Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
ghoulslash 2024-10-18 22:13:49 -04:00
parent 99c3146288
commit 229525d122
12 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config/dexnav.h
View File

@ -5,7 +5,7 @@
#define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */ #define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */
// Flag/var defines // Flag/var defines
#define FLAG_SYS_DEXNAV_SEARCH 0 // Searching for mon. MUST BE DEFINED FOR DEXNAV TO WORK #define FLAG_SYS_DEXNAV_SEARCH 0 // Searching for mon
#define FLAG_SYS_DEXNAV_GET 0 // Dexnav shows in start menu #define FLAG_SYS_DEXNAV_GET 0 // Dexnav shows in start menu
#define FLAG_SYS_DETECTOR_MODE 0 // Allow player to find hidden mons #define FLAG_SYS_DETECTOR_MODE 0 // Allow player to find hidden mons
#define VAR_DEXNAV_SPECIES 0 // Registered dexnav species #define VAR_DEXNAV_SPECIES 0 // Registered dexnav species

19
include/dexnav.h
View File

@ -22,7 +22,7 @@
#define ENCOUNTER_TYPE_LAND 0 #define ENCOUNTER_TYPE_LAND 0
#define ENCOUNTER_TYPE_WATER 1 #define ENCOUNTER_TYPE_WATER 1
#define ENCOUNTER_TYPE_HIDDEN 2 //get from species #define ENCOUNTER_TYPE_HIDDEN 2 // Get from species
#define COL_WATER_COUNT 5 #define COL_WATER_COUNT 5
#define COL_LAND_COUNT 6 #define COL_LAND_COUNT 6
@ -44,27 +44,25 @@
#define HA_INFO_Y (SEARCH_LEVEL_Y + 24) #define HA_INFO_Y (SEARCH_LEVEL_Y + 24)
#define CHAIN_BONUS_Y (HA_INFO_Y + 24) #define CHAIN_BONUS_Y (HA_INFO_Y + 24)
#define MON_LEVEL_NONEXISTENT 255 //if mon not in area GetEncounterLevel returns this to exit the search #define MON_LEVEL_NONEXISTENT 255 // If mon not in area GetEncounterLevel returns this to exit the search
// gui tags // GUI tags
#define ICON_PAL_TAG 56000 #define ICON_PAL_TAG 56000
#define ICON_GFX_TAG 55130 #define ICON_GFX_TAG 55130
#define SELECTION_CURSOR_TAG 0x4005 #define SELECTION_CURSOR_TAG 0x4005
#define CAPTURED_ALL_TAG 0x4002 #define CAPTURED_ALL_TAG 0x4002
//search tags // Search tags
#define OWNED_ICON_TAG 0x4003 #define OWNED_ICON_TAG 0x4003
#define HIDDEN_SEARCH_TAG SELECTION_CURSOR_TAG #define HIDDEN_SEARCH_TAG SELECTION_CURSOR_TAG
#define HIDDEN_MON_ICON_TAG 0x4006 #define HIDDEN_MON_ICON_TAG 0x4006
#define LIT_STAR_TILE_TAG 0x4010 #define LIT_STAR_TILE_TAG 0x4010
//#define SIGHT_TAG 0x5424
#define HELD_ITEM_TAG 0xd750 #define HELD_ITEM_TAG 0xd750
// dexnav search variable // Dexnav search variable
#define DEXNAV_MASK_SPECIES 0x3FFF //first 14 bits #define DEXNAV_MASK_SPECIES 0x3FFF // First 14 bits
#define DEXNAV_MASK_ENVIRONMENT 0xC000 //last two bit #define DEXNAV_MASK_ENVIRONMENT 0xC000 // Last two bit
//funcs
void EndDexNavSearch(u8 taskId); void EndDexNavSearch(u8 taskId);
void Task_OpenDexNavFromStartMenu(u8 taskId); void Task_OpenDexNavFromStartMenu(u8 taskId);
bool8 TryStartDexnavSearch(void); bool8 TryStartDexnavSearch(void);
@ -74,7 +72,6 @@ bool8 TryFindHiddenPokemon(void);
u32 CalculateDexnavShinyRolls(void); u32 CalculateDexnavShinyRolls(void);
void IncrementDexNavChain(void); void IncrementDexNavChain(void);
//ewram
extern bool8 gDexnavBattle; extern bool8 gDexnavBattle;
#endif //GUARD_DEXNAV_H #endif // GUARD_DEXNAV_H

1
include/field_effect.h
View File

@ -51,5 +51,4 @@ void StartEscapeRopeFieldEffect(void);
void FieldEffectFreeGraphicsResources(struct Sprite *sprite); void FieldEffectFreeGraphicsResources(struct Sprite *sprite);
void FieldEff_CaveDust(void); void FieldEff_CaveDust(void);
#endif // GUARD_FIELD_EFFECTS_H #endif // GUARD_FIELD_EFFECTS_H

