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

9790 Commits

Author SHA1 Message Date
Eduardo Quezada
fe91f08b26 Restore comments for now 2023-10-30 08:10:23 -03:00
Eduardo Quezada
661becc3b6 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2 
# Conflicts:
#	src/debug.c
 2023-10-30 08:05:14 -03:00
Alex
f461bc3256
AI_CompareDamagingMoves changes to increase the score by 1 for best moves (#3382) 
* Further optimizes AI_CompareDamagingMoves

* viableMove name change + 2 tests

* some issues

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-10-30 10:04:59 +01:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms (#3469) 
* Alcremie form sprites

Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>

# Conflicts:
#	graphics/pokemon/alcremie/lemon_cream/front.png
#	graphics/pokemon/alcremie/matcha_cream/back.png
#	graphics/pokemon/alcremie/matcha_cream/front.png
#	graphics/pokemon/alcremie/mint_cream/front.png
#	graphics/pokemon/alcremie/ruby_cream/front.png
#	graphics/pokemon/alcremie/salted_cream/front.png
#	include/graphics.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/footprint_table.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon.c

* Fixed cries

* Removed Todos

* Temp: all forms use the same icon

* Grouped form data + Fixed missing Level up and Teachable learnsets

* Added missing data for form changes and back animations

* Grouped defines together

* Fixed compile

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-10-29 20:30:56 +01:00
Katy
efae521646
Gen7 Sprites/Animations For Species (#3426) 2023-10-28 23:47:58 -03:00
Bassoonian
ab25e6bfa5
Fixes Synchronize's OW effect and adds configs (#3480) 2023-10-28 23:24:20 -03:00
Bassoonian
0dd22305a4
Adds Illuminate's Gen9 effect (#3482) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-28 23:22:41 -03:00
kittenchilly
5087095aae
Obedience levels now increase per badge (#3475) 2023-10-27 19:17:17 -03:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
Eduardo Quezada
8e0991475c Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
Eduardo Quezada
7ae37ab79c Merge branch 'pret_master' into RHH/upcoming 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/event_scripts.s
 2023-10-27 11:03:37 -03:00
Alex
57a99e9be6
Fixes dynamax move target and canceling in doubles (#3470) 2023-10-27 10:38:40 -03:00
Eduardo Quezada
59c0de0967 Merge branch 'RHH/master' into RHH/upcoming 2023-10-27 09:16:21 -03:00
kittenchilly
a8632f0fc5
Update PLA Pokemon data to correct values (#3458) 
* Fix PLA Pokemon data to use correct values

* oops, cant forget basculin white stripe

* Update level_up_learnsets.h

* Update species_info.h
 2023-10-26 22:45:33 +02:00
GriffinR
c169b856d4
Merge pull request #1937 from kittenchilly/removewhitespace 
Remove all trailing whitespace
 2023-10-26 10:09:00 -04:00
Bassoonian
bb9d3208b0
Frontier ban refactor (#3465) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-26 10:52:43 -03:00
Eduardo Quezada
25d6f8ba74 Fix mini_printf encoded string -Werror=pointer-sign warning 2023-10-26 09:25:50 -03:00
Alex
cb38f3bee6
Fixes legendary backgrounds (#3464) 
* Fixes legendary backgrounds

* missed one

* forgot break
 2023-10-25 17:06:25 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Alex
591ef71e3b
Fixes form change when using switch moves (#3463) 
* Fixes form change with switch moves
 2023-10-25 08:33:43 +01:00
Martin Griffin
74c08dc955 Merge remote-tracking branch 'rhh/master' into upcoming 2023-10-24 08:58:02 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' (#3459) 
Fix Purifying Salt to be immune to statuses from secondary effects.
 2023-10-24 09:55:32 +02:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
 2023-10-23 17:36:42 -03:00
Martin Griffin
1110d0aeb9
ROM space on debug menu (#3453) 2023-10-23 17:12:17 -03:00
Frank DeBlasio
bac135c6e8
Gave Razor Fang EVO_HELD_ITEM type/fieldUseFunc properties (#3456) 2023-10-23 17:03:31 -03:00
kittenchilly
333523e5f7 Remove all leading whitespace 2023-10-23 13:24:38 -05:00
Bassoonian
5592706a71 Fix Synchronize devnote + Gen9 behaviour 2023-10-23 17:59:07 +02:00
Martin Griffin
5fd36a8e39
Fix ModifyPersonalityForNature (#3452) 2023-10-23 09:37:40 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435) 
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
 2023-10-23 11:39:22 +01:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303) 
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
 2023-10-23 10:08:36 +01:00
kittenchilly
3755155e9d
Update friendship evo threshold to gen 8+ with config (#3376) 2023-10-22 18:05:54 -03:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440) 
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
 2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone
7fdc4aacda
Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
Alex
bf56ea8a8b apply suggestions 2023-10-22 19:46:31 +02:00
sbird
e08aae2a32 apply changes from #3436 2023-10-22 03:55:35 +02:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
voloved
ebdf14c620
Push B in wild battle moves to Run (#3362) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-21 12:45:40 -03:00
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