mirror of
https://github.com/zeldaret/ph
synced 2026-07-11 14:38:44 -04:00
Bump dsd to v0.10.1; UnkStruct_027e05f8_2 OK (#121)
* Unique delink file names * Fix build * Revert back to single link * UnkStruct_027e05f8_2 OK * `dsd fix ctor-symbols` * Fix symbols spanning over two delink files * `dsd fix ctor-symbols` again * Add missing function `func_02050a20` * Name `.p__sinit` symbols in USA after their EUR counterparts * Apply dsd signatures * Bump dsd to 0.10.0; Fix dsd not updating automatically * Rename overlay functions * Fix auto-download wibo * Fix generating objdiff report
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
#include "Player/LinkStateMove.hpp"
|
||||
#include "DTCM/UnkStruct_027e0d38.hpp"
|
||||
#include "Game/Game.hpp"
|
||||
#include "Player/LinkStateDamage.hpp"
|
||||
#include "Player/LinkStateFollow.hpp"
|
||||
#include "Player/LinkStateInteract.hpp"
|
||||
#include "Player/LinkStateItem.hpp"
|
||||
#include "Player/LinkStateMove.hpp"
|
||||
#include "Player/LinkStateRoll.hpp"
|
||||
#include "Player/PlayerControl.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#include "Actor/Navi/ActorNaviBase.hpp"
|
||||
#include "Actor/Navi/ActorNavi.hpp"
|
||||
#include "Actor/Navi/ActorNaviBase.hpp"
|
||||
#include "DTCM/UnkStruct_027e0fd4.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "Map/MapManager.hpp"
|
||||
@@ -1,6 +1,27 @@
|
||||
#include "DTCM/UnkStruct_027e05f8.hpp"
|
||||
|
||||
void UnkStruct_027e05f8::Init() {}
|
||||
void UnkStruct_027e05f8::func_02037458(u16 param1) {}
|
||||
void UnkStruct_027e05f8::func_02037480() {}
|
||||
unk32 UnkStruct_027e05f8::func_02037490(unk32 param1) {}
|
||||
#pragma section dtcm begin
|
||||
UnkStruct_027e05f8 data_027e05f8;
|
||||
#pragma section dtcm end
|
||||
|
||||
#define REG_027fffa8 (*(volatile u16 *) 0x027fffa8)
|
||||
|
||||
THUMB UnkStruct_027e05f8::UnkStruct_027e05f8() :
|
||||
mUnk_0(0),
|
||||
mUnk_2(0),
|
||||
mUnk_4(0) {}
|
||||
|
||||
ARM void UnkStruct_027e05f8::func_02037458(u16 param1) {
|
||||
mUnk_2 = param1 & (param1 ^ mUnk_0);
|
||||
mUnk_4 = mUnk_0 & (param1 ^ mUnk_0);
|
||||
mUnk_0 = param1;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_027e05f8::func_02037480() {
|
||||
mUnk_2 = 0;
|
||||
mUnk_4 = 0;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_027e05f8::func_02037490() {
|
||||
return ((REG_027fffa8 & 0x8000) >> 15) == 1;
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ THUMB bool Game::StartGameMode() {
|
||||
data_027e077c.Init(0);
|
||||
Fill16(0, (u16 *) &data_027e0d04, 6);
|
||||
func_02033d40(&data_027e0c38);
|
||||
data_027e05f8.Init();
|
||||
data_027e05f8 = UnkStruct_027e05f8();
|
||||
if (gOverlayManager.mLoadedOverlays[0] != OverlayId_None) {
|
||||
data_ov000_020ec7dc.func_ov000_0207c0f0(mModeId);
|
||||
gTouchControl.Init();
|
||||
|
||||
@@ -10,7 +10,7 @@ extern "C" void func_ov007_021028a0(u32 **);
|
||||
|
||||
THUMB void OverlayManager::Load(OverlayIndex index, OverlayId id) {
|
||||
if (id != OverlayId_None) {
|
||||
Overlay_Load(NULL, id);
|
||||
FS_LoadOverlay(NULL, id);
|
||||
}
|
||||
|
||||
this->mLoadedOverlays[index] = id;
|
||||
@@ -27,7 +27,7 @@ THUMB void OverlayManager::LoadIfNotLoaded(OverlayIndex index, OverlayId id) {
|
||||
|
||||
THUMB void OverlayManager::Unload(OverlayIndex index) {
|
||||
if (this->mLoadedOverlays[index] != OverlayId_None) {
|
||||
Overlay_Unload(NULL, this->mLoadedOverlays[index]);
|
||||
FS_UnloadOverlay(NULL, this->mLoadedOverlays[index]);
|
||||
this->mLoadedOverlays[index] = OverlayId_None;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user