mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 13:54:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Identify player functions and update asm.h

Browse Source
This commit is contained in:
theo3
2021-12-28 12:08:30 -08:00
parent 9456e38606
commit 0f65f8fd50
442 changed files with 697 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager10.c
+1 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "asm.h"
#include "manager.h"
#include "room.h"
#include "area.h"
@@ -8,7 +9,6 @@
#include "fileScreen.h"
#include "functions.h"
void Manager10_Main(Manager10*);
void sub_080595E4(Manager10*);
void sub_08059608(Manager10*);
void sub_08059690(Manager10*);
@@ -18,7 +18,6 @@ u32 sub_0805986C(void);
void sub_08059894(const u16*, const u16*, u32);
u32 sub_080598F8(u32, u32, u32);
void sub_08059960(const u16*, const u16*, u16*, u8);
void sub_08059994(void);
const u8 gUnk_08108390[6] = {
0x0F, 0x1E, 0x2D, 0x3C, 0x01, 0x01,
src/manager/manager11.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "manager.h"
#include "flags.h"
src/manager/manager12.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "area.h"
#include "asm.h"
#include "manager.h"
#include "room.h"
#include "functions.h"
@@ -87,7 +88,7 @@ void sub_08059A58(Manager12* this) {
}
}
#define COMMON(tmp2, tmp1) ((tmp2) >> 4 & 0x3f) | (((tmp1) + 0x188U) >> 4 & 0x3f) << 6
#define COMMON(tmp2, tmp1) (((tmp2) >> 4 & 0x3f) | (((tmp1) + 0x188U) >> 4 & 0x3f) << 6)
void sub_08059B18(void) {
u32 loopVar;
u32 innerLoopVar;
src/manager/manager14.c
-2
View File
@@ -5,7 +5,6 @@
#include "flags.h"
#include "coord.h"
#include "main.h"
#include "functions.h"
typedef struct {
Manager manager;
@@ -23,7 +22,6 @@ const u16 gUnk_0810859A[] = { 0x808, 0x907, 0xA06, 0x907 };
extern void sub_0805622C(u16*, u32, u32);
extern u16 gUnk_02017AA0[];
void Manager14_Main(Manager14*);
void sub_08059E80(Manager14*);
void sub_08059EF8(Manager14*);
u32 sub_08059F9C(Manager14*);
src/manager/manager19.c
-1
View File
@@ -1,7 +1,6 @@
#include "manager.h"
#include "area.h"
#include "room.h"
#include "functions.h"
#include "screen.h"
void sub_0805AFFC(Manager*);
src/manager/manager1A.c
-1
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "manager.h"
#include "flags.h"
#include "entity.h"
#include "room.h"
#include "screen.h"
#include "utils.h"
src/manager/manager1E.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "asm.h"
#include "manager.h"
#include "flags.h"
#include "functions.h"
typedef struct {
Manager manager;
src/manager/manager2.c
-2
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "entity.h"
#include "screen.h"
#include "functions.h"
#include "room.h"
typedef struct {
Manager manager;
src/manager/manager20.c
-2
View File
@@ -1,9 +1,7 @@
#include "global.h"
#include "manager.h"
#include "flags.h"
#include "entity.h"
#include "room.h"
#include "functions.h"
typedef struct {
Manager manager;
src/manager/manager21.c
+1 -2
View File
@@ -3,7 +3,6 @@
#include "room.h"
#include "object.h"
#include "functions.h"
#include "flags.h"
extern bool32 CheckRectOnScreen(u16, u16, u32, u32);
@@ -44,7 +43,7 @@ void Manager21_Main(Manager21* this) {
object->x.HALF.HI = gRoomControls.roomOriginX + spawnData->x;
object->y.HALF.HI = gRoomControls.roomOriginY + spawnData->y;
object->parent = (Entity*)this;
sub_08016A30(object);
ResolveCollisionLayer(object);
this->field_0x20 |= 1 << count;
}
}
src/manager/manager24.c
-2
View File
@@ -4,7 +4,6 @@
#include "audio.h"
#include "overworld.h"
#include "object.h"
#include "area.h"
extern void (*const gUnk_08108CDC[])(Manager24*);
@@ -16,7 +15,6 @@ extern u32 sub_080002C8(u16, u8);
extern void (*const gUnk_08108CE8[])(u32, u32);
u32 sub_0805C608(void);
extern u32 CheckIsInteriorWithEnemies(void);
extern u8 gUnk_08108CFC[];
src/manager/manager25.c
+1
View File
@@ -1,3 +1,4 @@
#include "asm.h"
#include "manager.h"
#include "room.h"
#include "functions.h"
src/manager/manager26.c
-2
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "manager.h"
#include "entity.h"
#include "flags.h"
#include "room.h"
#include "object.h"
#include "functions.h"
typedef struct {
Manager manager;
src/manager/manager28.c
-2
View File
@@ -1,9 +1,7 @@
#include "global.h"
#include "asm.h"
#include "manager.h"
#include "entity.h"
#include "room.h"
#include "functions.h"
typedef struct {
Manager manager;
src/manager/manager2A.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "asm.h"
#include "manager.h"
#include "room.h"
#include "flags.h"
#include "functions.h"
typedef struct {
u8 field_0x0;
src/manager/manager2B.c
+1 -4
View File
@@ -3,7 +3,6 @@
#include "room.h"
#include "functions.h"
#include "object.h"
#include "audio.h"
typedef struct {
Manager manager;
@@ -27,8 +26,6 @@ typedef struct {
extern void (*const gUnk_08108D30[])(Manager2B*);
extern u8 gEntCount;
void sub_0805D11C(Manager2B*);
void Manager2B_Main(Manager2B* this) {
@@ -50,7 +47,7 @@ void sub_0805D02C(Manager2B* this) {
object->x.HALF.HI = objectData[0] + gRoomControls.roomOriginX;
object->y.HALF.HI = objectData[1] + gRoomControls.roomOriginY;
object->parent = (Entity*)this;
sub_08016A30(object);
ResolveCollisionLayer(object);
this->field_0x20[counter] = object;
counter += 1;
objectData += 3;
src/manager/manager2C.c
+1
View File
@@ -1,4 +1,5 @@
#include "manager.h"
#include "asm.h"
#include "functions.h"
#include "utils.h"
src/manager/manager2D.c
+1
View File
@@ -1,3 +1,4 @@
#include "asm.h"
#include "entity.h"
#include "functions.h"
src/manager/manager3.c
-1
View File
@@ -7,7 +7,6 @@
#include "player.h"
#include "audio.h"
#include "object.h"
#include "functions.h"
// Facilitates the usage of minish portals.
src/manager/manager30.c
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "asm.h"
#include "audio.h"
#include "manager.h"
#include "flags.h"
src/manager/manager31.c
-1
View File
@@ -3,7 +3,6 @@
#include "flags.h"
#include "asm.h"
#include "object.h"
#include "room.h"
typedef struct {
Manager manager;
src/manager/manager32.c
-1
View File
@@ -1,6 +1,5 @@
#include "manager.h"
#include "screen.h"
#include "structures.h"
#include "room.h"
#include "functions.h"
#include "area.h"
src/manager/manager35.c
+2 -4
View File
@@ -17,8 +17,6 @@ typedef struct {
extern void (*const gUnk_08108D98[])(Manager35*);
extern void RequestPriorityDuration(Entity*, u32);
void Manager35_Main(Manager35* this) {
gUnk_08108D98[this->manager.action](this);
}
@@ -57,7 +55,7 @@ void sub_0805DCC8(Manager35* this) {
void sub_0805DD24(Manager35* this) {
RequestPriorityDuration(0, 8);
if ((gRoomControls.unk6 & 4) == 0 && --this->manager.unk_0e == 0) {
if ((gRoomControls.scroll_flags & 4) == 0 && --this->manager.unk_0e == 0) {
this->manager.action = 3;
SetFlag(this->field_0x3c);
if (this->field_0x36 == 0) {
@@ -73,7 +71,7 @@ void sub_0805DD68(Manager35* this) {
gRoomControls.cameraTarget = (Entity*)this->manager.parent;
}
} else {
if ((gRoomControls.unk6 & 4) == 0) {
if ((gRoomControls.scroll_flags & 4) == 0) {
Entity* entity = *(Entity**)this->manager.unk_18;
if (entity != NULL) {
DeleteEntity(entity);
src/manager/manager36.c
-1
View File
@@ -1,7 +1,6 @@
#include "manager.h"
#include "audio.h"
#include "script.h"
#include "functions.h"
typedef struct {
u16 waitTime;
src/manager/manager39.c
-1
View File
@@ -28,7 +28,6 @@ extern const u8 gUnk_08108E48[0x18];
extern const u8 gUnk_08108E60[];
extern void sub_0805F46C(void*, const void*);
extern void ResetSystemPriority(void);
void sub_0805E140(Manager39*);
void sub_0805E18C(Manager39*); // unused?
src/manager/manager4.c
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "asm.h"
#include "player.h"
#include "room.h"
#include "manager.h"
src/manager/manager6.c
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "asm.h"
#include "player.h"
#include "manager.h"
#include "functions.h"
src/manager/manager7.c
+1 -3
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "manager.h"
#include "asm.h"
#include "functions.h"
#include "structures.h"
#include "gba/gba.h"
typedef struct {
Manager manager;
src/manager/manager8.c
-2
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "manager.h"
#include "screen.h"
#include "functions.h"
#include "gba/gba.h"
typedef struct {
Manager manager;
src/manager/managerA.c
+1 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "asm.h"
#include "entity.h"
#include "player.h"
#include "manager.h"
@@ -15,8 +16,6 @@ static void sub_080585B0(ManagerA*);
static u32 PlayerStateValid(ManagerA*);
static void sub_080585DC(ManagerA*);
extern void sub_0801855C(void);
/**
* Ezlo hint manager
*/
src/manager/managerB.c
-5
View File
@@ -1,12 +1,10 @@
#include "global.h"
#include "manager.h"
#include "flags.h"
#include "entity.h"
#include "room.h"
#include "area.h"
#include "utils.h"
#include "audio.h"
#include "functions.h"
/*
* Manager B is used to create fights:
@@ -47,7 +45,6 @@ void ManagerB_Init(ManagerB* this) {
DeleteThisEntity();
}
}
extern void sub_080186C0(u32);
void ManagerB_WaitForFlag(ManagerB* this) {
int tmp;
@@ -63,8 +60,6 @@ void ManagerB_WaitForFlag(ManagerB* this) {
}
}
extern void sub_0801855C(void);
void ManagerB_WaitForDone(ManagerB* this) {
// check if all helpers are done
if (this->manager.unk_0e)
src/manager/managerE.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "entity.h"
#include "manager.h"
#include "flags.h"
src/manager/managerF.c
-3
View File
@@ -7,14 +7,11 @@
#include "functions.h"
#include "area.h"
#include "textbox.h"
#include "script.h"
#include "utils.h"
#include "tiles.h"
#include "object.h"
#include "item.h"
void sub_08058ECC(ManagerF*);
void sub_08058EE4(ManagerF*);
void sub_08058FB0(ManagerF*);
void sub_08059094(ManagerF*);