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

Use labels instead of constants for HRAM

Browse Source 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
Rangi
2018-08-25 14:28:22 -04:00
parent 376c64468b
commit eb1e3636bb
243 changed files with 4706 additions and 4661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
engine/pokegear/pokegear.asm
View File

@@ -27,10 +27,10 @@ PokeGear:
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
ld a, [hInMenu]
ldh a, [hInMenu]
push af
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
ld a, [wVramState]
push af
xor a
@@ -55,16 +55,16 @@ PokeGear:
pop af
ld [wVramState], a
pop af
ld [hInMenu], a
ldh [hInMenu], a
pop af
ld [wOptions], a
call ClearBGPalettes
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
ld a, $90
ld [hWY], a
ldh [hWY], a
call ExitPokegearRadio_HandleMusic
ret
@@ -74,17 +74,17 @@ PokeGear:
call ClearSprites
call DisableLCD
xor a
ld [hSCY], a
ld [hSCX], a
ldh [hSCY], a
ldh [hSCX], a
ld a, $7
ld [hWX], a
ldh [hWX], a
call Pokegear_LoadGFX
farcall ClearSpriteAnims
call InitPokegearModeIndicatorArrow
ld a, 8
call SkipMusic
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
call TownMap_InitCursorAndPlayerIconPositions
xor a
ld [wJumptableIndex], a ; POKEGEARSTATE_CLOCKINIT
@@ -102,7 +102,7 @@ PokeGear:
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ld a, [hCGB]
ldh a, [hCGB]
and a
ret z
ld a, %11100100
@@ -237,7 +237,7 @@ Pokegear_InitJumptableIndices:
InitPokegearTilemap:
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $4f
@@ -263,22 +263,22 @@ InitPokegearTilemap:
and a
jr nz, .kanto_0
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
call .UpdateBGMap
ld a, $90
jr .finish
.kanto_0
xor a ; LOW(vBGMap1)
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap1)
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
call .UpdateBGMap
xor a
.finish
ld [hWY], a
ldh [hWY], a
; swap region maps
ld a, [wPokegearMapRegion]
maskbits NUM_REGIONS
@@ -287,11 +287,11 @@ InitPokegearTilemap:
ret
.UpdateBGMap:
ld a, [hCGB]
ldh a, [hCGB]
and a
jr z, .dmg
ld a, $2
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld c, 3
call DelayFrames
.dmg
@@ -507,19 +507,19 @@ PokegearClock_Joypad:
.UpdateClock:
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call Pokegear_UpdateClock
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
Pokegear_UpdateClock:
hlcoord 3, 5
lb bc, 5, 14
call ClearBox
ld a, [hHours]
ldh a, [hHours]
ld b, a
ld a, [hMinutes]
ldh a, [hMinutes]
ld c, a
decoord 6, 8
farcall PrintHoursMins
@@ -899,7 +899,7 @@ PokegearPhone_MakePhoneCall:
ld hl, wOptions
res NO_TEXT_SCROLL, [hl]
xor a
ld [hInMenu], a
ldh [hInMenu], a
ld de, SFX_CALL
call PlaySFX
ld hl, .dotdotdot
@@ -918,7 +918,7 @@ PokegearPhone_MakePhoneCall:
ld hl, wOptions
set NO_TEXT_SCROLL, [hl]
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
call PokegearPhone_UpdateCursor
ld hl, wJumptableIndex
inc [hl]
@@ -945,7 +945,7 @@ PokegearPhone_MakePhoneCall:
db "@"
PokegearPhone_FinishPhoneCall:
ld a, [hJoyPressed]
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret z
farcall HangUp
@@ -999,14 +999,14 @@ PokegearPhone_GetDPad:
.done_joypad_same_page
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call PokegearPhone_UpdateCursor
call WaitBGMap
ret
.done_joypad_update_page
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call PokegearPhone_UpdateDisplayList
call WaitBGMap
ret
@@ -1120,7 +1120,7 @@ PokegearPhoneContactSubmenu:
ld de, .CallCancelStrings
.got_menu_data
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
push hl
push de
ld a, [de]
@@ -1187,12 +1187,12 @@ PokegearPhoneContactSubmenu:
.a_b
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call PokegearPhone_UpdateDisplayList
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
pop hl
ld a, [hJoyPressed]
ldh a, [hJoyPressed]
and B_BUTTON
jr nz, .Cancel
ld a, [wPokegearPhoneSubmenuCursor]
@@ -1219,7 +1219,7 @@ PokegearPhoneContactSubmenu:
jr c, .CancelDelete
call PokegearPhone_DeletePhoneNumber
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call PokegearPhone_UpdateDisplayList
ld hl, PokegearText_WhomToCall
call PrintText
@@ -1283,7 +1283,7 @@ PokegearPhoneContactSubmenu:
dw .Cancel
; unused
ld a, [hHours]
ldh a, [hHours]
cp 12
jr c, .am
sub 12
@@ -1449,11 +1449,11 @@ UpdateRadioStation:
and a
ret z
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
hlcoord 2, 9
call PlaceString
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
; unused
@@ -1740,7 +1740,7 @@ NoRadioStation:
ld [wPokegearRadioChannelAddr], a
ld [wPokegearRadioChannelAddr + 1], a
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
NoRadioMusic:
@@ -1752,7 +1752,7 @@ NoRadioMusic:
NoRadioName:
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
hlcoord 1, 8
lb bc, 3, 18
call ClearBox
@@ -1777,10 +1777,10 @@ _TownMap:
push af
set NO_TEXT_SCROLL, [hl]
ld a, [hInMenu]
ldh a, [hInMenu]
push af
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
ld a, [wVramState]
push af
@@ -1796,12 +1796,12 @@ _TownMap:
ld a, 8
call SkipMusic
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
call TownMap_GetCurrentLandmark
ld [wTownMapPlayerIconLandmark], a
ld [wTownMapCursorLandmark], a
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
call .InitTilemap
call WaitBGMap2
ld a, [wTownMapPlayerIconLandmark]
@@ -1815,7 +1815,7 @@ _TownMap:
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ld a, [hCGB]
ldh a, [hCGB]
and a
jr z, .dmg
ld a, %11100100
@@ -1839,7 +1839,7 @@ _TownMap:
pop af
ld [wVramState], a
pop af
ld [hInMenu], a
ldh [hInMenu], a
pop af
ld [wOptions], a
call ClearBGPalettes
@@ -1949,7 +1949,7 @@ PlayRadio:
call DelayFrames
.loop
call JoyTextDelay
ld a, [hJoyPressed]
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
jr nz, .stop
ld a, [wPokegearRadioChannelAddr]
@@ -2047,7 +2047,7 @@ _FlyMap:
push af
ld [hl], $1
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
@@ -2089,14 +2089,14 @@ _FlyMap:
.exit
ld [wTownMapPlayerIconLandmark], a
pop af
ld [hInMenu], a
ldh [hInMenu], a
call ClearBGPalettes
ld a, $90
ld [hWY], a
ldh [hWY], a
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
ld a, [wTownMapPlayerIconLandmark]
ld e, a
ret
@@ -2145,7 +2145,7 @@ FlyMapScroll:
call TownMapBubble
call WaitBGMap
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
TownMapBubble:
@@ -2367,9 +2367,9 @@ Pokedex_GetArea:
ld [wTownMapPlayerIconLandmark], a
call ClearSprites
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
ld de, PokedexNestIconGFX
ld hl, vTiles0 tile $7f
lb bc, BANK(PokedexNestIconGFX), 1
@@ -2393,7 +2393,7 @@ Pokedex_GetArea:
call GetSGBLayout
call SetPalettes
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
xor a ; JOHTO_REGION
call .GetAndPlaceNest
.loop
@@ -2402,7 +2402,7 @@ Pokedex_GetArea:
ld a, [hl]
and A_BUTTON | B_BUTTON
jr nz, .a_b
ld a, [hJoypadDown]
ldh a, [hJoypadDown]
and SELECT
jr nz, .select
call .LeftRightInput
@@ -2433,12 +2433,12 @@ Pokedex_GetArea:
ret
.left
ld a, [hWY]
ldh a, [hWY]
cp $90
ret z
call ClearSprites
ld a, $90
ld [hWY], a
ldh [hWY], a
xor a ; JOHTO_REGION
call .GetAndPlaceNest
ret
@@ -2447,18 +2447,18 @@ Pokedex_GetArea:
ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a
ret z
ld a, [hWY]
ldh a, [hWY]
and a
ret z
call ClearSprites
xor a
ld [hWY], a
ldh [hWY], a
ld a, KANTO_REGION
call .GetAndPlaceNest
ret
.BlinkNestIcons:
ld a, [hVBlankCounter]
ldh a, [hVBlankCounter]
ld e, a
and $f
ret nz
@@ -2637,16 +2637,16 @@ TownMapBGUpdate:
; BG Map address
ld a, l
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, h
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
; Only update palettes on CGB
ld a, [hCGB]
ldh a, [hCGB]
and a
jr z, .tiles
; BG Map mode 2 (palettes)
ld a, 2
ld [hBGMapMode], a
ldh [hBGMapMode], a
; The BG Map is updated in thirds, so we wait
; 3 frames to update the whole screen's palettes.
@@ -2657,7 +2657,7 @@ TownMapBGUpdate:
call WaitBGMap
; Turn off BG Map update
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
FillJohtoMap:
@@ -2829,7 +2829,7 @@ Unreferenced_Function92311:
push af
ld [hl], $1
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
@@ -2884,14 +2884,14 @@ Unreferenced_Function92311:
.finished_a_b
ld [wTownMapPlayerIconLandmark], a
pop af
ld [hInMenu], a
ldh [hInMenu], a
call ClearBGPalettes
ld a, $90
ld [hWY], a
ldh [hWY], a
xor a ; LOW(vBGMap0)
ld [hBGMapAddress], a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap0)
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
ld a, [wTownMapPlayerIconLandmark]
ld e, a
ret
@@ -2938,11 +2938,11 @@ Unreferenced_Function92311:
ld a, $90
ld b, $98
.finish
ld [hWY], a
ldh [hWY], a
ld a, b
ld [hBGMapAddress + 1], a
ldh [hBGMapAddress + 1], a
call TownMapBubble
call WaitBGMap
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret

12
engine/pokegear/radio.asm
View File

@@ -1528,15 +1528,15 @@ BuenasPassword1:
.PlayPassword:
call StartRadioStation
ld a, [hBGMapMode]
ldh a, [hBGMapMode]
push af
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld de, BuenasPasswordChannelName
hlcoord 2, 9
call PlaceString
pop af
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld hl, BuenaRadioText1
ld a, BUENAS_PASSWORD_2
jp NextRadioLine
@@ -1770,12 +1770,12 @@ BuenasPassword19:
jp NextRadioLine
BuenasPassword20:
ld a, [hBGMapMode]
ldh a, [hBGMapMode]
push af
farcall NoRadioMusic
farcall NoRadioName
pop af
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld hl, wDailyFlags2
res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl]
ld a, BUENAS_PASSWORD
@@ -1799,7 +1799,7 @@ BuenasPassword21:
BuenasPasswordCheckTime:
call UpdateTime
ld a, [hHours]
ldh a, [hHours]
cp NITE_HOUR
ret