Hello, thanks for the guide 🙂
I'm wondering if there's any information on merging pret's repo with this one. I'm somewhat lost on the merge conflicts, as there're many fields now identified but may or may not be 'obsolete'?
For example, in "include/battle.h", there's the following in "struct BattleStruct"
Code:
u8 field_180; // weird field, used in battle_main.c, once accessed as an array of u32 overwriting the field below
u8 field_181;
u8 field_182;
u8 field_183;
struct BattleEnigmaBerry battleEnigmaBerry;
In pret's repository, this has been identified as a union:
Code:
union {
struct LinkBattlerHeader linkBattlerHeader;
u32 battleVideo[2];
} multiBuffer;
Git creates a conflict with the definitions of "struct LinkBattlerHeader" and "struct Illusion". Since "field_180" is still used in "rh-hideout/master", the proper solution should be to include both changes?
On the other hand, I'm completely unsure how to handle this in "asm/macros/battle_scripts.inc":
Code:
<<<<<<< HEAD
+ .macro setembargo ptr
=======
+ .macro friendshiptodamagecalculation
>>>>>>> 5cb8ec424764845b1cb38871586346a885601b0f
.byte 0xb6
+ .4byte \ptr
.endm
Another conflict in "include/pokemon_icon.h":
Code:
<<<<<<< HEAD
+u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
+void FreeMonIconPalette(u16 species);
+void FreeAndDestroyMonIconSprite(struct Sprite *sprite);
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality);
=======
+ u8 CreateMonIconNoPersonality(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 handleDeoxys);
+ void FreeMonIconPalette(u16 species);
+ void FreeAndDestroyMonIconSprite(struct Sprite *sprite);
+ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 handleDeoxys);
>>>>>>> 5cb8ec424764845b1cb38871586346a885601b0f
Is the "handleDeoxys" parameter obsolete?
I'm wondering if there's existing information on these? There're still a lot of conflicts to go through 😅
