ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-01 15:20:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,057 Commits 1 Branch 0 Tags 235 MiB
0bca01cb74
Commit Graph

385 Commits

Author SHA1 Message Date
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
ultima-soul
c2a3c5687b Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:11:47 -08:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
ExpoSeed
9c43bcb429 Delete accidentally pushed file 2020-10-05 23:33:36 -05:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +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
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
bf61de01a7 Start documenting battle factory screen 2020-08-31 13:36:48 -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
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
22c1bf965a Finish documenting berry blender 2020-08-24 17:06:55 -04:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -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
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -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
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -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
b40cee540e Continue documenting roulette 2020-08-02 14:52:05 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans 
Document unk_transition
 2020-07-18 20:22:58 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose 
Document starter_choose.c
 2020-07-17 16:02:10 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
43c48d95c2 Document starter_choose.c 2020-07-06 17:26:25 -04:00
GriffinR
72edc46ab6 Document unk_transition 2020-07-02 15:45:37 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -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
19699bee23
Merge pull request #390 from ghoulslash/battle_engine 
add animations for all moves
 2020-05-29 12:53:17 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Evan
638d585fc0 update apple sprites 2020-05-26 10:16:24 -06:00
ghoulslash
13cf2cb217
Animation Particles, BGs, and gen 4 anims (#384) 
* undo some revert(?)

* cfru particles and bgs

* remove commented out particles
 2020-05-24 18:13:40 +02:00
Evan
181bfbf5fd cfru particles and bgs 2020-05-22 10:10:10 -06:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
Evan
c18b5966bf undo some revert(?) 2020-05-03 22:09:03 -06:00
SBird
67e9309415 gfx: fix hpbar_anim.png visual palette 2020-05-01 20:51:29 +02:00
DizzyEggg
e00b76b8da Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 13:31:52 +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
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02: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
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +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
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +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
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +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
8889039a57 Merge with master 2020-01-31 21:15:08 +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
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
DizzyEggg
1141e733eb Merge with master 2020-01-12 14:29:43 +01: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
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00