[Pokeemerald] DexNav (with Detector Mode!)

[Metaright]

I apologize if this is too big of an ask, but I'm a novice when it comes to resolving merge conflicts, and would appreciate any guidance on these. These occurred when incorporating this into DizzyEgg's stuff. I've included my thoughts on each, to explain where my logic takes me. I guess it's not really important to explain, but I want to show a good effort that I'm trying to learn.

In

wild_encounter.c

Spoiler:

<<<<<<< HEAD
bool8 TryDoDoubleWildBattle(void)
{
    if (GetSafariZoneFlag() || GetMonsStateToDoubles() != PLAYER_HAS_TWO_USABLE_MONS)
        return FALSE;
    else if (B_FLAG_FORCE_DOUBLE_WILD != 0 && FlagGet(B_FLAG_FORCE_DOUBLE_WILD))
        return TRUE;
    #if B_DOUBLE_WILD_CHANCE != 0
    else if ((Random() % 100) + 1 < B_DOUBLE_WILD_CHANCE)
        return TRUE;
    #endif
    return FALSE;
}
=======
u8 ChooseHiddenMonIndex(void)
{
    #ifdef ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL
        u8 rand = Random() % ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL;

        if (rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0)
            return 0;
        else if (rand >= ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0 && rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_1)
            return 1;
        else
            return 2;
    #else
        return 0xFF;
    #endif
}

>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

This one baffles me because it doesn't seem like the bits of code actually conflict with each other at all.

In

wild_encounter.h

Spoiler:

<<<<<<< HEAD
bool8 TryDoDoubleWildBattle(void);
=======
void CreateWildMon(u16 species, u8 level);
u16 GetCurrentMapWildMonHeaderId(void);
u8 ChooseWildMonIndex_Land(void);
u8 ChooseWildMonIndex_WaterRock(void);
u8 ChooseHiddenMonIndex(void);
>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

This one seems related to

wild_encounter.c

. My very hazy guess is that both "TryDoDoubleWildBattle" and "ChooseHiddenMonIndex" etc. need to be defined somehow, and they're taking up the same space? I'm probably really off, but that's what my amateurish intuition tells me.

In

pokemon.c

Spoiler:

<<<<<<< HEAD
              | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
              | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
              | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
        
        if (CheckBagHasItem(ITEM_SHINY_CHARM, 1))
        {
            u32 shinyValue;
            u32 rolls = 0;
            do
            {
                personality = Random32();
                shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality);
                rolls++;
            } while (shinyValue >= SHINY_ODDS && rolls < I_SHINY_CHARM_REROLLS);
        }
    }

=======
                  | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
                  | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
                  | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
                  
        if (FlagGet(FLAG_SHINY_CREATION))
        {
            u8 nature = personality % NUM_NATURES;  // keep current nature
            do {
                personality = Random32();
                personality = ((((Random() % SHINY_ODDS) ^ (HIHALF(value) ^ LOHALF(value))) ^ LOHALF(personality)) << 16) | LOHALF(personality);
            } while (nature != GetNatureFromPersonality(personality));
        }
    }
    
>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

I'm assuming this is mainly about generating shinies, but I don't see why these conflict. Is it because merging them is making the if-statements nest incorrectly, perhaps?

In

pokemon.h

Spoiler:

<<<<<<< HEAD
            u8 flags;
};
=======
 /* 0x1A */ u8 abilityHidden;
}; /* size = 28 */
>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

I'm wondering if this the root of why

wild_encounter.h

was breaking.

In

global.h

Spoiler:

<<<<<<< HEAD
    /*0x3???*/ u8 dexSeen[DEX_FLAGS_NO];
    /*0x3???*/ u8 dexCaught[DEX_FLAGS_NO];
    /*0x3???*/ u32 trainerHillTimes[4];
    /*0x3???*/ struct RamScript ramScript;
    /*0x3???*/ struct RecordMixingGift recordMixingGift;
    /*0x3???*/ LilycoveLady lilycoveLady;
    /*0x3???*/ struct TrainerNameRecord trainerNameRecords[20];
    /*0x3???*/ u8 registeredTexts[UNION_ROOM_KB_ROW_COUNT][21];
    /*0x3???*/ struct SaveTrainerHill trainerHill;
    /*0x3???*/ struct WaldaPhrase waldaPhrase;
    // sizeof: 0x3???
