alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to more sensible file

Browse Source
This commit is contained in:
Kevin Cathcart
2018-07-07 17:53:23 -04:00
parent d054dbbfc8
commit 080ed59541
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
npcitems.asm
View File

@@ -170,3 +170,25 @@ ItemSet_Powder:
STZ $02E9 ; thing we wrote over STZ $02E9 ; thing we wrote over
RTL RTL
;================================================================================ ;================================================================================
;================================================================================
; Randomize 300 Rupee NPC
;--------------------------------------------------------------------------------
Set300RupeeNPCItem:
INC $0D80, X ; thing we wrote over
PHA : PHP
REP #$20 ; set 16-bit accumulator
LDA $A0 ; these are all decimal because i got them that way
CMP.w #291 : BNE +
LDA RupeeNPC_MoldormCave : TAY ; load moldorm cave value into Y
BRA .done
+ CMP.w #286 : BNE +
LDA RupeeNPC_NortheastDarkSwampCave : TAY ; load northeast dark swamp cave value into Y
BRA .done
+
LDY.b #$46 ; default to a normal 300 rupees
.done
PLP : PLA
RTL
;================================================================================

20
shopkeeper.asm
View File

@@ -1,23 +1,3 @@
;================================================================================
; Randomize 300 Rupee NPC
;--------------------------------------------------------------------------------
Set300RupeeNPCItem:
INC $0D80, X ; thing we wrote over
PHA : PHP
REP #$20 ; set 16-bit accumulator
LDA $A0 ; these are all decimal because i got them that way
CMP.w #291 : BNE +
LDA RupeeNPC_MoldormCave : TAY ; load moldorm cave value into Y
BRA .done
+ CMP.w #286 : BNE +
LDA RupeeNPC_NortheastDarkSwampCave : TAY ; load northeast dark swamp cave value into Y
BRA .done
+
LDY.b #$46 ; default to a normal 300 rupees
.done
PLP : PLA
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 291 - Moldorm Cave ; 291 - Moldorm Cave
; 286 - Northeast Dark Swamp Cave ; 286 - Northeast Dark Swamp Cave