goalitem.asm

@@ -40,14 +40,14 @@ RTL
 	dw .crystals
 	dw .pendant_bosses
 	dw .crystal_bosses
-	dw .bosses
+	dw .prize_bosses
 	dw .agahnim_defeated
 	dw .agahnim2_defeated
 	dw .goal_item
 	dw .collection_rate
 	dw .custom_goal
 	dw .bingo
-	dw .success
+	dw .all_bosses
 	dw .success
 	dw .success
 	dw .success
@@ -70,19 +70,24 @@ RTL
 		CMP.b #$07 : RTS
 .pendant_bosses
 	PHP
-	LDA.b #$02
+	LDA.b #$20
 	JSR CheckForBossesDefeated : PLP : BCC +
 		CMP.b #$03 : RTS
 .crystal_bosses
 	PHP
-	LDA.b #$01
+	LDA.b #$10
 	JSR CheckForBossesDefeated : PLP : BCC +
 		CMP.b #$07 : RTS
-.bosses
+.all_bosses
+	PHP
+	LDA.b #$30
+	JSR CheckForBossesDefeated : PLP : BCC +
+		CMP.b #$10 : RTS
+.prize_bosses
 	PHP
 	LDA.b #$00
 	JSR CheckForBossesDefeated : PLP : BCC +
-		CMP.b #$10 : RTS
+		CMP.b #$0A : RTS
 	+ CMP.b [Scrap00], Y : INY : RTS
 .agahnim_defeated
 	LDA.l ProgressIndicator : CMP.b #$03 : RTS
@@ -346,7 +351,7 @@ CheckTowerOpen:
 ;---------------------------------------------------------------------------------------------------
 CheckAgaForPed:
         REP #$20
-		; seems light_speed option to force blue balls is unused for now
+        ; seems light_speed option to force blue balls is unused for now
         BRA .vanilla
 
 .light_speed
@@ -368,12 +373,38 @@ CheckAgaForPed:
         RTL
 
 ;---------------------------------------------------------------------------------------------------
+BossPrizeFlags:
+	; $00 = all prize bosses
+	db $00
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $10 = all crystal bosses
+	db $00
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $00, $00, $00 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $20 = all pendant bosses
+	db $00
+	db $00, $00, $00, $00, $00, $00, $00 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $30 = all bosses
+	db $01 ; agas
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+
 CheckForBossesDefeated:
 	PHB : PHX : PHY
 
-	STA.b Scrap04 ; 0 = check all, 1 = check crystals, 2 = check pendants
+	; $00 = check prize bosses
+	; $10 = check crystal bosses
+	; $20 = check pendant bosses
+	; $30 = check all bosses
+	STA.b Scrap04
 	
-	LDA.b #CrystalPendantFlags_3>>16
+	LDA.b #bank(CrystalPendantFlags_3)
 	PHA : PLB
 
 	STZ.b Scrap03 ; count of number of bosses killed
@@ -381,22 +412,22 @@ CheckForBossesDefeated:
 
 	REP #$30
 
-	LDY.w #10
+	LDY.w #11
 
 .next_check
-	LDA.w CrystalPendantFlags_3+2,Y : AND.w #$00FF : BEQ .skip
+	SEP #$30
-	CMP.w #$0008 ; C set = pendant, C clear = crystal
+	LDA.w CrystalPendantFlags_3+2, Y
-	LDA.b Scrap04 : BEQ .proceed
+	CLC : ADC.b Scrap04
-		PHP : ROR : BCC +
+	TAX
-			PLP : BCS .skip : BRA .proceed
+	LDA.l BossPrizeFlags, X
-		+ PLP : BCC .skip
+	REP #$30
+	BEQ .skip
 
-	.proceed
+	TYA : ASL A : TAX
-	TYA : ASL : TAX
 
-	LDA.l DungeonMapBossRooms+4,X
+	LDA.l DungeonMapBossRooms+4, X
-	ASL : TAX
+	ASL A : TAX
-	LDA.l RoomDataWRAM.l,X
+	LDA.l RoomDataWRAM.l, X
 
 	AND.w #$0800 : BEQ .skip
 		INC.b Scrap03

tables.asm

@@ -2664,7 +2664,7 @@ db #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00,
 ;--------------------------------------------------------------------------------
 org $B0EFE0 ; PC 0x186FE0-0x186FEF
 CrystalPendantFlags_3:
-    db $00 ; Sewers
+	db $00 ; Sewers
 	db $00 ; Hyrule Castle
 	db $08 ; Eastern Palace
 	db $09 ; Desert Palace
@@ -2672,7 +2672,7 @@ CrystalPendantFlags_3:
 	db $02 ; Swamp Palace
 	db $01 ; Palace of Darkness
 	db $06 ; Misery Mire
-    db $03 ; Skull Woods
+	db $03 ; Skull Woods
 	db $05 ; Ice Palace
 	db $0A ; Tower of Hera
 	db $04 ; Thieves' Town