8493 Commits

Author	SHA1	Message	Date
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
eatthepear	bd4b660983	Fix Berries that were broken after Bug Bite fix ... Issue #2448 Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works. I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).	2022-11-11 21:28:44 -05:00
LOuroboros	7260478c54	Uncommented level up moves	2022-11-11 01:31:22 -03:00
GriffinR	601bb0b578	Index gBattleFrontierHeldItems	2022-11-10 16:14:06 -05:00
GriffinR	3b1c8dfb17	Update list menu graphics	2022-11-09 19:44:58 -05: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
Eduardo Quezada	bd63ef18af	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/pokemon_storage_system.c	2022-11-09 19:33:26 -03:00
GriffinR	e434b0047f	More missing constant usage	2022-11-09 15:53:47 -05:00
GriffinR	431a7ef8dd	Add missing cursorKind field usage	2022-11-09 15:37:47 -05:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
GriffinR	b3e75138da	Sync wireless improvements	2022-11-09 15:14:18 -05:00
LOuroboros	a35986fd9c	Fixed indentation in ScrCmd_faceplayer	2022-11-08 21:01:50 -03:00
LOuroboros	999a53028a	Updated AnimTask_PrimalReversion	2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
Eduardo Quezada	237877e21b	Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-07 00:00:23 -03: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
BuffelSaft	bbd7b205fd	Merge pull request #2433 from ghoulslash/be/bug_bite ... Redo Bug Bite	2022-11-05 22:08:47 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone	fa8bf80905	Merge pull request #2420 from LOuroboros/teleport ... Updated CanTeleport	2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone	2b5aff2764	Merge pull request #2426 from tustin2121-2/patch-linker ... GF Header and Modern Builds	2022-11-04 12:27:13 -03: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
BuffelSaft	d05c74b9e9	Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams ... Fixed Bad Dream's ability popup message	2022-11-05 03:42:44 +13:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
Eduardo Quezada	5b1552514e	Review changes	2022-11-04 11:10:06 -03: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	8c66b318eb	Fixed Bad Dream's ability popup message	2022-11-04 00:46:07 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03: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
tustin2121	b32413d11e	Restoring the GFHeader ... - Also adding comment about what the header does and how to maintain it.	2022-11-02 12:45:36 -04:00
tustin2121	fd87c97ef8	Adding documentation about GFHeader	2022-11-02 12:42:58 -04: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
Eduardo Quezada D'Ottone	ebc9fc31d2	Merge pull request #2416 from DizzyEggg/fix_palace ... Fix battle palace bug	2022-11-01 12:16:55 -03:00
DizzyEggg	51d8b57dcc	restore deleted line	2022-10-31 13:19:10 +01:00
DizzyEggg	ea43b7732c	Fix battle tent again	2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone	9d64c838cf	Merge pull request #2424 from LOuroboros/getItemId ... Actually removed ItemId_GetId	2022-10-31 07:15:25 -03:00
LOuroboros	52dda5fc0f	Actually removed ItemId_GetId	2022-10-30 22:52:22 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	14e85249d1	Review changes	2022-10-30 17:12:13 -03:00
Eduardo Quezada	d02fc43703	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 13:38:25 -03:00
GriffinR	d90132842a	Update gitignore/spacing for new region map data	2022-10-30 12:22:41 -04: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
LOuroboros	a74a8fa134	Updated CanTeleport	2022-10-29 16:13:40 -03:00
LOuroboros	bdd082f869	Made Z-Moves unusable without PP	2022-10-29 12:07:59 -03:00
DizzyEggg	215604f5f7	fix battle palace bug	2022-10-27 20:44:43 +02: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
Eduardo Quezada D'Ottone	93dd8786ee	Merge pull request #2413 from kaisermg5/fix_tmhm_lock ... Fix lock when teaching a TM/HM after learning a move by level up.	2022-10-26 22:27:19 -03:00
kaisermg5	2cd0a0f862	Fix lock when teaching a TM/HM after learning a move by level up.	2022-10-25 18:48:06 -03:00
Eduardo Quezada	85ce30b1d6	Created macros for Bard Sounds	2022-10-25 14:33:02 -03: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	7bca475d77	Add Misty Explosion to Parental Bond ban list ... Probably not needed, but just in case!	2022-10-23 21:48:20 +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
LOuroboros	c267c615c1	Fixed CanFling	2022-10-22 10:38:39 -03: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	0d0a9bd31d	Update src/overworld.c ... Co-authored-by: GriffinR <griffin.g.richards@gmail.com>	2022-10-17 17:41:27 -07:00
Marcus Huderle	48ab684b48	Fix weather color map documentation	2022-10-17 17:41:27 -07:00
GriffinR	716025395c	Merge pull request #1802 from abaresk/wild-encounters ... Document new metatile wild encounter odds	2022-10-17 18:56:58 -04:00
Eduardo Quezada D'Ottone	c57ab9e529	Merge pull request #2392 from gruxor/wait-fix ... Replaced busy-wait loops	2022-10-17 15:34:22 -03:00
gruxor	610a8efb7d	Replaced busy-wait loops	2022-10-17 11:21:06 -04: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
ghoulslash	ede6162724	Merge pull request #2388 from AsparagusEduardo/RHH/pr/running ... Config for running indoors	2022-10-16 09:28:32 -04:00
Eduardo Quezada D'Ottone	dd2d6107bd	Fixed Z-Move not being cleared if Pokémon faints	2022-10-16 09:57:21 -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	8a1a561b80	Uncommented evo moves for each species	2022-10-14 11:28:15 -03:00
ghoulslash	d64e18d0b4	Merge pull request #2385 from LOuroboros/trainerClassBasedBalls ... Added class-based Poké Balls for trainers	2022-10-14 10:19:20 -04: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	2e128e3282	Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid ... Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID	2022-10-13 14:30:18 -04:00
GriffinR	722e501b7c	Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled ... Documented missing gSoftResetDisabled uses	2022-10-13 14:29:43 -04:00
Eduardo Quezada D'Ottone	71dad6aec9	Merge pull request #2384 from May8th1995/confuseAI ... Fix AI issue giving decrementing score to confuse hit instead of confuse	2022-10-13 12:16:00 -03:00
tennis	db013aab0b	Fix AI issue giving decrementing score to confuse hit instead of confuse	2022-10-13 15:58:57 +01:00
tennis	f79205af08	Fix bug where badge boost flag is inverted	2022-10-13 15:32:08 +01:00
Abaresk	af081b08ee	Make related func names more concise	2022-10-12 04:35:23 +00:00
Abaresk	11e3f03bd8	Document new metatile wild encounter odds	2022-10-12 04:03:02 +00:00
Kurausukun	dc97eca92d	combine "unused" field into tile buffer	2022-10-10 21:00:31 -04: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
LOuroboros	589c969e89	Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore	2022-10-07 18:20:00 -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
ghoulslash	9164f03f96	Merge pull request #2141 from Sneed69/Triple-Kick-Fix ... Triple kick power calc rework	2022-10-07 16:31:50 -04:00
Eduardo Quezada	044898fe95	Documented missing gSoftResetDisabled uses	2022-10-07 15:56:00 -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	d7f7fa7d07	Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti ... Changed ballMultiplier to account for future Hisuian ball multipliers	2022-10-07 10:48:02 -04:00
ghoulslash	1e04c80dfa	Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach ... Special handling for Mew's Teachable moveset	2022-10-07 10:39:56 -04:00
ghoulslash	7c7eb8ac7f	Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide ... Added missing Bide exception to Battle Arena Mind Points	2022-10-07 10:32:47 -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	bb2e64b3fc	Merge pull request #1786 from tustin2121/patch-spritestuff ... Subsprite Tables Documentation	2022-10-06 22:17:32 -04:00
tustin2121	ea168d1a6b	Fix typo 2: revelations	2022-10-06 20:34:46 -04:00
tustin2121	f3bddd1ea6	Fix typo	2022-10-06 19:36:01 -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	e8ed0bd9f2	Changed ballMultiplier to account for future Hisuian ball multipliers	2022-10-04 20:39:45 -03:00
Eduardo Quezada D'Ottone	d0895a7c32	Merge pull request #2370 from StephenLynx/master ... Fixed berserk not activating if mon falls to exactly half HP.	2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna	764bed6580	Fixed berserk not activating if mon falls to exactly half HP.	2022-10-01 20:50:55 -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
GriffinR	79a34411ce	Add additional DISPLAY_TILE_WIDTH usage	2022-09-29 15:22:21 -04:00
sbird	8dad7cc649	[doc] clean up casts in decompress.c	2022-09-29 17:33:39 +02:00
Eduardo Quezada	90ad11278d	Sorry Mewtwo ^^;	2022-09-28 09:17:10 -03:00
Eduardo Quezada	d24899369f	Special handling for Mew's Teachable moveset	2022-09-28 09:04:31 -03: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
Eduardo Quezada	5ca1b927e6	Added missing Bide exception to Battle Arena Mind Points	2022-09-27 08:13:32 -03:00
ghoulslash	253234378c	trace records target ability	2022-09-26 23:46:41 -04:00
ghoulslash	6e276b5f4d	Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings ... Extrapolated Battle Arena's move Mind ratings	2022-09-26 21:04:16 -04:00
Eduardo Quezada	ae21e1626e	Reworked Mind Points	2022-09-26 21:20:08 -03:00
GriffinR	e515e52abb	Add DISPLAY_TILE_* constants	2022-09-26 19:52:17 -04:00
ghoulslash	ff42806e04	Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix ... Multi battle interface fix	2022-09-26 09:12:40 -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
GriffinR	f0744641d1	Merge pull request #1651 from garakmon/entry_json ... use json for region map sections	2022-09-25 21:56:09 -04:00
GriffinR	171367d66c	Merge pull request #1643 from cbt6/object-event-graphics-info ... Format object event graphics info	2022-09-25 21:55:22 -04:00
GriffinR	45e6b48170	Merge pull request #1636 from GriffinRichards/rme-update ... Updates to region map for Porymap	2022-09-25 21:54:26 -04:00
Eduardo Quezada	5054cf3586	Documented unk40EF in Summary Screen	2022-09-25 21:33:20 -03:00
GriffinR	56c28fb2dd	Move region map gitignore to existing data gitignore	2022-09-25 18:15:16 -04:00
GriffinR	e473aaf783	Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json	2022-09-25 18:10:04 -04:00
Eduardo Quezada	057f76bfe6	Cleaned up missing JOY macros	2022-09-25 13:05:18 -03:00
GriffinR	7223dbd62f	Merge branch 'master' into rme-update	2022-09-25 11:56:57 -04: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	3b983aae14	Apply suggestions from code review	2022-09-25 08:31:24 -03:00
LOuroboros	a9ab3286ef	Fixed IsPlayerInFrontOfPC	2022-09-25 05:51:08 -03:00
Eduardo Quezada	0f35f080ec	Gender icon in naming screen based on Pokémon name length	2022-09-24 23:48:24 -03:00
LOuroboros	8e9bfda120	Update field_specials.c	2022-09-24 22:22:18 -03:00
Eduardo Quezada D'Ottone	13573b6e53	Merge pull request #2356 from LOuroboros/PeeC ... Modified the debug menu's PC access	2022-09-24 22:18:21 -03:00
LOuroboros	00eb67608a	Small tweak to the new check in PCTurnOffEffect	2022-09-24 22:10:46 -03:00
LOuroboros	5500e64a71	Reworked the debug menu's PC access	2022-09-24 17:26:41 -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
Eduardo Quezada D'Ottone	0fa8e20d08	Style changes from upstream	2022-09-24 14:20:07 -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
Eduardo Quezada D'Ottone	bb564d805f	Merge pull request #2353 from LOuroboros/siTypes ... Fixed Z-Moves showing the wrong type in battle	2022-09-24 10:36:38 -03:00
LOuroboros	696d90880e	Made Z-Moves always show the right type	2022-09-24 09:33:31 -03:00
LOuroboros	64405250ae	Updated IsViableZMove	2022-09-24 08:50:48 -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
Eduardo Quezada	7e112b0f0d	Added missing uses of JOY_xx macros	2022-09-22 21:43:33 -03:00
GriffinR	1107ff954d	Clean up shop.c	2022-09-22 15:08:17 -04:00
GriffinR	b8341558c3	Merge pull request #1779 from GriffinRichards/sync-fld-weather ... Add misc constant usage to field_weather_effect	2022-09-22 12:13:07 -04:00
GriffinR	9bcc36fe08	Merge pull request #1767 from GriffinRichards/trainer-pals ... Generate trainer pic palettes from image	2022-09-22 11:34:03 -04:00
StubbornOne	cad8922d7b	Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI	2022-09-21 23:42:40 +08:00
LOuroboros	d04a852e91	Update debug.c	2022-09-20 02:31:20 -03:00
Eduardo Quezada D'Ottone	24aebf0624	Merge pull request #2337 from LOuroboros/patch-2 ... Renamed some misclassified labels in src/debug.c	2022-09-19 14:33:51 -03:00
Eduardo Quezada D'Ottone	6868d8aa2a	Merge pull request #2338 from LOuroboros/BoxMonMon ... Fixed typo in BoxMonKnowsMove	2022-09-19 14:33:12 -03:00
Eduardo Quezada	192312d7ee	Extrapolated Battle Arena's move Mind ratings	2022-09-19 14:29:22 -03:00
LOuroboros	5f67335212	Fixed typo in BoxMonKnowsMove	2022-09-19 05:21:54 -03:00
LOuroboros	c137b01dd8	Update debug.c	2022-09-19 04:19:19 -03:00
ghoulslash	add3625589	fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt	2022-09-18 22:47:30 -04:00
Eduardo Quezada	adb4e54e95	Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen	2022-09-18 22:34:06 -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	41ae8ecdb7	Update src/battle_controller_opponent.c	2022-09-18 00:51:34 -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
tustin2121	5c55e44173	More diagrams ... - Diagramed all subsprite tables in the code base. There's a LOT in the slot machine code.	2022-09-17 14:34:20 -04:00
tustin2121	c371a44a83	Formatting	2022-09-17 13:34:54 -04:00
tustin2121	13877f71dc	Minor documentation ... Some things I figured out while working on my hack. - The Subsprite tables do not use `DISPLAY_WIDTH`, but rather use -16, since they are signed bytes. The negative numbers better illustrate what the tables are doing. - Figured out the as-of-yet undocumented data in SpriteCB_FlygonSilhouette	2022-09-17 13:33:10 -04:00
Eduardo Quezada	8a68596b64	Removed free macro	2022-09-16 20:36:44 -03:00
Eduardo Quezada	e412ec30a0	Removed calloc macro	2022-09-16 20:34:22 -03:00
Eduardo Quezada	63156b4398	Removed malloc macro	2022-09-16 20:24:26 -03:00
Eduardo Quezada	b2b308fe9e	Fixed Old Rod Lure swap	2022-09-16 15:16:51 -03:00
Eduardo Quezada	b0bd5f9879	Cleaned up trailing spaces and spaces instead of tabs	2022-09-16 14:42:11 -03: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
ghoulslash	ed81ec41bc	Merge pull request #2324 from ghoulslash/be/aiswitch ... fix ai switch semi invulnerable	2022-09-15 23:15:02 -04:00