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

Rename several script commands

Browse Source
This commit is contained in:
PikalaxALT 2015-11-25 10:16:29 -05:00
parent f599e477fc
commit 01792e00d2
327 changed files with 2935 additions and 2926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants/misc_constants.asm
View File

@ -48,6 +48,9 @@ RESET_FLAG EQU 0
SET_FLAG EQU 1 SET_FLAG EQU 1
CHECK_FLAG EQU 2 CHECK_FLAG EQU 2
; Boolean checks
FALSE EQU 0
TRUE EQU 1
; joypad ; joypad

1
data/battle_tower_2.asm
View File

@ -1,4 +1,3 @@
BattleTowerTrainerData:: ; What exactly it is, I don't know BattleTowerTrainerData:: ; What exactly it is, I don't know
; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied) ; 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. ; Second argument points to an entry in Unknown_170470, to which the first argument is compared.

2
engine/breeding/egg.asm
View File

@ -194,7 +194,7 @@ OverworldHatchEgg:: ; 16f5e
call Function16f70 call Function16f70
call ExitAllMenus call ExitAllMenus
call RestartMapMusic call RestartMapMusic
jp LoadMoveSprites jp CloseText
; 16f70 ; 16f70
Function16f70: ; 16f70 (5:6f70) Function16f70: ; 16f70 (5:6f70)

4
engine/decorations.asm
View File

@ -1246,9 +1246,9 @@ DecorationDesc_PosterPointers: ; 26f84
DecorationDesc_TownMapPoster: ; 0x26f91 DecorationDesc_TownMapPoster: ; 0x26f91
loadfont loadfont
writetext .TownMapText writetext .TownMapText
closetext waitbutton
special Special_TownMap special Special_TownMap
loadmovesprites closetext
end end
; 0x26f9b ; 0x26f9b

2
engine/events_2.asm
View File

@ -142,7 +142,7 @@ RandomEncounter:: ; 97cc0
; 97cf9 ; 97cf9
WildBattleScript: ; 97cf9 WildBattleScript: ; 97cf9
battlecheck setup_random_encounter
startbattle startbattle
returnafterbattle returnafterbattle
end end

6
engine/fruit_trees.asm
View File

@ -9,7 +9,7 @@ FruitTreeScript:: ; 44000
callasm CheckFruitTree callasm CheckFruitTree
iffalse .fruit iffalse .fruit
writetext NothingHereText writetext NothingHereText
closetext waitbutton
jump .end jump .end
.fruit .fruit
@ -27,10 +27,10 @@ FruitTreeScript:: ; 44000
.packisfull .packisfull
keeptextopen keeptextopen
writetext FruitPackIsFullText writetext FruitPackIsFullText
closetext waitbutton
.end .end
loadmovesprites closetext
end end
; 44041 ; 44041

26
engine/link.asm
View File

