mirror of https://github.com/zeldaret/tmc.git
change type of gUnk_02034490
This commit is contained in:
parent
8774c8939d
commit
ed943b1e53
|
|
@ -176,6 +176,6 @@ static_assert(sizeof(BG3Buffer) == 0x1000);
|
|||
*/
|
||||
|
||||
extern u8 gUnk_02022740[];
|
||||
extern u8 gUnk_02034490;
|
||||
extern u8 gUnk_02034490[];
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -832,7 +832,7 @@ void sub_0807E9F0(Entity* unk1, ScriptExecutionContext* unk2) {
|
|||
switch (gUnk_02022740[0]) {
|
||||
case 2:
|
||||
gPlayerState.field_0x8b = 3;
|
||||
gUnk_02034490 = tmp;
|
||||
gUnk_02034490[0] = tmp;
|
||||
unk2->unk_14 = tmp;
|
||||
break;
|
||||
case 1:
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
#include "screen.h"
|
||||
#include "manager.h"
|
||||
#include "functions.h"
|
||||
#include "structures.h"
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
|
|
@ -293,7 +294,6 @@ void sub_0805A758(Manager15* this) {
|
|||
}
|
||||
}
|
||||
|
||||
extern u8 gUnk_02034490;
|
||||
extern void sub_0805E4E0(Manager*, u32);
|
||||
extern void sub_08077B20(void);
|
||||
|
||||
|
|
@ -308,7 +308,7 @@ void sub_0805A76C(Manager15* this) {
|
|||
gPlayerEntity.animationState = 4;
|
||||
sub_0805E4E0(&this->manager, 0x258);
|
||||
sub_08078A90(0xFF);
|
||||
gUnk_02034490 = 1;
|
||||
gUnk_02034490[0] = 1;
|
||||
gRoomControls.cameraTarget = 0;
|
||||
sub_08077B20();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#include "global.h"
|
||||
#include "manager.h"
|
||||
#include "functions.h"
|
||||
#include "structures.h"
|
||||
#include "gba/gba.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -18,7 +19,6 @@ extern void sub_08052D74();
|
|||
extern u32 sub_08056300(const u16*);
|
||||
extern void sub_0805E3A0();
|
||||
|
||||
extern u8 gUnk_02034490;
|
||||
extern const u8 gGlobalGfxAndPalettes[];
|
||||
|
||||
const u16 gUnk_08108050[0x2A] = { 0, 0, 0x20, 0xE0, 0xE0, 1, 0, 0x1D0, 0x80, 0x60, 2,
|
||||
|
|
@ -63,7 +63,7 @@ void Manager7_Main(Manager7* this) {
|
|||
tmp2 = &gUnk_081080A4[tmp << 4];
|
||||
switch (this->manager.unk_0e) {
|
||||
case 0:
|
||||
gUnk_02034490 = 1;
|
||||
gUnk_02034490[0] = 1;
|
||||
LoadAssetAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000);
|
||||
LoadPaletteGroup(gUnk_081081E4[tmp]);
|
||||
this->manager.unk_0e++;
|
||||
|
|
@ -80,7 +80,7 @@ void Manager7_Main(Manager7* this) {
|
|||
this->manager.unk_0e++;
|
||||
break;
|
||||
case 8:
|
||||
gUnk_02034490 = 0;
|
||||
gUnk_02034490[0] = 0;
|
||||
this->manager.unk_0e++;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include "player.h"
|
||||
#include "flags.h"
|
||||
#include "functions.h"
|
||||
#include "structures.h"
|
||||
|
||||
extern void sub_0809F7BC(Entity*);
|
||||
extern void PlaySFX(u32);
|
||||
|
|
@ -22,7 +23,6 @@ extern Entity* CreateObject(u32, u32, u32);
|
|||
extern void PositionEntityOnTop(Entity*, Entity*);
|
||||
extern void sub_0807BB68(u32*, u32, u32);
|
||||
|
||||
extern u8 gUnk_02034490;
|
||||
extern void* gUnk_080DD750;
|
||||
extern Entity gPlayerEntity;
|
||||
extern PlayerState gPlayerState;
|
||||
|
|
@ -48,7 +48,7 @@ void sub_0809F514(Entity* this) {
|
|||
this->spriteSettings.b.draw = 0;
|
||||
this->field_0x68.HALF.LO = 12;
|
||||
gRoomControls.cameraTarget = this;
|
||||
gUnk_02034490 = 255;
|
||||
gUnk_02034490[0] = 255;
|
||||
sub_0809F7BC(this);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue