Merge commit '9174bbfba54f94ff51c149ba5d3f9e754dbf61a1' into codemann_OWMain

bugfixes.asm

@@ -246,7 +246,7 @@ FixSwimBump:
 .normal
 	LDA.b LinkJumping : BNE .continue ; what we wrote over
 .not_diving
-	PLA : PLA : PEA.w $87964E ; skip ahead, not diving
+	PLA : PLA : PEA.w $87964D ; skip ahead, not diving
 .continue
 	RTL
 ;--------------------------------------------------------------------------------

follower.asm

@@ -857,6 +857,7 @@ RTL
 Kiki_DontScareTheMonke:
     LDA.b LinkJumping : BEQ .return
     CMP.b #$02 : BEQ .no_spook ; needed for quake usage
+    LDA.b GameMode : CMP.b #$0F : BEQ .no_spook ; needed for entrance transitions
     LDA.w NoDamage : BNE .no_spook
     LDA.w LinkThud : BNE .no_spook
 .spook

newhud.asm

@@ -386,6 +386,7 @@ RTS
 ;================================================================================
 DrawMapCounts:
         LDA.l MapHUDMode : BEQ .done
+        LDA.l GenericKeys : BNE .done ; generator don't have an accurrate count of key doors in this case
 
         ; no map needed if this bit is set
         BIT.b #$02 : BNE .draw_map_count

tables.asm

@@ -1532,7 +1532,7 @@ db $19,$1A,$1B,$1C,$1D,$1E,$1F,$20
 db $21,$22,$11,$11,$10,$16,$16,$16
 db $16,$16,$11,$16,$16,$16,$15,$15
 db $15,$15,$15,$15,$15,$15,$15,$15
-db $15,$15,$16,$02,$09,$00,$00,$00
+db $15,$15,$2E,$02,$09,$00,$00,$00
 
 MusicShuffleTable:
 db $01,$02,$03,$04,$05,$06,$07,$08