Commit Graph

2482 Commits

Author SHA1 Message Date
DizzyEggg
42731e4b88 LANG_ENG to GAME_LANGUAGE 2018-05-30 20:28:31 +02:00
Diegoisawesome
f6350bc003
Merge pull request #258 from DizzyEggg/decompile_rom_8034C54
Decompile rom 8034c54
2018-05-29 17:35:47 -07:00
DizzyEggg
ff0c615870 decompile rom_8034C54 2018-05-27 23:26:01 +02:00
DizzyEggg
357afd91b5 start rom_8034C54 decomp 2018-05-27 17:42:48 +02:00
DizzyEggg
dd1c7c741a make record mixing compile 2018-05-26 00:37:03 +02:00
DizzyEggg
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
DizzyEggg
b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
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
PikalaxALT
6ae395a636 Merge branch 'master' into contest 2018-05-24 10:26:55 -04: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
PikalaxALT
5539e282a3 through sub_80DB798 2018-05-11 10:51:38 -04:00
PikalaxALT
8d0da7d8e0 Propagate ASM_DIRECT --> NAKED renaming 2018-05-11 09:41:32 -04:00
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04:00
PikalaxALT
c15b50ac68 through prints_contest_move_description 2018-05-11 08:44:21 -04: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
PikalaxALT
9bee601b16 through sub_80DB174 2018-05-10 19:28:52 -04:00
PikalaxALT
508a8e5182 through sub_80DAFA0 2018-05-10 18:16:58 -04:00
PikalaxALT
7fdebe0d15 through sub_80DAE0C 2018-05-10 17:54:30 -04:00
PikalaxALT
dfc83cf28f Merge branch 'master' into contest 2018-05-10 09:47:12 -04: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