SRAM fix for MultiClient. Only set SRAM flag on locations that count toward collection rate.

Shifted uppercase font.
This commit is contained in:
aerinon
2022-04-28 16:06:31 -06:00
parent 71d26eb109
commit 3685d8194e
4 changed files with 674 additions and 677 deletions

BIN
fonttest/font.gb Executable file

Binary file not shown.

View File

@@ -168,25 +168,18 @@ RevealPotItem:
STZ.w SpawnedItemIsMultiWorld STZ.w SpawnedItemIsMultiWorld
BIT.b $08 BIT.b $08
BVS LoadMultiWorldPotItem BVS LoadMultiWorldPotItem
BMI .major BMI LoadMajorPotItem
BRA .normal_secret
.major
JMP LoadMajorPotItem
.normal_secret .normal_secret
STA $08 STA $08
PHX : PHY PHX : PHY
INY : INY
LDA.b [$00],Y : AND.w #$00FF
CMP #$0088 : BEQ .obtained ; skip this step for switches
; set bit and count if first time lifting this pot ; set bit and count if first time lifting this pot
LDA.b $A0 : ASL : TAY
TXA : ASL : TAX : LDA.l BitFieldMasks, X : STA $0A TXA : ASL : TAX : LDA.l BitFieldMasks, X : STA $0A
TYX : LDA.l RoomPotData, X : BIT $0A : BNE .obtained LDA.b $A0 : ASL : TAX
JSR ShouldCountNormalPot : BCC .obtained
LDA.l RoomPotData, X : BIT $0A : BNE .obtained
ORA $0A : STA RoomPotData, X ORA $0A : STA RoomPotData, X
PLY : PHY
JSR ShouldCountNormalPot : BCC .obtained
; increment dungeon counts ; increment dungeon counts
SEP #$30 SEP #$30
LDA $040C : CMP #$FF : BEQ + LDA $040C : CMP #$FF : BEQ +

BIN
stats/font.2bpp Normal file

Binary file not shown.

View File

@@ -9,7 +9,11 @@ org $238000
incsrc stats/creditsnew.asm incsrc stats/creditsnew.asm
FontGfx: FontGfx:
incbin stats/font.gb if !FEATURE_NEW_TEXT
incbin stats/font.2bpp
else
incbin stats/font.gb
endif
FontGfxEnd: FontGfxEnd:
; Custom addresses. Most are arbitrary. Feel free to make sure they're okay or moving them elsewhere within ZP ; Custom addresses. Most are arbitrary. Feel free to make sure they're okay or moving them elsewhere within ZP