alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

move this to a safer spot

Browse Source 
fixes #12
also remove merge conflict resolution code
This commit is contained in:
sporchia
2017-11-13 09:27:43 -05:00
parent 7c876b317e
commit 232828b9cb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
darkworldspawn.asm
View File

@@ -51,11 +51,7 @@ SetDeathWorldChecked:
+ +
LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead
;<<<<<<< crystalsgoalganonrespawn
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 + : 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
LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
BRL DarkWorldFlagSet_pyramid BRL DarkWorldFlagSet_pyramid
+ +

8
tables.asm
View File

@@ -701,10 +701,6 @@ org $308169 ; PC 0x180169
AgahnimDoorStyle: AgahnimDoorStyle:
db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default) db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default)
;================================================================================ ;================================================================================
org $308170 ; PC 0x180170
GanonPyramidRespawn:
db #$01 ; #00 = Do not respawn on Pyramid after Death - #$01 = Respawn on Pyramid after Death (default)
;================================================================================
org $30816A ; PC 0x18016A org $30816A ; PC 0x18016A
FreeItemText: FreeItemText:
db #$00 ; #00 = Off - #$01 = On (default) db #$00 ; #00 = Off - #$01 = On (default)
@@ -716,6 +712,10 @@ org $30816E ; PC 0x18016E
HardModeExclusionCapeUsage: HardModeExclusionCapeUsage:
db #$04, #$08, #$10 ; normal, 1/2, 1/4 magic db #$04, #$08, #$10 ; normal, 1/2, 1/4 magic
;================================================================================ ;================================================================================
org $308171 ; PC 0x180171
GanonPyramidRespawn:
db #$01 ; #00 = Do not respawn on Pyramid after Death - #$01 = Respawn on Pyramid after Death (default)
;================================================================================
org $308190 ; PC 0x180190 org $308190 ; PC 0x180190
TimerStyle: TimerStyle:
db #$00 ; #$00 = Off (Default) - #$01 Countdown - #$02 = Stopwatch db #$00 ; #$00 = Off (Default) - #$01 Countdown - #$02 = Stopwatch