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

108 Commits

Author SHA1 Message Date
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -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
a2a9f22612 Clean up contest_util 2021-04-20 21:16:47 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
GriffinR
cd2a99b7c4 Doc storage - misc cleanup, some item/cursor 2021-04-17 13:33:29 -04:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
042a2ecc41 Document pokeblock feed scene 2021-04-12 18:44:37 -04:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
GriffinR
031da44cab Document mon markings 2021-02-28 17:11:46 -06:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -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
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
PikalaxALT
c3f6c56e19
Merge pull request #1161 from GriffinRichards/doc-wallclock 
Document wall clock data
 2020-09-04 19:48:04 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar 
Document cable car
 2020-09-03 16:24:27 -04:00
GriffinR
778bdb4d30 Document wallclock data 2020-08-29 15:55:28 -04:00
GriffinR
71a066f945 Document cable car 2020-08-28 03:54:04 -04:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-21 12:44:07 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
PikalaxALT
3372993a63
Merge pull request #1133 from GriffinRichards/doc-pblock 
Document use_pokeblock
 2020-08-17 16:28:15 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr 
Document naming screen
 2020-08-15 00:06:57 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock 2020-08-12 19:49:55 -04:00
GriffinR
4f615b65e6 Continue documenting use_pokeblock 2020-08-11 13:56:17 -04:00
GriffinR
e947729d65 Start documenting use_pokeblock 2020-08-10 13:48:16 -04:00
GriffinR
82e322bb96 Finish documenting naming screen 2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1 Start documenting naming screen 2020-08-07 02:00:41 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +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
76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
cca1dcc04a merge with master 2020-05-29 13:07:53 +02:00
Sierraffinity
d528d75af7 Connect title screen BG palettes together 2020-05-27 07:58:48 -05:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
SBird
7c4c1d3a5c gfx: merge battle_interface gfx table 2020-05-03 15:24:33 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02: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