Macro'd landmarks, cleaned up comments

constants/flypoint_constants.asm

@@ -1,25 +1,25 @@
 ; Fly point indexes (see data/flypoint)
 	const_def
 
-	const FLY_POINT_SILENT_HILL     ; 0
-	const FLY_POINT_OLD             ; 1
-	const FLY_POINT_WEST            ; 2
-	const FLY_POINT_HAITEKU         ; 3
-	const FLY_POINT_FONTO           ; 4
-	const FLY_POINT_BAADON          ; 5
-	const FLY_POINT_NEWTYPE         ; 6
-	const FLY_POINT_SUGAR           ; 7
-	const FLY_POINT_BULL_FOREST     ; 8
-	const FLY_POINT_STAND           ; 9
-	const FLY_POINT_KANTO           ; 10
-	const FLY_POINT_PRINCE          ; 11
-	const FLY_POINT_MT_FUJI         ; 12
-	const FLY_POINT_SOUTH           ; 13
-	const FLY_POINT_NORTH           ; 14
+	const FLY_POINT_SILENT_HILL	; 0
+	const FLY_POINT_OLD			; 1
+	const FLY_POINT_WEST		; 2
+	const FLY_POINT_HAITEKU		; 3
+	const FLY_POINT_FONTO		; 4
+	const FLY_POINT_BAADON		; 5
+	const FLY_POINT_NEWTYPE		; 6
+	const FLY_POINT_SUGAR		; 7
+	const FLY_POINT_BULL_FOREST	; 8
+	const FLY_POINT_STAND		; 9
+	const FLY_POINT_KANTO		; 10
+	const FLY_POINT_PRINCE		; 11
+	const FLY_POINT_MT_FUJI		; 12
+	const FLY_POINT_SOUTH		; 13
+	const FLY_POINT_NORTH		; 14
 
 ; Unused?
 
-	const FLY_POINT_ROUTE_15        ; 15
-	const FLY_POINT_ROUTE_18        ; 16
+	const FLY_POINT_ROUTE_15	; 15
+	const FLY_POINT_ROUTE_18	; 16
 
 DEF FLY_POINT_N_A EQU $FF

constants/menu_constants.asm

@@ -52,16 +52,16 @@
 ; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
 	const_def 1
 	; moves
-	const MONMENUITEM_CUT        ; 1
-	const MONMENUITEM_FLY        ; 2
-	const MONMENUITEM_SURF       ; 3
-	const MONMENUITEM_STRENGTH   ; 4
-	const MONMENUITEM_FLASH		 ; 5
-	const MONMENUITEM_WHIRLPOOL  ; 6
-	const MONMENUITEM_BOUNCE	 ; 7
-	const MONMENUITEM_DIG        ; 8
-	const MONMENUITEM_TELEPORT   ; 9
-	const MONMENUITEM_SOFTBOILED ; 10
+	const MONMENUITEM_CUT			; 1
+	const MONMENUITEM_FLY			; 2
+	const MONMENUITEM_SURF			; 3
+	const MONMENUITEM_STRENGTH		; 4
+	const MONMENUITEM_FLASH			; 5
+	const MONMENUITEM_WHIRLPOOL		; 6
+	const MONMENUITEM_BOUNCE		; 7
+	const MONMENUITEM_DIG			; 8
+	const MONMENUITEM_TELEPORT		; 9
+	const MONMENUITEM_SOFTBOILED	; 10
 	; options
 	const MONMENUITEM_STATS      ; 11
 	const MONMENUITEM_SWITCH     ; 12

constants/pokemon_data_constants.asm

@@ -103,9 +103,6 @@ DEF PARTY_LENGTH EQU 6
 ; The Japanese version fits more Pokémon into the boxes, but has less boxes total
 DEF MONS_PER_BOX EQU 30
 DEF NUM_BOXES EQU 10
-; English version:
-;DEF MONS_PER_BOX EQU 20
-;DEF NUM_BOXES    EQU 14
 
 ; hall of fame
 DEF HOF_MON_LENGTH EQUS "(wHallOfFamePokemonListMon1End - wHallOfFamePokemonListMon1)"

data/maps/landmarks.asm

@@ -1,60 +1,59 @@
 INCLUDE "constants.asm"
 
 MACRO landmark
