Commit Graph

51 Commits

Author SHA1 Message Date
JappaWakka bce86162ef Fix Battle Music being played in the overworld 2023-07-22 11:43:06 +02:00
JappaWakka fad33eaa4a Pokédex form support progress 2023-07-12 20:09:06 +02:00
JappaWakka a90ef6e6d8 A lot of progress on the softcode forms 2023-07-06 20:14:44 +02:00
JappaWakka f1aeb43b75 Fix Pokémon not falling in battle 2023-06-27 14:23:12 +02:00
JappaWakka af937955b9 New BattleAnimation type + Confuse Ray animation..
And some fixes
2023-06-26 16:36:52 +02:00
JappaWakka 030f5a5c74 Fix a wrong color 2023-06-22 14:28:24 +02:00
JappaWakka 3200dd9d15 Fix Daytimes when set by command 2023-06-21 19:28:35 +02:00
JappaWakka a386be5eb6 Added psychic anim & made background anims work
and also added Ice Punch assets to project
2023-06-21 19:24:43 +02:00
JappaWakka 62fea61236 Fix battlescreen having wrong daytime sky 2023-06-21 19:22:24 +02:00
JappaWakka a6d9a21b72 Fix some GameMode Item stuff 2023-06-21 19:21:34 +02:00
JappaWakka 92e611adcb Update battle while in chat 2023-06-07 20:36:41 +02:00
JappaWakka d13b5eb8d3 GameMode Item Preparations
Implemented GameMode Mega Stones
2023-05-29 15:33:57 +02:00
JappaWakka 0ae62ceaef Have both double trainer npcs show up in battle 2023-02-27 20:25:16 +01:00
JappaWakka b75de6fe5e Fixed BattleMapOffset not being set to 0 2023-02-23 12:27:48 +01:00
JappaWakka 8f372b16f2 Fix item swap duplication (for real hopefully) 2023-01-27 13:17:25 +01:00
JappaWakka 7e7dae0d20 Fixed trick/item duplication and protean 2023-01-18 20:06:21 +01:00
JappaWakka cdccbfcc67 Fix for Trick and Recycle 2023-01-15 11:40:43 +01:00
JappaWakka cc2d46153d Disable Shift BattleStyle in PvP 2023-01-15 09:34:42 +01:00
JappaWakka 77271a4b67 Forgot some battle animation things 2023-01-14 20:58:17 +01:00
JappaWakka dfbaaf2b33 BattleScreen + BattleCatchScreen softlock fixes 2023-01-13 14:46:44 +01:00
JappaWakka dc454d2a68 Temporarily disabled animations for pvp battles 2023-01-13 14:09:21 +01:00
JappaWakka 7ae9ebaa50 Multimove Bug Fixed 2023-01-13 14:07:35 +01:00
JappaWakka 68a9d197e5 Improved the Custom Move commands 2022-12-26 20:54:00 +01:00
JappaWakka c6b3a97885 Fix trainers crashing when starting a battle 2022-10-18 16:54:38 +02:00
JappaWakka d2860b15a8 Models work better in battle now 2022-09-27 12:51:51 +02:00
JappaWakka fd93f96cbc Rewrote a huge part of musicplayer, works now! 2022-09-13 21:01:55 +02:00
JappaWakka e37268ffb5 Fix for knockoff item dupe bug 2022-09-04 19:23:12 +02:00
JappaWakka 27fa63bc7c Fixed battle model crash 2022-08-16 20:23:00 +02:00
JappaWakka 352b80db9c Any entity can have a model, model scale improved
0.1 meter in blender is now equivalent to 1/16th of a P3D unit or 1 pixel on a 16 pixels wide/tall texture. Mt Silver will need to be updated to match this scale, making the ModelEntity obsolete.

