Adding a New Source File

blakcat said:

I'm trying to add a new source file to the build; I followed the instructions here (just this section) to add the files to ld_script.txt, but I still get <function> used but not defined (it's declared in the .h file and used elsewhere) -- the .c implementation doesn't seem to be included.

Anyone know how to add a new .c implementation correctly?

Thanks in advance :)

Click to expand...

blakcat said:

Thanks for the reply!

(moved this bit into a spoiler because I've been able to move past this piece of the issue.)

Spoiler:

I moved all the code into the .h file while I was waiting (just to try something), and was able to compile, somewhat. I have since moved the code back to my new .c file, but it still doesn't work:

Code:

Assembler messages:
Error: can't open src/data/random_party.s for reading: No such file or directory
Makefile:274: recipe for target 'build/emerald/src/data/random_party.o' failed

(I have no clue how to deal with this, unfortunately.)

---

In terms of including the .h file, I do see it included. I even commented out the include in the spot where I call my functions, and the errors change to the following (as expected):

Code:

src/battle_main.c: In function `CreateNPCTrainerParty':
src/battle_main.c:1916: warning: implicit declaration of function `Test'

Which, to me, means it WAS being included properly, but it still doesn't explain why I still can't link/compile/etc. after adding the files to ld_script.txt.


Any further ideas are appreciated :)

---

Edit: do I need to add my new file under .text, .rodata, or both? Am I missing any other sections?

Also note that I deliberately took out a comma in my new .c file to cause a syntax error, but the compiler DOES NOT pick it up -- it seems to be ignoring that file, but I can't figure out why...

In the meantime, I'm stuck with a bunch of these warnings:

Code:

include/test.h:19: warning: 'Test' used but never defined

Click to expand...

blakcat said:

I get the feeling this is the root of my problems:

Code:

Assembler messages:
Error: can't open src/random_party.s for reading: No such file or directory
Makefile:274: recipe for target 'build/emerald/src/test.o' failed

Here's how everything is set up:
src/test.c

Spoiler:

Code:

#include "battle_script_commands.h"
#include "new_game.h"
#include "random_party.h"
#include "reverse_evolution.h"
#include "constants/pokemon.h"

//imports for printing to the console
#include "mgba.h"
#include "printf.h"
#include "../gflib/string_util.h"


static void SeedPkmnGenRng(u32 randomness);
static u8 CustomRnd(void);
static void ShuffleTypes(void);
static u32 PickRndSpecies(u8 partyIndex, u8 trainerClass, u8 teamLevel);


const struct TrainerPkmnTypes gTrainerTypeTable[] =
{
    {TRAINER_CLASS_LASS,            TYPE_NONE, TYPE_NONE, TYPE_NONE}             // <-- intentionally removed comma; doesn't produce error
    {TRAINER_CLASS_BUG_CATCHER,     TYPE_BUG, TYPE_NONE, TYPE_NONE},
    //...
    {TRAINER_CLASS_HIKER,           TYPE_GROUND, TYPE_ROCK, TYPE_NONE},
    {TRAINER_CLASS_YOUNG_COUPLE,    TYPE_NONE, TYPE_NONE, TYPE_NONE},
    {TRAINER_CLASS_WINSTRATE,       TYPE_DRAGON, TYPE_NONE, TYPE_NONE},
    {TRAINER_CLASS_PKMN_TRAINER_2,  TYPE_NONE, TYPE_NONE, TYPE_NONE},
    {0xFF,                          TYPE_NONE, TYPE_NONE, TYPE_NONE},
};

//...other constants

#define TYPE_PROB_LEN   24
EWRAM_DATA u8 gPartyTypes[PARTY_SIZE] = {1};
const u8 gTypeProbabilityList[TYPE_PROB_LEN] =
{
    TYPE_FIRE,
    TYPE_WATER, 
    //...
};

#define NUM_SEEDS   6 
EWRAM_DATA u32 sRandSeed[NUM_SEEDS] = {0};

