Skip to content

Commit

Permalink
Merge branch 'master' into itlinkarrow
Browse files Browse the repository at this point in the history
  • Loading branch information
@thefoxcam
thefoxcam committed Jul 19, 2024
2 parents 76af945 + c7f52f4 commit 80d49c0
Show file tree
Hide file tree
Showing 34 changed files with 888 additions and 3,515 deletions.
848 changes: 0 additions & 848 deletions asm/melee/ft/chara/ftCaptain/ftCa_SpecialHi.s
View file

This file was deleted.

393 changes: 0 additions & 393 deletions asm/melee/ft/chara/ftCommon/ftCo_0C35.s
View file

This file was deleted.

498 changes: 0 additions & 498 deletions asm/melee/ft/chara/ftCommon/ftCo_PassiveWall.s
View file

This file was deleted.

1,551 changes: 0 additions & 1,551 deletions asm/melee/it/items/itheiho.s
View file

This file was deleted.

68 changes: 34 additions & 34 deletions config/GALE01/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14273,20 +14273,20 @@ it_8028F9D8 = .text:0x8028F9D8; // type:function size:0x11C scope:global
it_8028FAF4 = .text:0x8028FAF4; // type:function size:0xF0 scope:global
it_8028FBE4 = .text:0x8028FBE4; // type:function size:0x78 scope:global
it_8028FC5C = .text:0x8028FC5C; // type:function size:0x28 scope:global
it_8028FC84 = .text:0x8028FC84; // type:function size:0x8 scope:global
it_8028FC8C = .text:0x8028FC8C; // type:function size:0x30 scope:global
it_8028FCBC = .text:0x8028FCBC; // type:function size:0x2C scope:global
it_8028FCE8 = .text:0x8028FCE8; // type:function size:0x5C scope:global
it_8028FD44 = .text:0x8028FD44; // type:function size:0x8 scope:global
it_8028FD4C = .text:0x8028FD4C; // type:function size:0x4 scope:global
it_8028FD50 = .text:0x8028FD50; // type:function size:0x2C scope:global
it_8028FC84 = .text:0x8028FC84; // type:function size:0x8 scope:local
it_8028FC8C = .text:0x8028FC8C; // type:function size:0x30 scope:local
it_8028FCBC = .text:0x8028FCBC; // type:function size:0x2C scope:local
it_8028FCE8 = .text:0x8028FCE8; // type:function size:0x5C scope:local
it_8028FD44 = .text:0x8028FD44; // type:function size:0x8 scope:local
it_8028FD4C = .text:0x8028FD4C; // type:function size:0x4 scope:local
it_8028FD50 = .text:0x8028FD50; // type:function size:0x2C scope:local
it_8028FD7C = .text:0x8028FD7C; // type:function size:0x5C scope:global
it_8028FDD8 = .text:0x8028FDD8; // type:function size:0x8 scope:global
it_8028FDE0 = .text:0x8028FDE0; // type:function size:0x4 scope:global
it_8028FDD8 = .text:0x8028FDD8; // type:function size:0x8 scope:local
it_8028FDE0 = .text:0x8028FDE0; // type:function size:0x4 scope:local
it_8028FDE4 = .text:0x8028FDE4; // type:function size:0x28 scope:global
it_8028FE0C = .text:0x8028FE0C; // type:function size:0x8 scope:global
it_8028FE14 = .text:0x8028FE14; // type:function size:0x30 scope:global
it_8028FE44 = .text:0x8028FE44; // type:function size:0x2C scope:global
it_8028FE0C = .text:0x8028FE0C; // type:function size:0x8 scope:local
it_8028FE14 = .text:0x8028FE14; // type:function size:0x30 scope:local
it_8028FE44 = .text:0x8028FE44; // type:function size:0x2C scope:local
it_8028FE70 = .text:0x8028FE70; // type:function size:0x20 scope:global
it_8028FE90 = .text:0x8028FE90; // type:function size:0x44 scope:global
it_8028FED4 = .text:0x8028FED4; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -16593,29 +16593,29 @@ it_802D85EC = .text:0x802D85EC; // type:function size:0x8 scope:global
it_802D85F4 = .text:0x802D85F4; // type:function size:0x24 scope:global
it_802D8618 = .text:0x802D8618; // type:function size:0x70 scope:global
it_802D8688 = .text:0x802D8688; // type:function size:0x20C scope:global
it_802D8894 = .text:0x802D8894; // type:function size:0x38 scope:global
it_802D88CC = .text:0x802D88CC; // type:function size:0x8 scope:global
it_802D88D4 = .text:0x802D88D4; // type:function size:0x3C scope:global
it_802D8910 = .text:0x802D8910; // type:function size:0x8 scope:global
it_802D8918 = .text:0x802D8918; // type:function size:0x6C scope:global
it_802D8984 = .text:0x802D8984; // type:function size:0xD0 scope:global
it_802D8A54 = .text:0x802D8A54; // type:function size:0x274 scope:global
it_802D8CC8 = .text:0x802D8CC8; // type:function size:0xEC scope:global
it_802D8DB4 = .text:0x802D8DB4; // type:function size:0x8 scope:global
it_802D8DBC = .text:0x802D8DBC; // type:function size:0x88 scope:global
it_802D8E44 = .text:0x802D8E44; // type:function size:0x8 scope:global
it_802D8E4C = .text:0x802D8E4C; // type:function size:0x8 scope:global
it_802D8E54 = .text:0x802D8E54; // type:function size:0x50 scope:global
it_802D8EA4 = .text:0x802D8EA4; // type:function size:0x24 scope:global
it_802D8894 = .text:0x802D8894; // type:function size:0x38 scope:local
it_802D88CC = .text:0x802D88CC; // type:function size:0x8 scope:local
it_802D88D4 = .text:0x802D88D4; // type:function size:0x3C scope:local
it_802D8910 = .text:0x802D8910; // type:function size:0x8 scope:local
it_802D8918 = .text:0x802D8918; // type:function size:0x6C scope:local
it_802D8984 = .text:0x802D8984; // type:function size:0xD0 scope:local
it_802D8A54 = .text:0x802D8A54; // type:function size:0x274 scope:local
it_802D8CC8 = .text:0x802D8CC8; // type:function size:0xEC scope:local
it_802D8DB4 = .text:0x802D8DB4; // type:function size:0x8 scope:local
it_802D8DBC = .text:0x802D8DBC; // type:function size:0x88 scope:local
it_802D8E44 = .text:0x802D8E44; // type:function size:0x8 scope:local
it_802D8E4C = .text:0x802D8E4C; // type:function size:0x8 scope:local
it_802D8E54 = .text:0x802D8E54; // type:function size:0x50 scope:local
it_802D8EA4 = .text:0x802D8EA4; // type:function size:0x24 scope:local
it_802D8EC8 = .text:0x802D8EC8; // type:function size:0x2A0 scope:global
it_802D9168 = .text:0x802D9168; // type:function size:0x10C scope:global
it_802D9274 = .text:0x802D9274; // type:function size:0x110 scope:global
it_802D9384 = .text:0x802D9384; // type:function size:0x270 scope:global
it_802D95F4 = .text:0x802D95F4; // type:function size:0xBC scope:global
it_802D96B0 = .text:0x802D96B0; // type:function size:0x64 scope:global
it_802D9714 = .text:0x802D9714; // type:function size:0x198 scope:global
it_802D98AC = .text:0x802D98AC; // type:function size:0x18 scope:global
it_802D98C4 = .text:0x802D98C4; // type:function size:0x148 scope:global
it_802D9168 = .text:0x802D9168; // type:function size:0x10C scope:local
it_802D9274 = .text:0x802D9274; // type:function size:0x110 scope:local
it_802D9384 = .text:0x802D9384; // type:function size:0x270 scope:local
it_802D95F4 = .text:0x802D95F4; // type:function size:0xBC scope:local
it_802D96B0 = .text:0x802D96B0; // type:function size:0x64 scope:local
it_802D9714 = .text:0x802D9714; // type:function size:0x198 scope:local
it_802D98AC = .text:0x802D98AC; // type:function size:0x18 scope:local
it_802D98C4 = .text:0x802D98C4; // type:function size:0x148 scope:local
it_802D9A0C = .text:0x802D9A0C; // type:function size:0x20 scope:global
it_802D9A2C = .text:0x802D9A2C; // type:function size:0x14C scope:global
it_802D9B78 = .text:0x802D9B78; // type:function size:0x30 scope:global
Expand Down
8 changes: 4 additions & 4 deletions configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,11 +510,11 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
Object(NonMatching, "melee/ft/ftdevice.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_Bury.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_FlyReflect.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_PassiveWall.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_PassiveWall.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_PassiveCeil.c"),
Object(NonMatching, "melee/ft/ftafterimage.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_DamageSong.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_0C35.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_0C35.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_AirCatch.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_DamageBind.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_WarpStar.c"),
Expand Down Expand Up @@ -560,7 +560,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
Object(Matching, "melee/ft/chara/ftCaptain/ftCa_SpecialN.c"),
Object(Matching, "melee/ft/chara/ftCaptain/ftCa_SpecialS.c"),
Object(NonMatching, "melee/ft/chara/ftCaptain/ftCa_SpecialLw.c"),
Object(NonMatching, "melee/ft/chara/ftCaptain/ftCa_SpecialHi.c"),
Object(Matching, "melee/ft/chara/ftCaptain/ftCa_SpecialHi.c"),
# Fox
Object(Matching, "melee/ft/chara/ftFox/ftFx_Init.c"),
Object(Matching, "melee/ft/chara/ftFox/ftFx_AppealS.c"),
Expand Down Expand Up @@ -1024,7 +1024,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
# Indivudal items
Object(NonMatching, "melee/it/items/itoldkuri.c"),
Object(Matching, "melee/it/items/itmato.c"),
Object(NonMatching, "melee/it/items/itheiho.c"),
Object(Matching, "melee/it/items/itheiho.c"),
Object(NonMatching, "melee/it/items/itlikelike.c"),
Object(NonMatching, "melee/it/items/itnokonoko.c"),
Object(NonMatching, "melee/it/items/itzgshell.c"),
Expand Down
8 changes: 4 additions & 4 deletions obj_files.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/asm/melee/ft/ftdevice.s.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_Bury.s.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_FlyReflect.s.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_PassiveWall.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCommon/ftCo_PassiveWall.c.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCommon/ftCo_PassiveCeil.c.o\
$(BUILD_DIR)/asm/melee/ft/ftafterimage.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCommon/ftCo_DamageSong.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_0C35.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCommon/ftCo_0C35.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_AirCatch.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCommon/ftCo_DamageBind.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCommon/ftCo_WarpStar.s.o\
Expand Down Expand Up @@ -227,7 +227,7 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/src/melee/ft/chara/ftCaptain/ftCa_SpecialN.c.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCaptain/ftCa_SpecialS.c.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCaptain/ftCa_SpecialLw.s.o\
$(BUILD_DIR)/asm/melee/ft/chara/ftCaptain/ftCa_SpecialHi.s.o\
$(BUILD_DIR)/src/melee/ft/chara/ftCaptain/ftCa_SpecialHi.c.o\

