10601 Commits

Author SHA1 Message Date
Eduardo Quezada
f350000b44 Option to disabling follower Pokémon 2024-02-17 23:49:52 -03:00
Eduardo Quezada
124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-02-17 23:40:08 -03:00
Ariel A
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
Ariel A
6bceacf403 Added override table for standalone follower palettes. 2024-02-17 16:55:11 -05:00
Ariel A
725252905b Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05:00
Ariel A
afbb88d77a Undo (most) indentation changes. 2024-02-15 22:24:20 -05:00
Eduardo Quezada
502a56efd1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/global.h
#	src/data.c
#	src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Ariel A
949fc48d26 Revert "Added nature colors to stats."
This reverts commit 2d9c42110f32bc1fb8211b5f265d669d1ebeba95.
2024-02-12 20:37:09 -05:00
Ariel A
1e5fd80b7e Revert "Allowed running inside buildings."
This reverts commit 4e3c2d84911614cfa917e2fa5d0fe1511fa5e41b.
2024-02-12 20:37:09 -05:00
Ariel A
c990851473 Revert "Added function to check for newer emulators/hardware."
This reverts commit c267dd6ee6e9766c70a1522adf6f0a812e337ae6.

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's: 

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's: 

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's:
2024-02-12 20:37:08 -05:00
Ariel A
915f40c654 Improved follower message system. 2024-02-12 20:37:08 -05:00
Ariel A
a407c72235 Cleaned up follower code.
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -05:00
LOuroboros
e73c58ed2e
Made EFFECT_WRING_OUT read the max power from the move's argument field (#4180)
* Made EFFECT_WRING_OUT read the max power from the move's argument field

