DizzyEggg
|
b7d0d37757
|
fix conflicts
|
2023-09-13 15:14:09 +02:00 |
|
DizzyEggg
|
0081c3a8fd
|
small improvement
|
2023-09-13 14:54:47 +02:00 |
|
DizzyEggg
|
94a3e80c8e
|
Remove redundant side macros/funcs (#3299)
Co-authored-by: gruxor <gruxor@proton.me>
|
2023-09-13 09:19:18 -03:00 |
|
DizzyEggg
|
9031f5a063
|
get battlers' speed only once
|
2023-09-13 14:04:25 +02:00 |
|
ghoulslash
|
623015bd8d
|
Add ai delay timer (#3302)
|
2023-09-13 08:00:29 -04:00 |
|
DizzyEggg
|
1a64938c9b
|
optimize dmg move result and ai who is faster
|
2023-09-13 13:23:19 +02:00 |
|
DizzyEggg
|
406209f738
|
score to s32
|
2023-09-13 09:27:49 +02:00 |
|
DizzyEggg
|
9778587935
|
optimize battle util and item functions by setting u32 variables
|
2023-09-13 00:02:26 +02:00 |
|
DizzyEggg
|
44bd830d2a
|
optimize dmg calc and ai dmg calc to reduce lag
|
2023-09-12 23:20:09 +02:00 |
|
DizzyEggg
|
2d9cbef684
|
exclude wild battles from ai lag meter
|
2023-09-12 20:19:14 +02:00 |
|
DizzyEggg
|
bd48cca8a2
|
ai delay timer
|
2023-09-12 10:35:05 +02:00 |
|
ghoulslash
|
b861f6dd9a
|
Fix overworld snow weather + make overworld fog cause misty terrain (#3241)
|
2023-09-11 09:28:44 -04:00 |
|
ghoulslash
|
8279ec385c
|
Added missing Evolution data (#3287)
|
2023-09-11 09:20:22 -04:00 |
|
ghoulslash
|
582cfb0ae7
|
Convert various to callnatives - Part 1 (#3269)
|
2023-09-11 09:19:56 -04:00 |
|
ghoulslash
|
181a0b35a5
|
Removed unused itemId field (#3293)
|
2023-09-11 09:13:27 -04:00 |
|
ghoulslash
|
ccdf72ad31
|
Updated Big Nugget's Fling power to Gen 8+ (#3296)
|
2023-09-11 09:10:50 -04:00 |
|
Martin Griffin
|
327fda776a
|
Callnative functions take ScriptContext argument (#3294)
|
2023-09-11 07:58:57 +01:00 |
|
Eduardo Quezada
|
bfcbd37d78
|
Updated Big Nugget's Fling power to Gen 8+
|
2023-09-11 02:43:39 -03:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|