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

11266 commits

Author SHA1 Message Date
pkmnsnfrn
f0d5b68f70 Improved checkspecies functions 2024-08-11 22:10:04 -07:00
pkmnsnfrn
abb17ea88b Improved dex flags functions 2024-08-11 21:01:31 -07:00
pkmnsnfrn
ebae09f0a6 Improved checkobjectat 2024-08-11 20:16:27 -07:00
pkmnsnfrn
7869cb4137 Improved RemoveAllItem 2024-08-11 19:31:52 -07:00
pkmnsnfrn
7f5ecd8d0f getobjectfacingdirection 2024-08-11 19:27:18 -07:00
pkmnsnfrn
262505589a checkforspecies 2024-08-11 19:19:15 -07:00
pkmnsnfrn
e746334e1e Added setmonball 2024-08-11 18:53:39 -07:00
pkmnsnfrn
fba1452c3b Added Seen/CaughtMon macros 2024-08-11 18:49:42 -07:00
pkmnsnfrn
0784f9fa74 Added checkobjectat 2024-08-10 21:40:57 -07:00
pkmnsnfrn
811b5d286e Added getobjectposition 2024-08-10 21:17:50 -07:00
pkmnsnfrn
73953b3e39 Added removeallitem 2024-08-10 14:43:50 -07:00
Eduardo Quezada
113f8de9b1 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player.c
 2024-08-08 13:22:49 -04:00
Eduardo Quezada
182809b515
Made perfect IV count into a granular setting (#5115) 
* Made perfect IV count into a granular setting

* Fixed optional parameter comment in SPECIES_NONE
 2024-08-08 13:46:22 -05:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers (#5122) 2024-08-08 20:12:18 +02:00
Frank DeBlasio
36aea8b68a
Changed single-use berry blender strings to be COMPOUND_STRINGs (#4963) 
* Turned Berry Blender NPC names into COMPOUND_STRINGS

* Moved more berry blender unused text to the unused text section

* Moved more Berry Blender text to Compound Strings

* Revert "Moved more Berry Blender text to Compound Strings"

This reverts commit d46c3f9791.

* Removed unused Berry Blender text
 2024-08-08 14:48:01 +02:00
Frank DeBlasio
754beeee5d
Created COMPOUND_STRINGs for default player names (#5037) 
* Converted default names to COMPOUND_STRINGs

* Moved new game strings out to main_menu
 2024-08-08 14:46:17 +02:00
Galaxeeh
355739db63
Dynamic Move Types in Summary Screen/Battle (#5084) 
* Dynamic Hidden Power Types

* Dynamic Ivy Cudgel is summary screens

* Dynamic Move types

* missed unnecessary comment that got left in

* format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection

* forgot to revert config defaults

* Update src/pokemon.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd)

* revert configs

* added Hail check to Weather Ball

* Fixed agbcc compile/brackets/u32 changes

* Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities

* Update src/pokemon_summary_screen.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-08 11:08:50 +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
c390999141
Pret Merge (7th of August) (#5116) 2024-08-08 10:23:14 +02:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) (#5110) 2024-08-07 22:05:07 +02:00
pkmnsnfrn
5635f94036 More changes from typeX to types[X] 2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf 2024-08-07 19:05:46 +02:00
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089) 
* Fix switch AI bug

* Forgot to save a file lol

* Fix infinite loop test compatibility
 2024-08-07 15:58:39 +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
psf
312749dd31
Changed type1 and type2 to be consistent (#2021) 
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
 2024-08-07 06:44:03 +01:00
Ariel A
5293e67995 Merge branch 'followers' into followers-expanded-id 2024-08-07 00:02:16 -04:00
kittenchilly
e4f09c8103
Move Relearner now displays move category (#5081) 
* Move relearner now displays move category

* Update move_relearner.c

* Update move_relearner.c

* Address reviews
 2024-08-06 23:58:18 +02: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
Alex
dbb9ee874b
Change GET_MOVE_TYPE to a function (#5090) 
* Change GET_MOVE_TYPE to a function

* add in battle check to GetMoveType function, move it to battle_util.c

* Update src/battle_util.c

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

* Update src/battle_util.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-05 22:02:31 -04:00
Bassoonian
55159bedd7 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5aug 2024-08-05 23:32:38 +02:00
Alex
12351d520d
Changes Evolution methods to Enums (#4977) 
* Changes Evolution methods to Enums

* make U8_ENUM to include/constants/global.h

* revert previous commit

* Update include/constants/pokemon.h

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-05 15:54:37 -04:00
Philipp AUER
1f93c25611
use OBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesname (#5088) 
Co-authored-by: sbird <sbird@no.tld>
 2024-08-05 15:18:35 -04:00
DizzyEggg
9ac8d0de25
Optimize/get rid of unused palette vars/functions (#4841) 2024-08-04 21:41:55 -04: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
pkmnsnfrn
0fb48e8a9a Fixed expanded OW IDs 2024-08-03 17:04:33 -07:00
Alex
41a79e3833
IsValidForBattle function formatting (#5085) 
ocd
 2024-08-03 22:23:34 +01:00
AlexOn1ine
0f3f2915fb Merge remote-tracking branch 'rhh/master' into master_merge 2024-08-03 20:19:33 +02:00
Martin Griffin
9d97537ee2
Fix speed ties (#4780) 
* Fix speed ties

* fixup! Fix speed ties

* fixup! Fix speed ties

* fixup! fixup! Fix speed ties

* fixup! Fix speed ties

* Workaround for Comatose-Ditto interaction
 2024-08-03 17:29:47 +02:00
cawtds
3af93bdfee
FRLG+ whiteout message (#4967) 
* FRLG whiteout message + post whiteout event
 2024-08-02 08:28:05 -07:00
Frank
62b4ea5aaa Fixed bottom half of Mt. Pyre not being labeled in PokeNav 2024-08-01 13:34:17 -04:00
Eduardo Quezada
57fc0fd3b9 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak (#5073) 
* Removes unnecessary checks for Shield Dust and Covert Cloak

* remove redundant include

* Update test/battle/ability/shield_dust.c

Co-authored-by: hedara90 <90hedara@gmail.com>

* Update test/battle/hold_effect/covert_cloak.c

Co-authored-by: hedara90 <90hedara@gmail.com>

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-08-01 09:58:14 +02: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
tertu
05ff7cef1c
Tweak IV generation slightly (#4876) 
With HQ_RANDOM on, this means that the generator now only consumes one RNG output when generating IVs.
Without HQ_RANDOM on, IV generation should be unchanged.
 2024-07-31 19:51:47 +02:00
Alex
e6175b5b84
Fixes spread damage in double battles (#5064) 
* Fixes spread move damage in doubles

* add DoubleBattle check

* add additional check to test

* restore trainer party
 2024-07-31 12:20:57 +02:00