6077 Commits

Author	SHA1	Message	Date
ghoulslash	e93ad2e255	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble	2021-09-06 09:24:28 -04:00
LOuroboros	3113e4fa12	Moved stat recalculation to HandleEndTurn_FinishBattle	2021-09-06 07:40:35 -03:00
DizzyEggg	68c33895fd	Merge pull request #1622 from BuffelSaft/money-boost ... Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE	2021-09-06 11:32:53 +02:00
BuffelSaft	734e0aa74d	Add brackets ... Oops!	2021-09-06 20:56:02 +12:00
DizzyEggg	cdec3077b2	Merge pull request #1630 from BuffelSaft/disguise2 ... Fix many Disguise bugs	2021-09-06 10:32:37 +02:00
DizzyEggg	fa081d1fc5	Merge pull request #1618 from BuffelSaft/protect-like ... Fix protect-like moves	2021-09-06 10:24:29 +02:00
DizzyEggg	67fd379771	Merge pull request #1632 from BuffelSaft/hammer-arm ... Fix Hammer arm's effect chance	2021-09-06 10:16:47 +02:00
BuffelSaft	4c8a12006c	Fix Hammer Arm's effect chance	2021-09-06 19:45:30 +12:00
BuffelSaft	bdbb4b5f7e	Fix many Disguise bugs ... Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.	2021-09-06 18:27:42 +12:00
ghoulslash	a9cbaa5966	fix mental herb encore, heal block	2021-09-04 08:40:43 -04:00
ghoulslash	e475813799	revert mental herb desc	2021-09-04 08:18:38 -04:00
ghoulslash	d66f3910d9	Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb	2021-09-03 17:41:09 -04:00
ghoulslash	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	b362ce7f33	Merge pull request #1621 from BuffelSaft/move-data ... Correct Liquidation and Sparkling Aria move data	2021-09-03 13:02:33 -06:00
ghoulslash	79f39a1fd0	fix eject button	2021-09-03 14:56:36 -04:00
ghoulslash	5c5276b04d	red card fixes	2021-09-03 14:29:28 -04:00
ghoulslash	4e2948012f	poison type still absorbs toxic spikes with heavy duty boots	2021-09-03 13:18:33 -04:00
ghoulslash	c7a587913b	replace statStages checks with CompareStat	2021-09-03 13:13:02 -04:00
ghoulslash	93e2e09148	fix terrain seeds. create generic CompareStat function	2021-09-03 12:17:38 -04:00
ghoulslash	7f4accdae4	fix room service switching in effect	2021-09-03 11:16:16 -04:00
ghoulslash	6ce1227447	fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case	2021-09-03 11:05:11 -04:00
ghoulslash	7c53214dad	merge with be	2021-09-02 15:33:42 -04:00
ultima-soul	a10a02a536	Merge pull request #1221 from ghoulslash/battle_engine ... Implement Pickpocket	2021-09-02 11:33:34 -07:00
BuffelSaft	13636f8691	Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE ... moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.	2021-09-02 16:15:58 +12:00
BuffelSaft	7d251c39f7	Correct Liquidation and Sparkling Aria ... Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.	2021-09-02 16:05:36 +12:00
BuffelSaft	cdb28f038f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down	2021-09-02 11:36:55 +12:00
LOuroboros	46fb92c4da	Optimized checks	2021-09-01 17:40:12 -03:00
ghoulslash	39a254f80d	fix sprite pos changes	2021-09-01 07:45:41 -04:00
ghoulslash	dfe59992d3	merge with be	2021-09-01 07:37:45 -04:00
BuffelSaft	3371773e5c	Move touchedProtectLike to protect structs ... This makes more sense than putting it in DisableStruct.	2021-09-01 21:34:47 +12:00
BuffelSaft	eb0f0b7ce8	Fix Sucker Punch vs Protect moves ... Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.	2021-09-01 21:32:07 +12:00
BuffelSaft	ea6ce80ad4	Fix protect-like moves ... Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target. This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.	2021-09-01 19:57:03 +12:00
LOuroboros	9990bda7a4	Fixed if statement for stat recalculation ... Thanks to Syreldar.	2021-09-01 02:55:15 -03:00
LOuroboros	d2bcc2ad5b	Added configs for modern post-battle stat calcs	2021-09-01 00:31:50 -03:00
LOuroboros	d60545af7a	Fixed U-turn and Choice Items interaction	2021-08-31 23:49:23 -03:00
ghoulslash	88476e0ac2	remove 2nd case in CanThrowBall	2021-08-31 12:59:20 -04:00
ghoulslash	e4fb9c4593	fix throwing ball in wild doubles	2021-08-31 12:51:03 -04:00
LOuroboros	69b7910f47	Gave an entrance animation to Delta Stream	2021-08-31 00:15:17 -03:00
LOuroboros	97ce02464b	Removed small redundancy	2021-08-30 22:09:33 -03:00
LOuroboros	d0fd883ec7	Small comment tweak	2021-08-30 21:49:45 -03:00
LOuroboros	0a38054925	Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly	2021-08-30 21:21:07 -03:00
LOuroboros	e39dc493fc	A couple of improvements, courtesy of Syreldar ... -Optimized the checks for `WEATHER_RAIN_PRIMAL` and `WEATHER_SUN_PRIMAL` in `Cmd_attackcanceler`. -Moved the dmg calculation effect of `WEATHER_STRONG_WINDS` to the `CalcFinalDmg` function.	2021-08-30 20:55:48 -03:00
LOuroboros	c0c6821f62	Made AI_CheckBadMove take the primal weathers into account ... Credits to Syreldar. Also took the chance and removed trailing spaces from the file.	2021-08-30 20:55:43 -03:00
LOuroboros	216d8f0608	Solved game freezing issue ... My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.	2021-08-27 18:28:34 -03:00
LOuroboros	9e4f33d09e	Implemented Desolate Land, Primordial Sea and Delta Stream	2021-08-27 17:56:43 -03:00
ExpoSeed	a58641cd70	Merge pull request #1603 from LOuroboros/megaEvoString ... Tweaked sText_MegaEvoEvolved	2021-08-26 19:33:39 -05:00
ExpoSeed	1f75f6e201	Merge pull request #1605 from LOuroboros/canEvolve ... Corrected `CanEvolve` function	2021-08-26 19:32:22 -05:00
BuffelSaft	1d1546c7b2	Suggested changes	2021-08-26 19:00:43 +12:00
BuffelSaft	bc298d242f	Move mega indicator for lv 100 mons ... Indicator sprite overlaps the "100" without this.	2021-08-25 23:15:30 +12:00
BuffelSaft	bb89d03a1d	Fix Venoshock ... Damage should double if target is poisoned, not attacker.	2021-08-25 22:57:10 +12:00
LOuroboros	e42d329fc6	Small tweak	2021-08-25 02:16:38 -03:00
LOuroboros	d270892a6b	Corrected CanEvolve function	2021-08-25 01:56:25 -03:00
LOuroboros	2c35006627	Tweaked sText_MegaEvoEvolved	2021-08-24 18:33:56 -03:00
ultima-soul	b620349da0	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-16 15:43:27 -07:00
GriffinR	ee5eee6ccc	Merge pull request #1493 from GriffinRichards/doc-itemmenu2 ... Document item menu	2021-08-15 12:01:57 -04:00
ghoulslash	d344612346	fix last used ball window in wild doubles	2021-08-12 14:49:17 -06:00
ghoulslash	a2d885c0d4	merge with be	2021-08-12 14:48:58 -06:00
ghoulslash	0bbbd1e7a9	fix electric/misty yawn/rest interactions	2021-08-12 14:08:41 -06:00
ghoulslash	5e250853c6	misty terrain blocks toxic spikes	2021-08-12 13:45:50 -06:00
ghoulslash	f050168c55	misty terrain blocks toxic spikes	2021-08-12 13:41:18 -06:00
ghoulslash	c7c0fbc296	merge with be, make AI CanBeStatused functions separate from general util ones	2021-08-12 13:37:53 -06:00
ghoulslash	7b0e60c705	some tweaks	2021-08-12 12:44:53 -06:00
ghoulslash	e3d30602d9	record item effect with trick	2021-08-12 01:29:52 -04:00
ghoulslash	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
PikalaxALT	c7fc6ac893	Merge pull request #1492 from Kurausukun/cgbsound ... Fix CgbSound Fakematches (Thanks to Revo)	2021-08-11 19:55:44 -04:00
ultima-soul	02c9e040df	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
GriffinR	034b7f0513	Fix conflicting PC window names	2021-08-11 19:14:50 -04:00
GriffinR	80348e7188	Merge branch 'master' into doc-itemmenu2	2021-08-11 19:01:47 -04:00
GriffinR	cc51627465	Merge pull request #1489 from GriffinRichards/doc-playerpc ... Document player pc	2021-08-11 18:59:58 -04:00
GriffinR	0bc26d9d79	Merge pull request #1488 from GriffinRichards/doc-frontierpass2 ... Document frontier pass	2021-08-11 17:40:55 -04:00
GriffinR	d951d7c363	Use tag constants in region_map.c	2021-08-11 09:31:20 -04:00
GriffinR	28a8fe191a	Document item menu	2021-08-10 22:13:02 -04:00
Kurausukun	2e892c6961	unsigned int -> u32	2021-08-08 22:22:50 -04:00
Kurausukun	ddb3911d0d	oops	2021-08-08 20:49:29 -04:00
Kurausukun	0bceaab046	rename variable	2021-08-08 20:34:16 -04:00
Kurausukun	b51d025f1c	port cgb fakematching fixes (thanks to revo)	2021-08-08 20:33:21 -04:00
BuffelSaft	e1ca2af8b3	Update src/battle_util.c ... Fix copy/paste typo Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-08-08 00:52:27 +12:00
BuffelSaft	6c6363f7cf	Use form table in species check	2021-08-07 20:59:04 +12:00
BuffelSaft	f0cb6190e0	Implement Burmy form change ... Burmy changes form based on where it last battled.	2021-08-07 20:56:10 +12:00
BuffelSaft	1f3983cb05	Shields Down protects all meteor form Minior ... This was only working with red core minior.	2021-08-07 20:38:35 +12:00
GriffinR	bd5cf07059	Merge branch 'master' into doc-playerpc	2021-08-02 14:08:10 -04:00
GriffinR	06b909bcd8	Document player pc	2021-08-02 13:58:40 -04:00
GriffinR	3e60a78406	Merge branch 'master' into doc-frontierpass2	2021-07-31 13:30:40 -04:00
GriffinR	602855ea99	Document frontier pass	2021-07-31 13:28:08 -04:00
GriffinR	459b20d762	Merge pull request #1479 from PikalaxALT/flatten_sprite_pos ... Flatten pos fields in struct Sprite	2021-07-27 18:02:00 -04:00
ghoulslash	ab529b4e89	add stuff cheeks	2021-07-27 10:31:48 -06:00
LOuroboros	f1195e1884	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-07-27 09:08:52 -03:00
ghoulslash	4ca6d76160	add bug bite	2021-07-25 14:55:52 -06:00
ghoulslash	c914ed8572	fix sucker punch, surging strikes, obstruct, and snipe shot	2021-07-25 09:38:54 -06:00
ghoulslash	a37d4c3da9	merge with be, give life dew jungle healing effect	2021-07-25 08:22:05 -06:00
ghoulslash	fd61770c34	water bubble prevents burn	2021-07-25 07:53:44 -06:00
ghoulslash	eadd09bebd	block item use under embargo	2021-07-25 07:39:02 -06:00
sphericalice	71de6ea939	Use the correct constant for PSS page comparison	2021-07-24 18:54:37 +01:00
ghoulslash	e6a2d2226f	Merge pull request #1540 from DizzyEggg/rage_powder ... Rage powder updated to gen6	2021-07-24 07:15:58 -06:00
ghoulslash	07e3e73372	fix ITEM_NONE to 0 for compilation reasons	2021-07-18 11:20:51 -06:00
ghoulslash	d1bc7b5676	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-07-18 11:16:53 -06:00
ghoulslash	45d4cee243	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-07-18 11:11:03 -06:00
LOuroboros	29b1ba2a3c	Fixed calls to UndoFormChange in battle_script_commands.c	2021-07-18 12:34:17 -03:00
DizzyEggg	312583de5e	Merge pull request #1564 from BuffelSaft/form-capture ... Undo form changes on capture	2021-07-16 09:22:23 +02:00
DizzyEggg	304f3b9203	Merge pull request #1565 from BuffelSaft/disguise-fix ... Fix Disguise reverting on switch out	2021-07-16 09:17:10 +02:00
BuffelSaft	d2d7b6ffef	Remove Mimikyu check from loop ... More efficient than checking in each loop iteration.	2021-07-16 18:09:41 +12:00
BuffelSaft	90fdb74ccb	Remove UndoFormChangeOnSwitch ... Handle switching out Mimikyu Busted in UndoFormChange.	2021-07-16 17:56:53 +12:00
DizzyEggg	d6400448fd	Merge pull request #1563 from ghoulslash/battle_ai ... AI_IsTerrainAffected checks	2021-07-15 09:36:47 +02:00
ghoulslash	ebc187c16d	Merge pull request #1536 from DizzyEggg/gravity ... Fix Gravity's animation	2021-07-13 10:54:45 -06:00
GriffinR	a274cc6a76	Merge branch 'master' into flatten_sprite_pos	2021-07-12 01:39:28 -04:00
Collin Styles	eab1d7b5b1	Use the IS_TYPE_PHYSICAL macro in AddMovePoints	2021-07-11 22:02:24 -07:00
GriffinR	72bb2bd160	Merge pull request #1474 from GriffinRichards/clean-miragetower ... Clean up Mirage Tower	2021-07-10 23:26:41 -04:00
BuffelSaft	63faa6e3a9	Fix Disguise reverting on switch out ... Make Mimikyu's disguise stay busted when it's switched out.	2021-07-11 14:15:24 +12:00
BuffelSaft	8d432e4e34	Undo form changes on capture ... This will revert busted Mimikyu, Schooling Wishiwashi etc. to their base forms when caught.	2021-07-11 12:51:27 +12:00
ghoulslash	59c16ff1cf	AI_IsTerrainAffected checks	2021-07-10 16:41:41 -06:00
GriffinR	32fe412755	Merge pull request #1475 from GriffinRichards/doc-minor ... Label remaining symbols in a few files	2021-07-08 00:24:56 -04:00
GriffinR	fced9e507d	Merge pull request #1478 from Kurausukun/itemprint ... Change ItemPrintFunc to Use u32 Instead of s32	2021-07-08 00:15:45 -04:00
PikalaxALT	810ca5f8ff	Flatten pos fields in struct Sprite	2021-07-07 09:11:52 -04:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
ghoulslash	542f0accf5	fix updating last used ball when run out of item id	2021-07-04 10:09:57 -06:00
ghoulslash	d28ac33b0e	fix throw last used ball action turn order checks	2021-07-04 09:28:59 -06:00
Kurausukun	42730a8315	Revert "remove gflib" ... This reverts commit 8b59909ac5.	2021-07-03 17:39:33 -04:00
GriffinR	b4f66496ed	Merge pull request #1471 from GriffinRichards/fix-lock ... Fix some object lock names	2021-07-03 11:21:10 -04:00
SnorlaxMonster	43c5107e4d	Correct card lines in Battle Dome comments ... The comments regarding the lines that Trainer information is displayed on the Battle Dome Trainer Card were off-by-one.	2021-07-03 22:41:18 +10:00
GriffinR	c42b5d783a	Fix 'determining' typo	2021-07-02 03:26:50 -04:00
GriffinR	64d06f4c8f	Condense battle AI scripts, minor clean up	2021-07-02 02:46:01 -04:00
GriffinR	8f43d1ebeb	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
GriffinR	d73b3c05c6	Label remaining hall_of_fame symbols	2021-07-02 01:02:28 -04:00
GriffinR	fe89a4d147	Label remaining region_map symbols	2021-07-02 00:52:36 -04:00
GriffinR	10886a586b	Clean up mirage tower	2021-07-01 23:46:15 -04:00
GriffinR	3964820a84	Merge pull request #1473 from GriffinRichards/fix-div0 ... Fix divide by 0 in Cmd_getexp	2021-07-01 14:26:34 -04:00
GriffinR	93188ef0a8	Fix divide by 0 in Cmd_getexp	2021-07-01 00:18:52 -04:00
garakmon	d391c136d8	fix encounter slot logic to accomodate changes	2021-06-27 21:14:21 -04:00
ghoulslash	c06029bc72	add last used ball	2021-06-25 13:37:59 -06:00
GriffinR	6d92b466e7	Add missing use of F_TRAINER_FEMALE	2021-06-25 11:50:09 -04:00
PikalaxALT	e0b58592b2	Merge pull request #1469 from GriffinRichards/fix-contesthearts ... Clarify contest heart tiles	2021-06-21 13:59:50 -04:00
GriffinR	810b51f96c	Clarify contest heart tiles	2021-06-21 13:48:03 -04:00
StubbornOne	2d41f08312	Add Telepathy's damage prevention effect	2021-06-21 14:18:33 +08:00
DizzyEggg	800e2395c0	Merge pull request #1542 from BuffelSaft/thaw_moves_2 ... Fix Thawing Moves, Add FLAG_THAW_USER	2021-06-19 13:47:51 +02:00
ultima-soul	9407a1ac76	Replace hardcoded number in MakeCaptureStars.	2021-06-18 19:20:05 -07:00
BuffelSaft	4c18cb7fe7	Remove EFFECT_THAW_HIT	2021-06-19 11:49:00 +12:00
BuffelSaft	06111bdc63	Replace EFFECT_THAW_HIT ... Both moves that used EFFECT_THAW_HIT now use EFFECT_BURN_HIT.	2021-06-19 11:43:29 +12:00
BuffelSaft	87279ecab9	Fix CANCELLER_FROZEN ... Now checks if current move will thaw user before trying to defrost it.	2021-06-19 11:31:46 +12:00
Kurausukun	10c80230c4	change printItemFunc to use u32 instead of s32 ... also change a use of -2 to LIST_CANCEL	2021-06-18 00:15:45 -04:00
Kurausukun	8b59909ac5	remove gflib	2021-06-17 22:09:48 -04:00
Sewef	fd55a0d015	Update src/battle_message.c ... Nothing happened. Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-06-17 14:12:06 +02:00
Sewef	d02be421bc	Fix sATypeMove_Table definition	2021-06-17 14:06:40 +02:00
ExpoSeed	b6b0062bd6	Change map header flags to use a bitfield	2021-06-13 17:02:06 -05:00
MissingNoL	721dbe9178	Implemented all PLG effects	2021-06-12 18:01:35 -07:00
MissingNoL	610b18bfdb	Implemented Double Iron Bash's effect	2021-06-12 14:27:50 -07:00
MissingNoL	beb126b534	Implemented Zippy Zap's effect	2021-06-12 13:58:54 -07:00
ghoulslash	70fd98a009	Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2 ... Fix Imposter looplock	2021-06-10 11:59:29 -06:00
ghoulslash	de21636f97	Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1 ... Fix mon shadow when caught and learn new move	2021-06-10 11:59:10 -06:00
ExpoSeed	3ed06c2cc2	Remove remaining grey and replace with gray	2021-06-10 11:36:10 -05:00
BuffelSaft	e6a8faec1e	Fix thawing moves ... Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.	2021-06-10 23:48:18 +12:00
DizzyEggg	179ac9c1e1	Fix Imposter looplock	2021-06-10 13:45:24 +02:00
DizzyEggg	f27dcab784	Rage powder has powder moves qualities when forcing a target	2021-06-10 12:55:05 +02:00
DizzyEggg	c6f3b7f571	Merge pull request #1532 from LOuroboros/emergency_exit ... Fixed Emergency Exit	2021-06-10 10:41:07 +02:00
DizzyEggg	1e855cf469	Fix mon shadow when caught and learn new move ... Fixes #1477	2021-06-09 09:49:42 +02:00
DizzyEggg	540719c483	Add support for only one enemy pokemon in double battles start	2021-06-08 22:50:37 +02:00
ultima-soul	1ff3718d1f	Merge pull request #1446 from LOuroboros/inner_focus ... Tweaked Inner Focus	2021-06-08 13:18:35 -07:00
LOuroboros	d849c31ee8	Followed Ghoulslash's suggestion	2021-06-08 11:56:03 -03:00
ghoulslash	a683c698fb	Merge pull request #1524 from Jaizu/patch-13 ... Change the ability popup sound	2021-06-08 08:41:41 -06:00
DizzyEggg	4b29ae39ad	Allow one mon double battles	2021-06-08 16:40:47 +02:00
DizzyEggg	e2f14d43db	Fix Gravity's animation	2021-06-08 12:13:40 +02:00
LOuroboros	2c1237365b	Fixed Emergency Exit ... The ability was getting triggered even if the user was the only Pokémon alive in the party.	2021-06-07 22:39:53 -03:00
LOuroboros	588b3638d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus	2021-06-07 19:22:20 -03:00
LOuroboros	8726107d42	Removed BattleScript_FlinchPrevention ... Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.	2021-06-07 19:18:15 -03:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00
MissingNoL	caf2548830	Included battle_util.h, fixed parameter IsMoveMakingContact	2021-06-06 21:40:38 -07:00
MissingNoL	bfc66a21cc	gBattlescriptCurrInstr[3] is not reading species parameter	2021-06-06 19:14:11 -07:00
ultima-soul	2563bc5c83	Merge pull request #1521 from DizzyEggg/largeexp ... Allow larger exp gains	2021-06-06 13:33:33 -07:00
Jaizu	3ae783aa16	Change the ability popup sound	2021-06-06 22:19:17 +02:00
MissingNoL	9cd522d254	Merge branch 'battle_engine' into Photon_Geyser	2021-06-05 16:46:28 -07:00
MissingNoL	d69cfcff70	Update battle_script_commands.c ... Included src/battle_util.c to call IsMoveMakingContact	2021-06-05 16:43:19 -07:00
MissingNoL	517763bc9f	Update src/battle_util.c ... Changed an `if` to `else if` Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-06-05 16:38:37 -07:00
MissingNoL	e48e9c1d7a	Merge branch 'battle_engine' into Hyperspace_Fury	2021-06-05 14:42:30 -07:00
MissingNoL	c4b700a8e7	Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc.	2021-06-05 13:47:05 -07:00
ultima-soul	3448e19275	Merge pull request #1459 from ExpoSeed/BE/rename-flags ... Rename flags	2021-06-04 19:33:45 -07:00
AJ Fontaine	2fe7184d10	Rename sText_WildPkmnAppeared2 to reflect its use ... sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.	2021-06-04 22:32:33 -04:00
ExpoSeed	12a155bd9a	FLAG_DMG_2X_IN_AIR can now hit targets	2021-06-04 21:28:28 -05:00
ExpoSeed	aefd5e26d1	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-06-04 21:26:15 -05:00
ExpoSeed	8810809849	Missed one rename!	2021-06-04 19:39:03 -05:00
ExpoSeed	ec2c140ecb	Disambiguate Thousand Arrows flag from other flags	2021-06-04 19:34:37 -05:00
ExpoSeed	15914d7af8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags	2021-06-04 19:00:29 -05:00
ultima-soul	6edec5bc3d	Merge pull request #1437 from LOuroboros/oblivious ... Tweaked Oblivious	2021-06-04 16:51:38 -07:00
LOuroboros	b552db7193	Tweaked the Oblivious immunities ... Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.	2021-06-04 19:23:07 -03:00
DizzyEggg	4b744374c8	Allow larger exp gains	2021-06-03 23:17:44 +02:00
ultima-soul	2813b4f9bf	Merge pull request #1519 from DizzyEggg/flameburst ... Fix FlameBurst	2021-06-03 09:30:50 -07:00
ultima-soul	e5a3123b8c	Merge pull request #1505 from MissingNoL/Decaps-and-Miracle-Eye-Text-Fixes ... Decaps and Miracle Eye text fixes	2021-06-03 09:06:15 -07:00
ultima-soul	9584b8539f	Merge pull request #1492 from LOuroboros/battle_debug ... Tweaked src/battle_debug.c to comply with the PE	2021-06-03 09:01:37 -07:00
LOuroboros	b67e82c7c1	Syntax change #2 ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-06-03 05:17:52 -03:00
LOuroboros	cb4f16a178	Syntax change #1 ... Though I don't like it, personally. Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-06-03 05:17:41 -03:00
MissingNoL	1022d34218	Update src/data/text/move_descriptions.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-06-03 01:16:03 -07:00
LOuroboros	b215b44951	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales	2021-06-03 05:09:14 -03:00
DizzyEggg	85ff866998	Fix FlameBurst	2021-06-03 09:50:43 +02:00
ultima-soul	72f23ff7ba	Merge pull request #1507 from ghoulslash/flower_gift ... Add Sunny Check to Flower Gift Ally Boosts	2021-06-02 23:35:59 -07:00
ultima-soul	bb9a7b04f8	Merge pull request #1499 from LOuroboros/patch-1 ... Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT	2021-06-02 23:07:50 -07:00
ultima-soul	c01247237d	Merge pull request #1498 from AsparagusEduardo/fix_BE_X_items ... Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7	2021-06-02 23:05:33 -07:00
LOuroboros	37875a7850	Commented out call to inexistent IsZMove func	2021-06-02 18:02:04 -03:00
LOuroboros	bf679fc99e	Tweaked Task_ShowAiKnowledge too	2021-06-02 17:42:55 -03:00
LOuroboros	e65f8dfd0e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_debug	2021-06-02 17:40:17 -03:00
LOuroboros	586c76d93a	Changed Clanging Scales' secondaryEffectChance to 0 ... Review request.	2021-06-02 16:46:28 -03:00
BuffelSaft	2a6b989c92	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press	2021-06-02 12:41:28 +12:00
LOuroboros	d48a6e00d4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious	2021-06-01 18:15:01 -03:00
Kurausukun	5c6b8ea8d6	re-add const to gEvolutionTable in daycare.c	2021-06-01 17:14:45 -04:00
Kurausukun	9f5bf65fb3	[PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make ... consistent use of SOME_VRAM_STORE	2021-05-31 18:12:35 -05:00
Kurausukun	2bbaf71998	[LEAK-INFORMED] fix CreateShedinja fakematch ... info: the header change is required. accesses to the struct need to be treated as non-const, even though the array must be const. thanks to jiang for figuring this out.	2021-05-31 08:20:46 -05:00
Kurausukun	2705f2e5f4	[LEAK-INFORMED] also pretty dumb	2021-05-31 08:20:46 -05:00
Kurausukun	42021db743	[LEAK-INFORMED] literal dumbest fakematch ever	2021-05-31 08:20:46 -05:00
amiosi	b588e94395	more requested changes	2021-05-28 15:05:33 -04:00
MissingNoL	0f09055cfe	Fixes and added Poison chance to Shell Side Arm (needs contact on physical)	2021-05-28 11:11:03 -07:00
MissingNoL	f30a9542ee	Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm	2021-05-27 22:21:55 -07:00
amiosi	7b530a34bf	finish requested changes	2021-05-27 20:14:46 -04:00
amiosi	03a7020512	double oops	2021-05-27 16:16:12 -04:00
amiosi	36c977d9eb	oopsie	2021-05-27 16:01:34 -04:00
amiosi	f7651fd592	most fixes from requested changes	2021-05-27 15:55:19 -04:00
amiosi	fc81994579	Merge branch 'battle_engine' into old_findings	2021-05-27 15:28:02 -04:00
gAlfonso-bit	c9c5586068	Fixed ChangeBgY_ScreenOff‘s signature. (#1447) ... * Fix Functions * Fix ChangeBgY_ScreenOff signature * Remove unneeded changes * Fix argument mismatch Just to get this out of the way * Not needed * Update palette.c	2021-05-27 07:32:09 -05:00
Kurausukun	5d5327c0b7	better match	2021-05-25 04:32:47 -04:00
Kurausukun	5ae5cf110d	[LEAK-INFORMED] fix fakematch in DrawWallpaper	2021-05-25 04:03:11 -04:00
ghoulslash	5840b1f0ed	utility umbrella effect	2021-05-24 09:52:45 -06:00
MissingNoL	031504cd12	Spaces instead of tabs	2021-05-23 18:31:49 -07:00
MissingNoL	07a9674d22	Fixed	2021-05-23 18:30:22 -07:00
MissingNoL	0d47269798	Spaces instead of tabs	2021-05-23 18:11:53 -07:00
MissingNoL	c428d1bdbb	Coded Hyperspace Fury	2021-05-23 17:59:14 -07:00
ghoulslash	c91240068c	add sun check to flower gift ally boosts	2021-05-23 14:45:21 -06:00
Eduardo Quezada D'Ottone	6afe2ec74e	Fixed compile error & updated names and value to correspond to the change.	2021-05-23 15:28:29 -04:00
ghoulslash	c3e28e9b1a	merge with be	2021-05-23 12:22:52 -06:00
ghoulslash	54b03a474d	fix SIDE_STATUS_SCREEN_ANY	2021-05-23 12:22:07 -06:00
gAlfonso-bit	ff16812f99	UBFix: uninitialized variables in m4a engine and siirtc.c (#1432)	2021-05-23 09:56:37 -05:00
gAlfonso-bit	ffbbc88801	BUGFIX: battle scripts (#1436)	2021-05-23 09:35:03 -05:00
MissingNoL	dd9920e80b	Update move_descriptions.h	2021-05-23 02:41:41 -07:00
MissingNoL	8b6906bf32	Update abilities.h	2021-05-23 02:39:57 -07:00
LOuroboros	5ef106f061	Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT	2021-05-22 10:29:57 -03:00
Eduardo Quezada D'Ottone	04c6331a60	Merge pull request #1432 from BuffelSaft/thousand_arrows ... Fix Thousand Arrows	2021-05-21 11:40:13 -04:00
Eduardo Quezada D'Ottone	d1d95df409	Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7	2021-05-21 11:29:13 -04:00
LOuroboros	83a1351e82	Tweaked Task_ShowAiPoints to comply with the PE ... Due to the removal of the Deoxys hack, this function needed some minor adjustments that could have always been handled by using the #ifdef preproc directive.	2021-05-17 18:33:12 -03:00
Eduardo Quezada D'Ottone	76b99e66dc	Added missing Treecko from animation list.	2021-05-16 20:46:58 -04:00
ExpoSeed	a7e3da2301	pyramidWinStreas	2021-05-15 15:59:54 -05:00
ExpoSeed	361fa594b3	Various BUGFIXes and UBFIXes	2021-05-15 15:56:17 -05:00
gAlfonso-bit	ab8318cc79	Fix UB: Destoyed task is modified. ... After destruction, task is no longer used, so updating its values is worthless.	2021-05-15 14:35:32 -05:00
Kurausukun	3a403dc520	[LEAK-INFORMED] fix do {} while (0) in apprentice	2021-05-13 11:29:46 -05:00
Kurausukun	e737f1f924	fix main_menu goto	2021-05-13 11:29:11 -05:00
Kurausukun	2cc38acb84	fix item.c gotos	2021-05-13 11:29:11 -05:00
Kurausukun	3b7f708eb0	fix player_pc goto	2021-05-13 11:29:11 -05:00
Kurausukun	0c7773ad75	fix mystery_gift gotos	2021-05-13 11:29:11 -05:00
Kurausukun	f0453871a2	fix battle_dome goto	2021-05-13 11:29:11 -05:00
Kurausukun	dbc1b9aacf	fix goto in bike.c	2021-05-13 11:29:11 -05:00
Kurausukun	7740ca1303	replace raw values with char constants	2021-05-13 11:26:15 -05:00
Kurausukun	fa23b196a9	[LEAK-INFORMED] fix battle_interface fakematch	2021-05-13 11:26:15 -05:00
gAlfonso-bit	9a195c0fef	Cherry-pick roamer bug fix from pokefirered ... Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald	2021-05-13 11:23:42 -05:00
gAlfonso-bit	3e15a3ef8f	Update IsPokemonCryPlaying	2021-05-13 11:23:11 -05:00
ExpoSeed	43854664b5	Fix UB in RotatingGate_RotateInDirection	2021-05-11 10:12:01 -05:00
LOuroboros	95d41524a2	Implemented Clanging Scales' effect	2021-05-09 18:20:03 -03:00
Flametix	a8fab62c89	Fix Substitute typo	2021-05-06 20:49:04 -04:00
ultima-soul	e864c39a5d	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-05-04 10:04:35 -07:00
ghoulslash	fd3605b023	Merge pull request #1443 from AmbientDinosaur/patch-1 ... Keen Eye evasion ignoring effect from Gen 6	2021-05-04 09:49:56 -06:00
ghoulslash	6b7a7ca260	Merge pull request #1406 from ghoulslash/be_bugfix ... Fix data corruption from HideMegaTriggerSprite	2021-05-04 09:45:03 -06:00
ghoulslash	1ccf43b5f7	Merge pull request #1451 from LOuroboros/stench ... Implemented Stench's battle effect	2021-05-04 09:41:13 -06:00
ghoulslash	a3e6fe1ef4	Merge pull request #1442 from LOuroboros/patch-1 ... Fixed Punk Rock	2021-05-04 09:37:54 -06:00
ghoulslash	984f49747f	Merge pull request #1454 from LOuroboros/HandleAction_UseMove ... Minor syntax tweaks to HandleAction_UseMove	2021-05-04 09:37:10 -06:00
ghoulslash	97ae2fe1be	Merge pull request #1460 from AmbientDinosaur/patch-2 ... Corrected the move data for Gen 4 Overheat	2021-05-04 09:36:36 -06:00
ghoulslash	d73efc45e4	Merge pull request #1462 from AmbientDinosaur/patch-3 ... Remove superfluous define of LEVEL_UP_END	2021-05-04 09:33:23 -06:00
ghoulslash	e803b42827	Merge pull request #1467 from LOuroboros/gravity_acc ... Added Gravity's missing acc boost	2021-05-04 09:32:58 -06:00
ghoulslash	afea2cf5fa	Merge pull request #1482 from BuffelSaft/room_moves_text ... Fix Wonder Room, Magic Room battle messages	2021-05-04 09:32:37 -06:00
ghoulslash	22fc9733e5	Merge pull request #1480 from BuffelSaft/big_root_fix ... Make Big Root affect absorb moves	2021-05-04 09:32:18 -06:00
ghoulslash	e343090a8b	Merge pull request #1479 from BuffelSaft/orb_fix ... Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't	2021-05-04 09:31:58 -06:00
BuffelSaft	ec4012e95d	Fix "Room" move battle messages ... Move new line so these messages fit in the text box.	2021-05-04 23:57:43 +12:00
BuffelSaft	5d177f0a15	Make Big Root affect absorb moves ... Big Root should increase the HP recovered by Absorb, Giga Drain etc.	2021-05-04 23:20:22 +12:00
BuffelSaft	542201dd4f	Add missing ability checks to orbs ... Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.	2021-05-04 23:08:48 +12:00
BuffelSaft	e8598076a8	Fix Toxic and Flame Orb ... Shouldn't inflict status conditions on a fainted mon.	2021-05-04 22:55:19 +12:00
GriffinR	4206359862	Fix some object lock names	2021-05-04 01:21:50 -04:00
LOuroboros	5489ab97e4	MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK	2021-05-01 07:37:23 -03:00
Kurausukun	608c829acd	change usages of float/double to f32/f64	2021-05-01 01:41:27 -04:00
GriffinR	2608018862	Use some missing fieldmap constants in trainer hill	2021-04-29 16:12:50 -04:00
ultima-soul	56fc420187	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-28 21:34:30 -07:00
GriffinR	f7a699c686	Merge pull request #1421 from GriffinRichards/doc-tvrecordmix ... Document TV	2021-04-29 00:25:01 -04:00
LOuroboros	3dbb096393	Added Gravity's missing acc boost	2021-04-28 23:31:58 -03:00
GriffinR	6c38837b26	Merge pull request #1420 from GriffinRichards/doc-dataanims ... Document battler affine anims, default pokeball throw	2021-04-28 13:56:42 -04:00
GriffinR	58cef0ae52	Merge pull request #1418 from GriffinRichards/sync-ereaderhelp ... Sync e-reader helpers, document trainer hill e-reader	2021-04-28 06:08:57 -04:00
ultima-soul	14a0303e2f	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-27 18:36:37 -07:00
GriffinR	c6300b5325	Merge pull request #1417 from GriffinRichards/doc-pyramidbag ... Document Battle Pyramid Bag	2021-04-27 14:48:09 -04:00
GriffinR	18f85b5cf0	Merge pull request #1415 from GriffinRichards/doc-contestutil ... Some Contest clean up	2021-04-27 02:29:41 -04:00
GriffinR	265b49c47b	Label missing sprite anims	2021-04-26 14:41:15 -04:00
GriffinR	d74017d256	Merge pull request #1419 from GriffinRichards/doc-animstatus ... Label more unused battle anims	2021-04-26 13:32:15 -04:00
GriffinR	c0aedf8df4	Merge pull request #1410 from GriffinRichards/doc-tradedata ... Document trade sequence animation, some trade cleanup	2021-04-26 13:26:12 -04:00
GriffinR	aad090e154	Document TV	2021-04-26 12:35:35 -04:00
GriffinR	e40f89b175	Move unknown data table, reference with species	2021-04-25 02:19:01 -04:00
GriffinR	bee60f4c64	Document battler sprite affine anims, default pokeball throw	2021-04-25 02:18:34 -04:00
GriffinR	e065c0c285	Label more unused battle anims	2021-04-24 18:26:25 -04:00
GriffinR	86475c5ded	Document trainer hill ereader	2021-04-24 18:04:27 -04:00
GriffinR	004c37bf02	Sync ereader_helpers with pokefirered	2021-04-24 18:03:06 -04:00
GriffinR	8c820878bf	Document Battle Pyramid Bag	2021-04-23 15:07:36 -04:00
GriffinR	f823cd224f	Merge pull request #1416 from ProjectRevoTPP/apprentice_fix ... [LEAK INFORMED] Fix apprentice.c do{}while(0)	2021-04-22 17:25:52 -04:00
ProjectRevoTPP	6ebd0ccb57	add NO_COND macro	2021-04-22 17:20:28 -04:00
ProjectRevoTPP	5c51a3ecc6	get rid of apprentice fakematching(s)	2021-04-22 16:40:46 -04:00
GriffinR	bc9fc38254	Misc contest cleanup	2021-04-22 15:51:04 -04:00
GriffinR	e874dfcbc8	Merge pull request #1408 from GriffinRichards/doc-pokemonstorage ... Document Pokémon Storage System	2021-04-22 01:32:16 -04:00
ProjectRevoTPP	ddc1534098	idiot, get rid of code in block	2021-04-21 21:38:42 -04:00
ProjectRevoTPP	00eeb727db	fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy	2021-04-21 21:37:12 -04:00
GriffinR	dbe24f0baa	Clean up contest_painting	2021-04-21 20:04:12 -04:00
ProjectRevoTPP	57948b86a8	Eliminate the last fakematching. We are free of nonmatchings/fakematchings!	2021-04-20 21:31:39 -04:00
GriffinR	a2a9f22612	Clean up contest_util	2021-04-20 21:16:47 -04:00
ProjectRevoTPP	21f05a3c01	Resolve sio32intr_clock_slave fakematching. One left!	2021-04-20 12:58:50 -04:00
GriffinR	04af378904	Document trade sequence animation, some trade cleanup	2021-04-20 05:50:39 -04:00
Kurausukun	d542baf14b	THE BEAST IS SLAIN	2021-04-19 23:44:24 -04:00
GriffinR	342ebbf406	Merge branch 'master' into doc-pokemonstorage	2021-04-18 01:49:09 -04:00
GriffinR	52495e889f	Doc storage - cleanup	2021-04-18 01:44:25 -04:00
GriffinR	6f967ff6ad	Doc storage - standardize names, drop PSS	2021-04-17 23:40:27 -04:00
GriffinR	33c68255de	Doc storage - unk utility	2021-04-17 23:31:29 -04:00
GriffinR	7bf89d6446	Doc storage - icon scroll	2021-04-17 23:00:08 -04:00
GriffinR	c921994ce1	Doc storage - tilemap util, place change	2021-04-17 19:02:30 -04:00
GriffinR	1c3e387d43	Doc storage - party menu	2021-04-17 14:33:00 -04:00
GriffinR	cd2a99b7c4	Doc storage - misc cleanup, some item/cursor	2021-04-17 13:33:29 -04:00
GriffinR	96dabc1a7f	Doc storage - multi move	2021-04-16 22:36:37 -04:00
GriffinR	80cc7d46ae	Doc storage - fix row/column flip	2021-04-16 15:07:10 -04:00
GriffinR	e5f0d2f736	Doc storage - releasing, some cursor	2021-04-16 04:30:09 -04:00
GriffinR	c1da6b29bc	Merge pull request #1405 from GriffinRichards/constants-display ... Add more usage of DISPLAY constants, misc REG constants	2021-04-16 01:30:03 -04:00
Kurausukun	3e804cb7d1	document decoding buffer	2021-04-16 00:58:54 -04:00
GriffinR	84e1cbaaa6	Doc storage - misc gfx, item icons	2021-04-15 22:07:12 -04:00
GriffinR	838a452363	Doc storage - choose box menu, move wallpaper gfx	2021-04-15 18:46:20 -04:00
GriffinR	a1ed59450e	Doc storage - wallpaper and titles	2021-04-15 16:09:41 -04:00
GriffinR	30fecca109	Doc storage - menu texts	2021-04-15 13:31:18 -04:00
GriffinR	f94540c2b8	Misc reg constant cleanup	2021-04-15 03:14:42 -04:00
GriffinR	8368b753df	More usage of WININ/OUT constants	2021-04-15 02:43:09 -04:00
GriffinR	62abcecc54	More usage of DISPLAY constants	2021-04-15 02:22:24 -04:00
GriffinR	c4ef45c161	Merge pull request #1403 from GriffinRichards/doc-pokeblock ... Document Pokéblock menu and feeding scene	2021-04-14 14:17:36 -04:00
GriffinR	be84499b56	Drop static function argument names	2021-04-14 12:24:09 -04:00
GriffinR	98ab546d3a	Label misc unused move anims	2021-04-13 04:04:09 -04:00
GriffinR	7645be27eb	Label unused move anims in anim_effects_3	2021-04-13 03:28:03 -04:00
GriffinR	f9f33b643e	Label unused move anims in anim_effects_2	2021-04-13 03:17:39 -04:00
GriffinR	56057d3c32	Label more unused battle anims	2021-04-13 02:50:37 -04:00
GriffinR	82f870091e	Merge pull request #1400 from GriffinRichards/doc-pokemonanim ... Document Pokémon animation	2021-04-13 01:36:15 -04:00
GriffinR	042a2ecc41	Document pokeblock feed scene	2021-04-12 18:44:37 -04:00
Marcus Huderle	e92d2005c4	Use designated initializers for gTypeNames	2021-04-12 17:41:16 -05:00
GriffinR	c786a9b20c	Document pokeblock menu	2021-04-11 18:10:05 -04:00
GriffinR	2166e337a1	Label unused move anims	2021-04-11 13:21:22 -04:00
AmbientDinosaur	232acab1a2	Remove superfluous define of LEVEL_UP_END ... LEVEL_UP_END is already defined in constants/pokemon.h	2021-04-10 22:55:07 +02:00
GriffinR	09a9efd5c5	Merge pull request #1398 from GriffinRichards/doc-field ... Document field	2021-04-10 13:05:51 -04:00
GriffinR	f6016838b1	Merge pull request #1397 from GriffinRichards/doc-moremisc ... Clean up battle scripts	2021-04-10 12:41:35 -04:00
GriffinR	fb24336e8f	Pokemon animation misc cleanup	2021-04-10 01:36:06 -04:00
GriffinR	72ba8cf58d	Document pokemon animation types	2021-04-10 00:50:28 -04:00
Kurausukun	3e725272fc	standardize "grey" to "gray"	2021-04-09 22:39:34 -04:00
AmbientDinosaur	ad19b262eb	Corrected the move data for Gen 4 Overheat ... The contact flag was removed in Gen 4, and the base power was lowered in Gen 6. Currently, the changes are flipped around.	2021-04-08 03:21:51 +02:00
ExpoSeed	e11fd352fa	Merge pull request #1364 from ghoulslash/two-turn ... Fix Two-Turn Moves Failing Innapropriately	2021-04-07 16:12:13 -05:00
ExpoSeed	8494306d1d	Rename flags	2021-04-07 16:07:30 -05:00
ExpoSeed	45405e95b0	Merge pull request #1418 from BuffelSaft/rage_powder_fix_1 ... Fix powder immunity for self-targeting moves	2021-04-07 16:06:57 -05:00
ExpoSeed	8a49d66622	Revert "Made Thousand Arrows bypass type immunity"	2021-04-07 15:03:11 -05:00
ExpoSeed	f8d3029537	Merge pull request #1453 from LOuroboros/thousand_arrows ... Made Thousand Arrows bypass type immunity	2021-04-07 14:58:48 -05:00
GriffinR	c95e89e083	Remove old variables	2021-04-07 13:32:08 -04:00
GriffinR	356e63db03	Clean up fieldmap, port frlg macros	2021-04-07 13:26:02 -04:00
GriffinR	d717a635c8	event_object_movement cleanup	2021-04-06 17:55:29 -04:00
GriffinR	0dc7ff8994	Minor misc field doc	2021-04-06 17:17:41 -04:00
GriffinR	7d2a94282a	Label horizontal fog data	2021-04-06 17:05:38 -04:00
GriffinR	4a1cfbead2	Document remaining overworld	2021-04-06 16:55:43 -04:00
GriffinR	86a9d94ce1	Document fieldmap	2021-04-06 16:05:43 -04:00
GriffinR	8bad478b49	Document disguise field effects	2021-04-06 14:51:39 -04:00
GriffinR	756fad0e61	Document some event object movement	2021-04-06 14:34:36 -04:00
GriffinR	802d2b2f0f	Label Kyogre/Groudon anims	2021-04-06 03:46:19 -04:00
GriffinR	00c3044c96	Clarify Groudon/Kyogre/Rayquaza gfx names	2021-04-06 02:38:15 -04:00
GriffinR	806abe2999	Document some objev anims, make objevgfx info static	2021-04-05 19:52:35 -04:00
GriffinR	553fe6239a	Document more field effects	2021-04-05 18:21:17 -04:00
GriffinR	f90026826a	Document some weather, field effects	2021-04-04 17:52:07 -04:00
ExpoSeed	2bbab03eba	Merge pull request #1430 from LOuroboros/decap_battle_types ... Decapped the in battle type strings	2021-04-04 15:11:13 -05:00
ExpoSeed	df900ca310	Merge pull request #1419 from LOuroboros/mega_bracelet ... Added a check for the Mega Bracelet in CanMegaEvolve	2021-04-04 15:06:40 -05:00
Eduardo Quezada D'Ottone	2034d6eb32	Merge pull request #1424 from ghoulslash/popup ... Ability Pop Up Apostrophes	2021-04-04 15:32:32 -04:00
Eduardo Quezada D'Ottone	8bc91f9d23	Merge pull request #1435 from LOuroboros/defeatist ... Fixed Defeatist's check	2021-04-04 13:59:34 -04:00
LOuroboros	63edb34fe2	Minor syntax tweaks to HandleAction_UseMove	2021-04-04 08:47:38 -03:00
LOuroboros	228f711bf6	Made Thousand Arrows bypass type immunity	2021-04-04 07:38:38 -03:00
GriffinR	5fa20534f9	Label remaining fields in Weather struct	2021-04-04 00:52:17 -04:00
GriffinR	b926fa6b07	Document thunderstorm	2021-04-04 00:44:20 -04:00
GriffinR	1494a83035	Sync drought with pokefirered, add weather tags	2021-04-03 22:47:58 -04:00
LOuroboros	9f83c9b574	Implemented Stench's battle effect ... And updated its description.	2021-04-03 23:47:10 -03:00
GriffinR	fe1b757af5	Some constant use in WallyHandleActions	2021-04-03 16:37:00 -04:00
GriffinR	b6711441f5	Fix AI Guard Spec use, and Specs->Spec	2021-04-03 15:18:17 -04:00
GriffinR	f4d8a91ba4	Misc battle script cleanup	2021-04-03 14:07:31 -04:00
GriffinR	9ea9ffde09	Add remaining multistring chooser constants	2021-04-03 11:49:06 -04:00
LOuroboros	4d773ef40c	Removed the BattleScript from Inner Focus ... Any questions shall be directed to Mr. Junichi Masuda.	2021-04-03 00:17:30 -03:00
ultima-soul	939608f5b8	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-02 13:16:40 -07:00
AmbientDinosaur	d310edda4b	Keen Eye evasion ignoring effect from Gen 6	2021-04-02 19:25:07 +02:00
GriffinR	c9d3b26ff7	Label miss string indexes	2021-04-02 02:12:46 -04:00
GriffinR	8be2c5d60b	Document Contest Lady TV Show	2021-04-02 01:49:38 -04:00
LOuroboros	5106867116	Update battle_util.c	2021-04-02 04:10:20 +00:00
GriffinR	a0b3d4df12	Merge pull request #1390 from GriffinRichards/doc-introcred ... Document intro and credits sequences	2021-04-01 23:13:59 -04:00
GriffinR	51970f97b0	Merge pull request #1393 from GriffinRichards/doc-dewfordtrend ... Document Dewford Trend and match_call.c	2021-04-01 22:19:48 -04:00
GriffinR	1ff6aaf57d	Add constant use for match call text ids	2021-04-01 04:21:26 -04:00
GriffinR	f58465a274	Document match_call.c	2021-04-01 03:29:15 -04:00
BuffelSaft	20a7dec070	Fix Thousand Arrows vs. Flying Type ... Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.	2021-04-01 17:23:47 +13:00
LOuroboros	ed74430d26	Added a variation of BattleScript_NotAffected ... This one triggers the Ability PopUp.	2021-03-31 23:33:51 -03:00
LOuroboros	da24b9c251	Tweaked Oblivious ... -Made it unaffected by a foe's taunt. -Changed the Battle Script it calls when a foe tries to infatuate.	2021-03-31 21:20:00 -03:00
LOuroboros	60b566f8b6	Fixed Defeatist's check	2021-03-31 20:17:05 -03:00
GriffinR	69a6a97468	Remove incorrect comment	2021-03-31 17:29:09 -04:00
GriffinR	5ba858d19c	Label missing easy chat symbols	2021-03-31 16:56:10 -04:00
GriffinR	771a434730	Label Trend Watcher TV show texts	2021-03-31 16:29:42 -04:00
GriffinR	86856098a3	Document Dewford Trend	2021-03-31 16:08:42 -04:00
BuffelSaft	35add44a90	Thousand Arrows hits airborne targets ... Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc. Also fixed its effect chance, which was 0 instead of 100.	2021-03-31 23:05:30 +13:00
GriffinR	6b070010b2	Merge pull request #1392 from GriffinRichards/multichoicebool ... Use bool for multichoice ignoreBPress	2021-03-31 01:27:42 -04:00
GriffinR	5d7c438efc	Merge pull request #1391 from GriffinRichards/objvram ... Add some uses of OBJ_VRAM/VRAM_SIZE	2021-03-31 00:36:20 -04:00
GriffinR	f602a9dcbf	Use bool for multichoice ignoreBPress	2021-03-31 00:35:56 -04:00
LOuroboros	66e86e3aac	Decapped the in battle type strings	2021-03-31 00:47:57 -03:00
GriffinR	8c6e89e994	Bit shifts from hex to decimal	2021-03-30 17:38:09 -04:00
GriffinR	d5d1caf965	Add some uses of OBJ_VRAM/VRAM_SIZE	2021-03-30 15:07:04 -04:00
GriffinR	50e9666e16	Merge branch 'master' into doc-introcred	2021-03-29 20:56:15 -04:00
GriffinR	dea07dc865	Standardize intro gfx names	2021-03-29 20:48:48 -04:00
GriffinR	09ff1524b4	Finish documenting credits	2021-03-29 19:58:29 -04:00
Kurausukun	102582a3df	Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc	2021-03-29 18:36:18 -04:00
Kurausukun	79a8eb481f	1 to true	2021-03-29 18:32:22 -04:00
GriffinR	c40fb9288c	Merge pull request #1378 from GriffinRichards/doc-berrycrush ... Document Berry Crush	2021-03-29 12:38:16 -04:00
Marcus Huderle	6cceb05cb7	Document some text-related things	2021-03-29 11:20:00 -05:00
ghoulslash	856781ce56	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:03:05 -06:00
ghoulslash	a8c40a8d6f	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:03:00 -06:00
ghoulslash	332286ce03	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:56 -06:00
ghoulslash	d7c7f808b8	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:51 -06:00
ghoulslash	97428b6e10	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:46 -06:00
ghoulslash	31cdf043cc	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:41 -06:00
ghoulslash	d0f5528abb	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:34 -06:00
ghoulslash	492b5718e7	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-29 08:02:21 -06:00
GriffinR	62968895ca	Add MON_PIC_SIZE constant	2021-03-29 09:38:19 -04:00
GriffinR	357c5439f5	Document some credits	2021-03-29 08:52:40 -04:00
GriffinR	c86cc8b371	Document intro, start intro_credits/credits	2021-03-28 23:13:56 -04:00
ghoulslash	a595b213b4	merge with be	2021-03-28 17:29:22 -06:00
Scott	5cb8ec4247	Rename IsNotEventLegalMewOrDeoxys	2021-03-27 17:27:32 -05:00
GriffinR	7a5c6d4d86	Standardize Friendship/Happiness	2021-03-27 17:27:20 -05:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
GriffinR	0f869fb266	Remaining labels in trainer_card	2021-03-22 15:30:19 -05:00
GriffinR	2be0c52c17	Remaining labels in map_name_popup	2021-03-22 15:30:19 -05:00
GriffinR	1cc0a3506f	Label misc field effects	2021-03-22 15:30:19 -05:00
GriffinR	4077c53338	A few labels in party, start, option menus	2021-03-22 15:30:19 -05:00
GriffinR	9773b436d2	Clean up shop.c	2021-03-22 15:30:19 -05:00
GriffinR	6127c6f32e	Misc labels in battle facilities	2021-03-22 15:30:19 -05:00
Kurausukun	9eb5794482	cleanup some m4a code (thanks to shoomer)	2021-03-21 13:43:53 -05:00
GriffinR	dfc6ee0e9e	Add SAFE_DIV	2021-03-21 13:43:14 -05:00
GriffinR	28aff5b179	Correct ClearRankingHallRecords bugfix	2021-03-21 13:43:14 -05:00
GriffinR	557152b06e	Minor link cleanup	2021-03-21 13:40:40 -05:00
Kurausukun	7198d40ec8	port some documentation from FR	2021-03-19 18:49:19 -04:00
Kurausukun	5b910a11b4	port miscellaneous fr documentation	2021-03-18 20:35:39 -04:00
GriffinR	8eafe1fd4e	Move pointillism points array to src	2021-03-18 17:36:18 -05:00
GriffinR	22e2c0a47c	Document Berry Crush	2021-03-18 15:18:23 -04:00
ghoulslash	539806d176	ability pop up apostrophes	2021-03-17 14:26:33 -06:00
BuffelSaft	937c24ca51	Remove special Body Press effect ... Only include the official effect for Body Press to stay faithful to the gen 8 games.	2021-03-16 23:37:02 +13:00
BuffelSaft	7d237d8ff6	Implement Body Press' effect ... Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.	2021-03-16 22:56:44 +13:00
Kurausukun	3baac6ef3c	port some missed berry crush documentation	2021-03-15 23:55:10 -04:00
GriffinR	ecd269ba2c	Merge pull request #1372 from GriffinRichards/doc-countdown ... Document minigame countdown	2021-03-15 21:39:58 -04:00
PikalaxALT	925e68c03f	Update newly named fields	2021-03-15 15:22:41 -04:00
PikalaxALT	8352ebcc48	Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer	2021-03-15 09:46:57 -04:00
LOuroboros	d6e89a99ce	Corrected the name of an included header file ... include/constants/battle_moves.h doesn't exist. The right header file to include was include/constants/moves.h instead.	2021-03-14 12:54:57 -03:00
amiosi	b081a00891	Merge branch 'battle_engine' into old_findings	2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen ... Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
Seth Barberee	4158f07dee	move bgBuffers back to unk138	2021-03-12 19:24:03 -06:00
Seth Barberee	fda56d6f47	berry_crush: sync some pokefirered names with pokeemerald	2021-03-12 18:39:25 -06:00
PikalaxALT	8d4dcb228a	More documentation in battle_main	2021-03-12 16:55:58 -05:00
PikalaxALT	e32a1571af	Resolve link comm buffers in gBattleStruct	2021-03-12 15:37:31 -05:00
PikalaxALT	e6b1b97aa1	Nonmatching resoltuion ... - Fix fakematch in Cmd_get_used_held_item - Remove `static` overrides in MODERN in four objects	2021-03-12 13:55:07 -05:00
GriffinR	b1a69d95ea	Document minigame countdown	2021-03-11 14:25:22 -05:00