Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,381 Commits 3 Branches 0 Tags 878 MiB
Commit Graph

2381 Commits

Author SHA1 Message Date
Diegoisawesome 06186561f2
Merge pull request #257 from Diegoisawesome/master 
Clean up Makefile (with help from devkitPro maintainers)
 2018-05-25 01:08:57 -05:00
Diegoisawesome 489f90b832 Update Makefile with help from devkitPro maintainers 2018-05-22 18:46:38 -05:00
DizzyEggg 03b593d3c3 try my luck with record mixing 2018-05-22 21:54:57 +02:00
DizzyEggg c8e1c80375 record mixing fix for real hopefully 2018-05-20 12:21:39 +02:00
DizzyEggg 4d5bfc149e Merge branch 'master' into decomp_record_mixing 2018-05-20 12:16:45 +02:00
DizzyEggg 1a8d5132d6 fix record mixing for real 2018-05-20 10:51:09 +02:00
Diegoisawesome de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks 
Decompile field tasks
 2018-05-19 23:34:30 -05:00
Diegoisawesome ecfe49ec61
Merge pull request #254 from DizzyEggg/decompile_menu_indicators 
Decompile menu indicators
 2018-05-19 23:23:45 -05:00
DizzyEggg 0978cc60a1 change map event var names to pokeruby ones 2018-05-19 19:20:32 +02:00
DizzyEggg 1307fde8ca make field tasks compile 2018-05-19 18:13:48 +02:00
DizzyEggg d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
DizzyEggg 11d8f489c4 failed attempt 2018-05-19 14:30:41 +02:00
DizzyEggg e44f35c7b7 fix record mixing merge conflicts 2018-05-19 12:32:44 +02:00
DizzyEggg 9385036ff7 make menu indicators compile 2018-05-19 11:53:22 +02:00
DizzyEggg 4857757431 merge list menu and list indicators 2018-05-19 11:36:31 +02:00
DizzyEggg 1ead30ad40 decompile menu indicators 2018-05-19 10:54:02 +02:00
DizzyEggg 303c9f0917 start menu indicators decomp 2018-05-16 22:16:22 +02:00
Diegoisawesome 0c1f85f200
Merge pull request #253 from DizzyEggg/decompile_menu_helpers 
Decompile menu helpers
 2018-05-15 17:44:41 -05:00
DizzyEggg 0cf3836a03 decompile menu helpers 2018-05-15 20:22:19 +02:00
DizzyEggg 7735fb2ad3 start menu helpers decomp 2018-05-14 23:03:40 +02:00
Diegoisawesome d1df98361f
Merge pull request #252 from Diegoisawesome/master 
Fix sym_common end, rename ASM_DIRECT to NAKED
 2018-05-11 17:36:11 -05:00
Diegoisawesome ce5fc0277a Remove extra space at end of sym_common 2018-05-11 17:24:56 -05:00
Diegoisawesome 23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
Diegoisawesome 3e93615e38
Merge pull request #251 from Diegoisawesome/master 
Use song constants
 2018-05-11 00:53:58 -05:00
Diegoisawesome 4e2886db81 Use song constants 2018-05-11 00:33:32 -05:00
Diegoisawesome bc60000755
Update mauville_old_man.txt to fix warning 2018-05-10 21:49:51 -05:00
Diegoisawesome 7c551ef373
Merge pull request #250 from Diegoisawesome/master 
Port/decompile field_effect
 2018-05-10 18:45:35 -05:00
Diegoisawesome 2b6d2dfadd Merge branch 'master' of https://github.com/pret/pokeemerald 2018-05-10 18:38:24 -05:00
Diegoisawesome 416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Diegoisawesome 80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
golem galvanize 13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
golem galvanize d31600e70e finish decompiling pokedex 2018-05-10 03:30:42 -04:00
Marcus Huderle 7defc27b99
Merge pull request #245 from PikalaxALT/mauville_old_man 
Mauville old man
 2018-05-09 15:08:19 -07:00
PikalaxALT 4470f77b3d Merge branch 'master' into mauville_old_man 2018-05-09 15:30:21 -04:00
PikalaxALT 1b525ba7f9 Remove file that should have been ignored. WTF clion? 2018-05-09 15:28:51 -04:00
Diegoisawesome e01253ebe1
Merge pull request #247 from Diegoisawesome/master 
Port/decompile fieldmap.c
 2018-05-09 05:30:57 -05:00
Diegoisawesome 279276c539 Fix capitalization on filename 2018-05-09 05:14:24 -05:00
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
PikalaxALT fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT 61cc1d5574 Rename symbols using Ruby as a reference 2018-05-07 18:11:20 -04:00
PikalaxALT 0231ed13ee Remaining functions in mauville_old_man 2018-05-07 16:35:29 -04: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