mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

11
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
View file

@ -1,18 +1,23 @@
/*
* File: z_object_kankyo.c
* Overlay: ovl_Object_Kankyo
* Description: Environmental Effects
*/
#include "z_object_kankyo.h"
#define ROOM 0x00
#define FLAGS 0x02000030
void ObjectKankyo_Init(ObjectKankyo* this, GlobalContext* globalCtx);
void ObjectKankyo_Destroy(ObjectKankyo* this, GlobalContext* globalCtx);
void ObjectKankyo_Update(ObjectKankyo* this, GlobalContext* globalCtx);
void ObjectKankyo_Draw(ObjectKankyo* this, GlobalContext* globalCtx);
void ObjectKankyo_SetupAction(ObjectKankyo* this, ActorFunc actionFunc);
/*
const ActorInit Object_Kankyo_InitVars = {
ACTOR_OBJECT_KANKYO,
ACTORTYPE_ITEMACTION,
ROOM,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ObjectKankyo),
@ -22,7 +27,7 @@ const ActorInit Object_Kankyo_InitVars = {
(ActorFunc)ObjectKankyo_Draw,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2AA0.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_SetupAction.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s")

3
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
View file

@ -6,7 +6,8 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x1514];
/* 0x014C */ char unk_14C[0x1510];
/* 0x165C */ ActorFunc actionFunc;
} ObjectKankyo; // size = 0x1660
extern const ActorInit Object_Kankyo_InitVars;