Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-14 16:20:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #51 from cawtds/migrate-string-table

Browse Source 
sync battle string table
This commit is contained in:
cawtds 2025-02-12 00:14:59 +01:00 committed by GitHub
commit 181c40c6a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 1191 additions and 1834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charmap.txt
View File

@ -427,6 +427,10 @@ B_ATK_NAME_WITH_PREFIX2 = FD 3E
B_DEF_NAME_WITH_PREFIX2 = FD 3F
B_EFF_NAME_WITH_PREFIX2 = FD 40
B_SCR_NAME_WITH_PREFIX2 = FD 41
B_TRAINER1_NAME_WITH_CLASS = FD 42
B_TRAINER2_NAME_WITH_CLASS = FD 43
B_PARTNER_NAME_WITH_CLASS = FD 44
B_ATK_TRAINER_NAME_WITH_CLASS = FD 45
@ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00

2
data/battle_scripts_1.s
View File

@ -5675,7 +5675,7 @@ BattleScript_LocalBattleLostPrintWhiteOut::
waitmessage B_WAIT_TIME_LONG
end2
BattleScript_LocalBattleLostEnd::
printstring STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER
printstring STRINGID_PLAYERLOSTTOENEMYTRAINER
waitmessage B_WAIT_TIME_LONG
getmoneyreward
printstring STRINGID_PLAYERPAIDPRIZEMONEY

2
data/battle_scripts_2.s
View File

@ -14,7 +14,7 @@
@ pokefirered leftovers
BattleScript_OldMan_Pokedude_CaughtMessage::
printstring STRINGID_GOTCHAPKMNCAUGHT2
printstring STRINGID_GOTCHAPKMNCAUGHTOLDMAN
setbyte gBattleOutcome, B_OUTCOME_CAUGHT
endlinkbattle
finishturn

8
data/scripts/pc_transfer.inc
View File

@ -22,23 +22,23 @@ EventScript_TransferredToPC::
EventScript_TransferredSomeonesPC::
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
goto_if_eq VAR_RESULT, TRUE, EventScript_TransferredSomeonesPCBoxFull
msgbox Text_MonSentToBoxInSomeonesPC
msgbox gText_PkmnTransferredSomeonesPC
return
EventScript_TransferredSomeonesPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname STR_VAR_3, VAR_RESULT
msgbox Text_MonSentToBoxSomeonesBoxFull
msgbox gText_PkmnTransferredSomeonesPCBoxFull
return
EventScript_TransferredBillsPC::
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
goto_if_eq VAR_RESULT, TRUE, EventScript_TransferredBillsPCBoxFull
msgbox Text_MonSentToBoxInBillsPC
msgbox gText_PkmnTransferredBillsPC
return
EventScript_TransferredBillsPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname STR_VAR_3, VAR_RESULT
msgbox Text_MonSentToBoxBillsBoxFull
msgbox gText_PkmnTransferredBillsPCBoxFull
return

8
data/text/pc_transfer.inc
View File

@ -1,22 +1,22 @@
Text_MonSentToBoxInSomeonesPC::
gText_PkmnTransferredSomeonesPC::
.string "{STR_VAR_2} was transferred to\n"
.string "Someone's PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxInBillsPC::
gText_PkmnTransferredBillsPC::
.string "{STR_VAR_2} was transferred to\n"
.string "BILL'S PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxSomeonesBoxFull::
gText_PkmnTransferredSomeonesPCBoxFull::
.string "BOX “{STR_VAR_3}” on\n"
.string "Someone's PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxBillsBoxFull::
gText_PkmnTransferredBillsPCBoxFull::
.string "BOX “{STR_VAR_3}” on\n"
.string "BILL'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"

7
include/battle_message.h
View File

@ -3,11 +3,14 @@
#include "constants/battle.h"
// This buffer can hold many different things. Some of the things it can hold
// that have explicit sizes are listed below to ensure it can contain them.
#define TEXT_BUFF_ARRAY_COUNT max(16, \
max(MOVE_NAME_LENGTH + 2, /* +2 to hold the "!" and EOS. */ \
max(POKEMON_NAME_LENGTH + 1, \
ABILITY_NAME_LENGTH + 1)))
#define BATTLE_MSG_MAX_WIDTH 208
#define BATTLE_MSG_MAX_LINES 2
// for 0xFD
@ -76,6 +79,10 @@
#define B_TXT_DEF_NAME_WITH_PREFIX2 0x3F //lowercase
#define B_TXT_EFF_NAME_WITH_PREFIX2 0x40 //lowercase
#define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX2 0x41 //lowercase
#define B_TXT_TRAINER1_NAME_WITH_CLASS 0x42
#define B_TXT_TRAINER2_NAME_WITH_CLASS 0x43
#define B_TXT_PARTNER_NAME_WITH_CLASS 0x44
#define B_TXT_ATK_TRAINER_NAME_WITH_CLASS 0x45
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3

440
include/constants/battle_string_ids.h
View File

