diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a525e8..c840a6d 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.rgbds-version b/.rgbds-version index faef31a..3eefcb9 100644 --- a/.rgbds-version +++ b/.rgbds-version @@ -1 +1 @@ -0.7.0 +1.0.0 diff --git a/Makefile b/Makefile index 6fa3447..c841546 100644 --- a/Makefile +++ b/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 diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm old mode 100755 new mode 100644 diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm old mode 100755 new mode 100644 diff --git a/audio/songs/heal.asm b/audio/songs/heal.asm old mode 100755 new mode 100644 diff --git a/audio/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm old mode 100755 new mode 100644 diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm old mode 100755 new mode 100644 diff --git a/audio/songs/none.asm b/audio/songs/none.asm old mode 100755 new mode 100644 diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm old mode 100755 new mode 100644 diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm old mode 100755 new mode 100644 diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm old mode 100755 new mode 100644 diff --git a/audio/songs/title.asm b/audio/songs/title.asm old mode 100755 new mode 100644 diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm old mode 100755 new mode 100644 diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm old mode 100755 new mode 100644 diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm old mode 100755 new mode 100644 diff --git a/constants/charmap.asm b/constants/charmap.asm old mode 100755 new mode 100644 index 2d5c2bc..40b45df --- a/constants/charmap.asm +++ b/constants/charmap.asm @@ -1,9 +1,9 @@ charmap "", $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 "", $14 ; "くん" or "ちゃん" - - 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 "", $1d ; "に　" - charmap "", $1e ; "って" - charmap "", $1f ; "を　" - - charmap "ィ゛", $20 - charmap "あ゛", $21 - - charmap "", $22 ; "た！" - charmap "", $23 ; "こうげき" - charmap "", $24 ; "は　" - charmap "", $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 "", $35 ; "ばん　どうろ" - charmap "", $36 ; "わたし" - charmap "", $37 ; "ここは" + charmap "<な゛>", $35 + charmap "<に゛>", $36 + charmap "<ぬ゛>", $37 + charmap "", $38 ; wRedsName charmap "", $39 ; wGreensName @@ -72,6 +69,7 @@ charmap "び", $3b charmap "ぶ", $3c charmap "べ", $3d + charmap "ベ", $3d ; Katakana, shared graphic tile with Hiragana "べ" charmap "ぼ", $3e charmap "", $3f @@ -84,6 +82,7 @@ charmap "ぴ", $45 charmap "ぷ", $46 charmap "ぺ", $47 + charmap "ペ", $47 ; Katakana, shared graphic tile with Hiragana "ぺ" charmap "ぽ", $48 charmap "", $49 ; wMomsName @@ -91,7 +90,7 @@ charmap "<_CONT>", $4b ; implements "" charmap "", $4c - charmap "も゜", $4d + charmap "<も゜>", $4d charmap "", $4e charmap "", $4f @@ -99,17 +98,17 @@ charmap "", $51 charmap "", $52 ; wPlayerName charmap "", $53 ; wRivalName - charmap "#", $54 ; "POKé" + charmap "#", $54 ; "ポケモン" charmap "", $55 charmap "<⋯⋯>", $56 ; "⋯⋯" charmap "", $57 charmap "", $58 charmap "", $59 charmap "", $5a - charmap "", $5b ; "PC" - charmap "", $5c ; "TM" - charmap "", $5d ; "TRAINER" - charmap "", $5e ; "ROCKET" + charmap "", $5b ; "パソコン" + charmap "", $5c ; "わざマシン" + charmap "", $5d ; "トレーナー" + charmap "", $5e ; "ロケットだん" charmap "", $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 diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm old mode 100755 new mode 100644 diff --git a/constants/music_constants.asm b/constants/music_constants.asm old mode 100755 new mode 100644 diff --git a/constants/name_constants.asm b/constants/name_constants.asm old mode 100755 new mode 100644 diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm old mode 100755 new mode 100644 diff --git a/constants/script_constants.asm b/constants/script_constants.asm old mode 100755 new mode 100644 diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm old mode 100755 new mode 100644 diff --git a/data/debug/field_debug_entries.inc b/data/debug/field_debug_entries.inc index 25f858b..6dc0d38 100644 --- a/data/debug/field_debug_entries.inc +++ b/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 "つぎ▶@" diff --git a/data/items/descriptions.inc b/data/items/descriptions.inc index d2d115d..cda1671 100644 --- a/data/items/descriptions.inc +++ b/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 "？" diff --git a/data/items/names.asm b/data/items/names.asm index b8d6d75..7c9d3e8 100644 --- a/data/items/names.asm +++ b/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 diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index de395c9..14a4389 100644 --- a/data/maps/landmarks.asm +++ b/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 diff --git a/data/moves/descriptions.inc b/data/moves/descriptions.inc index 1697e15..0af7150 100644 --- a/data/moves/descriptions.inc +++ b/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 "コメントさくせいちゅう@" diff --git a/data/moves/names.asm b/data/moves/names.asm index 098e9e3..1cd148f 100644 --- a/data/moves/names.asm +++ b/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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 0f2cd33..6b49f3b 100644 --- a/data/pokemon/dex_entries.asm +++ b/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: diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index e911a32..77e17a7 100644 --- a/data/pokemon/names.asm +++ b/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 diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc old mode 100755 new mode 100644 diff --git a/data/sound_test_text_pointers.inc b/data/sound_test_text_pointers.inc index a2a4e43..b846d65 100644 --- a/data/sound_test_text_pointers.inc +++ b/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 "カジノ@" diff --git a/data/text/text_input_chars.asm b/data/text/text_input_chars.asm index 68cf9c9..b0fc8a1 100644 --- a/data/text/text_input_chars.asm +++ b/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 "　ﾞﾟ　ー？！円" diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 3324314..aafc683 100644 --- a/engine/battle/menu.asm +++ b/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" diff --git a/engine/bcd.asm b/engine/bcd.asm old mode 100755 new mode 100644 diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 75e1484..d8954f5 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -269,7 +269,8 @@ _DebugMenuSoundTest:: .String: deciram hDebugMenuSoundMenuIndex, 1, 1 - text "@" + text_start + line "@" text_from_ram wStartDay text "　" done diff --git a/engine/debug/field/item_test.inc b/engine/debug/field/item_test.inc index f21366e..2f8a20a 100644 --- a/engine/debug/field/item_test.inc +++ b/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 diff --git a/engine/debug/field/minigames.inc b/engine/debug/field/minigames.inc index cdc5b67..c146e70 100644 --- a/engine/debug/field/minigames.inc +++ b/engine/debug/field/minigames.inc @@ -71,7 +71,7 @@ FieldDebug_Minigames: db 3 db "スロットマシン@" db "ポーカーゲーム@" - db "ぺアゲーム@" + db "ペアゲーム@" .MinigamePointers: dba SlotMachineGame diff --git a/engine/debug/field/move_to_entrance.inc b/engine/debug/field/move_to_entrance.inc index 9405e37..8b128be 100644 --- a/engine/debug/field/move_to_entrance.inc +++ b/engine/debug/field/move_to_entrance.inc @@ -21,6 +21,7 @@ FieldDebug_MoveToRoute1Entrance: .CantUseText: text "ここでは　できません" + para "ロード１でじっこうできます" done diff --git a/engine/debug/field/pokemart_menu.inc b/engine/debug/field/pokemart_menu.inc index a8574ba..9b8c84f 100644 --- a/engine/debug/field/pokemart_menu.inc +++ b/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 "" - + next "" + prompt diff --git a/engine/debug/field/teleport.inc b/engine/debug/field/teleport.inc index abce9d2..577e899 100644 --- a/engine/debug/field/teleport.inc +++ b/engine/debug/field/teleport.inc @@ -25,9 +25,12 @@ FieldDebug_Teleport: .MapRegisteredText: text "このばしょを　とうろくしました" - para "" + + para "" + done .CannotRegisterMapText: text "ここは　とうろくできません！" - para "" + para "" + done diff --git a/engine/debug/field/unused_flag_menu.inc b/engine/debug/field/unused_flag_menu.inc index 88037d5..2959beb 100644 --- a/engine/debug/field/unused_flag_menu.inc +++ b/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 diff --git a/engine/debug/field/vram_viewer.inc b/engine/debug/field/vram_viewer.inc index 506cff3..495e09d 100644 --- a/engine/debug/field/vram_viewer.inc +++ b/engine/debug/field/vram_viewer.inc @@ -221,7 +221,7 @@ FieldDebug_DoClearEventFlags: .MenuData: db STATICMENU_CURSOR db 2 - db "フラグを　クりア@" + db "フラグを　クリア@" db "フラグを　うめる@" .CheckMapFlags: diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm old mode 100755 new mode 100644 diff --git a/engine/dumps/bank0d.asm b/engine/dumps/bank0d.asm index 2ee8cf2..754a128 100644 --- a/engine/dumps/bank0d.asm +++ b/engine/dumps/bank0d.asm @@ -773,7 +773,9 @@ StoringEnergyText: prompt UnleashedEnergyText: - text "のがまんが　とかれた！" + text "の" + line "がまんが　とかれた！" + prompt HungOnText: text "は" @@ -1168,7 +1170,8 @@ UsedMoveText_CheckObedience: ret MoveNameText: - text "@" + 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 "は" line "じぶんに　くぎを　うった" + para "は" line "のろいを　かけられた！" prompt @@ -8319,7 +8323,7 @@ BattleCommand_Safeguard: .CoveredByVeilText: text "は" - line "しんぴのべールに　つつまれた！" + line "しんぴのベールに　つつまれた！" prompt .failed @@ -8356,7 +8360,7 @@ BattleCommand_CheckSafeguard: SafeguardProtectText: text "は" - line "しんぴのべールに　まもられている！" + line "しんぴのベールに　まもられている！" prompt BattleCommand_GetMagnitude: diff --git a/engine/dumps/bank0f.asm b/engine/dumps/bank0f.asm index 262ca2c..88f3ab2 100644 --- a/engine/dumps/bank0f.asm +++ b/engine/dumps/bank0f.asm @@ -139,7 +139,7 @@ StartBattle: SafariZonePAText: text "アナウンス『ピンポーン！" - para "サファり　ボールを" + para "サファリ　ボールを" line "ぜんぶ　なげました！" prompt @@ -862,7 +862,7 @@ sub_3c6e0: EndPsychicVeilText: text "を　つつんでいた" - 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 "の　てもとには" line "たたかえる　#が　いない！" + para "は" line "めのまえが　まっくらに　なった！" prompt @@ -2154,7 +2155,8 @@ TrainerAboutToUseText: text_from_ram wOTClassName text "の　@" text_from_ram wStringBuffer1 - text "は" + 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 "のアンコールじょうたいが　とけた！" + text "の" + line "アンコールじょうたいが　とけた！" + prompt asm_3dff2: ldh a, [hBattleTurn] @@ -5332,16 +5336,20 @@ BoostedExpPointsText: text "　おおめに@" .BoostedExpPoints3Text: - text "@" + text_start + line "@" deciram wStringBuffer2, 2, 4 - text "　けいけんちを　もらった！" + text "　けいけんちを　もらった！" + prompt GrewToLevelText: text_from_ram wStringBuffer1 - text "はレべル@" + 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 "！" + text "！" + done RetreatMon: ld hl, PlayerMon2Text @@ -5506,7 +5515,7 @@ PrintComeBackText: ret ComeBackText: - text "" + text_start line "もどれ！" done diff --git a/engine/dumps/bank14.asm b/engine/dumps/bank14.asm index 8beb04e..b9d4817 100644 --- a/engine/dumps/bank14.asm +++ b/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, "" + ld a, '' 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], "" + ld [hl], '' 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 diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm old mode 100755 new mode 100644 index b4dd7ed..4a40fd7 --- a/engine/events/field_moves.asm +++ b/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 diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index f7bdf49..7eaf09f 100644 --- a/engine/events/pokecenter_pc.asm +++ b/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 "は　じぶんのパソコンに" line "つないだ" + para "どうぐあずかりシステムを" line "よびだした！" prompt @@ -223,6 +227,7 @@ _PlayersPC: .ShutDownText: text "は　じぶんのパソコンとの" line "せつぞくをきった" + para "" done diff --git a/engine/games/memory_minigame.asm b/engine/games/memory_minigame.asm index 0b95fbe..a762743 100644 --- a/engine/games/memory_minigame.asm +++ b/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] diff --git a/engine/games/pikachu_minigame.asm b/engine/games/pikachu_minigame.asm index 9ad3044..42bb004 100644 --- a/engine/games/pikachu_minigame.asm +++ b/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 diff --git a/engine/games/slot_machine_game.asm b/engine/games/slot_machine_game.asm index f56896a..4f80ef8 100644 --- a/engine/games/slot_machine_game.asm +++ b/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 diff --git a/engine/gfx/load_gfx.asm b/engine/gfx/load_gfx.asm index c7d21dd..d1ff3df 100644 --- a/engine/gfx/load_gfx.asm +++ b/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 diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm index 147fa46..9925026 100644 --- a/engine/items/buy_sell_toss.asm +++ b/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 diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm old mode 100755 new mode 100644 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm old mode 100755 new mode 100644 index ee0f174..904ae85 --- a/engine/items/item_effects.asm +++ b/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 "は　おぼえられない！" diff --git a/engine/items/tm_holder.asm b/engine/items/tm_holder.asm index 2b982ae..36f0b5c 100644 --- a/engine/items/tm_holder.asm +++ b/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 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 0d4385d..8b26e2b 100644 --- a/engine/menu/main_menu.asm +++ b/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 diff --git a/engine/menu/menu.asm b/engine/menu/menu.asm index 572773b..6b0e9f7 100644 --- a/engine/menu/menu.asm +++ b/engine/menu/menu.asm @@ -140,7 +140,7 @@ _PushWindow:: jr .indefinite_loop .WindowSaveAreaOverflowText: - text "ウィンドウセーブエりアが" + text "ウィンドウセーブエリアが" next "オーバーしました" done diff --git a/engine/menu/menu_2.asm b/engine/menu/menu_2.asm index cbf8c09..ef3495a 100644 --- a/engine/menu/menu_2.asm +++ b/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: diff --git a/engine/menu/options_menu.asm b/engine/menu/options_menu.asm index f5c6f87..6770105 100644 --- a/engine/menu/options_menu.asm +++ b/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 diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm index 8384ee6..17fe12a 100644 --- a/engine/menu/reset_dialog.asm +++ b/engine/menu/reset_dialog.asm @@ -11,5 +11,5 @@ DisplayResetDialog:: ret _ResetConfirmText:: - text "ほんとにりセットしますか？" + text "ほんとにリセットしますか？" done diff --git a/engine/menu/scrolling_menu.asm b/engine/menu/scrolling_menu.asm index 3ca2b8b..aa8512b 100644 --- a/engine/menu/scrolling_menu.asm +++ b/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 diff --git a/engine/menu/set_clock_dialog.asm b/engine/menu/set_clock_dialog.asm index 2ceb42f..876739d 100644 --- a/engine/menu/set_clock_dialog.asm +++ b/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 diff --git a/engine/menu/set_time.asm b/engine/menu/set_time.asm index ab00280..2291550 100644 --- a/engine/menu/set_time.asm +++ b/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 diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 1e6db44..8a32fc4 100644 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -78,13 +78,13 @@ DisplayStartMenu: .Strings: db "ずかん@" db "ポケモン@" - db "りュック@" + db "リュック@" db "@" 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 "すてました！" + line "すてました！" + prompt CantDropItem: ld hl, .CantDropItemText @@ -728,7 +724,8 @@ CantDropItem: .CantDropItemText: text "それは　とても　たいせつなモノです" - line "すてることは　できません！" + line "すてることは　できません！" + prompt PrintCantUseHM: ld hl, .CantUseHMText @@ -737,7 +734,8 @@ PrintCantUseHM: .CantUseHMText: text "かいはつちゅう　です" - line "いまは　つかえません" + line "いまは　つかえません" + prompt PrintCantUseText: ld hl, .CantUseHereText @@ -747,7 +745,8 @@ PrintCantUseText: .CantUseHereText: text "オーキドの　ことば<⋯⋯>" line "よ！　こういうものには" - cont "つかいどきが　あるのじゃ！" + cont "つかいどきが　あるのじゃ！" + prompt DrawNoItemsText: ld hl, .NoItemsText @@ -755,7 +754,9 @@ DrawNoItemsText: ret .NoItemsText: - text "どうぐ　をひとつももっていません！" + text "どうぐ　をひとつも" + next "もっていません！" + prompt BallPocket: xor a @@ -871,10 +872,10 @@ RegisterItem: ret .RegisteredItemText: - db 1 - dw wStringBuffer2 + text_from_ram wStringBuffer2 text "を　" - line "べんりボタンに　とうろくした！" + line "べんりボタンに　とうろくした！" + prompt PrintCantRegisterToolText: ld hl, .CantRegisterToolText @@ -883,7 +884,8 @@ PrintCantRegisterToolText: .CantRegisterToolText: text "そのどうぐは　" - line "とうろくできません！" + 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 "はずしました！" + line "はずしました！" + prompt .MailFullText text "どうぐが　いっぱいで" - line "メールを　はずせません！" + line "メールを　はずせません！" + prompt PartyPokemonSummary: call LoadStandardMenuHeader @@ -1425,7 +1429,8 @@ PrintNotHealthyEnoughText: jp HandleSelectedPokemon NotHealthyEnoughText: - text "たいりょくが　たりません！" + text "たいりょくが　たりません！" + prompt PrintNeedNewBadgeText: ld hl, NeedNewBadgeText @@ -1434,7 +1439,8 @@ PrintNeedNewBadgeText: NeedNewBadgeText: text "あたらしい　バッジを　てにするまで" - line "まだ　つかえません！" + 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 "⋯しかしなにもおきない！" + 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 "なまえ／おこづかい#ずかん@" + db "なまえ／" + next "" + next "おこづかい" + next "" + next "#ずかん@" TrainerCardDexEntriesText: db "ひき@" @@ -2172,7 +2183,7 @@ DrawTrainerCaseBadgePage: ret TrainerCardLeagueBadgesTextTiles: - db "#りーグバッジ@" + db "#リーグバッジ@" TrainerCardBadgesTiles: db $0A, $0B, $0C, $0D, $0E, $FF diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 0c94611..725b540 100644 --- a/engine/menu/text_entry.asm +++ b/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], "" + ld [hl], '' 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], "" + ld [hl], '' ret .bjump call NamingScreenDeleteCharacter @@ -906,9 +906,9 @@ DoMailEntry: ret nz dec [hl] call NamingScreenGetTextCursorPosition - ld [hl], "♀" + ld [hl], '♀' inc hl - ld [hl], "" + ld [hl], '' ret .startjump call NamingScreenStoreEntry @@ -975,7 +975,7 @@ SetupMail: ld d, [hl] ld hl, $0010 add hl, de - ld [hl], "" + ld [hl], '' 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 diff --git a/engine/movie/oak_speech.asm b/engine/movie/oak_speech.asm index c25e621..2f35022 100644 --- a/engine/movie/oak_speech.asm +++ b/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 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 4f1722f..93f06b8 100644 --- a/engine/movie/title.asm +++ b/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 "すべての　セーブデータエりアを" - db "クりア　しますか？" + text "すべての　セーブデータエリアを" + line "クリア　しますか？" + done SRAMClear_WinPOS:: db 0 diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm old mode 100755 new mode 100644 diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm old mode 100755 new mode 100644 diff --git a/engine/pokedex/display_dex_entry.asm b/engine/pokedex/display_dex_entry.asm index 43a3056..430f9eb 100644 --- a/engine/pokedex/display_dex_entry.asm +++ b/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 diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 101961b..b5be545 100644 --- a/engine/pokedex/pokedex.asm +++ b/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 diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 50b93ff..68fe900 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/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 "　　しゅるい　はっけん！@" + 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 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 327957c..bdba435 100644 --- a/engine/pokemon/bills_pc.asm +++ b/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?" diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index 83cf0a6..6328717 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/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 "", "オ゛" + 1 - db "", "ノ゛" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "┘" + 1 + ; ≥ < + db '', 'ガ' + db 'ド' + 1, 'バ' + db 'ボ' + 1, 'が' + db 'ど' + 1, 'ば' + db '', '　' db -1 diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 1c5813e..5c8b779 100644 --- a/engine/pokemon/evolve.asm +++ b/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 "@" + text_start + line "@" text_from_ram wStringBuffer1 text "に　しんかした" done diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm old mode 100755 new mode 100644 index 5354075..9b725b6 --- a/engine/pokemon/health.asm +++ b/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 diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 801a821..419ba3c 100644 --- a/engine/pokemon/learn.asm +++ b/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 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 4b4f5a1..98cacaa 100644 --- a/engine/pokemon/move_mon.asm +++ b/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 diff --git a/engine/pokemon/nickname_unused.asm b/engine/pokemon/nickname_unused.asm index 830cabd..644510d 100644 --- a/engine/pokemon/nickname_unused.asm +++ b/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 diff --git a/engine/smallflag.asm b/engine/smallflag.asm old mode 100755 new mode 100644 diff --git a/engine/unknown_boxes.asm b/engine/unknown_boxes.asm index 8ef5bf3..a07a8e0 100644 --- a/engine/unknown_boxes.asm +++ b/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 diff --git a/gfx/battle_anims/pointer.png b/gfx/battle_anims/pointer.png old mode 100755 new mode 100644 diff --git a/gfx/gfx.mk b/gfx/gfx.mk index 220e550..9c3f302 100644 --- a/gfx/gfx.mk +++ b/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 diff --git a/gfx/tilesets/tileset_00.common.png b/gfx/tilesets/tileset_00.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_01.common.png b/gfx/tilesets/tileset_01.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_02.common.png b/gfx/tilesets/tileset_02.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_03.common.png b/gfx/tilesets/tileset_03.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_04.common.png b/gfx/tilesets/tileset_04.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_05.common.png b/gfx/tilesets/tileset_05.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_06.common.png b/gfx/tilesets/tileset_06.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_07.common.png b/gfx/tilesets/tileset_07.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_08.common.png b/gfx/tilesets/tileset_08.common.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_19.png b/gfx/tilesets/tileset_19.png old mode 100755 new mode 100644 diff --git a/gfx/tilesets/tileset_1a.png b/gfx/tilesets/tileset_1a.png old mode 100755 new mode 100644 diff --git a/gfx/trainer_card/border.png b/gfx/trainer_card/border.png old mode 100755 new mode 100644 diff --git a/gfx/trainer_card/trainer_card.png b/gfx/trainer_card/trainer_card.png old mode 100755 new mode 100644 diff --git a/home/copy.asm b/home/copy.asm index ebce4f3..a1549a5 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -105,6 +105,6 @@ CopyString:: ld a, [de] inc de ld [hli], a - cp "@" + cp '@' jr nz, CopyString ret diff --git a/home/init.asm b/home/init.asm index 5bf2230..ddbc847 100644 --- a/home/init.asm +++ b/home/init.asm @@ -134,7 +134,7 @@ ClearVRAM: ret BlankBGMap: - ld a, "　" + ld a, '　' jr _FillBGMap FillBGMap: diff --git a/home/items.asm b/home/items.asm old mode 100755 new mode 100644 diff --git a/home/joypad.asm b/home/joypad.asm index 5f48f1d..6568b0e 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -234,10 +234,10 @@ BlinkCursor: ldh a, [hVBlankCounter] and $10 jr z, .cursor_off - ld a, "▼" + ld a, '▼' jr .save_cursor_state .cursor_off - ld a, "　" + ld a, '　' .save_cursor_state ldcoord_a (SCREEN_WIDTH - 2), (SCREEN_HEIGHT - 1) ret @@ -255,7 +255,7 @@ TextboxBlinkCursor:: ; to be shown at all. ld a, [hl] ld b, a - ld a, "▼" + ld a, '▼' cp b jr nz, .showCursorCountdown .showTextboxFrameCountdown @@ -267,7 +267,7 @@ TextboxBlinkCursor:: dec a ldh [hTextBoxCursorBlinkInterval + 1], a ret nz - ld a, "─" + ld a, '─' ld [hl], a ld a, $ff ldh [hTextBoxCursorBlinkInterval], a @@ -289,6 +289,6 @@ TextboxBlinkCursor:: ret nz ld a, $06 ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to $6FF iterations - ld a, "▼" + ld a, '▼' ld [hl], a ret diff --git a/home/map.asm b/home/map.asm index 0d39316..725ef73 100644 --- a/home/map.asm +++ b/home/map.asm @@ -393,7 +393,7 @@ LoadMapTimeOfDay:: ldh [hSCY], a ldh [hSCX], a - ld a, "■" + ld a, '■' ld bc, vBGMap1 - vBGMap0 hlbgcoord 0, 0 call ByteFill @@ -1123,7 +1123,7 @@ LoadMapPart:: call Bankswitch call LoadMetatiles - ld a, "■" + ld a, '■' hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill diff --git a/home/menu_window.asm b/home/menu_window.asm index af0b37b..1ac1a89 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -214,7 +214,7 @@ Move2DMenuCursor:: ld h, [hl] ld l, a ld a, [hl] - cp "▶" + cp '▶' jr nz, Place2DMenuCursor ld a, [wCursorOffCharacter] ld [hl], a @@ -258,10 +258,10 @@ Place2DMenuCursor:: ld c, a add hl, bc ld a, [hl] - cp "▶" + cp '▶' jr z, .cursor_on ld [wCursorOffCharacter], a - ld [hl], "▶" + ld [hl], '▶' .cursor_on ld a, l @@ -275,7 +275,7 @@ PlaceHollowCursor:: ld a, [hli] ld h, [hl] ld l, a - ld [hl], "▷" + ld [hl], '▷' ret HideCursor:: @@ -283,7 +283,7 @@ HideCursor:: ld a, [hli] ld h, [hl] ld l, a - ld [hl], "　" + ld [hl], '　' ret PushWindow:: @@ -318,7 +318,7 @@ ExitMenu:: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .copy_loop ld a, [hl] - cp "▲" + cp '▲' jr c, .skip ld [de], a .skip diff --git a/home/names.asm b/home/names.asm index df4be83..f660882 100644 --- a/home/names.asm +++ b/home/names.asm @@ -78,7 +78,7 @@ GetNthString:: ret z push bc ld b, a - ld c, "@" + ld c, '@' .readChar: ld a, [hli] cp c @@ -113,7 +113,7 @@ endr ld bc, MON_NAME_LENGTH - 1 call CopyBytes ld hl, wStringBuffer1 + MON_NAME_LENGTH - 1 - ld [hl], "@" + ld [hl], '@' pop de pop hl pop af @@ -171,7 +171,7 @@ GetMachineName:: ; now get the machine number and convert it to text ld a, [wNamedObjectIndexBuffer] sub ITEM_TM01_RED - 1 - ld b, "０" + ld b, '０' .first_digit sub 10 jr c, .second_digit @@ -184,11 +184,11 @@ GetMachineName:: ld [de], a inc de pop af - ld b, "０" + ld b, '０' add b ld [de], a inc de - ld a, "@" + ld a, '@' ld [de], a pop af ld [wNamedObjectIndexBuffer], a diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 15dbb76..abb0ba7 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -33,7 +33,7 @@ PrintBCDNumber:: jr nz, .skipRightAlignmentAdjustment dec hl ; if the string is right-aligned, it needs .skipRightAlignmentAdjustment ;to be moved back one space - ld [hl], "０" + ld [hl], '０' call PrintLetterDelay inc hl .done @@ -45,7 +45,7 @@ PrintBCDDigit:: jr z, .zeroDigit res 7, b ; unset 7 to indicate that a nonzero .outputDigit ; digit has been reached - add "０" + add '０' ld [hli], a jp PrintLetterDelay .zeroDigit @@ -53,6 +53,6 @@ PrintBCDDigit:: jr z, .outputDigit ; already reached a nonzero digit? bit 6, b ret nz ; left-align, don't pad with space - ld a, "　" + ld a, '　' ld [hli], a ret diff --git a/home/print_num.asm b/home/print_num.asm index b3d8709..dc04d37 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -148,12 +148,12 @@ PrintNumber:: call .PrintLeadingZero jr .PrintLeastSignificantDigit .LeadingNonZero - ld a, "０" + ld a, '０' add c ld [hl], a .PrintLeastSignificantDigit call .AdvancePointer - ld a, "０" + ld a, '０' add b ld [hli], a pop de @@ -221,7 +221,7 @@ PrintNumber:: ldh a, [hPrintNumLeadingDigit] or c jr z, .PrintLeadingZero - ld a, "０" + ld a, '０' add c ld [hl], a ldh [hPrintNumLeadingDigit], a @@ -230,7 +230,7 @@ PrintNumber:: ; prints a leading zero unless they are turned off in the flags bit 7, d ret z - ld [hl], "０" + ld [hl], '０' ret .AdvancePointer: diff --git a/home/tables.asm b/home/tables.asm old mode 100755 new mode 100644 diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm index 3f46d96..d4d3117 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -3,20 +3,20 @@ INCLUDE "constants.asm" SECTION "home/talk_to_npc.asm", ROM0 MapDefaultText:: - ld hl, GameplayText + ld hl, GameFreakText call OpenTextbox ret -GameplayText:: - text "ゲームフりーク！" +GameFreakText:: + text "ゲームフリーク！" done -Function3036:: - ld hl, EmptyText +TextAsmEnd:: + ld hl, .stop ret -EmptyText:: - db "@" +.stop: + text_end CallMapTextSubroutine:: ld a, [wTalkingTargetType] diff --git a/home/text.asm b/home/text.asm index 7b93c14..178a1f1 100644 --- a/home/text.asm +++ b/home/text.asm @@ -4,7 +4,7 @@ SECTION "home/text.asm", ROM0 ClearBox:: ; Fill a c*b box at hl with blank tiles. - ld a, "　" + ld a, '　' ; fallthrough FillBoxWithByte:: @@ -28,7 +28,7 @@ ClearTileMap:: hlcoord 0, 0 ld bc, SCREEN_HEIGHT * SCREEN_WIDTH - ld a, "　" + ld a, '　' call ByteFill ldh a, [rLCDC] bit 7, a @@ -39,7 +39,7 @@ DrawTextBox:: ; Top push hl - ld a, "┌" + ld a, '┌' ld [hli], a inc a ; "─" call .PlaceChars @@ -52,11 +52,11 @@ DrawTextBox:: add hl, de .row push hl - ld a, "│" + ld a, '│' ld [hli], a - ld a, "　" + ld a, '　' call .PlaceChars - ld [hl], "│" + ld [hl], '│' pop hl ld de, SCREEN_WIDTH @@ -65,11 +65,11 @@ DrawTextBox:: jr nz, .row ; Bottom - ld a, "└" + ld a, '└' ld [hli], a - ld a, "─" + ld a, '─' call .PlaceChars - ld [hl], "┘" + ld [hl], '┘' ret @@ -107,7 +107,7 @@ PlaceString:: push hl PlaceNextChar:: ld a, [de] - cp "@" + cp '@' jr nz, CheckDict ld b, h ld c, l @@ -124,7 +124,7 @@ endc jp z, \2 ENDM - cp "" + cp '' jr nz, .asm_0eaa pop hl ld bc, 2 * SCREEN_WIDTH @@ -133,7 +133,7 @@ ENDM jp NextChar .asm_0eaa: - cp "" + cp '' jr nz, .asm_0eb6 pop hl hlcoord 1, 16 @@ -141,30 +141,30 @@ ENDM jp NextChar .asm_0eb6: - dict "", NullChar - dict "", _ContTextNoPause - dict "<_CONT>", _ContText - dict "", Paragraph - dict "", PrintMomsName - dict "", PrintPlayerName - dict "", PrintRivalName - dict "#", PlacePOKe - dict "", PCChar - dict "", RocketChar - dict "", TMChar - dict "", TrainerChar - dict "", ContText - dict "<⋯⋯>", SixDotsChar - dict "", DoneText - dict "", PromptText - dict "", GaCharacter - dict "", PlaceDexEnd - dict "", PlaceMoveTargetsName - dict "", PlaceMoveUsersName + dict '', NullChar + dict '', _ContTextNoPause + dict '<_CONT>', _ContText + dict '', Paragraph + dict '', PrintMomsName + dict '', PrintPlayerName + dict '', PrintRivalName + dict '#', PlacePOKe + dict '', PCChar + dict '', RocketChar + dict '', TMChar + dict '', TrainerChar + dict '', ContText + dict '<⋯⋯>', SixDotsChar + dict '', DoneText + dict '', PromptText + dict '', GaCharacter + dict '', PlaceDexEnd + dict '', PlaceMoveTargetsName + dict '', PlaceMoveUsersName - cp "ﾟ" + cp 'ﾟ' jr z, .diacritic - cp "ﾞ" + cp 'ﾞ' jr nz, .not_diacritic .diacritic: push hl @@ -177,18 +177,18 @@ ENDM .not_diacritic: cp FIRST_REGULAR_TEXT_CHAR jr nc, .place - cp "パ" + cp 'パ' jr nc, .handakuten cp FIRST_HIRAGANA_DAKUTEN_CHAR jr nc, .hiragana_dakuten - add "カ" - "ガ" + add 'カ' - 'ガ' jr .katakana_dakuten .hiragana_dakuten: - add "か" - "が" + add 'か' - 'が' .katakana_dakuten: push af - ld a, "ﾞ" + ld a, 'ﾞ' push hl ld bc, -SCREEN_WIDTH add hl, bc @@ -198,16 +198,16 @@ ENDM jr .place .handakuten: - cp "ぱ" + cp 'ぱ' jr nc, .hiragana_handakuten - add "ハ" - "パ" + add 'ハ' - 'パ' jr .katakana_handakuten .hiragana_handakuten: - add "は" - "ぱ" + add 'は' - 'ぱ' .katakana_handakuten: push af - ld a, "ﾟ" + ld a, 'ﾟ' push hl ld bc, -SCREEN_WIDTH add hl, bc @@ -307,10 +307,10 @@ ContText:: .Text: text "<_CONT>@" - db "@" + text_end PlaceDexEnd:: - ld [hl], "。" + ld [hl], '。' pop hl ret @@ -318,12 +318,12 @@ PromptText:: ld a, [wLinkMode] cp $3 jp z, Function1026 - ld a, "▼" + ld a, '▼' ldcoord_a 18, 17 Function1026:: call ProtectedWaitBGMap call ButtonSound - ld a, "─" + ld a, '─' ldcoord_a 18, 17 DoneText:: pop hl @@ -336,14 +336,14 @@ DoneText:: Paragraph:: push de - ld a, "▼" + ld a, '▼' ldcoord_a 18, 17 call ProtectedWaitBGMap call ButtonSound hlcoord 1, 13 lb bc, 4, 18 call ClearBox - ld a, "─" + ld a, '─' ldcoord_a 18, 17 ld c, 20 call DelayFrames @@ -352,13 +352,13 @@ Paragraph:: jp NextChar _ContText:: - ld a, "▼" + ld a, '▼' ldcoord_a 18, 17 call ProtectedWaitBGMap push de call ButtonSound pop de - ld a, "─" + ld a, '─' ldcoord_a 18, 17 _ContTextNoPause:: push de @@ -383,7 +383,7 @@ ScrollTextUpOneLine:: dec b jr nz, .copyText coord hl, TEXTBOX_INNERX, TEXTBOX_INNERY + 2 - ld a, "　" + ld a, '　' ld b, TEXTBOX_INNERW .clearText ld [hli], a @@ -417,7 +417,7 @@ TextCommandProcessor:: NextTextCommand:: ld a, [hli] - cp "@" ; terminator + cp '@' ; terminator jr nz, .doTextCommand pop af ld [wTextboxFlags], a @@ -539,12 +539,12 @@ Text_WAIT_BUTTON:: ld a, [wLinkMode] cp $03 jp z, Text_TX_LINK_WAIT_BUTTON - ld a, "▼" + ld a, '▼' ldcoord_a TEXTBOX_WIDTH - 2, TEXTBOX_Y + TEXTBOX_HEIGHT - 1 push bc call ButtonSound pop bc - ld a, "─" + ld a, '─' ldcoord_a TEXTBOX_WIDTH - 2, TEXTBOX_Y + TEXTBOX_HEIGHT - 1 pop hl jp NextTextCommand @@ -554,7 +554,7 @@ Text_TX_SCROLL:: ; pushes text up two lines and sets the BC cursor to the border tile ; below the first character column of the text box. ; [07] - ld a, "─" + ld a, '─' ldcoord_a TEXTBOX_WIDTH - 2, TEXTBOX_Y + TEXTBOX_HEIGHT - 1 call ScrollTextUpOneLine call ScrollTextUpOneLine @@ -679,7 +679,7 @@ Text_TX_DOTS: ld h, b ld l, c .loop - ld a, "⋯" + ld a, '⋯' ld [hli], a push de call GetJoypad diff --git a/home/toolgear.asm b/home/toolgear.asm index 38a4c1c..145619d 100644 --- a/home/toolgear.asm +++ b/home/toolgear.asm @@ -70,12 +70,12 @@ InitToolgearBuffer:: call LoadToolgearGraphics bgcoord hl, 0, 0, wToolgearBuffer - ld a, "─" + ld a, '─' ld bc, SCREEN_WIDTH call ByteFill bgcoord hl, 0, 1, wToolgearBuffer - ld a, "　" + ld a, '　' ld bc, SCREEN_WIDTH call ByteFill @@ -106,7 +106,7 @@ UpdateToolgear:: ; This function is called every frame, and loads special tiles into the $66-$7a space. bgcoord hl, 0, 1, wToolgearBuffer ld bc, SCREEN_WIDTH - ld a, "　" + ld a, '　' call ByteFill ld hl, wd153 @@ -132,9 +132,9 @@ UpdateToolgear:: call .printDec ldh a, [hRTCDays] and 7 - add "日" ; Sunday + add '日' ; Sunday ldbgcoord_a 6, 1, wToolgearBuffer - ld a, "⚡" ; power + ld a, '⚡' ; power ldbgcoord_a 9, 1, wToolgearBuffer inc a ; mobile ldbgcoord_a 11, 1, wToolgearBuffer @@ -142,7 +142,7 @@ UpdateToolgear:: and 1 ret z - ld a, "：" + ld a, '：' ldbgcoord_a 2, 1, wToolgearBuffer ret @@ -183,7 +183,7 @@ UpdateToolgear:: ; .printDigit ; print a hexadecimal digit for value in a to de and $f - add "０" + add '０' ld [de], a inc de ret diff --git a/home/vcopy.asm b/home/vcopy.asm index 260c2c4..a26fafb 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -271,7 +271,7 @@ _RedrawFlashlightRow:: _RedrawFlashlightColumnBlack:: ld l, e ld h, d - ld b, "■" + ld b, '■' ld de, BG_MAP_WIDTH ld a, [wRedrawFlashlightWidthHeight] add a @@ -294,7 +294,7 @@ _RedrawFlashlightColumnBlack:: _RedrawFlashlightRowBlack:: ld l, e ld h, d - ld b, "■" + ld b, '■' ld a, [wRedrawFlashlightWidthHeight] ld c, a .loop diff --git a/macros/asserts.asm b/macros/asserts.asm index f0fa52a..738df93 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -1,6 +1,6 @@ ; Macros to verify assumptions about the data or code -MACRO table_width +MACRO? table_width DEF CURRENT_TABLE_WIDTH = \1 if _NARG == 2 REDEF CURRENT_TABLE_START EQUS "\2" @@ -10,13 +10,13 @@ MACRO table_width endc ENDM -MACRO assert_table_length +MACRO? assert_table_length DEF x = \1 assert x * CURRENT_TABLE_WIDTH == @ - {CURRENT_TABLE_START}, \ "{CURRENT_TABLE_START}: expected {d:x} entries, each {d:CURRENT_TABLE_WIDTH} bytes" ENDM -MACRO list_start +MACRO? list_start DEF list_index = 0 if _NARG == 1 REDEF CURRENT_LIST_START EQUS "\1" @@ -26,19 +26,19 @@ MACRO list_start endc ENDM -MACRO li - assert !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1) +MACRO? li + assert STRFIND(\1, "@") == -1, "String terminator \"@\" in list entry: \1" db \1, "@" DEF list_index += 1 ENDM -MACRO assert_list_length +MACRO? assert_list_length DEF x = \1 assert x == list_index, \ "{CURRENT_LIST_START}: expected {d:x} entries, got {d:list_index}" ENDM -MACRO def_grass_wildmons +MACRO? def_grass_wildmons ;\1: map id REDEF CURRENT_GRASS_WILDMONS_MAP EQUS "\1" REDEF CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" @@ -46,12 +46,12 @@ MACRO def_grass_wildmons map_id \1 ENDM -MACRO end_grass_wildmons +MACRO? end_grass_wildmons assert GRASS_WILDDATA_LENGTH == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ "def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes" ENDM -MACRO def_water_wildmons +MACRO? def_water_wildmons ;\1: map id REDEF CURRENT_WATER_WILDMONS_MAP EQUS "\1" REDEF CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" @@ -59,7 +59,7 @@ MACRO def_water_wildmons map_id \1 ENDM -MACRO end_water_wildmons +MACRO? end_water_wildmons assert WATER_WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ "def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes" ENDM diff --git a/macros/audio.asm b/macros/audio.asm old mode 100755 new mode 100644 diff --git a/macros/code.asm b/macros/code.asm index 06fd163..0040629 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -1,14 +1,14 @@ ; Syntactic sugar macros -MACRO lb ; r, hi, lo +MACRO? lb ; r, hi, lo ld \1, (((\2) & $ff) << 8) | (((\3) & $ff)) ENDM -MACRO ln ; r, hi, lo +MACRO? ln ; r, hi, lo ld \1, (((\2) & $f) << 4) | (((\3) & $f)) ENDM -MACRO ldpixel +MACRO? ldpixel if _NARG >= 5 lb \1, \2 * 8 + \4, \3 * 8 + \5 else diff --git a/macros/const.asm b/macros/const.asm index 11818e7..bc452e9 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -1,6 +1,6 @@ ; Enumerate constants -MACRO const_def +MACRO? const_def if _NARG >= 1 DEF const_value = \1 else @@ -13,17 +13,17 @@ MACRO const_def endc ENDM -MACRO const +MACRO? const DEF \1 EQU const_value DEF const_value += const_inc ENDM -MACRO shift_const +MACRO? shift_const DEF \1 EQU (1 << const_value) const \1_F ENDM -MACRO const_skip +MACRO? const_skip if _NARG >= 1 DEF const_value += const_inc * (\1) else @@ -31,7 +31,7 @@ MACRO const_skip endc ENDM -MACRO const_next +MACRO? const_next if (const_value > 0 && \1 < const_value) || (const_value < 0 && \1 > const_value) fail "const_next cannot go backwards from {const_value} to \1" else @@ -39,7 +39,7 @@ MACRO const_next endc ENDM -MACRO rb_skip +MACRO? rb_skip if _NARG == 1 rsset _RS + \1 else diff --git a/macros/coords.asm b/macros/coords.asm index 5acbfad..9c1167a 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -2,7 +2,7 @@ DEF hlcoord EQUS "coord hl," DEF bccoord EQUS "coord bc," DEF decoord EQUS "coord de," -MACRO coord +MACRO? coord ; register, x, y[, origin] if _NARG < 4 ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap @@ -15,7 +15,7 @@ DEF hlbgcoord EQUS "bgcoord hl," DEF bcbgcoord EQUS "bgcoord bc," DEF debgcoord EQUS "bgcoord de," -MACRO bgcoord +MACRO? bgcoord ; register, x, y[, origin] if _NARG < 4 ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0 @@ -24,7 +24,7 @@ MACRO bgcoord endc ENDM -MACRO dwcoord +MACRO? dwcoord ; x, y rept _NARG / 2 dw (\2) * SCREEN_WIDTH + (\1) + wTileMap @@ -33,7 +33,7 @@ rept _NARG / 2 endr ENDM -MACRO ldcoord_a +MACRO? ldcoord_a ; x, y[, origin] if _NARG < 3 ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a @@ -42,7 +42,7 @@ MACRO ldcoord_a endc ENDM -MACRO ldbgcoord_a +MACRO? ldbgcoord_a ; x, y[, origin] if _NARG < 3 ld [(\2) * BG_MAP_WIDTH + (\1) + vBGMap0], a @@ -51,7 +51,7 @@ MACRO ldbgcoord_a endc ENDM -MACRO lda_coord +MACRO? lda_coord ; x, y[, origin] if _NARG < 3 ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap] @@ -60,7 +60,7 @@ MACRO lda_coord endc ENDM -MACRO lda_bgcoord +MACRO? lda_bgcoord ; x, y[, origin] if _NARG < 3 ld a, [(\2) * BG_MAP_WIDTH + (\1) + vBGMap0] diff --git a/macros/data.asm b/macros/data.asm index 66f2713..eb137bc 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -5,39 +5,39 @@ DEF percent EQUS "* $ff / 100" ; Constant data (db, dw, dl) macros -MACRO dwb +MACRO? dwb dw \1 db \2 ENDM -MACRO dbw +MACRO? dbw db \1 dw \2 ENDM -MACRO dbbw +MACRO? dbbw db \1, \2 dw \3 ENDM -MACRO dbww +MACRO? dbww db \1 dw \2, \3 ENDM -MACRO dbwww +MACRO? dbwww db \1 dw \2, \3, \4 ENDM -MACRO dn ; nybbles +MACRO? dn ; nybbles rept _NARG / 2 db ((\1) << 4) | (\2) shift 2 endr ENDM -MACRO nybble_array +MACRO? nybble_array DEF CURRENT_NYBBLE_ARRAY_VALUE = 0 DEF CURRENT_NYBBLE_ARRAY_LENGTH = 0 IF _NARG == 1 @@ -48,7 +48,7 @@ MACRO nybble_array ENDC ENDM -MACRO nybble ; For vertical lists of nybbles +MACRO? nybble ; For vertical lists of nybbles ASSERT 0 <= (\1) && (\1) < $10, "nybbles must be 0-15" DEF CURRENT_NYBBLE_ARRAY_VALUE = (\1) | (CURRENT_NYBBLE_ARRAY_VALUE << 4) DEF CURRENT_NYBBLE_ARRAY_LENGTH += 1 @@ -58,7 +58,7 @@ MACRO nybble ; For vertical lists of nybbles ENDC ENDM -MACRO end_nybble_array +MACRO? end_nybble_array IF CURRENT_NYBBLE_ARRAY_LENGTH % 2 db CURRENT_NYBBLE_ARRAY_VALUE << 4 ENDC @@ -72,14 +72,14 @@ MACRO end_nybble_array ENDC ENDM -MACRO dc ; "crumbs" +MACRO? dc ; "crumbs" rept _NARG / 4 db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) shift 4 endr ENDM -MACRO dx +MACRO? dx DEF x = 8 * ((\1) - 1) rept \1 db LOW((\2) >> x) @@ -87,43 +87,43 @@ DEF x = x - 8 endr ENDM -MACRO dt ; three-byte (big-endian) +MACRO? dt ; three-byte (big-endian) dx 3, \1 ENDM -MACRO dd ; four-byte (big-endian) +MACRO? dd ; four-byte (big-endian) dx 4, \1 ENDM -MACRO littledt ; three-byte (little-endian) +MACRO? littledt ; three-byte (little-endian) db low(\1), high(\1), low((\1) >> 16) ENDM -MACRO bigdw ; big-endian word +MACRO? bigdw ; big-endian word dx 2, \1 ENDM -MACRO dba ; dbw bank, address +MACRO? dba ; dbw bank, address rept _NARG dbw BANK(\1), \1 shift endr ENDM -MACRO dab ; dwb address, bank +MACRO? dab ; dwb address, bank rept _NARG dwb \1, BANK(\1) shift endr ENDM -MACRO dba_pic ; dbw bank, address +MACRO? dba_pic ; dbw bank, address db BANK(\1) - PICS_FIX dw \1 ENDM -MACRO dbpixel +MACRO? dbpixel if _NARG >= 4 ; x tile, x pxl, y tile, y pxl db \1 * 8 + \3, \2 * 8 + \4 @@ -133,20 +133,20 @@ else endc ENDM -MACRO dsprite +MACRO? dsprite ; y tile, y pxl, x tile, x pxl, vtile offset, flags, attributes db LOW(\1 * 8) + \2, LOW(\3 * 8) + \4, \5, \6 ENDM -MACRO menu_coords +MACRO? menu_coords ; x1, y1, x2, y2 db \2, \1 ; start coords db \4, \3 ; end coords ENDM -MACRO bcd +MACRO? bcd rept _NARG dn LOW(\1) / 10, (\1) % 10 shift @@ -154,7 +154,7 @@ endr ENDM -MACRO sine_table +MACRO? sine_table ; \1 samples of sin(x) from x=0 to x<32768 (pi radians) DEF x = 0 rept \1 diff --git a/macros/gfx.asm b/macros/gfx.asm index 91a754d..4a17df2 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -1,4 +1,4 @@ -MACRO RGB +MACRO? RGB rept _NARG / 3 dw palred (\1) + palgreen (\2) + palblue (\3) shift 3 @@ -16,7 +16,7 @@ DEF color EQUS "+ PAL_COLOR_SIZE *" DEF tiles EQUS "* LEN_2BPP_TILE" DEF tile EQUS "+ LEN_2BPP_TILE *" -MACRO dbsprite +MACRO? dbsprite ; x tile, y tile, x pixel, y pixel, vtile offset, attributes db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 ENDM \ No newline at end of file diff --git a/macros/maps.asm b/macros/maps.asm index a65763f..1cd836b 100644 --- a/macros/maps.asm +++ b/macros/maps.asm @@ -39,7 +39,7 @@ DEF _src = -_tgt DEF _tgt = 0 endc -if !STRCMP("\1", "north") +if "\1" === "north" DEF _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src DEF _map = _tgt DEF _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 @@ -50,7 +50,7 @@ if _len > \3_WIDTH DEF _len = \3_WIDTH endc -elif !STRCMP("\1", "south") +elif "\1" === "south" DEF _blk = _src DEF _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt DEF _win = \3_WIDTH + 7 @@ -61,7 +61,7 @@ if _len > \3_WIDTH DEF _len = \3_WIDTH endc -elif !STRCMP("\1", "west") +elif "\1" === "west" DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - 3 DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt DEF _win = (\3_WIDTH + 6) * 2 - 6 @@ -72,7 +72,7 @@ if _len > \3_HEIGHT DEF _len = \3_HEIGHT endc -elif !STRCMP("\1", "east") +elif "\1" === "east" DEF _blk = (\3_WIDTH * _src) DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 DEF _win = \3_WIDTH + 7 diff --git a/macros/queue.asm b/macros/queue.asm old mode 100755 new mode 100644 diff --git a/macros/scripts.asm b/macros/scripts.asm old mode 100755 new mode 100644 diff --git a/macros/text.asm b/macros/text.asm index 4a00202..a47b03e 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -1,13 +1,38 @@ -DEF text EQUS "db $00," ; Start writing text. -DEF next EQUS "db \"\"," ; Move a line down. -DEF line EQUS "db \"\"," ; Start writing at the bottom line. -DEF para EQUS "db \"\"," ; Start a new paragraph. -DEF cont EQUS "db \"\"," ; Scroll to the next line. -DEF done EQUS "db \"\"" ; End a text box. -DEF prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating some other event). +MACRO text + db TX_START, \# ; Start writing text +ENDM + +MACRO next + db "", \# ; Move a line down +ENDM + +MACRO line + db "", \# ; Start writing at the bottom line +ENDM + +MACRO para + db "", \# ; Start a new paragraph +ENDM + +MACRO cont + db "", \# ; Scroll to the next line +ENDM + +MACRO done + db "" ; End a text box +ENDM + +MACRO prompt + db "" ; Prompt the player to end a text box (initiating some other event) +ENDM ; TextCommands indexes (see home/text.asm) - const_def 1 + const_def + + const TX_START ; $00 +MACRO text_start + db TX_START +ENDM const TX_RAM ; $01 MACRO text_from_ram diff --git a/macros/wram.asm b/macros/wram.asm index dee9b28..bd417cf 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -1,4 +1,4 @@ -MACRO flag_array +MACRO? flag_array ds ((\1) + 7) / 8 ENDM diff --git a/rgbdscheck.asm b/rgbdscheck.asm index 1d37444..77ae6e9 100644 --- a/rgbdscheck.asm +++ b/rgbdscheck.asm @@ -1,6 +1,6 @@ -IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) - fail "pokecrystal requires rgbds v0.7.0 or newer." +IF !DEF(__RGBDS_MAJOR__) + fail "pokegold-spaceworld requires rgbds v1.0.0 or newer." ENDC -IF __RGBDS_MAJOR__ == 0 && __RGBDS_MINOR__ < 7 - fail "pokecrystal requires rgbds v0.7.0 or newer." +IF __RGBDS_MAJOR__ < 1 + fail "pokegold-spaceworld requires rgbds v1.0.0 or newer." ENDC diff --git a/scripts/CaveMinecarts1.asm b/scripts/CaveMinecarts1.asm index 38bceb4..12f809a 100644 --- a/scripts/CaveMinecarts1.asm +++ b/scripts/CaveMinecarts1.asm @@ -6,12 +6,12 @@ CaveMinecarts1_ScriptLoader:: ret CaveMinecarts1_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts2.asm b/scripts/CaveMinecarts2.asm index dde0184..22626aa 100644 --- a/scripts/CaveMinecarts2.asm +++ b/scripts/CaveMinecarts2.asm @@ -6,12 +6,12 @@ CaveMinecarts2_ScriptLoader:: ret CaveMinecarts2_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts3.asm b/scripts/CaveMinecarts3.asm index 34a9275..33f8b0a 100644 --- a/scripts/CaveMinecarts3.asm +++ b/scripts/CaveMinecarts3.asm @@ -6,12 +6,12 @@ CaveMinecarts3_ScriptLoader:: ret CaveMinecarts3_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts4.asm b/scripts/CaveMinecarts4.asm index 69ea826..3c0029b 100644 --- a/scripts/CaveMinecarts4.asm +++ b/scripts/CaveMinecarts4.asm @@ -6,12 +6,12 @@ CaveMinecarts4_ScriptLoader:: ret CaveMinecarts4_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts5.asm b/scripts/CaveMinecarts5.asm index 2385564..dc78e0f 100644 --- a/scripts/CaveMinecarts5.asm +++ b/scripts/CaveMinecarts5.asm @@ -6,12 +6,12 @@ CaveMinecarts5_ScriptLoader:: ret CaveMinecarts5_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts6.asm b/scripts/CaveMinecarts6.asm index 3375150..24a1858 100644 --- a/scripts/CaveMinecarts6.asm +++ b/scripts/CaveMinecarts6.asm @@ -6,12 +6,12 @@ CaveMinecarts6_ScriptLoader:: ret CaveMinecarts6_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/CaveMinecarts7.asm b/scripts/CaveMinecarts7.asm index a871188..562f030 100644 --- a/scripts/CaveMinecarts7.asm +++ b/scripts/CaveMinecarts7.asm @@ -6,12 +6,12 @@ CaveMinecarts7_ScriptLoader:: ret CaveMinecarts7_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/Office1.asm b/scripts/Office1.asm index dc5f819..6ee9b11 100644 --- a/scripts/Office1.asm +++ b/scripts/Office1.asm @@ -6,12 +6,12 @@ Office1_ScriptLoader:: ret Office1_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/Office2.asm b/scripts/Office2.asm index ee2e603..712829c 100644 --- a/scripts/Office2.asm +++ b/scripts/Office2.asm @@ -6,12 +6,12 @@ Office2_ScriptLoader:: ret Office2_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/Office3.asm b/scripts/Office3.asm index c530eea..48fb2f1 100644 --- a/scripts/Office3.asm +++ b/scripts/Office3.asm @@ -6,12 +6,12 @@ Office3_ScriptLoader:: ret Office3_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/OldCityPokecenter1F.asm b/scripts/OldCityPokecenter1F.asm index c41f40e..56cf076 100644 --- a/scripts/OldCityPokecenter1F.asm +++ b/scripts/OldCityPokecenter1F.asm @@ -6,12 +6,12 @@ OldCityPokecenter1F_ScriptLoader:: ret OldCityPokecenter1F_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/OldCityPokecenterBattle.asm b/scripts/OldCityPokecenterBattle.asm index e7762b2..af35421 100644 --- a/scripts/OldCityPokecenterBattle.asm +++ b/scripts/OldCityPokecenterBattle.asm @@ -40,4 +40,4 @@ OldCityPokecenterBattleText1: OldCityPokecenterBattleTextString1: text "ちょっとまってね！@" text_exit - db "@" + text_end diff --git a/scripts/OldCityPokecenterTrade.asm b/scripts/OldCityPokecenterTrade.asm index 7167c79..0576192 100644 --- a/scripts/OldCityPokecenterTrade.asm +++ b/scripts/OldCityPokecenterTrade.asm @@ -42,4 +42,4 @@ OldCityPokecenterTradeTextString1: text_exit text_exit text_exit - db "@" + text_end diff --git a/scripts/PlayerHouse2F.asm b/scripts/PlayerHouse2F.asm index 17d3095..a529270 100644 --- a/scripts/PlayerHouse2F.asm +++ b/scripts/PlayerHouse2F.asm @@ -171,7 +171,7 @@ PlayerHouse2FTextString2: done PlayerHouse2FTextString3: - text "クりスマスに　カントーの" + text "クリスマスに　カントーの" line "しんせきに　プレゼント" cont "してもらった　にんぎょうだ" done @@ -193,7 +193,7 @@ PlayerHouse2FTextString5: start_asm call PlayerHouse2FCheckEmail - call Function3036 + call TextAsmEnd ret PlayerHouse2FTextString6: @@ -226,7 +226,7 @@ PlayerHouse2FTextString8: ; (unused?) para "もうしこみさきは⋯⋯" line "⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯" - cont "シルフの　ホームぺージだ" + cont "シルフの　ホームページだ" done PlayerHouse2FTextString9: diff --git a/scripts/PowerPlant1.asm b/scripts/PowerPlant1.asm index e441439..51552b7 100644 --- a/scripts/PowerPlant1.asm +++ b/scripts/PowerPlant1.asm @@ -6,12 +6,12 @@ PowerPlant1_ScriptLoader:: ret PowerPlant1_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/PowerPlant2.asm b/scripts/PowerPlant2.asm index 55633e1..3713954 100644 --- a/scripts/PowerPlant2.asm +++ b/scripts/PowerPlant2.asm @@ -6,12 +6,12 @@ PowerPlant2_ScriptLoader:: ret PowerPlant2_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/PowerPlant3.asm b/scripts/PowerPlant3.asm index 513647c..a6146a1 100644 --- a/scripts/PowerPlant3.asm +++ b/scripts/PowerPlant3.asm @@ -6,12 +6,12 @@ PowerPlant3_ScriptLoader:: ret PowerPlant3_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/PowerPlant4.asm b/scripts/PowerPlant4.asm index aa9610b..74ce18a 100644 --- a/scripts/PowerPlant4.asm +++ b/scripts/PowerPlant4.asm @@ -6,12 +6,12 @@ PowerPlant4_ScriptLoader:: ret PowerPlant4_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/RuinsOfAlphEntrance.asm b/scripts/RuinsOfAlphEntrance.asm index be72bcf..4f4a876 100644 --- a/scripts/RuinsOfAlphEntrance.asm +++ b/scripts/RuinsOfAlphEntrance.asm @@ -6,12 +6,12 @@ RuinsOfAlphEntrance_ScriptLoader:: ret RuinsOfAlphEntrance_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/RuinsOfAlphMain.asm b/scripts/RuinsOfAlphMain.asm index 5cd8a21..dfb923f 100644 --- a/scripts/RuinsOfAlphMain.asm +++ b/scripts/RuinsOfAlphMain.asm @@ -6,12 +6,12 @@ RuinsOfAlphMain_ScriptLoader:: ret RuinsOfAlphMain_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/ShizukanaOka.asm b/scripts/ShizukanaOka.asm index 1798242..09db6c0 100644 --- a/scripts/ShizukanaOka.asm +++ b/scripts/ShizukanaOka.asm @@ -151,6 +151,7 @@ ShizukanaOkaSignpost1: ShizukanaOkaTrainer6EncounterString: text "ねえ　ねえ　みてよ" + para "これ　ぜったい" line "しんしゅの　ポケモン　だよ！" done @@ -189,6 +190,7 @@ ShizukanaOkaTrainer4EncounterString: ShizukanaOkaTrainer4WonString: text "よるになると　くらくなるから" line "こどもは　はやく　かえりなさい！" + para "おれ？" line "おれは　ひをふくから　だいじょうぶ" done @@ -204,6 +206,7 @@ ShizukanaOkaTrainer3EncounterString: ShizukanaOkaTrainer3WonString: text "ポケモンずかんを　つくるんだって？" line "ちょっと　みせてよ" + para "へー" line "タイプべつに　ポケモン　さがせるんだ" done @@ -227,6 +230,7 @@ ShizukanaOkaText1String: text "この　おかの　ポケモンは　よわい！" line "だから　ここで　しゅぎょう　している" cont "トレーナーも　おおいよ" + para "みんな　バトルが　すきだから" line "うでだめしを　するといい" done diff --git a/scripts/SilentHill.asm b/scripts/SilentHill.asm index 23a3e36..5148ec3 100644 --- a/scripts/SilentHill.asm +++ b/scripts/SilentHill.asm @@ -396,16 +396,14 @@ SilentHillTextRival1: cont "じぶんの　ははおや　のこと" cont "いつも　なんて　よんでる？@" - db $08 - -LoadMomNamePromptUnused: + start_asm call LoadStandardMenuHeader callfar MomNamePrompt call CloseWindow call GetMemSGBLayout call UpdateSprites call UpdateTimePals - jp Function3036 + jp TextAsmEnd MomNameMenuHeaderUnused: db MENU_BACKUP_TILES ; flags @@ -426,7 +424,7 @@ SilentHillTextRival2: ; BYTE OFF line "そんな　こどもっぽい" cont "よびかた　してるなんて" cont "おわらいだぜ！" - cont"あー　ちょっとだけ　すっきりした！" + cont "あー　ちょっとだけ　すっきりした！" para "そんじゃあ" line "おれは　ひとあし　おさきに" @@ -460,7 +458,7 @@ SilentHillTextBackpack: ret SilentHillTextBackpackString: - text "あなたの　りュック　かっこいいわよ" + text "あなたの　リュック　かっこいいわよ" line "どこで　てに　いれたの？" done diff --git a/scripts/SilentHillHouse.asm b/scripts/SilentHillHouse.asm index 952f879..09e18ac 100644 --- a/scripts/SilentHillHouse.asm +++ b/scripts/SilentHillHouse.asm @@ -69,21 +69,20 @@ SilentHillHouseTextString1: text "おや？　あてに　メールが" line "とどいている　ようだ" cont "よんでみる？@" - db $08 -SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?) + start_asm call YesNoBox jr c, .jump ld hl, wd41a set 6, [hl] ld hl, SilentHillHouseTextString2 call PrintText - call Function3036 + call TextAsmEnd ret .jump ld hl, SilentHillHouseTextString3 call PrintText - call Function3036 + call TextAsmEnd ret SilentHillHouseTextString2: diff --git a/scripts/SilentHillLabBack.asm b/scripts/SilentHillLabBack.asm index e7680c5..55d0a04 100644 --- a/scripts/SilentHillLabBack.asm +++ b/scripts/SilentHillLabBack.asm @@ -184,31 +184,34 @@ SilentHillLabBackTextString3: SilentHillLabBackTextString4: text "オーキド『ほう！　ほのおのポケモン" line "@" - ld bc, wStringBuffer1 + text_from_ram wStringBuffer1 text "に　するんじゃな？@" - db 08 + + start_asm call ConfirmPokemonSelection - call Function3036 + call TextAsmEnd ret SilentHillLabBackTextString5: text "オーキド『ふむ　みずのポケモン" line "@" - ld bc, wStringBuffer1 + text_from_ram wStringBuffer1 text "に　きめるのじゃな？@" - db 08 + + start_asm call ConfirmPokemonSelection - call Function3036 + call TextAsmEnd ret SilentHillLabBackTextString6: text "オーキド『おお！　くさのポケモン" line "@" - ld bc, wStringBuffer1 + text_from_ram wStringBuffer1 text "が　いいんじゃな？@" - db 08 + + start_asm call ConfirmPokemonSelection - call Function3036 + call TextAsmEnd ret ConfirmPokemonSelection: @@ -252,8 +255,9 @@ SilentHillLabBackTextString8: para "は　オーキドはかせから" line "@" - ld bc, wStringBuffer1 - text "を　もらった！" + text_from_ram wStringBuffer1 + text "を　もらった！" + prompt SilentHillLabBackTextString9: text "オーキド『そうじゃ！" @@ -290,7 +294,7 @@ SilentHillLabBackTextString12: SilentHillLabBackTextString13: text "は　オーキドから" line "@" - ld bc, wStringBuffer1 + text_from_ram wStringBuffer1 text "を　もらった！" done diff --git a/scripts/SilentHillLabFront.asm b/scripts/SilentHillLabFront.asm index c82ab68..f9fb95f 100644 --- a/scripts/SilentHillLabFront.asm +++ b/scripts/SilentHillLabFront.asm @@ -737,15 +737,14 @@ SilentHillLabFrontTextString5: para "すこし　わしの　はなしを" line "きいては　くれんか？@" - db $08 -SilentHillLabFrontText6: + start_asm call YesNoBox jr c, .jump .loop ld hl, SilentHillLabFrontTextString6A call PrintText - call Function3036 + call TextAsmEnd ret .jump @@ -879,7 +878,7 @@ SilentHillLabFrontTextString11B: cont "これからも　ときどきは" cont "わしのところへ　かおを　だせ！" - para "#ずかんの　ぺージが" + para "#ずかんの　ページが" line "きに　なるからな" done @@ -996,7 +995,7 @@ SilentHillLabFrontTextString21: para "みつけた　#の　データが" line "じどうてきに　かきこまれて" - cont "ぺージが　ふえて　いく　という" + cont "ページが　ふえて　いく　という" cont "とても　ハイテクな　ずかん　だよ！" done @@ -1037,12 +1036,12 @@ SilentHillLabFrontTextString23: line "わすれている　みたいだから" para "わたしが　かわりに　これを　あげる！" - line "さいしんがた　#りュックよ" + line "さいしんがた　#リュックよ" para "は" - line "#りュックを　もらった！" + line "#リュックを　もらった！" - para "ナナミ『この　りュックには" + para "ナナミ『この　リュックには" line "モンスターボールを" cont "まとめて　いれられる" cont "ボールホルダと" diff --git a/scripts/SilentHillPokecenter.asm b/scripts/SilentHillPokecenter.asm index 449a294..649af13 100644 --- a/scripts/SilentHillPokecenter.asm +++ b/scripts/SilentHillPokecenter.asm @@ -96,7 +96,7 @@ SilentHillPokecenterNPCText4: ret SilentHillPokecenterTextString5: - text "こいつ　へルガー" + text "こいつ　ヘルガー" line "いままでにない　タイプの　ポケモンさ" done @@ -106,5 +106,5 @@ SilentHillPokecenterNPCText5: ret SilentHillPokecenterTextString6: - text "へルガー『ぐるるうー" + text "ヘルガー『ぐるるうー" done diff --git a/scripts/SlowpokeWellEntrance.asm b/scripts/SlowpokeWellEntrance.asm index 1652dd4..451c720 100644 --- a/scripts/SlowpokeWellEntrance.asm +++ b/scripts/SlowpokeWellEntrance.asm @@ -6,12 +6,12 @@ SlowpokeWellEntrance_ScriptLoader:: ret SlowpokeWellEntrance_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/SlowpokeWellMain.asm b/scripts/SlowpokeWellMain.asm index 90d6da1..e6c1eb9 100644 --- a/scripts/SlowpokeWellMain.asm +++ b/scripts/SlowpokeWellMain.asm @@ -6,12 +6,12 @@ SlowpokeWellMain_ScriptLoader:: ret SlowpokeWellMain_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/scripts/dummy_text_pointers.asm b/scripts/dummy_text_pointers.asm index 9955f70..2a274c2 100644 --- a/scripts/dummy_text_pointers.asm +++ b/scripts/dummy_text_pointers.asm @@ -39,13 +39,13 @@ PrinceRoute_TextPointers:: MtFujiRoute_TextPointers:: FontoRoute5_TextPointers:: BullForestRoute3_TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText + dw GameFreakText diff --git a/slack/slack.asm b/slack/slack.asm old mode 100755 new mode 100644 diff --git a/tools/common.h b/tools/common.h old mode 100755 new mode 100644 diff --git a/tools/gfx.c b/tools/gfx.c old mode 100755 new mode 100644 index dd2b5bd..c8f0b03 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -5,7 +5,6 @@ struct Options { bool trim_whitespace; - bool trim_trailing; bool remove_whitespace; bool interleave; bool remove_duplicates; @@ -25,7 +24,6 @@ void parse_args(int argc, char *argv[]) { struct option long_options[] = { {"remove-whitespace", no_argument, 0, 'R'}, {"trim-whitespace", no_argument, 0, 'T'}, - {"trim-trailing", no_argument, 0, 't'}, {"interleave", no_argument, 0, 'I'}, {"remove-duplicates", no_argument, 0, 'D'}, {"keep-whitespace", no_argument, 0, 'W'}, @@ -46,9 +44,6 @@ void parse_args(int argc, char *argv[]) { case 'T': options.trim_whitespace = true; break; - case 't': - options.trim_trailing = true; - break; case 'I': options.interleave = true; break; @@ -119,27 +114,6 @@ bool is_whitespace(const uint8_t *tile, int tile_size) { return true; } -/** - * is_solid_color - * Check if a tile is solid color, i.e. each - * bitplane is filled with the same value. - * Different bitplanes can have different values. - * - * Returns true if solid color, else false. - */ -bool is_solid_color(uint8_t *tile, int depth, int tile_size) { - - const uint8_t ONES = 0xff; - const uint8_t ZEROS = 0x00; - - for (int i = 0; i < depth; i++) { - if (tile[i] != ONES && tile[i] != ZEROS) { - return false; - } - } - return !memcmp(&tile[0], &tile[depth], tile_size - depth); -} - void trim_whitespace(struct Graphic *graphic) { int tile_size = options.depth * 8; for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { @@ -151,21 +125,6 @@ void trim_whitespace(struct Graphic *graphic) { } } -void trim_trailing(struct Graphic *graphic) { - int tile_size = options.depth * 8; - int last_tile = graphic->size - tile_size; - if (!is_solid_color(&graphic->data[last_tile], options.depth, tile_size)) { - return; - } - for (int i = graphic->size - 2 * tile_size; i > 0; i -= tile_size) { - if (!memcmp(&graphic->data[i], &graphic->data[last_tile], tile_size)) { - graphic->size = i; - } else { - break; - } - } -} - int get_tile_size(void) { return options.depth * (options.interleave ? 16 : 8); } @@ -309,8 +268,6 @@ int main(int argc, char *argv[]) { if (options.trim_whitespace) { trim_whitespace(&graphic); - } else if (options.trim_trailing) { - trim_trailing(&graphic); } if (options.interleave) { if (!options.png_file) { diff --git a/utils/dump_names.py b/utils/dump_names.py old mode 100644 new mode 100755 diff --git a/utils/dump_text.py b/utils/dump_text.py old mode 100644 new mode 100755 diff --git a/utils/map2link.py b/utils/map2link.py old mode 100644 new mode 100755 diff --git a/utils/mask.py b/utils/mask.py old mode 100644 new mode 100755 diff --git a/utils/pokemontools/gfx.py b/utils/pokemontools/gfx.py old mode 100644 new mode 100755 diff --git a/utils/pokemontools/png.py b/utils/pokemontools/png.py old mode 100644 new mode 100755 diff --git a/utils/read_charmap.py b/utils/read_charmap.py old mode 100644 new mode 100755