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

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -113,7 +113,7 @@ static DamageTable sDamageTable = {
static InitChainEntry sInitChain[] = {
ICHAIN_S8(naviEnemyId, 0x30, 1),
ICHAIN_F32(targetArrowOffset, 0x157C, 1),
ICHAIN_F32(targetArrowOffset, 5500, 1),
ICHAIN_F32_DIV1000(gravity, -1500, 0),
};
@ -425,7 +425,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
if (Animation_OnFrame(&this->skelAnime, 1.0f) != 0) {
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
func_8002F7DC(&this->actor, NA_SE_VO_LI_DAMAGE_S_KID);
} else {
func_8002F7DC(&this->actor, NA_SE_VO_LI_DAMAGE_S);
@ -443,14 +443,14 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) {
this->actor.world.pos.y = this->actor.world.pos.y + 10.0f;
}
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
player->actor.world.pos.y = this->actor.world.pos.y - 30.0f;
} else {
player->actor.world.pos.y = this->actor.world.pos.y - 50.0f;
}
if (this->timer == -0x1E) {
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY_KID);
} else {
func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY);
@ -462,7 +462,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) {
this->timer = this->timer + 2;
} else {
Math_StepToF(&this->actor.world.pos.y, player->actor.world.pos.y + (LINK_IS_CHILD ? 30.0f : 50.0f), 5.0f);
Math_StepToF(&this->actor.world.pos.y, player->actor.world.pos.y + (!LINK_IS_ADULT ? 30.0f : 50.0f), 5.0f);
}
Math_StepToF(&this->actor.world.pos.x, player->actor.world.pos.x, 3.0f);