`m_trademark` OK (#192)

* C file

* trademark_init

* trademark_cancel, trademark_move, trademark_main

* trademark_draw

* trademark_goto_demo_scene and func_80805360_jp

* set_npc_4_title_demo

* func_80804C40_jp

* trademark_cleanup

* func_808052B8_jp

* func_80805104_jp

* func_80804F78_jp

* func_80804EE0_jp

* fix warnings

* small cleanup

* fix build

* some fixes

* stuff

* some cleanups

* Fix rebase

* Import data

* Migrate bss

* cleanup

* Save substruct

* format

* TrademarkState and some other stuff

* remove fake match

* stuff I missed

* whoops

* Stupid `-Wtype-limits`

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* Review

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

* Update src/overlays/gamestates/ovl_trademark/m_trademark.c

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>

* clang-tidy changes???

* review

---------

Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/code/m_npc_walk.c b/src/code/m_npc_walk.c
index 40ee911..9a0cbd6 100644
--- a/src/code/m_npc_walk.c
+++ b/src/code/m_npc_walk.c
@@ -278,7 +278,7 @@ s32 mNpcW_ChangeNpcWalk(NpcWalking* walk, NpcWalkInfo* info) {
         NpcWalkInfo* free_info = &walk->info[free_idx];
 
         mNpcW_ClearNpcWalkInfo(free_info, 1);
-        idx = mNpcW_DecideNpc(common_data.animals, walk->idxUse);
+        idx = mNpcW_DecideNpc(common_data.save.animals, walk->idxUse);
 
         if (idx == -1) {
             walk->idxUse = 0;
@@ -288,10 +288,10 @@ s32 mNpcW_ChangeNpcWalk(NpcWalking* walk, NpcWalkInfo* info) {
                 }
             }
 
-            idx = mNpcW_DecideNpc(common_data.animals, walk->idxUse);
+            idx = mNpcW_DecideNpc(common_data.save.animals, walk->idxUse);
         }
 
-        mNpcW_SetNpcWalkInfo(free_info, &common_data.animals[idx], idx);
+        mNpcW_SetNpcWalkInfo(free_info, &common_data.save.animals[idx], idx);
         walk->idxUse |= (1 << idx);
         mNpcW_SetGoalBlock(free_info);
     }
@@ -300,7 +300,7 @@ s32 mNpcW_ChangeNpcWalk(NpcWalking* walk, NpcWalkInfo* info) {
 }
 
 s32 mNpcW_GetAloneBlock(u8* goalBlockX, u8* goalBlockZ) {
-    Animal_c* animal = common_data.animals;
+    Animal_c* animal = common_data.save.animals;
     NpcList* npcList = common_data.npclist;
     u8 block_field[FG_BLOCK_Z_NUM + 2];
     u8 count = 0;
@@ -415,7 +415,7 @@ s32 mNpcW_CheckDiffBlockWalkNpcHome(s32 blockX, s32 blockZ, NpcWalkInfo* info) {
     for (i = 0; i < NPCW_MAX; i++) {
         idx = info->idx;
         if (idx != -1) {
-            home = &common_data.animals[idx].homeInfo;
+            home = &common_data.save.animals[idx].homeInfo;
 
             if (home->blockX == blockX && home->blockZ == blockZ) {
                 break;
@@ -515,8 +515,8 @@ void mNpcW_SetGoalBlock(NpcWalkInfo* info) {
         case NPCW_GOAL_MY_HOME:
             idx = info->idx;
 
-            info->goalX = common_data.animals[idx].homeInfo.blockX;
-            info->goalZ = common_data.animals[idx].homeInfo.blockZ;
+            info->goalX = common_data.save.animals[idx].homeInfo.blockX;
+            info->goalZ = common_data.save.animals[idx].homeInfo.blockZ;
             break;
 
         default:
@@ -536,13 +536,13 @@ void mNpcW_InitNpcWalk(NpcWalking* walk) {
     bzero(l_goal_block, sizeof(l_goal_block));
     bzero(l_arrive_stay_count, sizeof(l_arrive_stay_count));
 
-    animals = common_data.animals;
-    walk->infoMax = NPCW_GET_WALK_NUM(common_data.nowNpcMax);
+    animals = common_data.save.animals;
+    walk->infoMax = NPCW_GET_WALK_NUM(common_data.save.nowNpcMax);
 
     for (i = 0; i < walk->infoMax; i++) {
         idx = mNpcW_DecideNpc(animals, walk->idxUse);
 
-        mNpcW_SetNpcWalkInfo(info, &common_data.animals[idx], idx);
+        mNpcW_SetNpcWalkInfo(info, &common_data.save.animals[idx], idx);
         walk->idxUse |= (1 << idx);
         info++;
     }
@@ -588,7 +588,7 @@ s32 mNpcW_GetWalkInfoStatusGoalAnimalIdx(s32* status, s32* goal, s32 idx) {
 
     if (idx >= 0 && idx < ANIMAL_NUM_MAX) {
         NpcWalking* walk = &common_data.npcWalk;
-        s32 info_idx = mNpcW_GetNpcWalkInfoIdx(walk->info, NPCW_MAX, &common_data.animals[idx].id);
+        s32 info_idx = mNpcW_GetNpcWalkInfoIdx(walk->info, NPCW_MAX, &common_data.save.animals[idx].id);
 
         if (info_idx >= 0) {
             res = TRUE;