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

12360 Commits

Author SHA1 Message Date
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes (#5252) 2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix (#5245) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix (#5256) 
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
 2024-08-25 10:03:33 +02:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
Galaxeeh
68e470f84a
Dynamic Move Display fixes (#5251) 
* Weatherball fire type check changed to WEATHER_DROUGHT, added overworld check for field terrain set by weather dependent on configs

* Update src/pokemon.c

FRICKIN INDENTS LMAO

Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>

---------

Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>
 2024-08-24 14:51:18 -04:00
tertu
17f68563eb
Remove support for the original LCG random number generator (#5078) 2024-08-24 10:07:00 -07:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests (#5242) 
* Adaptability, Aerilate, Aftermath tests

* Update test/battle/ability/aerilate.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-24 10:53:19 -04:00
PhallenTree
85fe398b50
Fix Starting Status being passed on to future wild battles (#5248) 2024-08-24 14:28:24 +02:00
Salem
4208da1e22
add missing break for poison puppeteer (#5243) 2024-08-23 18:21:40 +02:00
Martin Griffin
ac28fc52e5
Merge pull request #2007 from cawtds/ub-fix-battle-transition 
UB fix in battle_transition.c
 2024-08-21 19:08:07 +01:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces 
Clean up defines lacking spaces
 2024-08-21 19:04:12 +01:00
Martin Griffin
ea726eee31
Merge pull request #2024 from luckytyphlosion/master 
Slight storage system documentation
 2024-08-21 19:02:03 +01:00
Eduardo Quezada
77148f83a6
DoBattleIntro state documentation (#5231) 
* DoBattleIntro state documentation

* Removed unused state

* Update src/battle_main.c

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

* Fixed state jumps

* BattleStruct state uses enum

* Renamed state enums

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-21 15:57:28 +02:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes (#5142) 
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
 2024-08-20 20:16:32 +02:00
hedara90
d379ffef3e
Fixed Confide+Crafty Shield interaction (#5202) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-20 08:24:42 -04:00
Eduardo Quezada
6ac18a6fe5 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… (#5209) 
* Fixes weather abilities not activating when Cloud Nine user leaves the field

* parametrize
 2024-08-20 07:24:48 -04:00
psf
af12697845
Adds OW_BERRY_IMMORTAL (#5187) 
* Added OW_BERRY_IMMORTAL
Added cases for OW_BERRY_IMMORTAL

* removed one preproc

* removed other preproc

* Fixed identation

* Set config to FALSE

* Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388

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

* Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652

* Update include/config/overworld.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-08-20 07:23:33 -04:00
Pawkkie
a111ac496d
Fix typos (#5221) 
Fix typos in move description of Decorate, Collision Course and Electro Drift
 2024-08-20 12:44:27 +02:00
PhallenTree
bc5f40e518
Adds missing Wind Rider activation and tests (#5207) 
* Adds missing Wind Rider activation + tests

* Adds test for opponent setting up Tailwind

* Update src/battle_util.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-19 15:25:44 +02:00
kittenchilly
a958e61110
Fix using Population Dice with Loaded Dice printing garbage text (#5195) 2024-08-17 22:33:11 +02:00
hedara90
8ca234de7e
Removed gBitTable usage again (#5193) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-17 10:38:55 -07:00
Alex
8607a7fb33
Fixes UB in Cmd_averagestats (#5191) 
* Fixes UB in Cmd_averagestats

* fix test and align default case
 2024-08-17 18:19:22 +02:00
Alex
3a0c5c9c6c
Adds missing AI checks for poltergeist (#5189) 
Adds missing AI checks for poltergeist
 2024-08-17 18:18:03 +02:00
hedara90
e4c81ba6e0
Removed all instances of gBitTable[x] (#5123) 
* Replaced all the gBitTable[X] usages with 1 << X, and cleaned up script output

* Fixed failed merge in online viewer

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-17 10:28:09 -05:00
Frank DeBlasio
15348eae84
Consolidated the values of Rotom's moves and added Gen9 base form effect (#5186) 
* Consolidated Rotom move values

* Updated changing Rotom into its base form to its Gen9 effect

* Fixed order of if statement
 2024-08-16 23:31:19 +02:00
hedara90
b641c6f4fa
Fixed incorrect weather damage rounding when maxHP <16 (#5183) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-16 23:02:49 +02:00
Frank DeBlasio
bced2c97a1
Created PokeNav COMPOUND_STRINGS (#4983) 
* Converted Match Call names and descriptions to COMPOUND_STRINGs

* Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c

* Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c

* Cleaned up Steven's Match Call text

* Added PokeNav option text to match_call_gfx

* Moved PokeNav page descriptions to menu_handler_gfx

* Moved help bar texts to pokenav_main_menu.c

* Moved various PokeNav strings out of strings.c and into their relevant files

* Removed unused PokeNav strings
 2024-08-16 22:41:26 +02:00
hedara90
bd3d99d7d9
Fixed Retaliate not working correctly with passive damage (#5182) 
* Fixed Retaliate not working correctly when allies fainted from passive end of turn damage

* Changed test parameters to use legal stats

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-16 17:31:28 +02:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests (#5170) 
* Adds Harvest tests

* Adds Pickup in-battle effect + tests

* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)

* Change canPickupItem to bit field

* Make RandomUniformExcept inclusive (higher end) + convert bitfield

* Use CantPickupItem in PickupHasValidTargetc check

* Review
 2024-08-16 15:37:23 +02:00
GriffinR
3f49c5cbaf Fix trainer match call flags 2024-08-15 23:00:20 +02:00
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
hedara90
45f10d734f
Fixed Ice Face, implemented tests (#5171) 
* Fixed Ice Face, implemented tests

* Fixed agbcc and bad battle mon looping

* Fixed the ShouldChangeFormInWeather function again

* Cleaned up End of Turn weather form changes, simplified Ice Face

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-15 13:51:39 +02:00
pkmnsnfrn
287f6baaa9 spaces over tabs please don't eat my ass 2024-08-14 22:14:48 -07:00
pkmnsnfrn
fed7fc4f0a Fixed bug with checkobjectat 2024-08-14 21:35:03 -07:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
pkmnsnfrn
dc06321054 Moved pokedex flags to constants files andadded constants to header of event_scripts 2024-08-14 19:24:55 -07:00
luckytyphlosion
7d921fa89b Slight storage system documentation 2024-08-14 18:27:44 -04:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Alex
e3d9bb643f
#5120 Follow up (#5158) 
Consistency change
 2024-08-14 18:27:40 +02:00
Alex
9019fed264
Fixes booster energy not increasing speed (#5167) 
* Fixes booster energy not increasing speed

* alternative solution

* forgot else
 2024-08-14 18:26:52 +02:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159) 
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
 2024-08-14 17:20:18 +02:00
Eduardo Quezada
6f0004ec4e
Removed some hardcoding of move IDs + Gen4/5 Defog (#5156) 
* Removed some hardcoding of move IDs

* Added Defog Gen6+ config (+ updated tests)
 2024-08-14 15:51:34 +02:00
Bassoonian
63a1f85d81 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
psf
38752b59b4
Fix a sprite issue with B_SHOW_TYPES (#5157) 
* Fixed issue where tiles were not freed

* Updated to destroy first

* Cleaned up returns

* Added typeIconTags
Added FreeAllTypeIconResources
Fixed issue where typeIcons were not being properly handled when hidden
 2024-08-14 00:42:39 +02:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
Frank DeBlasio
f18859ac33
Refactor Frontier Brains (#5027) 
* Created gFrontierBrainInfo with trainerId

* Added objEventGfx and isFemale

* Added win/loss texts

* Added battleBit and streakAppearances

* Added macro for texts

* Added macro for sprites
 2024-08-12 22:07:12 -05:00
Eduardo Quezada
c74ad262cb Fixed incoming usage of GET_MOVE_TYPE from master 2024-08-12 16:32:11 -04:00
Eduardo Quezada
abb1fd20f3 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-12 16:24:04 -04:00
Alex
a8cd459370
Fixes Purifying Salt not halving dmg for dynamic move types (#5145) 
* Fixes Purifying Salt not halving dmg for dynamic move types

* forgot to add
 2024-08-12 15:54:24 -04:00