@ -1378,7 +1378,7 @@ Function28926: ; 28926
hlcoord 0, 15 hlcoord 0, 15
ld b, $1 ld b, $1
ld c, $12 ld c, $12
call Function28eef call Predef_LinkTextbox
hlcoord 2, 16 hlcoord 2, 16
ld de, String28ab4 ld de, String28ab4
call PlaceString call PlaceString
@ -1487,7 +1487,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call Function28eef call Predef_LinkTextbox
callba Function4d354 callba Function4d354
ld hl, UnknownText_0x28aaf ld hl, UnknownText_0x28aaf
bccoord 1, 14 bccoord 1, 14
@ -1509,7 +1509,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call Function28eef call Predef_LinkTextbox
callba Function4d354 callba Function4d354
ld hl, UnknownText_0x28ac4 ld hl, UnknownText_0x28ac4
bccoord 1, 14 bccoord 1, 14
@ -1519,7 +1519,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call Function28eef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ece ld de, String28ece
call PlaceString call PlaceString
@ -1666,7 +1666,7 @@ Function28b87: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call Function28eef call Predef_LinkTextbox
callba Function4d354 callba Function4d354
ld a, [wd002] ld a, [wd002]
ld hl, PartySpecies ld hl, PartySpecies
@ -1695,7 +1695,7 @@ Function28b87: ; 28b87
hlcoord 10, 7 hlcoord 10, 7
ld b, $3 ld b, $3
ld c, $7 ld c, $7
call Function28eef call Predef_LinkTextbox
ld de, String28eab ld de, String28eab
hlcoord 12, 8 hlcoord 12, 8
call PlaceString call PlaceString
@ -1735,7 +1735,7 @@ Function28b87: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Function28eef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ece ld de, String28ece
call PlaceString call PlaceString
@ -1752,7 +1752,7 @@ Function28b87: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Function28eef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ece ld de, String28ece
call PlaceString call PlaceString
@ -1982,7 +1982,7 @@ Function28b87: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Function28eef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ebd ld de, String28ebd
call PlaceString call PlaceString
@ -2019,10 +2019,10 @@ String28ece: ; 28ece
next "was canceled!@" next "was canceled!@"
Function28eef: ; 28eef Predef_LinkTextbox: ; 28eef
ld d, h ld d, h
ld e, l ld e, l
callba Function16d6ca callba LinkTextbox
ret ret
; 28ef8 ; 28ef8
@ -2041,11 +2041,11 @@ Function28f09: ; 28f09
hlcoord 0, 0 hlcoord 0, 0
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call Function28eef call Predef_LinkTextbox
hlcoord 0, 8 hlcoord 0, 8
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call Function28eef call Predef_LinkTextbox
callba Functionfb60d callba Functionfb60d
ret ret
; 28f24 ; 28f24

2
engine/map_objects.asm
View File

@ -2736,7 +2736,7 @@ Function5602: ; 5602, called at battle start
ld a, PLAYER ld a, PLAYER
call Function5629 ; respawn player call Function5629 ; respawn player
ld a, [wd459] ld a, [wBattleScriptFlags]
bit 7, a bit 7, a
jr z, .ok jr z, .ok

6
engine/menu.asm
View File

@ -4,7 +4,7 @@ Function2400e:: ; 2400e
rst FarCall rst FarCall
call Function24085 call Function24085
call UpdateSprites call UpdateSprites
call Function321c call ApplyTilemap
call Function2408f call Function2408f
ret ret
; 24022 ; 24022
@ -16,7 +16,7 @@ Function24022:: ; 24022
call Function24085 call Function24085
callba MobileTextBorder callba MobileTextBorder
call UpdateSprites call UpdateSprites
call Function321c call ApplyTilemap
call Function2408f call Function2408f
ret ret
; 2403c ; 2403c
@ -28,7 +28,7 @@ Function2403c:: ; 2403c
call Function24085 call Function24085
callba MobileTextBorder callba MobileTextBorder
call UpdateSprites call UpdateSprites
call Function321c call ApplyTilemap
call Function2411a call Function2411a
ld hl, wcfa5 ld hl, wcfa5
set 7, [hl] set 7, [hl]

4
engine/phone.asm
View File

@ -443,9 +443,9 @@ Script_ReceivePhoneCall: ; 0x90241
refreshscreen $0 refreshscreen $0
callasm RingTwice_StartCall callasm RingTwice_StartCall
ptcall wd048 ptcall wd048
closetext waitbutton
callasm HangUp callasm HangUp
loadmovesprites closetext
callasm InitCallReceiveDelay callasm InitCallReceiveDelay
end end
; 0x90255 ; 0x90255

2
engine/phone_scripts.asm
View File

@ -188,7 +188,7 @@ BillPhoneScript1: ; 0xbcfc5
BillPhoneScript2: ; 0xbd007 BillPhoneScript2: ; 0xbd007
farwritetext BillPhoneNewlyFullText farwritetext BillPhoneNewlyFullText
closetext waitbutton
end end
; Elm ; Elm

14
engine/pokecenter_pc.asm
View File

