Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Now the past 10 or so commits actually work.
|
|
|
|
|
|
Conflicts:
main.asm
|
|
|
|
|
|
|
|
|
|
|
|
These are now generated by the build.
|
|
globals.asm is no longer part of the build, is not generated, does not exist at all.
|