mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ac_reserve cleanup

Browse Source
This commit is contained in:
Cuyler36
2025-03-27 03:14:55 -04:00
parent 998914477d
commit 2954f6edfa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/ac_reserve.c
+1 -1
View File
@@ -15,7 +15,7 @@ ACTOR_PROFILE Reserve_Profile = {
mAc_PROFILE_RESERVE,
ACTOR_PART_ITEM,
ACTOR_STATE_TA_SET,
0x5810, // include name later
SIGN00,
ACTOR_OBJ_BANK_KEEP,
sizeof(RESERVE_ACTOR),
aRSV_actor_ct,
src/actor/ac_reserve_move.c_inc
+5 -5
View File
@@ -3,9 +3,9 @@ static void aRSV_set_bgOffset(ACTOR*, int) {
static void aRSV_set_talk_info(ACTOR* actor) {
RESERVE_ACTOR* reserve = (RESERVE_ACTOR*)actor;
u8 str[8];
u8 str[mIN_ITEM_NAME_LEN];
int item;
u8 str2[8];
u8 str2[ANIMAL_NAME_LEN];
rgba_t window_color;
if (reserve->structure_class.arg0 == 0x42) {
@@ -14,9 +14,9 @@ static void aRSV_set_talk_info(ACTOR* actor) {
if (reserve->structure_class.arg0 >= 6 && reserve->structure_class.arg0 <= 8) {
mIN_copy_name_str(str, Save_Get(fruit));
item = mIN_get_item_article(Save_Get(fruit));
mMsg_Set_free_str_art(mMsg_Get_base_window_p(), 0, str, 16, item);
mMsg_Set_free_str_art(mMsg_Get_base_window_p(), mMsg_FREE_STR0, str, mIN_ITEM_NAME_LEN, item);
mNpc_GetActorWorldName(str2, SP_NPC_SHOP_MASTER);
mMsg_Set_free_str(mMsg_Get_base_window_p(), 1, str2, 8);
mMsg_Set_free_str(mMsg_Get_base_window_p(), mMsg_FREE_STR1, str2, ANIMAL_NAME_LEN);
}
mDemo_Set_msg_num(reserve->structure_class.arg0 + 0x2B2D);
}
@@ -40,7 +40,7 @@ static void aRSV_wait(STRUCTURE_ACTOR* actor, GAME_PLAY* play) {
if (player->actor_class.world.position.z >= actor->actor_class.world.position.z) {
angle = ABS(actor->actor_class.player_angle_y);
if (angle < 0x2000) {
if (angle < DEG2SHORT_ANGLE2(45.0f)) {
mDemo_Request(mDemo_TYPE_TALK, &actor->actor_class, aRSV_set_talk_info);
}
}