ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,159 Commits 1 Branch 0 Tags 235 MiB
b570f87152
Commit Graph

2159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome
b570f87152 Merge master from pret 2018-05-09 05:10:23 -05:00
Diegoisawesome
d66c1c642c Port/decompile fieldmap.c 2018-05-09 05:07:56 -05:00
Marcus Huderle
f14d2765da
Merge pull request #240 from Slawter666/master 
Move gItems to c
 2018-05-06 10:05:26 -07:00
Slawter666
7f2329253f requested changes 2018-05-06 17:31:50 +01:00
Slawter666
190ac275bb
Formatting item_icon_table.h 2018-05-06 13:45:56 +01:00
Slawter666
279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +01:00
Slawter666
aab1238ec0 Revert "Convert item_graphics.inc to C" 
This reverts commit 546217d281.
 2018-05-06 09:12:23 +01:00
Slawter666
546217d281 Convert item_graphics.inc to C 
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
 2018-05-05 23:27:26 +01:00
Slawter666
22ec43a6ed resolve merge conflicts 2018-05-05 18:50:26 +01:00
Marcus Huderle
83ea8d0cd9
Merge pull request #243 from PikalaxALT/trader 
Port trader from Ruby
 2018-05-04 19:15:40 -07:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
Marcus Huderle
cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records 
Decompile battle records
 2018-05-03 08:42:44 -07:00
Marcus Huderle
9dc867a91c
Merge pull request #241 from DizzyEggg/decomp_item 
Decompile item
 2018-05-03 08:38:45 -07:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
b80fb98d9a make battle records compile 2018-05-01 16:35:38 +02:00
DizzyEggg
cc578fce18 battle records decompiled and documented 2018-05-01 15:54:31 +02:00
DizzyEggg
ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00
DizzyEggg
95cf853762 battle records more decomp and subtle name changes 2018-05-01 14:01:54 +02:00
DizzyEggg
f9a2f6c4a2 start decompiling battle records 2018-05-01 12:38:55 +02:00
DizzyEggg
9f97646724 make item compile 2018-04-29 15:34:14 +02:00
DizzyEggg
fd40e93cb5 clear item, save and load save files 2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
Slawter666
39fd42faea convert data/items.inc to include/data/items.h 
OK
 2018-04-25 02:33:55 +01:00
Slawter666
a49f80d552 Convert item_descriptions.inc to .h 
OK
 2018-04-25 01:41:04 +01:00
Slawter666
a9d65ae6b6 Move files to include/data 2018-04-24 00:58:14 +01:00
Slawter666
5a7a0d621c minor documentation of constants/items.h 2018-04-24 00:17:09 +01:00
Slawter666
2d4ab9f4ac Updated items.c 
Working but non-matching
 2018-04-23 23:25:03 +01:00
Slawter666
f56067bb63
Update items.c 2018-04-23 22:14:30 +01:00
Slawter666
a04f8f6ee3 Convert item data files to .c (not compiling) 2018-04-23 21:44:46 +01:00
Diegoisawesome
867b496f2e
Merge pull request #239 from DizzyEggg/patch-1 
Use DMA large macro in option menu
 2018-04-18 14:58:28 -05:00
DizzyEggg
dede2cc300
Use DMA large macro in option menu 2018-04-18 21:53:51 +02:00
Diegoisawesome
d10844f1fe
Merge pull request #237 from KDSKardabox/master 
Decompile mon markings, rotating_gate & field_camera
 2018-04-18 14:12:51 -05:00
KDSKardabox
dc759a501b add braces 2018-04-18 22:17:23 +05:30
KDSKardabox
0bab373f49 Perform requested changes 2018-04-18 22:10:26 +05:30
Diegoisawesome
4e63a52832
Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks 
decompile battle_anim_sound_tasks
 2018-04-18 11:40:01 -05:00
DizzyEggg
3d12a02f3e almost decomp sound tasks battle anim 2018-04-18 16:03:15 +02:00
KDSKardabox
7700fe61fe Decompile field camera 2018-04-18 17:42:41 +05:30
KDSKardabox
b818924feb Decompile rotating_rate & remove debug check 2018-04-18 14:09:50 +05:30
KDSKardabox
86f46ff8eb Merge branch 'master' of https://github.com/pret/pokeemerald 
g Please enter a commit message to explain why this merge is necessary,
 2018-04-17 14:27:52 +05:30
KDSKardabox
f5cbefc295 Decompile mon markings 2018-04-17 14:24:39 +05:30
Diegoisawesome
b5a269545a
Merge pull request #236 from KDSKardabox/master 
Decompile dewford trend
 2018-04-16 11:24:48 -05:00
KDSKardabox
936bb5925a Decompile dewford trend 2018-04-16 16:22:13 +05:30
Marcus Huderle
da719a1541
Merge pull request #235 from KDSKardabox/master 
Decompile pokemon icon
 2018-04-14 09:33:58 -07:00
KDSKardabox
447afe4505 Decompile pokemon icon 2018-04-13 17:51:49 +05:30
Marcus Huderle
cff12d7907
Merge pull request #234 from KDSKardabox/master 
Port map_obj_lock, map_name_popup, rom6 & script_movement
 2018-04-12 12:30:41 -07:00
KDSKardabox
ac7d69eb6e Done requested changes 2018-04-12 22:36:07 +05:30
KDSKardabox
66e76d9633 Decompile script movement 2018-04-10 14:55:25 +05:30
KDSKardabox
a3d065d0bd Decompile rom6 2018-04-10 12:17:29 +05:30
KDSKardabox
a18dc6aa80 Decompile map_name_popup 2018-04-09 12:52:28 +05:30
KDSKardabox
3948614bff Decompile map_obj_lock 2018-04-03 16:22:31 +05:30