 Paul Sander
|
f04f8baa5b
|
Merge remote-tracking branch 'upstream/master'
|
2018-12-18 23:13:33 +01:00 |
|
|
Paul Sander
|
478c7b5421
|
Merge remote-tracking branch 'upstream/master'
|
2018-12-17 16:26:00 +01:00 |
|
|
Paul Sander
|
fc1fd9c983
|
merge upstream
|
2018-11-30 22:16:04 +01:00 |
|
|
Paul Sander
|
308e60da31
|
change some names and remove some blank lines
|
2018-11-30 22:01:50 +01:00 |
|
|
paul
|
4744a7d96e
|
Merge remote-tracking branch 'upstream/master'
|
2018-11-24 19:57:36 +01:00 |
|
|
paul
|
284bbf91af
|
Merge remote-tracking branch 'upstream/master'
|
2018-11-20 19:03:24 +01:00 |
|
|
paul
|
4fc60e3f70
|
Merge remote-tracking branch 'upstream/master'
|
2018-11-08 21:54:53 +01:00 |
|
|
paul
|
d40ea8b15d
|
prepare graphics.s for further dumping of compressed data, tag regions which arent compressed
|
2018-10-30 01:27:51 +01:00 |
|
|
paul
|
a488618e41
|
Merge remote-tracking branch 'upstream/master'
|
2018-10-26 22:51:25 +02:00 |
|
|
paul
|
092462d83d
|
Merge remote-tracking branch 'upstream/master'
|
2018-10-21 17:10:02 +02:00 |
|
|
paul
|
e396bcdb72
|
Merge remote-tracking branch 'upstream/master'
|
2018-10-17 21:10:51 +02:00 |
|
|
paul
|
771cc93d93
|
actually fix trade.s
|
2018-10-14 16:38:48 +02:00 |
|
|
paul
|
3037f37cc6
|
merge upstream, fix non-conflict in trade.s
|
2018-10-14 16:36:53 +02:00 |
|
|
paul
|
943931f86f
|
add mail
|
2018-10-13 22:49:21 +02:00 |
|
|
paul
|
dc73d6e003
|
add items and some battle anims
|
2018-10-13 22:42:39 +02:00 |
|
|
paul
|
c3ffefa6c2
|
replace some interface baseroms, fix labels
|
2018-10-13 22:38:10 +02:00 |
|
|
paul
|
fbd6100c36
|
replace more battle anim baseroms, fix up labels
|
2018-10-13 22:28:46 +02:00 |
|
|
paul
|
cfe2cbd381
|
add some battle interface, berry blender and contest files, fix up label
|
2018-10-13 21:59:56 +02:00 |
|
|
paul
|
0283aa99bf
|
add battle terrain and transitions, replace more baserom
|
2018-10-13 21:43:22 +02:00 |
|
|
paul
|
ad02552fbe
|
replace more baserom, fix graphics_file_rules.mk for C2EA50, replace labels for battle_anims
|
2018-10-13 20:30:58 +02:00 |
|
|
paul
|
8781b66d5f
|
add all battle_anims (assuming there is no funkiness with them in fr), replace more baseroms
|
2018-10-13 19:41:45 +02:00 |
|
|
paul
|
291935525d
|
replace baseroms at D12AC4, D18780, D1A064
|
2018-10-13 19:16:38 +02:00 |
|
|
paul
|
0e29da2c9f
|
replace baserom at 8D093D8
|
2018-10-13 18:07:05 +02:00 |
|
|
paul
|
d161ce7ad1
|
change label for unknown hitmontop data
|
2018-10-13 00:56:24 +02:00 |
|
|
paul
|
8adafe8c73
|
add copy of black_belt palette for emerald and fix labels
|
2018-10-13 00:44:54 +02:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
paul
|
7d24736ce0
|
Merge remote-tracking branch 'upstream/master'
|
2018-10-03 19:36:11 +02:00 |
|
|
paul
|
d60d4a03bc
|
fetch some graphics
|
2018-10-03 19:34:04 +02:00 |
|