@ -9,6 +9,7 @@
#define STRINGID_BATTLEEND 5
#define STRINGID_TRAINERSLIDE 6
// todo: make some of those names less vague: attacker/target vs pkmn, etc.
#define STRINGID_TRAINER1LOSETEXT 12
#define STRINGID_PKMNGAINEDEXP 13
#define STRINGID_PKMNGREWTOLV 14
@ -378,6 +379,7 @@
#define STRINGID_PKMNBOXLANETTESPCFULL 378
#define STRINGID_TRAINER1WINTEXT 379
#define STRINGID_TRAINER2WINTEXT 380
#define STRINGID_ENDUREDSTURDY 381
#define STRINGID_POWERHERB 382
#define STRINGID_HURTBYITEM 383
@ -488,7 +490,7 @@
#define STRINGID_NOTDONEYET 488
#define STRINGID_STICKYWEBUSED 489
#define STRINGID_QUASHSUCCESS 490
#define STRINGID_PKMNBLEWAWAYTOXICSPIKES 491
#define STRINGID_PKMNBLEWAWAYTOXICSPIKES 491
#define STRINGID_PKMNBLEWAWAYSTICKYWEB 492
#define STRINGID_PKMNBLEWAWAYSTEALTHROCK 493
#define STRINGID_IONDELUGEON 494
@ -529,228 +531,222 @@
#define STRINGID_LASERFOCUS 529
#define STRINGID_GEMACTIVATES 530
#define STRINGID_BERRYDMGREDUCES 531
#define STRINGID_TARGETATEITEM 532
#define STRINGID_AIRBALLOONFLOAT 533
#define STRINGID_AIRBALLOONPOP 534
#define STRINGID_INCINERATEBURN 535
#define STRINGID_BUGBITE 536
#define STRINGID_ILLUSIONWOREOFF 537
#define STRINGID_ATTACKERCUREDTARGETSTATUS 538
#define STRINGID_ATTACKERLOSTFIRETYPE 539
#define STRINGID_HEALERCURE 540
#define STRINGID_SCRIPTINGABILITYSTATRAISE 541
#define STRINGID_RECEIVERABILITYTAKEOVER 542
#define STRINGID_PKNMABSORBINGPOWER 543
#define STRINGID_NOONEWILLBEABLETORUNAWAY 544
#define STRINGID_DESTINYKNOTACTIVATES 545
#define STRINGID_CLOAKEDINAFREEZINGLIGHT 546
#define STRINGID_CLEARAMULETWONTLOWERSTATS 547
#define STRINGID_FERVENTWISHREACHED 548
#define STRINGID_AIRLOCKACTIVATES 549
#define STRINGID_PRESSUREENTERS 550
#define STRINGID_DARKAURAENTERS 551
#define STRINGID_FAIRYAURAENTERS 552
#define STRINGID_AURABREAKENTERS 553
#define STRINGID_COMATOSEENTERS 554
#define STRINGID_SCREENCLEANERENTERS 555
#define STRINGID_FETCHEDPOKEBALL 556
#define STRINGID_BATTLERABILITYRAISEDSTAT 557
#define STRINGID_ASANDSTORMKICKEDUP 558
#define STRINGID_PKMNSWILLPERISHIN3TURNS 559
#define STRINGID_ABILITYRAISEDSTATDRASTICALLY 560
#define STRINGID_AURAFLAREDTOLIFE 561
#define STRINGID_ASONEENTERS 562
#define STRINGID_CURIOUSMEDICINEENTERS 563
#define STRINGID_CANACTFASTERTHANKSTO 564
#define STRINGID_MICLEBERRYACTIVATES 565
#define STRINGID_PKMNSHOOKOFFTHETAUNT 566
#define STRINGID_PKMNGOTOVERITSINFATUATION 567
#define STRINGID_ITEMCANNOTBEREMOVED 568
#define STRINGID_STICKYBARBTRANSFER 569
#define STRINGID_PKMNBURNHEALED 570
#define STRINGID_REDCARDACTIVATE 571
#define STRINGID_EJECTBUTTONACTIVATE 572
#define STRINGID_ATKGOTOVERINFATUATION 573
#define STRINGID_TORMENTEDNOMORE 574
#define STRINGID_HEALBLOCKEDNOMORE 575
#define STRINGID_ATTACKERBECAMEFULLYCHARGED 576
#define STRINGID_ATTACKERBECAMEASHSPECIES 577
#define STRINGID_EXTREMELYHARSHSUNLIGHT 578
#define STRINGID_EXTREMESUNLIGHTFADED 579
#define STRINGID_MOVEEVAPORATEDINTHEHARSHSUNLIGHT 580
#define STRINGID_EXTREMELYHARSHSUNLIGHTWASNOTLESSENED 581
#define STRINGID_HEAVYRAIN 582
#define STRINGID_HEAVYRAINLIFTED 583
#define STRINGID_MOVEFIZZLEDOUTINTHEHEAVYRAIN 584
#define STRINGID_NORELIEFROMHEAVYRAIN 585
#define STRINGID_MYSTERIOUSAIRCURRENT 586
#define STRINGID_STRONGWINDSDISSIPATED 587
#define STRINGID_MYSTERIOUSAIRCURRENTBLOWSON 588
#define STRINGID_ATTACKWEAKENEDBSTRONGWINDS 589
#define STRINGID_STUFFCHEEKSCANTSELECT 590
#define STRINGID_PKMNREVERTEDTOPRIMAL 591
#define STRINGID_BUTPOKEMONCANTUSETHEMOVE 592
#define STRINGID_BUTHOOPACANTUSEIT 593
#define STRINGID_BROKETHROUGHPROTECTION 594
#define STRINGID_ABILITYALLOWSONLYMOVE 595
#define STRINGID_SWAPPEDABILITIES 596
#define STRINGID_PASTELVEILPROTECTED 597
#define STRINGID_PASTELVEILENTERS 598
#define STRINGID_BATTLERTYPECHANGEDTO 599
#define STRINGID_BOTHCANNOLONGERESCAPE 600
#define STRINGID_CANTESCAPEDUETOUSEDMOVE 601
#define STRINGID_PKMNBECAMEWEAKERTOFIRE 602
#define STRINGID_ABOUTTOUSEPOLTERGEIST 603
#define STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE 604
#define STRINGID_NEUTRALIZINGGASENTERS 605
#define STRINGID_NEUTRALIZINGGASOVER 606
#define STRINGID_TARGETTOOHEAVY 607
#define STRINGID_PKMNTOOKTARGETHIGH 608
#define STRINGID_PKMNINSNAPTRAP 609
#define STRINGID_METEORBEAMCHARGING 610
#define STRINGID_HEATUPBEAK 611
#define STRINGID_COURTCHANGE 612
#define STRINGID_PLAYERLOSTTOENEMYTRAINER 613
#define STRINGID_PLAYERPAIDPRIZEMONEY 614
#define STRINGID_ZPOWERSURROUNDS 615
#define STRINGID_ZMOVEUNLEASHED 616
#define STRINGID_ZMOVERESETSSTATS 617
#define STRINGID_ZMOVEALLSTATSUP 618
#define STRINGID_ZMOVEZBOOSTCRIT 619
#define STRINGID_ZMOVERESTOREHP 620
#define STRINGID_ZMOVESTATUP 621
#define STRINGID_ZMOVEHPTRAP 622
#define STRINGID_ATTACKEREXPELLEDTHEPOISON 623
#define STRINGID_ATTACKERSHOOKITSELFAWAKE 624
#define STRINGID_ATTACKERBROKETHROUGHPARALYSIS 625
#define STRINGID_ATTACKERHEALEDITSBURN 626
#define STRINGID_ATTACKERMELTEDTHEICE 627
#define STRINGID_TARGETTOUGHEDITOUT 628
#define STRINGID_ATTACKERLOSTELECTRICTYPE 629
#define STRINGID_ATTACKERSWITCHEDSTATWITHTARGET 630
#define STRINGID_BEINGHITCHARGEDPKMNWITHPOWER 631
#define STRINGID_SUNLIGHTACTIVATEDABILITY 632
#define STRINGID_STATWASHEIGHTENED 633
#define STRINGID_ELECTRICTERRAINACTIVATEDABILITY 634
#define STRINGID_ABILITYWEAKENEDSURROUNDINGMONSSTAT 635
#define STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN 636
#define STRINGID_PKMNSABILITYPREVENTSABILITY 637
#define STRINGID_PREPARESHELLTRAP 638
#define STRINGID_SHELLTRAPDIDNTWORK 639
#define STRINGID_SPIKESDISAPPEAREDFROMTEAM 640
#define STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM 641
#define STRINGID_STICKYWEBDISAPPEAREDFROMTEAM 642
#define STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM 643
#define STRINGID_COULDNTFULLYPROTECT 644
#define STRINGID_STOCKPILEDEFFECTWOREOFF 645
#define STRINGID_PKMNREVIVEDREADYTOFIGHT 646
#define STRINGID_ITEMRESTOREDSPECIESHEALTH 647
#define STRINGID_ITEMCUREDSPECIESSTATUS 648
#define STRINGID_ITEMRESTOREDSPECIESPP 649
#define STRINGID_THUNDERCAGETRAPPED 650
#define STRINGID_PKMNHURTBYFROSTBITE 651
#define STRINGID_PKMNGOTFROSTBITE 652
#define STRINGID_PKMNSITEMHEALEDFROSTBITE 653
#define STRINGID_ATTACKERHEALEDITSFROSTBITE 654
#define STRINGID_PKMNFROSTBITEHEALED 655
#define STRINGID_PKMNFROSTBITEHEALED2 656
#define STRINGID_PKMNFROSTBITEHEALEDBY 657
#define STRINGID_MIRRORHERBCOPIED 658
#define STRINGID_STARTEDSNOW 659
#define STRINGID_SNOWCONTINUES 660
#define STRINGID_SNOWSTOPPED 661
#define STRINGID_SNOWWARNINGSNOW 662
#define STRINGID_PKMNITEMMELTED 663
#define STRINGID_ULTRABURSTREACTING 664
#define STRINGID_ULTRABURSTCOMPLETED 665
#define STRINGID_TEAMGAINEDEXP 666
#define STRINGID_CURRENTMOVECANTSELECT 667
#define STRINGID_TARGETISBEINGSALTCURED 668
#define STRINGID_TARGETISHURTBYSALTCURE 669
#define STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP 670
#define STRINGID_SHARPSTEELFLOATS 671
#define STRINGID_SHARPSTEELDMG 672
#define STRINGID_PKMNBLEWAWAYSHARPSTEEL 673
#define STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM 674
#define STRINGID_TEAMTRAPPEDWITHVINES 675
#define STRINGID_PKMNHURTBYVINES 676
#define STRINGID_TEAMCAUGHTINVORTEX 677
#define STRINGID_PKMNHURTBYVORTEX 678
#define STRINGID_TEAMSURROUNDEDBYFIRE 679
#define STRINGID_PKMNBURNINGUP 680
#define STRINGID_TEAMSURROUNDEDBYROCKS 681
#define STRINGID_PKMNHURTBYROCKSTHROWN 682
#define STRINGID_MOVEBLOCKEDBYDYNAMAX 683
#define STRINGID_ZEROTOHEROTRANSFORMATION 684
#define STRINGID_THETWOMOVESBECOMEONE 685
#define STRINGID_ARAINBOWAPPEAREDONSIDE 686
#define STRINGID_THERAINBOWDISAPPEARED 687
#define STRINGID_THESEAOFFIREDISAPPEARED 691
#define STRINGID_THESWAMPDISAPPEARED 693
#define STRINGID_WAITINGFORPARTNERSMOVE 688
#define STRINGID_SEAOFFIREENVELOPEDSIDE 689
#define STRINGID_HURTBYTHESEAOFFIRE 690
#define STRINGID_SWAMPENVELOPEDSIDE 692
#define STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE 694
#define STRINGID_HOSPITALITYRESTORATION 695
#define STRINGID_ELECTROSHOTCHARGING 696
#define STRINGID_ITEMWASUSEDUP 697
#define STRINGID_ATTACKERLOSTITSTYPE 698
#define STRINGID_SHEDITSTAIL 699
#define STRINGID_CLOAKEDINAHARSHLIGHT 700
#define STRINGID_SUPERSWEETAROMAWAFTS 701
#define STRINGID_DIMENSIONSWERETWISTED 702
#define STRINGID_BIZARREARENACREATED 703
#define STRINGID_BIZARREAREACREATED 704
#define STRINGID_TIDYINGUPCOMPLETE 705
#define STRINGID_OLDMANUSEDITEM 706
#define STRINGID_GOTCHAPKMNCAUGHT 707
#define STRINGID_GOTCHAPKMNCAUGHT2 708
#define STRINGID_THREWROCK 709
#define STRINGID_THREWBAIT 710
#define STRINGID_PKMNANGRY 711
#define STRINGID_PKMNEATING 712
#define STRINGID_DUMMY288 713
#define STRINGID_DUMMY289 714
#define STRINGID_OAKPLAYERWON 715
#define STRINGID_OAKPLAYERLOST 716
#define STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER 717
#define STRINGID_PKMNTRANSFERREDBILLSPC 718
#define STRINGID_PKMNBOXBILLSPCFULL 719
#define STRINGID_POKEDUDEUSED 720
#define STRINGID_POKEFLUTECATCHY 721
#define STRINGID_POKEFLUTE 722
#define STRINGID_MONHEARINGFLUTEAWOKE 723
#define STRINGID_PLAYERWHITEDOUT 724
#define STRINGID_MONTOOSCAREDTOMOVE 725
#define STRINGID_GHOSTGETOUTGETOUT 726
#define STRINGID_SILPHSCOPEUNVEILED 727
#define STRINGID_GHOSTWASMAROWAK 728
#define STRINGID_TRAINER1MON1COMEBACK 729
#define STRINGID_TRAINER1MON2COMEBACK 730
#define STRINGID_TRAINER1MON1AND2COMEBACK 731
#define STRINGID_PKMNTERASTALLIZEDINTO 732
#define STRINGID_BOOSTERENERGYACTIVATES 733
#define STRINGID_FOGCREPTUP 734
#define STRINGID_FOGISDEEP 735
#define STRINGID_FOGLIFTED 736
#define STRINGID_PKMNMADESHELLGLEAM 737
#define STRINGID_FICKLEBEAMDOUBLED 738
#define STRINGID_SUNLIGHTISHARSH 739
#define STRINGID_ITISHAILING 740
#define STRINGID_ITISSNOWING 741
#define STRINGID_ISCOVEREDWITHGRASS 742
#define STRINGID_MISTSWIRLSAROUND 743
#define STRINGID_ELECTRICCURRENTISRUNNING 744
#define STRINGID_SEEMSWEIRD 745
#define STRINGID_WAGGLINGAFINGER 746
#define STRINGID_COMMANDERACTIVATES 747
#define STRINGID_BLOCKEDBYSLEEPCLAUSE 748
#define STRINGID_SUPEREFFECTIVETWOFOES 749
#define STRINGID_NOTVERYEFFECTIVETWOFOES 750
#define STRINGID_ITDOESNTAFFECTTWOFOES 751
#define STRINGID_AIRBALLOONFLOAT 532
#define STRINGID_AIRBALLOONPOP 533
#define STRINGID_INCINERATEBURN 534
#define STRINGID_BUGBITE 535
#define STRINGID_ILLUSIONWOREOFF 536
#define STRINGID_ATTACKERCUREDTARGETSTATUS 537
#define STRINGID_ATTACKERLOSTFIRETYPE 538
#define STRINGID_HEALERCURE 539
#define STRINGID_SCRIPTINGABILITYSTATRAISE 540
#define STRINGID_RECEIVERABILITYTAKEOVER 541
#define STRINGID_PKNMABSORBINGPOWER 542
#define STRINGID_NOONEWILLBEABLETORUNAWAY 543
#define STRINGID_DESTINYKNOTACTIVATES 544
#define STRINGID_CLOAKEDINAFREEZINGLIGHT 545
#define STRINGID_CLEARAMULETWONTLOWERSTATS 546
#define STRINGID_FERVENTWISHREACHED 547
#define STRINGID_AIRLOCKACTIVATES 548
#define STRINGID_PRESSUREENTERS 549
#define STRINGID_DARKAURAENTERS 550
#define STRINGID_FAIRYAURAENTERS 551
#define STRINGID_AURABREAKENTERS 552
#define STRINGID_COMATOSEENTERS 553
#define STRINGID_SCREENCLEANERENTERS 554
#define STRINGID_FETCHEDPOKEBALL 555
#define STRINGID_BATTLERABILITYRAISEDSTAT 556
#define STRINGID_ASANDSTORMKICKEDUP 557
#define STRINGID_PKMNSWILLPERISHIN3TURNS 558
#define STRINGID_ABILITYRAISEDSTATDRASTICALLY 559
#define STRINGID_AURAFLAREDTOLIFE 560
#define STRINGID_ASONEENTERS 561
#define STRINGID_CURIOUSMEDICINEENTERS 562
#define STRINGID_CANACTFASTERTHANKSTO 563
#define STRINGID_MICLEBERRYACTIVATES 564
#define STRINGID_PKMNSHOOKOFFTHETAUNT 565
#define STRINGID_PKMNGOTOVERITSINFATUATION 566
#define STRINGID_ITEMCANNOTBEREMOVED 567
#define STRINGID_STICKYBARBTRANSFER 568
#define STRINGID_PKMNBURNHEALED 569
#define STRINGID_REDCARDACTIVATE 570
#define STRINGID_EJECTBUTTONACTIVATE 571
#define STRINGID_ATKGOTOVERINFATUATION 572
#define STRINGID_TORMENTEDNOMORE 573
#define STRINGID_HEALBLOCKEDNOMORE 574
#define STRINGID_ATTACKERBECAMEFULLYCHARGED 575
#define STRINGID_ATTACKERBECAMEASHSPECIES 576
#define STRINGID_EXTREMELYHARSHSUNLIGHT 577
#define STRINGID_EXTREMESUNLIGHTFADED 578
#define STRINGID_MOVEEVAPORATEDINTHEHARSHSUNLIGHT 579
#define STRINGID_EXTREMELYHARSHSUNLIGHTWASNOTLESSENED 580
#define STRINGID_HEAVYRAIN 581
#define STRINGID_HEAVYRAINLIFTED 582
#define STRINGID_MOVEFIZZLEDOUTINTHEHEAVYRAIN 583
#define STRINGID_NORELIEFROMHEAVYRAIN 584
#define STRINGID_MYSTERIOUSAIRCURRENT 585
#define STRINGID_STRONGWINDSDISSIPATED 586
#define STRINGID_MYSTERIOUSAIRCURRENTBLOWSON 587
#define STRINGID_ATTACKWEAKENEDBSTRONGWINDS 588
#define STRINGID_STUFFCHEEKSCANTSELECT 589
#define STRINGID_PKMNREVERTEDTOPRIMAL 590
#define STRINGID_BUTPOKEMONCANTUSETHEMOVE 591
#define STRINGID_BUTHOOPACANTUSEIT 592
#define STRINGID_BROKETHROUGHPROTECTION 593
#define STRINGID_ABILITYALLOWSONLYMOVE 594
#define STRINGID_SWAPPEDABILITIES 595
#define STRINGID_PASTELVEILPROTECTED 596
#define STRINGID_PASTELVEILENTERS 597
#define STRINGID_BATTLERTYPECHANGEDTO 598
#define STRINGID_BOTHCANNOLONGERESCAPE 599
#define STRINGID_CANTESCAPEDUETOUSEDMOVE 600
#define STRINGID_PKMNBECAMEWEAKERTOFIRE 601
#define STRINGID_ABOUTTOUSEPOLTERGEIST 602
#define STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE 603
#define STRINGID_NEUTRALIZINGGASENTERS 604
#define STRINGID_NEUTRALIZINGGASOVER 605
#define STRINGID_TARGETTOOHEAVY 606
#define STRINGID_PKMNTOOKTARGETHIGH 607
#define STRINGID_PKMNINSNAPTRAP 608
#define STRINGID_METEORBEAMCHARGING 609
#define STRINGID_HEATUPBEAK 610
#define STRINGID_COURTCHANGE 611
#define STRINGID_PLAYERLOSTTOENEMYTRAINER 612
#define STRINGID_PLAYERPAIDPRIZEMONEY 613
#define STRINGID_ZPOWERSURROUNDS 614
#define STRINGID_ZMOVEUNLEASHED 615
#define STRINGID_ZMOVERESETSSTATS 616
#define STRINGID_ZMOVEALLSTATSUP 617
#define STRINGID_ZMOVEZBOOSTCRIT 618
#define STRINGID_ZMOVERESTOREHP 619
#define STRINGID_ZMOVESTATUP 620
#define STRINGID_ZMOVEHPTRAP 621
#define STRINGID_ATTACKEREXPELLEDTHEPOISON 622
#define STRINGID_ATTACKERSHOOKITSELFAWAKE 623
#define STRINGID_ATTACKERBROKETHROUGHPARALYSIS 624
#define STRINGID_ATTACKERHEALEDITSBURN 625
#define STRINGID_ATTACKERMELTEDTHEICE 626
#define STRINGID_TARGETTOUGHEDITOUT 627
#define STRINGID_ATTACKERLOSTELECTRICTYPE 628
#define STRINGID_ATTACKERSWITCHEDSTATWITHTARGET 629
#define STRINGID_BEINGHITCHARGEDPKMNWITHPOWER 630
#define STRINGID_SUNLIGHTACTIVATEDABILITY 631
#define STRINGID_STATWASHEIGHTENED 632
#define STRINGID_ELECTRICTERRAINACTIVATEDABILITY 633
#define STRINGID_ABILITYWEAKENEDSURROUNDINGMONSSTAT 634
#define STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN 635
#define STRINGID_PKMNSABILITYPREVENTSABILITY 636
#define STRINGID_PREPARESHELLTRAP 637
#define STRINGID_SHELLTRAPDIDNTWORK 638
#define STRINGID_SPIKESDISAPPEAREDFROMTEAM 639
#define STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM 640
#define STRINGID_STICKYWEBDISAPPEAREDFROMTEAM 641
#define STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM 642
#define STRINGID_COULDNTFULLYPROTECT 643
#define STRINGID_STOCKPILEDEFFECTWOREOFF 644
#define STRINGID_PKMNREVIVEDREADYTOFIGHT 645
#define STRINGID_ITEMRESTOREDSPECIESHEALTH 646
#define STRINGID_ITEMCUREDSPECIESSTATUS 647
#define STRINGID_ITEMRESTOREDSPECIESPP 648
#define STRINGID_THUNDERCAGETRAPPED 649
#define STRINGID_PKMNHURTBYFROSTBITE 650
#define STRINGID_PKMNGOTFROSTBITE 651
#define STRINGID_PKMNSITEMHEALEDFROSTBITE 652
#define STRINGID_ATTACKERHEALEDITSFROSTBITE 653
#define STRINGID_PKMNFROSTBITEHEALED 654
#define STRINGID_PKMNFROSTBITEHEALED2 655
#define STRINGID_PKMNFROSTBITEHEALEDBY 656
#define STRINGID_MIRRORHERBCOPIED 657
#define STRINGID_STARTEDSNOW 658
#define STRINGID_SNOWCONTINUES 659
#define STRINGID_SNOWSTOPPED 660
#define STRINGID_SNOWWARNINGSNOW 661
#define STRINGID_PKMNITEMMELTED 662
#define STRINGID_ULTRABURSTREACTING 663
#define STRINGID_ULTRABURSTCOMPLETED 664
#define STRINGID_TEAMGAINEDEXP 665
#define STRINGID_CURRENTMOVECANTSELECT 666
#define STRINGID_TARGETISBEINGSALTCURED 667
#define STRINGID_TARGETISHURTBYSALTCURE 668
#define STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP 669
#define STRINGID_SHARPSTEELFLOATS 670
#define STRINGID_SHARPSTEELDMG 671
#define STRINGID_PKMNBLEWAWAYSHARPSTEEL 672
#define STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM 673
#define STRINGID_TEAMTRAPPEDWITHVINES 674
#define STRINGID_PKMNHURTBYVINES 675
#define STRINGID_TEAMCAUGHTINVORTEX 676
#define STRINGID_PKMNHURTBYVORTEX 677
#define STRINGID_TEAMSURROUNDEDBYFIRE 678
#define STRINGID_PKMNBURNINGUP 679
#define STRINGID_TEAMSURROUNDEDBYROCKS 680
#define STRINGID_PKMNHURTBYROCKSTHROWN 681
#define STRINGID_MOVEBLOCKEDBYDYNAMAX 682
#define STRINGID_ZEROTOHEROTRANSFORMATION 683
#define STRINGID_THETWOMOVESBECOMEONE 684
#define STRINGID_ARAINBOWAPPEAREDONSIDE 685
#define STRINGID_THERAINBOWDISAPPEARED 686
#define STRINGID_WAITINGFORPARTNERSMOVE 687
#define STRINGID_SEAOFFIREENVELOPEDSIDE 688
#define STRINGID_HURTBYTHESEAOFFIRE 689
#define STRINGID_THESEAOFFIREDISAPPEARED 690
#define STRINGID_SWAMPENVELOPEDSIDE 691
#define STRINGID_THESWAMPDISAPPEARED 692
#define STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE 693
#define STRINGID_HOSPITALITYRESTORATION 694
#define STRINGID_ELECTROSHOTCHARGING 695
#define STRINGID_ITEMWASUSEDUP 696
#define STRINGID_ATTACKERLOSTITSTYPE 697
#define STRINGID_SHEDITSTAIL 698
#define STRINGID_CLOAKEDINAHARSHLIGHT 699
#define STRINGID_SUPERSWEETAROMAWAFTS 700
#define STRINGID_DIMENSIONSWERETWISTED 701
#define STRINGID_BIZARREARENACREATED 702
#define STRINGID_BIZARREAREACREATED 703
#define STRINGID_TIDYINGUPCOMPLETE 704
#define STRINGID_PKMNTERASTALLIZEDINTO 705
#define STRINGID_BOOSTERENERGYACTIVATES 706
#define STRINGID_FOGCREPTUP 707
#define STRINGID_FOGISDEEP 708
#define STRINGID_FOGLIFTED 709
#define STRINGID_PKMNMADESHELLGLEAM 710
#define STRINGID_FICKLEBEAMDOUBLED 711
#define STRINGID_COMMANDERACTIVATES 712
#define STRINGID_POKEFLUTECATCHY 713
#define STRINGID_POKEFLUTE 714
#define STRINGID_MONHEARINGFLUTEAWOKE 715
#define STRINGID_SUNLIGHTISHARSH 716
#define STRINGID_ITISHAILING 717
#define STRINGID_ITISSNOWING 718
#define STRINGID_ISCOVEREDWITHGRASS 719
#define STRINGID_MISTSWIRLSAROUND 720
#define STRINGID_ELECTRICCURRENTISRUNNING 721
#define STRINGID_SEEMSWEIRD 722
#define STRINGID_WAGGLINGAFINGER 723
#define STRINGID_BLOCKEDBYSLEEPCLAUSE 724
#define STRINGID_SUPEREFFECTIVETWOFOES 725
#define STRINGID_NOTVERYEFFECTIVETWOFOES 726
#define STRINGID_ITDOESNTAFFECTTWOFOES 727
#define BATTLESTRINGS_COUNT 752
// pokefirered specific
#define STRINGID_OLDMANUSEDITEM 728
#define STRINGID_GOTCHAPKMNCAUGHTOLDMAN 729
#define STRINGID_THREWROCK 730
#define STRINGID_THREWBAIT 731
#define STRINGID_PKMNANGRY 732
#define STRINGID_PKMNEATING 733
#define STRINGID_PKMNTRANSFERREDBILLSPC 734
#define STRINGID_PKMNBOXBILLSPCFULL 735
#define STRINGID_POKEDUDEUSED 736
#define STRINGID_MONTOOSCAREDTOMOVE 737
#define STRINGID_GHOSTGETOUTGETOUT 738
#define STRINGID_SILPHSCOPEUNVEILED 739
#define STRINGID_GHOSTWASMAROWAK 740
#define STRINGID_TRAINER1MON1COMEBACK 741
#define STRINGID_TRAINER1MON2COMEBACK 742
#define STRINGID_TRAINER1MON1AND2COMEBACK 743
#define BATTLESTRINGS_COUNT 744
// This is the string id that gBattleStringsTable starts with.
// String ids before this (e.g. STRINGID_INTROMSG) are not in the table,

