ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 14:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,283 Commits 1 Branch 0 Tags 235 MiB
deb3109c81
Commit Graph

4971 Commits

Author SHA1 Message Date
LOuroboros
e25f843db3 Implemented Quark Drive's effect 
Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.
 2022-12-06 05:23:29 -03:00
LOuroboros
a328088122 Implemented Protosynthesis' effect 
Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.
 2022-12-06 05:23:29 -03:00
LOuroboros
34cafa746c Implemented Electromorphosis' effect 
Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied.
Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.)
As a result, the game will trigger the ability multiple times if they're hit by a multihit move.
This directive makes the code end the ability effect preemptively if the target does have the status flag applied.
 2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
ca656b63b9 Added Well Baked Body's effect and misc. changes 
-Added a modifybattlerstatstage macro to handle stat stages in battle.
-Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.
 2022-12-06 05:21:24 -03:00
Bassoonian
58a54c90d2 Restore GEN_LATEST to GEN_8 2022-12-04 18:16:37 +01:00
GriffinR
f55443656f Add NUM_TILES_PER_METATILE 2022-12-03 17:29:02 -05:00
LOuroboros
acb9c31bd4 Implemented Anger Shell's effect 2022-12-03 01:19:24 -03:00
LOuroboros
b0027cb78b Implemented Seed Sower's effect 2022-12-02 23:31:41 -03:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
Eduardo Quezada
4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e Made Types and Egg Groups into arrays 2022-11-22 17:05:25 -03:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename 
Renamed gBaseStats to gSpeciesInfo
 2022-11-18 17:45:23 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides 
Introduce NUM_BATTLE_SIDES
 2022-11-18 17:39:00 -05:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian
3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
Eduardo Quezada
791c547b2c Renamed missing overworld debug configs 2022-11-14 14:07:32 -03:00
Eduardo Quezada
540f4679bb Implemented uses of Shiny config 2022-11-14 11:56:02 -03:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
LOuroboros
11c99cac61 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-13 23:17:59 -03:00
LOuroboros
31a602f3b6 Optimized Intimidate's code 2022-11-12 18:03:46 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid 
Config for Dark Void being only usable by Darkrai
 2022-11-05 22:42:51 +13:00
Eduardo Quezada
44bf4a15e3 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
#	include/constants/battle_move_effects.h
 2022-11-04 12:19:40 -03:00
ghoulslash
7a0e541413 workaround for GetBattlerHoldEffectParam to handle bug bite different battler id 2022-11-04 10:29:05 -04:00
ghoulslash
1e6903840a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite 2022-11-04 09:29:45 -04:00
ghoulslash
d13431b4ab merge w rhh master 2022-11-04 09:29:39 -04:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
BuffelSaft
c169a9523e
Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00
BuffelSaft
736ca893b6 Fix abilities that raise target's stat after hit 
Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.
 2022-11-03 21:54:56 +13:00
LOuroboros
86e322dcea Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike 
Multi-hit refactor and Parental Bond
 2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney 
Implemented Honey's Sweet Scent functionality
 2022-11-01 20:09:30 -04:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
Eduardo Quezada
85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
BuffelSaft
3327758cdb Move B_BEAT_UP_DMG to other move settings 
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
 2022-10-26 23:29:09 +13:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
BuffelSaft
d9cc98a4fe Suggested changes 
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
 2022-10-24 22:19:35 +13:00
BuffelSaft
a5ede1ee90 Move B_PARENTAL_BOND_DAMAGE to damage settings 
Title.
 2022-10-23 21:41:42 +13:00
BuffelSaft
9b076a9dcf Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES 
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
 2022-10-23 21:40:04 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
3775c5d00c Fix move effects 
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
 2022-10-22 18:54:25 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
GriffinR
e752c8a2f9
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately 
Document seldom-used trigger functionality
 2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone
18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY 
Getting rid of the VAR_ prefix, to avoid the porymap problem.
 2022-10-18 21:12:31 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none 
Add the HEAL_LOCATION_NONE constant
 2022-10-18 18:41:04 -04:00
Abaresk
7f09894045 Merge branch 'master' into thunder 2022-10-18 04:37:56 +00:00
Marcus Huderle
48ab684b48 Fix weather color map documentation 2022-10-17 17:41:27 -07:00
tustin2121
327c648e87 Document seldom-used trigger functionality 
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
 2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
1607291982 Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
Abaresk
e67d55bfc4 Fix names 2022-10-15 13:37:24 +00:00
Abaresk
b538239f18 Add more documentation to thunder weather 2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
LOuroboros
90f79999bb Added class-based Poké Balls for trainers 
Thanks to Ghoulslash for helping me optimizing things.
 2022-10-14 11:14:30 -03:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c 
