Eduardo Quezada D'Ottone
|
4cbc6d4de1
|
Config for running indoors
|
2022-10-14 22:31:45 -03:00 |
|
LOuroboros
|
90f79999bb
|
Added class-based Poké Balls for trainers
Thanks to Ghoulslash for helping me optimizing things.
|
2022-10-14 11:14:30 -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 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
|
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 |
|
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 |
|
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 |
|
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 |
|
LOuroboros
|
5f67335212
|
Fixed typo in BoxMonKnowsMove
|
2022-09-19 05:21:54 -03:00 |
|
Eduardo Quezada D'Ottone
|
681ad8c7a9
|
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
# Conflicts:
# 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_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-09-18 18:25:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
293a880238
|
Apply suggestions from code review
|
2022-09-18 00:50:21 -03:00 |
|
Ct11217
|
5f74781a7d
|
Remove ACE_POKEMON_FUNCTIONALITY
|
2022-09-17 17:44:50 -06:00 |
|
ghoulslash
|
8bbe1b9037
|
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:03:33 -04:00 |
|
Eduardo Quezada
|
6b79c7772c
|
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_interface.c
|
2022-09-16 11:56:50 -03:00 |
|
Eduardo Quezada
|
672f572ff8
|
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:04:30 -03:00 |
|
Eduardo Quezada D'Ottone
|
7825153bb2
|
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
Exp Candy Fixes
|
2022-09-15 22:46:59 -03:00 |
|
ghoulslash
|
6616c89451
|
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
Tidying graphics - Trio Weather
|
2022-09-15 18:01:43 -04:00 |
|
ghoulslash
|
354a8256e4
|
Merge pull request #2226 from Porygon23/AI-Logic-Updates
Added corner case logic for AI Switching.
|
2022-09-15 17:56:35 -04:00 |
|
Eduardo Quezada
|
bca1267ca8
|
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
|
2022-09-15 14:52:18 -03:00 |
|
Eduardo Quezada
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|
Eduardo Quezada
|
1d7e8bd730
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
|
2022-09-13 16:22:42 -03:00 |
|
GriffinR
|
91c040b081
|
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
|
2022-09-13 14:00:11 -04:00 |
|
GriffinR
|
4c34babb4d
|
Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
|
2022-09-12 22:02:46 -04:00 |
|