Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-04-25 15:39:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format text strings, using macro where possible

Browse Source
This commit is contained in:
Narishma-gb 2025-11-24 21:13:02 +01:00
parent add3d79a7e
commit e8ebf74343
27 changed files with 180 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/debug/debug_menu.asm
View File

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

1
engine/debug/field/move_to_entrance.inc
View File

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

4
engine/debug/field/pokemart_menu.inc
View File

@ -339,5 +339,5 @@ DebugMart_ShowPlaceholderText:
.PlaceholderText:
text "かいはつちゅうです"
next "<PROMPT>"
next ""
prompt

7
engine/debug/field/teleport.inc
View File

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

8
engine/dumps/bank0d.asm
View File

@ -773,7 +773,9 @@ StoringEnergyText:
prompt
UnleashedEnergyText:
text "<USER>の<LINE>がまんが　とかれた！<PROMPT>"
text "<USER>の"
line "がまんが　とかれた！"
prompt
HungOnText:
text "<TARGET>は"
@ -1168,7 +1170,8 @@ UsedMoveText_CheckObedience:
ret
MoveNameText:
text "<LINE>@"
text_start
line "@"
text_from_ram wStringBuffer2
start_asm
; get start address
@ -7769,6 +7772,7 @@ BattleCommand_NailDown:
.PutACurseText
text "<USER>は"
line "じぶんに　くぎを　うった"
para "<TARGET>は"
line "のろいを　かけられた！"
prompt

27
engine/dumps/bank0f.asm
View File

@ -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 "<PLAYER>の　てもとには"
line "たたかえる　#が　いない！"
para "<PLAYER>は"
line "めのまえが　まっくらに　なった！"
prompt
@ -2154,7 +2155,8 @@ TrainerAboutToUseText:
text_from_ram wca2b
text "の　@"
text_from_ram wStringBuffer1
text "は<LINE>"
text "は"
line ""
text_from_ram wEnemyMonNickname
text "を　くりだそうと　している"
@ -4242,7 +4244,9 @@ LinkBattleSendRecieveAction:
ret
BattleText_TargetsEncoreEnded:
text "<TARGET>の<LINE>アンコールじょうたいが　とけた！<PROMPT>"
text "<TARGET>の"
line "アンコールじょうたいが　とけた！"
prompt
asm_3dff2:
ldh a, [hBattleTurn]
@ -5332,16 +5336,20 @@ BoostedExpPointsText:
text "　おおめに@"
.BoostedExpPoints3Text:
text "<LINE>@"
text_start
line "@"
deciram wStringBuffer2, 2, 4
text "　けいけんちを　もらった！<PROMPT>"
text "　けいけんちを　もらった！"
prompt
GrewToLevelText:
text_from_ram wStringBuffer1
text "は<LINE>レベル@"
text "は"
line "レベル@"
deciram wCurPartyLevel, 1, 3
text "　に　あがった！@"
db "ジ@"
sound_dex_fanfare_50_79
text_end
PrintSendOutMonMessage:
ld a, [wLinkMode]
@ -5429,7 +5437,8 @@ PrintPlayerMon1Text:
ret
.Text:
text_from_ram wBattleMonNickname
text "！<DONE>"
text "！"
done
RetreatMon:
ld hl, PlayerMon2Text
@ -5506,7 +5515,7 @@ PrintComeBackText:
ret
ComeBackText:
text ""
text_start
line "もどれ！"
done

2
engine/events/field_moves.asm
View File

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

5
engine/events/pokecenter_pc.asm
View File

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

3
engine/items/item_effects.asm
View File

@ -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 "は　おぼえられない！"

2
engine/items/tm_holder.asm
View File

@ -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 "は　おぼえられない！"

125
engine/menu/start_menu.asm
View File

