diff --git a/include/config/dexnav.h b/include/config/dexnav.h index c5531e18d2..c50345592c 100644 --- a/include/config/dexnav.h +++ b/include/config/dexnav.h @@ -5,7 +5,7 @@ #define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */ // 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_DETECTOR_MODE 0 // Allow player to find hidden mons #define VAR_DEXNAV_SPECIES 0 // Registered dexnav species diff --git a/include/dexnav.h b/include/dexnav.h index 520263c3cd..054878ea41 100644 --- a/include/dexnav.h +++ b/include/dexnav.h @@ -22,7 +22,7 @@ #define ENCOUNTER_TYPE_LAND 0 #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_LAND_COUNT 6 @@ -44,27 +44,25 @@ #define HA_INFO_Y (SEARCH_LEVEL_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_GFX_TAG 55130 #define SELECTION_CURSOR_TAG 0x4005 #define CAPTURED_ALL_TAG 0x4002 -//search tags +// Search tags #define OWNED_ICON_TAG 0x4003 #define HIDDEN_SEARCH_TAG SELECTION_CURSOR_TAG #define HIDDEN_MON_ICON_TAG 0x4006 #define LIT_STAR_TILE_TAG 0x4010 -//#define SIGHT_TAG 0x5424 #define HELD_ITEM_TAG 0xd750 -// dexnav search variable -#define DEXNAV_MASK_SPECIES 0x3FFF //first 14 bits -#define DEXNAV_MASK_ENVIRONMENT 0xC000 //last two bit +// Dexnav search variable +#define DEXNAV_MASK_SPECIES 0x3FFF // First 14 bits +#define DEXNAV_MASK_ENVIRONMENT 0xC000 // Last two bit -//funcs void EndDexNavSearch(u8 taskId); void Task_OpenDexNavFromStartMenu(u8 taskId); bool8 TryStartDexnavSearch(void); @@ -74,7 +72,6 @@ bool8 TryFindHiddenPokemon(void); u32 CalculateDexnavShinyRolls(void); void IncrementDexNavChain(void); -//ewram extern bool8 gDexnavBattle; -#endif //GUARD_DEXNAV_H +#endif // GUARD_DEXNAV_H diff --git a/include/field_effect.h b/include/field_effect.h index c8120ab99c..3db86bc219 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -51,5 +51,4 @@ void StartEscapeRopeFieldEffect(void); void FieldEffectFreeGraphicsResources(struct Sprite *sprite); void FieldEff_CaveDust(void); - #endif // GUARD_FIELD_EFFECTS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index d3ee8dfb6e..eca49f8a6a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -323,11 +323,11 @@ struct PlayerAvatar { /*0x00*/ u8 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. /*0x04*/ u8 spriteId; - /*0x05*/ u8 objectEventId:7; - u8 creeping:1; + /*0x05*/ u8 objectEventId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie diff --git a/include/party_menu.h b/include/party_menu.h index 5ce8997961..5236dd27a7 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -26,7 +26,6 @@ extern u8 gSelectedMonPartyId; extern MainCallback gPostMenuFieldCallback; extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE]; extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2]; -extern const struct SpriteSheet sSpriteSheet_HeldItem; extern const struct SpriteSheet gSpriteSheet_HeldItem; extern const u16 gHeldItemPalette[]; diff --git a/include/text_window.h b/include/text_window.h index ca6180b8a6..98776193f6 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -25,8 +25,6 @@ void rbox_fill_rectangle(u8 windowId); const u16 *GetTextWindowPalette(u8 id); const u16 *GetOverworldTextboxPalettePtr(void); void LoadSignPostWindowFrameGfx(void); - -//NEW void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset); #endif // GUARD_TEXT_WINDOW_H diff --git a/src/dexnav.c b/src/dexnav.c index 8fab671981..66b16296a4 100644 --- a/src/dexnav.c +++ b/src/dexnav.c @@ -61,7 +61,6 @@ #if DEXNAV_ENABLED STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0); -STATIC_ASSERT(FLAG_SYS_DEXNAV_GET != 0); STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0); STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0); STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0); @@ -389,17 +388,6 @@ static const struct SpriteTemplate sPotentialStarTemplate = .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 = { .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}; // search sprite sheets 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 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) { u16 tileX = sDexNavSearchDataPtr->tileX; @@ -2352,6 +2331,7 @@ static void DexNav_RunSetup(void) while (!DexNav_DoGfxSetup()) {} } +// Entry point for the dexnav GUI static void DexNavGuiInit(MainCallback callback) { if ((sDexNavUiDataPtr = AllocZeroed(sizeof(struct DexNavGUI))) == NULL) diff --git a/src/field_effect.c b/src/field_effect.c index e7d22aa05c..fad769fd2f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3927,7 +3927,6 @@ static void Task_MoveDeoxysRock(u8 taskId) } } -// new u8 FldEff_CaveDust(void) { u8 spriteId; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 7b086f3b8c..9abb81a18e 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -160,8 +160,6 @@ static bool32 IsMetatileLand(s16, s16, u32); static u8 TrySpinPlayerForWarp(struct ObjectEvent *, s16 *); -// .rodata - static bool8 (*const sForcedMovementTestFuncs[NUM_FORCED_MOVEMENTS])(u8) = { MetatileBehavior_IsTrickHouseSlipperyFloor, diff --git a/src/new_game.c b/src/new_game.c index 10dd82105b..0837475971 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -53,7 +53,7 @@ static void ClearFrontierRecord(void); static void WarpToTruck(void); static void ResetMiniGamesRecords(void); static void ResetItemFlags(void); -static void ResetDexnav(void); +static void ResetDexNav(void); EWRAM_DATA bool8 gDifferentSaveFile = FALSE; EWRAM_DATA bool8 gEnableContestDebugging = FALSE; @@ -208,7 +208,7 @@ void NewGameInitData(void) ResetTrainerHillResults(); ResetContestLinkResults(); ResetItemFlags(); - ResetDexnav(); + ResetDexNav(); } static void ResetMiniGamesRecords(void) @@ -226,7 +226,7 @@ static void ResetItemFlags(void) #endif } -static void ResetDexnav(void) +static void ResetDexNav(void) { #if USE_DEXNAV_SEARCH_LEVELS == TRUE memset(gSaveBlock3Ptr->dexNavSearchLevels, 0, sizeof(gSaveBlock3Ptr->dexNavSearchLevels)); diff --git a/src/start_menu.c b/src/start_menu.c index 8ed50c52d7..5e4849b26d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -67,7 +67,7 @@ enum MENU_ACTION_RETIRE_FRONTIER, MENU_ACTION_PYRAMID_BAG, MENU_ACTION_DEBUG, - MENU_ACTION_DEXNAV + MENU_ACTION_DEXNAV, }; // Save status @@ -333,7 +333,7 @@ static void BuildNormalStartMenu(void) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) 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); if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) diff --git a/src/text_window.c b/src/text_window.c index dcb1c2fe07..4a6f811282 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -211,4 +211,3 @@ void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset) LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset); LoadPalette(sDexnavWindowFrame.pal, palOffset, 32); } -