From 46272e7fad74a89340e78d471c175dd337051392 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 1 Dec 2022 14:04:09 -0700 Subject: [PATCH] New goal "completionist" --- goalitem.asm | 9 +++++++++ tables.asm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/goalitem.asm b/goalitem.asm index 9d112f8..255688c 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -46,6 +46,7 @@ CheckGanonVulnerability: dw .crystals_and_bosses dw .bosses_only dw .all_dungeons_no_agahnim + dw .completionist ; 00 = always vulnerable .vulnerable @@ -99,6 +100,14 @@ CheckGanonVulnerability: .bosses_only JMP CheckForCrystalBossesDefeated +.completionist + REP #$20 + LDA.l TotalItemCounter : CMP.l MaxItemCounter + SEP #$20 + BCC .fail +BRA .all_dungeons + + ;-------------------------------------------------------------------------------- GetRequiredCrystalsForTower: BEQ + : JSL.l BreakTowerSeal_ExecuteSparkles : + ; thing we wrote over diff --git a/tables.asm b/tables.asm index 3f667c4..7111753 100644 --- a/tables.asm +++ b/tables.asm @@ -1901,4 +1901,7 @@ db $08, $08, $06, $06, $02, $0A, $0E, $08, $08, $08, $06, $08, $0C, $1B, $00, $0 ;-------------------------------------------------------------------------------- ; 0x187010 - 187FFF (unused) ;-------------------------------------------------------------------------------- +org $30F010 +MaxItemCounter: +dw $00D8 ; 216 default