8022 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GriffinR	0e22b21b14	Merge pull request #1485 from LOuroboros/patch-3 ... Removed unused status ailment constants	2021-07-23 13:15:46 -04:00
LOuroboros	bfa824f761	Removed unused status ailment constants	2021-07-23 13:18:24 -03:00
GriffinR	e67729f647	Remove address comments in sound directory	2021-07-21 00:56:04 -04:00
GriffinR	06351bf63c	Remove address comments	2021-07-20 15:18:31 -04:00
ghoulslash	25f9458fea	Merge pull request #1573 from LOuroboros/undoformchange ... Fixed calls to UndoFormChange in battle_script_commands.c	2021-07-18 11:16:41 -06:00
LOuroboros	29b1ba2a3c	Fixed calls to UndoFormChange in battle_script_commands.c	2021-07-18 12:34:17 -03:00
PikalaxALT	bea170e8e9	Merge pull request #1483 from PikalaxALT/symbols_merge_commit ... Use merge commit message for symbols branch	2021-07-16 12:59:03 -04:00
PikalaxALT	52512cfbe1	Use merge commit message for symbols branch	2021-07-16 12:15:53 -04: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	a29c9f9339	Merge pull request #1569 from LOuroboros/cotton_down ... Fixed Cotton Down	2021-07-13 11:06:59 -06:00
ghoulslash	ebc187c16d	Merge pull request #1536 from DizzyEggg/gravity ... Fix Gravity's animation	2021-07-13 10:54:45 -06:00
LOuroboros	02eace4574	Fixed Cotton Down ... It will no longer affect fainted 'mons.	2021-07-13 13:54:33 -03:00
GriffinR	a274cc6a76	Merge branch 'master' into flatten_sprite_pos	2021-07-12 01:39:28 -04:00
GriffinR	876a89eba4	Merge pull request #1482 from cstyles/physical-macro ... Use the `IS_TYPE_PHYSICAL` macro in `AddMovePoints`	2021-07-12 01:25:05 -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
PikalaxALT	4419337aeb	Merge pull request #1481 from GriffinRichards/fix-symsname ... Use PR title for symbols branch commits	2021-07-08 08:00:16 -04:00
GriffinR	2f1a997440	Use PR title for symbols branch commits	2021-07-08 00:49:27 -04: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
DizzyEggg	34f869ef40	Fix White Smoke affecting Shell Smash's def drop	2021-07-06 10:37:17 +02:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
ultima-soul	4d1c63e3d3	Merge pull request #1556 from ExpoSeed/BE/fix-redefinition-error ... Include expansion_branches.h in global.h	2021-07-04 13:41:42 -07:00
ExpoSeed	0ed1d29ece	Include expansion_branches.h in global.h	2021-07-04 12:39:30 -05:00
ghoulslash	171329aabd	Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error ... Fix redefinition error in battle_config.h	2021-07-04 09:31:46 -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
GriffinR	56b69157ef	Merge pull request #1477 from SnorlaxMonster/comment-battledome ... Correct card lines in Battle Dome comments	2021-07-03 09:55:41 -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	d2701b51ab	Combine battle script labels, add EFFECT comments	2021-07-02 15:37:59 -04:00
ExpoSeed	fb69b65337	Fix redefinition error in battle_config.h	2021-07-02 14:36:55 -05:00
GriffinR	2946342a6b	Merge pull request #1476 from luckytyphlosion/master ... Fix modern builds when devkitARM is not in PATH.	2021-07-02 15:07:27 -04:00
luckytyphlosion	b3d66f5528	Merge branch 'master' of https://github.com/pret/pokeemerald	2021-07-02 12:53:12 -04:00
luckytyphlosion	9fd27fe855	Fix modern builds when devkitARM is not in PATH.	2021-07-02 12:52:31 -04: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