=======
    /*0x3598*/ u8 field_3598[0x180];
    /*0x3718*/ u32 trainerHillTimes[4];
    /*0x3728*/ struct RamScript ramScript;
    /*0x3B14*/ struct RecordMixingGift recordMixingGift;
    /*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
    /*0x3B58*/ LilycoveLady lilycoveLady;
    /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
    /*0x3C88*/ u8 registeredTexts[UNION_ROOM_KB_ROW_COUNT][21];
    /*0x3D5A*/ u8 filler3D5A[0xA];
    /*0x3D64*/ struct SaveTrainerHill trainerHill;
    /*0x3D70*/ struct WaldaPhrase waldaPhrase;
               u8 dexNavSearchLevels[NUM_SPECIES];
               u8 dexNavChain;
    // sizeof: 0x3D88
>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

My first thought was that these "struct" lines are trying to take the same place in the data, and I just need to make room for them all somehow?

Finally, in

build.yml

Spoiler:

<<<<<<< HEAD
      - name: Agbcc
        run: make -j${nproc} 

      - name: Modern
        run: make -j${nproc} modern
=======
      - name: Compare
        run: make -j${nproc} all syms

      - name: Modern
        env:
          MODERN: 1
          COMPARE: 0
        run: make -j${nproc} all

      - name: Webhook
        if: ${{ github.event_name == 'push' }}
        env:
          CALCROM_DISCORD_WEBHOOK_USERNAME: OK
          CALCROM_DISCORD_WEBHOOK_AVATAR_URL: https://i.imgur.com/38BQHdd.png
          CALCROM_DISCORD_WEBHOOK_URL: ${{ secrets.CALCROM_DISCORD_WEBHOOK_URL }}
        run: sh .github/calcrom/webhook.sh pokeemerald

      - name: Move symfiles
        if: ${{ github.event_name == 'push' }}
        run: |
          cp -v *.sym symbols/

      - name: Update symfiles
        if: ${{ github.event_name == 'push' }}
        uses: EndBug/add-and-commit@v7
        with:
          branch: symbols
          cwd: "./symbols"
          add: "*.sym"
          message: ${{ github.event.commits[0].message }}
>>>>>>> 53e6ba1c4867d00813062981ff15a9ca02209dd8

I have no idea about this one.

Aside from these, there were a couple (namely

battle_message.c

and

battle_main.c

where I think the solution was just to replace the old code with the new code.

Anyway, I would appreciate any guidance on these, as well as any further explanation for what the code does and why it conflicts.

 

[ghoulslash]

-

No problem! It is sometimes tough to determine what code to keep. From what I can tell:

• wild_encounter.c - keep both parts of the conflict
• wild_encounter.h - keep both parts of the conflit
• pokemon.c - this one is tricky because you need parts of both. I just pushed an update to the dexnav branch to handle the shiny charm, so if you pull again you would want to keep the stuff with FlagGet(FLAG_CHINY_CREATION) only.
• pokemon.h - RHH changed how hidden abilities work - I've just updated the branch to handle this as well
• global.h - you want to keep dexNavSearchLevels and dexNavChain, so the bottom part of the conflicts :)
• build.yml - To be honest I have no idea, but I would see what that file looks like in pret and choose whatever conflict matches their repo

Hope this helps!

 

[tahayarkhan]

Can you create a dexnav patch cuz it is so much difficult for me to implement in my Rom I have found firered patch but can't find emerald so please give me dex nav patch for emerald

 

[ghoulslash]

Can you create a dexnav patch cuz it is so much difficult for me to implement in my Rom I have found firered patch but can't find emerald so please give me dex nav patch for emerald

