Correct pre-computed branch - fixes zero bug

Thanks 0xCrafty on the PK Hack Discord for discovering and helping troubleshoot this bug!
charasyn · Jul 15, 2021 · d665588 · d665588
1 parent e4abdc2
commit d665588
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ Some examples of custom control codes can be seen in the `example/` directory:
 ## Thanks
 - jtolmar for providing a WIP which this was based on
 - phoenixbound and Catador for their support during development
+- 0xCrafty for bugtesting
 - All of the randomizer developers for inspiring me to get involved with PK Hacking
 - Everyone else on the PK Hack Discord for being awesome
 - The [EarthBound ROM Explorer](https://earthbound-rom-explorerr.herokuapp.com/)

diff --git a/ccexpand.ccs b/ccexpand.ccs
@@ -1,9 +1,16 @@
 import asm65816
 
-// Additional CCScript codes v0.2 - Single file version
+// CCExpand v0.3 - Additional CCScript codes
 // Initial version by jtolmar
 // Rework and additional support functions by cooprocks123e
 // With thanks to Phoenixbound, Catador and Herringway
+// Changelog:
+// 0.3 - Correct bug with R_Read_Parameter_Bytes
+//   The parameter space was not properly zero'ed out, leading to issues with
+//   M_Read_Bytes_or_Arg not returning the argument when the value was 0.
+//   Thanks to 0xCrafty for discovering and helping troubleshoot this bug!
+// 0.2 - Combine separate "library" and "implementation" files into single file
+// 0.1 - Initial version!
 
 // Many CCScript commands are "trees" that branch into more commands based on the
 // next byte. Of these, 1A and 1B have very few commands and lots of space to
@@ -349,7 +356,7 @@ R_Read_Parameter_Bytes: M_EB_Function_Wrapper_UserStack(-0x12, {
   TYA
   LSR // Get lower order bit in carry, and branch if 0
   LDA_i(0x0000)
-  BCC(13) // aligned
+  BCC(14) // aligned
   // Align Y to next word
   SEP(0x20)
   STA_y(D_cc_argv)

diff --git a/example/ccexpand.ccs b/example/ccexpand.ccs
@@ -1,9 +1,16 @@
 import asm65816
 
-// Additional CCScript codes v0.2 - Single file version
+// CCExpand v0.3 - Additional CCScript codes
 // Initial version by jtolmar
 // Rework and additional support functions by cooprocks123e
 // With thanks to Phoenixbound, Catador and Herringway
+// Changelog:
+// 0.3 - Correct bug with R_Read_Parameter_Bytes
+//   The parameter space was not properly zero'ed out, leading to issues with
+//   M_Read_Bytes_or_Arg not returning the argument when the value was 0.
+//   Thanks to 0xCrafty for discovering and helping troubleshoot this bug!
+// 0.2 - Combine separate "library" and "implementation" files into single file
+// 0.1 - Initial version!
 
 // Many CCScript commands are "trees" that branch into more commands based on the
 // next byte. Of these, 1A and 1B have very few commands and lots of space to
@@ -349,7 +356,7 @@ R_Read_Parameter_Bytes: M_EB_Function_Wrapper_UserStack(-0x12, {
   TYA
   LSR // Get lower order bit in carry, and branch if 0
   LDA_i(0x0000)
-  BCC(13) // aligned
+  BCC(14) // aligned
   // Align Y to next word
   SEP(0x20)
   STA_y(D_cc_argv)