LOuroboros
add75d84c0
Applied a couple of tweaks
...
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6
Allow Lv100 'mons to access level based evos
2022-11-25 17:34:11 -03:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0
Sync text ctrl codes with pokefirered
2022-11-23 21:13:00 -05:00
Eduardo Quezada D'Ottone
b48f057fe7
Merge pull request #1589 from cynderquil/pokemon_expansion
...
Fix Bastiodon's second icon frame
2022-11-20 20:47:07 -03:00
Bassoonian
4ac1e4fc61
Power Shift is now a clone of Power Trick
2022-11-19 13:41:56 +01:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
...
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
...
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
Bassoonian
4da9ecbcea
Prepare FLAG_SLICING_MOVE for merger with abilities branch
2022-11-18 22:37:31 +01:00
Bassoonian
4034f18c0e
Update PLA descriptions
2022-11-18 22:30:40 +01:00
Bassoonian
739680e425
Victory Dance effect
2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b
Mystical Power effect
2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a
Implement Double Shock functionality with temporary string
2022-11-18 22:12:26 +01:00
Bassoonian
a250341e6c
Forgot to reset Wicked Torque effect rate
2022-11-18 22:00:46 +01:00
Bassoonian
3ac3cb249e
Wicked Torque effect
2022-11-18 22:00:21 +01:00
Bassoonian
d4c92a0a19
Fix Bitter Malice's effect
2022-11-18 21:54:46 +01:00
Bassoonian
ed33f2b9ce
Change PLA moves to SV effects
2022-11-18 20:56:25 +01:00
Bassoonian
e279185152
Update move data to GEN9 (with config)
2022-11-18 12:22:15 +01:00
Bassoonian
f7d1a12d2d
Data entry for gen9 moves
2022-11-18 12:15:44 +01:00
ghoulslash
23acbb370d
Merge pull request #2447 from AsparagusEduardo/RHH/pr/version/1.3.0
...
Version 1.3.0
2022-11-17 21:25:13 -05:00
GriffinR
df470b75dd
Merge pull request #1817 from GriffinRichards/sync-wireless
...
Add cursor kind constants, sync wireless improvements
2022-11-17 15:18:20 -05:00
Eduardo Quezada
791c547b2c
Renamed missing overworld debug configs
2022-11-14 14:07:32 -03:00
Eduardo Quezada
540f4679bb
Implemented uses of Shiny config
2022-11-14 11:56:02 -03:00
Eduardo Quezada
011ec16f1e
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
LOuroboros
31a602f3b6
Optimized Intimidate's code
2022-11-12 18:03:46 -03:00
Eduardo Quezada D'Ottone
49b7328d32
Merge pull request #2451 from eatthepear/patch-1
...
Fix Berries that were broken after Bug Bite fix
2022-11-12 17:26:29 -03:00
eatthepear
bd4b660983
Fix Berries that were broken after Bug Bite fix
...
Issue #2448
Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works.
I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
2022-11-11 21:28:44 -05:00
Eduardo Quezada D'Ottone
6197e76875
Merge pull request #2449 from LOuroboros/patch-1
...
Uncommented level up moves
2022-11-11 01:46:42 -03:00
LOuroboros
7260478c54
Uncommented level up moves
2022-11-11 01:31:22 -03:00
GriffinR
601bb0b578
Index gBattleFrontierHeldItems
2022-11-10 16:14:06 -05:00
GriffinR
3b1c8dfb17
Update list menu graphics
2022-11-09 19:44:58 -05:00
Eduardo Quezada D'Ottone
a2b355f2a4
Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030
...
Support for Porymap 5.0.0 (pret merge 2022-10-30)
2022-11-09 20:15:15 -03:00
Eduardo Quezada
f2d0e547ac
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
Eduardo Quezada
bd63ef18af
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/pokemon_storage_system.c
2022-11-09 19:33:26 -03:00
GriffinR
e434b0047f
More missing constant usage
2022-11-09 15:53:47 -05:00
GriffinR
431a7ef8dd
Add missing cursorKind field usage
2022-11-09 15:37:47 -05:00
GriffinR
1d1c2d41bb
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da
Sync wireless improvements
2022-11-09 15:14:18 -05:00
GriffinR
9e24fe6ec8
Merge pull request #1816 from LOuroboros/patch-1
...
Fixed indentation in ScrCmd_faceplayer
2022-11-08 19:07:34 -05:00
LOuroboros
a35986fd9c
Fixed indentation in ScrCmd_faceplayer
2022-11-08 21:01:50 -03:00
Eduardo Quezada D'Ottone
e6ae0bd01e
Merge pull request #2434 from LOuroboros/badDreams
...
Optimized Bad Dreams' code
2022-11-08 08:16:07 -03:00
GriffinR
0a6de12b5e
Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc
...
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
2022-11-06 23:35:53 -05:00
Eduardo Quezada
237877e21b
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
2022-11-07 00:00:23 -03:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
...
Config for Dark Void being only usable by Darkrai
2022-11-05 22:42:51 +13:00
BuffelSaft
bbd7b205fd
Merge pull request #2433 from ghoulslash/be/bug_bite
...
Redo Bug Bite
2022-11-05 22:08:47 +13:00
LOuroboros
f56df74576
Optimized Bad Dreams' code
...
Misc:
-Made the ability pop up stick around until the ability's effect ends just like in ORAS.
-Updated sText_BadDreamsDmg accordingly while I was at it.
2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone
fa8bf80905
Merge pull request #2420 from LOuroboros/teleport
...
Updated CanTeleport
2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone
2b5aff2764
Merge pull request #2426 from tustin2121-2/patch-linker
...
GF Header and Modern Builds
2022-11-04 12:27:13 -03:00
BuffelSaft
d05c74b9e9
Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams
...
Fixed Bad Dream's ability popup message
2022-11-05 03:42:44 +13:00
ghoulslash
7a0e541413
workaround for GetBattlerHoldEffectParam to handle bug bite different battler id
2022-11-04 10:29:05 -04:00
