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

various

Browse Source
This commit is contained in:
Kat
2020-04-17 22:04:19 -04:00
parent 5b19a65ae6
commit bf6ecd979f
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -806,10 +806,10 @@ db $03 ; fade out speed. Should be power of 2 minus 1
;org $07B57B ; <- 3B57B - Bank07.asm : 8523 (BMI .cantOpen) ;org $07B57B ; <- 3B57B - Bank07.asm : 8523 (BMI .cantOpen)
;NOP #2 ;NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07B574 ; <- 3B574 - Bank07.asm : 8523 (BMI .cantOpen) org $07B574 ; <- 3B574 - Bank07.asm : 8519 (LDA.b #$01 : STA $02E9)
JSL.l ChestPrep JSL.l ChestPrep
NOP #3 NOP #3
db $90 ; !BLT .cantOpen db $90 ; !BCC .cantOpen
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $00D531 ; 5531 - Bank00.asm:3451 (LDY.b #$5D) org $00D531 ; 5531 - Bank00.asm:3451 (LDY.b #$5D)
JML.l GetAnimatedSpriteGfxFile JML.l GetAnimatedSpriteGfxFile

3
newitems.asm
View File

@@ -1116,8 +1116,9 @@ ChestPrep:
LDA.b #$01 : STA $02E9 LDA.b #$01 : STA $02E9
LDA.l ServerRequestMode : BEQ + LDA.l ServerRequestMode : BEQ +
JSL.l ChestItemServiceRequest JSL.l ChestItemServiceRequest
RTL
+ +
LDY $0C ; get item value LDY $0C ; get item value
CMP #$F0 SEC
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

16
servicerequest.asm
View File

@@ -52,19 +52,19 @@
!TX_SEQUENCE = "$7EF4A0" !TX_SEQUENCE = "$7EF4A0"
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
macro ServiceRequestVersion() macro ServiceRequestVersion()
LDA !TX_STATUS : BEQ + : SEC : RTL : + ; return fail if we don't have the lock LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
LDA.b #$01 : STA !TX_BUFFER+8 ; version LDA.b #$01 : STA !TX_BUFFER+8 ; version
LDA.b #$00 : STA !TX_BUFFER+9 LDA.b #$00 : STA !TX_BUFFER+9
STA !TX_BUFFER+10 STA !TX_BUFFER+10
STA !TX_BUFFER+11 STA !TX_BUFFER+11
LDA.b !SCM_VERSION : STA !TX_BUFFER LDA.b !SCM_VERSION : STA !TX_BUFFER
LDA #$01 : STA !TX_STATUS ; mark ready for reading LDA #$01 : STA !TX_STATUS ; mark ready for reading
CLC ; mark request as successful SEC ; mark request as successful
RTL RTL
endmacro endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
macro ServiceRequestChest(type) macro ServiceRequestChest(type)
LDA !TX_STATUS : BEQ + : SEC : RTL : + ; return fail if we don't have the lock LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor
BEQ + BEQ +
LDA $A0 : STA !TX_BUFFER+9 ; roomid low LDA $A0 : STA !TX_BUFFER+9 ; roomid low
@@ -77,12 +77,12 @@ macro ServiceRequestChest(type)
LDA $76 : !SUB #$58 : STA !TX_BUFFER+11 ; object index (type 2 only) LDA $76 : !SUB #$58 : STA !TX_BUFFER+11 ; object index (type 2 only)
LDA <type> : STA !TX_BUFFER ; item get LDA <type> : STA !TX_BUFFER ; item get
LDA #$01 : STA !TX_STATUS ; mark ready for reading LDA #$01 : STA !TX_STATUS ; mark ready for reading
CLC ; mark request as successful SEC ; mark request as successful
RTL RTL
endmacro endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
macro ServiceRequest(type,index) macro ServiceRequest(type,index)
LDA !TX_STATUS : BEQ + : SEC : RTL : + ; return fail if we don't have the lock LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor
BEQ + BEQ +
LDA $A0 : STA !TX_BUFFER+9 ; roomid low LDA $A0 : STA !TX_BUFFER+9 ; roomid low
@@ -95,14 +95,14 @@ macro ServiceRequest(type,index)
LDA <index> : STA !TX_BUFFER+11 ; object index (type 2 only) LDA <index> : STA !TX_BUFFER+11 ; object index (type 2 only)
LDA <type> : STA !TX_BUFFER ; item get LDA <type> : STA !TX_BUFFER ; item get
LDA #$01 : STA !TX_STATUS ; mark ready for reading LDA #$01 : STA !TX_STATUS ; mark ready for reading
CLC ; mark request as successful SEC ; mark request as successful
RTL RTL
endmacro endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
PollService: PollService:
PHP PHP
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
LDA !RX_STATUS : DEC : BEQ + : PLP : SEC : RTL : + ; return fail if there's nothing to read LDA !RX_STATUS : DEC : BEQ + : PLP : CLC : RTL : + ; return fail if there's nothing to read
LDA #$FF : STA !RX_STATUS ; stop calls from recursing in LDA #$FF : STA !RX_STATUS ; stop calls from recursing in
LDA !RX_BUFFER : CMP.b !SCM_GIVE : BNE + ; give item LDA !RX_BUFFER : CMP.b !SCM_GIVE : BNE + ; give item
PHY : LDA.l !RX_BUFFER+8 : TAY PHY : LDA.l !RX_BUFFER+8 : TAY
@@ -130,7 +130,7 @@ PollService:
.done .done
LDA #$00 : STA !RX_STATUS ; release lock LDA #$00 : STA !RX_STATUS ; release lock
PLP PLP
CLC ; mark request as successful SEC ; mark request as successful
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ItemVisualServiceRequest_F0: ItemVisualServiceRequest_F0: