b86e8c883b
Added DizzyEgg's colored natures to summary screen
2023-11-13 20:53:25 +01:00
14574d6548
Added move type split icons in battle
2023-11-13 20:34:59 +01:00
Bassoonian
623e7c5f25
Add Frostbite status
2023-04-22 18:23:08 +02:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
68f97d02f4
Colorize menu_info.png
2023-01-12 13:17:31 -05: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
GriffinR
3b1c8dfb17
Update list menu graphics
2022-11-09 19:44:58 -05:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
4dec9b83a3
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
GriffinR
01af8e877f
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
GriffinR
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
GriffinR
d782d3544d
Move pokeblock graphics out of interface
2022-01-11 11:46:58 -05:00
GriffinR
565dd24309
Move party menu graphics out of interface
2022-01-11 11:37:13 -05:00
GriffinR
7103839a61
Move summary screen graphics out of interface, fix some names
2022-01-11 11:22:45 -05:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
17b657d83a
Finish menu documentation
2021-11-04 11:52:43 -04:00
GriffinR
085f8adec6
Start remaining menu documentation
2021-11-03 17:38:08 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
GriffinR
356e6d7f08
Clean up mystery gift menu
2021-10-16 23:58:11 -04:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
0dc7ff8994
Minor misc field doc
2021-04-06 17:17:41 -04:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
f58465a274
Document match_call.c
2021-04-01 03:29:15 -04:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
ultima-soul
46e853c13b
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:23:23 -08:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
DizzyEggg
271219f962
Merge with master
2020-09-08 12:00:51 +02:00
GriffinR
778bdb4d30
Document wallclock data
2020-08-29 15:55:28 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
DizzyEggg
35559d6b71
Merge with master
2020-08-27 10:58:31 +02:00
GriffinR
e947729d65
Start documenting use_pokeblock
2020-08-10 13:48:16 -04:00
DizzyEggg
4c3f40a361
Merge with master
2020-07-11 12:59:23 +02:00
DizzyEggg
e03fea84d0
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-07-11 12:46:41 +02:00
GriffinR
7632404ba5
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
DizzyEggg
013f9b6a17
merge wiith masteer and summary screen change
2020-05-29 12:50:54 +02:00
DizzyEggg
bdebab834c
Document pokemon summary screen
2020-05-18 14:03:01 +02:00
DizzyEggg
791ed999d9
Merge
2019-11-10 12:40:11 +01:00
GriffinR
e01ec84837
Document party_menu second pass
2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
DizzyEggg
0eaddd251c
Merge branch 'master' into item_expansion
2019-06-03 11:06:09 +02:00
Papa Cancer
e53ba4773d
Documenting bags, berries and graphics
...
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
DizzyEggg
42e7930987
Almost done with the balls
2019-04-14 21:49:31 +02:00
DizzyEggg
9ca2af0ce9
More pokeballs expansion
2019-04-14 12:13:44 +02:00
Slawter666
3b501cb470
Document battle ui
2018-11-22 01:10:50 +00:00
camthesaxman
89e6170748
remove some redundant .pal files
2018-02-06 11:46:34 -06:00
