More comments

Fix some constants

9 files changed, 16 insertions, 9 deletions

diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 9a3323509..1914d7a29 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -17,6 +17,9 @@ MIN_NEUTRAL_DAMAGE EQU 2
 REST_SLEEP_TURNS EQU 2
 TREEMON_SLEEP_TURNS EQU 7
 
+; default move priority
+BASE_PRIORITY EQU 1
+
 ; PlayerStatLevels and EnemyStatLevels indexes
 ; used for GetStatName
 	const_def
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index fc9a5c08d..3585624bd 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -18,7 +18,6 @@
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
 ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - Footprints (see gfx/footprints.asm)
-; - SortedPokemon (see mobile/fixed_words.asm)
 const_value set 1
 	const BULBASAUR  ; 01
 	const IVYSAUR    ; 02
diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index cca5c3b9c..c45a9837e 100644
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -1,3 +1,5 @@
+; Pics are defined in gfx/pics.asm
+
 PokemonPicPointers::
 ; entries correspond to Pokémon species, two apiece
 	dba_pic BulbasaurFrontpic
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index c0b3d4538..887544126 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -1,6 +1,7 @@
-; Each trainer class has its own group. See trainers.asm.
+; Groups are defined in data/trainers/parties.asm.
 
 TrainerGroups: ; 0x39999
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	dw FalknerGroup
 	dw WhitneyGroup
 	dw BugsyGroup
diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm
index 201b44200..6fc444eb6 100644
--- a/data/trainers/pic_pointers.asm
+++ b/data/trainers/pic_pointers.asm
@@ -1,3 +1,5 @@
+; Pics are defined in gfx/pics.asm
+
 TrainerPicPointers::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	dba_pic FalknerPic
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index c609e0bba..8c9eecbcf 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -857,7 +857,7 @@ GetMovePriority: ; 3c5c5
 	cp -1
 	jr nz, .loop
 
-	ld a, 1
+	ld a, BASE_PRIORITY
 	ret
 
 .done
@@ -4808,7 +4808,7 @@ PrintPlayerHUD: ; 3dfbf
 	ld [de], a
 	ld hl, BattleMonLevel
 	ld de, TempMonLevel
-	ld bc, $0011
+	ld bc, $11
 	call CopyBytes
 	ld a, [CurBattleMon]
 	ld hl, PartyMon1Species
diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index 90dfdc7e0..c9c7d767f 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -1436,7 +1436,7 @@ RareCandy: ; ef14
 	call TextBox
 
 	hlcoord 11, 1
-	ld bc, $0004
+	ld bc, 4
 	predef PrintTempMonStats
 
 	call WaitPressAorB_BlinkCursor
@@ -2572,7 +2572,7 @@ Mysteryberry: ; f5bf
 	cp SKETCH
 	jr z, .CantUsePPUpOnSketch
 
-	ld bc, $0015
+	ld bc, MON_PP - MON_MOVES
 	add hl, bc
 	ld a, [hl]
 	cp 3 << 6 ; have 3 PP Ups already been used?
diff --git a/home/map.asm b/home/map.asm
index 1e409f0fc..ae1749acd 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2106,11 +2106,11 @@ GetMapHeaderMember:: ; 0x2c04
 ; Extract data from the current map's header.
 
 ; inputs:
-; de = offset of desired data within the mapheader
+; de = offset of desired data within the mapheader (a MAPHEADER_* constant)
 
 ; outputs:
 ; bc = data from the current map's header
-; (e.g., de = $0003 would return a pointer to the secondary map header)
+; (e.g., de = MAPHEADER_MAPHEADER2 would return a pointer to the secondary map header)
 
 	ld a, [MapGroup]
 	ld b, a
diff --git a/home/menu.asm b/home/menu.asm
index 03cec64df..b2aacf61e 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -517,7 +517,7 @@ ClearWindowData:: ; 1fbf
 ; 1ff0
 
 .bytefill ; 1ff0
-	ld bc, $0010
+	ld bc, $10
 	xor a
 	call ByteFill
 	ret