From 73a22e7a1f7bad1d711221453c6562e8f3140449 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 27 May 2021 05:37:41 -0300
Subject: set byte/nibble fix (do we even need to reset this info, though?)

---
 npc/functions/bitwise.txt | 16 ++++++++--------
 npc/functions/hub.txt     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/npc/functions/bitwise.txt b/npc/functions/bitwise.txt
index 88938eef9..023606629 100644
--- a/npc/functions/bitwise.txt
+++ b/npc/functions/bitwise.txt
@@ -121,10 +121,10 @@ function	script	get_bitword	{
 
 /////////////////////////////////////////////////////////////////////////////////
 // A Nibble can go up to 15. There are 7 nibbles.
-// set_nibble(VAR, VAL, NIBBLEID)
+// set_nibble(VAR, NIBBLEID, VAL)
 function	script	set_nibble	{
     .@v=getarg(0);
-    switch (getarg(2)) {
+    switch (getarg(1)) {
     case 0:
         .@s=0; .@m=0xF; break;
     case 1:
@@ -140,17 +140,17 @@ function	script	set_nibble	{
     case 6:
         .@s=24; .@m=0xF000000; break;
     default:
-        Exception("Invalid SNibble: "+getarg(2), RB_DEFAULT);
+        Exception("Invalid SNibble: "+getarg(1), RB_DEFAULT);
     }
 
-    return bitwise_set(getarg(0), .@m, .@s, getarg(1));
+    return bitwise_set(getarg(0), .@m, .@s, getarg(2));
 }
 
 // A Byte can go up to 255. There are 3 bytes. The forth can go up to 127.
-// set_nibble(VAR, VAL, BYTEID)
+// set_nibble(VAR, BYTEID, VAL)
 function	script	set_byte	{
     .@v=getarg(0);
-    switch (getarg(2)) {
+    switch (getarg(1)) {
     case 0:
         .@s=0; .@m=0xFF; break;
     case 1:
@@ -160,10 +160,10 @@ function	script	set_byte	{
     case 3:
         .@s=24; .@m=0x7F000000; break;
     default:
-        Exception("Invalid SByte: "+getarg(2), RB_DEFAULT);
+        Exception("Invalid SByte: "+getarg(1), RB_DEFAULT);
     }
 
-    return bitwise_set(getarg(0), .@m, .@s, getarg(1));
+    return bitwise_set(getarg(0), .@m, .@s, getarg(2));
 }
 
 // A Bitword can go up to 65535 and is fixed in position to handle Soul EXP.
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 9e6e492e0..14e15724b 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -59,8 +59,8 @@ function	script	HUB_Login	{
             }
 
             // Unset the target lake/world
-            set_byte(##00_INFO, 0, 3);
-            set_nibble(##00_INFO, 0, 5);
+            set_byte(##00_INFO, 3, 0);
+            set_nibble(##00_INFO, 5, 0);
         } else if (.@gto) {
             // Heading somewhere which is not here!
             mesc l("WARNING: If you use any Mirror Lake feature on this world, the current Mirror Lake Quest will be marked as \"Failed\"."), 1;
-- 
cgit v1.2.3-60-g2f50