1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 05:15:16 +00:00

z_scene_table, z_view, and z_fbdemo_fade OK (#561)

* fbdemo

* the view is clear

* more matchings

* scene table doesn't want to be nice

* small thing in view

* can do

* accidentally a value
This commit is contained in:
petrie911 2020-12-25 15:19:52 -06:00 committed by GitHub
parent 09ddf4f71e
commit a8ae9f48b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 49 additions and 898 deletions

View file

@ -194,7 +194,7 @@ void func_800AA78C(View* view, f32 x, f32 y, f32 z) {
view->unk_F4.z = z;
}
void func_800AA7AC(View* view, f32 arg1) {
s32 func_800AA7AC(View* view, f32 arg1) {
view->unk_100 = arg1;
}
@ -260,7 +260,7 @@ s32 func_800AA890(View* view, Mtx* mtx) {
}
void func_800AAA50(View* view, s32 arg1) {
arg1 = (view->flags & arg1) | arg1 >> 4;
arg1 = (view->flags & arg1) | (arg1 >> 4);
if (arg1 & 8) {
func_800AB0A8(view);
@ -522,8 +522,6 @@ s32 func_800AB944(View* view) {
return 1;
}
#ifdef NON_MATCHING
// regalloc differences, skips a t register at arg1's assignment
s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
Gfx* gfx = *gfxp;
GraphicsContext* gfxCtx = view->gfxCtx;
@ -595,9 +593,6 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
return 1;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB9EC.s")
#endif
s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ) {
s32 error = 0;