maptrigger macro

7 files changed, 39 insertions, 41 deletions

diff --git a/engine/events.asm b/engine/events.asm
index 51e7288bc..120154f24 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -502,7 +502,7 @@ CheckTimeEvents: ; 9693a
 
 .do_daily
 	callba CheckDailyResetTimer
-	callba CheckPokerusTrick
+	callba CheckPokerusTick
 	callba CheckPhoneCall
 	ret c
 
diff --git a/engine/options_menu.asm b/engine/options_menu.asm
index 2e8b0424b..f6d8392d9 100755
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -5,8 +5,8 @@ _OptionsMenu: ; e41d0
 	ld [hl], $1
 	call ClearBGPalettes
 	hlcoord 0, 0
-	ld b, $10
-	ld c, $12
+	ld b, 16
+	ld c, 18
 	call TextBox
 	hlcoord 2, 2
 	ld de, StringOptions
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 821a51f8a..4ef65da8c 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -213,14 +213,14 @@ Function90d70: ; 90d70 (24:4d70)
 	call GetWorldMapLocation
 
 .LoadLandmark
-	ld [wc6d8], a
-	ld [wc6d7], a
+	ld [wTownMapPlayerIconLandmark], a
+	ld [wTownMapCursorLandmark], a
 	ret
 
 .FastShip
-	ld [wc6d8], a
+	ld [wTownMapPlayerIconLandmark], a
 	ld a, NEW_BARK_TOWN
-	ld [wc6d7], a
+	ld [wTownMapCursorLandmark], a
 	ret
 
 Function90d9e: ; 90d9e (24:4d9e)
@@ -321,7 +321,7 @@ Function90e1a: ; 90e1a
 
 Function90e3f: ; 90e3f
 
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
@@ -341,7 +341,7 @@ Function90e3f: ; 90e3f
 	ld [hl], $6
 	hlcoord 19, 2
 	ld [hl], $17
-	ld a, [wc6d7]
+	ld a, [wTownMapCursorLandmark]
 	call Function910b4
 	ret
 ; 90e72
@@ -547,7 +547,7 @@ UnknownText_0x90faf: ; 0x90faf
 ; 0x90fb4
 
 Function90fb4: ; 90fb4 (24:4fb4)
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
@@ -567,9 +567,9 @@ Function90fb4: ; 90fb4 (24:4fb4)
 
 Function90fcd: ; 90fcd (24:4fcd)
 	call Function90da8
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	call Function9106a
-	ld a, [wc6d7]
+	ld a, [wTownMapCursorLandmark]
 	call Function91098
 	ld a, c
 	ld [wc6d5], a
@@ -580,7 +580,7 @@ Function90fcd: ; 90fcd (24:4fcd)
 	ret
 
 Function90fe9: ; 90fe9 (24:4fe9)
-	call Function910e8
+	call TownMap_GetKantoLandmarkLimits
 	jr Function90ff2
 
 Function90fee: ; 90fee (24:4fee)
@@ -637,7 +637,7 @@ Function9102f: ; 9102f (24:502f)
 	jr nz, .down
 	ret
 .up
-	ld hl, wc6d7
+	ld hl, wTownMapCursorLandmark
 	ld a, [hl]
 	cp d
 	jr c, .asm_91047
@@ -649,7 +649,7 @@ Function9102f: ; 9102f (24:502f)
 	jr .done
 
 .down
-	ld hl, wc6d7
+	ld hl, wTownMapCursorLandmark
 	ld a, [hl]
 	cp e
 	jr nz, .asm_91054
@@ -660,13 +660,13 @@ Function9102f: ; 9102f (24:502f)
 	dec [hl]
 
 .done
-	ld a, [wc6d7]
+	ld a, [wTownMapCursorLandmark]
 	call Function910b4
 	ld a, [wc6d5]
 	ld c, a
 	ld a, [wc6d6]
 	ld b, a
-	ld a, [wc6d7]
+	ld a, [wTownMapCursorLandmark]
 	call Function910d4
 	ret
 
