alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix some mangled labels

Browse Source
This commit is contained in:
cassidoxa
2022-02-03 22:01:34 -05:00
parent dfc4284a70
commit 3c6c45ddb4
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LTTP_RND_GeneralBugfixes.asm
View File

@@ -459,10 +459,10 @@ org $028296
.setAmbientSfx .setAmbientSfx
org $02A0A8 org $02A0A8
Dungeon_SaveRoomDataWRAM: Dungeon_SaveRoomData:
org $02A0BE org $02A0BE
Dungeon_SaveRoomDataWRAM_justKeys: Dungeon_SaveRoomData_justKeys:
org $02B861 org $02B861
Dungeon_SaveRoomQuadrantData: Dungeon_SaveRoomQuadrantData:

2
events.asm
View File

@@ -83,7 +83,7 @@ OnUncleItemGet:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnAga2Defeated: OnAga2Defeated:
JSL.l Dungeon_SaveRoomDataWRAM_justKeys ; thing we wrote over, make sure this is first JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
LDA.b #$01 : STA.l Aga2Duck LDA.b #$01 : STA.l Aga2Duck
JML.l IncrementAgahnim2Sword JML.l IncrementAgahnim2Sword
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

4
sram.asm
View File

@@ -389,7 +389,7 @@ DummyValue: skip 1 ; $01 if you're a real dummy
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
base $700000 ; base $700000 ;
CartridgeSRAM: ; CartridgeSRAM: ;
RoomDataWRAMSRAM: ; RoomDataSRAM: ;
skip $280 ; skip $280 ;
OverworldEventDataSRAM: ; OverworldEventDataSRAM: ;
skip $C0 ; skip $C0 ;
@@ -643,7 +643,7 @@ endmacro
; Direct SRAM Assertions ; Direct SRAM Assertions
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
%assertSRAM(CartridgeSRAM, $700000) %assertSRAM(CartridgeSRAM, $700000)
%assertSRAM(RoomDataWRAMSRAM, $700000) %assertSRAM(RoomDataSRAM, $700000)
%assertSRAM(OverworldEventDataSRAM, $700280) %assertSRAM(OverworldEventDataSRAM, $700280)
%assertSRAM(EquipmentSRAM, $700340) %assertSRAM(EquipmentSRAM, $700340)
%assertSRAM(InventoryTrackingSRAM, $70038C) %assertSRAM(InventoryTrackingSRAM, $70038C)

2
stats.asm
View File

@@ -292,7 +292,7 @@ IncrementUWMirror:
JSL.l StatTransitionCounter JSL.l StatTransitionCounter
+ +
PLA PLA
JSL.l Dungeon_SaveRoomDataWRAM ; thing we wrote over JSL.l Dungeon_SaveRoomData ; thing we wrote over
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
IncrementSpentRupees: IncrementSpentRupees: