Merge branch 'master' into changes

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@master
         with:
           path: rgbds
-          ref: v0.9.0
+          ref: v1.0.0
           repository: gbdev/rgbds
 
       - name: Install rgbds

.rgbds-version

@@ -1 +1 @@
-0.7.0
+1.0.0

Makefile

@@ -29,10 +29,10 @@ RGBFIX  ?= $(RGBDS)rgbfix
 RGBGFX  ?= $(RGBDS)rgbgfx
 RGBLINK ?= $(RGBDS)rgblink
 
-RGBASMFLAGS := -E -i $(BUILD)/ -DGOLD
-
-SCAN_INCLUDES := tools/scan_includes
-MAKE_SHIM := tools/make_shim.py
+RGBASMFLAGS  ?= -Weverything -Wtruncation=1
+RGBLINKFLAGS ?= -Weverything -Wtruncation=1
+RGBFIXFLAGS  ?= -Weverything
+RGBGFXFLAGS  ?= -Weverything
 
 tools/gfx :=
 
@@ -66,7 +66,7 @@ tidy:
 # Visualize disassembly progress.
 .PHONY: coverage
 coverage: $(ROM:.gb=.map)
-	utils/coverage.py $<
+	$(PYTHON) utils/coverage.py $<
 
 
 ### Build products
@@ -76,21 +76,25 @@ rgbdscheck.o: rgbdscheck.asm
 
 %.map: %.gb
 
+$(CORRECTEDROM): RGBFIXFLAGS += -f hg -m 0x10 -Wno-overwrite
 $(CORRECTEDROM): %-correctheader.gb: %.gb
 	cp $< $@
 	cp $(<:.gb=.sym) $(@:.gb=.sym)
-	$(RGBFIX) -f hg -m 0x10 $@
+	$(RGBFIX) $(RGBFIXFLAGS) $@
 
+RGBLINKFLAGS += -d
+
+$(ROM): RGBFIXFLAGS += -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3
 $(ROM): poke%-spaceworld.gb: layout.link $(OBJS) | $(BASEROM)
