General renaming and small structural changes in berry_patches.c - item.c #310
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
lhearachel
requested changes
Nov 21, 2024
Comment on lines
-663
to
+661
| FieldBattleDTO *dto; | ||
| FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); | ||
|
|
||
| dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_TRAINER); | ||
| FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_TRAINER); |
There was a problem hiding this comment.
aside: I had purposefully left them in this order for consistency's sake across similar functions, but I'm not attached-enough to it to go against changing it.
src/game_overlay.c
Outdated
| { | ||
| GF_ASSERT(param0->isActive == 1); | ||
| GF_ASSERT(FS_UnloadOverlay(MI_PROCESSOR_ARM9, param0->id) == TRUE); | ||
| GF_ASSERT(loadedOverlays->isActive == 1); |
There was a problem hiding this comment.
Suggested change
| GF_ASSERT(loadedOverlays->isActive == 1); | |
| GF_ASSERT(loadedOverlays->isActive == TRUE); |
And similar for other occurrences in this file.
There was a problem hiding this comment.
I have applied these and the other suggestions in the new commit
src/game_overlay.c
Outdated
|
|
||
| param0->isActive = 0; | ||
| loadedOverlays->isActive = 0; |
There was a problem hiding this comment.
Suggested change
| loadedOverlays->isActive = 0; | |
| loadedOverlays->isActive = FALSE; |
src/communication_system.c
Outdated
Comment on lines
779
to
783
| if (CommSys_IsPlayerConnected(i)) { | ||
| if (sCommunicationSystem->unk_664[i] > 3) { | ||
| return FALSE; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (CommSys_IsPlayerConnected(i)) { | |
| if (sCommunicationSystem->unk_664[i] > 3) { | |
| return FALSE; | |
| } | |
| } | |
| if (CommSys_IsPlayerConnected(i) && sCommunicationSystem->unk_664[i] > 3) { | |
| return FALSE; | |
| } |
…nnecessary scoping
lhearachel
reviewed
Nov 22, 2024
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Rachel <[email protected]>
Done! |
lhearachel
approved these changes
Nov 25, 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.
I went through some files in
srcand just made a bunch of small changes like making declarations more concise, removing unnecessary scoping, naming variables and arguments, and making the argument names match in the respective.hfiles.