Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more constants in scripts

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-12 01:40:20 -05:00
parent b23085f526
commit d83aefb30a
120 changed files with 828 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
engine/events/std_scripts.asm
View File

@@ -113,7 +113,7 @@ PokecenterNurseScript:
pause 10
special HealParty
playmusic MUSIC_NONE
writebyte 0 ; Machine is at a Pokemon Center
writebyte HEALMACHINE_POKECENTER
special HealMachineAnim
pause 30
special RestartMapMusic
@@ -251,25 +251,25 @@ DayToTextScript:
if_equal THURSDAY, .Thursday
if_equal FRIDAY, .Friday
if_equal SATURDAY, .Saturday
stringtotext .SundayText, 0
stringtotext .SundayText, MEM_BUFFER_0
end
.Monday:
stringtotext .MondayText, 0
stringtotext .MondayText, MEM_BUFFER_0
end
.Tuesday:
stringtotext .TuesdayText, 0
stringtotext .TuesdayText, MEM_BUFFER_0
end
.Wednesday:
stringtotext .WednesdayText, 0
stringtotext .WednesdayText, MEM_BUFFER_0
end
.Thursday:
stringtotext .ThursdayText, 0
stringtotext .ThursdayText, MEM_BUFFER_0
end
.Friday:
stringtotext .FridayText, 0
stringtotext .FridayText, MEM_BUFFER_0
end
.Saturday:
stringtotext .SaturdayText, 0
stringtotext .SaturdayText, MEM_BUFFER_0
end
.SundayText:
db "SUNDAY@"
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, $1
setmapscene MAHOGANY_TOWN, 1
end
BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
warp ROUTE_36_NATIONAL_PARK_GATE, 0, 4
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
@@ -321,7 +321,7 @@ BugContestResultsScript:
farwritetext ContestResults_ReadyToJudgeText
waitbutton
special BugContestJudging
RAM2MEM $0
vartomem MEM_BUFFER_0
if_equal 1, BugContestResults_FirstPlace
if_equal 2, BugContestResults_SecondPlace
if_equal 3, BugContestResults_ThirdPlace
@@ -349,14 +349,15 @@ BugContestResults_FinishUp
special ContestReturnMons
BugContestResults_DidNotLeaveMons
special CheckPartyFullAfterContest
if_equal $0, BugContestResults_CleanUp
if_equal $2, BugContestResults_CleanUp
if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
; BUGCONTEST_BOXED_MON
farwritetext ContestResults_PartyFullText
waitbutton
BugContestResults_CleanUp
closetext
setscene $0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0
setscene 0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@@ -384,7 +385,7 @@ BugContestResults_CleanUp
BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_GAVE_KURT_APRICORNS
itemtotext SUN_STONE, $1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem SUN_STONE
@@ -393,7 +394,7 @@ BugContestResults_FirstPlace ; 0xbc31e
; 0xbc332
BugContestResults_SecondPlace ; 0xbc332
itemtotext EVERSTONE, $1
itemtotext EVERSTONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem EVERSTONE
@@ -402,7 +403,7 @@ BugContestResults_SecondPlace ; 0xbc332
; 0xbc343
BugContestResults_ThirdPlace ; 0xbc343
itemtotext GOLD_BERRY, $1
itemtotext GOLD_BERRY, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem GOLD_BERRY
@@ -1759,7 +1760,7 @@ RematchGiftFScript:
end
GymStatue1Script:
mapnametotext $0
mapnametotext MEM_BUFFER_0
opentext
farwritetext GymStatue_CityGymText
waitbutton
@@ -1767,7 +1768,7 @@ GymStatue1Script:
end
GymStatue2Script:
mapnametotext $0
mapnametotext MEM_BUFFER_0
opentext
farwritetext GymStatue_CityGymText
buttonsound
@@ -1813,18 +1814,18 @@ CoinVendor_IntroScript: ; 0xbcde0
loadmenudata .MenuDataHeader
verticalmenu
closewindow
if_equal $1, .Buy50
if_equal $2, .Buy500
if_equal 1, .Buy50
if_equal 2, .Buy500
jump .Cancel
; 0xbcdf7
.Buy50: ; 0xbcdf7
checkcoins MAX_COINS - 50
if_equal $0, .CoinCaseFull
checkmoney $0, 1000
if_equal $2, .NotEnoughMoney
if_equal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 1000
if_equal HAVE_LESS, .NotEnoughMoney
givecoins 50
takemoney $0, 1000
takemoney YOUR_MONEY, 1000
waitsfx
playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy50CoinsText
@@ -1834,11 +1835,11 @@ CoinVendor_IntroScript: ; 0xbcde0
.Buy500: ; 0xbce1b
checkcoins MAX_COINS - 500
if_equal $0, .CoinCaseFull
checkmoney $0, 10000
if_equal $2, .NotEnoughMoney
if_equal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 10000
if_equal HAVE_LESS, .NotEnoughMoney
givecoins 500
takemoney $0, 10000
takemoney YOUR_MONEY, 10000
waitsfx
playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy500CoinsText