ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,417 Commits 1 Branch 0 Tags 235 MiB
e03fea84d0
Commit Graph

240 Commits

Author SHA1 Message Date
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
ab3eb6065b More transitions documentation 2020-06-01 16:17:25 +02:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
SBird
67e9309415 gfx: fix hpbar_anim.png visual palette 2020-05-01 20:51:29 +02:00
LOuroboros
32bb717bf1
Implemented missing TMs/HMs type palettes (#327) 
* Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash

* Actually added the Bug and Fairy type TM/HM sprite palettes now
 2020-04-16 09:27:13 +02:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR
0ffe63a23b Fix decor png dimensions 2020-04-13 12:58:48 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
DizzyEggg
fd34afac1e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-03-13 22:44:35 +01:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04: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
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276) 
* Shiny Charm Item

* Shiny Charm Rerolls
 2020-02-17 11:08:06 +01:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
DizzyEggg
bf6aa6a176 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-01-31 22:02:10 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
7f22fc9879 Update old weather names in field_weather_effect 2019-12-06 19:05:28 -06:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01:00