Map event tilemaps

4 files changed, 71 insertions, 69 deletions

diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 84a499c..d2065ae 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -459,12 +459,12 @@ Func_c34e: ; c34e (3:434e)
 
 Func_c36a: ; c36a (3:436a)
 	xor a
-	ld [wd323], a
+	ld [wOWMapEvents], a
 	ld a, [wCurMap]
 	cp POKEMON_DOME_ENTRANCE
 	jr nz, .asm_c379
 	xor a
-	ld [wd323 + 1], a
+	ld [wOWMapEvents + 1], a
 .asm_c379
 	ret
 
@@ -3453,7 +3453,7 @@ MasonLabLoadMap: ; d549 (3:5549)
 	jp SetNextNPCAndScript
 
 MasonLabCloseTextBox: ; d55e (3:555e)
-	ld a, $0a
+	ld a, MAP_EVENT_CHALLENGE_MACHINE
 	farcall Func_80b89
 	ret
 
@@ -3945,13 +3945,13 @@ DeckMachineRoomAfterDuel: ; d89f (3:589f)
 	db $00
 
 DeckMachineRoomCloseTextBox: ; d8ad (3:58ad)
-	ld a, $02
+	ld a, MAP_EVENT_FIGHTING_DECK_MACHINE
 .asm_d8af
 	push af
 	farcall Func_80b89
 	pop af
 	inc a
-	cp $0a
+	cp MAP_EVENT_FIRE_DECK_MACHINE + 1
 	jr c, .asm_d8af
 	ret
 
@@ -4046,7 +4046,7 @@ Script_d93f: ; d93f (3:593f)
 .ows_d95a
 	play_sfx SFX_5A
 	max_out_event_value EVENT_FIGHTING_DECK_MACHINE_ACTIVE
-	replace_map_blocks $02
+	replace_map_blocks MAP_EVENT_FIGHTING_DECK_MACHINE
 	print_text Text060a
 .ows_d963
 	ask_question_jump_default_yes Text060b, .ows_d969
@@ -4099,7 +4099,7 @@ Script_d995: ; d995 (3:5995)
 .ows_d9b0
 	play_sfx SFX_5A
 	max_out_event_value EVENT_ROCK_DECK_MACHINE_ACTIVE
-	replace_map_blocks $03
+	replace_map_blocks MAP_EVENT_ROCK_DECK_MACHINE
 	print_text Text060a
 .ows_d9b9
 	ask_question_jump_default_yes Text060b, .ows_d9bf
@@ -4127,7 +4127,7 @@ Script_d9c2: ; d9c2 (3:59c2)
 .ows_d9dd
 	play_sfx SFX_5A
 	max_out_event_value EVENT_WATER_DECK_MACHINE_ACTIVE
-	replace_map_blocks $04
+	replace_map_blocks MAP_EVENT_WATER_DECK_MACHINE
 	print_text Text060a
 .ows_d9e6
 	ask_question_jump_default_yes Text060b, .ows_d9ec
@@ -4155,7 +4155,7 @@ Script_d9ef: ; d9ef (3:59ef)
 .ows_da0a
 	play_sfx SFX_5A
 	max_out_event_value EVENT_LIGHTNING_DECK_MACHINE_ACTIVE
-	replace_map_blocks $05
+	replace_map_blocks MAP_EVENT_LIGHTNING_DECK_MACHINE
 	print_text Text060a
 .ows_da13
 	ask_question_jump_default_yes Text060b, .ows_da19
@@ -4183,7 +4183,7 @@ Script_da1c: ; da1c (3:5a1c)
 .ows_da37
 	play_sfx SFX_5A
 	max_out_event_value EVENT_GRASS_DECK_MACHINE_ACTIVE
-	replace_map_blocks $06
+	replace_map_blocks MAP_EVENT_GRASS_DECK_MACHINE
 	print_text Text060a
 .ows_da40
 	ask_question_jump_default_yes Text060b, .ows_da46
@@ -4211,7 +4211,7 @@ Script_da49: ; da49 (3:5a49)
 .ows_da64
 	play_sfx SFX_5A
 	max_out_event_value EVENT_PSYCHIC_DECK_MACHINE_ACTIVE
