diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_frontier/battle_arena_move_mind_ratings.inc | 357 | ||||
| -rw-r--r-- | data/battle_frontier_2.s | 34 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 104 |
3 files changed, 52 insertions, 443 deletions
diff --git a/data/battle_frontier/battle_arena_move_mind_ratings.inc b/data/battle_frontier/battle_arena_move_mind_ratings.inc deleted file mode 100644 index e1d0b26a9..000000000 --- a/data/battle_frontier/battle_arena_move_mind_ratings.inc +++ /dev/null @@ -1,357 +0,0 @@ - .align 2 -gBattleArenaMoveMindRatings:: @ 8611DC0 - .byte 0 @ - - .byte 1 @ Pound - .byte 1 @ Karate Chop - .byte 1 @ Double Slap - .byte 1 @ Comet Punch - .byte 1 @ Mega Punch - .byte 1 @ Pay Day - .byte 1 @ Fire Punch - .byte 1 @ Ice Punch - .byte 1 @ Thunder Punch - .byte 1 @ Scratch - .byte 1 @ Vice Grip - .byte 1 @ Guillotine - .byte 1 @ Razor Wind - .byte 0 @ Swords Dance - .byte 1 @ Cut - .byte 1 @ Gust - .byte 1 @ Wing Attack - .byte 0 @ Whirlwind - .byte 1 @ Fly - .byte 1 @ Bind - .byte 1 @ Slam - .byte 1 @ Vine Whip - .byte 1 @ Stomp - .byte 1 @ Double Kick - .byte 1 @ Mega Kick - .byte 1 @ Jump Kick - .byte 1 @ Rolling Kick - .byte 0 @ Sand-Attack - .byte 1 @ Headbutt - .byte 1 @ Horn Attack - .byte 1 @ Fury Attack - .byte 1 @ Horn Drill - .byte 1 @ Tackle - .byte 1 @ Body Slam - .byte 1 @ Wrap - .byte 1 @ Take Down - .byte 1 @ Thrash - .byte 1 @ Double-Edge - .byte 0 @ Tail Whip - .byte 1 @ Poison Sting - .byte 1 @ Twineedle - .byte 1 @ Pin Missile - .byte 0 @ Leer - .byte 1 @ Bite - .byte 0 @ Growl - .byte 0 @ Roar - .byte 0 @ Sing - .byte 0 @ Supersonic - .byte 1 @ Sonic Boom - .byte 0 @ Disable - .byte 1 @ Acid - .byte 1 @ Ember - .byte 1 @ Flamethrower - .byte 0 @ Mist - .byte 1 @ Water Gun - .byte 1 @ Hydro Pump - .byte 1 @ Surf - .byte 1 @ Ice Beam - .byte 1 @ Blizzard - .byte 1 @ Psybeam - .byte 1 @ Bubble Beam - .byte 1 @ Aurora Beam - .byte 1 @ Hyper Beam - .byte 1 @ Peck - .byte 1 @ Drill Peck - .byte 1 @ Submission - .byte 1 @ Low Kick - .byte 0 @ Counter - .byte 1 @ Seismic Toss - .byte 1 @ Strength - .byte 1 @ Absorb - .byte 1 @ Mega Drain - .byte 0 @ Leech Seed - .byte 0 @ Growth - .byte 1 @ Razor Leaf - .byte 1 @ Solar Beam - .byte 0 @ Poison Powder - .byte 0 @ Stun Spore - .byte 0 @ Sleep Powder - .byte 1 @ Petal Dance - .byte 0 @ String Shot - .byte 1 @ Dragon Rage - .byte 1 @ Fire Spin - .byte 1 @ Thunder Shock - .byte 1 @ Thunderbolt - .byte 0 @ Thunder Wave - .byte 1 @ Thunder - .byte 1 @ Rock Throw - .byte 1 @ Earthquake - .byte 1 @ Fissure - .byte 1 @ Dig - .byte 0 @ Toxic - .byte 1 @ Confusion - .byte 1 @ Psychic - .byte 0 @ Hypnosis - .byte 0 @ Meditate - .byte 0 @ Agility - .byte 1 @ Quick Attack - .byte 1 @ Rage - .byte 0 @ Teleport - .byte 1 @ Night Shade - .byte 0 @ Mimic - .byte 0 @ Screech - .byte 0 @ Double Team - .byte 0 @ Recover - .byte 0 @ Harden - .byte 0 @ Minimize - .byte 0 @ Smokescreen - .byte 0 @ Confuse Ray - .byte 0 @ Withdraw - .byte 0 @ Defense Curl - .byte 0 @ Barrier - .byte 0 @ Light Screen - .byte 0 @ Haze - .byte 0 @ Reflect - .byte 0 @ Focus Energy - .byte 0 @ Bide - .byte 0 @ Metronome - .byte 0 @ Mirror Move - .byte 1 @ Self-Destruct - .byte 1 @ Egg Bomb - .byte 1 @ Lick - .byte 1 @ Smog - .byte 1 @ Sludge - .byte 1 @ Bone Club - .byte 1 @ Fire Blast - .byte 1 @ Waterfall - .byte 1 @ Clamp - .byte 1 @ Swift - .byte 1 @ Skull Bash - .byte 1 @ Spike Cannon - .byte 1 @ Constrict - .byte 0 @ Amnesia - .byte 0 @ Kinesis - .byte 0 @ Soft-Boiled - .byte 1 @ Hi Jump Kick - .byte 0 @ Glare - .byte 1 @ Dream Eater - .byte 0 @ Poison Gas - .byte 1 @ Barrage - .byte 1 @ Leech Life - .byte 0 @ Lovely Kiss - .byte 1 @ Sky Attack - .byte 0 @ Transform - .byte 1 @ Bubble - .byte 1 @ Dizzy Punch - .byte 0 @ Spore - .byte 0 @ Flash - .byte 1 @ Psywave - .byte 0 @ Splash - .byte 0 @ Acid Armor - .byte 1 @ Crabhammer - .byte 1 @ Explosion - .byte 1 @ Fury Swipes - .byte 1 @ Bonemerang - .byte 0 @ Rest - .byte 1 @ Rock Slide - .byte 1 @ Hyper Fang - .byte 0 @ Sharpen - .byte 0 @ Conversion - .byte 1 @ Tri Attack - .byte 1 @ Super Fang - .byte 1 @ Slash - .byte 0 @ Substitute - .byte 1 @ Struggle - .byte 0 @ Sketch - .byte 1 @ Triple Kick - .byte 1 @ Thief - .byte 0 @ Spider Web - .byte 0 @ Mind Reader - .byte 0 @ Nightmare - .byte 1 @ Flame Wheel - .byte 1 @ Snore - .byte 0 @ Curse - .byte 1 @ Flail - .byte 0 @ Conversion 2 - .byte 1 @ Aeroblast - .byte 0 @ Cotton Spore - .byte 1 @ Reversal - .byte 0 @ Spite - .byte 1 @ Powder Snow - .byte -1 @ Protect - .byte 1 @ Mach Punch - .byte 0 @ Scary Face - .byte 1 @ Faint Attack - .byte 0 @ Sweet Kiss - .byte 0 @ Belly Drum - .byte 1 @ Sludge Bomb - .byte 1 @ Mud-Slap - .byte 1 @ Octazooka - .byte 0 @ Spikes - .byte 1 @ Zap Cannon - .byte 0 @ Foresight - .byte 0 @ Destiny Bond - .byte 0 @ Perish Song - .byte 1 @ Icy Wind - .byte -1 @ Detect - .byte 1 @ Bone Rush - .byte 0 @ Lock-On - .byte 1 @ Outrage - .byte 0 @ Sandstorm - .byte 1 @ Giga Drain - .byte -1 @ Endure - .byte 0 @ Charm - .byte 1 @ Rollout - .byte 1 @ False Swipe - .byte 0 @ Swagger - .byte 0 @ Milk Drink - .byte 1 @ Spark - .byte 1 @ Fury Cutter - .byte 1 @ Steel Wing - .byte 0 @ Mean Look - .byte 0 @ Attract - .byte 0 @ Sleep Talk - .byte 0 @ Heal Bell - .byte 1 @ Return - .byte 1 @ Present - .byte 1 @ Frustration - .byte 0 @ Safeguard - .byte 0 @ Pain Split - .byte 1 @ Sacred Fire - .byte 1 @ Magnitude - .byte 1 @ Dynamic Punch - .byte 1 @ Megahorn - .byte 1 @ Dragon Breath - .byte 0 @ Baton Pass - .byte 0 @ Encore - .byte 1 @ Pursuit - .byte 1 @ Rapid Spin - .byte 0 @ Sweet Scent - .byte 1 @ Iron Tail - .byte 1 @ Metal Claw - .byte 1 @ Vital Throw - .byte 0 @ Morning Sun - .byte 0 @ Synthesis - .byte 0 @ Moonlight - .byte 1 @ Hidden Power - .byte 1 @ Cross Chop - .byte 1 @ Twister - .byte 0 @ Rain Dance - .byte 0 @ Sunny Day - .byte 1 @ Crunch - .byte 0 @ Mirror Coat - .byte 0 @ Psych Up - .byte 1 @ Extreme Speed - .byte 1 @ Ancient Power - .byte 1 @ Shadow Ball - .byte 1 @ Future Sight - .byte 1 @ Rock Smash - .byte 1 @ Whirlpool - .byte 1 @ Beat Up - .byte -1 @ Fake Out - .byte 1 @ Uproar - .byte 0 @ Stockpile - .byte 1 @ Spit Up - .byte 0 @ Swallow - .byte 1 @ Heat Wave - .byte 0 @ Hail - .byte 0 @ Torment - .byte 0 @ Flatter - .byte 0 @ Will-O-Wisp - .byte 0 @ Memento - .byte 1 @ Facade - .byte 1 @ Focus Punch - .byte 1 @ Smelling Salt - .byte 0 @ Follow Me - .byte 0 @ Nature Power - .byte 0 @ Charge - .byte 0 @ Taunt - .byte 0 @ Helping Hand - .byte 0 @ Trick - .byte 0 @ Role Play - .byte 0 @ Wish - .byte 0 @ Assist - .byte 0 @ Ingrain - .byte 1 @ Superpower - .byte 0 @ Magic Coat - .byte 0 @ Recycle - .byte 1 @ Revenge - .byte 1 @ Brick Break - .byte 0 @ Yawn - .byte 1 @ Knock Off - .byte 1 @ Endeavor - .byte 1 @ Eruption - .byte 0 @ Skill Swap - .byte 0 @ Imprison - .byte 0 @ Refresh - .byte 0 @ Grudge - .byte 0 @ Snatch - .byte 1 @ Secret Power - .byte 1 @ Dive - .byte 1 @ Arm Thrust - .byte 0 @ Camouflage - .byte 0 @ Tail Glow - .byte 1 @ Luster Purge - .byte 1 @ Mist Ball - .byte 0 @ Feather Dance - .byte 0 @ Teeter Dance - .byte 1 @ Blaze Kick - .byte 0 @ Mud Sport - .byte 1 @ Ice Ball - .byte 1 @ Needle Arm - .byte 0 @ Slack Off - .byte 1 @ Hyper Voice - .byte 1 @ Poison Fang - .byte 1 @ Crush Claw - .byte 1 @ Blast Burn - .byte 1 @ Hydro Cannon - .byte 1 @ Meteor Mash - .byte 1 @ Astonish - .byte 1 @ Weather Ball - .byte 0 @ Aromatherapy - .byte 0 @ Fake Tears - .byte 1 @ Air Cutter - .byte 1 @ Overheat - .byte 0 @ Odor Sleuth - .byte 1 @ Rock Tomb - .byte 1 @ Silver Wind - .byte 0 @ Metal Sound - .byte 0 @ Grass Whistle - .byte 0 @ Tickle - .byte 0 @ Cosmic Power - .byte 1 @ Water Spout - .byte 1 @ Signal Beam - .byte 1 @ Shadow Punch - .byte 1 @ Extrasensory - .byte 1 @ Sky Uppercut - .byte 1 @ Sand Tomb - .byte 1 @ Sheer Cold - .byte 1 @ Muddy Water - .byte 1 @ Bullet Seed - .byte 1 @ Aerial Ace - .byte 1 @ Icicle Spear - .byte 0 @ Iron Defense - .byte 0 @ Block - .byte 0 @ Howl - .byte 1 @ Dragon Claw - .byte 1 @ Frenzy Plant - .byte 0 @ Bulk Up - .byte 1 @ Bounce - .byte 1 @ Mud Shot - .byte 1 @ Poison Tail - .byte 1 @ Covet - .byte 1 @ Volt Tackle - .byte 1 @ Magical Leaf - .byte 0 @ Water Sport - .byte 0 @ Calm Mind - .byte 1 @ Leaf Blade - .byte 0 @ Dragon Dance - .byte 1 @ Rock Blast - .byte 1 @ Shock Wave - .byte 1 @ Water Pulse - .byte 1 @ Doom Desire - .byte 1 @ Psycho Boost diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 3d80f1173..2b1eab991 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -102,37 +102,3 @@ gUnknown_08611DB0:: @ 8611DB0 gUnknown_08611DB8:: @ 8611DB8 .4byte gUnknown_08611D5C .4byte gUnknown_08611D94 - -@ 8611DC0 - .include "data/battle_frontier/battle_arena_move_mind_ratings.inc" - - .align 2 -gUnknown_08611F24:: @ 8611F24 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0xf0, 0x00, 0x00 - - .align 2 -gUnknown_08611F2C:: @ 8611F2C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F34:: @ 8611F34 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F3C:: @ 8611F3C - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F44:: @ 8611F44 - .2byte 0x000c, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F4C:: @ 8611F4C - .4byte gUnknown_08611F2C - .4byte gUnknown_08611F34 - .4byte gUnknown_08611F3C - .4byte gUnknown_08611F44 - - .align 2 -gUnknown_08611F5C:: @ 8611F5C - spr_template 0x03e8, 0xffff, gUnknown_08611F24, gUnknown_08611F4C, NULL, gDummySpriteAffineAnimTable, sub_81A5698 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index edf49eda5..be91c7c7e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -318,7 +318,7 @@ BattleScript_EffectSleep:: goto BattleScript_MoveEnd BattleScript_AlreadyAsleep:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYASLEEP waitmessage 0x40 @@ -731,7 +731,7 @@ BattleScript_EffectToxic:: goto BattleScript_MoveEnd BattleScript_AlreadyPoisoned:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x40 printstring STRINGID_PKMNALREADYPOISONED waitmessage 0x40 @@ -779,7 +779,7 @@ BattleScript_RestCantSleep:: goto BattleScript_MoveEnd BattleScript_RestIsAlreadyAsleep:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYASLEEP2 waitmessage 0x40 @@ -944,7 +944,7 @@ BattleScript_EffectConfuse:: goto BattleScript_MoveEnd BattleScript_AlreadyConfused:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYCONFUSED waitmessage 0x40 @@ -1051,7 +1051,7 @@ BattleScript_EffectParalyze:: goto BattleScript_MoveEnd BattleScript_AlreadyParalyzed:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNISALREADYPARALYZED waitmessage 0x40 @@ -1128,7 +1128,7 @@ BattleScript_SubstituteString:: waitmessage 0x40 goto BattleScript_MoveEnd BattleScript_AlreadyHasSubstitute:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNHASSUBSTITUTE waitmessage 0x40 @@ -2226,7 +2226,7 @@ BattleScript_WaterVeilPrevents:: goto BattleScript_MoveEnd BattleScript_AlreadyBurned:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYHASBURN waitmessage 0x40 @@ -2643,7 +2643,7 @@ BattleScript_TeeterDanceSubstitutePrevents:: goto BattleScript_TeeterDanceDoMoveEndIncrement BattleScript_TeeterDanceAlreadyConfused:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYCONFUSED waitmessage 0x40 @@ -4487,54 +4487,54 @@ BattleScript_ArenaTurnBeginning:: pause 0x8 playse SE_HANTEI1 various14 BS_ATTACKER - various16 8 - various17 8 + arenajudmengtstring 8 + arenawaitmessage 8 pause 0x40 various15 BS_ATTACKER volumeup end2 -BattleScript_82DB8E0:: +BattleScript_82DB8E0:: @ Unused battlescript playse SE_PINPON various14 BS_ATTACKER - various16 BS_TARGET - various17 BS_TARGET + arenajudmengtstring BS_TARGET + arenawaitmessage BS_TARGET pause 0x40 various15 BS_ATTACKER end2 -BattleScript_82DB8F3:: - makevisible 11 +BattleScript_ArenaDoJudgment:: + makevisible BS_PLAYER1 waitstate makevisible BS_OPPONENT1 waitstate volumedown - playse 0x109 + playse SE_HANTEI1 pause 0x8 - playse 0x109 + playse SE_HANTEI1 pause 0x40 various14 BS_ATTACKER - various16 BS_ATTACKER - various17 BS_ATTACKER + arenajudmengtstring 1 + arenawaitmessage 1 pause 0x40 setbyte gBattleCommunication, 0x0 - various9 BS_ATTACKER + arenajudgmentwindow pause 0x40 - various9 BS_ATTACKER - various16 BS_EFFECT_BATTLER - various17 BS_EFFECT_BATTLER - various9 BS_ATTACKER - various16 BS_FAINTED - various17 BS_FAINTED - various9 BS_ATTACKER - various16 0x4 - various17 0x4 - various9 BS_ATTACKER - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_82DB973 - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_82DB992 - various16 0x5 - various17 0x5 - various9 BS_ATTACKER + arenajudgmentwindow + arenajudmengtstring 2 + arenawaitmessage 2 + arenajudgmentwindow + arenajudmengtstring 3 + arenawaitmessage 3 + arenajudgmentwindow + arenajudmengtstring 4 + arenawaitmessage 4 + arenajudgmentwindow + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_ArenaJudgmentPlayerLoses + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_ArenaJudgmentDraw + arenajudmengtstring 5 + arenawaitmessage 5 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_DEFEATEDOPPONENTBYREFEREE waitmessage 0x40 @@ -4542,39 +4542,39 @@ BattleScript_82DB8F3:: waitcry BS_ATTACKER dofaintanimation BS_OPPONENT1 cleareffectsonfaint BS_OPPONENT1 - various10 BS_ATTACKER + arenaopponentmonlost end2 -BattleScript_82DB973:: - various16 0x6 - various17 0x6 - various9 BS_ATTACKER +BattleScript_ArenaJudgmentPlayerLoses: + arenajudmengtstring 6 + arenawaitmessage 6 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_LOSTTOOPPONENTBYREFEREE waitmessage 0x40 - playfaintcry 11 + playfaintcry BS_PLAYER1 waitcry BS_ATTACKER - dofaintanimation 11 - cleareffectsonfaint 11 - various11 BS_ATTACKER + dofaintanimation BS_PLAYER1 + cleareffectsonfaint BS_PLAYER1 + arenaplayermonlost end2 -BattleScript_82DB992:: - various16 BS_BATTLER_0 - various17 BS_BATTLER_0 - various9 BS_ATTACKER +BattleScript_ArenaJudgmentDraw: + arenajudmengtstring 7 + arenawaitmessage 7 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_TIEDOPPONENTBYREFEREE waitmessage 0x40 - playfaintcry 11 + playfaintcry BS_PLAYER1 waitcry BS_ATTACKER - dofaintanimation 11 - cleareffectsonfaint 11 + dofaintanimation BS_PLAYER1 + cleareffectsonfaint BS_PLAYER1 playfaintcry BS_OPPONENT1 waitcry BS_ATTACKER dofaintanimation BS_OPPONENT1 cleareffectsonfaint BS_OPPONENT1 - various12 BS_ATTACKER + arenabothmonlost end2 BattleScript_AskIfWantsToForfeitMatch:: |