@ -188,7 +188,7 @@ _KrissHousePC: ; 156d9
and a and a
jr nz, .asm_156f9 jr nz, .asm_156f9
call OverworldTextModeSwitch call OverworldTextModeSwitch
call Function321c call ApplyTilemap
call UpdateSprites call UpdateSprites
call PC_PlayShutdownSound call PC_PlayShutdownSound
ld c, $0 ld c, $0
@ -466,16 +466,16 @@ UnknownText_0x158c7: ; 0x158c7
Function158cc: ; 0x158cc Function158cc: ; 0x158cc
ld a, [wc2ce] ld a, [wSpriteUpdatesEnabled]
push af push af
ld a, $0 ld a, $0
ld [wc2ce], a ld [wSpriteUpdatesEnabled], a
callba CheckItemMenu callba CheckItemMenu
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
ld hl, .jumptable ld hl, .jumptable
rst JumpTable rst JumpTable
pop af pop af
ld [wc2ce], a ld [wSpriteUpdatesEnabled], a
ret ret
; 0x158e7 ; 0x158e7
@ -577,10 +577,10 @@ Function15985: ; 0x15985
xor a xor a
ld [wd0e3], a ld [wd0e3], a
.asm_15989 .asm_15989
ld a, [wc2ce] ld a, [wSpriteUpdatesEnabled]
push af push af
ld a, $0 ld a, $0
ld [wc2ce], a ld [wSpriteUpdatesEnabled], a
ld hl, MenuData15a08 ld hl, MenuData15a08
call CopyMenuDataHeader call CopyMenuDataHeader
hlcoord 0, 0 hlcoord 0, 0
@ -597,7 +597,7 @@ Function15985: ; 0x15985
ld a, [MenuSelection2] ld a, [MenuSelection2]
ld [wd0d7], a ld [wd0d7], a
pop af pop af
ld [wc2ce], a ld [wSpriteUpdatesEnabled], a
ld a, [wd0e3] ld a, [wd0e3]
and a and a
jr nz, .asm_159d8 jr nz, .asm_159d8

2
engine/predef.asm
View File

@ -46,7 +46,7 @@ PredefPointers:: ; 856b
add_predef CalcPkmnStatC add_predef CalcPkmnStatC
add_predef CanLearnTMHMMove add_predef CanLearnTMHMMove
add_predef GetTMHMMove add_predef GetTMHMMove
add_predef Function28eef ; $ 10 add_predef Predef_LinkTextbox ; $ 10
add_predef PrintMoveDesc add_predef PrintMoveDesc
add_predef UpdatePlayerHUD add_predef UpdatePlayerHUD
add_predef FillBox add_predef FillBox

118
engine/scripting.asm
View File

