ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,011 Commits 1 Branch 0 Tags 235 MiB
be152fbee8
Commit Graph

3446 Commits

Author SHA1 Message Date
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232) 2023-08-14 16:14:12 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:26:43 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00
Eduardo Quezada
87050d8c08 Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143) 2023-08-01 23:54:04 -04:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves (#3138) 
* fix various issues with primal weather blocking water/fire type moves

* forgot to change return to effect=1

* fix bugs
 2023-07-30 10:50:51 -04:00
DizzyEggg
c0f10623d6 Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix 2023-07-17 15:35:40 +02:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting (#3141) 
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-07-16 12:26:54 +01:00
DizzyEggg
381aa58587
Fix Bad Dreams ability pop-up + tests (#3131) 
* Fix all bad dreams issues and add tests

Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
 2023-07-16 06:38:00 +01:00
Eduardo Quezada
1980a115b4 Integrated GAME_STAT_ENTERED_BATTLE_TOWER bugfix from upstream 2023-07-06 13:07:03 -04:00
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue (#3089) 2023-06-30 09:03:18 -04:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests (#3074) 
* Fix Clear Amulet visual bug + Tests

TODO Tests, additional tests + Triple Kick pp bug

* Wonder Guard message, switch instead of if, misalignments
 2023-06-28 12:26:03 -04:00
DizzyEggg
f9058a8544 Fix disobedience wrong move effect issue 2023-06-28 12:47:20 +02:00
PSF
b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
Alex
112636b8f3 Fix Speed Boost animation 2023-05-28 11:54:43 +02:00
ghoulslash
a929ae8b48
Replace launchtemplate and launchtask in battle anims (#2640) 
* replace launchtemplate with createsprite using fix_launchtemplate.py

* tidy up script

* fix comment handing in fix_launchtemplate.py

* fix double comma after sprite template

* remove py script

* convert launchtask -> createvisualtask

* fix launchtask->createvisualtask issue

* fix ANIM_PAL ORs

* remove launchtemplate, launchtask macros

* fix pal macros in z moves

* fix bloom doom

* add F_PAL_ALL_BUT_DEF

* remove all ANIM_PAL_ usages

* devestating drake fix

* convert launchsoundtask and setblends

* Reworked CFRU macro PR

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone
84d9cd0396
Fixed compile issue when disabling overworld debug menu (#3024) 2023-05-24 08:24:44 -04:00
Eduardo Quezada D'Ottone
b972199141
Battle Item Refactor Fixes (#3022) 2023-05-23 21:32:57 -04:00
AgustinGDLV
5a8715e608 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-23 16:10:44 -07:00
AgustinGDLV
bb10b0d1b0 fixed GetBattlerSide, removed debug script 2023-05-23 15:50:51 -07:00
AgustinGDLV
34382fcece fixed revive in 1v2 battles 2023-05-23 14:19:24 -07:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) 
remove leftover
 2023-05-20 15:58:55 -04:00
LOuroboros
580a09e367 Updated DebugAction_Util_CheckSaveBlock 2023-05-20 15:40:36 -03:00
ghoulslash
487415e56b
Move direct statStage boosts to use statbuffchange (#3000) 
* fix double counting stat boosts for download, moxie beast boost etc

* speed boost use statbuffchange

* BattleScript_MoveStatDrain use statbuffchange

* statbuffchange for rage

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-05-17 11:22:23 -04:00
AgustinGDLV
785b100693 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf reworked weather form reversion + added more tests 2023-05-16 16:24:25 -07:00
AgustinGDLV
37874fe5c1
fixed revival blessing failure still showing anim (#3010) 2023-05-16 19:21:05 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
Ultimate Bob
f985eefaa1 Show Imposter abilty in popup instead of opponent's ability. 2023-05-09 01:40:28 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone
42445512ad
Battle Item Tests + critical fixes + new test macro (#2940) 2023-05-06 20:43:32 -04:00
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c refactored snow into damaging weather 
this is necessary for ice body to properly work.
doesnt actually do any damage
 2023-05-05 01:38:12 +02:00
Alex
957ee36c75
Fix for Ceaseless Edge/Axe Kick visual glitch (#2969) 2023-05-02 17:25:44 -04:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4 ad suggested changes 2023-05-02 21:17:14 +02:00
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957) 2023-05-02 14:08:05 -04:00
CallmeEchoo
c32d5f455b fix rebase issues 2023-05-02 16:44:42 +02:00
CallmeEchoo
f6e80b0ca7 Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather 2023-05-02 16:29:11 +02:00
CallmeEchoo
76721b16f8 add snow weather 2023-05-02 16:25:26 +02:00
ghoulslash
445e9c4b8b merge w upcoming 2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-30 21:15:03 -04:00
Alex
2d6282fece
Fix for Burn Up/Double Shock (#2962) 2023-04-30 10:46:21 -04:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables (#2411) 2023-04-30 08:41:54 -04:00
CallmeEchoo
99cbd2af37 add snow weather 2023-04-29 20:35:58 +02:00
Alex
0cbb80dda7
Fix grassy terrain freezing the game (#2959) 2023-04-28 08:58:43 -04:00
Bassoonian
c279830892 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution 2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix 2023-04-26 14:25:36 -04:00