diff --git a/include/m_name_table.h b/include/m_name_table.h
index bb10faff..9b4f71ca 100644
--- a/include/m_name_table.h
+++ b/include/m_name_table.h
@@ -1708,43 +1708,278 @@ extern mActor_name_t mNT_FishIdx2FishItemNo(int idx);
 #define SP_NPC_HEM (SP_NPC_START + 142) // D08E
 
 
-#define NPC_START 0xE000
-#define NPC_BOB NPC_START
-// TODO: Finish
-#define NPC_JOEY 0xE048
-#define NPC_PAOLO 0xE04C
-#define NPC_JANE 0xE061
-#define NPC_CARRIE 0xE06F
-#define NPC_SAMSON 0xE07D
-#define NPC_BUZZ 0xE08C
-#define NPC_CUBE 0xE093
-#define NPC_RASHER 0xE09B
-#define NPC_TANK 0xE0AA
-#define NPC_VESTA 0xE0AD
-#define NPC_TYBALT 0xE0B6
-#define NPC_LOBO 0xE0B9
-#define NPC_BIFF 0xE0C2
-#define NPC_MAELLE (NPC_START + 216)
-#define NPC_OHARE (NPC_START + 217)
-#define NPC_BLISS (NPC_START + 218)
-#define NPC_DRIFT (NPC_START + 219)
-#define NPC_BUD (NPC_START + 220)
-#define NPC_BOOMER (NPC_START + 221)
-#define NPC_ELINA (NPC_START + 222)
-#define NPC_FLASH (NPC_START + 223)
-#define NPC_DOBIE (NPC_START + 224)
-#define NPC_FLOSSIE (NPC_START + 225)
+#define NPC_START    0xE000
+// cats
+#define NPC_BOB      NPC_START
+#define NPC_OLIVIA   (NPC_START + 1)
+#define NPC_MITZI    (NPC_START + 2)
+#define NPC_KIKI     (NPC_START + 3)
+#define NPC_TANGY    (NPC_START + 4)
+#define NPC_KABUKI   (NPC_START + 5)
+#define NPC_TABBY    (NPC_START + 6)
+#define NPC_MONIQUE  (NPC_START + 7)
+#define NPC_STINKY   (NPC_START + 8)
+#define NPC_PURRL    (NPC_START + 9)
+#define NPC_KITTY    (NPC_START + 10)
+#define NPC_TOM      (NPC_START + 11)
+#define NPC_ROSIE    (NPC_START + 12)
+// anteaters
+#define NPC_NOSEGAY  (NPC_START + 13)
+#define NPC_ZOE      (NPC_START + 14)
+#define NPC_PANGO    (NPC_START + 15)
+#define NPC_CYRANO   (NPC_START + 16)
+#define NPC_SNOOTY   (NPC_START + 17)
+// bears
+#define NPC_TEDDY    (NPC_START + 18)
+#define NPC_CHOW     (NPC_START + 19)
+#define NPC_DOZER    (NPC_START + 20)
+#define NPC_NATE     (NPC_START + 21)
+#define NPC_GROUCHO  (NPC_START + 22)
+#define NPC_TUTU     (NPC_START + 23)
+#define NPC_URSALA   (NPC_START + 24)
+#define NPC_GRIZZLY  (NPC_START + 25)
+#define NPC_PINKY    (NPC_START + 26)
+// birds
+#define NPC_JAY      (NPC_START + 27)
+#define NPC_TWIGGY   (NPC_START + 28)
+#define NPC_ANCHOVY  (NPC_START + 29)
+#define NPC_PIPER    (NPC_START + 30)
+#define NPC_ADMIRAL  (NPC_START + 31)
+#define NPC_OTIS     (NPC_START + 32)
+#define NPC_ROBIN    (NPC_START + 33)
+#define NPC_MIDGE    (NPC_START + 34)
+#define NPC_ACE      (NPC_START + 35)
+#define NPC_TWIRP    (NPC_START + 36)
+// bulls)
+#define NPC_CHUCK    (NPC_START + 37)
+#define NPC_STU      (NPC_START + 38)
+// chickens
+#define NPC_GOOSE    (NPC_START + 39)
+#define NPC_BETTY    (NPC_START + 40)
+#define NPC_HECTOR   (NPC_START + 41)
+#define NPC_EGBERT   (NPC_START + 42)
+#define NPC_AVA      (NPC_START + 43)
+#define NPC_HANK     (NPC_START + 44)
+#define NPC_LEIGH    (NPC_START + 45)
+#define NPC_RHODA    (NPC_START + 46)
+// cubs
+#define NPC_VLADIMIR (NPC_START + 47)
+#define NPC_MURPHY   (NPC_START + 48)
+#define NPC_CUPCAKE  (NPC_START + 49)
+#define NPC_KODY     (NPC_START + 50)
+#define NPC_MAPLE    (NPC_START + 51)
+#define NPC_PUDGE    (NPC_START + 52)
+#define NPC_OLIVE    (NPC_START + 53)
+#define NPC_PONCHO   (NPC_START + 54)
+#define NPC_BLUEBEAR (NPC_START + 55)
+// cows
+#define NPC_PATTY    (NPC_START + 56)
+#define NPC_PETUNIA  (NPC_START + 57)
+#define NPC_BESSIE   (NPC_START + 58)
+#define NPC_BELLE    (NPC_START + 59)
+// crocodiles / alligators
+#define NPC_ALFONSO  (NPC_START + 60)
+#define NPC_BOOTS    (NPC_START + 61)
+#define NPC_LIZ      (NPC_START + 62)
+#define NPC_BISKIT   (NPC_START + 63)
+// dogs
+#define NPC_GOLDIE   (NPC_START + 64)
+#define NPC_DAISY    (NPC_START + 65)
+#define NPC_LUCKY    (NPC_START + 66)
+#define NPC_PORTIA   (NPC_START + 67)
+#define NPC_MADDIE   (NPC_START + 68)
+#define NPC_BUTCH    (NPC_START + 69)
+// ducks
+#define NPC_BILL     (NPC_START + 70)
+#define NPC_POMPOM   (NPC_START + 71)
+#define NPC_JOEY     (NPC_START + 72)
+#define NPC_SCOOT    (NPC_START + 73)
+#define NPC_DERWIN   (NPC_START + 74)
+#define NPC_FRECKLES (NPC_START + 75)
+// elephants
+#define NPC_PAOLO    (NPC_START + 76)
+#define NPC_DIZZY    (NPC_START + 77)
+#define NPC_AXEL     (NPC_START + 78)
+// frogs
+#define NPC_EMERALD  (NPC_START + 79)
+#define NPC_TAD      (NPC_START + 80)
+#define NPC_WART_JR  (NPC_START + 81)
+#define NPC_COUSTEAU (NPC_START + 82)
+#define NPC_PUDDLES  (NPC_START + 83)
+#define NPC_LILY     (NPC_START + 84)
+#define NPC_JEREMIAH (NPC_START + 85)
+#define NPC_HUCK     (NPC_START + 86)
+#define NPC_CAMOFROG (NPC_START + 87)
+#define NPC_RIBBOT   (NPC_START + 88)
+#define NPC_PRINCE   (NPC_START + 89)
+#define NPC_JAMBETTE (NPC_START + 90)
+// goats
+#define NPC_BILLY    (NPC_START + 91)
+#define NPC_CHEVRE   (NPC_START + 92)
+#define NPC_IGGY     (NPC_START + 93)
+#define NPC_GRUFF    (NPC_START + 94)
+#define NPC_SVEN     (NPC_START + 95)
+#define NPC_VELMA    (NPC_START + 96)
+// gorillas
+#define NPC_JANE     (NPC_START + 97)
+#define NPC_CESAR    (NPC_START + 98)
+#define NPC_LOUIE    (NPC_START + 99)
+#define NPC_PEEWEE   (NPC_START + 100)
+// hippos
+#define NPC_ROLLO    (NPC_START + 101)
+#define NPC_BUBBLES  (NPC_START + 102)
+#define NPC_BERTHA   (NPC_START + 103)
+// horses
+#define NPC_ELMER    (NPC_START + 104)
+#define NPC_WINNIE   (NPC_START + 105)
+#define NPC_SAVANNAH (NPC_START + 106)
+#define NPC_ED       (NPC_START + 107)
+#define NPC_CLEO     (NPC_START + 108)
+#define NPC_PEACHES  (NPC_START + 109)
+#define NPC_BUCK     (NPC_START + 110)
+// kangaroos
+#define NPC_CARRIE   (NPC_START + 111)
+#define NPC_MATHILDA (NPC_START + 112)
+#define NPC_MARCY    (NPC_START + 113)
+#define NPC_KITT     (NPC_START + 114)
+#define NPC_VALISE   (NPC_START + 115)
+#define NPC_ASTRID   (NPC_START + 116)
+// koalas
+#define NPC_SYDNEY   (NPC_START + 117)
+#define NPC_GONZO    (NPC_START + 118)
+#define NPC_OZZIE    (NPC_START + 119)
+#define NPC_YUKA     (NPC_START + 120)
+#define NPC_HUGGY    (NPC_START + 121)
+// lions
+#define NPC_REX      (NPC_START + 122)
+#define NPC_AZIZ     (NPC_START + 123)
+#define NPC_LEOPOLD  (NPC_START + 124)
+// mice
+#define NPC_SAMSON   (NPC_START + 125)
+#define NPC_PENNY    (NPC_START + 126)
+#define NPC_DORA     (NPC_START + 127)
+#define NPC_CHICO    (NPC_START + 128)
+#define NPC_CANDI    (NPC_START + 129)
+#define NPC_RIZZO    (NPC_START + 130)
+#define NPC_ANICOTTI (NPC_START + 131)
+#define NPC_LIMBERG  (NPC_START + 132)
+#define NPC_CARMEN   (NPC_START + 133)
+// octopus
+#define NPC_OCTAVIAN (NPC_START + 134)
+// ostriches
+#define NPC_SANDY    (NPC_START + 135)
+#define NPC_SPROCKET (NPC_START + 136)
+#define NPC_RIO      (NPC_START + 137)
+#define NPC_QUEENIE  (NPC_START + 138)
+// eagles
+#define NPC_APOLLO   (NPC_START + 139)
+#define NPC_BUZZ     (NPC_START + 140)
+#define NPC_QUETZAL  (NPC_START + 141)
+#define NPC_AMELIA   (NPC_START + 142)
+#define NPC_PIERCE   (NPC_START + 143)
+// penguins
+#define NPC_ROALD    (NPC_START + 144)
+#define NPC_AURORA   (NPC_START + 145)
+#define NPC_HOPPER   (NPC_START + 146)
+#define NPC_CUBE     (NPC_START + 147)
+#define NPC_PUCK     (NPC_START + 148)
+#define NPC_GWEN     (NPC_START + 149)
+#define NPC_FRIGA    (NPC_START + 150)
+// pigs
+#define NPC_CURLY    (NPC_START + 151)
+#define NPC_TRUFFLES (NPC_START + 152)
+#define NPC_SPORK    (NPC_START + 153)
+#define NPC_HUGH     (NPC_START + 154)
+#define NPC_RASHER   (NPC_START + 155)
+#define NPC_SUE_E    (NPC_START + 156)
+#define NPC_HAMBO    (NPC_START + 157)
+#define NPC_LUCY     (NPC_START + 158)
+#define NPC_COBB     (NPC_START + 159)
+#define NPC_BORIS    (NPC_START + 160)
+// rabbits
+#define NPC_BUNNIE   (NPC_START + 161)
+#define NPC_DOC      (NPC_START + 162)
+#define NPC_GASTON   (NPC_START + 163)
+#define NPC_COCO     (NPC_START + 164)
+#define NPC_GABI     (NPC_START + 165)
+#define NPC_DOTTY    (NPC_START + 166)
+#define NPC_GENJI    (NPC_START + 167)
+#define NPC_SNAKE    (NPC_START + 168)
+#define NPC_CLAUDE   (NPC_START + 169)
+// rhinos 
+#define NPC_TANK     (NPC_START + 170)
+#define NPC_SPIKE    (NPC_START + 171)
+#define NPC_TIARA    (NPC_START + 172)
+// sheep
+#define NPC_VESTA    (NPC_START + 173)
+// squirrels
+#define NPC_FILBERT  (NPC_START + 174)
+#define NPC_HAZEL    (NPC_START + 175)
+#define NPC_PEANUT   (NPC_START + 176)
+#define NPC_PECAN    (NPC_START + 177)
+#define NPC_RICKY    (NPC_START + 178)
+#define NPC_STATIC   (NPC_START + 179)
+#define NPC_MINT     (NPC_START + 180)
+#define NPC_NIBBLES  (NPC_START + 181)
+// tigers
+#define NPC_TYBALT   (NPC_START + 182)
+#define NPC_ROLF     (NPC_START + 183)
+#define NPC_BANGLE   (NPC_START + 184)
+// wolves
+#define NPC_LOBO     (NPC_START + 185)
+#define NPC_FREYA    (NPC_START + 186)
+#define NPC_CHIEF    (NPC_START + 187)
+// late additions
+#define NPC_WEBER    (NPC_START + 188)
+#define NPC_MALLARY  (NPC_START + 189)
+#define NPC_WOLFGANG (NPC_START + 190)
+#define NPC_HORNSBY  (NPC_START + 191)
+#define NPC_OXFORD   (NPC_START + 192)
+#define NPC_T_BONE   (NPC_START + 193)
+#define NPC_BIFF     (NPC_START + 194)
+#define NPC_OPAL     (NPC_START + 195)
+#define NPC_BONES    (NPC_START + 196)
+#define NPC_BEA      (NPC_START + 197)
+#define NPC_BITTY    (NPC_START + 198)
+#define NPC_ROCCO    (NPC_START + 199)
+#define NPC_LULU     (NPC_START + 200)
+#define NPC_BLAIRE   (NPC_START + 201)
+#define NPC_SALLY    (NPC_START + 202)
+#define NPC_ELLIE    (NPC_START + 203)
+#define NPC_ELOISE   (NPC_START + 204)
+#define NPC_ALLI     (NPC_START + 205)
+#define NPC_PIPPY    (NPC_START + 206)
+#define NPC_EUNICE   (NPC_START + 207)
+#define NPC_BAABARA  (NPC_START + 208)
+#define NPC_FANG     (NPC_START + 209)
+#define NPC_DEENA    (NPC_START + 210)
+#define NPC_PATE     (NPC_START + 211)
+#define NPC_STELLA   (NPC_START + 212)
+#define NPC_CASHMERE (NPC_START + 213)
+#define NPC_WOOLIO   (NPC_START + 214)
+#define NPC_COOKIE   (NPC_START + 215)
+// gamecube additions
+#define NPC_MAELLE   (NPC_START + 216)
+#define NPC_OHARE    (NPC_START + 217)
+#define NPC_BLISS    (NPC_START + 218)
+#define NPC_DRIFT    (NPC_START + 219)
+#define NPC_BUD      (NPC_START + 220)
+#define NPC_BOOMER   (NPC_START + 221)
+#define NPC_ELINA    (NPC_START + 222)
+#define NPC_FLASH    (NPC_START + 223)
+#define NPC_DOBIE    (NPC_START + 224)
+#define NPC_FLOSSIE  (NPC_START + 225)
 #define NPC_ANNALISE (NPC_START + 226)
-#define NPC_PLUCKY (NPC_START + 227)
-#define NPC_FAITH (NPC_START + 228)
-#define NPC_YODEL (NPC_START + 229)
-#define NPC_ROWAN (NPC_START + 230)
-#define NPC_JUNE (NPC_START + 231)
-#define NPC_CHERI (NPC_START + 232)
-#define NPC_PIGLEG (NPC_START + 233)
-#define NPC_ANKHA (NPC_START + 234)
-#define NPC_PUNCHY (NPC_START + 235)
-#define NPC_END (NPC_START + 236)
+#define NPC_PLUCKY   (NPC_START + 227)
+#define NPC_FAITH    (NPC_START + 228)
+#define NPC_YODEL    (NPC_START + 229)
+#define NPC_ROWAN    (NPC_START + 230)
+#define NPC_JUNE     (NPC_START + 231)
+#define NPC_CHERI    (NPC_START + 232)
+#define NPC_PIGLEG   (NPC_START + 233)
+#define NPC_ANKHA    (NPC_START + 234)
+#define NPC_PUNCHY   (NPC_START + 235)
+#define NPC_END      (NPC_START + 236)
 
 #define DUMMY_START 0xF000
 #define DUMMY_HANIWA0 0xF0FB