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

68 commits

Author SHA1 Message Date
ghoulslash
be3ee1ba85 merge w upcoming 2024-09-29 13:33:20 -04:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change (#5398) 
* changes Growth's move description to account for Gen 5+ behavior

* completes B_DIVE_BALL_MODIFIER comment

* fixes typos and incongruent spacing in various files

* Update src/data/moves_info.h

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-18 23:03:36 +02:00
Bassoonian
0b429a8649
Merrp merge (September 9th) (#5359) 2024-09-15 13:21:39 +02:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost 2024-09-12 14:45:37 -07:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 (#5336) 2024-09-12 18:55:30 +02:00
Eduardo Quezada
002c770f07 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge 2024-09-09 13:52:34 -03:00
Alex
5c86aa126f
Revert rtc based encounters (#5331) 
* Revert "RTC-based wild encounters follow up (#5328)"

This reverts commit 9a95c9b07a.

* Revert "RTC-based wild encounters (#5313)"

This reverts commit 7c7fd905ba.
 2024-09-06 21:09:04 +02:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost 2024-09-05 17:11:32 -07:00
Hiram Anderson
7c7fd905ba
RTC-based wild encounters (#5313) 
* Some jsonproc string utility functions

Adds stringContains, stringStartsWith and stringEndsWith for use in jsonproc.

* Time-based wild encounters

This adds some configs that allows users to define wild encounter groups on a map that are automatically cycled through depending on the time of day.
 2024-09-03 21:54:03 +02:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767) 
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

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

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-03 20:22:01 +02:00
psf
23134cec85
Merge branch 'upcoming' into signpost 2024-08-27 21:31:07 -07: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
ghoulslash
d2f3d319a7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/sideways_stairs 2024-08-04 12:26:20 -04:00
cawtds
3af93bdfee
FRLG+ whiteout message (#4967) 
* FRLG whiteout message + post whiteout event
 2024-08-02 08:28:05 -07:00
pkmnsnfrn
fb53297e64 Added documentation around OW_AUTO_SIGNPOST 2024-07-27 15:45:48 -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
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
Bassoonian
385b7017f3
Fix fake RTC being on by default (#4965) 2024-07-13 21:20:55 +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
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
ghoulslash
0cffe4a96a syntax fixes, turn slow movement on rock stairs default off, remove petalburg layout change 2024-07-08 14:08:15 -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
ghoulslash
b8dea3c7ec sideways stairs, try to integrate with follower code 2024-06-19 10:50:59 -04:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761) 
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
 2024-06-13 22:46:27 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers (#4765) 
* Add option to hide substitute followers

* Update event_object_movement.c
 2024-06-12 13:53:01 -04:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
Bassoonian
f4c890df1e Disable OW followers by default 2024-06-04 15:37:02 +02:00
Eduardo Quezada
6eba5bcb80 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
Bassoonian
7d84cd62ef
Add on release item config (#4577) 2024-05-15 23:46:25 +02:00
RavePossum
afb66b4d2b preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens 2024-05-07 23:58:29 -04:00
Eduardo Quezada
a200fe1590 Read separate palettes and apply it to Gen 1-3 2024-04-21 10:20:23 -04:00
Eduardo Quezada
3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h
 2024-04-20 13:23:14 -04:00
psf
24e3ca267b
Add OW_HIDE_REPEAT_MAP_POPUP config (#4370) 
* Added first working version

* Fixed spacing and set config to false

* Update src/overworld.c

Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4370#discussion_r1555917636

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-04-10 09:10:37 +02:00
psf
36cd976a03
Added OW_PC_MOVE_ORDER config (#4348) 
* Added OW_PC_MOVE_ORDER config

* Implemented feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4348\#pullrequestreview-1981473856
 2024-04-07 09:52:58 +02:00
Eduardo Quezada
e479fa1007 Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
Eduardo Quezada
f419de24d9
Removed Gen 9 settings for out-of-battle abilities (#4282) 
* Removed Gen 9 settings for out-of-battle abilities

* Updated OW_SYNCHRONIZE_NATURE comment
 2024-03-18 08:24:44 +01:00
Eduardo Quezada
39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	include/data.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_3_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-03-17 23:41:23 -03:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275) 
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
 2024-03-12 12:21:03 +01:00
Eduardo Quezada
1a4bc69c5a Moved follower settings to overworld config 2024-02-18 00:16:59 -03:00
Bassoonian
9a1f6dfb64
Allow one-mon double battles (#4007) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-16 18:24:49 +01:00
Bassoonian
7b0904c580 Fix extended berry stage palettes 2024-01-05 11:32:59 +01:00
Bassoonian
1662dc3478
Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
Martin Griffin
3ad66028e9
Backwards-compatible BoxPokémon Refactor (#3438) 
* Check progress in non-battle PARAMETRIZEd tests

* Overworld Script Tests

* Backward-compatible BoxPokemon Refactor

Reuses space that contains zeros to provide space for:
- HP/status in the box
- 12-character nicknames
- Up to 63 PokéBalls
- Shininess separate from PID
- Hidden Nature
- Hyper Training
- Dynamax Level
- Gigantamax Factor
- Terastallization Types
- Shadow

Implements:
- OW_PC_HEAL to switch between Gen7- and Gen8+ behavior
- Nature Mints
- Dynamax Candy
- Hyper Training commands (canhypertrain/hypertrain)
- Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor)
- Terastallization Type on the summary screen
- Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form

* fixup! Backward-compatible BoxPokemon Refactor

* displaydexinfo fix from Jasper
 2023-12-27 17:48:17 +01:00
Bassoonian
c115649349 Fix 6 stage Berry trees not growing properly 2023-12-24 23:08:15 +01:00