Convert tilesets.s to C
 2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero 
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
 2022-10-07 18:27:29 -03:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 
One for the go! (pret merge 2022/10/07)
 2022-10-07 17:14:00 -04:00
Eduardo Quezada
8ea060044a Battle text pauses config 2022-10-07 17:22:29 -03:00
Eduardo Quezada
453da8aa8c Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID 2022-10-07 15:49:00 -03:00
Eduardo Quezada
77f24d42e4 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-10-07 15:39:02 -03:00
Eduardo Quezada
44754f8ca7 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/constants/pokemon_config.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
 2022-10-07 15:27:16 -03:00
Eduardo Quezada
2a8048b677 Removed ItemId_GetId like in upstream 2022-10-07 14:53:58 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
 2022-10-07 14:52:32 -03:00
Eduardo Quezada
9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2022-10-07 14:05:45 -03:00
LOuroboros
50ca188cb2 Replaced didMegaEvo with a shiny new species flag 2022-10-07 12:32:36 -03:00
LOuroboros
02c6bc64b2 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero 2022-10-07 12:20:52 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags 
4 new species flags
 2022-10-07 10:55:43 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 
I don't have any Sunday memes (pret merge 2022-09-25)
 2022-10-07 10:25:59 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop 
Clean up shop.c
 2022-10-06 17:24:53 -04:00
GriffinR
c6e4c29ea3
Merge pull request #1792 from GriffinRichards/display-tiles 
Add DISPLAY_TILE_* constants
 2022-10-05 20:44:28 -04:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
Eduardo Quezada D'Ottone
af171eb4d4 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 
# Conflicts:
#	src/pokemon_summary_screen.c
 2022-10-01 17:32:32 -03:00
Eduardo Quezada
0370cb3fd2 Removed comment MAP_GROUP_COUNT 2022-09-30 22:05:10 -03:00
GriffinR
fb87616e9d Use window constants in mystery_gift_menu 2022-09-29 15:48:19 -04:00
GriffinR
4af1044439 Use window constants in region_map 2022-09-29 13:11:38 -04:00
GriffinR
16be1e8447 Use window constants for move relearner 2022-09-29 12:10:10 -04:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
Eduardo Quezada
ecad6ff0db Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2 2022-09-27 10:46:49 -03:00
Eduardo Quezada
fb9105f8ac Added Mega Evolution flag 2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-27 10:13:32 -03:00
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -04:00
ghoulslash
8ecdf68491
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix 
Fixes: Pokémon Debug isn't loading female icon palettes correctly
 2022-09-26 09:09:14 -04:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
TheXaman
886a487bf1 Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes 2022-09-26 12:40:30 +02:00
Eduardo Quezada
5054cf3586 Documented unk40EF in Summary Screen 2022-09-25 21:33:20 -03:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
38df216ebd
Merge pull request #2355 from ghoulslash/be/aiparty 
Add overwrittenAbilities field
 2022-09-24 14:33:02 -03:00
ghoulslash
c22671d2a2 add overwrittenAbilities field 2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print 
[debug] add support for mgba printf
 2022-09-23 13:49:48 -04:00
sbird
343d7f7d26 [debug] do not use heap allocation for MgbaPrintf 2022-09-23 04:12:57 +02:00
sbird
12670e8e3e [debug] simplify macros, add EX versions 2022-09-23 03:48:58 +02:00
sbird
22329d3318 [debug] use boolean constants for nStopProgram 2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e [debug] fix AGBAssert for AGBPrintf debug block 2022-09-23 03:22:57 +02:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
LOuroboros
5f67335212 Fixed typo in BoxMonKnowsMove 2022-09-19 05:21:54 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
#	src/data/pokemon/form_species_table_pointers.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
 2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone
293a880238
Apply suggestions from code review 2022-09-18 00:50:21 -03:00
Ct11217
5f74781a7d Remove ACE_POKEMON_FUNCTIONALITY 2022-09-17 17:44:50 -06:00
Eduardo Quezada
720cb249d6 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-16 12:06:06 -03:00
ghoulslash
8bbe1b9037
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome 
Config to limit the moves called by Metronome (by generation)
 2022-09-16 11:03:33 -04:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
Eduardo Quezada
672f572ff8 Config to limit the moves called by Metronome (by generation) 2022-09-16 11:04:30 -03:00
Eduardo Quezada
77696ca686 Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change 2022-09-16 10:31:02 -03:00
Eduardo Quezada D'Ottone
7825153bb2
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix 
Exp Candy Fixes
 2022-09-15 22:46:59 -03:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch 
Tidying graphics - Trio Weather
 2022-09-15 18:01:43 -04:00
