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

15943 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Griffin
a5e0738484
trainerproc: Parse line markers (#5122) 2024-08-08 20:12:18 +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
psf
b8dab587ab
Update include/battle.h 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-08-07 14:32:36 -07:00
pkmnsnfrn
5fbe5a331c Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5114\#discussion_r1707607637 2024-08-07 13:33:35 -07: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
Eduardo Quezada
d88834dd58 Backported OBJ_EVENT_GFX_SPECIES macro from Expansion 2024-08-07 13:42:18 -04: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
Eduardo Quezada
ce74c85e4f
Move effect TODO tests - Volume C (#5094) 2024-08-07 15:52:40 +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
Ariel A.
8d79ea1b19
Merge pull request #39 from Bassoonian/followersstringfixes 
Fix two small text errors in follower dialogue
 2024-08-07 00:00:01 -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
hedara90
db3bb40c1a
Accidentaly the Giratina origin overworld shiny pal (#5108) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-06 14:22:51 -05: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
Eduardo Quezada
9e9825853e
Pret Merge (5th of August) (#5098) 2024-08-05 22:03:26 -04:00
Bassoonian
55159bedd7 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5aug 2024-08-05 23:32:38 +02: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
GriffinR
9a3c6d072b
Merge pull request #2018 from fdeblasio/fixMtPyreLabel 
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
 2024-08-05 11:27:01 -04:00
toon
fd3cb6f96b
How to docs and fixes to be added to the mdbook documentation site (#5070) 
* Added most of the documentation from the wiki to the mdbook site directory and fixed some errors

* Removed the infinite repel documentation file

* Update docs/SUMMARY.md

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-05 09:26:14 -04:00
Ariel A.
e0f66c80b8
Merge pull request #38 from PokemonSanFran/followers-owTowerFix 
Fixed expanded OW IDs in battle_tower
 2024-08-04 22:43:11 -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
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
Martin Griffin
ed20ff5e8b
Improve 1.8 ⇒ 1.9 non-Competitive syntax migration instructions (#5079) 2024-08-02 20:15:09 +01:00
Martin Griffin
841bac21cd Improve 1.8 => 1.9 COMPETITIVE_PARTY_SYNTAX changelog entry 2024-08-02 19:57:58 +01:00
hedara90
45835a2c33
Fixed stray transparent pixels in Urshifu sprites (#5071) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-02 11:48:20 -07:00
Eduardo Quezada
512c44b698 Start 1.9.1 cycle 2024-08-01 17:04:48 -04:00
Eduardo Quezada
a2685d0d08
Version 1.9.0 (#5076) 2024-08-01 20:09:06 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 (#5005) 2024-08-01 19:52:29 -04:00
Eduardo Quezada
7ec24b89c8 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:47:50 -04: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
nooT
a89fc9de69
Added AI Flags Documentation To Directory For New Documentation Site (#5057) 
* Ported the wiki file ai flags to the /docs directory for the new documentation site

* Revised AI flag documentation based on reviewer feedback

* New comparitive clauses for; AI_FLAG_STRONGEST_MOVE and AI_FLAG_TRY_TO_FAINT

* Added an entry to the navigation menu for the AI Flags docs

* Added an entry to the navigation menu for the AI Flags docs
 2024-07-30 21:36:35 +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