clean up encounter.c #208

red031000 · 2023-08-10T19:45:49Z

WIP and currently extremely messy, will need cleaning up and finishing before review

red031000 · 2023-08-16T22:53:19Z

ready for review :)

include/bug_contest.h

adrienntindall

Only 302/373 files viewed but I have 33 comments and github web is lagging

include/encounter.h

include/field_follow_poke.h

include/field_map_object.h

include/field_system.h

src/encounter.c

src/field/overlay_01_rock_smash_item.c

src/field/scrcmd_pokemon_misc.c

adrienntindall

336/373 I hope red realizes that I'm not merging until all these changes are addressed

src/field_map_object.c

src/field_system.c

src/field_use_item.c

adrienntindall · 2023-08-17T10:07:08Z

src/overlay_36.c

@@ -40,9 +40,9 @@ static BOOL ov36_App_InitGameState_AfterOakSpeech_AppExit(OVY_MANAGER* man, int*
 static BOOL ov36_TitleScreen_NewGame_AppInit(OVY_MANAGER* man, int* state);


Do we have enough info to name overlay_36?

src/party.c

adrienntindall · 2023-08-17T10:09:43Z

src/party.c

-BOOL Party_SwapSlots(PARTY *party, int slotA, int slotB) {
-    PARTY_EXTRA_SUB tmp_PARTY_EXTRA_SUB;
+BOOL Party_SwapSlots(Party *party, int slotA, int slotB) {
+    PartyExtraSub tmp_PartyExtraSub;
    Pokemon *tmp_POKEMON;


fix these local variable names please

adrienntindall · 2023-08-17T10:11:07Z

src/pokemon_storage_system.c

    storage->boxModifiedFlag = 0;
 }

-u32 PCStorage_GetBoxModifiedFlags(PC_STORAGE* storage) {
+u32 PCStorage_GetBoxModifiedFlags(PCStorage* storage) {
    return storage->boxModifiedFlag;
 }

 u32 sub_02074120(void) {


PCBox_sizeof

src/pokemon_storage_system.c

src/safari_zone.c

src/sav_system_info.c

src/save_arrays.c

src/scrcmd_17.c

adrienntindall · 2023-08-17T12:06:25Z

src/scrcmd_battle.c

@@ -15,28 +15,28 @@
 BOOL ScrCmd_GetTrainerPathToPlayer(ScriptContext *ctx) {


Can we clean up the local variable names in this function please?

adrienntindall · 2023-08-17T12:09:45Z

src/scrcmd_c.c

@@ -164,7 +164,7 @@ BOOL ScrCmd_Wait(ScriptContext* ctx) {
 }

 static BOOL RunPauseTimer(ScriptContext* ctx) {
-    u16* frames_to_wait = GetVarPointer(ctx->fsys, ctx->data[0]);
+    u16* frames_to_wait = GetVarPointer(ctx->fieldSystem, ctx->data[0]);


alot of the local variables in this file contradict our style conventions

src/encounter.c

#208 split PR 1, rename party

#208 split PR 2, rename fsys to fieldSystem

#208 split PR 3, rename savedata to saveData

include/constants/std_script.h

src/field/scrcmd_pokemon_misc.c

include/constants/std_script.h

include/fieldmap.h

include/overlay_02.h

red031000 · 2023-09-09T21:21:26Z

@PikalaxALT review addressed

PikalaxALT · 2023-09-09T21:31:42Z

Declining to review due to the habitual squashing of commits deleting progress from previous review.

red031000 · 2023-09-09T21:34:08Z

the comments should still be present, plus, given that you have requested changes before, according to the repo rules, all who have requested changes that have write access must approve for a PR to be merged (unless I bypass branch protections)

#208 split PR 4, rename some misc funcs

Review references commits that were rebased out of existence.

Up to Battle Random functions start cleaning up encounter.c fix build fix build again remove two files from bad rebase switch fully to battle type constants rename TRAINER to Trainer few more funcs finish cleanup address some review comments de-capitalise std_script

adrienntindall · 2023-09-30T18:30:14Z

Some state machine reviews were left unaddressed but am approving for the sake of letting red work on other things

red031000 marked this pull request as ready for review August 16, 2023 22:53

adrienntindall reviewed Aug 16, 2023

View reviewed changes

include/bug_contest.h Show resolved Hide resolved

adrienntindall requested changes Aug 16, 2023

View reviewed changes

adrienntindall requested changes Aug 17, 2023

View reviewed changes

PikalaxALT requested changes Aug 19, 2023

View reviewed changes

src/encounter.c Show resolved Hide resolved

red031000 mentioned this pull request Aug 20, 2023

#208 split PR 1, rename party #230

Merged

adrienntindall added a commit that referenced this pull request Aug 20, 2023

Merge pull request #230 from red031000/split

66efaea

#208 split PR 1, rename party

red031000 force-pushed the master branch 2 times, most recently from bd3f21c to 51df5f8 Compare August 20, 2023 17:35

red031000 mentioned this pull request Aug 20, 2023

#208 split PR 2, rename fsys to fieldSystem #232

Merged

red031000 force-pushed the master branch 2 times, most recently from 1129ca3 to 75c3424 Compare August 22, 2023 08:18

adrienntindall added a commit that referenced this pull request Aug 22, 2023

Merge pull request #232 from red031000/split

bca5e34

#208 split PR 2, rename fsys to fieldSystem

red031000 force-pushed the master branch from 75c3424 to 278e473 Compare August 22, 2023 11:45

adrienntindall added a commit that referenced this pull request Aug 24, 2023

Merge pull request #238 from red031000/split

745f855

#208 split PR 3, rename savedata to saveData

red031000 force-pushed the master branch from 278e473 to c5ff201 Compare August 25, 2023 20:44

PikalaxALT requested changes Aug 26, 2023

View reviewed changes

include/constants/std_script.h Outdated Show resolved Hide resolved

src/field/scrcmd_pokemon_misc.c Show resolved Hide resolved

red031000 force-pushed the master branch 2 times, most recently from 4c219bb to 6d1b845 Compare September 4, 2023 23:32

PikalaxALT previously requested changes Sep 8, 2023

View reviewed changes

include/constants/std_script.h Outdated Show resolved Hide resolved

include/fieldmap.h Outdated Show resolved Hide resolved

include/overlay_02.h Outdated Show resolved Hide resolved

red031000 force-pushed the master branch from 6d1b845 to 59f83f2 Compare September 9, 2023 21:20

red031000 added a commit to red031000/pokeheartgold that referenced this pull request Sep 12, 2023

pret#208 split PR 4, rename some misc funcs

6b4322a

adrienntindall added a commit that referenced this pull request Sep 17, 2023

Merge pull request #250 from red031000/split

feacd38

#208 split PR 4, rename some misc funcs

cleanup encounter.c

ef830ff

Up to Battle Random functions start cleaning up encounter.c fix build fix build again remove two files from bad rebase switch fully to battle type constants rename TRAINER to Trainer few more funcs finish cleanup address some review comments de-capitalise std_script

red031000 force-pushed the master branch from 59f83f2 to ef830ff Compare September 23, 2023 13:49

adrienntindall approved these changes Sep 30, 2023

View reviewed changes

adrienntindall merged commit 1e1d1e7 into pret:master Sep 30, 2023
1 check passed

github-actions bot pushed a commit that referenced this pull request Sep 30, 2023

Merge pull request #208 from red031000/master

496ddd3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

clean up encounter.c #208

clean up encounter.c #208

red031000 commented Aug 10, 2023

red031000 commented Aug 16, 2023

adrienntindall left a comment

adrienntindall left a comment

adrienntindall Aug 17, 2023

adrienntindall Aug 17, 2023

adrienntindall Aug 17, 2023

adrienntindall Aug 17, 2023

adrienntindall Aug 17, 2023

red031000 commented Sep 9, 2023

PikalaxALT commented Sep 9, 2023

red031000 commented Sep 9, 2023

adrienntindall commented Sep 30, 2023

		@@ -40,9 +40,9 @@ static BOOL ov36_App_InitGameState_AfterOakSpeech_AppExit(OVY_MANAGER* man, int*
		static BOOL ov36_TitleScreen_NewGame_AppInit(OVY_MANAGER* man, int* state);

		@@ -15,28 +15,28 @@
		BOOL ScrCmd_GetTrainerPathToPlayer(ScriptContext *ctx) {

clean up encounter.c #208

clean up encounter.c #208

Conversation

red031000 commented Aug 10, 2023

red031000 commented Aug 16, 2023

adrienntindall left a comment

Choose a reason for hiding this comment

adrienntindall left a comment

Choose a reason for hiding this comment

adrienntindall Aug 17, 2023

Choose a reason for hiding this comment

adrienntindall Aug 17, 2023

Choose a reason for hiding this comment

adrienntindall Aug 17, 2023

Choose a reason for hiding this comment

adrienntindall Aug 17, 2023

Choose a reason for hiding this comment

adrienntindall Aug 17, 2023

Choose a reason for hiding this comment

red031000 commented Sep 9, 2023

PikalaxALT commented Sep 9, 2023

red031000 commented Sep 9, 2023

adrienntindall commented Sep 30, 2023