Merge branch 'master' into DRMain
# Conflicts: # LTTP_RND_GeneralBugfixes.asm # catfish.asm # compasses.asm # darkworldspawn.asm # hooks.asm # inventory.asm # newitems.asm # shopkeeper.asm # stats.asm # tables.asm Adn some updates from DR
This commit is contained in:
16
tables.asm
16
tables.asm
@@ -153,6 +153,9 @@ db #$00
|
||||
; #$03 = Require "NumberOfCrystalsRequiredForGanon" Crystals and Aga2
|
||||
; #$04 = Require "NumberOfCrystalsRequiredForGanon" Crystals
|
||||
; #$05 = Require "GoalItemRequirement" Goal Items
|
||||
; #$06 = Light Speed
|
||||
; #$07 = Require All Crystals and Crystal Bosses
|
||||
; #$08 = Require All Crystal Bosses only
|
||||
;--------------------------------------------------------------------------------
|
||||
org $30803F ; PC 0x18003F
|
||||
HammerableGanon:
|
||||
@@ -184,7 +187,8 @@ db #$00 ; #$00 = Off (default) - #$01 = On
|
||||
;--------------------------------------------------------------------------------
|
||||
org $308045 ; PC 0x180045
|
||||
HUDDungeonItems:
|
||||
db #$00 ; display ----dcba a: Small Keys, b: Big Key, c: Map, d: Compass
|
||||
; display ---edcba a: Small Keys, b: Big Key, c: Map, d: Compass, e: Bosses
|
||||
db #$00
|
||||
;--------------------------------------------------------------------------------
|
||||
org $308046 ; PC 0x180046 Link's starting equipment
|
||||
LinkStartingRupees:
|
||||
@@ -380,7 +384,11 @@ org $30808C ; PC 0x18008C
|
||||
PreopenGanonsTower:
|
||||
db $00 ; #$00 = Off (default) - #$01 = On
|
||||
;--------------------------------------------------------------------------------
|
||||
; 0x18008D - 0x18008F (unused)
|
||||
org $30808D ; PC 0x18008D
|
||||
InstantPostAgaWorldState:
|
||||
db $00 ; #$00 = Off (default) - #$01 = On
|
||||
;--------------------------------------------------------------------------------
|
||||
; 0x18008E - 0x18008F (unused)
|
||||
;--------------------------------------------------------------------------------
|
||||
org $308090 ; PC 0x180090 - 0x180097
|
||||
ProgressiveSwordLimit:
|
||||
@@ -865,8 +873,8 @@ Restrict_Ponds:
|
||||
db #$01 ; #$00 = Original Behavior - #$01 - Restrict to Bottles (Default)
|
||||
;================================================================================
|
||||
org $30817F ; PC 0x18017F
|
||||
Seizure_Safety:
|
||||
db #$00 ; #$00 = Off (Default) - #$xx = Limit Certain Effects
|
||||
DisableFlashing:
|
||||
db #$00 ; #$00 = Flashing Enabled (Default) - #$01 = Flashing Disabled
|
||||
;================================================================================
|
||||
;---- --hb
|
||||
;h - Hookshot
|
||||
|
||||
Reference in New Issue
Block a user