Home Explore Help
Register Sign In
NonstickAtom
/
Grammer2
forked from Zeda/Grammer2
2
0
Fork 0
Files
Browse Source

Merge branch 'master' of https://github.com/Zeda/Grammer2

Zeda Thomas 4 years ago
parent
d09e41dd05 d8082953ef
commit
14e50535af
2 changed files with 5 additions and 6 deletions
Unified View Show Diff Stats
  1. 4 4
      Readme.md
  2. 1 2
      docs/readme.md

+ 4 - 4
Readme.md
View File 

@@ -2,8 +2,8 @@
 
 For a tutorial/documentation on the commands open [/readme/commands.html](/docs/readme.md)
 
 For a tutorial/documentation on the commands open [/readme/commands.html](/docs/readme.md)
 
 Once downloads are ready, you'll be able to find them in the [releases](https://github.com/Zeda/Grammer2/releases) section.
 
 Once downloads are ready, you'll be able to find them in the [releases](https://github.com/Zeda/Grammer2/releases) section.
 
 
 
-Before going on, I do want to thank nonstickatom. I had to delete the commit history because I was misusing `git`, and that
 
-has unfortunately removed the logs of many of nonstickatom's contributions to the project (especially in documentation).
 
+Before going on, I do want to thank @NonstickAtom. I had to delete the commit history because I was misusing `git`, and that
 
+has unfortunately removed the logs of many of NonstickAtom's contributions to the project (especially in documentation).
 
 
 
 # Building
 
 # Building
 
 If you want to build this project yourself, you'll first need to clone the repository:
 
 If you want to build this project yourself, you'll first need to clone the repository:
 
@@ -14,8 +14,8 @@ git clone --recursive-submodules https://github.com/Zeda/Grammer2.git
 
 This project uses [`spasm-ng`](https://github.com/alberthdev/spasm-ng) to compile, and I use Linux. On windows you can either use the [`linux subsytem`](https://www.windowscentral.com/install-windows-subsystem-linux-windows-10)(only on windows 10) and install spasm from there or you can download the [`spasm-ng`](https://github.com/alberthdev/spasm-ng/releases) for Windows release.
 
 This project uses [`spasm-ng`](https://github.com/alberthdev/spasm-ng) to compile, and I use Linux. On windows you can either use the [`linux subsytem`](https://www.windowscentral.com/install-windows-subsystem-linux-windows-10)(only on windows 10) and install spasm from there or you can download the [`spasm-ng`](https://github.com/alberthdev/spasm-ng/releases) for Windows release.
 
 
 
 ***NOTE:** at the time of this writing, it appears that spasm-ng has a bug that doesn't parse the name field correctly.
 
 ***NOTE:** at the time of this writing, it appears that spasm-ng has a bug that doesn't parse the name field correctly.
 
-Please use this version for now: https://github.com/alberthdev/spasm-ng/tree/feature/app-name-var-size. If you are on
 
-Windows, Nonstickatom has built an .exe for it and posted [here]() with permission.*
 
+Please use this version for now: [alberthdev/spasm-ng/tree/feature/app-name-var-size](https://github.com/alberthdev/spasm-ng/tree/feature/app-name-var-size). If you are on
 
+Windows, @NonstickAtom785 has built the fixed version and posted it [here](https://ourl.ca/22728) with permission.*
 
 
 
 ## Linux:
 
 ## Linux:
 
 From the command line, run `./compile`
 
 From the command line, run `./compile`

+ 1 - 2
docs/readme.md
View File 

@@ -687,7 +687,6 @@ syntax that tilemaps are stored (stored in rows).
 
 | Fix Text(    | Use this to set the typewriter delay. The larger the number, the slower the typewriter text is displayed.
 
 | Fix Text(    | Use this to set the typewriter delay. The larger the number, the slower the typewriter text is displayed.
 
 | Fix          | See description below.
 
 | Fix          | See description below.
 
 | Full         | This is used to set 15MHz mode. Alternatively, if you add a number to the end `Full0` sets 6MHz, `Full1` sets 15MHz, `Full2` toggles the speed. 15MHz is only set if it is possible for the calc. This returns `0` if the previous speed setting was 6MHz, `1` if it was 15MHz.
 
 | Full         | This is used to set 15MHz mode. Alternatively, if you add a number to the end `Full0` sets 6MHz, `Full1` sets 15MHz, `Full2` toggles the speed. 15MHz is only set if it is possible for the calc. This returns `0` if the previous speed setting was 6MHz, `1` if it was 15MHz.
 
-
 
 | Output(      | See description below.
 
 | Output(      | See description below.
 
 
 
 ### Fix
 
 ### Fix
 
@@ -802,7 +801,7 @@ I have to give special thanks to Yeongjin Nam for their work on writing a
 
 better tutorial for Grammer and as well Louis Becquey (persalteas) for their work on
 
 better tutorial for Grammer and as well Louis Becquey (persalteas) for their work on
 
 writing a french readme/tutorial. Both of them have also made many valuable
 
 writing a french readme/tutorial. Both of them have also made many valuable
 
 suggestions that have helped make Grammer what it is right now. Thanks much!
 
 suggestions that have helped make Grammer what it is right now. Thanks much!
 
-Thanks to GModder for the suggestions and (many) bug reports that I would not have found otherwise!
 
+Thanks to @NonstickAtom785 for the suggestions and (many) bug reports that I would not have found otherwise!
 
 
 
 I also thank Hans Burch for reconstructing Grammer 2 after I lost my work. It must have been a tremendous amount of effort and tedium, and I greatly appreciate it. They've continued to provide valuable feedback about bugs and it has been extremely helpful.
 
 I also thank Hans Burch for reconstructing Grammer 2 after I lost my work. It must have been a tremendous amount of effort and tedium, and I greatly appreciate it. They've continued to provide valuable feedback about bugs and it has been extremely helpful.