mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

En_Horse OK (#554)

Browse source 
* En_Horse OK

* Remove reloc

* WIP

* Use EnIn

* Documentation

* Documentation

* Remove debug prints

* Warnings

* Cleanup

* Unused asm

* Review comment

* Review comments and reformat

* More review comments

* Rename flags

* Review changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Synray 2021-04-11 18:23:40 -07:00 • committed by GitHub
parent d22b746128
commit 7f94088a3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
140 changed files with 3880 additions and 12777 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/code/z_actor.c
View file

@ -1020,7 +1020,7 @@ void func_8002DE74(GlobalContext* globalCtx, Player* player) {
}
}
void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* horse) {
void Actor_MountHorse(GlobalContext* globalCtx, Player* player, Actor* horse) {
player->rideActor = horse;
player->stateFlags1 |= 0x800000;
horse->child = &player->actor;
@ -1607,28 +1607,28 @@ void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) {
}
}
u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor) {
if (actor->child != NULL) {
s32 Actor_IsMounted(GlobalContext* globalCtx, Actor* horse) {
if (horse->child != NULL) {
return true;
} else {
return false;
}
}
u32 func_8002F63C(GlobalContext* globalCtx, Actor* horse, s32 arg2) {
u32 Actor_SetRideActor(GlobalContext* globalCtx, Actor* horse, s32 mountSide) {
Player* player = PLAYER;
if (!(player->stateFlags1 & 0x003C7880)) {
player->rideActor = horse;
player->unk_43C = arg2;
player->mountSide = mountSide;
return true;
}
return false;
}
u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor) {
if (actor->child == NULL) {
s32 Actor_NotMounted(GlobalContext* globalCtx, Actor* horse) {
if (horse->child == NULL) {
return true;
} else {
return false;