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

Upgradeable mirror can mirror from light world

Browse Source
This commit is contained in:
Kara Alexandra
2024-11-25 02:23:13 -06:00
parent 30122cfa3d
commit f0d76f9918
7 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
2waymirror.asm Normal file
View File

@@ -0,0 +1,18 @@
pushpc
org $8DF7F1
dw $2C62, $2C63, $2C72, $2C73 ; Mirror
dw $2C62, $2C63, $2C72, $2D11 ; 2-Way Mirror
org $87A93F
JSL.l CheckMirrorWorld
pullpc
CheckMirrorWorld:
LDA.l MirrorEquipment
DEC
BNE +
LDA.b $8A
AND.b #$40
+ RTL

1
LTTP_RND_GeneralBugfixes.asm
View File

@@ -164,6 +164,7 @@ incsrc switches.asm
incsrc zoom_on_carry.asm incsrc zoom_on_carry.asm
incsrc iframes.asm incsrc iframes.asm
incsrc improve_items.asm incsrc improve_items.asm
incsrc 2waymirror.asm
warnpc $A58000 warnpc $A58000
org $A28000 org $A28000

BIN
data/c2807_v4.bin
View File

Binary file not shown.

BIN
data/c2807_v4.gfx
View File

Binary file not shown.

12
fileselect.asm
View File

@@ -299,7 +299,15 @@ DrawPlayerFileShared:
%fs_drawItemBasic(EquipmentSRAM+$12,9,18,FileSelectItems_cape) %fs_drawItemBasic(EquipmentSRAM+$12,9,18,FileSelectItems_cape)
; Mirror ; Mirror
%fs_drawItemBasic(EquipmentSRAM+$13,9,20,FileSelectItems_mirror) LDA.l EquipmentSRAM+$13 : AND.w #$00FF : BNE +
%fs_drawItemGray(9,20,FileSelectItems_mirror)
BRA ++
+ : DEC : BNE +
%fs_drawItem(9,20,FileSelectItems_mirror)
BRA ++
+
%fs_drawItem(9,20,FileSelectItems_mirror_2)
++
; Bottles ; Bottles
%fs_drawBottle(EquipmentSRAM+$1C,3,23) %fs_drawBottle(EquipmentSRAM+$1C,3,23)
@@ -546,6 +554,8 @@ FileSelectItems:
dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED
.mirror .mirror
dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE
.mirror_2
dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$02E2|!FS_COLOR_BLUE
.flippers .flippers
dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE

2
itemdatatables.asm
View File

@@ -162,7 +162,7 @@ endmacro
%ReceiptProps($17, -4, 0, $2F, $F36B, $FF, skip, skip) ; 17 - Heart piece %ReceiptProps($17, -4, 0, $2F, $F36B, $FF, skip, skip) ; 17 - Heart piece
%ReceiptProps($18, -4, 4, $07, $F351, $FF, magic_item, skip) ; 18 - Byrna %ReceiptProps($18, -4, 4, $07, $F351, $FF, magic_item, skip) ; 18 - Byrna
%ReceiptProps($19, -4, 0, $15, $F352, $FF, magic_item, skip) ; 19 - Cape %ReceiptProps($19, -4, 0, $15, $F352, $FF, magic_item, skip) ; 19 - Cape
%ReceiptProps($1A, -4, 0, $12, $F353, $02, skip, skip) ; 1A - Mirror %ReceiptProps($1A, -4, 0, $12, $F353, $FF, mirror, skip) ; 1A - Mirror
%ReceiptProps($1B, -4, 0, $0D, $F354, $02, skip, skip) ; 1B - Glove %ReceiptProps($1B, -4, 0, $0D, $F354, $02, skip, skip) ; 1B - Glove
%ReceiptProps($1C, -4, 0, $0D, $F354, $03, skip, skip) ; 1C - Mitts %ReceiptProps($1C, -4, 0, $0D, $F354, $03, skip, skip) ; 1C - Mitts
%ReceiptProps($1D, -4, 0, $0E, $F34E, $01, skip, skip) ; 1D - Book %ReceiptProps($1D, -4, 0, $0E, $F34E, $01, skip, skip) ; 1D - Book

7
newitems.asm
View File

@@ -361,7 +361,6 @@ ItemBehavior:
RTS RTS
.magic_item .magic_item
print pc
LDA.b #$7E LDA.b #$7E
STA.b $02 STA.b $02
REP #$30 REP #$30
@@ -376,6 +375,12 @@ ItemBehavior:
+ +
RTS RTS
.mirror
LDA.l MirrorEquipment : CMP.b #$02 : !BGE +
INC : STA.l MirrorEquipment ; upgrade mirror
+
RTS
.magic_2 .magic_2
LDA.l MagicConsumption : CMP.b #$02 : !BGE + LDA.l MagicConsumption : CMP.b #$02 : !BGE +
INC : STA.l MagicConsumption ; upgrade magic INC : STA.l MagicConsumption ; upgrade magic