Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
GriffinR
|
bfdbbad468
|
Split naming screen palettes/graphics, use correct image palettes, clean up
|
2022-08-09 09:27:28 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
hamish
|
307d5d93c4
|
add potlergeist animation
|
2022-05-23 08:53:08 -04: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 |
|
ultima-soul
|
86089ce935
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2022-02-28 22:13:14 -08: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
|
fde18b4774
|
Fix berry crusher graphics name
|
2022-01-11 10:42:00 -05:00 |
|
GriffinR
|
0a78cb5c9e
|
Fix some battle dome graphics names
|
2022-01-11 10:04:47 -05:00 |
|
GriffinR
|
3acf002a9c
|
Rename generic jp contest tilemaps
|
2021-12-28 13:16:40 -05:00 |
|
GriffinR
|
ee5e65d9ed
|
Rename generic title screen tilemaps
|
2021-12-28 03:57:44 -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 |
|
Blackforest92
|
76ba9d835a
|
pulled latest RHH battle_engine 08-11-2021
|
2021-11-08 16:38:42 +07:00 |
|
GriffinR
|
085f8adec6
|
Start remaining menu documentation
|
2021-11-03 17:38:08 -04:00 |
|
Blackforest92
|
b9c23f7c62
|
Update waterfall, trick room, & focus blast BG
|
2021-11-03 16:29:09 +07:00 |
|
Blackforest92
|
2d5ed4a1e2
|
Allow Giga Impact fadein background & upgrade its graphic
|
2021-11-02 12:53:11 +07:00 |
|
Eduardo Quezada D'Ottone
|
f3013d8ee9
|
Standarized Solarbeam into Solar Beam
|
2021-11-01 18:36:35 -03:00 |
|
Blackforest92
|
9b6cd383a4
|
Optimized Rock Wrecker and Hurricane
|
2021-11-01 01:06:39 +07:00 |
|
Blackforest92
|
e59d0dd5cf
|
clean Spacial Rend background
|
2021-10-31 22:58:43 +07:00 |
|
LOuroboros
|
10cda70129
|
Fixed Pikalax's PR
|
2021-10-30 11:51:29 -03:00 |
|
Blackforest92
|
799852ea77
|
Introduce alternate Steel Beam
|
2021-10-30 17:00:55 +07:00 |
|
GriffinR
|
41ecae91f8
|
Label remaining symbols in graphics.c
|
2021-10-27 13:47:18 -04:00 |
|
LOuroboros
|
91a68cd5db
|
Implemented Primal Reversion
|
2021-10-09 00:36:41 -03:00 |
|
GriffinR
|
b183a793a1
|
Move more gfx symbols into gHealthboxElementsGfxTable
|
2021-09-06 17:45:10 -04:00 |
|
froggestspirit
|
71da126dbb
|
case
|
2021-09-06 16:41:59 -04:00 |
|
froggestspirit
|
f8a24cdd6f
|
Identify unknown healthbox GFX
|
2021-09-06 10:42:05 -04:00 |
|
LOuroboros
|
69b7910f47
|
Gave an entrance animation to Delta Stream
|
2021-08-31 00:15:17 -03:00 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
ultima-soul
|
b620349da0
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-16 15:43:27 -07:00 |
|
GriffinR
|
3e60a78406
|
Merge branch 'master' into doc-frontierpass2
|
2021-07-31 13:30:40 -04:00 |
|
GriffinR
|
602855ea99
|
Document frontier pass
|
2021-07-31 13:28:08 -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
|
56fc420187
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-28 21:34:30 -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
|
18f85b5cf0
|
Merge pull request #1415 from GriffinRichards/doc-contestutil
Some Contest clean up
|
2021-04-27 02:29:41 -04:00 |
|
GriffinR
|
c0aedf8df4
|
Merge pull request #1410 from GriffinRichards/doc-tradedata
Document trade sequence animation, some trade cleanup
|
2021-04-26 13:26:12 -04:00 |
|
GriffinR
|
a2a9f22612
|
Clean up contest_util
|
2021-04-20 21:16:47 -04:00 |
|
GriffinR
|
04af378904
|
Document trade sequence animation, some trade cleanup
|
2021-04-20 05:50:39 -04:00 |
|
GriffinR
|
cd2a99b7c4
|
Doc storage - misc cleanup, some item/cursor
|
2021-04-17 13:33:29 -04:00 |
|
GriffinR
|
838a452363
|
Doc storage - choose box menu, move wallpaper gfx
|
2021-04-15 18:46:20 -04:00 |
|
GriffinR
|
042a2ecc41
|
Document pokeblock feed scene
|
2021-04-12 18:44:37 -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 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04:00 |
|