kittenchilly
|
baca050724
|
Allow Sliggoo to evolve during overworld fog (#3343)
|
2023-09-26 17:05:44 -03:00 |
|
Eduardo Quezada
|
9144b36ac1
|
Merge remote-tracking branch 'pret/master' into RHH/upcoming
# Conflicts:
# include/graphics.h
# src/anim_mon_front_pics.c
# src/data/graphics/pokemon.h
# src/data/pokemon/level_up_learnsets.h
# src/data/pokemon/pokedex_text.h
# src/data/pokemon_graphics/still_front_pic_table.h
# src/wild_encounter.c
|
2023-09-26 08:13:49 -03:00 |
|
Eduardo Quezada D'Ottone
|
de577f955a
|
Greatly reduce AI lag (#3308)
|
2023-09-26 07:28:18 -03:00 |
|
ghoulslash
|
0b9f12efe4
|
Adds support for placing Pokémon in the PC with the B button (#3329)
Adds support for placing Pokémon in the PC with the B button
|
2023-09-24 21:35:16 -04:00 |
|
Eduardo Quezada
|
566ec93492
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
|
2023-09-24 20:32:45 -03:00 |
|
DizzyEggg
|
996bc6ba24
|
Fix order of messages in gen6 exp share (#3339)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-24 17:07:56 -03:00 |
|
DizzyEggg
|
7d9555dadb
|
change some more variables to u32
|
2023-09-24 11:06:45 +02:00 |
|
DizzyEggg
|
5d77123c50
|
merge with master
|
2023-09-24 10:52:41 +02:00 |
|
LOuroboros
|
35e76e9868
|
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)
Co-authored-by: Alex <alexthenotes@gmail.com>
|
2023-09-24 00:01:18 -03:00 |
|
ghoulslash
|
b77dec1234
|
Transform updates AI_PARTY data (#3295)
* Cmd_transformdataexecution overwrite AI_PARTY data
* remove whitespace
* add RecordAllMoves
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-09-23 10:44:30 +02:00 |
|
DizzyEggg
|
662dd7d2c6
|
Fix give daycare egg option giving buggy eggs (#3335)
|
2023-09-22 12:20:00 -03:00 |
|
Bassoonian
|
b673738ba5
|
Add config for pressing B in the PC
|
2023-09-21 16:26:00 +02:00 |
|
kittenchilly
|
d4217739e6
|
Add type boosting held item power config (#3326)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-20 22:03:00 -03:00 |
|
DizzyEggg
|
136ea395ac
|
Fix tests breaking on modern (#3319)
* Fix tests breaking on modern
* modern tests fix - macro and rodata changes
* ld script rodata modern
|
2023-09-19 12:15:03 +02:00 |
|
DizzyEggg
|
74fd561759
|
merge with upcoming
|
2023-09-17 11:27:18 +02:00 |
|
Alex
|
a073e7bd59
|
Adds Gigaton Hammer and Salt Cure (#3297)
|
2023-09-15 11:18:47 -03:00 |
|
kittenchilly
|
4a3ee0db7f
|
Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes (#3301)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-14 15:37:57 -03:00 |
|
Eduardo Quezada
|
f3217c18dc
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# src/battle_util.c
|
2023-09-14 09:12:12 -03:00 |
|
DizzyEggg
|
7936910f90
|
Bug Bite - Tests and small fix (#3282)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-14 08:57:30 -03:00 |
|
Alex
|
db039ee4e2
|
Tera Shards Icons (#3307)
|
2023-09-14 07:38:45 -03:00 |
|
DizzyEggg
|
25459073e5
|
ai lag fixes ready
|
2023-09-14 11:44:44 +02:00 |
|
DizzyEggg
|
bb9501449c
|
final ai optimizations
|
2023-09-14 11:05:00 +02:00 |
|
DizzyEggg
|
5ea66f3c0c
|
more optimizations
|
2023-09-14 00:07:41 +02:00 |
|
DizzyEggg
|
38dcb3c66c
|
ai weather optimization
|
2023-09-13 17:28:26 +02:00 |
|
DizzyEggg
|
b7d0d37757
|
fix conflicts
|
2023-09-13 15:14:09 +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 |
|
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 |
|
GriffinR
|
de3493ff0e
|
Merge pull request #1921 from citrusbolt/blockboxrs
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
|
2023-09-12 18:48:05 -04: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 |
|
Eduardo Quezada
|
b89722500f
|
Fixed Mr. Mime capitalization
|
2023-09-12 13:09:56 -03: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
|
582cfb0ae7
|
Convert various to callnatives - Part 1 (#3269)
|
2023-09-11 09:19:56 -04:00 |
|
Eduardo Quezada
|
6a70b06240
|
Removed unused itemId field
|
2023-09-10 19:42:33 -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 |
|
Alex
|
18577ce598
|
Fix Scale Shot bug and use Canceller Multihit Moves (#3290)
|
2023-09-10 11:57:19 -03:00 |
|
kittenchilly
|
7a24167b4d
|
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
|
2023-09-08 11:47:35 -05:00 |
|
psf
|
75d06bb599
|
Generation 6 Experience Share (#3276)
|
2023-09-07 23:18:18 -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 |
|
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 |
|
DizzyEggg
|
d9677763e5
|
remove gActiveBattler replacement
|
2023-09-04 10:26:37 +02:00 |
|