Commit graph

15807 commits

Author SHA1 Message Date
tertu
17f68563eb
Remove support for the original LCG random number generator (#5078) 2024-08-24 10:07:00 -07: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
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
Eduardo Quezada
becb2fcac8 Start 1.9.2 cycle 2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 (#5199)
* Version 1.9.1

* Added 5195

* Apply suggestions from code review

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

* Added 5196 and 5207

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-19 18:25:39 -04:00
hedara90
3a6c3d580d
Round Tests (#5196)
* Round Tests

* Apply suggestions from code review

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

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-19 13:03:47 -04: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
hedara90
47356d181a
Fixed followers breaking for species IDs above 1535 (#5179)
* Fixed followers breaking for species Ids above 1535

* Added reminder to increase follower species bits if needed in the future

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 10:27:35 -07: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
Eduardo Quezada
fe275ef062
Teatime animations use B_WAIT_TIME_LONG (#5173) 2024-08-15 13:45:01 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07: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
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
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
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
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
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
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
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
Martin Griffin
25f7f431fa
Remove agbcc (#4994) 2024-08-11 22:06:33 +02: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
psf
d1183f4b8a
Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131)
* First attempt at a port

* Slightly broken but working

* Got images working and opponent palettes

* half finished compressed spritesheet approach instead

* fix the palettes (smh)

* fix hflip, and a lot of clean-up

* Add B_SHOW_TYPES

* Got Illusion working

* Add num type enum

* Updated function to get type

* Fixed type icon position and cleaned up functions

* Updated illusions and Tera handling

* Added BATTLE_TYPE_IS_SINGLE and DOUBLE

* Removed IS_BATTLE_TYPE_SINGLE

* Implemented BATTLE_TYPE_IS_DOUBLE across repo

* Removed SIDE macro

* Updated config

* Deprecated battler alive macro

* Reindented file

* Added exceptions for 2v1

* Replaced Fainted check with Null check

* Added functionality for only types of caught mons

* UseDoubleBattleCoords updated

* Added ShouldFlipTypeIcon

* Renamed TryLoadTypeIcon

* Refactored functions

* Refactored functions

* Refactored functions

* Refactored functions

* Renamed SEEN to CAUGHT

* Reset config

* Added useSecondPalette and isOrdinary to gTypesInfo

* Further simplified secondPalette and isOrdinary

* Changed isordinary to isSpecialCase

* Renamed to useSecondTypeIconPalette

* Fixed Stellar type interactions

* fixed spacing

* fixed include/config/battle.h

* fixed

* fixed include/config/general.h

* changed type1 and type2

* Moved IsDoubleBattle to include.battle.h
Removed BATTLE_TYPE_IS_DOUBLE
Removed IS_DOUBLE_BATTLE

* Changed IsBattlerFainted to IsBattlerAlive

* Removed IsBattlerNull

* Moved GetBattlerData to be inline

* Renamed GetMonDefensiveTeraType

* Removed IsIllusionActive

* Fixed identation

* found one last isDoubleBattle hold out

* fixed redundant brackets

* Fixed spacing for B_SHOW_TYPES

* Update src/battle_script_commands.c

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

* Fixed padding

* Reindent file and refactored GetTypeIconHideMovement

* Update include/data.h

---------

Co-authored-by: RavePossum <ravepossum@proton.me>
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-11 17:55:51 +02:00
Alex
97fa0be36e
Dynamic move type clean up (#5132)
* Minor clean up of the new function DynamicMoveType

* wrongly removed func

* Overworld Weather Bug

* wrong comparison
2024-08-11 14:18:56 +02:00