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 |
|
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 |
|
Eduardo Quezada D'Ottone
|
f564d4492b
|
GetBattlerHoldEffect usage optimizations (#3330)
* GetBattlerHoldEffect optimizations
* Type fix
|
2023-09-21 21:43:52 +02:00 |
|
DizzyEggg
|
8bf8c9e7a7
|
Fix flag debug screen corrupting subsequent message boxes (#3317)
|
2023-09-21 11:45:02 -03:00 |
|
Bassoonian
|
b673738ba5
|
Add config for pressing B in the PC
|
2023-09-21 16:26:00 +02:00 |
|
DizzyEggg
|
5b498e968f
|
Fix no return in isbattlergrounded (#3328)
|
2023-09-21 15:24:26 +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 |
|
Alex
|
415d6e9054
|
Fix Toxic Debris after user faints (#3323)
|
2023-09-19 15:54:52 +02: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 |
|
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 |
|
Alex
|
80ec67482e
|
Bitter Blade and Double Shock animations (#3310)
|
2023-09-14 15:31:18 -03:00 |
|
DizzyEggg
|
4fb0b55664
|
Bug bite/Fling enigma berry interaction & tests (#3311)
|
2023-09-14 14:13:11 -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 |
|
Eduardo Quezada
|
c9b2a8ae24
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# src/battle_ai_util.c
|
2023-09-14 08:34:47 -03:00 |
|
kittenchilly
|
2ce3f4db78
|
Implement Enigma Berry's hold effect + tests (#3300)
* Fix Enigma Berry
* Tests
* Update enigma_berry.c
|
2023-09-14 13:08:24 +02:00 |
|
Alex
|
db039ee4e2
|
Tera Shards Icons (#3307)
|
2023-09-14 07:38:45 -03:00 |
|
DizzyEggg
|
94a3e80c8e
|
Remove redundant side macros/funcs (#3299)
Co-authored-by: gruxor <gruxor@proton.me>
|
2023-09-13 09:19:18 -03:00 |
|
ghoulslash
|
623015bd8d
|
Add ai delay timer (#3302)
|
2023-09-13 08:00:29 -04:00 |
|
Alex
|
ca9e784102
|
Fixes Toxic Debris + CanTargetFaintAi index issue (#3306)
* Fixes Toxic Debris + CanTargetFaintAi index issue
* swap macro
|
2023-09-13 10:31:20 +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 |
|
Eduardo Quezada D'Ottone
|
13dedfb511
|
Revert "Implement Enigma Berry's hold effect" (#3298)
|
2023-09-11 10:37:17 -03:00 |
|
ghoulslash
|
b861f6dd9a
|
Fix overworld snow weather + make overworld fog cause misty terrain (#3241)
|
2023-09-11 09:28:44 -04:00 |
|
ghoulslash
|
a02843bc3f
|
Implement Enigma Berry's hold effect (#3285)
|
2023-09-11 09:20:58 -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 |
|
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 |
|
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 |
|
Gabriel Cowley
|
d585c520ff
|
Fix Z effect descriptions being cut off (#3286)
|
2023-09-08 07:09:11 -03:00 |
|