diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 1c50d01..e11dd6c 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb org $1FFFF8 ; <- FFFF8 timestamp rom -db #$20, #$17, #$10, #$02 ; year/month/day +db #$20, #$17, #$10, #$08 ; year/month/day ;================================================================================ diff --git a/darkworldspawn.asm b/darkworldspawn.asm index a2d3952..20a4c2c 100644 --- a/darkworldspawn.asm +++ b/darkworldspawn.asm @@ -52,7 +52,7 @@ SetDeathWorldChecked: LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead ;<<<<<<< crystalsgoalganonrespawn - LDA $1B : BNE + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled + LDA $1B : BEQ + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled ;======= ; LDA $1B : BEQ + : LDA $A0 : BNE + ; check if we died in ganon's room ;>>>>>>> master diff --git a/hooks.asm b/hooks.asm index 2cc20d9..e5027c3 100644 --- a/hooks.asm +++ b/hooks.asm @@ -611,6 +611,12 @@ NOP #2 org $0DDE9F ; <- 6DE9F equipment.asm:300 - LDA.b #$0A : STA $0200 LDA.b #$04 ;-------------------------------------------------------------------------------- +org $0DDE59 ; <- 6DE59 equipment.asm:247 - REP #$20 +JSL.l BringMenuDownEnhanced : RTS +;-------------------------------------------------------------------------------- +org $0DDFBC ; <- 6DFBC equipment.asm:599 - LDA $EA : ADD.w #$0008 : STA $EA : SEP #$20 : BNE .notDoneScrolling +JSL.l RaiseHudMenu : NOP #3 +;-------------------------------------------------------------------------------- org $0DDE3D ; <- 6DE3D equipment.asm:217 - BNE .equippedItemIsntBottle db $80 ; BRA ;-------------------------------------------------------------------------------- diff --git a/newitems.asm b/newitems.asm index 9879ad8..fa9c7b3 100755 --- a/newitems.asm +++ b/newitems.asm @@ -587,12 +587,16 @@ AddReceivedItemExpanded: .properties db 5, -1, 5, 5, 5, 5, 5, 1 db 2, 1, 1, 1, 2, 2, 2, 4 + db 4, 4, 1, 1, 2, 1, 1, 1 db 2, 1, 2, 1, 4, 4, 2, 1 + db 6, 1, 2, 1, 2, 2, 1, 2 db 2, 4, 1, 1, 4, 2, 1, 4 + db 2, 2, 4, 4, 4, 2, 1, 4 db 1, 2, 2, 1, 2, 2, 1, 1 + db 4, 4, 1, 2, 2, 4, 4, 4 db 2, 5, 2, 1 ;new diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index 852d893..29398b9 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -48,7 +48,7 @@ OverworldMap_CheckObject: TAX : BRA ++ + ;DW Map - LDA.l MapMode : BEQ +++ + LDA.l MapMode : BEQ +++ LDA.l !INVENTORY_MAP : AND.b #$02 : BNE +++ PHX LDA.l .dw_map_offsets, X : TAX ; put map offset into X @@ -85,12 +85,13 @@ db $02, $0A, $03, $FF db $06, $08, $0C, $0B, $07, $09, $05 .lw_map_offsets db $01, $00, $01 +; pod skull trock thieves mire ice swamp .dw_map_offsets -db $01, $01, $00, $00, $00, $01, $00 +db $01, $00, $00, $00, $01, $00, $01 .lw_map_masks db $20, $20, $10, $00 .dw_map_masks -db $02, $04, $80, $10, $40, $01, $04 +db $02, $80, $08, $10, $01, $40, $04 ;================================================================================ SetLWDWMap: PHP @@ -132,6 +133,29 @@ RTL ; CMP.b #$00 ;RTL ;================================================================================ +BringMenuDownEnhanced: + LDA.l QuickMenu : AND.l TournamentSeedInverse : BEQ + + REP #$20 ; set 16-bit accumulator + LDA.w #$FF18 : STA $EA ; immediately scroll to the end + SEP #$20 ; set 8-bit accumulator + INC $0200 + RTL + + + REP #$20 ; set 16-bit accumulator + LDA $EA : !SUB.w #$0008 : STA $EA : CMP.w #$FF18 + SEP #$20 ; set 8-bit accumulator + BNE .notDoneScrolling + INC $0200 + .notDoneScrolling +RTL +;================================================================================ +RaiseHudMenu: + LDA.l QuickMenu : AND.l TournamentSeedInverse : AND.w #$00FF : BEQ + + LDA.w #$0000 : STA $EA : RTL + + + LDA $EA : !ADD.w #$0008 : STA $EA +RTL +;================================================================================ ShowDungeonItems: LDA $040C : AND.w #$00FF : CMP.w #$00FF : BNE + : RTL : + ; return normal result if outdoors or in a cave ;LDA $F0 : AND.w #$0020 ; check for select diff --git a/tables.asm b/tables.asm index 2d632b1..cb388a4 100644 --- a/tables.asm +++ b/tables.asm @@ -179,6 +179,10 @@ org $308046 ; PC 0x180046 Link's starting equipment LinkStartingRupees: dw #$0000 ;-------------------------------------------------------------------------------- +org $308048 ; PC 0x180048 +QuickMenu: +db #$00 ; #$00 = Off (default) - #$01 = On +;-------------------------------------------------------------------------------- org $308080 ; PC 0x180080 Upgrade5BombsRefill: db #$00 @@ -363,7 +367,7 @@ dw $0100 ; #$6234 - Master Sword org $0ABEF8 ; PC 0x53EF8 MapObject_Eastern: -dw $6238 ; #$6038 - Green Pendant / Courage +dw $6038 ; #$6038 - Green Pendant / Courage org $0ABF1C ; PC 0x53F1C MapObject_Desert: @@ -391,11 +395,11 @@ dw $6434 ; #6434 - Crystal org $0ABF5A ; PC 0x53F5A MapObject_Ice: -dw $6434 ; #6434 - Crystal +dw $6432 ; #6434 - Crystal 5/6 org $0ABF48 ; PC 0x53F48 MapObject_Mire: -dw $6434 ; #6434 - Crystal +dw $6432 ; #6434 - Crystal 5/6 org $0ABF24 ; PC 0x53F24 MapObject_TRock: