From 39d3b8f097640ebca8f4f042a340a4deb2b97bcf Mon Sep 17 00:00:00 2001
From: ragnarok-clanker <ragnarok-clanker>
Date: Mon, 9 Nov 2026 09:24:30 +0000
Subject: [PATCH] Decompile fn_19378 (CNaviData::GetCell)

Batch #15090 by Yommy: 1 byte-identical, 0 confirmed by peer review.

- fn_19378 CNaviData::GetCell: byte-identical

Merged automatically: every function is byte-identical to the original.
---
 Source/Contents/NavigationRoute.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/NavigationRoute.cpp
index 0ae4532d2..fa0bd4d87 100644
--- a/Source/Contents/NavigationRoute.cpp
+++ b/Source/Contents/NavigationRoute.cpp
@@ -572,7 +572,7 @@ std::string CNavigationManager::DestinationTitle() {
   if (this->viewMode == 2) {
     NaviCell cell;
     this->data.GetCell(&cell);
-    CNaviInfo* info = this->data.GetInfo();
+    CNaviInfo* info = this->data.info;
     if (info != nullptr) {
       this->destinationTitle.assign(info->GetTitle());
     }
@@ -935,17 +935,14 @@ std::vector<unsigned char> CNavigationManager::WriteStates() {
 
 // OFFSET: 0x00B888F0
 // FUNCTION: fn_19378
-NaviCell* CNaviData::GetCell(NaviCell* out) {
-  const int x = this->cellX;
-  const int y = this->cellY;
-  out->x = x;
-  out->y = y;
+__declspec(noinline) NaviCell* CNaviData::GetCell(NaviCell* out) {
+  *out = NaviCell{this->cellX, this->cellY};
   return out;
 }
 
 // OFFSET: 0x00B88920
 // FUNCTION: fn_19380
-CNaviInfo* CNaviData::GetInfo() {
+__declspec(noinline) CNaviInfo* CNaviData::GetInfo() {
   return this->info;
 }
 
@@ -1011,7 +1008,9 @@ bool CNavigationManager::SavedTargetText(char* out, int size) {
     CNaviInfo* info = static_cast<CNaviInfo*>(this->savedTarget.object);
     NaviCell cellY;
     NaviCell cellX;
-    std::sprintf(text, "%s %d %d", info->GetName(), this->data.GetCell(&cellX)->x, this->data.GetCell(&cellY)->y);
+    const int y = this->data.GetCell(&cellY)->y;
+    const int x = this->data.GetCell(&cellX)->x;
+    std::sprintf(text, "%s %d %d", info->GetName(), x, y);
   } else {
     return false;
   }