From 01ef8bbc3d9a7f7f84e20d554047343199529686 Mon Sep 17 00:00:00 2001
From: Jdog <root@JOSH-DESKTOP.localdomain>
Date: Wed, 12 Aug 2020 13:53:01 -0700
Subject: [PATCH 1/5] Handful of new functions matched. Added items enum, other
 misc changes

---
 .../code_fa4c0_len_3bf0/AddBadge.s            |  29 --
 .../code_fa4c0_len_3bf0/AddCoin.s             |  22 --
 .../code_fa4c0_len_3bf0/AddItem.s             |  41 --
 .../code_fa4c0_len_3bf0/AddKeyItem.s          |   1 +
 .../code_fa4c0_len_3bf0/AddStarPieces.s       |  22 --
 .../code_fa4c0_len_3bf0/AddStarPoints.s       |  22 --
 .../code_fa4c0_len_3bf0/FadeInMusic.s         |   9 +
 .../code_fa4c0_len_3bf0/FadeOutMusic.s        |  34 --
 .../code_fa4c0_len_3bf0/PlayAmbientSounds.s   |  20 -
 .../code_fa4c0_len_3bf0/PlaySound.s           |  44 ---
 .../code_fa4c0_len_3bf0/PlaySoundAt.s         |  62 ---
 .../code_fa4c0_len_3bf0/RemoveItemAt.s        |  22 --
 .../code_fa4c0_len_3bf0/RemoveKeyItemAt.s     |  20 -
 .../code_fa4c0_len_3bf0/SetItemPos.s          |  56 ---
 .../code_fa4c0_len_3bf0/SetMusicTrack.s       |  49 ---
 .../code_fa4c0_len_3bf0/StopSound.s           |  32 --
 .../code_fa4c0_len_3bf0/UseDoorSounds.s       |  31 --
 .../code_fa4c0_len_3bf0/func_802D5B10.s       |   1 +
 papermario/include/common.h                   |   1 +
 papermario/include/common_structs.h           |  12 +-
 papermario/include/items.h                    | 367 ++++++++++++++++++
 papermario/include/variables.h                |   2 +
 papermario/src/code_1b40_len_20b0.c           |   2 +-
 papermario/src/code_fa4c0_len_3bf0.c          |  74 +++-
 24 files changed, 456 insertions(+), 519 deletions(-)
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddBadge.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddCoin.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddItem.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPieces.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPoints.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeOutMusic.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlayAmbientSounds.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySound.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAt.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemAt.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveKeyItemAt.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemPos.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetMusicTrack.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/StopSound.s
 delete mode 100644 papermario/asm/nonmatchings/code_fa4c0_len_3bf0/UseDoorSounds.s
 create mode 100644 papermario/include/items.h

diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddBadge.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddBadge.s
deleted file mode 100644
index 4048d78d55..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddBadge.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel AddBadge
-/* 0FB9A8 802D6FF8 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0FB9AC 802D6FFC AFB10014 */  sw    $s1, 0x14($sp)
-/* 0FB9B0 802D7000 0080882D */  daddu $s1, $a0, $zero
-/* 0FB9B4 802D7004 AFBF0018 */  sw    $ra, 0x18($sp)
-/* 0FB9B8 802D7008 AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FB9BC 802D700C 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FB9C0 802D7010 8E050000 */  lw    $a1, ($s0)
-/* 0FB9C4 802D7014 0C0B1EAF */  jal   get_variable
-/* 0FB9C8 802D7018 26100004 */   addiu $s0, $s0, 4
-/* 0FB9CC 802D701C 8E100000 */  lw    $s0, ($s0)
-/* 0FB9D0 802D7020 0C039DCF */  jal   add_badge
-/* 0FB9D4 802D7024 0040202D */   daddu $a0, $v0, $zero
-/* 0FB9D8 802D7028 0220202D */  daddu $a0, $s1, $zero
-/* 0FB9DC 802D702C 0040302D */  daddu $a2, $v0, $zero
-/* 0FB9E0 802D7030 0C0B2026 */  jal   set_variable
-/* 0FB9E4 802D7034 0200282D */   daddu $a1, $s0, $zero
-/* 0FB9E8 802D7038 8FBF0018 */  lw    $ra, 0x18($sp)
-/* 0FB9EC 802D703C 8FB10014 */  lw    $s1, 0x14($sp)
-/* 0FB9F0 802D7040 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FB9F4 802D7044 24020002 */  addiu $v0, $zero, 2
-/* 0FB9F8 802D7048 03E00008 */  jr    $ra
-/* 0FB9FC 802D704C 27BD0020 */   addiu $sp, $sp, 0x20
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddCoin.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddCoin.s
deleted file mode 100644
index 836e519e4d..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddCoin.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel AddCoin
-/* 0FBC28 802D7278 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FBC2C 802D727C AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FBC30 802D7280 0080802D */  daddu $s0, $a0, $zero
-/* 0FBC34 802D7284 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 0FBC38 802D7288 8E02000C */  lw    $v0, 0xc($s0)
-/* 0FBC3C 802D728C 0C0B1EAF */  jal   get_variable
-/* 0FBC40 802D7290 8C450000 */   lw    $a1, ($v0)
-/* 0FBC44 802D7294 0C03A830 */  jal   add_coins
-/* 0FBC48 802D7298 0040202D */   daddu $a0, $v0, $zero
-/* 0FBC4C 802D729C AE020084 */  sw    $v0, 0x84($s0)
-/* 0FBC50 802D72A0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 0FBC54 802D72A4 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FBC58 802D72A8 24020002 */  addiu $v0, $zero, 2
-/* 0FBC5C 802D72AC 03E00008 */  jr    $ra
-/* 0FBC60 802D72B0 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddItem.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddItem.s
deleted file mode 100644
index 6ad05d9e39..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddItem.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel AddItem
-/* 0FB448 802D6A98 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0FB44C 802D6A9C AFB10014 */  sw    $s1, 0x14($sp)
-/* 0FB450 802D6AA0 0080882D */  daddu $s1, $a0, $zero
-/* 0FB454 802D6AA4 AFBF0018 */  sw    $ra, 0x18($sp)
-/* 0FB458 802D6AA8 AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FB45C 802D6AAC 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FB460 802D6AB0 8E050000 */  lw    $a1, ($s0)
-/* 0FB464 802D6AB4 0C0B1EAF */  jal   get_variable
-/* 0FB468 802D6AB8 26100004 */   addiu $s0, $s0, 4
-/* 0FB46C 802D6ABC 8E100000 */  lw    $s0, ($s0)
-/* 0FB470 802D6AC0 0C039D5D */  jal   add_item
-/* 0FB474 802D6AC4 0040202D */   daddu $a0, $v0, $zero
-/* 0FB478 802D6AC8 0220202D */  daddu $a0, $s1, $zero
-/* 0FB47C 802D6ACC 0040302D */  daddu $a2, $v0, $zero
-/* 0FB480 802D6AD0 0C0B2026 */  jal   set_variable
-/* 0FB484 802D6AD4 0200282D */   daddu $a1, $s0, $zero
-/* 0FB488 802D6AD8 8FBF0018 */  lw    $ra, 0x18($sp)
-/* 0FB48C 802D6ADC 8FB10014 */  lw    $s1, 0x14($sp)
-/* 0FB490 802D6AE0 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FB494 802D6AE4 24020002 */  addiu $v0, $zero, 2
-/* 0FB498 802D6AE8 03E00008 */  jr    $ra
-/* 0FB49C 802D6AEC 27BD0020 */   addiu $sp, $sp, 0x20
-
-glabel func_802D6AF0
-/* 0FB4A0 802D6AF0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FB4A4 802D6AF4 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FB4A8 802D6AF8 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FB4AC 802D6AFC 8C450000 */  lw    $a1, ($v0)
-/* 0FB4B0 802D6B00 0C0B2026 */  jal   set_variable
-/* 0FB4B4 802D6B04 0000302D */   daddu $a2, $zero, $zero
-/* 0FB4B8 802D6B08 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FB4BC 802D6B0C 24020002 */  addiu $v0, $zero, 2
-/* 0FB4C0 802D6B10 03E00008 */  jr    $ra
-/* 0FB4C4 802D6B14 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s
index 0ee7fdefe0..3c3b5b4931 100644
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s
+++ b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s
@@ -46,6 +46,7 @@ glabel AddKeyItem
 /* 0FB2FC 802D694C 03E00008 */  jr    $ra
 /* 0FB300 802D6950 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D6954
 /* 0FB304 802D6954 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FB308 802D6958 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FB30C 802D695C 0C038069 */  jal   func_800E01A4
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPieces.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPieces.s
deleted file mode 100644
index 10623b15f4..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPieces.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel AddStarPieces
-/* 0FBCA0 802D72F0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FBCA4 802D72F4 AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FBCA8 802D72F8 0080802D */  daddu $s0, $a0, $zero
-/* 0FBCAC 802D72FC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 0FBCB0 802D7300 8E02000C */  lw    $v0, 0xc($s0)
-/* 0FBCB4 802D7304 0C0B1EAF */  jal   get_variable
-/* 0FBCB8 802D7308 8C450000 */   lw    $a1, ($v0)
-/* 0FBCBC 802D730C 0C03A85C */  jal   add_star_pieces
-/* 0FBCC0 802D7310 0040202D */   daddu $a0, $v0, $zero
-/* 0FBCC4 802D7314 AE020084 */  sw    $v0, 0x84($s0)
-/* 0FBCC8 802D7318 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 0FBCCC 802D731C 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FBCD0 802D7320 24020002 */  addiu $v0, $zero, 2
-/* 0FBCD4 802D7324 03E00008 */  jr    $ra
-/* 0FBCD8 802D7328 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPoints.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPoints.s
deleted file mode 100644
index 45dba228bd..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/AddStarPoints.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel AddStarPoints
-/* 0FBC64 802D72B4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FBC68 802D72B8 AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FBC6C 802D72BC 0080802D */  daddu $s0, $a0, $zero
-/* 0FBC70 802D72C0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 0FBC74 802D72C4 8E02000C */  lw    $v0, 0xc($s0)
-/* 0FBC78 802D72C8 0C0B1EAF */  jal   get_variable
-/* 0FBC7C 802D72CC 8C450000 */   lw    $a1, ($v0)
-/* 0FBC80 802D72D0 0C03A84A */  jal   add_star_points
-/* 0FBC84 802D72D4 0040202D */   daddu $a0, $v0, $zero
-/* 0FBC88 802D72D8 AE020084 */  sw    $v0, 0x84($s0)
-/* 0FBC8C 802D72DC 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 0FBC90 802D72E0 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FBC94 802D72E4 24020002 */  addiu $v0, $zero, 2
-/* 0FBC98 802D72E8 03E00008 */  jr    $ra
-/* 0FBC9C 802D72EC 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s
index 89e13c4750..30dd0ed0ea 100644
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s
+++ b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s
@@ -64,6 +64,7 @@ glabel FadeInMusic
 /* 0FA888 802D5ED8 03E00008 */  jr    $ra
 /* 0FA88C 802D5EDC 27BD0038 */   addiu $sp, $sp, 0x38
 
+glabel func_802D5EE0
 /* 0FA890 802D5EE0 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FA894 802D5EE4 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FA898 802D5EE8 8C82000C */  lw    $v0, 0xc($a0)
@@ -83,6 +84,7 @@ glabel FadeInMusic
 /* 0FA8D0 802D5F20 03E00008 */  jr    $ra
 /* 0FA8D4 802D5F24 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D5F28
 /* 0FA8D8 802D5F28 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* 0FA8DC 802D5F2C AFB10014 */  sw    $s1, 0x14($sp)
 /* 0FA8E0 802D5F30 0080882D */  daddu $s1, $a0, $zero
@@ -115,6 +117,7 @@ glabel FadeInMusic
 /* 0FA94C 802D5F9C 03E00008 */  jr    $ra
 /* 0FA950 802D5FA0 27BD0020 */   addiu $sp, $sp, 0x20
 
+glabel func_802D5FA4
 /* 0FA954 802D5FA4 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FA958 802D5FA8 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FA95C 802D5FAC 8C82000C */  lw    $v0, 0xc($a0)
@@ -129,6 +132,7 @@ glabel FadeInMusic
 /* 0FA980 802D5FD0 03E00008 */  jr    $ra
 /* 0FA984 802D5FD4 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D5FD8
 /* 0FA988 802D5FD8 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FA98C 802D5FDC AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FA990 802D5FE0 0C052B69 */  jal   func_8014ADA4
@@ -138,6 +142,7 @@ glabel FadeInMusic
 /* 0FA9A0 802D5FF0 03E00008 */  jr    $ra
 /* 0FA9A4 802D5FF4 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D5FF8
 /* 0FA9A8 802D5FF8 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* 0FA9AC 802D5FFC AFB10014 */  sw    $s1, 0x14($sp)
 /* 0FA9B0 802D6000 0080882D */  daddu $s1, $a0, $zero
@@ -161,6 +166,7 @@ glabel FadeInMusic
 /* 0FA9F8 802D6048 03E00008 */  jr    $ra
 /* 0FA9FC 802D604C 27BD0020 */   addiu $sp, $sp, 0x20
 
+glabel func_802D6050
 /* 0FAA00 802D6050 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FAA04 802D6054 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FAA08 802D6058 0C052B9B */  jal   func_8014AE6C
@@ -170,6 +176,7 @@ glabel FadeInMusic
 /* 0FAA18 802D6068 03E00008 */  jr    $ra
 /* 0FAA1C 802D606C 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D6070
 /* 0FAA20 802D6070 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FAA24 802D6074 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FAA28 802D6078 0C052BBE */  jal   func_8014AEF8
@@ -179,6 +186,7 @@ glabel FadeInMusic
 /* 0FAA38 802D6088 03E00008 */  jr    $ra
 /* 0FAA3C 802D608C 27BD0018 */   addiu $sp, $sp, 0x18
 
+glabel func_802D6090
 /* 0FAA40 802D6090 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* 0FAA44 802D6094 AFB10014 */  sw    $s1, 0x14($sp)
 /* 0FAA48 802D6098 0080882D */  daddu $s1, $a0, $zero
@@ -202,6 +210,7 @@ glabel FadeInMusic
 /* 0FAA90 802D60E0 03E00008 */  jr    $ra
 /* 0FAA94 802D60E4 27BD0020 */   addiu $sp, $sp, 0x20
 
+glabel func_802D60E8
 /* 0FAA98 802D60E8 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FAA9C 802D60EC AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FAAA0 802D60F0 8C82000C */  lw    $v0, 0xc($a0)
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeOutMusic.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeOutMusic.s
deleted file mode 100644
index 85349693b1..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/FadeOutMusic.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel FadeOutMusic
-/* 0FA690 802D5CE0 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 0FA694 802D5CE4 AFB1001C */  sw    $s1, 0x1c($sp)
-/* 0FA698 802D5CE8 0080882D */  daddu $s1, $a0, $zero
-/* 0FA69C 802D5CEC AFBF0020 */  sw    $ra, 0x20($sp)
-/* 0FA6A0 802D5CF0 AFB00018 */  sw    $s0, 0x18($sp)
-/* 0FA6A4 802D5CF4 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FA6A8 802D5CF8 8E050000 */  lw    $a1, ($s0)
-/* 0FA6AC 802D5CFC 0C0B1EAF */  jal   get_variable
-/* 0FA6B0 802D5D00 26100004 */   addiu $s0, $s0, 4
-/* 0FA6B4 802D5D04 0220202D */  daddu $a0, $s1, $zero
-/* 0FA6B8 802D5D08 8E050000 */  lw    $a1, ($s0)
-/* 0FA6BC 802D5D0C 0C0B1EAF */  jal   get_variable
-/* 0FA6C0 802D5D10 0040802D */   daddu $s0, $v0, $zero
-/* 0FA6C4 802D5D14 0200202D */  daddu $a0, $s0, $zero
-/* 0FA6C8 802D5D18 2405FFFF */  addiu $a1, $zero, -1
-/* 0FA6CC 802D5D1C 24030008 */  addiu $v1, $zero, 8
-/* 0FA6D0 802D5D20 0000302D */  daddu $a2, $zero, $zero
-/* 0FA6D4 802D5D24 0040382D */  daddu $a3, $v0, $zero
-/* 0FA6D8 802D5D28 0C052A46 */  jal   set_music_track
-/* 0FA6DC 802D5D2C AFA30010 */   sw    $v1, 0x10($sp)
-/* 0FA6E0 802D5D30 0002102B */  sltu  $v0, $zero, $v0
-/* 0FA6E4 802D5D34 8FBF0020 */  lw    $ra, 0x20($sp)
-/* 0FA6E8 802D5D38 8FB1001C */  lw    $s1, 0x1c($sp)
-/* 0FA6EC 802D5D3C 8FB00018 */  lw    $s0, 0x18($sp)
-/* 0FA6F0 802D5D40 00021040 */  sll   $v0, $v0, 1
-/* 0FA6F4 802D5D44 03E00008 */  jr    $ra
-/* 0FA6F8 802D5D48 27BD0028 */   addiu $sp, $sp, 0x28
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlayAmbientSounds.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlayAmbientSounds.s
deleted file mode 100644
index 64076c4711..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlayAmbientSounds.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel PlayAmbientSounds
-/* 0FAACC 802D611C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FAAD0 802D6120 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FAAD4 802D6124 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FAAD8 802D6128 0C0B1EAF */  jal   get_variable
-/* 0FAADC 802D612C 8C450000 */   lw    $a1, ($v0)
-/* 0FAAE0 802D6130 0040202D */  daddu $a0, $v0, $zero
-/* 0FAAE4 802D6134 0C051CDA */  jal   play_ambient_sounds
-/* 0FAAE8 802D6138 240500FA */   addiu $a1, $zero, 0xfa
-/* 0FAAEC 802D613C 0002102B */  sltu  $v0, $zero, $v0
-/* 0FAAF0 802D6140 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FAAF4 802D6144 00021040 */  sll   $v0, $v0, 1
-/* 0FAAF8 802D6148 03E00008 */  jr    $ra
-/* 0FAAFC 802D614C 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySound.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySound.s
deleted file mode 100644
index cc323e9bc9..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySound.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel PlaySound
-/* 0FAB00 802D6150 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FAB04 802D6154 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FAB08 802D6158 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FAB0C 802D615C 0C0B1EAF */  jal   get_variable
-/* 0FAB10 802D6160 8C450000 */   lw    $a1, ($v0)
-/* 0FAB14 802D6164 0C05272D */  jal   play_sound
-/* 0FAB18 802D6168 0040202D */   daddu $a0, $v0, $zero
-/* 0FAB1C 802D616C 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FAB20 802D6170 24020002 */  addiu $v0, $zero, 2
-/* 0FAB24 802D6174 03E00008 */  jr    $ra
-/* 0FAB28 802D6178 27BD0018 */   addiu $sp, $sp, 0x18
-
-glabel func_802D617C
-/* 0FAB2C 802D617C 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0FAB30 802D6180 AFB10014 */  sw    $s1, 0x14($sp)
-/* 0FAB34 802D6184 0080882D */  daddu $s1, $a0, $zero
-/* 0FAB38 802D6188 AFBF0018 */  sw    $ra, 0x18($sp)
-/* 0FAB3C 802D618C AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FAB40 802D6190 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FAB44 802D6194 8E050000 */  lw    $a1, ($s0)
-/* 0FAB48 802D6198 0C0B1EAF */  jal   get_variable
-/* 0FAB4C 802D619C 26100004 */   addiu $s0, $s0, 4
-/* 0FAB50 802D61A0 0220202D */  daddu $a0, $s1, $zero
-/* 0FAB54 802D61A4 8E050000 */  lw    $a1, ($s0)
-/* 0FAB58 802D61A8 0C0B1EAF */  jal   get_variable
-/* 0FAB5C 802D61AC 0040802D */   daddu $s0, $v0, $zero
-/* 0FAB60 802D61B0 0200202D */  daddu $a0, $s0, $zero
-/* 0FAB64 802D61B4 304500FF */  andi  $a1, $v0, 0xff
-/* 0FAB68 802D61B8 0000302D */  daddu $a2, $zero, $zero
-/* 0FAB6C 802D61BC 0C0526AE */  jal   _play_sound
-/* 0FAB70 802D61C0 00C0382D */   daddu $a3, $a2, $zero
-/* 0FAB74 802D61C4 8FBF0018 */  lw    $ra, 0x18($sp)
-/* 0FAB78 802D61C8 8FB10014 */  lw    $s1, 0x14($sp)
-/* 0FAB7C 802D61CC 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FAB80 802D61D0 24020002 */  addiu $v0, $zero, 2
-/* 0FAB84 802D61D4 03E00008 */  jr    $ra
-/* 0FAB88 802D61D8 27BD0020 */   addiu $sp, $sp, 0x20
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAt.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAt.s
deleted file mode 100644
index 793b4ac7cf..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAt.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel PlaySoundAt
-/* 0FAB8C 802D61DC 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0FAB90 802D61E0 AFB1001C */  sw    $s1, 0x1c($sp)
-/* 0FAB94 802D61E4 0080882D */  daddu $s1, $a0, $zero
-/* 0FAB98 802D61E8 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0FAB9C 802D61EC AFB40028 */  sw    $s4, 0x28($sp)
-/* 0FABA0 802D61F0 AFB30024 */  sw    $s3, 0x24($sp)
-/* 0FABA4 802D61F4 AFB20020 */  sw    $s2, 0x20($sp)
-/* 0FABA8 802D61F8 AFB00018 */  sw    $s0, 0x18($sp)
-/* 0FABAC 802D61FC 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FABB0 802D6200 8E050000 */  lw    $a1, ($s0)
-/* 0FABB4 802D6204 0C0B1EAF */  jal   get_variable
-/* 0FABB8 802D6208 26100004 */   addiu $s0, $s0, 4
-/* 0FABBC 802D620C 8E050000 */  lw    $a1, ($s0)
-/* 0FABC0 802D6210 26100004 */  addiu $s0, $s0, 4
-/* 0FABC4 802D6214 0220202D */  daddu $a0, $s1, $zero
-/* 0FABC8 802D6218 0C0B1EAF */  jal   get_variable
-/* 0FABCC 802D621C 0040A02D */   daddu $s4, $v0, $zero
-/* 0FABD0 802D6220 8E050000 */  lw    $a1, ($s0)
-/* 0FABD4 802D6224 26100004 */  addiu $s0, $s0, 4
-/* 0FABD8 802D6228 0220202D */  daddu $a0, $s1, $zero
-/* 0FABDC 802D622C 0C0B1EAF */  jal   get_variable
-/* 0FABE0 802D6230 0040982D */   daddu $s3, $v0, $zero
-/* 0FABE4 802D6234 8E050000 */  lw    $a1, ($s0)
-/* 0FABE8 802D6238 26100004 */  addiu $s0, $s0, 4
-/* 0FABEC 802D623C 0220202D */  daddu $a0, $s1, $zero
-/* 0FABF0 802D6240 0C0B1EAF */  jal   get_variable
-/* 0FABF4 802D6244 0040902D */   daddu $s2, $v0, $zero
-/* 0FABF8 802D6248 0220202D */  daddu $a0, $s1, $zero
-/* 0FABFC 802D624C 8E050000 */  lw    $a1, ($s0)
-/* 0FAC00 802D6250 0C0B1EAF */  jal   get_variable
-/* 0FAC04 802D6254 0040802D */   daddu $s0, $v0, $zero
-/* 0FAC08 802D6258 0280202D */  daddu $a0, $s4, $zero
-/* 0FAC0C 802D625C 0260282D */  daddu $a1, $s3, $zero
-/* 0FAC10 802D6260 44921000 */  mtc1  $s2, $f2
-/* 0FAC14 802D6264 00000000 */  nop   
-/* 0FAC18 802D6268 468010A0 */  cvt.s.w $f2, $f2
-/* 0FAC1C 802D626C 44061000 */  mfc1  $a2, $f2
-/* 0FAC20 802D6270 44901000 */  mtc1  $s0, $f2
-/* 0FAC24 802D6274 00000000 */  nop   
-/* 0FAC28 802D6278 468010A0 */  cvt.s.w $f2, $f2
-/* 0FAC2C 802D627C 44071000 */  mfc1  $a3, $f2
-/* 0FAC30 802D6280 44820000 */  mtc1  $v0, $f0
-/* 0FAC34 802D6284 00000000 */  nop   
-/* 0FAC38 802D6288 46800020 */  cvt.s.w $f0, $f0
-/* 0FAC3C 802D628C 0C052757 */  jal   play_sound_at_position
-/* 0FAC40 802D6290 E7A00010 */   swc1  $f0, 0x10($sp)
-/* 0FAC44 802D6294 8FBF002C */  lw    $ra, 0x2c($sp)
-/* 0FAC48 802D6298 8FB40028 */  lw    $s4, 0x28($sp)
-/* 0FAC4C 802D629C 8FB30024 */  lw    $s3, 0x24($sp)
-/* 0FAC50 802D62A0 8FB20020 */  lw    $s2, 0x20($sp)
-/* 0FAC54 802D62A4 8FB1001C */  lw    $s1, 0x1c($sp)
-/* 0FAC58 802D62A8 8FB00018 */  lw    $s0, 0x18($sp)
-/* 0FAC5C 802D62AC 24020002 */  addiu $v0, $zero, 2
-/* 0FAC60 802D62B0 03E00008 */  jr    $ra
-/* 0FAC64 802D62B4 27BD0030 */   addiu $sp, $sp, 0x30
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemAt.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemAt.s
deleted file mode 100644
index 7f706efe42..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemAt.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel RemoveItemAt
-/* 0FB23C 802D688C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FB240 802D6890 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FB244 802D6894 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FB248 802D6898 0C0B1EAF */  jal   get_variable
-/* 0FB24C 802D689C 8C450000 */   lw    $a1, ($v0)
-/* 0FB250 802D68A0 00021040 */  sll   $v0, $v0, 1
-/* 0FB254 802D68A4 3C018011 */  lui   $at, 0x8011
-/* 0FB258 802D68A8 00220821 */  addu  $at, $at, $v0
-/* 0FB25C 802D68AC A420F444 */  sh    $zero, -0xbbc($at)
-/* 0FB260 802D68B0 0C039DB3 */  jal   sort_items
-/* 0FB264 802D68B4 00000000 */   nop   
-/* 0FB268 802D68B8 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FB26C 802D68BC 24020002 */  addiu $v0, $zero, 2
-/* 0FB270 802D68C0 03E00008 */  jr    $ra
-/* 0FB274 802D68C4 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveKeyItemAt.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveKeyItemAt.s
deleted file mode 100644
index 359e2d6a02..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveKeyItemAt.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel RemoveKeyItemAt
-/* 0FB208 802D6858 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FB20C 802D685C AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FB210 802D6860 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FB214 802D6864 0C0B1EAF */  jal   get_variable
-/* 0FB218 802D6868 8C450000 */   lw    $a1, ($v0)
-/* 0FB21C 802D686C 00021840 */  sll   $v1, $v0, 1
-/* 0FB220 802D6870 3C018011 */  lui   $at, 0x8011
-/* 0FB224 802D6874 00230821 */  addu  $at, $at, $v1
-/* 0FB228 802D6878 A420F304 */  sh    $zero, -0xcfc($at)
-/* 0FB22C 802D687C 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FB230 802D6880 24020002 */  addiu $v0, $zero, 2
-/* 0FB234 802D6884 03E00008 */  jr    $ra
-/* 0FB238 802D6888 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemPos.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemPos.s
deleted file mode 100644
index 7f84471fb5..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemPos.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel SetItemPos
-/* 0FBA80 802D70D0 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 0FBA84 802D70D4 AFB10014 */  sw    $s1, 0x14($sp)
-/* 0FBA88 802D70D8 0080882D */  daddu $s1, $a0, $zero
-/* 0FBA8C 802D70DC AFBF0020 */  sw    $ra, 0x20($sp)
-/* 0FBA90 802D70E0 AFB3001C */  sw    $s3, 0x1c($sp)
-/* 0FBA94 802D70E4 AFB20018 */  sw    $s2, 0x18($sp)
-/* 0FBA98 802D70E8 AFB00010 */  sw    $s0, 0x10($sp)
-/* 0FBA9C 802D70EC 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FBAA0 802D70F0 8E050000 */  lw    $a1, ($s0)
-/* 0FBAA4 802D70F4 0C0B1EAF */  jal   get_variable
-/* 0FBAA8 802D70F8 26100004 */   addiu $s0, $s0, 4
-/* 0FBAAC 802D70FC 8E050000 */  lw    $a1, ($s0)
-/* 0FBAB0 802D7100 26100004 */  addiu $s0, $s0, 4
-/* 0FBAB4 802D7104 0220202D */  daddu $a0, $s1, $zero
-/* 0FBAB8 802D7108 0C0B1EAF */  jal   get_variable
-/* 0FBABC 802D710C 0040982D */   daddu $s3, $v0, $zero
-/* 0FBAC0 802D7110 8E050000 */  lw    $a1, ($s0)
-/* 0FBAC4 802D7114 26100004 */  addiu $s0, $s0, 4
-/* 0FBAC8 802D7118 0220202D */  daddu $a0, $s1, $zero
-/* 0FBACC 802D711C 0C0B1EAF */  jal   get_variable
-/* 0FBAD0 802D7120 0040902D */   daddu $s2, $v0, $zero
-/* 0FBAD4 802D7124 0220202D */  daddu $a0, $s1, $zero
-/* 0FBAD8 802D7128 8E050000 */  lw    $a1, ($s0)
-/* 0FBADC 802D712C 0C0B1EAF */  jal   get_variable
-/* 0FBAE0 802D7130 0040882D */   daddu $s1, $v0, $zero
-/* 0FBAE4 802D7134 0260202D */  daddu $a0, $s3, $zero
-/* 0FBAE8 802D7138 0C04C3D6 */  jal   get_item_entity
-/* 0FBAEC 802D713C 0040802D */   daddu $s0, $v0, $zero
-/* 0FBAF0 802D7140 0040182D */  daddu $v1, $v0, $zero
-/* 0FBAF4 802D7144 44920000 */  mtc1  $s2, $f0
-/* 0FBAF8 802D7148 00000000 */  nop   
-/* 0FBAFC 802D714C 46800020 */  cvt.s.w $f0, $f0
-/* 0FBB00 802D7150 E4600008 */  swc1  $f0, 8($v1)
-/* 0FBB04 802D7154 44910000 */  mtc1  $s1, $f0
-/* 0FBB08 802D7158 00000000 */  nop   
-/* 0FBB0C 802D715C 46800020 */  cvt.s.w $f0, $f0
-/* 0FBB10 802D7160 E460000C */  swc1  $f0, 0xc($v1)
-/* 0FBB14 802D7164 44900000 */  mtc1  $s0, $f0
-/* 0FBB18 802D7168 00000000 */  nop   
-/* 0FBB1C 802D716C 46800020 */  cvt.s.w $f0, $f0
-/* 0FBB20 802D7170 E4600010 */  swc1  $f0, 0x10($v1)
-/* 0FBB24 802D7174 8FBF0020 */  lw    $ra, 0x20($sp)
-/* 0FBB28 802D7178 8FB3001C */  lw    $s3, 0x1c($sp)
-/* 0FBB2C 802D717C 8FB20018 */  lw    $s2, 0x18($sp)
-/* 0FBB30 802D7180 8FB10014 */  lw    $s1, 0x14($sp)
-/* 0FBB34 802D7184 8FB00010 */  lw    $s0, 0x10($sp)
-/* 0FBB38 802D7188 24020002 */  addiu $v0, $zero, 2
-/* 0FBB3C 802D718C 03E00008 */  jr    $ra
-/* 0FBB40 802D7190 27BD0028 */   addiu $sp, $sp, 0x28
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetMusicTrack.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetMusicTrack.s
deleted file mode 100644
index de5eae927c..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/SetMusicTrack.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel SetMusicTrack
-/* 0FA6FC 802D5D4C 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0FA700 802D5D50 AFB1001C */  sw    $s1, 0x1c($sp)
-/* 0FA704 802D5D54 0080882D */  daddu $s1, $a0, $zero
-/* 0FA708 802D5D58 AFBF0028 */  sw    $ra, 0x28($sp)
-/* 0FA70C 802D5D5C AFB30024 */  sw    $s3, 0x24($sp)
-/* 0FA710 802D5D60 AFB20020 */  sw    $s2, 0x20($sp)
-/* 0FA714 802D5D64 AFB00018 */  sw    $s0, 0x18($sp)
-/* 0FA718 802D5D68 8E30000C */  lw    $s0, 0xc($s1)
-/* 0FA71C 802D5D6C 8E050000 */  lw    $a1, ($s0)
-/* 0FA720 802D5D70 0C0B1EAF */  jal   get_variable
-/* 0FA724 802D5D74 26100004 */   addiu $s0, $s0, 4
-/* 0FA728 802D5D78 8E050000 */  lw    $a1, ($s0)
-/* 0FA72C 802D5D7C 26100004 */  addiu $s0, $s0, 4
-/* 0FA730 802D5D80 0220202D */  daddu $a0, $s1, $zero
-/* 0FA734 802D5D84 0C0B1EAF */  jal   get_variable
-/* 0FA738 802D5D88 0040982D */   daddu $s3, $v0, $zero
-/* 0FA73C 802D5D8C 8E050000 */  lw    $a1, ($s0)
-/* 0FA740 802D5D90 26100004 */  addiu $s0, $s0, 4
-/* 0FA744 802D5D94 0220202D */  daddu $a0, $s1, $zero
-/* 0FA748 802D5D98 0C0B1EAF */  jal   get_variable
-/* 0FA74C 802D5D9C 0040902D */   daddu $s2, $v0, $zero
-/* 0FA750 802D5DA0 0220202D */  daddu $a0, $s1, $zero
-/* 0FA754 802D5DA4 8E050000 */  lw    $a1, ($s0)
-/* 0FA758 802D5DA8 0C0B1EAF */  jal   get_variable
-/* 0FA75C 802D5DAC 0040802D */   daddu $s0, $v0, $zero
-/* 0FA760 802D5DB0 0260202D */  daddu $a0, $s3, $zero
-/* 0FA764 802D5DB4 0240282D */  daddu $a1, $s2, $zero
-/* 0FA768 802D5DB8 00021400 */  sll   $v0, $v0, 0x10
-/* 0FA76C 802D5DBC 00021403 */  sra   $v0, $v0, 0x10
-/* 0FA770 802D5DC0 0200302D */  daddu $a2, $s0, $zero
-/* 0FA774 802D5DC4 240701F4 */  addiu $a3, $zero, 0x1f4
-/* 0FA778 802D5DC8 0C052A46 */  jal   set_music_track
-/* 0FA77C 802D5DCC AFA20010 */   sw    $v0, 0x10($sp)
-/* 0FA780 802D5DD0 0002102B */  sltu  $v0, $zero, $v0
-/* 0FA784 802D5DD4 8FBF0028 */  lw    $ra, 0x28($sp)
-/* 0FA788 802D5DD8 8FB30024 */  lw    $s3, 0x24($sp)
-/* 0FA78C 802D5DDC 8FB20020 */  lw    $s2, 0x20($sp)
-/* 0FA790 802D5DE0 8FB1001C */  lw    $s1, 0x1c($sp)
-/* 0FA794 802D5DE4 8FB00018 */  lw    $s0, 0x18($sp)
-/* 0FA798 802D5DE8 00021040 */  sll   $v0, $v0, 1
-/* 0FA79C 802D5DEC 03E00008 */  jr    $ra
-/* 0FA7A0 802D5DF0 27BD0030 */   addiu $sp, $sp, 0x30
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/StopSound.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/StopSound.s
deleted file mode 100644
index 73ecfc0128..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/StopSound.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel StopSound
-/* 0FAC68 802D62B8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FAC6C 802D62BC AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FAC70 802D62C0 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FAC74 802D62C4 0C0B1EAF */  jal   get_variable
-/* 0FAC78 802D62C8 8C450000 */   lw    $a1, ($v0)
-/* 0FAC7C 802D62CC 0C05271B */  jal   stop_sound
-/* 0FAC80 802D62D0 0040202D */   daddu $a0, $v0, $zero
-/* 0FAC84 802D62D4 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FAC88 802D62D8 24020002 */  addiu $v0, $zero, 2
-/* 0FAC8C 802D62DC 03E00008 */  jr    $ra
-/* 0FAC90 802D62E0 27BD0018 */   addiu $sp, $sp, 0x18
-
-glabel func_802D62E4
-/* 0FAC94 802D62E4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FAC98 802D62E8 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FAC9C 802D62EC 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FACA0 802D62F0 0C0B1EAF */  jal   get_variable
-/* 0FACA4 802D62F4 8C450000 */   lw    $a1, ($v0)
-/* 0FACA8 802D62F8 0040202D */  daddu $a0, $v0, $zero
-/* 0FACAC 802D62FC 0C05269B */  jal   func_80149A6C
-/* 0FACB0 802D6300 24050001 */   addiu $a1, $zero, 1
-/* 0FACB4 802D6304 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FACB8 802D6308 24020002 */  addiu $v0, $zero, 2
-/* 0FACBC 802D630C 03E00008 */  jr    $ra
-/* 0FACC0 802D6310 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/UseDoorSounds.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/UseDoorSounds.s
deleted file mode 100644
index 1711d47848..0000000000
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/UseDoorSounds.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel UseDoorSounds
-/* 0FACC4 802D6314 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FACC8 802D6318 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FACCC 802D631C 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FACD0 802D6320 0C0B1EAF */  jal   get_variable
-/* 0FACD4 802D6324 8C450000 */   lw    $a1, ($v0)
-/* 0FACD8 802D6328 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FACDC 802D632C 3C018015 */  lui   $at, 0x8015
-/* 0FACE0 802D6330 A4221340 */  sh    $v0, 0x1340($at)
-/* 0FACE4 802D6334 24020002 */  addiu $v0, $zero, 2
-/* 0FACE8 802D6338 03E00008 */  jr    $ra
-/* 0FACEC 802D633C 27BD0018 */   addiu $sp, $sp, 0x18
-
-glabel func_802D6340
-/* 0FACF0 802D6340 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0FACF4 802D6344 AFBF0010 */  sw    $ra, 0x10($sp)
-/* 0FACF8 802D6348 8C82000C */  lw    $v0, 0xc($a0)
-/* 0FACFC 802D634C 0C0B1EAF */  jal   get_variable
-/* 0FAD00 802D6350 8C450000 */   lw    $a1, ($v0)
-/* 0FAD04 802D6354 8FBF0010 */  lw    $ra, 0x10($sp)
-/* 0FAD08 802D6358 3C018015 */  lui   $at, 0x8015
-/* 0FAD0C 802D635C A4221308 */  sh    $v0, 0x1308($at)
-/* 0FAD10 802D6360 24020002 */  addiu $v0, $zero, 2
-/* 0FAD14 802D6364 03E00008 */  jr    $ra
-/* 0FAD18 802D6368 27BD0018 */   addiu $sp, $sp, 0x18
-
diff --git a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s
index 78f7b15cad..5ad45ade51 100644
--- a/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s
+++ b/papermario/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s
@@ -99,6 +99,7 @@ glabel func_802D5B10
 /* 0FA618 802D5C68 03E00008 */  jr    $ra
 /* 0FA61C 802D5C6C 27BD0040 */   addiu $sp, $sp, 0x40
 
+glabel func_802D5C70
 /* 0FA620 802D5C70 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 0FA624 802D5C74 AFBF0010 */  sw    $ra, 0x10($sp)
 /* 0FA628 802D5C78 8C82000C */  lw    $v0, 0xc($a0)
diff --git a/papermario/include/common.h b/papermario/include/common.h
index ede78a0a2b..612c44b7f7 100644
--- a/papermario/include/common.h
+++ b/papermario/include/common.h
@@ -7,5 +7,6 @@
 #include "functions.h"
 #include "variables.h"
 #include "macros.h"
+#include "items.h"
 
 #endif
diff --git a/papermario/include/common_structs.h b/papermario/include/common_structs.h
index d426be60e4..61d556ec46 100644
--- a/papermario/include/common_structs.h
+++ b/papermario/include/common_structs.h
@@ -102,7 +102,7 @@ typedef struct {
     /* 0x54 */ char unk_54[2];
     /* 0x56 */ s16 unk_56;
     /* 0x58 */ char unk_58[2];
-    /* 0x5A */ s16 unk_5a;
+    /* 0x5A */ s16 unk_5A;
 } item_entity;
 
 typedef struct {
@@ -370,11 +370,11 @@ typedef struct {
 } StaticNpcSettings; // size = 0x2C
 
 typedef enum {
-    Hammer=4,
-    Jump=2,
-    Normal=1,
-    Partner=6,
-    Spin=3,
+    triggerHammer=4,
+    triggerJump=2,
+    triggerNormal=1,
+    triggerPartner=6,
+    triggerSpin=3,
 } eEncounterTrigger;
 
 typedef struct {
diff --git a/papermario/include/items.h b/papermario/include/items.h
new file mode 100644
index 0000000000..e1bacc3a6a
--- /dev/null
+++ b/papermario/include/items.h
@@ -0,0 +1,367 @@
+#ifndef _ITEMS_H_
+#define _ITEMS_H_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum eItem {
+	JUMP = 0x0001,
+	SPIN_JUMP = 0x0002,
+	TORNADO_JUMP = 0x0003,
+	HAMMER = 0x0004,
+	SUPER_HAMMER = 0x0005,
+	ULTRA_HAMMER = 0x0006,
+	LUCKY_STAR = 0x0007,
+	MAP = 0x0008, // unused
+	BIG_MAP = 0x0009, // unused
+	FIRST_DEGREE_CARD = 0x000A,
+	SECOND_DEGREE_CARD = 0x000B,
+	THIRD_DEGREE_CARD = 0x000C,
+	FOURTH_DEGREE_CARD = 0x000D,
+	DIPLOMA = 0x000E,
+	ULTRA_STONE = 0x000F,
+	FORTRESS_KEY = 0x0010,
+	RUINS_KEY = 0x0011,
+	PULSE_STONE = 0x0012,
+	CASTLE_KEY1 = 0x0013,
+	PALACE_KEY = 0x0014,
+	LUNAR_STONE = 0x0015,
+	PYRAMID_STONE = 0x0016,
+	DIAMOND_STONE = 0x0017,
+	GOLDEN_VASE = 0x0018, // unused
+	KOOPERS_SHELL = 0x0019,
+	CASTLE_KEY2 = 0x001A,
+	FOREST_PASS = 0x001B, // unused
+	WEIGHT = 0x001C,
+	BOOS_PORTRAIT = 0x001D,
+	CRYSTAL_BERRY = 0x001E,
+	MYSTICAL_KEY = 0x001F,
+	STOREROOM_KEY = 0x0020,
+	TOY_TRAIN = 0x0021,
+	RECORD = 0x0022,
+	FRYING_PAN = 0x0023,
+	DICTIONARY = 0x0024,
+	MYSTERY_NOTE = 0x0025,
+	SUSPICIOUS_NOTE = 0x0026, // unused
+	CRYSTAL_BALL = 0x0027,
+	SCREWDRIVER = 0x0028, // unused
+	COOKBOOK = 0x0029,
+	JADE_RAVEN = 0x002A,
+	MAGICAL_SEED1 = 0x002B,
+	MAGICAL_SEED2 = 0x002C,
+	MAGICAL_SEED3 = 0x002D,
+	MAGICAL_SEED4 = 0x002E,
+	TOAD_DOLL = 0x002F, // unused
+	CALCULATOR = 0x0030,
+	BUCKET = 0x0031,
+	SCARF = 0x0032,
+	RED_KEY = 0x0033,
+	BLUE_KEY = 0x0034,
+	LETTER01 = 0x0036,
+	LETTER02 = 0x0037,
+	LETTER03 = 0x0038,
+	LETTER04 = 0x0039,
+	LETTER05 = 0x003A,
+	LETTER06 = 0x003B,
+	LETTER07 = 0x003C,
+	LETTER08 = 0x003D,
+	LETTER09 = 0x003E,
+	LETTER10 = 0x0040,
+	LETTER11 = 0x0041,
+	LETTER12 = 0x0045,
+	LETTER13 = 0x0046,
+	LETTER14 = 0x0047,
+	LETTER15 = 0x0048,
+	LETTER16 = 0x0049,
+	LETTER17 = 0x004A,
+	LETTER18 = 0x004B,
+	LETTER19 = 0x004C,
+	LETTER20 = 0x004E,
+	LETTER21 = 0x004F,
+	LETTER22 = 0x0050,
+	LETTER23 = 0x0051,
+	LETTER24 = 0x0052,
+	ARTIFACT = 0x0053,
+	LETTER25 = 0x0054,
+	DOLLY = 0x0056,
+	WATER_STONE = 0x0057,
+	MAGICAL_BEAN = 0x0058,
+	FERTILE_SOIL = 0x0059,
+	MIRACLE_WATER = 0x005A,
+	VOLCANO_VASE = 0x005B,
+	TAPE = 0x005C,
+	SUGAR = 0x005D,
+	SALT = 0x005E,
+	EGG1 = 0x005F,
+	CREAM = 0x0060,
+	STRAWBERRY = 0x0061,
+	BUTTER = 0x0062,
+	CLEANSER = 0x0063,
+	WATER = 0x0064,
+	FLOUR = 0x0065,
+	MILK = 0x0066,
+	LYRICS = 0x0067,
+	MELODY = 0x0068,
+	MAILBAG = 0x0069,
+	CASTLE_KEY3 = 0x006A,
+	ODD_KEY = 0x006B,
+	STAR_STONE = 0x006C,
+	SNEAKY_PARASOL = 0x006D,
+	KOOPA_LEGENDS = 0x006E,
+	AUTOGRAPH1 = 0x006F,
+	EMPTY_WALLET = 0x0070,
+	AUTOGRAPH2 = 0x0071,
+	KOOPA_SHELL = 0x0072, // unused
+	OLD_PHOTO = 0x0073,
+	GLASSES = 0x0074,
+	PHOTOGRAPH = 0x0075, // unused
+	PACKAGE = 0x0076,
+	RED_JAR = 0x0077,
+	CASTLE_KEY4 = 0x0078,
+	WAREHOUSE_KEY = 0x0079,
+	PRISON_KEY1 = 0x007A,
+	SILVER_CREDIT = 0x007B,
+	GOLD_CREDIT = 0x007C,
+	PRISON_KEY2 = 0x007D, // unused
+	PRISON_KEY3 = 0x007E, // unused
+	PRISON_KEY4 = 0x007F, // unused
+	FIRE_FLOWER = 0x0080,
+	SNOWMAN_DOLL = 0x0081,
+	THUNDER_RAGE = 0x0082,
+	SHOOTING_STAR = 0x0083,
+	THUNDER_BOLT = 0x0084,
+	PEBBLE = 0x0085,
+	DUSTY_HAMMER = 0x0086,
+	INSECTICIDE_HERB = 0x0087,
+	STONE_CAP = 0x0088,
+	TASTY_TONIC = 0x0089,
+	MUSHROOM = 0x008A,
+	VOLT_SHROOM = 0x008B,
+	SUPER_SHROOM = 0x008C,
+	DRIED_SHROOM = 0x008D,
+	ULTRA_SHROOM = 0x008E,
+	SLEEPY_SHEEP = 0x008F,
+	POW_BLOCK = 0x0090,
+	HUSTLE_DRINK = 0x0091,
+	STOP_WATCH = 0x0092,
+	WHACKAS_BUMP = 0x0093,
+	APPLE = 0x0094,
+	LIFE_SHROOM = 0x0095,
+	MYSTERY = 0x0096,
+	REPEL_GEL = 0x0097,
+	FRIGHT_JAR = 0x0098,
+	PLEASE_COME_BACK = 0x0099,
+	DIZZY_DIAL = 0x009A,
+	SUPER_SODA = 0x009B,
+	LEMON = 0x009C,
+	LIME = 0x009D,
+	BLUE_BERRY = 0x009E,
+	RED_BERRY = 0x009F,
+	YELLOW_BERRY = 0x00A0,
+	BUBBLE_BERRY = 0x00A1,
+	JAMMIN_JELLY = 0x00A2,
+	MAPLE_SYRUP = 0x00A3,
+	HONEY_SYRUP = 0x00A4,
+	GOOMNUT = 0x00A5,
+	KOOPA_LEAF = 0x00A6,
+	DRIED_PASTA = 0x00A7,
+	DRIED_FRUIT = 0x00A8,
+	STRANGE_LEAF = 0x00A9,
+	CAKE_MIX = 0x00AA,
+	EGG2 = 0x00AB,
+	COCONUT = 0x00AC,
+	MELON = 0x00AD,
+	STINKY_HERB = 0x00AE,
+	ICED_POTATO = 0x00AF,
+	SPICY_SOUP = 0x00B0,
+	APPLE_PIE = 0x00B1,
+	HONEY_ULTRA = 0x00B2,
+	MAPLE_ULTRA = 0x00B3,
+	JELLY_ULTRA = 0x00B4,
+	KOOPASTA = 0x00B5,
+	FRIED_SHROOM = 0x00B6,
+	SHROOM_CAKE = 0x00B7,
+	SHROOM_STEAK = 0x00B8,
+	HOT_SHROOM = 0x00B9,
+	SWEET_SHROOM = 0x00BA,
+	YUMMY_MEAL = 0x00BB,
+	HEALTHY_JUICE = 0x00BC,
+	BLAND_MEAL = 0x00BD,
+	DELUXE_FEAST = 0x00BE,
+	SPECIAL_SHAKE = 0x00BF,
+	BIG_COOKIE = 0x00C0,
+	CAKE = 0x00C1,
+	MISTAKE = 0x00C2,
+	KOOPA_TEA = 0x00C3,
+	HONEY_SUPER = 0x00C4,
+	MAPLE_SUPER = 0x00C5,
+	JELLY_SUPER = 0x00C6,
+	SPAGHETTI = 0x00C7,
+	EGG_MISSILE = 0x00C8,
+	FRIED_EGG = 0x00C9,
+	HONEY_SHROOM = 0x00CA,
+	HONEY_CANDY = 0x00CB,
+	ELECTRO_POP = 0x00CC,
+	FIRE_POP = 0x00CD,
+	LIME_CANDY = 0x00CE,
+	COCO_POP = 0x00CF,
+	LEMON_CANDY = 0x00D0,
+	JELLY_POP = 0x00D1,
+	STRANGE_CAKE = 0x00D2,
+	KOOKY_COOKIE = 0x00D3,
+	FROZEN_FRIES = 0x00D4,
+	POTATO_SALAD = 0x00D5,
+	NUTTY_CAKE = 0x00D6,
+	MAPLE_SHROOM = 0x00D7,
+	BOILED_EGG = 0x00D8,
+	YOSHI_COOKIE = 0x00D9,
+	JELLY_SHROOM1 = 0x00DA,
+	JELLY_SHROOM2 = 0x00DB,
+	JELLY_SHROOM3 = 0x00DC,
+	JELLY_SHROOM4 = 0x00DD,
+	JELLY_SHROOM5 = 0x00DE,
+	JELLY_SHROOM6 = 0x00DF,
+	SPIN_SMASH = 0x00E0,
+	MULTIBOUNCE = 0x00E1,
+	POWER_PLUS_A = 0x00E2,
+	DODGE_MASTER = 0x00E3,
+	POWER_BOUNCE = 0x00E4,
+	SPIKE_SHIELD = 0x00E5,
+	FIRST_ATTACK = 0x00E6,
+	HP_PLUS_A = 0x00E7,
+	QUAKE_HAMMER = 0x00E8,
+	DOUBLE_DIP = 0x00E9,
+	MYSTERY_SCROLL = 0x00EA, // unused
+	SLEEP_STOMP = 0x00EB,
+	FIRE_SHIELD = 0x00EC,
+	QUICK_CHANGE = 0x00ED,
+	D_DOWN_POUND = 0x00EE,
+	DIZZY_STOMP = 0x00EF,
+	SMASH_CHARGE0 = 0x00F0, // unused
+	PRETTY_LUCKY = 0x00F1,
+	FEELING_FINE = 0x00F2,
+	ATTACK_FX_A = 0x00F3,
+	ALLOR_NOTHING = 0x00F4,
+	HP_DRAIN = 0x00F5,
+	JUMP_CHARGE0 = 0x00F6, // unused
+	SLOW_GO = 0x00F7,
+	FP_PLUS_A = 0x00F8,
+	MEGA_RUSH = 0x00F9,
+	ICE_POWER = 0x00FA,
+	DEFEND_PLUS_A = 0x00FB,
+	PAY_OFF = 0x00FC,
+	MONEY_MONEY = 0x00FD,
+	CHILL_OUT = 0x00FE,
+	HAPPY_HEART_A = 0x00FF,
+	ZAP_TAP = 0x0100,
+	BERSERKER = 0x0101, // unused
+	RIGHT_ON = 0x0102, // unused
+	RUNAWAY_PAY = 0x0103,
+	REFUND = 0x0104,
+	FLOWER_SAVER_A = 0x0105,
+	TRIPLE_DIP = 0x0106,
+	HAMMER_THROW = 0x0107,
+	MEGA_QUAKE = 0x0108,
+	SMASH_CHARGE = 0x0109,
+	JUMP_CHARGE = 0x010A,
+	S_SMASH_CHG = 0x010B,
+	S_JUMP_CHG = 0x010C,
+	POWER_RUSH = 0x010D,
+	AUTO_JUMP = 0x010E, // unused
+	AUTO_SMASH = 0x010F, // unused
+	CRAZY_HEART = 0x0110, // unused
+	LAST_STAND = 0x0111,
+	CLOSE_CALL = 0x0112,
+	P_UP_D_DOWN = 0x0113,
+	LUCKY_DAY = 0x0114,
+	MEGA_HP_DRAIN = 0x0115, // unused
+	P_DOWN_D_UP = 0x0116,
+	POWER_QUAKE = 0x0117,
+	AUTO_MULTIBOUNCE = 0x0118, // unused
+	FLOWER_FANATIC = 0x0119, // unused
+	HEART_FINDER = 0x011A,
+	FLOWER_FINDER = 0x011B,
+	SPIN_ATTACK = 0x011C,
+	DIZZY_ATTACK = 0x011D,
+	I_SPY = 0x011E,
+	SPEEDY_SPIN = 0x011F,
+	BUMP_ATTACK = 0x0120,
+	POWER_JUMP = 0x0121,
+	SUPER_JUMP = 0x0122, // unused
+	MEGA_JUMP = 0x0123,
+	POWER_SMASH1 = 0x0124,
+	SUPER_SMASH = 0x0125, // unused
+	MEGA_SMASH = 0x0126,
+	POWER_SMASH2 = 0x0127,
+	POWER_SMASH3 = 0x0128,
+	DEEP_FOCUS1 = 0x0129,
+	SUPER_FOCUS = 0x012A, // unused
+	SHRINK_SMASH = 0x012B,
+	SHELL_CRACK = 0x012C, // unused
+	KAIDEN = 0x012D, // unused
+	D_DOWN_JUMP = 0x012E,
+	SHRINK_STOMP = 0x012F,
+	DAMAGE_DODGE_A = 0x0130,
+	EARTHQUAKE_JUMP = 0x0131,
+	DEEP_FOCUS2 = 0x0132,
+	DEEP_FOCUS3 = 0x0133,
+	HP_PLUS_B = 0x0134,
+	FP_PLUS_B = 0x0135,
+	HAPPY_HEART_B = 0x0136,
+	HAPPY_HEART_X = 0x0137,
+	FLOWER_SAVER_B = 0x0138,
+	FLOWER_SAVER_X = 0x0139,
+	DAMAGE_DODGE_B = 0x013A,
+	DAMAGE_DODGE_X = 0x013B,
+	POWER_PLUS_B = 0x013C,
+	POWER_PLUS_X = 0x013D,
+	DEFEND_PLUS_X = 0x013E,
+	DEFEND_PLUS_Y = 0x013F,
+	HAPPY_FLOWER_A = 0x0140,
+	HAPPY_FLOWER_B = 0x0141,
+	HAPPY_FLOWER_X = 0x0142,
+	GROUP_FOCUS = 0x0143,
+	PEEKABOO = 0x0144,
+	ATTACK_FX_D = 0x0145,
+	ATTACK_FX_B = 0x0146,
+	ATTACK_FX_E = 0x0147,
+	ATTACK_FX_C = 0x0148,
+	ATTACK_FX_F = 0x0149,
+	HP_PLUS_C = 0x014A,
+	HP_PLUS_X = 0x014B,
+	HP_PLUS_Y = 0x014C,
+	FP_PLUS_C = 0x014D,
+	FP_PLUS_X = 0x014E,
+	FP_PLUS_Y = 0x014F,
+	HEALTHY_HEALTHY = 0x0150,
+	ATTACK_FX_F2 = 0x0151,
+	ATTACK_FX_F3 = 0x0152,
+	ATTACK_FX_F4 = 0x0153,
+	ATTACK_FX_F5 = 0x0154,
+	PARTNER_ATTACK = 0x0155, // placeholder with partner attack icon
+	HEART = 0x0156,
+	COIN = 0x0157,
+	HEART_PIECE = 0x0158, // unused, NOT functional
+	STAR_POINT = 0x0159, // unused, functional, makes coin sound
+	FULL_HEAL = 0x015A, // unused, functional, item inside healing block
+	FLOWER = 0x015B,
+	STAR_PIECE = 0x015C,
+	PRESENT = 0x015D,
+	COMPLETE_CAKE = 0x015E,
+	BARE_CAKE = 0x015F,
+	EMPTY_CAKE_PAN = 0x0160,
+	FULL_CAKE_PAN = 0x0161,
+	EMPTY_MIXING_BOWL = 0x0162,
+	FULL_MIXING_BOWL = 0x0163,
+	CAKE_WITH_ICING = 0x0164,
+	CAKE_WITH_BERRIES = 0x0165,
+	HAMMER1_ICON = 0x0166,
+	HAMMER2_ICON = 0x0167,
+	HAMMER3_ICON = 0x0168,
+	BOOTS1_ICON = 0x0169,
+	BOOTS2_ICON = 0x016A,
+	BOOTS3_ICON = 0x016B,
+	ITEMS_ICON = 0x016C
+} eItem;
+
+#endif
\ No newline at end of file
diff --git a/papermario/include/variables.h b/papermario/include/variables.h
index 6aa1c3c1ba..12cf2b7dbc 100644
--- a/papermario/include/variables.h
+++ b/papermario/include/variables.h
@@ -23,6 +23,8 @@ extern s16 D_80151308;
 extern s16 D_8010F304[]; // Key Items
 extern s16 D_8010F444[]; // Items
 
+extern s32 D_8009A650[1];
+
 extern s16 gCurrentDoorSoundsSet;
 
 
diff --git a/papermario/src/code_1b40_len_20b0.c b/papermario/src/code_1b40_len_20b0.c
index 2f10f34a86..3e8c004d87 100644
--- a/papermario/src/code_1b40_len_20b0.c
+++ b/papermario/src/code_1b40_len_20b0.c
@@ -32,7 +32,7 @@ extern int D_802EB3D0[];
 extern u8 D_80074021;
 extern s32 D_8009A5D8;
 
-extern s32 D_8009A650[1];
+//extern s32 D_8009A650[1]; Declared in variables.h
 
 void dma_copy(void*, void*, void*);
 
diff --git a/papermario/src/code_fa4c0_len_3bf0.c b/papermario/src/code_fa4c0_len_3bf0.c
index dc5cd0bf47..737ee055aa 100644
--- a/papermario/src/code_fa4c0_len_3bf0.c
+++ b/papermario/src/code_fa4c0_len_3bf0.c
@@ -94,7 +94,6 @@ s32 RemoveKeyItemAt(script_context* script, s32 initialCall) {
     s16* ptrTemp = D_8010F304;
 
     ptrTemp[index] = 0;
-
     return 2;
 }
 
@@ -104,16 +103,80 @@ s32 RemoveItemAt(script_context* script, s32 initialCall) {
     s16* ptrTemp = D_8010F444;
     
     ptrTemp[index] = 0;
-
     sort_items();
     return 2;
 }
 
-INCLUDE_ASM(code_fa4c0_len_3bf0, AddKeyItem);
+s32 AddKeyItem(script_context* script, s32 initialCall) {
+    s32* ptrReadPos = script->ptrReadPos;
+    s32 value = *ptrReadPos++;
+    player_data* playerData = &gPlayerData;
+    s32 itemID = get_variable(script, value);
+    s32 i;
 
-INCLUDE_ASM(code_fa4c0_len_3bf0, HasKeyItem);
+    if (itemID == FORTRESS_KEY) {
+        playerData->fortressKeyCount++;
+        return 2;
+    }
 
-INCLUDE_ASM(code_fa4c0_len_3bf0, FindKeyItem);
+    for(i=0; i < ARRAY_COUNT(playerData->keyItems); i++) {
+        if (playerData->keyItems[i] == 0) {
+            break;
+        }
+    }
+
+    if (i < 32) {
+        playerData->keyItems[i] = itemID;
+    }
+    return 2;
+}
+
+s32 func_802D6954(void) {
+    func_800E01A4();
+    disable_player_physics();
+    func_800EF600();
+    D_8009A650[0] &= -0x41;
+    return 2;
+}
+
+s32 HasKeyItem(script_context* script, s32 initialCall) {
+    s32* ptrReadPos = script->ptrReadPos;
+    s32 itemID = get_variable(script, *ptrReadPos++);
+    s32 value = *ptrReadPos++;
+    player_data* playerData = &gPlayerData;
+    s32 i;
+    
+    for(i=0; i < ARRAY_COUNT(playerData->keyItems); i++) {
+        if (playerData->keyItems[i] == itemID) {
+            break;
+        }
+    }
+    set_variable(script, value, i < ARRAY_COUNT(playerData->keyItems));
+    return 2;
+}
+
+s32 FindKeyItem(script_context* script, s32 initialCall) {
+    s32* ptrReadPos = script->ptrReadPos;
+    s32 itemID = get_variable(script, *ptrReadPos++);
+    s32 value = *ptrReadPos++;
+    player_data* playerData = &gPlayerData;
+    s32 i;
+    s32 itemIndex;
+
+    for(i=0; i < ARRAY_COUNT(playerData->keyItems); i++) {
+        if (playerData->keyItems[i] == itemID) {
+            break;
+        }
+    }
+
+    itemIndex = -1;
+    if (i != ARRAY_COUNT(playerData->keyItems)) {
+        itemIndex = i;
+    }
+
+    set_variable(script, value, itemIndex);
+    return 2;
+}
 
 s32 AddItem(script_context* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
@@ -171,7 +234,6 @@ s32 SetItemPos(script_context* script, s32 initialCall) {
     ptrItemEntity->position[0] = x;
     ptrItemEntity->position[1] = y;
     ptrItemEntity->position[2] = z;
-
     return 2;
 }
 

From f19ffb98ee142ebaa4bc744cccc4a66cb99a9a60 Mon Sep 17 00:00:00 2001
From: Jdog <root@JOSH-DESKTOP.localdomain>
Date: Wed, 12 Aug 2020 14:59:08 -0700
Subject: [PATCH 2/5] Added starrod_to_c.py to /tools (as well as sub_folders
 to hold SR enums and generated header files)

---
 papermario/tools/c_enums/Item.h      | 367 +++++++++++++++++++++++++++
 papermario/tools/sr_enums/items.enum | 361 ++++++++++++++++++++++++++
 papermario/tools/starrod_to_c.py     |  60 +++++
 3 files changed, 788 insertions(+)
 create mode 100644 papermario/tools/c_enums/Item.h
 create mode 100644 papermario/tools/sr_enums/items.enum
 create mode 100644 papermario/tools/starrod_to_c.py

diff --git a/papermario/tools/c_enums/Item.h b/papermario/tools/c_enums/Item.h
new file mode 100644
index 0000000000..a21394190f
--- /dev/null
+++ b/papermario/tools/c_enums/Item.h
@@ -0,0 +1,367 @@
+#ifndef _ITEM_
+#define _ITEM_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Item {
+	JUMP = 0x00000001,
+	SPIN_JUMP = 0x00000002,
+	TORNADO_JUMP = 0x00000003,
+	HAMMER = 0x00000004,
+	SUPER_HAMMER = 0x00000005,
+	ULTRA_HAMMER = 0x00000006,
+	LUCKY_STAR = 0x00000007,
+	MAP = 0x00000008,
+	BIG_MAP = 0x00000009,
+	FIRST_DEGREE_CARD = 0x0000000A,
+	SECOND_DEGREE_CARD = 0x0000000B,
+	THIRD_DEGREE_CARD = 0x0000000C,
+	FOURTH_DEGREE_CARD = 0x0000000D,
+	DIPLOMA = 0x0000000E,
+	ULTRA_STONE = 0x0000000F,
+	FORTRESS_KEY = 0x00000010,
+	RUINS_KEY = 0x00000011,
+	PULSE_STONE = 0x00000012,
+	CASTLE_KEY1 = 0x00000013,
+	PALACE_KEY = 0x00000014,
+	LUNAR_STONE = 0x00000015,
+	PYRAMID_STONE = 0x00000016,
+	DIAMOND_STONE = 0x00000017,
+	GOLDEN_VASE = 0x00000018,
+	KOOPERS_SHELL = 0x00000019,
+	CASTLE_KEY2 = 0x0000001A,
+	FOREST_PASS = 0x0000001B,
+	WEIGHT = 0x0000001C,
+	BOOS_PORTRAIT = 0x0000001D,
+	CRYSTAL_BERRY = 0x0000001E,
+	MYSTICAL_KEY = 0x0000001F,
+	STOREROOM_KEY = 0x00000020,
+	TOY_TRAIN = 0x00000021,
+	RECORD = 0x00000022,
+	FRYING_PAN = 0x00000023,
+	DICTIONARY = 0x00000024,
+	MYSTERY_NOTE = 0x00000025,
+	SUSPICIOUS_NOTE = 0x00000026,
+	CRYSTAL_BALL = 0x00000027,
+	SCREWDRIVER = 0x00000028,
+	COOKBOOK = 0x00000029,
+	JADE_RAVEN = 0x0000002A,
+	MAGICAL_SEED1 = 0x0000002B,
+	MAGICAL_SEED2 = 0x0000002C,
+	MAGICAL_SEED3 = 0x0000002D,
+	MAGICAL_SEED4 = 0x0000002E,
+	TOAD_DOLL = 0x0000002F,
+	CALCULATOR = 0x00000030,
+	BUCKET = 0x00000031,
+	SCARF = 0x00000032,
+	RED_KEY = 0x00000033,
+	BLUE_KEY = 0x00000034,
+	LETTER01 = 0x00000036,
+	LETTER02 = 0x00000037,
+	LETTER03 = 0x00000038,
+	LETTER04 = 0x00000039,
+	LETTER05 = 0x0000003A,
+	LETTER06 = 0x0000003B,
+	LETTER07 = 0x0000003C,
+	LETTER08 = 0x0000003D,
+	LETTER09 = 0x0000003E,
+	LETTER10 = 0x00000040,
+	LETTER11 = 0x00000041,
+	LETTER12 = 0x00000045,
+	LETTER13 = 0x00000046,
+	LETTER14 = 0x00000047,
+	LETTER15 = 0x00000048,
+	LETTER16 = 0x00000049,
+	LETTER17 = 0x0000004A,
+	LETTER18 = 0x0000004B,
+	LETTER19 = 0x0000004C,
+	LETTER20 = 0x0000004E,
+	LETTER21 = 0x0000004F,
+	LETTER22 = 0x00000050,
+	LETTER23 = 0x00000051,
+	LETTER24 = 0x00000052,
+	ARTIFACT = 0x00000053,
+	LETTER25 = 0x00000054,
+	DOLLY = 0x00000056,
+	WATER_STONE = 0x00000057,
+	MAGICAL_BEAN = 0x00000058,
+	FERTILE_SOIL = 0x00000059,
+	MIRACLE_WATER = 0x0000005A,
+	VOLCANO_VASE = 0x0000005B,
+	TAPE = 0x0000005C,
+	SUGAR = 0x0000005D,
+	SALT = 0x0000005E,
+	EGG1 = 0x0000005F,
+	CREAM = 0x00000060,
+	STRAWBERRY = 0x00000061,
+	BUTTER = 0x00000062,
+	CLEANSER = 0x00000063,
+	WATER = 0x00000064,
+	FLOUR = 0x00000065,
+	MILK = 0x00000066,
+	LYRICS = 0x00000067,
+	MELODY = 0x00000068,
+	MAILBAG = 0x00000069,
+	CASTLE_KEY3 = 0x0000006A,
+	ODD_KEY = 0x0000006B,
+	STAR_STONE = 0x0000006C,
+	SNEAKY_PARASOL = 0x0000006D,
+	KOOPA_LEGENDS = 0x0000006E,
+	AUTOGRAPH1 = 0x0000006F,
+	EMPTY_WALLET = 0x00000070,
+	AUTOGRAPH2 = 0x00000071,
+	KOOPA_SHELL = 0x00000072,
+	OLD_PHOTO = 0x00000073,
+	GLASSES = 0x00000074,
+	PHOTOGRAPH = 0x00000075,
+	PACKAGE = 0x00000076,
+	RED_JAR = 0x00000077,
+	CASTLE_KEY4 = 0x00000078,
+	WAREHOUSE_KEY = 0x00000079,
+	PRISON_KEY1 = 0x0000007A,
+	SILVER_CREDIT = 0x0000007B,
+	GOLD_CREDIT = 0x0000007C,
+	PRISON_KEY2 = 0x0000007D,
+	PRISON_KEY3 = 0x0000007E,
+	PRISON_KEY4 = 0x0000007F,
+	FIRE_FLOWER = 0x00000080,
+	SNOWMAN_DOLL = 0x00000081,
+	THUNDER_RAGE = 0x00000082,
+	SHOOTING_STAR = 0x00000083,
+	THUNDER_BOLT = 0x00000084,
+	PEBBLE = 0x00000085,
+	DUSTY_HAMMER = 0x00000086,
+	INSECTICIDE_HERB = 0x00000087,
+	STONE_CAP = 0x00000088,
+	TASTY_TONIC = 0x00000089,
+	MUSHROOM = 0x0000008A,
+	VOLT_SHROOM = 0x0000008B,
+	SUPER_SHROOM = 0x0000008C,
+	DRIED_SHROOM = 0x0000008D,
+	ULTRA_SHROOM = 0x0000008E,
+	SLEEPY_SHEEP = 0x0000008F,
+	P_O_W_BLOCK = 0x00000090,
+	HUSTLE_DRINK = 0x00000091,
+	STOP_WATCH = 0x00000092,
+	WHACKAS_BUMP = 0x00000093,
+	APPLE = 0x00000094,
+	LIFE_SHROOM = 0x00000095,
+	MYSTERY = 0x00000096,
+	REPEL_GEL = 0x00000097,
+	FRIGHT_JAR = 0x00000098,
+	PLEASE_COME_BACK = 0x00000099,
+	DIZZY_DIAL = 0x0000009A,
+	SUPER_SODA = 0x0000009B,
+	LEMON = 0x0000009C,
+	LIME = 0x0000009D,
+	BLUE_BERRY = 0x0000009E,
+	RED_BERRY = 0x0000009F,
+	YELLOW_BERRY = 0x000000A0,
+	BUBBLE_BERRY = 0x000000A1,
+	JAMMIN_JELLY = 0x000000A2,
+	MAPLE_SYRUP = 0x000000A3,
+	HONEY_SYRUP = 0x000000A4,
+	GOOMNUT = 0x000000A5,
+	KOOPA_LEAF = 0x000000A6,
+	DRIED_PASTA = 0x000000A7,
+	DRIED_FRUIT = 0x000000A8,
+	STRANGE_LEAF = 0x000000A9,
+	CAKE_MIX = 0x000000AA,
+	EGG2 = 0x000000AB,
+	COCONUT = 0x000000AC,
+	MELON = 0x000000AD,
+	STINKY_HERB = 0x000000AE,
+	ICED_POTATO = 0x000000AF,
+	SPICY_SOUP = 0x000000B0,
+	APPLE_PIE = 0x000000B1,
+	HONEY_ULTRA = 0x000000B2,
+	MAPLE_ULTRA = 0x000000B3,
+	JELLY_ULTRA = 0x000000B4,
+	KOOPASTA = 0x000000B5,
+	FRIED_SHROOM = 0x000000B6,
+	SHROOM_CAKE = 0x000000B7,
+	SHROOM_STEAK = 0x000000B8,
+	HOT_SHROOM = 0x000000B9,
+	SWEET_SHROOM = 0x000000BA,
+	YUMMY_MEAL = 0x000000BB,
+	HEALTHY_JUICE = 0x000000BC,
+	BLAND_MEAL = 0x000000BD,
+	DELUXE_FEAST = 0x000000BE,
+	SPECIAL_SHAKE = 0x000000BF,
+	BIG_COOKIE = 0x000000C0,
+	CAKE = 0x000000C1,
+	MISTAKE = 0x000000C2,
+	KOOPA_TEA = 0x000000C3,
+	HONEY_SUPER = 0x000000C4,
+	MAPLE_SUPER = 0x000000C5,
+	JELLY_SUPER = 0x000000C6,
+	SPAGHETTI = 0x000000C7,
+	EGG_MISSILE = 0x000000C8,
+	FRIED_EGG = 0x000000C9,
+	HONEY_SHROOM = 0x000000CA,
+	HONEY_CANDY = 0x000000CB,
+	ELECTRO_POP = 0x000000CC,
+	FIRE_POP = 0x000000CD,
+	LIME_CANDY = 0x000000CE,
+	COCO_POP = 0x000000CF,
+	LEMON_CANDY = 0x000000D0,
+	JELLY_POP = 0x000000D1,
+	STRANGE_CAKE = 0x000000D2,
+	KOOKY_COOKIE = 0x000000D3,
+	FROZEN_FRIES = 0x000000D4,
+	POTATO_SALAD = 0x000000D5,
+	NUTTY_CAKE = 0x000000D6,
+	MAPLE_SHROOM = 0x000000D7,
+	BOILED_EGG = 0x000000D8,
+	YOSHI_COOKIE = 0x000000D9,
+	JELLY_SHROOM1 = 0x000000DA,
+	JELLY_SHROOM2 = 0x000000DB,
+	JELLY_SHROOM3 = 0x000000DC,
+	JELLY_SHROOM4 = 0x000000DD,
+	JELLY_SHROOM5 = 0x000000DE,
+	JELLY_SHROOM6 = 0x000000DF,
+	SPIN_SMASH = 0x000000E0,
+	MULTIBOUNCE = 0x000000E1,
+	POWER_PLUS_A = 0x000000E2,
+	DODGE_MASTER = 0x000000E3,
+	POWER_BOUNCE = 0x000000E4,
+	SPIKE_SHIELD = 0x000000E5,
+	FIRST_ATTACK = 0x000000E6,
+	H_P_PLUS_A = 0x000000E7,
+	QUAKE_HAMMER = 0x000000E8,
+	DOUBLE_DIP = 0x000000E9,
+	MYSTERY_SCROLL = 0x000000EA,
+	SLEEP_STOMP = 0x000000EB,
+	FIRE_SHIELD = 0x000000EC,
+	QUICK_CHANGE = 0x000000ED,
+	D_DOWN_POUND = 0x000000EE,
+	DIZZY_STOMP = 0x000000EF,
+	SMASH_CHARGE0 = 0x000000F0,
+	PRETTY_LUCKY = 0x000000F1,
+	FEELING_FINE = 0x000000F2,
+	ATTACK_F_X_A = 0x000000F3,
+	ALLOR_NOTHING = 0x000000F4,
+	H_P_DRAIN = 0x000000F5,
+	JUMP_CHARGE0 = 0x000000F6,
+	SLOW_GO = 0x000000F7,
+	F_P_PLUS_A = 0x000000F8,
+	MEGA_RUSH = 0x000000F9,
+	ICE_POWER = 0x000000FA,
+	DEFEND_PLUS_A = 0x000000FB,
+	PAY_OFF = 0x000000FC,
+	MONEY_MONEY = 0x000000FD,
+	CHILL_OUT = 0x000000FE,
+	HAPPY_HEART_A = 0x000000FF,
+	ZAP_TAP = 0x00000100,
+	BERSERKER = 0x00000101,
+	RIGHT_ON = 0x00000102,
+	RUNAWAY_PAY = 0x00000103,
+	REFUND = 0x00000104,
+	FLOWER_SAVER_A = 0x00000105,
+	TRIPLE_DIP = 0x00000106,
+	HAMMER_THROW = 0x00000107,
+	MEGA_QUAKE = 0x00000108,
+	SMASH_CHARGE = 0x00000109,
+	JUMP_CHARGE = 0x0000010A,
+	S_SMASH_CHG = 0x0000010B,
+	S_JUMP_CHG = 0x0000010C,
+	POWER_RUSH = 0x0000010D,
+	AUTO_JUMP = 0x0000010E,
+	AUTO_SMASH = 0x0000010F,
+	CRAZY_HEART = 0x00000110,
+	LAST_STAND = 0x00000111,
+	CLOSE_CALL = 0x00000112,
+	P_UP_D_DOWN = 0x00000113,
+	LUCKY_DAY = 0x00000114,
+	MEGA_H_P_DRAIN = 0x00000115,
+	P_DOWN_D_UP = 0x00000116,
+	POWER_QUAKE = 0x00000117,
+	AUTO_MULTIBOUNCE = 0x00000118,
+	FLOWER_FANATIC = 0x00000119,
+	HEART_FINDER = 0x0000011A,
+	FLOWER_FINDER = 0x0000011B,
+	SPIN_ATTACK = 0x0000011C,
+	DIZZY_ATTACK = 0x0000011D,
+	I_SPY = 0x0000011E,
+	SPEEDY_SPIN = 0x0000011F,
+	BUMP_ATTACK = 0x00000120,
+	POWER_JUMP = 0x00000121,
+	SUPER_JUMP = 0x00000122,
+	MEGA_JUMP = 0x00000123,
+	POWER_SMASH1 = 0x00000124,
+	SUPER_SMASH = 0x00000125,
+	MEGA_SMASH = 0x00000126,
+	POWER_SMASH2 = 0x00000127,
+	POWER_SMASH3 = 0x00000128,
+	DEEP_FOCUS1 = 0x00000129,
+	SUPER_FOCUS = 0x0000012A,
+	SHRINK_SMASH = 0x0000012B,
+	SHELL_CRACK = 0x0000012C,
+	KAIDEN = 0x0000012D,
+	D_DOWN_JUMP = 0x0000012E,
+	SHRINK_STOMP = 0x0000012F,
+	DAMAGE_DODGE_A = 0x00000130,
+	EARTHQUAKE_JUMP = 0x00000131,
+	DEEP_FOCUS2 = 0x00000132,
+	DEEP_FOCUS3 = 0x00000133,
+	H_P_PLUS_B = 0x00000134,
+	F_P_PLUS_B = 0x00000135,
+	HAPPY_HEART_B = 0x00000136,
+	HAPPY_HEART_X = 0x00000137,
+	FLOWER_SAVER_B = 0x00000138,
+	FLOWER_SAVER_X = 0x00000139,
+	DAMAGE_DODGE_B = 0x0000013A,
+	DAMAGE_DODGE_X = 0x0000013B,
+	POWER_PLUS_B = 0x0000013C,
+	POWER_PLUS_X = 0x0000013D,
+	DEFEND_PLUS_X = 0x0000013E,
+	DEFEND_PLUS_Y = 0x0000013F,
+	HAPPY_FLOWER_A = 0x00000140,
+	HAPPY_FLOWER_B = 0x00000141,
+	HAPPY_FLOWER_X = 0x00000142,
+	GROUP_FOCUS = 0x00000143,
+	PEEKABOO = 0x00000144,
+	ATTACK_F_X_D = 0x00000145,
+	ATTACK_F_X_B = 0x00000146,
+	ATTACK_F_X_E = 0x00000147,
+	ATTACK_F_X_C = 0x00000148,
+	ATTACK_F_X_F = 0x00000149,
+	H_P_PLUS_C = 0x0000014A,
+	H_P_PLUS_X = 0x0000014B,
+	H_P_PLUS_Y = 0x0000014C,
+	F_P_PLUS_C = 0x0000014D,
+	F_P_PLUS_X = 0x0000014E,
+	F_P_PLUS_Y = 0x0000014F,
+	HEALTHY_HEALTHY = 0x00000150,
+	ATTACK_F_X_F2 = 0x00000151,
+	ATTACK_F_X_F3 = 0x00000152,
+	ATTACK_F_X_F4 = 0x00000153,
+	ATTACK_F_X_F5 = 0x00000154,
+	PARTNER_ATTACK = 0x00000155,
+	HEART = 0x00000156,
+	COIN = 0x00000157,
+	HEART_PIECE = 0x00000158,
+	STAR_POINT = 0x00000159,
+	FULL_HEAL = 0x0000015A,
+	FLOWER = 0x0000015B,
+	STAR_PIECE = 0x0000015C,
+	PRESENT = 0x0000015D,
+	COMPLETE_CAKE = 0x0000015E,
+	BARE_CAKE = 0x0000015F,
+	EMPTY_CAKE_PAN = 0x00000160,
+	FULL_CAKE_PAN = 0x00000161,
+	EMPTY_MIXING_BOWL = 0x00000162,
+	FULL_MIXING_BOWL = 0x00000163,
+	CAKE_WITH_ICING = 0x00000164,
+	CAKE_WITH_BERRIES = 0x00000165,
+	HAMMER1_ICON = 0x00000166,
+	HAMMER2_ICON = 0x00000167,
+	HAMMER3_ICON = 0x00000168,
+	BOOTS1_ICON = 0x00000169,
+	BOOTS2_ICON = 0x0000016A,
+	BOOTS3_ICON = 0x0000016B,
+	ITEMS_ICON = 0x0000016C
+} Item;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/items.enum b/papermario/tools/sr_enums/items.enum
new file mode 100644
index 0000000000..167510c2c5
--- /dev/null
+++ b/papermario/tools/sr_enums/items.enum
@@ -0,0 +1,361 @@
+Item	% namespace
+itemID	% library name
+true	% reversed
+
+Jump                 = 00000001
+SpinJump             = 00000002
+TornadoJump          = 00000003
+Hammer               = 00000004
+SuperHammer          = 00000005
+UltraHammer          = 00000006
+LuckyStar            = 00000007
+Map                  = 00000008 % unused
+BigMap               = 00000009 % unused
+FirstDegreeCard      = 0000000A
+SecondDegreeCard     = 0000000B
+ThirdDegreeCard      = 0000000C
+FourthDegreeCard     = 0000000D
+Diploma              = 0000000E
+UltraStone           = 0000000F
+FortressKey          = 00000010
+RuinsKey             = 00000011
+PulseStone           = 00000012
+CastleKey1           = 00000013
+PalaceKey            = 00000014
+LunarStone           = 00000015
+PyramidStone         = 00000016
+DiamondStone         = 00000017
+GoldenVase           = 00000018 % unused
+KoopersShell         = 00000019
+CastleKey2           = 0000001A
+ForestPass           = 0000001B % unused
+Weight               = 0000001C
+BoosPortrait         = 0000001D
+CrystalBerry         = 0000001E
+MysticalKey          = 0000001F
+StoreroomKey         = 00000020
+ToyTrain             = 00000021
+Record               = 00000022
+FryingPan            = 00000023
+Dictionary           = 00000024
+MysteryNote          = 00000025
+SuspiciousNote       = 00000026 % unused
+CrystalBall          = 00000027
+Screwdriver          = 00000028 % unused
+Cookbook             = 00000029
+JadeRaven            = 0000002A
+MagicalSeed1         = 0000002B
+MagicalSeed2         = 0000002C
+MagicalSeed3         = 0000002D
+MagicalSeed4         = 0000002E
+ToadDoll             = 0000002F % unused
+Calculator           = 00000030
+Bucket               = 00000031
+Scarf                = 00000032
+RedKey               = 00000033
+BlueKey              = 00000034
+Letter01             = 00000036
+Letter02             = 00000037
+Letter03             = 00000038
+Letter04             = 00000039
+Letter05             = 0000003A
+Letter06             = 0000003B
+Letter07             = 0000003C
+Letter08             = 0000003D
+Letter09             = 0000003E
+Letter10             = 00000040
+Letter11             = 00000041
+Letter12             = 00000045
+Letter13             = 00000046
+Letter14             = 00000047
+Letter15             = 00000048
+Letter16             = 00000049
+Letter17             = 0000004A
+Letter18             = 0000004B
+Letter19             = 0000004C
+Letter20             = 0000004E
+Letter21             = 0000004F
+Letter22             = 00000050
+Letter23             = 00000051
+Letter24             = 00000052
+Artifact             = 00000053
+Letter25             = 00000054
+Dolly                = 00000056
+WaterStone           = 00000057
+MagicalBean          = 00000058
+FertileSoil          = 00000059
+MiracleWater         = 0000005A
+VolcanoVase          = 0000005B
+Tape                 = 0000005C
+Sugar                = 0000005D
+Salt                 = 0000005E
+Egg1                 = 0000005F
+Cream                = 00000060
+Strawberry           = 00000061
+Butter               = 00000062
+Cleanser             = 00000063
+Water                = 00000064
+Flour                = 00000065
+Milk                 = 00000066
+Lyrics               = 00000067
+Melody               = 00000068
+Mailbag              = 00000069
+CastleKey3           = 0000006A
+OddKey               = 0000006B
+StarStone            = 0000006C
+SneakyParasol        = 0000006D
+KoopaLegends         = 0000006E
+Autograph1           = 0000006F
+EmptyWallet          = 00000070
+Autograph2           = 00000071
+KoopaShell           = 00000072 % unused
+OldPhoto             = 00000073
+Glasses              = 00000074
+Photograph           = 00000075 % unused
+Package              = 00000076
+RedJar               = 00000077
+CastleKey4           = 00000078
+WarehouseKey         = 00000079
+PrisonKey1           = 0000007A
+SilverCredit         = 0000007B
+GoldCredit           = 0000007C
+PrisonKey2           = 0000007D % unused
+PrisonKey3           = 0000007E % unused
+PrisonKey4           = 0000007F % unused
+FireFlower           = 00000080
+SnowmanDoll          = 00000081
+ThunderRage          = 00000082
+ShootingStar         = 00000083
+ThunderBolt          = 00000084
+Pebble               = 00000085
+DustyHammer          = 00000086
+InsecticideHerb      = 00000087
+StoneCap             = 00000088
+TastyTonic           = 00000089
+Mushroom             = 0000008A
+VoltShroom           = 0000008B
+SuperShroom          = 0000008C
+DriedShroom          = 0000008D
+UltraShroom          = 0000008E
+SleepySheep          = 0000008F
+POWBlock             = 00000090
+HustleDrink          = 00000091
+StopWatch            = 00000092
+WhackasBump          = 00000093
+Apple                = 00000094
+LifeShroom           = 00000095
+Mystery              = 00000096
+RepelGel             = 00000097
+FrightJar            = 00000098
+PleaseComeBack       = 00000099
+DizzyDial            = 0000009A
+SuperSoda            = 0000009B
+Lemon                = 0000009C
+Lime                 = 0000009D
+BlueBerry            = 0000009E
+RedBerry             = 0000009F
+YellowBerry          = 000000A0
+BubbleBerry          = 000000A1
+JamminJelly          = 000000A2
+MapleSyrup           = 000000A3
+HoneySyrup           = 000000A4
+Goomnut              = 000000A5
+KoopaLeaf            = 000000A6
+DriedPasta           = 000000A7
+DriedFruit           = 000000A8
+StrangeLeaf          = 000000A9
+CakeMix              = 000000AA
+Egg2                 = 000000AB
+Coconut              = 000000AC
+Melon                = 000000AD
+StinkyHerb           = 000000AE
+IcedPotato           = 000000AF
+SpicySoup            = 000000B0
+ApplePie             = 000000B1
+HoneyUltra           = 000000B2
+MapleUltra           = 000000B3
+JellyUltra           = 000000B4
+Koopasta             = 000000B5
+FriedShroom          = 000000B6
+ShroomCake           = 000000B7
+ShroomSteak          = 000000B8
+HotShroom            = 000000B9
+SweetShroom          = 000000BA
+YummyMeal            = 000000BB
+HealthyJuice         = 000000BC
+BlandMeal            = 000000BD
+DeluxeFeast          = 000000BE
+SpecialShake         = 000000BF
+BigCookie            = 000000C0
+Cake                 = 000000C1
+Mistake              = 000000C2
+KoopaTea             = 000000C3
+HoneySuper           = 000000C4
+MapleSuper           = 000000C5
+JellySuper           = 000000C6
+Spaghetti            = 000000C7
+EggMissile           = 000000C8
+FriedEgg             = 000000C9
+HoneyShroom          = 000000CA
+HoneyCandy           = 000000CB
+ElectroPop           = 000000CC
+FirePop              = 000000CD
+LimeCandy            = 000000CE
+CocoPop              = 000000CF
+LemonCandy           = 000000D0
+JellyPop             = 000000D1
+StrangeCake          = 000000D2
+KookyCookie          = 000000D3
+FrozenFries          = 000000D4
+PotatoSalad          = 000000D5
+NuttyCake            = 000000D6
+MapleShroom          = 000000D7
+BoiledEgg            = 000000D8
+YoshiCookie          = 000000D9
+JellyShroom1         = 000000DA
+JellyShroom2         = 000000DB
+JellyShroom3         = 000000DC
+JellyShroom4         = 000000DD
+JellyShroom5         = 000000DE
+JellyShroom6         = 000000DF
+SpinSmash            = 000000E0
+Multibounce          = 000000E1
+PowerPlusA           = 000000E2
+DodgeMaster          = 000000E3
+PowerBounce          = 000000E4
+SpikeShield          = 000000E5
+FirstAttack          = 000000E6
+HPPlusA              = 000000E7
+QuakeHammer          = 000000E8
+DoubleDip            = 000000E9
+MysteryScroll        = 000000EA % unused
+SleepStomp           = 000000EB
+FireShield           = 000000EC
+QuickChange          = 000000ED
+DDownPound           = 000000EE
+DizzyStomp           = 000000EF
+SmashCharge0         = 000000F0 % unused
+PrettyLucky          = 000000F1
+FeelingFine          = 000000F2
+AttackFXA            = 000000F3
+AllorNothing         = 000000F4
+HPDrain              = 000000F5
+JumpCharge0          = 000000F6 % unused
+SlowGo               = 000000F7
+FPPlusA              = 000000F8
+MegaRush             = 000000F9
+IcePower             = 000000FA
+DefendPlusA          = 000000FB
+PayOff               = 000000FC
+MoneyMoney           = 000000FD
+ChillOut             = 000000FE
+HappyHeartA          = 000000FF
+ZapTap               = 00000100
+Berserker            = 00000101 % unused
+RightOn              = 00000102 % unused
+RunawayPay           = 00000103
+Refund               = 00000104
+FlowerSaverA         = 00000105
+TripleDip            = 00000106
+HammerThrow          = 00000107
+MegaQuake            = 00000108
+SmashCharge          = 00000109
+JumpCharge           = 0000010A
+SSmashChg            = 0000010B
+SJumpChg             = 0000010C
+PowerRush            = 0000010D
+AutoJump             = 0000010E % unused
+AutoSmash            = 0000010F % unused
+CrazyHeart           = 00000110 % unused
+LastStand            = 00000111
+CloseCall            = 00000112
+PUpDDown             = 00000113
+LuckyDay             = 00000114
+MegaHPDrain          = 00000115 % unused
+PDownDUp             = 00000116
+PowerQuake           = 00000117
+AutoMultibounce      = 00000118 % unused
+FlowerFanatic        = 00000119 % unused
+HeartFinder          = 0000011A
+FlowerFinder         = 0000011B
+SpinAttack           = 0000011C
+DizzyAttack          = 0000011D
+ISpy                 = 0000011E
+SpeedySpin           = 0000011F
+BumpAttack           = 00000120
+PowerJump            = 00000121
+SuperJump            = 00000122 % unused
+MegaJump             = 00000123
+PowerSmash1          = 00000124
+SuperSmash           = 00000125 % unused
+MegaSmash            = 00000126
+PowerSmash2          = 00000127
+PowerSmash3          = 00000128
+DeepFocus1           = 00000129
+SuperFocus           = 0000012A % unused
+ShrinkSmash          = 0000012B
+ShellCrack           = 0000012C % unused
+Kaiden               = 0000012D % unused
+DDownJump            = 0000012E
+ShrinkStomp          = 0000012F
+DamageDodgeA         = 00000130
+EarthquakeJump       = 00000131
+DeepFocus2           = 00000132
+DeepFocus3           = 00000133
+HPPlusB              = 00000134
+FPPlusB              = 00000135
+HappyHeartB          = 00000136
+HappyHeartX          = 00000137
+FlowerSaverB         = 00000138
+FlowerSaverX         = 00000139
+DamageDodgeB         = 0000013A
+DamageDodgeX         = 0000013B
+PowerPlusB           = 0000013C
+PowerPlusX           = 0000013D
+DefendPlusX          = 0000013E
+DefendPlusY          = 0000013F
+HappyFlowerA         = 00000140
+HappyFlowerB         = 00000141
+HappyFlowerX         = 00000142
+GroupFocus           = 00000143
+Peekaboo             = 00000144
+AttackFXD            = 00000145
+AttackFXB            = 00000146
+AttackFXE            = 00000147
+AttackFXC            = 00000148
+AttackFXF            = 00000149
+HPPlusC              = 0000014A
+HPPlusX              = 0000014B
+HPPlusY              = 0000014C
+FPPlusC              = 0000014D
+FPPlusX              = 0000014E
+FPPlusY              = 0000014F
+HealthyHealthy       = 00000150
+AttackFXF2           = 00000151
+AttackFXF3           = 00000152
+AttackFXF4           = 00000153
+AttackFXF5           = 00000154
+PartnerAttack        = 00000155 % placeholder with partner attack icon
+Heart                = 00000156
+Coin                 = 00000157
+HeartPiece			 = 00000158 % unused, NOT functional
+StarPoint			 = 00000159 % unused, functional, makes coin sound
+FullHeal			 = 0000015A % unused, functional, item inside healing block
+Flower				 = 0000015B
+StarPiece            = 0000015C
+Present              = 0000015D
+CompleteCake         = 0000015E
+BareCake             = 0000015F
+EmptyCakePan         = 00000160
+FullCakePan          = 00000161
+EmptyMixingBowl      = 00000162
+FullMixingBowl       = 00000163
+CakeWithIcing        = 00000164
+CakeWithBerries      = 00000165
+Hammer1Icon          = 00000166
+Hammer2Icon          = 00000167
+Hammer3Icon          = 00000168
+Boots1Icon           = 00000169
+Boots2Icon           = 0000016A
+Boots3Icon           = 0000016B
+ItemsIcon            = 0000016C
diff --git a/papermario/tools/starrod_to_c.py b/papermario/tools/starrod_to_c.py
new file mode 100644
index 0000000000..c24a48962e
--- /dev/null
+++ b/papermario/tools/starrod_to_c.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+
+import os
+import re
+import stringcase
+
+
+files = [filename for filename in os.listdir("./sr_enums") if filename.endswith(".enum")]
+for filename in files:
+    with open(f"./sr_enums/{filename}", "r") as file:
+        lines = file.readlines()
+
+        # Get enum attributes
+        namespace = re.match(r"[^  \t]*", lines[0]).group(0)
+        library_name = re.match(r"[^  \t]*", lines[1]).group(0)
+        reverse = True if re.match(r"[^  \t]*", lines[2]).group(0) == "true" else False
+
+        # Get a list of tuples containing (name, value)
+        items = []
+        comment = False
+        for line in lines[4:]:
+            line = line.rstrip("\n")
+            if not comment and not line.startswith("%") and "=" in line:
+                m = re.match(r"[ \t]*?([^ \t]*)[ \t]*=[ \t]*([^ \t]*)", line)
+                if m:
+                    if reverse:
+                        name = m.group(1)
+                        value = int(m.group(2), 16)
+                    else:
+                        name = m.group(2)
+                        value = int(m.group(1), 16)
+                    if value < 0:
+                        str_value = "-0x" + f"{value*-1:08x}".upper()
+                    else:
+                        str_value = "0x" + f"{value:08x}".upper()
+                    items.append((name, str_value))
+            elif "/%" in line:
+                comment = True
+            elif "%/" in line:
+                comment = False
+            
+        # Create a header file for this enum
+        with open(f"./c_enums/{namespace}.h", "w") as file:
+            header = f"_{stringcase.constcase(namespace)}_"
+            file.write(f"#ifndef {header}\n#define {header}\n")
+            file.write("\n")
+            file.write("#include \"ultra64.h\"\n#include \"types.h\"\n")
+            file.write("\n")
+            file.write(f"typedef enum {namespace} {'{'}\n")
+            for i,(name,value) in enumerate(items):
+                name_const = stringcase.constcase(name)
+                if i < len(items) - 1:
+                    file.write(f"\t{name_const} = {value},\n")
+                else:
+                    file.write(f"\t{name_const} = {value}\n")
+            file.write(f"{'}'} {namespace};\n\n")
+            file.write("#endif")
+                
+
+        
\ No newline at end of file

From 89246f7247851cff090d4e6d7d4e7dfe7b0c2640 Mon Sep 17 00:00:00 2001
From: Jdog <root@JOSH-DESKTOP.localdomain>
Date: Wed, 12 Aug 2020 15:18:55 -0700
Subject: [PATCH 3/5] Added Star Rod enums to /tools/sr_eenums

---
 papermario/tools/c_enums/Item.h               | 367 ------------------
 papermario/tools/sr_enums/ability.enum        |  60 +++
 papermario/tools/sr_enums/action_states.enum  |  42 ++
 papermario/tools/sr_enums/actor.enum          |  31 ++
 papermario/tools/sr_enums/actor_sounds.enum   |  10 +
 papermario/tools/sr_enums/ambient_sounds.enum |  19 +
 papermario/tools/sr_enums/animations.enum     |  39 ++
 papermario/tools/sr_enums/cameras.enum        |   8 +
 papermario/tools/sr_enums/decorations.enum    |  13 +
 papermario/tools/sr_enums/door_sounds.enum    |  11 +
 papermario/tools/sr_enums/door_swings.enum    |   6 +
 papermario/tools/sr_enums/easing.enum         |  22 ++
 papermario/tools/sr_enums/elements.enum       |  18 +
 papermario/tools/sr_enums/emotes.enum         |  10 +
 .../tools/sr_enums/encounter_trigger.enum     |   9 +
 papermario/tools/sr_enums/entities.enum       |  83 ++++
 papermario/tools/sr_enums/events.enum         |  63 +++
 papermario/tools/sr_enums/hit_result.enum     |  12 +
 papermario/tools/sr_enums/hit_sound.enum      |  10 +
 .../tools/sr_enums/item_spawn_modes.enum      |  41 ++
 papermario/tools/sr_enums/items.enum          |   0
 papermario/tools/sr_enums/locations.enum      |  40 ++
 papermario/tools/sr_enums/npcs.enum           |   7 +
 papermario/tools/sr_enums/outcomes.enum       |   8 +
 papermario/tools/sr_enums/partners.enum       |  16 +
 papermario/tools/sr_enums/phases.enum         |  31 ++
 .../tools/sr_enums/player_animations.enum     |  49 +++
 papermario/tools/sr_enums/songs.enum          | 159 ++++++++
 papermario/tools/sr_enums/sounds.enum         |  89 +++++
 papermario/tools/sr_enums/sprites.enum        | 237 +++++++++++
 papermario/tools/sr_enums/status.enum         |  43 ++
 papermario/tools/sr_enums/target_iter.enum    |  11 +
 papermario/tools/sr_enums/triggers.enum       |  24 ++
 33 files changed, 1221 insertions(+), 367 deletions(-)
 delete mode 100644 papermario/tools/c_enums/Item.h
 create mode 100755 papermario/tools/sr_enums/ability.enum
 create mode 100755 papermario/tools/sr_enums/action_states.enum
 create mode 100755 papermario/tools/sr_enums/actor.enum
 create mode 100755 papermario/tools/sr_enums/actor_sounds.enum
 create mode 100755 papermario/tools/sr_enums/ambient_sounds.enum
 create mode 100755 papermario/tools/sr_enums/animations.enum
 create mode 100755 papermario/tools/sr_enums/cameras.enum
 create mode 100755 papermario/tools/sr_enums/decorations.enum
 create mode 100755 papermario/tools/sr_enums/door_sounds.enum
 create mode 100755 papermario/tools/sr_enums/door_swings.enum
 create mode 100755 papermario/tools/sr_enums/easing.enum
 create mode 100755 papermario/tools/sr_enums/elements.enum
 create mode 100755 papermario/tools/sr_enums/emotes.enum
 create mode 100755 papermario/tools/sr_enums/encounter_trigger.enum
 create mode 100755 papermario/tools/sr_enums/entities.enum
 create mode 100755 papermario/tools/sr_enums/events.enum
 create mode 100755 papermario/tools/sr_enums/hit_result.enum
 create mode 100755 papermario/tools/sr_enums/hit_sound.enum
 create mode 100755 papermario/tools/sr_enums/item_spawn_modes.enum
 mode change 100644 => 100755 papermario/tools/sr_enums/items.enum
 create mode 100755 papermario/tools/sr_enums/locations.enum
 create mode 100755 papermario/tools/sr_enums/npcs.enum
 create mode 100755 papermario/tools/sr_enums/outcomes.enum
 create mode 100755 papermario/tools/sr_enums/partners.enum
 create mode 100755 papermario/tools/sr_enums/phases.enum
 create mode 100755 papermario/tools/sr_enums/player_animations.enum
 create mode 100755 papermario/tools/sr_enums/songs.enum
 create mode 100755 papermario/tools/sr_enums/sounds.enum
 create mode 100755 papermario/tools/sr_enums/sprites.enum
 create mode 100755 papermario/tools/sr_enums/status.enum
 create mode 100755 papermario/tools/sr_enums/target_iter.enum
 create mode 100755 papermario/tools/sr_enums/triggers.enum

diff --git a/papermario/tools/c_enums/Item.h b/papermario/tools/c_enums/Item.h
deleted file mode 100644
index a21394190f..0000000000
--- a/papermario/tools/c_enums/Item.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef _ITEM_
-#define _ITEM_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Item {
-	JUMP = 0x00000001,
-	SPIN_JUMP = 0x00000002,
-	TORNADO_JUMP = 0x00000003,
-	HAMMER = 0x00000004,
-	SUPER_HAMMER = 0x00000005,
-	ULTRA_HAMMER = 0x00000006,
-	LUCKY_STAR = 0x00000007,
-	MAP = 0x00000008,
-	BIG_MAP = 0x00000009,
-	FIRST_DEGREE_CARD = 0x0000000A,
-	SECOND_DEGREE_CARD = 0x0000000B,
-	THIRD_DEGREE_CARD = 0x0000000C,
-	FOURTH_DEGREE_CARD = 0x0000000D,
-	DIPLOMA = 0x0000000E,
-	ULTRA_STONE = 0x0000000F,
-	FORTRESS_KEY = 0x00000010,
-	RUINS_KEY = 0x00000011,
-	PULSE_STONE = 0x00000012,
-	CASTLE_KEY1 = 0x00000013,
-	PALACE_KEY = 0x00000014,
-	LUNAR_STONE = 0x00000015,
-	PYRAMID_STONE = 0x00000016,
-	DIAMOND_STONE = 0x00000017,
-	GOLDEN_VASE = 0x00000018,
-	KOOPERS_SHELL = 0x00000019,
-	CASTLE_KEY2 = 0x0000001A,
-	FOREST_PASS = 0x0000001B,
-	WEIGHT = 0x0000001C,
-	BOOS_PORTRAIT = 0x0000001D,
-	CRYSTAL_BERRY = 0x0000001E,
-	MYSTICAL_KEY = 0x0000001F,
-	STOREROOM_KEY = 0x00000020,
-	TOY_TRAIN = 0x00000021,
-	RECORD = 0x00000022,
-	FRYING_PAN = 0x00000023,
-	DICTIONARY = 0x00000024,
-	MYSTERY_NOTE = 0x00000025,
-	SUSPICIOUS_NOTE = 0x00000026,
-	CRYSTAL_BALL = 0x00000027,
-	SCREWDRIVER = 0x00000028,
-	COOKBOOK = 0x00000029,
-	JADE_RAVEN = 0x0000002A,
-	MAGICAL_SEED1 = 0x0000002B,
-	MAGICAL_SEED2 = 0x0000002C,
-	MAGICAL_SEED3 = 0x0000002D,
-	MAGICAL_SEED4 = 0x0000002E,
-	TOAD_DOLL = 0x0000002F,
-	CALCULATOR = 0x00000030,
-	BUCKET = 0x00000031,
-	SCARF = 0x00000032,
-	RED_KEY = 0x00000033,
-	BLUE_KEY = 0x00000034,
-	LETTER01 = 0x00000036,
-	LETTER02 = 0x00000037,
-	LETTER03 = 0x00000038,
-	LETTER04 = 0x00000039,
-	LETTER05 = 0x0000003A,
-	LETTER06 = 0x0000003B,
-	LETTER07 = 0x0000003C,
-	LETTER08 = 0x0000003D,
-	LETTER09 = 0x0000003E,
-	LETTER10 = 0x00000040,
-	LETTER11 = 0x00000041,
-	LETTER12 = 0x00000045,
-	LETTER13 = 0x00000046,
-	LETTER14 = 0x00000047,
-	LETTER15 = 0x00000048,
-	LETTER16 = 0x00000049,
-	LETTER17 = 0x0000004A,
-	LETTER18 = 0x0000004B,
-	LETTER19 = 0x0000004C,
-	LETTER20 = 0x0000004E,
-	LETTER21 = 0x0000004F,
-	LETTER22 = 0x00000050,
-	LETTER23 = 0x00000051,
-	LETTER24 = 0x00000052,
-	ARTIFACT = 0x00000053,
-	LETTER25 = 0x00000054,
-	DOLLY = 0x00000056,
-	WATER_STONE = 0x00000057,
-	MAGICAL_BEAN = 0x00000058,
-	FERTILE_SOIL = 0x00000059,
-	MIRACLE_WATER = 0x0000005A,
-	VOLCANO_VASE = 0x0000005B,
-	TAPE = 0x0000005C,
-	SUGAR = 0x0000005D,
-	SALT = 0x0000005E,
-	EGG1 = 0x0000005F,
-	CREAM = 0x00000060,
-	STRAWBERRY = 0x00000061,
-	BUTTER = 0x00000062,
-	CLEANSER = 0x00000063,
-	WATER = 0x00000064,
-	FLOUR = 0x00000065,
-	MILK = 0x00000066,
-	LYRICS = 0x00000067,
-	MELODY = 0x00000068,
-	MAILBAG = 0x00000069,
-	CASTLE_KEY3 = 0x0000006A,
-	ODD_KEY = 0x0000006B,
-	STAR_STONE = 0x0000006C,
-	SNEAKY_PARASOL = 0x0000006D,
-	KOOPA_LEGENDS = 0x0000006E,
-	AUTOGRAPH1 = 0x0000006F,
-	EMPTY_WALLET = 0x00000070,
-	AUTOGRAPH2 = 0x00000071,
-	KOOPA_SHELL = 0x00000072,
-	OLD_PHOTO = 0x00000073,
-	GLASSES = 0x00000074,
-	PHOTOGRAPH = 0x00000075,
-	PACKAGE = 0x00000076,
-	RED_JAR = 0x00000077,
-	CASTLE_KEY4 = 0x00000078,
-	WAREHOUSE_KEY = 0x00000079,
-	PRISON_KEY1 = 0x0000007A,
-	SILVER_CREDIT = 0x0000007B,
-	GOLD_CREDIT = 0x0000007C,
-	PRISON_KEY2 = 0x0000007D,
-	PRISON_KEY3 = 0x0000007E,
-	PRISON_KEY4 = 0x0000007F,
-	FIRE_FLOWER = 0x00000080,
-	SNOWMAN_DOLL = 0x00000081,
-	THUNDER_RAGE = 0x00000082,
-	SHOOTING_STAR = 0x00000083,
-	THUNDER_BOLT = 0x00000084,
-	PEBBLE = 0x00000085,
-	DUSTY_HAMMER = 0x00000086,
-	INSECTICIDE_HERB = 0x00000087,
-	STONE_CAP = 0x00000088,
-	TASTY_TONIC = 0x00000089,
-	MUSHROOM = 0x0000008A,
-	VOLT_SHROOM = 0x0000008B,
-	SUPER_SHROOM = 0x0000008C,
-	DRIED_SHROOM = 0x0000008D,
-	ULTRA_SHROOM = 0x0000008E,
-	SLEEPY_SHEEP = 0x0000008F,
-	P_O_W_BLOCK = 0x00000090,
-	HUSTLE_DRINK = 0x00000091,
-	STOP_WATCH = 0x00000092,
-	WHACKAS_BUMP = 0x00000093,
-	APPLE = 0x00000094,
-	LIFE_SHROOM = 0x00000095,
-	MYSTERY = 0x00000096,
-	REPEL_GEL = 0x00000097,
-	FRIGHT_JAR = 0x00000098,
-	PLEASE_COME_BACK = 0x00000099,
-	DIZZY_DIAL = 0x0000009A,
-	SUPER_SODA = 0x0000009B,
-	LEMON = 0x0000009C,
-	LIME = 0x0000009D,
-	BLUE_BERRY = 0x0000009E,
-	RED_BERRY = 0x0000009F,
-	YELLOW_BERRY = 0x000000A0,
-	BUBBLE_BERRY = 0x000000A1,
-	JAMMIN_JELLY = 0x000000A2,
-	MAPLE_SYRUP = 0x000000A3,
-	HONEY_SYRUP = 0x000000A4,
-	GOOMNUT = 0x000000A5,
-	KOOPA_LEAF = 0x000000A6,
-	DRIED_PASTA = 0x000000A7,
-	DRIED_FRUIT = 0x000000A8,
-	STRANGE_LEAF = 0x000000A9,
-	CAKE_MIX = 0x000000AA,
-	EGG2 = 0x000000AB,
-	COCONUT = 0x000000AC,
-	MELON = 0x000000AD,
-	STINKY_HERB = 0x000000AE,
-	ICED_POTATO = 0x000000AF,
-	SPICY_SOUP = 0x000000B0,
-	APPLE_PIE = 0x000000B1,
-	HONEY_ULTRA = 0x000000B2,
-	MAPLE_ULTRA = 0x000000B3,
-	JELLY_ULTRA = 0x000000B4,
-	KOOPASTA = 0x000000B5,
-	FRIED_SHROOM = 0x000000B6,
-	SHROOM_CAKE = 0x000000B7,
-	SHROOM_STEAK = 0x000000B8,
-	HOT_SHROOM = 0x000000B9,
-	SWEET_SHROOM = 0x000000BA,
-	YUMMY_MEAL = 0x000000BB,
-	HEALTHY_JUICE = 0x000000BC,
-	BLAND_MEAL = 0x000000BD,
-	DELUXE_FEAST = 0x000000BE,
-	SPECIAL_SHAKE = 0x000000BF,
-	BIG_COOKIE = 0x000000C0,
-	CAKE = 0x000000C1,
-	MISTAKE = 0x000000C2,
-	KOOPA_TEA = 0x000000C3,
-	HONEY_SUPER = 0x000000C4,
-	MAPLE_SUPER = 0x000000C5,
-	JELLY_SUPER = 0x000000C6,
-	SPAGHETTI = 0x000000C7,
-	EGG_MISSILE = 0x000000C8,
-	FRIED_EGG = 0x000000C9,
-	HONEY_SHROOM = 0x000000CA,
-	HONEY_CANDY = 0x000000CB,
-	ELECTRO_POP = 0x000000CC,
-	FIRE_POP = 0x000000CD,
-	LIME_CANDY = 0x000000CE,
-	COCO_POP = 0x000000CF,
-	LEMON_CANDY = 0x000000D0,
-	JELLY_POP = 0x000000D1,
-	STRANGE_CAKE = 0x000000D2,
-	KOOKY_COOKIE = 0x000000D3,
-	FROZEN_FRIES = 0x000000D4,
-	POTATO_SALAD = 0x000000D5,
-	NUTTY_CAKE = 0x000000D6,
-	MAPLE_SHROOM = 0x000000D7,
-	BOILED_EGG = 0x000000D8,
-	YOSHI_COOKIE = 0x000000D9,
-	JELLY_SHROOM1 = 0x000000DA,
-	JELLY_SHROOM2 = 0x000000DB,
-	JELLY_SHROOM3 = 0x000000DC,
-	JELLY_SHROOM4 = 0x000000DD,
-	JELLY_SHROOM5 = 0x000000DE,
-	JELLY_SHROOM6 = 0x000000DF,
-	SPIN_SMASH = 0x000000E0,
-	MULTIBOUNCE = 0x000000E1,
-	POWER_PLUS_A = 0x000000E2,
-	DODGE_MASTER = 0x000000E3,
-	POWER_BOUNCE = 0x000000E4,
-	SPIKE_SHIELD = 0x000000E5,
-	FIRST_ATTACK = 0x000000E6,
-	H_P_PLUS_A = 0x000000E7,
-	QUAKE_HAMMER = 0x000000E8,
-	DOUBLE_DIP = 0x000000E9,
-	MYSTERY_SCROLL = 0x000000EA,
-	SLEEP_STOMP = 0x000000EB,
-	FIRE_SHIELD = 0x000000EC,
-	QUICK_CHANGE = 0x000000ED,
-	D_DOWN_POUND = 0x000000EE,
-	DIZZY_STOMP = 0x000000EF,
-	SMASH_CHARGE0 = 0x000000F0,
-	PRETTY_LUCKY = 0x000000F1,
-	FEELING_FINE = 0x000000F2,
-	ATTACK_F_X_A = 0x000000F3,
-	ALLOR_NOTHING = 0x000000F4,
-	H_P_DRAIN = 0x000000F5,
-	JUMP_CHARGE0 = 0x000000F6,
-	SLOW_GO = 0x000000F7,
-	F_P_PLUS_A = 0x000000F8,
-	MEGA_RUSH = 0x000000F9,
-	ICE_POWER = 0x000000FA,
-	DEFEND_PLUS_A = 0x000000FB,
-	PAY_OFF = 0x000000FC,
-	MONEY_MONEY = 0x000000FD,
-	CHILL_OUT = 0x000000FE,
-	HAPPY_HEART_A = 0x000000FF,
-	ZAP_TAP = 0x00000100,
-	BERSERKER = 0x00000101,
-	RIGHT_ON = 0x00000102,
-	RUNAWAY_PAY = 0x00000103,
-	REFUND = 0x00000104,
-	FLOWER_SAVER_A = 0x00000105,
-	TRIPLE_DIP = 0x00000106,
-	HAMMER_THROW = 0x00000107,
-	MEGA_QUAKE = 0x00000108,
-	SMASH_CHARGE = 0x00000109,
-	JUMP_CHARGE = 0x0000010A,
-	S_SMASH_CHG = 0x0000010B,
-	S_JUMP_CHG = 0x0000010C,
-	POWER_RUSH = 0x0000010D,
-	AUTO_JUMP = 0x0000010E,
-	AUTO_SMASH = 0x0000010F,
-	CRAZY_HEART = 0x00000110,
-	LAST_STAND = 0x00000111,
-	CLOSE_CALL = 0x00000112,
-	P_UP_D_DOWN = 0x00000113,
-	LUCKY_DAY = 0x00000114,
-	MEGA_H_P_DRAIN = 0x00000115,
-	P_DOWN_D_UP = 0x00000116,
-	POWER_QUAKE = 0x00000117,
-	AUTO_MULTIBOUNCE = 0x00000118,
-	FLOWER_FANATIC = 0x00000119,
-	HEART_FINDER = 0x0000011A,
-	FLOWER_FINDER = 0x0000011B,
-	SPIN_ATTACK = 0x0000011C,
-	DIZZY_ATTACK = 0x0000011D,
-	I_SPY = 0x0000011E,
-	SPEEDY_SPIN = 0x0000011F,
-	BUMP_ATTACK = 0x00000120,
-	POWER_JUMP = 0x00000121,
-	SUPER_JUMP = 0x00000122,
-	MEGA_JUMP = 0x00000123,
-	POWER_SMASH1 = 0x00000124,
-	SUPER_SMASH = 0x00000125,
-	MEGA_SMASH = 0x00000126,
-	POWER_SMASH2 = 0x00000127,
-	POWER_SMASH3 = 0x00000128,
-	DEEP_FOCUS1 = 0x00000129,
-	SUPER_FOCUS = 0x0000012A,
-	SHRINK_SMASH = 0x0000012B,
-	SHELL_CRACK = 0x0000012C,
-	KAIDEN = 0x0000012D,
-	D_DOWN_JUMP = 0x0000012E,
-	SHRINK_STOMP = 0x0000012F,
-	DAMAGE_DODGE_A = 0x00000130,
-	EARTHQUAKE_JUMP = 0x00000131,
-	DEEP_FOCUS2 = 0x00000132,
-	DEEP_FOCUS3 = 0x00000133,
-	H_P_PLUS_B = 0x00000134,
-	F_P_PLUS_B = 0x00000135,
-	HAPPY_HEART_B = 0x00000136,
-	HAPPY_HEART_X = 0x00000137,
-	FLOWER_SAVER_B = 0x00000138,
-	FLOWER_SAVER_X = 0x00000139,
-	DAMAGE_DODGE_B = 0x0000013A,
-	DAMAGE_DODGE_X = 0x0000013B,
-	POWER_PLUS_B = 0x0000013C,
-	POWER_PLUS_X = 0x0000013D,
-	DEFEND_PLUS_X = 0x0000013E,
-	DEFEND_PLUS_Y = 0x0000013F,
-	HAPPY_FLOWER_A = 0x00000140,
-	HAPPY_FLOWER_B = 0x00000141,
-	HAPPY_FLOWER_X = 0x00000142,
-	GROUP_FOCUS = 0x00000143,
-	PEEKABOO = 0x00000144,
-	ATTACK_F_X_D = 0x00000145,
-	ATTACK_F_X_B = 0x00000146,
-	ATTACK_F_X_E = 0x00000147,
-	ATTACK_F_X_C = 0x00000148,
-	ATTACK_F_X_F = 0x00000149,
-	H_P_PLUS_C = 0x0000014A,
-	H_P_PLUS_X = 0x0000014B,
-	H_P_PLUS_Y = 0x0000014C,
-	F_P_PLUS_C = 0x0000014D,
-	F_P_PLUS_X = 0x0000014E,
-	F_P_PLUS_Y = 0x0000014F,
-	HEALTHY_HEALTHY = 0x00000150,
-	ATTACK_F_X_F2 = 0x00000151,
-	ATTACK_F_X_F3 = 0x00000152,
-	ATTACK_F_X_F4 = 0x00000153,
-	ATTACK_F_X_F5 = 0x00000154,
-	PARTNER_ATTACK = 0x00000155,
-	HEART = 0x00000156,
-	COIN = 0x00000157,
-	HEART_PIECE = 0x00000158,
-	STAR_POINT = 0x00000159,
-	FULL_HEAL = 0x0000015A,
-	FLOWER = 0x0000015B,
-	STAR_PIECE = 0x0000015C,
-	PRESENT = 0x0000015D,
-	COMPLETE_CAKE = 0x0000015E,
-	BARE_CAKE = 0x0000015F,
-	EMPTY_CAKE_PAN = 0x00000160,
-	FULL_CAKE_PAN = 0x00000161,
-	EMPTY_MIXING_BOWL = 0x00000162,
-	FULL_MIXING_BOWL = 0x00000163,
-	CAKE_WITH_ICING = 0x00000164,
-	CAKE_WITH_BERRIES = 0x00000165,
-	HAMMER1_ICON = 0x00000166,
-	HAMMER2_ICON = 0x00000167,
-	HAMMER3_ICON = 0x00000168,
-	BOOTS1_ICON = 0x00000169,
-	BOOTS2_ICON = 0x0000016A,
-	BOOTS3_ICON = 0x0000016B,
-	ITEMS_ICON = 0x0000016C
-} Item;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/ability.enum b/papermario/tools/sr_enums/ability.enum
new file mode 100755
index 0000000000..6ffa45c245
--- /dev/null
+++ b/papermario/tools/sr_enums/ability.enum
@@ -0,0 +1,60 @@
+Ability		% namespace
+abilityID	% library name
+false		% reversed
+
+00 = DodgeMaster
+01 = Unused			% the devs skipped 01 for some reason
+02 = SpikeShield
+03 = FirstAttack
+04 = HPPlus
+05 = DoubleDip
+06 = MysteryScroll
+07 = FireShield
+08 = PrettyLucky
+09 = HPDrain
+0A = AllOrNothing
+0B = SlowGo
+0C = FPPlus
+0D = IcePower
+0E = FeelingFine
+0F = AttackFX
+10 = MoneyMoney
+11 = ChillOut
+12 = HappyHeart
+13 = ZapTap
+14 = MegaRush
+15 = Berserker
+16 = RightOn
+17 = RunawayPay
+18 = FlowerSaver
+19 = PayOff
+1A = QuickChange
+1B = DefendPlus
+1C = PowerPlus
+1D = Refund
+1E = PowerRush
+1F = CrazyHeart
+20 = LastStand
+21 = CloseCall
+22 = PUpDDown
+23 = LuckyDay
+24 = MegaHPDrain
+25 = PDownDUp
+26 = FlowerFanatic
+27 = SpeedySpin
+28 = SpinAttack
+29 = ISpy
+2A = BumpAttack
+2B = HeartFinder
+2C = FlowerFinder
+2D = DizzyAttack
+2E = FinalGoompa
+2F = FinalBombomb
+30 = DeepFocus
+31 = SuperFocus
+32 = Kaiden
+33 = DamageDodge
+34 = HappyFlower
+35 = GroupFocus
+36 = Peekaboo
+37 = HealthyHealthy
diff --git a/papermario/tools/sr_enums/action_states.enum b/papermario/tools/sr_enums/action_states.enum
new file mode 100755
index 0000000000..0692d079b5
--- /dev/null
+++ b/papermario/tools/sr_enums/action_states.enum
@@ -0,0 +1,42 @@
+ActionState		% namespace
+actionStateID 	% library name
+false			% reversed
+
+% Current player action state, stored at 8010F07C
+
+00 = Idle
+01 = Walk
+02 = Run
+03 = Jump
+04 = Bounce			% used with kooper
+05 = AbortedJump	% aka Hop; released A before apex of jump
+06 = Launch			% Jack-in-the-boxes in the Toybox
+
+08 = Falling
+09 = StepDown
+0A = Land
+0B = StepDownLand
+0C = Conversation	% Reading signs doesn't count
+0D = SpinJump
+0E = GroundPound
+
+0F = UltraJump
+10 = UltraPound
+11 = Sliding
+12 = Hammer
+
+15 = HitHazard
+% 16 = TouchLava / 17 = ReactLava?
+17 = HitLava
+
+1A = Spin
+1B = EnemyFirstStrike
+
+1D = SpinningFlower
+
+1F = UseTweester
+
+21 = Ride			% Parakarry, Sushie, Lakilester, Bow
+22 = StepUp
+
+26 = UseSpring
diff --git a/papermario/tools/sr_enums/actor.enum b/papermario/tools/sr_enums/actor.enum
new file mode 100755
index 0000000000..e6ffb2c0f2
--- /dev/null
+++ b/papermario/tools/sr_enums/actor.enum
@@ -0,0 +1,31 @@
+Actor	% namespace
+actorID	% library name
+false	% reversed
+
+FFFFFF81 = Self
+00000000 = Player
+00000100 = Partner
+00000200 = Enemy0
+00000201 = Enemy1
+00000202 = Enemy2
+00000203 = Enemy3
+00000204 = Enemy4
+00000205 = Enemy5
+00000206 = Enemy6
+00000207 = Enemy7
+00000208 = Enemy8
+00000209 = Enemy9
+0000020A = Enemy10
+0000020B = Enemy11
+0000020C = Enemy12
+0000020D = Enemy13
+0000020E = Enemy14
+0000020F = Enemy15
+00000210 = Enemy16
+00000211 = Enemy17
+00000212 = Enemy18
+00000213 = Enemy19
+00000214 = Enemy20
+00000215 = Enemy21
+00000216 = Enemy22
+00000217 = Enemy23
diff --git a/papermario/tools/sr_enums/actor_sounds.enum b/papermario/tools/sr_enums/actor_sounds.enum
new file mode 100755
index 0000000000..76d59839c5
--- /dev/null
+++ b/papermario/tools/sr_enums/actor_sounds.enum
@@ -0,0 +1,10 @@
+ActorSound	% namespace
+actorSound	% library name
+false	% reversed
+
+0 = Walk
+1 = Fly
+2 = Jump
+3 = Hurt
+4 = WalkIncrement
+5 = FlyIncrement
diff --git a/papermario/tools/sr_enums/ambient_sounds.enum b/papermario/tools/sr_enums/ambient_sounds.enum
new file mode 100755
index 0000000000..1429f86586
--- /dev/null
+++ b/papermario/tools/sr_enums/ambient_sounds.enum
@@ -0,0 +1,19 @@
+AmbientSounds	% namespace
+ambientSFX 		% library name
+false			% reversed
+
+00 = Spooky
+01 = Wind
+02 = Beach
+03 = Jungle
+04 = UnderSea1
+05 = UnderSea2
+06 = Silence
+07 = UnderSea3
+08 = UnderSea4
+09 = ExitSea
+0A = UnderSea5
+0B = UnderSea6
+0C = Birds
+0D = Sea
+10 = Music
diff --git a/papermario/tools/sr_enums/animations.enum b/papermario/tools/sr_enums/animations.enum
new file mode 100755
index 0000000000..ea46c0c0f3
--- /dev/null
+++ b/papermario/tools/sr_enums/animations.enum
@@ -0,0 +1,39 @@
+Anim	% namespace
+anim	% library name
+false	% reversed
+
+00950000 = WhiteBoo-Stop
+00950001 = WhiteBoo-Idle
+00950002 = WhiteBoo-Walk
+00950003 = WhiteBoo-Run
+00950004 = WhiteBoo-Talk
+00950005 = WhiteBoo-Wave
+00950006 = WhiteBoo-Pain
+00950007 = WhiteBoo-Hide
+00950008 = WhiteBoo-Spook
+00950009 = WhiteBoo-Denying
+0095000A = WhiteBoo-Skeptical
+0095000B = WhiteBoo-Throw
+0095000C = WhiteBoo-CarryingStop
+0095000D = WhiteBoo-CarryingIdle
+0095000E = WhiteBoo-CarryingWalk
+0095000F = WhiteBoo-CarryingRun
+00950010 = WhiteBoo-CarryingShake
+
+00950100 = DustyBoo-Stop
+00950101 = DustyBoo-Idle
+00950102 = DustyBoo-Walk
+00950103 = DustyBoo-Run
+00950104 = DustyBoo-Talk
+00950105 = DustyBoo-Wave
+00950106 = DustyBoo-Pain
+00950107 = DustyBoo-Hide
+00950108 = DustyBoo-Spook
+00950109 = DustyBoo-Denying
+0095010A = DustyBoo-Skeptical
+0095010B = DustyBoo-Throw
+0095010C = DustyBoo-CarryingStop
+0095010D = DustyBoo-CarryingIdle
+0095010E = DustyBoo-CarryingWalk
+0095010F = DustyBoo-CarryingRun
+00950110 = DustyBoo-CarryingShake
diff --git a/papermario/tools/sr_enums/cameras.enum b/papermario/tools/sr_enums/cameras.enum
new file mode 100755
index 0000000000..c0f738d836
--- /dev/null
+++ b/papermario/tools/sr_enums/cameras.enum
@@ -0,0 +1,8 @@
+Cam		% namespace
+camID	% library name
+false	% reversed
+
+0 = Default
+1 = Battle	% only used with ShakeCam
+2 = Tattle
+3 = Cam3
diff --git a/papermario/tools/sr_enums/decorations.enum b/papermario/tools/sr_enums/decorations.enum
new file mode 100755
index 0000000000..835417f5fd
--- /dev/null
+++ b/papermario/tools/sr_enums/decorations.enum
@@ -0,0 +1,13 @@
+Decoration	% namespace
+decoration	% library name
+false		% reversed
+
+1 = GoldenFlames
+2 = Sweat
+3 = SeeingStars
+4 = RedFlames
+5 = GreySmokeTrail
+6 = FireSmokeTrail % really cool
+7 = Whirlwind
+8 = SteamEmitter
+B = RadialStarEmitter
diff --git a/papermario/tools/sr_enums/door_sounds.enum b/papermario/tools/sr_enums/door_sounds.enum
new file mode 100755
index 0000000000..f7e3493831
--- /dev/null
+++ b/papermario/tools/sr_enums/door_sounds.enum
@@ -0,0 +1,11 @@
+DoorSounds	% namespace
+doorSFX 	% library name
+false		% reversed
+
+0 = Basic
+1 = Metal
+2 = Large
+3 = Creaky
+4 = Gate
+% 5 = door to peach's balcony
+% 6 = unused?
diff --git a/papermario/tools/sr_enums/door_swings.enum b/papermario/tools/sr_enums/door_swings.enum
new file mode 100755
index 0000000000..3fc34c0187
--- /dev/null
+++ b/papermario/tools/sr_enums/door_swings.enum
@@ -0,0 +1,6 @@
+DoorSwing	% namespace
+doorSwing 	% library name
+false		% reversed
+
+ 1 = In
+-1 = Out
diff --git a/papermario/tools/sr_enums/easing.enum b/papermario/tools/sr_enums/easing.enum
new file mode 100755
index 0000000000..874c620ebe
--- /dev/null
+++ b/papermario/tools/sr_enums/easing.enum
@@ -0,0 +1,22 @@
+Easing	% namespace
+easing	% library name
+false	% reversed
+
+% Notes from MoveSpriteTo (func_8027BF38)
+% (0-D used as an index to jump table by func_8027B0DC)	=> script[7C]
+% t = current frame (S1), d = duration (S0)
+% also have A (F24), B (F26), and L = B - A
+
+0 = Linear 				% (no easing)
+1 = QuadraticIn
+2 = CubicIn
+3 = QuarticIn
+4 = QuadraticOut		% A + L * (1-((d-t)/d)^2)
+5 = CubicOut
+6 = QuarticOut
+7 = CosSlowOvershoot	% B - L * ((d-t)/d)^2 * cos(4*pi*(t/d))
+8 = CosFastOvershoot	% B - L * ((d-t)/d)^2 * cos(4*pi*(t^2/15*d))
+9 = CosBounce			% B - L * abs((d-t)/d)^2 * cos(4*pi*(t^2/40*d))
+A = CosInOut			% A + (L/2) * (1 - cos(pi*(t/d)))
+B = SinOut				% A + L * sin((pi/2)*(t/d))
+C = CosIn				% A + L * (1 - cos((pi/2)*(t/d)))
diff --git a/papermario/tools/sr_enums/elements.enum b/papermario/tools/sr_enums/elements.enum
new file mode 100755
index 0000000000..f26e6449b1
--- /dev/null
+++ b/papermario/tools/sr_enums/elements.enum
@@ -0,0 +1,18 @@
+Element	% namespace
+element	% library name
+true	% reversed
+
+Normal   = 1
+Fire     = 2
+Water    = 3
+Ice      = 4
+Mystery  = 5
+Magic    = 7
+Hammer   = 8
+Jump     = 9
+Cosmic   = A
+Blast    = B
+Shock    = C
+Quake    = D
+Throw    = F
+End      = 0
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/emotes.enum b/papermario/tools/sr_enums/emotes.enum
new file mode 100755
index 0000000000..96e9e921d0
--- /dev/null
+++ b/papermario/tools/sr_enums/emotes.enum
@@ -0,0 +1,10 @@
+Emote	% namespace
+emote	% library name
+false	% reversed
+
+0 = Exclamation
+1 = Shock
+2 = Question
+3 = Frustration
+4 = Ellipsis
+5 = Invalid
diff --git a/papermario/tools/sr_enums/encounter_trigger.enum b/papermario/tools/sr_enums/encounter_trigger.enum
new file mode 100755
index 0000000000..ff21f3a05f
--- /dev/null
+++ b/papermario/tools/sr_enums/encounter_trigger.enum
@@ -0,0 +1,9 @@
+EncounterTrigger	% namespace
+encounterTrigger	% library name
+false				% reversed
+
+1 = None	% neutral/enemy first strike
+2 = Jump
+3 = Spin	% spin/dizzy attack
+4 = Hammer
+6 = Partner % kooper/bombette
diff --git a/papermario/tools/sr_enums/entities.enum b/papermario/tools/sr_enums/entities.enum
new file mode 100755
index 0000000000..f4dde16ccd
--- /dev/null
+++ b/papermario/tools/sr_enums/entities.enum
@@ -0,0 +1,83 @@
+Entity	% namespace
+entity	% library name
+true	% reversed
+
+SavePoint                = 802E9A18
+RedSwitch                = 802E9BB0
+BlueSwitch               = 802E9BD4
+HugeBlueSwitch           = 802E9BF8
+GreenStompSwitch         = 802E9C1C
+MultiTriggerBlock        = 802EA07C
+BrickBlock               = 802EA0C4
+MultiCoinBrick           = 802EA0E8
+Hammer1Block             = 802EA10C
+Hammer1BlockWide         = 802EA130  % Wider collision box.
+Hammer1BlockThick        = 802EA154  % Thicker collision box.
+Hammer1BlockTiny         = 802EA178  % Same size as a normal item block.
+Hammer2Block             = 802EA19C
+Hammer2BlockWide         = 802EA1C0  % Wider collision box.
+Hammer2BlockThick        = 802EA1E4  % Thicker collision box.
+Hammer2BlockTiny         = 802EA208  % Same size as a normal item block.
+Hammer3Block             = 802EA22C
+Hammer3BlockWide         = 802EA250  % Unused in vanilla
+Hammer3BlockThick        = 802EA274  % Thicker collision box.
+Hammer3BlockTiny         = 802EA298  % Same size as a normal item block.
+PowBlock                 = 802EA2E0  
+YellowBlock              = 802EA564
+HiddenYellowBlock        = 802EA588
+RedBlock                 = 802EA5AC
+HiddenRedBlock           = 802EA5D0
+SingleTriggerBlock       = 802EA5F4  % Triggers events when hit. Bind with ASSIGN_SCRIPT, see isk_07 for usage.
+HealingBlock             = 802EA7E0
+SuperBlock               = 802EA910
+ScriptSpring             = 802EAA30
+SimpleSpring             = 802EAA54
+HiddenPanel              = 802EAB04
+GiantChest               = 802EAE0C
+Chest                    = 802EAE30
+BlueWarpPipe             = 802EAF80
+WoodenCrate              = 802EAED4
+Signpost                 = 802EAFDC
+
+Padlock                  = 802BCD68
+PadlockRedFrame          = 802BCD8C % light red frame around lock, unused in vanilla
+PadlockRedFace           = 802BCDB0 % dark red front plate, unused in vanilla
+PadlockBlueFace          = 802BCDD4 % dark blue front plate, unused in vanilla
+BoardedFloor             = 802BCE84 
+BombableRock1            = 802BCF00
+BombableRock2            = 802BCF24
+
+CymbalPlant              = 802BC788
+PinkFlower               = 802BC7AC
+SpinningFlower           = 802BC7F4
+BellbellPlant            = 802BCBD8
+TrumpetPlant             = 802BCBFC
+SpongyFlower             = 802BCC20
+RedArrowSigns            = 802BCD9C
+
+Tweester                 = 802BCA74
+StarBoxLaucher           = 802BCB44
+
+/%
+Bonus Entities:
+802E9C8C = ShatteringHammer1Block
+802E9CB0 = ShatteringHammer2Block
+802E9CD4 = ShatteringHammer3Block
+802E9CF8 = ShatteringHammer1BlockTiny
+802E9D1C = ShatteringHammer2BlockTiny
+802E9D40 = ShatteringHammer3BlockTiny
+802E9D64 = ShatteringBrickBlock
+
+802EA0A0 = InactiveMultiTriggerBlock? (but its red?)
+802EA2BC = PushBlock
+
+802EA618 = VanishingYellowBlock1
+802EA63C = VanishingYellowBlock2
+802EA660 = VanishingRedBlock1
+
+802EA77C = crash
+802EA7BC = HealingBlockHitEffect
+802EA934 = SuperBlockHitEffect1
+802EA958 = RedSuperBock (no scripts)
+802EA97C = SuperBlockHitEffect2
+%/
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/events.enum b/papermario/tools/sr_enums/events.enum
new file mode 100755
index 0000000000..a1f7fddce1
--- /dev/null
+++ b/papermario/tools/sr_enums/events.enum
@@ -0,0 +1,63 @@
+Event	% namespace
+event	% library name
+false	% reversed
+
+19 = Immune
+
+09 = HitCombo		% Used during a multiple-hit attack (Bow's Smack, successful Jump) for every hit except the last, ie: 09-09-09-09-0A (Bow's Smack).
+0A = Hit
+
+20 = Death
+
+0C = FallTrigger	% Activated by flag 00004000, fired when Mario jumps on an enemy. Used for flying enemies that fall down.
+0D = FlipTrigger	% Activated by flag 00001000, fired when Mario jumps on an enemy or uses a quake attack.
+
+22 = ExplodeTrigger	% Activated by flag 00000200, fired by Bombette's bomb attacks or fire-based attacks. Used only by Bobomb.
+
+% 17 = UnknownTrigger, probably activated by flag 00000100 (used only by Monstar) -- no, found in Embers as well (Area HOS).
+
+0B = SpinSmashHit		% Fired when hit by Spin Smash (used by Chain Chomp)
+21 = SpinSmashDeath		% Fired when killed by Spin Smash (used by Chain Chomp)
+
+11 = SpinSmashLaunchHit		% Fired when hit by something launched by a Spin Smash (used by Pokey)
+15 = SpinSmashLaunchDeath	% Fired when killed by something launched by Spin Smash (used by Pokey)
+
+15 = PowerBounceHit		% Activated by flag 00100000, fired when hit by Power Bounce
+28 = PowerBounceDeath	% Activated by flag 00100000, fired when killed by Power Bounce
+
+0E = BurnHit			% Fired by explosions and fiery attacks
+24 = BurnDeath			% Fired by explosions and fiery attacks, and when the player dies from jumping on a fiery enemy
+
+2F = ShockHit			% Fired by hitting electrified actor (not from electric attacks)
+26 = ShockDeath			% Only fired by hitting electrified player
+
+3A = BeginAirLift		% Fired when Airlift begins
+1F = AirLiftFailed		% Fired after Airlift fails
+16 = BlowAway			% Fired by Airlift and Hurricane
+
+39 = ScareAway			% Fired by Fright Jar and Spook
+
+3D = UpAndAway
+13 = StarBeam
+
+31 = RecoverStatus	% Fired after recovering from a status effect
+3F = SwapPartner	% Fired to the new partner, has broader unknown applications (see Tubba Blubba rematch at end of turn)
+
+1A = Block			% Fired to the player on a successful block
+
+% The following events are fired when the player jumps on a spiky enemy
+2A = SpikeContact	% Fired to the player
+27 = SpikeDeath		% Fired to the player
+1B = SpikeTaunt		% Fired to the enemy
+
+2C = BurnContact	% Fired to the player
+% 24 = FireDeath	% Fired to the player
+1C = BurnTaunt		% Fired to the enemy
+
+38 = BeginFirstStrike	% Fired just before the screen fades in following a player first strike
+35 = EndFirstStrike		% Fired after the player's first strike move is finished
+
+40 = LifeShroomProc
+41 = Revive
+
+37 = Lucky
diff --git a/papermario/tools/sr_enums/hit_result.enum b/papermario/tools/sr_enums/hit_result.enum
new file mode 100755
index 0000000000..12ce0986c9
--- /dev/null
+++ b/papermario/tools/sr_enums/hit_result.enum
@@ -0,0 +1,12 @@
+HitResult	% namespace
+hitResult	% library name
+false		% reversed
+
+00 = Hit
+% 02 = ???
+04 = LandedOnSpike
+05 = Lucky
+06 = Miss
+07 = HitStatic
+08 = Immune
+-1 = TriggeredExplode
diff --git a/papermario/tools/sr_enums/hit_sound.enum b/papermario/tools/sr_enums/hit_sound.enum
new file mode 100755
index 0000000000..ae554f33fd
--- /dev/null
+++ b/papermario/tools/sr_enums/hit_sound.enum
@@ -0,0 +1,10 @@
+HitSound	% namespace
+hitSound	% library name
+false		% reversed
+
+00 = Miss
+01 = Bones
+02 = Normal
+03 = Fire
+04 = Ice
+05 = Shock
diff --git a/papermario/tools/sr_enums/item_spawn_modes.enum b/papermario/tools/sr_enums/item_spawn_modes.enum
new file mode 100755
index 0000000000..7a0b40c82b
--- /dev/null
+++ b/papermario/tools/sr_enums/item_spawn_modes.enum
@@ -0,0 +1,41 @@
+ItemSpawnMode	% namespace
+itemSpawnMode 	% library name
+false		% reversed
+
+% Items may...
+% ...SpawnOnce, never giving another chance to obtain.
+% ...SpawnAlways, ignoring any flag assigned to the item.
+% ...spawn if not picked up (implicit), and being flagged when the player picks them up.
+% ...Fall, Toss, shoot out of an ItemBlock, or remaind Fixed in place.
+% ...disappear a short time after spawning: either vanish (implicit) or NeverVanish
+% Tossed items either have an initial velocity of 12, 14 (High), or 16 (Higher).
+
+% 00 = Nothing special, very similar to Fixed_SpawnAlways. 
+01 = Decoration             % used for non-obtainable items like shop items and items NPCs carry
+% 02 = Invisible/Inactive
+03 = Toss_SpawnAlways       % used for discarding items and coin loss from fleeing battles
+04 = BattleReward           % coins, hearts, flowers, items; could also be called 'Toss_High_AlwaysSpawn'
+05 = Toss_NeverVanish       % used for key items in bushes
+06 = Toss                   % used for items in bushes
+07 = Toss_SpawnOnce         % used for coins in bushes
+08 = Toss_SpawnOnce_NeverVanish
+09 = Toss_SpawnAlways_NeverVanish
+0A = ItemBlock_Item         %
+0B = ItemBlock_Badge        %
+0C = Fall_SpawnAlways       % used for berries in flo trees
+0D = Fall_NeverVanish       % used for key items in trees
+0E = Fall                   % used for items in trees
+0F = Fall_SpawnOnce         % used for coins in trees
+10 = Fixed_SpawnAlways
+11 = Fixed_NeverVanish
+12 = Fixed
+13 = Fixed_SpawnAlways_NeverVanish
+14 = ItemBlock_SpawnAlways  % used for items in item blocks
+15 = ItemBlock_Coin         % used for coins in item blocks
+16 = Toss_Higher_NeverVanish
+% 17 = Toss_Fade1
+% 18 = Toss_Fade2	high initial velocity
+% 19 = Toss_Fade3	
+1A = Toss_SpawnAlways_Small
+% 1B = 
+
diff --git a/papermario/tools/sr_enums/items.enum b/papermario/tools/sr_enums/items.enum
old mode 100644
new mode 100755
diff --git a/papermario/tools/sr_enums/locations.enum b/papermario/tools/sr_enums/locations.enum
new file mode 100755
index 0000000000..8b45262f5a
--- /dev/null
+++ b/papermario/tools/sr_enums/locations.enum
@@ -0,0 +1,40 @@
+Location	% namespace
+location	% library name
+false		% reversed
+
+18 = None
+17 = Testing
+01 = ToadTown
+19 = PeachCastleGrounds
+1B = ShootingStarSummit
+02 = ToadTownTunnels
+1E = GoombaVillage
+1F = GoombaRoad
+20 = PleasantPath
+21 = KoopaVillage
+07 = KoopaBrosFortress
+08 = MtRugged
+0A = DryDryDesert
+09 = DryDryOutpost
+0B = DryDryRuins
+0C = ForeverForest
+0D = BoosMansion
+22 = GustyGulch
+0F = TubbasManor
+23 = WindyMill
+10 = ShyGuysToybox
+24 = JadeJungle
+25 = YoshisVillage
+12 = MtLavalava
+26 = FlowerFields
+27 = CloudyClimb
+28 = ShiverCity
+29 = ShiverSnowfield
+2A = StarbornValley
+2B = ShiverMountain
+15 = CrystalPalace
+1C = StarWay
+1D = StarHaven
+16 = BowsersCastle
+1A = PeachsCastle
+2C = MariosHouse
diff --git a/papermario/tools/sr_enums/npcs.enum b/papermario/tools/sr_enums/npcs.enum
new file mode 100755
index 0000000000..f965c844de
--- /dev/null
+++ b/papermario/tools/sr_enums/npcs.enum
@@ -0,0 +1,7 @@
+Npc		% namespace
+npcID	% library name
+false	% reversed
+
+FFFFFFFF = Self
+FFFFFFFE = Player
+FFFFFFFC = Partner
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/outcomes.enum b/papermario/tools/sr_enums/outcomes.enum
new file mode 100755
index 0000000000..570c86f255
--- /dev/null
+++ b/papermario/tools/sr_enums/outcomes.enum
@@ -0,0 +1,8 @@
+Outcome	% namespace
+outcome	% library name
+false	% reversed
+
+00 = PlayerWon
+01 = PlayerLost
+02 = PlayerFled
+03 = EnemyFled
diff --git a/papermario/tools/sr_enums/partners.enum b/papermario/tools/sr_enums/partners.enum
new file mode 100755
index 0000000000..f4fd5f4420
--- /dev/null
+++ b/papermario/tools/sr_enums/partners.enum
@@ -0,0 +1,16 @@
+Partner		% namespace
+partnerID	% library name
+false		% reversed
+
+0 = None
+1 = Goombario
+2 = Kooper
+3 = Bombette
+4 = Parakarry
+5 = Goompa
+6 = Watt
+7 = Sushie
+8 = Lakilester
+9 = Bow
+A = Goombaria
+B = Twink
diff --git a/papermario/tools/sr_enums/phases.enum b/papermario/tools/sr_enums/phases.enum
new file mode 100755
index 0000000000..a5b95463b7
--- /dev/null
+++ b/papermario/tools/sr_enums/phases.enum
@@ -0,0 +1,31 @@
+Phase		% namespace
+battlePhase	% library name
+false		% reversed
+
+00 = ExecuteAction	% do whatever the player/partner has selected
+01 = FirstStrike
+
+03 = RunAwayStart
+04 = RunAwayReset
+07 = RunAwayFail
+06 = UseDefend
+
+08 = UseLifeShroom
+
+0A = PlayerBegin
+0D = PlayerEnd
+0C = EnemyBegin
+0B = EnemyEnd
+
+14 = MerleeAttackBonus
+15 = MerleeDefenseBonus
+16 = MerleeExpBonus
+
+1E = PlayerHappy
+
+/%
+03 = ? (used by player/partners)
+05 = ? (used by player/partners)
+
+16 = ? (used by player)
+%/
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/player_animations.enum b/papermario/tools/sr_enums/player_animations.enum
new file mode 100755
index 0000000000..d19ecf14f1
--- /dev/null
+++ b/papermario/tools/sr_enums/player_animations.enum
@@ -0,0 +1,49 @@
+PlayerAnim	% namespace
+playerAnim	% library name
+false		% reversed
+
+00010000 = StandStill
+00010001 = CrouchStill
+00010003 = Panting
+00010004 = Walking
+00010005 = Running
+00010006 = BeforeJump
+00010007 = MidairStill
+00010008 = Midair
+
+0001000E = StunnedStill
+0001000F = DeadStill
+
+00010011 = Spinning
+00010012 = Flailing
+00010013 = SitStill
+00010014 = Crouch
+00010015 = StoneStill
+00010016 = Throw
+
+00010017 = FallBack
+00010018 = FallDown
+00010019 = Scared
+0001001A = HurtFoot
+0001001B = RunPanic
+0001001C = Eat
+0001001D = StickOutTongue
+0001001E = Plant
+0001001F = GotItem
+00010020 = ReadyJump
+00010021 = Thinking
+00010022 = LostBalance
+00010023 = ShockStill
+
+00010025 = Drink
+00010026 = Squish
+00010027 = RunThinking
+00010028 = Question
+00010029 = NodYes
+
+0001002C = Pray
+
+0001002F = Charred
+00010030 = GetUp
+00010031 = DustOff
+00010032 = ThumbsUp
diff --git a/papermario/tools/sr_enums/songs.enum b/papermario/tools/sr_enums/songs.enum
new file mode 100755
index 0000000000..5d41c8919b
--- /dev/null
+++ b/papermario/tools/sr_enums/songs.enum
@@ -0,0 +1,159 @@
+Song	% namespace
+songID	% library name
+false	% reversed
+
+00 = ToadTown
+% 01 = GoombaVillageCopy
+02 = NormalBattle
+03 = SpecialBattle
+04 = JrTroopaBattle
+05 = FinalBowserBattle
+% 06 = GoombaVillageCopy
+07 = GoombaKingBattle
+08 = KoopaBrosBattle
+09 = FakeBowserBattle
+0A = TutankoopaBattle
+0B = TubbaBlubbaBattle
+0C = GeneralGuyBattle
+0D = LavaPiranhaBattle
+0E = HuffNPuffBattle
+0F = CrystalKingBattle
+10 = GoombaVillage
+11 = PleasantPath
+12 = FuzzyAttack
+13 = KoopaVillage
+14 = KoopaFortress
+15 = DryDryOutpost
+16 = MtRugged
+17 = DryDryDesert
+18 = DryDryRuins
+19 = RuinsBasement
+1A = ForeverForest
+1B = BoosMansion
+1C = CheerfulBoosMansion
+1D = GustyGulch
+1E = TubbasManor
+1F = TubbaEscape
+
+20 = ShyGuyToybox
+21 = ToyboxTrain
+22 = CreepyToybox
+% 23 = GoombaVillageCopy
+24 = JadeJungle
+25 = DeepJungle
+26 = YoshisVillage
+27 = YoshisPanic
+28 = RaphaelRaven
+29 = MtLavalava
+2A = VolcanoEscape
+2B = StarWayOpens
+2C = MasterBattle
+2D = RadioIslandSounds
+2E = RadioHotHits
+2F = RadioGoldenOldies
+30 = FlowerFieldsCloudy
+31 = FlowerFieldsSunny
+32 = CloudyClimb
+33 = PuffPuffMachine
+34 = SunTowerCloudy
+35 = SunTowerSunny
+% 36 = GoombaVillageCopy
+37 = CrystalPalace
+38 = ShiverCity
+39 = PenguinMystery
+3A = ShiverSnowfield
+3B = ShiverMountain
+3C = StarbornValley
+3D = MerlarTheme
+3E = MailCall
+3F = PeachsCastleParty
+
+40 = ChapterEnd
+41 = ChapterStart % followed by original mario theme
+42 = ItemUpgrade
+% 43 = GoombaVillageCopy
+44 = PhonographMusic
+45 = TutankoopaTheme
+46 = KammyKoopaTheme
+47 = JrTroopaTheme
+48 = BulletBillAssault
+49 = MontyMoleAssault
+4A = ShyGuyInvasion % basically a sped up toad town theme
+4B = ToadTownTunnels
+4C = WhaleTheme
+4D = ForeverForestWarning
+4E = YoshiKidsFound
+4F = UnusedFanfare
+50 = GoombaKingTheme
+51 = KoopaBrosInterlude
+52 = KoopaBrosTheme
+53 = TutankoopaWarning
+54 = TutankoopaRevealed
+55 = TubbaBlubbaTheme
+56 = GeneralGuyTheme
+57 = LavaPiranhaTheme
+58 = HuffNPuffTheme
+59 = CrystalKingTheme
+5A = BlooperTheme
+5B = MinibossBattle		% OR miniboss theme?
+5C = MonstarTheme
+5D = Club64
+5E = UnusedOpening
+5F = BowsersCastleFalls
+
+60 = StarHaven
+61 = ShootingStarSummit
+62 = StarshipTheme
+63 = StarSanctuary
+64 = BowsersCastle
+65 = BowsersCastleCaves
+66 = BowserTheme
+67 = BowserBattle
+68 = PeachWishes
+69 = FileSelect
+6A = MainTheme
+6B = BowserAttacks
+6C = MarioFalls
+6D = PeachAppears
+6E = TheEnd
+6F = RecoveredStarRod
+70 = TwinkTheme
+71 = StirringCake
+72 = GourmetGuyFreakout
+73 = PrisonerPeachTheme
+74 = PeachMission
+75 = PeachSneaking
+76 = PeachCaught
+77 = PeachQuizIntro
+78 = StarSpiritTheme
+79 = PenguinWhodunit
+7A = PenguinWakesUp
+7B = MagicBeanstalk
+7C = MerleeSpell
+7D = LakilesterTheme
+7E = GoombaBrosRetreat
+7F = SunshineReturns
+
+80 = RidingTheRails
+81 = RidingTheWhale
+82 = NewPartner
+83 = DryDryRuinsAppear
+84 = CandyCanes
+85 = Playroom
+86 = MoustafaTheme
+87 = GameOver
+88 = TakingRest
+89 = FlowerNPCTheme
+8A = FlowerGateAppears
+8B = BattleEnd
+8C = PopDivaSong
+8D = BooMinigame
+8E = LevelUp
+% 8F = GoombaVillageCopy
+90 = ParadeDay
+91 = ParadeNight
+% 92 = GoombaVillageCopy
+% 93 = GoombaVillageCopy
+94 = MarioBrosHouse
+95 = IntroStory
+96 = NewPartnerJP
diff --git a/papermario/tools/sr_enums/sounds.enum b/papermario/tools/sr_enums/sounds.enum
new file mode 100755
index 0000000000..2c7b7b9ba8
--- /dev/null
+++ b/papermario/tools/sr_enums/sounds.enum
@@ -0,0 +1,89 @@
+Sound	% namespace
+soundID	% library name
+false	% reversed
+
+% 043 = RunningWater
+
+045 = JrTroopaSplash
+046 = JrTroopaSwim
+047 = BooSpook
+
+0C1 = BooVanish
+0C3 = BooAppear
+
+0C5 = MenuOpen
+0C6 = MenuClose
+0C7 = MenuChangeSelection
+0C8 = MenuChangeTab
+0C9 = MenuNext
+0CA = MenuBack
+
+141 = Step1
+142 = Step2
+
+147 = TornadoJump
+148 = SoftLand
+
+14B = Land
+14E = HitBlock
+
+153 = SearchBush
+
+1C1 = BasicDoorOpen
+1C2 = BasicDoorClose
+1C3 = MetalDoorOpen
+1C4 = MetalDoorClose
+1C5 = LargeDoorOpen
+1C6 = LargeDoorClose
+1C7 = CreakyDoorOpen
+1C8 = CreakyDoorClose
+1C9 = MetalGateOpen
+1CA = MetalGateClose
+
+291 = BowSpook
+
+% 2C1 = high jump?
+2CD = SmokeBurst
+
+2D7 = DayzeeSong
+2D8 = PowerUp
+
+
+
+30C = ShyGuyScreams1
+30D = ShyGuyScreams2
+30E = ShyGuyScreams3
+30F = ToyTankMove1
+310 = ToyTankMove2
+395 = GeneralWhistle
+
+321 = MoleSurface
+322 = MoleDig
+323 = MolePop
+
+3E2 = Jump
+3E3 = MissJump	% or tripping
+
+3E5 = Death
+3E6 = BigPowerUp
+
+3E8 = MoleThrow
+
+2FF = CloseShell
+3D4 = OpenShell
+
+200E = BowVanish
+200F = BowAppear
+
+2016 = Cannon1
+2017 = Cannon2
+2018 = Cannon3
+
+2081 = Jump
+2076 = BombBlast
+
+20D4 = SpellCast1 % buff
+20D5 = SpellCast2 % shapes
+20D6 = SpellCast3
+20D7 = SpellCast4 % spooky
+20D8 = SpellCast5 % declining
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/sprites.enum b/papermario/tools/sr_enums/sprites.enum
new file mode 100755
index 0000000000..e1f0a00f3f
--- /dev/null
+++ b/papermario/tools/sr_enums/sprites.enum
@@ -0,0 +1,237 @@
+Sprite		% namespace
+spriteID	% library name
+false		% reversed
+
+01 = WorldGoombario
+02 = WorldKooper
+03 = WorldBombette
+04 = WorldParakarry
+05 = WorldBow
+06 = WorldWatt
+07 = WorldSushi
+08 = WorldLakilester
+09 = BattleGoombario
+0A = BattleKooper
+0B = BattleBombette
+0C = BattleParakarry
+0D = BattleBow
+0E = BattleWatt
+0F = BattleSushi
+10 = BattleLakilester
+11 = KooperWithoutShell
+12 = WorldEldstar
+13 = WorldMamar
+14 = WorldSkolar
+15 = WorldMuskular
+16 = WorldMisstar
+17 = WorldKlevar
+18 = WorldKalmar
+19 = BattleEldstar
+1A = BattleMamar
+1B = BattleSkolar
+1C = BattleMuskular
+1D = BattleMisstar
+1E = BattleKlevar
+1F = BattleKalmar
+20 = Twink
+21 = JrTroopa
+22 = SpikedJrTroopa
+23 = SpikedParaJrTroopa
+24 = MageJrTroopa
+25 = ParaJrTroopa
+26 = Goomba
+27 = SpikedGoomba
+28 = Paragoomba
+29 = KoopaTroopa
+2A = ParaTroopa
+2B = Fuzzy
+2C = Bombomb
+2D = BulletBill
+2E = BillBlaster
+2F = MontyMole
+30 = Cleft
+31 = Pokey
+32 = Bandit
+33 = BuzzyBeetle
+34 = Swooper
+35 = StoneChomp
+36 = PutridPiranha
+37 = PiranhaPlant
+38 = Sentinel
+39 = WorldClubba
+3A = BattleClubba
+3B = ShyGuy
+3C = GrooveGuy
+3D = SkyGuy
+3E = PyroGuy
+3F = SpyGuy
+40 = MediGuy
+41 = Fuzzipede
+42 = JungleGuy
+43 = HeartPlant
+44 = HurtPlant
+45 = MBush
+46 = Bubble
+47 = KentCKoopa
+48 = Dayzee
+49 = Lakitu
+4A = Spiny
+4B = Bzzap
+4C = RuffPuff
+4D = SpikeTop
+4E = Duplighost
+4F = AlbinoDino
+50 = Blooper
+51 = BabyBlooper
+52 = Gulpit
+53 = DryBones
+54 = ThrownBone
+55 = BonyBeetle
+56 = Magikoopa
+57 = FlyingMagikoopa
+58 = WorldKoopatrol
+59 = Koopatrol
+5A = HammerBros
+5B = BushBasic
+5C = BushBlocky
+5D = BushDry
+5E = BushLeafy
+5F = BushMatted
+60 = WorldKammy
+61 = BattleKammy
+62 = GoombaBros
+63 = GoombaKing
+64 = SpikyGoomnut
+65 = DarkToad
+66 = KoopaBros
+67 = Buzzar
+68 = Tutankoopa
+69 = ChainChomp
+6A = WorldTubba
+6B = BattleTubba
+6C = TubbasHeart
+6D = BigLanternGhost
+6E = ShySquadGuy
+6F = MarshalGuy
+70 = StiltGuy
+71 = StiltGuyUnfold
+72 = ShyStackGuy
+73 = ShyStackUnfold
+74 = ShyStackDamage
+75 = ShyStackRock
+76 = GeneralGuy
+77 = GeneralGuyBomb
+78 = TankGuy
+79 = LavaPiranhaHead
+7A = PetitPiranha
+7B = LavaBud
+7C = HuffNPuff
+7D = TuffPuff
+7E = Monstar
+7F = CrystalKing
+80 = WorldBowser
+81 = BattleBowser
+82 = Luigi
+83 = Toad
+84 = ThreeSisters
+85 = VannaT
+86 = ToadKid
+87 = ToadGuard
+88 = HarryT
+89 = ToadMinister
+8A = Postmaster
+8B = ConductorToad
+8C = TrainStationToad
+8D = Fishmael
+8E = ArtistToad
+8F = Koopa
+90 = KoopaWithoutShell
+91 = WorldBombomb
+92 = Whacka
+93 = Dryite
+94 = Mouser
+95 = Boo
+96 = Yoshi
+97 = YoshiKid
+98 = Raven
+99 = Bubulb
+9A = Penguin
+9B = ShiverToad
+9C = AltBandit
+9D = Goompapa
+9E = Goombaria
+9F = Goomama
+A0 = Goompa
+A1 = Goomma
+A2 = TheMaster
+A3 = Chan
+A4 = Lee
+A5 = Merlon
+A6 = ChetRippo
+A7 = Rowf
+A8 = MinhT
+A9 = RussT
+AA = TayceT
+AB = FiceT
+AC = Bartender
+AD = Chanterelle
+AE = RipCheato
+AF = ChuckQuizmo
+B0 = Merluvlee
+B1 = Merlar
+B2 = Merlow
+B3 = StarKid
+B4 = KoloradoWife
+B5 = KoopaKoot
+B6 = Kolorado
+B7 = BattleKolorado
+B8 = Archeologist
+B9 = Nomadimouse
+BA = WorldMerlee
+BB = BattleMerlee
+BC = DisguisedMoustafa
+BD = Moustafa
+BE = Oaklie
+BF = Bootler
+C0 = Yakkey
+C1 = GourmetGuy
+C2 = VillageLeader
+C3 = LeadersFriend
+C4 = RafaelRaven
+C5 = Tolielup
+C6 = GateFlower
+C7 = Petunia
+C8 = Posie
+C9 = Lily
+CA = Rosie
+CB = Sun
+CC = Lakilulu
+CD = Ninji
+CE = MayorPenguin
+CF = MayorPenguinWife
+D0 = PenguinPatrol
+D1 = Herringway
+D2 = Merle
+D3 = StarRod
+D4 = Fire
+D5 = Coin
+D6 = ParadePeach
+D7 = ParadeKoopas
+D8 = ParadeBurntBowser
+D9 = ParadeLuigi
+DA = ParadePartners
+DB = ParadeYoshis
+DC = ParadaKolorados
+DD = ParadeChicks
+DE = ParadeIceShow
+DF = ParadeToads
+E0 = ParadeBatons
+E1 = ParadeDrums
+E2 = ParadeFlags
+E3 = ParadeHorns
+E4 = ParadeTubbaBalloon
+E5 = ParadeWizards
+E6 = ParadeMario
+E7 = ParadeShyGuys
+E8 = ParadeTwink
+E9 = Leaf
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/status.enum b/papermario/tools/sr_enums/status.enum
new file mode 100755
index 0000000000..8faefe85a4
--- /dev/null
+++ b/papermario/tools/sr_enums/status.enum
@@ -0,0 +1,43 @@
+Status	% namespace
+status	% library name
+true	% reversed
+
+Normal			= 1
+Default			= 2		% works for any status not explicitly specified
+DefaultTurnMod	= 1F
+Sleep			= 6
+SleepTurnMod	= 20
+Poison			= 9
+PoisonTurnMod	= 25
+Frozen			= 7
+FrozenTurnMod	= 22
+Dizzy			= 4
+DizzyTurnMod	= 24
+Fear			= 3
+FearTurnMod		= 23
+Static			= B
+StaticTurnMod	= 21
+Paralyze		= 5
+ParalyzeTurnMod = 26
+Shrink			= A
+ShrinkTurnMod	= 27
+Stop			= 8
+StopTurnMod		= 29
+Stone			= C
+Daze			= D		% partners only, turn mod is N/A
+End				= 0
+
+
+Berserk			= 10
+TurnDone		= 12
+Hustle			= 19
+Danger			= 1A
+Thinking		= 1C
+Weary			= 1D
+
+% E
+% 13
+% 14
+% 15
+% 16
+% 18
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/target_iter.enum b/papermario/tools/sr_enums/target_iter.enum
new file mode 100755
index 0000000000..fe71c78fde
--- /dev/null
+++ b/papermario/tools/sr_enums/target_iter.enum
@@ -0,0 +1,11 @@
+Iter	% namespace
+iter	% library name
+false	% reversed
+
+% Used by enemy target iterators to select targets from a target list
+
+FFFFFFFF = First
+0000000A = Last
+00000000 = Next
+00000001 = Prev
+% any other value actually
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/triggers.enum b/papermario/tools/sr_enums/triggers.enum
new file mode 100755
index 0000000000..bf94adb028
--- /dev/null
+++ b/papermario/tools/sr_enums/triggers.enum
@@ -0,0 +1,24 @@
+Trigger	% namespace
+trigger	% library name
+false	% reversed
+
+00000080 = FloorTouch
+00080000 = FloorAbove
+00000800 = FloorPressA
+00000200 = FloorJump
+
+00000400 = WallTouch
+00000040 = WallPush
+00000100 = WallPressA
+00001000 = WallHammer
+
+00040000 = CeilingTouch
+
+% 00002000	???
+% 00004000	???
+% 00008000	???
+	
+00100000 = PointBomb
+
+00010000 = GameFlagSet
+00020000 = AreaFlagSet

From fa2f52cfb955f636030ba849da38b0b99c0a16f2 Mon Sep 17 00:00:00 2001
From: Jdog <root@JOSH-DESKTOP.localdomain>
Date: Wed, 12 Aug 2020 15:21:21 -0700
Subject: [PATCH 4/5] Added generated enum header files to /tools/c_enums

---
 papermario/tools/c_enums/Ability.h          |  66 ++++
 papermario/tools/c_enums/ActionState.h      |  37 ++
 papermario/tools/c_enums/Actor.h            |  37 ++
 papermario/tools/c_enums/ActorSound.h       |  16 +
 papermario/tools/c_enums/AmbientSounds.h    |  25 ++
 papermario/tools/c_enums/Anim.h             |  44 +++
 papermario/tools/c_enums/Cam.h              |  14 +
 papermario/tools/c_enums/Decoration.h       |  19 +
 papermario/tools/c_enums/DoorSounds.h       |  15 +
 papermario/tools/c_enums/DoorSwing.h        |  12 +
 papermario/tools/c_enums/Easing.h           |  23 ++
 papermario/tools/c_enums/Element.h          |  24 ++
 papermario/tools/c_enums/Emote.h            |  16 +
 papermario/tools/c_enums/EncounterTrigger.h |  15 +
 papermario/tools/c_enums/Entity.h           |  62 ++++
 papermario/tools/c_enums/Event.h            |  46 +++
 papermario/tools/c_enums/HitResult.h        |  17 +
 papermario/tools/c_enums/HitSound.h         |  16 +
 papermario/tools/c_enums/Item.h             | 367 ++++++++++++++++++++
 papermario/tools/c_enums/ItemSpawnMode.h    |  32 ++
 papermario/tools/c_enums/Iter.h             |  14 +
 papermario/tools/c_enums/Location.h         |  46 +++
 papermario/tools/c_enums/Npc.h              |  13 +
 papermario/tools/c_enums/Outcome.h          |  14 +
 papermario/tools/c_enums/Partner.h          |  22 ++
 papermario/tools/c_enums/Phase.h            |  25 ++
 papermario/tools/c_enums/PlayerAnim.h       |  49 +++
 papermario/tools/c_enums/Song.h             | 153 ++++++++
 papermario/tools/c_enums/Sound.h            |  70 ++++
 papermario/tools/c_enums/Sprite.h           | 243 +++++++++++++
 papermario/tools/c_enums/Status.h           |  40 +++
 papermario/tools/c_enums/Trigger.h          |  22 ++
 32 files changed, 1614 insertions(+)
 create mode 100644 papermario/tools/c_enums/Ability.h
 create mode 100644 papermario/tools/c_enums/ActionState.h
 create mode 100644 papermario/tools/c_enums/Actor.h
 create mode 100644 papermario/tools/c_enums/ActorSound.h
 create mode 100644 papermario/tools/c_enums/AmbientSounds.h
 create mode 100644 papermario/tools/c_enums/Anim.h
 create mode 100644 papermario/tools/c_enums/Cam.h
 create mode 100644 papermario/tools/c_enums/Decoration.h
 create mode 100644 papermario/tools/c_enums/DoorSounds.h
 create mode 100644 papermario/tools/c_enums/DoorSwing.h
 create mode 100644 papermario/tools/c_enums/Easing.h
 create mode 100644 papermario/tools/c_enums/Element.h
 create mode 100644 papermario/tools/c_enums/Emote.h
 create mode 100644 papermario/tools/c_enums/EncounterTrigger.h
 create mode 100644 papermario/tools/c_enums/Entity.h
 create mode 100644 papermario/tools/c_enums/Event.h
 create mode 100644 papermario/tools/c_enums/HitResult.h
 create mode 100644 papermario/tools/c_enums/HitSound.h
 create mode 100644 papermario/tools/c_enums/Item.h
 create mode 100644 papermario/tools/c_enums/ItemSpawnMode.h
 create mode 100644 papermario/tools/c_enums/Iter.h
 create mode 100644 papermario/tools/c_enums/Location.h
 create mode 100644 papermario/tools/c_enums/Npc.h
 create mode 100644 papermario/tools/c_enums/Outcome.h
 create mode 100644 papermario/tools/c_enums/Partner.h
 create mode 100644 papermario/tools/c_enums/Phase.h
 create mode 100644 papermario/tools/c_enums/PlayerAnim.h
 create mode 100644 papermario/tools/c_enums/Song.h
 create mode 100644 papermario/tools/c_enums/Sound.h
 create mode 100644 papermario/tools/c_enums/Sprite.h
 create mode 100644 papermario/tools/c_enums/Status.h
 create mode 100644 papermario/tools/c_enums/Trigger.h

diff --git a/papermario/tools/c_enums/Ability.h b/papermario/tools/c_enums/Ability.h
new file mode 100644
index 0000000000..86c27b5ae0
--- /dev/null
+++ b/papermario/tools/c_enums/Ability.h
@@ -0,0 +1,66 @@
+#ifndef _ABILITY_
+#define _ABILITY_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Ability {
+	DODGE_MASTER = 0x00000000,
+	UNUSED = 0x00000001,
+	SPIKE_SHIELD = 0x00000002,
+	FIRST_ATTACK = 0x00000003,
+	H_P_PLUS = 0x00000004,
+	DOUBLE_DIP = 0x00000005,
+	MYSTERY_SCROLL = 0x00000006,
+	FIRE_SHIELD = 0x00000007,
+	PRETTY_LUCKY = 0x00000008,
+	H_P_DRAIN = 0x00000009,
+	ALL_OR_NOTHING = 0x0000000A,
+	SLOW_GO = 0x0000000B,
+	F_P_PLUS = 0x0000000C,
+	ICE_POWER = 0x0000000D,
+	FEELING_FINE = 0x0000000E,
+	ATTACK_F_X = 0x0000000F,
+	MONEY_MONEY = 0x00000010,
+	CHILL_OUT = 0x00000011,
+	HAPPY_HEART = 0x00000012,
+	ZAP_TAP = 0x00000013,
+	MEGA_RUSH = 0x00000014,
+	BERSERKER = 0x00000015,
+	RIGHT_ON = 0x00000016,
+	RUNAWAY_PAY = 0x00000017,
+	FLOWER_SAVER = 0x00000018,
+	PAY_OFF = 0x00000019,
+	QUICK_CHANGE = 0x0000001A,
+	DEFEND_PLUS = 0x0000001B,
+	POWER_PLUS = 0x0000001C,
+	REFUND = 0x0000001D,
+	POWER_RUSH = 0x0000001E,
+	CRAZY_HEART = 0x0000001F,
+	LAST_STAND = 0x00000020,
+	CLOSE_CALL = 0x00000021,
+	P_UP_D_DOWN = 0x00000022,
+	LUCKY_DAY = 0x00000023,
+	MEGA_H_P_DRAIN = 0x00000024,
+	P_DOWN_D_UP = 0x00000025,
+	FLOWER_FANATIC = 0x00000026,
+	SPEEDY_SPIN = 0x00000027,
+	SPIN_ATTACK = 0x00000028,
+	I_SPY = 0x00000029,
+	BUMP_ATTACK = 0x0000002A,
+	HEART_FINDER = 0x0000002B,
+	FLOWER_FINDER = 0x0000002C,
+	DIZZY_ATTACK = 0x0000002D,
+	FINAL_GOOMPA = 0x0000002E,
+	FINAL_BOMBOMB = 0x0000002F,
+	DEEP_FOCUS = 0x00000030,
+	SUPER_FOCUS = 0x00000031,
+	KAIDEN = 0x00000032,
+	DAMAGE_DODGE = 0x00000033,
+	HAPPY_FLOWER = 0x00000034,
+	GROUP_FOCUS = 0x00000035,
+	PEEKABOO = 0x00000036,
+	HEALTHY_HEALTHY = 0x00000037
+} Ability;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ActionState.h b/papermario/tools/c_enums/ActionState.h
new file mode 100644
index 0000000000..bbcffb6b8a
--- /dev/null
+++ b/papermario/tools/c_enums/ActionState.h
@@ -0,0 +1,37 @@
+#ifndef _ACTION_STATE_
+#define _ACTION_STATE_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum ActionState {
+	IDLE = 0x00000000,
+	WALK = 0x00000001,
+	RUN = 0x00000002,
+	JUMP = 0x00000003,
+	BOUNCE = 0x00000004,
+	ABORTED_JUMP = 0x00000005,
+	LAUNCH = 0x00000006,
+	FALLING = 0x00000008,
+	STEP_DOWN = 0x00000009,
+	LAND = 0x0000000A,
+	STEP_DOWN_LAND = 0x0000000B,
+	CONVERSATION = 0x0000000C,
+	SPIN_JUMP = 0x0000000D,
+	GROUND_POUND = 0x0000000E,
+	ULTRA_JUMP = 0x0000000F,
+	ULTRA_POUND = 0x00000010,
+	SLIDING = 0x00000011,
+	HAMMER = 0x00000012,
+	HIT_HAZARD = 0x00000015,
+	HIT_LAVA = 0x00000017,
+	SPIN = 0x0000001A,
+	ENEMY_FIRST_STRIKE = 0x0000001B,
+	SPINNING_FLOWER = 0x0000001D,
+	USE_TWEESTER = 0x0000001F,
+	RIDE = 0x00000021,
+	STEP_UP = 0x00000022,
+	USE_SPRING = 0x00000026
+} ActionState;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Actor.h b/papermario/tools/c_enums/Actor.h
new file mode 100644
index 0000000000..46bff976e8
--- /dev/null
+++ b/papermario/tools/c_enums/Actor.h
@@ -0,0 +1,37 @@
+#ifndef _ACTOR_
+#define _ACTOR_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Actor {
+	SELF = 0xFFFFFF81,
+	PLAYER = 0x00000000,
+	PARTNER = 0x00000100,
+	ENEMY0 = 0x00000200,
+	ENEMY1 = 0x00000201,
+	ENEMY2 = 0x00000202,
+	ENEMY3 = 0x00000203,
+	ENEMY4 = 0x00000204,
+	ENEMY5 = 0x00000205,
+	ENEMY6 = 0x00000206,
+	ENEMY7 = 0x00000207,
+	ENEMY8 = 0x00000208,
+	ENEMY9 = 0x00000209,
+	ENEMY10 = 0x0000020A,
+	ENEMY11 = 0x0000020B,
+	ENEMY12 = 0x0000020C,
+	ENEMY13 = 0x0000020D,
+	ENEMY14 = 0x0000020E,
+	ENEMY15 = 0x0000020F,
+	ENEMY16 = 0x00000210,
+	ENEMY17 = 0x00000211,
+	ENEMY18 = 0x00000212,
+	ENEMY19 = 0x00000213,
+	ENEMY20 = 0x00000214,
+	ENEMY21 = 0x00000215,
+	ENEMY22 = 0x00000216,
+	ENEMY23 = 0x00000217
+} Actor;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ActorSound.h b/papermario/tools/c_enums/ActorSound.h
new file mode 100644
index 0000000000..39b3a4716b
--- /dev/null
+++ b/papermario/tools/c_enums/ActorSound.h
@@ -0,0 +1,16 @@
+#ifndef _ACTOR_SOUND_
+#define _ACTOR_SOUND_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum ActorSound {
+	WALK = 0x00000000,
+	FLY = 0x00000001,
+	JUMP = 0x00000002,
+	HURT = 0x00000003,
+	WALK_INCREMENT = 0x00000004,
+	FLY_INCREMENT = 0x00000005
+} ActorSound;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/AmbientSounds.h b/papermario/tools/c_enums/AmbientSounds.h
new file mode 100644
index 0000000000..6e9d7d8e62
--- /dev/null
+++ b/papermario/tools/c_enums/AmbientSounds.h
@@ -0,0 +1,25 @@
+#ifndef _AMBIENT_SOUNDS_
+#define _AMBIENT_SOUNDS_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum AmbientSounds {
+	SPOOKY = 0x00000000,
+	WIND = 0x00000001,
+	BEACH = 0x00000002,
+	JUNGLE = 0x00000003,
+	UNDER_SEA1 = 0x00000004,
+	UNDER_SEA2 = 0x00000005,
+	SILENCE = 0x00000006,
+	UNDER_SEA3 = 0x00000007,
+	UNDER_SEA4 = 0x00000008,
+	EXIT_SEA = 0x00000009,
+	UNDER_SEA5 = 0x0000000A,
+	UNDER_SEA6 = 0x0000000B,
+	BIRDS = 0x0000000C,
+	SEA = 0x0000000D,
+	MUSIC = 0x00000010
+} AmbientSounds;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Anim.h b/papermario/tools/c_enums/Anim.h
new file mode 100644
index 0000000000..fa7c879361
--- /dev/null
+++ b/papermario/tools/c_enums/Anim.h
@@ -0,0 +1,44 @@
+#ifndef _ANIM_
+#define _ANIM_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Anim {
+	WHITE_BOO__STOP = 0x00950000,
+	WHITE_BOO__IDLE = 0x00950001,
+	WHITE_BOO__WALK = 0x00950002,
+	WHITE_BOO__RUN = 0x00950003,
+	WHITE_BOO__TALK = 0x00950004,
+	WHITE_BOO__WAVE = 0x00950005,
+	WHITE_BOO__PAIN = 0x00950006,
+	WHITE_BOO__HIDE = 0x00950007,
+	WHITE_BOO__SPOOK = 0x00950008,
+	WHITE_BOO__DENYING = 0x00950009,
+	WHITE_BOO__SKEPTICAL = 0x0095000A,
+	WHITE_BOO__THROW = 0x0095000B,
+	WHITE_BOO__CARRYING_STOP = 0x0095000C,
+	WHITE_BOO__CARRYING_IDLE = 0x0095000D,
+	WHITE_BOO__CARRYING_WALK = 0x0095000E,
+	WHITE_BOO__CARRYING_RUN = 0x0095000F,
+	WHITE_BOO__CARRYING_SHAKE = 0x00950010,
+	DUSTY_BOO__STOP = 0x00950100,
+	DUSTY_BOO__IDLE = 0x00950101,
+	DUSTY_BOO__WALK = 0x00950102,
+	DUSTY_BOO__RUN = 0x00950103,
+	DUSTY_BOO__TALK = 0x00950104,
+	DUSTY_BOO__WAVE = 0x00950105,
+	DUSTY_BOO__PAIN = 0x00950106,
+	DUSTY_BOO__HIDE = 0x00950107,
+	DUSTY_BOO__SPOOK = 0x00950108,
+	DUSTY_BOO__DENYING = 0x00950109,
+	DUSTY_BOO__SKEPTICAL = 0x0095010A,
+	DUSTY_BOO__THROW = 0x0095010B,
+	DUSTY_BOO__CARRYING_STOP = 0x0095010C,
+	DUSTY_BOO__CARRYING_IDLE = 0x0095010D,
+	DUSTY_BOO__CARRYING_WALK = 0x0095010E,
+	DUSTY_BOO__CARRYING_RUN = 0x0095010F,
+	DUSTY_BOO__CARRYING_SHAKE = 0x00950110
+} Anim;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Cam.h b/papermario/tools/c_enums/Cam.h
new file mode 100644
index 0000000000..a36c551ea9
--- /dev/null
+++ b/papermario/tools/c_enums/Cam.h
@@ -0,0 +1,14 @@
+#ifndef _CAM_
+#define _CAM_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Cam {
+	DEFAULT = 0x00000000,
+	BATTLE = 0x00000001,
+	TATTLE = 0x00000002,
+	CAM3 = 0x00000003
+} Cam;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Decoration.h b/papermario/tools/c_enums/Decoration.h
new file mode 100644
index 0000000000..8f0348075e
--- /dev/null
+++ b/papermario/tools/c_enums/Decoration.h
@@ -0,0 +1,19 @@
+#ifndef _DECORATION_
+#define _DECORATION_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Decoration {
+	GOLDEN_FLAMES = 0x00000001,
+	SWEAT = 0x00000002,
+	SEEING_STARS = 0x00000003,
+	RED_FLAMES = 0x00000004,
+	GREY_SMOKE_TRAIL = 0x00000005,
+	FIRE_SMOKE_TRAIL = 0x00000006,
+	WHIRLWIND = 0x00000007,
+	STEAM_EMITTER = 0x00000008,
+	RADIAL_STAR_EMITTER = 0x0000000B
+} Decoration;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/DoorSounds.h b/papermario/tools/c_enums/DoorSounds.h
new file mode 100644
index 0000000000..98b2a3a9da
--- /dev/null
+++ b/papermario/tools/c_enums/DoorSounds.h
@@ -0,0 +1,15 @@
+#ifndef _DOOR_SOUNDS_
+#define _DOOR_SOUNDS_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum DoorSounds {
+	BASIC = 0x00000000,
+	METAL = 0x00000001,
+	LARGE = 0x00000002,
+	CREAKY = 0x00000003,
+	GATE = 0x00000004
+} DoorSounds;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/DoorSwing.h b/papermario/tools/c_enums/DoorSwing.h
new file mode 100644
index 0000000000..fce0c6232f
--- /dev/null
+++ b/papermario/tools/c_enums/DoorSwing.h
@@ -0,0 +1,12 @@
+#ifndef _DOOR_SWING_
+#define _DOOR_SWING_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum DoorSwing {
+	IN = 0x00000001,
+	OUT = -0x00000001
+} DoorSwing;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Easing.h b/papermario/tools/c_enums/Easing.h
new file mode 100644
index 0000000000..e5eb2958f2
--- /dev/null
+++ b/papermario/tools/c_enums/Easing.h
@@ -0,0 +1,23 @@
+#ifndef _EASING_
+#define _EASING_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Easing {
+	LINEAR = 0x00000000,
+	QUADRATIC_IN = 0x00000001,
+	CUBIC_IN = 0x00000002,
+	QUARTIC_IN = 0x00000003,
+	QUADRATIC_OUT = 0x00000004,
+	CUBIC_OUT = 0x00000005,
+	QUARTIC_OUT = 0x00000006,
+	COS_SLOW_OVERSHOOT = 0x00000007,
+	COS_FAST_OVERSHOOT = 0x00000008,
+	COS_BOUNCE = 0x00000009,
+	COS_IN_OUT = 0x0000000A,
+	SIN_OUT = 0x0000000B,
+	COS_IN = 0x0000000C
+} Easing;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Element.h b/papermario/tools/c_enums/Element.h
new file mode 100644
index 0000000000..ba866170b8
--- /dev/null
+++ b/papermario/tools/c_enums/Element.h
@@ -0,0 +1,24 @@
+#ifndef _ELEMENT_
+#define _ELEMENT_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Element {
+	NORMAL = 0x00000001,
+	FIRE = 0x00000002,
+	WATER = 0x00000003,
+	ICE = 0x00000004,
+	MYSTERY = 0x00000005,
+	MAGIC = 0x00000007,
+	HAMMER = 0x00000008,
+	JUMP = 0x00000009,
+	COSMIC = 0x0000000A,
+	BLAST = 0x0000000B,
+	SHOCK = 0x0000000C,
+	QUAKE = 0x0000000D,
+	THROW = 0x0000000F,
+	END = 0x00000000
+} Element;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Emote.h b/papermario/tools/c_enums/Emote.h
new file mode 100644
index 0000000000..6b6b9c064f
--- /dev/null
+++ b/papermario/tools/c_enums/Emote.h
@@ -0,0 +1,16 @@
+#ifndef _EMOTE_
+#define _EMOTE_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Emote {
+	EXCLAMATION = 0x00000000,
+	SHOCK = 0x00000001,
+	QUESTION = 0x00000002,
+	FRUSTRATION = 0x00000003,
+	ELLIPSIS = 0x00000004,
+	INVALID = 0x00000005
+} Emote;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/EncounterTrigger.h b/papermario/tools/c_enums/EncounterTrigger.h
new file mode 100644
index 0000000000..5cf6f7e543
--- /dev/null
+++ b/papermario/tools/c_enums/EncounterTrigger.h
@@ -0,0 +1,15 @@
+#ifndef _ENCOUNTER_TRIGGER_
+#define _ENCOUNTER_TRIGGER_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum EncounterTrigger {
+	NONE = 0x00000001,
+	JUMP = 0x00000002,
+	SPIN = 0x00000003,
+	HAMMER = 0x00000004,
+	PARTNER = 0x00000006
+} EncounterTrigger;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Entity.h b/papermario/tools/c_enums/Entity.h
new file mode 100644
index 0000000000..7bd672f532
--- /dev/null
+++ b/papermario/tools/c_enums/Entity.h
@@ -0,0 +1,62 @@
+#ifndef _ENTITY_
+#define _ENTITY_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Entity {
+	SAVE_POINT = 0x802E9A18,
+	RED_SWITCH = 0x802E9BB0,
+	BLUE_SWITCH = 0x802E9BD4,
+	HUGE_BLUE_SWITCH = 0x802E9BF8,
+	GREEN_STOMP_SWITCH = 0x802E9C1C,
+	MULTI_TRIGGER_BLOCK = 0x802EA07C,
+	BRICK_BLOCK = 0x802EA0C4,
+	MULTI_COIN_BRICK = 0x802EA0E8,
+	HAMMER1_BLOCK = 0x802EA10C,
+	HAMMER1_BLOCK_WIDE = 0x802EA130,
+	HAMMER1_BLOCK_THICK = 0x802EA154,
+	HAMMER1_BLOCK_TINY = 0x802EA178,
+	HAMMER2_BLOCK = 0x802EA19C,
+	HAMMER2_BLOCK_WIDE = 0x802EA1C0,
+	HAMMER2_BLOCK_THICK = 0x802EA1E4,
+	HAMMER2_BLOCK_TINY = 0x802EA208,
+	HAMMER3_BLOCK = 0x802EA22C,
+	HAMMER3_BLOCK_WIDE = 0x802EA250,
+	HAMMER3_BLOCK_THICK = 0x802EA274,
+	HAMMER3_BLOCK_TINY = 0x802EA298,
+	POW_BLOCK = 0x802EA2E0,
+	YELLOW_BLOCK = 0x802EA564,
+	HIDDEN_YELLOW_BLOCK = 0x802EA588,
+	RED_BLOCK = 0x802EA5AC,
+	HIDDEN_RED_BLOCK = 0x802EA5D0,
+	SINGLE_TRIGGER_BLOCK = 0x802EA5F4,
+	HEALING_BLOCK = 0x802EA7E0,
+	SUPER_BLOCK = 0x802EA910,
+	SCRIPT_SPRING = 0x802EAA30,
+	SIMPLE_SPRING = 0x802EAA54,
+	HIDDEN_PANEL = 0x802EAB04,
+	GIANT_CHEST = 0x802EAE0C,
+	CHEST = 0x802EAE30,
+	BLUE_WARP_PIPE = 0x802EAF80,
+	WOODEN_CRATE = 0x802EAED4,
+	SIGNPOST = 0x802EAFDC,
+	PADLOCK = 0x802BCD68,
+	PADLOCK_RED_FRAME = 0x802BCD8C,
+	PADLOCK_RED_FACE = 0x802BCDB0,
+	PADLOCK_BLUE_FACE = 0x802BCDD4,
+	BOARDED_FLOOR = 0x802BCE84,
+	BOMBABLE_ROCK1 = 0x802BCF00,
+	BOMBABLE_ROCK2 = 0x802BCF24,
+	CYMBAL_PLANT = 0x802BC788,
+	PINK_FLOWER = 0x802BC7AC,
+	SPINNING_FLOWER = 0x802BC7F4,
+	BELLBELL_PLANT = 0x802BCBD8,
+	TRUMPET_PLANT = 0x802BCBFC,
+	SPONGY_FLOWER = 0x802BCC20,
+	RED_ARROW_SIGNS = 0x802BCD9C,
+	TWEESTER = 0x802BCA74,
+	STAR_BOX_LAUCHER = 0x802BCB44
+} Entity;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Event.h b/papermario/tools/c_enums/Event.h
new file mode 100644
index 0000000000..216c22a2a7
--- /dev/null
+++ b/papermario/tools/c_enums/Event.h
@@ -0,0 +1,46 @@
+#ifndef _EVENT_
+#define _EVENT_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Event {
+	IMMUNE = 0x00000019,
+	HIT_COMBO = 0x00000009,
+	HIT = 0x0000000A,
+	DEATH = 0x00000020,
+	FALL_TRIGGER = 0x0000000C,
+	FLIP_TRIGGER = 0x0000000D,
+	EXPLODE_TRIGGER = 0x00000022,
+	SPIN_SMASH_HIT = 0x0000000B,
+	SPIN_SMASH_DEATH = 0x00000021,
+	SPIN_SMASH_LAUNCH_HIT = 0x00000011,
+	SPIN_SMASH_LAUNCH_DEATH = 0x00000015,
+	POWER_BOUNCE_HIT = 0x00000015,
+	POWER_BOUNCE_DEATH = 0x00000028,
+	BURN_HIT = 0x0000000E,
+	BURN_DEATH = 0x00000024,
+	SHOCK_HIT = 0x0000002F,
+	SHOCK_DEATH = 0x00000026,
+	BEGIN_AIR_LIFT = 0x0000003A,
+	AIR_LIFT_FAILED = 0x0000001F,
+	BLOW_AWAY = 0x00000016,
+	SCARE_AWAY = 0x00000039,
+	UP_AND_AWAY = 0x0000003D,
+	STAR_BEAM = 0x00000013,
+	RECOVER_STATUS = 0x00000031,
+	SWAP_PARTNER = 0x0000003F,
+	BLOCK = 0x0000001A,
+	SPIKE_CONTACT = 0x0000002A,
+	SPIKE_DEATH = 0x00000027,
+	SPIKE_TAUNT = 0x0000001B,
+	BURN_CONTACT = 0x0000002C,
+	BURN_TAUNT = 0x0000001C,
+	BEGIN_FIRST_STRIKE = 0x00000038,
+	END_FIRST_STRIKE = 0x00000035,
+	LIFE_SHROOM_PROC = 0x00000040,
+	REVIVE = 0x00000041,
+	LUCKY = 0x00000037
+} Event;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/HitResult.h b/papermario/tools/c_enums/HitResult.h
new file mode 100644
index 0000000000..6b8290b6d4
--- /dev/null
+++ b/papermario/tools/c_enums/HitResult.h
@@ -0,0 +1,17 @@
+#ifndef _HIT_RESULT_
+#define _HIT_RESULT_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum HitResult {
+	HIT = 0x00000000,
+	LANDED_ON_SPIKE = 0x00000004,
+	LUCKY = 0x00000005,
+	MISS = 0x00000006,
+	HIT_STATIC = 0x00000007,
+	IMMUNE = 0x00000008,
+	TRIGGERED_EXPLODE = -0x00000001
+} HitResult;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/HitSound.h b/papermario/tools/c_enums/HitSound.h
new file mode 100644
index 0000000000..0a350483dd
--- /dev/null
+++ b/papermario/tools/c_enums/HitSound.h
@@ -0,0 +1,16 @@
+#ifndef _HIT_SOUND_
+#define _HIT_SOUND_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum HitSound {
+	MISS = 0x00000000,
+	BONES = 0x00000001,
+	NORMAL = 0x00000002,
+	FIRE = 0x00000003,
+	ICE = 0x00000004,
+	SHOCK = 0x00000005
+} HitSound;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Item.h b/papermario/tools/c_enums/Item.h
new file mode 100644
index 0000000000..a21394190f
--- /dev/null
+++ b/papermario/tools/c_enums/Item.h
@@ -0,0 +1,367 @@
+#ifndef _ITEM_
+#define _ITEM_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Item {
+	JUMP = 0x00000001,
+	SPIN_JUMP = 0x00000002,
+	TORNADO_JUMP = 0x00000003,
+	HAMMER = 0x00000004,
+	SUPER_HAMMER = 0x00000005,
+	ULTRA_HAMMER = 0x00000006,
+	LUCKY_STAR = 0x00000007,
+	MAP = 0x00000008,
+	BIG_MAP = 0x00000009,
+	FIRST_DEGREE_CARD = 0x0000000A,
+	SECOND_DEGREE_CARD = 0x0000000B,
+	THIRD_DEGREE_CARD = 0x0000000C,
+	FOURTH_DEGREE_CARD = 0x0000000D,
+	DIPLOMA = 0x0000000E,
+	ULTRA_STONE = 0x0000000F,
+	FORTRESS_KEY = 0x00000010,
+	RUINS_KEY = 0x00000011,
+	PULSE_STONE = 0x00000012,
+	CASTLE_KEY1 = 0x00000013,
+	PALACE_KEY = 0x00000014,
+	LUNAR_STONE = 0x00000015,
+	PYRAMID_STONE = 0x00000016,
+	DIAMOND_STONE = 0x00000017,
+	GOLDEN_VASE = 0x00000018,
+	KOOPERS_SHELL = 0x00000019,
+	CASTLE_KEY2 = 0x0000001A,
+	FOREST_PASS = 0x0000001B,
+	WEIGHT = 0x0000001C,
+	BOOS_PORTRAIT = 0x0000001D,
+	CRYSTAL_BERRY = 0x0000001E,
+	MYSTICAL_KEY = 0x0000001F,
+	STOREROOM_KEY = 0x00000020,
+	TOY_TRAIN = 0x00000021,
+	RECORD = 0x00000022,
+	FRYING_PAN = 0x00000023,
+	DICTIONARY = 0x00000024,
+	MYSTERY_NOTE = 0x00000025,
+	SUSPICIOUS_NOTE = 0x00000026,
+	CRYSTAL_BALL = 0x00000027,
+	SCREWDRIVER = 0x00000028,
+	COOKBOOK = 0x00000029,
+	JADE_RAVEN = 0x0000002A,
+	MAGICAL_SEED1 = 0x0000002B,
+	MAGICAL_SEED2 = 0x0000002C,
+	MAGICAL_SEED3 = 0x0000002D,
+	MAGICAL_SEED4 = 0x0000002E,
+	TOAD_DOLL = 0x0000002F,
+	CALCULATOR = 0x00000030,
+	BUCKET = 0x00000031,
+	SCARF = 0x00000032,
+	RED_KEY = 0x00000033,
+	BLUE_KEY = 0x00000034,
+	LETTER01 = 0x00000036,
+	LETTER02 = 0x00000037,
+	LETTER03 = 0x00000038,
+	LETTER04 = 0x00000039,
+	LETTER05 = 0x0000003A,
+	LETTER06 = 0x0000003B,
+	LETTER07 = 0x0000003C,
+	LETTER08 = 0x0000003D,
+	LETTER09 = 0x0000003E,
+	LETTER10 = 0x00000040,
+	LETTER11 = 0x00000041,
+	LETTER12 = 0x00000045,
+	LETTER13 = 0x00000046,
+	LETTER14 = 0x00000047,
+	LETTER15 = 0x00000048,
+	LETTER16 = 0x00000049,
+	LETTER17 = 0x0000004A,
+	LETTER18 = 0x0000004B,
+	LETTER19 = 0x0000004C,
+	LETTER20 = 0x0000004E,
+	LETTER21 = 0x0000004F,
+	LETTER22 = 0x00000050,
+	LETTER23 = 0x00000051,
+	LETTER24 = 0x00000052,
+	ARTIFACT = 0x00000053,
+	LETTER25 = 0x00000054,
+	DOLLY = 0x00000056,
+	WATER_STONE = 0x00000057,
+	MAGICAL_BEAN = 0x00000058,
+	FERTILE_SOIL = 0x00000059,
+	MIRACLE_WATER = 0x0000005A,
+	VOLCANO_VASE = 0x0000005B,
+	TAPE = 0x0000005C,
+	SUGAR = 0x0000005D,
+	SALT = 0x0000005E,
+	EGG1 = 0x0000005F,
+	CREAM = 0x00000060,
+	STRAWBERRY = 0x00000061,
+	BUTTER = 0x00000062,
+	CLEANSER = 0x00000063,
+	WATER = 0x00000064,
+	FLOUR = 0x00000065,
+	MILK = 0x00000066,
+	LYRICS = 0x00000067,
+	MELODY = 0x00000068,
+	MAILBAG = 0x00000069,
+	CASTLE_KEY3 = 0x0000006A,
+	ODD_KEY = 0x0000006B,
+	STAR_STONE = 0x0000006C,
+	SNEAKY_PARASOL = 0x0000006D,
+	KOOPA_LEGENDS = 0x0000006E,
+	AUTOGRAPH1 = 0x0000006F,
+	EMPTY_WALLET = 0x00000070,
+	AUTOGRAPH2 = 0x00000071,
+	KOOPA_SHELL = 0x00000072,
+	OLD_PHOTO = 0x00000073,
+	GLASSES = 0x00000074,
+	PHOTOGRAPH = 0x00000075,
+	PACKAGE = 0x00000076,
+	RED_JAR = 0x00000077,
+	CASTLE_KEY4 = 0x00000078,
+	WAREHOUSE_KEY = 0x00000079,
+	PRISON_KEY1 = 0x0000007A,
+	SILVER_CREDIT = 0x0000007B,
+	GOLD_CREDIT = 0x0000007C,
+	PRISON_KEY2 = 0x0000007D,
+	PRISON_KEY3 = 0x0000007E,
+	PRISON_KEY4 = 0x0000007F,
+	FIRE_FLOWER = 0x00000080,
+	SNOWMAN_DOLL = 0x00000081,
+	THUNDER_RAGE = 0x00000082,
+	SHOOTING_STAR = 0x00000083,
+	THUNDER_BOLT = 0x00000084,
+	PEBBLE = 0x00000085,
+	DUSTY_HAMMER = 0x00000086,
+	INSECTICIDE_HERB = 0x00000087,
+	STONE_CAP = 0x00000088,
+	TASTY_TONIC = 0x00000089,
+	MUSHROOM = 0x0000008A,
+	VOLT_SHROOM = 0x0000008B,
+	SUPER_SHROOM = 0x0000008C,
+	DRIED_SHROOM = 0x0000008D,
+	ULTRA_SHROOM = 0x0000008E,
+	SLEEPY_SHEEP = 0x0000008F,
+	P_O_W_BLOCK = 0x00000090,
+	HUSTLE_DRINK = 0x00000091,
+	STOP_WATCH = 0x00000092,
+	WHACKAS_BUMP = 0x00000093,
+	APPLE = 0x00000094,
+	LIFE_SHROOM = 0x00000095,
+	MYSTERY = 0x00000096,
+	REPEL_GEL = 0x00000097,
+	FRIGHT_JAR = 0x00000098,
+	PLEASE_COME_BACK = 0x00000099,
+	DIZZY_DIAL = 0x0000009A,
+	SUPER_SODA = 0x0000009B,
+	LEMON = 0x0000009C,
+	LIME = 0x0000009D,
+	BLUE_BERRY = 0x0000009E,
+	RED_BERRY = 0x0000009F,
+	YELLOW_BERRY = 0x000000A0,
+	BUBBLE_BERRY = 0x000000A1,
+	JAMMIN_JELLY = 0x000000A2,
+	MAPLE_SYRUP = 0x000000A3,
+	HONEY_SYRUP = 0x000000A4,
+	GOOMNUT = 0x000000A5,
+	KOOPA_LEAF = 0x000000A6,
+	DRIED_PASTA = 0x000000A7,
+	DRIED_FRUIT = 0x000000A8,
+	STRANGE_LEAF = 0x000000A9,
+	CAKE_MIX = 0x000000AA,
+	EGG2 = 0x000000AB,
+	COCONUT = 0x000000AC,
+	MELON = 0x000000AD,
+	STINKY_HERB = 0x000000AE,
+	ICED_POTATO = 0x000000AF,
+	SPICY_SOUP = 0x000000B0,
+	APPLE_PIE = 0x000000B1,
+	HONEY_ULTRA = 0x000000B2,
+	MAPLE_ULTRA = 0x000000B3,
+	JELLY_ULTRA = 0x000000B4,
+	KOOPASTA = 0x000000B5,
+	FRIED_SHROOM = 0x000000B6,
+	SHROOM_CAKE = 0x000000B7,
+	SHROOM_STEAK = 0x000000B8,
+	HOT_SHROOM = 0x000000B9,
+	SWEET_SHROOM = 0x000000BA,
+	YUMMY_MEAL = 0x000000BB,
+	HEALTHY_JUICE = 0x000000BC,
+	BLAND_MEAL = 0x000000BD,
+	DELUXE_FEAST = 0x000000BE,
+	SPECIAL_SHAKE = 0x000000BF,
+	BIG_COOKIE = 0x000000C0,
+	CAKE = 0x000000C1,
+	MISTAKE = 0x000000C2,
+	KOOPA_TEA = 0x000000C3,
+	HONEY_SUPER = 0x000000C4,
+	MAPLE_SUPER = 0x000000C5,
+	JELLY_SUPER = 0x000000C6,
+	SPAGHETTI = 0x000000C7,
+	EGG_MISSILE = 0x000000C8,
+	FRIED_EGG = 0x000000C9,
+	HONEY_SHROOM = 0x000000CA,
+	HONEY_CANDY = 0x000000CB,
+	ELECTRO_POP = 0x000000CC,
+	FIRE_POP = 0x000000CD,
+	LIME_CANDY = 0x000000CE,
+	COCO_POP = 0x000000CF,
+	LEMON_CANDY = 0x000000D0,
+	JELLY_POP = 0x000000D1,
+	STRANGE_CAKE = 0x000000D2,
+	KOOKY_COOKIE = 0x000000D3,
+	FROZEN_FRIES = 0x000000D4,
+	POTATO_SALAD = 0x000000D5,
+	NUTTY_CAKE = 0x000000D6,
+	MAPLE_SHROOM = 0x000000D7,
+	BOILED_EGG = 0x000000D8,
+	YOSHI_COOKIE = 0x000000D9,
+	JELLY_SHROOM1 = 0x000000DA,
+	JELLY_SHROOM2 = 0x000000DB,
+	JELLY_SHROOM3 = 0x000000DC,
+	JELLY_SHROOM4 = 0x000000DD,
+	JELLY_SHROOM5 = 0x000000DE,
+	JELLY_SHROOM6 = 0x000000DF,
+	SPIN_SMASH = 0x000000E0,
+	MULTIBOUNCE = 0x000000E1,
+	POWER_PLUS_A = 0x000000E2,
+	DODGE_MASTER = 0x000000E3,
+	POWER_BOUNCE = 0x000000E4,
+	SPIKE_SHIELD = 0x000000E5,
+	FIRST_ATTACK = 0x000000E6,
+	H_P_PLUS_A = 0x000000E7,
+	QUAKE_HAMMER = 0x000000E8,
+	DOUBLE_DIP = 0x000000E9,
+	MYSTERY_SCROLL = 0x000000EA,
+	SLEEP_STOMP = 0x000000EB,
+	FIRE_SHIELD = 0x000000EC,
+	QUICK_CHANGE = 0x000000ED,
+	D_DOWN_POUND = 0x000000EE,
+	DIZZY_STOMP = 0x000000EF,
+	SMASH_CHARGE0 = 0x000000F0,
+	PRETTY_LUCKY = 0x000000F1,
+	FEELING_FINE = 0x000000F2,
+	ATTACK_F_X_A = 0x000000F3,
+	ALLOR_NOTHING = 0x000000F4,
+	H_P_DRAIN = 0x000000F5,
+	JUMP_CHARGE0 = 0x000000F6,
+	SLOW_GO = 0x000000F7,
+	F_P_PLUS_A = 0x000000F8,
+	MEGA_RUSH = 0x000000F9,
+	ICE_POWER = 0x000000FA,
+	DEFEND_PLUS_A = 0x000000FB,
+	PAY_OFF = 0x000000FC,
+	MONEY_MONEY = 0x000000FD,
+	CHILL_OUT = 0x000000FE,
+	HAPPY_HEART_A = 0x000000FF,
+	ZAP_TAP = 0x00000100,
+	BERSERKER = 0x00000101,
+	RIGHT_ON = 0x00000102,
+	RUNAWAY_PAY = 0x00000103,
+	REFUND = 0x00000104,
+	FLOWER_SAVER_A = 0x00000105,
+	TRIPLE_DIP = 0x00000106,
+	HAMMER_THROW = 0x00000107,
+	MEGA_QUAKE = 0x00000108,
+	SMASH_CHARGE = 0x00000109,
+	JUMP_CHARGE = 0x0000010A,
+	S_SMASH_CHG = 0x0000010B,
+	S_JUMP_CHG = 0x0000010C,
+	POWER_RUSH = 0x0000010D,
+	AUTO_JUMP = 0x0000010E,
+	AUTO_SMASH = 0x0000010F,
+	CRAZY_HEART = 0x00000110,
+	LAST_STAND = 0x00000111,
+	CLOSE_CALL = 0x00000112,
+	P_UP_D_DOWN = 0x00000113,
+	LUCKY_DAY = 0x00000114,
+	MEGA_H_P_DRAIN = 0x00000115,
+	P_DOWN_D_UP = 0x00000116,
+	POWER_QUAKE = 0x00000117,
+	AUTO_MULTIBOUNCE = 0x00000118,
+	FLOWER_FANATIC = 0x00000119,
+	HEART_FINDER = 0x0000011A,
+	FLOWER_FINDER = 0x0000011B,
+	SPIN_ATTACK = 0x0000011C,
+	DIZZY_ATTACK = 0x0000011D,
+	I_SPY = 0x0000011E,
+	SPEEDY_SPIN = 0x0000011F,
+	BUMP_ATTACK = 0x00000120,
+	POWER_JUMP = 0x00000121,
+	SUPER_JUMP = 0x00000122,
+	MEGA_JUMP = 0x00000123,
+	POWER_SMASH1 = 0x00000124,
+	SUPER_SMASH = 0x00000125,
+	MEGA_SMASH = 0x00000126,
+	POWER_SMASH2 = 0x00000127,
+	POWER_SMASH3 = 0x00000128,
+	DEEP_FOCUS1 = 0x00000129,
+	SUPER_FOCUS = 0x0000012A,
+	SHRINK_SMASH = 0x0000012B,
+	SHELL_CRACK = 0x0000012C,
+	KAIDEN = 0x0000012D,
+	D_DOWN_JUMP = 0x0000012E,
+	SHRINK_STOMP = 0x0000012F,
+	DAMAGE_DODGE_A = 0x00000130,
+	EARTHQUAKE_JUMP = 0x00000131,
+	DEEP_FOCUS2 = 0x00000132,
+	DEEP_FOCUS3 = 0x00000133,
+	H_P_PLUS_B = 0x00000134,
+	F_P_PLUS_B = 0x00000135,
+	HAPPY_HEART_B = 0x00000136,
+	HAPPY_HEART_X = 0x00000137,
+	FLOWER_SAVER_B = 0x00000138,
+	FLOWER_SAVER_X = 0x00000139,
+	DAMAGE_DODGE_B = 0x0000013A,
+	DAMAGE_DODGE_X = 0x0000013B,
+	POWER_PLUS_B = 0x0000013C,
+	POWER_PLUS_X = 0x0000013D,
+	DEFEND_PLUS_X = 0x0000013E,
+	DEFEND_PLUS_Y = 0x0000013F,
+	HAPPY_FLOWER_A = 0x00000140,
+	HAPPY_FLOWER_B = 0x00000141,
+	HAPPY_FLOWER_X = 0x00000142,
+	GROUP_FOCUS = 0x00000143,
+	PEEKABOO = 0x00000144,
+	ATTACK_F_X_D = 0x00000145,
+	ATTACK_F_X_B = 0x00000146,
+	ATTACK_F_X_E = 0x00000147,
+	ATTACK_F_X_C = 0x00000148,
+	ATTACK_F_X_F = 0x00000149,
+	H_P_PLUS_C = 0x0000014A,
+	H_P_PLUS_X = 0x0000014B,
+	H_P_PLUS_Y = 0x0000014C,
+	F_P_PLUS_C = 0x0000014D,
+	F_P_PLUS_X = 0x0000014E,
+	F_P_PLUS_Y = 0x0000014F,
+	HEALTHY_HEALTHY = 0x00000150,
+	ATTACK_F_X_F2 = 0x00000151,
+	ATTACK_F_X_F3 = 0x00000152,
+	ATTACK_F_X_F4 = 0x00000153,
+	ATTACK_F_X_F5 = 0x00000154,
+	PARTNER_ATTACK = 0x00000155,
+	HEART = 0x00000156,
+	COIN = 0x00000157,
+	HEART_PIECE = 0x00000158,
+	STAR_POINT = 0x00000159,
+	FULL_HEAL = 0x0000015A,
+	FLOWER = 0x0000015B,
+	STAR_PIECE = 0x0000015C,
+	PRESENT = 0x0000015D,
+	COMPLETE_CAKE = 0x0000015E,
+	BARE_CAKE = 0x0000015F,
+	EMPTY_CAKE_PAN = 0x00000160,
+	FULL_CAKE_PAN = 0x00000161,
+	EMPTY_MIXING_BOWL = 0x00000162,
+	FULL_MIXING_BOWL = 0x00000163,
+	CAKE_WITH_ICING = 0x00000164,
+	CAKE_WITH_BERRIES = 0x00000165,
+	HAMMER1_ICON = 0x00000166,
+	HAMMER2_ICON = 0x00000167,
+	HAMMER3_ICON = 0x00000168,
+	BOOTS1_ICON = 0x00000169,
+	BOOTS2_ICON = 0x0000016A,
+	BOOTS3_ICON = 0x0000016B,
+	ITEMS_ICON = 0x0000016C
+} Item;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ItemSpawnMode.h b/papermario/tools/c_enums/ItemSpawnMode.h
new file mode 100644
index 0000000000..ab5424163f
--- /dev/null
+++ b/papermario/tools/c_enums/ItemSpawnMode.h
@@ -0,0 +1,32 @@
+#ifndef _ITEM_SPAWN_MODE_
+#define _ITEM_SPAWN_MODE_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum ItemSpawnMode {
+	DECORATION = 0x00000001,
+	TOSS__SPAWN_ALWAYS = 0x00000003,
+	BATTLE_REWARD = 0x00000004,
+	TOSS__NEVER_VANISH = 0x00000005,
+	TOSS = 0x00000006,
+	TOSS__SPAWN_ONCE = 0x00000007,
+	TOSS__SPAWN_ONCE__NEVER_VANISH = 0x00000008,
+	TOSS__SPAWN_ALWAYS__NEVER_VANISH = 0x00000009,
+	ITEM_BLOCK__ITEM = 0x0000000A,
+	ITEM_BLOCK__BADGE = 0x0000000B,
+	FALL__SPAWN_ALWAYS = 0x0000000C,
+	FALL__NEVER_VANISH = 0x0000000D,
+	FALL = 0x0000000E,
+	FALL__SPAWN_ONCE = 0x0000000F,
+	FIXED__SPAWN_ALWAYS = 0x00000010,
+	FIXED__NEVER_VANISH = 0x00000011,
+	FIXED = 0x00000012,
+	FIXED__SPAWN_ALWAYS__NEVER_VANISH = 0x00000013,
+	ITEM_BLOCK__SPAWN_ALWAYS = 0x00000014,
+	ITEM_BLOCK__COIN = 0x00000015,
+	TOSS__HIGHER__NEVER_VANISH = 0x00000016,
+	TOSS__SPAWN_ALWAYS__SMALL = 0x0000001A
+} ItemSpawnMode;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Iter.h b/papermario/tools/c_enums/Iter.h
new file mode 100644
index 0000000000..e7aff72d69
--- /dev/null
+++ b/papermario/tools/c_enums/Iter.h
@@ -0,0 +1,14 @@
+#ifndef _ITER_
+#define _ITER_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Iter {
+	FIRST = 0xFFFFFFFF,
+	LAST = 0x0000000A,
+	NEXT = 0x00000000,
+	PREV = 0x00000001
+} Iter;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Location.h b/papermario/tools/c_enums/Location.h
new file mode 100644
index 0000000000..e916352b68
--- /dev/null
+++ b/papermario/tools/c_enums/Location.h
@@ -0,0 +1,46 @@
+#ifndef _LOCATION_
+#define _LOCATION_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Location {
+	NONE = 0x00000018,
+	TESTING = 0x00000017,
+	TOAD_TOWN = 0x00000001,
+	PEACH_CASTLE_GROUNDS = 0x00000019,
+	SHOOTING_STAR_SUMMIT = 0x0000001B,
+	TOAD_TOWN_TUNNELS = 0x00000002,
+	GOOMBA_VILLAGE = 0x0000001E,
+	GOOMBA_ROAD = 0x0000001F,
+	PLEASANT_PATH = 0x00000020,
+	KOOPA_VILLAGE = 0x00000021,
+	KOOPA_BROS_FORTRESS = 0x00000007,
+	MT_RUGGED = 0x00000008,
+	DRY_DRY_DESERT = 0x0000000A,
+	DRY_DRY_OUTPOST = 0x00000009,
+	DRY_DRY_RUINS = 0x0000000B,
+	FOREVER_FOREST = 0x0000000C,
+	BOOS_MANSION = 0x0000000D,
+	GUSTY_GULCH = 0x00000022,
+	TUBBAS_MANOR = 0x0000000F,
+	WINDY_MILL = 0x00000023,
+	SHY_GUYS_TOYBOX = 0x00000010,
+	JADE_JUNGLE = 0x00000024,
+	YOSHIS_VILLAGE = 0x00000025,
+	MT_LAVALAVA = 0x00000012,
+	FLOWER_FIELDS = 0x00000026,
+	CLOUDY_CLIMB = 0x00000027,
+	SHIVER_CITY = 0x00000028,
+	SHIVER_SNOWFIELD = 0x00000029,
+	STARBORN_VALLEY = 0x0000002A,
+	SHIVER_MOUNTAIN = 0x0000002B,
+	CRYSTAL_PALACE = 0x00000015,
+	STAR_WAY = 0x0000001C,
+	STAR_HAVEN = 0x0000001D,
+	BOWSERS_CASTLE = 0x00000016,
+	PEACHS_CASTLE = 0x0000001A,
+	MARIOS_HOUSE = 0x0000002C
+} Location;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Npc.h b/papermario/tools/c_enums/Npc.h
new file mode 100644
index 0000000000..42c4a45857
--- /dev/null
+++ b/papermario/tools/c_enums/Npc.h
@@ -0,0 +1,13 @@
+#ifndef _NPC_
+#define _NPC_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Npc {
+	SELF = 0xFFFFFFFF,
+	PLAYER = 0xFFFFFFFE,
+	PARTNER = 0xFFFFFFFC
+} Npc;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Outcome.h b/papermario/tools/c_enums/Outcome.h
new file mode 100644
index 0000000000..2dbc707d08
--- /dev/null
+++ b/papermario/tools/c_enums/Outcome.h
@@ -0,0 +1,14 @@
+#ifndef _OUTCOME_
+#define _OUTCOME_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Outcome {
+	PLAYER_WON = 0x00000000,
+	PLAYER_LOST = 0x00000001,
+	PLAYER_FLED = 0x00000002,
+	ENEMY_FLED = 0x00000003
+} Outcome;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Partner.h b/papermario/tools/c_enums/Partner.h
new file mode 100644
index 0000000000..4ae4d2a904
--- /dev/null
+++ b/papermario/tools/c_enums/Partner.h
@@ -0,0 +1,22 @@
+#ifndef _PARTNER_
+#define _PARTNER_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Partner {
+	NONE = 0x00000000,
+	GOOMBARIO = 0x00000001,
+	KOOPER = 0x00000002,
+	BOMBETTE = 0x00000003,
+	PARAKARRY = 0x00000004,
+	GOOMPA = 0x00000005,
+	WATT = 0x00000006,
+	SUSHIE = 0x00000007,
+	LAKILESTER = 0x00000008,
+	BOW = 0x00000009,
+	GOOMBARIA = 0x0000000A,
+	TWINK = 0x0000000B
+} Partner;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Phase.h b/papermario/tools/c_enums/Phase.h
new file mode 100644
index 0000000000..b8a8deaca4
--- /dev/null
+++ b/papermario/tools/c_enums/Phase.h
@@ -0,0 +1,25 @@
+#ifndef _PHASE_
+#define _PHASE_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Phase {
+	EXECUTE_ACTION = 0x00000000,
+	FIRST_STRIKE = 0x00000001,
+	RUN_AWAY_START = 0x00000003,
+	RUN_AWAY_RESET = 0x00000004,
+	RUN_AWAY_FAIL = 0x00000007,
+	USE_DEFEND = 0x00000006,
+	USE_LIFE_SHROOM = 0x00000008,
+	PLAYER_BEGIN = 0x0000000A,
+	PLAYER_END = 0x0000000D,
+	ENEMY_BEGIN = 0x0000000C,
+	ENEMY_END = 0x0000000B,
+	MERLEE_ATTACK_BONUS = 0x00000014,
+	MERLEE_DEFENSE_BONUS = 0x00000015,
+	MERLEE_EXP_BONUS = 0x00000016,
+	PLAYER_HAPPY = 0x0000001E
+} Phase;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/PlayerAnim.h b/papermario/tools/c_enums/PlayerAnim.h
new file mode 100644
index 0000000000..73196aa940
--- /dev/null
+++ b/papermario/tools/c_enums/PlayerAnim.h
@@ -0,0 +1,49 @@
+#ifndef _PLAYER_ANIM_
+#define _PLAYER_ANIM_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum PlayerAnim {
+	STAND_STILL = 0x00010000,
+	CROUCH_STILL = 0x00010001,
+	PANTING = 0x00010003,
+	WALKING = 0x00010004,
+	RUNNING = 0x00010005,
+	BEFORE_JUMP = 0x00010006,
+	MIDAIR_STILL = 0x00010007,
+	MIDAIR = 0x00010008,
+	STUNNED_STILL = 0x0001000E,
+	DEAD_STILL = 0x0001000F,
+	SPINNING = 0x00010011,
+	FLAILING = 0x00010012,
+	SIT_STILL = 0x00010013,
+	CROUCH = 0x00010014,
+	STONE_STILL = 0x00010015,
+	THROW = 0x00010016,
+	FALL_BACK = 0x00010017,
+	FALL_DOWN = 0x00010018,
+	SCARED = 0x00010019,
+	HURT_FOOT = 0x0001001A,
+	RUN_PANIC = 0x0001001B,
+	EAT = 0x0001001C,
+	STICK_OUT_TONGUE = 0x0001001D,
+	PLANT = 0x0001001E,
+	GOT_ITEM = 0x0001001F,
+	READY_JUMP = 0x00010020,
+	THINKING = 0x00010021,
+	LOST_BALANCE = 0x00010022,
+	SHOCK_STILL = 0x00010023,
+	DRINK = 0x00010025,
+	SQUISH = 0x00010026,
+	RUN_THINKING = 0x00010027,
+	QUESTION = 0x00010028,
+	NOD_YES = 0x00010029,
+	PRAY = 0x0001002C,
+	CHARRED = 0x0001002F,
+	GET_UP = 0x00010030,
+	DUST_OFF = 0x00010031,
+	THUMBS_UP = 0x00010032
+} PlayerAnim;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Song.h b/papermario/tools/c_enums/Song.h
new file mode 100644
index 0000000000..b86c81e2ef
--- /dev/null
+++ b/papermario/tools/c_enums/Song.h
@@ -0,0 +1,153 @@
+#ifndef _SONG_
+#define _SONG_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Song {
+	TOAD_TOWN = 0x00000000,
+	NORMAL_BATTLE = 0x00000002,
+	SPECIAL_BATTLE = 0x00000003,
+	JR_TROOPA_BATTLE = 0x00000004,
+	FINAL_BOWSER_BATTLE = 0x00000005,
+	GOOMBA_KING_BATTLE = 0x00000007,
+	KOOPA_BROS_BATTLE = 0x00000008,
+	FAKE_BOWSER_BATTLE = 0x00000009,
+	TUTANKOOPA_BATTLE = 0x0000000A,
+	TUBBA_BLUBBA_BATTLE = 0x0000000B,
+	GENERAL_GUY_BATTLE = 0x0000000C,
+	LAVA_PIRANHA_BATTLE = 0x0000000D,
+	HUFF_N_PUFF_BATTLE = 0x0000000E,
+	CRYSTAL_KING_BATTLE = 0x0000000F,
+	GOOMBA_VILLAGE = 0x00000010,
+	PLEASANT_PATH = 0x00000011,
+	FUZZY_ATTACK = 0x00000012,
+	KOOPA_VILLAGE = 0x00000013,
+	KOOPA_FORTRESS = 0x00000014,
+	DRY_DRY_OUTPOST = 0x00000015,
+	MT_RUGGED = 0x00000016,
+	DRY_DRY_DESERT = 0x00000017,
+	DRY_DRY_RUINS = 0x00000018,
+	RUINS_BASEMENT = 0x00000019,
+	FOREVER_FOREST = 0x0000001A,
+	BOOS_MANSION = 0x0000001B,
+	CHEERFUL_BOOS_MANSION = 0x0000001C,
+	GUSTY_GULCH = 0x0000001D,
+	TUBBAS_MANOR = 0x0000001E,
+	TUBBA_ESCAPE = 0x0000001F,
+	SHY_GUY_TOYBOX = 0x00000020,
+	TOYBOX_TRAIN = 0x00000021,
+	CREEPY_TOYBOX = 0x00000022,
+	JADE_JUNGLE = 0x00000024,
+	DEEP_JUNGLE = 0x00000025,
+	YOSHIS_VILLAGE = 0x00000026,
+	YOSHIS_PANIC = 0x00000027,
+	RAPHAEL_RAVEN = 0x00000028,
+	MT_LAVALAVA = 0x00000029,
+	VOLCANO_ESCAPE = 0x0000002A,
+	STAR_WAY_OPENS = 0x0000002B,
+	MASTER_BATTLE = 0x0000002C,
+	RADIO_ISLAND_SOUNDS = 0x0000002D,
+	RADIO_HOT_HITS = 0x0000002E,
+	RADIO_GOLDEN_OLDIES = 0x0000002F,
+	FLOWER_FIELDS_CLOUDY = 0x00000030,
+	FLOWER_FIELDS_SUNNY = 0x00000031,
+	CLOUDY_CLIMB = 0x00000032,
+	PUFF_PUFF_MACHINE = 0x00000033,
+	SUN_TOWER_CLOUDY = 0x00000034,
+	SUN_TOWER_SUNNY = 0x00000035,
+	CRYSTAL_PALACE = 0x00000037,
+	SHIVER_CITY = 0x00000038,
+	PENGUIN_MYSTERY = 0x00000039,
+	SHIVER_SNOWFIELD = 0x0000003A,
+	SHIVER_MOUNTAIN = 0x0000003B,
+	STARBORN_VALLEY = 0x0000003C,
+	MERLAR_THEME = 0x0000003D,
+	MAIL_CALL = 0x0000003E,
+	PEACHS_CASTLE_PARTY = 0x0000003F,
+	CHAPTER_END = 0x00000040,
+	CHAPTER_START = 0x00000041,
+	ITEM_UPGRADE = 0x00000042,
+	PHONOGRAPH_MUSIC = 0x00000044,
+	TUTANKOOPA_THEME = 0x00000045,
+	KAMMY_KOOPA_THEME = 0x00000046,
+	JR_TROOPA_THEME = 0x00000047,
+	BULLET_BILL_ASSAULT = 0x00000048,
+	MONTY_MOLE_ASSAULT = 0x00000049,
+	SHY_GUY_INVASION = 0x0000004A,
+	TOAD_TOWN_TUNNELS = 0x0000004B,
+	WHALE_THEME = 0x0000004C,
+	FOREVER_FOREST_WARNING = 0x0000004D,
+	YOSHI_KIDS_FOUND = 0x0000004E,
+	UNUSED_FANFARE = 0x0000004F,
+	GOOMBA_KING_THEME = 0x00000050,
+	KOOPA_BROS_INTERLUDE = 0x00000051,
+	KOOPA_BROS_THEME = 0x00000052,
+	TUTANKOOPA_WARNING = 0x00000053,
+	TUTANKOOPA_REVEALED = 0x00000054,
+	TUBBA_BLUBBA_THEME = 0x00000055,
+	GENERAL_GUY_THEME = 0x00000056,
+	LAVA_PIRANHA_THEME = 0x00000057,
+	HUFF_N_PUFF_THEME = 0x00000058,
+	CRYSTAL_KING_THEME = 0x00000059,
+	BLOOPER_THEME = 0x0000005A,
+	MINIBOSS_BATTLE = 0x0000005B,
+	MONSTAR_THEME = 0x0000005C,
+	CLUB64 = 0x0000005D,
+	UNUSED_OPENING = 0x0000005E,
+	BOWSERS_CASTLE_FALLS = 0x0000005F,
+	STAR_HAVEN = 0x00000060,
+	SHOOTING_STAR_SUMMIT = 0x00000061,
+	STARSHIP_THEME = 0x00000062,
+	STAR_SANCTUARY = 0x00000063,
+	BOWSERS_CASTLE = 0x00000064,
+	BOWSERS_CASTLE_CAVES = 0x00000065,
+	BOWSER_THEME = 0x00000066,
+	BOWSER_BATTLE = 0x00000067,
+	PEACH_WISHES = 0x00000068,
+	FILE_SELECT = 0x00000069,
+	MAIN_THEME = 0x0000006A,
+	BOWSER_ATTACKS = 0x0000006B,
+	MARIO_FALLS = 0x0000006C,
+	PEACH_APPEARS = 0x0000006D,
+	THE_END = 0x0000006E,
+	RECOVERED_STAR_ROD = 0x0000006F,
+	TWINK_THEME = 0x00000070,
+	STIRRING_CAKE = 0x00000071,
+	GOURMET_GUY_FREAKOUT = 0x00000072,
+	PRISONER_PEACH_THEME = 0x00000073,
+	PEACH_MISSION = 0x00000074,
+	PEACH_SNEAKING = 0x00000075,
+	PEACH_CAUGHT = 0x00000076,
+	PEACH_QUIZ_INTRO = 0x00000077,
+	STAR_SPIRIT_THEME = 0x00000078,
+	PENGUIN_WHODUNIT = 0x00000079,
+	PENGUIN_WAKES_UP = 0x0000007A,
+	MAGIC_BEANSTALK = 0x0000007B,
+	MERLEE_SPELL = 0x0000007C,
+	LAKILESTER_THEME = 0x0000007D,
+	GOOMBA_BROS_RETREAT = 0x0000007E,
+	SUNSHINE_RETURNS = 0x0000007F,
+	RIDING_THE_RAILS = 0x00000080,
+	RIDING_THE_WHALE = 0x00000081,
+	NEW_PARTNER = 0x00000082,
+	DRY_DRY_RUINS_APPEAR = 0x00000083,
+	CANDY_CANES = 0x00000084,
+	PLAYROOM = 0x00000085,
+	MOUSTAFA_THEME = 0x00000086,
+	GAME_OVER = 0x00000087,
+	TAKING_REST = 0x00000088,
+	FLOWER_N_P_C_THEME = 0x00000089,
+	FLOWER_GATE_APPEARS = 0x0000008A,
+	BATTLE_END = 0x0000008B,
+	POP_DIVA_SONG = 0x0000008C,
+	BOO_MINIGAME = 0x0000008D,
+	LEVEL_UP = 0x0000008E,
+	PARADE_DAY = 0x00000090,
+	PARADE_NIGHT = 0x00000091,
+	MARIO_BROS_HOUSE = 0x00000094,
+	INTRO_STORY = 0x00000095,
+	NEW_PARTNER_J_P = 0x00000096
+} Song;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Sound.h b/papermario/tools/c_enums/Sound.h
new file mode 100644
index 0000000000..ba01970a8d
--- /dev/null
+++ b/papermario/tools/c_enums/Sound.h
@@ -0,0 +1,70 @@
+#ifndef _SOUND_
+#define _SOUND_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Sound {
+	JR_TROOPA_SPLASH = 0x00000045,
+	JR_TROOPA_SWIM = 0x00000046,
+	BOO_SPOOK = 0x00000047,
+	BOO_VANISH = 0x000000C1,
+	BOO_APPEAR = 0x000000C3,
+	MENU_OPEN = 0x000000C5,
+	MENU_CLOSE = 0x000000C6,
+	MENU_CHANGE_SELECTION = 0x000000C7,
+	MENU_CHANGE_TAB = 0x000000C8,
+	MENU_NEXT = 0x000000C9,
+	MENU_BACK = 0x000000CA,
+	STEP1 = 0x00000141,
+	STEP2 = 0x00000142,
+	TORNADO_JUMP = 0x00000147,
+	SOFT_LAND = 0x00000148,
+	LAND = 0x0000014B,
+	HIT_BLOCK = 0x0000014E,
+	SEARCH_BUSH = 0x00000153,
+	BASIC_DOOR_OPEN = 0x000001C1,
+	BASIC_DOOR_CLOSE = 0x000001C2,
+	METAL_DOOR_OPEN = 0x000001C3,
+	METAL_DOOR_CLOSE = 0x000001C4,
+	LARGE_DOOR_OPEN = 0x000001C5,
+	LARGE_DOOR_CLOSE = 0x000001C6,
+	CREAKY_DOOR_OPEN = 0x000001C7,
+	CREAKY_DOOR_CLOSE = 0x000001C8,
+	METAL_GATE_OPEN = 0x000001C9,
+	METAL_GATE_CLOSE = 0x000001CA,
+	BOW_SPOOK = 0x00000291,
+	SMOKE_BURST = 0x000002CD,
+	DAYZEE_SONG = 0x000002D7,
+	POWER_UP = 0x000002D8,
+	SHY_GUY_SCREAMS1 = 0x0000030C,
+	SHY_GUY_SCREAMS2 = 0x0000030D,
+	SHY_GUY_SCREAMS3 = 0x0000030E,
+	TOY_TANK_MOVE1 = 0x0000030F,
+	TOY_TANK_MOVE2 = 0x00000310,
+	GENERAL_WHISTLE = 0x00000395,
+	MOLE_SURFACE = 0x00000321,
+	MOLE_DIG = 0x00000322,
+	MOLE_POP = 0x00000323,
+	JUMP = 0x000003E2,
+	MISS_JUMP = 0x000003E3,
+	DEATH = 0x000003E5,
+	BIG_POWER_UP = 0x000003E6,
+	MOLE_THROW = 0x000003E8,
+	CLOSE_SHELL = 0x000002FF,
+	OPEN_SHELL = 0x000003D4,
+	BOW_VANISH = 0x0000200E,
+	BOW_APPEAR = 0x0000200F,
+	CANNON1 = 0x00002016,
+	CANNON2 = 0x00002017,
+	CANNON3 = 0x00002018,
+	JUMP = 0x00002081,
+	BOMB_BLAST = 0x00002076,
+	SPELL_CAST1 = 0x000020D4,
+	SPELL_CAST2 = 0x000020D5,
+	SPELL_CAST3 = 0x000020D6,
+	SPELL_CAST4 = 0x000020D7,
+	SPELL_CAST5 = 0x000020D8
+} Sound;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Sprite.h b/papermario/tools/c_enums/Sprite.h
new file mode 100644
index 0000000000..3768175a71
--- /dev/null
+++ b/papermario/tools/c_enums/Sprite.h
@@ -0,0 +1,243 @@
+#ifndef _SPRITE_
+#define _SPRITE_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Sprite {
+	WORLD_GOOMBARIO = 0x00000001,
+	WORLD_KOOPER = 0x00000002,
+	WORLD_BOMBETTE = 0x00000003,
+	WORLD_PARAKARRY = 0x00000004,
+	WORLD_BOW = 0x00000005,
+	WORLD_WATT = 0x00000006,
+	WORLD_SUSHI = 0x00000007,
+	WORLD_LAKILESTER = 0x00000008,
+	BATTLE_GOOMBARIO = 0x00000009,
+	BATTLE_KOOPER = 0x0000000A,
+	BATTLE_BOMBETTE = 0x0000000B,
+	BATTLE_PARAKARRY = 0x0000000C,
+	BATTLE_BOW = 0x0000000D,
+	BATTLE_WATT = 0x0000000E,
+	BATTLE_SUSHI = 0x0000000F,
+	BATTLE_LAKILESTER = 0x00000010,
+	KOOPER_WITHOUT_SHELL = 0x00000011,
+	WORLD_ELDSTAR = 0x00000012,
+	WORLD_MAMAR = 0x00000013,
+	WORLD_SKOLAR = 0x00000014,
+	WORLD_MUSKULAR = 0x00000015,
+	WORLD_MISSTAR = 0x00000016,
+	WORLD_KLEVAR = 0x00000017,
+	WORLD_KALMAR = 0x00000018,
+	BATTLE_ELDSTAR = 0x00000019,
+	BATTLE_MAMAR = 0x0000001A,
+	BATTLE_SKOLAR = 0x0000001B,
+	BATTLE_MUSKULAR = 0x0000001C,
+	BATTLE_MISSTAR = 0x0000001D,
+	BATTLE_KLEVAR = 0x0000001E,
+	BATTLE_KALMAR = 0x0000001F,
+	TWINK = 0x00000020,
+	JR_TROOPA = 0x00000021,
+	SPIKED_JR_TROOPA = 0x00000022,
+	SPIKED_PARA_JR_TROOPA = 0x00000023,
+	MAGE_JR_TROOPA = 0x00000024,
+	PARA_JR_TROOPA = 0x00000025,
+	GOOMBA = 0x00000026,
+	SPIKED_GOOMBA = 0x00000027,
+	PARAGOOMBA = 0x00000028,
+	KOOPA_TROOPA = 0x00000029,
+	PARA_TROOPA = 0x0000002A,
+	FUZZY = 0x0000002B,
+	BOMBOMB = 0x0000002C,
+	BULLET_BILL = 0x0000002D,
+	BILL_BLASTER = 0x0000002E,
+	MONTY_MOLE = 0x0000002F,
+	CLEFT = 0x00000030,
+	POKEY = 0x00000031,
+	BANDIT = 0x00000032,
+	BUZZY_BEETLE = 0x00000033,
+	SWOOPER = 0x00000034,
+	STONE_CHOMP = 0x00000035,
+	PUTRID_PIRANHA = 0x00000036,
+	PIRANHA_PLANT = 0x00000037,
+	SENTINEL = 0x00000038,
+	WORLD_CLUBBA = 0x00000039,
+	BATTLE_CLUBBA = 0x0000003A,
+	SHY_GUY = 0x0000003B,
+	GROOVE_GUY = 0x0000003C,
+	SKY_GUY = 0x0000003D,
+	PYRO_GUY = 0x0000003E,
+	SPY_GUY = 0x0000003F,
+	MEDI_GUY = 0x00000040,
+	FUZZIPEDE = 0x00000041,
+	JUNGLE_GUY = 0x00000042,
+	HEART_PLANT = 0x00000043,
+	HURT_PLANT = 0x00000044,
+	M_BUSH = 0x00000045,
+	BUBBLE = 0x00000046,
+	KENT_C_KOOPA = 0x00000047,
+	DAYZEE = 0x00000048,
+	LAKITU = 0x00000049,
+	SPINY = 0x0000004A,
+	BZZAP = 0x0000004B,
+	RUFF_PUFF = 0x0000004C,
+	SPIKE_TOP = 0x0000004D,
+	DUPLIGHOST = 0x0000004E,
+	ALBINO_DINO = 0x0000004F,
+	BLOOPER = 0x00000050,
+	BABY_BLOOPER = 0x00000051,
+	GULPIT = 0x00000052,
+	DRY_BONES = 0x00000053,
+	THROWN_BONE = 0x00000054,
+	BONY_BEETLE = 0x00000055,
+	MAGIKOOPA = 0x00000056,
+	FLYING_MAGIKOOPA = 0x00000057,
+	WORLD_KOOPATROL = 0x00000058,
+	KOOPATROL = 0x00000059,
+	HAMMER_BROS = 0x0000005A,
+	BUSH_BASIC = 0x0000005B,
+	BUSH_BLOCKY = 0x0000005C,
+	BUSH_DRY = 0x0000005D,
+	BUSH_LEAFY = 0x0000005E,
+	BUSH_MATTED = 0x0000005F,
+	WORLD_KAMMY = 0x00000060,
+	BATTLE_KAMMY = 0x00000061,
+	GOOMBA_BROS = 0x00000062,
+	GOOMBA_KING = 0x00000063,
+	SPIKY_GOOMNUT = 0x00000064,
+	DARK_TOAD = 0x00000065,
+	KOOPA_BROS = 0x00000066,
+	BUZZAR = 0x00000067,
+	TUTANKOOPA = 0x00000068,
+	CHAIN_CHOMP = 0x00000069,
+	WORLD_TUBBA = 0x0000006A,
+	BATTLE_TUBBA = 0x0000006B,
+	TUBBAS_HEART = 0x0000006C,
+	BIG_LANTERN_GHOST = 0x0000006D,
+	SHY_SQUAD_GUY = 0x0000006E,
+	MARSHAL_GUY = 0x0000006F,
+	STILT_GUY = 0x00000070,
+	STILT_GUY_UNFOLD = 0x00000071,
+	SHY_STACK_GUY = 0x00000072,
+	SHY_STACK_UNFOLD = 0x00000073,
+	SHY_STACK_DAMAGE = 0x00000074,
+	SHY_STACK_ROCK = 0x00000075,
+	GENERAL_GUY = 0x00000076,
+	GENERAL_GUY_BOMB = 0x00000077,
+	TANK_GUY = 0x00000078,
+	LAVA_PIRANHA_HEAD = 0x00000079,
+	PETIT_PIRANHA = 0x0000007A,
+	LAVA_BUD = 0x0000007B,
+	HUFF_N_PUFF = 0x0000007C,
+	TUFF_PUFF = 0x0000007D,
+	MONSTAR = 0x0000007E,
+	CRYSTAL_KING = 0x0000007F,
+	WORLD_BOWSER = 0x00000080,
+	BATTLE_BOWSER = 0x00000081,
+	LUIGI = 0x00000082,
+	TOAD = 0x00000083,
+	THREE_SISTERS = 0x00000084,
+	VANNA_T = 0x00000085,
+	TOAD_KID = 0x00000086,
+	TOAD_GUARD = 0x00000087,
+	HARRY_T = 0x00000088,
+	TOAD_MINISTER = 0x00000089,
+	POSTMASTER = 0x0000008A,
+	CONDUCTOR_TOAD = 0x0000008B,
+	TRAIN_STATION_TOAD = 0x0000008C,
+	FISHMAEL = 0x0000008D,
+	ARTIST_TOAD = 0x0000008E,
+	KOOPA = 0x0000008F,
+	KOOPA_WITHOUT_SHELL = 0x00000090,
+	WORLD_BOMBOMB = 0x00000091,
+	WHACKA = 0x00000092,
+	DRYITE = 0x00000093,
+	MOUSER = 0x00000094,
+	BOO = 0x00000095,
+	YOSHI = 0x00000096,
+	YOSHI_KID = 0x00000097,
+	RAVEN = 0x00000098,
+	BUBULB = 0x00000099,
+	PENGUIN = 0x0000009A,
+	SHIVER_TOAD = 0x0000009B,
+	ALT_BANDIT = 0x0000009C,
+	GOOMPAPA = 0x0000009D,
+	GOOMBARIA = 0x0000009E,
+	GOOMAMA = 0x0000009F,
+	GOOMPA = 0x000000A0,
+	GOOMMA = 0x000000A1,
+	THE_MASTER = 0x000000A2,
+	CHAN = 0x000000A3,
+	LEE = 0x000000A4,
+	MERLON = 0x000000A5,
+	CHET_RIPPO = 0x000000A6,
+	ROWF = 0x000000A7,
+	MINH_T = 0x000000A8,
+	RUSS_T = 0x000000A9,
+	TAYCE_T = 0x000000AA,
+	FICE_T = 0x000000AB,
+	BARTENDER = 0x000000AC,
+	CHANTERELLE = 0x000000AD,
+	RIP_CHEATO = 0x000000AE,
+	CHUCK_QUIZMO = 0x000000AF,
+	MERLUVLEE = 0x000000B0,
+	MERLAR = 0x000000B1,
+	MERLOW = 0x000000B2,
+	STAR_KID = 0x000000B3,
+	KOLORADO_WIFE = 0x000000B4,
+	KOOPA_KOOT = 0x000000B5,
+	KOLORADO = 0x000000B6,
+	BATTLE_KOLORADO = 0x000000B7,
+	ARCHEOLOGIST = 0x000000B8,
+	NOMADIMOUSE = 0x000000B9,
+	WORLD_MERLEE = 0x000000BA,
+	BATTLE_MERLEE = 0x000000BB,
+	DISGUISED_MOUSTAFA = 0x000000BC,
+	MOUSTAFA = 0x000000BD,
+	OAKLIE = 0x000000BE,
+	BOOTLER = 0x000000BF,
+	YAKKEY = 0x000000C0,
+	GOURMET_GUY = 0x000000C1,
+	VILLAGE_LEADER = 0x000000C2,
+	LEADERS_FRIEND = 0x000000C3,
+	RAFAEL_RAVEN = 0x000000C4,
+	TOLIELUP = 0x000000C5,
+	GATE_FLOWER = 0x000000C6,
+	PETUNIA = 0x000000C7,
+	POSIE = 0x000000C8,
+	LILY = 0x000000C9,
+	ROSIE = 0x000000CA,
+	SUN = 0x000000CB,
+	LAKILULU = 0x000000CC,
+	NINJI = 0x000000CD,
+	MAYOR_PENGUIN = 0x000000CE,
+	MAYOR_PENGUIN_WIFE = 0x000000CF,
+	PENGUIN_PATROL = 0x000000D0,
+	HERRINGWAY = 0x000000D1,
+	MERLE = 0x000000D2,
+	STAR_ROD = 0x000000D3,
+	FIRE = 0x000000D4,
+	COIN = 0x000000D5,
+	PARADE_PEACH = 0x000000D6,
+	PARADE_KOOPAS = 0x000000D7,
+	PARADE_BURNT_BOWSER = 0x000000D8,
+	PARADE_LUIGI = 0x000000D9,
+	PARADE_PARTNERS = 0x000000DA,
+	PARADE_YOSHIS = 0x000000DB,
+	PARADA_KOLORADOS = 0x000000DC,
+	PARADE_CHICKS = 0x000000DD,
+	PARADE_ICE_SHOW = 0x000000DE,
+	PARADE_TOADS = 0x000000DF,
+	PARADE_BATONS = 0x000000E0,
+	PARADE_DRUMS = 0x000000E1,
+	PARADE_FLAGS = 0x000000E2,
+	PARADE_HORNS = 0x000000E3,
+	PARADE_TUBBA_BALLOON = 0x000000E4,
+	PARADE_WIZARDS = 0x000000E5,
+	PARADE_MARIO = 0x000000E6,
+	PARADE_SHY_GUYS = 0x000000E7,
+	PARADE_TWINK = 0x000000E8,
+	LEAF = 0x000000E9
+} Sprite;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Status.h b/papermario/tools/c_enums/Status.h
new file mode 100644
index 0000000000..2bde1a0309
--- /dev/null
+++ b/papermario/tools/c_enums/Status.h
@@ -0,0 +1,40 @@
+#ifndef _STATUS_
+#define _STATUS_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Status {
+	NORMAL = 0x00000001,
+	DEFAULT = 0x00000002,
+	DEFAULT_TURN_MOD = 0x0000001F,
+	SLEEP = 0x00000006,
+	SLEEP_TURN_MOD = 0x00000020,
+	POISON = 0x00000009,
+	POISON_TURN_MOD = 0x00000025,
+	FROZEN = 0x00000007,
+	FROZEN_TURN_MOD = 0x00000022,
+	DIZZY = 0x00000004,
+	DIZZY_TURN_MOD = 0x00000024,
+	FEAR = 0x00000003,
+	FEAR_TURN_MOD = 0x00000023,
+	STATIC = 0x0000000B,
+	STATIC_TURN_MOD = 0x00000021,
+	PARALYZE = 0x00000005,
+	PARALYZE_TURN_MOD = 0x00000026,
+	SHRINK = 0x0000000A,
+	SHRINK_TURN_MOD = 0x00000027,
+	STOP = 0x00000008,
+	STOP_TURN_MOD = 0x00000029,
+	STONE = 0x0000000C,
+	DAZE = 0x0000000D,
+	END = 0x00000000,
+	BERSERK = 0x00000010,
+	TURN_DONE = 0x00000012,
+	HUSTLE = 0x00000019,
+	DANGER = 0x0000001A,
+	THINKING = 0x0000001C,
+	WEARY = 0x0000001D
+} Status;
+
+#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Trigger.h b/papermario/tools/c_enums/Trigger.h
new file mode 100644
index 0000000000..a1561c6ce1
--- /dev/null
+++ b/papermario/tools/c_enums/Trigger.h
@@ -0,0 +1,22 @@
+#ifndef _TRIGGER_
+#define _TRIGGER_
+
+#include "ultra64.h"
+#include "types.h"
+
+typedef enum Trigger {
+	FLOOR_TOUCH = 0x00000080,
+	FLOOR_ABOVE = 0x00080000,
+	FLOOR_PRESS_A = 0x00000800,
+	FLOOR_JUMP = 0x00000200,
+	WALL_TOUCH = 0x00000400,
+	WALL_PUSH = 0x00000040,
+	WALL_PRESS_A = 0x00000100,
+	WALL_HAMMER = 0x00001000,
+	CEILING_TOUCH = 0x00040000,
+	POINT_BOMB = 0x00100000,
+	GAME_FLAG_SET = 0x00010000,
+	AREA_FLAG_SET = 0x00020000
+} Trigger;
+
+#endif
\ No newline at end of file

From eb19b9bf36e59991108984fbf33462a05abdfbff Mon Sep 17 00:00:00 2001
From: Jdog <root@JOSH-DESKTOP.localdomain>
Date: Wed, 12 Aug 2020 15:52:55 -0700
Subject: [PATCH 5/5] Fixes

---
 papermario/include/items.h                    |   2 +-
 papermario/src/code_1b40_len_20b0.c           |   2 -
 papermario/src/code_fa4c0_len_3bf0.c          |   6 +-
 papermario/tools/c_enums/Ability.h            |  66 ----
 papermario/tools/c_enums/ActionState.h        |  37 --
 papermario/tools/c_enums/Actor.h              |  37 --
 papermario/tools/c_enums/ActorSound.h         |  16 -
 papermario/tools/c_enums/AmbientSounds.h      |  25 --
 papermario/tools/c_enums/Anim.h               |  44 ---
 papermario/tools/c_enums/Cam.h                |  14 -
 papermario/tools/c_enums/Decoration.h         |  19 -
 papermario/tools/c_enums/DoorSounds.h         |  15 -
 papermario/tools/c_enums/DoorSwing.h          |  12 -
 papermario/tools/c_enums/Easing.h             |  23 --
 papermario/tools/c_enums/Element.h            |  24 --
 papermario/tools/c_enums/Emote.h              |  16 -
 papermario/tools/c_enums/EncounterTrigger.h   |  15 -
 papermario/tools/c_enums/Entity.h             |  62 ---
 papermario/tools/c_enums/Event.h              |  46 ---
 papermario/tools/c_enums/HitResult.h          |  17 -
 papermario/tools/c_enums/HitSound.h           |  16 -
 papermario/tools/c_enums/Item.h               | 367 ------------------
 papermario/tools/c_enums/ItemSpawnMode.h      |  32 --
 papermario/tools/c_enums/Iter.h               |  14 -
 papermario/tools/c_enums/Location.h           |  46 ---
 papermario/tools/c_enums/Npc.h                |  13 -
 papermario/tools/c_enums/Outcome.h            |  14 -
 papermario/tools/c_enums/Partner.h            |  22 --
 papermario/tools/c_enums/Phase.h              |  25 --
 papermario/tools/c_enums/PlayerAnim.h         |  49 ---
 papermario/tools/c_enums/Song.h               | 153 --------
 papermario/tools/c_enums/Sound.h              |  70 ----
 papermario/tools/c_enums/Sprite.h             | 243 ------------
 papermario/tools/c_enums/Status.h             |  40 --
 papermario/tools/c_enums/Trigger.h            |  22 --
 papermario/tools/sr_enums/ability.enum        |  60 ---
 papermario/tools/sr_enums/action_states.enum  |  42 --
 papermario/tools/sr_enums/actor.enum          |  31 --
 papermario/tools/sr_enums/actor_sounds.enum   |  10 -
 papermario/tools/sr_enums/ambient_sounds.enum |  19 -
 papermario/tools/sr_enums/animations.enum     |  39 --
 papermario/tools/sr_enums/cameras.enum        |   8 -
 papermario/tools/sr_enums/decorations.enum    |  13 -
 papermario/tools/sr_enums/door_sounds.enum    |  11 -
 papermario/tools/sr_enums/door_swings.enum    |   6 -
 papermario/tools/sr_enums/easing.enum         |  22 --
 papermario/tools/sr_enums/elements.enum       |  18 -
 papermario/tools/sr_enums/emotes.enum         |  10 -
 .../tools/sr_enums/encounter_trigger.enum     |   9 -
 papermario/tools/sr_enums/entities.enum       |  83 ----
 papermario/tools/sr_enums/events.enum         |  63 ---
 papermario/tools/sr_enums/hit_result.enum     |  12 -
 papermario/tools/sr_enums/hit_sound.enum      |  10 -
 .../tools/sr_enums/item_spawn_modes.enum      |  41 --
 papermario/tools/sr_enums/items.enum          | 361 -----------------
 papermario/tools/sr_enums/locations.enum      |  40 --
 papermario/tools/sr_enums/npcs.enum           |   7 -
 papermario/tools/sr_enums/outcomes.enum       |   8 -
 papermario/tools/sr_enums/partners.enum       |  16 -
 papermario/tools/sr_enums/phases.enum         |  31 --
 .../tools/sr_enums/player_animations.enum     |  49 ---
 papermario/tools/sr_enums/songs.enum          | 159 --------
 papermario/tools/sr_enums/sounds.enum         |  89 -----
 papermario/tools/sr_enums/sprites.enum        | 237 -----------
 papermario/tools/sr_enums/status.enum         |  43 --
 papermario/tools/sr_enums/target_iter.enum    |  11 -
 papermario/tools/sr_enums/triggers.enum       |  24 --
 67 files changed, 4 insertions(+), 3202 deletions(-)
 delete mode 100644 papermario/tools/c_enums/Ability.h
 delete mode 100644 papermario/tools/c_enums/ActionState.h
 delete mode 100644 papermario/tools/c_enums/Actor.h
 delete mode 100644 papermario/tools/c_enums/ActorSound.h
 delete mode 100644 papermario/tools/c_enums/AmbientSounds.h
 delete mode 100644 papermario/tools/c_enums/Anim.h
 delete mode 100644 papermario/tools/c_enums/Cam.h
 delete mode 100644 papermario/tools/c_enums/Decoration.h
 delete mode 100644 papermario/tools/c_enums/DoorSounds.h
 delete mode 100644 papermario/tools/c_enums/DoorSwing.h
 delete mode 100644 papermario/tools/c_enums/Easing.h
 delete mode 100644 papermario/tools/c_enums/Element.h
 delete mode 100644 papermario/tools/c_enums/Emote.h
 delete mode 100644 papermario/tools/c_enums/EncounterTrigger.h
 delete mode 100644 papermario/tools/c_enums/Entity.h
 delete mode 100644 papermario/tools/c_enums/Event.h
 delete mode 100644 papermario/tools/c_enums/HitResult.h
 delete mode 100644 papermario/tools/c_enums/HitSound.h
 delete mode 100644 papermario/tools/c_enums/Item.h
 delete mode 100644 papermario/tools/c_enums/ItemSpawnMode.h
 delete mode 100644 papermario/tools/c_enums/Iter.h
 delete mode 100644 papermario/tools/c_enums/Location.h
 delete mode 100644 papermario/tools/c_enums/Npc.h
 delete mode 100644 papermario/tools/c_enums/Outcome.h
 delete mode 100644 papermario/tools/c_enums/Partner.h
 delete mode 100644 papermario/tools/c_enums/Phase.h
 delete mode 100644 papermario/tools/c_enums/PlayerAnim.h
 delete mode 100644 papermario/tools/c_enums/Song.h
 delete mode 100644 papermario/tools/c_enums/Sound.h
 delete mode 100644 papermario/tools/c_enums/Sprite.h
 delete mode 100644 papermario/tools/c_enums/Status.h
 delete mode 100644 papermario/tools/c_enums/Trigger.h
 delete mode 100755 papermario/tools/sr_enums/ability.enum
 delete mode 100755 papermario/tools/sr_enums/action_states.enum
 delete mode 100755 papermario/tools/sr_enums/actor.enum
 delete mode 100755 papermario/tools/sr_enums/actor_sounds.enum
 delete mode 100755 papermario/tools/sr_enums/ambient_sounds.enum
 delete mode 100755 papermario/tools/sr_enums/animations.enum
 delete mode 100755 papermario/tools/sr_enums/cameras.enum
 delete mode 100755 papermario/tools/sr_enums/decorations.enum
 delete mode 100755 papermario/tools/sr_enums/door_sounds.enum
 delete mode 100755 papermario/tools/sr_enums/door_swings.enum
 delete mode 100755 papermario/tools/sr_enums/easing.enum
 delete mode 100755 papermario/tools/sr_enums/elements.enum
 delete mode 100755 papermario/tools/sr_enums/emotes.enum
 delete mode 100755 papermario/tools/sr_enums/encounter_trigger.enum
 delete mode 100755 papermario/tools/sr_enums/entities.enum
 delete mode 100755 papermario/tools/sr_enums/events.enum
 delete mode 100755 papermario/tools/sr_enums/hit_result.enum
 delete mode 100755 papermario/tools/sr_enums/hit_sound.enum
 delete mode 100755 papermario/tools/sr_enums/item_spawn_modes.enum
 delete mode 100755 papermario/tools/sr_enums/items.enum
 delete mode 100755 papermario/tools/sr_enums/locations.enum
 delete mode 100755 papermario/tools/sr_enums/npcs.enum
 delete mode 100755 papermario/tools/sr_enums/outcomes.enum
 delete mode 100755 papermario/tools/sr_enums/partners.enum
 delete mode 100755 papermario/tools/sr_enums/phases.enum
 delete mode 100755 papermario/tools/sr_enums/player_animations.enum
 delete mode 100755 papermario/tools/sr_enums/songs.enum
 delete mode 100755 papermario/tools/sr_enums/sounds.enum
 delete mode 100755 papermario/tools/sr_enums/sprites.enum
 delete mode 100755 papermario/tools/sr_enums/status.enum
 delete mode 100755 papermario/tools/sr_enums/target_iter.enum
 delete mode 100755 papermario/tools/sr_enums/triggers.enum

diff --git a/papermario/include/items.h b/papermario/include/items.h
index e1bacc3a6a..b22fd81369 100644
--- a/papermario/include/items.h
+++ b/papermario/include/items.h
@@ -364,4 +364,4 @@ typedef enum eItem {
 	ITEMS_ICON = 0x016C
 } eItem;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/papermario/src/code_1b40_len_20b0.c b/papermario/src/code_1b40_len_20b0.c
index 3e8c004d87..678e160f31 100644
--- a/papermario/src/code_1b40_len_20b0.c
+++ b/papermario/src/code_1b40_len_20b0.c
@@ -32,8 +32,6 @@ extern int D_802EB3D0[];
 extern u8 D_80074021;
 extern s32 D_8009A5D8;
 
-//extern s32 D_8009A650[1]; Declared in variables.h
-
 void dma_copy(void*, void*, void*);
 
 INCLUDE_ASM(code_1b40_len_20b0, step_game_loop);
diff --git a/papermario/src/code_fa4c0_len_3bf0.c b/papermario/src/code_fa4c0_len_3bf0.c
index 737ee055aa..89201e5470 100644
--- a/papermario/src/code_fa4c0_len_3bf0.c
+++ b/papermario/src/code_fa4c0_len_3bf0.c
@@ -119,13 +119,13 @@ s32 AddKeyItem(script_context* script, s32 initialCall) {
         return 2;
     }
 
-    for(i=0; i < ARRAY_COUNT(playerData->keyItems); i++) {
+    for (i=0; i < ARRAY_COUNT(playerData->keyItems); i++) {
         if (playerData->keyItems[i] == 0) {
             break;
         }
     }
 
-    if (i < 32) {
+    if (i < ARRAY_COUNT(playerData->keyItems)) {
         playerData->keyItems[i] = itemID;
     }
     return 2;
@@ -135,7 +135,7 @@ s32 func_802D6954(void) {
     func_800E01A4();
     disable_player_physics();
     func_800EF600();
-    D_8009A650[0] &= -0x41;
+    D_8009A650[0] &= ~0x40;
     return 2;
 }
 
diff --git a/papermario/tools/c_enums/Ability.h b/papermario/tools/c_enums/Ability.h
deleted file mode 100644
index 86c27b5ae0..0000000000
--- a/papermario/tools/c_enums/Ability.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _ABILITY_
-#define _ABILITY_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Ability {
-	DODGE_MASTER = 0x00000000,
-	UNUSED = 0x00000001,
-	SPIKE_SHIELD = 0x00000002,
-	FIRST_ATTACK = 0x00000003,
-	H_P_PLUS = 0x00000004,
-	DOUBLE_DIP = 0x00000005,
-	MYSTERY_SCROLL = 0x00000006,
-	FIRE_SHIELD = 0x00000007,
-	PRETTY_LUCKY = 0x00000008,
-	H_P_DRAIN = 0x00000009,
-	ALL_OR_NOTHING = 0x0000000A,
-	SLOW_GO = 0x0000000B,
-	F_P_PLUS = 0x0000000C,
-	ICE_POWER = 0x0000000D,
-	FEELING_FINE = 0x0000000E,
-	ATTACK_F_X = 0x0000000F,
-	MONEY_MONEY = 0x00000010,
-	CHILL_OUT = 0x00000011,
-	HAPPY_HEART = 0x00000012,
-	ZAP_TAP = 0x00000013,
-	MEGA_RUSH = 0x00000014,
-	BERSERKER = 0x00000015,
-	RIGHT_ON = 0x00000016,
-	RUNAWAY_PAY = 0x00000017,
-	FLOWER_SAVER = 0x00000018,
-	PAY_OFF = 0x00000019,
-	QUICK_CHANGE = 0x0000001A,
-	DEFEND_PLUS = 0x0000001B,
-	POWER_PLUS = 0x0000001C,
-	REFUND = 0x0000001D,
-	POWER_RUSH = 0x0000001E,
-	CRAZY_HEART = 0x0000001F,
-	LAST_STAND = 0x00000020,
-	CLOSE_CALL = 0x00000021,
-	P_UP_D_DOWN = 0x00000022,
-	LUCKY_DAY = 0x00000023,
-	MEGA_H_P_DRAIN = 0x00000024,
-	P_DOWN_D_UP = 0x00000025,
-	FLOWER_FANATIC = 0x00000026,
-	SPEEDY_SPIN = 0x00000027,
-	SPIN_ATTACK = 0x00000028,
-	I_SPY = 0x00000029,
-	BUMP_ATTACK = 0x0000002A,
-	HEART_FINDER = 0x0000002B,
-	FLOWER_FINDER = 0x0000002C,
-	DIZZY_ATTACK = 0x0000002D,
-	FINAL_GOOMPA = 0x0000002E,
-	FINAL_BOMBOMB = 0x0000002F,
-	DEEP_FOCUS = 0x00000030,
-	SUPER_FOCUS = 0x00000031,
-	KAIDEN = 0x00000032,
-	DAMAGE_DODGE = 0x00000033,
-	HAPPY_FLOWER = 0x00000034,
-	GROUP_FOCUS = 0x00000035,
-	PEEKABOO = 0x00000036,
-	HEALTHY_HEALTHY = 0x00000037
-} Ability;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ActionState.h b/papermario/tools/c_enums/ActionState.h
deleted file mode 100644
index bbcffb6b8a..0000000000
--- a/papermario/tools/c_enums/ActionState.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _ACTION_STATE_
-#define _ACTION_STATE_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum ActionState {
-	IDLE = 0x00000000,
-	WALK = 0x00000001,
-	RUN = 0x00000002,
-	JUMP = 0x00000003,
-	BOUNCE = 0x00000004,
-	ABORTED_JUMP = 0x00000005,
-	LAUNCH = 0x00000006,
-	FALLING = 0x00000008,
-	STEP_DOWN = 0x00000009,
-	LAND = 0x0000000A,
-	STEP_DOWN_LAND = 0x0000000B,
-	CONVERSATION = 0x0000000C,
-	SPIN_JUMP = 0x0000000D,
-	GROUND_POUND = 0x0000000E,
-	ULTRA_JUMP = 0x0000000F,
-	ULTRA_POUND = 0x00000010,
-	SLIDING = 0x00000011,
-	HAMMER = 0x00000012,
-	HIT_HAZARD = 0x00000015,
-	HIT_LAVA = 0x00000017,
-	SPIN = 0x0000001A,
-	ENEMY_FIRST_STRIKE = 0x0000001B,
-	SPINNING_FLOWER = 0x0000001D,
-	USE_TWEESTER = 0x0000001F,
-	RIDE = 0x00000021,
-	STEP_UP = 0x00000022,
-	USE_SPRING = 0x00000026
-} ActionState;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Actor.h b/papermario/tools/c_enums/Actor.h
deleted file mode 100644
index 46bff976e8..0000000000
--- a/papermario/tools/c_enums/Actor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _ACTOR_
-#define _ACTOR_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Actor {
-	SELF = 0xFFFFFF81,
-	PLAYER = 0x00000000,
-	PARTNER = 0x00000100,
-	ENEMY0 = 0x00000200,
-	ENEMY1 = 0x00000201,
-	ENEMY2 = 0x00000202,
-	ENEMY3 = 0x00000203,
-	ENEMY4 = 0x00000204,
-	ENEMY5 = 0x00000205,
-	ENEMY6 = 0x00000206,
-	ENEMY7 = 0x00000207,
-	ENEMY8 = 0x00000208,
-	ENEMY9 = 0x00000209,
-	ENEMY10 = 0x0000020A,
-	ENEMY11 = 0x0000020B,
-	ENEMY12 = 0x0000020C,
-	ENEMY13 = 0x0000020D,
-	ENEMY14 = 0x0000020E,
-	ENEMY15 = 0x0000020F,
-	ENEMY16 = 0x00000210,
-	ENEMY17 = 0x00000211,
-	ENEMY18 = 0x00000212,
-	ENEMY19 = 0x00000213,
-	ENEMY20 = 0x00000214,
-	ENEMY21 = 0x00000215,
-	ENEMY22 = 0x00000216,
-	ENEMY23 = 0x00000217
-} Actor;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ActorSound.h b/papermario/tools/c_enums/ActorSound.h
deleted file mode 100644
index 39b3a4716b..0000000000
--- a/papermario/tools/c_enums/ActorSound.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ACTOR_SOUND_
-#define _ACTOR_SOUND_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum ActorSound {
-	WALK = 0x00000000,
-	FLY = 0x00000001,
-	JUMP = 0x00000002,
-	HURT = 0x00000003,
-	WALK_INCREMENT = 0x00000004,
-	FLY_INCREMENT = 0x00000005
-} ActorSound;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/AmbientSounds.h b/papermario/tools/c_enums/AmbientSounds.h
deleted file mode 100644
index 6e9d7d8e62..0000000000
--- a/papermario/tools/c_enums/AmbientSounds.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _AMBIENT_SOUNDS_
-#define _AMBIENT_SOUNDS_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum AmbientSounds {
-	SPOOKY = 0x00000000,
-	WIND = 0x00000001,
-	BEACH = 0x00000002,
-	JUNGLE = 0x00000003,
-	UNDER_SEA1 = 0x00000004,
-	UNDER_SEA2 = 0x00000005,
-	SILENCE = 0x00000006,
-	UNDER_SEA3 = 0x00000007,
-	UNDER_SEA4 = 0x00000008,
-	EXIT_SEA = 0x00000009,
-	UNDER_SEA5 = 0x0000000A,
-	UNDER_SEA6 = 0x0000000B,
-	BIRDS = 0x0000000C,
-	SEA = 0x0000000D,
-	MUSIC = 0x00000010
-} AmbientSounds;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Anim.h b/papermario/tools/c_enums/Anim.h
deleted file mode 100644
index fa7c879361..0000000000
--- a/papermario/tools/c_enums/Anim.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _ANIM_
-#define _ANIM_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Anim {
-	WHITE_BOO__STOP = 0x00950000,
-	WHITE_BOO__IDLE = 0x00950001,
-	WHITE_BOO__WALK = 0x00950002,
-	WHITE_BOO__RUN = 0x00950003,
-	WHITE_BOO__TALK = 0x00950004,
-	WHITE_BOO__WAVE = 0x00950005,
-	WHITE_BOO__PAIN = 0x00950006,
-	WHITE_BOO__HIDE = 0x00950007,
-	WHITE_BOO__SPOOK = 0x00950008,
-	WHITE_BOO__DENYING = 0x00950009,
-	WHITE_BOO__SKEPTICAL = 0x0095000A,
-	WHITE_BOO__THROW = 0x0095000B,
-	WHITE_BOO__CARRYING_STOP = 0x0095000C,
-	WHITE_BOO__CARRYING_IDLE = 0x0095000D,
-	WHITE_BOO__CARRYING_WALK = 0x0095000E,
-	WHITE_BOO__CARRYING_RUN = 0x0095000F,
-	WHITE_BOO__CARRYING_SHAKE = 0x00950010,
-	DUSTY_BOO__STOP = 0x00950100,
-	DUSTY_BOO__IDLE = 0x00950101,
-	DUSTY_BOO__WALK = 0x00950102,
-	DUSTY_BOO__RUN = 0x00950103,
-	DUSTY_BOO__TALK = 0x00950104,
-	DUSTY_BOO__WAVE = 0x00950105,
-	DUSTY_BOO__PAIN = 0x00950106,
-	DUSTY_BOO__HIDE = 0x00950107,
-	DUSTY_BOO__SPOOK = 0x00950108,
-	DUSTY_BOO__DENYING = 0x00950109,
-	DUSTY_BOO__SKEPTICAL = 0x0095010A,
-	DUSTY_BOO__THROW = 0x0095010B,
-	DUSTY_BOO__CARRYING_STOP = 0x0095010C,
-	DUSTY_BOO__CARRYING_IDLE = 0x0095010D,
-	DUSTY_BOO__CARRYING_WALK = 0x0095010E,
-	DUSTY_BOO__CARRYING_RUN = 0x0095010F,
-	DUSTY_BOO__CARRYING_SHAKE = 0x00950110
-} Anim;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Cam.h b/papermario/tools/c_enums/Cam.h
deleted file mode 100644
index a36c551ea9..0000000000
--- a/papermario/tools/c_enums/Cam.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _CAM_
-#define _CAM_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Cam {
-	DEFAULT = 0x00000000,
-	BATTLE = 0x00000001,
-	TATTLE = 0x00000002,
-	CAM3 = 0x00000003
-} Cam;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Decoration.h b/papermario/tools/c_enums/Decoration.h
deleted file mode 100644
index 8f0348075e..0000000000
--- a/papermario/tools/c_enums/Decoration.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _DECORATION_
-#define _DECORATION_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Decoration {
-	GOLDEN_FLAMES = 0x00000001,
-	SWEAT = 0x00000002,
-	SEEING_STARS = 0x00000003,
-	RED_FLAMES = 0x00000004,
-	GREY_SMOKE_TRAIL = 0x00000005,
-	FIRE_SMOKE_TRAIL = 0x00000006,
-	WHIRLWIND = 0x00000007,
-	STEAM_EMITTER = 0x00000008,
-	RADIAL_STAR_EMITTER = 0x0000000B
-} Decoration;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/DoorSounds.h b/papermario/tools/c_enums/DoorSounds.h
deleted file mode 100644
index 98b2a3a9da..0000000000
--- a/papermario/tools/c_enums/DoorSounds.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _DOOR_SOUNDS_
-#define _DOOR_SOUNDS_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum DoorSounds {
-	BASIC = 0x00000000,
-	METAL = 0x00000001,
-	LARGE = 0x00000002,
-	CREAKY = 0x00000003,
-	GATE = 0x00000004
-} DoorSounds;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/DoorSwing.h b/papermario/tools/c_enums/DoorSwing.h
deleted file mode 100644
index fce0c6232f..0000000000
--- a/papermario/tools/c_enums/DoorSwing.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _DOOR_SWING_
-#define _DOOR_SWING_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum DoorSwing {
-	IN = 0x00000001,
-	OUT = -0x00000001
-} DoorSwing;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Easing.h b/papermario/tools/c_enums/Easing.h
deleted file mode 100644
index e5eb2958f2..0000000000
--- a/papermario/tools/c_enums/Easing.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _EASING_
-#define _EASING_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Easing {
-	LINEAR = 0x00000000,
-	QUADRATIC_IN = 0x00000001,
-	CUBIC_IN = 0x00000002,
-	QUARTIC_IN = 0x00000003,
-	QUADRATIC_OUT = 0x00000004,
-	CUBIC_OUT = 0x00000005,
-	QUARTIC_OUT = 0x00000006,
-	COS_SLOW_OVERSHOOT = 0x00000007,
-	COS_FAST_OVERSHOOT = 0x00000008,
-	COS_BOUNCE = 0x00000009,
-	COS_IN_OUT = 0x0000000A,
-	SIN_OUT = 0x0000000B,
-	COS_IN = 0x0000000C
-} Easing;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Element.h b/papermario/tools/c_enums/Element.h
deleted file mode 100644
index ba866170b8..0000000000
--- a/papermario/tools/c_enums/Element.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _ELEMENT_
-#define _ELEMENT_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Element {
-	NORMAL = 0x00000001,
-	FIRE = 0x00000002,
-	WATER = 0x00000003,
-	ICE = 0x00000004,
-	MYSTERY = 0x00000005,
-	MAGIC = 0x00000007,
-	HAMMER = 0x00000008,
-	JUMP = 0x00000009,
-	COSMIC = 0x0000000A,
-	BLAST = 0x0000000B,
-	SHOCK = 0x0000000C,
-	QUAKE = 0x0000000D,
-	THROW = 0x0000000F,
-	END = 0x00000000
-} Element;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Emote.h b/papermario/tools/c_enums/Emote.h
deleted file mode 100644
index 6b6b9c064f..0000000000
--- a/papermario/tools/c_enums/Emote.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _EMOTE_
-#define _EMOTE_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Emote {
-	EXCLAMATION = 0x00000000,
-	SHOCK = 0x00000001,
-	QUESTION = 0x00000002,
-	FRUSTRATION = 0x00000003,
-	ELLIPSIS = 0x00000004,
-	INVALID = 0x00000005
-} Emote;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/EncounterTrigger.h b/papermario/tools/c_enums/EncounterTrigger.h
deleted file mode 100644
index 5cf6f7e543..0000000000
--- a/papermario/tools/c_enums/EncounterTrigger.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ENCOUNTER_TRIGGER_
-#define _ENCOUNTER_TRIGGER_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum EncounterTrigger {
-	NONE = 0x00000001,
-	JUMP = 0x00000002,
-	SPIN = 0x00000003,
-	HAMMER = 0x00000004,
-	PARTNER = 0x00000006
-} EncounterTrigger;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Entity.h b/papermario/tools/c_enums/Entity.h
deleted file mode 100644
index 7bd672f532..0000000000
--- a/papermario/tools/c_enums/Entity.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _ENTITY_
-#define _ENTITY_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Entity {
-	SAVE_POINT = 0x802E9A18,
-	RED_SWITCH = 0x802E9BB0,
-	BLUE_SWITCH = 0x802E9BD4,
-	HUGE_BLUE_SWITCH = 0x802E9BF8,
-	GREEN_STOMP_SWITCH = 0x802E9C1C,
-	MULTI_TRIGGER_BLOCK = 0x802EA07C,
-	BRICK_BLOCK = 0x802EA0C4,
-	MULTI_COIN_BRICK = 0x802EA0E8,
-	HAMMER1_BLOCK = 0x802EA10C,
-	HAMMER1_BLOCK_WIDE = 0x802EA130,
-	HAMMER1_BLOCK_THICK = 0x802EA154,
-	HAMMER1_BLOCK_TINY = 0x802EA178,
-	HAMMER2_BLOCK = 0x802EA19C,
-	HAMMER2_BLOCK_WIDE = 0x802EA1C0,
-	HAMMER2_BLOCK_THICK = 0x802EA1E4,
-	HAMMER2_BLOCK_TINY = 0x802EA208,
-	HAMMER3_BLOCK = 0x802EA22C,
-	HAMMER3_BLOCK_WIDE = 0x802EA250,
-	HAMMER3_BLOCK_THICK = 0x802EA274,
-	HAMMER3_BLOCK_TINY = 0x802EA298,
-	POW_BLOCK = 0x802EA2E0,
-	YELLOW_BLOCK = 0x802EA564,
-	HIDDEN_YELLOW_BLOCK = 0x802EA588,
-	RED_BLOCK = 0x802EA5AC,
-	HIDDEN_RED_BLOCK = 0x802EA5D0,
-	SINGLE_TRIGGER_BLOCK = 0x802EA5F4,
-	HEALING_BLOCK = 0x802EA7E0,
-	SUPER_BLOCK = 0x802EA910,
-	SCRIPT_SPRING = 0x802EAA30,
-	SIMPLE_SPRING = 0x802EAA54,
-	HIDDEN_PANEL = 0x802EAB04,
-	GIANT_CHEST = 0x802EAE0C,
-	CHEST = 0x802EAE30,
-	BLUE_WARP_PIPE = 0x802EAF80,
-	WOODEN_CRATE = 0x802EAED4,
-	SIGNPOST = 0x802EAFDC,
-	PADLOCK = 0x802BCD68,
-	PADLOCK_RED_FRAME = 0x802BCD8C,
-	PADLOCK_RED_FACE = 0x802BCDB0,
-	PADLOCK_BLUE_FACE = 0x802BCDD4,
-	BOARDED_FLOOR = 0x802BCE84,
-	BOMBABLE_ROCK1 = 0x802BCF00,
-	BOMBABLE_ROCK2 = 0x802BCF24,
-	CYMBAL_PLANT = 0x802BC788,
-	PINK_FLOWER = 0x802BC7AC,
-	SPINNING_FLOWER = 0x802BC7F4,
-	BELLBELL_PLANT = 0x802BCBD8,
-	TRUMPET_PLANT = 0x802BCBFC,
-	SPONGY_FLOWER = 0x802BCC20,
-	RED_ARROW_SIGNS = 0x802BCD9C,
-	TWEESTER = 0x802BCA74,
-	STAR_BOX_LAUCHER = 0x802BCB44
-} Entity;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Event.h b/papermario/tools/c_enums/Event.h
deleted file mode 100644
index 216c22a2a7..0000000000
--- a/papermario/tools/c_enums/Event.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _EVENT_
-#define _EVENT_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Event {
-	IMMUNE = 0x00000019,
-	HIT_COMBO = 0x00000009,
-	HIT = 0x0000000A,
-	DEATH = 0x00000020,
-	FALL_TRIGGER = 0x0000000C,
-	FLIP_TRIGGER = 0x0000000D,
-	EXPLODE_TRIGGER = 0x00000022,
-	SPIN_SMASH_HIT = 0x0000000B,
-	SPIN_SMASH_DEATH = 0x00000021,
-	SPIN_SMASH_LAUNCH_HIT = 0x00000011,
-	SPIN_SMASH_LAUNCH_DEATH = 0x00000015,
-	POWER_BOUNCE_HIT = 0x00000015,
-	POWER_BOUNCE_DEATH = 0x00000028,
-	BURN_HIT = 0x0000000E,
-	BURN_DEATH = 0x00000024,
-	SHOCK_HIT = 0x0000002F,
-	SHOCK_DEATH = 0x00000026,
-	BEGIN_AIR_LIFT = 0x0000003A,
-	AIR_LIFT_FAILED = 0x0000001F,
-	BLOW_AWAY = 0x00000016,
-	SCARE_AWAY = 0x00000039,
-	UP_AND_AWAY = 0x0000003D,
-	STAR_BEAM = 0x00000013,
-	RECOVER_STATUS = 0x00000031,
-	SWAP_PARTNER = 0x0000003F,
-	BLOCK = 0x0000001A,
-	SPIKE_CONTACT = 0x0000002A,
-	SPIKE_DEATH = 0x00000027,
-	SPIKE_TAUNT = 0x0000001B,
-	BURN_CONTACT = 0x0000002C,
-	BURN_TAUNT = 0x0000001C,
-	BEGIN_FIRST_STRIKE = 0x00000038,
-	END_FIRST_STRIKE = 0x00000035,
-	LIFE_SHROOM_PROC = 0x00000040,
-	REVIVE = 0x00000041,
-	LUCKY = 0x00000037
-} Event;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/HitResult.h b/papermario/tools/c_enums/HitResult.h
deleted file mode 100644
index 6b8290b6d4..0000000000
--- a/papermario/tools/c_enums/HitResult.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _HIT_RESULT_
-#define _HIT_RESULT_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum HitResult {
-	HIT = 0x00000000,
-	LANDED_ON_SPIKE = 0x00000004,
-	LUCKY = 0x00000005,
-	MISS = 0x00000006,
-	HIT_STATIC = 0x00000007,
-	IMMUNE = 0x00000008,
-	TRIGGERED_EXPLODE = -0x00000001
-} HitResult;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/HitSound.h b/papermario/tools/c_enums/HitSound.h
deleted file mode 100644
index 0a350483dd..0000000000
--- a/papermario/tools/c_enums/HitSound.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _HIT_SOUND_
-#define _HIT_SOUND_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum HitSound {
-	MISS = 0x00000000,
-	BONES = 0x00000001,
-	NORMAL = 0x00000002,
-	FIRE = 0x00000003,
-	ICE = 0x00000004,
-	SHOCK = 0x00000005
-} HitSound;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Item.h b/papermario/tools/c_enums/Item.h
deleted file mode 100644
index a21394190f..0000000000
--- a/papermario/tools/c_enums/Item.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef _ITEM_
-#define _ITEM_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Item {
-	JUMP = 0x00000001,
-	SPIN_JUMP = 0x00000002,
-	TORNADO_JUMP = 0x00000003,
-	HAMMER = 0x00000004,
-	SUPER_HAMMER = 0x00000005,
-	ULTRA_HAMMER = 0x00000006,
-	LUCKY_STAR = 0x00000007,
-	MAP = 0x00000008,
-	BIG_MAP = 0x00000009,
-	FIRST_DEGREE_CARD = 0x0000000A,
-	SECOND_DEGREE_CARD = 0x0000000B,
-	THIRD_DEGREE_CARD = 0x0000000C,
-	FOURTH_DEGREE_CARD = 0x0000000D,
-	DIPLOMA = 0x0000000E,
-	ULTRA_STONE = 0x0000000F,
-	FORTRESS_KEY = 0x00000010,
-	RUINS_KEY = 0x00000011,
-	PULSE_STONE = 0x00000012,
-	CASTLE_KEY1 = 0x00000013,
-	PALACE_KEY = 0x00000014,
-	LUNAR_STONE = 0x00000015,
-	PYRAMID_STONE = 0x00000016,
-	DIAMOND_STONE = 0x00000017,
-	GOLDEN_VASE = 0x00000018,
-	KOOPERS_SHELL = 0x00000019,
-	CASTLE_KEY2 = 0x0000001A,
-	FOREST_PASS = 0x0000001B,
-	WEIGHT = 0x0000001C,
-	BOOS_PORTRAIT = 0x0000001D,
-	CRYSTAL_BERRY = 0x0000001E,
-	MYSTICAL_KEY = 0x0000001F,
-	STOREROOM_KEY = 0x00000020,
-	TOY_TRAIN = 0x00000021,
-	RECORD = 0x00000022,
-	FRYING_PAN = 0x00000023,
-	DICTIONARY = 0x00000024,
-	MYSTERY_NOTE = 0x00000025,
-	SUSPICIOUS_NOTE = 0x00000026,
-	CRYSTAL_BALL = 0x00000027,
-	SCREWDRIVER = 0x00000028,
-	COOKBOOK = 0x00000029,
-	JADE_RAVEN = 0x0000002A,
-	MAGICAL_SEED1 = 0x0000002B,
-	MAGICAL_SEED2 = 0x0000002C,
-	MAGICAL_SEED3 = 0x0000002D,
-	MAGICAL_SEED4 = 0x0000002E,
-	TOAD_DOLL = 0x0000002F,
-	CALCULATOR = 0x00000030,
-	BUCKET = 0x00000031,
-	SCARF = 0x00000032,
-	RED_KEY = 0x00000033,
-	BLUE_KEY = 0x00000034,
-	LETTER01 = 0x00000036,
-	LETTER02 = 0x00000037,
-	LETTER03 = 0x00000038,
-	LETTER04 = 0x00000039,
-	LETTER05 = 0x0000003A,
-	LETTER06 = 0x0000003B,
-	LETTER07 = 0x0000003C,
-	LETTER08 = 0x0000003D,
-	LETTER09 = 0x0000003E,
-	LETTER10 = 0x00000040,
-	LETTER11 = 0x00000041,
-	LETTER12 = 0x00000045,
-	LETTER13 = 0x00000046,
-	LETTER14 = 0x00000047,
-	LETTER15 = 0x00000048,
-	LETTER16 = 0x00000049,
-	LETTER17 = 0x0000004A,
-	LETTER18 = 0x0000004B,
-	LETTER19 = 0x0000004C,
-	LETTER20 = 0x0000004E,
-	LETTER21 = 0x0000004F,
-	LETTER22 = 0x00000050,
-	LETTER23 = 0x00000051,
-	LETTER24 = 0x00000052,
-	ARTIFACT = 0x00000053,
-	LETTER25 = 0x00000054,
-	DOLLY = 0x00000056,
-	WATER_STONE = 0x00000057,
-	MAGICAL_BEAN = 0x00000058,
-	FERTILE_SOIL = 0x00000059,
-	MIRACLE_WATER = 0x0000005A,
-	VOLCANO_VASE = 0x0000005B,
-	TAPE = 0x0000005C,
-	SUGAR = 0x0000005D,
-	SALT = 0x0000005E,
-	EGG1 = 0x0000005F,
-	CREAM = 0x00000060,
-	STRAWBERRY = 0x00000061,
-	BUTTER = 0x00000062,
-	CLEANSER = 0x00000063,
-	WATER = 0x00000064,
-	FLOUR = 0x00000065,
-	MILK = 0x00000066,
-	LYRICS = 0x00000067,
-	MELODY = 0x00000068,
-	MAILBAG = 0x00000069,
-	CASTLE_KEY3 = 0x0000006A,
-	ODD_KEY = 0x0000006B,
-	STAR_STONE = 0x0000006C,
-	SNEAKY_PARASOL = 0x0000006D,
-	KOOPA_LEGENDS = 0x0000006E,
-	AUTOGRAPH1 = 0x0000006F,
-	EMPTY_WALLET = 0x00000070,
-	AUTOGRAPH2 = 0x00000071,
-	KOOPA_SHELL = 0x00000072,
-	OLD_PHOTO = 0x00000073,
-	GLASSES = 0x00000074,
-	PHOTOGRAPH = 0x00000075,
-	PACKAGE = 0x00000076,
-	RED_JAR = 0x00000077,
-	CASTLE_KEY4 = 0x00000078,
-	WAREHOUSE_KEY = 0x00000079,
-	PRISON_KEY1 = 0x0000007A,
-	SILVER_CREDIT = 0x0000007B,
-	GOLD_CREDIT = 0x0000007C,
-	PRISON_KEY2 = 0x0000007D,
-	PRISON_KEY3 = 0x0000007E,
-	PRISON_KEY4 = 0x0000007F,
-	FIRE_FLOWER = 0x00000080,
-	SNOWMAN_DOLL = 0x00000081,
-	THUNDER_RAGE = 0x00000082,
-	SHOOTING_STAR = 0x00000083,
-	THUNDER_BOLT = 0x00000084,
-	PEBBLE = 0x00000085,
-	DUSTY_HAMMER = 0x00000086,
-	INSECTICIDE_HERB = 0x00000087,
-	STONE_CAP = 0x00000088,
-	TASTY_TONIC = 0x00000089,
-	MUSHROOM = 0x0000008A,
-	VOLT_SHROOM = 0x0000008B,
-	SUPER_SHROOM = 0x0000008C,
-	DRIED_SHROOM = 0x0000008D,
-	ULTRA_SHROOM = 0x0000008E,
-	SLEEPY_SHEEP = 0x0000008F,
-	P_O_W_BLOCK = 0x00000090,
-	HUSTLE_DRINK = 0x00000091,
-	STOP_WATCH = 0x00000092,
-	WHACKAS_BUMP = 0x00000093,
-	APPLE = 0x00000094,
-	LIFE_SHROOM = 0x00000095,
-	MYSTERY = 0x00000096,
-	REPEL_GEL = 0x00000097,
-	FRIGHT_JAR = 0x00000098,
-	PLEASE_COME_BACK = 0x00000099,
-	DIZZY_DIAL = 0x0000009A,
-	SUPER_SODA = 0x0000009B,
-	LEMON = 0x0000009C,
-	LIME = 0x0000009D,
-	BLUE_BERRY = 0x0000009E,
-	RED_BERRY = 0x0000009F,
-	YELLOW_BERRY = 0x000000A0,
-	BUBBLE_BERRY = 0x000000A1,
-	JAMMIN_JELLY = 0x000000A2,
-	MAPLE_SYRUP = 0x000000A3,
-	HONEY_SYRUP = 0x000000A4,
-	GOOMNUT = 0x000000A5,
-	KOOPA_LEAF = 0x000000A6,
-	DRIED_PASTA = 0x000000A7,
-	DRIED_FRUIT = 0x000000A8,
-	STRANGE_LEAF = 0x000000A9,
-	CAKE_MIX = 0x000000AA,
-	EGG2 = 0x000000AB,
-	COCONUT = 0x000000AC,
-	MELON = 0x000000AD,
-	STINKY_HERB = 0x000000AE,
-	ICED_POTATO = 0x000000AF,
-	SPICY_SOUP = 0x000000B0,
-	APPLE_PIE = 0x000000B1,
-	HONEY_ULTRA = 0x000000B2,
-	MAPLE_ULTRA = 0x000000B3,
-	JELLY_ULTRA = 0x000000B4,
-	KOOPASTA = 0x000000B5,
-	FRIED_SHROOM = 0x000000B6,
-	SHROOM_CAKE = 0x000000B7,
-	SHROOM_STEAK = 0x000000B8,
-	HOT_SHROOM = 0x000000B9,
-	SWEET_SHROOM = 0x000000BA,
-	YUMMY_MEAL = 0x000000BB,
-	HEALTHY_JUICE = 0x000000BC,
-	BLAND_MEAL = 0x000000BD,
-	DELUXE_FEAST = 0x000000BE,
-	SPECIAL_SHAKE = 0x000000BF,
-	BIG_COOKIE = 0x000000C0,
-	CAKE = 0x000000C1,
-	MISTAKE = 0x000000C2,
-	KOOPA_TEA = 0x000000C3,
-	HONEY_SUPER = 0x000000C4,
-	MAPLE_SUPER = 0x000000C5,
-	JELLY_SUPER = 0x000000C6,
-	SPAGHETTI = 0x000000C7,
-	EGG_MISSILE = 0x000000C8,
-	FRIED_EGG = 0x000000C9,
-	HONEY_SHROOM = 0x000000CA,
-	HONEY_CANDY = 0x000000CB,
-	ELECTRO_POP = 0x000000CC,
-	FIRE_POP = 0x000000CD,
-	LIME_CANDY = 0x000000CE,
-	COCO_POP = 0x000000CF,
-	LEMON_CANDY = 0x000000D0,
-	JELLY_POP = 0x000000D1,
-	STRANGE_CAKE = 0x000000D2,
-	KOOKY_COOKIE = 0x000000D3,
-	FROZEN_FRIES = 0x000000D4,
-	POTATO_SALAD = 0x000000D5,
-	NUTTY_CAKE = 0x000000D6,
-	MAPLE_SHROOM = 0x000000D7,
-	BOILED_EGG = 0x000000D8,
-	YOSHI_COOKIE = 0x000000D9,
-	JELLY_SHROOM1 = 0x000000DA,
-	JELLY_SHROOM2 = 0x000000DB,
-	JELLY_SHROOM3 = 0x000000DC,
-	JELLY_SHROOM4 = 0x000000DD,
-	JELLY_SHROOM5 = 0x000000DE,
-	JELLY_SHROOM6 = 0x000000DF,
-	SPIN_SMASH = 0x000000E0,
-	MULTIBOUNCE = 0x000000E1,
-	POWER_PLUS_A = 0x000000E2,
-	DODGE_MASTER = 0x000000E3,
-	POWER_BOUNCE = 0x000000E4,
-	SPIKE_SHIELD = 0x000000E5,
-	FIRST_ATTACK = 0x000000E6,
-	H_P_PLUS_A = 0x000000E7,
-	QUAKE_HAMMER = 0x000000E8,
-	DOUBLE_DIP = 0x000000E9,
-	MYSTERY_SCROLL = 0x000000EA,
-	SLEEP_STOMP = 0x000000EB,
-	FIRE_SHIELD = 0x000000EC,
-	QUICK_CHANGE = 0x000000ED,
-	D_DOWN_POUND = 0x000000EE,
-	DIZZY_STOMP = 0x000000EF,
-	SMASH_CHARGE0 = 0x000000F0,
-	PRETTY_LUCKY = 0x000000F1,
-	FEELING_FINE = 0x000000F2,
-	ATTACK_F_X_A = 0x000000F3,
-	ALLOR_NOTHING = 0x000000F4,
-	H_P_DRAIN = 0x000000F5,
-	JUMP_CHARGE0 = 0x000000F6,
-	SLOW_GO = 0x000000F7,
-	F_P_PLUS_A = 0x000000F8,
-	MEGA_RUSH = 0x000000F9,
-	ICE_POWER = 0x000000FA,
-	DEFEND_PLUS_A = 0x000000FB,
-	PAY_OFF = 0x000000FC,
-	MONEY_MONEY = 0x000000FD,
-	CHILL_OUT = 0x000000FE,
-	HAPPY_HEART_A = 0x000000FF,
-	ZAP_TAP = 0x00000100,
-	BERSERKER = 0x00000101,
-	RIGHT_ON = 0x00000102,
-	RUNAWAY_PAY = 0x00000103,
-	REFUND = 0x00000104,
-	FLOWER_SAVER_A = 0x00000105,
-	TRIPLE_DIP = 0x00000106,
-	HAMMER_THROW = 0x00000107,
-	MEGA_QUAKE = 0x00000108,
-	SMASH_CHARGE = 0x00000109,
-	JUMP_CHARGE = 0x0000010A,
-	S_SMASH_CHG = 0x0000010B,
-	S_JUMP_CHG = 0x0000010C,
-	POWER_RUSH = 0x0000010D,
-	AUTO_JUMP = 0x0000010E,
-	AUTO_SMASH = 0x0000010F,
-	CRAZY_HEART = 0x00000110,
-	LAST_STAND = 0x00000111,
-	CLOSE_CALL = 0x00000112,
-	P_UP_D_DOWN = 0x00000113,
-	LUCKY_DAY = 0x00000114,
-	MEGA_H_P_DRAIN = 0x00000115,
-	P_DOWN_D_UP = 0x00000116,
-	POWER_QUAKE = 0x00000117,
-	AUTO_MULTIBOUNCE = 0x00000118,
-	FLOWER_FANATIC = 0x00000119,
-	HEART_FINDER = 0x0000011A,
-	FLOWER_FINDER = 0x0000011B,
-	SPIN_ATTACK = 0x0000011C,
-	DIZZY_ATTACK = 0x0000011D,
-	I_SPY = 0x0000011E,
-	SPEEDY_SPIN = 0x0000011F,
-	BUMP_ATTACK = 0x00000120,
-	POWER_JUMP = 0x00000121,
-	SUPER_JUMP = 0x00000122,
-	MEGA_JUMP = 0x00000123,
-	POWER_SMASH1 = 0x00000124,
-	SUPER_SMASH = 0x00000125,
-	MEGA_SMASH = 0x00000126,
-	POWER_SMASH2 = 0x00000127,
-	POWER_SMASH3 = 0x00000128,
-	DEEP_FOCUS1 = 0x00000129,
-	SUPER_FOCUS = 0x0000012A,
-	SHRINK_SMASH = 0x0000012B,
-	SHELL_CRACK = 0x0000012C,
-	KAIDEN = 0x0000012D,
-	D_DOWN_JUMP = 0x0000012E,
-	SHRINK_STOMP = 0x0000012F,
-	DAMAGE_DODGE_A = 0x00000130,
-	EARTHQUAKE_JUMP = 0x00000131,
-	DEEP_FOCUS2 = 0x00000132,
-	DEEP_FOCUS3 = 0x00000133,
-	H_P_PLUS_B = 0x00000134,
-	F_P_PLUS_B = 0x00000135,
-	HAPPY_HEART_B = 0x00000136,
-	HAPPY_HEART_X = 0x00000137,
-	FLOWER_SAVER_B = 0x00000138,
-	FLOWER_SAVER_X = 0x00000139,
-	DAMAGE_DODGE_B = 0x0000013A,
-	DAMAGE_DODGE_X = 0x0000013B,
-	POWER_PLUS_B = 0x0000013C,
-	POWER_PLUS_X = 0x0000013D,
-	DEFEND_PLUS_X = 0x0000013E,
-	DEFEND_PLUS_Y = 0x0000013F,
-	HAPPY_FLOWER_A = 0x00000140,
-	HAPPY_FLOWER_B = 0x00000141,
-	HAPPY_FLOWER_X = 0x00000142,
-	GROUP_FOCUS = 0x00000143,
-	PEEKABOO = 0x00000144,
-	ATTACK_F_X_D = 0x00000145,
-	ATTACK_F_X_B = 0x00000146,
-	ATTACK_F_X_E = 0x00000147,
-	ATTACK_F_X_C = 0x00000148,
-	ATTACK_F_X_F = 0x00000149,
-	H_P_PLUS_C = 0x0000014A,
-	H_P_PLUS_X = 0x0000014B,
-	H_P_PLUS_Y = 0x0000014C,
-	F_P_PLUS_C = 0x0000014D,
-	F_P_PLUS_X = 0x0000014E,
-	F_P_PLUS_Y = 0x0000014F,
-	HEALTHY_HEALTHY = 0x00000150,
-	ATTACK_F_X_F2 = 0x00000151,
-	ATTACK_F_X_F3 = 0x00000152,
-	ATTACK_F_X_F4 = 0x00000153,
-	ATTACK_F_X_F5 = 0x00000154,
-	PARTNER_ATTACK = 0x00000155,
-	HEART = 0x00000156,
-	COIN = 0x00000157,
-	HEART_PIECE = 0x00000158,
-	STAR_POINT = 0x00000159,
-	FULL_HEAL = 0x0000015A,
-	FLOWER = 0x0000015B,
-	STAR_PIECE = 0x0000015C,
-	PRESENT = 0x0000015D,
-	COMPLETE_CAKE = 0x0000015E,
-	BARE_CAKE = 0x0000015F,
-	EMPTY_CAKE_PAN = 0x00000160,
-	FULL_CAKE_PAN = 0x00000161,
-	EMPTY_MIXING_BOWL = 0x00000162,
-	FULL_MIXING_BOWL = 0x00000163,
-	CAKE_WITH_ICING = 0x00000164,
-	CAKE_WITH_BERRIES = 0x00000165,
-	HAMMER1_ICON = 0x00000166,
-	HAMMER2_ICON = 0x00000167,
-	HAMMER3_ICON = 0x00000168,
-	BOOTS1_ICON = 0x00000169,
-	BOOTS2_ICON = 0x0000016A,
-	BOOTS3_ICON = 0x0000016B,
-	ITEMS_ICON = 0x0000016C
-} Item;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/ItemSpawnMode.h b/papermario/tools/c_enums/ItemSpawnMode.h
deleted file mode 100644
index ab5424163f..0000000000
--- a/papermario/tools/c_enums/ItemSpawnMode.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _ITEM_SPAWN_MODE_
-#define _ITEM_SPAWN_MODE_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum ItemSpawnMode {
-	DECORATION = 0x00000001,
-	TOSS__SPAWN_ALWAYS = 0x00000003,
-	BATTLE_REWARD = 0x00000004,
-	TOSS__NEVER_VANISH = 0x00000005,
-	TOSS = 0x00000006,
-	TOSS__SPAWN_ONCE = 0x00000007,
-	TOSS__SPAWN_ONCE__NEVER_VANISH = 0x00000008,
-	TOSS__SPAWN_ALWAYS__NEVER_VANISH = 0x00000009,
-	ITEM_BLOCK__ITEM = 0x0000000A,
-	ITEM_BLOCK__BADGE = 0x0000000B,
-	FALL__SPAWN_ALWAYS = 0x0000000C,
-	FALL__NEVER_VANISH = 0x0000000D,
-	FALL = 0x0000000E,
-	FALL__SPAWN_ONCE = 0x0000000F,
-	FIXED__SPAWN_ALWAYS = 0x00000010,
-	FIXED__NEVER_VANISH = 0x00000011,
-	FIXED = 0x00000012,
-	FIXED__SPAWN_ALWAYS__NEVER_VANISH = 0x00000013,
-	ITEM_BLOCK__SPAWN_ALWAYS = 0x00000014,
-	ITEM_BLOCK__COIN = 0x00000015,
-	TOSS__HIGHER__NEVER_VANISH = 0x00000016,
-	TOSS__SPAWN_ALWAYS__SMALL = 0x0000001A
-} ItemSpawnMode;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Iter.h b/papermario/tools/c_enums/Iter.h
deleted file mode 100644
index e7aff72d69..0000000000
--- a/papermario/tools/c_enums/Iter.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _ITER_
-#define _ITER_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Iter {
-	FIRST = 0xFFFFFFFF,
-	LAST = 0x0000000A,
-	NEXT = 0x00000000,
-	PREV = 0x00000001
-} Iter;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Location.h b/papermario/tools/c_enums/Location.h
deleted file mode 100644
index e916352b68..0000000000
--- a/papermario/tools/c_enums/Location.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _LOCATION_
-#define _LOCATION_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Location {
-	NONE = 0x00000018,
-	TESTING = 0x00000017,
-	TOAD_TOWN = 0x00000001,
-	PEACH_CASTLE_GROUNDS = 0x00000019,
-	SHOOTING_STAR_SUMMIT = 0x0000001B,
-	TOAD_TOWN_TUNNELS = 0x00000002,
-	GOOMBA_VILLAGE = 0x0000001E,
-	GOOMBA_ROAD = 0x0000001F,
-	PLEASANT_PATH = 0x00000020,
-	KOOPA_VILLAGE = 0x00000021,
-	KOOPA_BROS_FORTRESS = 0x00000007,
-	MT_RUGGED = 0x00000008,
-	DRY_DRY_DESERT = 0x0000000A,
-	DRY_DRY_OUTPOST = 0x00000009,
-	DRY_DRY_RUINS = 0x0000000B,
-	FOREVER_FOREST = 0x0000000C,
-	BOOS_MANSION = 0x0000000D,
-	GUSTY_GULCH = 0x00000022,
-	TUBBAS_MANOR = 0x0000000F,
-	WINDY_MILL = 0x00000023,
-	SHY_GUYS_TOYBOX = 0x00000010,
-	JADE_JUNGLE = 0x00000024,
-	YOSHIS_VILLAGE = 0x00000025,
-	MT_LAVALAVA = 0x00000012,
-	FLOWER_FIELDS = 0x00000026,
-	CLOUDY_CLIMB = 0x00000027,
-	SHIVER_CITY = 0x00000028,
-	SHIVER_SNOWFIELD = 0x00000029,
-	STARBORN_VALLEY = 0x0000002A,
-	SHIVER_MOUNTAIN = 0x0000002B,
-	CRYSTAL_PALACE = 0x00000015,
-	STAR_WAY = 0x0000001C,
-	STAR_HAVEN = 0x0000001D,
-	BOWSERS_CASTLE = 0x00000016,
-	PEACHS_CASTLE = 0x0000001A,
-	MARIOS_HOUSE = 0x0000002C
-} Location;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Npc.h b/papermario/tools/c_enums/Npc.h
deleted file mode 100644
index 42c4a45857..0000000000
--- a/papermario/tools/c_enums/Npc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _NPC_
-#define _NPC_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Npc {
-	SELF = 0xFFFFFFFF,
-	PLAYER = 0xFFFFFFFE,
-	PARTNER = 0xFFFFFFFC
-} Npc;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Outcome.h b/papermario/tools/c_enums/Outcome.h
deleted file mode 100644
index 2dbc707d08..0000000000
--- a/papermario/tools/c_enums/Outcome.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _OUTCOME_
-#define _OUTCOME_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Outcome {
-	PLAYER_WON = 0x00000000,
-	PLAYER_LOST = 0x00000001,
-	PLAYER_FLED = 0x00000002,
-	ENEMY_FLED = 0x00000003
-} Outcome;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Partner.h b/papermario/tools/c_enums/Partner.h
deleted file mode 100644
index 4ae4d2a904..0000000000
--- a/papermario/tools/c_enums/Partner.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _PARTNER_
-#define _PARTNER_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Partner {
-	NONE = 0x00000000,
-	GOOMBARIO = 0x00000001,
-	KOOPER = 0x00000002,
-	BOMBETTE = 0x00000003,
-	PARAKARRY = 0x00000004,
-	GOOMPA = 0x00000005,
-	WATT = 0x00000006,
-	SUSHIE = 0x00000007,
-	LAKILESTER = 0x00000008,
-	BOW = 0x00000009,
-	GOOMBARIA = 0x0000000A,
-	TWINK = 0x0000000B
-} Partner;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Phase.h b/papermario/tools/c_enums/Phase.h
deleted file mode 100644
index b8a8deaca4..0000000000
--- a/papermario/tools/c_enums/Phase.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _PHASE_
-#define _PHASE_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Phase {
-	EXECUTE_ACTION = 0x00000000,
-	FIRST_STRIKE = 0x00000001,
-	RUN_AWAY_START = 0x00000003,
-	RUN_AWAY_RESET = 0x00000004,
-	RUN_AWAY_FAIL = 0x00000007,
-	USE_DEFEND = 0x00000006,
-	USE_LIFE_SHROOM = 0x00000008,
-	PLAYER_BEGIN = 0x0000000A,
-	PLAYER_END = 0x0000000D,
-	ENEMY_BEGIN = 0x0000000C,
-	ENEMY_END = 0x0000000B,
-	MERLEE_ATTACK_BONUS = 0x00000014,
-	MERLEE_DEFENSE_BONUS = 0x00000015,
-	MERLEE_EXP_BONUS = 0x00000016,
-	PLAYER_HAPPY = 0x0000001E
-} Phase;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/PlayerAnim.h b/papermario/tools/c_enums/PlayerAnim.h
deleted file mode 100644
index 73196aa940..0000000000
--- a/papermario/tools/c_enums/PlayerAnim.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _PLAYER_ANIM_
-#define _PLAYER_ANIM_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum PlayerAnim {
-	STAND_STILL = 0x00010000,
-	CROUCH_STILL = 0x00010001,
-	PANTING = 0x00010003,
-	WALKING = 0x00010004,
-	RUNNING = 0x00010005,
-	BEFORE_JUMP = 0x00010006,
-	MIDAIR_STILL = 0x00010007,
-	MIDAIR = 0x00010008,
-	STUNNED_STILL = 0x0001000E,
-	DEAD_STILL = 0x0001000F,
-	SPINNING = 0x00010011,
-	FLAILING = 0x00010012,
-	SIT_STILL = 0x00010013,
-	CROUCH = 0x00010014,
-	STONE_STILL = 0x00010015,
-	THROW = 0x00010016,
-	FALL_BACK = 0x00010017,
-	FALL_DOWN = 0x00010018,
-	SCARED = 0x00010019,
-	HURT_FOOT = 0x0001001A,
-	RUN_PANIC = 0x0001001B,
-	EAT = 0x0001001C,
-	STICK_OUT_TONGUE = 0x0001001D,
-	PLANT = 0x0001001E,
-	GOT_ITEM = 0x0001001F,
-	READY_JUMP = 0x00010020,
-	THINKING = 0x00010021,
-	LOST_BALANCE = 0x00010022,
-	SHOCK_STILL = 0x00010023,
-	DRINK = 0x00010025,
-	SQUISH = 0x00010026,
-	RUN_THINKING = 0x00010027,
-	QUESTION = 0x00010028,
-	NOD_YES = 0x00010029,
-	PRAY = 0x0001002C,
-	CHARRED = 0x0001002F,
-	GET_UP = 0x00010030,
-	DUST_OFF = 0x00010031,
-	THUMBS_UP = 0x00010032
-} PlayerAnim;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Song.h b/papermario/tools/c_enums/Song.h
deleted file mode 100644
index b86c81e2ef..0000000000
--- a/papermario/tools/c_enums/Song.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef _SONG_
-#define _SONG_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Song {
-	TOAD_TOWN = 0x00000000,
-	NORMAL_BATTLE = 0x00000002,
-	SPECIAL_BATTLE = 0x00000003,
-	JR_TROOPA_BATTLE = 0x00000004,
-	FINAL_BOWSER_BATTLE = 0x00000005,
-	GOOMBA_KING_BATTLE = 0x00000007,
-	KOOPA_BROS_BATTLE = 0x00000008,
-	FAKE_BOWSER_BATTLE = 0x00000009,
-	TUTANKOOPA_BATTLE = 0x0000000A,
-	TUBBA_BLUBBA_BATTLE = 0x0000000B,
-	GENERAL_GUY_BATTLE = 0x0000000C,
-	LAVA_PIRANHA_BATTLE = 0x0000000D,
-	HUFF_N_PUFF_BATTLE = 0x0000000E,
-	CRYSTAL_KING_BATTLE = 0x0000000F,
-	GOOMBA_VILLAGE = 0x00000010,
-	PLEASANT_PATH = 0x00000011,
-	FUZZY_ATTACK = 0x00000012,
-	KOOPA_VILLAGE = 0x00000013,
-	KOOPA_FORTRESS = 0x00000014,
-	DRY_DRY_OUTPOST = 0x00000015,
-	MT_RUGGED = 0x00000016,
-	DRY_DRY_DESERT = 0x00000017,
-	DRY_DRY_RUINS = 0x00000018,
-	RUINS_BASEMENT = 0x00000019,
-	FOREVER_FOREST = 0x0000001A,
-	BOOS_MANSION = 0x0000001B,
-	CHEERFUL_BOOS_MANSION = 0x0000001C,
-	GUSTY_GULCH = 0x0000001D,
-	TUBBAS_MANOR = 0x0000001E,
-	TUBBA_ESCAPE = 0x0000001F,
-	SHY_GUY_TOYBOX = 0x00000020,
-	TOYBOX_TRAIN = 0x00000021,
-	CREEPY_TOYBOX = 0x00000022,
-	JADE_JUNGLE = 0x00000024,
-	DEEP_JUNGLE = 0x00000025,
-	YOSHIS_VILLAGE = 0x00000026,
-	YOSHIS_PANIC = 0x00000027,
-	RAPHAEL_RAVEN = 0x00000028,
-	MT_LAVALAVA = 0x00000029,
-	VOLCANO_ESCAPE = 0x0000002A,
-	STAR_WAY_OPENS = 0x0000002B,
-	MASTER_BATTLE = 0x0000002C,
-	RADIO_ISLAND_SOUNDS = 0x0000002D,
-	RADIO_HOT_HITS = 0x0000002E,
-	RADIO_GOLDEN_OLDIES = 0x0000002F,
-	FLOWER_FIELDS_CLOUDY = 0x00000030,
-	FLOWER_FIELDS_SUNNY = 0x00000031,
-	CLOUDY_CLIMB = 0x00000032,
-	PUFF_PUFF_MACHINE = 0x00000033,
-	SUN_TOWER_CLOUDY = 0x00000034,
-	SUN_TOWER_SUNNY = 0x00000035,
-	CRYSTAL_PALACE = 0x00000037,
-	SHIVER_CITY = 0x00000038,
-	PENGUIN_MYSTERY = 0x00000039,
-	SHIVER_SNOWFIELD = 0x0000003A,
-	SHIVER_MOUNTAIN = 0x0000003B,
-	STARBORN_VALLEY = 0x0000003C,
-	MERLAR_THEME = 0x0000003D,
-	MAIL_CALL = 0x0000003E,
-	PEACHS_CASTLE_PARTY = 0x0000003F,
-	CHAPTER_END = 0x00000040,
-	CHAPTER_START = 0x00000041,
-	ITEM_UPGRADE = 0x00000042,
-	PHONOGRAPH_MUSIC = 0x00000044,
-	TUTANKOOPA_THEME = 0x00000045,
-	KAMMY_KOOPA_THEME = 0x00000046,
-	JR_TROOPA_THEME = 0x00000047,
-	BULLET_BILL_ASSAULT = 0x00000048,
-	MONTY_MOLE_ASSAULT = 0x00000049,
-	SHY_GUY_INVASION = 0x0000004A,
-	TOAD_TOWN_TUNNELS = 0x0000004B,
-	WHALE_THEME = 0x0000004C,
-	FOREVER_FOREST_WARNING = 0x0000004D,
-	YOSHI_KIDS_FOUND = 0x0000004E,
-	UNUSED_FANFARE = 0x0000004F,
-	GOOMBA_KING_THEME = 0x00000050,
-	KOOPA_BROS_INTERLUDE = 0x00000051,
-	KOOPA_BROS_THEME = 0x00000052,
-	TUTANKOOPA_WARNING = 0x00000053,
-	TUTANKOOPA_REVEALED = 0x00000054,
-	TUBBA_BLUBBA_THEME = 0x00000055,
-	GENERAL_GUY_THEME = 0x00000056,
-	LAVA_PIRANHA_THEME = 0x00000057,
-	HUFF_N_PUFF_THEME = 0x00000058,
-	CRYSTAL_KING_THEME = 0x00000059,
-	BLOOPER_THEME = 0x0000005A,
-	MINIBOSS_BATTLE = 0x0000005B,
-	MONSTAR_THEME = 0x0000005C,
-	CLUB64 = 0x0000005D,
-	UNUSED_OPENING = 0x0000005E,
-	BOWSERS_CASTLE_FALLS = 0x0000005F,
-	STAR_HAVEN = 0x00000060,
-	SHOOTING_STAR_SUMMIT = 0x00000061,
-	STARSHIP_THEME = 0x00000062,
-	STAR_SANCTUARY = 0x00000063,
-	BOWSERS_CASTLE = 0x00000064,
-	BOWSERS_CASTLE_CAVES = 0x00000065,
-	BOWSER_THEME = 0x00000066,
-	BOWSER_BATTLE = 0x00000067,
-	PEACH_WISHES = 0x00000068,
-	FILE_SELECT = 0x00000069,
-	MAIN_THEME = 0x0000006A,
-	BOWSER_ATTACKS = 0x0000006B,
-	MARIO_FALLS = 0x0000006C,
-	PEACH_APPEARS = 0x0000006D,
-	THE_END = 0x0000006E,
-	RECOVERED_STAR_ROD = 0x0000006F,
-	TWINK_THEME = 0x00000070,
-	STIRRING_CAKE = 0x00000071,
-	GOURMET_GUY_FREAKOUT = 0x00000072,
-	PRISONER_PEACH_THEME = 0x00000073,
-	PEACH_MISSION = 0x00000074,
-	PEACH_SNEAKING = 0x00000075,
-	PEACH_CAUGHT = 0x00000076,
-	PEACH_QUIZ_INTRO = 0x00000077,
-	STAR_SPIRIT_THEME = 0x00000078,
-	PENGUIN_WHODUNIT = 0x00000079,
-	PENGUIN_WAKES_UP = 0x0000007A,
-	MAGIC_BEANSTALK = 0x0000007B,
-	MERLEE_SPELL = 0x0000007C,
-	LAKILESTER_THEME = 0x0000007D,
-	GOOMBA_BROS_RETREAT = 0x0000007E,
-	SUNSHINE_RETURNS = 0x0000007F,
-	RIDING_THE_RAILS = 0x00000080,
-	RIDING_THE_WHALE = 0x00000081,
-	NEW_PARTNER = 0x00000082,
-	DRY_DRY_RUINS_APPEAR = 0x00000083,
-	CANDY_CANES = 0x00000084,
-	PLAYROOM = 0x00000085,
-	MOUSTAFA_THEME = 0x00000086,
-	GAME_OVER = 0x00000087,
-	TAKING_REST = 0x00000088,
-	FLOWER_N_P_C_THEME = 0x00000089,
-	FLOWER_GATE_APPEARS = 0x0000008A,
-	BATTLE_END = 0x0000008B,
-	POP_DIVA_SONG = 0x0000008C,
-	BOO_MINIGAME = 0x0000008D,
-	LEVEL_UP = 0x0000008E,
-	PARADE_DAY = 0x00000090,
-	PARADE_NIGHT = 0x00000091,
-	MARIO_BROS_HOUSE = 0x00000094,
-	INTRO_STORY = 0x00000095,
-	NEW_PARTNER_J_P = 0x00000096
-} Song;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Sound.h b/papermario/tools/c_enums/Sound.h
deleted file mode 100644
index ba01970a8d..0000000000
--- a/papermario/tools/c_enums/Sound.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _SOUND_
-#define _SOUND_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Sound {
-	JR_TROOPA_SPLASH = 0x00000045,
-	JR_TROOPA_SWIM = 0x00000046,
-	BOO_SPOOK = 0x00000047,
-	BOO_VANISH = 0x000000C1,
-	BOO_APPEAR = 0x000000C3,
-	MENU_OPEN = 0x000000C5,
-	MENU_CLOSE = 0x000000C6,
-	MENU_CHANGE_SELECTION = 0x000000C7,
-	MENU_CHANGE_TAB = 0x000000C8,
-	MENU_NEXT = 0x000000C9,
-	MENU_BACK = 0x000000CA,
-	STEP1 = 0x00000141,
-	STEP2 = 0x00000142,
-	TORNADO_JUMP = 0x00000147,
-	SOFT_LAND = 0x00000148,
-	LAND = 0x0000014B,
-	HIT_BLOCK = 0x0000014E,
-	SEARCH_BUSH = 0x00000153,
-	BASIC_DOOR_OPEN = 0x000001C1,
-	BASIC_DOOR_CLOSE = 0x000001C2,
-	METAL_DOOR_OPEN = 0x000001C3,
-	METAL_DOOR_CLOSE = 0x000001C4,
-	LARGE_DOOR_OPEN = 0x000001C5,
-	LARGE_DOOR_CLOSE = 0x000001C6,
-	CREAKY_DOOR_OPEN = 0x000001C7,
-	CREAKY_DOOR_CLOSE = 0x000001C8,
-	METAL_GATE_OPEN = 0x000001C9,
-	METAL_GATE_CLOSE = 0x000001CA,
-	BOW_SPOOK = 0x00000291,
-	SMOKE_BURST = 0x000002CD,
-	DAYZEE_SONG = 0x000002D7,
-	POWER_UP = 0x000002D8,
-	SHY_GUY_SCREAMS1 = 0x0000030C,
-	SHY_GUY_SCREAMS2 = 0x0000030D,
-	SHY_GUY_SCREAMS3 = 0x0000030E,
-	TOY_TANK_MOVE1 = 0x0000030F,
-	TOY_TANK_MOVE2 = 0x00000310,
-	GENERAL_WHISTLE = 0x00000395,
-	MOLE_SURFACE = 0x00000321,
-	MOLE_DIG = 0x00000322,
-	MOLE_POP = 0x00000323,
-	JUMP = 0x000003E2,
-	MISS_JUMP = 0x000003E3,
-	DEATH = 0x000003E5,
-	BIG_POWER_UP = 0x000003E6,
-	MOLE_THROW = 0x000003E8,
-	CLOSE_SHELL = 0x000002FF,
-	OPEN_SHELL = 0x000003D4,
-	BOW_VANISH = 0x0000200E,
-	BOW_APPEAR = 0x0000200F,
-	CANNON1 = 0x00002016,
-	CANNON2 = 0x00002017,
-	CANNON3 = 0x00002018,
-	JUMP = 0x00002081,
-	BOMB_BLAST = 0x00002076,
-	SPELL_CAST1 = 0x000020D4,
-	SPELL_CAST2 = 0x000020D5,
-	SPELL_CAST3 = 0x000020D6,
-	SPELL_CAST4 = 0x000020D7,
-	SPELL_CAST5 = 0x000020D8
-} Sound;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Sprite.h b/papermario/tools/c_enums/Sprite.h
deleted file mode 100644
index 3768175a71..0000000000
--- a/papermario/tools/c_enums/Sprite.h
+++ /dev/null
@@ -1,243 +0,0 @@
-#ifndef _SPRITE_
-#define _SPRITE_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Sprite {
-	WORLD_GOOMBARIO = 0x00000001,
-	WORLD_KOOPER = 0x00000002,
-	WORLD_BOMBETTE = 0x00000003,
-	WORLD_PARAKARRY = 0x00000004,
-	WORLD_BOW = 0x00000005,
-	WORLD_WATT = 0x00000006,
-	WORLD_SUSHI = 0x00000007,
-	WORLD_LAKILESTER = 0x00000008,
-	BATTLE_GOOMBARIO = 0x00000009,
-	BATTLE_KOOPER = 0x0000000A,
-	BATTLE_BOMBETTE = 0x0000000B,
-	BATTLE_PARAKARRY = 0x0000000C,
-	BATTLE_BOW = 0x0000000D,
-	BATTLE_WATT = 0x0000000E,
-	BATTLE_SUSHI = 0x0000000F,
-	BATTLE_LAKILESTER = 0x00000010,
-	KOOPER_WITHOUT_SHELL = 0x00000011,
-	WORLD_ELDSTAR = 0x00000012,
-	WORLD_MAMAR = 0x00000013,
-	WORLD_SKOLAR = 0x00000014,
-	WORLD_MUSKULAR = 0x00000015,
-	WORLD_MISSTAR = 0x00000016,
-	WORLD_KLEVAR = 0x00000017,
-	WORLD_KALMAR = 0x00000018,
-	BATTLE_ELDSTAR = 0x00000019,
-	BATTLE_MAMAR = 0x0000001A,
-	BATTLE_SKOLAR = 0x0000001B,
-	BATTLE_MUSKULAR = 0x0000001C,
-	BATTLE_MISSTAR = 0x0000001D,
-	BATTLE_KLEVAR = 0x0000001E,
-	BATTLE_KALMAR = 0x0000001F,
-	TWINK = 0x00000020,
-	JR_TROOPA = 0x00000021,
-	SPIKED_JR_TROOPA = 0x00000022,
-	SPIKED_PARA_JR_TROOPA = 0x00000023,
-	MAGE_JR_TROOPA = 0x00000024,
-	PARA_JR_TROOPA = 0x00000025,
-	GOOMBA = 0x00000026,
-	SPIKED_GOOMBA = 0x00000027,
-	PARAGOOMBA = 0x00000028,
-	KOOPA_TROOPA = 0x00000029,
-	PARA_TROOPA = 0x0000002A,
-	FUZZY = 0x0000002B,
-	BOMBOMB = 0x0000002C,
-	BULLET_BILL = 0x0000002D,
-	BILL_BLASTER = 0x0000002E,
-	MONTY_MOLE = 0x0000002F,
-	CLEFT = 0x00000030,
-	POKEY = 0x00000031,
-	BANDIT = 0x00000032,
-	BUZZY_BEETLE = 0x00000033,
-	SWOOPER = 0x00000034,
-	STONE_CHOMP = 0x00000035,
-	PUTRID_PIRANHA = 0x00000036,
-	PIRANHA_PLANT = 0x00000037,
-	SENTINEL = 0x00000038,
-	WORLD_CLUBBA = 0x00000039,
-	BATTLE_CLUBBA = 0x0000003A,
-	SHY_GUY = 0x0000003B,
-	GROOVE_GUY = 0x0000003C,
-	SKY_GUY = 0x0000003D,
-	PYRO_GUY = 0x0000003E,
-	SPY_GUY = 0x0000003F,
-	MEDI_GUY = 0x00000040,
-	FUZZIPEDE = 0x00000041,
-	JUNGLE_GUY = 0x00000042,
-	HEART_PLANT = 0x00000043,
-	HURT_PLANT = 0x00000044,
-	M_BUSH = 0x00000045,
-	BUBBLE = 0x00000046,
-	KENT_C_KOOPA = 0x00000047,
-	DAYZEE = 0x00000048,
-	LAKITU = 0x00000049,
-	SPINY = 0x0000004A,
-	BZZAP = 0x0000004B,
-	RUFF_PUFF = 0x0000004C,
-	SPIKE_TOP = 0x0000004D,
-	DUPLIGHOST = 0x0000004E,
-	ALBINO_DINO = 0x0000004F,
-	BLOOPER = 0x00000050,
-	BABY_BLOOPER = 0x00000051,
-	GULPIT = 0x00000052,
-	DRY_BONES = 0x00000053,
-	THROWN_BONE = 0x00000054,
-	BONY_BEETLE = 0x00000055,
-	MAGIKOOPA = 0x00000056,
-	FLYING_MAGIKOOPA = 0x00000057,
-	WORLD_KOOPATROL = 0x00000058,
-	KOOPATROL = 0x00000059,
-	HAMMER_BROS = 0x0000005A,
-	BUSH_BASIC = 0x0000005B,
-	BUSH_BLOCKY = 0x0000005C,
-	BUSH_DRY = 0x0000005D,
-	BUSH_LEAFY = 0x0000005E,
-	BUSH_MATTED = 0x0000005F,
-	WORLD_KAMMY = 0x00000060,
-	BATTLE_KAMMY = 0x00000061,
-	GOOMBA_BROS = 0x00000062,
-	GOOMBA_KING = 0x00000063,
-	SPIKY_GOOMNUT = 0x00000064,
-	DARK_TOAD = 0x00000065,
-	KOOPA_BROS = 0x00000066,
-	BUZZAR = 0x00000067,
-	TUTANKOOPA = 0x00000068,
-	CHAIN_CHOMP = 0x00000069,
-	WORLD_TUBBA = 0x0000006A,
-	BATTLE_TUBBA = 0x0000006B,
-	TUBBAS_HEART = 0x0000006C,
-	BIG_LANTERN_GHOST = 0x0000006D,
-	SHY_SQUAD_GUY = 0x0000006E,
-	MARSHAL_GUY = 0x0000006F,
-	STILT_GUY = 0x00000070,
-	STILT_GUY_UNFOLD = 0x00000071,
-	SHY_STACK_GUY = 0x00000072,
-	SHY_STACK_UNFOLD = 0x00000073,
-	SHY_STACK_DAMAGE = 0x00000074,
-	SHY_STACK_ROCK = 0x00000075,
-	GENERAL_GUY = 0x00000076,
-	GENERAL_GUY_BOMB = 0x00000077,
-	TANK_GUY = 0x00000078,
-	LAVA_PIRANHA_HEAD = 0x00000079,
-	PETIT_PIRANHA = 0x0000007A,
-	LAVA_BUD = 0x0000007B,
-	HUFF_N_PUFF = 0x0000007C,
-	TUFF_PUFF = 0x0000007D,
-	MONSTAR = 0x0000007E,
-	CRYSTAL_KING = 0x0000007F,
-	WORLD_BOWSER = 0x00000080,
-	BATTLE_BOWSER = 0x00000081,
-	LUIGI = 0x00000082,
-	TOAD = 0x00000083,
-	THREE_SISTERS = 0x00000084,
-	VANNA_T = 0x00000085,
-	TOAD_KID = 0x00000086,
-	TOAD_GUARD = 0x00000087,
-	HARRY_T = 0x00000088,
-	TOAD_MINISTER = 0x00000089,
-	POSTMASTER = 0x0000008A,
-	CONDUCTOR_TOAD = 0x0000008B,
-	TRAIN_STATION_TOAD = 0x0000008C,
-	FISHMAEL = 0x0000008D,
-	ARTIST_TOAD = 0x0000008E,
-	KOOPA = 0x0000008F,
-	KOOPA_WITHOUT_SHELL = 0x00000090,
-	WORLD_BOMBOMB = 0x00000091,
-	WHACKA = 0x00000092,
-	DRYITE = 0x00000093,
-	MOUSER = 0x00000094,
-	BOO = 0x00000095,
-	YOSHI = 0x00000096,
-	YOSHI_KID = 0x00000097,
-	RAVEN = 0x00000098,
-	BUBULB = 0x00000099,
-	PENGUIN = 0x0000009A,
-	SHIVER_TOAD = 0x0000009B,
-	ALT_BANDIT = 0x0000009C,
-	GOOMPAPA = 0x0000009D,
-	GOOMBARIA = 0x0000009E,
-	GOOMAMA = 0x0000009F,
-	GOOMPA = 0x000000A0,
-	GOOMMA = 0x000000A1,
-	THE_MASTER = 0x000000A2,
-	CHAN = 0x000000A3,
-	LEE = 0x000000A4,
-	MERLON = 0x000000A5,
-	CHET_RIPPO = 0x000000A6,
-	ROWF = 0x000000A7,
-	MINH_T = 0x000000A8,
-	RUSS_T = 0x000000A9,
-	TAYCE_T = 0x000000AA,
-	FICE_T = 0x000000AB,
-	BARTENDER = 0x000000AC,
-	CHANTERELLE = 0x000000AD,
-	RIP_CHEATO = 0x000000AE,
-	CHUCK_QUIZMO = 0x000000AF,
-	MERLUVLEE = 0x000000B0,
-	MERLAR = 0x000000B1,
-	MERLOW = 0x000000B2,
-	STAR_KID = 0x000000B3,
-	KOLORADO_WIFE = 0x000000B4,
-	KOOPA_KOOT = 0x000000B5,
-	KOLORADO = 0x000000B6,
-	BATTLE_KOLORADO = 0x000000B7,
-	ARCHEOLOGIST = 0x000000B8,
-	NOMADIMOUSE = 0x000000B9,
-	WORLD_MERLEE = 0x000000BA,
-	BATTLE_MERLEE = 0x000000BB,
-	DISGUISED_MOUSTAFA = 0x000000BC,
-	MOUSTAFA = 0x000000BD,
-	OAKLIE = 0x000000BE,
-	BOOTLER = 0x000000BF,
-	YAKKEY = 0x000000C0,
-	GOURMET_GUY = 0x000000C1,
-	VILLAGE_LEADER = 0x000000C2,
-	LEADERS_FRIEND = 0x000000C3,
-	RAFAEL_RAVEN = 0x000000C4,
-	TOLIELUP = 0x000000C5,
-	GATE_FLOWER = 0x000000C6,
-	PETUNIA = 0x000000C7,
-	POSIE = 0x000000C8,
-	LILY = 0x000000C9,
-	ROSIE = 0x000000CA,
-	SUN = 0x000000CB,
-	LAKILULU = 0x000000CC,
-	NINJI = 0x000000CD,
-	MAYOR_PENGUIN = 0x000000CE,
-	MAYOR_PENGUIN_WIFE = 0x000000CF,
-	PENGUIN_PATROL = 0x000000D0,
-	HERRINGWAY = 0x000000D1,
-	MERLE = 0x000000D2,
-	STAR_ROD = 0x000000D3,
-	FIRE = 0x000000D4,
-	COIN = 0x000000D5,
-	PARADE_PEACH = 0x000000D6,
-	PARADE_KOOPAS = 0x000000D7,
-	PARADE_BURNT_BOWSER = 0x000000D8,
-	PARADE_LUIGI = 0x000000D9,
-	PARADE_PARTNERS = 0x000000DA,
-	PARADE_YOSHIS = 0x000000DB,
-	PARADA_KOLORADOS = 0x000000DC,
-	PARADE_CHICKS = 0x000000DD,
-	PARADE_ICE_SHOW = 0x000000DE,
-	PARADE_TOADS = 0x000000DF,
-	PARADE_BATONS = 0x000000E0,
-	PARADE_DRUMS = 0x000000E1,
-	PARADE_FLAGS = 0x000000E2,
-	PARADE_HORNS = 0x000000E3,
-	PARADE_TUBBA_BALLOON = 0x000000E4,
-	PARADE_WIZARDS = 0x000000E5,
-	PARADE_MARIO = 0x000000E6,
-	PARADE_SHY_GUYS = 0x000000E7,
-	PARADE_TWINK = 0x000000E8,
-	LEAF = 0x000000E9
-} Sprite;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Status.h b/papermario/tools/c_enums/Status.h
deleted file mode 100644
index 2bde1a0309..0000000000
--- a/papermario/tools/c_enums/Status.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _STATUS_
-#define _STATUS_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Status {
-	NORMAL = 0x00000001,
-	DEFAULT = 0x00000002,
-	DEFAULT_TURN_MOD = 0x0000001F,
-	SLEEP = 0x00000006,
-	SLEEP_TURN_MOD = 0x00000020,
-	POISON = 0x00000009,
-	POISON_TURN_MOD = 0x00000025,
-	FROZEN = 0x00000007,
-	FROZEN_TURN_MOD = 0x00000022,
-	DIZZY = 0x00000004,
-	DIZZY_TURN_MOD = 0x00000024,
-	FEAR = 0x00000003,
-	FEAR_TURN_MOD = 0x00000023,
-	STATIC = 0x0000000B,
-	STATIC_TURN_MOD = 0x00000021,
-	PARALYZE = 0x00000005,
-	PARALYZE_TURN_MOD = 0x00000026,
-	SHRINK = 0x0000000A,
-	SHRINK_TURN_MOD = 0x00000027,
-	STOP = 0x00000008,
-	STOP_TURN_MOD = 0x00000029,
-	STONE = 0x0000000C,
-	DAZE = 0x0000000D,
-	END = 0x00000000,
-	BERSERK = 0x00000010,
-	TURN_DONE = 0x00000012,
-	HUSTLE = 0x00000019,
-	DANGER = 0x0000001A,
-	THINKING = 0x0000001C,
-	WEARY = 0x0000001D
-} Status;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/c_enums/Trigger.h b/papermario/tools/c_enums/Trigger.h
deleted file mode 100644
index a1561c6ce1..0000000000
--- a/papermario/tools/c_enums/Trigger.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _TRIGGER_
-#define _TRIGGER_
-
-#include "ultra64.h"
-#include "types.h"
-
-typedef enum Trigger {
-	FLOOR_TOUCH = 0x00000080,
-	FLOOR_ABOVE = 0x00080000,
-	FLOOR_PRESS_A = 0x00000800,
-	FLOOR_JUMP = 0x00000200,
-	WALL_TOUCH = 0x00000400,
-	WALL_PUSH = 0x00000040,
-	WALL_PRESS_A = 0x00000100,
-	WALL_HAMMER = 0x00001000,
-	CEILING_TOUCH = 0x00040000,
-	POINT_BOMB = 0x00100000,
-	GAME_FLAG_SET = 0x00010000,
-	AREA_FLAG_SET = 0x00020000
-} Trigger;
-
-#endif
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/ability.enum b/papermario/tools/sr_enums/ability.enum
deleted file mode 100755
index 6ffa45c245..0000000000
--- a/papermario/tools/sr_enums/ability.enum
+++ /dev/null
@@ -1,60 +0,0 @@
-Ability		% namespace
-abilityID	% library name
-false		% reversed
-
-00 = DodgeMaster
-01 = Unused			% the devs skipped 01 for some reason
-02 = SpikeShield
-03 = FirstAttack
-04 = HPPlus
-05 = DoubleDip
-06 = MysteryScroll
-07 = FireShield
-08 = PrettyLucky
-09 = HPDrain
-0A = AllOrNothing
-0B = SlowGo
-0C = FPPlus
-0D = IcePower
-0E = FeelingFine
-0F = AttackFX
-10 = MoneyMoney
-11 = ChillOut
-12 = HappyHeart
-13 = ZapTap
-14 = MegaRush
-15 = Berserker
-16 = RightOn
-17 = RunawayPay
-18 = FlowerSaver
-19 = PayOff
-1A = QuickChange
-1B = DefendPlus
-1C = PowerPlus
-1D = Refund
-1E = PowerRush
-1F = CrazyHeart
-20 = LastStand
-21 = CloseCall
-22 = PUpDDown
-23 = LuckyDay
-24 = MegaHPDrain
-25 = PDownDUp
-26 = FlowerFanatic
-27 = SpeedySpin
-28 = SpinAttack
-29 = ISpy
-2A = BumpAttack
-2B = HeartFinder
-2C = FlowerFinder
-2D = DizzyAttack
-2E = FinalGoompa
-2F = FinalBombomb
-30 = DeepFocus
-31 = SuperFocus
-32 = Kaiden
-33 = DamageDodge
-34 = HappyFlower
-35 = GroupFocus
-36 = Peekaboo
-37 = HealthyHealthy
diff --git a/papermario/tools/sr_enums/action_states.enum b/papermario/tools/sr_enums/action_states.enum
deleted file mode 100755
index 0692d079b5..0000000000
--- a/papermario/tools/sr_enums/action_states.enum
+++ /dev/null
@@ -1,42 +0,0 @@
-ActionState		% namespace
-actionStateID 	% library name
-false			% reversed
-
-% Current player action state, stored at 8010F07C
-
-00 = Idle
-01 = Walk
-02 = Run
-03 = Jump
-04 = Bounce			% used with kooper
-05 = AbortedJump	% aka Hop; released A before apex of jump
-06 = Launch			% Jack-in-the-boxes in the Toybox
-
-08 = Falling
-09 = StepDown
-0A = Land
-0B = StepDownLand
-0C = Conversation	% Reading signs doesn't count
-0D = SpinJump
-0E = GroundPound
-
-0F = UltraJump
-10 = UltraPound
-11 = Sliding
-12 = Hammer
-
-15 = HitHazard
-% 16 = TouchLava / 17 = ReactLava?
-17 = HitLava
-
-1A = Spin
-1B = EnemyFirstStrike
-
-1D = SpinningFlower
-
-1F = UseTweester
-
-21 = Ride			% Parakarry, Sushie, Lakilester, Bow
-22 = StepUp
-
-26 = UseSpring
diff --git a/papermario/tools/sr_enums/actor.enum b/papermario/tools/sr_enums/actor.enum
deleted file mode 100755
index e6ffb2c0f2..0000000000
--- a/papermario/tools/sr_enums/actor.enum
+++ /dev/null
@@ -1,31 +0,0 @@
-Actor	% namespace
-actorID	% library name
-false	% reversed
-
-FFFFFF81 = Self
-00000000 = Player
-00000100 = Partner
-00000200 = Enemy0
-00000201 = Enemy1
-00000202 = Enemy2
-00000203 = Enemy3
-00000204 = Enemy4
-00000205 = Enemy5
-00000206 = Enemy6
-00000207 = Enemy7
-00000208 = Enemy8
-00000209 = Enemy9
-0000020A = Enemy10
-0000020B = Enemy11
-0000020C = Enemy12
-0000020D = Enemy13
-0000020E = Enemy14
-0000020F = Enemy15
-00000210 = Enemy16
-00000211 = Enemy17
-00000212 = Enemy18
-00000213 = Enemy19
-00000214 = Enemy20
-00000215 = Enemy21
-00000216 = Enemy22
-00000217 = Enemy23
diff --git a/papermario/tools/sr_enums/actor_sounds.enum b/papermario/tools/sr_enums/actor_sounds.enum
deleted file mode 100755
index 76d59839c5..0000000000
--- a/papermario/tools/sr_enums/actor_sounds.enum
+++ /dev/null
@@ -1,10 +0,0 @@
-ActorSound	% namespace
-actorSound	% library name
-false	% reversed
-
-0 = Walk
-1 = Fly
-2 = Jump
-3 = Hurt
-4 = WalkIncrement
-5 = FlyIncrement
diff --git a/papermario/tools/sr_enums/ambient_sounds.enum b/papermario/tools/sr_enums/ambient_sounds.enum
deleted file mode 100755
index 1429f86586..0000000000
--- a/papermario/tools/sr_enums/ambient_sounds.enum
+++ /dev/null
@@ -1,19 +0,0 @@
-AmbientSounds	% namespace
-ambientSFX 		% library name
-false			% reversed
-
-00 = Spooky
-01 = Wind
-02 = Beach
-03 = Jungle
-04 = UnderSea1
-05 = UnderSea2
-06 = Silence
-07 = UnderSea3
-08 = UnderSea4
-09 = ExitSea
-0A = UnderSea5
-0B = UnderSea6
-0C = Birds
-0D = Sea
-10 = Music
diff --git a/papermario/tools/sr_enums/animations.enum b/papermario/tools/sr_enums/animations.enum
deleted file mode 100755
index ea46c0c0f3..0000000000
--- a/papermario/tools/sr_enums/animations.enum
+++ /dev/null
@@ -1,39 +0,0 @@
-Anim	% namespace
-anim	% library name
-false	% reversed
-
-00950000 = WhiteBoo-Stop
-00950001 = WhiteBoo-Idle
-00950002 = WhiteBoo-Walk
-00950003 = WhiteBoo-Run
-00950004 = WhiteBoo-Talk
-00950005 = WhiteBoo-Wave
-00950006 = WhiteBoo-Pain
-00950007 = WhiteBoo-Hide
-00950008 = WhiteBoo-Spook
-00950009 = WhiteBoo-Denying
-0095000A = WhiteBoo-Skeptical
-0095000B = WhiteBoo-Throw
-0095000C = WhiteBoo-CarryingStop
-0095000D = WhiteBoo-CarryingIdle
-0095000E = WhiteBoo-CarryingWalk
-0095000F = WhiteBoo-CarryingRun
-00950010 = WhiteBoo-CarryingShake
-
-00950100 = DustyBoo-Stop
-00950101 = DustyBoo-Idle
-00950102 = DustyBoo-Walk
-00950103 = DustyBoo-Run
-00950104 = DustyBoo-Talk
-00950105 = DustyBoo-Wave
-00950106 = DustyBoo-Pain
-00950107 = DustyBoo-Hide
-00950108 = DustyBoo-Spook
-00950109 = DustyBoo-Denying
-0095010A = DustyBoo-Skeptical
-0095010B = DustyBoo-Throw
-0095010C = DustyBoo-CarryingStop
-0095010D = DustyBoo-CarryingIdle
-0095010E = DustyBoo-CarryingWalk
-0095010F = DustyBoo-CarryingRun
-00950110 = DustyBoo-CarryingShake
diff --git a/papermario/tools/sr_enums/cameras.enum b/papermario/tools/sr_enums/cameras.enum
deleted file mode 100755
index c0f738d836..0000000000
--- a/papermario/tools/sr_enums/cameras.enum
+++ /dev/null
@@ -1,8 +0,0 @@
-Cam		% namespace
-camID	% library name
-false	% reversed
-
-0 = Default
-1 = Battle	% only used with ShakeCam
-2 = Tattle
-3 = Cam3
diff --git a/papermario/tools/sr_enums/decorations.enum b/papermario/tools/sr_enums/decorations.enum
deleted file mode 100755
index 835417f5fd..0000000000
--- a/papermario/tools/sr_enums/decorations.enum
+++ /dev/null
@@ -1,13 +0,0 @@
-Decoration	% namespace
-decoration	% library name
-false		% reversed
-
-1 = GoldenFlames
-2 = Sweat
-3 = SeeingStars
-4 = RedFlames
-5 = GreySmokeTrail
-6 = FireSmokeTrail % really cool
-7 = Whirlwind
-8 = SteamEmitter
-B = RadialStarEmitter
diff --git a/papermario/tools/sr_enums/door_sounds.enum b/papermario/tools/sr_enums/door_sounds.enum
deleted file mode 100755
index f7e3493831..0000000000
--- a/papermario/tools/sr_enums/door_sounds.enum
+++ /dev/null
@@ -1,11 +0,0 @@
-DoorSounds	% namespace
-doorSFX 	% library name
-false		% reversed
-
-0 = Basic
-1 = Metal
-2 = Large
-3 = Creaky
-4 = Gate
-% 5 = door to peach's balcony
-% 6 = unused?
diff --git a/papermario/tools/sr_enums/door_swings.enum b/papermario/tools/sr_enums/door_swings.enum
deleted file mode 100755
index 3fc34c0187..0000000000
--- a/papermario/tools/sr_enums/door_swings.enum
+++ /dev/null
@@ -1,6 +0,0 @@
-DoorSwing	% namespace
-doorSwing 	% library name
-false		% reversed
-
- 1 = In
--1 = Out
diff --git a/papermario/tools/sr_enums/easing.enum b/papermario/tools/sr_enums/easing.enum
deleted file mode 100755
index 874c620ebe..0000000000
--- a/papermario/tools/sr_enums/easing.enum
+++ /dev/null
@@ -1,22 +0,0 @@
-Easing	% namespace
-easing	% library name
-false	% reversed
-
-% Notes from MoveSpriteTo (func_8027BF38)
-% (0-D used as an index to jump table by func_8027B0DC)	=> script[7C]
-% t = current frame (S1), d = duration (S0)
-% also have A (F24), B (F26), and L = B - A
-
-0 = Linear 				% (no easing)
-1 = QuadraticIn
-2 = CubicIn
-3 = QuarticIn
-4 = QuadraticOut		% A + L * (1-((d-t)/d)^2)
-5 = CubicOut
-6 = QuarticOut
-7 = CosSlowOvershoot	% B - L * ((d-t)/d)^2 * cos(4*pi*(t/d))
-8 = CosFastOvershoot	% B - L * ((d-t)/d)^2 * cos(4*pi*(t^2/15*d))
-9 = CosBounce			% B - L * abs((d-t)/d)^2 * cos(4*pi*(t^2/40*d))
-A = CosInOut			% A + (L/2) * (1 - cos(pi*(t/d)))
-B = SinOut				% A + L * sin((pi/2)*(t/d))
-C = CosIn				% A + L * (1 - cos((pi/2)*(t/d)))
diff --git a/papermario/tools/sr_enums/elements.enum b/papermario/tools/sr_enums/elements.enum
deleted file mode 100755
index f26e6449b1..0000000000
--- a/papermario/tools/sr_enums/elements.enum
+++ /dev/null
@@ -1,18 +0,0 @@
-Element	% namespace
-element	% library name
-true	% reversed
-
-Normal   = 1
-Fire     = 2
-Water    = 3
-Ice      = 4
-Mystery  = 5
-Magic    = 7
-Hammer   = 8
-Jump     = 9
-Cosmic   = A
-Blast    = B
-Shock    = C
-Quake    = D
-Throw    = F
-End      = 0
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/emotes.enum b/papermario/tools/sr_enums/emotes.enum
deleted file mode 100755
index 96e9e921d0..0000000000
--- a/papermario/tools/sr_enums/emotes.enum
+++ /dev/null
@@ -1,10 +0,0 @@
-Emote	% namespace
-emote	% library name
-false	% reversed
-
-0 = Exclamation
-1 = Shock
-2 = Question
-3 = Frustration
-4 = Ellipsis
-5 = Invalid
diff --git a/papermario/tools/sr_enums/encounter_trigger.enum b/papermario/tools/sr_enums/encounter_trigger.enum
deleted file mode 100755
index ff21f3a05f..0000000000
--- a/papermario/tools/sr_enums/encounter_trigger.enum
+++ /dev/null
@@ -1,9 +0,0 @@
-EncounterTrigger	% namespace
-encounterTrigger	% library name
-false				% reversed
-
-1 = None	% neutral/enemy first strike
-2 = Jump
-3 = Spin	% spin/dizzy attack
-4 = Hammer
-6 = Partner % kooper/bombette
diff --git a/papermario/tools/sr_enums/entities.enum b/papermario/tools/sr_enums/entities.enum
deleted file mode 100755
index f4dde16ccd..0000000000
--- a/papermario/tools/sr_enums/entities.enum
+++ /dev/null
@@ -1,83 +0,0 @@
-Entity	% namespace
-entity	% library name
-true	% reversed
-
-SavePoint                = 802E9A18
-RedSwitch                = 802E9BB0
-BlueSwitch               = 802E9BD4
-HugeBlueSwitch           = 802E9BF8
-GreenStompSwitch         = 802E9C1C
-MultiTriggerBlock        = 802EA07C
-BrickBlock               = 802EA0C4
-MultiCoinBrick           = 802EA0E8
-Hammer1Block             = 802EA10C
-Hammer1BlockWide         = 802EA130  % Wider collision box.
-Hammer1BlockThick        = 802EA154  % Thicker collision box.
-Hammer1BlockTiny         = 802EA178  % Same size as a normal item block.
-Hammer2Block             = 802EA19C
-Hammer2BlockWide         = 802EA1C0  % Wider collision box.
-Hammer2BlockThick        = 802EA1E4  % Thicker collision box.
-Hammer2BlockTiny         = 802EA208  % Same size as a normal item block.
-Hammer3Block             = 802EA22C
-Hammer3BlockWide         = 802EA250  % Unused in vanilla
-Hammer3BlockThick        = 802EA274  % Thicker collision box.
-Hammer3BlockTiny         = 802EA298  % Same size as a normal item block.
-PowBlock                 = 802EA2E0  
-YellowBlock              = 802EA564
-HiddenYellowBlock        = 802EA588
-RedBlock                 = 802EA5AC
-HiddenRedBlock           = 802EA5D0
-SingleTriggerBlock       = 802EA5F4  % Triggers events when hit. Bind with ASSIGN_SCRIPT, see isk_07 for usage.
-HealingBlock             = 802EA7E0
-SuperBlock               = 802EA910
-ScriptSpring             = 802EAA30
-SimpleSpring             = 802EAA54
-HiddenPanel              = 802EAB04
-GiantChest               = 802EAE0C
-Chest                    = 802EAE30
-BlueWarpPipe             = 802EAF80
-WoodenCrate              = 802EAED4
-Signpost                 = 802EAFDC
-
-Padlock                  = 802BCD68
-PadlockRedFrame          = 802BCD8C % light red frame around lock, unused in vanilla
-PadlockRedFace           = 802BCDB0 % dark red front plate, unused in vanilla
-PadlockBlueFace          = 802BCDD4 % dark blue front plate, unused in vanilla
-BoardedFloor             = 802BCE84 
-BombableRock1            = 802BCF00
-BombableRock2            = 802BCF24
-
-CymbalPlant              = 802BC788
-PinkFlower               = 802BC7AC
-SpinningFlower           = 802BC7F4
-BellbellPlant            = 802BCBD8
-TrumpetPlant             = 802BCBFC
-SpongyFlower             = 802BCC20
-RedArrowSigns            = 802BCD9C
-
-Tweester                 = 802BCA74
-StarBoxLaucher           = 802BCB44
-
-/%
-Bonus Entities:
-802E9C8C = ShatteringHammer1Block
-802E9CB0 = ShatteringHammer2Block
-802E9CD4 = ShatteringHammer3Block
-802E9CF8 = ShatteringHammer1BlockTiny
-802E9D1C = ShatteringHammer2BlockTiny
-802E9D40 = ShatteringHammer3BlockTiny
-802E9D64 = ShatteringBrickBlock
-
-802EA0A0 = InactiveMultiTriggerBlock? (but its red?)
-802EA2BC = PushBlock
-
-802EA618 = VanishingYellowBlock1
-802EA63C = VanishingYellowBlock2
-802EA660 = VanishingRedBlock1
-
-802EA77C = crash
-802EA7BC = HealingBlockHitEffect
-802EA934 = SuperBlockHitEffect1
-802EA958 = RedSuperBock (no scripts)
-802EA97C = SuperBlockHitEffect2
-%/
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/events.enum b/papermario/tools/sr_enums/events.enum
deleted file mode 100755
index a1f7fddce1..0000000000
--- a/papermario/tools/sr_enums/events.enum
+++ /dev/null
@@ -1,63 +0,0 @@
-Event	% namespace
-event	% library name
-false	% reversed
-
-19 = Immune
-
-09 = HitCombo		% Used during a multiple-hit attack (Bow's Smack, successful Jump) for every hit except the last, ie: 09-09-09-09-0A (Bow's Smack).
-0A = Hit
-
-20 = Death
-
-0C = FallTrigger	% Activated by flag 00004000, fired when Mario jumps on an enemy. Used for flying enemies that fall down.
-0D = FlipTrigger	% Activated by flag 00001000, fired when Mario jumps on an enemy or uses a quake attack.
-
-22 = ExplodeTrigger	% Activated by flag 00000200, fired by Bombette's bomb attacks or fire-based attacks. Used only by Bobomb.
-
-% 17 = UnknownTrigger, probably activated by flag 00000100 (used only by Monstar) -- no, found in Embers as well (Area HOS).
-
-0B = SpinSmashHit		% Fired when hit by Spin Smash (used by Chain Chomp)
-21 = SpinSmashDeath		% Fired when killed by Spin Smash (used by Chain Chomp)
-
-11 = SpinSmashLaunchHit		% Fired when hit by something launched by a Spin Smash (used by Pokey)
-15 = SpinSmashLaunchDeath	% Fired when killed by something launched by Spin Smash (used by Pokey)
-
-15 = PowerBounceHit		% Activated by flag 00100000, fired when hit by Power Bounce
-28 = PowerBounceDeath	% Activated by flag 00100000, fired when killed by Power Bounce
-
-0E = BurnHit			% Fired by explosions and fiery attacks
-24 = BurnDeath			% Fired by explosions and fiery attacks, and when the player dies from jumping on a fiery enemy
-
-2F = ShockHit			% Fired by hitting electrified actor (not from electric attacks)
-26 = ShockDeath			% Only fired by hitting electrified player
-
-3A = BeginAirLift		% Fired when Airlift begins
-1F = AirLiftFailed		% Fired after Airlift fails
-16 = BlowAway			% Fired by Airlift and Hurricane
-
-39 = ScareAway			% Fired by Fright Jar and Spook
-
-3D = UpAndAway
-13 = StarBeam
-
-31 = RecoverStatus	% Fired after recovering from a status effect
-3F = SwapPartner	% Fired to the new partner, has broader unknown applications (see Tubba Blubba rematch at end of turn)
-
-1A = Block			% Fired to the player on a successful block
-
-% The following events are fired when the player jumps on a spiky enemy
-2A = SpikeContact	% Fired to the player
-27 = SpikeDeath		% Fired to the player
-1B = SpikeTaunt		% Fired to the enemy
-
-2C = BurnContact	% Fired to the player
-% 24 = FireDeath	% Fired to the player
-1C = BurnTaunt		% Fired to the enemy
-
-38 = BeginFirstStrike	% Fired just before the screen fades in following a player first strike
-35 = EndFirstStrike		% Fired after the player's first strike move is finished
-
-40 = LifeShroomProc
-41 = Revive
-
-37 = Lucky
diff --git a/papermario/tools/sr_enums/hit_result.enum b/papermario/tools/sr_enums/hit_result.enum
deleted file mode 100755
index 12ce0986c9..0000000000
--- a/papermario/tools/sr_enums/hit_result.enum
+++ /dev/null
@@ -1,12 +0,0 @@
-HitResult	% namespace
-hitResult	% library name
-false		% reversed
-
-00 = Hit
-% 02 = ???
-04 = LandedOnSpike
-05 = Lucky
-06 = Miss
-07 = HitStatic
-08 = Immune
--1 = TriggeredExplode
diff --git a/papermario/tools/sr_enums/hit_sound.enum b/papermario/tools/sr_enums/hit_sound.enum
deleted file mode 100755
index ae554f33fd..0000000000
--- a/papermario/tools/sr_enums/hit_sound.enum
+++ /dev/null
@@ -1,10 +0,0 @@
-HitSound	% namespace
-hitSound	% library name
-false		% reversed
-
-00 = Miss
-01 = Bones
-02 = Normal
-03 = Fire
-04 = Ice
-05 = Shock
diff --git a/papermario/tools/sr_enums/item_spawn_modes.enum b/papermario/tools/sr_enums/item_spawn_modes.enum
deleted file mode 100755
index 7a0b40c82b..0000000000
--- a/papermario/tools/sr_enums/item_spawn_modes.enum
+++ /dev/null
@@ -1,41 +0,0 @@
-ItemSpawnMode	% namespace
-itemSpawnMode 	% library name
-false		% reversed
-
-% Items may...
-% ...SpawnOnce, never giving another chance to obtain.
-% ...SpawnAlways, ignoring any flag assigned to the item.
-% ...spawn if not picked up (implicit), and being flagged when the player picks them up.
-% ...Fall, Toss, shoot out of an ItemBlock, or remaind Fixed in place.
-% ...disappear a short time after spawning: either vanish (implicit) or NeverVanish
-% Tossed items either have an initial velocity of 12, 14 (High), or 16 (Higher).
-
-% 00 = Nothing special, very similar to Fixed_SpawnAlways. 
-01 = Decoration             % used for non-obtainable items like shop items and items NPCs carry
-% 02 = Invisible/Inactive
-03 = Toss_SpawnAlways       % used for discarding items and coin loss from fleeing battles
-04 = BattleReward           % coins, hearts, flowers, items; could also be called 'Toss_High_AlwaysSpawn'
-05 = Toss_NeverVanish       % used for key items in bushes
-06 = Toss                   % used for items in bushes
-07 = Toss_SpawnOnce         % used for coins in bushes
-08 = Toss_SpawnOnce_NeverVanish
-09 = Toss_SpawnAlways_NeverVanish
-0A = ItemBlock_Item         %
-0B = ItemBlock_Badge        %
-0C = Fall_SpawnAlways       % used for berries in flo trees
-0D = Fall_NeverVanish       % used for key items in trees
-0E = Fall                   % used for items in trees
-0F = Fall_SpawnOnce         % used for coins in trees
-10 = Fixed_SpawnAlways
-11 = Fixed_NeverVanish
-12 = Fixed
-13 = Fixed_SpawnAlways_NeverVanish
-14 = ItemBlock_SpawnAlways  % used for items in item blocks
-15 = ItemBlock_Coin         % used for coins in item blocks
-16 = Toss_Higher_NeverVanish
-% 17 = Toss_Fade1
-% 18 = Toss_Fade2	high initial velocity
-% 19 = Toss_Fade3	
-1A = Toss_SpawnAlways_Small
-% 1B = 
-
diff --git a/papermario/tools/sr_enums/items.enum b/papermario/tools/sr_enums/items.enum
deleted file mode 100755
index 167510c2c5..0000000000
--- a/papermario/tools/sr_enums/items.enum
+++ /dev/null
@@ -1,361 +0,0 @@
-Item	% namespace
-itemID	% library name
-true	% reversed
-
-Jump                 = 00000001
-SpinJump             = 00000002
-TornadoJump          = 00000003
-Hammer               = 00000004
-SuperHammer          = 00000005
-UltraHammer          = 00000006
-LuckyStar            = 00000007
-Map                  = 00000008 % unused
-BigMap               = 00000009 % unused
-FirstDegreeCard      = 0000000A
-SecondDegreeCard     = 0000000B
-ThirdDegreeCard      = 0000000C
-FourthDegreeCard     = 0000000D
-Diploma              = 0000000E
-UltraStone           = 0000000F
-FortressKey          = 00000010
-RuinsKey             = 00000011
-PulseStone           = 00000012
-CastleKey1           = 00000013
-PalaceKey            = 00000014
-LunarStone           = 00000015
-PyramidStone         = 00000016
-DiamondStone         = 00000017
-GoldenVase           = 00000018 % unused
-KoopersShell         = 00000019
-CastleKey2           = 0000001A
-ForestPass           = 0000001B % unused
-Weight               = 0000001C
-BoosPortrait         = 0000001D
-CrystalBerry         = 0000001E
-MysticalKey          = 0000001F
-StoreroomKey         = 00000020
-ToyTrain             = 00000021
-Record               = 00000022
-FryingPan            = 00000023
-Dictionary           = 00000024
-MysteryNote          = 00000025
-SuspiciousNote       = 00000026 % unused
-CrystalBall          = 00000027
-Screwdriver          = 00000028 % unused
-Cookbook             = 00000029
-JadeRaven            = 0000002A
-MagicalSeed1         = 0000002B
-MagicalSeed2         = 0000002C
-MagicalSeed3         = 0000002D
-MagicalSeed4         = 0000002E
-ToadDoll             = 0000002F % unused
-Calculator           = 00000030
-Bucket               = 00000031
-Scarf                = 00000032
-RedKey               = 00000033
-BlueKey              = 00000034
-Letter01             = 00000036
-Letter02             = 00000037
-Letter03             = 00000038
-Letter04             = 00000039
-Letter05             = 0000003A
-Letter06             = 0000003B
-Letter07             = 0000003C
-Letter08             = 0000003D
-Letter09             = 0000003E
-Letter10             = 00000040
-Letter11             = 00000041
-Letter12             = 00000045
-Letter13             = 00000046
-Letter14             = 00000047
-Letter15             = 00000048
-Letter16             = 00000049
-Letter17             = 0000004A
-Letter18             = 0000004B
-Letter19             = 0000004C
-Letter20             = 0000004E
-Letter21             = 0000004F
-Letter22             = 00000050
-Letter23             = 00000051
-Letter24             = 00000052
-Artifact             = 00000053
-Letter25             = 00000054
-Dolly                = 00000056
-WaterStone           = 00000057
-MagicalBean          = 00000058
-FertileSoil          = 00000059
-MiracleWater         = 0000005A
-VolcanoVase          = 0000005B
-Tape                 = 0000005C
-Sugar                = 0000005D
-Salt                 = 0000005E
-Egg1                 = 0000005F
-Cream                = 00000060
-Strawberry           = 00000061
-Butter               = 00000062
-Cleanser             = 00000063
-Water                = 00000064
-Flour                = 00000065
-Milk                 = 00000066
-Lyrics               = 00000067
-Melody               = 00000068
-Mailbag              = 00000069
-CastleKey3           = 0000006A
-OddKey               = 0000006B
-StarStone            = 0000006C
-SneakyParasol        = 0000006D
-KoopaLegends         = 0000006E
-Autograph1           = 0000006F
-EmptyWallet          = 00000070
-Autograph2           = 00000071
-KoopaShell           = 00000072 % unused
-OldPhoto             = 00000073
-Glasses              = 00000074
-Photograph           = 00000075 % unused
-Package              = 00000076
-RedJar               = 00000077
-CastleKey4           = 00000078
-WarehouseKey         = 00000079
-PrisonKey1           = 0000007A
-SilverCredit         = 0000007B
-GoldCredit           = 0000007C
-PrisonKey2           = 0000007D % unused
-PrisonKey3           = 0000007E % unused
-PrisonKey4           = 0000007F % unused
-FireFlower           = 00000080
-SnowmanDoll          = 00000081
-ThunderRage          = 00000082
-ShootingStar         = 00000083
-ThunderBolt          = 00000084
-Pebble               = 00000085
-DustyHammer          = 00000086
-InsecticideHerb      = 00000087
-StoneCap             = 00000088
-TastyTonic           = 00000089
-Mushroom             = 0000008A
-VoltShroom           = 0000008B
-SuperShroom          = 0000008C
-DriedShroom          = 0000008D
-UltraShroom          = 0000008E
-SleepySheep          = 0000008F
-POWBlock             = 00000090
-HustleDrink          = 00000091
-StopWatch            = 00000092
-WhackasBump          = 00000093
-Apple                = 00000094
-LifeShroom           = 00000095
-Mystery              = 00000096
-RepelGel             = 00000097
-FrightJar            = 00000098
-PleaseComeBack       = 00000099
-DizzyDial            = 0000009A
-SuperSoda            = 0000009B
-Lemon                = 0000009C
-Lime                 = 0000009D
-BlueBerry            = 0000009E
-RedBerry             = 0000009F
-YellowBerry          = 000000A0
-BubbleBerry          = 000000A1
-JamminJelly          = 000000A2
-MapleSyrup           = 000000A3
-HoneySyrup           = 000000A4
-Goomnut              = 000000A5
-KoopaLeaf            = 000000A6
-DriedPasta           = 000000A7
-DriedFruit           = 000000A8
-StrangeLeaf          = 000000A9
-CakeMix              = 000000AA
-Egg2                 = 000000AB
-Coconut              = 000000AC
-Melon                = 000000AD
-StinkyHerb           = 000000AE
-IcedPotato           = 000000AF
-SpicySoup            = 000000B0
-ApplePie             = 000000B1
-HoneyUltra           = 000000B2
-MapleUltra           = 000000B3
-JellyUltra           = 000000B4
-Koopasta             = 000000B5
-FriedShroom          = 000000B6
-ShroomCake           = 000000B7
-ShroomSteak          = 000000B8
-HotShroom            = 000000B9
-SweetShroom          = 000000BA
-YummyMeal            = 000000BB
-HealthyJuice         = 000000BC
-BlandMeal            = 000000BD
-DeluxeFeast          = 000000BE
-SpecialShake         = 000000BF
-BigCookie            = 000000C0
-Cake                 = 000000C1
-Mistake              = 000000C2
-KoopaTea             = 000000C3
-HoneySuper           = 000000C4
-MapleSuper           = 000000C5
-JellySuper           = 000000C6
-Spaghetti            = 000000C7
-EggMissile           = 000000C8
-FriedEgg             = 000000C9
-HoneyShroom          = 000000CA
-HoneyCandy           = 000000CB
-ElectroPop           = 000000CC
-FirePop              = 000000CD
-LimeCandy            = 000000CE
-CocoPop              = 000000CF
-LemonCandy           = 000000D0
-JellyPop             = 000000D1
-StrangeCake          = 000000D2
-KookyCookie          = 000000D3
-FrozenFries          = 000000D4
-PotatoSalad          = 000000D5
-NuttyCake            = 000000D6
-MapleShroom          = 000000D7
-BoiledEgg            = 000000D8
-YoshiCookie          = 000000D9
-JellyShroom1         = 000000DA
-JellyShroom2         = 000000DB
-JellyShroom3         = 000000DC
-JellyShroom4         = 000000DD
-JellyShroom5         = 000000DE
-JellyShroom6         = 000000DF
-SpinSmash            = 000000E0
-Multibounce          = 000000E1
-PowerPlusA           = 000000E2
-DodgeMaster          = 000000E3
-PowerBounce          = 000000E4
-SpikeShield          = 000000E5
-FirstAttack          = 000000E6
-HPPlusA              = 000000E7
-QuakeHammer          = 000000E8
-DoubleDip            = 000000E9
-MysteryScroll        = 000000EA % unused
-SleepStomp           = 000000EB
-FireShield           = 000000EC
-QuickChange          = 000000ED
-DDownPound           = 000000EE
-DizzyStomp           = 000000EF
-SmashCharge0         = 000000F0 % unused
-PrettyLucky          = 000000F1
-FeelingFine          = 000000F2
-AttackFXA            = 000000F3
-AllorNothing         = 000000F4
-HPDrain              = 000000F5
-JumpCharge0          = 000000F6 % unused
-SlowGo               = 000000F7
-FPPlusA              = 000000F8
-MegaRush             = 000000F9
-IcePower             = 000000FA
-DefendPlusA          = 000000FB
-PayOff               = 000000FC
-MoneyMoney           = 000000FD
-ChillOut             = 000000FE
-HappyHeartA          = 000000FF
-ZapTap               = 00000100
-Berserker            = 00000101 % unused
-RightOn              = 00000102 % unused
-RunawayPay           = 00000103
-Refund               = 00000104
-FlowerSaverA         = 00000105
-TripleDip            = 00000106
-HammerThrow          = 00000107
-MegaQuake            = 00000108
-SmashCharge          = 00000109
-JumpCharge           = 0000010A
-SSmashChg            = 0000010B
-SJumpChg             = 0000010C
-PowerRush            = 0000010D
-AutoJump             = 0000010E % unused
-AutoSmash            = 0000010F % unused
-CrazyHeart           = 00000110 % unused
-LastStand            = 00000111
-CloseCall            = 00000112
-PUpDDown             = 00000113
-LuckyDay             = 00000114
-MegaHPDrain          = 00000115 % unused
-PDownDUp             = 00000116
-PowerQuake           = 00000117
-AutoMultibounce      = 00000118 % unused
-FlowerFanatic        = 00000119 % unused
-HeartFinder          = 0000011A
-FlowerFinder         = 0000011B
-SpinAttack           = 0000011C
-DizzyAttack          = 0000011D
-ISpy                 = 0000011E
-SpeedySpin           = 0000011F
-BumpAttack           = 00000120
-PowerJump            = 00000121
-SuperJump            = 00000122 % unused
-MegaJump             = 00000123
-PowerSmash1          = 00000124
-SuperSmash           = 00000125 % unused
-MegaSmash            = 00000126
-PowerSmash2          = 00000127
-PowerSmash3          = 00000128
-DeepFocus1           = 00000129
-SuperFocus           = 0000012A % unused
-ShrinkSmash          = 0000012B
-ShellCrack           = 0000012C % unused
-Kaiden               = 0000012D % unused
-DDownJump            = 0000012E
-ShrinkStomp          = 0000012F
-DamageDodgeA         = 00000130
-EarthquakeJump       = 00000131
-DeepFocus2           = 00000132
-DeepFocus3           = 00000133
-HPPlusB              = 00000134
-FPPlusB              = 00000135
-HappyHeartB          = 00000136
-HappyHeartX          = 00000137
-FlowerSaverB         = 00000138
-FlowerSaverX         = 00000139
-DamageDodgeB         = 0000013A
-DamageDodgeX         = 0000013B
-PowerPlusB           = 0000013C
-PowerPlusX           = 0000013D
-DefendPlusX          = 0000013E
-DefendPlusY          = 0000013F
-HappyFlowerA         = 00000140
-HappyFlowerB         = 00000141
-HappyFlowerX         = 00000142
-GroupFocus           = 00000143
-Peekaboo             = 00000144
-AttackFXD            = 00000145
-AttackFXB            = 00000146
-AttackFXE            = 00000147
-AttackFXC            = 00000148
-AttackFXF            = 00000149
-HPPlusC              = 0000014A
-HPPlusX              = 0000014B
-HPPlusY              = 0000014C
-FPPlusC              = 0000014D
-FPPlusX              = 0000014E
-FPPlusY              = 0000014F
-HealthyHealthy       = 00000150
-AttackFXF2           = 00000151
-AttackFXF3           = 00000152
-AttackFXF4           = 00000153
-AttackFXF5           = 00000154
-PartnerAttack        = 00000155 % placeholder with partner attack icon
-Heart                = 00000156
-Coin                 = 00000157
-HeartPiece			 = 00000158 % unused, NOT functional
-StarPoint			 = 00000159 % unused, functional, makes coin sound
-FullHeal			 = 0000015A % unused, functional, item inside healing block
-Flower				 = 0000015B
-StarPiece            = 0000015C
-Present              = 0000015D
-CompleteCake         = 0000015E
-BareCake             = 0000015F
-EmptyCakePan         = 00000160
-FullCakePan          = 00000161
-EmptyMixingBowl      = 00000162
-FullMixingBowl       = 00000163
-CakeWithIcing        = 00000164
-CakeWithBerries      = 00000165
-Hammer1Icon          = 00000166
-Hammer2Icon          = 00000167
-Hammer3Icon          = 00000168
-Boots1Icon           = 00000169
-Boots2Icon           = 0000016A
-Boots3Icon           = 0000016B
-ItemsIcon            = 0000016C
diff --git a/papermario/tools/sr_enums/locations.enum b/papermario/tools/sr_enums/locations.enum
deleted file mode 100755
index 8b45262f5a..0000000000
--- a/papermario/tools/sr_enums/locations.enum
+++ /dev/null
@@ -1,40 +0,0 @@
-Location	% namespace
-location	% library name
-false		% reversed
-
-18 = None
-17 = Testing
-01 = ToadTown
-19 = PeachCastleGrounds
-1B = ShootingStarSummit
-02 = ToadTownTunnels
-1E = GoombaVillage
-1F = GoombaRoad
-20 = PleasantPath
-21 = KoopaVillage
-07 = KoopaBrosFortress
-08 = MtRugged
-0A = DryDryDesert
-09 = DryDryOutpost
-0B = DryDryRuins
-0C = ForeverForest
-0D = BoosMansion
-22 = GustyGulch
-0F = TubbasManor
-23 = WindyMill
-10 = ShyGuysToybox
-24 = JadeJungle
-25 = YoshisVillage
-12 = MtLavalava
-26 = FlowerFields
-27 = CloudyClimb
-28 = ShiverCity
-29 = ShiverSnowfield
-2A = StarbornValley
-2B = ShiverMountain
-15 = CrystalPalace
-1C = StarWay
-1D = StarHaven
-16 = BowsersCastle
-1A = PeachsCastle
-2C = MariosHouse
diff --git a/papermario/tools/sr_enums/npcs.enum b/papermario/tools/sr_enums/npcs.enum
deleted file mode 100755
index f965c844de..0000000000
--- a/papermario/tools/sr_enums/npcs.enum
+++ /dev/null
@@ -1,7 +0,0 @@
-Npc		% namespace
-npcID	% library name
-false	% reversed
-
-FFFFFFFF = Self
-FFFFFFFE = Player
-FFFFFFFC = Partner
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/outcomes.enum b/papermario/tools/sr_enums/outcomes.enum
deleted file mode 100755
index 570c86f255..0000000000
--- a/papermario/tools/sr_enums/outcomes.enum
+++ /dev/null
@@ -1,8 +0,0 @@
-Outcome	% namespace
-outcome	% library name
-false	% reversed
-
-00 = PlayerWon
-01 = PlayerLost
-02 = PlayerFled
-03 = EnemyFled
diff --git a/papermario/tools/sr_enums/partners.enum b/papermario/tools/sr_enums/partners.enum
deleted file mode 100755
index f4fd5f4420..0000000000
--- a/papermario/tools/sr_enums/partners.enum
+++ /dev/null
@@ -1,16 +0,0 @@
-Partner		% namespace
-partnerID	% library name
-false		% reversed
-
-0 = None
-1 = Goombario
-2 = Kooper
-3 = Bombette
-4 = Parakarry
-5 = Goompa
-6 = Watt
-7 = Sushie
-8 = Lakilester
-9 = Bow
-A = Goombaria
-B = Twink
diff --git a/papermario/tools/sr_enums/phases.enum b/papermario/tools/sr_enums/phases.enum
deleted file mode 100755
index a5b95463b7..0000000000
--- a/papermario/tools/sr_enums/phases.enum
+++ /dev/null
@@ -1,31 +0,0 @@
-Phase		% namespace
-battlePhase	% library name
-false		% reversed
-
-00 = ExecuteAction	% do whatever the player/partner has selected
-01 = FirstStrike
-
-03 = RunAwayStart
-04 = RunAwayReset
-07 = RunAwayFail
-06 = UseDefend
-
-08 = UseLifeShroom
-
-0A = PlayerBegin
-0D = PlayerEnd
-0C = EnemyBegin
-0B = EnemyEnd
-
-14 = MerleeAttackBonus
-15 = MerleeDefenseBonus
-16 = MerleeExpBonus
-
-1E = PlayerHappy
-
-/%
-03 = ? (used by player/partners)
-05 = ? (used by player/partners)
-
-16 = ? (used by player)
-%/
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/player_animations.enum b/papermario/tools/sr_enums/player_animations.enum
deleted file mode 100755
index d19ecf14f1..0000000000
--- a/papermario/tools/sr_enums/player_animations.enum
+++ /dev/null
@@ -1,49 +0,0 @@
-PlayerAnim	% namespace
-playerAnim	% library name
-false		% reversed
-
-00010000 = StandStill
-00010001 = CrouchStill
-00010003 = Panting
-00010004 = Walking
-00010005 = Running
-00010006 = BeforeJump
-00010007 = MidairStill
-00010008 = Midair
-
-0001000E = StunnedStill
-0001000F = DeadStill
-
-00010011 = Spinning
-00010012 = Flailing
-00010013 = SitStill
-00010014 = Crouch
-00010015 = StoneStill
-00010016 = Throw
-
-00010017 = FallBack
-00010018 = FallDown
-00010019 = Scared
-0001001A = HurtFoot
-0001001B = RunPanic
-0001001C = Eat
-0001001D = StickOutTongue
-0001001E = Plant
-0001001F = GotItem
-00010020 = ReadyJump
-00010021 = Thinking
-00010022 = LostBalance
-00010023 = ShockStill
-
-00010025 = Drink
-00010026 = Squish
-00010027 = RunThinking
-00010028 = Question
-00010029 = NodYes
-
-0001002C = Pray
-
-0001002F = Charred
-00010030 = GetUp
-00010031 = DustOff
-00010032 = ThumbsUp
diff --git a/papermario/tools/sr_enums/songs.enum b/papermario/tools/sr_enums/songs.enum
deleted file mode 100755
index 5d41c8919b..0000000000
--- a/papermario/tools/sr_enums/songs.enum
+++ /dev/null
@@ -1,159 +0,0 @@
-Song	% namespace
-songID	% library name
-false	% reversed
-
-00 = ToadTown
-% 01 = GoombaVillageCopy
-02 = NormalBattle
-03 = SpecialBattle
-04 = JrTroopaBattle
-05 = FinalBowserBattle
-% 06 = GoombaVillageCopy
-07 = GoombaKingBattle
-08 = KoopaBrosBattle
-09 = FakeBowserBattle
-0A = TutankoopaBattle
-0B = TubbaBlubbaBattle
-0C = GeneralGuyBattle
-0D = LavaPiranhaBattle
-0E = HuffNPuffBattle
-0F = CrystalKingBattle
-10 = GoombaVillage
-11 = PleasantPath
-12 = FuzzyAttack
-13 = KoopaVillage
-14 = KoopaFortress
-15 = DryDryOutpost
-16 = MtRugged
-17 = DryDryDesert
-18 = DryDryRuins
-19 = RuinsBasement
-1A = ForeverForest
-1B = BoosMansion
-1C = CheerfulBoosMansion
-1D = GustyGulch
-1E = TubbasManor
-1F = TubbaEscape
-
-20 = ShyGuyToybox
-21 = ToyboxTrain
-22 = CreepyToybox
-% 23 = GoombaVillageCopy
-24 = JadeJungle
-25 = DeepJungle
-26 = YoshisVillage
-27 = YoshisPanic
-28 = RaphaelRaven
-29 = MtLavalava
-2A = VolcanoEscape
-2B = StarWayOpens
-2C = MasterBattle
-2D = RadioIslandSounds
-2E = RadioHotHits
-2F = RadioGoldenOldies
-30 = FlowerFieldsCloudy
-31 = FlowerFieldsSunny
-32 = CloudyClimb
-33 = PuffPuffMachine
-34 = SunTowerCloudy
-35 = SunTowerSunny
-% 36 = GoombaVillageCopy
-37 = CrystalPalace
-38 = ShiverCity
-39 = PenguinMystery
-3A = ShiverSnowfield
-3B = ShiverMountain
-3C = StarbornValley
-3D = MerlarTheme
-3E = MailCall
-3F = PeachsCastleParty
-
-40 = ChapterEnd
-41 = ChapterStart % followed by original mario theme
-42 = ItemUpgrade
-% 43 = GoombaVillageCopy
-44 = PhonographMusic
-45 = TutankoopaTheme
-46 = KammyKoopaTheme
-47 = JrTroopaTheme
-48 = BulletBillAssault
-49 = MontyMoleAssault
-4A = ShyGuyInvasion % basically a sped up toad town theme
-4B = ToadTownTunnels
-4C = WhaleTheme
-4D = ForeverForestWarning
-4E = YoshiKidsFound
-4F = UnusedFanfare
-50 = GoombaKingTheme
-51 = KoopaBrosInterlude
-52 = KoopaBrosTheme
-53 = TutankoopaWarning
-54 = TutankoopaRevealed
-55 = TubbaBlubbaTheme
-56 = GeneralGuyTheme
-57 = LavaPiranhaTheme
-58 = HuffNPuffTheme
-59 = CrystalKingTheme
-5A = BlooperTheme
-5B = MinibossBattle		% OR miniboss theme?
-5C = MonstarTheme
-5D = Club64
-5E = UnusedOpening
-5F = BowsersCastleFalls
-
-60 = StarHaven
-61 = ShootingStarSummit
-62 = StarshipTheme
-63 = StarSanctuary
-64 = BowsersCastle
-65 = BowsersCastleCaves
-66 = BowserTheme
-67 = BowserBattle
-68 = PeachWishes
-69 = FileSelect
-6A = MainTheme
-6B = BowserAttacks
-6C = MarioFalls
-6D = PeachAppears
-6E = TheEnd
-6F = RecoveredStarRod
-70 = TwinkTheme
-71 = StirringCake
-72 = GourmetGuyFreakout
-73 = PrisonerPeachTheme
-74 = PeachMission
-75 = PeachSneaking
-76 = PeachCaught
-77 = PeachQuizIntro
-78 = StarSpiritTheme
-79 = PenguinWhodunit
-7A = PenguinWakesUp
-7B = MagicBeanstalk
-7C = MerleeSpell
-7D = LakilesterTheme
-7E = GoombaBrosRetreat
-7F = SunshineReturns
-
-80 = RidingTheRails
-81 = RidingTheWhale
-82 = NewPartner
-83 = DryDryRuinsAppear
-84 = CandyCanes
-85 = Playroom
-86 = MoustafaTheme
-87 = GameOver
-88 = TakingRest
-89 = FlowerNPCTheme
-8A = FlowerGateAppears
-8B = BattleEnd
-8C = PopDivaSong
-8D = BooMinigame
-8E = LevelUp
-% 8F = GoombaVillageCopy
-90 = ParadeDay
-91 = ParadeNight
-% 92 = GoombaVillageCopy
-% 93 = GoombaVillageCopy
-94 = MarioBrosHouse
-95 = IntroStory
-96 = NewPartnerJP
diff --git a/papermario/tools/sr_enums/sounds.enum b/papermario/tools/sr_enums/sounds.enum
deleted file mode 100755
index 2c7b7b9ba8..0000000000
--- a/papermario/tools/sr_enums/sounds.enum
+++ /dev/null
@@ -1,89 +0,0 @@
-Sound	% namespace
-soundID	% library name
-false	% reversed
-
-% 043 = RunningWater
-
-045 = JrTroopaSplash
-046 = JrTroopaSwim
-047 = BooSpook
-
-0C1 = BooVanish
-0C3 = BooAppear
-
-0C5 = MenuOpen
-0C6 = MenuClose
-0C7 = MenuChangeSelection
-0C8 = MenuChangeTab
-0C9 = MenuNext
-0CA = MenuBack
-
-141 = Step1
-142 = Step2
-
-147 = TornadoJump
-148 = SoftLand
-
-14B = Land
-14E = HitBlock
-
-153 = SearchBush
-
-1C1 = BasicDoorOpen
-1C2 = BasicDoorClose
-1C3 = MetalDoorOpen
-1C4 = MetalDoorClose
-1C5 = LargeDoorOpen
-1C6 = LargeDoorClose
-1C7 = CreakyDoorOpen
-1C8 = CreakyDoorClose
-1C9 = MetalGateOpen
-1CA = MetalGateClose
-
-291 = BowSpook
-
-% 2C1 = high jump?
-2CD = SmokeBurst
-
-2D7 = DayzeeSong
-2D8 = PowerUp
-
-
-
-30C = ShyGuyScreams1
-30D = ShyGuyScreams2
-30E = ShyGuyScreams3
-30F = ToyTankMove1
-310 = ToyTankMove2
-395 = GeneralWhistle
-
-321 = MoleSurface
-322 = MoleDig
-323 = MolePop
-
-3E2 = Jump
-3E3 = MissJump	% or tripping
-
-3E5 = Death
-3E6 = BigPowerUp
-
-3E8 = MoleThrow
-
-2FF = CloseShell
-3D4 = OpenShell
-
-200E = BowVanish
-200F = BowAppear
-
-2016 = Cannon1
-2017 = Cannon2
-2018 = Cannon3
-
-2081 = Jump
-2076 = BombBlast
-
-20D4 = SpellCast1 % buff
-20D5 = SpellCast2 % shapes
-20D6 = SpellCast3
-20D7 = SpellCast4 % spooky
-20D8 = SpellCast5 % declining
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/sprites.enum b/papermario/tools/sr_enums/sprites.enum
deleted file mode 100755
index e1f0a00f3f..0000000000
--- a/papermario/tools/sr_enums/sprites.enum
+++ /dev/null
@@ -1,237 +0,0 @@
-Sprite		% namespace
-spriteID	% library name
-false		% reversed
-
-01 = WorldGoombario
-02 = WorldKooper
-03 = WorldBombette
-04 = WorldParakarry
-05 = WorldBow
-06 = WorldWatt
-07 = WorldSushi
-08 = WorldLakilester
-09 = BattleGoombario
-0A = BattleKooper
-0B = BattleBombette
-0C = BattleParakarry
-0D = BattleBow
-0E = BattleWatt
-0F = BattleSushi
-10 = BattleLakilester
-11 = KooperWithoutShell
-12 = WorldEldstar
-13 = WorldMamar
-14 = WorldSkolar
-15 = WorldMuskular
-16 = WorldMisstar
-17 = WorldKlevar
-18 = WorldKalmar
-19 = BattleEldstar
-1A = BattleMamar
-1B = BattleSkolar
-1C = BattleMuskular
-1D = BattleMisstar
-1E = BattleKlevar
-1F = BattleKalmar
-20 = Twink
-21 = JrTroopa
-22 = SpikedJrTroopa
-23 = SpikedParaJrTroopa
-24 = MageJrTroopa
-25 = ParaJrTroopa
-26 = Goomba
-27 = SpikedGoomba
-28 = Paragoomba
-29 = KoopaTroopa
-2A = ParaTroopa
-2B = Fuzzy
-2C = Bombomb
-2D = BulletBill
-2E = BillBlaster
-2F = MontyMole
-30 = Cleft
-31 = Pokey
-32 = Bandit
-33 = BuzzyBeetle
-34 = Swooper
-35 = StoneChomp
-36 = PutridPiranha
-37 = PiranhaPlant
-38 = Sentinel
-39 = WorldClubba
-3A = BattleClubba
-3B = ShyGuy
-3C = GrooveGuy
-3D = SkyGuy
-3E = PyroGuy
-3F = SpyGuy
-40 = MediGuy
-41 = Fuzzipede
-42 = JungleGuy
-43 = HeartPlant
-44 = HurtPlant
-45 = MBush
-46 = Bubble
-47 = KentCKoopa
-48 = Dayzee
-49 = Lakitu
-4A = Spiny
-4B = Bzzap
-4C = RuffPuff
-4D = SpikeTop
-4E = Duplighost
-4F = AlbinoDino
-50 = Blooper
-51 = BabyBlooper
-52 = Gulpit
-53 = DryBones
-54 = ThrownBone
-55 = BonyBeetle
-56 = Magikoopa
-57 = FlyingMagikoopa
-58 = WorldKoopatrol
-59 = Koopatrol
-5A = HammerBros
-5B = BushBasic
-5C = BushBlocky
-5D = BushDry
-5E = BushLeafy
-5F = BushMatted
-60 = WorldKammy
-61 = BattleKammy
-62 = GoombaBros
-63 = GoombaKing
-64 = SpikyGoomnut
-65 = DarkToad
-66 = KoopaBros
-67 = Buzzar
-68 = Tutankoopa
-69 = ChainChomp
-6A = WorldTubba
-6B = BattleTubba
-6C = TubbasHeart
-6D = BigLanternGhost
-6E = ShySquadGuy
-6F = MarshalGuy
-70 = StiltGuy
-71 = StiltGuyUnfold
-72 = ShyStackGuy
-73 = ShyStackUnfold
-74 = ShyStackDamage
-75 = ShyStackRock
-76 = GeneralGuy
-77 = GeneralGuyBomb
-78 = TankGuy
-79 = LavaPiranhaHead
-7A = PetitPiranha
-7B = LavaBud
-7C = HuffNPuff
-7D = TuffPuff
-7E = Monstar
-7F = CrystalKing
-80 = WorldBowser
-81 = BattleBowser
-82 = Luigi
-83 = Toad
-84 = ThreeSisters
-85 = VannaT
-86 = ToadKid
-87 = ToadGuard
-88 = HarryT
-89 = ToadMinister
-8A = Postmaster
-8B = ConductorToad
-8C = TrainStationToad
-8D = Fishmael
-8E = ArtistToad
-8F = Koopa
-90 = KoopaWithoutShell
-91 = WorldBombomb
-92 = Whacka
-93 = Dryite
-94 = Mouser
-95 = Boo
-96 = Yoshi
-97 = YoshiKid
-98 = Raven
-99 = Bubulb
-9A = Penguin
-9B = ShiverToad
-9C = AltBandit
-9D = Goompapa
-9E = Goombaria
-9F = Goomama
-A0 = Goompa
-A1 = Goomma
-A2 = TheMaster
-A3 = Chan
-A4 = Lee
-A5 = Merlon
-A6 = ChetRippo
-A7 = Rowf
-A8 = MinhT
-A9 = RussT
-AA = TayceT
-AB = FiceT
-AC = Bartender
-AD = Chanterelle
-AE = RipCheato
-AF = ChuckQuizmo
-B0 = Merluvlee
-B1 = Merlar
-B2 = Merlow
-B3 = StarKid
-B4 = KoloradoWife
-B5 = KoopaKoot
-B6 = Kolorado
-B7 = BattleKolorado
-B8 = Archeologist
-B9 = Nomadimouse
-BA = WorldMerlee
-BB = BattleMerlee
-BC = DisguisedMoustafa
-BD = Moustafa
-BE = Oaklie
-BF = Bootler
-C0 = Yakkey
-C1 = GourmetGuy
-C2 = VillageLeader
-C3 = LeadersFriend
-C4 = RafaelRaven
-C5 = Tolielup
-C6 = GateFlower
-C7 = Petunia
-C8 = Posie
-C9 = Lily
-CA = Rosie
-CB = Sun
-CC = Lakilulu
-CD = Ninji
-CE = MayorPenguin
-CF = MayorPenguinWife
-D0 = PenguinPatrol
-D1 = Herringway
-D2 = Merle
-D3 = StarRod
-D4 = Fire
-D5 = Coin
-D6 = ParadePeach
-D7 = ParadeKoopas
-D8 = ParadeBurntBowser
-D9 = ParadeLuigi
-DA = ParadePartners
-DB = ParadeYoshis
-DC = ParadaKolorados
-DD = ParadeChicks
-DE = ParadeIceShow
-DF = ParadeToads
-E0 = ParadeBatons
-E1 = ParadeDrums
-E2 = ParadeFlags
-E3 = ParadeHorns
-E4 = ParadeTubbaBalloon
-E5 = ParadeWizards
-E6 = ParadeMario
-E7 = ParadeShyGuys
-E8 = ParadeTwink
-E9 = Leaf
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/status.enum b/papermario/tools/sr_enums/status.enum
deleted file mode 100755
index 8faefe85a4..0000000000
--- a/papermario/tools/sr_enums/status.enum
+++ /dev/null
@@ -1,43 +0,0 @@
-Status	% namespace
-status	% library name
-true	% reversed
-
-Normal			= 1
-Default			= 2		% works for any status not explicitly specified
-DefaultTurnMod	= 1F
-Sleep			= 6
-SleepTurnMod	= 20
-Poison			= 9
-PoisonTurnMod	= 25
-Frozen			= 7
-FrozenTurnMod	= 22
-Dizzy			= 4
-DizzyTurnMod	= 24
-Fear			= 3
-FearTurnMod		= 23
-Static			= B
-StaticTurnMod	= 21
-Paralyze		= 5
-ParalyzeTurnMod = 26
-Shrink			= A
-ShrinkTurnMod	= 27
-Stop			= 8
-StopTurnMod		= 29
-Stone			= C
-Daze			= D		% partners only, turn mod is N/A
-End				= 0
-
-
-Berserk			= 10
-TurnDone		= 12
-Hustle			= 19
-Danger			= 1A
-Thinking		= 1C
-Weary			= 1D
-
-% E
-% 13
-% 14
-% 15
-% 16
-% 18
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/target_iter.enum b/papermario/tools/sr_enums/target_iter.enum
deleted file mode 100755
index fe71c78fde..0000000000
--- a/papermario/tools/sr_enums/target_iter.enum
+++ /dev/null
@@ -1,11 +0,0 @@
-Iter	% namespace
-iter	% library name
-false	% reversed
-
-% Used by enemy target iterators to select targets from a target list
-
-FFFFFFFF = First
-0000000A = Last
-00000000 = Next
-00000001 = Prev
-% any other value actually
\ No newline at end of file
diff --git a/papermario/tools/sr_enums/triggers.enum b/papermario/tools/sr_enums/triggers.enum
deleted file mode 100755
index bf94adb028..0000000000
--- a/papermario/tools/sr_enums/triggers.enum
+++ /dev/null
@@ -1,24 +0,0 @@
-Trigger	% namespace
-trigger	% library name
-false	% reversed
-
-00000080 = FloorTouch
-00080000 = FloorAbove
-00000800 = FloorPressA
-00000200 = FloorJump
-
-00000400 = WallTouch
-00000040 = WallPush
-00000100 = WallPressA
-00001000 = WallHammer
-
-00040000 = CeilingTouch
-
-% 00002000	???
-% 00004000	???
-% 00008000	???
-	
-00100000 = PointBomb
-
-00010000 = GameFlagSet
-00020000 = AreaFlagSet