Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,182 Commits 1 Branch 0 Tags
Commit Graph

10070 Commits

Author SHA1 Message Date
Alex
6daea655e5 fix line alignment 2023-10-20 12:33:56 +02:00
Alex
ab6c5bafe9 New function to check ability stat loss 2023-10-20 12:29:55 +02:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-19 20:16:37 -03:00
Eduardo Quezada D'Ottone
14b7a70254
Dynamax (#2417) 2023-10-19 11:32:25 -03:00
Eduardo Quezada
6348c24be1 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2023-10-19 08:10:49 -03:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Alex
876341105b parantheses 2023-10-19 11:32:58 +02:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax 2023-10-18 19:37:09 -03:00
Alex
354f84be21 intim changes 2023-10-18 22:14:49 +02:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
leo60228
920fd481e7
Regional Dex numbers are always 3 digits 2023-10-18 14:37:28 -04:00
Eduardo Quezada
d27e566b4b
fix 4 digit spacing 
(cherry picked from commit a4538d606d32175323bc06928d55857e8d13b6d2)
 2023-10-18 14:37:28 -04:00
Eduardo Quezada
5831f9344c
4 digits in dex num in summary screen 
(cherry picked from commit 7175214663a817e72894bd4b594ba1f8cea701c3)
 2023-10-18 14:37:28 -04:00
Eduardo Quezada
6cc2a1ef03
4 digits option for dex numbers 
(cherry picked from commit 9bad51cbc69786ecd2e6719f2bca201a961bff5e)
 2023-10-18 14:37:28 -04:00
leo60228
b3e5c3179f
Revert "reorder species.h" 
This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.
 2023-10-18 14:37:27 -04:00
leo60228
f1464bbab6
fix icon palettes 2023-10-18 14:37:21 -04:00
leo60228
4e8ae5965e
make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON 2023-10-18 14:37:01 -04:00
leo60228
e10acf8b2d
gen 9 form learnsets 2023-10-18 14:37:00 -04:00
leo60228
5e0ff4ab52
gen 9 form learnset pointers 2023-10-18 14:37:00 -04:00
leo60228
ca931d09e9
form species info 2023-10-18 14:37:00 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing) 2023-10-18 14:36:59 -04:00
leo60228
fed554a110
sSpeciesToNationalPokedexNum 2023-10-18 14:34:01 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems 
(cherry picked from commit 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)
 2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder 
(cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)
 2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder 
Add gen 9 Pokémon data

(cherry picked from commit cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)
 2023-10-18 14:33:56 -04:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities (#3415) 2023-10-18 08:29:53 -03:00
sbird
b77bc71862 fix -Warray-parameter, -Waddress, -Warray-bounds warnings 
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
 2023-10-16 09:36:36 +01:00
Eduardo Quezada D'Ottone
fef7171c79
Fixed Parental Bond (#3417) 2023-10-15 12:02:43 -03:00
Eduardo Quezada
ca101e9952 Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm 2023-10-15 09:42:56 -03:00
Eduardo Quezada
6e1d4b4409 Fixed compile on modern + tests 2023-10-15 08:32:25 -03:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-10-15 00:30:00 -03:00
Kaitlyn
bf5fdfa942 Front Pic Animation Organization 
Organized and formatted
 2023-10-14 23:10:25 -03:00
Kaitlyn
0694e1bf1f Battle Animation Organization 
Added remaining sprites not listed
Organized and formatted.
 2023-10-14 23:10:25 -03:00
Eduardo Quezada
4f0802f96e Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2 
# Conflicts:
#	src/debug.c
 2023-10-14 22:14:39 -03:00
Eduardo Quezada
a936b78ad5 Merge branch 'RHH/master' into RHH/upcoming 2023-10-14 21:32:20 -03:00
Eduardo Quezada D'Ottone
6016c606d6
Converted Get(Box)MonData2 to proper functions (#3416) 2023-10-14 18:23:17 +02:00
LOuroboros
0f979ac796
Removed pointless for loop in CB2_InitBattleInternal (#3422) 2023-10-14 13:16:04 -03:00
Eduardo Quezada D'Ottone
0f3971a360
Updated Zacian/Zamazenta stats to Gen 9 (#3421) 2023-10-14 17:54:31 +02:00
LOuroboros
b46c2c2bf8
Made AbilityBattleEffects use the B_MSG_TERRAIN constants for the field terrain intro text (#3410) 2023-10-14 10:23:45 +02:00
LOuroboros
a746d0e726
Updated Cresselia's base stats (#3419) 2023-10-14 10:20:49 +02:00
Eduardo Quezada
c6b43d992a Fixed Parental Bond 2023-10-13 21:56:54 -03:00
Alex
1ae26b32e6
Fix Kee Berry and Custap Berry + Tests (#3409) 
* Fix Kee Berry and Custap Berry + Tests

* add missing assumes

* fix wrong test files

* fix new line
 2023-10-13 23:07:04 +02:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
Martin Griffin
45897cefbc
Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399) 
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
 2023-10-13 20:50:48 +02:00
Martin Griffin
cbdba65218
Move battle tests off the heap (#3413) 
* Catch OOM in tests

* Alias gBattleTestRunnerState with sBackupMapData

Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
 2023-10-13 20:29:30 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b Fix Syrup Bomb and change Octolock 2023-10-13 14:08:44 +02:00
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs (#3392) 2023-10-12 15:28:41 +01:00