pkmnsnfrn
91255a6054
Removed mb labels
2024-07-27 15:49:22 -07:00
pkmnsnfrn
fb53297e64
Added documentation around OW_AUTO_SIGNPOST
2024-07-27 15:45:48 -07:00
pkmnsnfrn
0a997fa6ca
Moved follower scripts back to original position https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003538
2024-07-27 14:57:53 -07:00
pkmnsnfrn
1ad3ba1f32
Fixed compilations errors with abgcc
2024-07-27 10:58:51 -07:00
pkmnsnfrn
59c2eeac21
Default signpost config is off
2024-07-26 21:22:29 -07:00
pkmnsnfrn
7717812154
Clean up files
2024-07-25 20:34:14 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
pkmnsnfrn
b5c58e53de
Removed all comments
2024-07-25 19:35:28 -07:00
pkmnsnfrn
fd69ef339c
Got pokemart and pokecenter changes working
2024-07-25 19:33:07 -07:00
pkmnsnfrn
a0c5e5511c
Added gSignPostWindow_Gfx
...
Added LoadSignBoxGfx
Add LoadSignPostWindowFrameGfx
2024-07-24 19:41:36 -07:00
pkmnsnfrn
61eff23d89
Moved menu defines to header file
...
Added FRLG signpost border
Started working on LoadSignPostWindowFrameGfx
2024-07-15 22:57:29 -07:00
pkmnsnfrn
1ae615651d
Renamed gWalkAwayFromSignInhibitTimer to gWalkAwayFromSignpostTimer
2024-07-15 22:33:31 -07:00
pkmnsnfrn
b54cf221d8
Renamed and refactored FieldInput_HandleCancelSignpost into CancelSignPostMessageBox
2024-07-15 22:13:33 -07:00
pkmnsnfrn
8445d44fb6
Renamed DoPicboxCancel to UseBlankMessageToCancelPokemonPic
2024-07-15 21:48:24 -07:00
pkmnsnfrn
b43e0e07f7
Add config to disable OW_AUTO_SIGNPOST
2024-07-15 21:45:34 -07:00
pkmnsnfrn
28183ec299
first merge of ghoul's branch
2024-07-15 21:35:58 -07: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
385b7017f3
Fix fake RTC being on by default ( #4965 )
2024-07-13 21:20:55 +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
ef76a6b21b
Merge branch 'upcoming' into disablefollowersbydefault
2024-07-11 14:08:55 +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
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
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
Pawkkie
0f21415130
Minor AI flag fixes / cleanup ( #4924 )
...
* AI flag fixes / cleanup
* Review feedback
2024-07-08 20:15:12 +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
psf
4ddae07451
Removed AI_FLAG_HELP_PARTNER ( #4918 )
2024-07-08 11:38:52 +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
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
Pawkkie
3660a054a2
Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING ( #4911 )
2024-07-05 18:41:29 +02: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
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
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
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
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
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting ( #4873 )
2024-06-26 23:44:01 +02:00
Alex
55c13a80bc
Force species in tests ( #4810 )
...
* Force species in tests
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-26 18:38:14 +02:00
Bassoonian
81bd14818e
Add day limit for forms support ( #4778 )
...
* Add day limit for forms support
* Add missing newline
* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
fakuzatsu
6c9dcd60bc
simple button config for the move description menu ( #4860 )
...
* simple button config for the move description menu
* change from preproc to normal if
2024-06-25 11:09:01 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00