* Renamed EFFECT_WRING_OUT to EFFECT_VARY_POWER_BASED_ON_HP
2024-02-12 22:39:15 +01:00
Nopinou
de0f94406a
Add shouldDynamax & shouldTerastal bits to TrainerMon (#4169) 2024-02-11 21:36:35 +01:00
Eduardo Quezada
ec83b11354 Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210
# Conflicts:
#	gflib/malloc.c
2024-02-10 18:05:20 -03:00
Eduardo Quezada
1720e1b129 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_2.s
#	src/data/pokemon/species_info/gen_9.h
2024-02-10 17:53:32 -03:00
Alex
97e4aa514a
Reverted Intrepid Sword and Dauntless Shield field unification (#4171)
* Reverts back Intrepid Sword and Dauntless Shield field unification

* fixes
2024-02-10 16:15:21 -03:00
Bassoonian
fed5c6fa7a
Analogously fix Supersweet Syrup interaction (#4170) 2024-02-10 18:43:46 +01:00
Alex
b7d77099b5
Fixes Opportunist accumulating stat changes (#4168)
* Fixes Opportunist accumulating stat changes

* move memset to TurnValuesCleanUp

* Update test/battle/ability/opportunist.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-10 18:18:29 +01:00
Martin Griffin
311d732359
Save-compatible SaveBlock3 (#4112)
* SaveBlock3 in sector footers

* Update load_save.c

Since mgriffin is currently not available I took the liberty to edit the file. Hope it's fine.

* SaveBlock3 in debug menu (#3)

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-02-10 18:14:36 +01:00
MartyKen
81fdfdd90b
PLA aux item sprites (#4160)
* PLA aux item sprites

* Sprite sharing
2024-02-10 18:08:09 +01:00
Eduardo Quezada D'Ottone
8b871b7eb4
Fixed Disguise not ending the battle in the correct form (#4167)
* Fixed Disguise not ending the battle in the correct form

* Added TODO comments
2024-02-10 17:13:46 +01:00
Eduardo Quezada D'Ottone
af95a09961
Last Respects effect + Fixed Supreme Overlord (#4151)
* Last Respects effect + Fixed Supreme Overlord

* Fixed ability pop-up happening when there's no fainted party members

* Fixed Supreme Overlord counting faints during the battle instead of fainted party

* Removed invalid test.

* Converted GetSupremeOverlordModifier to an inline function

* Created inline functions to obtain faint counters

* Fixed erroneous implemenation and tests
2024-02-10 10:58:41 +01:00
ghoulslash
5496115f92
replace AI_GetMoveEffectiveness with AI_DATA->effectiveness checks in AI_CanStatus funcs (#4166)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-02-10 09:09:11 +01:00
Eduardo Quezada D'Ottone
0f312e3f76
Fixed Ogerpon shiny palettes (#4165) 2024-02-09 22:51:36 +01:00
Eduardo Quezada
67f1772f1e Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_util.c
#	test/battle/item_effect/heal_and_cure_status.c
2024-02-09 17:02:56 -03:00
Eduardo Quezada D'Ottone
6da1be01a9
Added Indigo Disk cries (#4164) 2024-02-09 19:46:09 +01:00
ghoulslash
f873c6f93b
A batch of gen 9 move anims (#4145) 2024-02-09 09:52:59 -05:00
Hungry Pickle
47abc33c84
Fixes Stench ability triggering on non-damaging attacks (#4159)
* Fixes Stench ability triggering on non-damaging attacks

* adds stench ability test

* added stench ability test for partner pokemon

---------

Co-authored-by: HungryPickle <beardybirdy@gmail.com>
2024-02-09 15:35:40 +01:00
Alex
e89f8e00ed
Fixes Hit Escape moves interaction with hold effects and switch in ab… (#4091)
* Fixes Hit Escape moves interaction with hold effects and switch in abilities

* leftover

* fix spelling

* fix desc.
2024-02-09 14:00:42 +01:00
DizzyEggg
31ac151e29
Fix Full Restore / Antidote not reseting Toxic Counter (#4135)
* Fix Full Restore / Antidote not reseting Toxic Counter

* Update battle_scripts_2.s

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-09 13:58:16 +01:00
Bassoonian
15f30d646e
Add MON_TYPES and MON_EGG_GROUPS (#4154)
* Add MON_TYPE macro

* Add MON_EGG_GROUP macro

* Rename as requested by Edu

* Fix alignment after rename
2024-02-08 17:20:15 -03:00
Eduardo Quezada D'Ottone
ce97984d80
Updated teacheable learnests to Indigo Disk data (#4155)
* Updated teacheable learnests to Indigo Disk data

* Adjusted titles to indicate where to modify the moves
2024-02-08 17:27:26 +01:00
ghoulslash
d2690278b0
Implement ghoul's save block branch (#4113)
Implement ghoul's save block branch
2024-02-08 10:54:15 -05:00
Eduardo Quezada
ec803054e6 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	src/battle_util.c
#	test/battle/hold_effect/kee_berry.c
2024-02-08 12:19:51 -03:00
ghoulslash
4bfe6d3c6d
Merge branch 'upcoming' into ghoulsaveblock 2024-02-08 08:37:57 -05:00
MartyKen
51cbf92ed0
Lvl up learnsets by generation (#4049)
* Lvl up learnsets by generation

I think the title sums it up pretty nicely

* Update level_up_learnsets.h

forgot some newer pokemon

* divided the learnset file into generations

* Separated learnsets by generation

Separated the learnsets by generation, added a bit more documentation in the config file

* Update src/pokemon.c

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

* Update include/config/pokemon.h

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

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-08 09:02:02 -03:00
LOuroboros
916e4814bd
Implemented Custom/Complex/Expanded GiveMon scripting command (#3924)
* Introducing an expanded givemon

* Added debug features to check a Pokémon's EV and IV

* Added a parameter to set a custom mon's gender

* Added a debug feature to clear the party

* Defined the EV/IV getters in gSpecials

* Added Gigantamax Factor toggle to givecustommon

* Updated Gigantamax Factor label in givecustommon macro

* Added tera type parameter to givecustommon

Misc. changes:
-Added a few harmless comments to CreateCustomMon for consistency reasons.

* Cleaned up the code inside CreateCustomMon a bit

Also updated the values assigned to the parameters of ScriptGiveCustomMon
This is temporary though. I'll probably end up turning them into 2byte parameters so they can be filled when the scripting command is called by using variables once I solve the bigger problem that the scripting command is currently facing.

* Foolproofed the Poké Ball check in CreateCustomMon

* Assigned a default gender to givecustommon
This solved the nasty issue by which the command wasn't working properly if you didn't fill in each parameter when calling givecustommon in a script.

* Reinforced the gender checks at CreateCustomMon

* Re-reinforced the gender checks at CreateCustomMon

* Compressed givecustommon and added tests

-Made givecustommon skip unspecified parameters.
-Added scripting variables support for every parameter.
-Added tests.

* Updated the default values of some ScriptGiveCustomMon parameters

* Replaced vanilla's givemon with givecustommon

Misc. Changes:
-Renamed CreateCustomMon to ScriptGiveMonParameterized.
 -The truth is that the function was never limited to creating the skeleton of a Pokémon like the actual CreateMon functions do, so that label was never correct. The function was always an expanded ScriptGiveMon.
-Moved the core functions to src/script_pokemon_util.c which is where they actually belong.
-Updated ScriptGiveMonParameterized a little to incorporateb changes that were applied to the original ScriptGiveMon, namely, Synchronize ability and form change handling.
-Introduced a new ScriptGiveMon to replace the original one.

* Corrected givecustommon tests

* Fixed the default IV values for the new givemon

* Updated DebugAction_Party_ClearParty for consistency with the other debug functions

* Updated the text strings used by the Check EV/IV debug features

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-08 09:11:13 +01:00
Bassoonian
f1ff524d4e
Merge branch 'upcoming' into ghoulsaveblock 2024-02-08 00:06:35 +01:00
ZnogyroP
e295d7346a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into battle-anims 2024-02-07 16:10:00 -05:00
Alex
452432533a
Kee berry (#4149)
* Fixes Kee Berry

* new line

* Fix fix

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-07 15:42:22 +01:00
Nephrite
8d4c3a8acb
Two turn moves tweaks (#4150)
* Two turn move tweaks

Fixed comment bug and added CheckIfCanFireTwoTurnMoveNow function

* Renamed `tryfiretwoturnmovenowcheckeffect` macro
2024-02-07 15:42:05 +01:00
ZnogyroP
5d2dfe218e
Fixes to strings + Hospitality (#4147)
* Fixes to strings + Hospitality

* Requested changes

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-07 01:18:35 +01:00
Bassoonian
84686d15d8
Merge branch 'upcoming' into ghoulsaveblock 2024-02-06 23:36:46 +01:00
Bassoonian
28e3a2ba98 Merge branch 'ghoulsaveblock' of https://github.com/Bassoonian/pokeemerald-expansion into ghoulsaveblock 2024-02-06 23:36:35 +01:00
Bassoonian
37b442f3bb Apply ghoul's review 2024-02-06 23:36:30 +01:00
Alex
fa5f507b1e
Fixes Mycelium Might speed bracker (#4146)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-06 23:30:57 +01:00
Frank DeBlasio
7f50c0b9c3
Simplify gTrainerSprites (#4140)
* Simplified y_offset equations

* Removed trainer pic animation from gTrainerSprites

* Used metaprogram to simplify trainer sprites without mugshots

* Incorporated comments

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-06 22:24:36 +01:00
ZnogyroP
34067ac37f A batch of gen 9 move anims
Animations for:
- Last Respects
- Lumina Crash
- Kowtow Cleave
- Torch Song
- Aqua Step
- Hydro Steam
- Tidy Up
- Pounce
- Trailblaze
- Chilling Water
- Rage Fist
- Temper Flare
- Psychic Noise
2024-02-06 13:58:25 -05:00
Frank DeBlasio
dd3228aa14
Updated Mew teachable moves to SV (#4142) 2024-02-06 08:55:49 -03:00