alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

8
tables.asm
View File

@@ -701,10 +701,6 @@ org $308169 ; PC 0x180169
AgahnimDoorStyle:
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
FreeItemText:
db #$00 ; #00 = Off - #$01 = On (default)
@@ -716,6 +712,10 @@ org $30816E ; PC 0x18016E
HardModeExclusionCapeUsage:
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
TimerStyle:
db #$00 ; #$00 = Off (Default) - #$01 Countdown - #$02 = Stopwatch