@ -698,28 +698,24 @@ TryTossItem:
ret
.TossedText:
db 1
dw wStringBuffer2
text_from_ram wStringBuffer2
text "を　"
line "いくつ　すてますか？"
done
.TossVerifyText:
db 1
dw wStringBuffer2
text_from_ram wStringBuffer2
text "を　@"
db 9
dw wItemQuantity
db $12
deciram wItemQuantity, 1, 2
text "こ"
line "すててもよろしいですか？"
done
.TossedTextCopy:
db 1
dw wStringBuffer1
text_from_ram wStringBuffer1
text "を"
line "すてました！<PROMPT>"
line "すてました！"
prompt
CantDropItem:
ld hl, .CantDropItemText
@ -728,7 +724,8 @@ CantDropItem:
.CantDropItemText:
text "それは　とても　たいせつなモノです"
line "すてることは　できません！<PROMPT>"
line "すてることは　できません！"
prompt
PrintCantUseHM:
ld hl, .CantUseHMText
@ -737,7 +734,8 @@ PrintCantUseHM:
.CantUseHMText:
text "かいはつちゅう　です"
line "いまは　つかえません<PROMPT>"
line "いまは　つかえません"
prompt
PrintCantUseText:
ld hl, .CantUseHereText
@ -747,7 +745,8 @@ PrintCantUseText:
.CantUseHereText:
text "オーキドの　ことば<⋯⋯>"
line "<PLAYER>よ！　こういうものには"
cont "つかいどきが　あるのじゃ！<PROMPT>"
cont "つかいどきが　あるのじゃ！"
prompt
DrawNoItemsText:
ld hl, .NoItemsText
@ -755,7 +754,9 @@ DrawNoItemsText:
ret
.NoItemsText:
text "どうぐ　をひとつも<NEXT>もっていません！<PROMPT>"
text "どうぐ　をひとつも"
next "もっていません！"
prompt
BallPocket:
xor a
@ -871,10 +872,10 @@ RegisterItem:
ret
.RegisteredItemText:
db 1
dw wStringBuffer2
text_from_ram wStringBuffer2
text "を　"
line "べんりボタンに　とうろくした！<PROMPT>"
line "べんりボタンに　とうろくした！"
prompt
PrintCantRegisterToolText:
ld hl, .CantRegisterToolText
@ -883,7 +884,8 @@ PrintCantRegisterToolText:
.CantRegisterToolText:
text "そのどうぐは　"
line "とうろくできません！<PROMPT>"
line "とうろくできません！"
prompt
StartMenu_Party:
ld a, [wPartyCount]
@ -1116,70 +1118,57 @@ PartyHeldItem:
db "そうびを　はずす@"
.CantBeEquippedText
db 1
dw wStringBuffer1
text_from_ram wStringBuffer1
text "を　そうびすることは"
line "できません<PROMPT>"
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 "を　そうびした！<PROMPT>"
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 "そうびした！<PROMPT>"
line "そうびした！"
prompt
PartyNoItemToRecieveText:
db 1
dw wMonOrItemNameBuffer
text_from_ram wMonOrItemNameBuffer
text "は　なにも"
line "そうび　していません！<PROMPT>"
line "そうび　していません！"
prompt
PartyItemRecieveBagFullText:
text "どうぐが　いっぱいで"
line "そうびを　はずせません！<PROMPT>"
line "そうびを　はずせません！"
prompt
ItemPrompt673D:
db 1
dw wMonOrItemNameBuffer
text_from_ram wMonOrItemNameBuffer
text "から　@"
.UnusedText4
db 1
dw wStringBuffer1
text_from_ram wStringBuffer1
text "を"
line "はずしました！<PROMPT>"
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 "はずしました！<PROMPT>"
line "はずしました！"
prompt
.MailFullText
text "どうぐが　いっぱいで"
line "メールを　はずせません！<PROMPT>"
line "メールを　はずせません！"
prompt
PartyPokemonSummary:
call LoadStandardMenuHeader
@ -1441,7 +1431,8 @@ PrintNotHealthyEnoughText:
jp HandleSelectedPokemon
NotHealthyEnoughText:
text "たいりょくが　たりません！<PROMPT>"
text "たいりょくが　たりません！"
prompt
PrintNeedNewBadgeText:
ld hl, NeedNewBadgeText
@ -1450,7 +1441,8 @@ PrintNeedNewBadgeText:
NeedNewBadgeText:
text "あたらしい　バッジを　てにするまで"
line "まだ　つかえません！<PROMPT>"
line "まだ　つかえません！"
prompt
PartyPokemonSummary2:
ld hl, wOptions
@ -1740,7 +1732,8 @@ CheckRegisteredItem:
.NothingRegisteredText:
text "べんりボタンを　おした！"
line "⋯しかしなにもおきない！<PROMPT>"
line "⋯しかしなにもおきない！"
prompt
GetRegisteredItemID:
; if you can use the registered item, sets the ID to a
@ -2149,7 +2142,11 @@ DrawTrainerCardMainPage:
ret
TrainerCardText:
db "なまえ／<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@"
db "なまえ／"
next ""
next "おこづかい"
next ""
next "#ずかん@"
TrainerCardDexEntriesText:
db "ひき@"

5
engine/movie/title.asm
View File

@ -544,8 +544,9 @@ SRAMClearMenu::
jp Init
SRAMClear_Message::
db "<NULL>すべての　セーブデータエリアを"
db "<LINE>クリア　しますか？<DONE>"
text "すべての　セーブデータエリアを"
line "クリア　しますか？"
done
SRAMClear_WinPOS::
db 0

3
engine/pokedex/pokedex_2.asm
View File

@ -809,7 +809,8 @@ Pokedex_InitUnownMode:
db "アンノーン　の　しゅるい@"
.VariantsDiscoveredString:
db "　　しゅるい<NEXT>　はっけん！@"
db "　　しゅるい"
next "　はっけん！@"
PrintUnownList:

1
engine/pokemon/bills_pc.asm
View File

@ -428,6 +428,7 @@ BillsPC_ChangeBoxSubmenu:
.ChangeBoxSaveText:
text "#　ボックスを　かえると" ; "When you change a box"
line "どうじに　レポートが　かかれます" ; "data will be saved."
para "<⋯⋯>　それでも　いいですか？" ; "Is that okay?"
done

3
engine/pokemon/evolve.asm
View File

