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

11161 Commits

Author SHA1 Message Date
Eduardo Quezada
0ef8a795de Adjusted format of Follower Macro 2024-05-07 10:53:31 -04:00
ghoulslash
5538095785
Replace hp checks with IsBattlerAlive (#4429) 
* add IsBattlerAlive to flame/toxic orb, convert a bunch of .hp != 0 and .hp == 0 checks to IsBattlerAlive

* remove redundant IsBattlerAlive checks on flame/toxic orb

* Update src/battle_util.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-05-07 16:39:02 +02:00
Nopinou
82b626aef1
fix and tweak level cap code (#4505) 
Co-authored-by: Baptiste-Lecoutre <59924283+Baptiste-Lecoutre@users.noreply.github.com>
 2024-05-07 15:53:09 +02:00
Eduardo Quezada
85885d82c1 Gen 8 palettes (except Enamorus) 2024-05-07 08:47:54 -04:00
Abbie Potter
da3d715f3b
Punchier tera animation (#4507) 
* Punchier tera animation

* Removed testing comments

* Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative

* Remove redundant arg from applyterastallization
 2024-05-07 07:59:52 -04:00
sneed
f4e7c8cca8
Restore Pokedex Fairy type search option (#4515) 2024-05-07 13:44:15 +02:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type (#4502) 
* Cramorant faint fix and add form change type

* Fixed formatting, renamed form change type, changed various to callnative

* Fix oops broke everything except gulp missile

* Improved condition order

* remove extra line

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Added requested changes

---------

Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-07 06:44:17 -04:00
sneed
9d2e4d57e9
Removed stellar type from pokedex search (#4513) 
* Removed stellar type from pokedex search

* Apply suggestions from code review

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-05-07 11:32:31 +02:00
Eduardo Quezada
58e3bb0cbb Fixed Furfrou follower palettes 2024-05-06 18:57:59 -04:00
Eduardo Quezada
248980ae19 Fixed Flabébé family follower palettes 2024-05-06 18:24:36 -04:00
Eduardo Quezada
48ce61715d Fixed Vivillon palettes 2024-05-06 18:16:12 -04:00
Eduardo Quezada
d5111ad76e Fixed Arceus' Palettes 2024-05-06 18:01:02 -04:00
Eduardo Quezada
35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
 2024-05-06 16:03:29 -04:00
Eduardo Quezada
1ceae6e100 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-06 15:29:21 -04:00
Eduardo Quezada
2a605f2d84
Gen 1 type matchups + cleaned type matchup table (#4508) 2024-05-06 17:37:03 +02:00
cawtds
d98a4cb9a5
Fixed evolution tracker updates (#4503) 
* update evolution tracker correctly

* Update src/battle_script_commands.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-05-06 12:07:22 +02:00
Eduardo Quezada
d5a72ec685 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-05 19:50:12 -04:00
Eduardo Quezada
e20cb62de6
Fixed Steam Roller AI check affecting Terrain setting effects (#4498) 
* Fixed battle_ai_util.c whitespace

* Add arguments check

* Parenthesis

* Update src/battle_ai_util.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Added AI tests by AlexOn1ine

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-05-06 00:54:28 +02:00
Alex
41138f101c
Fix Red Card, Endured Damage interaction (#4482) 2024-05-05 14:29:59 +02:00
Eduardo Quezada
bcb230f3c9
Fixed Flute Items being consumed in battle (#4496) 2024-05-05 14:26:30 +02:00
PhallenTree
f07ef07855
Fixes various abilities' switch-in messages (#4500) 
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages

* Fixed typo in Supreme Overlord's String Id

* Fixes spacing in battle_string_ids.h
 2024-05-05 14:25:40 +02:00
Ariel A
f3b637c115 fix: castform OW sprite & palette 
fixed #34
 2024-05-04 18:47:25 -04:00
PhallenTree
ff2d1bb02c
Fixes Assist (#4491) 2024-05-04 16:59:47 +02:00
PhallenTree
adbb5a44c8
Fixes no effect on Diamond Storm, typo on Mortal Spin (#4489) 2024-05-04 15:11:32 +02:00
kittenchilly
0aad2a9ba7
Change Battle Frontier validation to species flag (#4341) 
* Split isLegendary into isRestrictedLegendary and isSubLegendary

* Address reviews and fix build

* Update frontier_util.c

* Remove gFrontierBannedSpecies , fast edition

* Sped up name generation

* More speed up

* Split Frontier restriction into its own flag

* Mythicals shouldn't be banned always anymore

* u32

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-03 13:32:06 -04:00
AgustinGDLV
9c46b83dbd
CanTerastallize Adjustments (#4440) 
* updated CanTerastallize to be disabled if B_FLAG_TERA_ORB_CHARGED undefined

* added check for B_FLAG_TERA_ORB_NO_COST

* reworked and tested CanTerastallize again

* fixed infinite cost if NO_COST flag not assigned
 2024-05-03 09:02:36 +02:00
Ariel A
e36a7c59cf Merge branch 'followers' into followers-expanded-id 2024-05-03 00:45:04 -04:00
Ariel A
758e4049cd fix: LARGE_OW_SUPPORT and affine OW movements 
fixed #33
 2024-05-03 00:43:39 -04:00
Eduardo Quezada
0c74fd31c3 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-02 14:24:17 -04:00
Alex
a48d2c9ce2
Set GiveBoxMonIntialMoveset_Fast as default (#4470) 
* Set GiveBoxMonIntialMoveset_Fast as default

* Update pokemon.h

removed duplicates
 2024-05-02 17:53:32 +02:00
Alex
6d397f9867
Fixes Magic Bounce in double battles (#4464) 
* Fixes Magic Bounce in double battles

* Add Double Battle check
 2024-05-02 14:23:46 +02:00
WillKolada
2aed78ebbb
Update IsDamageMoveUsable to check for Steel Roller viability (#4476) 
* Update IsDamageMoveUsable to check for Steel Roller viability

* Condense terrain flag checks and renamed IsDamageMoveUsable

IsDamageMoveUsable is now named IsDamageMoveUnusable to more accurately reflect the boolean it returns.
 2024-05-02 08:42:08 +02:00
Nopinou
362f08148c
fix non expanded types names macro (#4473) 
Co-authored-by: Baptiste-Lecoutre <59924283+Baptiste-Lecoutre@users.noreply.github.com>
 2024-05-01 16:24:44 -04:00
Alex
48d71b0de1
Hard Level Caps issues (#4420) 
* Fix 1 exp gain on hard level caps

* Level Cap issues

* fix compile

* brackets
 2024-04-30 13:59:02 +02:00
Bassoonian
c5552f53da
checkteratype setteratype (#4460) 2024-04-30 00:12:34 +02:00
PhallenTree
6ad443c9a8
Fixes Eject Items causing wrong pokemon to take damage from entry hazards (#4465) 
* Fix hazards damaging the wrong pokemon using eject items

* Added Stealth Rock test as requested

* Added Stealth Rock double battle test
 2024-04-29 23:16:58 +02:00
sneed
8d175ebe89
Automatically display TM/HM icons based on their move (#4452) 
* Automatically get icons and palettes for TM/HMs

* Restore HM icons

* replace sTMTypePalettes with a gTypesInfo field
 2024-04-29 19:29:00 +02:00
Alex
c1f92b088e
Eject Pack fix (#4463) 2024-04-29 13:21:33 +02:00
Ariel A
ee0d7a467a fix: reverted Wailord OW gfx back to 32x32 2024-04-28 20:37:08 -04:00
Bassoonian
c7797dff81
Make Fur Coat breakable (#4459) 2024-04-28 22:48:34 +02:00
Eduardo Quezada
5322127868 Fixed game not compiling when followers are disabled 2024-04-28 12:43:21 -04:00
sneed
0fafb5cd96
Fix lingering long ability popup names (#4456) 2024-04-28 11:06:39 -04:00
Ariel A
42d9b284b9 Merge branch 'followers' into followers-expanded-id 2024-04-27 23:19:38 -04:00
Ariel A
dbc11ad3d2 fix: improved follower pokemon lock and applymovement code 
fixed #30, fixed #32
 2024-04-27 23:15:49 -04:00
Ariel A
d7a021a914 fix: Made Common_Movement_* 'safe' for followers 
fixed #31
 2024-04-27 22:47:41 -04:00
kittenchilly
d58e6517f8
Add abilities Tera Shift, Tera Shell, and Teraform Zero (#4418) 
* Add abilities Tera Shift, Tera Shell, and Teraform Zero

* Address reviews

* Tests and misc cleanup

* Fix alignments

* Update battle_script_commands.c

* New tests and fix behavior

* Address more reviews

* Update battle_util.c
 2024-04-27 19:52:31 +02:00
kittenchilly
fc9d5c289a
Embody Aspect fixes (#4439) 
* Embody Aspect fixes

* Fix tests

* Update battle_util.c
 2024-04-27 19:35:42 +02:00
kittenchilly
64b28124fb
Add Tera Starstorm move + make Tera Blast displayed type reflect current type due to tera state (#4447) 
* Add Tera Starstorm move + make Tera Blast/Tera Starstorm displayed type reflect tera type

* Ooops

* Curse tests
 2024-04-27 19:35:29 +02:00
Alex
7355eb99a5
Fix infinite loop caused by leftovers with AI_FLAG_SMART_CHOICES (#4453) 2024-04-27 13:36:29 +02:00
Eduardo Quezada
b006e2d213 Shiny Gen 7 sprites (gotta fix regular palettes) 2024-04-26 11:43:34 -04:00