Merge branch 'beta' into pikit_mode
This commit is contained in:
+15
-3
@@ -90,11 +90,17 @@ ItemSet_FairySword:
|
||||
RTL
|
||||
|
||||
ItemSet_SmithSword:
|
||||
PHA : LDA.l NpcFlags+1 : ORA.b #$04 : STA.l NpcFlags+1 : PLA
|
||||
PHA
|
||||
LDA.l NpcFlags+1 : ORA.b #$04 : STA.l NpcFlags+1
|
||||
JSL UpdateLootHUD
|
||||
PLA
|
||||
RTL
|
||||
|
||||
ItemSet_MagicBat:
|
||||
PHA : LDA.l NpcFlags+1 : ORA.b #$80 : STA.l NpcFlags+1 : PLA
|
||||
PHA
|
||||
LDA.l NpcFlags+1 : ORA.b #$80 : STA.l NpcFlags+1
|
||||
JSL UpdateLootHUD
|
||||
PLA
|
||||
RTL
|
||||
|
||||
ItemSet_OldMan:
|
||||
@@ -125,6 +131,7 @@ ItemSet_SickKid:
|
||||
JSL Link_ReceiveItem ; thing we wrote over
|
||||
PHA
|
||||
LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags
|
||||
JSL UpdateLootHUD
|
||||
.skip
|
||||
PLA
|
||||
RTL
|
||||
@@ -153,6 +160,7 @@ ItemSet_Sahasrala:
|
||||
JSL Link_ReceiveItem ; thing we wrote over
|
||||
PHA
|
||||
LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags
|
||||
JSL UpdateLootHUD
|
||||
.skip
|
||||
PLA
|
||||
RTL
|
||||
@@ -171,6 +179,7 @@ ItemSet_Library:
|
||||
JSL Link_ReceiveItem ; thing we wrote over
|
||||
PHA
|
||||
LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags
|
||||
JSL UpdateLootHUD
|
||||
.skip
|
||||
PLA
|
||||
RTL
|
||||
@@ -197,7 +206,10 @@ ItemSet_Mushroom:
|
||||
RTL
|
||||
|
||||
ItemSet_Powder:
|
||||
PHA : LDA.l NpcFlags+1 : ORA.b #$20 : STA.l NpcFlags+1 : PLA
|
||||
PHA
|
||||
LDA.l NpcFlags+1 : ORA.b #$20 : STA.l NpcFlags+1
|
||||
JSL UpdateLootHUD
|
||||
PLA
|
||||
RTL
|
||||
;================================================================================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user