diff --git a/src/_ob_rabid_jar.c b/src/_ob_rabid_jar.c index c890c5b..41dc24d 100644 --- a/src/_ob_rabid_jar.c +++ b/src/_ob_rabid_jar.c @@ -94,7 +94,7 @@ loop_1: var_a1 += 1; var_v1 += 1; if (var_a1 >= 10) { - osSyncPrintf("UnusedMallocNo(): 空きがない!\n", var_a1); + osSyncPrintf("UnusedMallocNo(): 空きがない!\n"); while(1); } goto loop_1; @@ -137,6 +137,139 @@ INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078674); INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007896C); +// s32 func_8007338C(); /* extern */ +// extern s32 D_800E8210; + +// /* 8D6C 8007896C */ +// void func_8007896C(s16 arg0, s16 arg1, s16 arg2, s16 arg3) { +// s16 ulx; +// s16 uly; +// s16 lrx; +// s16 lry; +// // s32 temp_a0; +// +// lry = arg0; +// lrx = arg1; +// ulx = arg2; +// uly = arg3; +// if (func_8007338C() != 0) { +// if (arg0 < 0) { +// lry = 0; +// } else if (arg0 >= 320) { +// lry = 319; +// } +// if (lrx < 0) { +// lrx = 0; +// } else if (lrx >= 320) { +// lrx = 319; +// } +// if (ulx < 0) { +// ulx = 0; +// } else if (ulx >= 320) { +// ulx = 319; +// } +// if (uly < 0) { +// uly = 0; +// } else if (uly >= 240) { +// uly = 239; +// } +// +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 8; +// // temp_v0->unk8 = 0xE200001C; +// // temp_v0->unkC = 0; +// gDPSetRenderMode(obPtrDisplayList++, G_RM_NOOP, G_RM_NOOP2); +// +// gDPPipeSync(obPtrDisplayList++); +// gDPPipeSync(obPtrDisplayList++); +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x28; +// // temp_v0->unk28 = 0xE3000A01; +// // temp_v0->unk2C = 0x00300000; +// gDPSetCycleType(obPtrDisplayList++, G_CYC_FILL); +// +// // obPtrDisplayList = temp_v0 + 0x30; +// // temp_v0->unk30 = 0xE7000000U; +// // temp_v0->unk34 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x38; +// // temp_v0->unk38 = 0xFE000000; +// // temp_v0->unk3C = temp_a0; +// gDPSetDepthImage(obPtrDisplayList++, D_800C4B20 - 0x80000000); +// +// // obPtrDisplayList = temp_v0 + 0x40; +// // temp_v0->unk40 = 0xFF10013F; +// // temp_v0->unk44 = temp_a0; +// gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800C4B20 - 0x80000000); +// +// // obPtrDisplayList = temp_v0 + 0x48; +// // temp_v0->unk48 = 0xF7000000; +// // temp_v0->unk4C = 0xFFFCFFFC; +// gDPSetFillColor(obPtrDisplayList++, 0xFFFCFFFC); +// +// // obPtrDisplayList = temp_v0 + 0x50; +// // temp_v0->unk50 = 0xE7000000U; +// // temp_v0->unk54 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x58; +// // temp_v0->unk58 = (s32) (((ulx & 0x3FF) << 0xE) | (((uly & 0x3FF) * 4) | 0xF6000000)); +// // temp_v0->unk5C = (s32) (((lry & 0x3FF) << 0xE) | ((lrx & 0x3FF) * 4)); +// gDPFillRectangle(obPtrDisplayList++, ulx, uly, lrx, lry); +// +// // obPtrDisplayList = temp_v0 + 0x60; +// // temp_v0->unk60 = 0xE7000000U; +// // temp_v0->unk64 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x68; +// // temp_v0->unk68 = 0xE7000000U; +// // temp_v0->unk6C = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x70; +// // temp_v0->unk70 = 0xE7000000U; +// // temp_v0->unk74 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x78; +// // temp_v0->unk78 = 0xE7000000U; +// // temp_v0->unk7C = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x80; +// // temp_v0->unk80 = 0xFF10013F; +// // temp_v0->unk84 = (s32) (D_800E8210 - 0x80000000); +// gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800E8210 - 0x80000000); +// +// // obPtrDisplayList = temp_v0 + 0x88; +// // temp_v0->unk88 = 0xE7000000U; +// // temp_v0->unk8C = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x90; +// // temp_v0->unk90 = 0xE7000000U; +// // temp_v0->unk94 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0x98; +// // temp_v0->unk98 = 0xE3000A01; +// // temp_v0->unk9C = 0; +// gDPSetCycleType(obPtrDisplayList++, G_CYC_1CYCLE); +// +// // obPtrDisplayList = temp_v0 + 0xA0; +// // temp_v0->unkA0 = 0xE7000000U; +// // temp_v0->unkA4 = 0; +// gDPPipeSync(obPtrDisplayList++); +// +// // obPtrDisplayList = temp_v0 + 0xA8; +// } +// } + + INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078C6C); INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079028);