ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,337 Commits 1 Branch 0 Tags 235 MiB
7581218569
Commit Graph

1337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
185402fe21 more work on berry blender 2017-11-18 21:38:57 +01:00
Diegoisawesome
5dc8beb034
Merge pull request #112 from DizzyEggg/decompile_recorded_battle 
Decompile recorded battle
 2017-11-18 13:29:27 -06:00
DizzyEggg
8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg
f8b40754c7 wild encounter done 2017-11-18 12:27:10 +01:00
DizzyEggg
ca43536242 make recorded battle compile 2017-11-17 22:33:36 +01:00
DizzyEggg
6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
Diegoisawesome
52624c4fb7 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-17 15:07:17 -06:00
Diegoisawesome
3883c39991
Merge pull request #114 from DizzyEggg/decompile_daycare 
Decompile daycare
 2017-11-17 14:25:45 -06:00
DizzyEggg
d0245cf8d2 recorded battle merge conflicts fix 2017-11-17 19:34:55 +01:00
DizzyEggg
1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg
a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
DizzyEggg
b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
Diegoisawesome
a98c6bf210 Fix build by renaming specials 2017-11-16 09:30:04 -06:00
Diegoisawesome
f8402b3d74 Rename contest string symbols 2017-11-15 23:57:38 -06:00
Diegoisawesome
c0d180a870
Merge pull request #100 from PikalaxALT/heal_location 
Heal location and Field Region Map
 2017-11-15 23:24:45 -06:00
PikalaxALT
b46a15b03e Enclose flag macro definitions in parentheses 2017-11-16 00:13:06 -05:00
PikalaxALT
a7f72e7da1 Remove spaces between incrementor and incrementee 2017-11-16 00:01:47 -05:00
Diegoisawesome
6a73c89e54
Merge pull request #113 from DizzyEggg/decompile_pss 
Start Pokemon Storage System
 2017-11-15 20:55:38 -06:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01:00
DizzyEggg
616edd6c3f daycare file is decompiled 2017-11-15 20:08:31 +01:00
DizzyEggg
1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
Diegoisawesome
055a419830
Merge pull request #101 from Diegoisawesome/dump_maps 
Dump maps
 2017-11-15 01:01:06 -06:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome
3fb2a488f9
Merge pull request #111 from DizzyEggg/decompile_battle5 
Decompile battle5
 2017-11-14 16:52:40 -06:00
Diegoisawesome
118bf4f4b1
Merge pull request #108 from DizzyEggg/decompile_starter_choose 
Decompile starter choose
 2017-11-14 16:41:53 -06:00
DizzyEggg
6e2b1d4315 starter choose sym bss space to align 2017-11-14 23:27:22 +01:00
DizzyEggg
0310be3007 more of daycare done 2017-11-14 23:25:07 +01:00
DizzyEggg
95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
Diegoisawesome
72b57b342e
Merge pull request #106 from DizzyEggg/decompile_hall_of_fame 
Decompile hall of fame
 2017-11-13 15:33:48 -06:00
DizzyEggg
048dc4aa28 fix graphics rules file 2017-11-13 22:10:25 +01:00
DizzyEggg
8a56532d35 fix graphics rules file 2017-11-13 22:08:50 +01:00
DizzyEggg
5c44c64050 add hof graphics 2017-11-13 21:55:38 +01:00
DizzyEggg
516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
Diegoisawesome
d1fe93bf4a
Merge pull request #105 from DizzyEggg/dump_things 
Get rid of a couple of baseroms
 2017-11-13 12:46:40 -06:00
DizzyEggg
ea575ee217 fix typo in a string 2017-11-13 19:42:03 +01:00
DizzyEggg
4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg
3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg
bb9c928330 starter choose review changes 2017-11-13 18:30:17 +01:00
DizzyEggg
ac68187895 review changes adding a pal file 2017-11-13 18:18:12 +01:00
DizzyEggg
209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
PikalaxALT
79609d52c8 MAPSEC_DYNAMIC 2017-11-12 21:39:44 -05:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
DizzyEggg
8ceea171b3 leave out pss for now 2017-11-13 00:15:07 +01:00
DizzyEggg
3b43668286 more recorded battle done 2017-11-13 00:10:34 +01:00
DizzyEggg
c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
DizzyEggg
c967ba1d5f dump couple of baseroms review changes 2017-11-12 18:41:04 +01:00
DizzyEggg
716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg
9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00