diff options
| -rw-r--r-- | constants/map_data_constants.asm | 1 | ||||
| -rw-r--r-- | data/maps/flypoints.asm | 2 | ||||
| -rw-r--r-- | engine/pokegear/pokegear.asm | 22 |
3 files changed, 13 insertions, 12 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 89762da7..607b3e87 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -128,5 +128,6 @@ KANTO_FLYPOINT EQU const_value const FLY_FUCHSIA const FLY_CINNABAR const FLY_INDIGO +NUM_FLYPOINTS EQU const_value MAX_OUTDOOR_SPRITES EQU 11 ; see engine/overworld/overworld.asm diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index e3578daa..faf3a4da 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -27,4 +27,4 @@ Flypoints: db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO - db -1 + db -1 ; end diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 234dfca1..648db17b 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -65,7 +65,7 @@ PokeGear: ldh [hBGMapAddress], a ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a - ld a, $90 + ld a, SCREEN_HEIGHT_PX ldh [hWY], a call ExitPokegearRadio_HandleMusic ret @@ -261,7 +261,7 @@ InitPokegearTilemap: ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a call .UpdateBGMap - ld a, $90 + ld a, SCREEN_HEIGHT_PX jr .finish .kanto_0 @@ -2028,7 +2028,7 @@ _FlyMap: pop af ldh [hInMenu], a call ClearBGPalettes - ld a, $90 + ld a, SCREEN_HEIGHT_PX ldh [hWY], a xor a ; LOW(vBGMap0) ldh [hBGMapAddress], a @@ -2371,10 +2371,10 @@ Pokedex_GetArea: .left ldh a, [hWY] - cp $90 + cp SCREEN_HEIGHT_PX ret z call ClearSprites - ld a, $90 + ld a, SCREEN_HEIGHT_PX ldh [hWY], a xor a ; JOHTO_REGION call .GetAndPlaceNest @@ -2807,7 +2807,7 @@ Function92264: pop af ldh [hInMenu], a call ClearBGPalettes - ld a, $90 + ld a, SCREEN_HEIGHT_PX ldh [hWY], a xor a ; LOW(vBGMap0) ldh [hBGMapAddress], a @@ -2830,7 +2830,7 @@ Function92264: .down_right ld hl, wTownMapPlayerIconLandmark ld a, [hl] - cp FLY_INDIGO + cp NUM_FLYPOINTS - 1 jr c, .okay_dr ld [hl], -1 .okay_dr @@ -2842,7 +2842,7 @@ Function92264: ld a, [hl] and a jr nz, .okay_ul - ld [hl], FLY_INDIGO + 1 + ld [hl], NUM_FLYPOINTS .okay_ul dec [hl] .continue @@ -2851,13 +2851,13 @@ Function92264: jr c, .johto call FillKantoMap xor a - ld b, $9c + ld b, HIGH(vBGMap1) jr .finish .johto call FillJohtoMap - ld a, $90 - ld b, $98 + ld a, SCREEN_HEIGHT_PX + ld b, HIGH(vBGMap0) .finish ldh [hWY], a ld a, b |