Refactor as much as possible to GetEntInfo #245
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mateon1
commented
Oct 29, 2024
| @@ -4,5 +4,6 @@ | |||
| // This file gets included by each source file, just like in Chunsoft's original source, so we can have this string easily just like they did. | |||
|
|
|||
| // Later, we can move this into "global.h" before the #ifdef guard. But we can only do this if "global.h" isn't included outside of .c files... | |||
| #include "gba/defines.h" | |||
There was a problem hiding this comment.
Whoops, didn't mean to commit this, this was making coccinelle spew an annoying amount of errors on that ALIGNED(4) attribute if this was missing
DizzyEggg
suggested changes
Oct 29, 2024
| @@ -549,7 +549,7 @@ void CheriBerryItemAction(Entity *pokemon, Entity *target) | |||
|
|
|||
| void PechaBerryItemAction(Entity *pokemon, Entity *target) | |||
| { | |||
| if((u8)(target->axObj.info->nonVolatile.nonVolatileStatus - 2) <= 1) | |||
| if((u8)(GetEntInfo(target)->nonVolatile.nonVolatileStatus - 2) <= 1) | |||
There was a problem hiding this comment.
I know, that's not related, but since you're at it, maybe you could fix that as well? It's prolly nonVolatileStatus == 1 || nonVolatileStatus == 2 or sth similar
There was a problem hiding this comment.
I kept staring at this the past few PRs, but I think it's the crazy comparison macro, note that the u8 cast is after subtraction.
| @@ -200,7 +200,7 @@ void HandleTakeItemAction(Entity *param_1) | |||
| Item item; | |||
|
|
|||
| entity = sub_8044DA4(param_1,0); | |||
| info = entity->axObj.info; | |||
| info = entity->axObj.info; // GetEntInfo doesn't work here, probably fixable | |||
| info2 = entity->axObj.info; | |||
There was a problem hiding this comment.
Does it work if you get rid of info2?
| @@ -856,7 +856,7 @@ bool8 sub_8058270(Entity *pokemon, Entity *target, Move *move, u32 param_4) | |||
| u32 r3; | |||
|
|
|||
| r3 = 1; | |||
| if((u8)(target->axObj.info->charging.chargingStatus - 7) <= 1) | |||
| if((u8)(GetEntInfo(target)->charging.chargingStatus - 7) <= 1) | |||
There was a problem hiding this comment.
Same thing with status here
AnonymousRandomPerson
approved these changes
Oct 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.