8
include/event_scripts.h
View File

@ -1208,10 +1208,10 @@ extern const u8 EventScript_AccessPokemonBoxLink[];
extern const u8 EventScript_SprayWoreOff[];
// battle_message
extern const u8 Text_MonSentToBoxInSomeonesPC[];
extern const u8 Text_MonSentToBoxInBillsPC[];
extern const u8 Text_MonSentToBoxSomeonesBoxFull[];
extern const u8 Text_MonSentToBoxBillsBoxFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredBillsPC[];
extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[];
extern const u8 gText_PkmnTransferredBillsPCBoxFull[];
extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
extern const u8 gText_PkmnTransferredLanettesPC[];

14
include/strings.h
View File

@ -215,8 +215,6 @@ extern const u8 gString_SlotMachineControls[];
// battle_controller_safari
extern const u8 gText_EmptyString3[];
extern const u8 gText_SafariZoneMenu[];
extern const u8 gText_WhatWillPlayerThrow[];
// battle_controller_player
extern const u8 gText_BattleSwitchWhich[];
@ -229,18 +227,6 @@ extern const u8 gText_BattleMenu[];
extern const u8 gText_WhatWillPkmnDo[];
extern const u8 gText_NewLine[];
// battle_controller_oak_old_man
extern const u8 gText_ForPetesSake[];
extern const u8 gText_TheTrainerThat[];
extern const u8 gText_TryBattling[];
extern const u8 gText_InflictingDamageIsKey[];
extern const u8 gText_LoweringStats[];
extern const u8 gText_KeepAnEyeOnHP[];
extern const u8 gText_OakNoRunningFromATrainer[];
extern const u8 gText_WinEarnsPrizeMoney[];
extern const u8 gText_HowDissapointing[];
extern const u8 gText_WhatWillOldManDo[];
// battle_controller_pokedude
extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[];
extern const u8 Pokedude_Text_MyRattataFasterThanPidgey[];

