mirror of
https://github.com/zeldaret/oot
synced 2026-05-29 08:43:02 -04:00
mzxrules
3cef03f5ff
* beginning of migrating changes * got matching * changed order a bit * clean up bgcheck * fix conflict * fix conflict again * first stab at identifying types, some oks * Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs * more OKs, z_bgcheck.bss migration, update some sys_math3d.c args * couple more OKs * pushing some OKs * fix compilation issues * code_800430A0.c OK, more files decomp'd * 8003A3E0 big OK :) * Decomp most of func_8003C614, decomp helper funcs * Decomp SurfaceType, CamData, and WaterBox property related functions * more OKs, big OK in 8003C078 * more OKs, more progress, move a function definition in z_collision_check to functions.h * more clean-ups, more OKs, dyn_vtx is now defined as u8* * 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better * data migrated, more OKs * 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled * func_80040284, 800409A8 non_matching, add IS_ZERO macro * All asm files have C representations, some big OKs, lots of minor tweaks * More OKs, non-matching code cleanup * 8003FBF4 and 80040BE4 OK, improve codegen for most functions * format z_bgcheck.c * fix warnings, compile errors on NON_MATCHING * func_8003EE80 is now NON_MATCHING * begin documenting some functions * formatting * more documentation, func_8003A95C OK * fix PHYSICAL_TO_VIRTUAL changes * fix var rename * More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP * func_8004239C ok, more NON_MATCHING improvements, more documentation * Implement most suggested changes * Convert comments to slower comments * /** * Implement ZAP2 changes * my anti-virus ate my format.sh results * Rename a couple hundred functions, fix minor stuff * rename var so that clang formats correctly * run format.sh * implement Petrie's matches/suggestions * format * matches * and the asm * slight error * Add SSList * two more matches * stuff * implement code changes * clean up Petrie's matchings Co-authored-by: Arthur <arthurtilly413@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
56 lines
1.6 KiB
C
56 lines
1.6 KiB
C
#include "global.h"
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C680.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C704.s")
|
|
|
|
void func_8007C76C(Vec3f* src, Vec3s* dst) {
|
|
dst->x = src->x;
|
|
dst->y = src->y;
|
|
dst->z = src->z;
|
|
}
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C7A8.s")
|
|
|
|
void func_8007C7F8(CollisionContext* colCtx, Vec3f* pos) {
|
|
CollisionPoly* poly;
|
|
s32 bgId;
|
|
|
|
BgCheck_EntityRaycastFloor3(colCtx, &poly, &bgId, pos);
|
|
}
|
|
|
|
void func_8007C820(OnePointDemoCamera* onePointCamera, s16 actionParameters, s16 initTimer,
|
|
CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints) {
|
|
onePointCamera->atPoints = atPoints;
|
|
onePointCamera->eyePoints = eyePoints;
|
|
onePointCamera->actionParameters = actionParameters;
|
|
onePointCamera->initTimer = initTimer;
|
|
}
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C850.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007FFE0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_80080024.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_800800F8.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_800803F0.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_80080480.s")
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_800806BC.s")
|
|
|
|
void func_8008070C() {
|
|
D_80120130 = 0;
|
|
}
|
|
|
|
void func_80080718() {
|
|
D_80120130 = 1;
|
|
}
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_80080728.s")
|
|
|
|
void func_80080788(UNK_TYPE arg0, UNK_TYPE arg1) {
|
|
}
|