Skip to content

Commit a6c8ca5

Browse files
Yanis002Yanis002
committed
data_02049a2c -> gGame, UnkStruct_02049a2c -> Game
1 parent fc8834a commit a6c8ca5

File tree

15 files changed

+49
-49
lines changed

15 files changed

+49
-49
lines changed

‎config/eur/arm9/overlays/ov000/symbols.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func_ov000_02057608 kind:function(arm,size=0x8) addr:0x02057608
5959
func_ov000_02057610 kind:function(arm,size=0x30) addr:0x02057610
6060
func_ov000_02057640 kind:function(arm,size=0x48) addr:0x02057640
6161
func_ov000_02057688 kind:function(arm,size=0x48) addr:0x02057688
62-
_ZN18UnkStruct_02049a2c19func_ov000_020576d0Ev kind:function(arm,size=0x3c) addr:0x020576d0
63-
_ZN18UnkStruct_02049a2c19func_ov000_0205770cEv kind:function(arm,size=0x14) addr:0x0205770c
62+
_ZN4Game19func_ov000_020576d0Ev kind:function(arm,size=0x3c) addr:0x020576d0
63+
_ZN4Game19func_ov000_0205770cEv kind:function(arm,size=0x14) addr:0x0205770c
6464
func_ov000_02057720 kind:function(arm,size=0x14) addr:0x02057720
6565
func_ov000_02057734 kind:function(arm,size=0x1c) addr:0x02057734
6666
func_ov000_02057750 kind:function(thumb,size=0xc) addr:0x02057750

‎config/eur/arm9/overlays/ov018/symbols.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_ZN8SysFault19func_ov018_020c4840Ev kind:function(arm,size=0x30) addr:0x020c4840
2-
_ZN18UnkStruct_02049a2cC1Ev kind:function(arm,size=0x34) addr:0x020c4870
3-
_ZN18UnkStruct_02049a2c19func_ov018_020c48a4Ei kind:function(arm,size=0x54) addr:0x020c48a4
4-
_ZN18UnkStruct_02049a2c19func_ov018_020c48f8Ev kind:function(arm,size=0x58) addr:0x020c48f8
2+
_ZN4GameC1Ev kind:function(arm,size=0x34) addr:0x020c4870
3+
_ZN4Game19func_ov018_020c48a4Ei kind:function(arm,size=0x54) addr:0x020c48a4
4+
_ZN4Game19func_ov018_020c48f8Ev kind:function(arm,size=0x58) addr:0x020c48f8
55
_ZN18UnkStruct_02049b18C1Ev kind:function(arm,size=0x30) addr:0x020c4950
66
_ZN18UnkStruct_02011e1019func_ov018_020c4980Ev kind:function(arm,size=0xdc) addr:0x020c4980
77
_ZN18UnkStruct_02011e1019func_ov018_020c4a5cEv kind:function(arm,size=0x6c) addr:0x020c4a5c
@@ -10,7 +10,7 @@ _ZN18UnkStruct_02049b80C1Ev kind:function(arm,size=0x2c) addr:0x020c4adc
1010
_ZN21UnkStruct_02049b18_06C1Ev kind:function(arm,size=0x50) addr:0x020c4b08
1111
_ZN21UnkStruct_0204e64c_00C1Ev kind:function(arm,size=0x2c) addr:0x020c4b58
1212
_ZN18UnkStruct_0204e64cC1Ev kind:function(arm,size=0x24) addr:0x020c4b84
13-
_ZN18UnkStruct_02049a2c19func_ov018_020c4ba8Ev kind:function(arm,size=0x54) addr:0x020c4ba8
13+
_ZN4Game19func_ov018_020c4ba8Ev kind:function(arm,size=0x54) addr:0x020c4ba8
1414
_ZN15GameModeStartUpD1Ev kind:function(arm,size=0x20) addr:0x020c4bfc
1515
_ZN15GameModeStartUpC1Ev kind:function(arm,size=0x180) addr:0x020c4c1c
1616
_ZN15GameModeStartUp8vfunc_0CEv kind:function(arm,size=0xcc) addr:0x020c4d9c

