Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JP] Battle Code and Battle Areas #1198

Merged
merged 1 commit into from
Sep 5, 2024
Merged

[JP] Battle Code and Battle Areas #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/battle/16C8E0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ EvtScript BtlPutPartnerAway = {
Add(LVar1, 25)
Call(SetActorJumpGravity, ACTOR_PARTNER, Float(1.0))
Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
#if VERSION_JP
Call(JumpToGoal, ACTOR_PARTNER, 10, 0, 1, 1)
#else
Call(JumpToGoal, ACTOR_PARTNER, 10, 0, 0, 1)
#endif
Call(DisablePartnerBlur)
Return
End
Expand All @@ -88,7 +92,11 @@ EvtScript BtlBringPartnerOut = {
IfEq(LVar1, 0)
Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
Else
#if VERSION_JP
Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 1, 1)
#else
Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
#endif
EndIf
Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
Call(ForceHomePos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
Expand Down
7 changes: 5 additions & 2 deletions src/battle/actors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,11 @@ Vec3s StandardActorHomePositions[] = {
};

// TODO: what is this, and look into warnings that are silenced via casts
// Note: check D_8028358C_2 in battle/popup_messages.c (file split might be incorrect)
s32* D_8028358C[] = {
(s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1,
(s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C,
(s32*)D_8028358C, (s32*)D_8028358C, 0
(s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C,
#if !VERSION_JP
(s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, 0
#endif
};
Loading
Loading