From ca71275bbecc7db9a4eeca3a6ac4215b66de4318 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:06:32 -0800
Subject: big d_a_alink pass (#214)

* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data
---
 src/d/d_item.cpp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/d/d_item.cpp')

diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index faeab6a55d..dba0047cfa 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -1220,24 +1220,13 @@ void item_func_HAWK_EYE() {
 }
 
 /* 800986C4-80098718 093004 0054+00 1/0 0/0 0/0 .text            item_func_WOOD_STICK__Fv */
-// load instructions are switched
-#ifdef NONMATCHING
 void item_func_WOOD_STICK() {
     dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD);
     dComIfGs_setSelectEquipSword(WOOD_STICK);
 
-    dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo());  // wrong order
+    s32 roomNo = dComIfGp_roomControl_getStayNo();
+    dComIfGs_onSwitch(28, roomNo);
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void item_func_WOOD_STICK() {
-    nofralloc
-#include "asm/d/d_item/item_func_WOOD_STICK__Fv.s"
-}
-#pragma pop
-#endif
 
 void item_func_BOOMERANG() {
     dComIfGs_setItem(SLOT_0, BOOMERANG);
-- 
cgit v1.2.3