Commit Graph

13297 Commits

Author SHA1 Message Date
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
DizzyEggg
6658899841 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into upcoming 2023-07-26 09:23:13 +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
GriffinR
39192725f2
Merge pull request #1901 from mrgriffin/pret-potential-misalignment
Detect potential misalignment in modern
2023-07-25 14:21:42 -04:00
DizzyEggg
0c0373a6b9 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into upcoming 2023-07-25 12:37:00 +02:00
Alex
da9b421ae1
Fix Ruin ability calcs (#3171) 2023-07-25 09:59:26 +02:00
Martin Griffin
b499f41a5c Print ticks 2023-07-25 07:40:51 +01:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin
3f5daa8cf1 Add BENCHMARK to test runner
Counts the time spent in the block in arbitrary time units (64-cycles
currently). If the block takes more than ~4 million cycles (~0.25s) the
benchmark will wrap around.

Note that the time can be affected by the timeout IRQs, and should only
be taken as a loose indication of relative performance.
2023-07-24 15:18:28 +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
6f40d44a23 Cleanup RandomUniform and RandomElementArray 2023-07-23 10:24:58 +01:00
Martin Griffin
fc321965a9 RNG_HITS and RNG_LOADED_DICE 2023-07-23 10:24:58 +01:00
ghoulslash
a527d6c7de
Fix wrong color in stat move animation (#3161) 2023-07-23 04:38:25 -04: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
6b5bd5fa66 Merge branch 'forceEggHatch' of https://github.com/LOuroboros/pokeemerald into upcoming 2023-07-21 12:00:45 +02:00
DizzyEggg
e0271a92e9 Fix trainer messages appearing for frontier trainers 2023-07-21 11:40:15 +02:00
DizzyEggg
fc37345c29 Fix wrong color in stat move animation 2023-07-21 10:42:39 +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
Eduardo Quezada
89f368db12 Fixed missing versions 2023-07-19 23:05:07 -04:00
Bassoonian
6d7d7f109e
Fix debug menu memory overflow (#3154) 2023-07-19 17:38:09 -04:00
LOuroboros
2860ac9c80 Added a debug feature to hatch eggs 2023-07-19 13:29:36 -03:00
GriffinR
56ec3b6461
Merge pull request #1900 from Bassoonian/priortiy
Fix priortiy typos
2023-07-19 11:44:10 -04:00
Bassoonian
7fa6ed8b05 Fix priortiy typos 2023-07-19 17:33:28 +02:00
Alex
6b5d1e7577
Adds some gen9 moves (#3147)
* Adds some gen9 moves

* Fix Test + Tabs

* Collision Course boost changed to 1.3333
2023-07-19 13:25:20 +02:00
DizzyEggg
34beb3d662 add tests for rattled 2023-07-19 10:59:36 +02:00
Eduardo Quezada D'Ottone
cf29c9eb69
Fixed enemy parties not reverting to their original form post-battle (#3150) 2023-07-19 08:46:57 +02:00
Eclipse
ca792d43cc
Gender differences sprites, final part (#3122)
* The last survivors

* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-07-18 21:31:22 -04:00
luckytyphlosion
8ec0bff034
Update msys2 instructions
Add pacman -Sy msys2-keyring
2023-07-18 19:28:41 -04:00
CyanSMP64
219ac7830c
Update female Alakazam's front sprite design (#3149) 2023-07-18 12:56:15 -04:00
DizzyEggg
f4dc5e931f some more stuff 2023-07-18 12:01:25 +02:00
DizzyEggg
1bd4f9c7a8 rework incoming surviability 2023-07-18 11:36:09 +02:00
Eduardo Quezada D'Ottone
b08c8f85fc
Fixed Utility Umbrella damage calculations (#2835)
* Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks

* Fixed reading move incorrectly

* Tests: Sun, Rain, Utility Umbrella and Hydro Steam

* [STASH] Skeli changes, needs to remake tests

* Fixed tests

* Removed redundant tests

* Removed unused variable

* Removed Primal Todo tests
2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone
6fec0e4dd1
Ported TheXaman's latest changes to the Debug Menu (#2815)
* Added option for generating incrementing pokemon in pc boxes

# Conflicts:
#	src/debug.c

* added submenu arrows, increased menu high to full screen

# Conflicts:
#	src/debug.c

* combined flags and vars into one submenu

# Conflicts:
#	src/debug.c

* added new window to flags/vars showing the current state and added submenu indicator

# Conflicts:
#	src/debug.c

* added alligned arrows for debug submenus

# Conflicts:
#	src/debug.c

* used {CLEAR_TO X} instead of manual spaces

# Conflicts:
#	src/debug.c

* renamed gDebugText to proper sDebugText

# Conflicts:
#	src/debug.c

* added Fill submenu, added fill function for PC items and all bag pockets  @LOuroboros

# Conflicts:
#	src/debug.c

* put cheat start into utility

# Conflicts:
#	src/debug.c

* put fill submenu into main menu

# Conflicts:
#	src/debug.c

* tiny fix

* renaming and reordering

# Conflicts:
#	src/debug.c

* Added reset pokedex flags for @AsparagusEduardo

* made flag toggle list dynamic

# Conflicts:
#	src/debug.c

* initial battle debug menu WIP

# Conflicts:
#	src/debug.c
#	src/wild_encounter.c

* fix visual bug

* added battle start

# Conflicts:
#	include/debug.h
#	src/battle_ai_script_commands.c

* Added faster way to add initial movesets to mon

* Added waiting music for the slow box filling

* Simplified the call to scripts

* Simplified debug scripts

* Disabled Battle Test for now

* Fixed personality on fast PC fill being always 0

* Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT

* Added missing return TRUE

* Sets nickname

* Changed how GetSpeciesName to how it's used upstream

---------

Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>
2023-07-18 09:17:03 +02:00
Eduardo Quezada D'Ottone
43ad1a4d3b
Unified multi-strike move flags (#3126)
* Unified twoStrikes and threeStrikes flags into strikeCount

* Decreased strikeCount max from 255 to 15.
2023-07-18 09:07:14 +02:00
Alex
38655b9d1f
Fix gem boost on multi hit moves and config for gem param (#3144) 2023-07-18 06:11:54 +01:00
DizzyEggg
04feba8314 test for electromorphosis, small fix for wind power 2023-07-17 16:30:59 +02: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
1b6f582600 tests for stamina/wind power 2023-07-17 15:33:44 +02:00
Alex
330e20b9e9
Fix Protosynthesis and Quark Drive boosts (#3139)
* Fix Protosynthesis and Quark Drive boosts

* Added Tests + fix newly introduced bug in the PR

Add unintentionally deletet break

new line
2023-07-17 11:10:13 +02:00