Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
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
ghoulslash
8cf7de166c use gMovesInfo for rock climb given expansion's changes 2024-08-04 12:32:26 -04:00
ghoulslash
80db140d2b merge w pret 2024-08-04 12:32:13 -04:00
ghoulslash
54af254b05 fix ObjectMovingOnRockStairs with follower with merrps system 2024-08-04 12:27:41 -04:00
ghoulslash
d2f3d319a7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/sideways_stairs 2024-08-04 12:26:20 -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
PhallenTree
ab9f8e69fb
Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts (#5061) 
* Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite

* Fix Life Orb damaging the user if they hit themselves in confusion

* Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod

* Parametrize Species
 2024-07-30 10:36:22 +02:00
hedara90
74220518d4
Fixed the animation tables being different sizes (#5063) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-29 13:34:19 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro (#5049) 
* Added OBJ_EVENT_GFX_SPECIES_SHINY

* Update src/event_object_movement.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-07-29 18:41:03 +02:00
Eduardo Quezada
54c19af037
Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ (#5060) 2024-07-29 16:28:32 +02:00
Eduardo Quezada
b4eca0a6ec Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	src/battle_util.c
 2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 (#5053) 
* Fixed Hidden Power damage category for PSS < GEN_4

* Fixed category display regression

* Wrapped GET_MOVE_TYPE

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-29 13:45:14 +02:00
kittenchilly
904d59220d Shorten squish anim 2024-07-28 11:55:57 -05:00
kittenchilly
f22666c2a3 Merge branch 'master' into axekick-anim 2024-07-28 11:46:14 -05:00
pkmnsnfrn
1ac4d195c2 Changed mb to MetatileBehavior per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1694003941 2024-07-27 15:17:32 -07:00
pkmnsnfrn
5bb1730394 Fixed if statement compilation 2024-07-27 15:07:50 -07:00
pkmnsnfrn
4f03ba98be Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694004015 2024-07-27 15:05:49 -07:00
pkmnsnfrn
fccecf038f Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003876 2024-07-27 15:03:45 -07:00
pkmnsnfrn
3c4aaf53f8 Removed unneeded preproc per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003941 2024-07-27 15:03:03 -07:00
pkmnsnfrn
e360d3bd73 Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003683 2024-07-27 15:02:15 -07:00
pkmnsnfrn
b666782483 Nested conditions per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003628 2024-07-27 15:01:33 -07:00
pkmnsnfrn
d21d23b52c Removed extra spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003572 2024-07-27 14:59:36 -07:00