Also added Snorlax battle model
2022-07-13 00:12:16 +02:00
Jasper "JappaWakka" Speelman 4d36a5851b Only allow switching when round is over
Also fixed minor error with items in battle
2022-05-14 16:07:32 +02:00
JappaWakka 8160838230
Merge pull request #64 from JappaWakkaP3D/permanent_item_loss_fix
Permanent item loss caused by attacks fix
2022-05-13 23:49:52 +02:00
JappaWakka e47581df69 Battle Pokémon models are now placed in subfolder 2022-04-25 18:44:36 +02:00
JappaWakka 797cd45085 Battle related music bugs fix 2022-04-19 18:13:18 +02:00
Jasper "JappaWakka" Speelman d934a947aa Battle Updates
* Shift Battlestyle Implemented
* Bugs related to switching Pokémon with Battle Animations off fixed
2022-04-14 20:14:35 +02:00
Jasper "JappaWakka" Speelman 56527e85c0 Fix for battlemusic playing after end battle 2022-04-09 22:08:52 +02:00
JappaWakka 7555a5e903 Battle fixes and improvements
* Fixed camera angle not changing to the Pokémon when status effects are doing something
* Fixed softlock when opponent trainer switches Pokémon
* (Hopefully) fixed initial positioning errors with spawned BattleAnimation entities related to BattleFlip functionality
* Removed the now unneccessary BattleFlip checks in the move animation of Growl
* Improved Ember move animation (fireball speed & flame delay)
* Improved Poison Sting move animation by making the stinger smaller, increasing the speed of the stinger and making it use a flipped version of the texture when the opponent uses the move
* Improved Poisoned status effect animation by making it 1 bubble for regular poison and 3 bubbles for toxic
* Repositioned the flame of the Burned status effect animation
* Trainers now display a message when sending out their Pokémon (I removed that before)
* Fixed Party Screen not appearing immediately after the player's Pokémon fainted and also made the player unable to exit the Party Screen when that happens.
* Fixed the incorrectly scaled font sizes and text alignment in the selection menu that appears when selecting a Pokémon in the Party screen
* Replaced minifont in the Pokémon level up stats box with InGameFont and fixed the offsets
* Fixed the error I made in the ceiling map code of Violet City's gym
* Removed the file MoveAnimationQueryObject.vb because AnimationQueryObject.vb also includes Move Animations
* Fixed the textbox in battles where an empty rectangle would appear before the animation finished.
* When a trainer spots the player and an exclamation mark bubble pops up above their head, a sound is played (Emote_Exclamation)
* In trainer battles, the player's Pokémon now also plays their cry.
2022-01-16 17:22:36 +01:00
JappaWakka 667671e16f Battle Bugfixes
Fixed buggy throwing animation of the opponent trainer
Fixed a bug related to the trainer sprite in the vs trainer intro that made the trainer texture buggy if it wasn't 32x32
2022-01-10 20:45:28 +01:00
JappaWakka 35aa80b072 Improved Whirlpool Animation + Fixed BattleAnimations drawn behind Pokémon 2021-12-30 21:53:57 +01:00
Jasper "JappaWakka" Speelman c1ec08fe7f Various Battle Improvements and Fixes
* Improved timing BlockIn & BlockOut BattleIntro animations
* Removed player ball throw animations at the start of the battle for battles that are not pvp
* Fixed absorb animation
* Improved the faint animation and removed the unnecessary camera angle changes when a pokémon faints
2021-11-06 11:26:34 +01:00
Jasper "JappaWakka" Speelman 4b3b900e40 Start of battle pokeball throw animation
and some little fixes
2021-11-05 23:09:33 +01:00
JappaWakkaP3D 7fba875d02 Fixed a lot of animation system bugs
Fixed:
* Spawned entities not appearing
* Animations getting removed too soon
* Incorrect relative positioning
* Ember textures being searched for in the wrong place
2021-10-24 01:56:29 +02:00
JappaWakka 673178616f Added Battle Animation type Background to temporarily draw a texture to the screen behind the Pokémon but in front of the world 2021-10-22 12:21:13 +02:00
JappaWakka 4132bbe1c0 Fixed the music gap between BattleIntroScreen and BattleScreen
Also replaced the johto_wild music with a well-looped one
2021-10-17 22:13:18 +02:00
JappaWakka a85849a52c Added @screen.showimage(texture,[sound],[x],[y],[w],[h]) command
To show an image like with @screen.showpokemon but one that's not necessarily the texture of a Pokémon, like the fossils at Pewter City, which I've also added textures for. Arguments in the title of this commit between brackets are optional.
2021-10-17 17:44:01 +02:00
JappaWakka dd34d9731c CanMuteMusic = CanMuteAudio & other tweaks
- CanMuteMusic property in source code renamed to CanMuteAudio

- Old New Game intro and Localization errors (made by me) fixed
2021-10-01 15:24:54 +02:00
JappaWakkaP3D d8f7319bc7 Permanent item loss caused by attacks fix
If an item is swapped/removed/whatever in a battle
  If it's a PvP battle or a Trainer battle
    Every Pokémon that has its item removed gets its original item back
  If it's a Wild battle
    If a Pokémon that had its original item removed is holding
    a different item (because of the attack Trick for example)
      The Pokémon keeps the new item and the original item is added to
      the inventory.
2021-01-30 22:34:02 +01:00
Vitaly Mikhailov ef0cecfe2e
Added <battle.caught> command 2019-10-31 23:57:27 +03:00
Ruan Pablo aedec48f93 Terrain final implementation + typos and move fixes
fixed fake-out/first impression working on 2 turns
fixed protecting move breaking messages
fixed trapping/binding moves and abilities
fixed flinch message popping up unnecessarily
updated natural gift BP calculation
updated some moves' contest category and other stats
added roseli, kee, maranga berry effects
added alolan pokemon abilities
added smacking down effect
added terrain as well as its effects
replaced polkadot bow (no use) with berserk gene
other minor fixes such as typos, captalizations
wrapping up other commits
2019-09-27 15:46:23 -03:00
CaptainSegis a1aff31089 Minor visual fixes 2018-08-16 18:53:49 -05:00
nilllzz fcdcbad6c9 fix music, always summer/day in main menu 2018-02-24 01:20:42 +01:00