Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Dexnav #4818

Merged
merged 70 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5e948e7
add dexnav
Apr 2, 2021
3c4bf80
merge with pret
May 18, 2021
abe68b7
incremement dexnav chain fix
May 18, 2021
ccb17e9
check encounter rate in DexNavLoadEncounterData as added check
May 21, 2021
0c14ec4
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Jun 11, 2021
5fd40d9
add forgotten TryIncrementSpeciesSearchLevel call
Jun 11, 2021
c01ad82
fix some text color labels, add creeping back
Jun 11, 2021
7405c11
add r to search
Jun 16, 2021
8010fac
reset dexnav search when crossing maps
Jun 16, 2021
608dd9d
add shiny chaining
Jun 17, 2021
f007bef
cleaner dexnav egg move generation
Jun 17, 2021
705e79b
Msgbox fixes
Jaizu Jun 17, 2021
5d63d27
add hidden encounters to wild_encounters json
Jun 17, 2021
7862a7d
Merge pull request #13 from Jaizu/patch-17
ghoulslash Jun 17, 2021
5da18d9
add TryFindHiddenPokemon back in
Jun 18, 2021
fbdbc33
fix dexnav headerId overflow issue
Jun 27, 2021
53e6ba1
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Jun 27, 2021
1898a1c
add shiny charm check to handle FLAG_SHINY_CREATION
Aug 7, 2021
b903d02
handle battle engine hidden ability change
Aug 7, 2021
019a582
replace level bonus with current chain
Aug 19, 2021
03fa493
merge with pret
Aug 19, 2021
222d1d3
merge with pret
Oct 26, 2021
eee3f5b
merge w pret
Nov 5, 2021
fdaa979
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Nov 9, 2021
9c4d574
some fixes
Nov 9, 2021
6b360ac
fix potential to perfect ivs
Nov 18, 2021
6f6ed0a
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Nov 28, 2021
3c72283
update functions
Nov 28, 2021
ad514cf
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Dec 20, 2021
9c67ec3
Fixed icons showing when there's no encounters in the map
AsparagusEduardo Mar 20, 2022
279f596
Merge pull request #16 from AsparagusEduardo/dexnav_fix
ghoulslash Mar 21, 2022
6420e2c
dexnav fix shiny rate
Jun 24, 2022
7194c27
Merge branch 'dexnav' of github.com:ghoulslash/pokeemerald into dexnav
Jun 24, 2022
deddda4
merge w pret
Jul 30, 2022
c7c7a76
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
Aug 4, 2022
a5773a4
fix function names to match pret
Aug 4, 2022
4775e03
merge w pret
Oct 17, 2022
7431044
dont open dexnav from start menu if map has no encounters
Oct 17, 2022
e1021af
fix MapHasNoEncounterData
Oct 19, 2022
3c2bf0b
Renamed functions to match current pret counterparts, changed IsEleva…
pkmnsnfrn Feb 4, 2023
0790882
Merged with pret
pkmnsnfrn Feb 4, 2023
6e12458
Clean up swp files
pkmnsnfrn Feb 4, 2023
0fcf48b
Merge pull request #20 from PokemonSanFran/dexnav
ghoulslash Feb 8, 2023
7d01052
merge w master
Apr 16, 2023
01a91c4
reset gDexnavBattle in FreeResetData_ReturnToOvOrDoEvolutions
Aug 17, 2023
652cb00
merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag
Jun 16, 2024
cb16963
merge in original dexnav code with some rhh specific tweaks
Jun 16, 2024
48d2bff
merge w upcoming
Jul 8, 2024
bd014e4
syntax, alignment fixes
Jul 8, 2024
2e52e33
merge w upcoming
Oct 4, 2024
a6a6737
some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls
Oct 4, 2024
cf78462
merge w upcoming
Oct 16, 2024
bb78d45
some fixes
Oct 16, 2024
43f184d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Oct 16, 2024
5448459
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Oct 19, 2024
cb9f1f2
move dexnav flags, vars to config, add DEXNAV_ENABLED config to add s…
Oct 19, 2024
99c3146
add mgba error if opening dexnav when DEXNAV_ENABLED if false
Oct 19, 2024
229525d
some cleanup
Oct 19, 2024
4fc07c4
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Oct 20, 2024
31fe638
handle some suggestions
Oct 20, 2024
b488ff9
merge w upcoming
Nov 3, 2024
de9c6ea
remove unecessary preprocs, comment fixes
Nov 3, 2024
57225e8
some more fixes
Nov 3, 2024
931a05f
Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald…
Nov 11, 2024
418d127
initialize weight in inner loop of DexNavPickTile
Nov 11, 2024
6f78288
fix dexNavSearchLevels array size
Nov 14, 2024
d8ea4fa
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Jan 2, 2025
85787aa
add moves.h
Jan 2, 2025
7a9e847
some clean up
Jan 2, 2025
9707d09
some more Dexnav -> DexNav
Jan 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/event_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -1150,3 +1150,5 @@ EventScript_VsSeekerChargingDone::
.include "data/scripts/follower.inc"
.include "data/text/save.inc"
.include "data/text/birch_speech.inc"
.include "data/scripts/dexnav.inc"

ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
21 changes: 13 additions & 8 deletions data/field_effect_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH
.4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS
.4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS
.4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS
.4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2
.4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND
.4byte gFieldEffectScript_ShakingGrass @ FLDEFF_SHAKING_GRASS
.4byte gFieldEffectScript_ShakingGrass2 @ FLDEFF_SHAKING_LONG_GRASS
.4byte gFieldEffectScript_UnusedSand @ FLDEFF_SAND_HOLE
.4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING
.4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
.4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS
Expand Down Expand Up @@ -79,7 +79,8 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_TracksSlither @ FLDEFF_TRACKS_SLITHER
.4byte gFieldEffectScript_TracksBug @ FLDEFF_TRACKS_BUG
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT

