Commit Graph

9164 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
d4638eaf1a Fixed Plasma Fists target 2021-10-31 19:50:31 -03:00
BuffelSaft
fbce8b2ff0
Merge pull request #1749 from ghoulslash/wandering_spirit
Wandering Spirit
2021-11-01 11:26:53 +13:00
ghoulslash
a2b8f3f169 replace gBattleMons[x].ability w GetBattlerAbility 2021-10-31 17:19:30 -04:00
GriffinR
dac4192fd3 Split headers from crt0 2021-10-31 16:39:54 -04:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
Blackforest92
e59d0dd5cf clean Spacial Rend background 2021-10-31 22:58:43 +07:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
e9f6fd9766
Merge pull request #1837 from Blackforest92/battle_engine
Minor fix to Steel Beam
2021-10-31 11:37:58 -04:00
ghoulslash
dfb92fa74e fix VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 2021-10-31 11:12:17 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
Blackforest92
c87e2433a7 Minor fix to Steel Beam 2021-10-31 21:41:39 +07:00
GriffinR
36039e1b86 Convert fonts.s to C 2021-10-31 01:44:18 -04:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics
Implement Gorilla Tactics
2021-10-30 21:44:33 -04:00
Eduardo Quezada D'Ottone
31e62e9321
Merge pull request #1835 from LOuroboros/bgTilemapsFix
Fixed new BG tilemaps
2021-10-30 21:41:32 -03:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
BuffelSaft
2282c4fb5c Fix MOVEEND_CHOICE_MOVE
Oops
2021-10-31 12:09:40 +13:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
ghoulslash
ae0260fa62 fix run away check in TryRunFromBattle 2021-10-30 12:06:02 -04:00
GriffinR
71605556ab Clean up braille_puzzles 2021-10-30 11:59:14 -04:00
ghoulslash
bcf272353c
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-30 11:54:09 -04:00
ghoulslash
915054e84e
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-30 11:54:04 -04:00
ghoulslash
dc9e418155
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-30 11:53:58 -04:00
ghoulslash
de6140193a
Merge pull request #1833 from LOuroboros/patch-2
Fixed Move_SPECIAL_REND typo
2021-10-30 11:34:54 -04:00
ghoulslash
1925874d35 hunger switch unaffected by wandering spirit 2021-10-30 11:18:50 -04:00
LOuroboros
0ddcb69c65
Fixed Move_SPECIAL_REND typo 2021-10-30 12:14:28 -03:00
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