diff --git a/constants/charmap.asm b/constants/charmap.asm index 2d5c2bc..40b45df 100755 --- 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/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/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/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 51f5667..018bbc4 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/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 344cafe..9b8c84f 100644 --- a/engine/debug/field/pokemart_menu.inc +++ b/engine/debug/field/pokemart_menu.inc @@ -82,7 +82,7 @@ DebugMart_BuyMenuHeader: ret DebugMart_WelcomeText: - text "フレンドりーショップへ　" + text "フレンドリーショップへ　" line "ようこそ！" prompt @@ -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/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/bank0d.asm b/engine/dumps/bank0d.asm index 0f7db04..bc40691 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 @@ -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 a11a34d..6ea86c8 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 wca2b 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 wca2b text "の　@" text_from_ram wStringBuffer1 - text "は" + text "は" + line "" text_from_ram wEnemyMonNickname text "を　くりだそうと　している" @@ -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 8e7afd7..307f190 100644 --- a/engine/dumps/bank14.asm +++ b/engine/dumps/bank14.asm @@ -249,10 +249,10 @@ GetTrainerClassName_Old:: db "だんいん@" .cooltrainer_male - db "エりート♂@" + db "エリート♂@" .cooltrainer_female - db "エりート♀@" + db "エリート♀@" DrawPlayerHP:: ld a, 1 @@ -1549,7 +1549,7 @@ RevitalizedText: _GrewToLevelText: text_from_ram wStringBuffer1 - text "の　レべルが@" + text "の　レベルが@" deciram wCurPartyLevel, 1, 3 text "になった@" sound_dex_fanfare_50_79 diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index b4dd7ed..4a40fd7 100755 --- 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 a42a61d..f6fd51a 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/items/item_effects.asm b/engine/items/item_effects.asm index 4bb6bb6..f669058 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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 ed0cf04..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 "は　おぼえられない！" 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/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/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 4b3ceda..972ef32 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] @@ -1116,70 +1118,57 @@ PartyHeldItem: db "そうびを　はずす@" .CantBeEquippedText - db 1 - dw wStringBuffer1 + text_from_ram wStringBuffer1 text "を　そうびすることは" - line "できません" + line "できません" + prompt ItemWasEquippedText: - db 1 - dw wMonOrItemNameBuffer + text_from_ram wMonOrItemNameBuffer text "は　そうび　していた" line "@" - -.UnusedText1 - db 1 - dw wStringBuffer1 + text_from_ram wStringBuffer1 text "を　はずして" - para "@" -.UnusedText2 - db 1 - dw wStringBuffer2 - text "を　そうびした！" + para "@" + text_from_ram wStringBuffer2 + text "を　そうびした！" + prompt ItemPrompt66FA: - db 1 - dw wMonOrItemNameBuffer + text_from_ram wMonOrItemNameBuffer text "は　@" - -.UnusedText3 - db 1 - dw wStringBuffer2 + text_from_ram wStringBuffer2 text "を" - line "そうびした！" + line "そうびした！" + prompt PartyNoItemToRecieveText: - db 1 - dw wMonOrItemNameBuffer + text_from_ram wMonOrItemNameBuffer text "は　なにも" - line "そうび　していません！" + line "そうび　していません！" + prompt PartyItemRecieveBagFullText: text "どうぐが　いっぱいで" - line "そうびを　はずせません！" + line "そうびを　はずせません！" + prompt ItemPrompt673D: - db 1 - dw wMonOrItemNameBuffer + text_from_ram wMonOrItemNameBuffer text "から　@" - -.UnusedText4 - db 1 - dw wStringBuffer1 + text_from_ram wStringBuffer1 text "を" - line "はずしました！" + line "はずしました！" + prompt ItemPrompt6753: - db 1 - dw wMonOrItemNameBuffer + text_from_ram wMonOrItemNameBuffer text "は　@" - -.UnusedText5: - db 1 - dw wStringBuffer1 + text_from_ram wStringBuffer1 text "を" line "すでに　そうび　しています" + para "そうびしている　どうぐを" line "とりかえますか？" done @@ -1341,17 +1330,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 @@ -1441,7 +1431,8 @@ PrintNotHealthyEnoughText: jp HandleSelectedPokemon NotHealthyEnoughText: - text "たいりょくが　たりません！" + text "たいりょくが　たりません！" + prompt PrintNeedNewBadgeText: ld hl, NeedNewBadgeText @@ -1450,7 +1441,8 @@ PrintNeedNewBadgeText: NeedNewBadgeText: text "あたらしい　バッジを　てにするまで" - line "まだ　つかえません！" + line "まだ　つかえません！" + prompt PartyPokemonSummary2: ld hl, wOptions @@ -1740,7 +1732,8 @@ CheckRegisteredItem: .NothingRegisteredText: text "べんりボタンを　おした！" - line "⋯しかしなにもおきない！" + line "⋯しかしなにもおきない！" + prompt GetRegisteredItemID: ; if you can use the registered item, sets the ID to a @@ -2149,7 +2142,11 @@ DrawTrainerCardMainPage: ret TrainerCardText: - db "なまえ／おこづかい#ずかん@" + db "なまえ／" + next "" + next "おこづかい" + next "" + next "#ずかん@" TrainerCardDexEntriesText: db "ひき@" @@ -2188,7 +2185,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 36061f5..725b540 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -500,12 +500,12 @@ Dakutens: db "カガキギクグケゲコゴ" db "サザシジスズセゼソゾ" db "タダチヂツヅテデトド" - db "ハバヒビフブへべホボ" + db "ハバヒビフブヘベホボ" db $FF Handakutens: db "はぱひぴふぷへぺほぽ" - db "ハパヒピフプへぺホポ" + db "ハパヒピフプヘペホポ" db $FF NamingScreenDeleteCharacter: diff --git a/engine/movie/oak_speech.asm b/engine/movie/oak_speech.asm index 88ac87a..c4550e3 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 "そして・・・" diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 198b29d..741fed3 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -544,8 +544,9 @@ SRAMClearMenu:: jp Init SRAMClear_Message:: - db "すべての　セーブデータエりアを" - db "クりア　しますか？" + text "すべての　セーブデータエリアを" + line "クリア　しますか？" + done SRAMClear_WinPOS:: db 0 diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index ab5ce63..68fe900 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -809,7 +809,8 @@ Pokedex_InitUnownMode: db "アンノーン　の　しゅるい@" .VariantsDiscoveredString: - db "　　しゅるい　はっけん！@" + db "　　しゅるい" + next "　はっけん！@" PrintUnownList: diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index c4ec8c7..bdba435 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -428,6 +428,7 @@ BillsPC_ChangeBoxSubmenu: .ChangeBoxSaveText: text "#　ボックスを　かえると" ; "When you change a box" line "どうじに　レポートが　かかれます" ; "data will be saved." + para "<⋯⋯>　それでも　いいですか？" ; "Is that okay?" done @@ -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 6fb4ed6..6328717 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -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 20fd010..5c8b779 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -335,7 +335,8 @@ CongratulationsYourPokemonText: done EvolvedIntoText: - text "@" + text_start + line "@" text_from_ram wStringBuffer1 text "に　しんかした" done 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/unknown_boxes.asm b/engine/unknown_boxes.asm index 918fb48..a07a8e0 100644 --- a/engine/unknown_boxes.asm +++ b/engine/unknown_boxes.asm @@ -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/home/talk_to_npc.asm b/home/talk_to_npc.asm index d73e198..32e9b7c 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 5e6dbee..178a1f1 100644 --- a/home/text.asm +++ b/home/text.asm @@ -307,7 +307,7 @@ ContText:: .Text: text "<_CONT>@" - db "@" + text_end PlaceDexEnd:: ld [hl], '。' 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/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 345f5a8..96e7208 100644 --- a/scripts/PlayerHouse2F.asm +++ b/scripts/PlayerHouse2F.asm @@ -171,7 +171,7 @@ PlayerHouse2FTextString2: done PlayerHouse2FTextString3: - text "クりスマスに　カントーの" + text "クリスマスに　カントーの" line "しんせきに　プレゼント" cont "してもらった　にんぎょうだ" done @@ -191,10 +191,9 @@ PlayerHouse2FTextString5: line "メールが　とどいている　ようだ" cont "よんでみる？@" - db $08 - + start_asm call PlayerHouse2FCheckEmail - call Function3036 + call TextAsmEnd ret PlayerHouse2FTextString6: @@ -227,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 e5f213a..d245dc5 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 0af03cc..b42709f 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 6ef0604..26bab2c 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 d573bcf..2070168 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 e48032a..55f877c 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