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 |
|
ghoulslash
|
34cd23619f
|
Merge pull request #1471 from LOuroboros/magic_gaurd
Fixed a typo in the battle_engine
|
2021-05-04 09:30:19 -06: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 |
|
LOuroboros
|
5489ab97e4
|
MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK
|
2021-05-01 07:37:23 -03: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
|
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 |
|
ultima-soul
|
4ae56011f5
|
Merge pull request #1458 from rh-hideout/revert-1453-thousand_arrows
Revert "Made Thousand Arrows bypass type immunity"
|
2021-04-07 13:45:31 -07: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 |
|
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
|
228f711bf6
|
Made Thousand Arrows bypass type immunity
|
2021-04-04 07:38:38 -03:00 |
|
ultima-soul
|
5073be0a0b
|
Merge pull request #1447 from ExpoSeed/master
battle engine ci
|
2021-04-02 22:46:19 -07:00 |
|
ExpoSeed
|
579ff8aeaf
|
newline
|
2021-04-03 00:38:15 -05:00 |
|
ExpoSeed
|
77d5699072
|
new workflow
|
2021-04-03 00:26:55 -05:00 |
|
ultima-soul
|
17bdabaf54
|
Merge pull request #1426 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-04-02 22:17:43 -07:00 |
|
ultima-soul
|
939608f5b8
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-02 13:16:40 -07:00 |
|
GriffinR
|
677b4fc394
|
Merge pull request #1396 from GriffinRichards/fix-guards
Add missing include guard suffixes
|
2021-04-02 13:06:18 -04:00 |
|
GriffinR
|
1b8d405b5e
|
Add missing include guard suffixes
|
2021-04-02 12:54:40 -04: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
|
691c680908
|
Delete unreferenced palette
|
2021-04-01 14:32:23 -04:00 |
|
GriffinR
|
21fd6827b0
|
Merge pull request #1394 from GriffinRichards/fix-bgevent
Fix bg event macros
|
2021-04-01 14:22: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 |
|
GriffinR
|
038505984c
|
Fix bg event macros
|
2021-04-01 02:42:02 -04: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 |
|
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 |
|
GriffinR
|
e8b6b4b65e
|
Merge pull request #1383 from Kurausukun/fr_doc
Port Some Documentation from FR
|
2021-03-29 18:53:26 -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 |
|
GriffinR
|
731a442035
|
Merge pull request #1389 from huderlem/text_doc
Document some text-related things
|
2021-03-29 12:32:26 -04:00 |
|