ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,733 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

6733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -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
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
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers 
Document battle controllers, misc other battle
 2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd 
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
 2021-02-01 21:04:00 -05:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
GriffinR
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves 
Minor bard music clean up
 2021-02-01 14:59:45 -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
GriffinR
45ee3a687d Add comments for some data in crt0.s 2021-01-29 18:36:39 -05:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -05:00
opakedragon
1e8edcbfcd Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"" 
This reverts commit be50fab8f2dc81b1d7e33de29866271e5153bbdc.
 2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2 Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow" 
This reverts commit 3a6be5a34c48d11e8721100deca3955354ed576e.
 2021-01-29 13:30:09 -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
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05: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
opakedragon
3a6be5a34c Fix Spelling of BagMenu_RemoveBagItemMessageindow 2021-01-27 06:18:29 -05: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
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00