29
src/battle_controller_oak_old_man.c
View File

@ -49,6 +49,17 @@ static void PrintOakText_ForPetesSake(u32 battler);
static void PrintOakTextWithMainBgDarkened(u32 battler, const u8 *text, u8 delay);
static void HandleInputChooseAction(u32 battler);
static const u8 sText_ForPetesSake[] = _("OAK: Oh, for Pete's sake…\nSo pushy, as always.\p{B_PLAYER_NAME}.\pYou've never had a POKéMON battle\nbefore, have you?\pA POKéMON battle is when TRAINERS\npit their POKéMON against each\lother.\p");
static const u8 sText_HowDissapointing[] = _("OAK: Hm…\nHow disappointing…\pIf you win, you earn prize money,\nand your POKéMON grow.\pBut if you lose, {B_PLAYER_NAME}, you end\nup paying prize money…\pHowever, since you had no warning\nthis time, I'll pay for you.\pBut things won't be this way once\nyou step outside these doors.\pThat's why you must strengthen your\nPOKéMON by battling wild POKéMON.\p");
static const u8 sText_InflictingDamageIsKey[] = _("OAK: Inflicting damage on the foe\nis the key to any battle.\p");
static const u8 sText_KeepAnEyeOnHP[] = _("OAK: Keep your eyes on your\nPOKéMON's HP.\pIt will faint if the HP drops to\n“0.”\p");
static const u8 sText_LoweringStats[] = _("OAK: Lowering the foe's stats\nwill put you at an advantage.\p");
static const u8 sText_OakNoRunningFromATrainer[] = _("OAK: No! There's no running away\nfrom a TRAINER POKéMON battle!\p");
static const u8 sText_TheTrainerThat[] = _("The TRAINER that makes the other\nTRAINER's POKéMON faint by lowering\ltheir HP to “0,” wins.\p");
static const u8 sText_TryBattling[] = _("But rather than talking about it,\nyou'll learn more from experience.\pTry battling and see for yourself.\p");
static const u8 sText_WinEarnsPrizeMoney[] = _("OAK: Hm! Excellent!\pIf you win, you earn prize money,\nand your POKéMON will grow!\pBattle other TRAINERS and make\nyour POKéMON strong!\p");
static const u8 gText_WhatWillOldManDo[] = _("What will the\nold man do?");
static void (*const sOakOldManBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) =
{
[CONTROLLER_GETMONDATA] = BtlController_HandleGetMonData,
@ -414,7 +425,7 @@ static void PrintOakText_ForPetesSake(u32 battler)
}
break;
case 2:
BattleStringExpandPlaceholdersToDisplayedString(gText_ForPetesSake);
BattleStringExpandPlaceholdersToDisplayedString(sText_ForPetesSake);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN);
++gBattleStruct->simulatedInputState[0];
break;
@ -433,7 +444,7 @@ static void PrintOakText_ForPetesSake(u32 battler)
case 4:
if (!gPaletteFade.active)
{
BattleStringExpandPlaceholdersToDisplayedString(gText_TheTrainerThat);
BattleStringExpandPlaceholdersToDisplayedString(sText_TheTrainerThat);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN);
++gBattleStruct->simulatedInputState[0];
}
@ -453,7 +464,7 @@ static void PrintOakText_ForPetesSake(u32 battler)
case 6:
if (!gPaletteFade.active)
{
BattleStringExpandPlaceholdersToDisplayedString(gText_TryBattling);
BattleStringExpandPlaceholdersToDisplayedString(sText_TryBattling);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN);
++gBattleStruct->simulatedInputState[0];
}
@ -483,27 +494,27 @@ static void PrintOakText_ForPetesSake(u32 battler)
void PrintOakText_InflictingDamageIsKey(u32 battler)
{
PrintOakTextWithMainBgDarkened(battler, gText_InflictingDamageIsKey, 1);
PrintOakTextWithMainBgDarkened(battler, sText_InflictingDamageIsKey, 1);
}
static void PrintOakText_LoweringStats(u32 battler)
{
PrintOakTextWithMainBgDarkened(battler, gText_LoweringStats, 64);
PrintOakTextWithMainBgDarkened(battler, sText_LoweringStats, 64);
}
void PrintOakText_OakNoRunningFromATrainer(u32 battler)
{
PrintOakTextWithMainBgDarkened(battler, gText_OakNoRunningFromATrainer, 1);
PrintOakTextWithMainBgDarkened(battler, sText_OakNoRunningFromATrainer, 1);
}
static void PrintOakText_WinEarnsPrizeMoney(u32 battler)
{
PrintOakTextWithMainBgDarkened(battler, gText_WinEarnsPrizeMoney, 64);
PrintOakTextWithMainBgDarkened(battler, sText_WinEarnsPrizeMoney, 64);
}
void PrintOakText_HowDisappointing(u32 battler)
{
PrintOakTextWithMainBgDarkened(battler, gText_HowDissapointing, 64);
PrintOakTextWithMainBgDarkened(battler, sText_HowDissapointing, 64);
}
static void PrintOakTextWithMainBgDarkened(u32 battler, const u8 *text, u8 delay)
@ -605,7 +616,7 @@ static void PrintOakText_KeepAnEyeOnHP(u32 battler)
}
break;
case 3:
BattleStringExpandPlaceholdersToDisplayedString(gText_KeepAnEyeOnHP);
BattleStringExpandPlaceholdersToDisplayedString(sText_KeepAnEyeOnHP);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN);
++gBattleStruct->simulatedInputState[0];
break;

