Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

adrienntindall · 2023-06-03T08:00:25Z

No description provided.

Also made some _ctor and _new -> _New

This refers to the finger icon in the catching tutorial, I think Also got *some* documentation for UnkStruct_0200D748 done in the process

red031000

trying to think if there's a better name than battle_finger but I can't come up with one

src/overlay_12_0226BEC4.c

red031000 · 2023-06-04T13:27:21Z

src/overlay_12_0226BEC4.c

+    case 0:
+        GF_ASSERT(unkPtr != NULL);
+        {
+            NARC *bgHandleNarc = NARC_ctor(NARC_a_0_0_7, HEAP_ID_BATTLE);


ctor -> New

New or Open? Narcs are a lil different

either or, just not ctor

we'll just let the other PR deal with this for now since they've already changed quite a bit of the files, gonna keep making my way through the battle overlay

do we want to remove all the renamings in this PR then? as since it'll conflict with the other one

which renamings will conflict with the other PR? the _ctor to _New change is identical in both PRs so there should be no conflict, right? and the remaining changes here were left untouched in the other PR

thinking about it, I'm actually unsure if it will, there will be two commits making the same changes and I'm not 100% sure how git will handle it, it may just decide that the second commit is redundant and allow it to merge, or it may complain

I've just done some tests in a dumb repository and I had no issue merging identical PRs. The conflict appeared when the same line suffered different modifications in each PR (as in #150), but in this case we shouldn't have issues. Anyways, if @adrienntindall rebased the branch before merging the PR (which I believe is the cleanest option), then I think it's guaranteed that rest will be straightforward.

src/scrcmd_c.c

src/battle_finger.c

red031000 · 2023-06-04T13:36:08Z

src/battle_finger.c

+    }
+
+    if (finger->touchAnimationFlag == FALSE) {
+        int yOffset;


src/battle_finger.c

asm/battle_finger_data.s

Old (left) versus new (right) ov12_02248660 BattleContext_New ov12_02250F44 BattleContext_Init ov12_022486B0 BattleMain ov12_0223BD14 BattleSystem_GetWinLoseFlags ov12_0226CA90 sPlayerBattleCommands ov12_022486FC BattleContext_Delete ov12_0224BCC4 BattleSystem_CheckMoveHit ov12_0224C018 BattleSystem_CheckMoveEffect ov12_02248714 BattleSystem_CheckMoveHitEffect ov12_0224873C BattleControllerPlayer_GetBattleMon ov12_0224E4FC BattleSystem_GetBattleMon

ov12_02250370 BattleSystem_SetExperienceEarnFlags ov12_02250360 BattleSystem_ClearExperienceEarnFlags ov12_02255844 BattleSystem_GetHeldItemDamageBoost ov12_0226340C BattleController_SetMoveEffect

red031000 · 2023-06-05T16:49:34Z

include/battle_cursor.h

+void ov12_0226B97C(void *a0, u32 character, u32 pal, u32 cell, u32 animation);
+BattleCursor *ov12_0226B9A4(void *a0, void *a1, HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
+void ov12_0226BA28(BattleCursor *cursor);
+void ov12_0226BA4C(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, fx32 a9);


these ints should really be s32s for consistency sake

red031000 · 2023-06-05T16:49:46Z

include/battle_finger.h

+void BattleFinger_FreeResources(void *a0, u32 character, u32 pal, u32 cell, u32 animation);
+BattleFinger *BattleFinger_New(void *a0, void *a1, HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
+void BattleFinger_Delete(BattleFinger *finger);
+void ov12_0226BCFC(BattleFinger *finger, int x, int y, fx32 a3);


include/overlay_12_0224E4FC.h

include/overlay_12_0226BEC4.h

red031000 · 2023-06-05T16:53:02Z

src/battle_command.c

@@ -97,15 +97,15 @@ BOOL BtlCmd_PokemonSlideIn(BattleSystem *bsys, BATTLECONTEXT *ctx) {
                PokedexSetBattlerSeen(bsys, battlerId);
            }
        }
-        ov12_02250370(bsys, ctx, 1);
-        ov12_02250370(bsys, ctx, 3);
+        BattleSystem_SetExperienceEarnFlags(bsys, ctx, 1);


enum might be appropriate here instead of just numbers?

I tried, it lead to alot of issues elsewhere so I may just resign to using a define

src/battle_cursor.c

red031000 · 2023-06-05T16:54:13Z

src/battle_cursor.c

+
+//BattleCursor_Delete
+void ov12_0226BA28(BattleCursor *cursor) {
+    int i;


red031000 · 2023-06-05T16:54:37Z

src/battle_cursor.c

+}
+
+void ov12_0226BA4C(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, fx32 a9) {
+    int i;


s32 i (does this need to be defined here or can it be defined in the loop?

red031000 · 2023-06-05T16:54:59Z

src/battle_cursor.c

+    FreeToHeap(cursor);
+}
+
+void ov12_0226BA4C(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, fx32 a9) {


these params should probably be s32, as noted in the header

src/battle_cursor.c

aside from int -> s32 stuff since I don't like that very much

This reverts commit eda37c4.

adrienntindall added 6 commits June 3, 2023 02:18

Make HeapID an enum

8660536

Also made some _ctor and _new -> _New

Decompile overlay_12_0226BEC4

02c7656

Removed accidently commited files

952271e

overlay_12_0226BBC4 -> battle_finger

60fdb37

This refers to the finger icon in the catching tutorial, I think Also got *some* documentation for UnkStruct_0200D748 done in the process

Merge branch 'master' into master

6e1c87f

Fix warnings caused by merge

7818a8a

adrienntindall requested a review from red031000 June 4, 2023 12:41

red031000 requested changes Jun 4, 2023

View reviewed changes

adrienntindall added 2 commits June 5, 2023 00:15

Battle cursor 1, fix requested changes

9849bf0

decompile overlay_12_0226B8FC -> battle_cursor.c

9a3760b

adrienntindall requested a review from red031000 June 5, 2023 09:21

adrienntindall added 2 commits June 5, 2023 05:15

Some more documentation

10ee7dc

ov12_02250370 BattleSystem_SetExperienceEarnFlags ov12_02250360 BattleSystem_ClearExperienceEarnFlags ov12_02255844 BattleSystem_GetHeldItemDamageBoost ov12_0226340C BattleController_SetMoveEffect

red031000 requested changes Jun 5, 2023

View reviewed changes

adrienntindall added 3 commits June 5, 2023 15:36

Added second set of requested changes

c5e7412

aside from int -> s32 stuff since I don't like that very much

int -> s32

eda37c4

Revert "int -> s32"

7655a2d

This reverts commit eda37c4.

red031000 approved these changes Jun 6, 2023

View reviewed changes

red031000 merged commit 3e40bd3 into pret:master Jun 6, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

adrienntindall commented Jun 3, 2023

red031000 left a comment

red031000 Jun 4, 2023

adrienntindall Jun 4, 2023

red031000 Jun 4, 2023

adrienntindall Jun 5, 2023

red031000 Jun 5, 2023

Laquinh Jun 5, 2023 •

edited

Loading

red031000 Jun 5, 2023

Laquinh Jun 5, 2023 •

edited

Loading

red031000 Jun 4, 2023

red031000 Jun 5, 2023

red031000 Jun 5, 2023

red031000 Jun 5, 2023

adrienntindall Jun 5, 2023

red031000 Jun 5, 2023

red031000 Jun 5, 2023

red031000 Jun 5, 2023

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

Decompile overlay_12_0226BEC4, make HeapID into a proper enum #148

Conversation

adrienntindall commented Jun 3, 2023

red031000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Laquinh Jun 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Laquinh Jun 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Laquinh Jun 5, 2023 •

edited

Loading

Laquinh Jun 5, 2023 •

edited

Loading