@ -335,7 +335,8 @@ CongratulationsYourPokemonText:
done
EvolvedIntoText:
text "<LINE>@"
text_start
line "@"
text_from_ram wStringBuffer1
text "に　しんかした"
done

6
engine/pokemon/learn.asm
View File

@ -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

4
engine/unknown_boxes.asm
View File

@ -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

2
home/text.asm
View File

@ -307,7 +307,7 @@ ContText::
.Text:
text "<_CONT>@"
db "@"
text_end
PlaceDexEnd::
ld [hl], '。'

41
macros/text.asm
View File

@ -1,13 +1,38 @@
DEF text EQUS "db $00," ; Start writing text.
DEF next EQUS "db \"<NEXT>\"," ; Move a line down.
DEF line EQUS "db \"<LINE>\"," ; Start writing at the bottom line.
DEF para EQUS "db \"<PARA>\"," ; Start a new paragraph.
DEF cont EQUS "db \"<CONT>\"," ; Scroll to the next line.
DEF done EQUS "db \"<DONE>\"" ; End a text box.
DEF prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event).
MACRO text
db TX_START, \# ; Start writing text
ENDM
MACRO next
db "<NEXT>", \# ; Move a line down
ENDM
MACRO line
db "<LINE>", \# ; Start writing at the bottom line
ENDM
MACRO para
db "<PARA>", \# ; Start a new paragraph
ENDM
MACRO cont
db "<CONT>", \# ; Scroll to the next line
ENDM
MACRO done
db "<DONE>" ; End a text box
ENDM
MACRO prompt
db "<PROMPT>" ; 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

2
scripts/OldCityPokecenterBattle.asm
View File

@ -40,4 +40,4 @@ OldCityPokecenterBattleText1:
OldCityPokecenterBattleTextString1:
text "ちょっとまってね！@"
text_exit
db "@"
text_end

2
scripts/OldCityPokecenterTrade.asm
View File

@ -42,4 +42,4 @@ OldCityPokecenterTradeTextString1:
text_exit
text_exit
text_exit
db "@"
text_end

3
scripts/PlayerHouse2F.asm
View File

@ -191,8 +191,7 @@ PlayerHouse2FTextString5:
line "メールが　とどいている　ようだ"
cont "よんでみる？@"
db $08
start_asm
call PlayerHouse2FCheckEmail
call Function3036
ret

4
scripts/ShizukanaOka.asm
View File

@ -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

4
scripts/SilentHill.asm
View File

@ -396,9 +396,7 @@ SilentHillTextRival1:
cont "じぶんの　ははおや　のこと"
cont "いつも　なんて　よんでる？@"
db $08
LoadMomNamePromptUnused:
start_asm
call LoadStandardMenuHeader
callfar MomNamePrompt
call CloseWindow

3
scripts/SilentHillHouse.asm
View File

@ -69,9 +69,8 @@ SilentHillHouseTextString1:
text "おや？　<RIVAL>あてに　メールが"
line "とどいている　ようだ"
cont "よんでみる？@"
db $08
SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?)
start_asm
call YesNoBox
jr c, .jump
ld hl, wd41a

22
scripts/SilentHillLabBack.asm
View File

@ -184,9 +184,10 @@ SilentHillLabBackTextString3:
SilentHillLabBackTextString4:
text "オーキド『ほう！　ほのおのポケモン"
line "@"
ld bc, wStringBuffer1
text_from_ram wStringBuffer1
text "に　するんじゃな？@"
db 08
start_asm
call ConfirmPokemonSelection
call Function3036
ret
@ -194,9 +195,10 @@ SilentHillLabBackTextString4:
SilentHillLabBackTextString5:
text "オーキド『ふむ　みずのポケモン"
line "@"
ld bc, wStringBuffer1
text_from_ram wStringBuffer1
text "に　きめるのじゃな？@"
db 08
start_asm
call ConfirmPokemonSelection
call Function3036
ret
@ -204,9 +206,10 @@ SilentHillLabBackTextString5:
SilentHillLabBackTextString6:
text "オーキド『おお！　くさのポケモン"
line "@"
ld bc, wStringBuffer1
text_from_ram wStringBuffer1
text "が　いいんじゃな？@"
db 08
start_asm
call ConfirmPokemonSelection
call Function3036
ret
@ -252,8 +255,9 @@ SilentHillLabBackTextString8:
para "<PLAYER>は　オーキドはかせから"
line "@"
ld bc, wStringBuffer1
text "を　もらった！<PROMPT>"
text_from_ram wStringBuffer1
text "を　もらった！"
prompt
SilentHillLabBackTextString9:
text "オーキド『そうじゃ！"
@ -290,7 +294,7 @@ SilentHillLabBackTextString12:
SilentHillLabBackTextString13:
text "<RIVAL>は　オーキドから"
line "@"
ld bc, wStringBuffer1
text_from_ram wStringBuffer1
text "を　もらった！"
done

3
scripts/SilentHillLabFront.asm
View File

@ -737,9 +737,8 @@ SilentHillLabFrontTextString5:
para "すこし　わしの　はなしを"
line "きいては　くれんか？@"
db $08
SilentHillLabFrontText6:
start_asm
call YesNoBox
jr c, .jump
.loop