-; X, Y. The game actually stores and reads the bytes swapped, with Y first and X second.
-; Made a macro for convenience and to avoid confusion.
-; Not used right now, but use in the future?
+; X, Y.
+; Unlike the final game, the prototype actually stores and reads the bytes swapped, with Y first and X second.
 	db \2 + 16, \1 + 8
 
 ENDM
 
-SECTION "data/maps/landmarks.asm@LandmarkPositions", ROMX
+SECTION "data/maps/landmarks.asm", ROMX
 
 LandmarkPositions:
-	db 0, 0				; LANDMARK_NONE
-	db 28, 156			; LANDMARK_NORTH
-	db 40, 156			; LANDMARK_BULL_FOREST_ROUTE_3
-	db 52, 156			; LANDMARK_BULL_FOREST
-	db 64, 156			; LANDMARK_BULL_FOREST_ROUTE_2
-	db 76, 156			; LANDMARK_STAND
-	db 92, 156			; LANDMARK_STAND_ROUTE
-	db 108, 148			; LANDMARK_KANTO_EAST_ROUTE
-	db 108, 132			; LANDMARK_KANTO
-	db 108, 120			; LANDMARK_ROUTE_SILENT_EAST
-	db 108, 108			; LANDMARK_SILENT_HILL
-	db 100, 108			; LANDMARK_PRINCE
-	db 92, 108			; LANDMARK_MT_FUJI
-	db 108, 100			; LANDMARK_ROUTE_1_P1
-	db 108, 92			; LANDMARK_ROUTE_1_P2
-	db 92, 92			; LANDMARK_OLD_CITY
-	db 92, 80			; LANDMARK_ROUTE_2
-	db 92, 68			; LANDMARK_WEST
-	db 80, 68			; LANDMARK_BAADON_ROUTE_1
-	db 68, 68			; LANDMARK_BAADON
-	db 68, 92			; LANDMARK_BAADON_ROUTE_2
-	db 68, 108			; LANDMARK_BAADON_ROUTE_3
-	db 76, 116			; LANDMARK_ROUTE_15
-	db 76, 124			; LANDMARK_NEWTYPE
-	db 64, 124			; LANDMARK_SUGAR_ROUTE
-	db 52, 124			; LANDMARK_SUGAR
-	db 76, 132			; LANDMARK_NEWTYPE_ROUTE
-	db 60, 140			; LANDMARK_ROUTE_18
-	db 52, 148			; LANDMARK_BULL_FOREST_ROUTE_1
-	db 92, 128			; LANDMARK_1C
-	db 84, 104			; LANDMARK_1D
-	db 60, 56			; LANDMARK_FONTO_ROUTE_3
-	db 60, 44			; LANDMARK_FONTO
-	db 52, 44			; LANDMARK_FONTO_ROUTE_2
-	db 44, 32			; LANDMARK_FONTO_ROUTE_6
-	db 52, 20			; LANDMARK_FONTO_ROUTE_5
-	db 60, 20			; LANDMARK_SOUTH
-	db 60, 32			; LANDMARK_FONTO_ROUTE_1
-	db 72, 20			; LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
-	db 84, 28			; LANDMARK_HAITEKU_WEST_ROUTE
-	db 84, 44			; LANDMARK_HAITEKU
-	db 84, 56			; LANDMARK_WASTE_BRIDGE
-	db 60, 68			; LANDMARK_FONTO_ROUTE_4
-	db 72, 44			; LANDMARK_FONTO_BRIDGE
+	landmark -8, -16		; LANDMARK_NONE
+	landmark 148, 12		; LANDMARK_NORTH
+	landmark 148, 24		; LANDMARK_BULL_FOREST_ROUTE_3
+	landmark 148, 36		; LANDMARK_BULL_FOREST
+	landmark 148, 48		; LANDMARK_BULL_FOREST_ROUTE_2
+	landmark 148, 60 		; LANDMARK_STAND
+	landmark 148, 76		; LANDMARK_STAND_ROUTE
+	landmark 140, 92		; LANDMARK_KANTO_EAST_ROUTE
+	landmark 124, 92		; LANDMARK_KANTO
+	landmark 112, 92		; LANDMARK_ROUTE_SILENT_EAST
+	landmark 100, 92		; LANDMARK_SILENT_HILL
+	landmark 100, 84		; LANDMARK_PRINCE
+	landmark 100, 76 		; LANDMARK_MT_FUJI
+	landmark 92, 92 		; LANDMARK_ROUTE_1_P1
+	landmark 84, 92			; LANDMARK_ROUTE_1_P2
+	landmark 84, 76			; LANDMARK_OLD_CITY
+	landmark 72, 76			; LANDMARK_ROUTE_2
+	landmark 60, 76			; LANDMARK_WEST
+	landmark 60, 64			; LANDMARK_BAADON_ROUTE_1
+	landmark 60, 52			; LANDMARK_BAADON
+	landmark 84, 52			; LANDMARK_BAADON_ROUTE_2
+	landmark 100, 52		; LANDMARK_BAADON_ROUTE_3
+	landmark 108, 60		; LANDMARK_ROUTE_15
+	landmark 116, 60		; LANDMARK_NEWTYPE
+	landmark 116, 48		; LANDMARK_SUGAR_ROUTE
+	landmark 116, 36		; LANDMARK_SUGAR
+	landmark 124, 60		; LANDMARK_NEWTYPE_ROUTE
+	landmark 132, 44		; LANDMARK_ROUTE_18
+	landmark 140, 36		; LANDMARK_BULL_FOREST_ROUTE_1
+	landmark 120, 76		; LANDMARK_1C
+	landmark 96, 68			; LANDMARK_1D
+	landmark 48, 44			; LANDMARK_FONTO_ROUTE_3
+	landmark 36, 44			; LANDMARK_FONTO
+	landmark 36, 36			; LANDMARK_FONTO_ROUTE_2
+	landmark 24, 28			; LANDMARK_FONTO_ROUTE_6
+	landmark 12, 36			; LANDMARK_FONTO_ROUTE_5
+	landmark 12, 44			; LANDMARK_SOUTH
+	landmark 24, 44			; LANDMARK_FONTO_ROUTE_1
+	landmark 12, 56			; LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
+	landmark 20, 68			; LANDMARK_HAITEKU_WEST_ROUTE
+	landmark 36, 68			; LANDMARK_HAITEKU
+	landmark 48, 68			; LANDMARK_WASTE_BRIDGE
+	landmark 60, 44			; LANDMARK_FONTO_ROUTE_4
+	landmark 36, 56			; LANDMARK_FONTO_BRIDGE
 
 SECTION "data/maps/landmarks.asm@LandmarkNames", ROMX
 