7
src/battle_controller_safari.c
View File

@ -101,6 +101,9 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) =
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static const u8 sText_WhatWillPlayerThrow[] = _("What will {B_PLAYER_NAME}\nthrow?");
static const u8 sText_SafariZoneMenu[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}BALL{CLEAR_TO 56}BAIT\nROCK{CLEAR_TO 56}RUN");
void SetControllerToSafari(u32 battler)
{
gBattlerControllerEndFuncs[battler] = SafariBufferExecCompleted;
@ -287,13 +290,13 @@ static void SafariHandleChooseAction(u32 battler)
gBattlerControllerFuncs[battler] = HandleChooseActionAfterDma3;
BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG);
BattlePutTextOnWindow(gText_SafariZoneMenu, B_WIN_ACTION_MENU);
BattlePutTextOnWindow(sText_SafariZoneMenu, B_WIN_ACTION_MENU);
for (i = 0; i < 4; i++)
ActionSelectionDestroyCursorAt(i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[battler], 0);
BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPlayerThrow);
BattleStringExpandPlaceholdersToDisplayedString(sText_WhatWillPlayerThrow);
BreakStringAutomatic(gDisplayedStringBattle, WindowWidthPx(B_WIN_ACTION_PROMPT), 2, FONT_NORMAL);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT);
}

2434
src/battle_message.c
View File

File diff suppressed because it is too large Load Diff

44
src/evolution_scene.c
View File

@ -880,7 +880,7 @@ static void Task_EvolutionScene(u8 taskId)
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
gTasks[taskId].tState++;
@ -898,7 +898,7 @@ static void Task_EvolutionScene(u8 taskId)
{
// "{mon} is trying to learn {move}"
BufferMoveToLearnIntoBattleTextBuff2();
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveState++;
}
@ -907,7 +907,7 @@ static void Task_EvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
// "But, {mon} can't learn more than four moves"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveState++;
}
@ -916,7 +916,7 @@ static void Task_EvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
// "Delete a move to make room for {move}?"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveYesState = MVSTATE_SHOW_MOVE_SELECT;
gTasks[taskId].tLearnMoveNoState = MVSTATE_ASK_CANCEL;
@ -1004,7 +1004,7 @@ static void Task_EvolutionScene(u8 taskId)
if (IsMoveHM(move))
{
// Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveState = MVSTATE_RETRY_AFTER_HM;
}
@ -1021,14 +1021,14 @@ static void Task_EvolutionScene(u8 taskId)
}
break;
case MVSTATE_FORGET_MSG_1:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveState++;
break;
case MVSTATE_FORGET_MSG_2:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveState++;
}
@ -1036,20 +1036,20 @@ static void Task_EvolutionScene(u8 taskId)
case MVSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE;
}
break;
case MVSTATE_ASK_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tLearnMoveYesState = MVSTATE_CANCEL;
gTasks[taskId].tLearnMoveNoState = MVSTATE_INTRO_MSG_1;
gTasks[taskId].tLearnMoveState = MVSTATE_PRINT_YES_NO;
break;
case MVSTATE_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
break;
@ -1300,7 +1300,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
gTasks[taskId].tState++;
@ -1318,7 +1318,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
// "{mon} is trying to learn {move}"
BufferMoveToLearnIntoBattleTextBuff2();
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState++;
}
@ -1327,7 +1327,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
// "But, {mon} can't learn more than four moves"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState++;
}
@ -1336,7 +1336,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
// "Delete a move to make room for {move}?"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveYesState = T_MVSTATE_SHOW_MOVE_SELECT;
gTasks[taskId].tLearnMoveNoState = T_MVSTATE_ASK_CANCEL;
@ -1357,7 +1357,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
case 0: // YES
sEvoCursorPos = 0;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState;
if (gTasks[taskId].tLearnMoveState == T_MVSTATE_SHOW_MOVE_SELECT)
@ -1366,7 +1366,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
case 1: // NO
case MENU_B_PRESSED:
sEvoCursorPos = 1;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
break;
@ -1405,7 +1405,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (IsMoveHM(move))
{
// Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = T_MVSTATE_RETRY_AFTER_HM;
}
@ -1416,7 +1416,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
RemoveMonPPBonus(mon, var);
SetMonMoveSlot(mon, gMoveToLearn, var);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState++;
}
@ -1426,7 +1426,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
case T_MVSTATE_FORGET_MSG:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState++;
}
@ -1434,20 +1434,20 @@ static void Task_TradeEvolutionScene(u8 taskId)
case T_MVSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tState = T_EVOSTATE_LEARNED_MOVE;
}
break;
case T_MVSTATE_ASK_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveYesState = T_MVSTATE_CANCEL;
gTasks[taskId].tLearnMoveNoState = T_MVSTATE_INTRO_MSG_1;
gTasks[taskId].tLearnMoveState = T_MVSTATE_PRINT_YES_NO;
break;
case T_MVSTATE_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START]);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE;
break;

8
src/naming_screen.c
View File

@ -291,10 +291,10 @@ static const u16 sRival_Gfx[] = INCBIN_U16("graphics/naming_screen/rival.4bpp");
static const u8 *const sTransferredToPCMessages[] =
{
Text_MonSentToBoxInSomeonesPC,
Text_MonSentToBoxInBillsPC,
Text_MonSentToBoxSomeonesBoxFull,
Text_MonSentToBoxBillsBoxFull
gText_PkmnTransferredSomeonesPC,
gText_PkmnTransferredBillsPC,
gText_PkmnTransferredSomeonesPCBoxFull,
gText_PkmnTransferredBillsPCBoxFull
};
static const struct BgTemplate sBgTemplates[] =

10
test/text.c
View File

@ -593,7 +593,7 @@ TEST("Battle strings fit on the battle message window")
for (i = start; i <= end; i++)
{
PARAMETRIZE_LABEL("%S", gBattleStringsTable[i - BATTLESTRINGS_TABLE_START]) { battleStringId = i - BATTLESTRINGS_TABLE_START; }
PARAMETRIZE_LABEL("%S", gBattleStringsTable[i]) { battleStringId = i; }
}
// Clear buffers
@ -635,7 +635,7 @@ TEST("Battle strings fit on the battle message window")
// In cases where a buffer is used with multiple contexts, the widest string is used.
// Eg. STRINGID_CANACTFASTERTHANKSTO is used for both with abilities and items,
// so ability is chosen because it's longer.
switch (battleStringId + BATTLESTRINGS_TABLE_START)
switch (battleStringId)
{
// Testing Trainer messages is out of the current scope for this test.
case STRINGID_TRAINER1LOSETEXT:
@ -805,9 +805,9 @@ TEST("Battle strings fit on the battle message window")
break;
// Buffer Box name to STR_VAR_1 and STR_VAR_3, Nickname to STR_VAR_2
case STRINGID_PKMNTRANSFERREDSOMEONESPC:
case STRINGID_PKMNTRANSFERREDBILLSPC:
case STRINGID_PKMNTRANSFERREDLANETTESPC:
case STRINGID_PKMNBOXSOMEONESPCFULL:
case STRINGID_PKMNBOXBILLSPCFULL:
case STRINGID_PKMNBOXLANETTESPCFULL:
StringCopy(gStringVar1, boxName);
StringCopy(gStringVar2, nickname);
StringCopy(gStringVar3, boxName);
@ -816,7 +816,7 @@ TEST("Battle strings fit on the battle message window")
break;
}
BattleStringExpandPlaceholders(gBattleStringsTable[battleStringId], battleString, BATTLE_STRING_BUFFER_SIZE);
DebugPrintf("Battle String ID %d: %S", battleStringId + BATTLESTRINGS_TABLE_START, battleString);
DebugPrintf("Battle String ID %d: %S", battleStringId, battleString);
for (j = 1;; j++)
{
strWidth = GetStringLineWidth(fontId, battleString, 0, j, BATTLE_STRING_BUFFER_SIZE);