pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make level selection menu landmarks universal (#4) (#12)

Browse Source
This commit is contained in:
xCrystal
2023-08-20 12:08:24 +02:00
parent 222b46896c
commit fc2e757c57
11 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/pokegear/pokegear.asm
View File

@@ -574,7 +574,7 @@ PokegearMap_InitPlayerIcon:
pop af
ld e, a
push bc
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -609,7 +609,7 @@ PokegearMap_UpdateLandmarkName:
pop af
ld e, a
push de
farcall GetLandmarkName
farcall LevelSelectionMenu_GetLandmarkName
pop de
farcall TownMap_ConvertLineBreakCharacters
hlcoord 8, 0
@@ -619,7 +619,7 @@ PokegearMap_UpdateLandmarkName:
PokegearMap_UpdateCursorPosition:
push bc
ld e, a
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -1986,7 +1986,7 @@ TownMapBubble:
ld de, Flypoints
add hl, de
ld e, [hl]
farcall GetLandmarkName
farcall LevelSelectionMenu_GetLandmarkName
hlcoord 2, 1
ld de, wStringBuffer1
call PlaceString
@@ -2000,7 +2000,7 @@ GetMapCursorCoordinates:
ld de, Flypoints
add hl, de
ld e, [hl]
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
ld a, [wTownMapCursorCoordinates]
ld c, a
ld a, [wTownMapCursorCoordinates + 1]
@@ -2231,7 +2231,7 @@ Pokedex_GetArea:
push de
ld e, a
push hl
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
pop hl
; load into OAM
ld a, d
@@ -2261,7 +2261,7 @@ Pokedex_GetArea:
ret c
ld a, [wTownMapPlayerIconLandmark]
ld e, a
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
ld c, e
ld b, d
ld de, .PlayerOAM
@@ -2472,7 +2472,7 @@ TownMapPlayerIcon:
pop af
ld e, a
push bc
farcall GetLandmarkCoords
farcall LevelSelectionMenu_GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc

4
engine/pokegear/radio.asm
View File

@@ -266,7 +266,7 @@ endr
pop bc
call GetWorldMapLocation
ld e, a
farcall GetLandmarkName
farcall LevelSelectionMenu_GetLandmarkName
ld hl, OPT_OakText1
call CopyRadioTextToRAM
ld a, OAKS_POKEMON_TALK_5
@@ -1249,7 +1249,7 @@ PeoplePlaces6: ; Places
ld c, [hl]
call GetWorldMapLocation
ld e, a
farcall GetLandmarkName
farcall LevelSelectionMenu_GetLandmarkName
ld hl, PnP_Text5
ld a, PLACES_AND_PEOPLE_7
jp NextRadioLine