mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Big actor cleanup (fixed) (#69)

Browse source 
* Started doing cleanup

* did more work

* did more migration

* migrated more rodata and worked on some structs

* did more work

* Removal of ROOM field from initvars, some rodata migration, some string decompilation

* General update

* Decompiled vt strings

* Tool work

* Tool improvements

* 270 overlay rodata files remaining

* better float handling

* floats

* Many more floats

* migrated boss_mo

* assorted fixes

* Migrated 10

* tool improvements

* migrated 10

* 10 more

* 1 more

* did a few more

* fixes

* 10 more

* more floats

* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.

* removed changes made to script by accident

* migrated largest rodata - ovl_fishing

* Did some more

* 114 remaining

* 99 left !

* almost done migrating rodata

* did some more, done for tonight

* almost done, tried add support to the script for z_player

* All possible rodata migrated in actor overlays

* update

* removed static from all overlays, ran format.sh

* Removed unknown actor structs

* converted a few floats

* Added new lines to header files that were missing them. Removed unused asm files

* Removed unused asm files

* Formatting newlines

Further formatting

spacing

.float spacing

More space formatting

More spacing formatting

Removing .balign 4 after floats

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Lucas Shaw 2020-04-14 11:16:34 -07:00 • committed by GitHub
parent 5aef81071e
commit 045a92d7c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10327 changed files with 33390 additions and 45661 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -1,18 +1,18 @@
#include "z_arms_hook.h"
#define ROOM 0x00
#define FLAGS 0x00000030
void ArmsHook_Init(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Destroy(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Update(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_Draw(ArmsHook* this, GlobalContext* globalCtx);
void ArmsHook_SetupAction(ArmsHook* this, ActorFunc actionFunc);
void func_80864FC4(ArmsHook* this, GlobalContext* globalCtx);
/*
const ActorInit Arms_Hook_InitVars = {
ACTOR_ARMS_HOOK,
ACTORTYPE_ITEMACTION,
ROOM,
FLAGS,
OBJECT_LINK_BOY,
sizeof(ArmsHook),
@ -22,7 +22,7 @@ const ActorInit Arms_Hook_InitVars = {
(ActorFunc)ArmsHook_Draw,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864F00.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s")

3
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
View file

@ -6,7 +6,8 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0xCC];
/* 0x014C */ char unk_14C[0xC8];
/* 0x0214 */ ActorFunc actionFunc;
} ArmsHook; // size = 0x0218
extern const ActorInit Arms_Hook_InitVars;