adding MAP_* constant values

src/constants/map_constants.asm

@@ -2,6 +2,131 @@
 DEF TCG_ISLAND EQU $0
 DEF GR_ISLAND  EQU $1
 
+	; MAP_*
+	; used in map scripts, and other places.
+	; see also: bank03.asm:Data_c651
+	const_def
+	const OVERWORLD_MAP_TCG               ; $00
+	const OVERWORLD_MAP_GR                ; $01
+	const MAP_MASON_LABORATORY_MAIN       ; $02
+	const MAP_MASON_LABORATORY_SIDE_1     ; $03
+	const MAP_MASON_LABORATORY_SIDE_2     ; $04
+	const MAP_ISHIHARAS_HOUSE             ; $05
+	const MAP_LIGHTNING_CLUB_ENTRANCE     ; $06
+	const MAP_LIGHTNING_CLUB_LOBBY        ; $07
+	const MAP_LIGHTNING_CLUB              ; $08
+	const MAP_PSYCHIC_CLUB_ENTRANCE       ; $09
+	const MAP_PSYCHIC_CLUB_LOBBY          ; $0a
+	const MAP_PSYCHIC_CLUB                ; $0b
+	const MAP_ROCK_CLUB_ENTRANCE          ; $0c
+	const MAP_ROCK_CLUB_LOBBY             ; $0d
+	const MAP_ROCK_CLUB                   ; $0e
+	const MAP_FIGHTING_CLUB_ENTRANCE      ; $0f
+	const MAP_FIGHTING_CLUB_LOBBY         ; $10
+	const MAP_FIGHTING_CLUB               ; $11
+	const MAP_GRASS_CLUB_ENTRANCE         ; $12
+	const MAP_GRASS_CLUB_LOBBY            ; $13
+	const MAP_GRASS_CLUB                  ; $14
+	const MAP_SCIENCE_CLUB_ENTRANCE       ; $15
+	const MAP_SCIENCE_CLUB_LOBBY          ; $16
+	const MAP_SCIENCE_CLUB                ; $17
+	const MAP_WATER_CLUB_ENTRANCE         ; $18
+	const MAP_WATER_CLUB_LOBBY            ; $19
+	const MAP_WATER_CLUB                  ; $1a
+	const MAP_FIRE_CLUB_ENTRANCE          ; $1b
+	const MAP_FIRE_CLUB_LOBBY             ; $1c
+	const MAP_FIRE_CLUB                   ; $1d
+	const MAP_TCG_AIRPORT_ENTRANCE        ; $1e
+	const MAP_TCG_AIRPORT                 ; $1f
+	const MAP_TCG_CHALLENGE_HALL_ENTRANCE ; $20
+	const MAP_TCG_CHALLENGE_HALL_LOBBY    ; $21
+	const MAP_TCG_CHALLENGE_HALL          ; $22
+	const MAP_POKEMON_DOME_ENTRANCE       ; $23
+	const MAP_POKEMON_DOME                ; $24
+	const MAP_POKEMON_DOME_BACK           ; $25
+	const MAP_OVERHEAD_ISLANDS            ; $26
+	const MAP_GR_AIRPORT_ENTRANCE         ; $27
+	const MAP_GR_AIRPORT                  ; $28
+	const MAP_ISHIHARAS_VILLA_1           ; $29
+	const MAP_ISHIHARAS_VILLA_2           ; $2a
+	const MAP_GAME_CENTER_ENTRANCE        ; $2b
+	const MAP_GAME_CENTER_LOBBY           ; $2c
+	const MAP_GAME_CENTER_1               ; $2d
+	const MAP_GAME_CENTER_2               ; $2e
+	const MAP_CARD_DUNGEON_PAWN           ; $2f
+	const MAP_CARD_DUNGEON_KNIGHT         ; $30
+	const MAP_CARD_DUNGEON_BISHOP         ; $31
+	const MAP_CARD_DUNGEON_ROOK           ; $32
+	const MAP_CARD_DUNGEON_QUEEN          ; $33
+	const MAP_SEALED_FORT_ENTRANCE        ; $34
+	const MAP_SEALED_FORT                 ; $35
+	const MAP_GR_CHALLENGE_HALL_ENTRANCE  ; $36
+	const MAP_GR_CHALLENGE_HALL_LOBBY     ; $37
+	const MAP_GR_CHALLENGE_HALL           ; $38
+	const MAP_GRASS_FORT_ENTRANCE         ; $39
+	const MAP_GRASS_FORT_LOBBY            ; $3a
+	const MAP_GRASS_FORT_MIDORI           ; $3b
+	const MAP_GRASS_FORT_YUTA             ; $3c
+	const MAP_GRASS_FORT_MIYUKI           ; $3d
+	const MAP_GRASS_FORT_MORINO           ; $3e
+	const MAP_LIGHTNING_FORT_ENTRANCE     ; $3f
+	const MAP_LIGHTNING_FORT_LOBBY        ; $40
+	const MAP_LIGHTNING_FORT_RENNA        ; $41
+	const MAP_LIGHTNING_FORT_ICHIKAWA     ; $42
+	const MAP_LIGHTNING_FORT_CATHERINE    ; $43
+	const MAP_FIRE_FORT_ENTRANCE          ; $44
+	const MAP_FIRE_FORT_LOBBY             ; $45
+	const MAP_FIRE_FORT_JES               ; $46
+	const MAP_FIRE_FORT_YUKI              ; $47
+	const MAP_FIRE_FORT_SHOKO             ; $48
+	const MAP_FIRE_FORT_HIDERO            ; $49
+	const MAP_WATER_FORT_ENTRANCE         ; $4a
+	const MAP_WATER_FORT_LOBBY            ; $4b
+	const MAP_WATER_FORT_MIYAJIMA         ; $4c
+	const MAP_WATER_FORT_SENTA            ; $4d
+	const MAP_WATER_FORT_AIRA             ; $4e
+	const MAP_WATER_FORT_KANOKO           ; $4f
+	const MAP_FIGHTING_FORT_ENTRANCE      ; $50
+	const MAP_FIGHTING_FORT               ; $51
+	const MAP_FIGHTING_FORT_MAZE_1        ; $52
+	const MAP_FIGHTING_FORT_MAZE_2        ; $53
+	const MAP_FIGHTING_FORT_MAZE_3        ; $54
+	const MAP_FIGHTING_FORT_MAZE_4        ; $55
+	const MAP_FIGHTING_FORT_MAZE_5        ; $56
+	const MAP_FIGHTING_FORT_MAZE_6        ; $57
+	const MAP_FIGHTING_FORT_MAZE_7        ; $58
+	const MAP_FIGHTING_FORT_MAZE_8        ; $59
+	const MAP_FIGHTING_FORT_MAZE_9        ; $5a
+	const MAP_FIGHTING_FORT_MAZE_10       ; $5b
+	const MAP_FIGHTING_FORT_MAZE_11       ; $5c
+	const MAP_FIGHTING_FORT_MAZE_12       ; $5d
+	const MAP_FIGHTING_FORT_MAZE_13       ; $5e
+	const MAP_FIGHTING_FORT_MAZE_14       ; $5f
+	const MAP_FIGHTING_FORT_MAZE_15       ; $60
+	const MAP_FIGHTING_FORT_MAZE_16       ; $61
+	const MAP_FIGHTING_FORT_MAZE_17       ; $62
+	const MAP_FIGHTING_FORT_MAZE_18       ; $63
+	const MAP_FIGHTING_FORT_MAZE_19       ; $64
+	const MAP_FIGHTING_FORT_MAZE_20       ; $65
+	const MAP_FIGHTING_FORT_MAZE_21       ; $66
+	const MAP_FIGHTING_FORT_MAZE_22       ; $67
+	const MAP_FIGHTING_FORT_BASEMENT      ; $68
+	const MAP_FIGHTING_FORT_GODA          ; $69
+	const MAP_FIGHTING_FORT_GRACE         ; $6a
+	const MAP_PSYCHIC_STRONGHOLD_ENTRANCE ; $6b
+	const MAP_PSYCHIC_STRONGHOLD_LOBBY    ; $6c
+	const MAP_PSYCHIC_STRONGHOLD          ; $6d
+	const MAP_PSYCHIC_STRONGHOLD_MAMI     ; $6e
+	const MAP_COLORLESS_ALTAR_ENTRANCE    ; $6f
+	const MAP_COLORLESS_ALTAR             ; $70
+	const MAP_GR_CASTLE_ENTRANCE          ; $71
+	const MAP_GR_CASTLE                   ; $72
+	const MAP_GR_CASTLE_BIRURITCHI        ; $73
+
+	; MAP_GFX_*
+	; referenced in MapHeaders, and others. see also: data/map_gfx.asm
+	; only 2 maps have alternate graphics: MAP_LIGHTNING_CLUB, MAP_GFX_GR_CHALLENGE_HALL
+	; note that the constant values are largely different from the corresponding MAP_*
 	const_def
 	const OVERWORLD_MAP_GFX_TCG               ; $00
 	const OVERWORLD_MAP_GFX_GR                ; $01

