Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests ( #5444 )
2024-09-29 17:05:54 -04:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change ( #5398 )
...
* changes Growth's move description to account for Gen 5+ behavior
* completes B_DIVE_BALL_MODIFIER comment
* fixes typos and incongruent spacing in various files
* Update src/data/moves_info.h
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 ( #5385 )
...
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
2024-09-14 20:21:34 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Eduardo Quezada
2f21073555
Fixed Tera Shift description ( #5351 )
2024-09-08 22:13:32 -04:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names ( #5296 )
...
* Fix Max and G-Max Moves bypassing absorbing abilities
* Fix G-Max Corviknight and Centiskorch speciesName
* Remove some outdated comments
* Missing Dynamax check
* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
Pawkkie
a111ac496d
Fix typos ( #5221 )
...
Fix typos in move description of Decorate, Collision Course and Electro Drift
2024-08-20 12:44:27 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name ( #5134 )
2024-08-10 23:59:23 +02:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers ( #5122 )
2024-08-08 20:12:18 +02:00
hedara90
6bbc0601a9
Fixed non-grass Ivy Cudgel breaking battle UI ( #5117 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-08 10:39:38 +02:00
Bassoonian
207129e0c8
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug
2024-08-07 12:42:45 +02:00
Ariel A
5293e67995
Merge branch 'followers' into followers-expanded-id
2024-08-07 00:02:16 -04:00
tertu
08f8ccd9eb
Follower palette fix ( #5107 )
2024-08-06 11:52:05 -05:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b
Fixed some overworld palettes
2024-08-06 13:25:26 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
Bassoonian
4dce7db714
Another text fix
2024-08-04 16:53:46 +01:00
Bassoonian
369efc1208
Fix two small text errors in follower dialogue
2024-08-04 01:15:36 +01:00
Eduardo Quezada
8450268b74
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/battle_anim.h
2024-07-31 18:13:19 -04:00
Alex
3b9ea5b54c
Adds battle frontier conversion script ( #5040 )
...
Adds script to convert battle frontier mons to new format
Fixes existing battle frontier mons to match vanilla
2024-07-31 15:04:21 -07:00
hedara90
74220518d4
Fixed the animation tables being different sizes ( #5063 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:34:19 -04:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
kittenchilly
7f6ddcf9d9
Update all level up learnsets to Indigo Disk ( #5023 )
...
* Update all movesets to Indigo Disk
* Also update past gens for gen 9 mons
* Update gen_1.h
2024-07-24 22:53:37 +02:00
hedara90
3f4b4adae5
Updated reference to config location to new location ( #5026 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-23 14:09:32 -04:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
ae48293806
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
2024-07-22 23:06:44 -04:00
kittenchilly
0bcd6a5435
Make Snow Warning description respect config ( #5018 )
...
* Make Snow Warning description respect config
* Update src/data/abilities.h
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-22 13:39:32 +02:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite ( #5008 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
