mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix remaining non matchings

Browse source
This commit is contained in:
Roman971 2020-03-23 01:38:25 +01:00
parent d85168f0b0
commit 64b5536ab8
11 changed files with 114 additions and 638 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/code/z_debug.c
View file

@ -1,8 +1,5 @@
#include <ultra64.h>
#include <global.h>
#include <z64.h>
#include <color.h>
#include <regs.h>
#include <PR/os_cont.h>
typedef struct {
@ -60,29 +57,24 @@ void func_800636C0() {
void func_8006375C(s32 arg0, s32 arg1, float* d_80855320) {
}
#ifdef NON_MATCHING // regalloc
// Copy Camera Debugger Text
void func_8006376C(u8 x, u8 y, u8 colorId, const char* text) {
PrintTextBuffer* buf;
char* bufText;
s16 i; // v1
s16 i;
buf = &D_8015FA98[D_8011E0B0];
if (D_8011E0B0 < 0x16) {
buf->x = x;
buf->y = y;
buf->colorId = colorId;
i = 0;
bufText = buf->text + 1;
if (*buf->text = *text++) {
do
if (i++ > 0x14) {
break;
}
while (*bufText++ = *text++);
bufText = buf->text;
while (*bufText++ = *text++) {
if (i++ > 0x14) {
break;
}
}
*bufText = '\0';
@ -90,10 +82,6 @@ void func_8006376C(u8 x, u8 y, u8 colorId, const char* text) {
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_8006376C.s")
#endif
// Draw Text
void func_80063828(GfxPrint* gfxPrint) {
s32 i;