static u8 CustomRnd(void)
{
    u8 retval;
    u8 seedIndex = (sRandIndex / 4) % NUM_SEEDS;
    u8 byteIndex = sRandIndex % 4;
    u32 bitMask = 0xFF << (byteIndex * 8);

    retval = (sRandSeed[seedIndex] & bitMask) >> (byteIndex * 8);
    sRandIndex++;

    mgba_printf(MGBA_LOG_ERROR, "CustomRnd %u 0x%X", retval, retval);
    mgba_printf(MGBA_LOG_DEBUG, "sRandIndex: %u; seed-value: 0x%X", sRandIndex, sRandSeed[seedIndex]);
    mgba_printf(MGBA_LOG_DEBUG, "seedIndex: %u; byteIndex: %u; bitMask: 0x%X", seedIndex, byteIndex, bitMask);

    return retval;
}

//...other functions

src/includes/test.h

Spoiler:

Code:

#ifndef GUARD_TEST_H
#define GUARD_TEST_H

static u8 CustomRnd(void);
//...other function declarations

struct TrainerPkmnTypes
{
    u8 classId;
    u8 type1;
    u8 type2;
    u8 type3;
};

#endif

src\battle_main.c

Spoiler:

Code:

#include "test.h"

//...

static u8 CreateNPCTrainerParty(struct Pokemon* party, u16 trainerNum, bool8 firstTrainer)
{
    u32 nameHash = 0;
    u8 nameLen = 0;
    u32 personalityValue;
    u8 fixedIV;
    s32 i, j;
    u8 monsCount;
    u32 species;

    mgba_printf(MGBA_LOG_WARN, "Creating party...");

    if (trainerNum == TRAINER_SECRET_BASE)
        return 0;

    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER
                                                                        | BATTLE_TYPE_EREADER_TRAINER
                                                                        | BATTLE_TYPE_TRAINER_HILL)))
    {
        if(firstTrainer == TRUE)
            ZeroEnemyPartyMons();

        if(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
        {
            if (gTrainers[trainerNum].partySize > 3)
                monsCount = 3;
            else
                monsCount = gTrainers[trainerNum].partySize;
        }
        else if(GetTeamLevel() > 20)
        {
            monsCount = 4 + CustomRnd() % 3;                // <-- new code being used
        }
        else
        {
            monsCount = gTrainers[trainerNum].partySize;
        }
    }

    //...
}

All the code has been tested inside src\battle_main.c and works, but when I tried to split it into a new file, it doesn't seem to be included in with the build (I assume it's the reason the .s file can't be found, per the error at the top.)


Thanks again for all the help! :)

Click to expand...

Anon822 said:

CustomRnd cannot be used outside test.c because it's declared as static.

Click to expand...

Assembler messages:
Error: can't open src/test.s for reading: No such file or directory
Makefile:274: recipe for target 'build/emerald/src/test.o' failed

blakcat said:

Well, I feel stupid. 😅😱 (I had even looked up what static means, but obviously picked the wrong resource). I removed all the static references, but the .c file is STILL not being compiled 🙄🙄.

Spoiler:

Code:

Assembler messages:
Error: can't open src/test.s for reading: No such file or directory
Makefile:274: recipe for target 'build/emerald/src/test.o' failed

Click to expand...

#include "global.h"

EWRAM_DATA u32 variable = 0;
u8 testfunc(void){
    return 0;
}

u8 testfunc(void);

@@ -335,6 +335,7 @@ SECTIONS {
         src/gym_leader_rematch.o(.text);
         src/battle_transition_frontier.o(.text);
         src/international_string_util.o(.text);
[COLOR="Lime"]+		src/test.o(.text);[/COLOR]
     } =0
 
     script_data :
@@ -695,6 +696,7 @@ SECTIONS {
         data/mystery_gift.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
[COLOR="Lime"]+		src/test.o(.rodata);[/COLOR]
     } =0

@@ -148,3 +148,4 @@
 	.include "src/faraway_island.o"
 	.include "src/trainer_hill.o"
 	.include "src/rayquaza_scene.o"
[COLOR="Lime"]+	.include "src/test.o"[/COLOR]

blakcat said:

Edit: I also don't see a file named pokeemerald.map (I ran find . -name "pokeemerald.map" with no results).

Click to expand...