ghoulslash
|
3298312faf
|
add script context to callnative functions
|
2023-09-10 21:29:13 -04:00 |
|
Eduardo Quezada
|
6a70b06240
|
Removed unused itemId field
|
2023-09-10 19:42:33 -03:00 |
|
DizzyEggg
|
4dff0362df
|
Fix ai vs ai battles switch issue (#3283)
|
2023-09-10 19:01:12 -03:00 |
|
Alex
|
09f92719cb
|
Tests for status curing berries (#3289)
|
2023-09-10 18:59:12 -03:00 |
|
Eduardo Quezada
|
755e260da4
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# include/constants/battle_move_effects.h
# test/battle/move_effect/multi_hit.c
|
2023-09-10 18:38:46 -03:00 |
|
kittenchilly
|
2642b81303
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-10 13:21:28 -05:00 |
|
kittenchilly
|
daf8e6ca0b
|
Merge branch 'master' into enigmaberry
|
2023-09-10 13:20:24 -05:00 |
|
Alex
|
18577ce598
|
Fix Scale Shot bug and use Canceller Multihit Moves (#3290)
|
2023-09-10 11:57:19 -03:00 |
|
LOuroboros
|
e75ed112d3
|
Added missing FONT_* labels in ItemUseOutOfBattle_ExpShare (#3291)
|
2023-09-10 11:52:50 -03:00 |
|
AaghatIsLive
|
49e791f128
|
Fixed some hisuian abilities (#3292)
|
2023-09-10 11:51:05 -03:00 |
|
Aaghat
|
2d2a255e6f
|
Forgot to change caught mon dex page
|
2023-09-09 11:29:24 +05:30 |
|
Aaghat
|
1b17e3adff
|
set hgss pokedex off by default
|
2023-09-09 10:59:44 +05:30 |
|
Aaghat
|
332cc29273
|
Add new Evo methods
|
2023-09-09 10:56:45 +05:30 |
|
Aaghat
|
6ac16c8c2e
|
More clean up
|
2023-09-09 10:16:14 +05:30 |
|
Eduardo Quezada
|
b114baa07d
|
Updated Nosepass evolution with PLA's
|
2023-09-09 00:01:45 -03:00 |
|
kittenchilly
|
7a24167b4d
|
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
|
2023-09-08 11:47:35 -05:00 |
|
kittenchilly
|
73cbe9e37b
|
Merge branch 'master' into enigmaberry
|
2023-09-08 11:44:33 -05:00 |
|
Aaghat
|
dbeaa2b2e9
|
add config comment
|
2023-09-08 21:56:12 +05:30 |
|
Aaghat
|
7832a43544
|
Minor fixes
|
2023-09-08 21:47:43 +05:30 |
|
Aaghat
|
e8f56d5c68
|
use rare candy instead of exp share
|
2023-09-08 19:26:29 +05:30 |
|
Aaghat
|
cc273ed2c4
|
Clean Up
|
2023-09-08 19:25:01 +05:30 |
|
Aaghat
|
c4231ba860
|
Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss
|
2023-09-08 18:47:26 +05:30 |
|
Gabriel Cowley
|
d585c520ff
|
Fix Z effect descriptions being cut off (#3286)
|
2023-09-08 07:09:11 -03:00 |
|
Eduardo Quezada
|
6332870a3b
|
Crabominable can now evolve via Ice Stone
|
2023-09-08 00:30:10 -03:00 |
|
psf
|
75d06bb599
|
Generation 6 Experience Share (#3276)
|
2023-09-07 23:18:18 -03:00 |
|
kittenchilly
|
40ac214764
|
Fix enigma berry
|
2023-09-07 17:10:25 -05:00 |
|
kittenchilly
|
8f8705929a
|
Update battle_util.c
|
2023-09-07 15:37:58 -05:00 |
|
kittenchilly
|
b4db3b6a81
|
Add enigma berry effect
|
2023-09-07 15:32:26 -05:00 |
|
DizzyEggg
|
dd3334aa82
|
Battle bond tests and small fix (#3279)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-07 17:23:43 -03:00 |
|
kittenchilly
|
e20383b0a4
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-07 14:29:30 -05:00 |
|
Eduardo Quezada
|
3333395ff7
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
|
2023-09-07 15:54:55 -03:00 |
|
Eduardo Quezada
|
820113d883
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
|
2023-09-07 15:13:06 -03:00 |
|
citrusbolt
|
d31b168522
|
Add blockBoxRS field to struct BoxPokemon
|
2023-09-05 06:17:10 -06:00 |
|
Alex
|
c99b34fd89
|
Fix Magnet Rise animation (#3280)
|
2023-09-05 08:08:51 -03:00 |
|
DizzyEggg
|
cfd802423b
|
Fling fixes and tests (#3191)
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-05 06:56:36 -03:00 |
|
ghoulslash
|
675aa5db41
|
fix GetBattleAnimMoveTargets logic (#3278)
* fix GetBattleAnimMoveTargets logic
* more efficient GetBattleAnimMoveTargets
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-09-05 09:21:14 +02:00 |
|
kittenchilly
|
1e10bbe007
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-04 17:57:20 -05:00 |
|
kittenchilly
|
2fa4206bf1
|
Add new Substitute doll sprites (#3263)
|
2023-09-04 19:48:43 -03:00 |
|
ghoulslash
|
b90702918e
|
Get rid of the gActiveBattler variable (#3262)
|
2023-09-04 08:40:00 -04:00 |
|
DizzyEggg
|
d9677763e5
|
remove gActiveBattler replacement
|
2023-09-04 10:26:37 +02:00 |
|
DizzyEggg
|
7c2ad314d4
|
merge with upcoming
|
2023-09-04 09:40:48 +02:00 |
|
GriffinR
|
4439253f39
|
Add include guards for assembly constants files
|
2023-09-03 20:57:54 -04:00 |
|
kittenchilly
|
0a781217ea
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-02 15:17:23 -05:00 |
|
Eduardo Quezada
|
66710ac22a
|
Updated various defines
|
2023-08-31 23:54:11 -04:00 |
|
Eduardo Quezada
|
c4553c71aa
|
5 more callnatives
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
|
2023-08-31 23:43:48 -04:00 |
|
Eduardo Quezada
|
4ac61ad15f
|
handleultraburst, handleprimalreversion, handlemegaevo
|
2023-08-31 22:34:57 -04:00 |
|
Eduardo Quezada
|
1513443c39
|
Fixed Ultra Burst + Mega Evolution test
|
2023-08-31 22:33:20 -04:00 |
|
Eduardo Quezada
|
35d7201935
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# data/battle_scripts_1.s
# include/battle_scripts.h
|
2023-08-31 20:46:53 -04:00 |
|
Eduardo Quezada D'Ottone
|
c4e88760f5
|
Pret merge (2023/08/31) (#3268)
|
2023-08-31 14:52:18 -04:00 |
|
Eduardo Quezada
|
842b9dc6c0
|
Incorporated bugfixes from upstream
|
2023-08-31 14:30:13 -04:00 |
|