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

Curr -> Cur

Browse Source
This commit is contained in:
Rangi
2018-09-09 15:09:51 -04:00
parent 84cfbc70fa
commit ae022e1420
30 changed files with 321 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/pokegear/pokegear.asm
View File

@@ -1573,7 +1573,7 @@ RadioChannels:
LoadStation_OaksPokemonTalk:
xor a ; OAKS_POKEMON_TALK
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
ld hl, PlayRadioShow
@@ -1583,7 +1583,7 @@ LoadStation_OaksPokemonTalk:
LoadStation_PokedexShow:
ld a, POKEDEX_SHOW
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1594,7 +1594,7 @@ LoadStation_PokedexShow:
LoadStation_PokemonMusic:
ld a, POKEMON_MUSIC
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1605,7 +1605,7 @@ LoadStation_PokemonMusic:
LoadStation_LuckyChannel:
ld a, LUCKY_CHANNEL
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1616,7 +1616,7 @@ LoadStation_LuckyChannel:
LoadStation_BuenasPassword:
ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1634,7 +1634,7 @@ NotBuenasPasswordName: db "@"
LoadStation_UnownRadio:
ld a, UNOWN_RADIO
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1645,7 +1645,7 @@ LoadStation_UnownRadio:
LoadStation_PlacesAndPeople:
ld a, PLACES_AND_PEOPLE
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1656,7 +1656,7 @@ LoadStation_PlacesAndPeople:
LoadStation_LetsAllSing:
ld a, LETS_ALL_SING
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1667,7 +1667,7 @@ LoadStation_LetsAllSing:
LoadStation_RocketRadio:
ld a, ROCKET_RADIO
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1678,7 +1678,7 @@ LoadStation_RocketRadio:
LoadStation_PokeFluteRadio:
ld a, POKE_FLUTE_RADIO
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -1689,7 +1689,7 @@ LoadStation_PokeFluteRadio:
LoadStation_EvolutionRadio:
ld a, EVOLUTION_RADIO
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)

24
engine/pokegear/radio.asm
View File

@@ -1,6 +1,6 @@
PlayRadioShow:
; If we're already in the radio program proper, we don't need to be here.
ld a, [wCurrentRadioLine]
ld a, [wCurRadioLine]
cp POKE_FLUTE_RADIO
jr nc, .ok
; If Team Rocket is not occupying the radio tower, we don't need to be here.
@@ -13,10 +13,10 @@ PlayRadioShow:
jr nz, .ok
; Team Rocket broadcasts on all stations.
ld a, ROCKET_RADIO
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
.ok
; Jump to the currently loaded station. The index to which we need to jump is in wCurrentRadioLine.
ld a, [wCurrentRadioLine]
; Jump to the currently loaded station. The index to which we need to jump is in wCurRadioLine.
ld a, [wCurRadioLine]
ld e, a
ld d, 0
ld hl, RadioJumptable
@@ -145,7 +145,7 @@ PrintRadioLine:
call PrintTextBoxText
.skip
ld a, RADIO_SCROLL
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld a, 100
ld [wRadioTextDelay], a
ret
@@ -175,7 +175,7 @@ RadioScroll:
ret
.proceed
ld a, [wNextRadioLine]
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld a, [wNumRadioLinesPrinted]
cp 1
call nz, CopyBottomLineToTopLine
@@ -592,7 +592,7 @@ OaksPKMNTalk10:
ld hl, OPT_PokemonChannelText
call PrintText
ld a, OAKS_POKEMON_TALK_11
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld a, 100
ld [wRadioTextDelay], a
ret
@@ -654,7 +654,7 @@ OaksPKMNTalk14:
xor a
ld [wNumRadioLinesPrinted], a
ld a, RADIO_SCROLL
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld a, 10
ld [wRadioTextDelay], a
ret
@@ -663,7 +663,7 @@ OaksPKMNTalk14:
db "@"
PlaceRadioString:
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
ld a, 100
ld [wRadioTextDelay], a
jp PlaceString
@@ -1779,7 +1779,7 @@ BuenasPassword20:
ld hl, wDailyFlags2
res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl]
ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld hl, BuenaOffTheAirText
@@ -1788,7 +1788,7 @@ BuenasPassword20:
BuenasPassword21:
ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a
ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
call BuenasPasswordCheckTime
@@ -1911,7 +1911,7 @@ StartRadioStation:
call RadioTerminator
call PrintText
ld hl, RadioChannelSongs
ld a, [wCurrentRadioLine]
ld a, [wCurRadioLine]
ld c, a
ld b, 0
add hl, bc