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
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
d153947aa2
Merge branch 'upcoming' into dynamax
2023-10-18 19:37:09 -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
Eduardo Quezada
a936b78ad5
Merge branch 'RHH/master' into RHH/upcoming
2023-10-14 21:32:20 -03:00
Eduardo Quezada D'Ottone
0f3971a360
Updated Zacian/Zamazenta stats to Gen 9 ( #3421 )
2023-10-14 17:54:31 +02:00
LOuroboros
a746d0e726
Updated Cresselia's base stats ( #3419 )
2023-10-14 10:20:49 +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
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs ( #3392 )
2023-10-12 15:28:41 +01:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel ( #3402 )
...
* initial commit
* done
* clean up
2023-10-11 11:09:50 +02:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon ( #3401 )
2023-10-11 11:02:28 +02:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
Eduardo Quezada
644fba2db1
Gigantamax Flag
2023-10-10 17:37:18 -03:00
Eduardo Quezada
2fac60055f
Merge branch 'RHH/master' into RHH/upcoming
2023-10-09 22:08:32 -03:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
f7098414d3
Fixed Bergmite/Avalugg updated egg groups ( #3380 )
2023-10-09 12:19:18 +02:00
Eduardo Quezada
d1c672d3ce
Converted most battle preproc ifs to regular ifs
2023-10-08 21:32:15 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data ( #3349 )
2023-10-08 15:56:09 -03:00
LOuroboros
70ed93e01b
Updated Hisuian form abilities to SV's standard ( #3391 )
2023-10-08 15:54:33 -03:00
kittenchilly
ab8bc6e493
Add new sell value of 1/4 of an item's price, with config ( #3315 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-05 09:14:42 -03:00
Eduardo Quezada
a6940c9e03
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
...
# Conflicts:
# src/battle_ai_script_commands.c
# src/battle_controller_player.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_controllers.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/mystery_gift_menu.c
# src/pokemon.c
2023-10-02 17:17:41 -03:00
Bassoonian
8a1f166f5d
Updates Pokémon abilities to Gen9 ( #3353 )
2023-09-30 20:35:35 -03:00
kittenchilly
baca050724
Allow Sliggoo to evolve during overworld fog ( #3343 )
2023-09-26 17:05:44 -03:00
Eduardo Quezada
566ec93492
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
2023-09-24 20:32:45 -03:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN ( #3247 )
...
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-09-24 00:01:18 -03:00
kittenchilly
d4217739e6
Add type boosting held item power config ( #3326 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-20 22:03:00 -03:00
Eduardo Quezada
af210da972
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure ( #3297 )
2023-09-15 11:18:47 -03:00
Alex
db039ee4e2
Tera Shards Icons ( #3307 )
2023-09-14 07:38:45 -03:00
Eduardo Quezada
b89722500f
Fixed Mr. Mime capitalization
2023-09-12 13:09:56 -03:00
ghoulslash
8279ec385c
Added missing Evolution data ( #3287 )
2023-09-11 09:20:22 -04:00
ghoulslash
181a0b35a5
Removed unused itemId field ( #3293 )
2023-09-11 09:13:27 -04:00
Eduardo Quezada
bfcbd37d78
Updated Big Nugget's Fling power to Gen 8+
2023-09-11 02:43:39 -03:00
Eduardo Quezada
6a70b06240
Removed unused itemId field
2023-09-10 19:42:33 -03:00
Eduardo Quezada
755e260da4
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# include/constants/battle_move_effects.h
# test/battle/move_effect/multi_hit.c
2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves ( #3290 )
2023-09-10 11:57:19 -03:00
AaghatIsLive
49e791f128
Fixed some hisuian abilities ( #3292 )
2023-09-10 11:51:05 -03:00
Eduardo Quezada
b114baa07d
Updated Nosepass evolution with PLA's
2023-09-09 00:01:45 -03:00
Eduardo Quezada
6332870a3b
Crabominable can now evolve via Ice Stone
2023-09-08 00:30:10 -03:00
psf
75d06bb599
Generation 6 Experience Share ( #3276 )
2023-09-07 23:18:18 -03:00
kittenchilly
2fa4206bf1
Add new Substitute doll sprites ( #3263 )
2023-09-04 19:48:43 -03:00
Eduardo Quezada
35d7201935
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/battle_scripts.h
2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) ( #3268 )
2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
Alex
64ffc5a85d
Fixes Beat Up + Chloroblast ( #3264 )
2023-08-30 15:58:53 -04:00
kittenchilly
48d6fe2e64
Merge branch 'upcoming' into ultraburst
2023-08-26 14:43:31 -05:00
Eduardo Quezada D'Ottone
9c937a945c
Pokemon sprite review pt.1 ( #3235 )
2023-08-23 22:43:42 -04:00
CyanSMP64
fd37946c1d
resize golduck
2023-08-22 20:31:13 +12:00
LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field ( #3243 )
...
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
2023-08-21 12:49:17 +01:00
