summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-03-07 23:31:09 -0500
committerAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-03-10 22:33:12 -0500
commit26a7012be18beee7bea538c48452efac595eac15 (patch)
treeabf43fedf0d5d5f34505377ff207986b5126d9cb
parent7e0046a2c9a056f3c3694a8c7b7bb9ac37a8e220 (diff)
Removed function address comments in favor of .map file
-rw-r--r--include/charge_move.h2
-rw-r--r--include/dungeon_action.h2
-rw-r--r--include/dungeon_ai_attack.h6
-rw-r--r--include/dungeon_ai_attack_1.h1
-rw-r--r--include/dungeon_ai_item_weight.h2
-rw-r--r--include/dungeon_ai_items.h4
-rw-r--r--include/dungeon_ai_movement.h1
-rw-r--r--include/dungeon_ai_targeting.h1
-rw-r--r--include/dungeon_ai_targeting_1.h2
-rw-r--r--include/dungeon_ai_targeting_2.h1
-rw-r--r--include/dungeon_capabilities.h1
-rw-r--r--include/dungeon_capabilities_1.h4
-rw-r--r--include/dungeon_engine.h2
-rw-r--r--include/dungeon_items.h1
-rw-r--r--include/dungeon_map_access.h2
-rw-r--r--include/dungeon_movement.h1
-rw-r--r--include/dungeon_pokemon_attributes.h8
-rw-r--r--include/dungeon_random.h2
-rw-r--r--include/dungeon_random_1.h1
-rw-r--r--include/dungeon_range.h1
-rw-r--r--include/dungeon_util.h4
-rw-r--r--include/dungeon_util_1.h1
-rw-r--r--include/dungeon_visibility.h1
-rw-r--r--include/number_util.h1
-rw-r--r--include/position_util.h1
-rw-r--r--include/status.h1
-rw-r--r--include/status_checker.h5
-rw-r--r--include/status_checks.h1
-rw-r--r--include/status_checks_1.h3
-rw-r--r--include/targeting.h1
-rw-r--r--include/targeting_flags.h1
-rw-r--r--include/tile_types.h2
-rw-r--r--include/trap.h1
-rw-r--r--include/type_effectiveness.h1
-rw-r--r--include/weather.h1
35 files changed, 0 insertions, 70 deletions
diff --git a/include/charge_move.h b/include/charge_move.h
index fd88a62..e1ef306 100644
--- a/include/charge_move.h
+++ b/include/charge_move.h
@@ -3,9 +3,7 @@
#include "dungeon_entity.h"
-// 0x570AC
bool8 MoveMatchesChargingStatus(struct DungeonEntity *pokemon, struct PokemonMove *move);
-// 0x570F4
// checkCharge = Check for the move named Charge.
bool8 IsCharging(struct DungeonEntity *pokemon, bool8 checkCharge);
diff --git a/include/dungeon_action.h b/include/dungeon_action.h
index 48f81d5..39add48 100644
--- a/include/dungeon_action.h
+++ b/include/dungeon_action.h
@@ -3,9 +3,7 @@
#include "dungeon_entity.h"
-// 0x44C94
void SetAction(struct DungeonActionContainer *actionPointer, u16 action);
-// 0x44CA0
void SetWalkAction(struct DungeonActionContainer *actionPointer, s16 species);
#endif
diff --git a/include/dungeon_ai_attack.h b/include/dungeon_ai_attack.h
index bd874a4..aa840fd 100644
--- a/include/dungeon_ai_attack.h
+++ b/include/dungeon_ai_attack.h
@@ -12,17 +12,11 @@ struct MoveTargetResults
s32 moveWeight;
};
-// 0x7BB94
void DecideAttack(struct DungeonEntity *pokemon);
-// 0x7C04C
s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEntity *pokemon, struct PokemonMove *move);
-// 0x7C4A0
bool8 IsTargetInLineRange(struct DungeonEntity *user, struct DungeonEntity *target, s32 range);
-// 0x7C580
s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, u32 hasStatusChecker);
-// 0x7C648
bool8 CanUseStatusMove(s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker);
-// 0x7C7AC
s32 WeightMove(struct DungeonEntity *user, s32 targetingFlags, struct DungeonEntity *target, u32 moveType);
#endif
diff --git a/include/dungeon_ai_attack_1.h b/include/dungeon_ai_attack_1.h
index 89a1f0d..dc9e9c9 100644
--- a/include/dungeon_ai_attack_1.h
+++ b/include/dungeon_ai_attack_1.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x7C9F8
bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange);
#endif
diff --git a/include/dungeon_ai_item_weight.h b/include/dungeon_ai_item_weight.h
index a498744..871e68b 100644
--- a/include/dungeon_ai_item_weight.h
+++ b/include/dungeon_ai_item_weight.h
@@ -3,9 +3,7 @@
#include "dungeon_entity.h"
-// 0x48F28
u32 EvaluateItem(struct DungeonEntity *targetPokemon, struct ItemSlot *item, u32 itemTargetFlags);
-// 0x494EC
bool8 CanTargetAdjacentPokemon(struct DungeonEntity *pokemon);
#endif
diff --git a/include/dungeon_ai_items.h b/include/dungeon_ai_items.h
index 5daf7b0..91e0a22 100644
--- a/include/dungeon_ai_items.h
+++ b/include/dungeon_ai_items.h
@@ -4,13 +4,9 @@
#include "dungeon_entity.h"
#include "position.h"
-// 0x73658
void DecideUseItem(struct DungeonEntity *pokemon);
-// 0x739DC
void FindStraightThrowableTargets(struct DungeonEntity *pokemon, s32 thrownAIFlag, struct ItemSlot *item, bool8 ignoreRollChance);
-// 0x73AA0
void FindRockItemTargets(struct DungeonEntity *pokemon, struct ItemSlot *item, struct Position potentialTargets[], bool8 ignoreRollChance);
-// 0x73B78
void TargetThrownItem(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, struct ItemSlot *item, s32 targetingFlags, bool8 ignoreRollChance);
#endif
diff --git a/include/dungeon_ai_movement.h b/include/dungeon_ai_movement.h
index 27bb00f..d53ab06 100644
--- a/include/dungeon_ai_movement.h
+++ b/include/dungeon_ai_movement.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x75990
void DecideAction(struct DungeonEntity *pokemon);
#endif
diff --git a/include/dungeon_ai_targeting.h b/include/dungeon_ai_targeting.h
index 945c490..ae5b952 100644
--- a/include/dungeon_ai_targeting.h
+++ b/include/dungeon_ai_targeting.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x71138
bool8 CanAttackInFront(struct DungeonEntity *pokemon, s32 direction);
#endif
diff --git a/include/dungeon_ai_targeting_1.h b/include/dungeon_ai_targeting_1.h
index 49b700f..d59a0ee 100644
--- a/include/dungeon_ai_targeting_1.h
+++ b/include/dungeon_ai_targeting_1.h
@@ -3,9 +3,7 @@
#include "dungeon_entity.h"
-// 0x71494
bool8 ShouldAvoidEnemies(struct DungeonEntity *pokemon);
-// 0x71518
bool8 ShouldAvoidEnemiesAndShowEffect(struct DungeonEntity *pokemon, bool8 showRunAwayEffect);
#endif
diff --git a/include/dungeon_ai_targeting_2.h b/include/dungeon_ai_targeting_2.h
index c314646..5fe43a3 100644
--- a/include/dungeon_ai_targeting_2.h
+++ b/include/dungeon_ai_targeting_2.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x71598
u8 CanTarget(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, bool8 ignoreInvisible, bool8 checkPetrified);
#endif
diff --git a/include/dungeon_capabilities.h b/include/dungeon_capabilities.h
index 6574b32..f4a0306 100644
--- a/include/dungeon_capabilities.h
+++ b/include/dungeon_capabilities.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x70B6C
bool8 CannotMove(struct DungeonEntity *pokemon, bool8 checkBlinker);
#endif
diff --git a/include/dungeon_capabilities_1.h b/include/dungeon_capabilities_1.h
index 1319230..5c8e3d0 100644
--- a/include/dungeon_capabilities_1.h
+++ b/include/dungeon_capabilities_1.h
@@ -3,13 +3,9 @@
#include "dungeon_entity.h"
-// 0x70C60
bool8 CannotUseItems(struct DungeonEntity *pokemon);
-// 0x70CD0
bool8 CannotAct(struct DungeonEntity *pokemon);
-// 0x70d04
bool8 CannotAttack(struct DungeonEntity *pokemon, bool8 skipSleep);
-// 0x70D6C
bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir);
#endif
diff --git a/include/dungeon_engine.h b/include/dungeon_engine.h
index d2be40b..e4fa7f4 100644
--- a/include/dungeon_engine.h
+++ b/include/dungeon_engine.h
@@ -1,9 +1,7 @@
#ifndef GUARD_DUNGEON_ENGINE_H
#define GUARD_DUNGEON_ENGINE_H
-// 0x441BC
bool8 IsBossBattle();
-// 0x441E8
bool8 IsFixedDungeon();
#endif
diff --git a/include/dungeon_items.h b/include/dungeon_items.h
index 8eb1718..0c227c2 100644
--- a/include/dungeon_items.h
+++ b/include/dungeon_items.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x46CB0
bool8 HasItem(struct DungeonEntity *pokemon, u8 itemIndex);
#endif
diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h
index c715483..dc5790c 100644
--- a/include/dungeon_map_access.h
+++ b/include/dungeon_map_access.h
@@ -8,9 +8,7 @@ struct unkStruct_202F190
struct MapTile* unk0[6];
};
-// 0x4954C
struct MapTile* GetMapTile_1(s32 x, s32 y);
-// 0x49590
struct MapTile* GetMapTile_2(s32 x, s32 y);
#endif
diff --git a/include/dungeon_movement.h b/include/dungeon_movement.h
index d15ef1b..111d98b 100644
--- a/include/dungeon_movement.h
+++ b/include/dungeon_movement.h
@@ -1,7 +1,6 @@
#ifndef GUARD_DUNGEON_MOVEMENT_H
#define GUARD_DUNGEON_MOVEMENT_H
-// 0x70328
u8 GetCrossableTerrain(s16 species);
#endif
diff --git a/include/dungeon_pokemon_attributes.h b/include/dungeon_pokemon_attributes.h
index 40b13ee..c09a657 100644
--- a/include/dungeon_pokemon_attributes.h
+++ b/include/dungeon_pokemon_attributes.h
@@ -3,22 +3,14 @@
#include "dungeon_entity.h"
-// 0x71824
bool8 HasAbility(struct DungeonEntity *pokemon, u8 ability);
-// 0x71858
bool8 HasType(struct DungeonEntity *pokemon, u8 type);
-// 0x71884
bool8 CanSeeInvisible(struct DungeonEntity *pokemon);
-// 0x718AC
bool8 HasTactic(struct DungeonEntity *pokemon, u8 tactic);
-// 0x718D8
bool8 HasIQSkill(struct DungeonEntity *pokemon, u8 IQSkill);
-
void LoadIQSkills(struct DungeonEntity *pokemon);
bool8 CanSeeTeammate(struct DungeonEntity * pokemon);
u8 GetMoveTypeForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove);
-
-// 0x71A44
s32 CalculateMovePower(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove);
bool8 ToolboxEnabled(struct DungeonEntityData *pokemon);
diff --git a/include/dungeon_random.h b/include/dungeon_random.h
index 5679720..b53b4bb 100644
--- a/include/dungeon_random.h
+++ b/include/dungeon_random.h
@@ -1,9 +1,7 @@
#ifndef GUARD_DUNGEON_RANDOM_H
#define GUARD_DUNGEON_RANDOM_H
-// 0x840E8
s32 DungeonRandom(void);
-// 0x84100
s32 DungeonRandomCapped(s32 cap);
#endif
diff --git a/include/dungeon_random_1.h b/include/dungeon_random_1.h
index bfc2ecd..c863a7e 100644
--- a/include/dungeon_random_1.h
+++ b/include/dungeon_random_1.h
@@ -1,7 +1,6 @@
#ifndef GUARD_DUNGEON_RANDOM_1_H
#define GUARD_DUNGEON_RANDOM_1_H
-// 0x84144
bool8 RollPercentChance(s32 percentChance);
#endif
diff --git a/include/dungeon_range.h b/include/dungeon_range.h
index 3d76011..80cb7e3 100644
--- a/include/dungeon_range.h
+++ b/include/dungeon_range.h
@@ -3,7 +3,6 @@
#include "position.h"
-// 0x83294
bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2);
#endif
diff --git a/include/dungeon_util.h b/include/dungeon_util.h
index b32b85d..77db878 100644
--- a/include/dungeon_util.h
+++ b/include/dungeon_util.h
@@ -7,13 +7,9 @@
extern const struct Position gAdjacentTileOffsets[NUM_DIRECTIONS];
-// 0x450E0
bool8 EntityExists(struct DungeonEntity *pokemon);
-// 0x450F8
u32 GetEntityType(struct DungeonEntity *entity);
-// 0x45104
struct DungeonEntityData *GetTrapData(struct DungeonEntity *entity);
-// 0x45108
struct ItemSlot *GetItemData(struct DungeonEntity *entity);
struct MapTile *GetMapTileForDungeonEntity_2(struct DungeonEntity *entity);
diff --git a/include/dungeon_util_1.h b/include/dungeon_util_1.h
index cfda253..070e6d8 100644
--- a/include/dungeon_util_1.h
+++ b/include/dungeon_util_1.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x85A50
bool8 IsMovingClient(struct DungeonEntity *entity);
#endif
diff --git a/include/dungeon_visibility.h b/include/dungeon_visibility.h
index f94926e..62e7163 100644
--- a/include/dungeon_visibility.h
+++ b/include/dungeon_visibility.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x45990
bool8 CanSee(struct DungeonEntity *entity, struct DungeonEntity *targetEntity);
#endif
diff --git a/include/number_util.h b/include/number_util.h
index c42ef1c..692fba0 100644
--- a/include/number_util.h
+++ b/include/number_util.h
@@ -1,7 +1,6 @@
#ifndef GUARD_NUMBER_UTIL_H
#define GUARD_NUMBER_UTIL_H
-// 0x94450
s32 RoundUpFixedPoint(s32 fixedPointNumber);
#endif
diff --git a/include/position_util.h b/include/position_util.h
index 74019b7..9004d10 100644
--- a/include/position_util.h
+++ b/include/position_util.h
@@ -3,7 +3,6 @@
#include "position.h"
-// 0x983D8
s32 CalculateFacingDir(struct Position *originPos, struct Position *targetPos);
#endif
diff --git a/include/status.h b/include/status.h
index 21ff6fd..d12170a 100644
--- a/include/status.h
+++ b/include/status.h
@@ -7,7 +7,6 @@
#define FLASH_FIRE_STATUS_MAXED 1
#define FLASH_FIRE_STATUS_NOT_MAXED 2
-// 0x7723C
u8 GetFlashFireStatus(struct DungeonEntity *pokemon);
#endif
diff --git a/include/status_checker.h b/include/status_checker.h
index 668d16e..416b265 100644
--- a/include/status_checker.h
+++ b/include/status_checker.h
@@ -4,15 +4,10 @@
#include "constants/move.h"
#include "dungeon_entity.h"
-// 0x5C498
bool8 CanUseOnSelfWithStatusChecker(struct DungeonEntity *pokemon, struct PokemonMove *move);
-// 0x5CEB8
bool8 CanUseOnTargetWithStatusChecker(struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move);
-// 0x5D810
bool8 HasDisabledMove(struct PokemonMove *moves);
-// 0x5D850
bool8 LastUsedMoveOutOfPP(struct PokemonMove *moves);
-// 0x5D888
bool8 HasLastUsedMove(struct PokemonMove *moves);
#endif
diff --git a/include/status_checks.h b/include/status_checks.h
index 5bc80eb..5253d9d 100644
--- a/include/status_checks.h
+++ b/include/status_checks.h
@@ -5,7 +5,6 @@
extern const s16 gConfusedAttackChance;
-// 0x7001C
bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon);
#endif
diff --git a/include/status_checks_1.h b/include/status_checks_1.h
index a90bdb0..306937b 100644
--- a/include/status_checks_1.h
+++ b/include/status_checks_1.h
@@ -3,11 +3,8 @@
#include "dungeon_entity.h"
-// 0x70A58
bool8 HasNegativeStatus(struct DungeonEntity *pokemon);
-// 0x70B28
bool8 IsSleeping(struct DungeonEntity *pokemon);
-// 0x70B48
bool8 HasQuarterHPOrLess(struct DungeonEntity* pokemon);
#endif
diff --git a/include/targeting.h b/include/targeting.h
index 7330398..89c4d49 100644
--- a/include/targeting.h
+++ b/include/targeting.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x69DCC
void TargetTileInFront(struct DungeonEntity *pokemon);
#endif
diff --git a/include/targeting_flags.h b/include/targeting_flags.h
index d7d4737..3e1abdd 100644
--- a/include/targeting_flags.h
+++ b/include/targeting_flags.h
@@ -4,7 +4,6 @@
#include "constants/move.h"
#include "dungeon_entity.h"
-// 0x7CD64
s16 GetMoveTargetingFlagsForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *move, bool32 isAI);
#endif
diff --git a/include/tile_types.h b/include/tile_types.h
index f1bc412..d1577d4 100644
--- a/include/tile_types.h
+++ b/include/tile_types.h
@@ -7,9 +7,7 @@
#define DUNGEON_WATER_TYPE_LAVA 1
#define DUNGEON_WATER_TYPE_WATER 2
-// 0x4AF20
bool8 IsTileGround(struct MapTile* tile);
-// 0x4AF74
bool8 IsWaterTileset();
#endif
diff --git a/include/trap.h b/include/trap.h
index 49a5216..fb6855e 100644
--- a/include/trap.h
+++ b/include/trap.h
@@ -3,7 +3,6 @@
#include "position.h"
-// 0x4AF74
bool8 CanLayTrap(struct Position *pos);
#endif
diff --git a/include/type_effectiveness.h b/include/type_effectiveness.h
index 1847850..3502f0e 100644
--- a/include/type_effectiveness.h
+++ b/include/type_effectiveness.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x6E654
s32 WeightWeakTypePicker(struct DungeonEntity *user, struct DungeonEntity *target, u8 moveType);
#endif
diff --git a/include/weather.h b/include/weather.h
index b7fa725..711007d 100644
--- a/include/weather.h
+++ b/include/weather.h
@@ -3,7 +3,6 @@
#include "dungeon_entity.h"
-// 0x7E580
u8 GetWeather(struct DungeonEntity* pokemon);
#endif