Eduardo Quezada
8d7ca894bd
Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder
...
# Conflicts:
# include/config/pokemon.h
# include/constants/pokemon.h
# include/constants/species.h
# include/pokedex.h
# sound/cry_tables.inc
# src/data/pokemon/species_info.h
# src/pokedex.c
# src/pokemon.c
# src/pokemon_debug.c
2022-11-29 18:43:59 -03: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
eec2c36b1a
Moved Gen 7 data to gBaseStats
2022-11-29 17:36:51 -03:00
Eduardo Quezada
cbb36b02a1
Now returns SPECIES_NONE data when there's no data defined for a species
2022-11-29 15:26:36 -03:00
Eduardo Quezada
8a285ac830
Fixed graphics during evolution scene
2022-11-29 11:41:17 -03:00
Eduardo Quezada
755df9b1cf
Ported female differences
2022-11-28 21:45:49 -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
Eduardo Quezada
a993c6c793
Removed enemyMonElevation from FRONT_SPRITE macro
2022-11-28 11:28:16 -03:00
Eduardo Quezada
6b8494036d
Removed unused species argument in DecompressPicFromTable
2022-11-28 10:49:32 -03:00
Eduardo Quezada
9d1ab936d5
Moved Gen 6 data to gBaseStats
2022-11-28 09:45:46 -03:00
Eduardo Quezada
46c99b040f
Moved Gen 5 data to gBaseStats
2022-11-27 20:25:08 -03:00
Eduardo Quezada
bb703bfd03
Fixed palette loading in summary screen
2022-11-27 14:04:11 -03:00
Eduardo Quezada
d6096c9c52
Moved Gen 4 data to gBaseStats
2022-11-27 12:20:10 -03: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
45eab8a292
Finally removed gLevelUpLearnsets and gTeachableLearnsets
2022-11-25 15:37:56 -03:00
Eduardo Quezada
88d9017237
Moved Gen 3 data to gBaseStats
2022-11-25 15:37:18 -03:00
Eduardo Quezada
5acc22a41d
Moved Gen 2 data to gBaseStats
2022-11-25 12:58:27 -03:00
Eduardo Quezada
7e12f5418f
Moved the rest of the Gen 1 data to gBaseStats
2022-11-25 10:48:52 -03:00
Eduardo Quezada
e3cffc0328
Ported Gen 4 dex entries
2022-11-24 18:34:45 -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
Eduardo Quezada
7a925a0611
Removed sSpeciesToBackAnimSet
2022-11-24 14:08:37 -03:00
Eduardo Quezada
df49fbedac
Get species name from National Dex number
2022-11-24 14:07:06 -03:00
Eduardo Quezada
a4c2a325f0
Changed gen 1-3 dex data into the dex macros
2022-11-24 13:15:19 -03:00
GriffinR
004ce32da0
Sync text ctrl codes with pokefirered
2022-11-23 21:13:00 -05:00
Eduardo Quezada
5b8be2a144
Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder
...
# Conflicts:
# data/battle_scripts_1.s
# src/data/pokemon/level_up_learnsets.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/pokemon.c
2022-11-21 17:52:19 -03:00
Eduardo Quezada
50117e8b4f
Removing data
2022-11-21 12:17:53 -03: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
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
