diff --git a/asm/melee/ft/ft_0D14.s b/asm/melee/ft/ft_0D14.s index 43d9793a24..b0c9c62e79 100644 --- a/asm/melee/ft/ft_0D14.s +++ b/asm/melee/ft/ft_0D14.s @@ -2403,7 +2403,7 @@ /* 800D351C 000D00FC 54 84 EF FE */ extrwi r4, r4, 1, 28 /* 800D3520 000D0100 4B F6 19 6D */ bl Player_SetFallsByIndex /* 800D3524 000D0104 88 7F 00 0C */ lbz r3, 0xc(r31) -/* 800D3528 000D0108 4B F6 3C 41 */ bl plStale_80037168 +/* 800D3528 000D0108 4B F6 3C 41 */ bl plStale_ResetStaleMoveTableForPlayer /* 800D352C 000D010C 48 09 7B 69 */ bl gm_8016B094 /* 800D3530 000D0110 2C 03 00 00 */ cmpwi r3, 0x0 /* 800D3534 000D0114 40 82 00 10 */ bne .L_800D3544 diff --git a/asm/melee/pl/plbonus.s b/asm/melee/pl/plbonus.s index c283087f0c..5ce3e452e7 100644 --- a/asm/melee/pl/plbonus.s +++ b/asm/melee/pl/plbonus.s @@ -186,7 +186,7 @@ pl_8003891C: /* 80038934 00035514 4B FF D9 F1 */ bl Player_GetStaleMoveTableIndexPtr2 /* 80038938 00035518 3B E3 00 00 */ addi r31, r3, 0 /* 8003893C 0003551C 38 7E 00 00 */ addi r3, r30, 0 -/* 80038940 00035520 4B FF E8 29 */ bl plStale_80037168 +/* 80038940 00035520 4B FF E8 29 */ bl plStale_ResetStaleMoveTableForPlayer /* 80038944 00035524 7F C3 F3 78 */ mr r3, r30 /* 80038948 00035528 4B FF EC 55 */ bl plAttack_8003759C /* 8003894C 0003552C 7F C3 F3 78 */ mr r3, r30 diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt index 305defe138..ec16b0c183 100644 --- a/config/GALE01/symbols.txt +++ b/config/GALE01/symbols.txt @@ -940,7 +940,7 @@ Player_80036EA0 = .text:0x80036EA0; // type:function size:0x94 scope:global Player_80036F34 = .text:0x80036F34; // type:function size:0x120 scope:global Player_80037054 = .text:0x80037054; // type:function size:0x108 scope:global plStale_InitAttackInstance = .text:0x8003715C; // type:function size:0xC scope:global -plStale_80037168 = .text:0x80037168; // type:function size:0xA0 scope:global +plStale_ResetStaleMoveTableForPlayer = .text:0x80037168; // type:function size:0xA0 scope:global plStale_IncrementAttackInstance = .text:0x80037208; // type:function size:0x24 scope:global plStale_UpdateStaleMovesFromFighter = .text:0x8003722C; // type:function size:0x1A0 scope:global plStale_UpdateStaleMovesFromItem = .text:0x800373CC; // type:function size:0x1C4 scope:global diff --git a/src/melee/pl/plstale.c b/src/melee/pl/plstale.c index 99e0104af9..711018c039 100644 --- a/src/melee/pl/plstale.c +++ b/src/melee/pl/plstale.c @@ -15,7 +15,7 @@ void plStale_InitAttackInstance(void) staleAttackInstance = 1; } -void plStale_80037168(s32 slot) +void plStale_ResetStaleMoveTableForPlayer(s32 slot) { int i; StaleMoveTable* stale_table = Player_GetStaleMoveTableIndexPtr(slot); diff --git a/src/melee/pl/plstale.h b/src/melee/pl/plstale.h index ae4dd37d2f..9e49e89242 100644 --- a/src/melee/pl/plstale.h +++ b/src/melee/pl/plstale.h @@ -6,7 +6,7 @@ #include void plStale_InitAttackInstance(void); -void plStale_80037168(s32 slot); +void plStale_ResetStaleMoveTableForPlayer(s32 slot); u16 plStale_IncrementAttackInstance(void); void plStale_UpdateStaleMovesFromFighter(HSD_GObj* gobj, HSD_GObj* gobj_2); void plStale_UpdateStaleMovesFromItem(HSD_GObj* gobj, HSD_GObj* gobj_2);