search

ejona86 / taus

Tetris - Actually Useful Statistics and other mods
MIT License
89 stars 3 forks source link

Tournament v0.1 #1

Closed TGGC closed 4 years ago

TGGC commented 4 years ago

I added a new flag to build a tournament mode rom. I started putting a background in and changed alll PPU adressses to match. I moved all this to a file called tournament.screenlayout.inc. I did the same for the changes of the pattern table with tournament-CHR.inc. I suggest to add another compile flag for next box in the middle and also have a screenlayout.inc for the other two background screens. Then after including the right layout in the beginning of twoplayer.s the ifdef ifdef else else can be removed and the tournament version code can be used for all three versions.

TGGC commented 4 years ago

I updated the commits. But how to handle the diff? For now I would not mind if my change is removed completely. I can reapply it within minutes, much quicker than to do a proper merge.

ejona86 commented 4 years ago

@TGGC, oh, you didn't notice I had added a merge commit that handled the diff. I manually merged it and then ran make, touch build/diffhead*, make to regenerate the file with correct lines. I've re-created the merge commit and pushed it here.

Do you care if I squash merge this or whether I keep the separate development commits?