-	$(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -l layout.link -O $(BASEROM) -o $@ $(filter-out $<, $^)
-	$(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2$(shell echo $* | cut -d _ -f 1 | tr '[:lower:]' '[:upper:]')" $@
+	$(RGBLINK) $(RGBLINKFLAGS) -l layout.link -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $(filter-out $<, $^)
+	$(RGBFIX) $(RGBFIXFLAGS) -t "POKEMON2$(shell echo $* | cut -d _ -f 1 | tr '[:lower:]' '[:upper:]')" $@
 
 $(BASEROM):
 	@echo "Please obtain a copy of Gold_debug.sgb and put it in this directory as $@"
 	@exit 1
 
 $(BUILD)/shim.asm: shim.sym | $$(dir $$@)
-	$(MAKE_SHIM) $< > $@
+	$(PYTHON) tools/make_shim.py $< > $@
 
 
 ### Misc file-specific graphics rules
@@ -100,14 +104,16 @@ include slack/slack.mk
 
 ### Catch-all build target rules
 
+RGBASMFLAGS += -E -i $(BUILD)/ -DGOLD
+
 $(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@) rgbdscheck.o
 	$(RGBASM) $(RGBASMFLAGS) $(OUTPUT_OPTION) $<
 
 $(BUILD)/%.o: %.asm | $$(dir $$@) rgbdscheck.o
 	$(RGBASM) $(RGBASMFLAGS) $(OUTPUT_OPTION) $<
 
-$(BUILD)/%.d: %.asm | $$(dir $$@) $(SCAN_INCLUDES)
-	@$(SCAN_INCLUDES) -b $(BUILD)/ -i $(BUILD)/ -i ./ -o $@ -t $(@:.d=.o) $<
+$(BUILD)/%.d: %.asm | $$(dir $$@) tools/scan_includes
+	@tools/scan_includes -b $(BUILD)/ -i $(BUILD)/ -i ./ -o $@ -t $(@:.d=.o) $<
 
 .PRECIOUS: $(BUILD)/%.pic
 $(BUILD)/%.pic: $(BUILD)/%.2bpp tools/pkmncompress | $$(dir $$@)
@@ -115,17 +121,17 @@ $(BUILD)/%.pic: $(BUILD)/%.2bpp tools/pkmncompress | $$(dir $$@)
 
 .PRECIOUS: $(BUILD)/%.2bpp
 $(BUILD)/%.2bpp: %.png tools/gfx | $$(dir $$@)
-	$(RGBGFX) $(OUTPUT_OPTION) $<
+	$(RGBGFX) -c dmg $(RGBGFXFLAGS) $(OUTPUT_OPTION) $<
 	tools/gfx $(tools/gfx) $(OUTPUT_OPTION) $@
 
 .PRECIOUS: $(BUILD)/%.1bpp
 $(BUILD)/%.1bpp: %.1bpp.png tools/gfx | $$(dir $$@)
-	$(RGBGFX) -d1 $(OUTPUT_OPTION) $<
+	$(RGBGFX) -c dmg $(RGBGFXFLAGS) -d1 $(OUTPUT_OPTION) $<
 	tools/gfx $(tools/gfx) -d1 $(OUTPUT_OPTION) $@
 
 .PRECIOUS: $(BUILD)/%.tilemap
 $(BUILD)/%.tilemap: %.png | $$(dir $$@)
-	$(RGBGFX) -t $@ $<
+	$(RGBGFX) -c dmg $(RGBGFXFLAGS) -t $@ $<
 
 .PRECIOUS: $(BUILD)/%.sgb.tilemap
 export LC_ALL=C

constants/charmap.asm

@@ -1,9 +1,9 @@
 	charmap "<NULL>", $00
 
-	charmap "イ゛", $01
-	charmap "ヴ",  $02
-	charmap "エ゛", $03
-	charmap "オ゛", $04
+	charmap "<イ゛>", $01
+	charmap "<ヴ>",  $02
+	charmap "<エ゛>", $03
+	charmap "<オ゛>", $04
 
 	charmap "ガ", $05
 	charmap "ギ", $06
@@ -21,30 +21,26 @@
 	charmap "デ", $12
 	charmap "ド", $13
 
-	charmap "<PLAY_G>",  $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"
-
-	charmap "<15>", $15 ; nothing
-	charmap "<16>", $16 ; nothing
-
-	charmap "ネ゛", $17
-	charmap "ノ゛", $18
+	charmap "<ナ゛>", $14
+	charmap "<ニ゛>", $15
+	charmap "<ヌ゛>", $16
+	charmap "<ネ゛>", $17
+	charmap "<ノ゛>", $18
 
 	charmap "バ", $19
 	charmap "ビ", $1a
 	charmap "ブ", $1b
 	charmap "ボ", $1c
 
-	charmap "<NI>",  $1d ; "に　"
-	charmap "<TTE>", $1e ; "って"
-	charmap "<WO>",  $1f ; "を　"
-
-	charmap "ィ゛", $20
-	charmap "あ゛", $21
-
-	charmap "<TA!>",     $22 ; "た！"
-	charmap "<KOUGEKI>", $23 ; "こうげき"
-	charmap "<WA>",      $24 ; "は　"
-	charmap "<NO>",      $25 ; "の　"
+	charmap "<マ゛>", $1d
+	charmap "<ミ゛>", $1e
+	charmap "<ム゛>", $1f
+	charmap "<ィ゛>", $20
+	charmap "<あ゛>", $21
+	charmap "<い゛>", $22
+	charmap "<う゛>", $23
+	charmap "<え゛>", $24
+	charmap "<お゛>", $25
 
 	charmap "が", $26
 	charmap "ぎ", $27
@@ -62,9 +58,10 @@
 	charmap "で", $33
 	charmap "ど", $34
 
-	charmap "<ROUTE>",   $35 ; "ばん　どうろ"
-	charmap "<WATASHI>", $36 ; "わたし"
-	charmap "<KOKO_WA>", $37 ; "ここは"
+	charmap "<な゛>", $35
+	charmap "<に゛>", $36
+	charmap "<ぬ゛>", $37
+
 	charmap "<RED>",     $38 ; wRedsName
 	charmap "<GREEN>",   $39 ; wGreensName
 
@@ -72,6 +69,7 @@
 	charmap "び", $3b
 	charmap "ぶ", $3c
 	charmap "べ", $3d
+	charmap "ベ", $3d ; Katakana, shared graphic tile with Hiragana "べ"
 	charmap "ぼ", $3e
 
 	charmap "<ENEMY>", $3f
@@ -84,6 +82,7 @@
 	charmap "ぴ", $45
 	charmap "ぷ", $46
 	charmap "ぺ", $47
+	charmap "ペ", $47 ; Katakana, shared graphic tile with Hiragana "ぺ"
 	charmap "ぽ", $48
 
 	charmap "<MOM>",    $49 ; wMomsName
@@ -91,7 +90,7 @@
 	charmap "<_CONT>",  $4b ; implements "<CONT>"
 	charmap "<SCROLL>", $4c
 
-	charmap "も゜", $4d
+	charmap "<も゜>", $4d
 
 	charmap "<NEXT>",    $4e
 	charmap "<LINE>",    $4f
@@ -99,17 +98,17 @@
 	charmap "<PARA>",    $51
 	charmap "<PLAYER>",  $52 ; wPlayerName
 	charmap "<RIVAL>",   $53 ; wRivalName
-	charmap "#",         $54 ; "POKé"
+	charmap "#",         $54 ; "ポケモン"
 	charmap "<CONT>",    $55
 	charmap "<⋯⋯>",      $56 ; "⋯⋯"
 	charmap "<DONE>",    $57
 	charmap "<PROMPT>",  $58
 	charmap "<TARGET>",  $59
 	charmap "<USER>",    $5a
-	charmap "<PC>",      $5b ; "PC"
-	charmap "<TM>",      $5c ; "TM"
-	charmap "<TRAINER>", $5d ; "TRAINER"
-	charmap "<ROCKET>",  $5e ; "ROCKET"
+	charmap "<PC>",      $5b ; "パソコン"
+	charmap "<TM>",      $5c ; "わざマシン"
+	charmap "<TRAINER>", $5d ; "トレーナー"
+	charmap "<ROCKET>",  $5e ; "ロケットだん"
 	charmap "<DEXEND>",  $5f
 
 	charmap "■", $60
@@ -235,6 +234,7 @@
 	charmap "ひ", $cb
 	charmap "ふ", $cc
 	charmap "へ", $cd
+	charmap "ヘ", $cd ; Katakana, shared graphic tile with Hiragana "へ"
 	charmap "ほ", $ce
 	charmap "ま", $cf
 	charmap "み", $d0
@@ -246,6 +246,7 @@
 	charmap "よ", $d6
 	charmap "ら", $d7
 	charmap "り", $d8
+	charmap "リ", $d8 ; Katakana, shared graphic tile with Hiragana "り"
 	charmap "る", $d9
 	charmap "れ", $da
 	charmap "ろ", $db

data/debug/field_debug_entries.inc

@@ -31,7 +31,7 @@
 	const FIELDDEBUG_TRAINER_GEAR            ; $1c
 
 FieldDebug_MenuStrings:
-	db "りセット@"
+	db "リセット@"
 	db "とじる@"
 	db "わくせん@"
 	db "ゲーム@"
@@ -41,7 +41,7 @@ FieldDebug_MenuStrings:
 	db "キャラ@"
 	db "なまえ@"
 	db "ツールギア@"
-	db "イべント@"
+	db "イベント@"
 	db "かいふく@"
 	db "つうしん@"
 	db "つぎ▶@"

data/items/descriptions.inc

@@ -356,7 +356,7 @@ CalciumDescription:
 	db   "とくしゅの　きそポイントを　あげる@"
 
 RareCandyDescription:
-	db   "ポケモンの　レべルを　１つあげる@"
+	db   "ポケモンの　レベルを　１つあげる@"
 
 XAccuracyDescription:
 	db   "しようした　せんとうちゅうだけ"
@@ -403,7 +403,7 @@ MaxRepelDescription:
 
 DireHitDescription:
 	db   "しようした　せんとうちゅうだけ"
-	next "クりティカルりつが　あがる@"
+	next "クリティカルりつが　あがる@"
 
 Item2DDescription:
 	db   "？"
@@ -754,7 +754,7 @@ InvisibleWallDescription:
 
 SharpScytheDescription:
 	db   "そうびすると"
-	next "クりティカルが　でやすくなる@"
+	next "クリティカルが　でやすくなる@"
 
 Item87Description:
 	db   "？"

data/items/names.asm

@@ -29,14 +29,14 @@ ItemNames::
 	db "みずのいし@" ; WATER_STONE
 	db "しようきんし@" ; 19
 	db "マックスアップ@" ; HP_UP
-	db "タウりン@" ; PROTEIN
-	db "ブロムへキシン@" ; IRON
+	db "タウリン@" ; PROTEIN
+	db "ブロムヘキシン@" ; IRON
 	db "インドメタシン@" ; CARBOS
 	db "しようきんし@" ; 1E
-	db "りゾチウム@" ; CALCIUM
+	db "リゾチウム@" ; CALCIUM
 	db "ふしぎなアメ@" ; RARE_CANDY
 	db "ヨクアタール@" ; X_ACCURACY
-	db "りーフのいし@" ; LEAF_STONE
+	db "リーフのいし@" ; LEAF_STONE
 	db "しようきんし@" ; 23
 	db "きんのたま@" ; NUGGET
 	db "ピッピにんぎょう@" ; POKE_DOLL
@@ -46,7 +46,7 @@ ItemNames::
 	db "エフェクトガード@" ; GUARD_SPEC
 	db "シルバースプレー@" ; SUPER_REPEL
 	db "ゴールドスプレー@" ; MAX_REPEL
-	db "クりィテカッター@" ; DIRE_HIT
+	db "クリィテカッター@" ; DIRE_HIT
 	db "しようきんし@" ; 2D
 	db "おいしいみず@" ; FRESH_WATER
 	db "サイコソーダ@" ; SODA_POP
@@ -55,7 +55,7 @@ ItemNames::
 	db "しようきんし@" ; 32
 	db "ディフェンダー@" ; X_DEFEND
 	db "スピーダー@" ; X_SPEED
-	db "スぺシャルアップ@" ; X_SPECIAL
+	db "スペシャルアップ@" ; X_SPECIAL
 	db "コインケース@" ; COIN_CASE
 	db "ダウジングマシン@" ; ITEMFINDER
 	db "ポケモンのふえ@" ; POKE_FLUTE
@@ -66,7 +66,7 @@ ItemNames::
 	db "すごいつりざお@" ; SUPER_ROD
 	db "ポイントアップ@" ; PP_UP
 	db "ピーピーエイド@" ; ETHER
-	db "ピーピーりカバー@" ; MAX_ETHER
+	db "ピーピーリカバー@" ; MAX_ETHER
 	db "ピーピーエイダー@" ; ELIXER
 	db "しんぴのはなびら@" ; MYSTIC_PETAL
 	db "しろいハネ@" ; WHITE_FEATHER
@@ -76,14 +76,14 @@ ItemNames::
 	db "アップグレード@" ; UP_GRADE
 	db "ふしぎないと@" ; STRANGE_THREAD
 	db "おっきなはっぱ@" ; BIG_LEAF
-	db "せんせいのハり@" ; QUICK_NEEDLE
+	db "せんせいのハリ@" ; QUICK_NEEDLE
 	db "しようきんし@" ; 4B
 	db "とがったいし@" ; SHARP_STONE
 	db "くろいハネ@" ; BLACK_FEATHER
 	db "とがったまえば@" ; SHARP_FANG
-	db "へビのぬけがら@" ; SNAKESKIN
+	db "ヘビのぬけがら@" ; SNAKESKIN
 	db "でんきぶくろ@" ; ELECTRIC_POUCH
-	db "もうどくバり@" ; TOXIC_NEEDLE
+	db "もうどくバリ@" ; TOXIC_NEEDLE
 	db "おうじゃのしるし@" ; KINGS_ROCK
 	db "ふしぎなちから@" ; STRANGE_POWER
 	db "いのちのおふだ@" ; LIFE_TAG
@@ -99,8 +99,8 @@ ItemNames::
 	db "まよけのおふだ@" ; TALISMAN_TAG
 	db "ふしぎなみず@" ; STRANGE_WATER
 	db "まがったスプーン@" ; TWISTEDSPOON
-	db "こうげきバり@" ; ATTACK_NEEDLE
-	db "パワーりスト@" ; POWER_BRACER
+	db "こうげきバリ@" ; ATTACK_NEEDLE
+	db "パワーリスト@" ; POWER_BRACER
 	db "かたいいし@" ; HARD_STONE
 	db "しようきんし@" ; 64
 	db "ぷよぷよふうせん@" ; JIGGLING_BALLOON
@@ -113,7 +113,7 @@ ItemNames::
 	db "かせきのかけら@" ; FOSSIL_SHARD
 	db "きたないゴミ@" ; GROSS_GARBAGE
 	db "おっきなしんじゅ@" ; BIG_PEARL
-	db "おうじゃのべルト@" ; CHAMPION_BELT
+	db "おうじゃのベルト@" ; CHAMPION_BELT
 	db "おふだ@" ; TAG
 	db "のろいのおふだ@" ; SPELL_TAG
 	db "５えんだま@" ; 5_YEN_COIN
@@ -144,7 +144,7 @@ ItemNames::
 	db "２ほんのツノ@" ; TWIN_HORNS
 	db "ごすんくぎ@" ; SPIKE
 	db "きのみ@" ; BERRY
-	db "りンゴ@" ; APPLE
+	db "リンゴ@" ; APPLE
 	db "メタルコート@" ; METAL_COAT
 	db "きれいなシッポ@" ; PRETTY_TAIL
 	db "みずのシッポ@" ; WATER_TAIL

data/maps/landmarks.asm

@@ -69,7 +69,7 @@ LandmarkNames::
 	db "ブルーフォレスト@" ; BLUE_FOREST
 	db "スタンド@" ; STAND
 	db "カントー@" ; KANTO
-	db "プりンス@" ; PRINCE
+	db "プリンス@" ; PRINCE
 	db "フジヤマ@" ; MT_FUJI
 	db "サウス@" ; SOUTH
 	db "ノース@" ; NORTH

data/moves/descriptions.inc

@@ -257,7 +257,7 @@ PoundDescription:
 
 KarateChopDescription:
 	db   "チョップで　てきを　こうげき"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 DoubleslapDescription:
 	db   "てきを　おうふくビンタで"
@@ -376,7 +376,7 @@ FuryAttackDescription:
 	next "２ー５かい　れんぞくで　こうげき@"
 
 HornDrillDescription:
-	db   "ツノを　ドりルのように　かいてんさせ"
+	db   "ツノを　ドリルのように　かいてんさせ"
 	next "てきを　つつき　せんとうふのうにする@"
 
 TackleDescription:
@@ -408,15 +408,15 @@ TailWhipDescription:
 	next "ぼうぎょを　さげさせる@"
 
 PoisonStingDescription:
-	db   "どくのある　ハりや　ツノで　こうげき"
+	db   "どくのある　ハリや　ツノで　こうげき"
 	next "てきに　どくをあたえることがある@"
 
 TwineedleDescription:
-	db   "りょうての　ハりを　つかって"
+	db   "りょうての　ハリを　つかって"
 	next "てきを　２かい　れんぞくで　こうげき@"
 
 PinMissileDescription:
-	db   "するどいハりを　てきに　はっしゃして"
+	db   "するどいハリを　てきに　はっしゃして"
 	next "２ー５かい　れんぞくで　こうげき@"
 
 LeerDescription:
@@ -525,7 +525,7 @@ CounterDescription:
 
 SeismicTossDescription:
 	db   "いんりょくを　りようして　なげる"
-	next "レべルぶんの　ダメージを　あたえる@"
+	next "レベルぶんの　ダメージを　あたえる@"
 
 StrengthDescription:
 	db   "ぜんしんに　すごいちからを　ためて"
@@ -549,7 +549,7 @@ GrowthDescription:
 
 RazorLeafDescription:
 	db   "はっぱで　てきを　きりつける"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 SolarbeamDescription:
 	db   "１ターンめで　ひかりを　きゅうしゅう"
@@ -653,7 +653,7 @@ TeleportDescription:
 
 NightShadeDescription:
 	db   "てきに　おそろしい　まぼろしを　みせ"
-	next "レべルぶんの　ダメージを　あたえる@"
+	next "レベルぶんの　ダメージを　あたえる@"
 
 MimicDescription:
 	db   "てきが　つかった　わざが　"
@@ -713,7 +713,7 @@ ReflectDescription:
 
 FocusEnergyDescription:
 	db   "こうげきに　きあいを　こめて"
-	next "クりティカルヒットを　でやすくする@"
+	next "クリティカルヒットを　でやすくする@"
 
 BideDescription:
 	db   "２ー３ターン　こうげきに　たえて"
@@ -744,7 +744,7 @@ SmogDescription:
 	next "てきに　どくをあたえることがある@"
 
 SludgeDescription:
-	db   "へドロを　なげつけて　こうげき"
+	db   "ヘドロを　なげつけて　こうげき"
 	next "てきに　どくをあたえることがある@"
 
 BoneClubDescription:
@@ -772,7 +772,7 @@ SkullBashDescription:
 	next "つぎのターンで　てきを　こうげき@"
 
 SpikeCannonDescription:
-	db   "するどいハりを　てきに　はっしゃして"
+	db   "するどいハリを　てきに　はっしゃして"
 	next "２ー５かい　れんぞくで　こうげき@"
 
 ConstrictDescription:
@@ -844,7 +844,7 @@ FlashDescription:
 	next "てきの　めいちゅうりつを　さげさせる@"
 
 PsywaveDescription:
-	db   "てきに　１ーレべル×１．５の"
+	db   "てきに　１ーレベル×１．５の"
 	next "ダメージを　ランダムで　あたえる@"
 
 SplashDescription:
@@ -856,7 +856,7 @@ AcidArmorDescription:
 
 CrabhammerDescription:
 	db   "ハサミを　てきに　たたきつける"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 ExplosionDescription:
 	db   "てきに　だいダメージを　あたえるが"
@@ -883,7 +883,7 @@ HyperFangDescription:
 	next "ひるませることがある@"
 
 SharpenDescription:
-	db   "ポりゴンを　へらし　カクカクになって"
+	db   "ポリゴンを　へらし　カクカクになって"
 	next "こうげきを　あげる@"
 
 ConversionDescription:
@@ -900,7 +900,7 @@ SuperFangDescription:
 
 SlashDescription:
 	db   "するどいカマや　ツメなどで　こうげき"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 SubstituteDescription:
 	db   "たいりょくの　４ぶんの１を　つかって"
@@ -956,7 +956,7 @@ Conversion2Description:
 
 CoinHurlDescription:
 	db   "おかねを　つかって　てきを　こうげき"
-	next "かいぬしが　りッチなほど　つよいワザ@"
+	next "かいぬしが　リッチなほど　つよいワザ@"
 
 CottonSporeDescription:
 	db   "ほうしを　まとわりつかせ　てきにの"
@@ -998,7 +998,7 @@ BellyDrumDescription:
 	next "こうげきを　グーンとあげる@"
 
 SludgeBombDescription:
-	db   "へドロを　なげつけて　こうげき"
+	db   "ヘドロを　なげつけて　こうげき"
 	next "てきに　どくをあたえることがある@"
 
 MudSlapDescription:
@@ -1199,7 +1199,7 @@ HiddenPowerDescription:
 
 CrossCutterDescription:
 	db   "ハサミを　こうさ　させて　こうげき"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 TwisterDescription:
 	db   "ものすごい　かぜを　おこして"
@@ -1228,7 +1228,7 @@ UprootDescription:
 
 WindRideDescription:
 	db   "かぜと　ともに　てきに　たいあたり"
-	next "クりティカルヒットが　でやすい@"
+	next "クリティカルヒットが　でやすい@"
 
 WaterSportDescription:
 	db   "コメントさくせいちゅう@"

data/moves/names.asm

@@ -34,7 +34,7 @@ MoveNames::
 	db "ずつき@" ; HEADBUTT
 	db "つのでつく@" ; HORN_ATTACK
 	db "みだれづき@" ; FURY_ATTACK
-	db "つのドりル@" ; HORN_DRILL
+	db "つのドリル@" ; HORN_DRILL
 	db "たいあたり@" ; TACKLE
 	db "のしかかり@" ; BODY_SLAM
 	db "まきつく@" ; WRAP
@@ -67,7 +67,7 @@ MoveNames::
 	db "オーロラビーム@" ; AURORA_BEAM
 	db "はかいこうせん@" ; HYPER_BEAM
 	db "つつく@" ; PECK
-	db "ドりルくちばし@" ; DRILL_PECK
+	db "ドリルくちばし@" ; DRILL_PECK
 	db "じごくぐるま@" ; SUBMISSION
 	db "けたぐり@" ; LOW_KICK
 	db "カウンター@" ; COUNTER
@@ -103,7 +103,7 @@ MoveNames::
 	db "でんこうせっか@" ; QUICK_ATTACK
 	db "いかり@" ; RAGE
 	db "テレポート@" ; TELEPORT
-	db "ナイトへッド@" ; NIGHT_SHADE
+	db "ナイトヘッド@" ; NIGHT_SHADE
 	db "ものまね@" ; MIMIC
 	db "いやなおと@" ; SCREECH
 	db "かげぶんしん@" ; DOUBLE_TEAM
@@ -114,10 +114,10 @@ MoveNames::
 	db "あやしいひかり@" ; CONFUSE_RAY
 	db "からにこもる@" ; WITHDRAW
 	db "まるくなる@" ; DEFENSE_CURL
-	db "バりアー@" ; BARRIER
+	db "バリアー@" ; BARRIER
 	db "ひかりのかべ@" ; LIGHT_SCREEN
 	db "くろいきり@" ; HAZE
-	db "りフレクター@" ; REFLECT
+	db "リフレクター@" ; REFLECT
 	db "きあいだめ@" ; FOCUS_ENERGY
 	db "がまん@" ; BIDE
 	db "ゆびをふる@" ; METRONOME
@@ -126,7 +126,7 @@ MoveNames::
 	db "タマゴばくだん@" ; EGG_BOMB
 	db "したでなめる@" ; LICK
 	db "スモッグ@" ; SMOG
-	db "へドロこうげき@" ; SLUDGE
+	db "ヘドロこうげき@" ; SLUDGE
 	db "ホネこんぼう@" ; BONE_CLUB
 	db "だいもんじ@" ; FIRE_BLAST
 	db "たきのぼり@" ; WATERFALL
@@ -169,7 +169,7 @@ MoveNames::
 	db "みがわり@" ; SUBSTITUTE
 	db "わるあがき@" ; STRUGGLE
 	db "スケッチ@" ; SKETCH
-	db "トりプルキック@" ; TRIPLE_KICK
+	db "トリプルキック@" ; TRIPLE_KICK
 	db "どろぼう@" ; THIEF
 	db "クモのす@" ; SPIDER_WEB
 	db "こころのめ@" ; MIND_READER
@@ -190,7 +190,7 @@ MoveNames::
 	db "だましうち@" ; FAINT_ATTACK
 	db "てんしのキッス@" ; SWEET_KISS
 	db "はらだいこ@" ; BELLY_DRUM
-	db "へドロばくだん@" ; SLUDGE_BOMB
+	db "ヘドロばくだん@" ; SLUDGE_BOMB
 	db "どろかけ@" ; MUD_SLAP
 	db "オクタンほう@" ; OCTAZOOKA
 	db "まきびし@" ; SPIKES

data/pokemon/dex_entries.asm

@@ -210,7 +210,7 @@ WeedleDexEntry:
 	db 3
 	dw 32
 	db   "もりに　おおく　ハッパを　たべる。"
-	next "あたまに　するどい　ハりをもち"
+	next "あたまに　するどい　ハリをもち"
 	next "さされると　どくに　おかされる。@"
 
 KakunaDexEntry:
@@ -350,7 +350,7 @@ NidorinaDexEntry:
 	next "にくだんせんを　このむ。@"
 
 NidoqueenDexEntry:
-	db "ドりル@"
+	db "ドリル@"
 	db 13
 	dw 600
 	db   "せなかに　はりのような　ウロコが"
@@ -374,7 +374,7 @@ NidorinoDexEntry:
 	next "きょうれつな　どくそをだす　しくみ。@"
 
 NidokingDexEntry:
-	db "ドりル@"
+	db "ドリル@"
 	db 14
 	dw 620
 	db   "ダイヤのように　かたい　ひふと"
@@ -585,7 +585,7 @@ PoliwagDexEntry:
 	db "おたま@"
 	db 6
 	dw 124
-	db   "スべスべした　くろいひふは　うすい。"
+	db   "スベスベした　くろいひふは　うすい。"
 	next "おなかの　なかが　すけて"
 	next "うずまきじょうに　みえる。@"
 
@@ -602,7 +602,7 @@ PoliwrathDexEntry:
 	db 13
 	dw 540
 	db   "クロールや　バタフライが　とくいで"
-	next "オりンピックの　せんしゅでも　"
+	next "オリンピックの　せんしゅでも　"
 	next "ぐんぐんと　おいぬいていく。@"
 
 AbraDexEntry:
@@ -806,15 +806,15 @@ DewgongDexEntry:
 	next "むしろ　さむいほど　げんきになる。@"
 
 GrimerDexEntry:
-	db "へドロ@"
+	db "ヘドロ@"
 	db 9
 	dw 300
 	db   "つきからの　エックスせんをあびた"
-	next "へドロが　べトべターにへんかした。"
+	next "ヘドロが　ベトベターにへんかした。"
 	next "きたないモノが　だいこうぶつ。@"
 
 MukDexEntry:
-	db "へドロ@"
+	db "ヘドロ@"
 	db 12
 	dw 300
 	db   "ふだんは　じめんに　まざっていて"
@@ -1123,7 +1123,7 @@ LickitungDexEntry:
 	db "なめまわし@"
 	db 12
 	dw 655
-	db   "べロが　からだの　２ばいも　のびる。"
+	db   "ベロが　からだの　２ばいも　のびる。"
 	next "エサをとったり　こうげきをしたりと"
 	next "まるで　てのように　うごくのだ。@"
 
@@ -1152,7 +1152,7 @@ RhyhornDexEntry:
 	next "コナゴナに　ふんさいしてしまう。@"
 
 RhydonDexEntry:
-	db "ドりル@"
+	db "ドリル@"
 	db 19
 	dw 1200
 	db   "ぜんしんを　よろいのような　ひふで"
@@ -1211,7 +1211,7 @@ SeakingDexEntry:
 	db "きんぎょ@"
 	db 13
 	dw 390
-	db   "ツノが　ドりルのように　とがっていて"
+	db   "ツノが　ドリルのように　とがっていて"
 	next "いわはだを　ツノで　くりぬき"
 	next "じぶんの　すを　つくっている。@"
 
@@ -1232,11 +1232,11 @@ StarmieDexEntry:
 	next "じもとでは　うたがわれている。@"
 
 MrMimeDexEntry:
-	db "バりアー@"
+	db "バリアー@"
 	db 13
 	dw 545
 	db   "ひとを　しんじこませるのが　うまい。"
-	next "パントマイムで　つくったカべが"
+	next "パントマイムで　つくったカベが"
 	next "ほんとうに　あらわれるという。@"
 
 ScytherDexEntry:

data/pokemon/names.asm

@@ -7,14 +7,14 @@ PokemonNames::
 	db "フシギソウ" ; IVYSAUR
 	db "フシギバナ" ; VENUSAUR
 	db "ヒトカゲ@" ; CHARMANDER
-	db "りザード@" ; CHARMELEON
-	db "りザードン" ; CHARIZARD
+	db "リザード@" ; CHARMELEON
+	db "リザードン" ; CHARIZARD
 	db "ゼニガメ@" ; SQUIRTLE
 	db "カメール@" ; WARTORTLE
 	db "カメックス" ; BLASTOISE
 	db "キャタピー" ; CATERPIE
 	db "トランセル" ; METAPOD
-	db "バタフりー" ; BUTTERFREE
+	db "バタフリー" ; BUTTERFREE
 	db "ビードル@" ; WEEDLE
 	db "コクーン@" ; KAKUNA
 	db "スピアー@" ; BEEDRILL
@@ -24,7 +24,7 @@ PokemonNames::
 	db "コラッタ@" ; RATTATA
 	db "ラッタ@@" ; RATICATE
 	db "オニスズメ" ; SPEAROW
-	db "オニドりル" ; FEAROW
+	db "オニドリル" ; FEAROW
 	db "アーボ@@" ; EKANS
 	db "アーボック" ; ARBOK
 	db "ピカチュウ" ; PIKACHU
@@ -32,17 +32,17 @@ PokemonNames::
 	db "サンド@@" ; SANDSHREW
 	db "サンドパン" ; SANDSLASH
 	db "ニドラン♀" ; NIDORAN_F
-	db "ニドりーナ" ; NIDORINA
+	db "ニドリーナ" ; NIDORINA
 	db "ニドクイン" ; NIDOQUEEN
 	db "ニドラン♂" ; NIDORAN_M
-	db "ニドりーノ" ; NIDORINO
+	db "ニドリーノ" ; NIDORINO
 	db "ニドキング" ; NIDOKING
 	db "ピッピ@@" ; CLEFAIRY
 	db "ピクシー@" ; CLEFABLE
 	db "ロコン@@" ; VULPIX
 	db "キュウコン" ; NINETALES
-	db "プりン@@" ; JIGGLYPUFF
-	db "プクりン@" ; WIGGLYTUFF
+	db "プリン@@" ; JIGGLYPUFF
+	db "プクリン@" ; WIGGLYTUFF
 	db "ズバット@" ; ZUBAT
 	db "ゴルバット" ; GOLBAT
 	db "ナゾノクサ" ; ODDISH
@@ -53,13 +53,13 @@ PokemonNames::
 	db "コンパン@" ; VENONAT
 	db "モルフォン" ; VENOMOTH
 	db "ディグダ@" ; DIGLETT
-	db "ダグトりオ" ; DUGTRIO
+	db "ダグトリオ" ; DUGTRIO
 	db "ニャース@" ; MEOWTH
-	db "ぺルシアン" ; PERSIAN
+	db "ペルシアン" ; PERSIAN
 	db "コダック@" ; PSYDUCK
 	db "ゴルダック" ; GOLDUCK
 	db "マンキー@" ; MANKEY
-	db "オコりザル" ; PRIMEAPE
+	db "オコリザル" ; PRIMEAPE
 	db "ガーディ@" ; GROWLITHE
 	db "ウインディ" ; ARCANINE
 	db "ニョロモ@" ; POLIWAG
@@ -68,9 +68,9 @@ PokemonNames::
 	db "ケーシィ@" ; ABRA
 	db "ユンゲラー" ; KADABRA
 	db "フーディン" ; ALAKAZAM
-	db "ワンりキー" ; MACHOP
-	db "ゴーりキー" ; MACHOKE
-	db "カイりキー" ; MACHAMP
+	db "ワンリキー" ; MACHOP
+	db "ゴーリキー" ; MACHOKE
+	db "カイリキー" ; MACHAMP
 	db "マダツボミ" ; BELLSPROUT
 	db "ウツドン@" ; WEEPINBELL
 	db "ウツボット" ; VICTREEBEL
@@ -87,22 +87,22 @@ PokemonNames::
 	db "レアコイル" ; MAGNETON
 	db "カモネギ@" ; FARFETCHD
 	db "ドードー@" ; DODUO
-	db "ドードりオ" ; DODRIO
+	db "ドードリオ" ; DODRIO
 	db "パウワウ@" ; SEEL
 	db "ジュゴン@" ; DEWGONG
-	db "べトべター" ; GRIMER
-	db "べトべトン" ; MUK
+	db "ベトベター" ; GRIMER
+	db "ベトベトン" ; MUK
 	db "シェルダー" ; SHELLDER
 	db "パルシェン" ; CLOYSTER
 	db "ゴース@@" ; GASTLY
 	db "ゴースト@" ; HAUNTER
 	db "ゲンガー@" ; GENGAR
 	db "イワーク@" ; ONIX
-	db "スりープ@" ; DROWZEE
-	db "スりーパー" ; HYPNO
+	db "スリープ@" ; DROWZEE
+	db "スリーパー" ; HYPNO
 	db "クラブ@@" ; KRABBY
 	db "キングラー" ; KINGLER
-	db "ビりりダマ" ; VOLTORB
+	db "ビリリダマ" ; VOLTORB
 	db "マルマイン" ; ELECTRODE
 	db "タマタマ@" ; EXEGGCUTE
 	db "ナッシー@" ; EXEGGUTOR
@@ -110,7 +110,7 @@ PokemonNames::
 	db "ガラガラ@" ; MAROWAK
 	db "サワムラー" ; HITMONLEE
 	db "エビワラー" ; HITMONCHAN
-	db "べロりンガ" ; LICKITUNG
+	db "ベロリンガ" ; LICKITUNG
 	db "ドガース@" ; KOFFING
 	db "マタドガス" ; WEEZING
 	db "サイホーン" ; RHYHORN
@@ -124,7 +124,7 @@ PokemonNames::
 	db "アズマオウ" ; SEAKING
 	db "ヒトデマン" ; STARYU
 	db "スターミー" ; STARMIE
-	db "バりヤード" ; MRMIME
+	db "バリヤード" ; MRMIME
 	db "ストライク" ; SCYTHER
 	db "ルージュラ" ; JYNX
 	db "エレブー@" ; ELECTABUZZ
@@ -139,35 +139,35 @@ PokemonNames::
 	db "シャワーズ" ; VAPOREON
 	db "サンダース" ; JOLTEON
 	db "ブースター" ; FLAREON
-	db "ポりゴン@" ; PORYGON
+	db "ポリゴン@" ; PORYGON
 	db "オムナイト" ; OMANYTE
 	db "オムスター" ; OMASTAR
 	db "カブト@@" ; KABUTO
 	db "カブトプス" ; KABUTOPS
 	db "プテラ@@" ; AERODACTYL
 	db "カビゴン@" ; SNORLAX
-	db "フりーザー" ; ARTICUNO
+	db "フリーザー" ; ARTICUNO
 	db "サンダー@" ; ZAPDOS
 	db "ファイヤー" ; MOLTRES
-	db "ミニりュウ" ; DRATINI
-	db "ハクりュー" ; DRAGONAIR
-	db "カイりュー" ; DRAGONITE
+	db "ミニリュウ" ; DRATINI
+	db "ハクリュー" ; DRAGONAIR
+	db "カイリュー" ; DRAGONITE
 	db "ミュウツー" ; MEWTWO
 	db "ミュウ@@" ; MEW
 	db "ハッパ@@" ; HAPPA
 	db "ハナモグラ" ; HANAMOGURA
-	db "ハナりュウ" ; HANARYU
+	db "ハナリュウ" ; HANARYU
 	db "ホノオグマ" ; HONOGUMA
-	db "ボルべアー" ; VOLBEAR
-	db "ダイナべア" ; DYNABEAR
+	db "ボルベアー" ; VOLBEAR
+	db "ダイナベア" ; DYNABEAR
 	db "クルス@@" ; KURUSU
 	db "アクア@@" ; AQUA
-	db "アクエりア" ; AQUARIA
+	db "アクエリア" ; AQUARIA
 	db "ホーホー@" ; HOHO
 	db "ボーボー@" ; BOBO
 	db "パチメエ@" ; PACHIMEE
 	db "モココ@@" ; MOKOKO
-	db "デンりュウ" ; DENRYU
+	db "デンリュウ" ; DENRYU
 	db "ミコン@@" ; MIKON
 	db "モンジャ@" ; MONJA
 	db "ジャランラ" ; JARANRA
@@ -176,31 +176,31 @@ PokemonNames::
 	db "シビレフグ" ; SHIBIREFUGU
 	db "ピチュー@" ; PICHU
 	db "ピィ@@@" ; PY
-	db "ププりン@" ; PUPURIN
+	db "ププリン@" ; PUPURIN
 	db "ミズウオ@" ; MIZUUO
 	db "ネイティ@" ; NATY
 	db "ネイティオ" ; NATIO
 	db "ギョピン@" ; GYOPIN
-	db "マりル@@" ; MARIL
+	db "マリル@@" ; MARIL
 	db "マンボー１" ; MANBO1
-	db "イカり@@" ; IKARI
+	db "イカリ@@" ; IKARI
 	db "グロテス@" ; GROTESS
 	db "エクシング" ; EKSING
 	db "パラ@@@" ; PARA
 	db "コクモ@@" ; KOKUMO
-	db "ツーへッド" ; TWOHEAD
-	db "ヨロイドり" ; YOROIDORI
+	db "ツーヘッド" ; TWOHEAD
+	db "ヨロイドリ" ; YOROIDORI
 	db "アニモン@" ; ANIMON
 	db "ヒナーズ@" ; HINAZU
 	db "サニー@@" ; SUNNY
 	db "パオン@@" ; PAON
 	db "ドンファン" ; DONPHAN
 	db "ツインズ@" ; TWINZ
-	db "キりンりキ" ; KIRINRIKI
-	db "ぺインター" ; PAINTER
+	db "キリンリキ" ; KIRINRIKI
+	db "ペインター" ; PAINTER
 	db "コーニャ@" ; KOUNYA
-	db "りンりン@" ; RINRIN
-	db "べルルン@" ; BERURUN
+	db "リンリン@" ; RINRIN
+	db "ベルルン@" ; BERURUN
 	db "ニョロトノ" ; NYOROTONO
 	db "ヤドキング" ; YADOKING
 	db "アンノーン" ; ANNON
@@ -210,7 +210,7 @@ PokemonNames::
 	db "エーフィ@" ; EIFIE
 	db "ブラッキー" ; BLACKY
 	db "ターバン@" ; TURBAN
-	db "べトべビー" ; BETBABY
+	db "ベトベビー" ; BETBABY
 	db "テッポウオ" ; TEPPOUO
 	db "オクタン@" ; OKUTANK
 	db "ゴング@@" ; GONGU
@@ -219,9 +219,9 @@ PokemonNames::
 	db "ハネコ@@" ; HANEKO
 	db "ポポネコ@" ; POPONEKO
 	db "ワタネコ@" ; WATANEKO
-	db "バりりーナ" ; BARIRINA
-	db "りップ@@" ; LIP
-	db "エレべビー" ; ELEBABY
+	db "バリリーナ" ; BARIRINA
+	db "リップ@@" ; LIP
+	db "エレベビー" ; ELEBABY
 	db "ブビィ@@" ; BOOBY
 	db "キレイハナ" ; KIREIHANA
 	db "ツボミット" ; TSUBOMITTO
@@ -238,10 +238,10 @@ PokemonNames::
 	db "シザース@" ; SCISSORS
 	db "プラックス" ; PURAKKUSU
 	db "デビル@@" ; DEVIL
-	db "へルガー@" ; HELGAA
+	db "ヘルガー@" ; HELGAA
 	db "ウルフマン" ; WOLFMAN
 	db "ワーウルフ" ; WARWOLF
-	db "ポりゴン２" ; PORYGON2
+	db "ポリゴン２" ; PORYGON2
 	db "ナメール@" ; NAMEIL
 	db "ハガネール" ; HAGANEIL
 	db "キングドラ" ; KINGDRA
@@ -253,4 +253,4 @@ PokemonNames::
 	db "トゲピー@" ; TOGEPY
 	db "ブルー@@" ; BULU
 	db "テイル@@" ; TAIL
-	db "りーフィ@" ; LEAFY
+	db "リーフィ@" ; LEAFY

data/sound_test_text_pointers.inc

@@ -83,7 +83,7 @@ SoundTest_TitleText:          db "タイトル@"
 SoundTest_EndingText:         db "エンディング@"
 SoundTest_HallOfFameText:     db "でんどういり@"
 SoundTest_OaksLabText:        db "けんきゆうじよ@"
-SoundTest_JigglypuffSongText: db "プりンノうた@"
+SoundTest_JigglypuffSongText: db "プリンノうた@"
 SoundTest_BikeText:           db "じてんしや@"
 SoundTest_SurfText:           db "うみ@"
 SoundTest_CasinoText:         db "カジノ@"

data/text/text_input_chars.asm

@@ -7,8 +7,8 @@ TextEntryChars:
 	db "たちつてと　なにぬねの　はひふへほ"
 	db "まみむめも　やゆよわん　らりるれろ"
 	db "アイウエオ　カキクケコ　サシスセソ"
-	db "タチツテト　ナニヌネノ　ハヒフへホ"
-	db "マミムメモ　ヤユヨワン　ラりルレロ"
+	db "タチツテト　ナニヌネノ　ハヒフヘホ"
+	db "マミムメモ　ヤユヨワン　ラリルレロ"
 	db "ゃゅょっを　ャュョッヲ　ﾞﾟ　ー。"
 	db "１２３４５　６７８９０　？！×．円"
 
@@ -21,7 +21,7 @@ TextEntryHiragana:
 
 TextEntryKatakana:
 	db "アイウエオ　カキクケコ　サシスセソ"
-	db "タチツテト　ナニヌネノ　ハヒフへホ"
-	db "マミムメモ　ヤユヨワン　ラりルレロ"
+	db "タチツテト　ナニヌネノ　ハヒフヘホ"
+	db "マミムメモ　ヤユヨワン　ラリルレロ"
 	db "ャュョッヲ　１２３４５　６７８９０"
 	db "　ﾞﾟ　ー？！円"

engine/battle/menu.asm

@@ -45,7 +45,7 @@ SafariBattleMenuHeader:
 	db STATICMENU_CURSOR
 	dn 2, 2
 	db 11
-	db "サファりボール×　　　@" ; "SAFARI BALL×   @"
+	db "サファリボール×　　　@" ; "SAFARI BALL×   @"
 	db "エサをなげる@"         ; "THROW BAIT"
 	db "いしをなげる@"         ; "THROW ROCK"
 	db "にげる@"              ; "RUN"

engine/debug/debug_menu.asm

@@ -269,7 +269,8 @@ _DebugMenuSoundTest::
 
 .String:
 	deciram hDebugMenuSoundMenuIndex, 1, 1
-	text "<LINE>@"
+	text_start
+	line "@"
 	text_from_ram wStartDay
 	text "　"
 	done

engine/debug/field/item_test.inc

@@ -141,7 +141,7 @@ FieldDebug_ItemTest:
 	ld de, $28
 	ld a, [wMenuDataItems]
 .clear_menu_loop
-	ld [hl], "　"
+	ld [hl], '　'
 	add hl, de
 	dec a
 	jr nz, .clear_menu_loop

engine/debug/field/minigames.inc

@@ -71,7 +71,7 @@ FieldDebug_Minigames:
 	db 3
 	db "スロットマシン@"
 	db "ポーカーゲーム@"
-	db "ぺアゲーム@"
+	db "ペアゲーム@"
 
 .MinigamePointers:
 	dba SlotMachineGame

engine/debug/field/move_to_entrance.inc

@@ -21,6 +21,7 @@ FieldDebug_MoveToRoute1Entrance:
 
 .CantUseText:
 	text "ここでは　できません"
+
 	para "ロード１でじっこうできます"
 	done
 

engine/debug/field/pokemart_menu.inc

@@ -78,11 +78,11 @@ DebugMart_BuyMenuHeader:
 	pop hl
 	ld c, $83
 	call PrintBCDNumber
-	ld [hl], "円"
+	ld [hl], '円'
 	ret
 
 DebugMart_WelcomeText:
-	text "フレンドりーショップへ　"
+	text "フレンドリーショップへ　"
 	line "ようこそ！"
 	prompt
 
@@ -324,11 +324,11 @@ DebugMart_LoadItems:
 .PrintPaddedDigits:
 	ld a, [de]
 	inc de
-	cp "　"
+	cp '　'
 	jr nz, .to_digit
-	ld a, "０"
+	ld a, '０'
 .to_digit
-	sub "０"
+	sub '０'
 	ret
 
 DebugMart_ShowPlaceholderText:
@@ -339,5 +339,5 @@ DebugMart_ShowPlaceholderText:
 
 .PlaceholderText:
 	text "かいはつちゅうです"
-	next "<PROMPT>"
-
+	next ""
+	prompt

engine/debug/field/teleport.inc

@@ -25,9 +25,12 @@ FieldDebug_Teleport:
 
 .MapRegisteredText:
 	text "このばしょを　とうろくしました"
-	para "<DONE>"
+
+	para ""
+	done
 
 .CannotRegisterMapText:
 	text "ここは　とうろくできません！"
-	para "<DONE>"
 
+	para ""
+	done

engine/debug/field/unused_flag_menu.inc

@@ -65,9 +65,9 @@ ENDM
 	ret
 
 .CheckBit:
-	ld a, "０"
+	ld a, '０'
 	jr z, .not_set
-	ld a, "１"
+	ld a, '１'
 .not_set
 	ld [bc], a
 	inc bc

engine/debug/field/vram_viewer.inc

@@ -221,7 +221,7 @@ FieldDebug_DoClearEventFlags:
 .MenuData:
 	db STATICMENU_CURSOR
 	db 2
-	db "フラグを　クりア@"
+	db "フラグを　クリア@"
 	db "フラグを　うめる@"
 
 .CheckMapFlags:

engine/dumps/bank0d.asm

@@ -773,7 +773,9 @@ StoringEnergyText:
 	prompt
 
 UnleashedEnergyText:
-	text "<USER>の<LINE>がまんが　とかれた！<PROMPT>"
+	text "<USER>の"
+	line "がまんが　とかれた！"
+	prompt
 
 HungOnText:
 	text "<TARGET>は"
@@ -1168,7 +1170,8 @@ UsedMoveText_CheckObedience:
 	ret
 
 MoveNameText:
-	text "<LINE>@"
+	text_start
+	line "@"
 	text_from_ram wStringBuffer2
 	start_asm
 ; get start address
@@ -5568,7 +5571,7 @@ Text_BattleFoeEffectActivate:
 
 GetStatName:
 	ld hl, StatNames
-	ld c, "@"
+	ld c, '@'
 
 .CheckName
 	dec b
@@ -7769,6 +7772,7 @@ BattleCommand_NailDown:
 .PutACurseText
 	text "<USER>は"
 	line "じぶんに　くぎを　うった"
+
 	para "<TARGET>は"
 	line "のろいを　かけられた！"
 	prompt
@@ -8319,7 +8323,7 @@ BattleCommand_Safeguard:
 
 .CoveredByVeilText:
 	text "<USER>は"
-	line "しんぴのべールに　つつまれた！"
+	line "しんぴのベールに　つつまれた！"
 	prompt
 
 .failed
@@ -8356,7 +8360,7 @@ BattleCommand_CheckSafeguard:
 
 SafeguardProtectText:
 	text "<TARGET>は"
-	line "しんぴのべールに　まもられている！"
+	line "しんぴのベールに　まもられている！"
 	prompt
 
 BattleCommand_GetMagnitude:

engine/dumps/bank0f.asm

@@ -139,7 +139,7 @@ StartBattle:
 SafariZonePAText:
 	text "アナウンス『ピンポーン！"
 
-	para "サファり　ボールを"
+	para "サファリ　ボールを"
 	line "ぜんぶ　なげました！"
 	prompt
 
@@ -862,7 +862,7 @@ sub_3c6e0:
 
 EndPsychicVeilText:
 	text "<USER>を　つつんでいた"
-	line "しんぴの　べールが　なくなった！"
+	line "しんぴの　ベールが　なくなった！"
 	prompt
 
 sub_3c704:
@@ -1423,7 +1423,7 @@ BattleText_EnemyWasDefeated:
 	text_from_ram wOTClassName
 	text "の　@"
 	text_from_ram wStringBuffer1
-	text ""
+	text_start
 	line "との　しょうぶに　かった！"
 	prompt
 
@@ -1648,6 +1648,7 @@ RivalWinText:
 OutOfUsableMonsText:
 	text "<PLAYER>の　てもとには"
 	line "たたかえる　#が　いない！"
+
 	para "<PLAYER>は"
 	line "めのまえが　まっくらに　なった！"
 	prompt
@@ -2154,7 +2155,8 @@ TrainerAboutToUseText:
 	text_from_ram wOTClassName
 	text "の　@"
 	text_from_ram wStringBuffer1
-	text "は<LINE>"
+	text "は"
+	line ""
 	text_from_ram wEnemyMonNickname
 	text "を　くりだそうと　している"
 
@@ -3102,11 +3104,11 @@ CenterMonName:
 .loop:
 	inc de
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr z, .done
 	inc de
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr z, .done
 	dec hl
 	dec b
@@ -3296,7 +3298,7 @@ asm_3d8c0:
 asm_3d8d5:
 	ld hl, $c387
 	ld bc, $81
-	ld a, "　"
+	ld a, '　'
 	call ByteFill
 	xor a
 	ld [wPartyMenuActionText], a
@@ -3625,7 +3627,7 @@ MoveSelectionScreen::
 	dec a
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
-	ld [hl], "▷"
+	ld [hl], '▷'
 
 .interpret_joypad
 	call WaitBGMap
@@ -4002,9 +4004,9 @@ MoveInfoBox:
 	call PlaceString
 
 	hlcoord 16, 13
-	ld [hl], "／"
+	ld [hl], '／'
 	hlcoord 14, 16
-	ld [hl], "／"
+	ld [hl], '／'
 	hlcoord 14, 13
 	ld de, wStringBuffer1
 	lb bc, 1, 2
@@ -4242,7 +4244,9 @@ LinkBattleSendRecieveAction:
 	ret
 
 BattleText_TargetsEncoreEnded:
-	text "<TARGET>の<LINE>アンコールじょうたいが　とけた！<PROMPT>"
+	text "<TARGET>の"
+	line "アンコールじょうたいが　とけた！"
+	prompt
 
 asm_3dff2:
 	ldh a, [hBattleTurn]
@@ -5332,16 +5336,20 @@ BoostedExpPointsText:
 	text "　おおめに@"
 
 .BoostedExpPoints3Text:
-	text "<LINE>@"
+	text_start
+	line "@"
 	deciram wStringBuffer2, 2, 4
-	text "　けいけんちを　もらった！<PROMPT>"
+	text "　けいけんちを　もらった！"
+	prompt
 
 GrewToLevelText:
 	text_from_ram wStringBuffer1
-	text "は<LINE>レべル@"
+	text "は"
+	line "レベル@"
 	deciram wCurPartyLevel, 1, 3
 	text "　に　あがった！@"
-	db "ジ@"
+	sound_dex_fanfare_50_79
+	text_end
 
 PrintSendOutMonMessage:
 	ld a, [wLinkMode]
@@ -5429,7 +5437,8 @@ PrintPlayerMon1Text:
 	ret
 .Text:
 	text_from_ram wBattleMonNickname
-	text "！<DONE>"
+	text "！"
+	done
 
 RetreatMon:
 	ld hl, PlayerMon2Text
@@ -5506,7 +5515,7 @@ PrintComeBackText:
 	ret
 
 ComeBackText:
-	text ""
+	text_start
 	line "もどれ！"
 	done
 

engine/dumps/bank14.asm

@@ -98,7 +98,7 @@ PrintMonTypes::
 	jr PrintType
 
 .hide_type_2
-	ld a, "　"
+	ld a, '　'
 	ld bc, SCREEN_WIDTH - 3
 	add hl, bc
 	ld [hl], a
@@ -171,7 +171,7 @@ GetTrainerClassName_Old::
 	ld a, [hli]
 	ld [de], a
 	inc de
-	cp "@"
+	cp '@'
 	jr nz, .copy_byte
 	ret
 
@@ -249,10 +249,10 @@ GetTrainerClassName_Old::
 	db "だんいん@"
 
 .cooltrainer_male
-	db "エりート♂@"
+	db "エリート♂@"
 
 .cooltrainer_female
-	db "エりート♀@"
+	db "エリート♀@"
 
 DrawPlayerHP::
 	ld a, 1
@@ -327,7 +327,7 @@ DrawHP:
 	lb bc, 2, 3
 	call PrintNumber
 
-	ld a, "／"  ; $f3
+	ld a, '／' ; $f3
 	ld [hli], a
 
 ; Print max HP
@@ -452,14 +452,14 @@ Function50340::
 	call PlaceString
 	push bc
 	call GetGender
-	ld a, "♂"
+	ld a, '♂'
 	jr c, .asm_50384
-	ld a, "♀"
+	ld a, '♀'
 .asm_50384
 	pop hl
 	ld [hl], a
 	hlcoord 1, 12
-	ld a, "／"
+	ld a, '／'
 	ld [hli], a
 	ld a, [wMonHIndex]
 	ld [wMoveGrammar], a
@@ -952,7 +952,7 @@ ListMovePP::
 	and a
 	jr z, .skip
 	ld c, a
-	ld a, "ー"
+	ld a, 'ー'
 	call .load_loop
 
 .skip
@@ -994,7 +994,7 @@ ListMovePP::
 	ld de, wStringBuffer1 + 4
 	lb bc, 1, 2
 	call PrintNumber
-	ld a, "／"
+	ld a, '／'
 	ld [hli], a
 	ld de, wNamedObjectIndexBuffer
 	lb bc, 1, 2
@@ -1252,7 +1252,7 @@ PlacePartyMember::
 	dec hl
 	dec hl
 	dec hl
-	ld a, "▷"
+	ld a, '▷'
 	ld [hli], a
 	inc hl
 	inc hl
@@ -1549,7 +1549,7 @@ RevitalizedText:
 
 _GrewToLevelText:
 	text_from_ram wStringBuffer1
-	text "の　レべルが@"
+	text "の　レベルが@"
 	deciram wCurPartyLevel, 1, 3
 	text "になった@"
 	sound_dex_fanfare_50_79
@@ -1581,11 +1581,11 @@ PlaceStatusString::
 	pop de
 	jr nz, PlaceNonFaintStatus
 	; "FNT" equivalent string
-	ld a, "ひ"
+	ld a, 'ひ'
 	ld [hli], a
-	ld a, "ん"
+	ld a, 'ん'
 	ld [hli], a
-	ld [hl], "し"
+	ld [hl], 'し'
 	and a
 	ret
 
@@ -1602,39 +1602,39 @@ PlaceNonFaintStatus::
 	and SLP
 	ret z
 	; "SLP" equivalent string
-	ld a, "ね"
+	ld a, 'ね'
 	ld [hli], a
-	ld a, "む"
+	ld a, 'む'
 	ld [hli], a
-	ld [hl], "り"
+	ld [hl], 'り'
 	ret
 
 .PsnString
-	ld a, "<DO>"
+	ld a, '<DO>'
 	ld [hli], a
-	ld [hl], "く"
+	ld [hl], 'く'
 	ret
 
 .BrnString
-	ld a, "や"
+	ld a, 'や'
 	ld [hli], a
-	ld a, "け"
+	ld a, 'け'
 	ld [hli], a
-	ld [hl], "<DO>"
+	ld [hl], '<DO>'
 	ret
 
 .FrzString
-	ld a, "こ"
+	ld a, 'こ'
 	ld [hli], a
-	ld a, "お"
+	ld a, 'お'
 	ld [hli], a
-	ld [hl], "り"
+	ld [hl], 'り'
 	ret
 
 .ParString
-	ld a, "ま"
+	ld a, 'ま'
 	ld [hli], a
-	ld [hl], "ひ"
+	ld [hl], 'ひ'
 	ret
 
 GetMonBackpic::
@@ -1975,7 +1975,7 @@ _SwitchPartyMons::
 	ld bc, 2 * SCREEN_WIDTH
 	call AddNTimes
 	ld bc, 2 * SCREEN_WIDTH
-	ld a, "　"
+	ld a, '　'
 	call ByteFill
 	pop af
 	ld hl, wShadowOAMSprite00
@@ -2102,7 +2102,7 @@ PartyMenu_ClearCursor::
 	ld bc, 2 * SCREEN_WIDTH
 	ld a, PARTY_LENGTH
 .next
-	ld [hl], "　"
+	ld [hl], '　'
 	add hl, bc
 	dec a
 	jr nz, .next

engine/events/field_moves.asm

@@ -502,6 +502,7 @@ CheckIfSpawnPoint:
 
 Text_CantFindDestination:
 	text "とびさきが　みつかりません"
+
 	para ""
 	done
 
@@ -521,6 +522,7 @@ FailTeleport:
 
 Text_CantUseTeleportHere:
 	text "ここでは　つかえません！"
+
 	para ""
 	done
 

engine/events/pokecenter_pc.asm

@@ -55,6 +55,7 @@ PokemonCenterPC:
 
 .TurnOnText:
 	text "コンピューターを　きどう！"
+
 	para "ネットワークにせつぞくした！"
 	prompt
 
@@ -125,12 +126,14 @@ PC_Demo:
 	ret
 
 .SkarmoryText:
-	text "ポケモン　ジャーナル　ホームぺージ"
+	text "ポケモン　ジャーナル　ホームページ"
 	line "<⋯⋯>　<⋯⋯>　<⋯⋯>　<⋯⋯>　<⋯⋯>　<⋯⋯>"
+
 	para "しんポケモン　はっけん！！"
-	line "めいめい　ヨロイドり"
+	line "めいめい　ヨロイドリ"
 	cont "はがねの　ように"
 	cont "かたい　つばさが　とくちょう"
+
 	para "ひこうタイプ　だけではなく"
 	line "あたらしく　メタルタイプ　としても"
 	cont "ぶんるい　されることが　けってい"
@@ -216,6 +219,7 @@ _PlayersPC:
 .TurnOnText:
 	text "<PLAYER>は　じぶんのパソコンに"
 	line "つないだ"
+
 	para "どうぐあずかりシステムを"
 	line "よびだした！"
 	prompt
@@ -223,6 +227,7 @@ _PlayersPC:
 .ShutDownText:
 	text "<PLAYER>は　じぶんのパソコンとの"
 	line "せつぞくをきった"
+
 	para ""
 	done
 

engine/games/memory_minigame.asm

@@ -153,7 +153,7 @@ endr
 .CheckTriesRemaining:
 	ld a, [wMemoryGameNumberTriesRemaining]
 	hlcoord 17, 0
-	add "０"
+	add '０'
 	ld [hl], a
 	ld hl, wMemoryGameNumberTriesRemaining
 	ld a, [hl]

engine/games/pikachu_minigame.asm

@@ -240,7 +240,7 @@ PikachuMiniGame_BlinkText:
 
 .render_dakutens
 ; Render dakuten marks separately
-	ld a, "ﾞ" + $10
+	ld a, 'ﾞ' + $10
 
 	hlcoord 5, 0
 	ld [hl], a

engine/games/slot_machine_game.asm

@@ -248,7 +248,7 @@ Slots_DisplayBiasValue:
 
 ; print second digit
 	and $f
-	add "０"
+	add '０'
 	hlcoord 1, 0
 	ld [hl], a
 
@@ -256,7 +256,7 @@ Slots_DisplayBiasValue:
 	ld a, e
 	swap a
 	and $F
-	add "０"
+	add '０'
 	hlcoord 0, 0
 	ld [hl], a
 	ret
@@ -1952,7 +1952,7 @@ Slots_PayoutText:
 	inc a
 	ldcoord_a 3, 14
 	hlcoord 18, 16
-	ld [hl], "▼"
+	ld [hl], '▼'
 	ld hl, .LinedUpText
 rept 4
 	inc bc

engine/gfx/load_gfx.asm

@@ -29,18 +29,18 @@ LoadToolgearGraphicsDebug::
 	bit 0, [hl]
 	jr z, .loadToolgearGraphics
 	ld hl, $9660
-	ld de, FontGFX + (("０" - "ア") * $08)
-	lb bc, BANK(FontGFX), ("９" - "０" + 1)
+	ld de, FontGFX + (('０' - 'ア') * $08)
+	lb bc, BANK(FontGFX), ('９' - '０' + 1)
 	call Get1bpp
 	ld hl, $9700
 	ld de, FontExtraAB_GFX
-	lb bc, BANK(FontExtraAB_GFX), ("Ｆ" - "Ａ" + 1)
+	lb bc, BANK(FontExtraAB_GFX), ('Ｆ' - 'Ａ' + 1)
 	call Get2bpp
 	ret
 .loadToolgearGraphics::
 	ld hl, $9660
-	ld de, FontGFX + (("０" - "ア") * $08)
-	lb bc, BANK(FontGFX), ("９" - "０" + 1)
+	ld de, FontGFX + (('０' - 'ア') * $08)
+	lb bc, BANK(FontGFX), ('９' - '０' + 1)
 	call Get1bpp
 	ld hl, $9700
 	ld de, TrainerCardColonGFX

engine/items/buy_sell_toss.asm

@@ -136,7 +136,7 @@ BuySellToss_UpdateQuantityDisplayAndPrice:
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
 	add hl, de
-	ld [hl], "×"
+	ld [hl], '×'
 	inc hl
 	ld de, wItemQuantity
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
@@ -168,7 +168,7 @@ BuySellToss_UpdateQuantityDisplayAndPrice:
 	ld de, hMoneyTemp
 	lb bc, 4, 6
 	call PrintNumber
-	ld [hl], "円"
+	ld [hl], '円'
 	call WaitBGMap
 	ret
 

engine/items/item_effects.asm

@@ -531,7 +531,7 @@ PokeBallEffect:
 
 	pop de
 	ld a, [de]
-	cp "@" ; Did we just leave the name empty?
+	cp '@' ; Did we just leave the name empty?
 	jr nz, .return_from_capture
 	ld hl, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
@@ -555,7 +555,7 @@ PokeBallEffect:
 	call GBFadeOutToWhite
 	ld de, wBoxMonNicknames
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr nz, .done_with_nickname_pc
 
 	ld hl, wStringBuffer1
@@ -1262,7 +1262,7 @@ ItemActionTextWaitButton:
 	ldh [hBGMapMode], a
 	ld hl, wTileMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
-	ld a, "　"
+	ld a, '　'
 	call ByteFill
 	callfar WritePartyMenuTilemapAndText
 	ld a, 1
@@ -1751,6 +1751,7 @@ ENDM
 
 .PlayedFluteText:
 	text "#のふえを　ふいた！"
+
 	para "うーん！"
 	line "すばらしい　ねいろだ！"
 	prompt
@@ -2225,6 +2226,7 @@ AskTeachTMHM_Old:
 	text_from_ram wStringBuffer2
 	text "が"
 	line "きろくされていた！"
+
 	para "@"
 	text_from_ram wStringBuffer2
 	text "を"
@@ -2237,6 +2239,7 @@ AskTeachTMHM_Old:
 	text_from_ram wStringBuffer2
 	text "は"
 	line "あいしょうが　わるかった！"
+
 	para "@"
 	text_from_ram wStringBuffer2
 	text "は　おぼえられない！"

engine/items/tm_holder.asm

@@ -111,6 +111,7 @@ ContainedMoveText:
 	text_from_ram wStringBuffer2
 	text "が"
 	line "きろくされていた！"
+
 	para "@"
 	text_from_ram wStringBuffer2
 	text "を"
@@ -123,6 +124,7 @@ TMHMNotCompatibleText:
 	text_from_ram wStringBuffer2
 	text "は"
 	line "あいしょうが　わるかった！"
+
 	para "@"
 	text_from_ram wStringBuffer2
 	text "は　おぼえられない！"
@@ -349,9 +351,9 @@ TMHolder_DisplayItems:
 	pop hl
 	ld bc, $8
 	add hl, bc
-	ld [hl], "×"
+	ld [hl], '×'
 	inc hl
-	ld a, "０"
+	ld a, '０'
 
 	pop bc
 	push bc
@@ -371,11 +373,11 @@ TMHolder_DisplayItems:
 .cancel
 	call .GetCurrentLineCoord
 ; Write "CANCEL"
-	ld a, "や"
+	ld a, 'や'
 	ld [hli], a
-	ld a, "め"
+	ld a, 'め'
 	ld [hli], a
-	ld [hl], "る"
+	ld [hl], 'る'
 .done
 	ret
 

engine/menu/main_menu.asm

@@ -312,7 +312,7 @@ PrintPlayTime::
 	ld de, hRTCHours
 	lb bc, 1, 3
 	call PrintNumber
-	ld [hl], "："
+	ld [hl], '：'
 	inc hl
 	ld de, hRTCMinutes
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2

engine/menu/menu.asm

@@ -140,7 +140,7 @@ _PushWindow::
 	jr .indefinite_loop
 
 .WindowSaveAreaOverflowText:
-	text "ウィンドウセーブエりアが"
+	text "ウィンドウセーブエリアが"
 	next "オーバーしました"
 	done
 

engine/menu/menu_2.asm

@@ -56,7 +56,7 @@ PlaceMenuItemQuantity::
 	pop hl
 	and a
 	jr nz, .done
-	ld [hl], "×"
+	ld [hl], '×'
 	inc hl
 	ld de, wMenuSelectionQuantity
 	lb bc, 1, 2
@@ -139,9 +139,9 @@ PlaceDetailedBoxMonView::
 	push hl
 
 	callfar GetGender
-	ld a, "♂"
+	ld a, '♂'
 	jr c, .male
-	ld a, "♀"
+	ld a, '♀'
 .male
 	pop hl
 	ld [hl], a
@@ -191,7 +191,7 @@ PlaceMoneyTextbox:
 	ld de, wMoney
 	lb bc, PRINTNUM_RIGHTALIGN | 3, 6
 	call PrintNumber
-	ld [hl], "円"
+	ld [hl], '円'
 	ret
 
 MoneyTopRightMenuHeader:

engine/menu/options_menu.asm

@@ -17,7 +17,7 @@ OptionsMenu::
 	call DisplayOptionsMenu
 .Loop:
 	call GetOptionsMenuCursorPos
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call SetOptionsFromCursorPositions
 	call WaitBGMap
 .wait_joy_loop
@@ -74,7 +74,7 @@ OptionsMenu::
 	and 7
 	ld [wActiveFrame], a
 	hlcoord 17, 16
-	add "１"
+	add '１'
 	ld [hl], a
 	call LoadFontExtra
 	jr .Loop
@@ -82,7 +82,7 @@ OptionsMenu::
 .ClearOldMenuCursor:
 	push af
 	call GetOptionsMenuCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	pop af
 	ld [wOptionsMenuCursorX], a
 	jp .Loop
@@ -162,7 +162,7 @@ OptionsMenu::
 	ld a, [hl]
 	push af
 	call GetOptionsMenuCursorPos
-	ld [hl], "▷"
+	ld [hl], '▷'
 	pop af
 	ld [wOptionsMenuCursorX], a
 	pop af
@@ -205,7 +205,7 @@ OptionsMenu::
 
 .Cursor_BottomRow:
 	call GetOptionsMenuCursorPos
-	ld [hl], "▷"
+	ld [hl], '▷'
 	ld a, [wOptionsMenuCursorX]
 	xor %110 ; 1 <-> 7
 	ld [wOptionsMenuCursorX], a
@@ -326,10 +326,10 @@ DisplayOptionsMenu:
 	ld [wOptionsBottomRowCursorX], a
 ; Cursor in front of "Cancel"
 	hlcoord 1, OPT_BOTTOM_ROW
-	ld [hl], "▷"
+	ld [hl], '▷'
 ; Cursor in front of frame options
 	hlcoord 7, OPT_BOTTOM_ROW
-	ld [hl], "▷"
+	ld [hl], '▷'
 	ld a, [wOptionsTextSpeedCursorX]
 	ld [wOptionsMenuCursorX], a
 	ld a, 3
@@ -343,7 +343,7 @@ DisplayOptionsMenu:
 	ld e, a
 	ld d, 0
 	add hl, de
-	ld [hl], "▷"
+	ld [hl], '▷'
 	ret
 
 .LoadGFX_DrawDisplay
@@ -404,7 +404,7 @@ DisplayOptionsMenu:
 ; Place # of active frame
 	ld a, [wActiveFrame]
 	hlcoord 17, 16
-	add "１"
+	add '１'
 	ld [hl], a
 	ret
 

engine/menu/reset_dialog.asm

@@ -11,5 +11,5 @@ DisplayResetDialog::
 	ret
 
 _ResetConfirmText::
-	text "ほんとにりセットしますか？"
+	text "ほんとにリセットしますか？"
 	done

engine/menu/scrolling_menu.asm

@@ -188,7 +188,7 @@ ScrollingMenu_ClearLeftColumn::
 	ld de, 2 * SCREEN_WIDTH
 	ld a, [wMenuData_ScrollingMenuHeight]
 .loop
-	ld [hl], "　"
+	ld [hl], '　'
 	add hl, de
 	dec a
 	jr nz, .loop
@@ -309,7 +309,7 @@ ScrollingMenu_UpdateDisplay::
 	ld a, [wMenuBorderRightCoord]
 	ld c, a
 	call Coord2Tile
-	ld [hl], "▲"
+	ld [hl], '▲'
 
 .okay
 	call MenuBoxCoord2Tile
@@ -343,7 +343,7 @@ ScrollingMenu_UpdateDisplay::
 	ld a, [wMenuBorderRightCoord]
 	ld c, a
 	call Coord2Tile
-	ld [hl], "▼"
+	ld [hl], '▼'
 	ret
 
 .cancel
@@ -409,7 +409,7 @@ ScrollingMenu_PlaceCursor:
 	add $0
 	ld c, a
 	call Coord2Tile
-	ld [hl], "▷"
+	ld [hl], '▷'
 
 .done
 	ret

engine/menu/set_clock_dialog.asm

@@ -85,7 +85,7 @@ SetClockDialog_PrintUpDownArrows:
 	ret
 
 .clear_arrows
-	ld a, "　"
+	ld a, '　'
 	hlcoord 18, 14
 	ld [hl], a
 	hlcoord 18, 16

engine/menu/set_time.asm

@@ -70,7 +70,7 @@ Textdbaf4:
 .sub_dbb63
 	call Function04ac
 	call Function0502
-	jp Function3036
+	jp TextAsmEnd
 
 Textdbb6c:
 	deciram wStartHour, 1, 2

engine/menu/start_menu.asm

@@ -78,13 +78,13 @@ DisplayStartMenu:
 .Strings:
 	db "ずかん@"
 	db "ポケモン@"
-	db "りュック@"
+	db "リュック@"
 	db "<PLAYER>@"
 	db "レポート@"
 	db "せってい@"
 	db "とじる@"
 	db "わくせん@"
-	db "りセット@"
+	db "リセット@"
 
 StartMenuJumpTable:
 	dw StartMenu_Pokedex
@@ -456,7 +456,7 @@ NondebugBackpackLoop:
 	jr HandleBackpackInput
 
 BackpackHeaderText:
-	db "　　　　　　りュックの　なか　　　　　@"
+	db "　　　　　　リュックの　なか　　　　　@"
 
 HandleBackpackInput:
 	ld a, [wMenuJoypad]
@@ -698,28 +698,24 @@ TryTossItem:
 	ret
 
 .TossedText:
-	db 1
-	dw wStringBuffer2
+	text_from_ram wStringBuffer2
 	text "を　"
 	line "いくつ　すてますか？"
 	done
 
 .TossVerifyText:
-	db 1
-	dw wStringBuffer2
+	text_from_ram wStringBuffer2
 	text "を　@"
-	db 9
-	dw wItemQuantity
-	db $12
+	deciram wItemQuantity, 1, 2
 	text "こ"
 	line "すててもよろしいですか？"
 	done
 
 .TossedTextCopy:
-	db 1
-	dw wStringBuffer1
+	text_from_ram wStringBuffer1
 	text "を"
-	line "すてました！<PROMPT>"
+	line "すてました！"
+	prompt
 
 CantDropItem:
 	ld hl, .CantDropItemText
@@ -728,7 +724,8 @@ CantDropItem:
 
 .CantDropItemText:
 	text "それは　とても　たいせつなモノです"
-	line "すてることは　できません！<PROMPT>"
+	line "すてることは　できません！"
+	prompt
 
 PrintCantUseHM:
 	ld hl, .CantUseHMText
@@ -737,7 +734,8 @@ PrintCantUseHM:
 
 .CantUseHMText:
 	text "かいはつちゅう　です"
-	line "いまは　つかえません<PROMPT>"
+	line "いまは　つかえません"
+	prompt
 
 PrintCantUseText:
 	ld hl, .CantUseHereText
@@ -747,7 +745,8 @@ PrintCantUseText:
 .CantUseHereText:
 	text "オーキドの　ことば<⋯⋯>"
 	line "<PLAYER>よ！　こういうものには"
-	cont "つかいどきが　あるのじゃ！<PROMPT>"
+	cont "つかいどきが　あるのじゃ！"
+	prompt
 
 DrawNoItemsText:
 	ld hl, .NoItemsText
@@ -755,7 +754,9 @@ DrawNoItemsText:
 	ret
 
 .NoItemsText:
-	text "どうぐ　をひとつも<NEXT>もっていません！<PROMPT>"
+	text "どうぐ　をひとつも"
+	next "もっていません！"
+	prompt
 
 BallPocket:
 	xor a
@@ -871,10 +872,10 @@ RegisterItem:
 	ret
 
 .RegisteredItemText:
-	db 1
-	dw wStringBuffer2
+	text_from_ram wStringBuffer2
 	text "を　"
-	line "べんりボタンに　とうろくした！<PROMPT>"
+	line "べんりボタンに　とうろくした！"
+	prompt
 
 PrintCantRegisterToolText:
 	ld hl, .CantRegisterToolText
@@ -883,7 +884,8 @@ PrintCantRegisterToolText:
 
 .CantRegisterToolText:
 	text "そのどうぐは　"
-	line "とうろくできません！<PROMPT>"
+	line "とうろくできません！"
+	prompt
 
 StartMenu_Party:
 	ld a, [wPartyCount]
@@ -1164,6 +1166,7 @@ PokemonAskSwapItemText:
 	text_from_ram wStringBuffer1
 	text "を"
 	line "すでに　そうび　しています"
+
 	para "そうびしている　どうぐを"
 	line "とりかえますか？"
 	done
@@ -1325,17 +1328,18 @@ PartyMailMenu:
 	done
 
 .DrawNick
-	db 1
-	dw wStringBuffer1
+	text_from_ram wStringBuffer1
 	text "から　@"
 
 .DeleteMailText
 	text "メールを"
-	line "はずしました！<PROMPT>"
+	line "はずしました！"
+	prompt
 
 .MailFullText
 	text "どうぐが　いっぱいで"
-	line "メールを　はずせません！<PROMPT>"
+	line "メールを　はずせません！"
+	prompt
 
 PartyPokemonSummary:
 	call LoadStandardMenuHeader
@@ -1425,7 +1429,8 @@ PrintNotHealthyEnoughText:
 	jp HandleSelectedPokemon
 
 NotHealthyEnoughText:
-	text "たいりょくが　たりません！<PROMPT>"
+	text "たいりょくが　たりません！"
+	prompt
 
 PrintNeedNewBadgeText:
 	ld hl, NeedNewBadgeText
@@ -1434,7 +1439,8 @@ PrintNeedNewBadgeText:
 
 NeedNewBadgeText:
 	text "あたらしい　バッジを　てにするまで"
-	line "まだ　つかえません！<PROMPT>"
+	line "まだ　つかえません！"
+	prompt
 
 PartyPokemonSummary2:
 	ld hl, wOptions
@@ -1486,7 +1492,7 @@ PokeSummary:
 	ld a, [wCurPartyMon]
 	and a
 	jr z, .FirstPokeChosen
-	ld [hl], "」"
+	ld [hl], '」'
 .FirstPokeChosen
 	inc a
 	ld b, a
@@ -1495,7 +1501,7 @@ PokeSummary:
 	jr z, .LastPokeChosen
 	inc hl
 	inc hl
-	ld [hl], "▶" ; right filled arrow
+	ld [hl], '▶' ; right filled arrow
 .LastPokeChosen
 	ld de, PartyMenuAttributes
 	call SetMenuAttributes
@@ -1724,7 +1730,8 @@ CheckRegisteredItem:
 
 .NothingRegisteredText:
 	text "べんりボタンを　おした！"
-	line "⋯しかしなにもおきない！<PROMPT>"
+	line "⋯しかしなにもおきない！"
+	prompt
 
 GetRegisteredItemID:
 ; if you can use the registered item, sets the ID to a
@@ -1960,18 +1967,18 @@ TrainerCardMainInputs:
 	ret
 .left
 	hlcoord 4, 16
-	ld [hl], "▶"
+	ld [hl], '▶'
 	hlcoord 11, 16
-	ld [hl], "　"
+	ld [hl], '　'
 	xor a
 	ld [wFlyDestination], a
 	and a
 	ret
 .right
 	hlcoord 4, 16
-	ld [hl], "　"
+	ld [hl], '　'
 	hlcoord 11, 16
-	ld [hl], "▶"
+	ld [hl], '▶'
 	ld a, 1
 	ld [wFlyDestination], a
 	and a
@@ -2129,11 +2136,15 @@ DrawTrainerCardMainPage:
 	ld de, TrainerCardBadgesTextTiles
 	call PlaceTrainerCardTiles
 	hlcoord 4, 16
-	ld [hl], "▶"
+	ld [hl], '▶'
 	ret
 
 TrainerCardText:
-	db "なまえ／<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@"
+	db   "なまえ／"
+	next ""
+	next "おこづかい"
+	next ""
+	next "#ずかん@"
 
 TrainerCardDexEntriesText:
 	db "ひき@"
@@ -2172,7 +2183,7 @@ DrawTrainerCaseBadgePage:
 	ret
 
 TrainerCardLeagueBadgesTextTiles:
-	db "#りーグバッジ@"
+	db "#リーグバッジ@"
 
 TrainerCardBadgesTiles:
 	db $0A, $0B, $0C, $0D, $0E, $FF

engine/menu/text_entry.asm

@@ -2,8 +2,8 @@ INCLUDE "constants.asm"
 
 SECTION "engine/menu/text_entry.asm@naming", ROMX
 
-DEF NAMINGSCREEN_UNDERSCORE EQU "♀"
-DEF NAMINGSCREEN_HYPHEN     EQU "♂"
+DEF NAMINGSCREEN_UNDERSCORE EQU '♀'
+DEF NAMINGSCREEN_HYPHEN     EQU '♂'
 DEF NAMINGSCREEN_END        EQU $F0
 
 NamingScreen:
@@ -211,7 +211,7 @@ NamingScreen_InitText:
 	call WaitForAutoBgMapTransfer
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
-	ld a, "■"
+	ld a, '■'
 	call ByteFill
 	hlcoord 1, 1
 	lb bc, $07, $12
@@ -443,10 +443,10 @@ LetterOffsetsTable2:
 NamingScreenTryAddCharacter:
 	ld a, [wNamingScreenLastCharacter]
 	ld hl, Dakutens
-	cp "ﾞ"
+	cp 'ﾞ'
 	jr z, .jump
 	ld hl, Handakutens
-	cp "ﾟ"
+	cp 'ﾟ'
 	jr z, .jump
 	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
@@ -460,7 +460,7 @@ NamingScreenTryAddCharacter:
 	inc [hl]
 	call NamingScreenGetTextCursorPosition
 	ld a, [hl]
-	cp "@"
+	cp '@'
 	ret z
 	ld [hl], NAMINGSCREEN_UNDERSCORE
 	ret
@@ -500,12 +500,12 @@ Dakutens:
 	db "カガキギクグケゲコゴ"
 	db "サザシジスズセゼソゾ"
 	db "タダチヂツヅテデトド"
-	db "ハバヒビフブへべホボ"
+	db "ハバヒビフブヘベホボ"
 	db $FF
 
 Handakutens:
 	db "はぱひぴふぷへぺほぽ"
-	db "ハパヒピフプへぺホポ"
+	db "ハパヒピフプヘペホポ"
 	db $FF
 
 NamingScreenDeleteCharacter:
@@ -551,7 +551,7 @@ NamingScreenInitNameEntry:
 	ld [hli], a
 	dec c
 	jr nz, .loop
-	ld [hl], "@"
+	ld [hl], '@'
 	ret
 
 NamingScreenStoreEntry:
@@ -568,7 +568,7 @@ NamingScreenStoreEntry:
 	cp NAMINGSCREEN_UNDERSCORE
 	jr nz, .notterminator
 .terminator
-	ld [hl], "@"
+	ld [hl], '@'
 .notterminator
 	inc hl
 	dec c
@@ -758,7 +758,7 @@ ComposeMailMessage:
 	ld d, [hl]
 	ld hl, $0010
 	add hl, de
-	ld [hl], "<NEXT>"
+	ld [hl], '<NEXT>'
 	ret
 
 InitMailText:
@@ -881,7 +881,7 @@ DoMailEntry:
 
 .ajump
 	call NamingScreenGetLastCharacter
-	cp "円"
+	cp '円'
 	jr z, .startjump
 	call NamingScreenTryAddCharacter
 	xor a
@@ -892,9 +892,9 @@ DoMailEntry:
 	ret nz
 	inc [hl]
 	call NamingScreenGetTextCursorPosition
-	ld [hl], "♀"
+	ld [hl], '♀'
 	dec hl
-	ld [hl], "<NEXT>"
+	ld [hl], '<NEXT>'
 	ret
 .bjump
 	call NamingScreenDeleteCharacter
@@ -906,9 +906,9 @@ DoMailEntry:
 	ret nz
 	dec [hl]
 	call NamingScreenGetTextCursorPosition
-	ld [hl], "♀"
+	ld [hl], '♀'
 	inc hl
-	ld [hl], "<NEXT>"
+	ld [hl], '<NEXT>'
 	ret
 .startjump
 	call NamingScreenStoreEntry
@@ -975,7 +975,7 @@ SetupMail:
 	ld d, [hl]
 	ld hl, $0010
 	add hl, de
-	ld [hl], "<NEXT>"
+	ld [hl], '<NEXT>'
 	ret
 
 DrawMailLoadedText:
@@ -993,7 +993,7 @@ DrawMail:
 	call WaitForAutoBgMapTransfer
 	hlcoord 0, 0
 	lb bc, $01, $68
-	ld a, "■"
+	ld a, '■'
 	call ByteFill
 	hlcoord 1, 1
 	lb bc, $07, $12

engine/movie/oak_speech.asm

@@ -384,9 +384,9 @@ OakSpeechDemo::
 
 	para "もちろん"
 	line "きみの　パートナーとなる　ポケモンと"
-	cont "りュックは　ようい　しておる"
+	cont "リュックは　ようい　しておる"
 
-	para "りュックの　なかには"
+	para "リュックの　なかには"
 	line "キズぐすりと"
 	cont "モンスターボールが"
 	cont "はいっておるから　あんしんじゃ！"
@@ -421,7 +421,7 @@ OakSpeech2::
 
 OakSpeech3::
 	text "その　#　という　いきものを"
-	line "ひとは　ぺットに　したり"
+	line "ひとは　ペットに　したり"
 	cont "しょうぶに　つかったり"
 	cont "そして・・・"
 
@@ -497,7 +497,7 @@ ChoosePlayerName::
 	ld de, wPlayerName
 	farcall NamingScreen
 	ld a, [wPlayerName]
-	cp "@"
+	cp '@'
 	jr z, .loop
 
 	call GBFadeOutToWhite
@@ -550,7 +550,7 @@ ChooseRivalName::
 	ld de, wRivalName
 	farcall NamingScreen
 	ld a, [wRivalName]
-	cp "@"
+	cp '@'
 	jr z, .loop
 
 	call GBFadeOutToWhite
@@ -602,7 +602,7 @@ MomNamePrompt::
 	ld de, wMomsName
 	farcall NamingScreen
 	ld a, [wMomsName]
-	cp "@"
+	cp '@'
 	jr z, .loop
 
 	call ClearPalettes

engine/movie/title.asm

@@ -115,7 +115,7 @@ TitleSequenceInit::
 
 	ld hl, vBGMap0
 	ld bc, 128 tiles
-	ld a, "　"
+	ld a, '　'
 	call ByteFill
 
 	ld b, SGB_TITLE_SCREEN
@@ -483,7 +483,7 @@ LoadPrintArea::
 
 PrintPMJapaneseChara::
 	coord hl, 15, 2
-	ld a, "こ"
+	ld a, 'こ'
 	lb bc, 4, 4
 	jr PrintBoxArea
 
@@ -544,8 +544,9 @@ SRAMClearMenu::
 	jp Init
 
 SRAMClear_Message::
-	db "<NULL>すべての　セーブデータエりアを"
-	db "<LINE>クりア　しますか？<DONE>"
+	text "すべての　セーブデータエリアを"
+	line "クリア　しますか？"
+	done
 
 SRAMClear_WinPOS::
 	db 0

engine/pokedex/display_dex_entry.asm

@@ -39,9 +39,9 @@ _DisplayDexEntry:
 	ld de, PokedexText_Pokemon
 	call PlaceString
 	hlcoord 2, 8
-	ld a, "№"
+	ld a, '№'
 	ld [hli], a
-	ld a, "．"
+	ld a, '．'
 	ld [hli], a
 	ld de, wTempSpecies
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
@@ -68,14 +68,14 @@ _DisplayDexEntry:
 	ld a, [de]
 	cp 10
 	jr nc, .less_than_1_meter
-	ld [hl], "０"
+	ld [hl], '０'
 
 .less_than_1_meter
 ; Shift last digit to the right and put decimal point in its place.
 	inc hl
 	ld a, [hli]
 	ld [hld], a
-	ld [hl], "．"
+	ld [hl], '．'
 
 .skip_height
 	inc de
@@ -108,14 +108,14 @@ _DisplayDexEntry:
 	ldh a, [hPokedexTempWeight]
 	sbc 0
 	jr nc, .less_than_1_kilogram
-	ld [hl], "０"
+	ld [hl], '０'
 
 .less_than_1_kilogram
 ; Shift last digit to the right and put decimal point in its place.
 	inc hl
 	ld a, [hli]
 	ld [hld], a
-	ld [hl], "．"
+	ld [hl], '．'
 
 	pop af
 	ldh [hPokedexTempWeight + 1], a

engine/pokedex/pokedex.asm

@@ -845,7 +845,7 @@ Pokedex_PlaceBorder:
 	; Left border
 	ld a, $66
 	ld [hli], a
-	ld a, "　"
+	ld a, '　'
 .fill_middle
 	ld [hli], a
 	dec c

engine/pokedex/pokedex_2.asm

@@ -252,11 +252,11 @@ Pokedex_DisplaySearchOptions:
 	push de
 	ld a, [wDexArrowCursorPosIndex]
 	call Pokedex_GetSearchScreenCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 
 	; Place new cursor
 	hlcoord 13, 12
-	ld [hl], "▶"
+	ld [hl], '▶'
 	xor a
 	ld [wDexArrowCursorPosIndex], a
 	pop de
@@ -315,7 +315,7 @@ Pokedex_DisplayTypeSearch:
 	call Pokedex_PlaceSearchScreenTypeList
 	call Pokedex_PlaceSearchScreenTypeStrings
 	hlcoord 2, 4
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call Pokedex_WaitBGMap
 	ret
 
@@ -447,7 +447,7 @@ Pokedex_MoveSearchMenuCursor:
 	jr z, .set_carry_flag_up
 
 	call Pokedex_GetSearchScreenCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	dec [hl]
 	jr .PutArrow
@@ -462,7 +462,7 @@ Pokedex_MoveSearchMenuCursor:
 	jr nc, .set_carry_flag_down
 
 	call Pokedex_GetSearchScreenCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	inc [hl]
 	jr .PutArrow
@@ -474,7 +474,7 @@ Pokedex_MoveSearchMenuCursor:
 .PutArrow:
 	ld a, [hl]
 	call Pokedex_GetSearchScreenCursorPos
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call Pokedex_WaitBGMap
 	and a
 	ret
@@ -516,7 +516,7 @@ Pokedex_MoveTypeSelectedMenuCursor:
 	ret z
 
 	call Pokedex_GetTypeSelectedMenuCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	dec [hl]
 	jr .PutArrow
@@ -527,14 +527,14 @@ Pokedex_MoveTypeSelectedMenuCursor:
 	ret nc
 
 	call Pokedex_GetTypeSelectedMenuCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	inc [hl]
 
 .PutArrow:
 	ld a, [hl]
 	call Pokedex_GetTypeSelectedMenuCursorPos
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call Pokedex_WaitBGMap
 	and a
 	ret
@@ -796,12 +796,12 @@ Pokedex_InitUnownMode:
 	hlcoord 12, 8
 	call PrintUnownListEntry
 	hlcoord 17, 8
-	ld a, "？"
+	ld a, '？'
 	ld [hli], a
 	ld [hl], a
 	call PrintUnownList
 	hlcoord 2, 4
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call Pokedex_WaitBGMap
 	ret
 
@@ -809,7 +809,8 @@ Pokedex_InitUnownMode:
 	db "アンノーン　の　しゅるい@"
 
 .VariantsDiscoveredString:
-	db "　　しゅるい<NEXT>　はっけん！@"
+	db   "　　しゅるい"
+	next "　はっけん！@"
 
 
 PrintUnownList:
@@ -909,7 +910,7 @@ Pokedex_UnownModeHandleDPadInput:
 	jr z, .top_of_list
 
 	call .GetCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	dec [hl]
 	jr .PlaceArrow
@@ -932,7 +933,7 @@ Pokedex_UnownModeHandleDPadInput:
 	jr nc, .bottom_of_list
 
 	call .GetCursorPos
-	ld [hl], "　"
+	ld [hl], '　'
 	ld hl, wDexArrowCursorPosIndex
 	inc [hl]
 	jr .PlaceArrow
@@ -944,7 +945,7 @@ Pokedex_UnownModeHandleDPadInput:
 .PlaceArrow:
 	ld a, [hl]
 	call Pokedex_GetSearchScreenCursorPos
-	ld [hl], "▶"
+	ld [hl], '▶'
 	call Pokedex_WaitBGMap
 	and a
 	ret

engine/pokemon/bills_pc.asm

@@ -263,11 +263,11 @@ InitDummyBoxNames:
 	push hl
 	ld de, .DummyBoxText
 	call CopyString
-	ld a, "０"
+	ld a, '０'
 	add c
 	dec hl
 	ld [hli], a
-	ld [hl], "@"
+	ld [hl], '@'
 	pop hl
 	ld de, BOX_NAME_LENGTH
 	add hl, de
@@ -428,6 +428,7 @@ BillsPC_ChangeBoxSubmenu:
 .ChangeBoxSaveText:
 	text "#　ボックスを　かえると" ; "When you change a box"
 	line "どうじに　レポートが　かかれます" ; "data will be saved."
+
 	para "<⋯⋯>　それでも　いいですか？" ; "Is that okay?"
 	done
 
@@ -436,7 +437,7 @@ BillsPC_ChangeBoxSubmenu:
 	ld de, wTempBoxName
 	farcall NamingScreen
 	ld a, [wTempBoxName]
-	cp "@"
+	cp '@'
 	ret z
 	ld hl, wBoxNames
 	ld bc, BOX_NAME_LENGTH
@@ -525,9 +526,9 @@ _ViewPKMN:
 	ld de, .CurrentBox
 	call PlaceString
 	hlcoord 0, 3
-	ld a, "┌"
+	ld a, '┌'
 	ld [hli], a
-	ld a, "─"
+	ld a, '─'
 	ld c, SCREEN_WIDTH - 1
 
 .top_border_loop
@@ -535,7 +536,7 @@ _ViewPKMN:
 	dec c
 	jr nz, .top_border_loop
 	ld de, SCREEN_WIDTH
-	ld a, "│"
+	ld a, '│'
 	ld c, 8
 .left_border_loop
 	ld [hl], a
@@ -556,7 +557,7 @@ _ViewPKMN:
 	db "ボックス／いまの　ボックス@" ; "Box/Current Box"
 
 .SpeciesNameLevel:
-	db "しゅるい　　なまえ　　　レべル@" ; "Species Name Level"
+	db "しゅるい　　なまえ　　　レベル@" ; "Species Name Level"
 
 .PCString_ChooseaPKMN:
 	text "どの#が　みたいねん？" ; "Which would you like to see?"

engine/pokemon/correct_nick_errors.asm

@@ -10,7 +10,7 @@ CorrectNickErrors:
 	ld b, MON_NAME_LENGTH
 .checkchar
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr z, .end
 	ld hl, InvalidNicknameChars
 	dec hl
@@ -25,7 +25,7 @@ CorrectNickErrors:
 	jr c, .loop
 	cp [hl]
 	jr nc, .loop
-	ld a, "？"
+	ld a, '？'
 	ld [de], a
 	jr .loop
 
@@ -35,10 +35,10 @@ CorrectNickErrors:
 	jr nz, .checkchar
 	pop de
 	push de
-	ld a, "？"
+	ld a, '？'
 	ld [de], a
 	inc de
-	ld a, "@"
+	ld a, '@'
 	ld [de], a
 .end
 	pop de
@@ -46,9 +46,10 @@ CorrectNickErrors:
 	ret
 
 InvalidNicknameChars:
-	db "<NULL>",   "オ゛" + 1
-	db "<PLAY_G>", "ノ゛" + 1
-	db "<NI>",     "<NO>" + 1
-	db "<ROUTE>",  "<GREEN>" + 1
-	db "<MOM>",    "┘" + 1
+	;      ≥        <
+	db '<NULL>',   'ガ'
+	db 'ド' + 1,    'バ'
+	db 'ボ' + 1,    'が'
+	db 'ど' + 1,    'ば'
+	db '<MOM>',    '　'
 	db -1

engine/pokemon/evolve.asm

@@ -304,7 +304,7 @@ UpdateSpeciesNameIfNotNicknamed:
 	cp [hl]
 	inc hl
 	ret nz
-	cp "@"
+	cp '@'
 	jr nz, .loop
 
 	ld a, [wCurPartyMon]
@@ -335,7 +335,8 @@ CongratulationsYourPokemonText:
 	done
 
 EvolvedIntoText:
-	text "<LINE>@"
+	text_start
+	line "@"
 	text_from_ram wStringBuffer1
 	text "に　しんかした"
 	done

engine/pokemon/health.asm

@@ -311,7 +311,7 @@ UpdateHPBar_PrintHPNumber:
 	ld de, SCREEN_WIDTH + 1
 	add hl, de
 	push hl
-	ld a, "　"
+	ld a, '　'
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a

engine/pokemon/learn.asm

@@ -218,10 +218,12 @@ AskForgetMoveText:
 	line "@"
 	text_from_ram wStringBuffer2
 	text "を　おぼえたい<⋯⋯>！"
+
 	para "しかし　@"
 	text_from_ram wMonOrItemNameBuffer
 	text "は　わざを　４つ"
 	line "おぼえるので　せいいっぱいだ！"
+
 	para "@"
 	text_from_ram wStringBuffer2
 	text "の　かわりに"
@@ -242,13 +244,15 @@ Text_1_2_and_Poof:
 MoveForgotText:
 	text "　ポカン！@"
 	text_exit
-	text ""
+	text_start
+
 	para "@"
 	text_from_ram wMonOrItemNameBuffer
 	text "は　@"
 	text_from_ram wStringBuffer1
 	text "の"
 	line "つかいかたを　きれいに　わすれた！"
+
 	para "そして<⋯⋯>！"
 	prompt
 

engine/pokemon/move_mon.asm

@@ -1020,13 +1020,13 @@ GiveEgg::
 	call AddNTimes
 
 ; Print "EGG" as its name
-	ld a, "た"
+	ld a, 'た'
 	ld [hli], a
-	ld a, "ま"
+	ld a, 'ま'
 	ld [hli], a
-	ld a, "ご"
+	ld a, 'ご'
 	ld [hli], a
-	ld [hl], "@"
+	ld [hl], '@'
 	and a
 	ret
 
@@ -1437,7 +1437,7 @@ GivePoke::
 	farcall NamingScreen
 	pop de
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr nz, .not_empty
 
 	ld hl, wStringBuffer1

engine/pokemon/nickname_unused.asm

@@ -51,7 +51,7 @@ AskName_Old:
 .done
 	pop hl
 	ld a, [hl]
-	cp "@"
+	cp '@'
 	jr nz, .not_terminated ; shouldn't this be the other way around? 'jr z' instead of 'jr nz'?
 .declined_nickname
 	ld d, h
@@ -81,7 +81,7 @@ Unreferenced_DisplayNameRaterScreen:
 	call UpdateTimePals
 	pop de
 	ld a, [de]
-	cp "@"
+	cp '@'
 	jr z, .empty_name
 	ld hl, wPartyMonNicknames
 	ld bc, MON_NAME_LENGTH

engine/unknown_boxes.asm

@@ -23,7 +23,7 @@ Function1130b:
 	add a, $F7
 	ld hl, wStringBuffer2
 	ld [hli], a
-	ld [hl], "@"
+	ld [hl], '@'
 	ld hl, BoxCantHoldText
 	call PrintText
 	scf
@@ -60,7 +60,7 @@ RecievePokemonText:
 	text_from_ram wStringBuffer1
 	text "を　てにいれた！@"
 	sound_dex_fanfare_50_79
-	db "@"
+	text_end
 
 BoxCantHoldText:
 	text "#を　もちきれないので"
@@ -74,8 +74,10 @@ BoxCantHoldText:
 
 BoxFullText:
 	text "#を　もちきれません！"
+
 	para "ボックスも　いっぱいで"
 	line "てんそうできません！"
+
 	para "#センターなどで"
 	line "ボックスを　かえてきて　ください"
 	done

gfx/gfx.mk

@@ -10,8 +10,6 @@ $(BUILD)/gfx/sgb/sgb_border_silver.2bpp: tools/gfx += --trim-whitespace
 
 $(BUILD)/gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
 
-$(BUILD)/gfx/trainer_gear/town_map.2bpp: tools/gfx += --trim-trailing
-
 $(BUILD)/gfx/minigames/slots_1.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/minigames/slots_2.2bpp: tools/gfx += --interleave --png=$<
 $(BUILD)/gfx/minigames/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip

home/copy.asm

@@ -105,6 +105,6 @@ CopyString::
 	ld a, [de]
 	inc de
 	ld [hli], a
-	cp "@"
+	cp '@'
 	jr nz, CopyString
 	ret