atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15613 commits 2 branches 40 tags 617 MiB
Commit graph

15613 commits

This branch
This branch
All branches
Author SHA1 Message Date
pkmnsnfrn
389f4e4180 Worked with ShinyDragonHunter to get signpost working 2024-07-24 20:58:18 -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
Martin Griffin
9c1a85ef0f
trainerproc: use -traditional-cpp to preserve Unicode characters (#4969) 2024-07-14 11:28:05 +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
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
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