Commit Graph

6404 Commits

Author SHA1 Message Date
amiosi
86da6d04ff Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-03 12:45:19 -05:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux
Various tweaks related to Pokémon cries
2021-02-03 11:26:44 -06:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
f46f21bb38 tapus again 2021-02-02 14:40:04 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
ghoulslash
2f00169623
Merge pull request #1387 from amiosi/dex-decap
decap dex entries
2021-02-02 12:17:11 -07:00
LOuroboros
e5801d83bc Removed unnecessary copy of Crustle's cry 2021-02-02 15:38:49 -03:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute
Fixed Keldeo Resolute's animation
2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys
Fixed Deoxys Attack Form's animation
2021-02-02 11:17:25 -06:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-02-02 09:48:21 -07:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2 decap POKeMON string 2021-02-01 14:19:24 -05:00
ultima-soul
76851eb672
Merge pull request #1380 from amiosi/kyurem
Kyurem form moveset swap
2021-01-31 13:32:31 -08:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -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
0f142048bf
Merge pull request #1373 from LOuroboros/riolu
Corrected Riolu's evo method
2021-01-27 14:07:27 -08:00
LOuroboros
6e89f8dff2 Corrected Riolu's evo method 2021-01-27 19:02:37 -03:00
LOuroboros
cfa6fc5eb8 Fixed Keldeo Resolute's animation 2021-01-27 15:26:39 -03:00
LOuroboros
99c7797dc8 Fixed Deoxys Attack Form's animation 2021-01-27 15:06:49 -03:00
luckytyphlosion
740c0a6bc1
Merge pull request #1294 from luckytyphlosion/aif2pcm-fix
Fix bug in pcm delta compression.
2021-01-26 15:23:11 -05:00
luckytyphlosion
b0de03356b
Merge pull request #1315 from PokeCodec/patch-3
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-26 15:22:24 -05:00
luckytyphlosion
ff8952a3f0
Merge pull request #1308 from PokeCodec/pain
Get rid of Task_data_OP macro
2021-01-26 15:22:13 -05:00
N
b1a29e5017
Use INTR_FLAG_VBLANK instead of constant 0x1 2021-01-25 21:37:04 -05:00
LOuroboros
294fd69240 Corrected the cry macro for some Gen. 8 forms/variations 2021-01-24 21:12:04 -03:00
N
07d19ba526
Update main.c 2021-01-22 18:40:08 -05:00
N
3102d94e3c Undo change 2021-01-22 17:41:57 -05:00
N
c636b7c3ae Some more tweaks 2021-01-22 17:41:07 -05:00
ExpoSeed
2e0b02e491
Merge pull request #1322 from amiosi/pokemon_expansion
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
2021-01-21 19:16:59 -06:00
amiosi
08eb883939 sounds like a lot of HOOPA 2021-01-21 20:10:38 -05:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal
Remove Special Handling for Deoxys
2021-01-21 12:22:03 -07:00
ghoulslash
fe7f2f18a4
Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
2021-01-21 12:19:41 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
Document battle tv data
2021-01-21 12:27:14 -05:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald
Fix misnamed ground effect flags & document reflections
2021-01-20 18:50:31 -05:00
SphericalIce
c0489199c0 Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection 2021-01-20 22:32:04 +00:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe
Add Form Species ID Tables
2021-01-20 13:54:20 -07:00
ultima-soul
fdc6156f83 Add Form Species ID tables and entries for new mons and forms. 2021-01-20 12:07:29 -08:00
ultima-soul
9663ed0d3c Merge branch 'form_species_tables' into form_species_tables_pe 2021-01-20 12:06:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
SphericalIce
86297398e6 Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE 2021-01-20 10:34:33 +00:00
SphericalIce
4334f7a379 Include NUM_REFLECTION_TYPES in the ReflectionTypes enum 2021-01-20 10:17:07 +00:00