More merge labeling

2024-04-07 05:09:32 -05:00
parent 9cfeb18fef
commit 27685ac77d
70 changed files with 1386 additions and 1410 deletions
--- a/doorrando/overrides.asm
+++ b/doorrando/overrides.asm
@@ -36,7 +36,7 @@ BlockEraseFix:
    + rtl

 FixShopCode:
-    cpx.w #$0300 : !bge +
+    cpx.w #$0300 : !BGE +
        sta.l RoomDataWRAM[$00].l, x
    + rtl

@@ -46,8 +46,8 @@ VitreousKeyReset:
    + JML SpritePrep_LoadProperties ; what we wrote over

 GuruguruFix:
-    lda.b RoomIndex : cmp.b #$df : !bge +
-        and.b #$0f : cmp.b #$0e : !blt +
+    lda.b RoomIndex : cmp.b #$df : !BGE +
+        and.b #$0f : cmp.b #$0e : !BLT +
            iny #2
    + rtl