Save 12 bytes by inlining functions--thanks Ray!

Author: willisblackburn

src/functions.s

@@ -183,32 +183,6 @@ fun_dpeek:
         pla
         rts
 
-.bss
-
-rnd_value:      .res .sizeof(Float::t)
-
-.code
-
-fun_rnd:
-        lda     FP0e                    ; 0 -> return previous number, >0 -> return next number, <0 -> reseed
-        beq     @output
-        lda     FP0s
-        bpl     @generate
-        jsr     rnd_reseed
-@generate:
-        jsr     rnd_generate
-@output:
-        ldx     #4                      ; Make random number from rnd_value
-@next_copy_to_fp0:
-        lda     rnd_value-1,x
-        sta     FP0t-1,x
-        dex
-        bne     @next_copy_to_fp0
-        lda     #BIAS-1                 ; This effectively puts the binary point to the left of the mantissa
-        sta     FP0e
-        stx     FP0s                    ; The purpose of all the -1s was to make X 0 here
-        jmp     normalize 
-
 fun_sgn:
         lda     FP0e                    ; If exponent is 0 then value is 0; return 0
         beq     @done

src/random.s

@@ -6,17 +6,27 @@
 ; Separated out from the rest of functions so we can replace it on a machine that includes a hardware random
 ; number generator.
 
-rnd_mask:       .byte $B7, $1D, $C1, $04
+.bss
+
+rnd_value:      .res .sizeof(Float::t)
 
-; Generates a new random value in rnd_value.
-; Uses a 32-bit linear feedback shift register (LFSR) with taps defined by rnd_mask.
-; To generate one random bit, we shift rnd_value left one bit and then, if the bit we shifted into the carry is 1, we
-; XOR the seed with the rnd_mask. The random bit is the bit we shifted off the left, but we don't use it, because in
-; fact the value left in rnd_value contains the *last* value returned from the RND function. We we generate 32 new
-; bits and then just return them directly from rnd_value. The value of rnd_mask is the CRC32 polynomial and will
-; generate random numbers with a cycle of 2^31-1.
+.code
+
+rnd_mask:       .byte $B7, $1D, $C1, $04
 
-rnd_generate:
+; Generates a new random value in rnd_value and outputs it in FP0.
+fun_rnd:
+        lda     FP0e                    ; 0 -> return previous number, >0 -> return next number, <0 -> reseed
+        beq     @output
+        lda     FP0s
+        bpl     @generate
+        ldx     #4                      ; Copy given number into rnd_value
+@next_copy_to_value:
+        lda     FP0t-1,x
+        sta     rnd_value-1,x
+        dex
+        bne     @next_copy_to_value
+@generate:
         ldy     #32                     ; Each iteration generates 1 pseudo-random bit
 @next_shift:
         asl     rnd_value
@@ -34,13 +44,14 @@ rnd_generate:
 @skip_feedback:
         dey
         bne     @next_shift
-        rts
-
-rnd_reseed:
-        ldx     #4                      ; Copy given number into rnd_value
-@next_copy_to_value:
-        lda     FP0t-1,x
-        sta     rnd_value-1,x
+@output:
+        ldx     #4                      ; Make random number from rnd_value
+@next_copy_to_fp0:
+        lda     rnd_value-1,x
+        sta     FP0t-1,x
         dex
-        bne     @next_copy_to_value
-        rts        
+        bne     @next_copy_to_fp0
+        lda     #BIAS-1                 ; This effectively puts the binary point to the left of the mantissa
+        sta     FP0e
+        stx     FP0s                    ; The purpose of all the -1s was to make X 0 here
+        jmp     normalize

src/string.s

@@ -249,7 +249,10 @@ for_all_strings:
         lda     #STRING_EXTRA - 2       ; Move to next string; minus 2 because two calls to "plus_one" function
         jsr     add_src_ptr_plus_one
 @next:
-        jsr     check_src_ptr
+        lda     src_ptr                 ; Compare src_ptr with himem_ptr using 16-bit subtraction
+        cmp     himem_ptr               ; Check low byte
+        lda     src_ptr+1               ; Subtract high byte
+        sbc     himem_ptr+1             ; Carry clear if src_ptr < himem_ptr, else carry set
         bcc     @continue
         rts
 
@@ -463,16 +466,6 @@ set_name_ptr_data:
         txa                             ; Return type in A (setting flags)
         rts
 
-; Checks if src_ptr is < himem_ptr.
-; Returns carry clear if it is, otherwise carry set.
-
-check_src_ptr:
-        lda     src_ptr                 ; Compare src_ptr with himem_ptr using 16-bit subtraction
-        cmp     himem_ptr               ; Check low byte
-        lda     src_ptr+1               ; Subtract high byte
-        sbc     himem_ptr+1             ; Returns with carry clear if src_ptr < himem_ptr, else carry set
-@done:
-        rts
 
 ; Adds the value in A plus one to src_ptr. Always adds one more than A to make make skipping over the length byte
 ; and string data easier.