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

Merged in DR v1.4.1.10

Browse Source
This commit is contained in:
codemann8
2024-04-18 09:47:17 -05:00
parent c465ff61dc e12af76559
commit 0d84af814a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllerjank.asm
View File

@@ -83,16 +83,16 @@ InvertDPad:
JML InvertDPadReturn JML InvertDPadReturn
+ DEC : BNE + + DEC : BNE +
JMP.w InvertDPad_DPadOnly JMP InvertDPad_DPadOnly
+ DEC : BNE + + DEC : BNE +
JMP.w InvertDPad_ButtonsOnly JMP InvertDPad_ButtonsOnly
+ DEC : BNE + + DEC : BNE +
JMP.w InvertDPad_Both JMP InvertDPad_Both
+ DEC : BNE + + DEC : BNE +
JMP.w InvertDPad_SwapSides JMP InvertDPad_SwapSides
+ DEC : BNE + + DEC : BNE +
JMP.w InvertDPad_DPadLROnly JMP InvertDPad_DPadLROnly
+ JMP.w InvertDPad_DPadUDOnly + JMP InvertDPad_DPadUDOnly
.onemind_controller_offset .onemind_controller_offset

1
doorrando/overrides.asm
View File

@@ -19,7 +19,6 @@ OnFileLoadOverride:
MirrorCheckOverride: MirrorCheckOverride:
lda.l DRFlags : and.b #$02 : beq ++ lda.l DRFlags : and.b #$02 : beq ++
lda.l MirrorEquipment : cmp.b #$01 : beq + lda.l MirrorEquipment : cmp.b #$01 : beq +
;++ lda.b OverworldIndex : and.b #$40 ; what I wrote over
++ phx : ldx.b OverworldIndex : lda.l OWTileWorldAssoc,x : plx : and.b #$ff ++ phx : ldx.b OverworldIndex : lda.l OWTileWorldAssoc,x : plx : and.b #$ff
rtl rtl
+ lda.l DRScroll : rtl + lda.l DRScroll : rtl

11
events.asm
View File

@@ -272,6 +272,11 @@ PostItemAnimation:
LDA.b #$00 : STA.l TextBoxDefer LDA.b #$00 : STA.l TextBoxDefer
+ +
LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
LDA.b LinkDirection : BEQ +
JSL IncrementChestTurnCounter
+
LDA.b IndoorsFlag : BEQ + LDA.b IndoorsFlag : BEQ +
REP #$20 : LDA.b RoomIndex : STA.l !MULTIWORLD_ROOMID : SEP #$20 REP #$20 : LDA.b RoomIndex : STA.l !MULTIWORLD_ROOMID : SEP #$20
LDA.w RoomItemsTaken : STA.l !MULTIWORLD_ROOMDATA LDA.w RoomItemsTaken : STA.l !MULTIWORLD_ROOMDATA
@@ -282,12 +287,8 @@ PostItemAnimation:
LDA.b #$00 : STA.l !MULTIWORLD_ITEM_PLAYER_ID LDA.b #$00 : STA.l !MULTIWORLD_ITEM_PLAYER_ID
PLB PLB
JML Ancilla_ReceiveItem_objectFinished JML Ancilla_ReceiveItem_objectFinished
+ +
LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
LDA.b LinkDirection : BEQ +
JSL IncrementChestTurnCounter
+
REP #$20 REP #$20
PEA.w $7E00 PEA.w $7E00
PLB : PLB PLB : PLB