-	replace_map_blocks $07
+	replace_map_blocks MAP_EVENT_PSYCHIC_DECK_MACHINE
 	print_text Text060a
 .ows_da6d
 	ask_question_jump_default_yes Text060b, .ows_da73
@@ -4239,7 +4239,7 @@ Script_da76: ; da76 (3:5a76)
 .ows_da91
 	play_sfx SFX_5A
 	max_out_event_value EVENT_SCIENCE_DECK_MACHINE_ACTIVE
-	replace_map_blocks $08
+	replace_map_blocks MAP_EVENT_SCIENCE_DECK_MACHINE
 	print_text Text060a
 .ows_da9a
 	ask_question_jump_default_yes Text060b, .ows_daa0
@@ -4267,7 +4267,7 @@ Script_daa3: ; daa3 (3:5aa3)
 .ows_dabe
 	play_sfx SFX_5A
 	max_out_event_value EVENT_FIRE_DECK_MACHINE_ACTIVE
-	replace_map_blocks $09
+	replace_map_blocks MAP_EVENT_FIRE_DECK_MACHINE
 	print_text Text060a
 .ows_dac7
 	ask_question_jump_default_yes Text060b, .ows_dacd
@@ -8387,7 +8387,7 @@ PokemonDomeEntranceLoadMap: ; f607 (3:7607)
 	ret
 
 PokemonDomeEntranceCloseTextBox: ; f62a (3:762a)
-	ld a, $00
+	ld a, MAP_EVENT_POKEMON_DOME_DOOR
 	farcall Func_80b89
 	ret
 
@@ -8479,7 +8479,7 @@ Script_f6af: ; f6af (3:76af)
 .ows_f6b9
 	print_npc_text Text0559
 	play_sfx SFX_0F
-	replace_map_blocks $00
+	replace_map_blocks MAP_EVENT_POKEMON_DOME_DOOR
 	do_frames 30
 	move_player NORTH, 1
 	quit_script_fully
@@ -8540,7 +8540,7 @@ PokemonDomeLoadMap: ; f706 (3:7706)
 	jp SetNextScript
 
 PokemonDomeCloseTextBox: ; f718 (3:7718)
-	ld a, $01
+	ld a, MAP_EVENT_HALL_OF_HONOR_DOOR
 	farcall Func_80b89
 	ret
 
@@ -9040,7 +9040,7 @@ Script_BeatRod: ; faae (3:7aae)
 	move_active_npc NPCMovement_fb96
 	set_active_npc_direction SOUTH
 	play_sfx SFX_0F
-	replace_map_blocks $01
+	replace_map_blocks MAP_EVENT_HALL_OF_HONOR_DOOR
 	set_event EVENT_POKEMON_DOME_STATE, POKEMON_DOME_DEFEATED
 	max_out_event_value EVENT_HALL_OF_HONOR_DOORS_OPEN
 	print_text_quit_fully Text05a4
@@ -9050,7 +9050,7 @@ Script_BeatRod: ; faae (3:7aae)
 	override_song MUSIC_STOP
 	set_event EVENT_RONALD_POKEMON_DOME_STATE, RONALD_CHALLENGED
 	play_sfx SFX_0F
-	replace_map_blocks $01
+	replace_map_blocks MAP_EVENT_HALL_OF_HONOR_DOOR
 	move_active_npc NPCMovement_fbd2
 	set_default_song MUSIC_RONALD
 	play_default_song
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index b1fb692..b780b36 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -1194,7 +1194,7 @@ Func_11430: ; 11430 (4:5430)
 	dw wNPCDuelist,            1, $ff00 ; sNPCDuelist
 	dw wChallengeHallNPC,      1, $ff00 ; sChallengeHallNPC
 	dw wd698,                  4, $ff00 ; sb818
-	dw wd323,                 11, $ff00 ; sb81c
+	dw wOWMapEvents,          11, $ff00 ; sOWMapEvents
 	dw Data_1156c,             1, $ff00 ; sb827
 	dw wd0b8,                  1, $ff00 ; sb828
 	dw wd0b9,                  1, $ff00 ; sb829
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 018787e..85de56b 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -1710,7 +1710,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
 	call Func_1d705
 	call Func_1c858
 	xor a