This feature is not for binary hacking.

 

[trikop]

Can you create a dexnav patch cuz it is so much difficult for me to implement in my Rom I have found firered patch but can't find emerald so please give me dex nav patch for emerald

You might have confused decomp romhacking with binary romhacking. You don't "patch" roms when working with decomps
EDIT: Oops someone already posted a response before i posted haha

 

[STikER]

Does it require a lot of edits to make DexNav accessible from PokeNav instead of the start menu?
I don't wanna bother anyone with doing this for me, but I doubt I have enough proficiency in C ('cuz I don't have any :P) to be able to implement this all on my own.
So, what things should be changed?

 

[tahayarkhan]

don't worry I've got the R.O.W.E source file where this is included right hour later I post this request thank you

 

[ghoulslash]

Does it require a lot of edits to make DexNav accessible from PokeNav instead of the start menu?
I don't wanna bother anyone with doing this for me, but I doubt I have enough proficiency in C ('cuz I don't have any :P) to be able to implement this all on my own.
So, what things should be changed?

Adding a new pokenav tab would be difficult, replacing an existing tab would be easier, but still challenging. I can help with the latter, having done that in Pokemon Voyager myself. Feel free to contact me on discord (same username) if you want :)

 

[thespbgamer]

Just a question ghoulslash, I got the newer version of pokeemerald, and merge your following branches by this order:
saveblock -> dexnav -> item_dec

And the save ALWAYS gets corrupted, any tips on that ?

 

[retrogba]

[
[*]A dexNavSearchLevels field has been added to saveblock1. It requires a byte per pokemon, so by default there is not enough space in any saveblock for such a large structure.

Hi Ghoul - when determining the size needed for the saveblock, how does this count pokemon? For example, I've pulled in the RHH Pokemon Expansion, but I only plan on having 400 mons in the dex (but leaving the rest in the code). Would it require 1 byte for each of the ~900 mons in the PokemonExpansion, or would it only track the 400 that were declared in the dex? Or is it basing it off what's been set up in wild encounters only, and thus using even less space?

EDIT: Answered on the discord! Thanks.

 

[laser_dolphin]

Could you please post the answer here as well as it is valuable information.
I'd also like to know how it is calculated.

EDIT: Answered on the discord! Thanks.

In the struct SaveBlock1 you got u8 dexNavSearchLevels[NUM_SPECIES]; which means that for each species you need one Byte.
You also have to consider whether or not you internally consider forms as their own species because then they also take a Byte each.

Thanks to SBird and ghoulslash for the answer.

 

[doejohn126]

When compiling I kept getting errors like this "src/battle_util.c: In function `GetBattlerFriendshipScore':
src/battle_util.c:2075: structure has no member named `flags'". Usually the line has a .flags.

 

[Lunos]

When compiling I kept getting errors like this "src/battle_util.c: In function `GetBattlerFriendshipScore':
src/battle_util.c:2075: structure has no member named `flags'". Usually the line has a .flags.

Sounds like a bad merge of the feature in a project using the expansion, completely unrelated to the DexNav itself.
The GetBattlerFriendshipScore uses species flags, which are declared in the SpeciesInfo struct at include/pokemon.h, so make sure the variable is present there.
https://github.com/rh-hideout/pokeemerald-expansion/blob/upcoming/include/pokemon.h#L334

 

[ShyShy]

how to enable detector mode?

 

[Lunos]

how to enable detector mode?

[*]Detector mode is inaccessible until FLAG_SYS_DETECTOR_MODE is manually set. Until then, ?? icons will appear on the GUI even if the hidden pokemon species has been seen/caught.

If you check the code changes this feature branch makes, you'll see that FLAG_SYS_DETECTOR_MODE is a regular script flag.
You can set it wherever you want. A script the Player is always bound to activate in their playthrough, EventScript_ResetAllMapFlags which is a script that triggers whenever you pick New Game, etc.