Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-05 21:07:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,537 Commits 3 Branches 0 Tags 879 MiB
a4ecd7338b
Commit Graph

520 Commits

Author SHA1 Message Date
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Pawkkie
579fa6410d
Switch chance config support (#6187) 2025-02-10 00:30:54 +01:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs (#5914) 
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-09 22:29:23 +01:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-02-09 00:54:58 +01:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites (#5874) 
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
 2025-01-30 22:29:20 -03:00
kittenchilly
058bf58b7b
Match current gen behavior for battle environment after fishing (#6099) 2025-01-26 22:39:14 +01:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
 2025-01-26 12:08:10 -03:00
hedara90
88986baf5f
Trainer Party Pools (#5731) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-25 13:28:46 +01:00
Eduardo Quezada
26daf15ce0 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-24 18:29:28 -03:00
Eduardo Quezada
cd84e07341 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-23 23:01:25 -03:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer (#6029) 2025-01-23 09:47:14 +01:00
hedara90
e8d3b4163f
Trainerslide animation fix (#6040) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-22 14:50:23 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen (#6027) 2025-01-20 09:41:31 +01:00
Eduardo Quezada
a756bb501c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01:00
AERDU
e4e4460636
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032) 2025-01-18 19:54:20 +01:00
Bassoonian
243900cdbb
Rename DexNav flags and vars (#6044) 2025-01-18 14:44:40 +01:00
Eduardo Quezada
937b3106b4 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-17 19:33:48 -03:00
hedara90
3bcfa355eb
Config for move slot rearrangement in battle (#6017) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-17 23:03:01 +01:00
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves (#6026) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-01-15 15:20:31 +01:00
Alex
e264fa6fc0
Removed OW_AUTO_SIGNPOST (#5978) 2025-01-08 16:14:38 -08:00
psf
81d877339c
Removed OW_AUTO_SIGNPOST (#5974) 2025-01-08 21:36:50 +01:00
khbsd
76964dd96a
Fly from Pokenav (#5679) 2025-01-05 00:24:58 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337) 
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-01-04 14:25:03 +01:00
Eduardo Quezada
89f90e1f69 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-03 13:58:10 -03:00
Eduardo Quezada
161c3aadea OW_OBJECT_SUBPRIORITY 2025-01-03 13:51:11 -03:00
ghoulslash
7a9e847fd4 some clean up 2025-01-02 09:00:56 -05:00
ghoulslash
d8ea4fa1ec Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e Merge branch '_RHH/master' into _RHH/upcoming 2025-01-01 18:34:42 -03:00
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode (#5889) 2025-01-01 10:24:23 +01:00
Eduardo Quezada
004efd1e5a Merge branch '_RHH/master' into _RHH/upcoming 2024-12-31 18:38:03 -03:00
Alex
f864bf8b70
Adds Generational config for Magic Guard (Fix for Gen4+) (#5893) 2024-12-30 09:01:20 +01:00
Eduardo Quezada
dbc3cc28b8 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-21 09:31:23 -03:00
Eduardo Quezada
53aebc34dd Merge branch '_RHH/master' into _RHH/upcoming 2024-12-20 20:48:13 -03:00
Eduardo Quezada
05f300f6cc Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-20 15:22:14 -03:00
hedara90
e579333427
Egg cycle length fix (#5828) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-12-20 11:23:51 +01:00
PhallenTree
f4a0cc0055
Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles (#5829) 2024-12-19 13:51:03 +01:00
Eduardo Quezada
bcc65e74a6 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-14 13:03:16 -03:00
PhallenTree
3ad5de5fef
Adds missing Friend Ball friendship bonus upon catching (#5795) 2024-12-10 08:26:23 -03:00
hedara90
75eaf890a2
Evolution level 1 learn (#5791) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-12-09 13:21:30 +01:00
hedara90
09a8d051d4
Added the missing config to use new terrains (#5792) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-12-09 12:28:31 +01:00
PhallenTree
775ea3b564
Pursuit refactor (#5707) 2024-12-06 19:14:46 +01:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ (#5652) 2024-12-05 22:29:20 +01:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
Pawkkie
b15f7ad4f1
Sleep Clause global config (#5762) 2024-12-02 16:35:28 -05:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE (#5566) 
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-12-02 09:06:03 +01:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message (#5747) 2024-11-30 18:06:17 -05:00
ghoulslash
b488ff9b53 merge w upcoming 2024-11-03 07:11:40 -05:00
hedara90
02d7767327
Set default battle shadow to Gen3 (#5632) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-11-03 07:29:09 -03:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences (#5595) 2024-10-29 15:38:26 +01:00
Eduardo Quezada
e8b8ca19a9 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-28 12:13:55 -03:00
Eduardo Quezada
13d3245204
Added compressed OW mon VRAM notice in config file (#5599) 2024-10-27 14:04:33 -04:00
ghoulslash
4fc07c4369 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-20 18:46:54 -04:00
RavePossum
85197eda5e
Move Relearner and Renaming From Summary Screen (#5513) 
* implement move relearner in summary screen

* implement renaming in summary screen

* Enable summary screen rename and relearn by default

* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC

* add a config to not restore full PP when relearning from summary screen

* hide summary relearner option if mon has no relearnable moves

* add note not to decap RELEARN string

* re-static function that now no longer needs to be accessible elsewhere

* Fix move relearner not showing up if you first select a mon with no moves

* The great curly brace massacre of 2024 (PR feedback)

* sprinkling in some parentheses

* PR feedback 2 (curly braces & whitespace)
 2024-10-19 14:43:05 +02:00
ghoulslash
229525d122 some cleanup 2024-10-18 22:13:49 -04:00
ghoulslash
cb9f1f27a7 move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise 2024-10-18 22:00:19 -04:00
ghoulslash
54484593b3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-18 21:46:54 -04:00
kittenchilly
04aa5b7c24
Add more later gen fishing mechanics (#5518) 
* Add new fishing bite odds and follower boost

* Sticky

* Update item.h

* Update field_player_avatar.c

* Update field_player_avatar.c
 2024-10-18 16:45:31 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config (#5206) 
* Add back older sprites

* Graphics config

* Added GBA most graphical data to gSpeciesInfo

* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files

* GBA mon icons

* Split GBA footprints into separate config

* Separated GBA icons into their own config

* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS

* Moved GBA sprites to regular folder with prefix

* Renamed configs

* Temporarely disabled shadows when GBA sprites are enabled

* Removed remaining files from pokemon_old folder
 2024-10-18 13:37:00 +02:00
ghoulslash
bb78d45400 some fixes 2024-10-15 21:24:53 -04:00
ghoulslash
cf78462fab merge w upcoming 2024-10-15 21:24:47 -04:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon (#5502) 
* Add No Running Battle Flag

Adds a flag that if set prevents the player from being able to run from wild battles.

* Formatting battle_util.c

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

* Adjust for pre-Gen 8 Teleport

Addresses the edge case with Teleport when used with under Gen 8 mechanics.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-10-11 21:59:50 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form (#4813) 
* Add config to change Vivillon's default form

* Update daycare.c

* Remove the default form stuff

* Update daycare.c

* Clean up

* Assert and fancy
 2024-10-10 21:27:50 +02:00
Eduardo Quezada
1d9557811b Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-10-08 15:58:17 -03:00
Eduardo Quezada
f913f2884b Add config for shadow intensity 2024-10-08 12:21:06 -03:00
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK (#5448) 
* First addition of both checks

* Updated config file

* fixed spacing

* Updated spacing

* Fixed issues where feature was always on

* Update overworld.h

fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
 2024-10-07 17:07:23 +02:00
Eduardo Quezada
a7fca616b0 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-04 14:28:13 -03:00
ghoulslash
2e52e3331f merge w upcoming 2024-10-04 12:56:21 -04:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453) 
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

* fixes and added new test cases

* bugfixing and added EWRAM u16 gLastUsedMoveType

* update after Pawkkie review

---------

Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
 2024-10-04 12:42:15 -04:00
ghoulslash
c8afe9bbde some formatting fixes 2024-09-29 13:34:11 -04:00
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
kittenchilly
c1dffc694e
Merge level_caps and ev_caps into one caps file (#5429) 
* Merge level_caps and ev_caps into one caps file

* Update caps.h
 2024-09-27 23:40:49 +02:00
psf
ad0778722b
Adds SAVE_TYPE_ERROR_SCREEN (#5188) 
* Original commit

* Moved config from save to general https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747901
Reindent function per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747984
Split Compound String into seperate lines
per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Changed Rom to ROM per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Removed extra new line per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748172

* fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2295134679

* Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2306527812

* Removed comment and made line breaks consistent per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#pullrequestreview-2320266015
 2024-09-22 19:07:17 +02:00
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors (#5044) 2024-09-21 20:39:07 +02:00
psf
fee26e29f5
Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY (#5054) 
* Added AUTO_SCROLL_TEXT

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265

* Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524

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

* Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771

* Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891

* Update text.h

* Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Update gflib/text.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-19 12:01:12 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests (#5400) 
* Fix Quash + After You and Quash configs

* Add tests
 2024-09-19 00:10:29 +02: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
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests (#5370) 
* Simplified fix from #4638

* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge

* Powder Tests

* Remove duplicate

* Assume Powder is a powder move

* Add config for Powder Rain interaction

* Only primal rain

* Z-Moves fix handled in Canceller_Z_Moves

* Fix BattleScript name

* Make sure Z-Move + Powder still damages user
 2024-09-13 18:08:23 +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
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers (#5178) 
* Add data to SpeciesInfo entries for in-battle shadows

* Implement sized shadows in the sprite visualizer

* Implement sized shadows in game code

* Show shadows for the lead battler for opponents during their battle anim

* Feedback on shadows, round 1

* Revert removal of Goomy and Sliggoo shadows

* Fixed GEN_3 setting

* Code cleanup + remove pre-processor branches

* Fix bugs with gen-3 configuration branch

* Style corrections, final shadow coordinate adjustments

* Adjustments to Garbodor and Araquanid
 2024-09-10 21:27:49 +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
Eduardo Quezada
6d020eb366
Cleaned up duplicate dynamic type functions (#5338) 
* Cleaned up duplicated dynamic type functions

* Small cleanup

* Oops, last cleanup broke stuff

* Alignment

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-08 19:14:05 +02: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
Alex
04b5c013a9
Adds config to show target of ingame partner (#5307) 
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-03 19:28:59 +02:00
Erickson Russell
de242c8a29
EV Caps and EV Items (#5269) 
* EV Caps and EV Items

Introduces EV caps, inspired by level caps, with configurable options for various cap implementations. Additionally, modifies EV items to interact with these caps based on a configurable setting.

* EV Caps fixes

Changed the EV caps to be less redundant and work better overall.

* EV Caps Fix part 2

Set the items back to ItemUseOutOfBattle_Medicine, got rid of ItemUseOutOfBattle_EVItem and ItemUseCB_EVItem, and reverted CB2_ReturnToPartyMenuUsingItem to CB2_ReturnToPartyMenuUsingRareCandy

* EV Caps Fixes Part 3

Fixed being able to use EV items to go over 252 limit on single stats.

* Update src/ev_caps.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-01 23:15:39 +02:00
psf
95167936d4
Merge branch 'upcoming' into signpost 2024-08-31 07:02:18 -07:00
psf
4f39354185
Deprecate MMBN Names (#5240) 
* Removed HANDLE_EXPANDED_MOVE_NAME

* Removed HANDLE_EXPANDED_TYPE_NAME

* Removed HANDLE_EXPANDED_ITEM_NAME

* Removed HANDLE_EXPANDED_SPECIES_NAME

* Removed I_EXPANDED_ITEM_NAMES

* Removed B_EXPANDED_MOVE_NAMES

* Removed B_EXPANDED_TYPE_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Added documentation of names

* Github markdown spacing is silly

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
 2024-08-29 16:33:25 -04:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04:00
psf
23134cec85
Merge branch 'upcoming' into signpost 2024-08-27 21:31:07 -07:00
Alex
98dbf3a575
Fixes Charged up status (#5274) 
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
 2024-08-27 20:01:51 +02:00
kittenchilly
03e0472cbe
Add I_REPEL_INCLUDE_FAINTED config and behavior (#5239) 
* Add I_REPEL_INCLUDE_FAINTED config

* Update src/wild_encounter.c

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

* Update wild_encounter.c

* Update wild_encounter.c

* Update src/wild_encounter.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-26 15:58:12 +02: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
Frank DeBlasio
15348eae84
Consolidated the values of Rotom's moves and added Gen9 base form effect (#5186) 
* Consolidated Rotom move values

* Updated changing Rotom into its base form to its Gen9 effect

* Fixed order of if statement
 2024-08-16 23:31:19 +02:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Eduardo Quezada
6f0004ec4e
Removed some hardcoding of move IDs + Gen4/5 Defog (#5156) 
* Removed some hardcoding of move IDs

* Added Defog Gen6+ config (+ updated tests)
 2024-08-14 15:51:34 +02:00
Alex
7119d60a67
Set new anim particles by default to off (#5161) 2024-08-14 06:31:26 -07:00
psf
d1183f4b8a
Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131) 
* First attempt at a port

* Slightly broken but working

* Got images working and opponent palettes

* half finished compressed spritesheet approach instead

* fix the palettes (smh)

* fix hflip, and a lot of clean-up

* Add B_SHOW_TYPES

* Got Illusion working

* Add num type enum

* Updated function to get type

* Fixed type icon position and cleaned up functions

* Updated illusions and Tera handling

* Added BATTLE_TYPE_IS_SINGLE and DOUBLE

* Removed IS_BATTLE_TYPE_SINGLE

* Implemented BATTLE_TYPE_IS_DOUBLE across repo

* Removed SIDE macro

* Updated config

* Deprecated battler alive macro

* Reindented file

* Added exceptions for 2v1

* Replaced Fainted check with Null check

* Added functionality for only types of caught mons

* UseDoubleBattleCoords updated

* Added ShouldFlipTypeIcon

* Renamed TryLoadTypeIcon

* Refactored functions

* Refactored functions

* Refactored functions

* Refactored functions

* Renamed SEEN to CAUGHT

* Reset config

* Added useSecondPalette and isOrdinary to gTypesInfo

* Further simplified secondPalette and isOrdinary

* Changed isordinary to isSpecialCase

* Renamed to useSecondTypeIconPalette

* Fixed Stellar type interactions

* fixed spacing

* fixed include/config/battle.h

* fixed

* fixed include/config/general.h

* changed type1 and type2

* Moved IsDoubleBattle to include.battle.h
Removed BATTLE_TYPE_IS_DOUBLE
Removed IS_DOUBLE_BATTLE

* Changed IsBattlerFainted to IsBattlerAlive

* Removed IsBattlerNull

* Moved GetBattlerData to be inline

* Renamed GetMonDefensiveTeraType

* Removed IsIllusionActive

* Fixed identation

* found one last isDoubleBattle hold out

* fixed redundant brackets

* Fixed spacing for B_SHOW_TYPES

* Update src/battle_script_commands.c

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

* Fixed padding

* Reindent file and refactored GetTypeIconHideMovement

* Update include/data.h

---------

Co-authored-by: RavePossum <ravepossum@proton.me>
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-11 17:55:51 +02:00
Eduardo Quezada
113f8de9b1 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player.c
 2024-08-08 13:22:49 -04:00
Galaxeeh
355739db63
Dynamic Move Types in Summary Screen/Battle (#5084) 
* Dynamic Hidden Power Types

* Dynamic Ivy Cudgel is summary screens

* Dynamic Move types

* missed unnecessary comment that got left in

* format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection

* forgot to revert config defaults

* Update src/pokemon.c

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

* if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd)

* revert configs

* added Hail check to Weather Ball

* Fixed agbcc compile/brackets/u32 changes

* Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities

* Update src/pokemon_summary_screen.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-08 11:08:50 +02:00
kittenchilly
e4f09c8103
Move Relearner now displays move category (#5081) 
* Move relearner now displays move category

* Update move_relearner.c

* Update move_relearner.c

* Address reviews
 2024-08-06 23:58:18 +02: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
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
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
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
Eduardo Quezada
fb708b7ed3 Merge branch '_RHH/master' into _RHH/upcoming 2024-07-10 10:05:10 -04:00
ghoulslash
bd014e4fb7 syntax, alignment fixes 2024-07-08 14:15:41 -04:00
ghoulslash
48d2bff553 merge w upcoming 2024-07-08 14:12:00 -04: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
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
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
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
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
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
ghoulslash
b8dea3c7ec sideways stairs, try to integrate with follower code 2024-06-19 10:50:59 -04:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder (#4805) 2024-06-19 13:42:01 +02:00
sneed
609754f0f6
Add RandomChance macro and ability trigger chance config (#4829) 
* RandomChance macro, contact ability chance config

* Unify config, add shed skin
 2024-06-18 20:13:44 +02:00
ghoulslash
cb1696384c merge in original dexnav code with some rhh specific tweaks 2024-06-16 10:39:28 -04:00
Eduardo Quezada
1eb0b3261f
Added option to disable species cries (#4791) 
* Added option to disable cries

* Update src/pokemon.c

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-06-15 22:07:13 +02: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
Bassoonian
5fe0aee063
Add config to turn off two-framed front sprites (#4750) 
* Add config to turn off two-framed front sprites

* Two frames should be on by default

* Simplifies integration
 2024-06-11 13:10:23 -04:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
Bassoonian
bbc05234b9
Make Pokémon Sprite Visualizer name official (#4745) 
* Rename files to PSV

* Rename functions and defines

* Add missing newlines

* Integrate feedback
 2024-06-09 12:12:35 -04:00
sneed
fa81861593
Add newer generation Heal Bell interactions with Soundproof (#4732) 
* newer generation soundproof heal bell interactions

* Fix bugs and rewrite AnyPartyMemberStatused

* add missing check, tests, clean up

* fix ai code and rename battler for clarity
 2024-06-07 18:51:21 +02:00
Bassoonian
f4c890df1e Disable OW followers by default 2024-06-04 15:37:02 +02:00
Eduardo Quezada
ee1d14755a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-06-02 11:06:41 -04:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks (#4462) 
* Set TYPE_MYSTERY as type 0

* Remove redundant TYPE_NONE

* Moved Gen 1-3 type damage categories to gTypesInfo

* Set TYPE_NONE as 0 instead

* Grouped type info to a single file

* Fixed sTypeEffectivenessTable static name

* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs

* oops, missed the extern

* Moved Tera Type RGB values to gTypesInfo

* Fixed Tera Type test

* Added option test feature to set IVs

* Hidden Power type test

* Tera Type safeguard in givemon

* Removed isHiddenPowerType for a future PR that refactors Hidden Power

* Review changes
 2024-06-01 07:38:22 +02:00
Eduardo Quezada
021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	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_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-05-28 14:28:33 -04:00