mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Rename several script commands
This commit is contained in:
PikalaxALT
parent
f599e477fc
commit
01792e00d2
@ -48,6 +48,9 @@ RESET_FLAG EQU 0
|
||||
SET_FLAG EQU 1
|
||||
CHECK_FLAG EQU 2
|
||||
|
||||
; Boolean checks
|
||||
FALSE EQU 0
|
||||
TRUE EQU 1
|
||||
|
||||
; joypad
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
BattleTowerTrainerData:: ; What exactly it is, I don't know
|
||||
; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied)
|
||||
; Second argument points to an entry in Unknown_170470, to which the first argument is compared.
|
||||
|
||||
@ -194,7 +194,7 @@ OverworldHatchEgg:: ; 16f5e
|
||||
call Function16f70
|
||||
call ExitAllMenus
|
||||
call RestartMapMusic
|
||||
jp LoadMoveSprites
|
||||
jp CloseText
|
||||
; 16f70
|
||||
|
||||
Function16f70: ; 16f70 (5:6f70)
|
||||
|
||||
@ -1246,9 +1246,9 @@ DecorationDesc_PosterPointers: ; 26f84
|
||||
DecorationDesc_TownMapPoster: ; 0x26f91
|
||||
loadfont
|
||||
writetext .TownMapText
|
||||
closetext
|
||||
waitbutton
|
||||
special Special_TownMap
|
||||
loadmovesprites
|
||||
closetext
|
||||
end
|
||||
; 0x26f9b
|
||||
|
||||
|
||||
@ -142,7 +142,7 @@ RandomEncounter:: ; 97cc0
|
||||
; 97cf9
|
||||
|
||||
WildBattleScript: ; 97cf9
|
||||
battlecheck
|
||||
setup_random_encounter
|
||||
startbattle
|
||||
returnafterbattle
|
||||
end
|
||||
|
||||
@ -9,7 +9,7 @@ FruitTreeScript:: ; 44000
|
||||
callasm CheckFruitTree
|
||||
iffalse .fruit
|
||||
writetext NothingHereText
|
||||
closetext
|
||||
waitbutton
|
||||
jump .end
|
||||
|
||||
.fruit
|
||||
@ -27,10 +27,10 @@ FruitTreeScript:: ; 44000
|
||||
.packisfull
|
||||
keeptextopen
|
||||
writetext FruitPackIsFullText
|
||||
closetext
|
||||
waitbutton
|
||||
|
||||
.end
|
||||
loadmovesprites
|
||||
closetext
|
||||
end
|
||||
; 44041
|
||||
|
||||
|
||||
@ -1378,7 +1378,7 @@ Function28926: ; 28926
|
||||
hlcoord 0, 15
|
||||
ld b, $1
|
||||
ld c, $12
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 2, 16
|
||||
ld de, String28ab4
|
||||
call PlaceString
|
||||
@ -1487,7 +1487,7 @@ Function28926: ; 28926
|
||||
hlcoord 0, 12
|
||||
ld b, $4
|
||||
ld c, $12
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
callba Function4d354
|
||||
ld hl, UnknownText_0x28aaf
|
||||
bccoord 1, 14
|
||||
@ -1509,7 +1509,7 @@ Function28926: ; 28926
|
||||
hlcoord 0, 12
|
||||
ld b, $4
|
||||
ld c, $12
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
callba Function4d354
|
||||
ld hl, UnknownText_0x28ac4
|
||||
bccoord 1, 14
|
||||
@ -1519,7 +1519,7 @@ Function28926: ; 28926
|
||||
hlcoord 0, 12
|
||||
ld b, $4
|
||||
ld c, $12
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 1, 14
|
||||
ld de, String28ece
|
||||
call PlaceString
|
||||
@ -1666,7 +1666,7 @@ Function28b87: ; 28b87
|
||||
hlcoord 0, 12
|
||||
ld b, $4
|
||||
ld c, $12
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
callba Function4d354
|
||||
ld a, [wd002]
|
||||
ld hl, PartySpecies
|
||||
@ -1695,7 +1695,7 @@ Function28b87: ; 28b87
|
||||
hlcoord 10, 7
|
||||
ld b, $3
|
||||
ld c, $7
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
ld de, String28eab
|
||||
hlcoord 12, 8
|
||||
call PlaceString
|
||||
@ -1735,7 +1735,7 @@ Function28b87: ; 28b87
|
||||
hlcoord 0, 12
|
||||
ld b, 4
|
||||
ld c, 18
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 1, 14
|
||||
ld de, String28ece
|
||||
call PlaceString
|
||||
@ -1752,7 +1752,7 @@ Function28b87: ; 28b87
|
||||
hlcoord 0, 12
|
||||
ld b, 4
|
||||
ld c, 18
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 1, 14
|
||||
ld de, String28ece
|
||||
call PlaceString
|
||||
@ -1982,7 +1982,7 @@ Function28b87: ; 28b87
|
||||
hlcoord 0, 12
|
||||
ld b, 4
|
||||
ld c, 18
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 1, 14
|
||||
ld de, String28ebd
|
||||
call PlaceString
|
||||
@ -2019,10 +2019,10 @@ String28ece: ; 28ece
|
||||
next "was canceled!@"
|
||||
|
||||
|
||||
Function28eef: ; 28eef
|
||||
Predef_LinkTextbox: ; 28eef
|
||||
ld d, h
|
||||
ld e, l
|
||||
callba Function16d6ca
|
||||
callba LinkTextbox
|
||||
ret
|
||||
; 28ef8
|
||||
|
||||
@ -2041,11 +2041,11 @@ Function28f09: ; 28f09
|
||||
hlcoord 0, 0
|
||||
ld b, 6
|
||||
ld c, 18
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
hlcoord 0, 8
|
||||
ld b, 6
|
||||
ld c, 18
|
||||
call Function28eef
|
||||
call Predef_LinkTextbox
|
||||
callba Functionfb60d
|
||||
ret
|
||||
; 28f24
|
||||
|
||||
@ -2736,7 +2736,7 @@ Function5602: ; 5602, called at battle start
|
||||
ld a, PLAYER
|
||||
call Function5629 ; respawn player
|
||||
|
||||
ld a, [wd459]
|
||||
ld a, [wBattleScriptFlags]
|
||||
bit 7, a
|
||||
jr z, .ok
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ Function2400e:: ; 2400e
|
||||
rst FarCall
|
||||
call Function24085
|
||||
call UpdateSprites
|
||||
call Function321c
|
||||
call ApplyTilemap
|
||||
call Function2408f
|
||||
ret
|
||||
; 24022
|
||||
@ -16,7 +16,7 @@ Function24022:: ; 24022
|
||||
call Function24085
|
||||
callba MobileTextBorder
|
||||
call UpdateSprites
|
||||
call Function321c
|
||||
call ApplyTilemap
|
||||
call Function2408f
|
||||
ret
|
||||
; 2403c
|
||||
@ -28,7 +28,7 @@ Function2403c:: ; 2403c
|
||||
call Function24085
|
||||
callba MobileTextBorder
|
||||
call UpdateSprites
|
||||
call Function321c
|
||||
call ApplyTilemap
|
||||
call Function2411a
|
||||
ld hl, wcfa5
|
||||
set 7, [hl]
|
||||
|
||||
@ -443,9 +443,9 @@ Script_ReceivePhoneCall: ; 0x90241
|
||||
refreshscreen $0
|
||||
callasm RingTwice_StartCall
|
||||
ptcall wd048
|
||||
closetext
|
||||
waitbutton
|
||||
callasm HangUp
|
||||
loadmovesprites
|
||||
closetext
|
||||
callasm InitCallReceiveDelay
|
||||
end
|
||||
; 0x90255
|
||||
|
||||
@ -188,7 +188,7 @@ BillPhoneScript1: ; 0xbcfc5
|
||||
|
||||
BillPhoneScript2: ; 0xbd007
|
||||
farwritetext BillPhoneNewlyFullText
|
||||
closetext
|
||||
waitbutton
|
||||
end
|
||||
|
||||
; Elm
|
||||
|
||||
@ -188,7 +188,7 @@ _KrissHousePC: ; 156d9
|
||||
and a
|
||||
jr nz, .asm_156f9
|
||||
call OverworldTextModeSwitch
|
||||
call Function321c
|
||||
call ApplyTilemap
|
||||
call UpdateSprites
|
||||
call PC_PlayShutdownSound
|
||||
ld c, $0
|
||||
@ -466,16 +466,16 @@ UnknownText_0x158c7: ; 0x158c7
|
||||
|
||||
|
||||
Function158cc: ; 0x158cc
|
||||
ld a, [wc2ce]
|
||||
ld a, [wSpriteUpdatesEnabled]
|
||||
push af
|
||||
ld a, $0
|
||||
ld [wc2ce], a
|
||||
ld [wSpriteUpdatesEnabled], a
|
||||
callba CheckItemMenu
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld hl, .jumptable
|
||||
rst JumpTable
|
||||
pop af
|
||||
ld [wc2ce], a
|
||||
ld [wSpriteUpdatesEnabled], a
|
||||
ret
|
||||
; 0x158e7
|
||||
|
||||
@ -577,10 +577,10 @@ Function15985: ; 0x15985
|
||||
xor a
|
||||
ld [wd0e3], a
|
||||
.asm_15989
|
||||
ld a, [wc2ce]
|
||||
ld a, [wSpriteUpdatesEnabled]
|
||||
push af
|
||||
ld a, $0
|
||||
ld [wc2ce], a
|
||||
ld [wSpriteUpdatesEnabled], a
|
||||
ld hl, MenuData15a08
|
||||
call CopyMenuDataHeader
|
||||
hlcoord 0, 0
|
||||
@ -597,7 +597,7 @@ Function15985: ; 0x15985
|
||||
ld a, [MenuSelection2]
|
||||
ld [wd0d7], a
|
||||
pop af
|
||||
ld [wc2ce], a
|
||||
ld [wSpriteUpdatesEnabled], a
|
||||
ld a, [wd0e3]
|
||||
and a
|
||||
jr nz, .asm_159d8
|
||||
|
||||
@ -46,7 +46,7 @@ PredefPointers:: ; 856b
|
||||
add_predef CalcPkmnStatC
|
||||
add_predef CanLearnTMHMMove
|
||||
add_predef GetTMHMMove
|
||||
add_predef Function28eef ; $ 10
|
||||
add_predef Predef_LinkTextbox ; $ 10
|
||||
add_predef PrintMoveDesc
|
||||
add_predef UpdatePlayerHUD
|
||||
add_predef FillBox
|
||||
|
||||
@ -143,7 +143,7 @@ ScriptCommandTable: ; 96cb1
|
||||
dw Script_pocketisfull
|
||||
dw Script_loadfont
|
||||
dw Script_refreshscreen
|
||||
dw Script_loadmovesprites
|
||||
dw Script_closetext
|
||||
dw Script_loadbytec2cf
|
||||
dw Script_farwritetext
|
||||
dw Script_writetext
|
||||
@ -156,26 +156,26 @@ IF _CRYSTAL
|
||||
dw Script_farjumptext
|
||||
ENDC
|
||||
dw Script_jumptext
|
||||
dw Script_closetext
|
||||
dw Script_waitbutton
|
||||
dw Script_keeptextopen
|
||||
dw Script_pokepic
|
||||
dw Script_pokepicyesorno
|
||||
dw Script_closepokepic
|
||||
dw Script_interpretmenu
|
||||
dw Script_interpretmenu2
|
||||
dw Script_loadpikachudata
|
||||
dw Script_battlecheck
|
||||
dw Script_loadtrainerdata
|
||||
dw Script_loadpokedata
|
||||
dw Script_loadtrainer
|
||||
dw Script_setup_random_encounter
|
||||
dw Script_memtrainerdata
|
||||
dw Script_scriptedpokedata
|
||||
dw Script_scriptedtrainerdata
|
||||
dw Script_startbattle
|
||||
dw Script_returnafterbattle
|
||||
dw Script_catchtutorial
|
||||
dw Script_trainertext
|
||||
dw Script_trainerstatus
|
||||
dw Script_trainerflagaction
|
||||
dw Script_winlosstext
|
||||
dw Script_scripttalkafter
|
||||
dw Script_talkaftercancel
|
||||
dw Script_talkaftercheck
|
||||
dw Script_end_if_just_battled
|
||||
dw Script_check_just_battled
|
||||
dw Script_setlasttalked
|
||||
dw Script_applymovement
|
||||
dw Script_applymovement2
|
||||
@ -200,13 +200,13 @@ ENDC
|
||||
dw Script_writecmdqueue
|
||||
dw Script_delcmdqueue
|
||||
dw Script_playmusic
|
||||
dw Script_playrammusic
|
||||
dw Script_encountermusic
|
||||
dw Script_musicfadeout
|
||||
dw Script_playmapmusic
|
||||
dw Script_reloadmapmusic
|
||||
dw Script_cry
|
||||
dw Script_playsound
|
||||
dw Script_waitbutton
|
||||
dw Script_waitsfx
|
||||
dw Script_warpsound
|
||||
dw Script_specialsound
|
||||
dw Script_passtoengine
|
||||
@ -347,8 +347,8 @@ JumpTextFacePlayerScript: ; 96e79
|
||||
JumpTextScript: ; 96e7a
|
||||
loadfont
|
||||
repeattext -1, -1
|
||||
waitbutton
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 96e81
|
||||
|
||||
@ -431,10 +431,10 @@ Script_repeattext: ; 96ebb
|
||||
ret
|
||||
; 96ed9
|
||||
|
||||
Script_closetext: ; 96ed9
|
||||
Script_waitbutton: ; 96ed9
|
||||
; script command 0x54
|
||||
|
||||
jp CloseText
|
||||
jp WaitButton
|
||||
; 96edc
|
||||
|
||||
Script_keeptextopen: ; 96edc
|
||||
@ -455,9 +455,9 @@ Script_yesorno: ; 96eed
|
||||
; script command 0x4e
|
||||
|
||||
call YesNoBox
|
||||
ld a, 0
|
||||
ld a, FALSE
|
||||
jr c, .no
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
.no
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
@ -502,10 +502,10 @@ Script_pokepic: ; 96f16
|
||||
ret
|
||||
; 96f29
|
||||
|
||||
Script_pokepicyesorno: ; 96f29
|
||||
Script_closepokepic: ; 96f29
|
||||
; script command 0x57
|
||||
|
||||
callba PokepicYesOrNo
|
||||
callba ClosePokepic
|
||||
ret
|
||||
; 96f30
|
||||
|
||||
@ -575,9 +575,9 @@ GiveItemScript: ; 96f77
|
||||
callasm ret_96f76
|
||||
writetext ReceivedItemText
|
||||
iffalse .Full
|
||||
waitbutton
|
||||
waitsfx
|
||||
specialsound
|
||||
closetext
|
||||
waitbutton
|
||||
itemnotify
|
||||
end
|
||||
|
||||
@ -611,7 +611,7 @@ Script_verbosegiveitem2: ; 96f8e
|
||||
ld [wItemQuantityChangeBuffer], a
|
||||
ld hl, NumItems
|
||||
call ReceiveItem
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
jr c, .ok2
|
||||
xor a
|
||||
.ok2
|
||||
@ -748,7 +748,7 @@ Script_elevator: ; 9707c
|
||||
ld b, a
|
||||
callba Elevator
|
||||
ret c
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 97099
|
||||
@ -885,7 +885,7 @@ Script_scripttalkafter: ; 97125
|
||||
jp ScriptJump
|
||||
; 97132
|
||||
|
||||
Script_trainerstatus: ; 97132
|
||||
Script_trainerflagaction: ; 97132
|
||||
; script command 0x63
|
||||
; parameters:
|
||||
; action (SingleByteParam)
|
||||
@ -902,7 +902,7 @@ Script_trainerstatus: ; 97132
|
||||
ld a, c
|
||||
and a
|
||||
ret z
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 9714c
|
||||
@ -926,21 +926,21 @@ Script_winlosstext: ; 9714c
|
||||
ret
|
||||
; 97163
|
||||
|
||||
Script_talkaftercancel: ; 97163
|
||||
Script_end_if_just_battled: ; 97163
|
||||
; script command 0x66
|
||||
|
||||
ld a, [wd04d]
|
||||
ld a, [wRunningTrainerBattleScript]
|
||||
and a
|
||||
ret z
|
||||
jp Script_end
|
||||
; 9716b
|
||||
|
||||
Script_talkaftercheck: ; 9716b
|
||||
Script_check_just_battled: ; 9716b
|
||||
; script command 0x67
|
||||
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ld a, [wd04d]
|
||||
ld a, [wRunningTrainerBattleScript]
|
||||
and a
|
||||
ret nz
|
||||
xor a
|
||||
@ -948,7 +948,7 @@ Script_talkaftercheck: ; 9716b
|
||||
ret
|
||||
; 9717a
|
||||
|
||||
Script_playrammusic: ; 9717a
|
||||
Script_encountermusic: ; 9717a
|
||||
; script command 0x80
|
||||
|
||||
ld a, [OtherTrainerClass]
|
||||
@ -1011,7 +1011,7 @@ Script_playsound: ; 971b7
|
||||
ret
|
||||
; 971c3
|
||||
|
||||
Script_waitbutton: ; 971c3
|
||||
Script_waitsfx: ; 971c3
|
||||
; script command 0x86
|
||||
|
||||
call WaitSFX
|
||||
@ -1481,19 +1481,19 @@ Script_loadpikachudata: ; 973f0
|
||||
ret
|
||||
; 973fb
|
||||
|
||||
Script_battlecheck: ; 973fb
|
||||
Script_setup_random_encounter: ; 973fb
|
||||
; script command 0x5b
|
||||
|
||||
xor a
|
||||
ld [wd459], a
|
||||
ld [wBattleScriptFlags], a
|
||||
ret
|
||||
; 97400
|
||||
|
||||
Script_loadtrainerdata: ; 97400
|
||||
Script_memtrainerdata: ; 97400
|
||||
; script command 0x5c
|
||||
|
||||
ld a, (1 << 7) | 1
|
||||
ld [wd459], a
|
||||
ld [wBattleScriptFlags], a
|
||||
ld a, [WalkingDirection]
|
||||
ld [OtherTrainerClass], a
|
||||
ld a, [FacingDirection]
|
||||
@ -1501,14 +1501,14 @@ Script_loadtrainerdata: ; 97400
|
||||
ret
|
||||
; 97412
|
||||
|
||||
Script_loadpokedata: ; 97412
|
||||
Script_scriptedpokedata: ; 97412
|
||||
; script command 0x5d
|
||||
; parameters:
|
||||
; pokemon (PokemonParam)
|
||||
; level (DecimalParam)
|
||||
|
||||
ld a, (1 << 7)
|
||||
ld [wd459], a
|
||||
ld [wBattleScriptFlags], a
|
||||
call GetScriptByte
|
||||
ld [TempWildMonSpecies], a
|
||||
call GetScriptByte
|
||||
@ -1516,14 +1516,14 @@ Script_loadpokedata: ; 97412
|
||||
ret
|
||||
; 97424
|
||||
|
||||
Script_loadtrainer: ; 97424
|
||||
Script_scriptedtrainerdata: ; 97424
|
||||
; script command 0x5e
|
||||
; parameters:
|
||||
; trainer_group (TrainerGroupParam)
|
||||
; trainer_id (TrainerIdParam)
|
||||
|
||||
ld a, (1 << 7) | 1
|
||||
ld [wd459], a
|
||||
ld [wBattleScriptFlags], a
|
||||
call GetScriptByte
|
||||
ld [OtherTrainerClass], a
|
||||
call GetScriptByte
|
||||
@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447
|
||||
Script_returnafterbattle: ; 97459
|
||||
; script command 0x60
|
||||
|
||||
ld hl, wd459
|
||||
ld hl, wBattleScriptFlags
|
||||
ld d, [hl]
|
||||
ld [hl], $0
|
||||
ld a, [wBattleResult]
|
||||
@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491
|
||||
; script command 0x7b
|
||||
|
||||
xor a
|
||||
ld [wd459], a
|
||||
ld [wBattleScriptFlags], a
|
||||
ld a, MAPSETUP_RELOADMAP
|
||||
ld [hMapEntryMethod], a
|
||||
ld a, $1
|
||||
@ -2362,7 +2362,7 @@ Script_giveitem: ; 977ca
|
||||
ld hl, NumItems
|
||||
call ReceiveItem
|
||||
jr nc, .full
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
.full
|
||||
@ -2388,7 +2388,7 @@ Script_takeitem: ; 977f0
|
||||
ld hl, NumItems
|
||||
call TossItem
|
||||
ret nc
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 97812
|
||||
@ -2405,7 +2405,7 @@ Script_checkitem: ; 97812
|
||||
ld hl, NumItems
|
||||
call CheckItem
|
||||
ret nc
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 97829
|
||||
@ -2534,7 +2534,7 @@ Script_checktime: ; 978ae
|
||||
call GetScriptByte
|
||||
and c
|
||||
ret z
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 978c3
|
||||
@ -2551,7 +2551,7 @@ Script_checkpoke: ; 978c3
|
||||
ld de, 1
|
||||
call IsInArray
|
||||
ret nc
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 978da
|
||||
@ -2567,7 +2567,7 @@ Script_addcellnum: ; 978da
|
||||
ld c, a
|
||||
callba AddPhoneNumber
|
||||
ret nc
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 978ef
|
||||
@ -2583,7 +2583,7 @@ Script_delcellnum: ; 978ef
|
||||
ld c, a
|
||||
callba DelCellNum
|
||||
ret nc
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 97904
|
||||
@ -2600,7 +2600,7 @@ Script_checkcellnum: ; 97904
|
||||
ld c, a
|
||||
callba CheckCellNum
|
||||
ret nc
|
||||
ld a, $1
|
||||
ld a, TRUE
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 97919
|
||||
@ -2624,7 +2624,7 @@ Script_checkphonecall: ; 97926
|
||||
ld a, [wSpecialPhoneCallID]
|
||||
and a
|
||||
jr z, .ok
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
.ok
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
@ -2728,7 +2728,7 @@ Script_checkevent: ; 979a4
|
||||
ld a, c
|
||||
and a
|
||||
jr z, .false
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
.false
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
@ -2743,7 +2743,7 @@ Script_setflag: ; 979bb
|
||||
ld e, a
|
||||
call GetScriptByte
|
||||
ld d, a
|
||||
ld b, 1 ; set
|
||||
ld b, SET_FLAG
|
||||
call _EngineFlagAction
|
||||
ret
|
||||
; 979c9
|
||||
@ -2757,7 +2757,7 @@ Script_clearflag: ; 979c9
|
||||
ld e, a
|
||||
call GetScriptByte
|
||||
ld d, a
|
||||
ld b, 0 ; clear
|
||||
ld b, RESET_FLAG
|
||||
call _EngineFlagAction
|
||||
ret
|
||||
; 979d7
|
||||
@ -2776,7 +2776,7 @@ Script_checkflag: ; 979d7
|
||||
ld a, c
|
||||
and a
|
||||
jr z, .false
|
||||
ld a, 1
|
||||
ld a, TRUE
|
||||
.false
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
@ -3053,15 +3053,15 @@ Script_loadbytec2cf: ; 97b27
|
||||
; 97b2e
|
||||
|
||||
|
||||
LoadMoveSpritesScript: ; 97b2e
|
||||
loadmovesprites
|
||||
CloseTextScript: ; 97b2e
|
||||
closetext
|
||||
; 97b2f
|
||||
|
||||
Script_loadmovesprites: ; 97b2f
|
||||
Script_closetext: ; 97b2f
|
||||
; script command 0x49
|
||||
|
||||
call Function2e20
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
ret
|
||||
; 97b36
|
||||
|
||||
|
||||
@ -9,8 +9,8 @@ SelectMenu:: ; 13327
|
||||
ld b, BANK(ItemMayBeRegisteredText)
|
||||
ld hl, ItemMayBeRegisteredText
|
||||
call MapTextbox
|
||||
call CloseText
|
||||
jp LoadMoveSprites
|
||||
call WaitButton
|
||||
jp CloseText
|
||||
; 13340
|
||||
|
||||
|
||||
@ -141,7 +141,7 @@ UseRegisteredItem: ; 133c3
|
||||
.NoFunction ; 133df
|
||||
call LoadFont
|
||||
call CantUseItem
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
and a
|
||||
ret
|
||||
; 133ea
|
||||
@ -149,7 +149,7 @@ UseRegisteredItem: ; 133c3
|
||||
.Current ; 133ea
|
||||
call LoadFont
|
||||
call DoItemEffect
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
and a
|
||||
ret
|
||||
; 133f5
|
||||
@ -159,7 +159,7 @@ UseRegisteredItem: ; 133c3
|
||||
call FadeToMenu
|
||||
call DoItemEffect
|
||||
call ReturnToCallingMenu
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
and a
|
||||
ret
|
||||
; 13406
|
||||
@ -185,7 +185,7 @@ UseRegisteredItem: ; 133c3
|
||||
|
||||
._cantuse
|
||||
call CantUseItem
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
and a
|
||||
ret
|
||||
; 1342d
|
||||
|
||||
@ -61,8 +61,8 @@ endr
|
||||
.MenuReturns
|
||||
dw .Reopen
|
||||
dw .Exit
|
||||
dw .ExitMenuCallFuncLoadMoveSprites
|
||||
dw .ExitMenuRunScriptLoadMoveSprites
|
||||
dw .ExitMenuCallFuncCloseText
|
||||
dw .ExitMenuRunScriptCloseText
|
||||
dw .ExitMenuRunScript
|
||||
dw .ReturnEnd
|
||||
dw .ReturnRedraw
|
||||
@ -78,7 +78,7 @@ endr
|
||||
.ReturnEnd
|
||||
call ExitMenu
|
||||
.ReturnEnd2
|
||||
call LoadMoveSprites
|
||||
call CloseText
|
||||
call UpdateTimePals
|
||||
ret
|
||||
|
||||
@ -115,14 +115,14 @@ endr
|
||||
ret
|
||||
; 12699
|
||||
|
||||
.ExitMenuRunScriptLoadMoveSprites ; 12699
|
||||
.ExitMenuRunScriptCloseText ; 12699
|
||||
call ExitMenu
|
||||
ld a, HMENURETURN_SCRIPT
|
||||
ld [hMenuReturn], a
|
||||
jr .ReturnEnd2
|
||||
; 126a2
|
||||
|
||||
.ExitMenuCallFuncLoadMoveSprites ; 126a2
|
||||
.ExitMenuCallFuncCloseText ; 126a2
|
||||
call ExitMenu
|
||||
ld hl, wQueuedScriptAddr
|
||||
ld a, [hli]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@ InitClock: ; 90672 (24:4672)
|
||||
ld [hInMenu], a
|
||||
|
||||
ld a, $0
|
||||
ld [wc2ce], a
|
||||
ld [wSpriteUpdatesEnabled], a
|
||||
ld a, $10
|
||||
ld [MusicFade], a
|
||||
ld a, MUSIC_NONE % $100
|
||||
@ -436,7 +436,7 @@ Special_SetDayOfWeek: ; 90913
|
||||
ld [hl], $f5
|
||||
hlcoord 10, 5
|
||||
call Function909de
|
||||
call Function321c
|
||||
call ApplyTilemap
|
||||
ld c, 10
|
||||
call DelayFrames
|
||||
.asm_9096a
|
||||
|
||||
@ -29,6 +29,6 @@ _BasementKey: ; 507b4
|
||||
; 507e1
|
||||
|
||||
.BasementKeyScript: ; 0x507e1
|
||||
loadmovesprites
|
||||
closetext
|
||||
farjump BasementDoorScript
|
||||
; 0x507e6
|
||||
|
||||
@ -34,6 +34,6 @@ _CardKey: ; 50779
|
||||
; 507af
|
||||
|
||||
.CardKeyScript: ; 0x507af
|
||||
loadmovesprites
|
||||
closetext
|
||||
farjump MapRadioTower3FSignpost2Script
|
||||
; 0x507b4
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user