DizzyEggg
6ae1ba10da
fix conflicts
2023-08-28 13:55:45 +02:00
Pawkkie
906ea4a5b0
Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove ( #3218 )
...
* Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove
* Use array to match ability to absorbing type
Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation.
* Minor syntax fixes
2023-08-28 13:39:27 +02:00
GriffinR
d67914e114
Merge pull request #1912 from GriffinRichards/moves-mask
...
Handful of fixes related to MAX_MON_MOVES
2023-08-27 19:40:59 -04:00
GriffinR
dcaf03e360
Merge pull request #1918 from WhenGryphonsFly/key_intr_enable
...
Correct KEY_INTR_ENABLE
2023-08-27 17:23:16 -04:00
kittenchilly
37f6685949
Merge branch 'upcoming' into overworldsnow
2023-08-27 14:51:57 -05:00
WhenGryphonsFly
5abeb6718d
Correct KEY_INTR_ENABLE
2023-08-27 14:30:57 -05:00
kittenchilly
7ffd31f5de
Update ultra_burst.c
2023-08-26 16:42:35 -05:00
kittenchilly
96e39cde0b
Update ultra_burst.c
2023-08-26 16:14:24 -05:00
kittenchilly
ac67900c0a
Fix test speed
2023-08-26 15:32:10 -05:00
kittenchilly
2e1b137183
Ultra Burst tests
2023-08-26 15:19:47 -05:00
kittenchilly
48d6fe2e64
Merge branch 'upcoming' into ultraburst
2023-08-26 14:43:31 -05:00
voloved
2784f701d8
Poké Ball shortcut tweaks ( #3254 )
2023-08-26 12:58:51 -04:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -04:00
Eduardo Quezada
1f72e6ac07
Merge branch 'RHH/master' into RHH/upcoming
2023-08-24 21:31:58 -04:00
Eduardo Quezada
d360deb3b6
1.5.3 in templates
2023-08-24 20:44:50 -04:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu ( #3039 )
2023-08-24 19:23:26 -04:00
Eduardo Quezada D'Ottone
9c937a945c
Pokemon sprite review pt.1 ( #3235 )
2023-08-23 22:43:42 -04:00
CyanSMP64
ef69021f0f
some more tweaks by mrds
2023-08-24 13:00:31 +12:00
Philipp AUER
905fc6fd4d
Fixed Metronome Item damage multiplier ( #3246 )
...
Co-authored-by: sbird <sbird@no.tld>
2023-08-23 19:23:00 -04:00
GriffinR
843830374c
Merge pull request #1916 from grunt-lucas/gbagfx-cc
...
gbagfx to respect user CC setting
2023-08-22 14:57:32 -04:00
grunt-lucas
9d170c7e35
gbagfx to respect user CC setting
2023-08-22 07:37:48 -07:00
CyanSMP64
fd37946c1d
resize golduck
2023-08-22 20:31:13 +12:00
LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field ( #3243 )
...
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
2023-08-21 12:49:17 +01:00
DizzyEggg
9cf5376c96
use GetBattlerParty in LoadMonSprite
2023-08-21 09:43:01 +02:00
GriffinR
e70577d59b
Add missing sizeof in trainer_see
2023-08-20 17:22:29 -04:00
kittenchilly
a79898f1b1
Make fog cause misty terrain
2023-08-20 13:51:48 -05:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim
...
Document stat change animation
2023-08-20 14:29:11 -04:00
kittenchilly
5e98891577
Snow doesn't cause shade anymore
2023-08-20 13:24:20 -05:00
CyanSMP64
4e5809a0d0
tweak graveler, pikachu
2023-08-20 22:08:54 +12:00
Bassoonian
f2391cd823
Add female Basculegion to cry table ( #3242 )
2023-08-19 11:20:40 -04:00
kittenchilly
0ad3919f22
Fix overworld snow weather
2023-08-19 01:40:31 -05:00
CyanSMP64
60a2878f8f
tweak growlithe, slowbro, poliwag
2023-08-19 16:15:20 +12:00
GriffinR
4f3068406c
Merge pull request #1914 from AnonymousRandomPerson/master
...
Added newer decomp projects to readme
2023-08-18 23:45:44 -04:00
AnonymousRandomPerson
63f39133ab
Added newer decomp projects to readme
2023-08-18 23:38:14 -04:00
CyanSMP64
c33660e00f
fix arcanine and zard
2023-08-19 15:37:41 +12:00
CyanSMP64
ec24754489
fix arcanine, change bg colour of green pokemon
2023-08-18 17:24:30 +12:00
Eduardo Quezada D'Ottone
5b885a4ddb
Convert vanilla trainer data to only use the full custom trainer mon struct ( #3114 )
2023-08-17 18:19:38 -04:00
Eduardo Quezada
d3333812dd
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
2023-08-17 17:52:28 -04:00
kittenchilly
4ca4b2dd76
Update battle_interface.c
2023-08-17 13:29:27 -05:00
kittenchilly
4e0e70ae81
Fix memory corruption when handling the ultra burst trigger sprite
2023-08-17 13:29:04 -05:00
kittenchilly
f95b4fdb4c
Merge branch 'upcoming' into ultraburst
2023-08-17 13:25:00 -05:00
Eduardo Quezada
a6dbb68bac
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# src/battle_util.c
# src/battle_z_move.c
2023-08-17 13:42:09 -04:00
Philipp AUER
cd90fdec5d
[Critical] fix memory corruption when handling trigger sprites ( #3238 )
...
Co-authored-by: sbird <sbird@no.tld>
2023-08-16 20:21:16 -04:00
GriffinR
bdc0ea1037
Add MOD to match mod with powers of 2
2023-08-16 16:44:45 -04:00
GriffinR
057928438a
Document ChooseMoveAndTargetInBattlePalace
2023-08-16 16:41:29 -04:00
GriffinR
aca7998b93
Add missing use of ALL_MOVES_MASK
2023-08-16 14:33:15 -04:00
CyanSMP64
74de0ef3ca
set background colour
2023-08-16 13:58:31 +12:00
GriffinR
10a10e914b
Merge pull request #1910 from GriffinRichards/misc-constants
...
Use miscellaneous missing constants
2023-08-15 17:53:41 -04:00
CyanSMP64
0c27db10d6
Review mon sprites 0001-0080
2023-08-15 20:24:07 +12:00
kittenchilly
dba28cf93f
Allow Z-Moves to be selected after Mega Evolution ( #3233 )
...
* Allow Z-Moves to be selected after Mega Evolution
* You cannot do Wish Mega Evolution at all if you hold a z crystal
* Rebase to master
2023-08-14 19:10:15 -04:00
