ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,838 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

209 Commits

Author SHA1 Message Date
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
PokeCodec
938aec45d3 Match CreatePokeDexList 
Cherry-picked from the pret Ruby repo
 2020-07-07 20:57:20 -04:00
DizzyEggg
cca1dcc04a merge with master 2020-05-29 13:07:53 +02:00
DizzyEggg
a35ce6ecdf
Give a define for all dex interface sprites 
for easier editing
 2020-05-03 11:12:05 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
jiangzhengwenjz
afdcb69bf4 better matching approach than upstream 2020-04-02 20:30:31 +08:00
jiangzhengwenjz
61b7b45084 Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching 2020-04-02 20:26:16 +08:00
Sewef
1c895bb8d0
Match HighlightSubmenuScreenSelectBarItem 2020-04-02 13:17:33 +02:00
Sewef
096e57f56c
Match HighlightScreenSelectBarItem 2020-04-02 13:11:18 +02:00
jiangzhengwenjz
cd60736e36 PrintMonWeight 2020-04-02 12:15:03 +08:00
jiangzhengwenjz
69f6d2afad HighlightSubmenuScreenSelectBarItem 2020-04-02 01:03:44 +08:00
jiangzhengwenjz
3d2c42adfe HighlightScreenSelectBarItem 2020-04-02 01:03:25 +08:00
GriffinR
a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
Sebastian Gabl
5fff2f2234 Use SHINY_ODDS macro where intended 
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
 2020-01-15 08:10:20 -06:00
DizzyEggg
f1d1557a39 Merge with master 2020-01-12 15:06:52 +01:00
Slawter666
8b1595ebc3 Pokédex search menu documentation 2020-01-06 15:18:58 -06:00
DizzyEggg
a4a4132d26 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-23 16:41:44 +01:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
2a6e4e0a2a Merge with master 2019-12-09 08:29:10 +01:00
Slawter666
47ea65b96e Requested changes 2019-12-06 19:06:21 -06:00
Slawter666
9fc176f272 Document pokedex info page 2019-12-06 19:06:21 -06:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
DizzyEggg
b70cde8f1b Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-11-22 23:11:17 +01:00
Slawter666
c455fcfa59 Pokedex documentation 2019-11-20 09:01:50 -06:00
DizzyEggg
ab2de0342b
Merge pull request #201 from AsparagusEduardo/PokedexOrders 
Updated Alphabetical, Weight and Height orders.
 2019-11-10 16:50:20 +01:00
Eduardo Quezada D'Ottone
49dc9a41c8 Forgot 3 of them... Oops ^^; 2019-11-01 16:33:36 -03:00
DizzyEggg
4bbbbdc50a Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-10-19 15:30:14 +02:00
Eduardo Quezada D'Ottone
05beb7046d Fixed function order. 2019-10-11 19:02:54 -03:00
GriffinR
81ee8f07ef Document pc.inc and prof_birch.inc 2019-10-07 01:13:34 -04:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
PikalaxALT
9317d114a9
Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
Eduardo Quezada D'Ottone
27fa3361ca Orders searchable for National Dex. 2019-09-30 23:53:26 -03:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
ultima-soul
d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07:00
DizzyEggg
0252270515 Merge with master 2019-08-12 11:25:05 +02:00
PikalaxALT
1f62caae43 Some cleanup 2019-08-05 15:49:05 -04:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
DizzyEggg
17cf13beef Merge with master 2019-04-16 11:14:50 +02:00
Marcus Huderle
065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Phlosioneer
2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -05:00
DizzyEggg
518f9c0638 Some nonmatchings 2019-04-11 07:02:48 -05:00
DizzyEggg
b0317adb8c Merge branch 'master' into pokemon_expansion 2019-04-11 13:10:35 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00