.4byte gFieldEffectScript_CaveDust @ FLDEFF_CAVE_DUST

gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon
field_eff_end
Expand Down Expand Up @@ -156,12 +157,12 @@ gFieldEffectScript_JumpLongGrass::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
field_eff_end

gFieldEffectScript_UnusedGrass::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
gFieldEffectScript_ShakingGrass::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShakingGrass
field_eff_end

gFieldEffectScript_UnusedGrass2::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
gFieldEffectScript_ShakingGrass2::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShakingGrass2
field_eff_end

gFieldEffectScript_UnusedSand::
Expand Down Expand Up @@ -374,3 +375,7 @@ gFieldEffectScript_TracksSpot::
gFieldEffectScript_TracksSlither::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither
field_eff_end

gFieldEffectScript_CaveDust::
field_eff_loadfadedpal_callnative gSpritePalette_CaveDust FldEff_CaveDust
field_eff_end
47 changes: 47 additions & 0 deletions data/scripts/dexnav.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
EventScript_StartDexNavBattle::
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
lock
playse 0x15
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
applymovement OBJ_EVENT_ID_PLAYER Common_Movement_ExclamationMark
waitmovement 0
waitse
dowildbattle
release
end

ghoulslash marked this conversation as resolved.
Show resolved Hide resolved

EventScript_NotFoundNearby::
msgbox sText_NotFoundNearby, MSGBOX_SIGN
end
sText_NotFoundNearby:
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
.string "It couldn't be found nearby.\n"
.string "Try looking in a different area!$"


EventScript_MovedTooFast::
msgbox sText_TryMovingSlower, MSGBOX_SIGN
end
sText_TryMovingSlower:
.string "The Pokémon got away!\n"
.string "Try moving more slowly.$"


EventScript_PokemonGotAway::
msgbox sText_PokemonGotAway, MSGBOX_SIGN
end
sText_PokemonGotAway:
.string "The Pokémon got away!$"


EventScript_LostSignal::
msgbox sText_LostSignal, MSGBOX_SIGN
end
sText_LostSignal:
.string "There is no reaction.\n"
.string "The signal was lost!$"


EventScript_TooDark::
msgbox sText_TooDark, MSGBOX_SIGN
end
sText_TooDark:
.string "It's too dark to search\nfor a Pokémon!$"
Binary file added graphics/dexnav/captured_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/dexnav/gui.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
217 73 73
4 4 4
1 81 113
1 121 193
119 177 75
93 97 101
91 179 211
153 32 32
111 141 81
173 173 173
187 217 167
75 147 189
177 219 235
105 22 22
Binary file added graphics/dexnav/gui_tilemap.bin
Binary file not shown.
Binary file added graphics/dexnav/gui_tiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/hidden.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/hidden_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/no_data.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/owned_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dexnav/vision.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/field_effects/palettes/cave_dust.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 1 255
159 122 85
207 189 157
199 181 149
114 88 61
132 101 70
199 173 141
225 209 193
189 165 133
181 149 115
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
Binary file added graphics/field_effects/pics/cave_dust.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/text_window/dexnav_pal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 6
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
46 46 46
0 0 0
255 255 255
65 changes: 65 additions & 0 deletions include/config/dexnav.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#ifndef GUARD_CONFIG_DEXNAV_H
#define GUARD_CONFIG_DEXNAV_H


#define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: EXCEEDS SAVEBLOCK SPACE! YOU WILL NEED TO FREE UP SPACE */
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved

// search parameters
#define DEXNAV_TIMEOUT 15 //15 seconds is the time out. Max of 1092 seconds allowed
#define SNEAKING_PROXIMITY 4 //Tile amount
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
#define CREEPING_PROXIMITY 2
#define MAX_PROXIMITY 20

#define DEXNAV_CHAIN_MAX 100 // maximum chain value

//hidden pokemon options - no info so I just guessed at values
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
#define HIDDEN_MON_STEP_COUNT 100 //look for hidden pokemon every x steps
#define HIDDEN_MON_SEARCH_RATE 25 //x% chance of finding hidden pokemon every x steps
#define HIDDEN_MON_PROBABILTY 15 //x% chance of finding hidden mon compared to regular encounter data
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved

//// SEARCH PROBABILITIES
// see https://m.bulbapedia.bulbagarden.net/wiki/DexNav#Benefits
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
//Chance of encountering egg move at search levels
#define SEARCHLEVEL0_MOVECHANCE 0
#define SEARCHLEVEL5_MOVECHANCE 21
#define SEARCHLEVEL10_MOVECHANCE 46
#define SEARCHLEVEL25_MOVECHANCE 58
#define SEARCHLEVEL50_MOVECHANCE 63
#define SEARCHLEVEL100_MOVECHANCE 83
//Chance of encountering Hidden Abilities at search levels
#define SEARCHLEVEL0_ABILITYCHANCE 0
#define SEARCHLEVEL5_ABILITYCHANCE 0
#define SEARCHLEVEL10_ABILITYCHANCE 5
#define SEARCHLEVEL25_ABILITYCHANCE 15
#define SEARCHLEVEL50_ABILITYCHANCE 20
#define SEARCHLEVEL100_ABILITYCHANCE 23
//Chance of encountering held item
#define SEARCHLEVEL0_ITEM 0
#define SEARCHLEVEL5_ITEM 0
#define SEARCHLEVEL10_ITEM 1
#define SEARCHLEVEL25_ITEM 7
#define SEARCHLEVEL50_ITEM 6
#define SEARCHLEVEL100_ITEM 12
//Chance of encountering one star potential
#define SEARCHLEVEL0_ONESTAR 0
#define SEARCHLEVEL5_ONESTAR 14
#define SEARCHLEVEL10_ONESTAR 17
#define SEARCHLEVEL25_ONESTAR 17
#define SEARCHLEVEL50_ONESTAR 15
#define SEARCHLEVEL100_ONESTAR 8
//Chance of encountering two star potential
#define SEARCHLEVEL0_TWOSTAR 0
#define SEARCHLEVEL5_TWOSTAR 1
#define SEARCHLEVEL10_TWOSTAR 9
#define SEARCHLEVEL25_TWOSTAR 16
#define SEARCHLEVEL50_TWOSTAR 17
#define SEARCHLEVEL100_TWOSTAR 24
//Chance of encountering three star potential
#define SEARCHLEVEL0_THREESTAR 0
#define SEARCHLEVEL5_THREESTAR 0
#define SEARCHLEVEL10_THREESTAR 1
#define SEARCHLEVEL25_THREESTAR 7
#define SEARCHLEVEL50_THREESTAR 6
#define SEARCHLEVEL100_THREESTAR 12

#endif // GUARD_CONFIG_DEXNAV_H
9 changes: 6 additions & 3 deletions include/constants/field_effects.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#define FLDEFF_JUMP_SMALL_SPLASH 16
#define FLDEFF_LONG_GRASS 17
#define FLDEFF_JUMP_LONG_GRASS 18
#define FLDEFF_UNUSED_GRASS 19
#define FLDEFF_UNUSED_GRASS_2 20
#define FLDEFF_UNUSED_SAND 21
#define FLDEFF_SHAKING_GRASS 19
#define FLDEFF_SHAKING_LONG_GRASS 20
#define FLDEFF_SAND_HOLE 21
#define FLDEFF_WATER_SURFACING 22
#define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
#define FLDEFF_DEEP_SAND_FOOTPRINTS 24
Expand Down Expand Up @@ -75,6 +75,7 @@
#define FLDEFF_TRACKS_SLITHER 70
#define FLDEFF_TRACKS_SPOT 71
#define FLDEFF_TRACKS_BUG 72
#define FLDEFF_CAVE_DUST 73

#define FLDEFFOBJ_SHADOW_S 0
#define FLDEFFOBJ_SHADOW_M 1
Expand Down Expand Up @@ -116,6 +117,7 @@
#define FLDEFFOBJ_TRACKS_SLITHER 37
#define FLDEFFOBJ_TRACKS_SPOT 38
#define FLDEFFOBJ_TRACKS_BUG 39
#define FLDEFFOBJ_CAVE_DUST 40

