diff options
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/home/text.asm b/home/text.asm index 191c96172..2dbb85f6d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -47,10 +47,8 @@ ClearScreen:: ; fdb TextBox:: ; fe8 -; Draw a text box at hl with room for -; b lines of c characters each. -; Places a border around the textbox, -; then switches the palette to the +; Draw a text box at hl with room for b lines of c characters each. +; Places a border around the textbox, then switches the palette to the ; text black-and-white scheme. push bc push hl @@ -146,7 +144,7 @@ SpeechTextBox:: ; 103e ; 1048 TestText:: ; 1048 - text "ゲームフりーク!" + text "ゲームフりーク！" done ; 1052 @@ -216,31 +214,31 @@ dict2: MACRO ._\@: ENDM - dict "<DAY>", Char15 + dict TX_DAY, DayOfWeekChar dict "<LINE>", LineChar dict "<NEXT>", NextLineChar dict TX_FAR, TextFar - dict $00, NullChar - dict $4c, Char4C - dict $4b, Char4B + dict TX_START, NullChar + dict "<SCROLL>", _ContTextNoPause + dict "<_CONT>", _ContText dict "<PARA>", Paragraph dict "<MOM>", PrintMomsName dict "<PLAYER>", PrintPlayerName dict "<RIVAL>", PrintRivalName - dict $35, Char35 - dict $36, Char36 - dict $37, Char37 + dict "<ROUTE>", PlaceJPRoute + dict "<WATASHI>", PlaceWatashi + dict "<KOKO_WA>", PlaceKokoWa dict "<RED>", PrintRedsName dict "<GREEN>", PrintGreensName dict "#", PlacePOKe dict "<PC>", PCChar dict "<ROCKET>", RocketChar dict "<TM>", TMChar - dict "<TRNER>", TrainerChar + dict "<TRAINER>", TrainerChar dict "<KOUGEKI>", PlaceKougeki - dict "<LNBRK>", Char22 + dict "<LNBRK>", LineBreakChar dict "<CONT>", ContText - dict "<......>", SixDotsChar + dict "<……>", SixDotsChar dict "<DONE>", DoneText dict "<PROMPT>", PromptText dict "<PKMN>", PlacePKMN @@ -265,32 +263,32 @@ ENDM jp NextChar .not_diacritic - cp $60 ; Regular characters + cp FIRST_REGULAR_TEXT_CHAR jr nc, .place cp "パ" jr nc, .handakuten .dakuten - cp $20 - jr nc, .daku1 + cp FIRST_HIRAGANA_DAKUTEN_CHAR + jr nc, .hiragana_dakuten add "カ" - "ガ" - jr .daku2 -.daku1 + jr .katakana_dakuten +.hiragana_dakuten add "か" - "が" -.daku2 +.katakana_dakuten ld b, "ﾞ" ; dakuten call Diacritic jr .place .handakuten cp "ぱ" - jr nc, .han1 + jr nc, .hiragana_handakuten add "ハ" - "パ" - jr .han2 -.han1 + jr .katakana_handakuten +.hiragana_handakuten add "は" - "ぱ" -.han2 +.katakana_handakuten ld b, "ﾟ" ; handakuten call Diacritic @@ -301,7 +299,7 @@ ENDM ; 0x117b -Char15:: ; 117b +DayOfWeekChar:: ; 117b ld c, l ld b, h farcall Function17f036 @@ -330,20 +328,20 @@ PlaceKougeki: print_name KougekiText ; 11cc SixDotsChar: print_name SixDotsCharText ; 11d3 PlacePKMN: print_name PlacePKMNText ; 11da PlacePOKE: print_name PlacePOKEText ; 11e1 -Char35: print_name Char35Text ; 11e8 -Char36: print_name Char36Text ; 11ef -Char37: print_name Char37Text ; 11f6 +PlaceJPRoute: print_name PlaceJPRouteText ; 11e8 +PlaceWatashi: print_name PlaceWatashiText ; 11ef +PlaceKokoWa: print_name PlaceKokoWaText ; 11f6 PlaceMoveTargetsName:: ; 11fd ld a, [hBattleTurn] xor 1 - jr PlaceMoveTargetsName_5A + jr PlaceMoveUsersName.place PlaceMoveUsersName:: ; 1203 ld a, [hBattleTurn] -PlaceMoveTargetsName_5A: ; 1205 +.place: ; 1205 push de and a jr nz, .enemy @@ -352,7 +350,7 @@ PlaceMoveTargetsName_5A: ; 1205 jr PlaceCommandCharacter .enemy - ld de, EnemyText ; Enemy + ld de, EnemyText call PlaceString ld h, b ld l, c @@ -377,7 +375,7 @@ PlaceEnemysName:: ; 121b call PlaceString ld h, b ld l, c - ld de, String12a2 + ld de, String_Space call PlaceString push bc callfar Battle_GetTrainerName @@ -402,9 +400,9 @@ PlaceGenderedPlayerName:: ; 1252 ld l, c ld a, [wPlayerGender] bit 0, a - ld de, String_kun + ld de, KunSuffixText jr z, PlaceCommandCharacter - ld de, String_chan + ld de, ChanSuffixText jr PlaceCommandCharacter @@ -416,22 +414,23 @@ PlaceCommandCharacter:: ; 126a jp NextChar ; 0x1273 -TMCharText:: db "TM@" ; 1273 -TrainerCharText:: db "TRAINER@" ; 1276 -PCCharText:: db "PC@" ; 127e -RocketCharText:: db "ROCKET@" ; 1281 -PlacePOKeText:: db "POKé@" ; 1288 -KougekiText:: db "こうげき@" ; 128d -SixDotsCharText:: db "……@" ; 1292 -EnemyText:: db "Enemy @" ; 1295 -PlacePKMNText:: db "<PK><MN>@" ; PK MN ; 129c -PlacePOKEText:: db "<PO><KE>@" ; PO KE ; 129f -String12a2:: db " @" ; 12a2 -Char35Text:: -Char36Text:: -Char37Text:: db "@" ; 12a4 -String_kun:: db "@" ; 12a5 -String_chan:: db "@" ; 12a6 +TMCharText:: db "TM@" +TrainerCharText:: db "TRAINER@" +PCCharText:: db "PC@" +RocketCharText:: db "ROCKET@" +PlacePOKeText:: db "POKé@" +KougekiText:: db "こうげき@" +SixDotsCharText:: db "……@" +EnemyText:: db "Enemy @" +PlacePKMNText:: db "<PK><MN>@" +PlacePOKEText:: db "<PO><KE>@" +String_Space:: db " @" +; These strings have been dummied out. +PlaceJPRouteText:: +PlaceWatashiText:: +PlaceKokoWaText:: db "@" +KunSuffixText:: db "@" +ChanSuffixText:: db "@" ; 12a7 NextLineChar:: ; 12a7 @@ -442,7 +441,7 @@ NextLineChar:: ; 12a7 jp NextChar ; 12b0 -Char22:: ; 12b0 +LineBreakChar:: ; 12b0 pop hl ld bc, SCREEN_WIDTH add hl, bc @@ -525,7 +524,7 @@ Paragraph:: ; 12f2 ; 131f -Char4B:: ; 131f +_ContText:: ; 131f ld a, [wLinkMode] or a jr nz, .communication @@ -541,8 +540,9 @@ Char4B:: ; 131f ld a, [wLinkMode] or a call z, UnloadBlinkingCursor + ; fallthrough -Char4C:: ; 1337 +_ContTextNoPause:: ; 1337 push de call TextScroll call TextScroll @@ -563,7 +563,7 @@ ContText:: ; 1345 pop de jp NextChar -.cont db $4b, "@" +.cont: db "<_CONT>@" ; 1356 @@ -598,7 +598,8 @@ DoneText:: ; 137c ld de, .stop dec de ret -.stop db "@" + +.stop: db "@" ; 1383 NullChar:: ; 1383 @@ -690,7 +691,7 @@ PokeFluteTerminatorCharacter:: ; 13e0 ld hl, .stop ret -.stop db "@" +.stop: db "@" ; 13e5 @@ -734,30 +735,30 @@ DoTextUntilTerminator:: ; 13f6 ; 1410 TextCommands:: ; 1410 -; entries correspond to macros/text.asm enumeration - dw Text_TX - dw Text_TX_RAM - dw Text_TX_BCD - dw Text_TX_MOVE - dw Text_TX_BOX - dw Text_TX_LOW - dw Text_WAIT_BUTTON - dw Text_TX_SCROLL - dw Text_START_ASM - dw Text_TX_NUM - dw Text_TX_EXIT - dw Text_PlaySound ; $0b - dw Text_TX_DOTS - dw Text_0D - dw Text_PlaySound ; $0e - dw Text_PlaySound ; $0f - dw Text_PlaySound ; $10 - dw Text_PlaySound ; $11 - dw Text_PlaySound ; $12 - dw Text_PlaySound ; $13 - dw Text_TX_STRINGBUFFER - dw Text_TX_DAY - dw Text_TX_FAR +; entries correspond to TX_* constants (see macros/scripts/text.asm) + dw Text_TX ; TX_START + dw Text_TX_RAM ; TX_RAM + dw Text_TX_BCD ; TX_BCD + dw Text_TX_MOVE ; TX_MOVE + dw Text_TX_BOX ; TX_BOX + dw Text_TX_LOW ; TX_LOW + dw Text_WAIT_BUTTON ; WAIT_BUTTON + dw Text_TX_SCROLL ; TX_SCROLL + dw Text_START_ASM ; START_ASM + dw Text_TX_NUM ; TX_NUM + dw Text_TX_EXIT ; TX_EXIT + dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_50_79 + dw Text_TX_DOTS ; TX_DOTS + dw Text_LINK_WAIT_BUTTON ; TX_LINK_WAIT_BUTTON + dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_20_49 + dw Text_PlaySound ; TX_SOUND_ITEM + dw Text_PlaySound ; TX_SOUND_CAUGHT_MON + dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_80_109 + dw Text_PlaySound ; TX_SOUND_FANFARE + dw Text_PlaySound ; TX_SOUND_SLOT_MACHINE_START + dw Text_TX_STRINGBUFFER ; TX_STRINGBUFFER + dw Text_TX_DAY ; TX_DAY + dw Text_TX_FAR ; TX_FAR ; 143e Text_TX:: ; 143e @@ -899,9 +900,9 @@ Text_WAIT_BUTTON:: ; 149f ld a, [wLinkMode] cp LINK_COLOSSEUM - jp z, Text_0D + jp z, Text_LINK_WAIT_BUTTON cp LINK_MOBILE - jp z, Text_0D + jp z, Text_LINK_WAIT_BUTTON push hl call LoadBlinkingCursor @@ -1015,14 +1016,13 @@ Text_PlaySound:: ; 1500 ret ; 1522 -Function1522:: ; 1522 -; XXX +Unreferenced_Function1522:: ; 1522 ; TX_CRY push de ld e, [hl] inc hl ld d, [hl] - call PlayCry + call PlayMonCry pop de pop hl pop bc @@ -1030,13 +1030,13 @@ Function1522:: ; 1522 ; 152d TextSFX:: ; 152d - dbw TX_SOUND_0B, SFX_DEX_FANFARE_50_79 - dbw TX_SOUND_12, SFX_FANFARE - dbw TX_SOUND_0E, SFX_DEX_FANFARE_20_49 - dbw TX_SOUND_0F, SFX_ITEM - dbw TX_SOUND_10, SFX_CAUGHT_MON - dbw TX_SOUND_11, SFX_DEX_FANFARE_80_109 - dbw TX_SOUND_13, SFX_SLOT_MACHINE_START + dbw TX_SOUND_DEX_FANFARE_50_79, SFX_DEX_FANFARE_50_79 + dbw TX_SOUND_FANFARE, SFX_FANFARE + dbw TX_SOUND_DEX_FANFARE_20_49, SFX_DEX_FANFARE_20_49 + dbw TX_SOUND_ITEM, SFX_ITEM + dbw TX_SOUND_CAUGHT_MON, SFX_CAUGHT_MON + dbw TX_SOUND_DEX_FANFARE_80_109, SFX_DEX_FANFARE_80_109 + dbw TX_SOUND_SLOT_MACHINE_START, SFX_SLOT_MACHINE_START db -1 ; 1543 @@ -1069,7 +1069,7 @@ Text_TX_DOTS:: ; 1543 ret ; 1562 -Text_0D:: ; 1562 +Text_LINK_WAIT_BUTTON:: ; 1562 ; wait for key down ; display arrow push hl |