Commit Graph

6522 Commits

Author SHA1 Message Date
ultima-soul
874409fd1a
Merge pull request #1520 from Jaizu/patch-10
Feathr > Feather
2021-06-03 09:13:24 -07:00
Jaizu
a500b04a51
Feathr > Feather
We do have enough space to put the whole word.
2021-06-03 12:08:31 +02:00
ultima-soul
fc19023087
Merge pull request #1493 from LOuroboros/feathers
Corrected the Wings/Feathers
2021-06-02 22:56:16 -07:00
ExpoSeed
5731dd3240
Merge pull request #1517 from LOuroboros/holdEffects_IE
Adjusted the list of item hold effects
2021-06-02 16:05:59 -05:00
LOuroboros
03647c7790 Adjusted the list of item hold effects 2021-06-02 17:27:45 -03:00
LOuroboros
1b13db80fc
Syntax fix
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:43:01 -03:00
ultima-soul
1f859e340d
Merge pull request #1415 from ghoulslash/item_expansion
Add Berry Hold Effects
2021-05-24 11:07:35 -07:00
ghoulslash
64815a5f85
Update src/data/items.h
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-05-24 10:18:05 -06:00
ghoulslash
5aa1b5b1ee
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:59 -06:00
ghoulslash
39974b05f7
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:55 -06:00
ghoulslash
a3b092c9a3
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:51 -06:00
ghoulslash
6b868a028a
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:47 -06:00
ghoulslash
aafc8e2109
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:39 -06:00
ghoulslash
f7c00d2366
Update src/data/items.h
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-05-24 10:17:34 -06:00
Eduardo Quezada D'Ottone
ff296efb5c
Merge pull request #1484 from LOuroboros/patch-1
Corrected the item descriptions of some berries
2021-05-21 11:41:14 -04:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03:00
LOuroboros
972ed0d5a7 Adjusted the item data of the Wings/Feathers
Now they work. Yay.
2021-05-17 21:34:42 -03:00
ultima-soul
88861abb29
Merge pull request #1470 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-05-13 20:56:23 -07:00
LOuroboros
16573a36eb
Update item_descriptions.h 2021-05-08 18:32:37 -03:00
ghoulslash
6703517f6d
Merge pull request #1456 from ExpoSeed/IE/razor-claw
Razor claw effect
2021-05-04 09:33:40 -06:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
Document TV
2021-04-29 00:25:01 -04:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims
Document battler affine anims, default pokeball throw
2021-04-28 13:56:42 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp
Sync e-reader helpers, document trainer hill e-reader
2021-04-28 06:08:57 -04:00
GriffinR
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag
Document Battle Pyramid Bag
2021-04-27 14:48:09 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil
Some Contest clean up
2021-04-27 02:29:41 -04:00
GriffinR
d74017d256
Merge pull request #1419 from GriffinRichards/doc-animstatus
Label more unused battle anims
2021-04-26 13:32:15 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata
Document trade sequence animation, some trade cleanup
2021-04-26 13:26:12 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -04:00
GriffinR
e065c0c285 Label more unused battle anims 2021-04-24 18:26:25 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02 Sync ereader_helpers with pokefirered 2021-04-24 18:03:06 -04:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
f823cd224f
Merge pull request #1416 from ProjectRevoTPP/apprentice_fix
[LEAK INFORMED] Fix apprentice.c do{}while(0)
2021-04-22 17:25:52 -04:00
ProjectRevoTPP
6ebd0ccb57 add NO_COND macro 2021-04-22 17:20:28 -04:00
ProjectRevoTPP
5c51a3ecc6 get rid of apprentice fakematching(s) 2021-04-22 16:40:46 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
e874dfcbc8
Merge pull request #1408 from GriffinRichards/doc-pokemonstorage
Document Pokémon Storage System
2021-04-22 01:32:16 -04:00
GriffinR
8dd6af1db1
Merge pull request #1414 from ProjectRevoTPP/rfu_NI_stopReceivingData
fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy
2021-04-22 01:26:45 -04:00
ProjectRevoTPP
ddc1534098 idiot, get rid of code in block 2021-04-21 21:38:42 -04:00
ProjectRevoTPP
00eeb727db fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy 2021-04-21 21:37:12 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
e96e7ba2e8
Merge pull request #1412 from ProjectRevoTPP/Sio32IDIntr
Eliminate the last fakematching (Sio32IDIntr). We are free of nonmatchings/fakematchings!
2021-04-21 08:49:22 -04:00
ProjectRevoTPP
57948b86a8 Eliminate the last fakematching. We are free of nonmatchings/fakematchings! 2021-04-20 21:31:39 -04:00
GriffinR
a2a9f22612 Clean up contest_util 2021-04-20 21:16:47 -04:00
GriffinR
f8e5bac883
Merge pull request #1411 from ProjectRevoTPP/sio32intr
Resolve sio32intr_clock_slave fakematching. One left!
2021-04-20 14:50:51 -04:00
ProjectRevoTPP
21f05a3c01 Resolve sio32intr_clock_slave fakematching. One left! 2021-04-20 12:58:50 -04:00