Eduardo Quezada
|
1580f892a5
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
# include/constants/pokemon.h
# src/battle_script_commands.c
|
2022-12-19 18:53:26 -03:00 |
|
ghoulslash
|
79fa2c79e2
|
Merge pull request #2517 from LOuroboros/speed_swap
Fixed Speed Swap's effect
|
2022-12-19 08:56:36 -05:00 |
|
ghoulslash
|
386a62fe81
|
Merge pull request #2526 from AsparagusEduardo/RHH/pr/fix/doubleWildChance
Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set
|
2022-12-19 08:55:32 -05:00 |
|
SonikkuA-DatH
|
562736a5e6
|
Update battle_scripts_1.s
Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR
|
2022-12-18 22:50:41 -08:00 |
|
SonikkuA-DatH
|
ffda816507
|
Update battle_script_commands.h
Whoops, forgot the to copy paste various
|
2022-12-18 22:41:15 -08:00 |
|
SonikkuA-DatH
|
2dbfc1c8f5
|
Update data/battle_scripts_1.s
Fixes spacing. Thanks Lunos!
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-12-18 22:28:33 -08:00 |
|
SonikkuA-DatH
|
bf1a205661
|
Update src/battle_script_commands.c
Bracket fixing
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-12-18 22:27:12 -08:00 |
|
SonikkuA-DatH
|
c81b702a86
|
Update src/battle_script_commands.c
Spacing refix
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-12-18 22:26:51 -08:00 |
|
SonikkuA-DatH
|
03b5d36249
|
Update src/battle_script_commands.c
removes various description
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-12-18 22:26:06 -08:00 |
|
SonikkuA-DatH
|
6a2a026c70
|
Update battle_anim.h
Added required tags
|
2022-12-18 22:23:51 -08:00 |
|
SonikkuA-DatH
|
5682247ace
|
Add files via upload
Base upload. Need to apply Teatime changes...
|
2022-12-18 19:14:54 -08:00 |
|
SonikkuA-DatH
|
b97a68656c
|
Delete battle_anim.h
Need to replace with current...
|
2022-12-18 19:14:01 -08:00 |
|
SonikkuA-DatH
|
f0aee1f8d3
|
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
|
2022-12-18 17:50:39 -08:00 |
|
SonikkuA-DatH
|
44b522fd1c
|
Update battle_script_commands.c
Spacing
|
2022-12-18 15:53:07 -08:00 |
|
SonikkuA-DatH
|
9cd8d81412
|
Update battle_scripts_1.s
Fixed spacing
|
2022-12-18 15:37:44 -08:00 |
|
GriffinR
|
7a480c0a87
|
Merge pull request #1830 from sphericalice/registered-item-none
Use the ITEM_NONE constant for the registeredItem save block field
|
2022-12-18 16:11:29 -05:00 |
|
SphericalIce
|
17052d4547
|
Use the ITEM_NONE constant for the registeredItem save block field
|
2022-12-18 21:05:37 +00:00 |
|
Eduardo Quezada
|
bd7d949f5f
|
Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set
|
2022-12-18 13:49:02 -03:00 |
|
Eduardo Quezada
|
55ba9d8364
|
Fixed right Frontier move tutor not loading their move list correctly.
|
2022-12-18 13:17:33 -03:00 |
|
Eduardo Quezada D'Ottone
|
892fa1bc55
|
Merge pull request #2524 from LOuroboros/patch-1
Removed repeated stat change defines
|
2022-12-18 10:42:28 -03:00 |
|
LOuroboros
|
089104cd9c
|
Update battle_script_commands.c
|
2022-12-18 10:35:58 -03:00 |
|
Eduardo Quezada
|
66d1c9bc65
|
Documenting padding in structs used by Saveblocks
|
2022-12-17 22:55:43 -03:00 |
|
Eduardo Quezada D'Ottone
|
f6a89c9cc8
|
Merge pull request #2520 from LOuroboros/patch-1
Updated ENDTURN_PLASMA_FISTS
|
2022-12-17 12:14:07 -03:00 |
|
LOuroboros
|
4f951b7887
|
Updated ENDTURN_PLASMA_FISTS
|
2022-12-17 03:44:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
937f5acc84
|
Merge pull request #2519 from AsparagusEduardo/RHH/pr/sync/pret_20221216
I'll make your face the greatest in Hoenn! Or else you will DIE. (Pret merge 2022/12/16)
|
2022-12-16 21:06:38 -03:00 |
|
Eduardo Quezada
|
c03f354dca
|
Finished cleaning up the animations to the new standard
|
2022-12-16 20:58:41 -03:00 |
|
Eduardo Quezada
|
6a57dcdc4c
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216
# Conflicts:
# src/data.c
# src/data/pokemon_graphics/front_pic_anims.h
|
2022-12-16 19:19:23 -03:00 |
|
GriffinR
|
2aa6a9c164
|
Remove two unreferenced metatile labels
|
2022-12-16 11:05:56 -05:00 |
|
Eduardo Quezada D'Ottone
|
0dca5a5230
|
Merge pull request #2516 from LOuroboros/patch-1
Updated SetMoveEffect
|
2022-12-15 18:10:08 -03:00 |
|
Eduardo Quezada D'Ottone
|
79a753efcc
|
Merge pull request #2518 from LOuroboros/bSides
Updated SIDE constant usages
|
2022-12-15 18:09:37 -03:00 |
|
LOuroboros
|
852f06deea
|
Updated SIDE constant usages
|
2022-12-15 17:44:56 -03:00 |
|
GriffinR
|
347a02ace1
|
Sync trade
|
2022-12-15 15:40:59 -05:00 |
|
LOuroboros
|
7c447a1f62
|
Small corrections
|
2022-12-14 12:09:16 -03:00 |
|
LOuroboros
|
4c9446ed0a
|
Fixed Speed Swap's effect
|
2022-12-14 12:00:45 -03:00 |
|
LOuroboros
|
af6ea91e72
|
Applied Eduardo's suggestion
|
2022-12-14 10:48:12 -03:00 |
|
LOuroboros
|
37151e4a2d
|
Updated SetMoveEffect
|
2022-12-14 10:46:11 -03:00 |
|
ghoulslash
|
90dd59c039
|
Merge pull request #2513 from LOuroboros/patch-1
Update battle.h
|
2022-12-13 11:54:18 -05:00 |
|
LOuroboros
|
6ef30da492
|
Update battle.h
|
2022-12-13 02:44:49 -03:00 |
|
LOuroboros
|
a3e58b05c1
|
Implemented Guard Dog's effect
|
2022-12-12 20:33:37 -03:00 |
|
LOuroboros
|
a56cfd1aa7
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities
|
2022-12-12 19:55:48 -03:00 |
|
ghoulslash
|
657e0d755b
|
Merge pull request #2511 from AsparagusEduardo/RHH/pr/cleanup/SpecialStatus
Reorganized SpecialStatus struct to minimize padding.
|
2022-12-11 22:50:17 -05:00 |
|
Eduardo Quezada
|
1290a9411d
|
Reorganized SpecialStatus struct to minimize padding.
|
2022-12-12 00:37:00 -03:00 |
|
ghoulslash
|
340278c83b
|
Merge pull request #2452 from LOuroboros/intimidate
Optimized Intimidate's code
|
2022-12-11 22:04:16 -05:00 |
|
LOuroboros
|
8eff1a13c1
|
Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands
|
2022-12-11 23:17:59 -03:00 |
|
LOuroboros
|
e6a3396b0f
|
Added Adrenaline Orb check and removed silly comment
|
2022-12-11 19:24:36 -03:00 |
|
Eduardo Quezada D'Ottone
|
db32032781
|
Merge pull request #2475 from Bassoonian/gen9moves
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
|
2022-12-11 18:39:25 -03:00 |
|
ghoulslash
|
0a9e3c8dc8
|
fix stattextbuffer in BattleScript_IntimidatePrevented_Item
|
2022-12-11 16:16:10 -05:00 |
|
Bassoonian
|
07a8af5975
|
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
|
2022-12-11 22:09:23 +01:00 |
|
ghoulslash
|
e3e0d60222
|
Merge pull request #2467 from Bassoonian/gen9moves
Generation IX Moves
|
2022-12-11 14:47:47 -05:00 |
|
GriffinR
|
5c90df73ba
|
Merge pull request #1825 from AsparagusEduardo/pret/pr2/AnimationMacros
Species animation tables into macros
|
2022-12-10 10:00:34 -05:00 |
|