layout.link

@@ -125,7 +125,7 @@ ROMX $02
 	"gfx.asm@Mon Nest Icon"
 
 	"data/maps/flypoints.asm"
-	"data/maps/landmarks.asm@LandmarkPositions"
+	"data/maps/landmarks.asm"
 
 	"engine/trainer_gear.asm@OpenTrainerGear"
 	"gfx.asm@Trainer Gear GFX"

ram/wram.asm

@@ -375,26 +375,10 @@ wBattleAnimEnd::
 
 	ds $1a3 ; TODO
 
-;wEnemyMoveStruct:: ds 1
-;wEnemyMoveStructEffect:: ds 1
-;wEnemyMoveStructPower:: ds 1
-;wEnemyMoveStructType:: ds 1
-;wEnemyMoveStructAccuracy:: ds 1
-;wEnemyMoveStructPP:: ds 1
-;wEnemyMoveStructEffectChance:: ds 1
-
 wBattle::
 wEnemyMoveStruct:: move_struct wEnemyMoveStruct
 wPlayerMoveStruct:: move_struct wPlayerMoveStruct
 
-;wPlayerMoveStruct:: ds 1
-;wPlayerMoveStructEffect:: ds 1
-;wPlayerMoveStructPower:: ds 1
-;wPlayerMoveStructType:: ds 1
-;wPlayerMoveStructAccuracy:: ds 1
-;wPlayerMoveStructPP:: ds 1
-;wPlayerMoveStructEffectChance:: ds 1
-
 wEnemyMonNickname:: ds 6
 wBattleMonNickname:: ds 6
 
@@ -801,7 +785,7 @@ wSpriteDecodeTable0Ptr:: ds 2
 wSpriteDecodeTable1Ptr:: ds 2
 
 wFXAnimID:: dw
-;wccc1:: ds 1
+
 wccc2:: ds 1
 wccc3:: ds 1
 wccc4:: ds 1