Eduardo Quezada
|
0f53923bd9
|
Different amount of flags for seen vs caught
|
2022-10-10 17:22:59 -03:00 |
|
Eduardo Quezada
|
69243b7618
|
Function to get form tables
|
2022-10-10 16:52:19 -03:00 |
|
Eduardo Quezada
|
24d2a1765e
|
Form species tables based on national dex number
|
2022-10-10 16:49:01 -03:00 |
|
Eduardo Quezada
|
58436a077b
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/breaking/speciesReorder
# Conflicts:
# src/data/pokemon/base_stats.h
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon/teachable_learnsets.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-10-10 11:50:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
2ce340e8e1
|
Merge pull request #2262 from LOuroboros/becomingAHero
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
|
2022-10-07 18:27:29 -03:00 |
|
ghoulslash
|
06bddbac23
|
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
One for the go! (pret merge 2022/10/07)
|
2022-10-07 17:14:00 -04:00 |
|
Eduardo Quezada
|
8ea060044a
|
Battle text pauses config
|
2022-10-07 17:22:29 -03:00 |
|
Eduardo Quezada
|
2a8048b677
|
Removed ItemId_GetId like in upstream
|
2022-10-07 14:53:58 -03:00 |
|
Eduardo Quezada
|
68b474c0f0
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
|
2022-10-07 14:52:32 -03:00 |
|
Eduardo Quezada
|
9b977486fe
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
# Conflicts:
# src/data/pokemon/base_stats.h
|
2022-10-07 14:05:45 -03:00 |
|
LOuroboros
|
50ca188cb2
|
Replaced didMegaEvo with a shiny new species flag
|
2022-10-07 12:32:36 -03:00 |
|
LOuroboros
|
02c6bc64b2
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero
|
2022-10-07 12:20:52 -03:00 |
|
ghoulslash
|
441586f23f
|
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
|
2022-10-07 10:55:43 -04:00 |
|
ghoulslash
|
923046c993
|
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
|
2022-10-07 10:25:59 -04:00 |
|
GriffinR
|
e293986fbb
|
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
|
2022-10-06 17:24:53 -04:00 |
|
GriffinR
|
c6e4c29ea3
|
Merge pull request #1792 from GriffinRichards/display-tiles
Add DISPLAY_TILE_* constants
|
2022-10-05 20:44:28 -04:00 |
|
Eduardo Quezada
|
a20334f79a
|
Removed unused functions in item header
|
2022-10-04 22:06:07 -03:00 |
|
Eduardo Quezada
|
fe107645f7
|
Merged pallete conversion
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-10-02 16:01:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
af171eb4d4
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
# Conflicts:
# src/pokemon_summary_screen.c
|
2022-10-01 17:32:32 -03:00 |
|
Eduardo Quezada
|
0370cb3fd2
|
Removed comment MAP_GROUP_COUNT
|
2022-09-30 22:05:10 -03:00 |
|
Eduardo Quezada
|
ccb8d7a857
|
Reordered evolutions and added constants for new evo methods
|
2022-09-28 00:15:45 -03:00 |
|
Eduardo Quezada
|
5b4a23b672
|
include/graphics.h
|
2022-09-27 21:09:09 -03:00 |
|
Eduardo Quezada
|
ecad6ff0db
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
|
2022-09-27 10:46:49 -03:00 |
|
Eduardo Quezada
|
fb9105f8ac
|
Added Mega Evolution flag
|
2022-09-27 10:21:26 -03:00 |
|
Eduardo Quezada
|
3d214f8204
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
# Conflicts:
# src/pokemon.c
|
2022-09-27 10:13:32 -03:00 |
|
GriffinR
|
e515e52abb
|
Add DISPLAY_TILE_* constants
|
2022-09-26 19:52:17 -04:00 |
|
Eduardo Quezada
|
4c7b6d1662
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/speciesReorder
# Conflicts:
# src/battle_script_commands.c
|
2022-09-26 17:46:30 -03:00 |
|
ghoulslash
|
8ecdf68491
|
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix
Fixes: Pokémon Debug isn't loading female icon palettes correctly
|
2022-09-26 09:09:14 -04:00 |
|
Eduardo Quezada
|
dfdfb72365
|
Separate config for updated move types
|
2022-09-26 07:50:43 -03:00 |
|
TheXaman
|
886a487bf1
|
Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes
|
2022-09-26 12:40:30 +02:00 |
|
Eduardo Quezada
|
5054cf3586
|
Documented unk40EF in Summary Screen
|
2022-09-25 21:33:20 -03:00 |
|
Eduardo Quezada
|
f969effd36
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
|
2022-09-25 12:51:39 -03:00 |
|
Eduardo Quezada D'Ottone
|
17c8842ad4
|
Merge branch 'dev' into teleport
|
2022-09-24 14:39:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
38df216ebd
|
Merge pull request #2355 from ghoulslash/be/aiparty
Add overwrittenAbilities field
|
2022-09-24 14:33:02 -03:00 |
|
ghoulslash
|
c22671d2a2
|
add overwrittenAbilities field
|
2022-09-24 12:12:31 -04:00 |
|
Eduardo Quezada D'Ottone
|
a483899043
|
Merge branch 'dev' into symbiosis
|
2022-09-24 11:58:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
d59d8b92af
|
Merge branch 'dev' into AI
|
2022-09-24 11:07:09 -03:00 |
|
Eduardo Quezada
|
9a03435284
|
Ordering grapjics
|
2022-09-23 22:26:49 -03:00 |
|
GriffinR
|
9b6b164aad
|
Merge pull request #1768 from SBird1337/feature/mgba-print
[debug] add support for mgba printf
|
2022-09-23 13:49:48 -04:00 |
|
Eduardo Quezada
|
7ed16b55ed
|
Scatterbug and Spewpa forms
|
2022-09-23 07:56:27 -03:00 |
|
sbird
|
343d7f7d26
|
[debug] do not use heap allocation for MgbaPrintf
|
2022-09-23 04:12:57 +02:00 |
|
sbird
|
12670e8e3e
|
[debug] simplify macros, add EX versions
|
2022-09-23 03:48:58 +02:00 |
|
sbird
|
22329d3318
|
[debug] use boolean constants for nStopProgram
|
2022-09-23 03:23:44 +02:00 |
|
sbird
|
44a5a8d31e
|
[debug] fix AGBAssert for AGBPrintf debug block
|
2022-09-23 03:22:57 +02:00 |
|
GriffinR
|
1107ff954d
|
Clean up shop.c
|
2022-09-22 15:08:17 -04:00 |
|
Eduardo Quezada
|
eda1dce876
|
More reordering, using form constants
|
2022-09-21 22:31:33 -03:00 |
|
Eduardo Quezada
|
ad89897500
|
Using base forms in tables
|
2022-09-20 08:18:00 -03:00 |
|
Eduardo Quezada
|
a6a032c3cf
|
Using base forms in tables
|
2022-09-20 00:00:34 -03:00 |
|
Eduardo Quezada
|
268b666104
|
Fixed order + Cry orders
|
2022-09-19 22:26:53 -03:00 |
|
Eduardo Quezada
|
ff34d0efd3
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/concept/speciesReorder
# Conflicts:
# src/data/pokemon/base_stats.h
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon/level_up_learnsets.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-09-19 19:26:24 -03:00 |
|