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.

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

Nov 2024 #258

Merged
merged 7 commits into from
Nov 27, 2024
Merged

Nov 2024 #258

merged 7 commits into from
Nov 27, 2024

Conversation

SethBarberee
Copy link
Collaborator

The great renaming of move/orb actions that haven't been documented yet. Still a few more orb funcs in 807CD9C that I would like to finish before marking this PR ready.

@SethBarberee SethBarberee marked this pull request as ready for review November 16, 2024 17:53
@SethBarberee
Copy link
Collaborator Author

SethBarberee commented Nov 16, 2024

HandleTrawlOrbAction is a little too much for me with the huge stack it has so left the WIP scratch and matched the rest of the orb funcs. With that, this PR is ready for review.

@@ -306,7 +306,8 @@ bool8 YawnMoveAction(Entity * pokemon, Entity *target, Move *move, s32 param_4)
return TRUE;
}

bool8 sub_80576F8(Entity * pokemon, Entity *target, Move *move, s32 param_4)
// NOTE: Is there a better name for this?
bool8 BasicSleepMoveAction(Entity * pokemon, Entity *target, Move *move, s32 param_4)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps the "Basic" isn't needed. SleepMoveAction by itself conveys the same meaning of being a shared move action between similar sleep moves.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is referring to rest etc, then Sleep is fine. If it's referring to forcing sleep (like hypnosis), then I suggest "CastSleep".
Same for "CastFreeze" and "CastBurn" etc if that's the situation

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't "force" the status conditions. It still has to roll the chance for a status condition. For example,

bool8 BasicFireMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4)
{
  bool8 flag;

  flag = FALSE;
  SendThawedMessage(pokemon, target);
  if (HandleDamagingMove(pokemon,target,move,0x100,param_4) != 0) {
    flag = TRUE;
    if(sub_805727C(pokemon, target, gUnknown_80F4DBA))
    {
        BurnedStatusTarget(pokemon, target, 0, FALSE);
    }
  }
  return flag;
}

@AnonymousRandomPerson
Copy link
Collaborator

Some merge conflicts were introduced with #256 merging.

src/called_move_data.c Outdated Show resolved Hide resolved
@AnonymousRandomPerson
Copy link
Collaborator

@SethBarberee FYI, there are some unresolved comments here that I'm waiting on before approving.

@SethBarberee
Copy link
Collaborator Author

Was on vacation and just got back. Will try to address them in next day or two.

@SethBarberee SethBarberee merged commit 55459b9 into pret:master Nov 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants