daNpc_Cb1_c Almost OK (#822)

* daNpc_Cb1_c Almost OK

Down to regswaps/minor instruction issues

* Oops

That inline was fake

* Some Cleanup

- Fill in more inlines
- Reorganize daNpc_Cb1_c inlines
- Use inlines more
- Some naming and typing consistency

* Naming, Consistency Tweaks

- TRUE/FALSE macros for all cases of BOOL, use int -> BOOL sometimes
- Rename HIO to be consistent with other NPCs
- Animation enum

* Some HIO Names

* Clarity Tweaks

- NULL in more asserts
- Squared constants

1 files changed, 2 insertions, 2 deletions

diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 944e08d0..6c2b2c9b 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -2239,7 +2239,7 @@ BOOL daNpc_Os_c::execute() {
                     m4E8 = 0;
                 }
                 else {
-                    daPy_getPlayerLinkActorClass()->startRestartRoom(5, 0xC9, -1.0f, 0);
+                    daPy_getPlayerLinkActorClass()->npcStartRestartRoom();
                 }
             }
             else {
@@ -2247,7 +2247,7 @@ BOOL daNpc_Os_c::execute() {
             }
             
             if(mAcch.ChkWaterIn()) {
-                daPy_getPlayerLinkActorClass()->startRestartRoom(5, 0xC9, -1.0f, 0);
+                daPy_getPlayerLinkActorClass()->npcStartRestartRoom();
 
                 if(!isWaterHit()) {
                     onWaterHit();