Commit Graph

468 Commits

Author SHA1 Message Date
grunt-lucas
32dcea0cdb
Fix issue with Enamorus Therian cry define order (#2956) 2023-04-26 15:08:15 -04:00
Alex
487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01:00
Eduardo Quezada
ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Eduardo Quezada
bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Alex
a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
Alex
a86b870cfd PLA cries 2023-02-22 23:06:22 +01:00
Eduardo Quezada
65a33ed442 Fix cry table alignment due to missing placeholder Enamorus Therian cry 2022-11-26 09:20:54 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
#	src/data/pokemon/form_species_table_pointers.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation.
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
2022-08-30 12:50:59 -04:00
Blackforest92
07a07ddc8d Update to latest master branch + allow Reveal Glass to work with Enamorus 2022-08-24 15:00:48 +07:00
Eduardo Quezada
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
Kurausukun
04013fbdf2 forgot we could do this 2022-01-22 19:41:31 -05:00
Kurausukun
a83e41b2cc move m4a track definitions 2022-01-22 19:37:46 -05:00
laqieer
1c6232bc2e Fix macro v069 in sound/MPlayDef.s 2022-01-08 00:58:05 +08:00
Eduardo Quezada D'Ottone
3779396d74 Adjusted sample rate for Noibat and Oricorio + slightly fixed Klefki 2022-01-03 20:30:05 -03:00
LOuroboros
7f34b03309 The cries from Chespin to Calyrex are now inserted as compressed cries 2022-01-02 14:34:57 -03: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
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
GriffinR
4f825a6ee0 Give generic names to unknown direct sound wave data 2021-11-06 17:00:24 -04:00
GriffinR
93705bc257 Label phonemes 2021-11-06 12:30:40 -04:00
GriffinR
44295261b0 Give programmable wave samples generic names 2021-11-06 12:07:42 -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
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
GriffinR
e67729f647 Remove address comments in sound directory 2021-07-21 00:56:04 -04:00
amiosi
7714650fef fix build error 2021-02-03 14:55:55 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
2cba017699 cry renames 2021-02-03 12:50:54 -05:00
LOuroboros
e5801d83bc Removed unnecessary copy of Crustle's cry 2021-02-02 15:38:49 -03:00
LOuroboros
294fd69240 Corrected the cry macro for some Gen. 8 forms/variations 2021-01-24 21:12:04 -03:00
LOuroboros
0da2fd0dcb Renamed cry_not and cry2_not macros 2021-01-18 11:43:34 -03:00
LOuroboros
9827e57fbc Fixed mistakes.
-Corrected Porygon-Z's cry's filename
-Restored Bunnelby's cry
2021-01-18 11:43:18 -03:00
LOuroboros
b38dd7346a Updated the filenames of Gen. 1 to 3 species in direct_sound_data.inc 2021-01-18 11:42:58 -03:00
LOuroboros
7ccd0f192c Tweaked direct_sound_data.inc
And removed a .aiff file that had no place in here.
2021-01-18 11:42:17 -03:00
LOuroboros
e1e2c28761 A few things.
-Replaced the Gen. 1 to 3 cries with BW2 rips.
-Reintroduced the Gen. 4 and 5 cries.
-Renamed every cry_not_species file to uncomp_species instead.
2021-01-18 11:41:58 -03:00
LOuroboros
4a2bdd23e0 Removed every Gen. 4 and 5 cry for reasons 2021-01-18 11:37:07 -03:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys
Added the data of Deoxys' forms
2020-10-22 00:52:40 -03: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
Kurausukun
04bf1d433a one more instrument
oops just found this one
2020-09-23 22:31:12 -04:00
Kurausukun
30e3437891 rename instruments (again) 2020-09-17 23:52:57 -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
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00