@ -143,7 +143,7 @@ ScriptCommandTable: ; 96cb1
dw Script_pocketisfull dw Script_pocketisfull
dw Script_loadfont dw Script_loadfont
dw Script_refreshscreen dw Script_refreshscreen
dw Script_loadmovesprites dw Script_closetext
dw Script_loadbytec2cf dw Script_loadbytec2cf
dw Script_farwritetext dw Script_farwritetext
dw Script_writetext dw Script_writetext
@ -156,26 +156,26 @@ IF _CRYSTAL
dw Script_farjumptext dw Script_farjumptext
ENDC ENDC
dw Script_jumptext dw Script_jumptext
dw Script_closetext dw Script_waitbutton
dw Script_keeptextopen dw Script_keeptextopen
dw Script_pokepic dw Script_pokepic
dw Script_pokepicyesorno dw Script_closepokepic
dw Script_interpretmenu dw Script_interpretmenu
dw Script_interpretmenu2 dw Script_interpretmenu2
dw Script_loadpikachudata dw Script_loadpikachudata
dw Script_battlecheck dw Script_setup_random_encounter
dw Script_loadtrainerdata dw Script_memtrainerdata
dw Script_loadpokedata dw Script_scriptedpokedata
dw Script_loadtrainer dw Script_scriptedtrainerdata
dw Script_startbattle dw Script_startbattle
dw Script_returnafterbattle dw Script_returnafterbattle
dw Script_catchtutorial dw Script_catchtutorial
dw Script_trainertext dw Script_trainertext
dw Script_trainerstatus dw Script_trainerflagaction
dw Script_winlosstext dw Script_winlosstext
dw Script_scripttalkafter dw Script_scripttalkafter
dw Script_talkaftercancel dw Script_end_if_just_battled
dw Script_talkaftercheck dw Script_check_just_battled
dw Script_setlasttalked dw Script_setlasttalked
dw Script_applymovement dw Script_applymovement
dw Script_applymovement2 dw Script_applymovement2
@ -200,13 +200,13 @@ ENDC
dw Script_writecmdqueue dw Script_writecmdqueue
dw Script_delcmdqueue dw Script_delcmdqueue
dw Script_playmusic dw Script_playmusic
dw Script_playrammusic dw Script_encountermusic
dw Script_musicfadeout dw Script_musicfadeout
dw Script_playmapmusic dw Script_playmapmusic
dw Script_reloadmapmusic dw Script_reloadmapmusic
dw Script_cry dw Script_cry
dw Script_playsound dw Script_playsound
dw Script_waitbutton dw Script_waitsfx
dw Script_warpsound dw Script_warpsound
dw Script_specialsound dw Script_specialsound
dw Script_passtoengine dw Script_passtoengine
@ -347,8 +347,8 @@ JumpTextFacePlayerScript: ; 96e79
JumpTextScript: ; 96e7a JumpTextScript: ; 96e7a
loadfont loadfont
repeattext -1, -1 repeattext -1, -1
waitbutton
closetext closetext
loadmovesprites
end end
; 96e81 ; 96e81
@ -431,10 +431,10 @@ Script_repeattext: ; 96ebb
ret ret
; 96ed9 ; 96ed9
Script_closetext: ; 96ed9 Script_waitbutton: ; 96ed9
; script command 0x54 ; script command 0x54
jp CloseText jp WaitButton
; 96edc ; 96edc
Script_keeptextopen: ; 96edc Script_keeptextopen: ; 96edc
@ -455,9 +455,9 @@ Script_yesorno: ; 96eed
; script command 0x4e ; script command 0x4e
call YesNoBox call YesNoBox
ld a, 0 ld a, FALSE
jr c, .no jr c, .no
ld a, 1 ld a, TRUE
.no .no
ld [ScriptVar], a ld [ScriptVar], a
ret ret
@ -502,10 +502,10 @@ Script_pokepic: ; 96f16
ret ret
; 96f29 ; 96f29
Script_pokepicyesorno: ; 96f29 Script_closepokepic: ; 96f29
; script command 0x57 ; script command 0x57
callba PokepicYesOrNo callba ClosePokepic
ret ret
; 96f30 ; 96f30
@ -575,9 +575,9 @@ GiveItemScript: ; 96f77
callasm ret_96f76 callasm ret_96f76
writetext ReceivedItemText writetext ReceivedItemText
iffalse .Full iffalse .Full
waitbutton waitsfx
specialsound specialsound
closetext waitbutton
itemnotify itemnotify
end end
@ -611,7 +611,7 @@ Script_verbosegiveitem2: ; 96f8e
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld hl, NumItems ld hl, NumItems
call ReceiveItem call ReceiveItem
ld a, 1 ld a, TRUE
jr c, .ok2 jr c, .ok2
xor a xor a
.ok2 .ok2
@ -748,7 +748,7 @@ Script_elevator: ; 9707c
ld b, a ld b, a
callba Elevator callba Elevator
ret c ret c
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 97099 ; 97099
@ -885,7 +885,7 @@ Script_scripttalkafter: ; 97125
jp ScriptJump jp ScriptJump
; 97132 ; 97132
Script_trainerstatus: ; 97132 Script_trainerflagaction: ; 97132
; script command 0x63 ; script command 0x63
; parameters: ; parameters:
; action (SingleByteParam) ; action (SingleByteParam)
@ -902,7 +902,7 @@ Script_trainerstatus: ; 97132
ld a, c ld a, c
and a and a
ret z ret z
ld a, 1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 9714c ; 9714c
@ -926,21 +926,21 @@ Script_winlosstext: ; 9714c
ret ret
; 97163 ; 97163
Script_talkaftercancel: ; 97163 Script_end_if_just_battled: ; 97163
; script command 0x66 ; script command 0x66
ld a, [wd04d] ld a, [wRunningTrainerBattleScript]
and a and a
ret z ret z
jp Script_end jp Script_end
; 9716b ; 9716b
Script_talkaftercheck: ; 9716b Script_check_just_battled: ; 9716b
; script command 0x67 ; script command 0x67
ld a, 1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ld a, [wd04d] ld a, [wRunningTrainerBattleScript]
and a and a
ret nz ret nz
xor a xor a
@ -948,7 +948,7 @@ Script_talkaftercheck: ; 9716b
ret ret
; 9717a ; 9717a
Script_playrammusic: ; 9717a Script_encountermusic: ; 9717a
; script command 0x80 ; script command 0x80
ld a, [OtherTrainerClass] ld a, [OtherTrainerClass]
@ -1011,7 +1011,7 @@ Script_playsound: ; 971b7
ret ret
; 971c3 ; 971c3
Script_waitbutton: ; 971c3 Script_waitsfx: ; 971c3
; script command 0x86 ; script command 0x86
call WaitSFX call WaitSFX
@ -1481,19 +1481,19 @@ Script_loadpikachudata: ; 973f0
ret ret
; 973fb ; 973fb
Script_battlecheck: ; 973fb Script_setup_random_encounter: ; 973fb
; script command 0x5b ; script command 0x5b
xor a xor a
ld [wd459], a ld [wBattleScriptFlags], a
ret ret
; 97400 ; 97400
Script_loadtrainerdata: ; 97400 Script_memtrainerdata: ; 97400
; script command 0x5c ; script command 0x5c
ld a, (1 << 7) | 1 ld a, (1 << 7) | 1
ld [wd459], a ld [wBattleScriptFlags], a
ld a, [WalkingDirection] ld a, [WalkingDirection]
ld [OtherTrainerClass], a ld [OtherTrainerClass], a
ld a, [FacingDirection] ld a, [FacingDirection]
@ -1501,14 +1501,14 @@ Script_loadtrainerdata: ; 97400
ret ret
; 97412 ; 97412
Script_loadpokedata: ; 97412 Script_scriptedpokedata: ; 97412
; script command 0x5d ; script command 0x5d
; parameters: ; parameters:
; pokemon (PokemonParam) ; pokemon (PokemonParam)
; level (DecimalParam) ; level (DecimalParam)
ld a, (1 << 7) ld a, (1 << 7)
ld [wd459], a ld [wBattleScriptFlags], a
call GetScriptByte call GetScriptByte
ld [TempWildMonSpecies], a ld [TempWildMonSpecies], a
call GetScriptByte call GetScriptByte
@ -1516,14 +1516,14 @@ Script_loadpokedata: ; 97412
ret ret
; 97424 ; 97424
Script_loadtrainer: ; 97424 Script_scriptedtrainerdata: ; 97424
; script command 0x5e ; script command 0x5e
; parameters: ; parameters:
; trainer_group (TrainerGroupParam) ; trainer_group (TrainerGroupParam)
; trainer_id (TrainerIdParam) ; trainer_id (TrainerIdParam)
ld a, (1 << 7) | 1 ld a, (1 << 7) | 1
ld [wd459], a ld [wBattleScriptFlags], a
call GetScriptByte call GetScriptByte
ld [OtherTrainerClass], a ld [OtherTrainerClass], a
call GetScriptByte call GetScriptByte
@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447
Script_returnafterbattle: ; 97459 Script_returnafterbattle: ; 97459
; script command 0x60 ; script command 0x60
ld hl, wd459 ld hl, wBattleScriptFlags
ld d, [hl] ld d, [hl]
ld [hl], $0 ld [hl], $0
ld a, [wBattleResult] ld a, [wBattleResult]
@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491
; script command 0x7b ; script command 0x7b
xor a xor a
ld [wd459], a ld [wBattleScriptFlags], a
ld a, MAPSETUP_RELOADMAP ld a, MAPSETUP_RELOADMAP
ld [hMapEntryMethod], a ld [hMapEntryMethod], a
ld a, $1 ld a, $1
@ -2362,7 +2362,7 @@ Script_giveitem: ; 977ca
ld hl, NumItems ld hl, NumItems
call ReceiveItem call ReceiveItem
jr nc, .full jr nc, .full
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
.full .full
@ -2388,7 +2388,7 @@ Script_takeitem: ; 977f0
ld hl, NumItems ld hl, NumItems
call TossItem call TossItem
ret nc ret nc
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 97812 ; 97812
@ -2405,7 +2405,7 @@ Script_checkitem: ; 97812
ld hl, NumItems ld hl, NumItems
call CheckItem call CheckItem
ret nc ret nc
ld a, 1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 97829 ; 97829
@ -2534,7 +2534,7 @@ Script_checktime: ; 978ae
call GetScriptByte call GetScriptByte
and c and c
ret z ret z
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 978c3 ; 978c3
@ -2551,7 +2551,7 @@ Script_checkpoke: ; 978c3
ld de, 1 ld de, 1
call IsInArray call IsInArray
ret nc ret nc
ld a, 1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 978da ; 978da
@ -2567,7 +2567,7 @@ Script_addcellnum: ; 978da
ld c, a ld c, a
callba AddPhoneNumber callba AddPhoneNumber
ret nc ret nc
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 978ef ; 978ef
@ -2583,7 +2583,7 @@ Script_delcellnum: ; 978ef
ld c, a ld c, a
callba DelCellNum callba DelCellNum
ret nc ret nc
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 97904 ; 97904
@ -2600,7 +2600,7 @@ Script_checkcellnum: ; 97904
ld c, a ld c, a
callba CheckCellNum callba CheckCellNum
ret nc ret nc
ld a, $1 ld a, TRUE
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 97919 ; 97919
@ -2624,7 +2624,7 @@ Script_checkphonecall: ; 97926
ld a, [wSpecialPhoneCallID] ld a, [wSpecialPhoneCallID]
and a and a
jr z, .ok jr z, .ok
ld a, 1 ld a, TRUE
.ok .ok
ld [ScriptVar], a ld [ScriptVar], a
ret ret
@ -2728,7 +2728,7 @@ Script_checkevent: ; 979a4
ld a, c ld a, c
and a and a
jr z, .false jr z, .false
ld a, 1 ld a, TRUE
.false .false
ld [ScriptVar], a ld [ScriptVar], a
ret ret
@ -2743,7 +2743,7 @@ Script_setflag: ; 979bb
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, 1 ; set ld b, SET_FLAG
call _EngineFlagAction call _EngineFlagAction
ret ret
; 979c9 ; 979c9
@ -2757,7 +2757,7 @@ Script_clearflag: ; 979c9
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, 0 ; clear ld b, RESET_FLAG
call _EngineFlagAction call _EngineFlagAction
ret ret
; 979d7 ; 979d7
@ -2776,7 +2776,7 @@ Script_checkflag: ; 979d7
ld a, c ld a, c
and a and a
jr z, .false jr z, .false
ld a, 1 ld a, TRUE
.false .false
ld [ScriptVar], a ld [ScriptVar], a
ret ret
@ -3053,15 +3053,15 @@ Script_loadbytec2cf: ; 97b27
; 97b2e ; 97b2e
LoadMoveSpritesScript: ; 97b2e CloseTextScript: ; 97b2e
loadmovesprites closetext
; 97b2f ; 97b2f
Script_loadmovesprites: ; 97b2f Script_closetext: ; 97b2f
; script command 0x49 ; script command 0x49
call Function2e20 call Function2e20
call LoadMoveSprites call CloseText
ret ret
; 97b36 ; 97b36