‎config/eur/arm9/symbols.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,9 @@ func_0201328c kind:function(arm,size=0x3c) addr:0x0201328c
651651
func_020132c8 kind:function(arm,size=0x14) addr:0x020132c8
652652
func_020132dc kind:function(arm,size=0x78) addr:0x020132dc
653653
func_02013354 kind:function(arm,size=0x1c) addr:0x02013354
654-
_ZN18UnkStruct_02049a2c13func_02013370Ei kind:function(arm,size=0x24) addr:0x02013370
655-
_ZN18UnkStruct_02049a2c3RunEi kind:function(arm,size=0x390) addr:0x02013394
656-
_ZN18UnkStruct_02049a2c20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) addr:0x02013724
654+
_ZN4Game13func_02013370Ei kind:function(arm,size=0x24) addr:0x02013370
655+
_ZN4Game3RunEi kind:function(arm,size=0x390) addr:0x02013394
656+
_ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) addr:0x02013724
657657
func_0201373c kind:function(arm,size=0x18) addr:0x0201373c
658658
func_02013754 kind:function(arm,size=0x14) addr:0x02013754
659659
_ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x02013768
@@ -2727,7 +2727,7 @@ data_020499c8 kind:bss addr:0x020499c8
27272727
data_020499e0 kind:bss addr:0x020499e0
27282728
data_02049a1c kind:bss addr:0x02049a1c
27292729
data_02049a20 kind:bss addr:0x02049a20
2730-
data_02049a2c kind:bss addr:0x02049a2c
2730+
gGame kind:bss addr:0x02049a2c
27312731
data_02049b14 kind:bss addr:0x02049b14
27322732
data_02049b18 kind:bss addr:0x02049b18
27332733
data_02049b2a kind:bss addr:0x02049b2a

‎config/jp/arm9/overlays/ov000/symbols.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func_ov000_02058b88 kind:function(arm,size=0x8) addr:0x02058b88
5959
func_ov000_02058b90 kind:function(arm,size=0x30) addr:0x02058b90
6060
func_ov000_02058bc0 kind:function(arm,size=0x48) addr:0x02058bc0
6161
func_ov000_02058c08 kind:function(arm,size=0x48) addr:0x02058c08
62-
_ZN18UnkStruct_02049a2c19func_ov000_020576d0Ev kind:function(arm,size=0x3c) addr:0x02058c50
63-
_ZN18UnkStruct_02049a2c19func_ov000_0205770cEv kind:function(arm,size=0x14) addr:0x02058c8c
62+
_ZN4Game19func_ov000_020576d0Ev kind:function(arm,size=0x3c) addr:0x02058c50
63+
_ZN4Game19func_ov000_0205770cEv kind:function(arm,size=0x14) addr:0x02058c8c
6464
func_ov000_02058ca0 kind:function(arm,size=0x14) addr:0x02058ca0
6565
func_ov000_02058cb4 kind:function(arm,size=0x1c) addr:0x02058cb4
6666
func_ov000_02058cd0 kind:function(thumb,size=0xc) addr:0x02058cd0

