Commit Graph

9399 Commits

Author SHA1 Message Date
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
LOuroboros
10cda70129 Fixed Pikalax's PR 2021-10-30 11:51:29 -03:00
PikalaxALT
de23b3b04d New move tilemap bins are easier to edit 2021-10-30 11:51:22 -03:00
ghoulslash
a461823cbf weather ball anim checks utility umbrella 2021-10-30 09:48:23 -04:00
GriffinR
875be8a8a8
Merge pull request #1528 from GriffinRichards/doc-ereaderscr
Document ereader screen
2021-10-30 09:34:14 -04:00
ghoulslash
ee7b63e372 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-30 09:26:33 -04:00
ghoulslash
eedd255b18
Merge pull request #1832 from Blackforest92/battle_engine
Alternate fix to Steel Beam
2021-10-30 09:19:54 -04:00
ghoulslash
3e364b4870 switchin abilities activate after wandering spirit 2021-10-30 09:16:33 -04:00
ghoulslash
f4537b1213 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit 2021-10-30 09:14:32 -04:00
ghoulslash
4b0325dbe4 neutralizing gas switchout 2021-10-30 09:13:08 -04:00
Eduardo Quezada D'Ottone
1811d75c23
Merge pull request #1829 from rh-hideout/revert-1760-ex_fix_move_bg_tilemaps
Revert "Ex fix move bg tilemaps"
2021-10-30 09:08:25 -03:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
BuffelSaft
52054e4bfe Fix Corrosion, Poison Touch
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 21:12:18 +13:00
BuffelSaft
da30f023e8
Revert "Ex fix move bg tilemaps" 2021-10-30 19:32:37 +13:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d start ability 2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest
fix recycle and harvest
2021-10-30 15:00:56 +13:00
PikalaxALT
475520a562
Merge pull request #1535 from GriffinRichards/calcromnewline
Add newlines around calcrom output
2021-10-29 20:58:03 -04:00
GriffinR
1a69eb33e8 Add newlines around calcrom output 2021-10-29 20:27:58 -04:00
GriffinR
886551f655 Clean up battle transition doc 2021-10-29 18:57:41 -04:00
GriffinR
f51247615e Finish documenting battle_transition 2021-10-29 18:32:53 -04:00
GriffinR
8c2b401bb3
Merge pull request #1533 from LOuroboros/fontControl
Renamed "SIZE" text controller
2021-10-29 18:15:16 -04:00
LOuroboros
7574af3558 Fixed charmap comment about the FONT text controller 2021-10-29 19:08:24 -03:00
LOuroboros
cde0ce878c EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT 2021-10-29 19:00:07 -03:00
LOuroboros
5536bce88d SIZE -> FONT 2021-10-29 18:39:31 -03:00
GriffinR
af4d6dd8f0
Merge pull request #1532 from cbt6/anim-number
Label some animation index numbers
2021-10-29 14:14:15 -04:00
cbt6
9a1764f83e Label some animation index numbers 2021-10-30 01:37:49 +08:00
GriffinR
901cd476b6 Fix incorrect arguments on CopyRectToBgTilemapBufferRect 2021-10-29 11:51:47 -04:00
GriffinR
07bf225f94 Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
ghoulslash
cb9f4fbb42
Merge pull request #1760 from PikalaxALT/ex_fix_move_bg_tilemaps
Ex fix move bg tilemaps
2021-10-29 09:12:15 -04:00
ghoulslash
2502820e83 document a couple hitmarkers. fix failing moves not updating hp from own healing effects 2021-10-29 09:03:14 -04:00
Eduardo Quezada D'Ottone
8b45320b9a
Merge pull request #1820 from ghoulslash/skill_swap
Gen 4+ Skill Swap
2021-10-28 20:16:59 -03:00
GriffinR
c793949f46
Merge pull request #1531 from GriffinRichards/fix-statoverflow
Restore ModifyStatByNature bug notes
2021-10-28 18:13:05 -04:00
ghoulslash
204748e01a fix recycle and harvest 2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74 skill swap config option for switchin abilities 2021-10-28 16:53:00 -04:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
ghoulslash
3a86881fb3
Merge pull request #1819 from LOuroboros/patch-2
Fixed Shadow Force
2021-10-28 13:19:24 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
2803b840e5
Updated Shadow Force's move data 2021-10-28 13:52:35 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
GriffinR
7f49f26331 Restore ModifyStatByNature bug notes 2021-10-27 22:38:48 -04:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
GriffinR
1a5fa34790
Merge pull request #1529 from GriffinRichards/profileman
Replace 'mystery_event_club'
2021-10-27 14:36:12 -04:00
GriffinR
a470e2c761 Tabs to spaces for graphics_file_rules alignment 2021-10-27 14:07:56 -04:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
LOuroboros
8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00