sneed
312dcbb8a8
Speed Ignoring effect fixes ( #4613 )
...
* Custap ties with Quick Draw, Stall with Mycelium
* add a test
2024-05-24 11:21:35 +02:00
Rachel
c129423a69
Fix move descriptions for Feint and Feint Attack ( #4617 )
2024-05-24 11:19:55 +02:00
GriffinR
18f84b78f2
Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
...
Move POKE_ICON_BASE_PAL_TAG to a header
2024-05-22 20:29:12 -04:00
sneed
b592c6eae5
Add POKE_ICON_BASE_PAL_TAG to a header
2024-05-23 02:45:22 +03:00
kittenchilly
edab81b658
Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate ( #4606 )
...
* Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate
* Formatting
* Test
* Update own_tempo.c
2024-05-22 22:20:44 +02:00
Eduardo Quezada
1be5581f19
Revert NUM_DECORATION_FLAGS definition
2024-05-22 14:17:11 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Alex
ba07d2b3d4
Renames evolution methods the were labeled as evo level ( #4607 )
...
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES
* rename evo_level_recoil_damage
* change EVO_LEVEL_ITEM_COUNT_999
2024-05-22 11:06:24 +02:00
Ariel A
a49d908254
Merge branch 'followers' into followers-expanded-id
2024-05-21 22:23:00 -04:00
Ariel A
c0ca88d45a
Merge pull request #36 from Jaizu/followers-expanded-id
...
Fix virtual object events
2024-05-21 19:17:25 -07:00
Ariel A
b37d9b3000
fix: disable followers in Union Room
...
Fixed #17
2024-05-21 22:14:29 -04:00
Eduardo Quezada
14ab00cfeb
Moved message counts to their own file + remove unneeded include
2024-05-21 22:04:22 -04:00
Eduardo Quezada
9fc7e37c73
Comment updates
2024-05-21 19:38:42 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Alex
973146c725
BS_SetGlaiveRush formatting ( #4610 )
...
Please merge my OCD induced change.
2024-05-22 00:55:20 +02:00
sneed
7b8348773b
Triple kick calcs use strikeCount ( #4608 )
2024-05-21 16:45:32 -04:00
Eduardo Quezada
05e58c70e6
Improved GetTypeEffectiveness check
2024-05-21 15:19:39 -04:00
GriffinR
aa4fa925c2
Merge pull request #1995 from Jaizu/adjust_friendship
...
Make AdjustFriendship more readable
2024-05-21 12:01:53 -04:00
GriffinR
999731fbf1
Merge pull request #1996 from Jaizu/fix_pokeblocks
...
Fix Pokeblock script missing a releaseall
2024-05-21 11:58:08 -04:00
Jaizu
689f41803d
fix uppercase typo
2024-05-21 09:46:27 +02:00
moostoet
85ca0645a9
Add configuration to prevent permanent item theft (Covet / Thief) from NPCs ( #4605 )
...
* feat: implement logic for gen5+ covet/thief
* refactor: add define, misc. changes
* fix: define parenthesises
* fix: revert to bool32
* fix: formatting
2024-05-20 22:52:12 +02:00
cawtds
b73e33618d
Fix status curing of full restore when used on party member ( #4603 )
...
* fix getboxmondata for evolutiontracker if compiled with agbcc
* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests
* formatting, removed unused
2024-05-20 00:25:03 +02:00
Alex
57ec87387d
Fixes freeze on Galvanize Explosion against Volt Absorb ( #4601 )
2024-05-19 21:29:54 +02:00
Bassoonian
bc9f09744d
Egg Move Refactor ( #4534 )
...
* Egg Move Refactor
* Update python file and fix formatting
2024-05-19 13:47:15 +02:00
Jaizu
ef03daf6d4
Fix Pokeblock script missing a releaseall
2024-05-19 12:52:04 +02:00
Jaizu
2358ee88e3
Fix virtual object events
2024-05-19 12:41:51 +02:00
sneed
334668be26
Restore sassy nature effect ( #4598 )
2024-05-19 11:43:28 +02:00
Frank DeBlasio
849bd0c8bb
Consolidate natures ( #4562 )
...
* Added NatureInfo struct
* Added back animation variants to struct
* Added PokeBlock animations to struct
* Added Battle Palace info to struct
* Added nature girl messages to struct
* Reordered gNaturesInfo to match struct order
* Refactored nature stat table
* Fixed battle dome nature calculation
* Fixed neutral nature values
* Fixed bracket layout
2024-05-19 10:14:31 +02:00
Pawkkie
35e90b896d
Adjust description of FREE_MATCH_CALL ( #4590 )
...
* Adjust description of FREE_MATCH_CALL
* Shorten comment
2024-05-19 10:13:14 +02:00
kittenchilly
b7fc2b447a
Add Stellar Tera Shard sprite ( #4595 )
...
* Add Stellar Tera Shard sprite
* Update items.h
2024-05-18 22:20:47 +02:00
Bassoonian
d811cd1c4c
Add egg cycle length config ( #4596 )
2024-05-18 14:59:32 -04:00
Eduardo Quezada
9dab5d5377
Add more type immunities for followers
2024-05-18 14:55:57 -04:00
Eduardo Quezada
a6bfcc1194
More style fixes
2024-05-18 14:36:06 -04:00
hedara90
4ccfd5355d
Fixed Elixir only being useable if the first move was missing PP ( #4594 )
...
* Fixed Elixir only being useable is the first move was missing PP
* Update restore_pp.c
Commented out the test that doesn't actually test what it's supposed to due to current test system.
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-05-18 19:55:31 +02:00
Eduardo Quezada
06094a2137
More style fixes.
2024-05-18 11:39:46 -04:00
Cafei
a28ee83b06
sawsbuck sprites ( #4592 )
2024-05-18 17:07:27 +02:00
Alex
1d83ce430c
Follow up to #4579 : wrong naming ( #4591 )
2024-05-18 17:05:25 +02:00
Eduardo Quezada
9dd0395852
Moved follower scripts to new folder
2024-05-18 10:47:56 -04:00
Eduardo Quezada
73a13e5dd4
Some review changes
2024-05-18 10:40:09 -04:00
Eduardo Quezada
569749f9c2
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
2024-05-18 10:12:17 -04:00
sneed
982934c4aa
Pokedex Plus fixes ( #4514 )
...
* Pokedex plus no longer allows browsing unseen evos
* Restore "has no evolutions" printing
* only print "has no evolution" text at 0 depth
* Revert config changes
* fix duplicate icons and removed eevee hardcodes
* add new scope and indentation fixes
* actually introduce new scope
2024-05-18 10:53:01 +02:00
kittenchilly
4b221b5802
Get rid of gItemIconTable ( #4579 )
...
* Get rid of gItemIconTable
* Move the script to the folder
2024-05-18 10:22:26 +02:00
Ariel A
d785fad8cf
refactor: code review for expansion
2024-05-17 21:37:18 -04:00
Ariel A
d3849f2fc6
Merge branch 'followers' into followers-expanded-id
2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
Eduardo Quezada
ddd92b9672
Removed unused garbage
2024-05-17 14:41:14 -04:00
Eduardo Quezada
24913f5339
TEMPORARY: Reverted Gen 4-8 followers
2024-05-17 14:40:45 -04:00
Eduardo Quezada
dca0305ac8
FLAG_TEMP_HIDE_FOLLOWER is now an alias for FLAG_TEMP_E
2024-05-17 11:24:05 -04:00
Eduardo Quezada
6b641beb83
Restore padding to ROM
2024-05-17 11:23:44 -04:00
Eduardo Quezada
3160cbb97d
Removed usages of DEBUG define
2024-05-17 11:23:31 -04:00
