diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c index 2a9eebf75e..d609443658 100644 --- a/src/pause/pause_tabs.c +++ b/src/pause/pause_tabs.c @@ -266,7 +266,7 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3 void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { draw_msg(pause_get_menu_msg(PAUSE_MSG_19), baseX + 4, baseY + 1, 255.0 - darkening * 0.5, 0, 1); if (gPauseMenuCurrentTab == 0) { - if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_ITEMS) { + if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_ITEMS) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6); } } @@ -275,7 +275,7 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { draw_msg(pause_get_menu_msg(PAUSE_MSG_1A), baseX + 9, baseY + 1, 255.0 - darkening * 0.5, 0, 1); if (gPauseMenuCurrentTab == 0) { - if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_PARTY) { + if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_PARTY) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6); } } @@ -321,15 +321,15 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { #if VERSION_JP if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); - hud_element_set_alpha(gPauseTabsIconIDs[0], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsHIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); + hud_element_set_alpha(gPauseTabsHIDs[0], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); - hud_element_set_alpha(gPauseTabsIconIDs[0], 255); + hud_element_clear_flags(gPauseTabsHIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); + hud_element_set_alpha(gPauseTabsHIDs[0], 255); } - hud_element_set_render_pos(gPauseTabsIconIDs[0], baseX + 23, baseY + 7); - hud_element_draw_without_clipping(gPauseTabsIconIDs[0]); + hud_element_set_render_pos(gPauseTabsHIDs[0], baseX + 23, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsHIDs[0]); #else if (darkening != 0) { hud_element_set_flags(gPauseTabsHIDs[4], HUD_ELEMENT_FLAG_TRANSPARENT); @@ -341,6 +341,7 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s hud_element_set_render_pos(gPauseTabsHIDs[4], baseX + 22, baseY + 7); hud_element_draw_without_clipping(gPauseTabsHIDs[4]); +#endif if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_SPIRITS) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6); @@ -351,15 +352,15 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { #if VERSION_JP if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); - hud_element_set_alpha(gPauseTabsIconIDs[1], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsHIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); + hud_element_set_alpha(gPauseTabsHIDs[1], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); - hud_element_set_alpha(gPauseTabsIconIDs[1], 255); + hud_element_clear_flags(gPauseTabsHIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); + hud_element_set_alpha(gPauseTabsHIDs[1], 255); } - hud_element_set_render_pos(gPauseTabsIconIDs[1], baseX + 23, baseY + 7); - hud_element_draw_without_clipping(gPauseTabsIconIDs[1]); + hud_element_set_render_pos(gPauseTabsHIDs[1], baseX + 23, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsHIDs[1]); #else if (darkening != 0) { hud_element_set_flags(gPauseTabsHIDs[5], HUD_ELEMENT_FLAG_TRANSPARENT); diff --git a/src/world/dead/area_flo/flo_21/npc.c b/src/world/dead/area_flo/flo_21/npc.c index 3e5d2b00dc..e0f232f450 100644 --- a/src/world/dead/area_flo/flo_21/npc.c +++ b/src/world/dead/area_flo/flo_21/npc.c @@ -518,7 +518,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Main) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_THUMBS_UP, TRUE) Call(SetNpcYaw, NPC_PARTNER, 90) Call(GetPlayerPos, LVar0, LVar1, LVar3) Call(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) @@ -543,7 +543,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Aux) = { EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, 1) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_HuffNPuff_01))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Main))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim02) @@ -556,7 +556,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, 1) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Aux))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim01) Exec(N(EVS_HuffNPuff_AnimateBodyScale)) @@ -569,7 +569,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { EvtScript N(EVS_NpcInit_HuffNPuff_Arms) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, 1) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Aux))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim19) Else @@ -605,7 +605,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Face), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -616,7 +616,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Body), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -627,7 +627,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -646,7 +646,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -657,7 +657,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -668,7 +668,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -679,7 +679,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -690,7 +690,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -701,7 +701,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -712,7 +712,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -723,7 +723,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -734,7 +734,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -745,7 +745,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -756,7 +756,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -767,7 +767,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -778,7 +778,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -789,7 +789,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -800,7 +800,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), diff --git a/src/world/dead/area_flo/flo_22/npc.c b/src/world/dead/area_flo/flo_22/npc.c index f3671c9003..70e7ecacb7 100644 --- a/src/world/dead/area_flo/flo_22/npc.c +++ b/src/world/dead/area_flo/flo_22/npc.c @@ -110,7 +110,7 @@ NpcData N(NpcData_Bzzap) = { .yaw = 270, .init = &N(EVS_NpcInit_Bzzap), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; @@ -121,7 +121,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 270, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_23/npc.c b/src/world/dead/area_flo/flo_23/npc.c index d283118c5f..d5b9293f1d 100644 --- a/src/world/dead/area_flo/flo_23/npc.c +++ b/src/world/dead/area_flo/flo_23/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueGateFlower, diff --git a/src/world/dead/area_flo/flo_25/npc.c b/src/world/dead/area_flo/flo_25/npc.c index aedbb4803a..f4d5ce8de7 100644 --- a/src/world/dead/area_flo/flo_25/npc.c +++ b/src/world/dead/area_flo/flo_25/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_RED_ANIMS, .tattle = MSG_NpcTattle_RedGateFlower, diff --git a/src/world/dead/area_kzn/kzn_20/npc.c b/src/world/dead/area_kzn/kzn_20/npc.c index 8a16906baf..0655ccfe53 100644 --- a/src/world/dead/area_kzn/kzn_20/npc.c +++ b/src/world/dead/area_kzn/kzn_20/npc.c @@ -142,9 +142,9 @@ EvtScript N(EVS_Kolorado_CalmIdle) = { EndLoop Wait(LVar2) #if VERSION_JP - Goto(0) + Goto(0) #else - Goto(10) + Goto(10) #endif Return End diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index a2c1aca1da..70a9e13cc0 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -87,7 +87,7 @@ dead_GetSelfNpcID = GetSelfNpcID + 0x3F50; dead_SetEnemyFlagBits = SetEnemyFlagBits + 0x3F50; dead_GetSelfAnimationFromTable = GetSelfAnimationFromTable + 0x3F50; dead_OnPlayerFled = OnPlayerFled + 0x3F50; -dead_is_point_within_region = is_point_within_region + 0x3F90; +dead_is_point_outside_territory = is_point_outside_territory + 0x3F90; dead_basic_ai_check_player_dist = basic_ai_check_player_dist + 0x3F90; dead_ai_enemy_play_sound = ai_enemy_play_sound + 0x41E0; dead_basic_ai_wander_init = basic_ai_wander_init + 0x42C0; @@ -171,7 +171,7 @@ dead_set_aux_pan_v = set_aux_pan_v + 0xA418; dead_mdl_get_copied_vertices = mdl_get_copied_vertices + 0xA418; dead_mdl_get_copied_gfx = mdl_get_copied_gfx + 0xA418; dead_queue_render_task = queue_render_task + 0xABD0; -dead_create_worker_world = create_worker_world + 0xADF0; +dead_create_worker_scene = create_worker_scene + 0xADF0; dead_set_message_images = set_message_images + 0xB098; dead_set_message_text_var = set_message_text_var + 0xB098; dead_get_item_entity = get_item_entity + 0xBF80; @@ -386,26 +386,9 @@ filemenu_BSS_END = 0x8024B8B0; sprite_shading_profiles_data_ROM_START = sprite_shading_profiles_ROM_START + 0x1D0; // subsequent segments -// CHECK IF NECESSARY ----------------------------- -gEffectDataBuffer = 0x80197000; -gEffectGlobals = 0x801A6000; -AuHeapBase = 0x801AA000; -D_80200000 = 0x80200000; -// ------------------------------------ gBackgroundImage = 0x80200000; filemenu_update = 0x80242970; filemenu_init = 0x802440B0; filemenu_cleanup = 0x802442D0; -func_80244BC4 = 0x80244394; -// CHECK IF NECESSARY ------------------------ filemenu_get_exit_mode = 0x80244394; -heap_collisionHead = 0x80268000; -shim_create_audio_system_obfuscated = 0x802B2000; -shim_load_engine_data_obfuscated = 0x802B203C; -shim_general_heap_create_obfuscated = 0x802B2078; -shim_battle_heap_create_obfuscated = 0x802B20B4; -heap_generalHead = 0x802FB800; -gFrameBuf0 = 0x8038F800; -gFrameBuf1 = 0x803B5000; -// ------------------------------------ heap_battleHead = 0x803DA800;