#define FLDEFF_PAL_TAG_CUT_GRASS 0x1000
#define FLDEFF_PAL_TAG_SECRET_POWER_TREE 0x1003
Expand All @@ -129,5 +131,6 @@
#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F
#define FLDEFF_PAL_TAG_HOF_MONITOR 0x1010
#define FLDEFF_PAL_TAG_UNKNOWN 0x1011
#define FLDEFF_PAL_TAG_CAVE_DUST 0x1012

#endif // GUARD_FIELD_EFFECT_CONSTANTS_H
8 changes: 4 additions & 4 deletions include/constants/flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -1383,8 +1383,8 @@
#define FLAG_IS_CHAMPION (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking.
#define FLAG_NURSE_UNION_ROOM_REMINDER (SYSTEM_FLAGS + 0x20)

#define FLAG_UNUSED_0x881 (SYSTEM_FLAGS + 0x21) // Unused Flag
#define FLAG_UNUSED_0x882 (SYSTEM_FLAGS + 0x22) // Unused Flag
#define FLAG_SYS_DEXNAV_SEARCH (SYSTEM_FLAGS + 0x21)
#define FLAG_SHINY_CREATION (SYSTEM_FLAGS + 0x22) // force creation of a shiny mon
#define FLAG_UNUSED_0x883 (SYSTEM_FLAGS + 0x23) // Unused Flag
#define FLAG_UNUSED_0x884 (SYSTEM_FLAGS + 0x24) // Unused Flag
#define FLAG_UNUSED_0x885 (SYSTEM_FLAGS + 0x25) // Unused Flag
Expand All @@ -1398,8 +1398,8 @@
#define FLAG_SYS_SAFARI_MODE (SYSTEM_FLAGS + 0x2C)
#define FLAG_SYS_CRUISE_MODE (SYSTEM_FLAGS + 0x2D)

#define FLAG_UNUSED_0x88E (SYSTEM_FLAGS + 0x2E) // Unused Flag
#define FLAG_UNUSED_0x88F (SYSTEM_FLAGS + 0x2F) // Unused Flag
#define FLAG_SYS_DETECTOR_MODE (SYSTEM_FLAGS + 0x2E) // allow player to find hidden mons
#define FLAG_SYS_DEXNAV_GET (SYSTEM_FLAGS + 0x2F) // dexnav shows in start menu

#define FLAG_SYS_TV_HOME (SYSTEM_FLAGS + 0x30)
#define FLAG_SYS_TV_WATCH (SYSTEM_FLAGS + 0x31)
Expand Down
3 changes: 2 additions & 1 deletion include/constants/game_stat.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@
#define GAME_STAT_ENTERED_HOT_SPRINGS 49
#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_PLAYED_BERRY_CRUSH 51
#define GAME_STAT_DEXNAV_SCANNED 52

#define NUM_USED_GAME_STATS 52
#define NUM_USED_GAME_STATS 53
#define NUM_GAME_STATS 64

#endif // GUARD_CONSTANTS_GAME_STAT_H
1 change: 1 addition & 0 deletions include/constants/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "config/caps.h"
#include "config/pokemon.h"
#include "config/overworld.h"
#include "config/dexnav.h"

// Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen.
// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
Expand Down
4 changes: 2 additions & 2 deletions include/constants/vars.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
#define VAR_ROXANNE_CALL_STEP_COUNTER 0x40F4
#define VAR_SCOTT_BF_CALL_STEP_COUNTER 0x40F5
#define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER 0x40F6
#define VAR_UNUSED_0x40F7 0x40F7 // Unused Var
#define VAR_UNUSED_0x40F8 0x40F8 // Unused Var
#define VAR_DEXNAV_SPECIES 0x40F7 // Registered dexnav species
#define VAR_DEXNAV_STEP_COUNTER 0x40F8 // steps for finding hidden pokemon
ghoulslash marked this conversation as resolved.
Show resolved Hide resolved
#define VAR_UNUSED_0x40F9 0x40F9 // Unused Var
#define VAR_UNUSED_0x40FA 0x40FA // Unused Var
#define VAR_UNUSED_0x40FB 0x40FB // Unused Var
Expand Down
1 change: 1 addition & 0 deletions include/constants/wild_encounter.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define WATER_WILD_COUNT 5
#define ROCK_WILD_COUNT 5
#define FISH_WILD_COUNT 10
#define HIDDEN_WILD_COUNT 3

#define NUM_ALTERING_CAVE_TABLES 9

Expand Down
1 change: 1 addition & 0 deletions include/daycare.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ void ShowDaycareLevelMenu(void);
void ChooseSendDaycareMon(void);
u8 GetEggMovesBySpecies(u16 species, u16 *eggMoves);
bool8 SpeciesCanLearnEggMove(u16 species, u16 move);
u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves);

#endif // GUARD_DAYCARE_H
Loading
Loading