-	ld [wd323 + 1], a
+	ld [wOWMapEvents + 1], a
 	ld a, MUSIC_CREDITS
 	call PlaySong
 	farcall Func_10031
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index ad2ffd1..4b5aa1a 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -1160,12 +1160,12 @@ StoreOWFramesetSubgroup: ; 805c1 (20:45c1)
 
 INCLUDE "data/map_ow_framesets.asm"
 
-; clears wd323
+; clears wOWMapEvents
 Func_80b7a: ; 80b7a (20:4b7a)
 	push hl
 	push bc
 	ld c, $b
-	ld hl, wd323
+	ld hl, wOWMapEvents
 	xor a
 .loop
 	ld [hli], a
@@ -1176,6 +1176,7 @@ Func_80b7a: ; 80b7a (20:4b7a)
 	ret
 ; 0x80b89
 
+; a = MAP_EVENT_* constant
 Func_80b89: ; 80b89 (20:4b89)
 	push hl
 	push bc
@@ -1183,8 +1184,8 @@ Func_80b89: ; 80b89 (20:4b89)
 	ld c, a
 	ld a, TRUE
 	ld [wWriteBGMapToSRAM], a
-	ld b, $00
-	ld hl, wd323
+	ld b, $0
+	ld hl, wOWMapEvents
 	add hl, bc
 	ld a, [hl]
 	or a
@@ -1223,7 +1224,7 @@ Func_80baa: ; 80baa (20:4baa)
 	push af
 
 	ld b, $0
-	ld hl, wd323
+	ld hl, wOWMapEvents
 	add hl, bc
 	ld a, $1
 	ld [hl], a
@@ -1232,7 +1233,7 @@ Func_80baa: ; 80baa (20:4baa)
 	add a
 	ld c, a
 	ld b, $0
-	ld hl, .unknown_80c21
+	ld hl, .tilemap_pointers
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -1281,41 +1282,42 @@ Func_80baa: ; 80baa (20:4baa)
 	pop hl
 	ret
 
-.unknown_80c21
-	dw .data_1
-	dw .data_2
-	dw .data_3
-	dw .data_4
-	dw .data_5
-	dw .data_6
-	dw .data_7
-	dw .data_8
-	dw .data_9
-	dw .data_10
-	dw .data_11
-
-.data_1
-	db $16, $00, TILEMAP_UNKNOWN_3, TILEMAP_UNKNOWN_3_CGB
-.data_2
-	db $0e, $00, TILEMAP_UNKNOWN_4, TILEMAP_UNKNOWN_4_CGB
-.data_3
-	db $06, $02, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_4
-	db $0a, $02, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_5
-	db $0e, $02, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_6
-	db $12, $02, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_7
-	db $0e, $0a, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_8
-	db $12, $0a, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_9
-	db $0e, $12, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_10
-	db $12, $12, TILEMAP_UNKNOWN_2, TILEMAP_UNKNOWN_2_CGB
-.data_11
-	db $0a, $00, TILEMAP_UNKNOWN_1, TILEMAP_UNKNOWN_1_CGB
+.tilemap_pointers
+	dw .PokemonDomeDoor      ; MAP_EVENT_POKEMON_DOME_DOOR
+	dw .HallOfHonorDoor      ; MAP_EVENT_HALL_OF_HONOR_DOOR
+	dw .FightingDeckMachine  ; MAP_EVENT_FIGHTING_DECK_MACHINE
+	dw .RockDeckMachine      ; MAP_EVENT_ROCK_DECK_MACHINE
+	dw .WaterDeckMachine     ; MAP_EVENT_WATER_DECK_MACHINE
+	dw .LightningDeckMachine ; MAP_EVENT_LIGHTNING_DECK_MACHINE
+	dw .GrassDeckMachine     ; MAP_EVENT_GRASS_DECK_MACHINE
+	dw .PsychicDeckMachine   ; MAP_EVENT_PSYCHIC_DECK_MACHINE
+	dw .ScienceDeckMachine   ; MAP_EVENT_SCIENCE_DECK_MACHINE
+	dw .FireDeckMachine      ; MAP_EVENT_FIRE_DECK_MACHINE
+	dw .ChallengeMachine     ; MAP_EVENT_CHALLENGE_MACHINE
+
+; x coordinate, y coordinate, non-cgb tilemap, cgb tilemap
+.PokemonDomeDoor
+	db $16, $00, TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT, TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT_CGB
+.HallOfHonorDoor
+	db $0e, $00, TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT, TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT_CGB
+.FightingDeckMachine
+	db $06, $02, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.RockDeckMachine
+	db $0a, $02, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.WaterDeckMachine
+	db $0e, $02, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.LightningDeckMachine
+	db $12, $02, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.GrassDeckMachine
+	db $0e, $0a, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.PsychicDeckMachine
+	db $12, $0a, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.ScienceDeckMachine
+	db $0e, $12, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.FireDeckMachine
+	db $12, $12, TILEMAP_DECK_MACHINE_MAP_EVENT, TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+.ChallengeMachine
+	db $0a, $00, TILEMAP_CHALLENGE_MACHINE_MAP_EVENT, TILEMAP_CHALLENGE_MACHINE_MAP_EVENT_CGB
 
 	ret ; unreferenced stray ret?
 
@@ -1607,12 +1609,12 @@ Tilemaps: ; 80e67 (20:4e67)
 	tilemap OverworldMapCGBTilemap,          TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP_CGB
 	tilemap MasonLaboratoryTilemap,          TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY
 	tilemap MasonLaboratoryCGBTilemap,       TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY_CGB
-	tilemap Unknown1Tilemap,                 TILESET_MASON_LABORATORY            ; TILEMAP_UNKNOWN_1
-	tilemap Unknown1CGBTilemap,              TILESET_MASON_LABORATORY            ; TILEMAP_UNKNOWN_1_CGB
+	tilemap Unknown1Tilemap,                 TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT
+	tilemap Unknown1CGBTilemap,              TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT_CGB
 	tilemap DeckMachineRoomTilemap,          TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM
 	tilemap DeckMachineRoomCGBTilemap,       TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM_CGB
-	tilemap Unknown2Tilemap,                 TILESET_MASON_LABORATORY            ; TILEMAP_UNKNOWN_2
-	tilemap Unknown2CGBTilemap,              TILESET_MASON_LABORATORY            ; TILEMAP_UNKNOWN_2_CGB
+	tilemap Unknown2Tilemap,                 TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT
+	tilemap Unknown2CGBTilemap,              TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
 	tilemap IshiharaTilemap,                 TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA
 	tilemap IshiharaCGBTilemap,              TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA_CGB
 	tilemap FightingClubEntranceTilemap,     TILESET_CLUB_ENTRANCE               ; TILEMAP_FIGHTING_CLUB_ENTRANCE
@@ -1655,12 +1657,12 @@ Tilemaps: ; 80e67 (20:4e67)
 	tilemap ChallengeHallCGBTilemap,         TILESET_CHALLENGE_HALL              ; TILEMAP_CHALLENGE_HALL_CGB
 	tilemap PokemonDomeEntranceTilemap,      TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE
 	tilemap PokemonDomeEntranceCGBTilemap,   TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE_CGB
-	tilemap Unknown3Tilemap,                 TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_UNKNOWN_3
-	tilemap Unknown3CGBTilemap,              TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_UNKNOWN_3_CGB
+	tilemap Unknown3Tilemap,                 TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT
+	tilemap Unknown3CGBTilemap,              TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT_CGB
 	tilemap PokemonDomeTilemap,              TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME
 	tilemap PokemonDomeCGBTilemap,           TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME_CGB
-	tilemap Unknown4Tilemap,                 TILESET_POKEMON_DOME                ; TILEMAP_UNKNOWN_4
-	tilemap Unknown4CGBTilemap,              TILESET_POKEMON_DOME                ; TILEMAP_UNKNOWN_4_CGB
+	tilemap Unknown4Tilemap,                 TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT
+	tilemap Unknown4CGBTilemap,              TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT_CGB
 	tilemap HallOfHonorTilemap,              TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR
 	tilemap HallOfHonorCGBTilemap,           TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR_CGB
 	tilemap CardPopCGBTilemap,               TILESET_CARD_POP                    ; TILEMAP_CARD_POP_CGB