Commit Graph

1092 Commits

Author SHA1 Message Date
PikalaxALT c28d691ff2 Merge branch 'master' into fix_nonmatching 2018-02-07 00:55:50 -05:00
Marcus Huderle a395cd7e53 Merge pull request #565 from huderlem/fight
Decompile fight.s
2018-02-06 21:39:27 -08:00
PikalaxALT ecfdc57e1c Merge branch 'master' into fix_nonmatching 2018-02-04 23:06:04 -05:00
Marcus Huderle ad13f21d2e Start decompiling fight.s 2018-02-04 14:40:14 -08:00
camthesaxman 46023e742c Merge branch 'master' into german_debug
Conflicts:
	asm/pokemon_storage_system.s
	data/pokemon_storage_system.s
	src/pokemon/pokemon_1.c
	src/pokemon/pokemon_storage_system.c
	sym_common.txt
	sym_ewram.txt
2018-01-31 17:37:03 -06:00
PikalaxALT 4d9d458b80 match sub_81181E8 2018-01-31 08:33:40 -05:00
PikalaxALT 37c9594322 match sub_8116EF8 2018-01-30 22:28:39 -05:00
PikalaxALT 06f1fd1766 match sub_8117380 2018-01-30 18:07:13 -05:00
PikalaxALT a5f9a15d0d Merge branch 'master' into pokemon_storage_system 2018-01-29 22:07:02 -05:00
Cameron Hall 0597628ae7 Merge branch 'master' into german_debug 2018-01-27 16:51:06 -06:00
camthesaxman d5bc4b1207 oops, re-add the old charmap labels in graphics.s 2018-01-24 15:39:19 -06:00
Cameron Hall ac53fde3fc move debug scripts to a separate file 2018-01-24 01:18:38 -06:00
Cameron Hall 1e6cb59a0c start decompiling start_menu_debug.c 2018-01-23 20:43:28 -06:00
Cameron Hall 329d9aa856 dump all remaining baseroms 2018-01-23 17:54:29 -06:00
Cameron Hall e03633d6bc fix more false offsets 2018-01-23 16:55:48 -06:00
Cameron Hall 960bc2dd01 fix more false offsets 2018-01-23 15:29:39 -06:00
Cameron Hall 305f571fb5 dump more baseroms and fix more false offsets 2018-01-23 00:32:33 -06:00
Cameron Hall 1685a7977a dump some debug baseroms 2018-01-22 21:42:14 -06:00
PikalaxALT 79b3229185 Merge branch 'master' into pokemon_storage_system 2018-01-21 19:49:52 -05:00
Cameron Hall 608e06126a fix build of normal ROMs 2018-01-21 14:27:32 -06:00
Cameron Hall 11a9371349 resolve merge conflicts and make it compile 2018-01-21 13:53:32 -06:00
yenatch 933d63e1fd make special ids global 2018-01-20 18:34:37 -05:00
Cameron Hall 7383117626 turns out graphics are the same. I forgot to run 'make clean' :( 2018-01-20 14:36:32 -06:00
Cameron Hall 22d4763c03 more debug graphics baseroms 2018-01-19 17:22:46 -06:00
Cameron Hall f398d0ad62 apparently I suck at this 2018-01-19 16:51:26 -06:00
Cameron Hall 1c7de6838b actually do unused charmap incbin 2018-01-19 16:45:29 -06:00
Cameron Hall 8520963669 unused charmap incbin 2018-01-19 16:33:19 -06:00
Cameron Hall b85e23c15a add some debug data 2018-01-18 17:07:11 -06:00
Cameron Hall bcbc9d040b finish adding all debug code 2018-01-18 15:19:31 -06:00
Cameron Hall c3534e7b0e add more debug code 2018-01-17 16:46:54 -06:00
Cameron Hall 6efb614f3f add more debug things 2018-01-17 15:49:51 -06:00
Cameron Hall 6903b3626a resolve some undefined references 2018-01-17 13:11:10 -06:00
Cameron Hall d79f440b8d use 'if DEBUG' instead of 'ifdef DEBUG' 2018-01-17 12:10:41 -06:00
Cameron Hall bcf3fb8745 add more debug data 2018-01-17 12:07:40 -06:00
ProjectRevoTPP 9e4d9171e3 Merge branch 'master' of https://github.com/pret/pokeruby into fixes 2018-01-16 17:45:16 -05:00
ProjectRevoTPP dc872c0cbf split data_8393054 2018-01-16 17:18:31 -05:00
ProjectRevoTPP b779a60ad7 split data2b 2018-01-16 15:03:22 -05:00
ProjectRevoTPP 7860ce8dbe split data2a and make shop.c stuff static 2018-01-16 14:00:52 -05:00
camthesaxman 5d923c4d5f import some battle_4.c code from emerald and get atk23_getexp matching 2018-01-15 20:41:55 -06:00
PikalaxALT 650f85e7db through sub_809B130 2018-01-15 15:46:17 -05:00
PikalaxALT 5fcd1184d8 through sub_809A860 2018-01-14 19:10:31 -05:00
PikalaxALT e86234ff99 Merge branch 'master' into pokemon_storage_system 2018-01-14 17:43:11 -05:00
PikalaxALT d357394a7a Merge branch 'master' into fix_file_modes 2018-01-14 17:25:07 -05:00
PikalaxALT e79b3ce9ff Fix file modes 2018-01-14 17:24:28 -05:00
Cameron Hall 69a662de66 Merge pull request #534 from camthesaxman/tmhm_macros
improve TM/HM constants and add macro for TM/HM learnsets
2018-01-14 14:19:37 -06:00
Cameron Hall 408c6ceddc Merge pull request #526 from ProjectRevoTPP/contest_ai
decompile contest_ai.c
2018-01-14 14:04:11 -06:00
camthesaxman 58b71865c9 improve TM/HM constants and add macro for TM/HM learnsets 2018-01-14 13:41:50 -06:00
ProjectRevoTPP 8990b10732 move rodata to C 2018-01-14 13:19:30 -05:00
PikalaxALT 1ff1e8ce95 Merge branch 'master' into pokemon_storage_system 2018-01-14 10:53:36 -05:00
Marco Willems (M17.1) 72c90d9dd3 Decompiled data/battle_anim_80A7E7C.s 2018-01-14 14:13:59 +01:00