src/engine/bank03.asm

@@ -984,6 +984,7 @@ Func_c646:
 	ret
 
 ; bank and offset table of data for Func_d421 and Func_33b7
+; table corresponds to MAP_* IDs (do not confuse with MAP_GFX_*)
 Data_c651::
 	dba Data_40462 ; $00
 	dba Data_30080 ; $01
@@ -994,35 +995,35 @@ Data_c651::
 	dbw $0f, $4b88 ; $06
 	dbw $0f, $4c62 ; $07
 	dba LightningClub_MapHeader ; $08
-	dba PsychicClubEntrance_MapHeader ; $0a - not sure why $09 is skipped, but the data this points to is definitely $0a
-	dba PsychicClubLobby_MapHeader ; $0b
-	dba PsychicClub_MapHeader ; $0c
-	dba RockClubEntrance_MapHeader ; $0d
-	dba RockClubLobby_MapHeader ; $0e
-	dba RockClub_MapHeader ; $0f
-	dba FightningClubEntrance_MapHeader ; $10
-	dba FightningClubLobby_MapHeader ; $11
-	dba FightingClub_MapHeader ; $12
-	dba GrassClubEntrance_MapHeader ; $13
-	dbw $0f, $4ee6 ;
-	dba GrassClub_MapHeader ; $15
-	dba ScienceClubEntrance_MapHeader ; $16
-	dba ScienceClubLobby_MapHeader ; $17
-	dba ScienceClub_MapHeader ; $18
-	dba WaterClubEntrance_MapHeader ; $19
-	dba WaterClubLobby_MapHeader ; $1a
-	dba WaterClub_MapHeader ; $1b
-	dba FireClubEntrance_MapHeader ; $1c
-	dba FireClubLobby_MapHeader ; $1d
-	dba FireClub_MapHeader ; $1e
-	dbw $0d, $4575 ; $
-	dbw $0d, $4773 ; $
-	dbw $0f, $519e ; $
-	dbw $0f, $52d7 ; $
-	dbw $10, $5592 ; $
-	dba PokemonDomeEntrance_MapHeader ; $24
-	dbw $0f, $55d1 ; $
-	dbw $0f, $5d58 ; $
+	dba PsychicClubEntrance_MapHeader ; $09
+	dba PsychicClubLobby_MapHeader ; $0a
+	dba PsychicClub_MapHeader ; $0b
+	dba RockClubEntrance_MapHeader ; $0c
+	dba RockClubLobby_MapHeader ; $0d
+	dba RockClub_MapHeader ; $0e
+	dba FightningClubEntrance_MapHeader ; $0f
+	dba FightningClubLobby_MapHeader ; $10
+	dba FightingClub_MapHeader ; $11
+	dba GrassClubEntrance_MapHeader ; $12
+	dbw $0f, $4ee6 ; $13
+	dba GrassClub_MapHeader ; $14
+	dba ScienceClubEntrance_MapHeader ; $15
+	dba ScienceClubLobby_MapHeader ; $16
+	dba ScienceClub_MapHeader ; $17
+	dba WaterClubEntrance_MapHeader ; $18
+	dba WaterClubLobby_MapHeader ; $19
+	dba WaterClub_MapHeader ; $1a
+	dba FireClubEntrance_MapHeader ; $1b
+	dba FireClubLobby_MapHeader ; $1c
+	dba FireClub_MapHeader ; $1d
+	dbw $0d, $4575 ; $1e
+	dbw $0d, $4773 ; $1f
+	dbw $0f, $519e ; $20
+	dbw $0f, $52d7 ; $21
+	dbw $10, $5592 ; $22
+	dba PokemonDomeEntrance_MapHeader ; $23
+	dbw $0f, $55d1 ; $24
+	dbw $0f, $5d58 ; $25
 	dba OverheadIslands_MapHeader ; $26
 	dbw $0d, $4aaf ; $27
 	dbw $10, $5be9 ; $28