From e50dd330b8733b821bcd6434dff14ada72f81bce Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 15 Apr 2016 08:34:25 -0700 Subject: [PATCH] update debug printing render to the HUD dlist and clean out some code --- Lua/inject/print.asm | 9 +++------ Lua/inject/simple text.asm | 1 - Lua/inject/spawn mm.asm | 2 +- Lua/inject/spawn oot.asm | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Lua/inject/print.asm b/Lua/inject/print.asm index 6414414..89459d3 100644 --- a/Lua/inject/print.asm +++ b/Lua/inject/print.asm @@ -5,7 +5,7 @@ [global_context]: 0x80212020 // offset from first pointer in global context -[dlist_offset]: 0x2C0 +[dlist_offset]: 0x2B0 [SetTextRGBA]: 0x800FB3AC [SetTextXY]: 0x800FB41C @@ -19,14 +19,14 @@ [ObjectIndex]: 0x8009812C push 4, 1, ra -// draw some nonsense text +// draw the debug text li a0, 0x00010001 // xy li a1, 0x88CCFFFF // rgba la a2, fmt la a3, buffer jal simple_text nop -// reset buffer position in our per-frame hook +// reset buffer position la t0, buffer sw t0, buffer_pos // and set the string to null @@ -36,9 +36,6 @@ fmt: .asciiz "%s" .align -str: - .asciiz "hey" -.align .include "simple text.asm" diff --git a/Lua/inject/simple text.asm b/Lua/inject/simple text.asm index e8f7ce1..dfb4a43 100644 --- a/Lua/inject/simple text.asm +++ b/Lua/inject/simple text.asm @@ -58,4 +58,3 @@ simple_text: sw v0, @dlist_offset(s1) jpop 4, 1, s0, s1, ra - diff --git a/Lua/inject/spawn mm.asm b/Lua/inject/spawn mm.asm index 0f52a84..6ffbb54 100644 --- a/Lua/inject/spawn mm.asm +++ b/Lua/inject/spawn mm.asm @@ -19,7 +19,7 @@ [upgrades_offset]: 0xB8 [upgrades_2_offset]: 0xBA -[dlist_offset]: 0x2C0 +[dlist_offset]: 0x2B0 [SetTextRGBA]: 0x800859BC [SetTextXY]: 0x80085A2C diff --git a/Lua/inject/spawn oot.asm b/Lua/inject/spawn oot.asm index 02cd3a7..c5035aa 100644 --- a/Lua/inject/spawn oot.asm +++ b/Lua/inject/spawn oot.asm @@ -19,7 +19,7 @@ [upgrades_offset]: 0xA0 [upgrades_2_offset]: 0xA2 -[dlist_offset]: 0x2C0 +[dlist_offset]: 0x2B0 [SetTextRGBA]: 0x800CBE58 [SetTextXY]: 0x800CBEC8