Commit Graph

6087 Commits

Author SHA1 Message Date
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
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -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
tustin2121
be9100fe52 Review changes 2020-09-20 13:04:20 -04:00
GriffinR
1d1035a01f
Merge pull request #1196 from Kurausukun/rename_instruments
rename instruments (again)
2020-09-20 12:30:57 -04:00
tustin2121
832be34898 More documenting trainer hill
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
2020-09-20 01:50:54 -04:00
tustin2121
0d3646c0b9 Trainer hill location data
Changed the trainer hill data for trainer locations, directions, and ranges from vague unusable numbers into readable data via use of preprocessor macros.
2020-09-20 01:09:22 -04:00
Kaz
32ae13f9b6 walda_phrase.c: Proper sub_81D9C90 match GET. 2020-09-19 19:03:07 -04:00
GriffinR
0b592228c5
Merge pull request #1186 from kiliwily/DocSomeBugs
Document some bugs
2020-09-19 18:09:49 -04:00
Kaz
94711208a2 menu_specialized.c: Fix fakematches. 2020-09-19 17:38:54 -04:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix.
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04:00
kiliwily
f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00
kiliwily
56848fb891 Update battle_util.c 2020-09-19 20:44:16 +02:00
PikalaxALT
0088f59b1d
Merge pull request #1197 from MeatLoaf3/patch-1
Changed casts to volatile
2020-09-19 10:28:45 -04:00
PikalaxALT
b352d1be32
Merge pull request #1198 from PokeCodec/patch-1
Specify to install Libpng-dev, not libpng
2020-09-18 16:46:51 -04:00
Seija
f5457cd1fd
Libpng-devel
libpng dev library needs to be installed, not libpng
2020-09-18 16:25:46 -04:00
MeatLoaf3
0e74de0f9e
Changed casts to volatile
devkitArm wouldn't copy the bits properly in some instances. Casting as volatile solved the issue
2020-09-18 13:26:36 -04:00
Kurausukun
30e3437891 rename instruments (again) 2020-09-17 23:52:57 -04:00
GriffinR
a3a558acf4
Merge pull request #1195 from Kurausukun/audio-macro
Update Audio Macros
2020-09-17 20:10:57 -04:00
Kurausukun
f4a49dcd1d Make all arguments for audio macros required 2020-09-17 19:56:55 -04:00
Kaz
1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
Kurausukun
b9644e9583 Update Audio Macros
Information: Our current audio macros preclude the definition of root
key and pan (applicable when used in drumsets, aka "keysplit_all") for
GB channels. However, this functionality does exist in m4a--Pokemon
Emerald just happens not to use it. However, for the sake of people
working with custom music, I believe these values should be modifiable
by users.

Additionally, given the recent events that have occurred with this repo,
I would like to make something fully clear: I have indeed looked at the
GBA SDK before, which contains notes on how these sounds are defined;
therefore, I cannot blame you if you reject this PR on the grounds that
the information is "tainted." However, this information is readily
available and matches the same macros used for directsound--it's hardly
information that one would need the source to know.
2020-09-17 03:12:19 -04:00
Kaz
c724f2b809 battle_ai_script_commands.c: -g fixes the fakematch. 2020-09-16 22:01:45 -04:00
Kaz
5a70f99e16 battle_script_commands.c: Eliminate the last nonmatching (swapped expressions). 2020-09-16 21:39:44 -04:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -04:00
GriffinR
62b79018dc
Merge pull request #1194 from ExpoSeed/typo-fix
Complete TMHM Learnset description
2020-09-16 14:21:21 -04:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00