Commit Graph

94 Commits

Author SHA1 Message Date
paul a9cef334e0 fix up blaziken, double_question_mark and pokemaniac 2018-10-13 00:39:32 +02:00
paul 0e8180b9bb clean up/redo previous labels 2018-10-12 23:24:19 +02:00
paul 7ce6c69138 almost complete working pokemon and trainer images, offending ones are baserom'd 2018-10-12 00:00:46 +02:00
paul 6533d65932 more preparation for copypate 2018-10-11 22:49:56 +02:00
paul 50fcc3a1e9 Merge remote-tracking branch 'upstream/master' 2018-10-11 18:56:58 +02:00
Marcus Huderle bd88c80379 Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
2018-10-11 11:56:24 -05:00
paul acdd8cab26 Merge branch 'master' of github.com:Missingmew/pokefirered 2018-10-10 23:01:08 +02:00
paul f24d9344e8 revert to previous graphics_file_rules.mk and fix up font rules. fix double include in makefile 2018-10-10 23:00:46 +02:00
paul 3f0827128a resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics 2018-10-10 22:54:23 +02:00
ProjectRevoTPP 05d03f7f32 decompile up to sub_80444C4 2018-10-10 00:47:44 -04:00
ProjectRevoTPP 799a9ccfe2 decompile up to sub_8043B40 2018-10-09 00:04:47 -04:00
ProjectRevoTPP 6c614d71a5 decompile up to SpeciesToCryId 2018-10-08 21:58:30 -04:00
ProjectRevoTPP 967b4e6612 merge and nonmatching PokemonUseItemEffects2 2018-10-08 18:51:14 -04:00
Marcus Huderle 10fff9c6f2 Merge pull request #19 from PikalaxALT/menews_jisan
Menews jisan
2018-10-08 17:19:57 -05:00
PikalaxALT 1d50bcb0b9 Cleanup and create menews_jisan header 2018-10-08 16:02:11 -04:00
PikalaxALT eda4a9f940 Use the macro ya dummy 2018-10-08 14:59:48 -04:00
PikalaxALT d348c44eb6 Finish decompile of menews_jisan.s 2018-10-08 14:58:51 -04:00
PikalaxALT 6b27e999f2 through sub_8146D94 2018-10-08 14:40:46 -04:00
PikalaxALT 4dd5029fdc sub_8146CA4 2018-10-08 14:24:44 -04:00
ProjectRevoTPP 02fb51cbe7 nearly matching PokemonItemEffects2 2018-10-08 13:17:04 -04:00
PikalaxALT 7040e8e956 sub_8146C30 2018-10-08 12:10:33 -04:00
ProjectRevoTPP e54247c225 partially decompile pokemon.c 2018-10-08 00:57:51 -04:00
Marcus Huderle f285a81e85 Merge pull request #16 from ProjectRevoTPP/text
finish decompiling text.c
2018-10-07 00:09:17 -05:00
ProjectRevoTPP 77f8b38417 address comments 2018-10-07 01:01:45 -04:00
ProjectRevoTPP 4cd32e8636 migrate text rodata to C file 2018-10-07 00:14:45 -04:00
paul 0a51caf56b Merge remote-tracking branch 'upstream/master' 2018-10-07 00:16:29 +02:00
paul 1ee1ebe23a push through first incbin, two files are apparently missing 2018-10-07 00:16:05 +02:00
ProjectRevoTPP eb03b1ab0f Merge branch 'master' of https://github.com/pret/pokefirered into text 2018-10-06 16:45:53 -04:00
ProjectRevoTPP 9236084ad8 finish decompiling text.c 2018-10-06 16:40:08 -04:00
paul 0c6d127007 copy graphics_file_rules.mk from emerald and modify Makefile to get multi-graphic-sprites working 2018-10-06 20:33:33 +02:00
Marcus Huderle 281507d72e Merge pull request #15 from SatoMew/master
Fix ld_script.txt
2018-10-06 12:36:39 -05:00
SatoMew 7ee367e18e Fix ld_script.txt 2018-10-06 18:32:26 +01:00
Marcus Huderle 2e774667c8 Merge pull request #14 from SatoMew/master
decompile random.c
2018-10-06 12:02:06 -05:00
SatoMew 77e95d1309 Fix previous change 2018-10-06 17:41:51 +01:00
SatoMew 7e1e4bc301 Remove unnecessary newline 2018-10-06 17:35:02 +01:00
SatoMew 09f27128f8 decompile random.c 2018-10-06 17:27:58 +01:00
paul 0aa555d134 Merge remote-tracking branch 'upstream/master' 2018-10-06 17:51:44 +02:00
paul efebe909c6 fix not building data.o 2018-10-06 17:21:26 +02:00
paul 43579dc5bc add source graphics 2018-10-06 17:01:47 +02:00
Marcus Huderle 2cb551cf0d Merge pull request #13 from ProjectRevoTPP/sound
decompile sound.c
2018-10-05 23:21:03 -05:00
ProjectRevoTPP 4fafb81b2f decompile sound.c 2018-10-05 21:26:13 -04:00
Marcus Huderle 0659d53c27 Merge pull request #12 from ProjectRevoTPP/task
decompile task.c
2018-10-05 17:23:12 -05:00
ProjectRevoTPP dca511ad23 decompile task.c 2018-10-05 18:01:51 -04:00
Marcus Huderle 7990309f0a Merge pull request #11 from ProjectRevoTPP/script
decompile script.c
2018-10-05 15:59:40 -05:00
ProjectRevoTPP 52559f4c16 decompile script.c 2018-10-04 21:55:27 -04:00
Marcus Huderle 9975ba7211 Merge pull request #10 from ProjectRevoTPP/battle_ai_fix
fix battle_ai so it builds
2018-10-04 18:33:46 -05:00
ProjectRevoTPP 3c71cf58f5 fix battle_ai so it builds 2018-10-04 19:22:29 -04:00
Marcus Huderle f044c8215b Merge pull request #9 from ProjectRevoTPP/battle_ai
decompile battle_ai_script_commands.c
2018-10-04 17:55:20 -05:00
ProjectRevoTPP 621cfbebee decompile battle_ai_script_commands.c 2018-10-03 21:30:13 -04:00
paul 7d24736ce0 Merge remote-tracking branch 'upstream/master' 2018-10-03 19:36:11 +02:00