8028 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
GriffinR	63b93c4611	Merge pull request #1472 from garakmon/hi ... fix encounter slot logic to accomodate changes	2021-06-27 21:22:53 -04:00
garakmon	d391c136d8	fix encounter slot logic to accomodate changes	2021-06-27 21:14:21 -04:00
GriffinR	827c274979	Merge pull request #1470 from GriffinRichards/constants-ftrainerfemale ... Add missing use of F_TRAINER_FEMALE	2021-06-25 12:40:22 -04: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
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
GriffinR	7582a6b12e	Merge pull request #1468 from ultima-soul/patch-1 ... Replace Hardcoded Number in MakeCaptureStars	2021-06-18 22:38:01 -04: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
PikalaxALT	182df7c101	Merge pull request #1465 from PikalaxALT/push_symbols ... Port symfile implementation from Ruby, FireRed	2021-06-18 13:03:54 -04:00
PikalaxALT	6ca73737cf	Fix regex error	2021-06-18 12:53:15 -04: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
GriffinR	780da6bfd0	Merge pull request #1466 from Sewef/patch-1 ... Fix sATypeMove_Table definition	2021-06-17 14:29:28 -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
PikalaxALT	ae8f6e29f8	Symplifi symfiles	2021-06-16 14:43:35 -04:00
PikalaxALT	5ccac26f26	Port symfile implementation from Ruby, FireRed	2021-06-16 11:03:23 -04:00
GriffinR	69fb670955	Merge pull request #1464 from ExpoSeed/pret/map-header-flags ... Change map header flags to use a bitfield	2021-06-13 18:12:40 -04:00
ExpoSeed	b6b0062bd6	Change map header flags to use a bitfield	2021-06-13 17:02:06 -05:00
GriffinR	b0dfaa92be	Merge pull request #1460 from luckytyphlosion/remove-temps ... Buildsystem no longer builds temporary files for C compilation by default, and other makefile optimizations.	2021-06-13 17:51:17 -04:00
GriffinR	f85fb3af89	Merge pull request #1463 from sphericalice/item-eventscript-labels ... Rename item script labels to fit the established name scheme	2021-06-13 08:32:52 -04:00
SphericalIce	0a94dba4a7	Rename item script labels to fit the established name scheme	2021-06-13 13:21:23 +01: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
GriffinR	e308dc8236	Merge pull request #1462 from ExpoSeed/pret/more-gray-less-grey ... Remove remaining grey and replace with gray	2021-06-10 13:01:55 -04: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
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	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
ExpoSeed	339f297949	Merge pull request #1525 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-06-07 15:56:43 -05:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00