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
ghoulslash
7c23a39c5e
Disable OW followers by default ( #4720 )
2024-07-11 08:51:38 -04:00
Eduardo Quezada
9e0af6c84d
Merrp's follower merge (11th of July) ( #4944 )
2024-07-11 08:36:45 -04:00
Bassoonian
ef76a6b21b
Merge branch 'upcoming' into disablefollowersbydefault
2024-07-11 14:08:55 +02:00
Bassoonian
b695ddfe37
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge11july
2024-07-11 09:57:03 +02:00
Ariel A
88cfd9e267
fix: Removed LoadSpriteSheetByTemplate offset's dependence on EWRAM memory layout
2024-07-11 00:01:45 -04: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
0613af5604
Untag
2024-07-10 09:47:35 -04:00
Eduardo Quezada
c0eb9af2e6
Version 1.8.5 ( #4921 )
...
* Version 1.8.5
* Updated up to PR 4926 (squash)
* Fixed descriptions (squash)
* Updated up to PR4939 (squash)
2024-07-10 09:44:55 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix ( #4939 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02: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
tertu
eea736c210
shop menu allows for 6 digits item prices ( #4929 )
2024-07-08 11:39:46 -05: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
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
sneed
60c7588532
IsFinalStrikeEffect uses effect instead of move ( #4917 )
...
* IsFinalStrikeEffect uses effect instead of move
* Update test/battle/ability/parental_bond.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-06 09:41:19 +02:00
Bassoonian
93f5ca2481
Pret Merge (5th of July) ( #4915 )
2024-07-05 23:55:33 +02:00
Bassoonian
31ee8fec80
Fix 2006 regression
2024-07-05 20:49:18 +02:00
Bassoonian
a7f786009e
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july
2024-07-05 20:44:29 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
kleeenexfeu
8168dd7be9
Shed tail rounds up, not down ( #4913 )
...
* Shed tail rounds up, not down
* Label
2024-07-05 19:21:30 +02:00
Pawkkie
3660a054a2
Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING ( #4911 )
2024-07-05 18:41:29 +02:00
GriffinR
a0a02f9733
Merge pull request #2012 from DizzyEggg/patch-1
...
Berry blender's Task_HandleOpponent small fixes
2024-07-04 15:02:58 -04:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes
2024-07-04 20:56:22 +02:00
ghoulslash
3df7e770df
Remove SetBattlerData from AI_CalcDamage ( #4881 )
2024-07-04 10:05:20 -04:00
psf
2a5e4343c8
Implemented OW_IGNORE_EGGS_ON_HEAL ( #4888 )
...
* Implemented OW_IGNORE_EGGS_ON_HEAL
* Removed videos and change nPokemon to u32
* Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486
* Update include/config/overworld.h
Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-04 16:03:42 +02:00
Alex
13b8daf36b
Supersweet Syrup wrong ability desc ( #4902 )
2024-07-03 22:53:41 +02:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c ( #4883 )
...
* Remove Duplicate ai code from battle_ai_util.c
* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
Pawkkie
47426406c3
Ai tests folder ( #4898 )
...
* AI folder for tests
* Move sequence switching tests
2024-07-02 17:49:04 +02:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING ( #4878 )
...
* AI_FLAG_BAD_SWITCHING
* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly
* Fix U-Turn etc. tests
* Test overhaul with Egg's suggestions
* Add EFFECT_HIT_SWITCH_TARGET to tests
* Review feedback
* Re-review feedback
2024-07-01 08:53:07 +02:00
GriffinR
502eedaed8
Merge pull request #2009 from abcboy101/berry-blender
...
Decode unused JP text in berry_blender.c
2024-06-29 16:31:56 -04:00
Frank DeBlasio
6957fc70c9
Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled ( #4866 )
2024-06-29 22:12:26 +02:00
Frank DeBlasio
c3634db0ea
Fixed Mud Sport/Water Sport reduction value ( #4874 )
...
* Fixed Mud Sport/Water Sport reduction value
* Removed define
2024-06-29 22:11:49 +02:00
Frank DeBlasio
103ed85b83
Added config to prevent unobtainable Pokemon from being shiny ( #4735 )
...
* Added config to prevent unobtainable Pokemon from being shiny
* Added config for disabling shinies if the player has no Poke Balls
* Removed check for adventure started flag
2024-06-29 22:07:14 +02:00
Cafei
3ec371de05
Fixes ( #4887 )
2024-06-29 20:46:00 +02:00
