diff --git a/code/gte_hello/gen/hello_gte_tape.offsets.h b/code/gte_hello/gen/hello_gte_tape.offsets.h
index ab28d43..d75ab2a 100644
--- a/code/gte_hello/gen/hello_gte_tape.offsets.h
+++ b/code/gte_hello/gen/hello_gte_tape.offsets.h
@@ -8,10 +8,10 @@
 #undef atom_offset
 #define atom_offset(tag, name)  atom_offset_##tag##_##name
 
-// --- atom: floor_tri (51 words) ---
+// --- atom: floor_tri (32 words) ---
 
-#define _atom_offset_culling_floor_tri_exit    17
-#define _atom_offset_bounds_chk_floor_tri_exit 3
+#define _atom_offset_culling_floor_tri_exit           17
+#define _atom_offset_bounds_chk_floor_tri_exit        3
 
 enum {
     atom_offset_culling_floor_tri_exit = _atom_offset_culling_floor_tri_exit,
diff --git a/code/gte_hello/hello_gte_tape.c b/code/gte_hello/hello_gte_tape.c
index edeafc2..1dc601a 100644
--- a/code/gte_hello/hello_gte_tape.c
+++ b/code/gte_hello/hello_gte_tape.c
@@ -22,18 +22,18 @@
 
 #pragma region Baked Atoms
 
-internal MipsAtom_(floor_tri) {
+internal MipsCode code_floor_tri [] __attribute__((aligned (4))) = {
 	// T0-T2 allocated
-	// mac_load_tri_indices(R_T0, R_T1, R_T2),
-		  load_half_u(R_T0, R_FaceCur, 0 * S_(S2))
-		, load_half_u(R_T1, R_FaceCur, 1 * S_(S2))
-		, load_half_u(R_T2, R_FaceCur, 2 * S_(S2))
-	,
-	// mac_load_tri_verts(  R_T0, R_T1, R_T2),
-			shift_ll(R_AT, R_T0, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY0), gte_mt(R_V1, C2_VZ0)
-		, shift_ll(R_AT, R_T1, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY1), gte_mt(R_V1, C2_VZ1)
-		, shift_ll(R_AT, R_T2, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY2), gte_mt(R_V1, C2_VZ2)
-	,
+	mac_load_tri_indices(R_T0, R_T1, R_T2),
+	// 	  load_half_u(R_T0, R_FaceCur, 0 * S_(S2))
+	// 	, load_half_u(R_T1, R_FaceCur, 1 * S_(S2))
+	// 	, load_half_u(R_T2, R_FaceCur, 2 * S_(S2))
+	// ,
+	mac_load_tri_verts(  R_T0, R_T1, R_T2),
+	// 		shift_ll(R_AT, R_T0, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY0), gte_mt(R_V1, C2_VZ0)
+	// 	, shift_ll(R_AT, R_T1, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY1), gte_mt(R_V1, C2_VZ1)
+	// 	, shift_ll(R_AT, R_T2, 3), add_u(R_AT, R_AT, R_VertBase), load_word(R_V0, R_AT, 0), load_word(R_V1, R_AT, 4), gte_mt(R_V0, C2_VXY2), gte_mt(R_V1, C2_VZ2)
+	// ,
 
 	/* 3. Execute Math */
 	nop, nop, gte_cmdw_rotate_translate_perspective_triple,
diff --git a/scripts/build_psyq.ps1 b/scripts/build_psyq.ps1
index 490f093..6d5fc71 100644
--- a/scripts/build_psyq.ps1
+++ b/scripts/build_psyq.ps1
@@ -317,7 +317,7 @@ function generate-TapeAtomOffsets {param(
 	[Parameter(Mandatory=$true)]
 	[string]$metadata)
 
-	$gen_atom_offsets_script = join-path $path_scripts 'tape_attom.offset_gen.meta.lua'
+	$gen_atom_offsets_script = join-path $path_scripts 'tape_atom.offset_gen.meta.lua'
 
     $any_stale = $false
     foreach ($src in $sources) {
diff --git a/scripts/tape_attom.offset_gen.meta.lua b/scripts/tape_atom.offset_gen.meta.lua
similarity index 99%
rename from scripts/tape_attom.offset_gen.meta.lua
rename to scripts/tape_atom.offset_gen.meta.lua
index 3c8e1c4..cd0ad34 100644
--- a/scripts/tape_attom.offset_gen.meta.lua
+++ b/scripts/tape_atom.offset_gen.meta.lua
@@ -629,7 +629,7 @@ local function generate_header(source_path, atoms_data)
     local lines = {}
     local function add(s) table.insert(lines, s) end
 
-    add("// Auto-generated by gen_atom_offsets.lua — DO NOT EDIT")
+    add("// Auto-generated by tape_atom_offset_gen.meta.lua — DO NOT EDIT")
     add("// Source: " .. source_path)
     add("#pragma once")
     add("")