TEXT_O_FILES +=\
$(BUILD_DIR)/src/melee/ft/chara/ftFox/ftFx_Init.c.o\
Expand Down Expand Up @@ -706,7 +706,7 @@ TEXT_O_FILES +=\
TEXT_O_FILES +=\
$(BUILD_DIR)/asm/melee/it/items/itoldkuri.s.o\
$(BUILD_DIR)/src/melee/it/items/itmato.c.o\
$(BUILD_DIR)/asm/melee/it/items/itheiho.s.o\
$(BUILD_DIR)/src/melee/it/items/itheiho.c.o\
$(BUILD_DIR)/asm/melee/it/items/itlikelike.s.o\
$(BUILD_DIR)/asm/melee/it/items/itnokonoko.s.o\
$(BUILD_DIR)/asm/melee/it/items/itzgshell.s.o\
Expand Down
59 changes: 9 additions & 50 deletions src/melee/ft/chara/ftCaptain/ftCa_SpecialHi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@

#include <common_structs.h>

/* literal */ float const ftCa_SpecialLw_804D9230 = 0;
/* literal */ float const ftCa_SpecialLw_804D9234 = 1;
/* literal */ double const ftCa_SpecialLw_804D9238 = M_PI_2;

void ftCa_SpecialHiThrow1_Coll(HSD_GObj* gobj)
{
ftCo_AirCatchHit_Coll(gobj);
Expand Down Expand Up @@ -98,9 +94,7 @@ void ftCa_SpecialHi_Phys(HSD_GObj* gobj)
fp->self_vel.x = fp->mv.ca.specialhi.vel.x;
fp->self_vel.y = fp->mv.ca.specialhi.vel.y;
fp->self_vel.z = 0;
if (!ftCommon_8007D050(fp, da->specialhi_horz_vel *
fp->co_attrs.air_drift_max))
{
if (!ftCommon_8007D050(fp, da->specialhi_horz_vel * ca->air_drift_max)) {
ftCommon_8007D3A8(fp, p_ftCommonData->x258,
ca->air_drift_stick_mul *
da->specialhi_air_friction_mul,
Expand Down Expand Up @@ -189,35 +183,13 @@ void ftCa_SpecialAirHi_IASA(HSD_GObj* gobj)

void ftCa_SpecialAirHi_Phys(HSD_GObj* gobj)
{
u8 _[28];
Fighter* fp = GET_FIGHTER(gobj);
ftCaptain_DatAttrs* da = fp->dat_attrs;
ftCo_DatAttrs* ca = &fp->co_attrs;
fp->self_vel.x = fp->mv.ca.specialhi.vel.x;
fp->self_vel.y = fp->mv.ca.specialhi.vel.y;
fp->self_vel.z = 0;
if (!ftCommon_8007D050(fp, da->specialhi_horz_vel * ca->air_drift_max)) {
ftCommon_8007D3A8(fp, p_ftCommonData->x258,
ca->air_drift_stick_mul *
da->specialhi_air_friction_mul,
ca->air_drift_max * da->specialhi_horz_vel);
}
fp->mv.ca.specialhi.vel.x = fp->x74_anim_vel.x + fp->self_vel.x;
fp->mv.ca.specialhi.vel.y = fp->x74_anim_vel.y + fp->self_vel.y;
ft_80085134(gobj);
fp->x74_anim_vel.x = fp->x74_anim_vel.y = 0;
fp->self_vel.x = fp->self_vel.x + fp->mv.ca.specialhi.vel.x;
fp->self_vel.y = fp->self_vel.y + fp->mv.ca.specialhi.vel.y;
PAD_STACK(28);
ftCa_SpecialHi_Phys(gobj);
}

void ftCa_SpecialAirHi_Coll(HSD_GObj* gobj)
{
Fighter* fp = GET_FIGHTER(gobj);
if (fp->ground_or_air == GA_Air) {
doAirColl(gobj);
} else if (ft_80082708(gobj)) {
ftCommon_8007D5D4(fp);
}
ftCa_SpecialHi_Coll(gobj);
}

static void ftCa_SpecialLw_800E550C(HSD_GObj*);
Expand Down Expand Up @@ -294,24 +266,11 @@ void ftCa_SpecialHiThrow0_Phys(HSD_GObj* gobj)
{
Fighter* fp = GET_FIGHTER(gobj);
ftCaptain_DatAttrs* da = fp->dat_attrs;
if (fp->mv.ca.specialhi.x2_b2) {
ftCo_DatAttrs* ca = &fp->co_attrs;
fp->self_vel.x = fp->mv.ca.specialhi.vel.x;
fp->self_vel.y = fp->mv.ca.specialhi.vel.y;
fp->self_vel.z = 0;
if (!ftCommon_8007D050(fp, da->specialhi_horz_vel * ca->air_drift_max))
{
ftCommon_8007D3A8(fp, p_ftCommonData->x258,
ca->air_drift_stick_mul *
da->specialhi_air_friction_mul,
ca->air_drift_max * da->specialhi_horz_vel);
}
fp->mv.ca.specialhi.vel.x = fp->x74_anim_vel.x + fp->self_vel.x;
fp->mv.ca.specialhi.vel.y = fp->x74_anim_vel.y + fp->self_vel.y;
ft_80085134(gobj);
fp->x74_anim_vel.x = fp->x74_anim_vel.y = 0;
fp->self_vel.x = fp->self_vel.x + fp->mv.ca.specialhi.vel.x;
fp->self_vel.y = fp->self_vel.y + fp->mv.ca.specialhi.vel.y;
ftCo_DatAttrs* ca;
PAD_STACK(32);
if (fp->mv.ca.specialhi.x2_b0) {
ftCa_SpecialHi_Phys(gobj);
ca = &fp->co_attrs;
{
float vel_y = fp->self_vel.y - fp->mv.ca.specialhi.vel.y;
ftCommon_8007D494(fp, da->specialhi_catch_grav, ca->terminal_vel);
Expand Down
Loading

0 comments on commit 80d49c0

Please sign in to comment.