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

Remove even more address comments

Browse Source 
That should be all of them this time
This commit is contained in:
mid-kid
2018-06-25 02:10:37 +02:00
parent 0cbe04da44
commit 5efce10789
698 changed files with 2243 additions and 4185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
engine/events/std_scripts.asm
View File

@@ -216,7 +216,7 @@ Radio2Script:
closetext
end
TrashCanScript: ; 0xbc1a5
TrashCanScript:
farjumptext TrashCanText
PCScript:
@@ -335,9 +335,8 @@ BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText
buttonsound
jump BugContestResults_FinishUp
; 0xbc2b1
BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText
buttonsound
@@ -381,9 +380,8 @@ BugContestResults_CleanUp:
setflag ENGINE_DAILY_BUG_CONTEST
special PlayMapMusic
end
; 0xbc31e
BugContestResults_FirstPlace: ; 0xbc31e
BugContestResults_FirstPlace:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
@@ -391,55 +389,48 @@ BugContestResults_FirstPlace: ; 0xbc31e
verbosegiveitem SUN_STONE
iffalse BugContestResults_NoRoomForSunStone
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc332
BugContestResults_SecondPlace: ; 0xbc332
BugContestResults_SecondPlace:
itemtotext EVERSTONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem EVERSTONE
iffalse BugContestResults_NoRoomForEverstone
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc343
BugContestResults_ThirdPlace: ; 0xbc343
BugContestResults_ThirdPlace:
itemtotext GOLD_BERRY, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem GOLD_BERRY
iffalse BugContestResults_NoRoomForGoldBerry
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc354
BugContestResults_NoRoomForSunStone: ; 0xbc354
BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc35f
BugContestResults_NoRoomForEverstone: ; 0xbc35f
BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc36a
BugContestResults_NoRoomForGoldBerry: ; 0xbc36a
BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc375
BugContestResults_NoRoomForBerry: ; 0xbc375
BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
jump BugContestResults_DidNotWin
; 0xbc380
BugContestResults_CopyContestantsToResults: ; 0xbc380
BugContestResults_CopyContestantsToResults:
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -1489,7 +1480,7 @@ RegisteredNumberFScript:
buttonsound
end
NumberAcceptedFScript: ; 0xbcbd3
NumberAcceptedFScript:
checkcode VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
@@ -1777,23 +1768,21 @@ GymStatue2Script:
closetext
end
ReceiveItemScript: ; 0xbcdb9
ReceiveItemScript:
waitsfx
farwritetext ReceivedItemText
playsound SFX_ITEM
waitsfx
end
; 0xbcdc3
ReceiveTogepiEggScript: ; 0xbcdc3
ReceiveTogepiEggScript:
waitsfx
farwritetext ReceivedItemText
playsound SFX_GET_EGG_FROM_DAY_CARE_LADY
waitsfx
end
; 0xbcdcd
GameCornerCoinVendorScript: ; 0xbcdcd
GameCornerCoinVendorScript:
faceplayer
opentext
farwritetext CoinVendor_WelcomeText
@@ -1804,12 +1793,11 @@ GameCornerCoinVendorScript: ; 0xbcdcd
waitbutton
closetext
end
; 0xbcde0
CoinVendor_IntroScript: ; 0xbcde0
CoinVendor_IntroScript:
farwritetext CoinVendor_IntroText
.loop ; 0xbcde4
.loop
special DisplayMoneyAndCoinBalance
loadmenu .MenuHeader
verticalmenu
@@ -1817,9 +1805,8 @@ CoinVendor_IntroScript: ; 0xbcde0
ifequal 1, .Buy50
ifequal 2, .Buy500
jump .Cancel
; 0xbcdf7
.Buy50: ; 0xbcdf7
.Buy50:
checkcoins MAX_COINS - 50
ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 1000
@@ -1831,9 +1818,8 @@ CoinVendor_IntroScript: ; 0xbcde0
farwritetext CoinVendor_Buy50CoinsText
waitbutton
jump .loop
; 0xbce1b
.Buy500: ; 0xbce1b
.Buy500:
checkcoins MAX_COINS - 500
ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 10000
@@ -1845,28 +1831,24 @@ CoinVendor_IntroScript: ; 0xbcde0
farwritetext CoinVendor_Buy500CoinsText
waitbutton
jump .loop
; 0xbce3f
.NotEnoughMoney: ; 0xbce3f
.NotEnoughMoney:
farwritetext CoinVendor_NotEnoughMoneyText
waitbutton
closetext
end
; 0xbce46
.CoinCaseFull: ; 0xbce46
.CoinCaseFull:
farwritetext CoinVendor_CoinCaseFullText
waitbutton
closetext
end
; 0xbce4d
.Cancel: ; 0xbce4d
.Cancel:
farwritetext CoinVendor_CancelText
waitbutton
closetext
end
; 0xbce54
.MenuHeader:
@@ -1881,7 +1863,6 @@ CoinVendor_IntroScript: ; 0xbcde0
db " 50 : ¥1000@"
db "500 : ¥10000@"
db "CANCEL@"
; 0xbce7f
HappinessCheckScript: