mirror of
https://github.com/pret/pokefirered.git
synced 2026-05-09 12:35:23 -05:00
fixed remaining tests: updated battle string, added missing ability/item/move effects, clean up leaking tasks during testing
This commit is contained in:
cawtds
parent
0f7e42c75f
commit
dae2ae18d4
|
|
@ -419,6 +419,12 @@ B_ATK_TEAM2 = FD 38
|
|||
B_DEF_NAME = FD 39
|
||||
B_DEF_TEAM1 = FD 3A
|
||||
B_DEF_TEAM2 = FD 3B
|
||||
@ FD 3C
|
||||
@ FD 3D
|
||||
B_ATK_NAME_WITH_PREFIX2 = FD 3E
|
||||
B_DEF_NAME_WITH_PREFIX2 = FD 3F
|
||||
B_EFF_NAME_WITH_PREFIX2 = FD 40
|
||||
B_SCR_ACTIVE_NAME_WITH_PREFIX2 = FD 41
|
||||
|
||||
@ indicates the end of a town/city name (before " TOWN" or " CITY")
|
||||
NAME_END = FC 00
|
||||
|
|
|
|||
|
|
@ -22,6 +22,18 @@ Text_MonSentToBoxBillsBoxFull::
|
|||
.string "{STR_VAR_2} was transferred to\n"
|
||||
.string "BOX “{STR_VAR_1}.”$"
|
||||
|
||||
gText_PkmnTransferredLanettesPC::
|
||||
.string "{STR_VAR_2} was transferred to\n"
|
||||
.string "LANETTE'S PC.\p"
|
||||
.string "It was placed in \n"
|
||||
.string "BOX “{STR_VAR_1}.”$"
|
||||
|
||||
gText_PkmnTransferredLanettesPCBoxFull::
|
||||
.string "BOX “{STR_VAR_3}” on\n"
|
||||
.string "LANETTE'S PC was full.\p"
|
||||
.string "{STR_VAR_2} was transferred to\n"
|
||||
.string "BOX “{STR_VAR_1}.”$"
|
||||
|
||||
Text_PlayerObtainedTheMon::
|
||||
.string "{PLAYER} obtained\n"
|
||||
.string "the {STR_VAR_1}!$"
|
||||
|
|
|
|||
|
|
@ -442,313 +442,311 @@
|
|||
#define STRINGID_WATERSPORTENDS 442
|
||||
#define STRINGID_GRAVITYENDS 443
|
||||
#define STRINGID_AQUARINGHEAL 444
|
||||
#define STRINGID_AURORAVEILENDS 445
|
||||
#define STRINGID_ELECTRICTERRAINENDS 446
|
||||
#define STRINGID_MISTYTERRAINENDS 447
|
||||
#define STRINGID_PSYCHICTERRAINENDS 448
|
||||
#define STRINGID_GRASSYTERRAINENDS 449
|
||||
#define STRINGID_TARGETABILITYSTATRAISE 450
|
||||
#define STRINGID_TARGETSSTATWASMAXEDOUT 451
|
||||
#define STRINGID_ATTACKERABILITYSTATRAISE 452
|
||||
#define STRINGID_POISONHEALHPUP 453
|
||||
#define STRINGID_BADDREAMSDMG 454
|
||||
#define STRINGID_MOLDBREAKERENTERS 455
|
||||
#define STRINGID_TERAVOLTENTERS 456
|
||||
#define STRINGID_TURBOBLAZEENTERS 457
|
||||
#define STRINGID_SLOWSTARTENTERS 458
|
||||
#define STRINGID_SLOWSTARTEND 459
|
||||
#define STRINGID_SOLARPOWERHPDROP 460
|
||||
#define STRINGID_AFTERMATHDMG 461
|
||||
#define STRINGID_ANTICIPATIONACTIVATES 462
|
||||
#define STRINGID_FOREWARNACTIVATES 463
|
||||
#define STRINGID_ICEBODYHPGAIN 464
|
||||
#define STRINGID_SNOWWARNINGHAIL 465
|
||||
#define STRINGID_FRISKACTIVATES 466
|
||||
#define STRINGID_UNNERVEENTERS 467
|
||||
#define STRINGID_HARVESTBERRY 468
|
||||
#define STRINGID_LASTABILITYRAISEDSTAT 469
|
||||
#define STRINGID_MAGICBOUNCEACTIVATES 470
|
||||
#define STRINGID_PROTEANTYPECHANGE 471
|
||||
#define STRINGID_SYMBIOSISITEMPASS 472
|
||||
#define STRINGID_STEALTHROCKDMG 473
|
||||
#define STRINGID_TOXICSPIKESABSORBED 474
|
||||
#define STRINGID_TOXICSPIKESPOISONED 475
|
||||
#define STRINGID_STICKYWEBSWITCHIN 476
|
||||
#define STRINGID_HEALINGWISHCAMETRUE 477
|
||||
#define STRINGID_HEALINGWISHHEALED 478
|
||||
#define STRINGID_LUNARDANCECAMETRUE 479
|
||||
#define STRINGID_CUSEDBODYDISABLED 480
|
||||
#define STRINGID_ATTACKERACQUIREDABILITY 481
|
||||
#define STRINGID_TARGETABILITYSTATLOWER 482
|
||||
#define STRINGID_TARGETSTATWONTGOHIGHER 483
|
||||
#define STRINGID_PKMNMOVEBOUNCEDABILITY 484
|
||||
#define STRINGID_IMPOSTERTRANSFORM 485
|
||||
#define STRINGID_ASSAULTVESTDOESNTALLOW 486
|
||||
#define STRINGID_GRAVITYPREVENTSUSAGE 487
|
||||
#define STRINGID_HEALBLOCKPREVENTSUSAGE 488
|
||||
#define STRINGID_NOTDONEYET 489
|
||||
#define STRINGID_STICKYWEBUSED 490
|
||||
#define STRINGID_QUASHSUCCESS 491
|
||||
#define STRINGID_PKMNBLEWAWAYTOXICSPIKES 492
|
||||
#define STRINGID_PKMNBLEWAWAYSTICKYWEB 493
|
||||
#define STRINGID_PKMNBLEWAWAYSTEALTHROCK 494
|
||||
#define STRINGID_IONDELUGEON 495
|
||||
#define STRINGID_TOPSYTURVYSWITCHEDSTATS 496
|
||||
#define STRINGID_TERRAINBECOMESMISTY 497
|
||||
#define STRINGID_TERRAINBECOMESGRASSY 498
|
||||
#define STRINGID_TERRAINBECOMESELECTRIC 499
|
||||
#define STRINGID_TERRAINBECOMESPSYCHIC 500
|
||||
#define STRINGID_TARGETELECTRIFIED 501
|
||||
#define STRINGID_MEGAEVOREACTING 502
|
||||
#define STRINGID_MEGAEVOEVOLVED 503
|
||||
#define STRINGID_DRASTICALLY 504
|
||||
#define STRINGID_SEVERELY 505
|
||||
#define STRINGID_INFESTATION 506
|
||||
#define STRINGID_NOEFFECTONTARGET 507
|
||||
#define STRINGID_BURSTINGFLAMESHIT 508
|
||||
#define STRINGID_BESTOWITEMGIVING 509
|
||||
#define STRINGID_THIRDTYPEADDED 510
|
||||
#define STRINGID_FELLFORFEINT 511
|
||||
#define STRINGID_POKEMONCANNOTUSEMOVE 512
|
||||
#define STRINGID_COVEREDINPOWDER 513
|
||||
#define STRINGID_POWDEREXPLODES 514
|
||||
#define STRINGID_BELCHCANTSELECT 515
|
||||
#define STRINGID_SPECTRALTHIEFSTEAL 516
|
||||
#define STRINGID_GRAVITYGROUNDING 517
|
||||
#define STRINGID_MISTYTERRAINPREVENTS 518
|
||||
#define STRINGID_GRASSYTERRAINHEALS 519
|
||||
#define STRINGID_ELECTRICTERRAINPREVENTS 520
|
||||
#define STRINGID_PSYCHICTERRAINPREVENTS 521
|
||||
#define STRINGID_SAFETYGOGGLESPROTECTED 522
|
||||
#define STRINGID_FLOWERVEILPROTECTED 523
|
||||
#define STRINGID_SWEETVEILPROTECTED 524
|
||||
#define STRINGID_AROMAVEILPROTECTED 525
|
||||
#define STRINGID_CELEBRATEMESSAGE 526
|
||||
#define STRINGID_USEDINSTRUCTEDMOVE 527
|
||||
#define STRINGID_THROATCHOPENDS 528
|
||||
#define STRINGID_PKMNCANTUSEMOVETHROATCHOP 529
|
||||
#define STRINGID_LASERFOCUS 530
|
||||
#define STRINGID_GEMACTIVATES 531
|
||||
#define STRINGID_BERRYDMGREDUCES 532
|
||||
#define STRINGID_TARGETATEITEM 533
|
||||
#define STRINGID_AIRBALLOONFLOAT 534
|
||||
#define STRINGID_AIRBALLOONPOP 535
|
||||
#define STRINGID_INCINERATEBURN 536
|
||||
#define STRINGID_BUGBITE 537
|
||||
#define STRINGID_ILLUSIONWOREOFF 538
|
||||
#define STRINGID_ATTACKERCUREDTARGETSTATUS 539
|
||||
#define STRINGID_ATTACKERLOSTFIRETYPE 540
|
||||
#define STRINGID_HEALERCURE 541
|
||||
#define STRINGID_SCRIPTINGABILITYSTATRAISE 542
|
||||
#define STRINGID_RECEIVERABILITYTAKEOVER 543
|
||||
#define STRINGID_PKNMABSORBINGPOWER 544
|
||||
#define STRINGID_NOONEWILLBEABLETORUNAWAY 545
|
||||
#define STRINGID_DESTINYKNOTACTIVATES 546
|
||||
#define STRINGID_CLOAKEDINAFREEZINGLIGHT 547
|
||||
#define STRINGID_CLEARAMULETWONTLOWERSTATS 548
|
||||
#define STRINGID_FERVENTWISHREACHED 549
|
||||
#define STRINGID_AIRLOCKACTIVATES 550
|
||||
#define STRINGID_PRESSUREENTERS 551
|
||||
#define STRINGID_DARKAURAENTERS 552
|
||||
#define STRINGID_FAIRYAURAENTERS 553
|
||||
#define STRINGID_AURABREAKENTERS 554
|
||||
#define STRINGID_COMATOSEENTERS 555
|
||||
#define STRINGID_SCREENCLEANERENTERS 556
|
||||
#define STRINGID_FETCHEDPOKEBALL 557
|
||||
#define STRINGID_BATTLERABILITYRAISEDSTAT 558
|
||||
#define STRINGID_ASANDSTORMKICKEDUP 559
|
||||
#define STRINGID_PKMNSWILLPERISHIN3TURNS 560
|
||||
#define STRINGID_ABILITYRAISEDSTATDRASTICALLY 561
|
||||
#define STRINGID_AURAFLAREDTOLIFE 562
|
||||
#define STRINGID_ASONEENTERS 563
|
||||
#define STRINGID_CURIOUSMEDICINEENTERS 564
|
||||
#define STRINGID_CANACTFASTERTHANKSTO 565
|
||||
#define STRINGID_MICLEBERRYACTIVATES 566
|
||||
#define STRINGID_PKMNSHOOKOFFTHETAUNT 567
|
||||
#define STRINGID_PKMNGOTOVERITSINFATUATION 568
|
||||
#define STRINGID_ITEMCANNOTBEREMOVED 569
|
||||
#define STRINGID_STICKYBARBTRANSFER 570
|
||||
#define STRINGID_PKMNBURNHEALED 571
|
||||
#define STRINGID_REDCARDACTIVATE 572
|
||||
#define STRINGID_EJECTBUTTONACTIVATE 573
|
||||
#define STRINGID_ATKGOTOVERINFATUATION 574
|
||||
#define STRINGID_TORMENTEDNOMORE 575
|
||||
#define STRINGID_HEALBLOCKEDNOMORE 576
|
||||
#define STRINGID_ATTACKERBECAMEFULLYCHARGED 577
|
||||
#define STRINGID_ATTACKERBECAMEASHSPECIES 578
|
||||
#define STRINGID_EXTREMELYHARSHSUNLIGHT 579
|
||||
#define STRINGID_EXTREMESUNLIGHTFADED 580
|
||||
#define STRINGID_MOVEEVAPORATEDINTHEHARSHSUNLIGHT 581
|
||||
#define STRINGID_EXTREMELYHARSHSUNLIGHTWASNOTLESSENED 582
|
||||
#define STRINGID_HEAVYRAIN 583
|
||||
#define STRINGID_HEAVYRAINLIFTED 584
|
||||
#define STRINGID_MOVEFIZZLEDOUTINTHEHEAVYRAIN 585
|
||||
#define STRINGID_NORELIEFROMHEAVYRAIN 586
|
||||
#define STRINGID_MYSTERIOUSAIRCURRENT 587
|
||||
#define STRINGID_STRONGWINDSDISSIPATED 588
|
||||
#define STRINGID_MYSTERIOUSAIRCURRENTBLOWSON 589
|
||||
#define STRINGID_ATTACKWEAKENEDBSTRONGWINDS 590
|
||||
#define STRINGID_STUFFCHEEKSCANTSELECT 591
|
||||
#define STRINGID_PKMNREVERTEDTOPRIMAL 592
|
||||
#define STRINGID_BUTPOKEMONCANTUSETHEMOVE 593
|
||||
#define STRINGID_BUTHOOPACANTUSEIT 594
|
||||
#define STRINGID_BROKETHROUGHPROTECTION 595
|
||||
#define STRINGID_ABILITYALLOWSONLYMOVE 596
|
||||
#define STRINGID_SWAPPEDABILITIES 597
|
||||
#define STRINGID_PASTELVEILPROTECTED 598
|
||||
#define STRINGID_PASTELVEILENTERS 599
|
||||
#define STRINGID_BATTLERTYPECHANGEDTO 600
|
||||
#define STRINGID_BOTHCANNOLONGERESCAPE 601
|
||||
#define STRINGID_CANTESCAPEDUETOUSEDMOVE 602
|
||||
#define STRINGID_PKMNBECAMEWEAKERTOFIRE 603
|
||||
#define STRINGID_ABOUTTOUSEPOLTERGEIST 604
|
||||
#define STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE 605
|
||||
#define STRINGID_NEUTRALIZINGGASENTERS 606
|
||||
#define STRINGID_NEUTRALIZINGGASOVER 607
|
||||
#define STRINGID_TARGETTOOHEAVY 608
|
||||
#define STRINGID_PKMNTOOKTARGETHIGH 609
|
||||
#define STRINGID_PKMNINSNAPTRAP 610
|
||||
#define STRINGID_METEORBEAMCHARGING 611
|
||||
#define STRINGID_HEATUPBEAK 612
|
||||
#define STRINGID_COURTCHANGE 613
|
||||
#define STRINGID_PLAYERLOSTTOENEMYTRAINER 614
|
||||
#define STRINGID_PLAYERPAIDPRIZEMONEY 615
|
||||
#define STRINGID_ZPOWERSURROUNDS 616
|
||||
#define STRINGID_ZMOVEUNLEASHED 617
|
||||
#define STRINGID_ZMOVERESETSSTATS 618
|
||||
#define STRINGID_ZMOVEALLSTATSUP 619
|
||||
#define STRINGID_ZMOVEZBOOSTCRIT 620
|
||||
#define STRINGID_ZMOVERESTOREHP 621
|
||||
#define STRINGID_ZMOVESTATUP 622
|
||||
#define STRINGID_ZMOVEHPTRAP 623
|
||||
#define STRINGID_ATTACKEREXPELLEDTHEPOISON 624
|
||||
#define STRINGID_ATTACKERSHOOKITSELFAWAKE 625
|
||||
#define STRINGID_ATTACKERBROKETHROUGHPARALYSIS 626
|
||||
#define STRINGID_ATTACKERHEALEDITSBURN 627
|
||||
#define STRINGID_ATTACKERMELTEDTHEICE 628
|
||||
#define STRINGID_TARGETTOUGHEDITOUT 629
|
||||
#define STRINGID_ATTACKERLOSTELECTRICTYPE 630
|
||||
#define STRINGID_ATTACKERSWITCHEDSTATWITHTARGET 631
|
||||
#define STRINGID_BEINGHITCHARGEDPKMNWITHPOWER 632
|
||||
#define STRINGID_SUNLIGHTACTIVATEDABILITY 633
|
||||
#define STRINGID_STATWASHEIGHTENED 634
|
||||
#define STRINGID_ELECTRICTERRAINACTIVATEDABILITY 635
|
||||
#define STRINGID_ABILITYWEAKENEDSURROUNDINGMONSSTAT 636
|
||||
#define STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN 637
|
||||
#define STRINGID_PKMNSABILITYPREVENTSABILITY 638
|
||||
#define STRINGID_PREPARESHELLTRAP 639
|
||||
#define STRINGID_SHELLTRAPDIDNTWORK 640
|
||||
#define STRINGID_SPIKESDISAPPEAREDFROMTEAM 641
|
||||
#define STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM 642
|
||||
#define STRINGID_STICKYWEBDISAPPEAREDFROMTEAM 643
|
||||
#define STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM 644
|
||||
#define STRINGID_COULDNTFULLYPROTECT 645
|
||||
#define STRINGID_STOCKPILEDEFFECTWOREOFF 646
|
||||
#define STRINGID_PKMNREVIVEDREADYTOFIGHT 647
|
||||
#define STRINGID_ITEMRESTOREDSPECIESHEALTH 648
|
||||
#define STRINGID_ITEMCUREDSPECIESSTATUS 649
|
||||
#define STRINGID_ITEMRESTOREDSPECIESPP 650
|
||||
#define STRINGID_THUNDERCAGETRAPPED 651
|
||||
#define STRINGID_PKMNHURTBYFROSTBITE 652
|
||||
#define STRINGID_PKMNGOTFROSTBITE 653
|
||||
#define STRINGID_PKMNSITEMHEALEDFROSTBITE 654
|
||||
#define STRINGID_ATTACKERHEALEDITSFROSTBITE 655
|
||||
#define STRINGID_PKMNFROSTBITEHEALED 656
|
||||
#define STRINGID_PKMNFROSTBITEHEALED2 657
|
||||
#define STRINGID_PKMNFROSTBITEHEALEDBY 658
|
||||
#define STRINGID_MIRRORHERBCOPIED 659
|
||||
#define STRINGID_STARTEDSNOW 660
|
||||
#define STRINGID_SNOWCONTINUES 661
|
||||
#define STRINGID_SNOWSTOPPED 662
|
||||
#define STRINGID_SNOWWARNINGSNOW 663
|
||||
#define STRINGID_PKMNITEMMELTED 664
|
||||
#define STRINGID_ULTRABURSTREACTING 665
|
||||
#define STRINGID_ULTRABURSTCOMPLETED 666
|
||||
#define STRINGID_TEAMGAINEDEXP 667
|
||||
#define STRINGID_CURRENTMOVECANTSELECT 668
|
||||
#define STRINGID_TARGETISBEINGSALTCURED 669
|
||||
#define STRINGID_TARGETISHURTBYSALTCURE 670
|
||||
#define STRINGID_OPPORTUNISTCOPIED 671
|
||||
#define STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP 672
|
||||
#define STRINGID_SHARPSTEELFLOATS 673
|
||||
#define STRINGID_SHARPSTEELDMG 674
|
||||
#define STRINGID_PKMNBLEWAWAYSHARPSTEEL 675
|
||||
#define STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM 676
|
||||
#define STRINGID_TEAMTRAPPEDWITHVINES 677
|
||||
#define STRINGID_PKMNHURTBYVINES 678
|
||||
#define STRINGID_TEAMCAUGHTINVORTEX 679
|
||||
#define STRINGID_PKMNHURTBYVORTEX 680
|
||||
#define STRINGID_TEAMSURROUNDEDBYFIRE 681
|
||||
#define STRINGID_PKMNBURNINGUP 682
|
||||
#define STRINGID_TEAMSURROUNDEDBYROCKS 683
|
||||
#define STRINGID_PKMNHURTBYROCKSTHROWN 684
|
||||
#define STRINGID_MOVEBLOCKEDBYDYNAMAX 685
|
||||
#define STRINGID_ZEROTOHEROTRANSFORMATION 686
|
||||
#define STRINGID_THETWOMOVESBECOMEONE 687
|
||||
#define STRINGID_ARAINBOWAPPEAREDONSIDE 688
|
||||
#define STRINGID_THERAINBOWDISAPPEARED 689
|
||||
#define STRINGID_THESEAOFFIREDISAPPEARED 693
|
||||
#define STRINGID_THESWAMPDISAPPEARED 695
|
||||
#define STRINGID_WAITINGFORPARTNERSMOVE 690
|
||||
#define STRINGID_SEAOFFIREENVELOPEDSIDE 691
|
||||
#define STRINGID_HURTBYTHESEAOFFIRE 692
|
||||
#define STRINGID_SWAMPENVELOPEDSIDE 694
|
||||
#define STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE 696
|
||||
#define STRINGID_HOSPITALITYRESTORATION 697
|
||||
#define STRINGID_ELECTROSHOTCHARGING 698
|
||||
#define STRINGID_ITEMWASUSEDUP 699
|
||||
#define STRINGID_ATTACKERLOSTITSTYPE 700
|
||||
#define STRINGID_SHEDITSTAIL 701
|
||||
#define STRINGID_CLOAKEDINAHARSHLIGHT 702
|
||||
#define STRINGID_SUPERSWEETAROMAWAFTS 703
|
||||
#define STRINGID_DIMENSIONSWERETWISTED 704
|
||||
#define STRINGID_BIZARREARENACREATED 705
|
||||
#define STRINGID_BIZARREAREACREATED 706
|
||||
#define STRINGID_TIDYINGUPCOMPLETE 707
|
||||
#define STRINGID_OLDMANUSEDITEM 708
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT 709
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT2 710
|
||||
#define STRINGID_THREWROCK 711
|
||||
#define STRINGID_THREWBAIT 712
|
||||
#define STRINGID_PKMNANGRY 713
|
||||
#define STRINGID_PKMNEATING 714
|
||||
#define STRINGID_DUMMY288 715
|
||||
#define STRINGID_DUMMY289 716
|
||||
#define STRINGID_OAKPLAYERWON 717
|
||||
#define STRINGID_OAKPLAYERLOST 718
|
||||
#define STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER 719
|
||||
#define STRINGID_PKMNTRANSFERREDBILLSPC 720
|
||||
#define STRINGID_PKMNBOXBILLSPCFULL 721
|
||||
#define STRINGID_POKEDUDEUSED 722
|
||||
#define STRINGID_POKEFLUTECATCHY 723
|
||||
#define STRINGID_POKEFLUTE 724
|
||||
#define STRINGID_MONHEARINGFLUTEAWOKE 725
|
||||
#define STRINGID_PLAYERWHITEDOUT 726
|
||||
#define STRINGID_MONTOOSCAREDTOMOVE 727
|
||||
#define STRINGID_GHOSTGETOUTGETOUT 728
|
||||
#define STRINGID_SILPHSCOPEUNVEILED 729
|
||||
#define STRINGID_GHOSTWASMAROWAK 730
|
||||
#define STRINGID_TRAINER1MON1COMEBACK 731
|
||||
#define STRINGID_TRAINER1MON2COMEBACK 732
|
||||
#define STRINGID_TRAINER1MON1AND2COMEBACK 733
|
||||
#define STRINGID_PKMNTERASTALLIZEDINTO 734
|
||||
#define STRINGID_BOOSTERENERGYACTIVATES 735
|
||||
#define STRINGID_FOGCREPTUP 736
|
||||
#define STRINGID_FOGISDEEP 737
|
||||
#define STRINGID_FOGLIFTED 738
|
||||
#define STRINGID_PKMNMADESHELLGLEAM 739
|
||||
#define STRINGID_FICKLEBEAMDOUBLED 740
|
||||
#define STRINGID_SUNLIGHTISHARSH 741
|
||||
#define STRINGID_ITISHAILING 742
|
||||
#define STRINGID_ITISSNOWING 743
|
||||
#define STRINGID_ISCOVEREDWITHGRASS 744
|
||||
#define STRINGID_MISTSWIRLSAROUND 745
|
||||
#define STRINGID_ELECTRICCURRENTISRUNNING 746
|
||||
#define STRINGID_SEEMSWEIRD 747
|
||||
#define STRINGID_WAGGLINGAFINGER 748
|
||||
#define STRINGID_COMMANDERACTIVATES 749
|
||||
#define STRINGID_ELECTRICTERRAINENDS 445
|
||||
#define STRINGID_MISTYTERRAINENDS 446
|
||||
#define STRINGID_PSYCHICTERRAINENDS 447
|
||||
#define STRINGID_GRASSYTERRAINENDS 448
|
||||
#define STRINGID_TARGETABILITYSTATRAISE 449
|
||||
#define STRINGID_TARGETSSTATWASMAXEDOUT 450
|
||||
#define STRINGID_ATTACKERABILITYSTATRAISE 451
|
||||
#define STRINGID_POISONHEALHPUP 452
|
||||
#define STRINGID_BADDREAMSDMG 453
|
||||
#define STRINGID_MOLDBREAKERENTERS 454
|
||||
#define STRINGID_TERAVOLTENTERS 455
|
||||
#define STRINGID_TURBOBLAZEENTERS 456
|
||||
#define STRINGID_SLOWSTARTENTERS 457
|
||||
#define STRINGID_SLOWSTARTEND 458
|
||||
#define STRINGID_SOLARPOWERHPDROP 459
|
||||
#define STRINGID_AFTERMATHDMG 460
|
||||
#define STRINGID_ANTICIPATIONACTIVATES 461
|
||||
#define STRINGID_FOREWARNACTIVATES 462
|
||||
#define STRINGID_ICEBODYHPGAIN 463
|
||||
#define STRINGID_SNOWWARNINGHAIL 464
|
||||
#define STRINGID_FRISKACTIVATES 465
|
||||
#define STRINGID_UNNERVEENTERS 466
|
||||
#define STRINGID_HARVESTBERRY 467
|
||||
#define STRINGID_LASTABILITYRAISEDSTAT 468
|
||||
#define STRINGID_MAGICBOUNCEACTIVATES 469
|
||||
#define STRINGID_PROTEANTYPECHANGE 470
|
||||
#define STRINGID_SYMBIOSISITEMPASS 471
|
||||
#define STRINGID_STEALTHROCKDMG 472
|
||||
#define STRINGID_TOXICSPIKESABSORBED 473
|
||||
#define STRINGID_TOXICSPIKESPOISONED 474
|
||||
#define STRINGID_STICKYWEBSWITCHIN 475
|
||||
#define STRINGID_HEALINGWISHCAMETRUE 476
|
||||
#define STRINGID_HEALINGWISHHEALED 477
|
||||
#define STRINGID_LUNARDANCECAMETRUE 478
|
||||
#define STRINGID_CUSEDBODYDISABLED 479
|
||||
#define STRINGID_ATTACKERACQUIREDABILITY 480
|
||||
#define STRINGID_TARGETABILITYSTATLOWER 481
|
||||
#define STRINGID_TARGETSTATWONTGOHIGHER 482
|
||||
#define STRINGID_PKMNMOVEBOUNCEDABILITY 483
|
||||
#define STRINGID_IMPOSTERTRANSFORM 484
|
||||
#define STRINGID_ASSAULTVESTDOESNTALLOW 485
|
||||
#define STRINGID_GRAVITYPREVENTSUSAGE 486
|
||||
#define STRINGID_HEALBLOCKPREVENTSUSAGE 487
|
||||
#define STRINGID_NOTDONEYET 488
|
||||
#define STRINGID_STICKYWEBUSED 489
|
||||
#define STRINGID_QUASHSUCCESS 490
|
||||
#define STRINGID_PKMNBLEWAWAYTOXICSPIKES 491
|
||||
#define STRINGID_PKMNBLEWAWAYSTICKYWEB 492
|
||||
#define STRINGID_PKMNBLEWAWAYSTEALTHROCK 493
|
||||
#define STRINGID_IONDELUGEON 494
|
||||
#define STRINGID_TOPSYTURVYSWITCHEDSTATS 495
|
||||
#define STRINGID_TERRAINBECOMESMISTY 496
|
||||
#define STRINGID_TERRAINBECOMESGRASSY 497
|
||||
#define STRINGID_TERRAINBECOMESELECTRIC 498
|
||||
#define STRINGID_TERRAINBECOMESPSYCHIC 499
|
||||
#define STRINGID_TARGETELECTRIFIED 500
|
||||
#define STRINGID_MEGAEVOREACTING 501
|
||||
#define STRINGID_MEGAEVOEVOLVED 502
|
||||
#define STRINGID_DRASTICALLY 503
|
||||
#define STRINGID_SEVERELY 504
|
||||
#define STRINGID_INFESTATION 505
|
||||
#define STRINGID_NOEFFECTONTARGET 506
|
||||
#define STRINGID_BURSTINGFLAMESHIT 507
|
||||
#define STRINGID_BESTOWITEMGIVING 508
|
||||
#define STRINGID_THIRDTYPEADDED 509
|
||||
#define STRINGID_FELLFORFEINT 510
|
||||
#define STRINGID_POKEMONCANNOTUSEMOVE 511
|
||||
#define STRINGID_COVEREDINPOWDER 512
|
||||
#define STRINGID_POWDEREXPLODES 513
|
||||
#define STRINGID_BELCHCANTSELECT 514
|
||||
#define STRINGID_SPECTRALTHIEFSTEAL 515
|
||||
#define STRINGID_GRAVITYGROUNDING 516
|
||||
#define STRINGID_MISTYTERRAINPREVENTS 517
|
||||
#define STRINGID_GRASSYTERRAINHEALS 518
|
||||
#define STRINGID_ELECTRICTERRAINPREVENTS 519
|
||||
#define STRINGID_PSYCHICTERRAINPREVENTS 520
|
||||
#define STRINGID_SAFETYGOGGLESPROTECTED 521
|
||||
#define STRINGID_FLOWERVEILPROTECTED 522
|
||||
#define STRINGID_SWEETVEILPROTECTED 523
|
||||
#define STRINGID_AROMAVEILPROTECTED 524
|
||||
#define STRINGID_CELEBRATEMESSAGE 525
|
||||
#define STRINGID_USEDINSTRUCTEDMOVE 526
|
||||
#define STRINGID_THROATCHOPENDS 527
|
||||
#define STRINGID_PKMNCANTUSEMOVETHROATCHOP 528
|
||||
#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 BATTLESTRINGS_COUNT 750
|
||||
#define BATTLESTRINGS_COUNT 748
|
||||
|
||||
// This is the string id that gBattleStringsTable starts with.
|
||||
// String ids before this (e.g. STRINGID_INTROMSG) are not in the table,
|
||||
|
|
|
|||
|
|
@ -1208,6 +1208,8 @@ extern const u8 Text_MonSentToBoxInSomeonesPC[];
|
|||
extern const u8 Text_MonSentToBoxInBillsPC[];
|
||||
extern const u8 Text_MonSentToBoxSomeonesBoxFull[];
|
||||
extern const u8 Text_MonSentToBoxBillsBoxFull[];
|
||||
extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
|
||||
extern const u8 gText_PkmnTransferredLanettesPC[];
|
||||
|
||||
extern const u8 EventScript_BagItemCanBeRegistered[];
|
||||
|
||||
|
|
|
|||
|
|
@ -46,5 +46,6 @@ bool8 IsBGMPlaying(void);
|
|||
bool8 IsSpecialSEPlaying(void);
|
||||
void SetBGMVolume_SuppressHelpSystemReduction(u16 volume);
|
||||
void BGMVolumeMax_EnableHelpSystemReduction(void);
|
||||
void Task_DuckBGMForPokemonCry(u8 taskId);
|
||||
|
||||
#endif // GUARD_SOUND_H
|
||||
|
|
|
|||
|
|
@ -1671,7 +1671,20 @@ void CB2_QuitRecordedBattle(void)
|
|||
m4aMPlayStop(&gMPlayInfo_SE1);
|
||||
m4aMPlayStop(&gMPlayInfo_SE2);
|
||||
if (gTestRunnerEnabled)
|
||||
{
|
||||
// Clean up potentially-leaking tasks.
|
||||
// I think these leak when the battle ends soon after a
|
||||
// battler is fainted.
|
||||
u8 taskId;
|
||||
taskId = FindTaskIdByFunc(Task_PlayerController_RestoreBgmAfterCry);
|
||||
if (taskId != TASK_NONE)
|
||||
DestroyTask(taskId);
|
||||
taskId = FindTaskIdByFunc(Task_DuckBGMForPokemonCry);
|
||||
if (taskId != TASK_NONE)
|
||||
DestroyTask(taskId);
|
||||
|
||||
TestRunner_Battle_AfterLastTurn();
|
||||
}
|
||||
FreeRestoreBattleData();
|
||||
FreeAllWindowBuffers();
|
||||
SetMainCallback2(gMain.savedCallback);
|
||||
|
|
|
|||
1355
src/battle_message.c
1355
src/battle_message.c
File diff suppressed because it is too large
Load Diff
|
|
@ -2137,6 +2137,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
|
|||
.cantBeSwapped = TRUE,
|
||||
.cantBeTraced = TRUE,
|
||||
.cantBeSuppressed = TRUE,
|
||||
.cantBeOverwritten = TRUE,
|
||||
},
|
||||
|
||||
[ABILITY_ELECTROMORPHOSIS] =
|
||||
|
|
|
|||
|
|
@ -13876,6 +13876,7 @@ const struct Item gItemsInfo[] =
|
|||
.type = ITEM_USE_PARTY_MENU,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_Medicine,
|
||||
.battleUsage = EFFECT_ITEM_CURE_STATUS,
|
||||
.effect = gItemEffect_FullHeal,
|
||||
.flingPower = 30,
|
||||
.iconPic = gItemIcon_JubilifeMuffin,
|
||||
.iconPalette = gItemIconPalette_JubilifeMuffin,
|
||||
|
|
|
|||
|
|
@ -3803,7 +3803,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] =
|
|||
.type = TYPE_NORMAL,
|
||||
.accuracy = 0,
|
||||
.pp = 30,
|
||||
.target = MOVE_TARGET_USER,
|
||||
.target = B_UPDATED_MOVE_DATA >= GEN_5 ? MOVE_TARGET_SELECTED : MOVE_TARGET_USER,
|
||||
.priority = 0,
|
||||
.category = DAMAGE_CATEGORY_STATUS,
|
||||
.zMove = { .effect = Z_EFFECT_RECOVER_HP },
|
||||
|
|
@ -16360,7 +16360,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] =
|
|||
.description = COMPOUND_STRING(
|
||||
"Boosts a user's\nstats "
|
||||
"depending on\nTatsugiri."),
|
||||
.effect = EFFECT_PLACEHOLDER, // EFFECT_ORDER_UP
|
||||
.effect = EFFECT_ORDER_UP,
|
||||
.power = 80,
|
||||
.type = TYPE_DRAGON,
|
||||
.accuracy = 100,
|
||||
|
|
@ -16370,6 +16370,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] =
|
|||
.category = DAMAGE_CATEGORY_PHYSICAL,
|
||||
.mirrorMoveBanned = TRUE,
|
||||
.metronomeBanned = TRUE,
|
||||
.additionalEffects = ADDITIONAL_EFFECTS({
|
||||
.moveEffect = MOVE_EFFECT_ORDER_UP,
|
||||
.self = TRUE,
|
||||
.chance = 100,
|
||||
}),
|
||||
.battleAnimScript = Move_ORDER_UP,
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ extern struct ToneData gCryTable_Reverse[];
|
|||
|
||||
static void Task_Fanfare(u8 taskId);
|
||||
static void CreateFanfareTask(void);
|
||||
static void Task_DuckBGMForPokemonCry(u8 taskId);
|
||||
static void RestoreBGMVolumeAfterPokemonCry(void);
|
||||
|
||||
static const struct Fanfare sFanfares[] = {
|
||||
|
|
@ -512,7 +511,7 @@ bool8 IsCryPlaying(void)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
static void Task_DuckBGMForPokemonCry(u8 taskId)
|
||||
void Task_DuckBGMForPokemonCry(u8 taskId)
|
||||
{
|
||||
if (gPokemonCryBGMDuckingCounter)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -690,8 +690,8 @@ TEST("Battle strings fit on the battle message window")
|
|||
sBattlerAbilities[j] = longAbilityID;
|
||||
|
||||
// Set Trainers
|
||||
gTrainerBattleOpponent_A = 1;
|
||||
gTrainerBattleOpponent_B = 1;
|
||||
gTrainerBattleOpponent_A = TRAINER_YOUNGSTER_BEN;
|
||||
gTrainerBattleOpponent_B = TRAINER_YOUNGSTER_BEN;
|
||||
|
||||
// Set battler to 1, so "The opposing " is prefixed when refering to battlers.
|
||||
gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
|
||||
|
|
@ -879,9 +879,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_PKMNTRANSFERREDLANETTESPC:
|
||||
case STRINGID_PKMNTRANSFERREDBILLSPC:
|
||||
case STRINGID_PKMNBOXSOMEONESPCFULL:
|
||||
case STRINGID_PKMNBOXLANETTESPCFULL:
|
||||
case STRINGID_PKMNBOXBILLSPCFULL:
|
||||
StringCopy(gStringVar1, boxName);
|
||||
StringCopy(gStringVar2, nickname);
|
||||
StringCopy(gStringVar3, boxName);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user