mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Remove map name sign feature (#1)
This commit is contained in:
parent
8ac94cc479
commit
dd04feb32a
@ -49,4 +49,3 @@ MapSetupCommands:
|
||||
add_mapsetup SuspendMapAnims ; 2a
|
||||
add_mapsetup ApplyMapPalettes ; 2b
|
||||
add_mapsetup EnableTextAcceleration ; 2c
|
||||
add_mapsetup InitMapNameSign ; 2d
|
||||
|
@ -86,7 +86,6 @@ MapSetupScript_Connection:
|
||||
mapsetup LoadMapObjects
|
||||
mapsetup FadeToMapMusic
|
||||
mapsetup LoadMapPalettes
|
||||
mapsetup InitMapNameSign
|
||||
mapsetup ApplyMapPalettes
|
||||
mapsetup LoadWildMonData
|
||||
mapsetup UpdateRoamMons
|
||||
|
@ -1,233 +0,0 @@
|
||||
DEF MAP_NAME_SIGN_START EQU $60
|
||||
|
||||
InitMapNameSign::
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes
|
||||
ret
|
||||
|
||||
; should have just been a fallthrough
|
||||
.inefficient_farcall
|
||||
ld a, [wMapGroup]
|
||||
ld b, a
|
||||
ld a, [wMapNumber]
|
||||
ld c, a
|
||||
call GetWorldMapLocation
|
||||
ld [wCurLandmark], a
|
||||
|
||||
call GetMapEnvironment
|
||||
cp GATE
|
||||
jr nz, .not_gate
|
||||
|
||||
.gate
|
||||
ld a, -1
|
||||
ld [wCurLandmark], a
|
||||
|
||||
.not_gate
|
||||
ld hl, wEnteredMapFromContinue
|
||||
bit 1, [hl]
|
||||
res 1, [hl]
|
||||
jr nz, .dont_do_map_sign
|
||||
|
||||
call .CheckMovingWithinLandmark
|
||||
jr z, .dont_do_map_sign
|
||||
ld a, [wCurLandmark]
|
||||
ld [wPrevLandmark], a
|
||||
|
||||
call .CheckSpecialMap
|
||||
jr z, .dont_do_map_sign
|
||||
|
||||
; Display for 60 frames
|
||||
ld a, 60
|
||||
ld [wLandmarkSignTimer], a
|
||||
call LoadMapNameSignGFX
|
||||
call InitMapNameFrame
|
||||
farcall HDMATransfer_OnlyTopFourRows
|
||||
ret
|
||||
|
||||
.dont_do_map_sign
|
||||
ld a, [wCurLandmark]
|
||||
ld [wPrevLandmark], a
|
||||
ld a, $90
|
||||
ldh [rWY], a
|
||||
ldh [hWY], a
|
||||
xor a
|
||||
ldh [hLCDCPointer], a
|
||||
ret
|
||||
|
||||
.CheckMovingWithinLandmark:
|
||||
ld a, [wCurLandmark]
|
||||
ld c, a
|
||||
ld a, [wPrevLandmark]
|
||||
cp c
|
||||
ret
|
||||
|
||||
.CheckSpecialMap:
|
||||
; These landmarks do not get pop-up signs.
|
||||
cp -1
|
||||
ret z
|
||||
ld a, 1
|
||||
and a
|
||||
ret
|
||||
|
||||
PlaceMapNameSign::
|
||||
ld hl, wLandmarkSignTimer
|
||||
ld a, [hl]
|
||||
and a
|
||||
jr z, .disappear
|
||||
dec [hl]
|
||||
cp 60
|
||||
ret z
|
||||
cp 59
|
||||
jr nz, .already_initialized
|
||||
call InitMapNameFrame
|
||||
call PlaceMapNameCenterAlign
|
||||
farcall HDMATransfer_OnlyTopFourRows
|
||||
.already_initialized
|
||||
ld a, $80
|
||||
ld a, $70
|
||||
ldh [rWY], a
|
||||
ldh [hWY], a
|
||||
ret
|
||||
|
||||
.disappear
|
||||
ld a, $90
|
||||
ldh [rWY], a
|
||||
ldh [hWY], a
|
||||
xor a
|
||||
ldh [hLCDCPointer], a
|
||||
ret
|
||||
|
||||
LoadMapNameSignGFX:
|
||||
ld de, MapEntryFrameGFX
|
||||
ld hl, vTiles2 tile MAP_NAME_SIGN_START
|
||||
lb bc, BANK(MapEntryFrameGFX), 14
|
||||
call Get2bpp
|
||||
ret
|
||||
|
||||
InitMapNameFrame:
|
||||
hlcoord 0, 0
|
||||
ld b, 2
|
||||
ld c, 18
|
||||
call InitMapSignAttrmap
|
||||
call PlaceMapNameFrame
|
||||
ret
|
||||
|
||||
PlaceMapNameCenterAlign:
|
||||
ld a, [wCurLandmark]
|
||||
ld e, a
|
||||
farcall GetLandmarkName
|
||||
call .GetNameLength
|
||||
ld a, SCREEN_WIDTH
|
||||
sub c
|
||||
srl a
|
||||
ld b, 0
|
||||
ld c, a
|
||||
hlcoord 0, 2
|
||||
add hl, bc
|
||||
ld de, wStringBuffer1
|
||||
call PlaceString
|
||||
ret
|
||||
|
||||
.GetNameLength:
|
||||
ld c, 0
|
||||
push hl
|
||||
ld hl, wStringBuffer1
|
||||
.loop
|
||||
ld a, [hli]
|
||||
cp "@"
|
||||
jr z, .stop
|
||||
cp "%"
|
||||
jr z, .loop
|
||||
inc c
|
||||
jr .loop
|
||||
.stop
|
||||
pop hl
|
||||
ret
|
||||
|
||||
InitMapSignAttrmap:
|
||||
ld de, wAttrmap - wTilemap
|
||||
add hl, de
|
||||
inc b
|
||||
inc b
|
||||
inc c
|
||||
inc c
|
||||
ld a, PAL_BG_TEXT | PRIORITY
|
||||
.loop
|
||||
push bc
|
||||
push hl
|
||||
.inner_loop
|
||||
ld [hli], a
|
||||
dec c
|
||||
jr nz, .inner_loop
|
||||
pop hl
|
||||
ld de, SCREEN_WIDTH
|
||||
add hl, de
|
||||
pop bc
|
||||
dec b
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
PlaceMapNameFrame:
|
||||
hlcoord 0, 0
|
||||
; top left
|
||||
ld a, MAP_NAME_SIGN_START + 1
|
||||
ld [hli], a
|
||||
; top row
|
||||
ld a, MAP_NAME_SIGN_START + 2
|
||||
call .FillTopBottom
|
||||
; top right
|
||||
ld a, MAP_NAME_SIGN_START + 4
|
||||
ld [hli], a
|
||||
; left, first line
|
||||
ld a, MAP_NAME_SIGN_START + 5
|
||||
ld [hli], a
|
||||
; first line
|
||||
call .FillMiddle
|
||||
; right, first line
|
||||
ld a, MAP_NAME_SIGN_START + 11
|
||||
ld [hli], a
|
||||
; left, second line
|
||||
ld a, MAP_NAME_SIGN_START + 6
|
||||
ld [hli], a
|
||||
; second line
|
||||
call .FillMiddle
|
||||
; right, second line
|
||||
ld a, MAP_NAME_SIGN_START + 12
|
||||
ld [hli], a
|
||||
; bottom left
|
||||
ld a, MAP_NAME_SIGN_START + 7
|
||||
ld [hli], a
|
||||
; bottom
|
||||
ld a, MAP_NAME_SIGN_START + 8
|
||||
call .FillTopBottom
|
||||
; bottom right
|
||||
ld a, MAP_NAME_SIGN_START + 10
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.FillMiddle:
|
||||
ld c, SCREEN_WIDTH - 2
|
||||
ld a, MAP_NAME_SIGN_START + 13
|
||||
.loop
|
||||
ld [hli], a
|
||||
dec c
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
.FillTopBottom:
|
||||
ld c, (SCREEN_WIDTH - 2) / 4 + 1
|
||||
jr .enterloop
|
||||
|
||||
.continueloop
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
|
||||
.enterloop
|
||||
inc a
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
dec a
|
||||
dec c
|
||||
jr nz, .continueloop
|
||||
ret
|
@ -208,7 +208,6 @@ HandleMapObjects:
|
||||
HandleMapBackground:
|
||||
farcall _UpdateSprites
|
||||
farcall ScrollScreen
|
||||
farcall PlaceMapNameSign
|
||||
ret
|
||||
|
||||
CheckPlayerState:
|
||||
@ -272,16 +271,6 @@ PlayerEvents:
|
||||
|
||||
ld [wScriptRunning], a
|
||||
call DoPlayerEvent
|
||||
ld a, [wScriptRunning]
|
||||
cp PLAYEREVENT_CONNECTION
|
||||
jr z, .ok2
|
||||
cp PLAYEREVENT_JOYCHANGEFACING
|
||||
jr z, .ok2
|
||||
|
||||
xor a
|
||||
ld [wLandmarkSignTimer], a
|
||||
|
||||
.ok2
|
||||
scf
|
||||
ret
|
||||
|
||||
|
@ -297,7 +297,8 @@ LoadMapPalettes:
|
||||
|
||||
RefreshMapSprites:
|
||||
call ClearSprites
|
||||
farcall InitMapNameSign
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call GetMovementPermissions
|
||||
farcall RefreshPlayerSprite
|
||||
farcall CheckUpdatePlayerSprite
|
||||
|
@ -35,9 +35,6 @@ INCBIN "gfx/battle/expbar.2bpp"
|
||||
TownMapGFX:
|
||||
INCBIN "gfx/pokegear/town_map.2bpp.lz"
|
||||
|
||||
UnusedWeekdayKanjiGFX: ; unreferenced
|
||||
INCBIN "gfx/font/unused_weekday_kanji.2bpp"
|
||||
|
||||
PokegearPhoneIconGFX:
|
||||
INCBIN "gfx/font/phone_icon.2bpp"
|
||||
|
||||
@ -51,12 +48,6 @@ INCBIN "gfx/font/space.2bpp"
|
||||
FontsExtra_SolidBlackGFX:
|
||||
INCBIN "gfx/font/black.1bpp"
|
||||
|
||||
UnusedUpArrowGFX: ; unreferenced
|
||||
INCBIN "gfx/font/unused_up_arrow.1bpp"
|
||||
|
||||
MapEntryFrameGFX:
|
||||
INCBIN "gfx/frames/map_entry_sign.2bpp"
|
||||
|
||||
FontsExtra2_UpArrowGFX:
|
||||
INCBIN "gfx/font/up_arrow.2bpp"
|
||||
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 86 B |
Binary file not shown.
Before Width: | Height: | Size: 142 B |
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 169 B |
@ -39,7 +39,8 @@ CloseText::
|
||||
ld a, $90
|
||||
ldh [hWY], a
|
||||
call UpdatePlayerSprite
|
||||
farcall InitMapNameSign
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
farcall LoadOverworldFont
|
||||
ret
|
||||
|
||||
|
1
main.asm
1
main.asm
@ -287,7 +287,6 @@ INCLUDE "engine/events/trainer_scripts.asm"
|
||||
|
||||
SECTION "bank2E", ROMX
|
||||
|
||||
INCLUDE "engine/events/map_name_sign.asm"
|
||||
INCLUDE "engine/events/checkforhiddenitems.asm"
|
||||
INCLUDE "engine/events/treemons.asm"
|
||||
INCLUDE "engine/events/fishing_gfx.asm"
|
||||
|
@ -135,7 +135,6 @@ wPrevDexEntry:: db
|
||||
wDisableTextAcceleration:: db
|
||||
wPrevLandmark:: db
|
||||
wCurLandmark:: db
|
||||
wLandmarkSignTimer:: dw
|
||||
|
||||
wLinkMode::
|
||||
; a LINK_* value for the link type
|
||||
|
Loading…
Reference in New Issue
Block a user