From 9500800c3ceb30df8090a3e6abb5c4686199625b Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 5 May 2023 22:11:19 -0500
Subject: [PATCH] Minor formatting and small optimization

---
 bookofmudora.asm           |  4 ++--
 catfish.asm                |  4 ++--
 doorrando/hudadditions.asm |  2 +-
 doorrando/normal.asm       |  2 +-
 keydrop/standing_items.asm | 36 ++++++++++++++++++------------------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/bookofmudora.asm b/bookofmudora.asm
index 412b9b7..d413984 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -63,7 +63,7 @@ RTL
 LoadBonkItem:
 	LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
 	CMP #115 : BNE + ; Desert Bonk Key
-    	LDA.l BonkKey_Desert
+		LDA.l BonkKey_Desert
 		BRA ++
 	+ : CMP #140 : BNE + ; GTower Bonk Key
 		LDA.l BonkKey_GTower
@@ -79,7 +79,7 @@ LoadBonkItem_Player:
 		LDA.l BonkKey_Desert_Player
 		BRA ++
 	+ : CMP #140 : BNE + ; GTower Bonk Key
-    	LDA.l BonkKey_GTower_Player
+		LDA.l BonkKey_GTower_Player
 		BRA ++
 	+
 		LDA.b #$00
diff --git a/catfish.asm b/catfish.asm
index 30351fb..7429cb7 100644
--- a/catfish.asm
+++ b/catfish.asm
@@ -25,12 +25,12 @@ MarkThrownItem:
 	LDA $8A : CMP.b #$81 : BNE .catfish
 
 	.zora
-    JSL.l ItemSet_ZoraKing
+	JSL.l ItemSet_ZoraKing
 	LDA ZoraItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
 	BRA .done
 
 	.catfish
-    JSL.l ItemSet_Catfish
+	JSL.l ItemSet_Catfish
 	LDA CatfishItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
 
 	.done
diff --git a/doorrando/hudadditions.asm b/doorrando/hudadditions.asm
index c77f411..362b389 100644
--- a/doorrando/hudadditions.asm
+++ b/doorrando/hudadditions.asm
@@ -16,7 +16,7 @@ HudAdditions:
         + JSL HexToDec_fast
         .skip
         LDA #$207F : STA !GOAL_DRAW_ADDRESS+2 : STA !GOAL_DRAW_ADDRESS+4
-		PLA : PHA : CMP.w #100 : !BLT +
+		LDA.b 1,S : CMP.w #100 : !BLT +
 			LDX.b $05 : TXA : ORA.w #$2490 : STA !GOAL_DRAW_ADDRESS+2 ; draw 100's digit
 		+ PLA : CMP.w #10 : !BLT +
 		 	LDX.b $06 : TXA : ORA.w #$2490 : STA !GOAL_DRAW_ADDRESS+4 ; draw 10's digit
diff --git a/doorrando/normal.asm b/doorrando/normal.asm
index 9352837..6fcb7e5 100644
--- a/doorrando/normal.asm
+++ b/doorrando/normal.asm
@@ -433,7 +433,7 @@ HandleSpecialDoorLanding: {
     HandleIncomingDoorState:
     PHA
         LDA.l DRMode : BEQ .noDoor
-        PLA : PHA : AND.b #$FA : CMP.b #$80 : bne .noDoor
+        LDA.b 1,S : AND.b #$FA : CMP.b #$80 : bne .noDoor
 
         .setDoorState
         LDA.w $0418 : AND.b #$02 : BNE + : INC
diff --git a/keydrop/standing_items.asm b/keydrop/standing_items.asm
index 2d5c02a..12ac19b 100644
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -472,21 +472,21 @@ SpriteKeyDrawGFX:
 	RTL
 
 KeyGet:
-    LDA CurrentSmallKeys ; what we wrote over
-    PHA
-    	LDA.l StandingItemsOn : BNE +
-    		PLA : RTL
-    	+ LDY $0E80, X
-    	LDA SprItemIndex, X : STA SpawnedItemIndex
-    	LDA SprItemFlags, X : STA SpawnedItemFlag
-    	LDA $A0 : CMP #$87 : BNE + ;check for hera cage
-    	LDA SpawnedItemFlag : BNE + ; if it came from a pot, it's fine
-    		JSR ShouldKeyBeCountedForDungeon : BCC ++
+	LDA CurrentSmallKeys ; what we wrote over
+	PHA
+		LDA.l StandingItemsOn : BNE +
+			PLA : RTL
+		+ LDY $0E80, X
+		LDA SprItemIndex, X : STA SpawnedItemIndex
+		LDA SprItemFlags, X : STA SpawnedItemFlag
+		LDA $A0 : CMP #$87 : BNE + ;check for hera cage
+		LDA SpawnedItemFlag : BNE + ; if it came from a pot, it's fine
+			JSR ShouldKeyBeCountedForDungeon : BCC ++
 			JSL CountChestKeyLong
-    		++ PLA : RTL
-    	+ STY $00
-    	LDA SprItemMWPlayer, X : STA !MULTIWORLD_ITEM_PLAYER_ID : BNE .receive
-    	PHX
+			++ PLA : RTL
+		+ STY $00
+		LDA SprItemMWPlayer, X : STA !MULTIWORLD_ITEM_PLAYER_ID : BNE .receive
+		PHX
 			LDA $040C : CMP #$FF : BNE +
 				LDA $00 : CMP.b #$AF : BNE .skip
 				LDA CurrentGenericKeys : INC : STA CurrentGenericKeys
@@ -499,10 +499,10 @@ KeyGet:
 				++ PLX : PLA : RTL
 			+ CMP.b #$AF : beq .countIt ; universal key
 			CMP.b #$24 : beq .countIt   ; small key for this dungeon
-    	.skip PLX
-    	.receive
-    	JSL $0791b3 ; Player_HaltDashAttackLong
-    	JSL.l Link_ReceiveItem
+		.skip PLX
+		.receive
+		JSL $0791b3 ; Player_HaltDashAttackLong
+		JSL.l Link_ReceiveItem
 	PLA : DEC : RTL
 
 KeyTable: