sneed
3fa6bf46db
Test battlers always have their forced abilities ( #4707 )
...
* Test battlers always have their forced abilities
* indentation
2024-07-21 21:20:39 +02:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite ( #5008 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
Eduardo Quezada
01831a30b9
Temporarely revert regional form inheritance ( #5004 )
2024-07-20 18:23:47 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Bassoonian
9ff30ee87a
Fix frontier ineligibility fix ( #4997 )
2024-07-19 11:46:25 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Bassoonian
93ee3a9197
Fix Psycho Shift Frostbite interaction ( #4995 )
2024-07-18 21:51:21 +02:00
Alex
62640456e7
Fixes residual damage order. #4945 Follow up. ( #4993 )
2024-07-18 12:48:23 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases ( #4987 )
2024-07-17 23:36:15 +02:00
AlexOn1ine
19fff81160
Fixes AI not being aware during calcs
2024-07-17 22:13:09 +02:00
Martin Griffin
23aa9f0433
trainers.h ( #4990 )
2024-07-17 21:41:52 +02:00
innocenthedgehog
d333f9f066
Fix typos in trainers.party documentation ( #4988 )
...
Co-authored-by: psytp2 <psytp2@nottingham.ac.uk>
2024-07-17 13:46:44 +02:00
hedara90
7703cb314b
trainerproc documentation ( #4734 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-16 18:50:31 +01:00
iriv24
0e21e0debf
replace gTransformedPersonalities[battlerAtk] in HandleLoadSpecialPokePic with personalityValue in HandleSpeciesGfxDataChange ( #4975 )
2024-07-15 19:41:23 +02:00
psf
7b3b635c67
Add AUTO_LOWERCASE_KEYBOARD ( #4976 )
...
* Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD
* Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397
* Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502
2024-07-15 19:06:01 +02:00
Alex
0d0100d8f8
Reduces AI_WhoStrikesFirst to the most essential parts ( #4978 )
...
* Reduces AI_WhoStrikesFirst to the most essential parts
* abgcc
* add stall check + minor clean up
* add comment
2024-07-15 17:18:03 +02:00
iriv24
684e8af181
Vanilla species names fit in health box without narrowing ( #4979 )
2024-07-15 16:01:36 +01:00
Pawkkie
b5a7185841
Fix U-Turn With Ace Mon ( #4748 ) ( #4972 )
...
* Fix U-Turn With Ace Mon
* ASSUME for test
2024-07-15 09:19:41 +02:00
Eduardo Quezada
2b40e79ac3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_util.h
# src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
Pawkkie
b084dcd8d3
Fix Upper Hand being used blindly ( #4973 )
2024-07-14 22:00:51 +02:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves ( #4923 )
2024-07-14 15:35:11 +02:00
psf
5c38532281
Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND ( #4953 )
...
* First proof of concept works
* Added B_THROW_BALLS_SOUND
* Made generic MonSendOut
* Changed magic number to constant
* added acute e and changed to GEN_LATEST
* Removed tabs
* Undef'd HIBYTE and removed extra bool32
* Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114
Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761
* Reset debug script
* Removed static assert per Discord conversation with Alex
2024-07-14 14:46:04 +02:00
psf
d410f56a8c
Add P_CAN_FORGET_HIDDEN_MOVE ( #4968 )
...
* Added P_CAN_FORGET_HMS
* Renamed to can forget hidden move
* Bypass IsLastMonThatKnowsSurf
* Fixed typo
* Moved P_CAN_FORGET_HIDDEN_MOVE
* Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-14 11:23:49 +02:00
Pawkkie
c721f1b04a
Smarter Focus Punch and Substitute ( #4952 )
...
* Smarter Focus Punch
* Smarter Substitute, review feedback
* Use HasAnyKnownMove instead of isFirstTurn
* When are we removing agbcc again
* Use HasMoveEffect
2024-07-14 08:29:27 +02:00
Bassoonian
f6d2b2861a
Fix Tera indicators ( #4960 )
...
* Fix Tera indicators
* Better fix
2024-07-13 23:08:43 +02:00
Alex
45275fee17
Fix Infinite Tera Orb racharging ( #4863 )
...
* Fix Infinte Tera Orb charges
* trainer_parties.h
2024-07-13 22:38:06 +02:00
Alex
5e2e2e9fce
Minor shouldUseGimmick refactor ( #4962 )
2024-07-13 20:56:18 +02:00
psf
3e03419bdb
Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc ( #4954 )
...
* First concept
* Fixed config file and added static assert
* Reset debug scripts
* Cleaned up overworld config
* Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121
* Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279
* Update include/config/overworld.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 20:44:27 +02:00
Frank DeBlasio
d224db43c8
Consolidated Lilycove Contest Lady's values into one struct ( #4951 )
...
* Consolidated Lilycove Contest Lady's values into one struct
* Converted Lilycove Lady strings to COMPOUND_STRINGS
2024-07-13 14:44:22 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
psf
522a8ba3f7
Allow users to increase MAX_MONEY ( #4943 )
...
* Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header
Replaced use of PrintMoneyAmount
* Added define for MAX_MONEY_DIGITS
Removed GetMaxNumMoneyDigits
Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS
Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS
* Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Removed width and tilemap changes
* Modified CountDigits to count digits greater than 1
Fixed PrintMoneyAmount to work with large digits
* Added an early return to PrependFontIdToFit
* First prototype working
* Updated GetMoneyBoxHorizontalPosition with amount
* Updated GetMoneyBoxHorizontalPosition with amount
* Got version working with one space before
* Got version working with one space before
* Got version working with all spacingOC
* cleaned up PrintMoneyAmount
* Created CalculateleadingSpacesForMoney
* Cleaned up for PR
* Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365
2024-07-13 11:16:34 +02:00
Bassoonian
deb2b69a76
Fix Diamond Storm's effect ( #4947 )
2024-07-11 09:28:38 -04:00
Bassoonian
f85bff6e30
Fix Basculegion's gen9 level up learnset ( #4948 )
2024-07-11 15:07:39 +02:00
Alex
7b6ff1b560
Fixes Trace turn order ( #4941 )
...
* Fixes Trace turn order
* Update battle_script_commands.c
* Update test/battle/ability/trace.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-10 22:29:26 +02:00
psf
e953a809ff
Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO ( #4910 )
...
* Added OW_USE_FAKE_RTC, OW_ALTERED_TIME_RATIO and src/fake_rtc.c
* Changed ALTERED_TIME_RATIO to GEN_LATEST
* Changed spaces to tabs per https://github.com/rh-hideout/pokeemerald-expansion/pull/4910/files\#r1667111624
2024-07-10 20:58:01 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
Eduardo Quezada
b5160b7ec8
Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields ( #4937 )
2024-07-10 01:22:25 +02:00
ghoulslash
e1d8ef8190
Dynamic AI Functions ( #4908 )
...
* dynamic ai func
* add AI_TagBattlePreferFoe as an example
* Update src/battle_ai_main.c
* Update src/battle_ai_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-09 13:50:48 +02:00
kleeenexfeu
e1a6876600
Bitter Malice description fix ( #4933 )
...
It always lowers the foe's attack
2024-07-08 17:37:40 -04:00
ghoulslash
49e93799d1
Battle Anim Debug Check ( #4930 )
...
* battle anim scripts check uncleared Task_UpdateMonBg after anims
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-07-08 19:49:13 +01:00
Pawkkie
0f21415130
Minor AI flag fixes / cleanup ( #4924 )
...
* AI flag fixes / cleanup
* Review feedback
2024-07-08 20:15:12 +02:00
DizzyEggg
40950b63f7
shop menu allows for 6 digits item prices
2024-07-08 18:12:48 +02:00
Bassoonian
8ec3a85706
Fix safari zone player healthbox ( #4927 )
2024-07-08 18:10:25 +02:00
Alex
637a7072f0
Add missing adjust scores ( #4925 )
...
* Add missing adjust scores
* ai log made the test fail
2024-07-08 12:05:32 +02:00
Alex
cc0a9acc7f
Fixes wrong nature on partner ( #4926 )
2024-07-08 11:47:30 +02:00
psf
4ddae07451
Removed AI_FLAG_HELP_PARTNER ( #4918 )
2024-07-08 11:38:52 +02:00
psf
805a6300c7
Fixed B_TRANSITION_SHRED_SPLIT from softlocking the game ( #4919 )
...
* Added B_ENABLE_SHRED_SPLIT
Created preproc define to remove ShredSplit_BrokenCheck
* Removed config per https://github.com/rh-hideout/pokeemerald-expansion/pull/4919\#issuecomment-2211690039
2024-07-08 10:08:07 +02:00
Eduardo Quezada
6404241c40
Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 ( #4922 )
2024-07-07 13:18:16 +02:00