‎config/jp/arm9/overlays/ov018/symbols.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_ZN8SysFault19func_ov018_020c4840Ev kind:function(arm,size=0x30) addr:0x020c6060
2-
_ZN18UnkStruct_02049a2cC1Ev kind:function(arm,size=0x34) addr:0x020c6090
3-
_ZN18UnkStruct_02049a2c19func_ov018_020c48a4Ei kind:function(arm,size=0x54) addr:0x020c60c4
4-
_ZN18UnkStruct_02049a2c19func_ov018_020c48f8Ev kind:function(arm,size=0x58) addr:0x020c6118
2+
_ZN4GameC1Ev kind:function(arm,size=0x34) addr:0x020c6090
3+
_ZN4Game19func_ov018_020c48a4Ei kind:function(arm,size=0x54) addr:0x020c60c4
4+
_ZN4Game19func_ov018_020c48f8Ev kind:function(arm,size=0x58) addr:0x020c6118
55
_ZN18UnkStruct_02049b18C1Ev kind:function(arm,size=0x30) addr:0x020c6170
66
_ZN18UnkStruct_02011e1019func_ov018_020c4980Ev kind:function(arm,size=0xdc) addr:0x020c61a0
77
_ZN18UnkStruct_02011e1019func_ov018_020c4a5cEv kind:function(arm,size=0x6c) addr:0x020c627c
@@ -10,7 +10,7 @@ _ZN18UnkStruct_02049b80C1Ev kind:function(arm,size=0x2c) addr:0x020c62fc
1010
_ZN21UnkStruct_02049b18_06C1Ev kind:function(arm,size=0x50) addr:0x020c6328
1111
_ZN21UnkStruct_0204e64c_00C1Ev kind:function(arm,size=0x2c) addr:0x020c6378
1212
_ZN18UnkStruct_0204e64cC1Ev kind:function(arm,size=0x24) addr:0x020c63a4
13-
_ZN18UnkStruct_02049a2c19func_ov018_020c4ba8Ev kind:function(arm,size=0x54) addr:0x020c63c8
13+
_ZN4Game19func_ov018_020c4ba8Ev kind:function(arm,size=0x54) addr:0x020c63c8
1414
_ZN15GameModeStartUpD1Ev kind:function(arm,size=0x20) addr:0x020c641c
1515
_ZN15GameModeStartUpC1Ev kind:function(arm,size=0x180) addr:0x020c643c
1616
_ZN15GameModeStartUp8vfunc_0CEv kind:function(arm,size=0xcc) addr:0x020c65bc

‎config/jp/arm9/symbols.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,9 @@ func_0201328c kind:function(arm,size=0x3c) addr:0x0201328c
651651
func_020132c8 kind:function(arm,size=0x14) addr:0x020132c8
652652
func_020132dc kind:function(arm,size=0x78) addr:0x020132dc
653653
func_02013354 kind:function(arm,size=0x1c) addr:0x02013354
654-
_ZN18UnkStruct_02049a2c13func_02013370Ei kind:function(arm,size=0x24) addr:0x02013370
655-
_ZN18UnkStruct_02049a2c3RunEi kind:function(arm,size=0x394) addr:0x02013394
656-
_ZN18UnkStruct_02049a2c20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) addr:0x02013728
654+
_ZN4Game13func_02013370Ei kind:function(arm,size=0x24) addr:0x02013370
655+
_ZN4Game3RunEi kind:function(arm,size=0x394) addr:0x02013394
656+
_ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) addr:0x02013728
657657
func_02013740 kind:function(arm,size=0x18) addr:0x02013740
658658
func_02013758 kind:function(arm,size=0x14) addr:0x02013758
659659
_ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x0201376c
@@ -2750,7 +2750,7 @@ data_0204af48 kind:bss addr:0x0204af48
27502750
data_0204af60 kind:bss addr:0x0204af60
27512751
data_0204af9c kind:bss addr:0x0204af9c
27522752
data_0204afa0 kind:bss addr:0x0204afa0
2753-
data_02049a2c kind:bss addr:0x0204afac
2753+
gGame kind:bss addr:0x0204afac
27542754
data_0204b094 kind:bss addr:0x0204b094
27552755
data_02049b18 kind:bss addr:0x0204b098
27562756
data_0204b0aa kind:bss addr:0x0204b0aa

include/Unknown/UnkStruct_02049a2c.hpp renamed to include/Game/Game.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class UnkStruct_02049a2c_1C {
2727
/* 08 */ virtual void vfunc_08();
2828
};
2929

