Commit graph

112 commits

Author SHA1 Message Date
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
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
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -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
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
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
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
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
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08: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
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
Evan
280c68b531 renamed pokenav graphics file fixes 2020-10-11 09:11:12 -06:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +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
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +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
DizzyEggg
e00b76b8da Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 13:31:52 +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
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
DizzyEggg
887fb1b45c Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-03-13 22:45:51 +01:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
DizzyEggg
5fc298c4eb Add graphical fairy type 2019-12-30 18:34:30 +01:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00