ghoulslash
354a8256e4
Merge pull request #2226 from Porygon23/AI-Logic-Updates 
Added corner case logic for AI Switching.
 2022-09-15 17:56:35 -04:00
Eduardo Quezada
bca1267ca8 Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes 2022-09-15 14:52:18 -03:00
Eduardo Quezada
dc423ef7ff Handling repel/lure menu 2022-09-14 00:18:01 -03:00
Eduardo Quezada
ee628de82f Config to turn off Hippopotas' and Hippowdon's female icons 2022-09-13 21:42:53 -03:00
Eduardo Quezada
0caf79f702 Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 
# Conflicts:
#	graphics/pokemon/cherrim/anim_front.png
#	graphics/pokemon/scyther/anim_front.png
#	graphics/pokemon/scyther/front.png
#	graphics/pokemon/shinx/anim_front.png
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
 2022-09-13 20:44:49 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
 2022-09-13 16:22:42 -03:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04:00
GriffinR
4c34babb4d
Merge pull request #1780 from LOuroboros/raquaza 
Fixed a typo and scripting vars alignment
 2022-09-12 22:02:46 -04:00
LOuroboros
14c6d8b91a Fixed alignment for the value of vars 0x4020 to 0x40FF 2022-09-12 21:33:03 -03:00
LOuroboros
cb83a09203 Fixed vars alignment 2022-09-12 21:27:53 -03:00
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
GriffinR
d3d8b4a181
Merge pull request #1762 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:32:27 -04:00
Eduardo Quezada
0944232059 Added shiny rerolls to Lures + reverted repel var name 2022-09-12 10:21:57 -03:00
Eduardo Quezada
e3005e5275 Item config for repel prompt 2022-09-12 10:21:52 -03:00
Eduardo Quezada
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -03:00
Deokishisu
e3c19f5df5 Implement B2W2 Repel System 
The game now asks if the player would like to use another Repel when the one they used runs out.

# Conflicts:
#	include/constants/vars.h
 2022-09-12 10:21:38 -03:00
Eduardo Quezada
66177e7958 Reworked shiny charm rerolls allow adding additional rerolls when necessary 2022-09-12 10:21:21 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada
61752a4977 Added parenthesis to GET_SHINY_VALUE 2022-09-11 13:35:58 -04:00
Eduardo Quezada
4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_controller_link_opponent.c
#	src/battle_controller_opponent.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controllers.c
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/pokemon.c
 2022-09-10 00:17:03 -04:00
LOuroboros
12fee71008 Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE 2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms 
Introduced FORM_BATTLE form changes
 2022-09-09 14:15:53 -04:00
Blackforest92
29529a0c47 Remove primal_particle leftovers 2022-09-09 22:28:11 +07:00
Blackforest92
d870d71dbe Remove windstorm_brew leftovers 2022-09-09 22:26:29 +07:00
Blackforest92
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
Eduardo Quezada
8449f237c2 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b Added SPECIES_FLAG_CANNOT_BE_TRADED 
- Also corrected Cylarex's forms not having the legendary flag
 2022-09-09 08:59:53 -04:00
Eduardo Quezada
9144779634 Removed repeated extern consts in strings.h 2022-09-09 08:49:16 -04:00
Blackforest92
caf323a653 Erase ghost data in include/constants/map_groups.h 2022-09-09 00:40:30 +07:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
LOuroboros
c8f4a44380 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-09-06 20:40:34 -03:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
TheXaman
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
59de7e48e5
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix 
Fixed PokemonSubstruct3 alignment
 2022-09-06 15:14:45 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
sbird
584bfe0221 [debug] add support for mgba printf 
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
 2022-09-06 13:40:31 +02:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
TheXaman
6cab795c5c
Update include/constants/overworld_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:02:44 +02:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -03:00
Eduardo Quezada
74c3fdfba7 Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee) 2022-09-04 19:41:01 -03:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
03498d7240 Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER 2022-09-02 23:57:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates 2022-09-02 14:44:47 -06:00
TheXaman
b4b3e84cbd removed default flags and added ingame warning if a function that requires them is used 2022-09-02 18:39:38 +02:00
TheXaman
367b12801e changed debug_config.h to overworld_config.h, 
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
 2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1 removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone
59f1f10dec
Merge pull request #2260 from DizzyEggg/magic_bounce 
Fix Magic Bounce targets
 2022-09-01 19:56:15 -04:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
Eduardo Quezada
8d94c58cac Shows exp when leveling up with Exp Candies 2022-08-31 21:54:27 -04:00
Eduardo Quezada
3264c3c87a Shows amount of Exp gained. 2022-08-31 09:05:51 -04:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00