Commit Graph

5929 Commits

Author SHA1 Message Date
Eduardo Quezada
1d76144e19 Commented out Gen 4+ abilities in base_stats.h 2020-10-16 17:05:34 -03:00
Eduardo Alvaro Quezada D'Ottone
f66b34ba42
Merge pull request #27 from LOuroboros/rhhpokeexp_evomap_tweak
Tweaked EVO_MAP evolutions
2020-10-16 12:41:26 -03:00
LOuroboros
16f4fda35b Tweaked EVO_MAP evolutions
The EVO_MAP evolution method was using numerical IDs instead of proper labels, which wasn't intuitive.
On top of that, there were better maps to choose for some of the species that made use of it.
2020-10-15 06:35:37 -03:00
ExpoSeed
857251d7f4
Merge pull request #4 from ExpoSeed/sync-pokemon-expansion
Sync pokemon expansion
2020-10-13 12:13:46 -05:00
ExpoSeed
a539045dae Relocate and redefine POKEMON_SLOTS_NUMBER 2020-10-13 12:05:42 -05:00
ExpoSeed
3f8d71b8fd Relocate POKEMON_SLOTS_NUMBER to avoid merge conflict 2020-10-12 21:24:35 -05:00
ExpoSeed
90d4359aeb Fix constants 2020-10-12 19:11:41 -05:00
ExpoSeed
81ac09af0b Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-12 12:45:42 -05:00
GriffinR
46212e0d14
Merge pull request #1230 from GriffinRichards/fixubcomm
Fix PutAwayDecorationLoop UB comment
2020-10-11 19:16:42 -04:00
GriffinR
1472111c5d Fix PutAwayDecorationLoop UB comment 2020-10-11 19:02:10 -04:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document
start pokenav documentation
2020-10-11 11:59:40 -04:00
Evan
280c68b531 renamed pokenav graphics file fixes 2020-10-11 09:11:12 -06:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
GriffinR
4efbdaf706
Merge pull request #1227 from kageru/pret
Document gUnknown_03006298
2020-10-11 07:17:09 -04:00
kageru
52ebc4252e
Document gUnknown_03006298 2020-10-11 09:54:49 +02:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
Evan
2b2be90a52 start pokenav documentation 2020-10-10 16:17:34 -06:00
GriffinR
13f37cf974
Merge pull request #1223 from GriffinRichards/constants-misc
Add ITEM6_HEAL constants, change move flags to shifts
2020-10-06 18:39:43 -04:00
GriffinR
ba18f4011a
Merge pull request #1225 from ExpoSeed/make-clean-rl
Add *.rl to make clean
2020-10-06 00:46:31 -04:00
ExpoSeed
8f7e212967 Remove *.rl in make clean 2020-10-05 23:33:55 -05:00
ExpoSeed
9c43bcb429 Delete accidentally pushed file 2020-10-05 23:33:36 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
22db85b4e9 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-05 11:28:15 -05:00
GriffinR
a33d4874d9
Merge pull request #1219 from ExpoSeed/bye-pr-template
Eliminate most of PR template
2020-10-04 23:38:42 -04:00
GriffinR
9b90a773d2
Merge pull request #1221 from AsparagusEduardo/Doc-newGameBerries
Documenting where each of the berries are generated in new_game.inc
2020-10-04 23:37:41 -04:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
Eduardo Quezada
96e4b43ce5 Documenting where each of the berries are generated in new_game.inc 2020-10-03 21:52:09 -03:00
PikalaxALT
4a773ce18d
Merge pull request #1217 from ipatix/fix_O3
rewrite MultiBootWaitCycles as naked function
2020-10-03 12:34:02 -04:00
PikalaxALT
f0012504c6
Merge pull request #1218 from MeatLoaf3/patch-3
Change toOrrX and toOrrY to u8 in void FillBitmapRect4Bit, glib/blit.c
2020-10-03 12:33:44 -04:00
ExpoSeed
94bfc31629 Eliminate most of PR template 2020-10-02 11:24:39 -05:00
MeatLoaf3
5f17b07d0c
Change toOrrX and toOrrY to u8 2020-10-02 11:17:11 -04:00
Michael Panzlaff
187c96d6e5 rewrite MultiBootWaitCycles as naked function
Before, when compiling MultiBootWaitCycles with O3 and MODERN=1, you
might have run into problems during optimizations when the compiler tried
to optimize the function, even if declared NOINLINE.

When rewriting this function as NAKED function, this no longer happens
as the optimizer will treat it as black box and compilation will resume.
2020-10-02 12:27:16 +02:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Revo
22c6c03429 Remove unnecessary comments 2020-10-01 17:06:33 -05:00
Revo
7f1fa72746 :masuda: 2020-10-01 17:06:33 -05:00
ProjectRevoTPP
7c697e9536 Resolve fakematch CopyGlyphToWindow. 2020-10-01 17:06:33 -05:00
PikalaxALT
cb69835536
Merge pull request #1210 from ExpoSeed/pull-request-template
More concise pull request template
2020-09-27 19:25:19 -04:00
ExpoSeed
933e180dd6 Remove breaking change line 2020-09-27 18:09:35 -05:00
ExpoSeed
70f7d4f256 More concise pull request template 2020-09-27 17:59:21 -05:00
PikalaxALT
46d748a219
Create pull_request_template.md 2020-09-27 17:40:30 -04:00
PikalaxALT
00b8208914
Merge pull request #1205 from GriffinRichards/constants-itemdigits
Use constants for item digits
2020-09-27 17:24:48 -04:00
GriffinR
f8ce2efb55
Merge pull request #1206 from ExpoSeed/script-command-comments
Comments for script command tables
2020-09-25 15:13:38 -04:00
ExpoSeed
032669e2ab Change script command table comment alignment from tabs to spaces 2020-09-25 14:05:17 -05:00
ExpoSeed
3860551777 Mark unused script commands 2020-09-25 13:41:17 -05:00
ExpoSeed
31d12383b1 Add byte comments to mystery event script command table 2020-09-25 13:27:15 -05:00
ExpoSeed
e7340ca0e1 Add byte comments to script command table 2020-09-25 13:25:36 -05:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04:00
GriffinR
541eff3c73
Merge pull request #1204 from Kurausukun/rename-2
one more instrument
2020-09-23 23:39:12 -04:00
Kurausukun
04bf1d433a one more instrument
oops just found this one
2020-09-23 22:31:12 -04:00
GriffinR
47b5b75a1d
Merge pull request #1201 from tustin2121/tustin2121-patch-8
Documenting the trainer hill floor data
2020-09-20 15:20:24 -04:00