ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,148 Commits 1 Branch 0 Tags
Commit Graph

9259 Commits

Author SHA1 Message Date
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
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
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
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
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
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
Eduardo Quezada
34d38bdbae Merge branch 'RHH/master' into RHH/upcoming 2023-08-06 20:31:45 -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
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
Martin Griffin
cd51471c96
Revamped GetTotalAccuracy (#3182) 2023-08-02 12:19:36 +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 D'Ottone
54816816a0
Fixed null dereferencing errors with -fanalyzer on modern (#3165) 2023-07-31 14:49:08 -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
Eduardo Quezada D'Ottone
8196bea2d7
Pret merge 23-07-25 (#3176) 2023-07-30 10:46:23 -04:00
Alex
5167b01b14 var for ability + hold effect, loaded dice comparison 
fix for small bug introduced in the latest commit
 2023-07-29 23:36:01 +02:00
LOuroboros
4a657c7eaf Revamped GetTotalAccuracy 2023-07-29 17:22:10 -03:00
Alex
5fa7a6d4c6 Skill Link Tests, Loaded Dice stuff 2023-07-28 13:20:06 +02:00
DizzyEggg
1baa57418e
Fixed copyright screen not showing up on certain emulators (#2664) 
* Fix old intro not showing up on VBA

* Update intro.c

* Update intro.c

* Update intro.c
 2023-07-26 21:33:01 -04:00
Alex
bca29d8586 Adds Mortal Spin and Population Bomb 2023-07-26 17:37:56 +02:00
DizzyEggg
a3d6e31227 Merge branch 'rattled' into stamina_fix 2023-07-26 09:36:46 +02:00
DizzyEggg
c11839c648 Use isValidForBattle 2023-07-26 09:34:23 +02:00
DizzyEggg
7b7cbf506d Merge branch 'upcoming' into ai_switching 2023-07-26 09:23:53 +02:00
Martin Griffin
0e5c78aeb6 Merge remote-tracking branch 'pret/master' into 'rhh/master' 2023-07-25 19:49:18 +01:00
Eduardo Quezada
ad78dfcf68 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-07-25 14:38:53 -04:00
Alex
da9b421ae1
Fix Ruin ability calcs (#3171) 2023-07-25 09:59:26 +02:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin
b53cca1a06
Declarations for 2- and 3-argument GetMonData (#1756) 
* Type-safe GetMonData/GetBoxMonData

* Comments
 2023-07-24 09:57:37 -04:00
ghoulslash
b5431898c2
RNG for Metronome, multi-hit moves, and Loaded Dice (#3159) 2023-07-23 08:15:14 -04:00
Martin Griffin
fc321965a9 RNG_HITS and RNG_LOADED_DICE 2023-07-23 10:24:58 +01:00
ghoulslash
f5d5e544d1
Fix trainer slide messages appearing for frontier trainers (#3162) 2023-07-23 04:37:36 -04:00
gruxor
5a6532ddfb Merge branch 'upcoming-fixes' of https://github.com/gruxor/pokeemerald-expansion into upcoming-fixes 2023-07-22 14:50:12 -04:00
gruxor
3d25dadcd0 Fixed whitespace indent on switches 2023-07-22 14:49:37 -04:00
gruxor
215d57e871
Update src/fieldmap.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-07-22 14:47:07 -04:00
gruxor
4e75f6d454 Minor fix to null check 2023-07-21 16:22:43 -04:00
gruxor
fc8ee625b6 Fixed outstanding UB with -fanalyzer on modern 2023-07-21 15:51:03 -04:00
Alex
ad25dfe1e9
Set otGender + Moves in FillPartnerParty (#3163) 2023-07-21 14:43:39 -04:00
LOuroboros
cd5f997ee3
Added a debug feature to hatch eggs (#3155) 2023-07-21 12:06:05 +02:00
DizzyEggg
e0271a92e9 Fix trainer messages appearing for frontier trainers 2023-07-21 11:40:15 +02:00
Martin Griffin
b406a9c1bd RandomUniformExcept and RNG_METRONOME 2023-07-20 10:25:03 +01:00
Eduardo Quezada
47cea526ec Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-07-19 23:22:07 -04:00
Bassoonian
6d7d7f109e
Fix debug menu memory overflow (#3154) 2023-07-19 17:38:09 -04:00