atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15064 commits 2 branches 40 tags 617 MiB
Commit graph

15064 commits

This branch
This branch
All branches
Author SHA1 Message Date
MelonSpeedruns
20a3d91de7
Fixed Basculegion Back Sprite Offset & Greninja forms animations (#4198) 2024-02-15 15:56:32 -03:00
LOuroboros
1f349e0fb9
Renamed NUM_ABILITY_VANILLA to NUM_ABILITY_PERSONALITY (#4196) 2024-02-15 15:22:25 +01:00
Bassoonian
6a61e6525e
Fix height call (#4195) 2024-02-15 13:07:31 +01:00
psf
cc22fef6c8
- Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. (#4193) 
- Created `ConvertMonHeightToString` and `ConvertMonWeightToString` for developers to use
 2024-02-15 10:23:11 +01:00
cmy2008
ab2260a81e
Deleted a space (#4194) 2024-02-15 10:21:35 +01:00
Martin Griffin
c21ab741f7
randompercentage, randomelement (#4189) 
'randompercentage X' sets VAR_RESULT to TRUE X% of the time, or FALSE
100-X% of the time.

'randomelement X, Y, ...' sets VAR_RESULT to one of X, Y, ... with equal
probability.
 2024-02-15 08:07:28 +01:00
LOuroboros
eb7ddeb66c
Updated the way in which ScriptGiveMonParameterized and ScrCmd_givemon chooe a default ability (#4192) 
* Updated the way in which ScrCmd_givemon and ScriptGiveMon assign a default ability
When an abilityNum is not assigned in a call to givemon performed inside of an overworld script, ScriptGiveMonParameterized will make sure to generate an abilityNum of 0 or 1 in the same way vanilla does it; by defaulting to 0, and then tweaking it based on the least relevant bit of the Pokémon's personality.
ScriptGiveMon will set the default ability of a Pokémon in the same way now too, because even though it was rewritten in #3924, it should ideally produce a Pokémon in a similar way than vanilla does it.

* Removed pointless abilityNum setup in ScriptGiveMonParameterized
 2024-02-15 08:01:34 +01:00
psf
7f6e1e2aea
Add configs for measurement systems and decimal separators (#4183) 
* Allow developers to choose metric or imperial, and their decimal seperator of choice for Pokédex entries
- Creates  which cleans up the existing implementing of printing height and weight to the pokedex
- Developers can choose to use metric or imperial units of measurement in the Pokédex
- - Developers can choose to use any character as a decimal seperator in the Pokédex
- Allows users to define units and decimal seperators independently
- Fixes a bug in Lotad / Seedot house

* Fixed compilation issue with agbcc

* Updated to include HGSS Dex and address PR Feedback
 2024-02-14 10:17:23 +01: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
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
Nephrite
1ac9934742 Reverted forcePressure flag move 2024-02-13 12:19:27 +09:00
Ariel A
7e2bbac2aa Updated README. 2024-02-12 20:37:09 -05:00
Ariel A
949fc48d26 Revert "Added nature colors to stats." 
This reverts commit 2d9c42110f.
 2024-02-12 20:37:09 -05:00
Ariel A
1e5fd80b7e Revert "Allowed running inside buildings." 
This reverts commit 4e3c2d8491.
 2024-02-12 20:37:09 -05:00
Ariel A
c990851473 Revert "Added function to check for newer emulators/hardware." 
This reverts commit c267dd6ee6.

# 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
Nephrite
3537a37e12 Re-added missing linebreaks 2024-02-12 22:31:26 +09:00
Nephrite
b447add4c3 Minor fixes to RNG and additional effect count 2024-02-12 22:27:58 +09:00
Nephrite
16ab876241 Swapped power/accuracy and type/split 
Also moved one bit from power to accuracy; raises BP limit to 511, decreases accuracy limit to 127 (which is already more than necessary).
 2024-02-12 21:47:07 +09:00
Nephrite
b665e7245b Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored 2024-02-12 16:15:53 +09:00
Nephrite
3695f0317b Reordered everything in moves_info.h to be in struct order 2024-02-12 16:13:15 +09:00
Nopinou
de0f94406a
Add shouldDynamax & shouldTerastal bits to TrainerMon (#4169) 2024-02-11 21:36:35 +01:00
Alex
3598a18703
Adds config for Soundproof change during Uproar status (#4174) 2024-02-11 10:40:30 +01:00
Bassoonian
d1b3d1c2c3
Pret merge 2024/02/10 (#4173) 2024-02-11 00:05:31 +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
Bassoonian
b4fa0b1bf0
Clean up space/tabs difference (#4163) 2024-02-10 14:43:14 -03: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
GriffinR
954ba0a155
Merge pull request #1980 from Kurausukun/dexcry 
Missing Constant in Dex Cry Screen
 2024-02-10 09:38:51 -05:00
Kurausukun
3342fdafc2 add missing constant 2024-02-10 05:32:03 -05: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
Nephrite
436ef7e59a Tweaks + RETURN_MOVE_HAS_MOVE_EFFECT_WITH macro 
Macro makes it easier to build functions that check a move's move effects
 2024-02-09 23:01:27 +09:00
Nephrite
ce4dd729f4 Merged from upcoming 2024-02-09 23:00:36 +09: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