ghoulslash
04e9c181ad
add covert cloak check for stats
2022-12-06 12:42:01 -05:00
ghoulslash
2391150274
Revert "CreateAbilityPopup always records ability"
...
This reverts commit c8661a1bc1
2022-12-06 11:25:27 -05:00
ghoulslash
c8661a1bc1
CreateAbilityPopup always records ability
2022-12-06 11:24:04 -05:00
ghoulslash
c327655ef5
small fixes
2022-12-06 11:12:20 -05:00
ghoulslash
5a26a69ccd
add some RecordItemEffect and RecordAbilityBattle situations, ai checks
2022-12-06 11:00:57 -05:00
ghoulslash
bdb480765c
add ability shield check to mummy, wandering spirit
2022-12-06 10:50:33 -05:00
ghoulslash
b6258adc6d
fix ShouldLowerStat clear amulet check
2022-12-06 10:43:01 -05:00
ghoulslash
6d28882e44
start gen9 hold effects
2022-12-06 09:48:36 -05:00
Eduardo Quezada D'Ottone
3718f58a0a
Merge pull request #2469 from LOuroboros/patch-1
...
Updated TryChangeBattleTerrain
2022-12-05 23:40:52 -03:00
LOuroboros
f9458117ee
Updated TryChangeBattleTerrain
2022-12-05 23:31:41 -03:00
Eduardo Quezada D'Ottone
63310df7c6
Merge pull request #2468 from LOuroboros/patch-1
...
Update INSTALL.md
2022-12-04 20:57:29 -03:00
LOuroboros
4d1494bf95
Update INSTALL.md
2022-12-04 20:48:17 -03:00
Eduardo Quezada D'Ottone
14e35a4831
Merge pull request #2466 from ghoulslash/be/slidefix
...
Set battler before BattleScript_TrainerSlideMsgRet
2022-11-29 22:22:19 -03:00
ghoulslash
6140cacbef
set BS_SCRIPING before BattleScript_TrainerSlideMsgRet
2022-11-29 18:28:33 -05:00
Eduardo Quezada D'Ottone
816bc46694
Merge pull request #2456 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221124
...
Gen 9 when? (Pret sync 2022/11/24)
2022-11-29 17:46:16 -03:00
Eduardo Quezada
9d1149c423
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# src/pokemon.c
2022-11-29 17:40:09 -03:00
Eduardo Quezada D'Ottone
7ab3d37a7c
Merge pull request #2464 from ghoulslash/be/callnative
...
add callnative bs func, convert metal burst dmg calc
2022-11-28 16:16:04 -03:00
ghoulslash
510fb56d74
distinguish callnative vs. various macrso
2022-11-28 11:57:34 -05:00
ghoulslash
b869b836cc
add callnative bs func, convert metal burst dmg calc
2022-11-28 10:34:27 -05:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP
...
Made Z-Moves unusable without PP
2022-11-28 09:52:28 -05:00
ghoulslash
ac30ebd5a4
Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny
...
Refactored Shiny configs + cleanup
2022-11-28 09:51:39 -05:00
ghoulslash
33873eff6f
Merge pull request #2460 from LOuroboros/rareCandiesLv100
...
Allow Lv100 'mons to access level based evos
2022-11-28 09:48:55 -05:00
BuffelSaft
70a10ebda0
Merge pull request #2462 from AsparagusEduardo/RHH/pr/fix/cries
...
Fix cry table alignment due to missing placeholder Enamorus Therian cry
2022-11-27 02:12:38 +13:00
Eduardo Quezada
65a33ed442
Fix cry table alignment due to missing placeholder Enamorus Therian cry
2022-11-26 09:20:54 -03:00
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
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
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
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
