merge conflicts resolved
This commit is contained in:
JimB16
@@ -70,12 +70,12 @@ Function1dd7ae: ; 1dd7ae
|
||||
call PlaceString
|
||||
hlcoord 12, 15
|
||||
ld de, GameTimeHours
|
||||
ld bc, $0204
|
||||
lb bc, 2, 4
|
||||
call PrintNum
|
||||
ld [hl], $67
|
||||
inc hl
|
||||
ld de, GameTimeMinutes
|
||||
ld bc, $8102
|
||||
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
|
||||
call PrintNum
|
||||
ret
|
||||
; 1dd7f0
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
dwb VisitedSpawns + 3, %00000100 ; silver cave
|
||||
dwb VisitedSpawns + 3, %00010000 ; unused
|
||||
|
||||
dwb wdc9d, %00000001 ; lucky number show
|
||||
dwb wLuckyNumberShowFlag, %00000001 ; lucky number show
|
||||
dwb StatusFlags2, %00001000
|
||||
|
||||
dwb DailyFlags, %00000001 ; kurt making balls ; $50
|
||||
|
||||
@@ -121,7 +121,7 @@ StartMap: ; 96724
|
||||
xor a
|
||||
ld [ScriptRunning], a
|
||||
ld hl, MapStatus
|
||||
ld bc, $3e
|
||||
ld bc, $3e ; 62
|
||||
call ByteFill
|
||||
callba Function113e5
|
||||
call ClearJoypad
|
||||
@@ -133,17 +133,17 @@ EnterMap: ; 9673e
|
||||
xor a
|
||||
ld [wd453], a
|
||||
ld [wd454], a
|
||||
call Function968d1
|
||||
call SetUpFiveStepWildEncounterCooldown
|
||||
callba RunMapSetupScript
|
||||
call ClearAllScriptFlags3
|
||||
|
||||
ld a, [$ff9f]
|
||||
ld a, [hMapEntryMethod]
|
||||
cp $f7
|
||||
jr nz, .dontset
|
||||
call SetAll_ScriptFlags3
|
||||
.dontset
|
||||
|
||||
ld a, [$ff9f]
|
||||
ld a, [hMapEntryMethod]
|
||||
cp $f3
|
||||
jr nz, .dontresetpoison
|
||||
xor a
|
||||
@@ -151,7 +151,7 @@ EnterMap: ; 9673e
|
||||
.dontresetpoison
|
||||
|
||||
xor a
|
||||
ld [$ff9f], a
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, 2 ; HandleMap
|
||||
ld [MapStatus], a
|
||||
ret
|
||||
@@ -382,9 +382,9 @@ CheckTileEvent: ; 96874
|
||||
call CheckBit4_ScriptFlags3
|
||||
jr z, .ok
|
||||
|
||||
call RockSmashEncounter
|
||||
call RandomEncounter
|
||||
ret c
|
||||
jr .ok
|
||||
jr .ok ; pointless
|
||||
|
||||
.ok
|
||||
xor a
|
||||
@@ -419,8 +419,8 @@ CheckTileEvent: ; 96874
|
||||
; 968c7
|
||||
|
||||
|
||||
Function968c7:: ; 968c7
|
||||
ld hl, wd452
|
||||
CheckWildEncounterCooldown:: ; 968c7
|
||||
ld hl, wWildEncounterCooldown
|
||||
ld a, [hl]
|
||||
and a
|
||||
ret z
|
||||
@@ -430,9 +430,9 @@ Function968c7:: ; 968c7
|
||||
ret
|
||||
; 968d1
|
||||
|
||||
Function968d1: ; 968d1
|
||||
SetUpFiveStepWildEncounterCooldown: ; 968d1
|
||||
ld a, 5
|
||||
ld [wd452], a
|
||||
ld [wWildEncounterCooldown], a
|
||||
ret
|
||||
; 968d7
|
||||
|
||||
@@ -441,11 +441,11 @@ Function968d7: ; 968d7
|
||||
; 968d8
|
||||
|
||||
Function968d8: ; 968d8
|
||||
ld a, [wd452]
|
||||
ld a, [wWildEncounterCooldown]
|
||||
cp 2
|
||||
ret nc
|
||||
ld a, 2
|
||||
ld [wd452], a
|
||||
ld [wWildEncounterCooldown], a
|
||||
ret
|
||||
; 968e4
|
||||
|
||||
|
||||
@@ -95,10 +95,10 @@ CheckFacingTileEvent:: ; 97c5f
|
||||
; 97cc0
|
||||
|
||||
|
||||
RockSmashEncounter:: ; 97cc0
|
||||
; Rock Smash encounter
|
||||
RandomEncounter:: ; 97cc0
|
||||
; Random encounter
|
||||
|
||||
call Function968c7
|
||||
call CheckWildEncounterCooldown
|
||||
jr c, .nope
|
||||
call CanUseSweetScent
|
||||
jr nc, .nope
|
||||
@@ -120,8 +120,8 @@ RockSmashEncounter:: ; 97cc0
|
||||
ret
|
||||
|
||||
.ok
|
||||
ld a, BANK(RockSmashBattleScript)
|
||||
ld hl, RockSmashBattleScript
|
||||
ld a, BANK(WildBattleScript)
|
||||
ld hl, WildBattleScript
|
||||
jr .done
|
||||
|
||||
.ok_bug_contest
|
||||
@@ -135,7 +135,7 @@ RockSmashEncounter:: ; 97cc0
|
||||
ret
|
||||
; 97cf9
|
||||
|
||||
RockSmashBattleScript: ; 97cf9
|
||||
WildBattleScript: ; 97cf9
|
||||
battlecheck
|
||||
startbattle
|
||||
returnafterbattle
|
||||
|
||||
@@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
|
||||
add hl, bc
|
||||
ld [hl], 2
|
||||
ld hl, wd4cf
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
cp [hl]
|
||||
jr z, .ok
|
||||
ld hl, OBJECT_09
|
||||
@@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
|
||||
ret z
|
||||
ld a, [wd4cd]
|
||||
ld d, a
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
cp d
|
||||
ret nz
|
||||
ld a, e
|
||||
@@ -2651,7 +2651,7 @@ Function5565: ; 5565
|
||||
|
||||
Function5579: ; 5579
|
||||
push bc
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
ld c, a
|
||||
call Function5582
|
||||
pop bc
|
||||
@@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
ld [hli], a
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
ld [hli], a
|
||||
push hl
|
||||
ld hl, OBJECT_MAP_X
|
||||
@@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
|
||||
ld bc, ObjectStructs
|
||||
xor a
|
||||
.loop
|
||||
ld [$ffaf], a
|
||||
ld [hConnectionStripLength], a
|
||||
call GetObjectSprite
|
||||
jr z, .ok
|
||||
call Function565c
|
||||
@@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
|
||||
add hl, bc
|
||||
ld b, h
|
||||
ld c, l
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
inc a
|
||||
cp NUM_OBJECT_STRUCTS
|
||||
jr nz, .loop
|
||||
@@ -2801,13 +2801,13 @@ Function5645: ; 5645
|
||||
xor a
|
||||
ld bc, ObjectStructs
|
||||
.loop
|
||||
ld [$ffaf], a
|
||||
ld [hConnectionStripLength], a
|
||||
call Function5680
|
||||
ld hl, OBJECT_STRUCT_LENGTH
|
||||
add hl, bc
|
||||
ld b, h
|
||||
ld c, l
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
inc a
|
||||
cp NUM_OBJECT_STRUCTS
|
||||
jr nz, .loop
|
||||
@@ -3032,7 +3032,7 @@ Function5781: ; 5781
|
||||
ld bc, ObjectStructs
|
||||
xor a
|
||||
.loop
|
||||
ld [$ffaf], a
|
||||
ld [hConnectionStripLength], a
|
||||
call GetObjectSprite
|
||||
jr z, .next
|
||||
call Function437b
|
||||
@@ -3042,7 +3042,7 @@ Function5781: ; 5781
|
||||
add hl, bc
|
||||
ld b, h
|
||||
ld c, l
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
inc a
|
||||
cp NUM_OBJECT_STRUCTS
|
||||
jr nz, .loop
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
RunMapSetupScript:: ; 15363
|
||||
ld a, [$ff9f]
|
||||
ld a, [hMapEntryMethod]
|
||||
and $f
|
||||
dec a
|
||||
ld c, a
|
||||
|
||||
@@ -217,7 +217,7 @@ Function4013c: ; 4013c (10:413c)
|
||||
call ByteFill
|
||||
callba Function1de171
|
||||
hlcoord 0, 17
|
||||
ld de, Unknown_407f2
|
||||
ld de, String_START_SEARCH
|
||||
call Function40acd
|
||||
ld a, $7
|
||||
ld [wc7d3], a
|
||||
@@ -246,7 +246,7 @@ Function4013c: ; 4013c (10:413c)
|
||||
call Function41148
|
||||
callba Function1de171
|
||||
hlcoord 0, 17
|
||||
ld de, Unknown_407f2
|
||||
ld de, String_START_SEARCH
|
||||
call Function40acd
|
||||
ld a, $7
|
||||
ld [wc7d3], a
|
||||
@@ -1068,7 +1068,7 @@ Function40741: ; 40741
|
||||
|
||||
Function4074c: ; 4074c (10:474c)
|
||||
hlcoord 0, 17
|
||||
ld de, Unknown_407f2
|
||||
ld de, String_START_SEARCH
|
||||
call Function40acd
|
||||
ld a, $32
|
||||
hlcoord 0, 0
|
||||
@@ -1081,27 +1081,27 @@ Function4074c: ; 4074c (10:474c)
|
||||
ld bc, $607
|
||||
call Function40ad5
|
||||
hlcoord 1, 11
|
||||
ld de, Unknown_407e1
|
||||
ld de, String_SEEN
|
||||
call Function40acd
|
||||
ld hl, PokedexSeen ; wdeb9 (aliases: EndPokedexSeen)
|
||||
ld b, EndPokedexSeen - PokedexSeen
|
||||
call CountSetBits
|
||||
ld de, wd265
|
||||
hlcoord 5, 12
|
||||
ld bc, $103
|
||||
lb bc, 1, 3
|
||||
call PrintNum
|
||||
hlcoord 1, 14
|
||||
ld de, Unknown_407e6
|
||||
ld de, String_OWN
|
||||
call Function40acd
|
||||
ld hl, PokedexCaught
|
||||
ld b, EndPokedexCaught - PokedexCaught
|
||||
call CountSetBits
|
||||
ld de, wd265
|
||||
hlcoord 5, 15
|
||||
ld bc, $103
|
||||
lb bc, 1, 3
|
||||
call PrintNum
|
||||
hlcoord 1, 17
|
||||
ld de, Unknown_407ea
|
||||
ld de, String_SELECT_OPTION
|
||||
call Function40acd
|
||||
hlcoord 8, 1
|
||||
ld b, $7
|
||||
@@ -1123,13 +1123,13 @@ Function4074c: ; 4074c (10:474c)
|
||||
ret
|
||||
; 407e1 (10:47e1)
|
||||
|
||||
Unknown_407e1: ; 407e1
|
||||
String_SEEN: ; 407e1
|
||||
db "SEEN", $ff
|
||||
Unknown_407e6: ; 407e6
|
||||
String_OWN: ; 407e6
|
||||
db "OWN", $ff
|
||||
Unknown_407ea: ; 407ea
|
||||
String_SELECT_OPTION: ; 407ea
|
||||
db $3b, $48, $49, $4a, $44, $45, $46, $47 ; SELECT > OPTION
|
||||
Unknown_407f2: ; 407f2
|
||||
String_START_SEARCH: ; 407f2
|
||||
db $3c, $3b, $41, $42, $43, $4b, $4c, $4d, $4e, $3c, $ff ; START > SEARCH
|
||||
; 407fd
|
||||
|
||||
@@ -1270,7 +1270,7 @@ Function40962: ; 40962 (10:4962)
|
||||
call PlaceString
|
||||
ld de, wc7d7
|
||||
hlcoord 1, 16
|
||||
ld bc, $103
|
||||
lb bc, 1, 3
|
||||
call PrintNum
|
||||
hlcoord 8, 0
|
||||
ld [hl], $59
|
||||
@@ -1541,7 +1541,7 @@ Function40b6a: ; 40b6a (10:4b6a)
|
||||
ld de, -20
|
||||
add hl, de
|
||||
ld de, wd265
|
||||
ld bc, $8103
|
||||
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
|
||||
call PrintNum
|
||||
pop hl
|
||||
ret
|
||||
@@ -2360,7 +2360,7 @@ Function413f5: ; 413f5 (10:53f5)
|
||||
ret
|
||||
|
||||
Function413fe: ; 413fe (10:53fe)
|
||||
jp Functionfb8
|
||||
jp FillBoxWithByte
|
||||
|
||||
Function41401: ; 41401 (10:5401)
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
|
||||
@@ -36,7 +36,7 @@ PredefPointers:: ; 856b
|
||||
add_predef FlagPredef
|
||||
add_predef Functionc699
|
||||
add_predef FillPP
|
||||
add_predef AddPkmnToParty
|
||||
add_predef TryAddMonToParty
|
||||
add_predef Functionda96
|
||||
add_predef SentGetPkmnIntoFromBox
|
||||
add_predef SentPkmnIntoBox
|
||||
|
||||
786
engine/radio.asm
786
engine/radio.asm
File diff suppressed because it is too large
Load Diff
404
engine/radio2.asm
Normal file
404
engine/radio2.asm
Normal file
@@ -0,0 +1,404 @@
|
||||
_UpdateRadioStation: ; 9163e (24:563e)
|
||||
jr UpdateRadioStation
|
||||
|
||||
Function91640: ; 91640 (24:5640)
|
||||
push bc
|
||||
call .TuningKnob
|
||||
pop bc
|
||||
ld a, [wRadioTuningKnob]
|
||||
ld hl, $6
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.TuningKnob: ; 9164e (24:564e)
|
||||
ld hl, hJoyLast
|
||||
ld a, [hl]
|
||||
and D_DOWN
|
||||
jr nz, .down
|
||||
ld a, [hl]
|
||||
and D_UP
|
||||
jr nz, .up
|
||||
ret
|
||||
|
||||
.down
|
||||
ld hl, wRadioTuningKnob
|
||||
ld a, [hl]
|
||||
and a
|
||||
ret z
|
||||
rept 2
|
||||
dec [hl]
|
||||
endr
|
||||
jr .update
|
||||
|
||||
.up
|
||||
ld hl, wRadioTuningKnob
|
||||
ld a, [hl]
|
||||
cp 80
|
||||
ret nc
|
||||
rept 2
|
||||
inc [hl]
|
||||
endr
|
||||
|
||||
.update
|
||||
|
||||
UpdateRadioStation: ; 9166f (24:566f)
|
||||
ld hl, wRadioTuningKnob
|
||||
ld d, [hl]
|
||||
ld hl, RadioChannels
|
||||
.loop
|
||||
ld a, [hli]
|
||||
cp -1
|
||||
jr z, .nostation
|
||||
cp d
|
||||
jr z, .foundstation
|
||||
rept 2
|
||||
inc hl
|
||||
endr
|
||||
jr .loop
|
||||
|
||||
.nostation
|
||||
call NoRadioStation
|
||||
ret
|
||||
|
||||
.foundstation
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
ld de, .returnafterstation
|
||||
push de
|
||||
jp [hl]
|
||||
.returnafterstation
|
||||
ld a, [wc6d9]
|
||||
and a
|
||||
ret z
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
hlcoord 2, 9
|
||||
call PlaceString
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
; 916a1 (24:56a1)
|
||||
|
||||
Function916a1: ; 916a1
|
||||
ld [wc6d9], a
|
||||
ld a, [hli]
|
||||
ld [wc6da], a
|
||||
ld a, [hli]
|
||||
ld [wc6db], a
|
||||
ret
|
||||
; 916ad
|
||||
|
||||
|
||||
RadioChannels:
|
||||
; frequencies and the shows that play on them.
|
||||
; frequency value given here = 4 × ingame_frequency − 2
|
||||
dbw 16, .PkmnTalkAndPokedexShow
|
||||
dbw 28, .PokemonMusic
|
||||
dbw 32, .LuckyChannel
|
||||
dbw 40, .BuenasPassword
|
||||
dbw 52, .RuinsOfAlphRadio
|
||||
dbw 64, .PlacesAndPeople
|
||||
dbw 72, .LetsAllSing
|
||||
dbw 78, .PokeFluteRadio
|
||||
dbw 80, .EvolutionRadio
|
||||
db $ff
|
||||
|
||||
.PkmnTalkAndPokedexShow
|
||||
; Pokédex Show in the morning
|
||||
; Oak's Pokémon Talk in the afternoon and evening
|
||||
call .InJohto
|
||||
jr nc, .NoSignal
|
||||
ld a, [TimeOfDay]
|
||||
and a
|
||||
jp z, LoadStation_PokedexShow
|
||||
jp LoadStation_OaksPokemonTalk
|
||||
|
||||
.PokemonMusic
|
||||
call .InJohto
|
||||
jr nc, .NoSignal
|
||||
jp LoadStation_PokemonMusic
|
||||
|
||||
.LuckyChannel
|
||||
call .InJohto
|
||||
jr nc, .NoSignal
|
||||
jp LoadStation_LuckyChannel
|
||||
|
||||
.BuenasPassword
|
||||
call .InJohto
|
||||
jr nc, .NoSignal
|
||||
jp LoadStation_BuenasPassword
|
||||
|
||||
.RuinsOfAlphRadio
|
||||
ld a, [wc6d8]
|
||||
cp RUINS_OF_ALPH
|
||||
jr nz, .NoSignal
|
||||
jp LoadStation_UnownRadio
|
||||
|
||||
.PlacesAndPeople
|
||||
call .InJohto
|
||||
jr c, .NoSignal
|
||||
ld a, [wPokegearFlags]
|
||||
bit 3, a
|
||||
jr z, .NoSignal
|
||||
jp LoadStation_PlacesAndPeople
|
||||
|
||||
.LetsAllSing
|
||||
call .InJohto
|
||||
jr c, .NoSignal
|
||||
ld a, [wPokegearFlags]
|
||||
bit 3, a
|
||||
jr z, .NoSignal
|
||||
jp LoadStation_LetsAllSing
|
||||
|
||||
.PokeFluteRadio
|
||||
call .InJohto
|
||||
jr c, .NoSignal
|
||||
ld a, [wPokegearFlags]
|
||||
bit 3, a
|
||||
jr z, .NoSignal
|
||||
jp LoadStation_PokeFluteRadio
|
||||
|
||||
.EvolutionRadio
|
||||
; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
|
||||
|
||||
ld a, [StatusFlags]
|
||||
bit 4, a
|
||||
jr z, .NoSignal
|
||||
|
||||
ld a, [wc6d8]
|
||||
cp MAHOGANY_TOWN
|
||||
jr z, .ok
|
||||
cp ROUTE_43
|
||||
jr z, .ok
|
||||
cp LAKE_OF_RAGE
|
||||
jr nz, .NoSignal
|
||||
.ok
|
||||
jp LoadStation_EvolutionRadio
|
||||
|
||||
.NoSignal
|
||||
call NoRadioStation
|
||||
ret
|
||||
|
||||
.InJohto
|
||||
; if in Johto or on the S.S. Aqua, set carry
|
||||
; otherwise clear carry
|
||||
ld a, [wc6d8]
|
||||
cp FAST_SHIP
|
||||
jr z, .johto
|
||||
cp KANTO_LANDMARK
|
||||
jr c, .johto
|
||||
.kanto
|
||||
and a
|
||||
ret
|
||||
.johto
|
||||
scf
|
||||
ret
|
||||
|
||||
|
||||
|
||||
LoadStation_OaksPokemonTalk: ; 91753 (24:5753)
|
||||
xor a ; OAKS_POKEMON_TALK
|
||||
ld [wd002], a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, OaksPkmnTalkName
|
||||
ret
|
||||
|
||||
LoadStation_PokedexShow: ; 91766 (24:5766)
|
||||
ld a, POKEDEX_SHOW
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, PokedexShowName
|
||||
ret
|
||||
|
||||
LoadStation_PokemonMusic: ; 9177b (24:577b)
|
||||
ld a, POKEMON_MUSIC
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, PokemonMusicName
|
||||
ret
|
||||
|
||||
LoadStation_LuckyChannel: ; 91790 (24:5790)
|
||||
ld a, LUCKY_CHANNEL
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, LuckyChannelName
|
||||
ret
|
||||
|
||||
LoadStation_BuenasPassword: ; 917a5 (24:57a5)
|
||||
ld a, BUENAS_PASSWORD
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, NotBuenasPasswordName
|
||||
ld a, [StatusFlags2]
|
||||
bit 0, a
|
||||
ret z
|
||||
ld de, BuenasPasswordName
|
||||
ret
|
||||
; 917c3 (24:57c3)
|
||||
|
||||
BuenasPasswordName: db "BUENA'S PASSWORD@"
|
||||
NotBuenasPasswordName: db "@"
|
||||
|
||||
LoadStation_UnownRadio: ; 917d5 (24:57d5)
|
||||
ld a, UNOWN_RADIO
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, UnknownStationName
|
||||
ret
|
||||
|
||||
LoadStation_PlacesAndPeople: ; 917ea (24:57ea)
|
||||
ld a, PLACES_AND_PEOPLE
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, PlacesAndPeopleName
|
||||
ret
|
||||
|
||||
LoadStation_LetsAllSing: ; 917ff (24:57ff)
|
||||
ld a, LETS_ALL_SING
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, LetsAllSingName
|
||||
ret
|
||||
; 91814 (24:5814)
|
||||
|
||||
LoadStation_RocketRadio: ; 91814
|
||||
ld a, ROCKET_RADIO
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, LetsAllSingName
|
||||
ret
|
||||
; 91829
|
||||
|
||||
LoadStation_PokeFluteRadio: ; 91829 (24:5829)
|
||||
ld a, POKE_FLUTE_RADIO
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, PokeFluteStationName
|
||||
ret
|
||||
|
||||
LoadStation_EvolutionRadio: ; 9183e (24:583e)
|
||||
ld a, EVOLUTION_RADIO
|
||||
ld [wd002], a
|
||||
xor a
|
||||
ld [wd005], a
|
||||
ld a, BANK(PlayRadioShow)
|
||||
ld hl, PlayRadioShow
|
||||
call Radio_BackUpFarCallParams
|
||||
ld de, UnknownStationName
|
||||
ret
|
||||
; 91853 (24:5853)
|
||||
|
||||
LoadStation_Dummy: ; 91853
|
||||
ret
|
||||
|
||||
RadioMusicRestartDE: ; 91854 (24:5854)
|
||||
push de
|
||||
ld a, e
|
||||
ld [wc6dc], a
|
||||
ld de, MUSIC_NONE
|
||||
call PlayMusic
|
||||
pop de
|
||||
ld a, e
|
||||
ld [wMapMusic], a
|
||||
call PlayMusic
|
||||
ret
|
||||
|
||||
RadioMusicRestartPokemonChannel: ; 91868 (24:5868)
|
||||
push de
|
||||
ld a, $fe
|
||||
ld [wc6dc], a
|
||||
ld de, MUSIC_NONE
|
||||
call PlayMusic
|
||||
pop de
|
||||
ld de, MUSIC_POKEMON_CHANNEL
|
||||
call PlayMusic
|
||||
ret
|
||||
|
||||
Radio_BackUpFarCallParams: ; 9187c (24:587c)
|
||||
ld [wc6d9], a
|
||||
ld a, l
|
||||
ld [wc6da], a
|
||||
ld a, h
|
||||
ld [wc6db], a
|
||||
ret
|
||||
|
||||
NoRadioStation: ; 91888 (24:5888)
|
||||
call NoRadioMusic
|
||||
call NoRadioName
|
||||
xor a
|
||||
ld [wc6d9], a
|
||||
ld [wc6da], a
|
||||
ld [wc6db], a
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ret
|
||||
|
||||
NoRadioMusic: ; 9189d (24:589d)
|
||||
ld de, MUSIC_NONE
|
||||
call PlayMusic
|
||||
ld a, $ff
|
||||
ld [wc6dc], a
|
||||
ret
|
||||
|
||||
NoRadioName: ; 918a9 (24:58a9)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
hlcoord 1, 8
|
||||
ld bc, $312
|
||||
call ClearBox
|
||||
hlcoord 0, 12
|
||||
ld bc, $412
|
||||
call TextBox
|
||||
ret
|
||||
; 918bf
|
||||
|
||||
OaksPkmnTalkName: db "OAK's <PK><MN> Talk@"
|
||||
PokedexShowName: db "#DEX Show@"
|
||||
PokemonMusicName: db "#MON Music@"
|
||||
LuckyChannelName: db "Lucky Channel@"
|
||||
UnknownStationName: db "?????@"
|
||||
PlacesAndPeopleName: db "Places & People@"
|
||||
LetsAllSingName: db "Let's All Sing!@"
|
||||
PokeFluteStationName: db "# FLUTE@"
|
||||
; 9191c
|
||||
@@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
|
||||
call GetScriptByte
|
||||
call GetScriptPerson
|
||||
call _CopyObjectStruct
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
ld b, 0 ; clear
|
||||
call ApplyEventActionAppearDisappear
|
||||
ret
|
||||
@@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
|
||||
ld a, [hLastTalked]
|
||||
.ok
|
||||
call DeleteObjectStruct
|
||||
ld a, [$ffaf]
|
||||
ld a, [hConnectionStripLength]
|
||||
ld b, 1 ; set
|
||||
call ApplyEventActionAppearDisappear
|
||||
callba RefreshMapAppearDisappear
|
||||
@@ -1584,7 +1584,7 @@ Script_reloadmap: ; 0x97491
|
||||
xor a
|
||||
ld [wd459], a
|
||||
ld a, $f3
|
||||
ld [$ff9f], a
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, $1
|
||||
call LoadMapStatus
|
||||
call StopScript
|
||||
@@ -2232,7 +2232,7 @@ Script_readmoney: ; 0x97732
|
||||
call ResetStringBuffer1
|
||||
call GetMoneyAccount
|
||||
ld hl, StringBuffer1
|
||||
ld bc, $4306
|
||||
lb bc, PRINTNUM_RIGHTALIGN | 3, 6
|
||||
call PrintNum
|
||||
ld de, StringBuffer1
|
||||
jp ConvertMemToText
|
||||
@@ -2246,7 +2246,7 @@ Script_readcoins: ; 0x97747
|
||||
call ResetStringBuffer1
|
||||
ld hl, StringBuffer1
|
||||
ld de, Coins
|
||||
ld bc, $4206
|
||||
lb bc, PRINTNUM_RIGHTALIGN | 2, 6
|
||||
call PrintNum
|
||||
ld de, StringBuffer1
|
||||
jp ConvertMemToText
|
||||
@@ -2260,7 +2260,7 @@ Script_RAM2MEM: ; 0x9775c
|
||||
call ResetStringBuffer1
|
||||
ld de, ScriptVar
|
||||
ld hl, StringBuffer1
|
||||
ld bc, $4103
|
||||
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
|
||||
call PrintNum
|
||||
ld de, StringBuffer1
|
||||
jp ConvertMemToText
|
||||
@@ -2656,7 +2656,7 @@ Script_giveegg: ; 0x97968
|
||||
; level (DecimalParam)
|
||||
; if no room in the party, return 0 in ScriptVar; else, return 2
|
||||
|
||||
xor a
|
||||
xor a ; PARTYMON
|
||||
ld [ScriptVar], a
|
||||
ld [MonType], a
|
||||
call GetScriptByte
|
||||
@@ -2839,7 +2839,7 @@ Script_warp: ; 0x97a1d
|
||||
ld a, -1
|
||||
ld [wd001], a
|
||||
ld a, -15
|
||||
ld [$ff9f], a
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, 1
|
||||
call LoadMapStatus
|
||||
call StopScript
|
||||
@@ -2851,7 +2851,7 @@ Script_warp: ; 0x97a1d
|
||||
ld a, -1
|
||||
ld [wd001], a
|
||||
ld a, -5
|
||||
ld [$ff9f], a
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, 1
|
||||
call LoadMapStatus
|
||||
call StopScript
|
||||
@@ -2994,7 +2994,7 @@ Script_newloadmap: ; 0x97b08
|
||||
; which_method (SingleByteParam)
|
||||
|
||||
call GetScriptByte
|
||||
ld [$ff9f], a
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, 1
|
||||
call LoadMapStatus
|
||||
call StopScript
|
||||
@@ -3198,7 +3198,7 @@ Script_halloffame: ; 0x97bd5
|
||||
Script_credits: ; 0x97bf3
|
||||
; script command 0xa2
|
||||
|
||||
callba Function86455
|
||||
callba RedCredits
|
||||
; fallthrough
|
||||
|
||||
DisplayCredits:
|
||||
|
||||
@@ -102,9 +102,9 @@ SpecialsPointers:: ; c029
|
||||
add_special Function24b25
|
||||
add_special Function24b4e
|
||||
add_special Function24ae8
|
||||
add_special Function4d87a
|
||||
add_special Functionc434
|
||||
add_special Functionc422
|
||||
add_special Special_CheckForLuckyNumberWinners
|
||||
add_special Special_CheckLuckyNumberShowFlag
|
||||
add_special Special_ResetLuckyNumberShowFlag
|
||||
add_special Function4d9d3
|
||||
add_special Function88018
|
||||
add_special SpecialNameRater
|
||||
@@ -117,9 +117,9 @@ SpecialsPointers:: ; c029
|
||||
add_special RunCallback_04
|
||||
add_special Functionfb841
|
||||
add_special SpecialSnorlaxAwake
|
||||
add_special Function7413
|
||||
add_special Function7418
|
||||
add_special Function741d
|
||||
add_special Special_YoungerHaircutBrother
|
||||
add_special Special_OlderHaircutBrother
|
||||
add_special Special_DaisyMassage
|
||||
add_special Functionc472
|
||||
add_special ProfOaksPCBoot
|
||||
add_special SpecialGameboyCheck
|
||||
@@ -522,15 +522,15 @@ SpecialCheckPokerus: ; c419
|
||||
jp ScriptReturnCarry
|
||||
; c422
|
||||
|
||||
Functionc422: ; c422
|
||||
Special_ResetLuckyNumberShowFlag: ; c422
|
||||
callba Function1152b
|
||||
ld hl, wdc9d
|
||||
ld hl, wLuckyNumberShowFlag
|
||||
res 0, [hl]
|
||||
callba Function5d33
|
||||
callba LoadOrRegenerateLuckyIDNumber
|
||||
ret
|
||||
; c434
|
||||
|
||||
Functionc434: ; c434
|
||||
Special_CheckLuckyNumberShowFlag: ; c434
|
||||
callba Function11542
|
||||
jp ScriptReturnCarry
|
||||
; c43d
|
||||
|
||||
@@ -5,7 +5,7 @@ Function113d6: ; 113d6
|
||||
|
||||
Function113da: ; 113da
|
||||
xor a
|
||||
ld [wdc2d], a
|
||||
ld [wLuckyNumberDayBuffer], a
|
||||
ld [wdc3a], a
|
||||
ld [wdc1c], a
|
||||
ret
|
||||
@@ -242,28 +242,28 @@ Function11522: ; 11522
|
||||
; 1152b
|
||||
|
||||
Function1152b: ; 1152b
|
||||
call Function11534
|
||||
ld hl, wdc2d
|
||||
call .GetDaysUntilNextFriday
|
||||
ld hl, wLuckyNumberDayBuffer
|
||||
jp Function11415
|
||||
; 11534
|
||||
|
||||
Function11534: ; 11534
|
||||
.GetDaysUntilNextFriday: ; 11534
|
||||
call GetWeekday
|
||||
ld c, a
|
||||
ld a, $5
|
||||
ld a, FRIDAY
|
||||
sub c
|
||||
jr z, .asm_1153f
|
||||
jr nc, .asm_11541
|
||||
jr z, .friday_saturday
|
||||
jr nc, .earlier ; should've done "ret nc"
|
||||
|
||||
.asm_1153f
|
||||
add $7
|
||||
.friday_saturday
|
||||
add 7
|
||||
|
||||
.asm_11541
|
||||
.earlier
|
||||
ret
|
||||
; 11542
|
||||
|
||||
Function11542: ; 11542
|
||||
ld hl, wdc2d
|
||||
ld hl, wLuckyNumberDayBuffer
|
||||
jp Function11420
|
||||
; 11548
|
||||
|
||||
|
||||
Reference in New Issue
Block a user