pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

two partner functions (#793)

Browse Source 
* matched partner_walking_follow_player

* clean stuff
This commit is contained in:
Unnunu 2022-09-30 17:00:33 +03:00 committed by GitHub
parent 473bfa0692
commit a293e4e120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 695 additions and 2812 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bss2.c
View File

@ -70,13 +70,13 @@ BSS char D_8010C9B4[0xC];
// BSS s32 D_8010CFBC;
// BSS s32 wPartnerTetherDistance;
// BSS s32 D_8010CFC4;
// BSS s16 D_8010CFC8;
// BSS s16 wPartnerFollowState;
// BSS s16 D_8010CFCA;
// BSS s16 D_8010CFCC;
// BSS s16 D_8010CFCE;
// BSS s32 D_8010CFD0;
// BSS s32 wPartnerNpcIndex;
// BSS s32 wPartnerCurrentScript;
// BSS s32 D_8010CFD8;
// BSS s32 wCurrentPartnerId;
// BSS s32 wPartnerCurrentScriptID;
// BSS s32 D_8010CFE0;
// BSS s32 D_8010CFE4;

4
src/world/partner/bow.c
View File

@ -171,7 +171,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) {
if (isInitialCall) {
func_802BD4FC_323E4C(bow);
if (!(playerStatus->animFlags & PA_FLAGS_100000)) {
if (func_800EA52C(9)) {
if (func_800EA52C(PARTNER_BOW)) {
if (playerStatus->animFlags & PA_FLAGS_200000) {
playerStatus->animFlags &= ~PA_FLAGS_200000;
script->functionTemp[2] = disable_player_input();
@ -201,7 +201,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) {
script->functionTemp[0]++;
break;
case 41:
if ((!func_800EA52C(9) || is_starting_conversation()) &&
if ((!func_800EA52C(PARTNER_BOW) || is_starting_conversation()) &&
script->functionTemp[2] < playerStatus->inputEnabledCounter
&& D_802BE0C4) {

4
src/world/partner/parakarry.c
View File

@ -182,7 +182,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) {
func_802BD514_319A84(parakarry);
if (!(playerStatus->animFlags & PA_FLAGS_100000)) {
if (partnerActionStatus->partnerAction_unk_1 == 0) {
if (!func_800EA52C(4)) {
if (!func_800EA52C(PARTNER_PARAKARRY)) {
return ApiStatus_DONE2;
}
D_802BEBC0_31CBE0 = 0x28;
@ -217,7 +217,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) {
case 41:
if (D_802BEBC4 == 0) {
if (evt->functionTemp[2] >= playerStatus->inputEnabledCounter) {
if (func_800EA52C(4)) {
if (func_800EA52C(PARTNER_PARAKARRY)) {
D_802BEBC0_31CBE0 = 30;
break;
}

4
src/world/partner/watt.c
View File

@ -217,7 +217,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) {
if (!(playerStatus->animFlags & PA_FLAGS_100000)) {
if (partnerActionStatus->partnerAction_unk_1 == 0) {
if ((partnerActionStatus->partnerActionState != ACTION_STATE_IDLE) ||
(func_800EA52C(6) && !is_starting_conversation()))
(func_800EA52C(PARTNER_WATT) && !is_starting_conversation()))
{
if (gGameStatusPtr->keepUsingPartnerOnMapChange) {
if (playerStatus->animFlags & (PA_FLAGS_HOLDING_WATT | PA_FLAGS_2)) {
@ -259,7 +259,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) {
if (script->functionTemp[1] == 0) {
if (script->functionTemp[2] >= playerStatus->inputEnabledCounter) {
if (!(playerStatus->animFlags & PA_FLAGS_100000)) {
if (func_800EA52C(6)) {
if (func_800EA52C(PARTNER_WATT)) {
if (!is_starting_conversation()) {
D_802BE304 = 20;
break;

879
src/world/partners.c
View File

File diff suppressed because it is too large Load Diff

1060
ver/us/asm/nonmatchings/world/partners/partner_flying_follow_player.s
View File

File diff suppressed because it is too large Load Diff

1534
ver/us/asm/nonmatchings/world/partners/partner_walking_follow_player.s
View File

File diff suppressed because it is too large Load Diff

12
ver/us/symbol_addrs.txt
View File

@ -3862,13 +3862,13 @@ exec_entity_commandlist = 0x8010FD68; // type:func rom:0xA6468
D_8010CFBC = 0x8010CFBC; // type:data rom:0xA646C
wPartnerTetherDistance = 0x8010CFC0; // type:data rom:0xA6470
D_8010CFC4 = 0x8010CFC4; // type:data rom:0xA6474
D_8010CFC8 = 0x8010CFC8; // type:data rom:0xA6478
wPartnerFollowState = 0x8010CFC8; // type:data rom:0xA6478
D_8010CFCA = 0x8010CFCA; // type:data rom:0xA647A
D_8010CFCC = 0x8010CFCC; // type:data rom:0xA647C
D_8010CFCE = 0x8010CFCE; // type:data rom:0xA647E
D_8010CFD0 = 0x8010CFD0; // type:data rom:0xA6480
wPartnerNpcIndex = 0x8010CFD0; // type:data rom:0xA6480
D_8010CFD4 = 0x8010CFD4; // type:data rom:0xA6484
D_8010CFD8 = 0x8010CFD8; // type:data rom:0xA6488
wCurrentPartnerId = 0x8010CFD8; // type:data rom:0xA6488
D_8010CFDC = 0x8010CFDC; // type:data rom:0xA648C
D_8010CFE0 = 0x8010CFE0; // type:data rom:0xA6490
D_8010CFE4 = 0x8010CFE4; // type:data rom:0xA6494
@ -25854,13 +25854,13 @@ gPlayerMoveHistoryIndex = 0x8010CFB8; // type:data
D_8010CFBC = 0x8010CFBC; // type:data
wPartnerTetherDistance = 0x8010CFC0; // type:data
D_8010CFC4 = 0x8010CFC4; // type:data
D_8010CFC8 = 0x8010CFC8; // type:data
wPartnerFollowState = 0x8010CFC8; // type:data
D_8010CFCA = 0x8010CFCA; // type:data
D_8010CFCC = 0x8010CFCC; // type:data
D_8010CFCE = 0x8010CFCE; // type:data
D_8010CFD0 = 0x8010CFD0; // type:data
wPartnerNpcIndex = 0x8010CFD0; // type:data
wPartnerCurrentScript = 0x8010CFD4; // type:data
D_8010CFD8 = 0x8010CFD8; // type:data
wCurrentPartnerId = 0x8010CFD8; // type:data
wPartnerCurrentScriptID = 0x8010CFDC; // type:data
D_8010CFE0 = 0x8010CFE0; // type:data
D_8010CFE4 = 0x8010CFE4; // type:data