Commit graph

230 commits

Author SHA1 Message Date
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
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
This reverts commit e2d70d440e, reversing
changes made to 0d2b400953.

# Conflicts:
#	gflib/text.c
#	include/config/decap.h
#	src/battle_message.c
#	src/item.c
2024-05-13 19:19:37 +02:00
LOuroboros
d08fb8e824
Turned B_RESTORE_HELD_BATTLE_ITEMS into a non-boolean config (#4402)
* Corrected the comment description of B_RESTORE_HELD_BATTLE_ITEMS

* Made B_RESTORE_HELD_BATTLE_ITEMS a non-boolean config
2024-04-18 09:03:39 +02:00
Eduardo Quezada
fbff04d4e3
Fixed silent Klefki cry (#4392)
* Fixed Klefki's cry not being hearable

* Added warning to family toggle file
2024-04-14 21:06:17 +02:00
Alex
c740c4ba19
Disguise fixes + gen8 hp loss config (#4360)
* Disguise fixes + gen8 hp loss config

* fix battler arg

* Update test/battle/ability/disguise.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-07 00:07:55 +02:00
Eduardo Quezada
d662409cda
Disable Tera Type on summary screen by default (#4289) 2024-03-18 17:40:05 -03:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275)
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
2024-03-12 12:21:03 +01:00
MartyKen
ec73e28507
Gen 6 level up learnset update (#4267)
* 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>

* PLA aux item sprites

* Gen 6 lvl up Learnset update

Updates gen 6's level up learnsets to ORAS (previously XY)

* Revert "Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming"

This reverts commit 53462c4088, reversing
changes made to 051a93058c.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-03-11 07:46:16 -03:00
Eduardo Quezada
5acc770f00
Fixed config comment (#4237) 2024-03-03 09:07:47 +01:00
Eduardo Quezada D'Ottone
8671da436b
Add LGPE+ Premier Ball Bonus config (#4191)
* Add LGPE+ Premier Ball Bonus config

* Capitalization

* Premier Ball count in message + only give the amount of Premier Balls possible

* Review changes

* Updated B_TELEPORT_BEHAVIOR to match Premier Ball config

* Update src/shop.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-25 10:13:26 +01:00
Eduardo Quezada D'Ottone
5e79fcd5b4
Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213)
* Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct

* Fixed SaveBlock1 comment (please squash)

* Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock
2024-02-19 18:42:56 +01:00
Alex
7ab23cf426
Sets neutral nature and ability 0 as default in trainer control (#4172)
* Sets neutral nature and ability 0 as default in trainer control

* add config to generate a random ability

* minor correction

* move config to battle.h

* fixed compiling
2024-02-18 15:02:58 +01:00
Eduardo Quezada
ebe13ffc3c Merge branch '_RHH/master' into _RHH/upcoming 2024-02-16 11:30:01 -03:00
ghoulslash
ce99db0086
Generic Starting Battle Status Variable (#4176)
* setup generic starting battle status variable, ABILITYEFFECT_SWITCH_IN_STATUSES

* fix B_ANIM_TAILWIND, assign to starting statuses, and change B_VAR_STARTING_STATUS check for only the variable and not trainers

* Update src/battle_main.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update src/battle_util.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update src/battle_util.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* style fixes

* General_Room naims play SE

* fix sText_BizarreArenaCreated

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-14 10:05:37 +01:00
Alex
3598a18703
Adds config for Soundproof change during Uproar status (#4174) 2024-02-11 10:40:30 +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
Bassoonian
5d5cc76a2c
Teachable learnset helper mechanics (#3856)
* Teachable learnset helper mechanics

* Rename folder and python script

* Some teachable learnset work

* Update PoryMoves file labels

* Add header and make custom json

* Include found moves in output file

* Update SV file to latest version

* Don't run if there are no jsons to be found

* Add Basculin duplication in json

* Add universal move support to

* Ignore and skip Mew

* Integrate tool in Makefile

* Condense Basculin learnsets

* Split Oinkologne for easier generation

* Add Deoxys' XD move tutor data

* Add missing Darumaka/Yamask Galarian SwSh TMs

* Add TID species to sv.json

* Update sv.json to The Indigo Disk data

* Add Python install instructions

* Fix Makefile

* Expand header with more information

* Add config to allow disabling the learnset helper

* Update include/config/pokemon.h

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

* Don't crash if the config is missing

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-08 11:32:48 -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
Bassoonian
84686d15d8
Merge branch 'upcoming' into ghoulsaveblock 2024-02-06 23:36:46 +01:00
LOuroboros
691b1879f8
Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132)
* Renamed VAR_TERRAIN and introduced a var-based field terrains timer

* Fixed sky battle configs alignment and syntax

* Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars

* Removed pointless edits to EndTurnTerrain

* Updated B_VAR_TERRAIN_TIMER's comment

* Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc

* Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects

* Reverted changes made to BS_SetRemoveTerrain
I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality.

* Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
2024-02-04 13:04:55 +01:00
Bassoonian
adc3308d13 Actually multi battles seem to work fine too 2024-02-02 16:52:39 +01:00
Bassoonian
6c1a111c14 No questionnaires are actually broken 2024-02-02 16:45:58 +01:00
Bassoonian
b8b7dd304b Add final config documentation 2024-02-02 16:38:33 +01:00
Bassoonian
6f668fb31d Add FREE_MYSTERY_GIFT 2024-02-02 16:31:19 +01:00
Bassoonian
4092d0283a Fix FREE_BATTLE_TOWER_E_READER 2024-02-02 15:58:27 +01:00
Bassoonian
db95a06ae0 Fix FREE_TRAINER_HILL 2024-02-02 15:24:46 +01:00
Bassoonian
dedba114be Fix FREE_LINK_BATTLE_RECORDS 2024-02-02 15:16:18 +01:00
Bassoonian
a1c17a1de7 Fix FREE_ENIGMA_BERRY 2024-02-02 15:01:50 +01:00
Bassoonian
cc57452695 Fix FREE_UNION_ROOM_CHAT 2024-02-02 14:57:40 +01:00
Bassoonian
24ed9e77ff Fix FREE_MATCH_CALL 2024-02-02 14:13:16 +01:00
Bassoonian
deb3e6a11d Add dependency #error 2024-02-02 13:47:53 +01:00
Bassoonian
27a65a5961 Fix FREE_RECORD_MIXING_HALL_RECORDS 2024-02-02 13:46:19 +01:00
Bassoonian
90be8436d9 Fix FREE_POKEMON_JUMP 2024-02-02 13:39:21 +01:00
Bassoonian
26a4c56843 Ensure FREE_EXTRA_SEEN_FLAGS works 2024-02-02 13:32:13 +01:00
Bassoonian
495ee6698c Clean up code 2024-02-02 13:13:27 +01:00
Bassoonian
acf5d8133a Convert ifndef configs to standard configs 2024-02-02 12:43:31 +01:00
LOuroboros
a64e1c63c1
Move data unification (#3999)
* Made gBattleMoves handle the InGame name and description of battle moves
No more multiple arrays in separate, individual files.

Note:
-Keep an eye on Task_LearnedMove.

* Reintroduced move names

Misc:
-Fixed Trick-or-Treat and Light of Ruin's expanded names.
-Introduced a new field for Z-Move names, and a constant for their name length.
-Added a few TODOs to GetBattleMoveName.
-Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own.

* Updated GetBattleMoveName to handle Z-Move Names

Misc:
-Removed pointless TODO about MOVE_NAME_LENGTH.
 -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it.

* Fixed a couple of expanded move names

* Removed zMoveName variable of struct BattleMove and extended the name variable's size

* Ditched no longer used MOVE_NAME_LENGTH constant

* Corrected the names of the max moves
I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea.

* Fixed U-turn's name

* Brought back MOVE_NAME_LENGTH
I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves.

* Introduced a union for Move/Z-Move names in the struct BattleMove

* Fixed the union for gBattleMoves move names
Also updated GetBattleMoveName to properly handle Max Move names.
Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names.

* Removed deprecated GetZMoveName and GetMaxMoveName

* Reintroduced mention to gMoveNames in sGFRomHeader

* Fixed move names and ported move descriptions

* Fused the struct ContestMove into the struct BattleMove

* Removed no longer used Z_MOVE_NAME_LENGTH constant

* Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names

* Reintroduced the contest parameters for Pokémon moves

* Renamed gBattleMoves to gMovesInfo
This is consistent with gSpeciesInfo, the array that contains most of the species data.

* Renamed the BattleMove struct to MovesInfo
This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array.

* Removed empty lines separating battle params from contest params in gMovesInfo

* Renamed MovesInfo to MoveInfo

* Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro
Used to handle moves with expanded names in a more comfortable manner.
Also fixed Trick-or-Treat's expanded name.

* Renamed GetBattleMoveName to GetMoveName

* Added a comment pointing out that the shared move descriptions are shared move descriptions

* Re-aligned one of the escape characters of CHECK_MOVE_FLAG

* Renamed the battle_moves.h file to moves_info.h instead for consistency's sake

* Applied Eduardo's adjustments

* Using compound string for regular move names as well, saving 1180 bytes and making their use consistent
* Move description formatting

* Updated Pursuit test after merge

* Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY

---------

Co-authored-by: Nephrite <thechurchofcage@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-29 08:51:32 -03:00
Eduardo Quezada D'Ottone
c8d73c0827
Merge branch 'upcoming' into guillotine-expansion 2024-01-26 10:10:27 -03:00
Bassoonian
78708cad55
Adds universal move array (#4052)
* Add universal move list

* Exclude TM illiterates from learning universal moves

* Add config for literacy checks

* Fix config check

* Update src/pokemon.c

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

* Other review remarks

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-24 11:45:22 -03:00
Ariel A
8a52316dd2 Reformatted for code review. Moved config to include/config/decap.h. 2024-01-17 01:12:04 -05:00
Bassoonian
9a1f6dfb64
Allow one-mon double battles (#4007)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-16 18:24:49 +01:00
Bassoonian
e8a238a775
Exp yield configs (#3995)
* Gen 1 exp yield config

* I'm a dumdum

* Gen 2 configs

* Exp yield configs up to gen3

* Gen 4 configs

* Gen 5 configs

* Configs up to gen6

* Gen7 configs

* Final form exp adjustments
2024-01-15 23:49:12 +01:00
Bassoonian
4846e2a884
Add updated EV configs (#3993)
* Add updated EV configs

* Fix Misdreavus ternary
2024-01-14 15:26:34 +01:00
Biffalo XIII
2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
2024-01-11 19:51:11 -03:00
Nephrite
baefa08bee Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-12 03:13:42 +09:00
Nephrite
3c93f97166 Apply suggestions from code review
Thanks, Edu

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-12 02:13:55 +09:00
Bassoonian
ce48616477
Add power item config (#3961) 2024-01-11 09:34:19 +01:00
Nephrite
c4616739d8 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-11 00:35:35 +09:00
Alex
4dc1b1dda3
Revert "Update catch curve for pokeballs (#3685)" (#3955)
This reverts commit 929ec54a39.
2024-01-09 21:20:51 -03:00