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 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
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
|
cce9918908
|
Add Wnum_tiles to additional num_tiles rules
|
2022-08-18 23:13:27 -04:00 |
|
Martin Griffin
|
5e593a62fb
|
Ignore num_tiles if it would truncate non-transparent tiles (#1729)
|
2022-08-18 23:07:25 -04:00 |
|
GriffinR
|
bfdbbad468
|
Split naming screen palettes/graphics, use correct image palettes, clean up
|
2022-08-09 09:27:28 -04:00 |
|
sneed
|
ef496ddb9d
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim
|
2022-05-19 00:54:16 +03:00 |
|
sneed
|
09bace2b26
|
fix cherrim sprite
|
2022-05-19 00:40:54 +03:00 |
|
sneed
|
5a4c165bea
|
fix 4bpp instead of gbapal
|
2022-05-18 21:27:47 +03:00 |
|
sneed
|
49abca345d
|
back_normal.4bpp to normal/back.4bpp
|
2022-05-18 21:11:39 +03:00 |
|
sneed
|
8c15c5b6d7
|
fix castform sprite
|
2022-05-18 20:47:14 +03:00 |
|
ultima-soul
|
84a7f960c8
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2022-02-28 23:37:41 -08: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
|
565dd24309
|
Move party menu graphics out of interface
|
2022-01-11 11:37:13 -05:00 |
|
GriffinR
|
23f5c9fd5c
|
Clean up pokedex_area_screen
|
2021-12-31 00:16:56 -05:00 |
|
ultima-soul
|
01a90ca6c2
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-11-27 22:17:05 -08:00 |
|
ultima-soul
|
57bf1c7824
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-11-21 10:41:12 -08:00 |
|
GriffinR
|
baeacbe2f1
|
Clean up pokenav general menus, organize pokenav graphics
|
2021-11-12 17:08:12 -05:00 |
|
GriffinR
|
e14210ce1f
|
Merge pull request #1536 from GriffinRichards/clean-braille
Add font id constants, better braille support
|
2021-11-03 13:17:29 -04:00 |
|
GriffinR
|
36039e1b86
|
Convert fonts.s to C
|
2021-10-31 01:44:18 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
a470e2c761
|
Tabs to spaces for graphics_file_rules alignment
|
2021-10-27 14:07:56 -04:00 |
|
GriffinR
|
41ecae91f8
|
Label remaining symbols in graphics.c
|
2021-10-27 13:47:18 -04:00 |
|
ultima-soul
|
cf0fd961b9
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-28 23:56:58 -07:00 |
|
ultima-soul
|
0da3f74a7e
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-28 18:58:38 -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
|
dbe24f0baa
|
Clean up contest_painting
|
2021-04-21 20:04:12 -04:00 |
|
GriffinR
|
838a452363
|
Doc storage - choose box menu, move wallpaper gfx
|
2021-04-15 18:46:20 -04:00 |
|
ultima-soul
|
56a1cab314
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-03-23 15:21:19 -07:00 |
|
GriffinR
|
cbc7a72814
|
Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
|
2021-02-28 11:19:02 -05:00 |
|
Marcus Huderle
|
c900de35e7
|
Fix build and cleanup mistakes
|
2021-02-28 09:54:55 -06:00 |
|
GriffinR
|
117b90a261
|
Document pokemon jump
|
2021-02-26 17:26:39 -05:00 |
|
Eduardo Quezada
|
92728a1875
|
Added Ultimasoul's Forms from his FromID system.
|
2020-10-23 11:44:47 -03:00 |
|
ExpoSeed
|
81ac09af0b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion
|
2020-10-12 12:45:42 -05:00 |
|
Evan
|
280c68b531
|
renamed pokenav graphics file fixes
|
2020-10-11 09:11:12 -06:00 |
|
DizzyEggg
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +02:00 |
|
DizzyEggg
|
c2733236be
|
Merge with master
|
2020-08-27 11:36:35 +02:00 |
|
GriffinR
|
95ea0e92e7
|
Start documenting rayquaza_scene
|
2020-08-25 17:49:42 -04:00 |
|
GriffinR
|
868f831167
|
More roulette doc
|
2020-08-04 14:25:13 -04:00 |
|
GriffinR
|
22b5b6b074
|
Start documenting roulette
|
2020-07-30 19:37:16 -04:00 |
|
DizzyEggg
|
43359f39c3
|
Merge with master
|
2020-07-27 15:28:03 +02:00 |
|
DizzyEggg
|
ff5fc97859
|
Merge with master
|
2020-07-11 14:07:10 +02:00 |
|
GriffinR
|
72edc46ab6
|
Document unk_transition
|
2020-07-02 15:45:37 -04:00 |
|
DizzyEggg
|
f608ae9f70
|
make battle transition OK ok Ok oK
|
2020-06-02 13:30:05 +02:00 |
|
DizzyEggg
|
88bdeed1a6
|
Merge with master
|
2020-04-15 14:40:16 +02:00 |
|
GriffinR
|
715e0d7f64
|
Fix indentation in graphics_file_rules.mk
|
2020-04-12 13:13:02 -04:00 |
|
GriffinR
|
d478156ad9
|
Split stormy_water png for kyogre/groudon
|
2020-04-12 13:04:05 -04:00 |
|
DizzyEggg
|
887fb1b45c
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2020-03-13 22:45:51 +01:00 |
|