@@ -747,17 +747,17 @@ Function910d4: ; 910d4
 	ret
 ; 910e8
 
-Function910e8: ; 910e8
+TownMap_GetKantoLandmarkLimits: ; 910e8
 	ld a, [StatusFlags]
 	bit 6, a
-	jr z, .asm_910f4
-	ld d, $5e
-	ld e, $2f
+	jr z, .not_hof
+	ld d, ROUTE_28
+	ld e, PALLET_TOWN
 	ret
 
-.asm_910f4
-	ld d, $5e
-	ld e, $58
+.not_hof
+	ld d, ROUTE_28
+	ld e, VICTORY_ROAD
 	ret
 ; 910f9
 
@@ -1558,7 +1558,7 @@ RadioChannels:
 	jp LoadStation_BuenasPassword
 
 .RuinsOfAlphRadio
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp RUINS_OF_ALPH
 	jr nz, .NoSignal
 	jp LoadStation_UnownRadio
@@ -1594,7 +1594,7 @@ RadioChannels:
 	bit 4, a
 	jr z, .NoSignal
 
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp MAHOGANY_TOWN
 	jr z, .ok
 	cp ROUTE_43
@@ -1611,7 +1611,7 @@ RadioChannels:
 .InJohto
 ; if in Johto or on the S.S. Aqua, set carry
 ; otherwise clear carry
-	ld a, [wc6d8]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
diff --git a/engine/save.asm b/engine/save.asm
index 7750b0f41..f2f3a79bd 100644
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -723,13 +723,13 @@ TryLoadSaveData: ; 14f1c
 
 DefaultOptions: ; 14f7c
 	db $03 ; mid text speed
-	db $00
+	db $00 ; wSaveFileExists
 	db $00 ; frame 0
-	db $01
+	db $01 ; TextBoxFlags
 	db $40 ; gb printer: normal brightness
 	db $01 ; menu account on
-	db $00
-	db $00
+	db $00 ; ??
+	db $00 ; ??
 ; 14f84
 
 CheckPrimarySaveFile: ; 14f84
diff --git a/engine/scripting.asm b/engine/scripting.asm
index d271d5192..6198bf417 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1203,7 +1203,7 @@ ApplyPersonFacing: ; 9728b
 	jr c, .not_visible ; STILL_SPRITE
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit 2, [hl]
+	bit FIXED_FACING, [hl]
 	jr nz, .not_visible
 	pop de
 	ld a, e
diff --git a/engine/time.asm b/engine/time.asm
index f4eee4b17..542141198 100755
--- a/engine/time.asm
+++ b/engine/time.asm
@@ -195,7 +195,7 @@ InitializeStartDay: ; 114dd
 	ret
 ; 114e7
 
-CheckPokerusTrick:: ; 114e7
+CheckPokerusTick:: ; 114e7
 	ld hl, wStartDay
 	call CalcDaysSince
 	call GetDaysSince
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 2633b8385..100aaae17 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -45,23 +45,23 @@ _TownMap: ; 9191c
 	call SetPalettes
 	ld a, [hCGB]
 	and a
-	jr z, .sgb
-	ld a, $e4
+	jr z, .dmg
+	ld a, %11100100
 	call DmgToCgbObjPal0
 	call DelayFrame
 
-.sgb
+.dmg
 	ld a, [wd002]
 	cp KANTO_LANDMARK
 	jr nc, .kanto
 	ld d, KANTO_LANDMARK - 1
 	ld e, 1
-	call Function919b0
+	call .loop
 	jr .resume
 
 .kanto
-	call Function910e8
-	call Function919b0
+	call TownMap_GetKantoLandmarkLimits
+	call .loop
 
 .resume
 	pop af
@@ -72,9 +72,7 @@ _TownMap: ; 9191c
 	ld [Options], a
 	call ClearBGPalettes
 	ret
-; 919b0
 
-Function919b0: ; 919b0
 .loop
 	call JoyTextDelay
 	ld hl, hJoyPressed