From 4c60dda140335d6322411c6ef62a2dc0b85a3018 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 18 Jan 2025 16:30:55 +0100 Subject: [PATCH] Move DTCM documentation from Ghidra --- config/eur/arm9/dtcm/symbols.txt | 20 ++++++++++---------- config/usa/arm9/dtcm/symbols.txt | 20 ++++++++++---------- src/00_Core/Item/ItemManager.cpp | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 21171a74..f2f7f0a0 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -18,10 +18,10 @@ data_027e0138 kind:data(any) addr:0x27e0138 data_027e0148 kind:data(any) addr:0x27e0148 data_027e0158 kind:data(any) addr:0x27e0158 data_027e0160 kind:data(any) addr:0x27e0160 -data_027e016c kind:data(any) addr:0x27e016c +gDefaultScale kind:data(any) addr:0x27e016c data_027e0178 kind:data(any) addr:0x27e0178 data_027e0184 kind:data(any) addr:0x27e0184 -data_027e0194 kind:data(any) addr:0x27e0194 +gDefaultMatrix kind:data(any) addr:0x27e0194 data_027e01b8 kind:data(any) addr:0x27e01b8 data_027e0200 kind:bss addr:0x27e0200 data_027e0220 kind:bss addr:0x27e0220 @@ -49,9 +49,9 @@ data_027e0384 kind:bss addr:0x27e0384 data_027e03c8 kind:bss addr:0x27e03c8 data_027e03fc kind:bss addr:0x27e03fc data_027e0424 kind:bss addr:0x27e0424 -data_027e0438 kind:bss addr:0x27e0438 -data_027e045c kind:bss addr:0x27e045c -data_027e0468 kind:bss addr:0x27e0468 +gGeomMatrix kind:bss addr:0x27e0438 +gGeomTranslation kind:bss addr:0x27e045c +gGeomScale kind:bss addr:0x27e0468 data_027e047c kind:bss addr:0x27e047c data_027e04ac kind:bss addr:0x27e04ac data_027e04dc kind:bss addr:0x27e04dc @@ -100,7 +100,7 @@ data_027e0d44 kind:bss addr:0x27e0d44 data_027e0d48 kind:bss addr:0x27e0d48 data_027e0d54 kind:bss addr:0x27e0d54 data_027e0d6c kind:bss addr:0x27e0d6c -data_027e0d78 kind:bss addr:0x27e0d78 +gTouchControl kind:bss addr:0x27e0d78 data_027e0d84 kind:bss addr:0x27e0d84 data_027e0db0 kind:bss addr:0x27e0db0 data_027e0db4 kind:bss addr:0x27e0db4 @@ -136,13 +136,13 @@ gItemManager kind:bss addr:0x27e0fb4 gPlayerControl kind:bss addr:0x27e0fb8 gHealthManager kind:bss addr:0x27e0fbc data_027e0fc0 kind:bss addr:0x27e0fc0 -data_027e0fc4 kind:bss addr:0x27e0fc4 +gItemModelLoader kind:bss addr:0x27e0fc4 gPlayerLink kind:bss addr:0x27e0fc8 -data_027e0fcc kind:bss addr:0x27e0fcc +gPlayerControlData kind:bss addr:0x27e0fcc data_027e0fce kind:bss addr:0x27e0fce -data_027e0fd0 kind:bss addr:0x27e0fd0 +gLinkState kind:bss addr:0x27e0fd0 data_027e0fd4 kind:bss addr:0x27e0fd4 -data_027e0fd8 kind:bss addr:0x27e0fd8 +gPlayerControlDatas kind:bss addr:0x27e0fd8 gLinkStates kind:bss addr:0x27e0fdc data_027e0fe0 kind:bss addr:0x27e0fe0 gActorManager kind:bss addr:0x27e0fe4 diff --git a/config/usa/arm9/dtcm/symbols.txt b/config/usa/arm9/dtcm/symbols.txt index 21171a74..f2f7f0a0 100644 --- a/config/usa/arm9/dtcm/symbols.txt +++ b/config/usa/arm9/dtcm/symbols.txt @@ -18,10 +18,10 @@ data_027e0138 kind:data(any) addr:0x27e0138 data_027e0148 kind:data(any) addr:0x27e0148 data_027e0158 kind:data(any) addr:0x27e0158 data_027e0160 kind:data(any) addr:0x27e0160 -data_027e016c kind:data(any) addr:0x27e016c +gDefaultScale kind:data(any) addr:0x27e016c data_027e0178 kind:data(any) addr:0x27e0178 data_027e0184 kind:data(any) addr:0x27e0184 -data_027e0194 kind:data(any) addr:0x27e0194 +gDefaultMatrix kind:data(any) addr:0x27e0194 data_027e01b8 kind:data(any) addr:0x27e01b8 data_027e0200 kind:bss addr:0x27e0200 data_027e0220 kind:bss addr:0x27e0220 @@ -49,9 +49,9 @@ data_027e0384 kind:bss addr:0x27e0384 data_027e03c8 kind:bss addr:0x27e03c8 data_027e03fc kind:bss addr:0x27e03fc data_027e0424 kind:bss addr:0x27e0424 -data_027e0438 kind:bss addr:0x27e0438 -data_027e045c kind:bss addr:0x27e045c -data_027e0468 kind:bss addr:0x27e0468 +gGeomMatrix kind:bss addr:0x27e0438 +gGeomTranslation kind:bss addr:0x27e045c +gGeomScale kind:bss addr:0x27e0468 data_027e047c kind:bss addr:0x27e047c data_027e04ac kind:bss addr:0x27e04ac data_027e04dc kind:bss addr:0x27e04dc @@ -100,7 +100,7 @@ data_027e0d44 kind:bss addr:0x27e0d44 data_027e0d48 kind:bss addr:0x27e0d48 data_027e0d54 kind:bss addr:0x27e0d54 data_027e0d6c kind:bss addr:0x27e0d6c -data_027e0d78 kind:bss addr:0x27e0d78 +gTouchControl kind:bss addr:0x27e0d78 data_027e0d84 kind:bss addr:0x27e0d84 data_027e0db0 kind:bss addr:0x27e0db0 data_027e0db4 kind:bss addr:0x27e0db4 @@ -136,13 +136,13 @@ gItemManager kind:bss addr:0x27e0fb4 gPlayerControl kind:bss addr:0x27e0fb8 gHealthManager kind:bss addr:0x27e0fbc data_027e0fc0 kind:bss addr:0x27e0fc0 -data_027e0fc4 kind:bss addr:0x27e0fc4 +gItemModelLoader kind:bss addr:0x27e0fc4 gPlayerLink kind:bss addr:0x27e0fc8 -data_027e0fcc kind:bss addr:0x27e0fcc +gPlayerControlData kind:bss addr:0x27e0fcc data_027e0fce kind:bss addr:0x27e0fce -data_027e0fd0 kind:bss addr:0x27e0fd0 +gLinkState kind:bss addr:0x27e0fd0 data_027e0fd4 kind:bss addr:0x27e0fd4 -data_027e0fd8 kind:bss addr:0x27e0fd8 +gPlayerControlDatas kind:bss addr:0x27e0fd8 gLinkStates kind:bss addr:0x27e0fdc data_027e0fe0 kind:bss addr:0x27e0fe0 gActorManager kind:bss addr:0x27e0fe4 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index add40960..c9088647 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -153,16 +153,16 @@ ARM ItemModel *ItemManager::GetItemModel(ItemModelId id) { return mItemModels[id]; } -extern unk32 data_027e0fc4; +extern unk32 gItemModelLoader; extern "C" void *func_ov00_020bb3a8(unk32 param1, u32 index); extern "C" void func_ov00_020c0bdc(void *param1, unk32 param2); ARM void ItemManager::func_ov00_020ad538(unk32 param1) const { - void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 6); + void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 6); func_ov00_020c0bdc(unk1, param1); } ARM void ItemManager::func_ov00_020ad560(unk32 param1) const { - void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 7); + void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 7); func_ov00_020c0bdc(unk1, param1); } @@ -171,7 +171,7 @@ ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) { } ARM void ItemManager::func_ov00_020ad594(unk32 param1) const { - void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 11); + void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 11); func_ov00_020c0bdc(unk1, param1); }