6
include/global.fieldmap.h
View File

@ -323,11 +323,11 @@ struct PlayerAvatar
{ {
/*0x00*/ u8 flags; /*0x00*/ u8 flags;
/*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags /*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x02*/ u8 runningState:7; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
u8 creeping:1;
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId; /*0x04*/ u8 spriteId;
/*0x05*/ u8 objectEventId:7; /*0x05*/ u8 objectEventId;
u8 creeping:1;
/*0x06*/ bool8 preventStep; /*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender; /*0x07*/ u8 gender;
/*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie

1
include/party_menu.h
View File

@ -26,7 +26,6 @@ extern u8 gSelectedMonPartyId;
extern MainCallback gPostMenuFieldCallback; extern MainCallback gPostMenuFieldCallback;
extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE]; extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE];
extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2]; extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
extern const struct SpriteSheet sSpriteSheet_HeldItem;
extern const struct SpriteSheet gSpriteSheet_HeldItem; extern const struct SpriteSheet gSpriteSheet_HeldItem;
extern const u16 gHeldItemPalette[]; extern const u16 gHeldItemPalette[];

2
include/text_window.h
View File

@ -25,8 +25,6 @@ void rbox_fill_rectangle(u8 windowId);
const u16 *GetTextWindowPalette(u8 id); const u16 *GetTextWindowPalette(u8 id);
const u16 *GetOverworldTextboxPalettePtr(void); const u16 *GetOverworldTextboxPalettePtr(void);
void LoadSignPostWindowFrameGfx(void); void LoadSignPostWindowFrameGfx(void);
//NEW
void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset); void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset);
#endif // GUARD_TEXT_WINDOW_H #endif // GUARD_TEXT_WINDOW_H

22
src/dexnav.c
View File

@ -61,7 +61,6 @@
#if DEXNAV_ENABLED #if DEXNAV_ENABLED
STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0); STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0);
STATIC_ASSERT(FLAG_SYS_DEXNAV_GET != 0);
STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0); STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0);
STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0); STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0);
STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0); STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0);
@ -389,17 +388,6 @@ static const struct SpriteTemplate sPotentialStarTemplate =
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
/*static const struct SpriteTemplate sSightTemplate =
{
.tileTag = SIGHT_TAG,
.paletteTag = 0xFFFF, //held item pal
.oam = &sSightOam,
.anims = sAnimCmdTable_Sight,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy,
};*/
static const struct SpriteTemplate sSearchIconSpriteTemplate = static const struct SpriteTemplate sSearchIconSpriteTemplate =
{ {
.tileTag = HIDDEN_SEARCH_TAG, .tileTag = HIDDEN_SEARCH_TAG,
@ -438,7 +426,6 @@ static const struct CompressedSpriteSheet sNoDataIconSpriteSheet = {sNoDataGfx,
static const struct CompressedSpriteSheet sCapturedAllPokemonSpriteSheet = {sCapturedAllMonsTiles, (8 * 8) / 2, CAPTURED_ALL_TAG}; static const struct CompressedSpriteSheet sCapturedAllPokemonSpriteSheet = {sCapturedAllMonsTiles, (8 * 8) / 2, CAPTURED_ALL_TAG};
// search sprite sheets // search sprite sheets
static const struct CompressedSpriteSheet sPotentialStarSpriteSheet = {sPotentialStarGfx, (8 * 8) / 2, LIT_STAR_TILE_TAG}; static const struct CompressedSpriteSheet sPotentialStarSpriteSheet = {sPotentialStarGfx, (8 * 8) / 2, LIT_STAR_TILE_TAG};
//static const struct CompressedSpriteSheet sSightSpriteSheet = {sEyeGfx, (16 * 8 * 3) / 2, SIGHT_TAG};
static const struct CompressedSpriteSheet sOwnedIconSpriteSheet = {sOwnedIconGfx, (8 * 8) / 2, OWNED_ICON_TAG}; static const struct CompressedSpriteSheet sOwnedIconSpriteSheet = {sOwnedIconGfx, (8 * 8) / 2, OWNED_ICON_TAG};
static const struct CompressedSpriteSheet sHiddenMonIconSpriteSheet = {sHiddenMonIconGfx, (8 * 8) / 2, HIDDEN_MON_ICON_TAG}; static const struct CompressedSpriteSheet sHiddenMonIconSpriteSheet = {sHiddenMonIconGfx, (8 * 8) / 2, HIDDEN_MON_ICON_TAG};
@ -936,14 +923,6 @@ static void DexNavDrawPotentialStars(u8 potential, u8* dst)
} }
} }
/*static void DexNavDrawSight(u8 sightLevel, u8* dst)
{
//LoadSpritePalette(&sHeldItemSpritePalette);
*dst = CreateSprite(&sSightTemplate, 176 + (16 / 2), GetSearchWindowY() + 18, 0);
if (*dst != MAX_SPRITES)
DexNavSightUpdate(sightLevel);
};*/
static void DexNavUpdateDirectionArrow(void) static void DexNavUpdateDirectionArrow(void)
{ {
u16 tileX = sDexNavSearchDataPtr->tileX; u16 tileX = sDexNavSearchDataPtr->tileX;
@ -2352,6 +2331,7 @@ static void DexNav_RunSetup(void)
while (!DexNav_DoGfxSetup()) {} while (!DexNav_DoGfxSetup()) {}
} }
// Entry point for the dexnav GUI
static void DexNavGuiInit(MainCallback callback) static void DexNavGuiInit(MainCallback callback)
{ {
if ((sDexNavUiDataPtr = AllocZeroed(sizeof(struct DexNavGUI))) == NULL) if ((sDexNavUiDataPtr = AllocZeroed(sizeof(struct DexNavGUI))) == NULL)

1
src/field_effect.c
View File

@ -3927,7 +3927,6 @@ static void Task_MoveDeoxysRock(u8 taskId)
} }
} }
// new
u8 FldEff_CaveDust(void) u8 FldEff_CaveDust(void)
{ {
u8 spriteId; u8 spriteId;

2
src/field_player_avatar.c
View File

@ -160,8 +160,6 @@ static bool32 IsMetatileLand(s16, s16, u32);
static u8 TrySpinPlayerForWarp(struct ObjectEvent *, s16 *); static u8 TrySpinPlayerForWarp(struct ObjectEvent *, s16 *);
// .rodata
static bool8 (*const sForcedMovementTestFuncs[NUM_FORCED_MOVEMENTS])(u8) = static bool8 (*const sForcedMovementTestFuncs[NUM_FORCED_MOVEMENTS])(u8) =
{ {
MetatileBehavior_IsTrickHouseSlipperyFloor, MetatileBehavior_IsTrickHouseSlipperyFloor,

6
src/new_game.c
View File

@ -53,7 +53,7 @@ static void ClearFrontierRecord(void);
static void WarpToTruck(void); static void WarpToTruck(void);
static void ResetMiniGamesRecords(void); static void ResetMiniGamesRecords(void);
static void ResetItemFlags(void); static void ResetItemFlags(void);
static void ResetDexnav(void); static void ResetDexNav(void);
EWRAM_DATA bool8 gDifferentSaveFile = FALSE; EWRAM_DATA bool8 gDifferentSaveFile = FALSE;
EWRAM_DATA bool8 gEnableContestDebugging = FALSE; EWRAM_DATA bool8 gEnableContestDebugging = FALSE;
@ -208,7 +208,7 @@ void NewGameInitData(void)
ResetTrainerHillResults(); ResetTrainerHillResults();
ResetContestLinkResults(); ResetContestLinkResults();
ResetItemFlags(); ResetItemFlags();
ResetDexnav(); ResetDexNav();
} }
static void ResetMiniGamesRecords(void) static void ResetMiniGamesRecords(void)
@ -226,7 +226,7 @@ static void ResetItemFlags(void)
#endif #endif
} }
static void ResetDexnav(void) static void ResetDexNav(void)
{ {
#if USE_DEXNAV_SEARCH_LEVELS == TRUE #if USE_DEXNAV_SEARCH_LEVELS == TRUE
memset(gSaveBlock3Ptr->dexNavSearchLevels, 0, sizeof(gSaveBlock3Ptr->dexNavSearchLevels)); memset(gSaveBlock3Ptr->dexNavSearchLevels, 0, sizeof(gSaveBlock3Ptr->dexNavSearchLevels));

4
src/start_menu.c
View File

@ -67,7 +67,7 @@ enum
MENU_ACTION_RETIRE_FRONTIER, MENU_ACTION_RETIRE_FRONTIER,
MENU_ACTION_PYRAMID_BAG, MENU_ACTION_PYRAMID_BAG,
MENU_ACTION_DEBUG, MENU_ACTION_DEBUG,
MENU_ACTION_DEXNAV MENU_ACTION_DEXNAV,
}; };
// Save status // Save status
@ -333,7 +333,7 @@ static void BuildNormalStartMenu(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKEDEX); AddStartMenuAction(MENU_ACTION_POKEDEX);
if (FlagGet(FLAG_SYS_DEXNAV_GET)) if (FLAG_SYS_DEXNAV_GET != 0 && FlagGet(FLAG_SYS_DEXNAV_GET))
AddStartMenuAction(MENU_ACTION_DEXNAV); AddStartMenuAction(MENU_ACTION_DEXNAV);
if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)

1
src/text_window.c
View File

@ -211,4 +211,3 @@ void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset)
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset);
LoadPalette(sDexnavWindowFrame.pal, palOffset, 32); LoadPalette(sDexnavWindowFrame.pal, palOffset, 32);
} }