Commit graph

15808 commits

Author SHA1 Message Date
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07: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
Alex
4d78d5e507
Fixes Poltergeist missing accuracy check (#5168) 2024-08-14 12:07:01 -04: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
00f8a4db15
Added guide to running documentation website locally (#5059)
* Added guide to running documentation website locally

* Added link to mdBook's official documentation.

---------

Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-08-14 16:10:58 +02:00
Eduardo Quezada
c625ac6d53
Added multiple missing ability TODO tests (#5163) 2024-08-14 15:43:18 +02:00
Alex
7119d60a67
Set new anim particles by default to off (#5161) 2024-08-14 06:31:26 -07:00
Eduardo Quezada
a00a584284
Pret merge (14th of August) (#5165) 2024-08-14 07:57:22 -04:00
Bassoonian
63a1f85d81 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
hedara90
cfa7316ea0
Made the speed tie test use PASSES_RANDOMLY (#5092)
* Made the speed tie test use PASSES_RANDOMLY
* Hack to allow results with PASSES_RANDOMLY

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-08-13 21:08:24 +01:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02: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
cawtds
ba1512f864
Fix specific tiles changing to pc tiles when using boxlink/debug pc (#5141) 2024-08-12 15:52:55 -04:00
hedara90
5df53a5c1c
Added fixed Unown follower sprites by Sarn (#5146)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-12 15:39:11 -04:00
Alex
863b96f759
Fixes Stomping Tantrum effect not doubling power in certain situations (#5140)
* Fixes Stomping Tantrum effect not doubling power in certain situations

* fix dancer test
2024-08-11 19:05:38 -04:00
Alex
805bb2888c
Fixes wrong padding in struct SpeciesInfo (#5139)
Fixes wrong padding in struct SpeciesInfo that is if I counted correctly.

After I opened #5138 I realized it might be an issue on master as well.
2024-08-11 18:27:22 +02:00
PhallenTree
779cedd16f
Fixes Dancer, adds Revelation Dance interactions with Z-Move, Roost and typeless mons (#5133)
* Add Revelation Dance interactions with typeless mons, Roost and Z-Move

* Fixes Dancer-called moves not updating their type

* Adds Revelation Dance tests

* Make sure target isn't immune in Dancer test

* Missing ... in message

* Missing Assume

* CI ends Dancer test too early?

* Z-Revelation Dance is Breakneck Blitz (Test)

* Fix test (Zoroark too strong?)

* Replace H!Zoroark

* Remove Ability specification

* Remove HP_Bars

* Fix Dancer checking for battlers that don't exist in single battles
2024-08-11 12:13:46 -04:00
Alex
137c15a9ce
Clean up for #4928 (#5120)
* Clean up for #4928

* agbcc

* review comments

* agbcc

* Update src/battle_util.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-11 13:21:49 +02:00
Alex
527cc33e0d
Adjusted AI calcs for Triple Kick Effect (#5127)
* Adjusted AI calcs for Triple Kick Effect

* use strikeCount

* fix compile
2024-08-11 13:01:10 +02:00
Alex
77afb01477
Fixes Zigzgoon battle being able to use a Gimmick (#5129)
* Fixes Zigzgoon battle being able to use a Gimmick

* add commit

* Update src/battle_terastal.c

* Update src/battle_dynamax.c
2024-08-11 00:23:51 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name (#5134) 2024-08-10 23:59:23 +02:00
Cafei
2237e33ab2
Pokemon spite fixes (#5126)
Various Gen 8 (+Sawsbuck Summer) sprite fixes for overworld and battle sprites.
2024-08-10 19:43:19 +02:00
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
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