code cleanup, pass 1

DevEd2 · Sep 29, 2021 · 2c53751 · 2c53751
1 parent 427a8cd
commit 2c53751
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 144 deletions.
diff --git a/Engine/GBPrinter.asm b/Engine/GBPrinter.asm
@@ -39,7 +39,6 @@ GBPrinter_TestPrint:
     call    GBPrinter_Detect
     ret     nz
     ; TODO
-    ld      b,b
     ret
 
 ; INPUT:  A = data

diff --git a/Engine/GameModes/Level.asm b/Engine/GameModes/Level.asm
@@ -62,7 +62,7 @@ GM_Level:
     pop     hl
     call    LoadMap
     
-    ld      a,$80
+    ld      a,high(_VRAM)
     ld      [Engine_ParallaxDest],a
     
     ; initialize camera
@@ -240,7 +240,7 @@ LevelLoop::
     ld      a,$01
     
 .dohoriz
-    call    Parallax_ShiftHorizontal
+    farcall Parallax_ShiftHorizontal
 
 .skipX
     pop     de
@@ -251,7 +251,7 @@ LevelLoop::
     cpl
     inc     a
     ld      c,1
-    call    Parallax_ShiftVertical
+    farcall Parallax_ShiftVertical
 .skipY
 
 .nocamera

diff --git a/Engine/Metatile.asm b/Engine/Metatile.asm
@@ -10,7 +10,7 @@ COLLISION_SOLID         equ 1
 COLLISION_TOPSOLID      equ 2
 COLLISION_WATER         equ 3
 COLLISION_COIN          equ 4
-COLLISION_GOAL          equ 5
+COLLISION_UNUSED5       equ 5
 COLLISION_KILL          equ 6
 COLLISION_UNUSED7       equ 7
 

diff --git a/Engine/Parallax.asm b/Engine/Parallax.asm
@@ -6,7 +6,7 @@ Engine_ParallaxTemp2:		db
 Engine_ParallaxTemp3:		db
 Engine_ParallaxTemp4:		db
 
-section "Parallax routines",rom0
+section "Parallax routines",romx
 ; INPUT: a = amount to shift by
 Parallax_ShiftHorizontal::
 	push	de
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ GBPrinter_TestPrint: @@
         call    GBPrinter_Detect
         ret     nz
         ; TODO
-        ld      b,b
         ret
     ; INPUT:  A = data
@@ Expand Down @@