Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[iQue] Match z_sram #2426

Merged
merged 8 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sram_iQueReadWrite -> Sram_ReadWriteIQue
cadmic committed Jan 16, 2025
commit 8c4a4a42f2b9a69b1ffa1db692f1f505b9a3186d
6 changes: 3 additions & 3 deletions src/code/z_sram.c
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@

#else

void Sram_iQueReadWrite(s32 addr, void* dramAddr, size_t size, s32 direction) {
void Sram_ReadWriteIQue(s32 addr, void* dramAddr, size_t size, s32 direction) {
void* sramAddr;

addr -= OS_K1_TO_PHYSICAL(0xA8000000);
@@ -36,8 +36,8 @@ void Sram_iQueReadWrite(s32 addr, void* dramAddr, size_t size, s32 direction) {
}
}

#define SRAM_READ(addr, dramAddr, size) Sram_iQueReadWrite(addr, dramAddr, size, OS_READ)
#define SRAM_WRITE(addr, dramAddr, size) Sram_iQueReadWrite(addr, dramAddr, size, OS_WRITE)
#define SRAM_READ(addr, dramAddr, size) Sram_ReadWriteIQue(addr, dramAddr, size, OS_READ)
#define SRAM_WRITE(addr, dramAddr, size) Sram_ReadWriteIQue(addr, dramAddr, size, OS_WRITE)

#endif

2 changes: 1 addition & 1 deletion tools/disasm/ique-cn/functions.txt
Original file line number Diff line number Diff line change
@@ -1824,7 +1824,7 @@ SkinMatrix_MtxFToMtx = 0x80095D40; // type:func
SkinMatrix_MtxFToNewMtx = 0x80095F58; // type:func
SkinMatrix_SetRotateAxis = 0x80095FA0; // type:func
func_800A8030 = 0x80096110; // type:func
Sram_iQueReadWrite = 0x80096280; // type:func
Sram_ReadWriteIQue = 0x80096280; // type:func
Sram_InitNewSave = 0x800962D0; // type:func
Sram_InitDebugSave = 0x80096420; // type:func
Sram_OpenSave = 0x800965E8; // type:func