12
engine/selectmenu.asm
View File

@ -9,8 +9,8 @@ SelectMenu:: ; 13327
ld b, BANK(ItemMayBeRegisteredText) ld b, BANK(ItemMayBeRegisteredText)
ld hl, ItemMayBeRegisteredText ld hl, ItemMayBeRegisteredText
call MapTextbox call MapTextbox
call CloseText call WaitButton
jp LoadMoveSprites jp CloseText
; 13340 ; 13340
@ -141,7 +141,7 @@ UseRegisteredItem: ; 133c3
.NoFunction ; 133df .NoFunction ; 133df
call LoadFont call LoadFont
call CantUseItem call CantUseItem
call LoadMoveSprites call CloseText
and a and a
ret ret
; 133ea ; 133ea
@ -149,7 +149,7 @@ UseRegisteredItem: ; 133c3
.Current ; 133ea .Current ; 133ea
call LoadFont call LoadFont
call DoItemEffect call DoItemEffect
call LoadMoveSprites call CloseText
and a and a
ret ret
; 133f5 ; 133f5
@ -159,7 +159,7 @@ UseRegisteredItem: ; 133c3
call FadeToMenu call FadeToMenu
call DoItemEffect call DoItemEffect
call ReturnToCallingMenu call ReturnToCallingMenu
call LoadMoveSprites call CloseText
and a and a
ret ret
; 13406 ; 13406
@ -185,7 +185,7 @@ UseRegisteredItem: ; 133c3
._cantuse ._cantuse
call CantUseItem call CantUseItem
call LoadMoveSprites call CloseText
and a and a
ret ret
; 1342d ; 1342d

10
engine/startmenu.asm
View File

@ -61,8 +61,8 @@ endr
.MenuReturns .MenuReturns
dw .Reopen dw .Reopen
dw .Exit dw .Exit
dw .ExitMenuCallFuncLoadMoveSprites dw .ExitMenuCallFuncCloseText
dw .ExitMenuRunScriptLoadMoveSprites dw .ExitMenuRunScriptCloseText
dw .ExitMenuRunScript dw .ExitMenuRunScript
dw .ReturnEnd dw .ReturnEnd
dw .ReturnRedraw dw .ReturnRedraw
@ -78,7 +78,7 @@ endr
.ReturnEnd .ReturnEnd
call ExitMenu call ExitMenu
.ReturnEnd2 .ReturnEnd2
call LoadMoveSprites call CloseText
call UpdateTimePals call UpdateTimePals
ret ret
@ -115,14 +115,14 @@ endr
ret ret
; 12699 ; 12699
.ExitMenuRunScriptLoadMoveSprites ; 12699 .ExitMenuRunScriptCloseText ; 12699
call ExitMenu call ExitMenu
ld a, HMENURETURN_SCRIPT ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a ld [hMenuReturn], a
jr .ReturnEnd2 jr .ReturnEnd2
; 126a2 ; 126a2
.ExitMenuCallFuncLoadMoveSprites ; 126a2 .ExitMenuCallFuncCloseText ; 126a2
call ExitMenu call ExitMenu
ld hl, wQueuedScriptAddr ld hl, wQueuedScriptAddr
ld a, [hli] ld a, [hli]

320
engine/std_scripts.asm
View File

File diff suppressed because it is too large Load Diff

4
engine/timeset.asm
View File

@ -6,7 +6,7 @@ InitClock: ; 90672 (24:4672)
ld [hInMenu], a ld [hInMenu], a
ld a, $0 ld a, $0
ld [wc2ce], a ld [wSpriteUpdatesEnabled], a
ld a, $10 ld a, $10
ld [MusicFade], a ld [MusicFade], a
ld a, MUSIC_NONE % $100 ld a, MUSIC_NONE % $100
@ -436,7 +436,7 @@ Special_SetDayOfWeek: ; 90913
ld [hl], $f5 ld [hl], $f5
hlcoord 10, 5 hlcoord 10, 5
call Function909de call Function909de
call Function321c call ApplyTilemap
ld c, 10 ld c, 10
call DelayFrames call DelayFrames
.asm_9096a .asm_9096a

2
event/basement_key.asm
View File

@ -29,6 +29,6 @@ _BasementKey: ; 507b4
; 507e1 ; 507e1
.BasementKeyScript: ; 0x507e1 .BasementKeyScript: ; 0x507e1
loadmovesprites closetext
farjump BasementDoorScript farjump BasementDoorScript
; 0x507e6 ; 0x507e6

2
event/card_key.asm
View File

@ -34,6 +34,6 @@ _CardKey: ; 50779
; 507af ; 507af
.CardKeyScript: ; 0x507af .CardKeyScript: ; 0x507af
loadmovesprites closetext
farjump MapRadioTower3FSignpost2Script farjump MapRadioTower3FSignpost2Script
; 0x507b4 ; 0x507b4

Some files were not shown because too many files have changed in this diff Show More