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

updates

Browse Source
This commit is contained in:
Karkat
2017-09-23 22:40:22 -04:00
parent 5239476d13
commit 284732b45d
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
goalitem.asm
View File

@@ -12,16 +12,25 @@ DrawGoalIndicator:
LDA.l !GOAL_COUNTER LDA.l !GOAL_COUNTER
AND.w #$00FF AND.w #$00FF
JSL.l HexToDec JSL.l HexToDec
LDA $7F5005 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 10's digit and move the cursor
LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 10's digit and move the cursor LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 10's digit and move the cursor
LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 1's and move the cursor LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 1's and move the cursor
LDA.w #$2830 : STA $7EC72C, X : INX #2 ; draw slash and move the cursor LDA.l GoalItemRequirement : AND.w #$00FF : CMP.w #$00FF : BEQ .skip
LDA.w #$2830 : STA $7EC72C, X : INX #2 ; draw slash and move the cursor
LDA.l GoalItemRequirement LDA.l GoalItemRequirement
AND.w #$00FF AND.w #$00FF
JSL.l HexToDec JSL.l HexToDec
LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 10's digit and move the cursor LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 10's digit and move the cursor
LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 1's and move the cursor LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC72C, X : INX #2 ; draw 1's and move the cursor
BRA .done
.skip
LDA.w #$207F
STA $7EC72C, X : INX #
STA $7EC72C, X : INX #
STA $7EC72C, X : INX #
.done
PLX PLX
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -56,11 +65,15 @@ CheckGanonVulnerability:
;#$04 = Require All Crystals ;#$04 = Require All Crystals
LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals
BRA .success BRA .success
+ ; CMP #$03 : BNE + this is a comment + CMP #$03 : BNE + this is a comment
;#$03 = Require All Crystals and Aga 2 ;#$03 = Require All Crystals and Aga 2
LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals
LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open) LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success BRA .success
+ CMP #$05 : BNE + this is a comment
;#$05 = Require 100 Goal Items
LDA.l !GOAL_COUNTER : CMP.w #100 : !BLT .fail ; require 100 goal items
BRA .success
+ +
.fail : CLC : RTL .fail : CLC : RTL
.success : SEC : RTL .success : SEC : RTL

1
newitems.asm
View File

@@ -168,6 +168,7 @@ AddReceivedItemExpandedGetItem:
JSR.w ProcessEventItems : CPX.b #$00 : BEQ ++ JSR.w ProcessEventItems : CPX.b #$00 : BEQ ++
;JSL.l Main_ShowTextMessage ;JSL.l Main_ShowTextMessage
LDA !GOAL_COUNTER : INC : STA !GOAL_COUNTER
LDA.b #$01 : STA $7F50A0 LDA.b #$01 : STA $7F50A0
BRL .done BRL .done
++ ++

12
tables.asm
View File

@@ -140,8 +140,12 @@ db #$00 ; #$00 = Off (default) - #$01 = On
org $30803E ; PC 0x18003E org $30803E ; PC 0x18003E
InvincibleGanon: InvincibleGanon:
db #$00 db #$00
; #$00 = Off (default) - #$01 = On - #$02 = Require All Dungeons ; #$00 = Off (default)
; #$03 = Require Crystals and Aga2 - #$04 = Require Crystals ; #$01 = On
; #$02 = Require All Dungeons
; #$03 = Require Crystals and Aga2
; #$04 = Require Crystals
; #$05 = Require 100 Goal Items
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803F ; PC 0x18003F org $30803F ; PC 0x18003F
HammerableGanon: HammerableGanon:
@@ -666,11 +670,11 @@ StandingKey_Hera:
;================================================================================ ;================================================================================
org $308165 ; PC 0x180165 org $308165 ; PC 0x180165
GoalItemIcon: GoalItemIcon:
dw #$280D ; #$280D = Star (default) - #$280E = Triforce Piece dw #$280E ; #$280D = Star (default) - #$280E = Triforce Piece
;================================================================================ ;================================================================================
org $308167 ; PC 0x180167 org $308167 ; PC 0x180167
GoalItemRequirement: GoalItemRequirement:
db #$00 ; #$00 = Off (default) - #$XX = Require $XX Goal Items db #$FF ; #$00 = Off (default) - #$XX = Require $XX Goal Items ; #$FF = Counter-Only
;================================================================================ ;================================================================================
org $308168 ; PC 0x180168 org $308168 ; PC 0x180168
ByrnaCaveSpikeDamage: ByrnaCaveSpikeDamage: