ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 1 Branch 0 Tags 235 MiB
4ca4b2dd76
Commit Graph

13161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kittenchilly
4ca4b2dd76 Update battle_interface.c 2023-08-17 13:29:27 -05:00
kittenchilly
4e0e70ae81 Fix memory corruption when handling the ultra burst trigger sprite 2023-08-17 13:29:04 -05:00
kittenchilly
f95b4fdb4c Merge branch 'upcoming' into ultraburst 2023-08-17 13:25:00 -05:00
Eduardo Quezada
a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	src/battle_util.c
#	src/battle_z_move.c
 2023-08-17 13:42:09 -04:00
Philipp AUER
cd90fdec5d
[Critical] fix memory corruption when handling trigger sprites (#3238) 
Co-authored-by: sbird <sbird@no.tld>
 2023-08-16 20:21:16 -04:00
kittenchilly
dba28cf93f
Allow Z-Moves to be selected after Mega Evolution (#3233) 
* Allow Z-Moves to be selected after Mega Evolution

* You cannot do Wish Mega Evolution at all if you hold a z crystal

* Rebase to master
 2023-08-14 19:10:15 -04:00
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
LOuroboros
c414a0103c
Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID (#3231) 
* Made jumpifnopursuitswitchdmg use Pursuit's effect ID instead of its move ID

* Made Cmd_pursuitdoubles use Pursuit's effect ID too, even though it's unused
 2023-08-14 08:45:37 -04:00
Eduardo Quezada
32c3c33376 Missing master merge organization 
My bad ^^;
 2023-08-13 19:01:03 -04:00
PCG
b8a22eb119
Remove soundMove from Steam Eruption and replace it with sheerForceBoost (#3229) 
Co-authored-by: PCG06 <prajithgomes06@gmail.com>
 2023-08-13 00:53:22 -04:00
kittenchilly
3435c590c9 Merge branch 'upcoming' into ultraburst 2023-08-12 18:58:38 -05:00
gruxor
f493ae8c69
Fixed item sprites with palette errors (#3222) 2023-08-12 18:13:33 -04:00
Eduardo Quezada
09fc48461f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	test/battle/move_flags/three_strikes.c
#	test/move_flag_strike_count.c
#	test/move_flag_three_strikes.c
#	test/powder_moves.c
#	test/status1.c
 2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders (#2822) 2023-08-12 20:00:15 +01:00
kittenchilly
5e8caa8d45 Merge branch 'upcoming' into ultraburst 2023-08-12 12:36:11 -05:00
kittenchilly
2b27b0bf00 Constants 2023-08-12 12:30:36 -05:00
Eduardo Quezada
952bacd858 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
 2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
ada29313de
Fix for wild double battles with an in-game partner (#3210) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:29:10 -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
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ (#3196) 
* [battle, damage] refactor damage formula to match gen5+

* [test] use exact values for dry skin, swarm tests

* fixup: assume stats for dry-skin, swarm tests

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-11 16:28:38 -04:00
kittenchilly
063d83b58e Fix build 2023-08-11 14:01:45 -05:00
kittenchilly
c3a8edae32 Sprites and fixes 2023-08-11 13:36:01 -05:00
Eduardo Quezada D'Ottone
bd7960ef21
Updated versions for issue templates (#3220) 2023-08-11 12:04:03 -04:00
kittenchilly
c3e31af5f3 Ultra burst trigger 2023-08-09 22:12:26 -05:00
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner (#3215) 2023-08-09 10:06:03 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00
DizzyEggg
1fb42e4497
Sticky web / Court Change / Mirror Armor tests + small fixes (#3160) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
 2023-08-07 10:27:57 -04:00
Eduardo Quezada D'Ottone
fc66a8c476
Adds Mortal Spin and Population Bomb (#3178) 2023-08-07 08:54:18 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
Eduardo Quezada
d74cbca0b9 LF shenanigans 2023-08-06 21:02:16 -04:00
Eduardo Quezada
34d38bdbae Merge branch 'RHH/master' into RHH/upcoming 2023-08-06 20:31:45 -04:00
Eduardo Quezada
833f7dd9d3 LF shenanigans 2023-08-06 20:25:23 -04:00
Eclipse
5226935857
Fixed Trainer class ball not assigned to second Pokémon (#3203) 2023-08-04 22:56:05 -04:00
ghoulslash
a0dd77dd41
Improve AI switching, so it doesn't get killed on switch-in (#3146) 2023-08-04 07:34:58 -04:00
ghoulslash
dc1d44eefd
Updated Cmd_jumpifsideaffecting (#3200) 2023-08-04 07:32:54 -04:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start (#3111) 
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids

* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-08-04 08:57:06 +02:00
DizzyEggg
e7bc42fcaf use IsValidForBattle 2023-08-03 21:17:39 +02:00
LOuroboros
0bace94dc7
Updated Cmd_jumpifsideaffecting 2023-08-03 14:46:45 -03:00
Philipp AUER
7d8bcce9a5
Optimize sprite.c (#3175) 2023-08-03 15:57:04 +03:00
Martin Griffin
17555feb20
Animation script cleanup and fixes - Part 2 (#3193) 2023-08-02 12:28:29 +01:00
Martin Griffin
b08b6a37cb Optimize BuildOamBuffer 2023-08-02 12:22:30 +01:00
Martin Griffin
b3295d1cfb
Reverted BattleMove power to u8 (#3187) 2023-08-02 12:20:11 +01:00
Martin Griffin
cd51471c96
Revamped GetTotalAccuracy (#3182) 2023-08-02 12:19:36 +01:00
Martin Griffin
5543c9da8b
[battle, movesets] revert bulbasaur's level up change (#3194) 2023-08-02 09:06:48 +01:00
sbird
1d8ad1b756 [battle, movesets] revert bulbasaur's level up change 2023-08-02 09:51:45 +02:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5 MOVE_CORROSIVE_GAS Effect (#3152) 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
 2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08 Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143) 2023-08-01 23:54:04 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul (#3192) 
* [battle, anim] woodhammer animation overhaul

* squashme: timings

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-01 19:10:18 -04:00
Eduardo Quezada
e21346dd67 Fixed Rage Powder's animation not turning the user red 2023-08-01 19:05:39 -04:00