use 'next' macro in strings

This commit is contained in:
yenatch 2014-01-22 01:21:41 -05:00
parent 7a69bfaa92
commit 53a4432e68

227
main.asm
View file

@ -11184,9 +11184,10 @@ Func_4541: ; 4541 (1:4541)
jp PlaceString jp PlaceString
CopyrightTextString: ; 4556 (1:4556) CopyrightTextString: ; 4556 (1:4556)
db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A,$4E ; ©'95.'96.'98 Nintendo db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo
db $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72,$4E ; ©'95.'96.'98 Creatures inc. next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc.
db $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B,"@" ; ©'95.'96.'98 GAME FREAK inc. next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
db "@"
TitleMons: ; 4588 (1:4588) TitleMons: ; 4588 (1:4588)
; mons on the title screen are randomly chosen from here ; mons on the title screen are randomly chosen from here
@ -13810,7 +13811,8 @@ TradeCompleted:
db "Trade completed!@" db "Trade completed!@"
TradeCanceled: TradeCanceled:
db "Too bad! The trade",$4E,"was canceled!@" db "Too bad! The trade"
next "was canceled!@"
PointerTable_5a5b: ; 5a5b (1:5a5b) PointerTable_5a5b: ; 5a5b (1:5a5b)
dw Func_5530 dw Func_5530
@ -14236,13 +14238,16 @@ Func_5d5f: ; 5d5f (1:5d5f)
jp EnterMap jp EnterMap
ContinueText: ; 5d7e (1:5d7e) ContinueText: ; 5d7e (1:5d7e)
db "CONTINUE",$4e db "CONTINUE", $4e
NewGameText: ; 5d87 (1:5d87) NewGameText: ; 5d87 (1:5d87)
db "NEW GAME",$4e,"OPTION@" db "NEW GAME", $4e
db "OPTION@"
TradeCenterText: ; 5d97 (1:5d97) TradeCenterText: ; 5d97 (1:5d97)
db "TRADE CENTER",$4e,"COLOSSEUM",$4e,"CANCEL@" db "TRADE CENTER", $4e
db "COLOSSEUM", $4e
db "CANCEL@"
Func_5db5: ; 5db5 (1:5db5) Func_5db5: ; 5db5 (1:5db5)
xor a xor a
@ -14331,10 +14336,10 @@ Func_5e55: ; 5e55 (1:5e55)
jp PrintNumber jp PrintNumber
SaveScreenInfoText: ; 5e6a (1:5e6a) SaveScreenInfoText: ; 5e6a (1:5e6a)
db "PLAYER",$4e db "PLAYER"
db "BADGES ",$4e next "BADGES "
db "#DEX ",$4e next "#DEX "
db "TIME@" next "TIME@"
DisplayOptionMenu: ; 5e8a (1:5e8a) DisplayOptionMenu: ; 5e8a (1:5e8a)
FuncCoord 0,0 FuncCoord 0,0
@ -14496,16 +14501,16 @@ DisplayOptionMenu: ; 5e8a (1:5e8a)
jp .eraseOldMenuCursor jp .eraseOldMenuCursor
TextSpeedOptionText: ; 5fc0 (1:5fc0) TextSpeedOptionText: ; 5fc0 (1:5fc0)
db "TEXT SPEED",$4E db "TEXT SPEED"
db " FAST MEDIUM SLOW@" next " FAST MEDIUM SLOW@"
BattleAnimationOptionText: ; 5fde (1:5fde) BattleAnimationOptionText: ; 5fde (1:5fde)
db "BATTLE ANIMATION",$4E db "BATTLE ANIMATION"
db " ON OFF@" next " ON OFF@"
BattleStyleOptionText: ; 5ffd (1:5ffd) BattleStyleOptionText: ; 5ffd (1:5ffd)
db "BATTLE STYLE",$4E db "BATTLE STYLE"
db " SHIFT SET@" next " SHIFT SET@"
OptionMenuCancelText: ; 6018 (1:6018) OptionMenuCancelText: ; 6018 (1:6018)
db "CANCEL@" db "CANCEL@"
@ -15911,15 +15916,34 @@ Func_6a6c: ; 6a6c (1:6a6c)
IF _RED IF _RED
DefaultNamesPlayer: ; 6aa8 (1:6aa8) DefaultNamesPlayer: ; 6aa8 (1:6aa8)
db "NEW NAME",$4E,"RED",$4E,"ASH",$4E,"JACK@" db "NEW NAME"
next "RED"
next "ASH"
next "JACK"
db "@"
DefaultNamesRival: ; 6abe (1:6abe) DefaultNamesRival: ; 6abe (1:6abe)
db "NEW NAME",$4E,"BLUE",$4E,"GARY",$4E,"JOHN@" db "NEW NAME"
next "BLUE"
next "GARY"
next "JOHN"
db "@"
ENDC ENDC
IF _BLUE IF _BLUE
DefaultNamesPlayer: ; 6aa8 (1:6aa8) DefaultNamesPlayer: ; 6aa8 (1:6aa8)
db "NEW NAME",$4E,"BLUE",$4E,"GARY",$4E,"JOHN@" db "NEW NAME"
next "BLUE"
next "GARY"
next "JOHN"
db "@"
DefaultNamesRival: ; 6abe (1:6abe) DefaultNamesRival: ; 6abe (1:6abe)
db "NEW NAME",$4E,"RED",$4E,"ASH",$4E,"JACK@" db "NEW NAME"
next "RED"
next "ASH"
next "JACK"
db "@"
ENDC ENDC
Func_6ad6: ; 6ad6 (1:6ad6) Func_6ad6: ; 6ad6 (1:6ad6)
@ -17275,21 +17299,21 @@ TextBoxTextAndCoordTable: ; 73b0 (1:73b0)
; note that there is no terminator ; note that there is no terminator
BuySellQuitText: ; 7413 (1:7413) BuySellQuitText: ; 7413 (1:7413)
db "BUY",$4E db "BUY"
db "SELL",$4E next "SELL"
db "QUIT@@" next "QUIT@@"
UseTossText: ; 7422 (1:7422) UseTossText: ; 7422 (1:7422)
db "USE",$4E db "USE"
db "TOSS@" next "TOSS@"
JapaneseSaveMessageText: ; 742b (1:742b) JapaneseSaveMessageText: ; 742b (1:742b)
db "きろく",$4E db "きろく"
db "メッセージ@" next "メッセージ@"
JapaneseSpeedOptionsText: ; 7435 (1:7435) JapaneseSpeedOptionsText: ; 7435 (1:7435)
db "はやい",$4E db "はやい"
db "おそい@" next "おそい@"
MoneyText: ; 743d (1:743d) MoneyText: ; 743d (1:743d)
db "MONEY@" db "MONEY@"
@ -17298,30 +17322,30 @@ JapaneseMochimonoText: ; 7443 (1:7443)
db "もちもの@" db "もちもの@"
JapaneseMainMenuText: ; 7448 (1:7448) JapaneseMainMenuText: ; 7448 (1:7448)
db "つづきから",$4E db "つづきから"
db "さいしょから@" next "さいしょから@"
BattleMenuText: ; 7455 (1:7455) BattleMenuText: ; 7455 (1:7455)
db "FIGHT ",$E1,$E2,$4E db "FIGHT ",$E1,$E2
db "ITEM RUN@" next "ITEM RUN@"
SafariZoneBattleMenuText: ; 7468 (1:7468) SafariZoneBattleMenuText: ; 7468 (1:7468)
db "BALL× BAIT",$4E db "BALL× BAIT"
db "THROW ROCK RUN@" next "THROW ROCK RUN@"
SwitchStatsCancelText: ; 7489 (1:7489) SwitchStatsCancelText: ; 7489 (1:7489)
db "SWITCH",$4E db "SWITCH"
db "STATS",$4E next "STATS"
db "CANCEL@" next "CANCEL@"
JapaneseAhText: ; 749d (1:749d) JapaneseAhText: ; 749d (1:749d)
db "アッ!@" db "アッ!@"
JapanesePokedexMenu: ; 74a1 (1:74a1) JapanesePokedexMenu: ; 74a1 (1:74a1)
db "データをみる",$4E db "データをみる"
db "なきごえ",$4E next "なきごえ"
db "ぶんぷをみる",$4E next "ぶんぷをみる"
db "キャンセル@" next "キャンセル@"
Func_74ba: ; 74ba (1:74ba) Func_74ba: ; 74ba (1:74ba)
ld hl, $d730 ld hl, $d730
@ -17714,9 +17738,9 @@ FieldMoveNames: ; 778d (1:778d)
db "SOFTBOILED@" db "SOFTBOILED@"
PokemonMenuEntries: ; 77c2 (1:77c2) PokemonMenuEntries: ; 77c2 (1:77c2)
db "STATS",$4E db "STATS"
db "SWITCH",$4E next "SWITCH"
db "CANCEL@" next "CANCEL@"
GetMonFieldMoves: ; 77d6 (1:77d6) GetMonFieldMoves: ; 77d6 (1:77d6)
ld a, [wWhichPokemon] ; $cf92 ld a, [wWhichPokemon] ; $cf92
@ -18139,10 +18163,10 @@ Func_7aa5: ; 7aa5 (1:7aa5)
jp Func_7aa5 jp Func_7aa5
PlayersPCMenuEntries: ; 7af5 (1:7af5) PlayersPCMenuEntries: ; 7af5 (1:7af5)
db "WITHDRAW ITEM",$4E db "WITHDRAW ITEM"
db "DEPOSIT ITEM",$4E next "DEPOSIT ITEM"
db "TOSS ITEM",$4E next "TOSS ITEM"
db "LOG OFF@" next "LOG OFF@"
UnnamedText_7b22: ; 7b22 (1:7b22) UnnamedText_7b22: ; 7b22 (1:7b22)
TX_FAR _UnnamedText_7b22 TX_FAR _UnnamedText_7b22
@ -30101,10 +30125,10 @@ PrintStat
ret ret
StatsText: ; 12b3a (4:6b3a) StatsText: ; 12b3a (4:6b3a)
db "ATTACK", $4e db "ATTACK"
db "DEFENSE", $4e next "DEFENSE"
db "SPEED", $4e next "SPEED"
db "SPECIAL@" next "SPECIAL@"
StatusScreen2: ; 12b57 (4:6b57) StatusScreen2: ; 12b57 (4:6b57)
ld a, [$ff00+$d7] ld a, [$ff00+$d7]
@ -31321,9 +31345,9 @@ TrainerInfo_FarCopyData: ; 1357f (4:757f)
jp FarCopyData2 jp FarCopyData2
TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584) TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584)
db "NAME/",$4E db "NAME/"
db "MONEY/",$4E next "MONEY/"
db "TIME/@" next "TIME/@"
; $76 is a circle tile ; $76 is a circle tile
TrainerInfo_BadgesText: ; 13597 (4:7597) TrainerInfo_BadgesText: ; 13597 (4:7597)
@ -39634,8 +39658,8 @@ BikeShopText1: ; 1d745 (7:5745)
jp TextScriptEnd jp TextScriptEnd
BikeShopMenuText: ; 1d7f8 (7:57f8) BikeShopMenuText: ; 1d7f8 (7:57f8)
db "BICYCLE", $4e db "BICYCLE"
db "CANCEL@" next "CANCEL@"
BikeShopMenuPrice: ; 1d807 (7:5807) BikeShopMenuPrice: ; 1d807 (7:5807)
db "¥1000000@" db "¥1000000@"
@ -42321,7 +42345,11 @@ BillsHousePokemonListText1: ; 1ec7f (7:6c7f)
db "@" db "@"
BillsMonListText: ; 1ec84 (7:6c84) BillsMonListText: ; 1ec84 (7:6c84)
db "EEVEE",$4e,"FLAREON",$4e,"JOLTEON",$4e,"VAPOREON",$4e,"CANCEL@" db "EEVEE"
next "FLAREON"
next "JOLTEON"
next "VAPOREON"
next "CANCEL@"
BillsHousePokemonListText2: ; 1ecaa (7:6caa) BillsHousePokemonListText2: ; 1ecaa (7:6caa)
TX_FAR _BillsHousePokemonListText2 TX_FAR _BillsHousePokemonListText2
@ -43833,9 +43861,9 @@ Func_37395: ; 37395 (d:7395)
jp Func_37395 jp Func_37395
UnnamedText_3745e: ; 3745e (d:745e) UnnamedText_3745e: ; 3745e (d:745e)
db "×3",$4e db "×3"
db "×2",$4e next "×2"
db "×1@" next "×1@"
UnnamedText_37467: ; 37467 (d:7467) UnnamedText_37467: ; 37467 (d:7467)
TX_FAR _UnnamedText_37467 TX_FAR _UnnamedText_37467
@ -65202,10 +65230,10 @@ PokedexContentsText: ; 402a6 (10:42a6)
db "CONTENTS@" db "CONTENTS@"
PokedexMenuItemsText: ; 402af (10:42af) PokedexMenuItemsText: ; 402af (10:42af)
db "DATA",$4E db "DATA"
db "CRY",$4E next "CRY"
db "AREA",$4E next "AREA"
db "QUIT@" next "QUIT@"
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
; INPUT: ; INPUT:
@ -85894,7 +85922,11 @@ DiplomaEmptyText:
db "@" db "@"
DiplomaCongrats: DiplomaCongrats:
db "Congrats! This",$4e,"diploma certifies",$4e,"that you have",$4e,"completed your",$4e,"#DEX.@" db "Congrats! This"
next "diploma certifies"
next "that you have"
next "completed your"
next "#DEX.@"
DiplomaGameFreak: DiplomaGameFreak:
db "GAME FREAK@" db "GAME FREAK@"
@ -93893,7 +93925,10 @@ LinkCableHelpText2: ; 5dca3 (17:5ca3)
db "@" db "@"
HowToLinkText: ; 5dca8 (17:5ca8) HowToLinkText: ; 5dca8 (17:5ca8)
db "HOW TO LINK",$4e,"COLOSSEUM",$4e,"TRADE CENTER",$4e,"STOP READING@" db "HOW TO LINK"
next "COLOSSEUM"
next "TRADE CENTER"
next "STOP READING@"
LinkCableInfoTexts: ; 5dcd8 (17:5cd8) LinkCableInfoTexts: ; 5dcd8 (17:5cd8)
dw LinkCableInfoText1 dw LinkCableInfoText1
@ -94003,14 +94038,14 @@ ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7)
db "@" db "@"
StatusAilmentText1: ; 5ddac (17:5dac) StatusAilmentText1: ; 5ddac (17:5dac)
db " SLP",$4e db " SLP"
db " PSN",$4e next " PSN"
db " PAR@" next " PAR@"
StatusAilmentText2: ; 5ddbb (17:5dbb) StatusAilmentText2: ; 5ddbb (17:5dbb)
db " BRN",$4e db " BRN"
db " FRZ",$4e next " FRZ"
db " QUIT@@" next " QUIT@@"
ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc) ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc)
dw ViridianBlackboardSleepText dw ViridianBlackboardSleepText
@ -98558,7 +98593,9 @@ Func_702f0: ; 702f0 (1c:42f0)
jp PlayCry jp PlayCry
HoFMonInfoText: ; 70329 (1c:4329) HoFMonInfoText: ; 70329 (1c:4329)
db "LEVEL/",$4e,"TYPE1/",$4e,"TYPE2/@" db "LEVEL/"
next "TYPE1/"
next "TYPE2/@"
Func_7033e: ; 7033e (1c:433e) Func_7033e: ; 7033e (1c:433e)
ld de, Unknown_72ede ; $6ede ld de, Unknown_72ede ; $6ede
@ -103542,18 +103579,18 @@ UnnamedText_739d4: ; 739d4 (1c:79d4)
db "@" db "@"
BoxNames: ; 739d9 (1c:79d9) BoxNames: ; 739d9 (1c:79d9)
db "BOX 1",$4e db "BOX 1"
db "BOX 2",$4e next "BOX 2"
db "BOX 3",$4e next "BOX 3"
db "BOX 4",$4e next "BOX 4"
db "BOX 5",$4e next "BOX 5"
db "BOX 6",$4e next "BOX 6"
db "BOX 7",$4e next "BOX 7"
db "BOX 8",$4e next "BOX 8"
db "BOX 9",$4e next "BOX 9"
db "BOX10",$4e next "BOX10"
db "BOX11",$4e next "BOX11"
db "BOX12@" next "BOX12@"
BoxNoText: ; 73a21 (1c:7a21) BoxNoText: ; 73a21 (1c:7a21)
db "BOX No.@" db "BOX No.@"
@ -105282,15 +105319,15 @@ VendingMachineText1: ; 74f99 (1d:4f99)
db "@" db "@"
DrinkText: ; 74f9e (1d:4f9e) DrinkText: ; 74f9e (1d:4f9e)
db "FRESH WATER",$4E db "FRESH WATER"
db "SODA POP",$4E next "SODA POP"
db "LEMONADE",$4E next "LEMONADE"
db "CANCEL@" next "CANCEL@"
DrinkPriceText: ; 74fc3 (1d:4fc3) DrinkPriceText: ; 74fc3 (1d:4fc3)
db "¥200",$4E db "¥200"
db "¥300",$4E next "¥300"
db "¥350",$4E,"@" next "¥350",$4E,"@"
VendingMachineText4: ; 74fd3 (1d:4fd3) VendingMachineText4: ; 74fd3 (1d:4fd3)
TX_FAR _VendingMachineText4 TX_FAR _VendingMachineText4