ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-26 15:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,577 Commits 1 Branch 0 Tags
Commit Graph

3006 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
5bf300f97c Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE 2021-09-30 22:12:02 -03:00
GriffinR
001a25e49c
Merge pull request #1507 from GriffinRichards/doc-walda 
Document Walda Phrase
 2021-09-30 12:27:20 -04:00
Pokestia
38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
Eduardo Quezada D'Ottone
55b61313a4 PSS uses form change table for holding items. 
# Conflicts:
#	src/pokemon.c
 2021-09-29 02:13:44 -03:00
GriffinR
8a79ca3818 Document walda_phrase 2021-09-26 17:01:39 -04:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM 
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
 2021-09-25 22:00:10 -03:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table 
Form change table
 2021-09-22 00:04:26 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion 
Port missing Gen8 icons from DPE
 2021-09-20 22:48:57 -03:00
Eduardo Quezada D'Ottone
18d91cc935
Merge pull request #1647 from BuffelSaft/gender-diff-fixes1 
Show gender differences in evo scene
 2021-09-20 22:03:23 -03:00
BuffelSaft
4aa7c096b7 Show gender differences in evo scene 2021-09-11 16:30:09 +12:00
BuffelSaft
db928a1329 Data entry for new sprites 
Add sprite defines, entries to gender tables, etc.
 2021-09-11 14:12:41 +12:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -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
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
GriffinR
8f5e2bbeba Label swap line margin flag 2021-08-21 11:04:28 -04:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
GriffinR
dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04: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
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
Blackforest92
3bd81d347d Add missing Gen8 icons 2021-07-31 14:48:55 +07:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list 
Instead of sorting them by location, it makes more sense to sort them by their value.
 2021-07-26 20:18:11 -03:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
GriffinR
01f2381e01 Add LINK_MANAGER field comments from SDK 2021-07-11 16:48:59 -04:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor 
Label remaining symbols in a few files
 2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint 
Change ItemPrintFunc to Use u32 Instead of s32
 2021-07-08 00:15:45 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ExpoSeed
630d172393 Include expansion_branches.h in global.h 2021-07-04 12:41:21 -05:00
Kurausukun
42730a8315 Revert "remove gflib" 
This reverts commit 8b59909ac5eb6e3540aeb78396943d57a9702e4d.
 2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
ExpoSeed
788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
fe89a4d147 Label remaining region_map symbols 2021-07-02 00:52:36 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts 
Clarify contest heart tiles
 2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5 remove gflib 2021-06-17 22:09:48 -04:00