mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-09 11:44:10 -04:00
Overhaul the build system (#234)
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
This commit is contained in:
+196
-203
@@ -1,5 +1,4 @@
|
||||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
#include "global.h"
|
||||
|
||||
void Actor_PrintLists(ActorContext* actorCtx) {
|
||||
ActorListEntry* actorList = &actorCtx->actorList[0];
|
||||
@@ -7,14 +6,14 @@ void Actor_PrintLists(ActorContext* actorCtx) {
|
||||
s32 i;
|
||||
|
||||
FaultDrawer_SetCharPad(-2, 0);
|
||||
FaultDrawer_Printf(D_801DC9D0, gMaxActorId);
|
||||
FaultDrawer_Printf(D_801DC9D8);
|
||||
FaultDrawer_Printf("actor\n", gMaxActorId);
|
||||
FaultDrawer_Printf("No. Actor Name Part SegName\n");
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) {
|
||||
actor = actorList[i].first;
|
||||
|
||||
while (actor != NULL) {
|
||||
FaultDrawer_Printf(D_801DC9F8, i, actor, actor->id, actor->category, D_801DCA10);
|
||||
FaultDrawer_Printf("%3d %08x %04x %3d %s\n", i, actor, actor->id, actor->category, "");
|
||||
actor = actor->next;
|
||||
}
|
||||
}
|
||||
@@ -44,10 +43,10 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
|
||||
COMBINED);
|
||||
|
||||
dy = CLAMP(dy, 0.0f, 150.0f);
|
||||
shadowScale = 1.0f - (dy * D_801DCA14);
|
||||
shadowScale = 1.0f - (dy * 0.0028571428f);
|
||||
|
||||
if (color != NULL) {
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color->red, color->green, color->blue,
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color->r, color->g, color->b,
|
||||
(u8)(actor->shape.shadowAlpha * shadowScale));
|
||||
} else {
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u8)(actor->shape.shadowAlpha * shadowScale));
|
||||
@@ -60,7 +59,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
|
||||
Matrix_RotateY((f32)actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY);
|
||||
}
|
||||
|
||||
shadowScale = 1.0f - (dy * D_801DCA14);
|
||||
shadowScale = 1.0f - (dy * 0.0028571428f);
|
||||
shadowScale *= actor->shape.shadowScale;
|
||||
Matrix_Scale(shadowScale * actor->scale.x, 1.0f, shadowScale * actor->scale.z, MTXMODE_APPLY);
|
||||
|
||||
@@ -72,7 +71,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//ActorShadow_Draw.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/ActorShadow_Draw.s")
|
||||
#endif
|
||||
|
||||
/* ActorShadow_DrawCircle */
|
||||
@@ -113,10 +112,10 @@ void func_800B40E0(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3,
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx);
|
||||
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0,
|
||||
(u32)(((arg3 * D_801DCA18) > 1.0f ? 1.0f : (arg3 * D_801DCA18)) * arg4) & 0xFF);
|
||||
(u32)(((arg3 * 1.3e-05f) > 1.0f ? 1.0f : (arg3 * 1.3e-05f)) * arg4) & 0xFF);
|
||||
|
||||
sp58 = Math_FAtan2F(light->l.dir[0], light->l.dir[2]);
|
||||
arg6 *= (4.5f - (light->l.dir[1] * D_801DCA1C));
|
||||
arg6 *= (4.5f - (light->l.dir[1] * 0.035f));
|
||||
arg6 = (arg6 < 1.0f) ? 1.0f : arg6;
|
||||
SysMatrix_SetCurrentState(arg2);
|
||||
Matrix_RotateY(sp58, MTXMODE_APPLY);
|
||||
@@ -128,24 +127,24 @@ void func_800B40E0(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3,
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B40E0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B40E0.s")
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B42F8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B42F8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4A98.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4A98.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4AEC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4AEC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4B50.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4B50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4EDC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4EDC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F40.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4F40.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B4F78.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B4F78.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5040.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B5040.s")
|
||||
|
||||
void Actor_TargetContextInit(TargetContext* targetCtx, Actor* actor, GlobalContext* globalCtx) {
|
||||
targetCtx->unk90 = NULL;
|
||||
@@ -159,9 +158,9 @@ void Actor_TargetContextInit(TargetContext* targetCtx, Actor* actor, GlobalConte
|
||||
func_800B4F78(targetCtx, actor->category, globalCtx);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5208.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B5208.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B5814.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B5814.s")
|
||||
|
||||
u32 Flags_GetSwitch(GlobalContext* globalCtx, s32 flag) {
|
||||
if (flag >= 0 && flag < 0x80) {
|
||||
@@ -253,7 +252,7 @@ void Actor_TitleCardCreate(GlobalContext* globalCtx, TitleCardContext* titleCard
|
||||
titleCardCtx->fadeInDelay = 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Nop800B5E50.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_Nop800B5E50.s")
|
||||
|
||||
void Actor_TitleCardUpdate(GlobalContext* globalCtx, TitleCardContext* titleCardCtx) {
|
||||
if (DECR(titleCardCtx->fadeInDelay) == 0) {
|
||||
@@ -267,23 +266,23 @@ void Actor_TitleCardUpdate(GlobalContext* globalCtx, TitleCardContext* titleCard
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_TitleCardDraw.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_TitleCardDraw.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6434.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6434.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6468.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6468.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6474.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6474.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B648C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B648C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B64FC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B64FC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6584.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6584.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6608.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6608.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6680.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6680.s")
|
||||
|
||||
void Actor_MarkForDeath(Actor* actor) {
|
||||
actor->draw = NULL;
|
||||
@@ -351,7 +350,7 @@ void Actor_InitToDefaultValues(Actor* actor, GlobalContext* globalCtx) {
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InitToDefaultValues.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_InitToDefaultValues.s")
|
||||
#endif
|
||||
|
||||
void Actor_FiniActor(Actor* actor, GlobalContext* globalCtx) {
|
||||
@@ -367,29 +366,23 @@ void Actor_SetMovementScale(s32 scale) {
|
||||
actorMovementScale = scale * 0.5f;
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
void Actor_ApplyMovement(Actor* actor) {
|
||||
actor->world.pos.x += ((actor->velocity.x * actorMovementScale) + actor->colChkInfo.displacement.x);
|
||||
actor->world.pos.y += ((actor->velocity.y * actorMovementScale) + actor->colChkInfo.displacement.y);
|
||||
actor->world.pos.z += ((actor->velocity.z * actorMovementScale) + actor->colChkInfo.displacement.z);
|
||||
f32 speedRate = actorMovementScale;
|
||||
|
||||
actor->world.pos.x += ((actor->velocity.x * speedRate) + actor->colChkInfo.displacement.x);
|
||||
actor->world.pos.y += ((actor->velocity.y * speedRate) + actor->colChkInfo.displacement.y);
|
||||
actor->world.pos.z += ((actor->velocity.z * speedRate) + actor->colChkInfo.displacement.z);
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_ApplyMovement.asm")
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
void Actor_SetVelocityYRotationAndGravity(Actor* actor) {
|
||||
actor->velocity.x = actor->speedXZ * Math_SinS(actor->world.rot.x);
|
||||
actor->velocity.y = actor->velocity.y + actor->gravity;
|
||||
actor->velocity.z = actor->speedXZ * Math_CosS(actor->world.rot.x);
|
||||
actor->velocity.x = actor->speedXZ * Math_SinS(actor->world.rot.y);
|
||||
actor->velocity.z = actor->speedXZ * Math_CosS(actor->world.rot.y);
|
||||
actor->velocity.y += actor->gravity;
|
||||
|
||||
if (actor->velocity.y < actor->minYVelocity) {
|
||||
actor->velocity.y = actor->minYVelocity;
|
||||
if (actor->velocity.y < actor->minVelocityY) {
|
||||
actor->velocity.y = actor->minVelocityY;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
|
||||
#endif
|
||||
|
||||
void Actor_SetVelocityAndMoveYRotationAndGravity(Actor* actor) {
|
||||
Actor_SetVelocityYRotationAndGravity(actor);
|
||||
@@ -420,9 +413,9 @@ void Actor_SetVelocityAndMoveXYRotationReverse(Actor* actor) {
|
||||
Actor_ApplyMovement(actor);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C04.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6C04.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6C58.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6C58.s")
|
||||
|
||||
s16 Actor_YawBetweenActors(Actor* from, Actor* to) {
|
||||
return Math_Vec3f_Yaw(&from->world.pos, &to->world.pos);
|
||||
@@ -483,38 +476,38 @@ f32 Actor_YDistance(Actor* actor1, Actor* actor2) {
|
||||
return actor2->world.pos.y - actor1->world.pos.y;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6F20.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6F20.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B6FC8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B6FC8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7090.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7090.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7118.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7118.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7128.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7128.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B715C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B715C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7170.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7170.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B71DC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B71DC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7200.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7200.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B722C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B722C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B724C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B724C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7298.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7298.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B72E0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B72E0.s")
|
||||
|
||||
void func_800B72F8(DynaPolyActor* dpactor, f32 a1, s16 a2) {
|
||||
dpactor->unk150 = a2;
|
||||
dpactor->unk148 += a1;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsLinkFacingActor.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_IsLinkFacingActor.s")
|
||||
|
||||
s32 Actor_IsActorFacedByActor(Actor* actor, Actor* other, s16 tolerance) {
|
||||
s16 angle;
|
||||
@@ -548,7 +541,7 @@ s32 Actor_IsActorFacingActor(Actor* actor, Actor* other, s16 tolerance) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_IsActorFacingLinkAndWithinRange.s")
|
||||
|
||||
s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range, s16 tolerance) {
|
||||
s16 dist;
|
||||
@@ -562,65 +555,65 @@ s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B75A0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B75A0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B761C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B761C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7678.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7678.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateBgCheckInfo.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_UpdateBgCheckInfo.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7E04.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7E04.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7FE0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B7FE0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8018.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8018.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8050.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8050.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8118.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8118.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B81E0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B81E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8214.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8214.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8248.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8248.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B82EC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B82EC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83BC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B83BC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B83F8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B83F8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B84D0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B84D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8500.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8500.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B85E0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B85E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8614.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8614.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B863C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B863C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B867C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B867C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B86C8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B86C8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8708.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8708.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8718.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8718.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B874C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B874C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8804.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8804.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B882C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B882C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B886C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B886C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8898.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8898.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8934.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8934.s")
|
||||
|
||||
u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) {
|
||||
if (actor->parent != NULL) {
|
||||
@@ -630,13 +623,13 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) {
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8A1C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8A1C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8B84.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8B84.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BB0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8BB0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BD0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8BD0.s")
|
||||
|
||||
s32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx) {
|
||||
if (!actor->parent) {
|
||||
@@ -646,92 +639,92 @@ s32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx) {
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C20.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8C20.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C50.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8C50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C78.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8C78.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C9C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8C9C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8CEC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8CEC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D10.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8D10.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D50.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8D50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8D98.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8D98.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8DD4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8DD4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E1C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8E1C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E58.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8E58.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Audio_PlayActorSound2.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Audio_PlayActorSound2.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EF4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8EF4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8F98.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8F98.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FC0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8FC0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8FE8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B8FE8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9010.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9010.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9038.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9038.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9084.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9084.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9098.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9098.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90AC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B90AC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B90F4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B90F4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9120.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9120.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Init.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9334.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9334.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateActor.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_UpdateActor.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateAll.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_UpdateAll.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawActor.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_DrawActor.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9D1C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9D1C.s")
|
||||
|
||||
void Actor_DrawAllSetup(GlobalContext* globalCtx) {
|
||||
globalCtx->actorCtx.undrawnActorCount = 0;
|
||||
globalCtx->actorCtx.unkB = 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RecordUndrawnActor.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_RecordUndrawnActor.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9E84.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9E84.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B9EF4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800B9EF4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2D8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA2D8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA2FC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA2FC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_DrawAll.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_DrawAll.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA6FC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA6FC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA798.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA798.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA8B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA8B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BA9B4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BA9B4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_InsertIntoTypeList.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_InsertIntoTypeList.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_RemoveFromTypeList.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_RemoveFromTypeList.s")
|
||||
|
||||
void Actor_FreeOverlay(ActorOverlay* entry) {
|
||||
void* ramAddr;
|
||||
@@ -753,127 +746,127 @@ void Actor_FreeOverlay(ActorOverlay* entry) {
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Spawn.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_Spawn.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_LoadOverlay.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_LoadOverlay.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnAsChildAndCutscene.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_SpawnAsChildAndCutscene.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnAsChild.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_SpawnAsChild.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnTransitionActors.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_SpawnTransitionActors.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB2D0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB2D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB498.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB498.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB59C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB59C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB604.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB604.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BB8EC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB8EC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBA88.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBA88.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBAC0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBAC0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBB74.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBB74.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBC20.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBC20.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBCEC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBCEC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBDAC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBDAC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BBFB0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBFB0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC154.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC154.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC188.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC188.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC1B4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC1B4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC270.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC270.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC444.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC444.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC4EC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC4EC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC5B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC5EC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC5EC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC620.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC620.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC770.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC770.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC7D8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC7D8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC848.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC848.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BC8B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BC8B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB50.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BCB50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCB70.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BCB70.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCBF4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BCBF4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCC68.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BCC68.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BCCDC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BCCDC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD2B4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD2B4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD384.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD384.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD6B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6E4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD6E4.s")
|
||||
|
||||
// This function is very similar to OoT's func_80034A14
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD888.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD888.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9A0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD9A0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9E0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BD9E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDAA0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BDAA0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDB6C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BDB6C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDC5C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BDC5C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDCF4.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BDCF4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Noop.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_Noop.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFC0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BDFC0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE03C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE03C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE0B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE0B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE184.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE184.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE22C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE22C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE258.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE258.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE2B8.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE2B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE33C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE33C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE3D0.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE3D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE504.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE504.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE568.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE568.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE5CC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE5CC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE63C.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE63C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BE680.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE680.s")
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BF7CC.asm")
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BF7CC.s")
|
||||
|
||||
Reference in New Issue
Block a user