From 3c6c45ddb4bab1602fbf3fd1817b1b0b5111c554 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 3 Feb 2022 22:01:34 -0500 Subject: [PATCH] Fix some mangled labels --- LTTP_RND_GeneralBugfixes.asm | 4 ++-- events.asm | 2 +- sram.asm | 4 ++-- stats.asm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 0893f49..8c54d9c 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -459,10 +459,10 @@ org $028296 .setAmbientSfx org $02A0A8 -Dungeon_SaveRoomDataWRAM: +Dungeon_SaveRoomData: org $02A0BE -Dungeon_SaveRoomDataWRAM_justKeys: +Dungeon_SaveRoomData_justKeys: org $02B861 Dungeon_SaveRoomQuadrantData: diff --git a/events.asm b/events.asm index 0a1de87..1a729eb 100644 --- a/events.asm +++ b/events.asm @@ -83,7 +83,7 @@ OnUncleItemGet: RTL ;-------------------------------------------------------------------------------- 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 JML.l IncrementAgahnim2Sword ;-------------------------------------------------------------------------------- diff --git a/sram.asm b/sram.asm index 2f2de53..3163659 100644 --- a/sram.asm +++ b/sram.asm @@ -389,7 +389,7 @@ DummyValue: skip 1 ; $01 if you're a real dummy ;-------------------------------------------------------------------------------- base $700000 ; CartridgeSRAM: ; -RoomDataWRAMSRAM: ; +RoomDataSRAM: ; skip $280 ; OverworldEventDataSRAM: ; skip $C0 ; @@ -643,7 +643,7 @@ endmacro ; Direct SRAM Assertions ;-------------------------------------------------------------------------------- %assertSRAM(CartridgeSRAM, $700000) -%assertSRAM(RoomDataWRAMSRAM, $700000) +%assertSRAM(RoomDataSRAM, $700000) %assertSRAM(OverworldEventDataSRAM, $700280) %assertSRAM(EquipmentSRAM, $700340) %assertSRAM(InventoryTrackingSRAM, $70038C) diff --git a/stats.asm b/stats.asm index e38ae31..1fef8ae 100644 --- a/stats.asm +++ b/stats.asm @@ -292,7 +292,7 @@ IncrementUWMirror: JSL.l StatTransitionCounter + PLA - JSL.l Dungeon_SaveRoomDataWRAM ; thing we wrote over + JSL.l Dungeon_SaveRoomData ; thing we wrote over RTL ;-------------------------------------------------------------------------------- IncrementSpentRupees: