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 |
|
GriffinR
|
79a34411ce
|
Add additional DISPLAY_TILE_WIDTH usage
|
2022-09-29 15:22:21 -04:00 |
|
GriffinR
|
1ae5010233
|
Merge pull request #1794 from SBird1337/doc/decompress-casts
[doc] clean up casts in decompress.c
|
2022-09-29 11:40:02 -04:00 |
|
sbird
|
8dad7cc649
|
[doc] clean up casts in decompress.c
|
2022-09-29 17:33:39 +02:00 |
|
Eduardo Quezada
|
90ad11278d
|
Sorry Mewtwo ^^;
|
2022-09-28 09:17:10 -03:00 |
|
Eduardo Quezada
|
d24899369f
|
Special handling for Mew's Teachable moveset
|
2022-09-28 09:04:31 -03:00 |
|
GriffinR
|
6db489e2d5
|
Use constants for overworld object palette slots
|
2022-09-27 20:16:48 -04:00 |
|
GriffinR
|
4f407a1066
|
Convert tilesets.s to C
|
2022-09-27 17:23:26 -04: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 |
|
Eduardo Quezada
|
5ca1b927e6
|
Added missing Bide exception to Battle Arena Mind Points
|
2022-09-27 08:13:32 -03:00 |
|
Eduardo Quezada D'Ottone
|
757ed2ebd4
|
Merge pull request #2364 from ghoulslash/be/trace
Trace records target ability
|
2022-09-27 08:00:27 -03:00 |
|
ghoulslash
|
253234378c
|
trace records target ability
|
2022-09-26 23:46:41 -04:00 |
|
ghoulslash
|
6e276b5f4d
|
Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings
Extrapolated Battle Arena's move Mind ratings
|
2022-09-26 21:04:16 -04:00 |
|
Eduardo Quezada
|
ae21e1626e
|
Reworked Mind Points
|
2022-09-26 21:20:08 -03:00 |
|
GriffinR
|
e515e52abb
|
Add DISPLAY_TILE_* constants
|
2022-09-26 19:52:17 -04:00 |
|
ghoulslash
|
ff42806e04
|
Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix
Multi battle interface fix
|
2022-09-26 09:12:40 -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 |
|
ghoulslash
|
e41c2efc39
|
Merge pull request #2361 from AsparagusEduardo/RHH/pr/moveTypeConfig
Separate config for updated move types
|
2022-09-26 09:08:41 -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 |
|
GriffinR
|
f0744641d1
|
Merge pull request #1651 from garakmon/entry_json
use json for region map sections
|
2022-09-25 21:56:09 -04:00 |
|
GriffinR
|
171367d66c
|
Merge pull request #1643 from cbt6/object-event-graphics-info
Format object event graphics info
|
2022-09-25 21:55:22 -04:00 |
|
GriffinR
|
45e6b48170
|
Merge pull request #1636 from GriffinRichards/rme-update
Updates to region map for Porymap
|
2022-09-25 21:54:26 -04:00 |
|
GriffinR
|
b8bf9dea56
|
Merge pull request #1791 from AsparagusEduardo/pret/pr/unk40EF
Documented unk40EF in Summary Screen
|
2022-09-25 21:50:37 -04:00 |
|
Eduardo Quezada
|
5054cf3586
|
Documented unk40EF in Summary Screen
|
2022-09-25 21:33:20 -03:00 |
|
GriffinR
|
f695ddd1ba
|
Ignore new Porymap config
|
2022-09-25 18:34:07 -04:00 |
|
GriffinR
|
56c28fb2dd
|
Move region map gitignore to existing data gitignore
|
2022-09-25 18:15:16 -04:00 |
|
GriffinR
|
e473aaf783
|
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
|
2022-09-25 18:10:04 -04:00 |
|
Eduardo Quezada
|
057f76bfe6
|
Cleaned up missing JOY macros
|
2022-09-25 13:05:18 -03:00 |
|
GriffinR
|
7223dbd62f
|
Merge branch 'master' into rme-update
|
2022-09-25 11:56:57 -04: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
|
2a02cefc81
|
Merge pull request #2358 from LOuroboros/PeeCee
Fixed IsPlayerInFrontOfPC
|
2022-09-25 08:36:43 -03:00 |
|
Eduardo Quezada D'Ottone
|
3b983aae14
|
Apply suggestions from code review
|
2022-09-25 08:31:24 -03:00 |
|
LOuroboros
|
a9ab3286ef
|
Fixed IsPlayerInFrontOfPC
|
2022-09-25 05:51:08 -03:00 |
|
GriffinR
|
4579efe4c7
|
Merge pull request #1790 from AsparagusEduardo/pret/pr/namingScreenGender
Gender icon in naming screen based on Pokémon name length
|
2022-09-24 23:27:40 -04:00 |
|
Eduardo Quezada
|
0f35f080ec
|
Gender icon in naming screen based on Pokémon name length
|
2022-09-24 23:48:24 -03:00 |
|
Eduardo Quezada D'Ottone
|
b8aa34af81
|
Merge pull request #2357 from LOuroboros/patch-2
Update field_specials.c
|
2022-09-24 22:35:58 -03:00 |
|
LOuroboros
|
8e9bfda120
|
Update field_specials.c
|
2022-09-24 22:22:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
13573b6e53
|
Merge pull request #2356 from LOuroboros/PeeC
Modified the debug menu's PC access
|
2022-09-24 22:18:21 -03:00 |
|
LOuroboros
|
00eb67608a
|
Small tweak to the new check in PCTurnOffEffect
|
2022-09-24 22:10:46 -03:00 |
|
GriffinR
|
d8b3919063
|
Ignore Porymap's prefabs file
|
2022-09-24 18:27:53 -04:00 |
|
LOuroboros
|
5500e64a71
|
Reworked the debug menu's PC access
|
2022-09-24 17:26:41 -03:00 |
|
Eduardo Quezada D'Ottone
|
e950da02f3
|
Merge pull request #2121 from LOuroboros/teleport
Updated Teleport
|
2022-09-24 14:53:45 -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 |
|
Eduardo Quezada D'Ottone
|
0f743c4f00
|
Merge pull request #2117 from AgustinGDLV/symbiosis
ABILITY_SYMBIOSIS
|
2022-09-24 14:30:39 -03:00 |
|
Eduardo Quezada D'Ottone
|
0fa8e20d08
|
Style changes from upstream
|
2022-09-24 14:20:07 -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 |
|