30-
class UnkStruct_02049a2c {
30+
class Game {
3131
public:
3232
/* 00 */ GameModeBase *mpCurrentGameMode;
3333
/* 04 */ GameModeCreateCallback createCallback;
@@ -39,7 +39,7 @@ class UnkStruct_02049a2c {
3939
/* 1C */ UnkStruct_02049a2c_1C mUnk_1C;
4040
/* E8 */
4141

42-
UnkStruct_02049a2c();
42+
Game();
4343

4444
void main(unk32 param1); // really here? got 2 params for sure
4545
void Run(unk32 param1);
@@ -59,4 +59,4 @@ class UnkStruct_02049a2c {
5959
static GameModeStartUp *func_ov018_020c4ba8();
6060
};
6161

62-
extern UnkStruct_02049a2c data_02049a2c;
62+
extern Game gGame;

‎include/Game/GameModeFileSelect.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

33
#include "FileSelect/FileSelect.hpp"
4+
#include "Game/Game.hpp"
45
#include "Game/GameModeManager.hpp"
5-
#include "Unknown/UnkStruct_02049a2c.hpp"
66
#include "Unknown/UnkStruct_02049bd4.hpp"
77
#include "Unknown/UnkStruct_0204a110.hpp"
88

@@ -18,7 +18,7 @@ class GameModeFileSelect : public GameModeBase {
1818
this->mSaveSlotIndex = 0;
1919
data_02049bd4.func_02014cdc(2);
2020
data_02049bd4.mUnk_02 &= 0xFFFB;
21-
data_02049a2c.func_02013370(1);
21+
gGame.func_02013370(1);
2222
data_0204999c.mUnk_60 = 0xD6D8;
2323
data_ov000_020b504c.func_ov001_020be668();
2424
data_0204a110.func_ov001_020bd514(2, FileSelectManager::Create, 0, 1);

‎src/018_StartUp/GameModeStartUp.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "Game/GameModeStartUp.hpp"
2+
#include "Game/Game.hpp"
23
#include "System/OverlayManager.hpp"
34
#include "System/SysFault.hpp"
45
#include "System/SysNew.hpp"
5-
#include "Unknown/UnkStruct_02049a2c.hpp"
66
#include "Unknown/UnkStruct_02049b80.hpp"
77
#include "Unknown/UnkStruct_0204a110.hpp"
88
#include "Unknown/UnkStruct_0204e5f8.hpp"
@@ -50,24 +50,24 @@ ARM void SysFault::func_ov018_020c4840() {
5050
this->mUnk_04 = 0;
5151
}
5252

53-
ARM UnkStruct_02049a2c::UnkStruct_02049a2c() :
53+
ARM Game::Game() :
5454
mpCurrentGameMode(NULL),
5555
createCallback(NULL),
5656
mUnk_08(NULL),
5757
mpSaveFile(NULL),
5858
mUnk_14(NULL),
5959
mUnk_18(NULL) {}
6060

61-
ARM void UnkStruct_02049a2c::func_ov018_020c48a4(unk32 param1) {
61+
ARM void Game::func_ov018_020c48a4(unk32 param1) {
6262
func_020261f0(1, func_02013184);
6363
func_020263bc(1);
6464
func_020234d4(1);
6565
func_02026ef0(&this->mUnk_1C.mUnk_04);
6666
func_02031e48(func_020131b0);
67-
this->TrySetCreateCallback((GameModeCreateCallback) UnkStruct_02049a2c::func_ov018_020c4ba8);
67+
this->TrySetCreateCallback((GameModeCreateCallback) Game::func_ov018_020c4ba8);
6868
}
6969

70-
ARM void UnkStruct_02049a2c::func_ov018_020c48f8() {
70+
ARM void Game::func_ov018_020c48f8() {
7171
if (gOverlayManager.mLoadedOverlays[OverlaySlot_Second] != OverlayIndex_Second) {
7272
data_02049ba0.LoadIfNotLoaded(OverlaySlot_Second, OverlayIndex_Second);
7373
data_0204999c.func_ov018_020c4a5c();
@@ -169,7 +169,7 @@ ARM UnkStruct_0204e64c::UnkStruct_0204e64c() {
169169
this->mUnk_16 = 0;
170170
}
171171

172-
ARM GameModeStartUp *UnkStruct_02049a2c::func_ov018_020c4ba8() {
172+
ARM GameModeStartUp *Game::func_ov018_020c4ba8() {
173173
static GameModeStartUp data_ov018_020c5bd4;
174174
return &data_ov018_020c5bd4;
175175
}
@@ -202,7 +202,7 @@ ARM void GameModeStartUp::vfunc_0C() {
202202
if (this->mUnk_04.mUnk_0D == this->mUnk_04.mUnk_10) {
203203
if (this->mUnk_28 == 0) {
204204
this->mUnk_2C = SHARED_WORK_C3C;
205-
data_02049a2c.func_ov018_020c48f8();
205+
gGame.func_ov018_020c48f8();
206206
} else if (!this->mUnk_2A && (SHARED_WORK_C3C - this->mUnk_2C) >= 0x3C) {
207207
this->mUnk_2A = data_0204a060.func_020183d4(false, (GameModeCreateCallback) UnkStruct_0204a060::func_020183b8, 1);
208208

‎src/019_MainSelect/FileSelectMain.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "FileSelect/FileSelect.hpp"
2+
#include "Game/Game.hpp"
23
#include "Game/GameModeFileSelect.hpp"
34
#include "Save/SaveManager.hpp"
4-
#include "Unknown/UnkStruct_02049a2c.hpp"
55
#include "Unknown/UnkStruct_0204a088.hpp"
66
#include "Unknown/UnkStruct_0204a110.hpp"
77
#include "Unknown/UnkStruct_0204af1c.hpp"
@@ -1131,7 +1131,7 @@ ARM void FileSelectMain::vfunc_08(Input *pButtons, TouchControl *pTouchControl)
11311131
}
11321132

11331133
ARM void FileSelectMain::func_ov019_020c8290() {
1134-
if ((data_02049a2c.GetGameModeFileSelect()->mUnk_04.mUnk_08 & 0xFFFF) == 0xFFFF) {
1134+
if ((gGame.GetGameModeFileSelect()->mUnk_04.mUnk_08 & 0xFFFF) == 0xFFFF) {
11351135
this->SetState(FileSelectState_Init);
11361136
}
11371137
}
@@ -1342,7 +1342,7 @@ ARM void FileSelectMain::func_ov019_020c9c70() {
13421342
break;
13431343
case BTN_ID_FILE_SELECT_CONTACT_MODE:
13441344
this->SetState(FileSelectState_ChooseModeToContactMode);
1345-
data_02049a2c.GetGameModeFileSelect()->LoadContactMode(this->mSaveSlotIndex);
1345+
gGame.GetGameModeFileSelect()->LoadContactMode(this->mSaveSlotIndex);
13461346
data_ov000_020b5214.func_ov000_0206db44(0x1C);
13471347
break;
13481348
case BTN_ID_FILE_SELECT_OPTIONS:
@@ -1405,10 +1405,10 @@ ARM void FileSelectMain::func_ov019_020c9e08() {
14051405
this->mUnk_155C.func_ov000_020609c4();
14061406

14071407
if (this->mExitMode == FileSelectExitMode_AdventureMode && this->mUnk_00BC.mUnk_0C) {
1408-
data_02049a2c.GetGameModeFileSelect()->LoadAdventureMode(this->mSaveSlotIndex);
1408+
gGame.GetGameModeFileSelect()->LoadAdventureMode(this->mSaveSlotIndex);
14091409
this->mExitMode = FileSelectExitMode_Unk_3;
14101410
} else if (this->mExitMode == FileSelectExitMode_BattleMode && this->mUnk_00BC.mUnk_0C) {
1411-
data_02049a2c.GetGameModeFileSelect()->LoadBattleMode(this->mSaveSlotIndex);
1411+
gGame.GetGameModeFileSelect()->LoadBattleMode(this->mSaveSlotIndex);
14121412
this->mExitMode = FileSelectExitMode_Unk_3;
14131413
}
14141414
}

0 commit comments

Comments
 (0)