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>

src/code/PreRender.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 /**
  * Assigns the "save" values in PreRender
@@ -148,7 +147,7 @@ void func_8017023C(PreRender* this, Gfx** gfxp, void* buf, void* bufSave) {
     *gfxp = gfx;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/PreRender/func_8017023C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_8017023C.s")
 #endif
 
 void func_8017057C(PreRender* this, Gfx** gfxp) {
@@ -249,7 +248,7 @@ void func_80170798(PreRender* this, Gfx** gfxp) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/PreRender/func_80170798.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_80170798.s")
 #endif
 
 void func_80170AE0(PreRender* this, Gfx** gfxp, s32 alpha) {
@@ -397,9 +396,9 @@ void PreRender_ApplyAntiAliasingFilter(PreRender* this) {
     }
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/PreRender/func_801716C4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_801716C4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/PreRender/func_801717F8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_801717F8.s")
 
 /**
  * Applies filters to the framebuffer prerender to make it look smoother
@@ -426,7 +425,7 @@ void PreRender_ApplyFiltersSlowlyInit(PreRender* this) {
         }
 
         this->unk_4D = 1;
-        StackCheck_Init(&slowlyStackEntry, slowlyStack, &slowlyStack[4096], 0, 0x100, D_801DFC60);
+        StackCheck_Init(&slowlyStackEntry, slowlyStack, &slowlyStack[4096], 0, 0x100, "slowly");
         Slowly_Start(&D_801F6E00, &D_801F7FE8, PreRender_ApplyFilters, this, NULL);
         D_801F6FC0 = true;
     }
@@ -450,7 +449,7 @@ void func_801720C4(PreRender* this) {
     }
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/PreRender/func_801720FC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_801720FC.s")
 
 void func_80172758(Gfx** gfxp, void* timg, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 tt, u16 arg8, f32 x,
                    f32 y, f32 xScale, f32 yScale, u32 flags) {

src/code/TwoHeadArena.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void* THA_GetHead(TwoHeadArena* tha) {
     return tha->head;

src/code/TwoHeadGfxArena.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void THGA_Ct(TwoHeadGfxArena* thga, Gfx* start, u32 size) {
     THA_Ct((TwoHeadArena*)thga, start, size);

src/code/audioMgr.c

@@ -48,12 +48,12 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
             osRecvMesg(&audioMgr->cmdQ, (OSMesg*)&msg, OS_MESG_BLOCK);
             osStopTimer(&timer);
             if (msg == timerMsgVal) {
-                Fault_Log("AUDIO SP TIMEOUT %08x %08x\n", audioMgr->rspTask, audioMgr->rspTask->task);
+                osSyncPrintf("AUDIO SP TIMEOUT %08x %08x\n", audioMgr->rspTask, audioMgr->rspTask->task);
                 if (retryCount >= 0) {
                     retryCount--;
                     func_8017703C(audioMgr->sched);
                 } else {
-                    Fault_Log("audioMgr.c:もうダメ！死ぬ！\n");
+                    osSyncPrintf("audioMgr.c:もうダメ！死ぬ！\n");
                     osDestroyThread(NULL);
                     break;
                 }

src/code/audio_effects.c

@@ -0,0 +1,21 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196A00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196BC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196D20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196D7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196DB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80196FEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80197048.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80197138.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80197164.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_effects/func_80197188.s")

src/code/audio_heap.c

@@ -0,0 +1,111 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B0F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B10C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B250.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B318.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B3FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B474.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B4F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B520.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B578.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B5D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B608.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B640.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B69C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B6E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B740.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B768.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B77C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B7AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B7BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B8FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B95C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018B9E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018BA64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018BB28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018BBEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C380.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C3D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C4E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C8B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C8E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C93C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018C994.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018CB70.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018CB78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018CC3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018CCA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018CFAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018D57C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018D5D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018D658.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018D6C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018D760.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DA50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DBC4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DCB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DCF8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DD98.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DDD4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DF24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018DFE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018E00C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018E03C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018E2A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018E344.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_8018E8C8.s")

src/code/audio_load.c

@@ -0,0 +1,161 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018EB60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018EC4C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/D_801E030C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018EF88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F220.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F298.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F310.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F388.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F3B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F3E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F448.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F478.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F4D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F588.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F604.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F6F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F7C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F7F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F83C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F880.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F8C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F908.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018F9B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FA60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FAD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FB20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FB78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FCCC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FD20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FD40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FE5C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8018FF60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190204.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190240.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190294.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801902D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190544.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190668.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019067C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190754.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019075C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019077C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190B08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190B38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190B44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190B50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190BB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190F50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80190F64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191134.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801911C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801911CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191240.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801913C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019144C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191460.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191568.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191598.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019161C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191740.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191864.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191870.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801919AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191B40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191BD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191C40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191C54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80191D94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_8019218C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192340.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192388.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_801924BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192514.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192990.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192AD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192AD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192AE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192AE8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192B54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_80192BAC.s")

src/code/audio_playback.c

@@ -0,0 +1,63 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80194930.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80194DB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80194E60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80194F20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80194F84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801954CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195508.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801955DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801956C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801957B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801958F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195C40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195C60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195C80.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195D84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195DDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195DEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195E3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80195EE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80196040.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_8019617C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801961BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801961E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80196268.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801963E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_8019641C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80196448.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_80196494.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801964F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801965F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_playback/func_801968C4.s")

src/code/audio_seqplayer.c

@@ -0,0 +1,73 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_801974D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197538.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197714.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197880.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_801979D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197A54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197AA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197B14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197C0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197C8C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197D24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197D4C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197E08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197E48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197E88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197F28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197F3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197F74.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197FB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_801980D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019815C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019825C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80198640.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80198CE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_801990F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80199124.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80199198.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80199244.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80199268.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019A0BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019AA3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019AAF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019AB40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019AC10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019ACEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019ADBC.s")

src/code/audio_synthesis.c

@@ -0,0 +1,137 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801877D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187B64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187BEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187DE8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187E58.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187F00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80187FE8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018801C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188024.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018802C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188034.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188068.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188070.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188078.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880A4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801880E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018811C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188124.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018814C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188174.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188190.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188198.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801881A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801881A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801881C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801881F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188224.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018822C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188234.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018823C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188244.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018824C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188254.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018825C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188264.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188288.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801882A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188304.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801884A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188698.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018883C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801888E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_801889A4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188A50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188AFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188C48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188CB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188D20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188D28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188D68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188DDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80188FBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80189064.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_80189620.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018A4B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018A768.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018A808.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018ACC4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_8018AE34.s")

src/code/c_keyframe.c

@@ -0,0 +1,85 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801830A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801830C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801830E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183148.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183224.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801832B0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018332C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018340C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183430.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018349C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801834A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183510.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183580.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801835EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183658.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801836CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018373C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801837CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183808.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183880.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183A3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183B08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183B68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80183DE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018410C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018450C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801845A4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801845C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_8018462C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184638.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801846AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184728.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801847A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184818.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184898.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184914.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801849A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801849DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80184C48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801850A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_801853C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/c_keyframe/func_80185460.s")

src/code/code_0x80183070.c

@@ -1,8 +0,0 @@
-#include <ultra64.h>
-#include <global.h>
-
-void func_80183070(void) {
-    for (;;) {
-        func_80087A6C(1000);
-    }
-}

src/code/code_800CB000.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800CB000/func_800CB000.s")

src/code/code_800E8EA0.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
     func_80151938(globalCtx, textId);

src/code/code_800F0390.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F0390.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F03C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F048C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F0568.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F0590.s")

src/code/code_800F07C0.c

@@ -0,0 +1,31 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F07C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0888.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0944.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F09B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0A20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0A94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0BB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0CE4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0DD4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0E94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0EEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0F28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F0FF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F10AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F07C0/func_800F112C.s")

src/code/code_800F12D0.c

@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F12D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F1304.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F1374.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F13E8.s")

src/code/code_800F23E0.c

@@ -0,0 +1,5 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F23E0/func_800F23E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F23E0/func_800F2478.s")

src/code/code_80122660.c

@@ -0,0 +1,5 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80122660/func_80122660.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80122660/func_80122670.s")

src/code/code_8012EC80.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 // Bit Flag array in which gBitFlags[n] is literally (1 << n)
 u32 gBitFlags[] = {
@@ -195,13 +194,13 @@ s32 func_8012EC80(GlobalContext* globalCtx) {
 }
 
 void func_8012ED34(s16 equipment);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012ED34.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012ED34.s")
 
 u8 func_8012ED78(GlobalContext* globalCtx, s16 equipment);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012ED78.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012ED78.s")
 
 void func_8012EDE8(s16 arg0, u32 arg1);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012EDE8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012EDE8.s")
 
 s32 func_8012EE34(s16 arg0) {
     s16 num = 0;
@@ -292,7 +291,7 @@ void func_8012EF0C(s16 arg0) {
 }
 
 void func_8012F0EC(s16 arg0);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012F0EC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012F0EC.s")
 
 #ifdef NON_MATCHING
 // regalloc
@@ -307,7 +306,7 @@ void func_8012F1BC(s16 sceneIndex) {
 }
 #else
 void func_8012F1BC(s16 arg0);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012F1BC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012F1BC.s")
 #endif
 
 s16 func_8012F22C(s16 sceneIndex) {
@@ -319,23 +318,4 @@ s16 func_8012F22C(s16 sceneIndex) {
 }
 
 void func_8012F278(GlobalContext* globalCtx);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012F278.asm")
-
-u32 D_801C2410[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000101, 0x01010101, 0x01010101, 0x01010101, 0x01010101,
-    0x01010101, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000101, 0x01000000, 0x01010101, 0x01010101, 0x01010101,
-    0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00010100, 0x00000101, 0x01010101,
-    0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000001, 0x00000001, 0x01000000,
-    0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101,
-    0x00010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101,
-    0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-};
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8012EC80/func_8012F278.s")

src/code/code_801323D0.c

@@ -0,0 +1,41 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801323D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132428.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132494.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801326B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801328F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132920.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132938.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132954.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_8013296C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A18.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A80.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132AD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132B24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132B84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132D70.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132E9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132FDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80133000.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80133038.s")

src/code/code_8013EC10.c

@@ -0,0 +1,19 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EC10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EC44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013ECE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013ED9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EDD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EE04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EE24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EE38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8013EC10/func_8013EE48.s")

src/code/code_80140E80.c

@@ -0,0 +1,21 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80140E80.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80140EA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80140EAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80141008.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_8014116C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_801411B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80141200.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_8014151C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80141678.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80140E80/func_80141778.s")

src/code/code_801420C0.c

@@ -0,0 +1,7 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801420C0/func_801420C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801420C0/func_801420F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801420C0/func_80142100.s")

src/code/code_80172BC0.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80172BC0/func_80172BC0.s")

src/code/code_80174A40.c

@@ -0,0 +1,7 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80174A40/Graph_GfxPlusOne.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80174A40/Graph_BranchDlist.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80174A40/Graph_DlistAlloc.s")

src/code/code_80183070.c

@@ -0,0 +1,7 @@
+#include "global.h"
+
+void func_80183070(void) {
+    for (;;) {
+        Sleep_Msec(1000);
+    }
+}

src/code/code_80192BE0.c

@@ -0,0 +1,81 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80192BE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80192C00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019319C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801936D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019372C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193774.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019380C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193858.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019387C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801938A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801938D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193900.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193990.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801939A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193AEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193BA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193C04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193C24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193C5C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193CB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193D08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193DA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193DF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193E44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193E6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193E9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80193EA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194080.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801942BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194304.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194328.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019435C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019439C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801943D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019440C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194528.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194548.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194568.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_80194668.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801946E4.s")

src/code/code_80194710.c

@@ -0,0 +1,13 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194710.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194750.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194790.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194804.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194840.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_801948B0.s")

src/code/code_8019AF00.c

@@ -0,0 +1,429 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/D_801E0BD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019AF00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019AF58.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019AFE8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B02C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B074.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B144.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B378.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B38C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B3D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B4B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B544.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B568.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B5AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B5EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B618.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B654.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019B6B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019BC44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019BE98.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C1C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C1D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C268.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C2E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C300.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C398.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C5A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019C8D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/D_801E0C14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CD08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CE34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CE6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CEBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CF6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CF78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CF9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019CFA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D134.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D26C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D488.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D4F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D600.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D758.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D864.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D8B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019D8E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019DF28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019DF64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019DFF8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E000.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E00C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E014.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E0FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E104.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E110.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E14C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E324.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E4B0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E634.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019E864.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019EA40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019EB2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F024.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F05C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/play_sound.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F128.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F170.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F1C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F208.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F230.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F258.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F300.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F420.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F4AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F540.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F570.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F5AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F638.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F780.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F7D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F830.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F88C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F900.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FA18.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FAD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FB0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FC20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FCB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FD90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FDC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FE1C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FE74.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FEDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FF38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FF9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0048.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A00EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0124.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0184.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A01C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0204.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0238.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A026C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0318.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0450.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A046C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0554.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A05E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A05F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0654.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0810.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0868.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A09D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0C70.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0C90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0CB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0E44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1290.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1348.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A13BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A153C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A17F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1904.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1A10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1A8C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1D44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1DB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1E0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1F00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1F88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A1FB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2090.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A21FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2460.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A246C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2544.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A257C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A25E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2670.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2778.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A27E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A281C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A29D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2BB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2C20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2C44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2C88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2D54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2DE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2E54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2ED8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2F88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2FC4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3000.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3038.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3098.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A312C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A31EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3238.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A32CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3590.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A36F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3950.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A39F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3A7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3AC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3AEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3B48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3B90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3CD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3CF4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3D54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3D98.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3E38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3EC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3F54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3F6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3FB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3FFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/audio_setBGM.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4058.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A41C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A41F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A429C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A42C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4324.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4348.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4380.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4428.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_PreNMI.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A44C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A44D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A46F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4748.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A479C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A47DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A48E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4A28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4B80.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4C30.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4C54.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4D00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4D50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4DA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4DF4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4E64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4FD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5080.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A50C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5100.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A510C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5118.s")

src/code/code_801A51F0.c

@@ -0,0 +1,42 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/D_801E0EC0.s")
+
+UNK_TYPE func_801A51F0(UNK_TYPE arg0) {
+    switch (arg0) {
+        case 1:
+        case 4:
+        case 5:
+        case 11:
+        case 13:
+        case 14:
+        case 15:
+            return -1;
+        default:
+            return 0;
+    }
+}
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5228.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5390.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A53DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A53E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A541C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5488.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A54C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A54D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5680.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5808.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5A10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5A1C.s")

src/code/code_801A5BD0.c

@@ -0,0 +1,45 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5BD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5C28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5C8C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5CFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5DDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5F7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A6430.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A65C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A6D0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7084.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7168.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7284.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A72CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7328.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7484.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A75E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7720.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7794.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7828.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A787C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A78E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A794C.s")

src/code/code_801A7B10.c

@@ -0,0 +1,47 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A7B10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A7D04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A7D84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A89A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A89D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8A50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8ABC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8B14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8B2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8BD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8D5C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9768.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A982C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A99B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9A74.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9BFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9C68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9D10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9DCC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9EA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9F4C.s")

src/code/code_801AA020.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/D_801E1100.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA020.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA248.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA3E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA520.s")

src/code/db_camera.c

@@ -0,0 +1,43 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161180.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_8016119C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_8016122C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801612B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161998.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161BAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161BE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161C0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161C20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80161E4C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801620CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_8016237C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801623E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801624EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_8016253C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801629BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80162A50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80162FF8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_801631DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80163334.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_80163660.s")

src/code/flg_set.c

@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/flg_set/func_800B32D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/flg_set/D_801DC120.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/flg_set/func_800B3644.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/flg_set/D_801DC9B8.s")

src/code/game.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 s32 gFramerateDivisor = 1;
 f32 gFramerateDivisorF = 1.0f;
@@ -156,7 +155,7 @@ void Game_InitHeap(GameState* gamestate, u32 size) {
     }
 
     THA_Ct(&gamestate->heap, NULL, 0);
-    assert_fail("../game.c", 0x40B);
+    __assert("../game.c", 0x40B);
 }
 
 void Game_ResizeHeap(GameState* gamestate, u32 size) {
@@ -181,7 +180,7 @@ void Game_ResizeHeap(GameState* gamestate, u32 size) {
         THA_Ct(&gamestate->heap, buf, size);
     } else {
         THA_Ct(&gamestate->heap, 0, 0);
-        assert_fail("../game.c", 0x432);
+        __assert("../game.c", 0x432);
     }
 }
 

src/code/gamealloc.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/gamealloc/func_80173BF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/gamealloc/Gamealloc_Alloc.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/gamealloc/Gamealloc_Free.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/gamealloc/Gamealloc_FreeAll.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/gamealloc/Gamealloc_Init.s")

src/code/graph.c

@@ -0,0 +1,25 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_FaultClient.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_DlAlloc.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_InitTHGA.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_GetNextGameState.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_FaultAddrConvFunc.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_Render.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_FrameSetup.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_RenderFrame.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_DoFrame.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_ThreadEntry.s")

src/code/listalloc.c

@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/listalloc/func_80174AA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/listalloc/func_80174AB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/listalloc/func_80174B20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/listalloc/func_80174BA0.s")

src/code/main.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/main/main.s")

src/code/osFlash.c

@@ -0,0 +1,39 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186A70.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186AB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B28.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B30.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B70.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186B78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186CAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186D60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186E64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80186EC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80187018.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80187080.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80187124.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_80187284.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_801872FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_801873BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/osFlash/func_8018752C.s")

src/code/padmgr.c

@@ -0,0 +1,57 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_GetControllerBitmask.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80174F24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80174F44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80174F7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80174F9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_GetEventCallback.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175008.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_SetEventCallback.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_8017506C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Lock.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Unlock.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_801750FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175364.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175434.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_8017544C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175474.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_801754C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_CalcStickEdges.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_ParseState.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_801759BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175AE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Stop.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175E68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_GetInput.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_GetInput2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_ThreadEntry.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Start.s")

src/code/sched.c

@@ -0,0 +1,47 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176280.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176314.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/Sched_Nop80176364.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176370.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176394.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_801764F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_8017668C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_801766F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176748.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_801767B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_801768E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_8017691C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176988.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176B34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176C24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176CF4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80176F2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/Sched_SendEntryMsg.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_8017703C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80177060.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_80177084.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/Sched_ThreadEntry.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sched/Sched_Start.s")

src/code/speed_meter.c

@@ -0,0 +1,21 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_80177390.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_801773A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_801773C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/SpeedMeter_DrawTimeEntries.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_80177A84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_80177AC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/SpeedMeter_DrawAllocEntries.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_801780F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_801781EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_8017842C.s")

src/code/sys_cmpdma.c

@@ -0,0 +1,31 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178750.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178818.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178978.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_801789D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/get_framebuffer.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/get_zbuffer.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178A24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178A34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178A94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178AC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178C80.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178D7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178DAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178E3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cmpdma/func_80178E7C.s")

src/code/sys_flashrom.c

@@ -0,0 +1,31 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_801857C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_801857D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185864.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185908.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185968.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_801859F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185A2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185B1C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185BE4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185C24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/SysFlashrom_ThreadEntry.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185DDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185EC4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185F04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_flashrom/func_80185F64.s")

src/code/sys_initial_check.c

@@ -0,0 +1,17 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_WriteRGB5A1Pixel.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_WriteI4Pixel.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_DrawI4Texture.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_ClearRGB5A1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_DrawExpansionPakErrorMessage.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_DrawRegionLockErrorMessage.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_ExpansionPak.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_RegionIsSupported.s")

src/code/sys_math.c

@@ -0,0 +1,15 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/func_80179300.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/func_80179400.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/pow_int.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/sin_rad.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/cos_rad.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/Rand_ZeroFloat.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/randPlusMinusPoint5Scaled.s")

src/code/sys_math3d.c

@@ -0,0 +1,189 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Normalize.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179678.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179798.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179A44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179B34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179B94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179D74.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ScaleAndAdd.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Lerp.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Parallel.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_AngleBetweenVectors.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179F64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZBoundCheck.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A09C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A1D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A304.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A438.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZLengthSquared.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZLength.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZDistanceSquared.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZDistance.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_LengthSquared.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Vec3fMagnitude.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_DistanceSquared.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Distance.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_DistanceS.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A7B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A7F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A838.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_CrossProduct.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalVector.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A954.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017AA0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017ABBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017AD38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B68C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B7F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_UnitNormalVector.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_SignedDistanceFromPlane.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B9D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalizedDistanceFromPlane.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalizedSignedDistanceFromPlane.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BAD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BD98.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BDE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BE30.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BEE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BF8C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C008.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C17C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C1F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C494.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C540.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C808.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C850.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C904.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C980.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CB08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CB7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CEA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CEF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CFA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D020.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D1AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D220.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D2FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D404.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_TriSetCoords.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_IsPointInSphere.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D668.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D7C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D814.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D91C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017DA24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereLineSeg.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017DD34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereTri.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017E294.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017E350.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderTri.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017F1A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphere.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphereIntersect.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphereIntersectAndDistance.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereCylinderDistance.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereCylinderDistanceAndAmount.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderCylinderAmount.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderCylinderAmountAndDistance.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3d_ColTriTri.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017F9C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FA34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FAA8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FB1C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FD44.s")

src/code/sys_math_atan.c

@@ -1,61 +1,80 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 u16 sATan2Tbl[] = {
-    0,    10,   20,   31,   41,   51,   61,   71,   81,   92,   102,  112,  122,  132,  143,  153,  163,  173,  183,
-    194,  204,  214,  224,  234,  244,  255,  265,  275,  285,  295,  305,  316,  326,  336,  346,  356,  367,  377,
-    387,  397,  407,  417,  428,  438,  448,  458,  468,  478,  489,  499,  509,  519,  529,  539,  550,  560,  570,
-    580,  590,  600,  610,  621,  631,  641,  651,  661,  671,  681,  692,  702,  712,  722,  732,  742,  752,  763,
-    773,  783,  793,  803,  813,  823,  833,  844,  854,  864,  874,  884,  894,  904,  914,  924,  935,  945,  955,
-    965,  975,  985,  995,  1005, 1015, 1025, 1036, 1046, 1056, 1066, 1076, 1086, 1096, 1106, 1116, 1126, 1136, 1146,
-    1156, 1166, 1177, 1187, 1197, 1207, 1217, 1227, 1237, 1247, 1257, 1267, 1277, 1287, 1297, 1307, 1317, 1327, 1337,
-    1347, 1357, 1367, 1377, 1387, 1397, 1407, 1417, 1427, 1437, 1447, 1457, 1467, 1477, 1487, 1497, 1507, 1517, 1527,
-    1537, 1547, 1557, 1567, 1577, 1587, 1597, 1607, 1617, 1627, 1637, 1646, 1656, 1666, 1676, 1686, 1696, 1706, 1716,
-    1726, 1736, 1746, 1756, 1765, 1775, 1785, 1795, 1805, 1815, 1825, 1835, 1845, 1854, 1864, 1874, 1884, 1894, 1904,
-    1914, 1923, 1933, 1943, 1953, 1963, 1973, 1982, 1992, 2002, 2012, 2022, 2031, 2041, 2051, 2061, 2071, 2080, 2090,
-    2100, 2110, 2120, 2129, 2139, 2149, 2159, 2168, 2178, 2188, 2198, 2207, 2217, 2227, 2237, 2246, 2256, 2266, 2275,
-    2285, 2295, 2305, 2314, 2324, 2334, 2343, 2353, 2363, 2372, 2382, 2392, 2401, 2411, 2421, 2430, 2440, 2450, 2459,
-    2469, 2478, 2488, 2498, 2507, 2517, 2526, 2536, 2546, 2555, 2565, 2574, 2584, 2594, 2603, 2613, 2622, 2632, 2641,
-    2651, 2660, 2670, 2679, 2689, 2699, 2708, 2718, 2727, 2737, 2746, 2756, 2765, 2775, 2784, 2793, 2803, 2812, 2822,
-    2831, 2841, 2850, 2860, 2869, 2879, 2888, 2897, 2907, 2916, 2926, 2935, 2944, 2954, 2963, 2973, 2982, 2991, 3001,
-    3010, 3019, 3029, 3038, 3047, 3057, 3066, 3075, 3085, 3094, 3103, 3113, 3122, 3131, 3141, 3150, 3159, 3168, 3178,
-    3187, 3196, 3206, 3215, 3224, 3233, 3243, 3252, 3261, 3270, 3279, 3289, 3298, 3307, 3316, 3325, 3335, 3344, 3353,
-    3362, 3371, 3380, 3390, 3399, 3408, 3417, 3426, 3435, 3444, 3453, 3463, 3472, 3481, 3490, 3499, 3508, 3517, 3526,
-    3535, 3544, 3553, 3562, 3571, 3580, 3589, 3599, 3608, 3617, 3626, 3635, 3644, 3653, 3662, 3670, 3679, 3688, 3697,
-    3706, 3715, 3724, 3733, 3742, 3751, 3760, 3769, 3778, 3787, 3796, 3804, 3813, 3822, 3831, 3840, 3849, 3858, 3867,
-    3875, 3884, 3893, 3902, 3911, 3920, 3928, 3937, 3946, 3955, 3964, 3972, 3981, 3990, 3999, 4007, 4016, 4025, 4034,
-    4042, 4051, 4060, 4069, 4077, 4086, 4095, 4103, 4112, 4121, 4129, 4138, 4147, 4155, 4164, 4173, 4181, 4190, 4199,
-    4207, 4216, 4224, 4233, 4242, 4250, 4259, 4267, 4276, 4284, 4293, 4302, 4310, 4319, 4327, 4336, 4344, 4353, 4361,
-    4370, 4378, 4387, 4395, 4404, 4412, 4421, 4429, 4438, 4446, 4454, 4463, 4471, 4480, 4488, 4497, 4505, 4513, 4522,
-    4530, 4539, 4547, 4555, 4564, 4572, 4580, 4589, 4597, 4605, 4614, 4622, 4630, 4639, 4647, 4655, 4663, 4672, 4680,
-    4688, 4697, 4705, 4713, 4721, 4730, 4738, 4746, 4754, 4762, 4771, 4779, 4787, 4795, 4803, 4812, 4820, 4828, 4836,
-    4844, 4852, 4860, 4869, 4877, 4885, 4893, 4901, 4909, 4917, 4925, 4933, 4941, 4949, 4958, 4966, 4974, 4982, 4990,
-    4998, 5006, 5014, 5022, 5030, 5038, 5046, 5054, 5062, 5070, 5078, 5086, 5094, 5101, 5109, 5117, 5125, 5133, 5141,
-    5149, 5157, 5165, 5173, 5181, 5188, 5196, 5204, 5212, 5220, 5228, 5235, 5243, 5251, 5259, 5267, 5275, 5282, 5290,
-    5298, 5306, 5313, 5321, 5329, 5337, 5344, 5352, 5360, 5368, 5375, 5383, 5391, 5398, 5406, 5414, 5421, 5429, 5437,
-    5444, 5452, 5460, 5467, 5475, 5483, 5490, 5498, 5505, 5513, 5521, 5528, 5536, 5543, 5551, 5559, 5566, 5574, 5581,
-    5589, 5596, 5604, 5611, 5619, 5626, 5634, 5641, 5649, 5656, 5664, 5671, 5679, 5686, 5694, 5701, 5708, 5716, 5723,
-    5731, 5738, 5745, 5753, 5760, 5768, 5775, 5782, 5790, 5797, 5804, 5812, 5819, 5826, 5834, 5841, 5848, 5856, 5863,
-    5870, 5878, 5885, 5892, 5899, 5907, 5914, 5921, 5928, 5936, 5943, 5950, 5957, 5964, 5972, 5979, 5986, 5993, 6000,
-    6008, 6015, 6022, 6029, 6036, 6043, 6050, 6058, 6065, 6072, 6079, 6086, 6093, 6100, 6107, 6114, 6121, 6128, 6135,
-    6142, 6150, 6157, 6164, 6171, 6178, 6185, 6192, 6199, 6206, 6213, 6220, 6227, 6234, 6240, 6247, 6254, 6261, 6268,
-    6275, 6282, 6289, 6296, 6303, 6310, 6317, 6323, 6330, 6337, 6344, 6351, 6358, 6365, 6371, 6378, 6385, 6392, 6399,
-    6406, 6412, 6419, 6426, 6433, 6440, 6446, 6453, 6460, 6467, 6473, 6480, 6487, 6493, 6500, 6507, 6514, 6520, 6527,
-    6534, 6540, 6547, 6554, 6560, 6567, 6574, 6580, 6587, 6594, 6600, 6607, 6613, 6620, 6627, 6633, 6640, 6646, 6653,
-    6660, 6666, 6673, 6679, 6686, 6692, 6699, 6705, 6712, 6718, 6725, 6731, 6738, 6744, 6751, 6757, 6764, 6770, 6777,
-    6783, 6790, 6796, 6803, 6809, 6815, 6822, 6828, 6835, 6841, 6848, 6854, 6860, 6867, 6873, 6879, 6886, 6892, 6898,
-    6905, 6911, 6917, 6924, 6930, 6936, 6943, 6949, 6955, 6962, 6968, 6974, 6980, 6987, 6993, 6999, 7005, 7012, 7018,
-    7024, 7030, 7037, 7043, 7049, 7055, 7061, 7068, 7074, 7080, 7086, 7092, 7098, 7105, 7111, 7117, 7123, 7129, 7135,
-    7141, 7147, 7154, 7160, 7166, 7172, 7178, 7184, 7190, 7196, 7202, 7208, 7214, 7220, 7226, 7232, 7238, 7244, 7250,
-    7256, 7262, 7268, 7274, 7280, 7286, 7292, 7298, 7304, 7310, 7316, 7322, 7328, 7334, 7340, 7346, 7352, 7358, 7363,
-    7369, 7375, 7381, 7387, 7393, 7399, 7405, 7411, 7416, 7422, 7428, 7434, 7440, 7446, 7451, 7457, 7463, 7469, 7475,
-    7480, 7486, 7492, 7498, 7503, 7509, 7515, 7521, 7526, 7532, 7538, 7544, 7549, 7555, 7561, 7566, 7572, 7578, 7584,
-    7589, 7595, 7601, 7606, 7612, 7618, 7623, 7629, 7635, 7640, 7646, 7651, 7657, 7663, 7668, 7674, 7679, 7685, 7691,
-    7696, 7702, 7707, 7713, 7718, 7724, 7730, 7735, 7741, 7746, 7752, 7757, 7763, 7768, 7774, 7779, 7785, 7790, 7796,
-    7801, 7807, 7812, 7818, 7823, 7828, 7834, 7839, 7845, 7850, 7856, 7861, 7866, 7872, 7877, 7883, 7888, 7893, 7899,
-    7904, 7910, 7915, 7920, 7926, 7931, 7936, 7942, 7947, 7952, 7958, 7963, 7968, 7974, 7979, 7984, 7990, 7995, 8000,
-    8005, 8011, 8016, 8021, 8026, 8032, 8037, 8042, 8047, 8053, 8058, 8063, 8068, 8074, 8079, 8084, 8089, 8094, 8100,
-    8105, 8110, 8115, 8120, 8125, 8131, 8136, 8141, 8146, 8151, 8156, 8161, 8166, 8172, 8177, 8182, 8187, 8192,
+    0x0,    0xA,    0x14,   0x1F,   0x29,   0x33,   0x3D,   0x47,   0x51,   0x5C,   0x66,   0x70,   0x7A,   0x84,
+    0x8F,   0x99,   0xA3,   0xAD,   0xB7,   0xC2,   0xCC,   0xD6,   0xE0,   0xEA,   0xF4,   0xFF,   0x109,  0x113,
+    0x11D,  0x127,  0x131,  0x13C,  0x146,  0x150,  0x15A,  0x164,  0x16F,  0x179,  0x183,  0x18D,  0x197,  0x1A1,
+    0x1AC,  0x1B6,  0x1C0,  0x1CA,  0x1D4,  0x1DE,  0x1E9,  0x1F3,  0x1FD,  0x207,  0x211,  0x21B,  0x226,  0x230,
+    0x23A,  0x244,  0x24E,  0x258,  0x262,  0x26D,  0x277,  0x281,  0x28B,  0x295,  0x29F,  0x2A9,  0x2B4,  0x2BE,
+    0x2C8,  0x2D2,  0x2DC,  0x2E6,  0x2F0,  0x2FB,  0x305,  0x30F,  0x319,  0x323,  0x32D,  0x337,  0x341,  0x34C,
+    0x356,  0x360,  0x36A,  0x374,  0x37E,  0x388,  0x392,  0x39C,  0x3A7,  0x3B1,  0x3BB,  0x3C5,  0x3CF,  0x3D9,
+    0x3E3,  0x3ED,  0x3F7,  0x401,  0x40C,  0x416,  0x420,  0x42A,  0x434,  0x43E,  0x448,  0x452,  0x45C,  0x466,
+    0x470,  0x47A,  0x484,  0x48E,  0x499,  0x4A3,  0x4AD,  0x4B7,  0x4C1,  0x4CB,  0x4D5,  0x4DF,  0x4E9,  0x4F3,
+    0x4FD,  0x507,  0x511,  0x51B,  0x525,  0x52F,  0x539,  0x543,  0x54D,  0x557,  0x561,  0x56B,  0x575,  0x57F,
+    0x589,  0x593,  0x59D,  0x5A7,  0x5B1,  0x5BB,  0x5C5,  0x5CF,  0x5D9,  0x5E3,  0x5ED,  0x5F7,  0x601,  0x60B,
+    0x615,  0x61F,  0x629,  0x633,  0x63D,  0x647,  0x651,  0x65B,  0x665,  0x66E,  0x678,  0x682,  0x68C,  0x696,
+    0x6A0,  0x6AA,  0x6B4,  0x6BE,  0x6C8,  0x6D2,  0x6DC,  0x6E5,  0x6EF,  0x6F9,  0x703,  0x70D,  0x717,  0x721,
+    0x72B,  0x735,  0x73E,  0x748,  0x752,  0x75C,  0x766,  0x770,  0x77A,  0x783,  0x78D,  0x797,  0x7A1,  0x7AB,
+    0x7B5,  0x7BE,  0x7C8,  0x7D2,  0x7DC,  0x7E6,  0x7EF,  0x7F9,  0x803,  0x80D,  0x817,  0x820,  0x82A,  0x834,
+    0x83E,  0x848,  0x851,  0x85B,  0x865,  0x86F,  0x878,  0x882,  0x88C,  0x896,  0x89F,  0x8A9,  0x8B3,  0x8BD,
+    0x8C6,  0x8D0,  0x8DA,  0x8E3,  0x8ED,  0x8F7,  0x901,  0x90A,  0x914,  0x91E,  0x927,  0x931,  0x93B,  0x944,
+    0x94E,  0x958,  0x961,  0x96B,  0x975,  0x97E,  0x988,  0x992,  0x99B,  0x9A5,  0x9AE,  0x9B8,  0x9C2,  0x9CB,
+    0x9D5,  0x9DE,  0x9E8,  0x9F2,  0x9FB,  0xA05,  0xA0E,  0xA18,  0xA22,  0xA2B,  0xA35,  0xA3E,  0xA48,  0xA51,
+    0xA5B,  0xA64,  0xA6E,  0xA77,  0xA81,  0xA8B,  0xA94,  0xA9E,  0xAA7,  0xAB1,  0xABA,  0xAC4,  0xACD,  0xAD7,
+    0xAE0,  0xAE9,  0xAF3,  0xAFC,  0xB06,  0xB0F,  0xB19,  0xB22,  0xB2C,  0xB35,  0xB3F,  0xB48,  0xB51,  0xB5B,
+    0xB64,  0xB6E,  0xB77,  0xB80,  0xB8A,  0xB93,  0xB9D,  0xBA6,  0xBAF,  0xBB9,  0xBC2,  0xBCB,  0xBD5,  0xBDE,
+    0xBE7,  0xBF1,  0xBFA,  0xC03,  0xC0D,  0xC16,  0xC1F,  0xC29,  0xC32,  0xC3B,  0xC45,  0xC4E,  0xC57,  0xC60,
+    0xC6A,  0xC73,  0xC7C,  0xC86,  0xC8F,  0xC98,  0xCA1,  0xCAB,  0xCB4,  0xCBD,  0xCC6,  0xCCF,  0xCD9,  0xCE2,
+    0xCEB,  0xCF4,  0xCFD,  0xD07,  0xD10,  0xD19,  0xD22,  0xD2B,  0xD34,  0xD3E,  0xD47,  0xD50,  0xD59,  0xD62,
+    0xD6B,  0xD74,  0xD7D,  0xD87,  0xD90,  0xD99,  0xDA2,  0xDAB,  0xDB4,  0xDBD,  0xDC6,  0xDCF,  0xDD8,  0xDE1,
+    0xDEA,  0xDF3,  0xDFC,  0xE05,  0xE0F,  0xE18,  0xE21,  0xE2A,  0xE33,  0xE3C,  0xE45,  0xE4E,  0xE56,  0xE5F,
+    0xE68,  0xE71,  0xE7A,  0xE83,  0xE8C,  0xE95,  0xE9E,  0xEA7,  0xEB0,  0xEB9,  0xEC2,  0xECB,  0xED4,  0xEDC,
+    0xEE5,  0xEEE,  0xEF7,  0xF00,  0xF09,  0xF12,  0xF1B,  0xF23,  0xF2C,  0xF35,  0xF3E,  0xF47,  0xF50,  0xF58,
+    0xF61,  0xF6A,  0xF73,  0xF7C,  0xF84,  0xF8D,  0xF96,  0xF9F,  0xFA7,  0xFB0,  0xFB9,  0xFC2,  0xFCA,  0xFD3,
+    0xFDC,  0xFE5,  0xFED,  0xFF6,  0xFFF,  0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D,
+    0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5,
+    0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C,
+    0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2,
+    0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227,
+    0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A,
+    0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D,
+    0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E,
+    0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED,
+    0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C,
+    0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9,
+    0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535,
+    0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0,
+    0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609,
+    0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671,
+    0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8,
+    0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E,
+    0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2,
+    0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806,
+    0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867,
+    0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8,
+    0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928,
+    0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986,
+    0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3,
+    0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E,
+    0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99,
+    0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2,
+    0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B,
+    0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2,
+    0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8,
+    0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C,
+    0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0,
+    0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3,
+    0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44,
+    0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94,
+    0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3,
+    0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32,
+    0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F,
+    0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB,
+    0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16,
+    0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60,
+    0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9,
+    0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1,
+    0x1FF6, 0x1FFB, 0x2000,
 };
 
 u16 Math_GetAtan2Tbl(f32 opposite, f32 adjacent) {

src/code/sys_matrix.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void SysMatrix_StateAlloc(GameState* gamestate) {
     sMatrixStack = (MtxF*)THA_AllocEndAlign16(&gamestate->heap, 0x500);
@@ -17,82 +16,82 @@ void SysMatrix_StatePop(void) {
     sCurrentMatrix--;
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_CopyCurrentState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_CopyCurrentState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_SetCurrentState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_SetCurrentState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetCurrentState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetCurrentState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertMatrix.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertMatrix.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertTranslation.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertTranslation.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/Matrix_Scale.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_Scale.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertXRotation_s.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertXRotation_s.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertXRotation_f.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertXRotation_f.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_RotateStateAroundXAxis.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_RotateStateAroundXAxis.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_SetStateXRotation.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_SetStateXRotation.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/Matrix_RotateY.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_RotateY.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertYRotation_f.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertYRotation_f.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertZRotation_s.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertZRotation_s.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertZRotation_f.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertZRotation_f.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotation.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotation.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_RotateAndTranslateState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_RotateAndTranslateState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_SetStateRotationAndTranslation.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_SetStateRotationAndTranslation.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_ToRSPMatrix.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_ToRSPMatrix.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetStateAsRSPMatrix.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetStateAsRSPMatrix.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/Matrix_NewMtx.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_NewMtx.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_AppendToPolyOpaDisp.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_AppendToPolyOpaDisp.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fByState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fByState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslation.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslation.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledX.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledX.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledY.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledY.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledZ.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_GetStateTranslationAndScaledZ.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fXZByCurrentState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fXZByCurrentState.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/Matrix_MtxFCopy.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_MtxFCopy.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_FromRSPMatrix.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_FromRSPMatrix.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fByMatrix.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_MultiplyVector3fByMatrix.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_TransposeXYZ.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_TransposeXYZ.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_NormalizeXYZ.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_NormalizeXYZ.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_8018219C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_8018219C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_801822C4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_801822C4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotationAroundUnitVector_f.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotationAroundUnitVector_f.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotationAroundUnitVector_s.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/SysMatrix_InsertRotationAroundUnitVector_s.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_80182C90.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_80182C90.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_80182CA0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_80182CA0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_80182CBC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_80182CBC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/sys_matrix/func_80182CCC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_80182CCC.s")

src/code/sys_slowly.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 #define SLOWLY_STATUS_DONE (1 << 0)
 #define SLOWLY_STATUS_STARTED (1 << 1)

src/code/sys_ucode.c

@@ -0,0 +1,7 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_ucode/func_80182CE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_ucode/func_80183020.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sys_ucode/func_80183058.s")

src/code/title_setup.c

@@ -1,5 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
+#include "overlays/gamestates/ovl_title/z_title.h"
 
 void TitleSetup_GameStateResetContext(void) {
     XREG(2) = 0;

src/code/z_DLF.c

@@ -0,0 +1,5 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_DLF/DLF_LoadGameState.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_DLF/DLF_FreeGameState.s")

src/code/z_actor.c

@@ -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")

src/code/z_actor_dlftbls.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 #include "initvars.h"
 
 #define ACTOR_OVERLAY(name, allocType)                                                                  \

src/code/z_bg_collect.c

@@ -1,9 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
-
-// This file comes after z_bgcheck.c and contains functions to manage actors attached to Bg Actors.
-// Perhaps it is called something like z_bgcheck_attach.c
-// The functions will use the BgCheck2 prefix for now.
+#include "global.h"
 
 void BgCheck2_UpdateActorPosition(CollisionContext* colCtx, s32 index, Actor* actor) {
     MtxF prevMatrix;

src/code/z_bg_item.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void BcCheck3_BgActorInit(DynaPolyActor* actor, UNK_TYPE4 param_2) {
     actor->bgId = -1;

src/code/z_bgcheck.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void BgCheck_PolygonLinkedListNodeInit(SSNode* node, s16* polyIndex, u16 next) {
     node->polyId = *polyIndex;
@@ -64,370 +63,370 @@ void BgCheck_CreateVertexFromVec3f(Vec3s* vertex, Vec3f* vector) {
     vertex->z = vector->z;
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFD84.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800BFD84.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800BFDEC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800BFDEC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetMinY.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetMinY.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetNormal.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_PolygonGetNormal.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0094.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C0094.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C01B8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C01B8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CreateTriNormFromPolygon.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_CreateTriNormFromPolygon.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C02C0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C02C0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0340.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C0340.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0474.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C0474.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0668.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C0668.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C06A8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C06A8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C074C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C074C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C07F0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C07F0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonCollidesWithSphere.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_PolygonCollidesWithSphere.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsertSorted.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsert.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInsert.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C0E74.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C0E74.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C10FC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C10FC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1238.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C1238.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C12A4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C12A4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1B68.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C1B68.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C1D7C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C1D7C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2008.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C2008.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C20F4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C20F4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2310.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C2310.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2460.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C2460.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2514.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C2514.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C25E0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C25E0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinSubdivisions.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinSubdivisions.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMaxSubdivisions.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetPolyMinMaxSubdivisions.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C2BE0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C2BE0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_SplitScenePolygonsIntoSubdivisions.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetIsDefaultSpecialScene.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxMemory.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcSubdivisionSize.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_CalcSubdivisionSize.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetSpecialSceneMaxObjects.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Init.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_Init.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C00.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3C00.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C14.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3C14.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorMeshHeader.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetActorMeshHeader.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3C94.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3C94.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3D50.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3D50.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3F40.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3F40.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C3FA0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C3FA0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4000.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4000.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4058.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4058.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C40B4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C40B4.s")
 
 f32 func_800C411C(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Actor* actor, Vec3f* pos) {
     return func_800C3D50(0, colCtx, 2, arg1, arg2, pos, actor, 28, 1.0f, 0);
 }
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4188.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4188.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C41E4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C41E4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4240.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4240.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C42A8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C42A8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4314.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4314.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C43CC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C43CC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4488.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4488.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C44F0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C44F0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C455C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C455C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C45C4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C45C4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4C74.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4C74.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4CD8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4CD8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4D3C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4D3C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4DA4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4DA4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4E10.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4E10.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F38.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4F38.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4F84.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4F84.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C4FD4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C4FD4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5464.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5464.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C54AC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C54AC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5538.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5538.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C55C4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C55C4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5650.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5650.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C56E0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C56E0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C576C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C576C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C57F8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C57F8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C583C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C583C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C58C8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C58C8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5954.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5954.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A20.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5A20.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5A64.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5A64.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsAlloc.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsAlloc.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C5B80.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C5B80.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ScenePolygonListsReserveNode.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshParamsInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshParamsInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_SetActorMeshParams.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_SetActorMeshParams.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AreActorMeshParamsEqual.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_AreActorMeshParamsEqual.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsHeadsInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshPolyListsInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshVerticesIndexInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshWaterboxesIndexInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInitFromActor.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshInitFromActor.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_HasActorMeshChanged.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_HasActorMeshChanged.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsAlloc.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_PolygonsAlloc.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_VerticesInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_VerticesListAlloc.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_VerticesListAlloc.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListAlloc.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_WaterboxListAlloc.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshUpdateParams.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ActorMeshUpdateParams.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_IsActorMeshIndexValid.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_IsActorMeshIndexValid.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaInit.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_DynaInit.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_DynaAlloc.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_DynaAlloc.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMesh.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMesh.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetActorOfMesh.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetActorOfMesh.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C62BC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C62BC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6314.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C6314.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C636C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C636C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C63C4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C63C4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C641C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C641C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6474.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C6474.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RemoveActorMesh.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_RemoveActorMesh.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C6554.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C6554.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_CalcWaterboxDimensions.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_CalcWaterboxDimensions.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMeshToLists.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_AddActorMeshToLists.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_ResetFlagsIfLoadedActor.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_Update.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_Update.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C756C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C756C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_UpdateAllActorMeshes.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_UpdateAllActorMeshes.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C76EC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C76EC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7974.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C7974.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C7E40.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C7E40.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8580.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C8580.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C87D0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C87D0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8A60.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C8A60.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8BD0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C8BD0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8DC0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C8DC0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C8EEC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C8EEC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C90AC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C90AC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C921C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C921C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9380.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9380.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeaderPointers.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeader.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_RelocateMeshHeader.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_RelocateAllMeshHeaders.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_RelocateAllMeshHeaders.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9640.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9640.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/BgCheck_GetPolygonAttributes.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/BgCheck_GetPolygonAttributes.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9704.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9704.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9728.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9728.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9770.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9770.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C97F8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C97F8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9844.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9844.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C98CC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C98CC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9924.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9924.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99AC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C99AC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99D4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C99D4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C99FC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C99FC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A24.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9A24.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A4C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9A4C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9A7C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9A7C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AB0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9AB0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9AE4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9AE4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B18.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9B18.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B40.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9B40.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B68.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9B68.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9B90.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9B90.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BB8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9BB8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9BDC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9BDC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C24.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9C24.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C74.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9C74.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9C9C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9C9C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CC4.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9CC4.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9CEC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9CEC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D14.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9D14.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D50.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9D50.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9D8C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9D8C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9DDC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9DDC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E18.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9E18.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E40.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9E40.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9E88.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9E88.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800C9EBC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800C9EBC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1AC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA1AC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA1E8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA1E8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA22C.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA22C.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA568.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA568.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA634.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA634.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA648.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA648.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6B8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA6B8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6D8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA6D8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA6F0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA6F0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA9D0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CA9D0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CAA14.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800CAA14.s")

src/code/z_camera.c

@@ -0,0 +1,373 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_fabsf.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_LengthVec3f.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB270.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Lerpf.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Lerps.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB42C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_LerpVec3f.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB544.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB584.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB5DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB60C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB674.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB6C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB700.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB780.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB7CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB7F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB828.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB854.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB880.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB8C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB8F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB924.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CB950.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBA7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBAAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBAD4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBB58.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBB88.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC00.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC30.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBC84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CBFA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC000.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC128.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC1C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC260.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC488.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC56C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC5C8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC740.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC7A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC804.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC874.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC938.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC958.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC9C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CCCEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD04C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD288.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD2E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD2F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD3E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD44C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD634.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD6CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD6F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD834.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CDA14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CDB6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CDE6C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CE2B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CE5E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CE79C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CE930.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CEAD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CEC38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CED90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNop.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ5.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ6.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ7.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ9.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO5.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO6.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO7.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO9.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC3.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC5.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC6.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC7.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC9.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Alloc.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Free.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DDFE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE0E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE0EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE308.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE324.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE62C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE840.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE890.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE954.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DF498.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_SetMode.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DF840.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DF86C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DF8EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFAC8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFB14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFC1C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFC40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFC68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFC90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFCB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFCDC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFD04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFD78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFEF0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFF18.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFF34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFF44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_SetFlags.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ClearFlags.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DFFAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E007C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E01AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E01B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E01DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E0228.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E0238.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E02AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E0308.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E031C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800E0348.s")

src/code/z_collision_btltbls.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 DamageTable sDamageTablePresets[] = {
     { {

src/code/z_collision_check.c

@@ -1,5 +1,46 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
+
+Vec3f D_801EDE00;
+Vec3f D_801EDE10;
+Vec3f D_801EDE20;
+Vec3f D_801EDE30;
+TriNorm D_801EDE40;
+TriNorm D_801EDE78;
+LineSegment D_801EDEB0;
+TriNorm D_801EDEC8;
+TriNorm D_801EDF00;
+Vec3f D_801EDF38;
+Vec3f D_801EDF48;
+TriNorm D_801EDF58;
+TriNorm D_801EDF90;
+LineSegment D_801EDFC8;
+Vec3f D_801EDFE0;
+Vec3f D_801EDFF0;
+TriNorm D_801EE000;
+TriNorm D_801EE038;
+TriNorm D_801EE070[2];
+Vec3f D_801EE0D8;
+TriNorm D_801EE0E8[2];
+TriNorm D_801EE150;
+TriNorm D_801EE188;
+Vec3f D_801EE1C0;
+Vec3f D_801EE1D0;
+Vec3f D_801EE1E0;
+Vec3f D_801EE1F0;
+EffSparkParams D_801EE200;
+TriNorm D_801EE6C8;
+TriNorm D_801EE700;
+EffSparkParams D_801EE738;
+EffSparkParams D_801EEC00;
+EffSparkParams D_801EF0C8;
+TriNorm D_801EF590;
+TriNorm D_801EF5C8;
+TriNorm D_801EF600;
+TriNorm D_801EF638;
+
+//! @TODO: These are fake bss symbols likely related to z_message_nes
+UNK_TYPE1 D_801EF66C;
+UNK_TYPE1 D_801EF66D;
 
 /**
  * Gets the damage and effect that should be applied for the collision between
@@ -1353,38 +1394,38 @@ void CollisionCheck_BlueBlood(GlobalContext* globalCtx, Collider* collider, Vec3
     D_801EEC00.position.x = v->z;
     D_801EEC00.particleFactor1 = 5;
     D_801EEC00.particleFactor2 = 5;
-    D_801EEC00.colorStart[0].red = 10;
-    D_801EEC00.colorStart[0].green = 10;
-    D_801EEC00.colorStart[0].blue = 200;
-    D_801EEC00.colorStart[0].alpha = 255;
-    D_801EEC00.colorStart[1].red = 0;
-    D_801EEC00.colorStart[1].green = 0;
-    D_801EEC00.colorStart[1].blue = 128;
-    D_801EEC00.colorStart[1].alpha = 255;
-    D_801EEC00.colorStart[2].red = 0;
-    D_801EEC00.colorStart[2].green = 0;
-    D_801EEC00.colorStart[2].blue = 128;
-    D_801EEC00.colorStart[2].alpha = 255;
-    D_801EEC00.colorStart[3].red = 0;
-    D_801EEC00.colorStart[3].green = 0;
-    D_801EEC00.colorStart[3].blue = 128;
-    D_801EEC00.colorStart[3].alpha = 255;
-    D_801EEC00.colorEnd[0].red = 0;
-    D_801EEC00.colorEnd[0].green = 0;
-    D_801EEC00.colorEnd[0].blue = 32;
-    D_801EEC00.colorEnd[0].alpha = 0;
-    D_801EEC00.colorEnd[1].red = 0;
-    D_801EEC00.colorEnd[1].green = 0;
-    D_801EEC00.colorEnd[1].blue = 32;
-    D_801EEC00.colorEnd[1].alpha = 0;
-    D_801EEC00.colorEnd[2].red = 0;
-    D_801EEC00.colorEnd[2].green = 0;
-    D_801EEC00.colorEnd[2].blue = 64;
-    D_801EEC00.colorEnd[2].alpha = 0;
-    D_801EEC00.colorEnd[3].red = 0;
-    D_801EEC00.colorEnd[3].green = 0;
-    D_801EEC00.colorEnd[3].blue = 64;
-    D_801EEC00.colorEnd[3].alpha = 0;
+    D_801EEC00.colorStart[0].r = 10;
+    D_801EEC00.colorStart[0].g = 10;
+    D_801EEC00.colorStart[0].b = 200;
+    D_801EEC00.colorStart[0].a = 255;
+    D_801EEC00.colorStart[1].r = 0;
+    D_801EEC00.colorStart[1].g = 0;
+    D_801EEC00.colorStart[1].b = 128;
+    D_801EEC00.colorStart[1].a = 255;
+    D_801EEC00.colorStart[2].r = 0;
+    D_801EEC00.colorStart[2].g = 0;
+    D_801EEC00.colorStart[2].b = 128;
+    D_801EEC00.colorStart[2].a = 255;
+    D_801EEC00.colorStart[3].r = 0;
+    D_801EEC00.colorStart[3].g = 0;
+    D_801EEC00.colorStart[3].b = 128;
+    D_801EEC00.colorStart[3].a = 255;
+    D_801EEC00.colorEnd[0].r = 0;
+    D_801EEC00.colorEnd[0].g = 0;
+    D_801EEC00.colorEnd[0].b = 32;
+    D_801EEC00.colorEnd[0].a = 0;
+    D_801EEC00.colorEnd[1].r = 0;
+    D_801EEC00.colorEnd[1].g = 0;
+    D_801EEC00.colorEnd[1].b = 32;
+    D_801EEC00.colorEnd[1].a = 0;
+    D_801EEC00.colorEnd[2].r = 0;
+    D_801EEC00.colorEnd[2].g = 0;
+    D_801EEC00.colorEnd[2].b = 64;
+    D_801EEC00.colorEnd[2].a = 0;
+    D_801EEC00.colorEnd[3].r = 0;
+    D_801EEC00.colorEnd[3].g = 0;
+    D_801EEC00.colorEnd[3].b = 64;
+    D_801EEC00.colorEnd[3].a = 0;
     D_801EEC00.age = 0;
     D_801EEC00.duration = 16;
     D_801EEC00.velocity = 8.0f;
@@ -1393,7 +1434,7 @@ void CollisionCheck_BlueBlood(GlobalContext* globalCtx, Collider* collider, Vec3
     Effect_Add(globalCtx, &effectIndex, 0, 0, 1, &D_801EEC00);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/CollisionCheck_BlueBlood.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/CollisionCheck_BlueBlood.s")
 #endif
 
 /**
@@ -1411,38 +1452,38 @@ void CollisionCheck_GreenBlood(GlobalContext* globalCtx, Collider* collider, Vec
     D_801EF0C8.position.x = v->z;
     D_801EF0C8.particleFactor1 = 5;
     D_801EF0C8.particleFactor2 = 5;
-    D_801EF0C8.colorStart[0].red = 10;
-    D_801EF0C8.colorStart[0].green = 200;
-    D_801EF0C8.colorStart[0].blue = 10;
-    D_801EF0C8.colorStart[0].alpha = 255;
-    D_801EF0C8.colorStart[1].red = 0;
-    D_801EF0C8.colorStart[1].green = 128;
-    D_801EF0C8.colorStart[1].blue = 0;
-    D_801EF0C8.colorStart[1].alpha = 255;
-    D_801EF0C8.colorStart[2].red = 0;
-    D_801EF0C8.colorStart[2].green = 128;
-    D_801EF0C8.colorStart[2].blue = 0;
-    D_801EF0C8.colorStart[2].alpha = 255;
-    D_801EF0C8.colorStart[3].red = 0;
-    D_801EF0C8.colorStart[3].green = 128;
-    D_801EF0C8.colorStart[3].blue = 0;
-    D_801EF0C8.colorStart[3].alpha = 255;
-    D_801EF0C8.colorEnd[0].red = 0;
-    D_801EF0C8.colorEnd[0].green = 32;
-    D_801EF0C8.colorEnd[0].blue = 0;
-    D_801EF0C8.colorEnd[0].alpha = 0;
-    D_801EF0C8.colorEnd[1].red = 0;
-    D_801EF0C8.colorEnd[1].green = 32;
-    D_801EF0C8.colorEnd[1].blue = 0;
-    D_801EF0C8.colorEnd[1].alpha = 0;
-    D_801EF0C8.colorEnd[2].red = 0;
-    D_801EF0C8.colorEnd[2].green = 64;
-    D_801EF0C8.colorEnd[2].blue = 0;
-    D_801EF0C8.colorEnd[2].alpha = 0;
-    D_801EF0C8.colorEnd[3].red = 0;
-    D_801EF0C8.colorEnd[3].green = 64;
-    D_801EF0C8.colorEnd[3].blue = 0;
-    D_801EF0C8.colorEnd[3].alpha = 0;
+    D_801EF0C8.colorStart[0].r = 10;
+    D_801EF0C8.colorStart[0].g = 200;
+    D_801EF0C8.colorStart[0].b = 10;
+    D_801EF0C8.colorStart[0].a = 255;
+    D_801EF0C8.colorStart[1].r = 0;
+    D_801EF0C8.colorStart[1].g = 128;
+    D_801EF0C8.colorStart[1].b = 0;
+    D_801EF0C8.colorStart[1].a = 255;
+    D_801EF0C8.colorStart[2].r = 0;
+    D_801EF0C8.colorStart[2].g = 128;
+    D_801EF0C8.colorStart[2].b = 0;
+    D_801EF0C8.colorStart[2].a = 255;
+    D_801EF0C8.colorStart[3].r = 0;
+    D_801EF0C8.colorStart[3].g = 128;
+    D_801EF0C8.colorStart[3].b = 0;
+    D_801EF0C8.colorStart[3].a = 255;
+    D_801EF0C8.colorEnd[0].r = 0;
+    D_801EF0C8.colorEnd[0].g = 32;
+    D_801EF0C8.colorEnd[0].b = 0;
+    D_801EF0C8.colorEnd[0].a = 0;
+    D_801EF0C8.colorEnd[1].r = 0;
+    D_801EF0C8.colorEnd[1].g = 32;
+    D_801EF0C8.colorEnd[1].b = 0;
+    D_801EF0C8.colorEnd[1].a = 0;
+    D_801EF0C8.colorEnd[2].r = 0;
+    D_801EF0C8.colorEnd[2].g = 64;
+    D_801EF0C8.colorEnd[2].b = 0;
+    D_801EF0C8.colorEnd[2].a = 0;
+    D_801EF0C8.colorEnd[3].r = 0;
+    D_801EF0C8.colorEnd[3].g = 64;
+    D_801EF0C8.colorEnd[3].b = 0;
+    D_801EF0C8.colorEnd[3].a = 0;
     D_801EF0C8.age = 0;
     D_801EF0C8.duration = 16;
     D_801EF0C8.velocity = 8.0f;
@@ -1450,7 +1491,7 @@ void CollisionCheck_GreenBlood(GlobalContext* globalCtx, Collider* collider, Vec
     Effect_Add(globalCtx, &effectIndex, 0, 0, 1, &D_801EF0C8);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/CollisionCheck_GreenBlood.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/CollisionCheck_GreenBlood.s")
 #endif
 
 /**
@@ -3664,7 +3705,7 @@ void Collider_UpdateSpheres(s32 limb, ColliderJntSph* collider) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/Collider_UpdateSpheres.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/Collider_UpdateSpheres.s")
 #endif
 
 /**
@@ -3704,7 +3745,7 @@ void Collider_UpdateSphere(s32 limb, ColliderSphere* collider) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/Collider_UpdateSphere.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/Collider_UpdateSphere.s")
 #endif
 
 /**
@@ -3722,38 +3763,38 @@ void CollisionCheck_SpawnRedBlood(GlobalContext* globalCtx, Vec3f* v) {
     D_801EE200.position.x = v->z;
     D_801EE200.particleFactor1 = 5;
     D_801EE200.particleFactor2 = 5;
-    D_801EE200.colorStart[0].red = 128;
-    D_801EE200.colorStart[0].green = 0;
-    D_801EE200.colorStart[0].blue = 64;
-    D_801EE200.colorStart[0].alpha = 255;
-    D_801EE200.colorStart[1].red = 128;
-    D_801EE200.colorStart[1].green = 0;
-    D_801EE200.colorStart[1].blue = 64;
-    D_801EE200.colorStart[1].alpha = 255;
-    D_801EE200.colorStart[2].red = 255;
-    D_801EE200.colorStart[2].green = 128;
-    D_801EE200.colorStart[2].blue = 0;
-    D_801EE200.colorStart[2].alpha = 255;
-    D_801EE200.colorStart[3].red = 255;
-    D_801EE200.colorStart[3].green = 128;
-    D_801EE200.colorStart[3].blue = 0;
-    D_801EE200.colorStart[3].alpha = 255;
-    D_801EE200.colorEnd[0].red = 64;
-    D_801EE200.colorEnd[0].green = 0;
-    D_801EE200.colorEnd[0].blue = 32;
-    D_801EE200.colorEnd[0].alpha = 0;
-    D_801EE200.colorEnd[1].red = 64;
-    D_801EE200.colorEnd[1].green = 0;
-    D_801EE200.colorEnd[1].blue = 32;
-    D_801EE200.colorEnd[1].alpha = 0;
-    D_801EE200.colorEnd[2].red = 128;
-    D_801EE200.colorEnd[2].green = 0;
-    D_801EE200.colorEnd[2].blue = 64;
-    D_801EE200.colorEnd[2].alpha = 0;
-    D_801EE200.colorEnd[3].red = 128;
-    D_801EE200.colorEnd[3].green = 0;
-    D_801EE200.colorEnd[3].blue = 64;
-    D_801EE200.colorEnd[3].alpha = 0;
+    D_801EE200.colorStart[0].r = 128;
+    D_801EE200.colorStart[0].g = 0;
+    D_801EE200.colorStart[0].b = 64;
+    D_801EE200.colorStart[0].a = 255;
+    D_801EE200.colorStart[1].r = 128;
+    D_801EE200.colorStart[1].g = 0;
+    D_801EE200.colorStart[1].b = 64;
+    D_801EE200.colorStart[1].a = 255;
+    D_801EE200.colorStart[2].r = 255;
+    D_801EE200.colorStart[2].g = 128;
+    D_801EE200.colorStart[2].b = 0;
+    D_801EE200.colorStart[2].a = 255;
+    D_801EE200.colorStart[3].r = 255;
+    D_801EE200.colorStart[3].g = 128;
+    D_801EE200.colorStart[3].b = 0;
+    D_801EE200.colorStart[3].a = 255;
+    D_801EE200.colorEnd[0].r = 64;
+    D_801EE200.colorEnd[0].g = 0;
+    D_801EE200.colorEnd[0].b = 32;
+    D_801EE200.colorEnd[0].a = 0;
+    D_801EE200.colorEnd[1].r = 64;
+    D_801EE200.colorEnd[1].g = 0;
+    D_801EE200.colorEnd[1].b = 32;
+    D_801EE200.colorEnd[1].a = 0;
+    D_801EE200.colorEnd[2].r = 128;
+    D_801EE200.colorEnd[2].g = 0;
+    D_801EE200.colorEnd[2].b = 64;
+    D_801EE200.colorEnd[2].a = 0;
+    D_801EE200.colorEnd[3].r = 128;
+    D_801EE200.colorEnd[3].g = 0;
+    D_801EE200.colorEnd[3].b = 64;
+    D_801EE200.colorEnd[3].a = 0;
     D_801EE200.age = 0;
     D_801EE200.duration = 16;
     D_801EE200.velocity = 8.0f;
@@ -3762,7 +3803,7 @@ void CollisionCheck_SpawnRedBlood(GlobalContext* globalCtx, Vec3f* v) {
     Effect_Add(globalCtx, &effectIndex, 0, 0, 1, &D_801EE200);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnRedBlood.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnRedBlood.s")
 #endif
 
 /**
@@ -3780,38 +3821,38 @@ void CollisionCheck_SpawnWaterDroplets(GlobalContext* globalCtx, Vec3f* v) {
     D_801EE738.position.x = v->z;
     D_801EE738.particleFactor1 = 5;
     D_801EE738.particleFactor2 = 5;
-    D_801EE738.colorStart[0].red = 255;
-    D_801EE738.colorStart[0].green = 255;
-    D_801EE738.colorStart[0].blue = 255;
-    D_801EE738.colorStart[0].alpha = 255;
-    D_801EE738.colorStart[1].red = 100;
-    D_801EE738.colorStart[1].green = 100;
-    D_801EE738.colorStart[1].blue = 100;
-    D_801EE738.colorStart[1].alpha = 100;
-    D_801EE738.colorStart[2].red = 100;
-    D_801EE738.colorStart[2].green = 100;
-    D_801EE738.colorStart[2].blue = 100;
-    D_801EE738.colorStart[2].alpha = 100;
-    D_801EE738.colorStart[3].red = 100;
-    D_801EE738.colorStart[3].green = 100;
-    D_801EE738.colorStart[3].blue = 100;
-    D_801EE738.colorStart[3].alpha = 100;
-    D_801EE738.colorEnd[0].red = 50;
-    D_801EE738.colorEnd[0].green = 50;
-    D_801EE738.colorEnd[0].blue = 50;
-    D_801EE738.colorEnd[0].alpha = 50;
-    D_801EE738.colorEnd[1].red = 50;
-    D_801EE738.colorEnd[1].green = 50;
-    D_801EE738.colorEnd[1].blue = 50;
-    D_801EE738.colorEnd[1].alpha = 50;
-    D_801EE738.colorEnd[2].red = 50;
-    D_801EE738.colorEnd[2].green = 50;
-    D_801EE738.colorEnd[2].blue = 50;
-    D_801EE738.colorEnd[2].alpha = 50;
-    D_801EE738.colorEnd[3].red = 0;
-    D_801EE738.colorEnd[3].green = 0;
-    D_801EE738.colorEnd[3].blue = 0;
-    D_801EE738.colorEnd[3].alpha = 0;
+    D_801EE738.colorStart[0].r = 255;
+    D_801EE738.colorStart[0].g = 255;
+    D_801EE738.colorStart[0].b = 255;
+    D_801EE738.colorStart[0].a = 255;
+    D_801EE738.colorStart[1].r = 100;
+    D_801EE738.colorStart[1].g = 100;
+    D_801EE738.colorStart[1].b = 100;
+    D_801EE738.colorStart[1].a = 100;
+    D_801EE738.colorStart[2].r = 100;
+    D_801EE738.colorStart[2].g = 100;
+    D_801EE738.colorStart[2].b = 100;
+    D_801EE738.colorStart[2].a = 100;
+    D_801EE738.colorStart[3].r = 100;
+    D_801EE738.colorStart[3].g = 100;
+    D_801EE738.colorStart[3].b = 100;
+    D_801EE738.colorStart[3].a = 100;
+    D_801EE738.colorEnd[0].r = 50;
+    D_801EE738.colorEnd[0].g = 50;
+    D_801EE738.colorEnd[0].b = 50;
+    D_801EE738.colorEnd[0].a = 50;
+    D_801EE738.colorEnd[1].r = 50;
+    D_801EE738.colorEnd[1].g = 50;
+    D_801EE738.colorEnd[1].b = 50;
+    D_801EE738.colorEnd[1].a = 50;
+    D_801EE738.colorEnd[2].r = 50;
+    D_801EE738.colorEnd[2].g = 50;
+    D_801EE738.colorEnd[2].b = 50;
+    D_801EE738.colorEnd[2].a = 50;
+    D_801EE738.colorEnd[3].r = 0;
+    D_801EE738.colorEnd[3].g = 0;
+    D_801EE738.colorEnd[3].b = 0;
+    D_801EE738.colorEnd[3].a = 0;
     D_801EE738.age = 0;
     D_801EE738.duration = 16;
     D_801EE738.velocity = 8.0f;
@@ -3820,7 +3861,7 @@ void CollisionCheck_SpawnWaterDroplets(GlobalContext* globalCtx, Vec3f* v) {
     Effect_Add(globalCtx, &effectIndex, 0, 0, 1, &D_801EE738);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnWaterDroplets.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnWaterDroplets.s")
 #endif
 
 /**

src/code/z_common_data.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_common_data/func_800E9360.s")

src/code/z_construct.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_construct/nop_801AAAA0.s")

src/code/z_debug.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/static_context_init.s")

src/code/z_debug_display.c

@@ -0,0 +1,15 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/func_800E9470.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/DebugDisplay_AddObject.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/DebugDisplay_DrawObjects.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/func_800E95F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/func_800E97D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/func_800E992C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_display/func_800E99B0.s")

src/code/z_debug_mode.c

@@ -0,0 +1,13 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9C90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9CA0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9CFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9DBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9E94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug_mode/func_800E9F78.s")

src/code/z_demo.c

@@ -0,0 +1,99 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA0D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA0EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_StepCutscene1.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_StepCutscene2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_Nop800EA210.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA220.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA258.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA2B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EA324.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EABAC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAC08.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAC44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAC94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAD14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAD48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAD7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EADB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAECC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAF20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EAFE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EB1DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EB364.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EB4B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EB6F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EBB68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EBCD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EBD60.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EC678.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EC6D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EC924.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800ECD7C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_ProcessCommands.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800ED980.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800ED9C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDA04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDA84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDBE0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/nop_800EDDB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDDBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDDCC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDE34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDF24.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EDF78.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EE0CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EE1D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EE200.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EE29C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800EE2F4.s")

src/code/z_draw.c

@@ -0,0 +1,49 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/GetItem_Draw.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EE364.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EE400.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EE5FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EE7D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EE940.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EEA48.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EEC18.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EED20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EEE34.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EEF4C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF054.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF0F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF1F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF2AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF364.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF4D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF65C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF780.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF89C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EF984.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EFAB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EFBFC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_draw/func_800EFD44.s")

src/code/z_eff_blure.c

@@ -1,5 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
+
 #ifdef NON_MATCHING
 void func_800A81F0(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     EffectBlureElement* elem;
@@ -67,39 +67,39 @@ void func_800A81F0(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A81F0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A81F0.s")
 #endif
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A8514.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A8514.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Initcommon.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Initcommon.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Init1.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Init1.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Init2.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Init2.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Destroy.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Destroy.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Update.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A8C78.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A8C78.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A8DE8.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A8DE8.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A92FC.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A92FC.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A9330.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A9330.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800A9804.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800A9804.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800AA190.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800AA190.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800AA460.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800AA460.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800AA498.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800AA498.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800AA700.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800AA700.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/func_800AABE0.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800AABE0.s")
 
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_eff_blure/EffectBlure_Draw.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Draw.s")

src/code/z_eff_footmark.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void EffFootmark_Init(GlobalContext* globalCtx) {
     EffFootmark* footmark;

src/code/z_eff_shield_particle.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_CalculateColors.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Draw.s")

src/code/z_eff_spark.c

@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/EffectSpark_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/EffectSpark_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/EffectSpark_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/EffectSpark_Draw.s")

src/code/z_eff_ss_dead.c

@@ -0,0 +1,13 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE2A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE434.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE5A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE5E4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE778.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_800AE8EC.s")

src/code/z_eff_tire_mark.c

@@ -0,0 +1,17 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/func_800AE930.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/func_800AEF44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitParticle.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitVertices.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Draw.s")

src/code/z_effect.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 EffInfo sEffInfoTable[] = {
     {

src/code/z_effect_soft_sprite.c

@@ -1,10 +1,9 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void EffectSS_Init(GlobalContext* globalCtx, s32 numEntries) {
     u32 i;
     EffectSs* effectsSs;
-    ParticleOverlay* overlay;
+    EffectSsOverlay* overlay;
 
     EffectSS2Info.data_table = (EffectSs*)THA_AllocEndAlign16(&globalCtx->state.heap, numEntries * sizeof(EffectSs));
     EffectSS2Info.searchIndex = 0;
@@ -16,7 +15,7 @@ void EffectSS_Init(GlobalContext* globalCtx, s32 numEntries) {
     }
 
     overlay = &particleOverlayTable[0];
-    for (i = 0; i < EFFECT_SS2_TYPE_LAST_LABEL; i++) {
+    for (i = 0; i < EFFECT_SS_MAX; i++) {
         overlay->loadedRamAddr = NULL;
         overlay++;
     }
@@ -25,7 +24,7 @@ void EffectSS_Init(GlobalContext* globalCtx, s32 numEntries) {
 void EffectSS_Clear(GlobalContext* globalCtx) {
     u32 i;
     EffectSs* effectsSs;
-    ParticleOverlay* overlay;
+    EffectSsOverlay* overlay;
     void* addr;
 
     EffectSS2Info.data_table = NULL;
@@ -39,7 +38,7 @@ void EffectSS_Clear(GlobalContext* globalCtx) {
 
     // Free memory from loaded particle overlays
     overlay = &particleOverlayTable[0];
-    for (i = 0; i < EFFECT_SS2_TYPE_LAST_LABEL; i++) {
+    for (i = 0; i < EFFECT_SS_MAX; i++) {
         addr = overlay->loadedRamAddr;
         if (addr != NULL) {
             zelda_free(addr);
@@ -69,7 +68,7 @@ void EffectSS_Delete(EffectSs* effectSs) {
 void EffectSS_ResetEntry(EffectSs* particle) {
     u32 i;
 
-    particle->type = EFFECT_SS2_TYPE_LAST_LABEL;
+    particle->type = EFFECT_SS_MAX;
     particle->accel.x = particle->accel.y = particle->accel.z = 0;
     particle->velocity.x = particle->velocity.y = particle->velocity.z = 0;
     particle->vec.x = particle->vec.y = particle->vec.z = 0;
@@ -161,8 +160,8 @@ void EffectSS_Copy(GlobalContext* globalCtx, EffectSs* effectsSs) {
 void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* initData) {
     s32 index;
     u32 overlaySize;
-    ParticleOverlay* entry = &particleOverlayTable[type];
-    ParticleOverlayInfo* overlayInfo;
+    EffectSsOverlay* entry = &particleOverlayTable[type];
+    EffectSsInit* initInfo;
 
     if (EffectSS_FindFreeSpace(priority, &index) != 0) {
         // Abort because we couldn't find a suitable slot to add this effect in
@@ -173,7 +172,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init
     overlaySize = (u32)entry->vramEnd - (u32)entry->vramStart;
 
     if (entry->vramStart == NULL) {
-        overlayInfo = entry->overlayInfo;
+        initInfo = entry->initInfo;
     } else {
         if (entry->loadedRamAddr == NULL) {
             entry->loadedRamAddr = zelda_mallocR(overlaySize);
@@ -185,20 +184,20 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init
             Load2_LoadOverlay(entry->vromStart, entry->vromEnd, entry->vramStart, entry->vramEnd, entry->loadedRamAddr);
         }
 
-        overlayInfo = (void*)(u32)(
-            entry->overlayInfo != NULL
-                ? (ParticleOverlayInfo*)(-((u32)entry->vramStart - (u32)entry->loadedRamAddr) + (u32)entry->overlayInfo)
+        initInfo = (void*)(u32)(
+            entry->initInfo != NULL
+                ? (EffectSsInit*)(-((u32)entry->vramStart - (u32)entry->loadedRamAddr) + (u32)entry->initInfo)
                 : NULL);
     }
 
-    if (overlayInfo->init != NULL) {
+    if (initInfo->init != NULL) {
         // Delete the previous effect in the slot, in case the slot wasn't free
         EffectSS_Delete(&EffectSS2Info.data_table[index]);
 
         EffectSS2Info.data_table[index].type = type;
         EffectSS2Info.data_table[index].priority = priority;
 
-        if (overlayInfo->init(globalCtx, index, &EffectSS2Info.data_table[index], initData) == 0) {
+        if (initInfo->init(globalCtx, index, &EffectSS2Info.data_table[index], initData) == 0) {
             EffectSS_ResetEntry(&EffectSS2Info.data_table[index]);
         }
     }

src/code/z_effect_soft_sprite_old_init.c

@@ -1,5 +1,36 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
+#include "overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.h"
+#include "overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h"
+#include "overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h"
+#include "overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h"
+#include "overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h"
+#include "overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h"
+#include "overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h"
+#include "overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h"
+#include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h"
+#include "overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h"
+#include "overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h"
+#include "overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h"
+#include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h"
+#include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h"
+#include "overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h"
+#include "overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h"
+#include "overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h"
+#include "overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h"
+#include "overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h"
+#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
+#include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h"
+#include "overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h"
+#include "overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h"
+#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+#include "overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.h"
+#include "overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h"
+#include "overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h"
+#include "overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.h"
+#include "overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h"
+#include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h"
+#include "overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h"
+#include "overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h"
 
 void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* texture) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
@@ -14,7 +45,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur
 
     OPEN_DISPS(gfxCtx);
 
-    scale = this->rgScale * D_801DC100;
+    scale = this->rgScale * 0.0025f;
     SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
     SkinMatrix_SetScale(&mfScale, scale, scale, scale);
     SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_187FC, &mfTrans11DA0);
@@ -381,14 +412,14 @@ void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity,
     Math_Vec3f_Copy(&initParams.accel, accel);
     initParams.scale = scale;
     initParams.scaleStep = scaleStep;
-    initParams.a = alpha;
+    initParams.alpha = alpha;
     initParams.fadeDelay = fadeDelay;
     initParams.life = life;
 
     EffectSs_Spawn(globalCtx, EFFECT_SS_D_FIRE, 128, &initParams);
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsDFire_Spawn.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsDFire_Spawn.s")
 #endif
 
 // EffectSsBubble Spawn Functions
@@ -545,7 +576,7 @@ void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstSca
     Vec3f velocity;
     Vec3f accel;
 
-    accel.y = D_801DC104 * burstScale;
+    accel.y = -0.07f * burstScale;
     accel.x = accel.z = 0.0f;
 
     for (i = 0; i < count; i++) {
@@ -558,7 +589,7 @@ void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstSca
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsHahen_SpawnBurst.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsHahen_SpawnBurst.s")
 #endif
 
 extern Vec3f D_801AE3E0;
@@ -606,7 +637,7 @@ extern Vec3f D_801AE3F8;
 void EffectSsSibuki_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos) {
     s16 i;
     Vec3f zeroVec = D_801AE3EC;
-    s16 randDirection = Rand_ZeroOne() * D_801DC108;
+    s16 randDirection = Rand_ZeroOne() * 1.99f;
 
     for (i = 0; i < KREG(19) + 30; i++) {
         EffectSsSibuki_Spawn(globalCtx, pos, &zeroVec, &zeroVec, i / (KREG(27) + 6), randDirection, KREG(18) + 40);
@@ -776,7 +807,7 @@ void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 sc
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsIcePiece_SpawnBurst.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsIcePiece_SpawnBurst.s")
 #endif
 
 // EffectSsEnIce Spawn Functions
@@ -871,7 +902,7 @@ void EffectSsFireTail_SpawnFlame(GlobalContext* globalCtx, Actor* actor, Vec3f*
 #else
 void EffectSsFireTail_SpawnFlame(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, f32 arg3, s16 bodyPart,
                                  f32 colorIntensity);
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsFireTail_SpawnFlame.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsFireTail_SpawnFlame.s")
 #endif
 
 void EffectSsFireTail_SpawnFlameOnPlayer(GlobalContext* globalCtx, f32 scale, s16 bodyPart, f32 colorIntensity) {
@@ -1026,12 +1057,12 @@ void EffectSsIceSmoke_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocit
 // EffectSsIceBlock Spawn Functions
 
 void EffectSsIceBlock_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale) {
-    EffectSsIceBlockInitParams initParams;
+    EffectEnIceBlockInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
     Math_Vec3f_Copy(&initParams.velocity, velocity);
     Math_Vec3f_Copy(&initParams.accel, accel);
     initParams.scale = scale;
 
-    EffectSs_Spawn(globalCtx, EFFECT_SS_ICE_BLOCK, 128, &initParams);
+    EffectSs_Spawn(globalCtx, EFFECT_EN_ICE_BLOCK, 128, &initParams);
 }

src/code/z_elf_message.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_800F05C0.s")

src/code/z_en_a_keep.c

@@ -1,7 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
-
-// This file is most likely z_en_a_obj.c
+#include "global.h"
 
 void EnAObj_Init(ActorEnAObj* this, GlobalContext* globalCtx) {
     ActorEnAObj* s0 = (ActorEnAObj*)this;

src/code/z_en_item00.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 #define FLAGS 0x00000000
 
@@ -624,7 +623,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
     this->actionFunc = func_800A6A40;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_en_item00/EnItem00_Update.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/EnItem00_Update.s")
 #endif
 
 void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx);
@@ -914,7 +913,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa
     return spawnedActor;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_en_item00/Item_DropCollectible.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/Item_DropCollectible.s")
 #endif
 
 #ifdef NON_MATCHING
@@ -971,7 +970,7 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 para
     return spawnedActor;
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_en_item00/Item_DropCollectible2.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/Item_DropCollectible2.s")
 #endif
 
 u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = {
@@ -1171,7 +1170,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
     }
 }
 #else
-#pragma GLOBAL_ASM("./asm/non_matchings/code/z_en_item00/Item_DropCollectibleRandom.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/Item_DropCollectibleRandom.s")
 #endif
 
 s32 D_801AE194[32] = { ITEM00_NO_DROP,     ITEM00_RUPEE_GREEN,     ITEM00_RUPEE_BLUE,  ITEM00_NO_DROP,

src/code/z_eventmgr.c

@@ -0,0 +1,51 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F1460.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCutsceneImpl.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F15D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_ClearWaiting.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_ClearNextCutscenes.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_MarkNextCutscenes.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_End.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_SetIntentToPlay.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCanPlayNext.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_StartAndSetUnkLinkFields.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_StartAndSetFlag.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_Start.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_Stop.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCurrentIndex.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCutscene.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetAdditionalCutscene.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetLength.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F2138.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F2178.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCurrentCamera.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F21CC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F22C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_SetReturnCamera.s")

src/code/z_face_reaction.c

@@ -0,0 +1,3 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_face_reaction/func_800F1250.s")

src/code/z_fbdemo.c

@@ -0,0 +1,19 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_80163DC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_8016418C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_8016424C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_801642D8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_80164438.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_8016454C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_80164678.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_801647AC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_801647B8.s")

src/code/z_fbdemo_circle.c

@@ -0,0 +1,19 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_Start.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_SetColor.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_SetType.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/func_80164C14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_Draw.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_circle/TransitionCircle_IsDone.s")

src/code/z_fbdemo_dlftbls.c

@@ -0,0 +1,5 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_dlftbls/func_80163C90.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_dlftbls/func_80163D80.s")

src/code/z_fbdemo_fade.c

@@ -0,0 +1,17 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_Start.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_Destroy.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_Update.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_Draw.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_IsDone.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_SetColor.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo_fade/TransitionFade_SetType.s")

src/code/z_fcurve_data_skelanime.c

@@ -0,0 +1,15 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F2620.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F2650.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F26C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F26F0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F2728.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F29A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_800F2CD8.s")

src/code/z_fireobj.c

@@ -0,0 +1,27 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_InitWithParams.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_SetState.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_SetPosition.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_StepSize.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_UpdateStateTransitions.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_Draw.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_InitLight.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_FiniLight.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_UpdateLight.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_Fini.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_SetState2.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_fireobj/FireObj_Update.s")

src/code/z_game_over.c

@@ -0,0 +1,7 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_game_over/func_801AA610.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_game_over/func_801AA624.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_game_over/func_801AA68C.s")

src/code/z_horse.c

@@ -0,0 +1,21 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3940.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F39B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3A64.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3B2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3B68.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3C44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F3ED4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F40A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F415C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_800F41E4.s")

src/code/z_jpeg.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_800F42A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_800F43BC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_800F44F4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_800F4540.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_800F470C.s")

src/code/z_kaleido_manager.c

@@ -0,0 +1,15 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/D_801DF9C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_80163700.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_80163758.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_801637B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_80163804.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_8016388C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_manager/func_801638D8.s")

src/code/z_kaleido_scope_call.c

@@ -0,0 +1,11 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/func_801639A0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/func_801639EC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/func_80163A38.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/func_80163A58.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/func_80163C0C.s")

src/code/z_kaleido_setup.c

@@ -0,0 +1,9 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_setup/func_800F4A10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_setup/func_800F4C0C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_setup/func_800F4E20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_setup/func_800F4F28.s")

src/code/z_kanfont.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 // stubbed in NTSC-U
 void Font_LoadChar(GlobalContext* globalCtx, u16 codePointIndex, s32 offset) {

src/code/z_kankyo.c

@@ -0,0 +1,163 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5090.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F50D4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_Init.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5954.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5A8C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5B10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F5CD0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6834.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F694C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6A04.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6A40.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6AB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6B44.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6CEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6EA4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/Kankyo_IsSceneUpsideDown.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F6FF8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8554.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F88C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8970.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8A9C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8CD4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F8D84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F9728.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800F9824.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA39C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA3C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FA9FC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAAB4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAC20.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FAF74.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB010.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB320.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB388.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB758.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FB9B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FBCBC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FBDEC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FBF3C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC158.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC3DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC444.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FC64C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD2B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD538.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD59C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD5E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD654.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD698.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/get_days_elapsed.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/reset_days_elapsed.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/get_current_day.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD750.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD768.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD78C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD858.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD928.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FD980.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FDAF8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FDC94.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE390.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE3E0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE484.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE498.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE4A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE4B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE590.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE5D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE610.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE620.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE658.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE6F8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE778.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE788.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE798.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE7A8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FE9B4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEA50.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAC0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800FEAF4.s")

src/code/z_lib.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 void* Lib_MemCpy(void* dest, void* src, size_t size) {
     bcopy(src, dest, size);