Abaresk
7f09894045
Merge branch 'master' into thunder
2022-10-18 04:37:56 +00:00
Marcus Huderle
48ab684b48
Fix weather color map documentation
2022-10-17 17:41:27 -07:00
tustin2121
327c648e87
Document seldom-used trigger functionality
...
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
1607291982
Implemented Honey's Sweet Scent functionality
2022-10-16 20:20:13 -03:00
Abaresk
e67d55bfc4
Fix names
2022-10-15 13:37:24 +00:00
Abaresk
b538239f18
Add more documentation to thunder weather
2022-10-15 04:25:35 +00:00
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
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
...
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93
Give tileset palettes proper type, name compressed secret base tiles
2022-10-08 02:02:12 -04: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
453da8aa8c
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-07 15:49:00 -03:00
Eduardo Quezada
77f24d42e4
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
2022-10-07 15:39:02 -03:00
Eduardo Quezada
44754f8ca7
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
...
# 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-07 15:27:16 -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
0370cb3fd2
Removed comment MAP_GROUP_COUNT
2022-09-30 22:05:10 -03:00
GriffinR
fb87616e9d
Use window constants in mystery_gift_menu
2022-09-29 15:48:19 -04:00
GriffinR
4af1044439
Use window constants in region_map
2022-09-29 13:11:38 -04:00
GriffinR
16be1e8447
Use window constants for move relearner
2022-09-29 12:10:10 -04: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
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
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
