Commit Graph

59 Commits

Author SHA1 Message Date
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
GriffinR
c291fa8e7f Propagate BG_COORD constants 2021-11-03 23:02:06 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -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
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -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
ExpoSeed
361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -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
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
GriffinR
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -05:00
GriffinR
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
GriffinR
1220f0655c Revert to original battle factory gcc 10 fix 2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a Fix typo 2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735 Condense fix for battle factory on gcc 10 2020-11-04 16:43:59 -05:00
GriffinR
c59a818462 Fix battle factory on gcc 10 2020-11-04 15:35:22 -05:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR
adcffd3f0e WIP More factory screen doc 2020-09-03 01:19:08 -04:00
GriffinR
bf61de01a7 Start documenting battle factory screen 2020-08-31 13:36:48 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
Document starter_choose.c
2020-07-17 16:02:10 -04:00
GriffinR
1c75396276 Clean up some frontier mon use in battle factory 2020-07-13 00:47:30 -04:00
GriffinR
43c48d95c2 Document starter_choose.c 2020-07-06 17:26:25 -04:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
c26e8b8ddb More SPRITE macro usage 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
e03595a10d Bugfixes from #591 2019-03-03 09:31:08 -06:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c
Mostly variables mislabeled as global and some formerly unknown stuff.
2019-02-23 21:12:35 -05:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00