dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Add STR_VAR_# ids to string buffer macros

Browse Source
This commit is contained in:
GriffinR
2021-11-17 22:00:44 -05:00
parent c940b67716
commit c4f8f4d11a
39 changed files with 186 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/scripts/berry_tree.inc
View File

@@ -92,20 +92,20 @@ BerryTree_EventScript_GetCareAdverb::
goto_if_eq BerryTree_EventScript_SetAdverbPoor
compare VAR_0x8005, 4
goto_if_eq BerryTree_EventScript_SetAdverbGreat
bufferstring 1, BerryTree_Text_CareAdverbGood
bufferstring STR_VAR_2, BerryTree_Text_CareAdverbGood
return
BerryTree_EventScript_SetAdverbGreat::
bufferstring 1, BerryTree_Text_CareAdverbGreat
bufferstring STR_VAR_2, BerryTree_Text_CareAdverbGreat
return
BerryTree_EventScript_SetAdverbPoor::
bufferstring 1, BerryTree_Text_CareAdverbPoor
bufferstring STR_VAR_2, BerryTree_Text_CareAdverbPoor
return
@ VAR_0x8006 here is the number of berries
BerryTree_EventScript_CheckBerryFullyGrown::
buffernumberstring 1, VAR_0x8006
buffernumberstring STR_VAR_2, VAR_0x8006
lock
faceplayer
special ObjectEventInteractionGetBerryCountString

2
data/scripts/cable_club.inc
View File

@@ -827,7 +827,7 @@ EventScript_RecordCenter_Spot3::
end
RecordCorner_EventScript_ReceivedGiftItem::
bufferitemname 1, VAR_TEMP_1
bufferitemname STR_VAR_2, VAR_TEMP_1
message RecordCorner_Text_PlayerSentOverOneX
waitmessage
waitbuttonpress

8
data/scripts/contest_hall.inc
View File

@@ -283,8 +283,8 @@ ContestHall_EventScript_GetCategoryTough::
return
ContestHall_EventScript_ContestGettingStarted::
buffercontestname 1, VAR_0x8008
bufferstdstring 2, VAR_0x8009
buffercontestname STR_VAR_2, VAR_0x8008
bufferstdstring STR_VAR_3, VAR_0x8009
call ContestHall_EventScript_GettingStarted
lockall
applymovement LOCALID_MC, ContestHall_Movement_MCBackUp
@@ -393,7 +393,7 @@ ContestHall_EventScript_Player4WalkToCenter::
ContestHall_EventScript_ShowContestMonPic::
special BufferContestTrainerAndMonNames
addvar VAR_0x8006, 1
buffernumberstring 1, VAR_0x8006
buffernumberstring STR_VAR_2, VAR_0x8006
lockall
applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
waitmovement 0
@@ -1000,7 +1000,7 @@ ContestHall_EventScript_CongratulateWinner::
special BufferContestWinnerTrainerName
special BufferContestWinnerMonName
addvar VAR_0x8005, 1
buffernumberstring 1, VAR_0x8005
buffernumberstring STR_VAR_2, VAR_0x8005
addvar VAR_0x8005, -1
call ContestHall_EventScript_CongratsWinner
applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp

14
data/scripts/field_move_scripts.inc
View File

@@ -6,8 +6,8 @@ EventScript_CutTree::
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_CUT
bufferpartymonnick STR_VAR_1, VAR_RESULT
buffermovename STR_VAR_2, MOVE_CUT
msgbox Text_WantToCut, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_CancelCut
@@ -67,8 +67,8 @@ EventScript_RockSmash::
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_ROCK_SMASH
bufferpartymonnick STR_VAR_1, VAR_RESULT
buffermovename STR_VAR_2, MOVE_ROCK_SMASH
msgbox Text_WantToSmash, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_CancelSmash
@@ -195,7 +195,7 @@ EventScript_UseWaterfall::
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToWaterfall, MSGBOX_YESNO
compare VAR_RESULT, NO
@@ -230,7 +230,7 @@ EventScript_UseDive::
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_WantToDive, MSGBOX_YESNO
@@ -255,7 +255,7 @@ EventScript_UseDiveUnderwater::
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_WantToSurface, MSGBOX_YESNO

2
data/scripts/gift_stamp_card.inc
View File

@@ -5,7 +5,7 @@ MysteryGiftScript_StampCard::
setorcopyvar VAR_RESULT, GET_NUM_STAMPS
specialvar VAR_0x8009, GetMysteryGiftCardStat
subvar VAR_0x8008, VAR_0x8009
buffernumberstring 0, VAR_0x8008
buffernumberstring STR_VAR_1, VAR_0x8008
lock
faceplayer
vmessage sText_MysteryGiftStampCard

26
data/scripts/obtain_item.inc
View File

@@ -8,7 +8,7 @@ Std_ObtainItem::
return
EventScript_ObtainItemMessage::
bufferitemnameplural 1, ITEMID, AMOUNT
bufferitemnameplural STR_VAR_2, ITEMID, AMOUNT
checkitemtype ITEMID
call EventScript_BufferPocketNameAndTryFanfare
compare VAR_0x8007, TRUE
@@ -27,31 +27,31 @@ EventScript_BufferPocketNameAndTryFanfare::
end
EventScript_BufferItemsPocket::
bufferstdstring 2, STDSTRING_ITEMS
bufferstdstring STR_VAR_3, STDSTRING_ITEMS
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferKeyItemsPocket::
bufferstdstring 2, STDSTRING_KEYITEMS
bufferstdstring STR_VAR_3, STDSTRING_KEYITEMS
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferPokeballsPocket::
bufferstdstring 2, STDSTRING_POKEBALLS
bufferstdstring STR_VAR_3, STDSTRING_POKEBALLS
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferTMHMsPocket::
bufferstdstring 2, STDSTRING_TMHMS
bufferstdstring STR_VAR_3, STDSTRING_TMHMS
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedTMHM
return
EventScript_BufferBerriesPocket::
bufferstdstring 2, STDSTRING_BERRIES
bufferstdstring STR_VAR_3, STDSTRING_BERRIES
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
@@ -82,7 +82,7 @@ Std_ObtainDecoration::
return
EventScript_ObtainDecorationMessage::
bufferdecorationname 1, ITEMID
bufferdecorationname STR_VAR_2, ITEMID
compare VAR_0x8007, TRUE
call_if_eq EventScript_ObtainedDecor
compare VAR_0x8007, FALSE
@@ -109,7 +109,7 @@ Std_FindItem::
copyvar VAR_0x8005, AMOUNT
checkitemspace ITEMID, AMOUNT
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, ITEMID, AMOUNT
bufferitemnameplural STR_VAR_2, ITEMID, AMOUNT
checkitemtype ITEMID
call EventScript_BufferPocketNameAndTryFanfare
compare VAR_0x8007, TRUE
@@ -130,7 +130,7 @@ EventScript_PickUpItem::
call_if_eq EventScript_FoundItem
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
bufferitemnameplural STR_VAR_2, VAR_0x8004, VAR_0x8005
pyramid_inchallenge
compare VAR_RESULT, TRUE
goto_if_eq EventScript_PutBattlePyramidItemInBag
@@ -142,7 +142,7 @@ EventScript_PutBattlePyramidItemInBag::
return
EventScript_FoundTMHM::
bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
bufferitemnameplural STR_VAR_1, VAR_0x8004, VAR_0x8005
message gText_PlayerFoundOneTMHM
return
@@ -161,7 +161,7 @@ EventScript_HiddenItemScript::
waitse
additem VAR_0x8005
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8005, 1
bufferitemnameplural STR_VAR_2, VAR_0x8005, 1
checkitemtype VAR_0x8005
call EventScript_BufferPocketNameAndTryFanfare
compare VAR_0x8007, TRUE
@@ -181,7 +181,7 @@ EventScript_PickUpHiddenItem::
end
EventScript_FoundHiddenTMHM::
bufferitemnameplural 0, VAR_0x8004, 1
bufferitemnameplural STR_VAR_1, VAR_0x8004, 1
message gText_PlayerFoundOneTMHM
goto EventScript_PutHiddenItemInPocket
end
@@ -194,7 +194,7 @@ EventScript_FoundHiddenItem::
EventScript_PutHiddenItemInPocket::
waitmessage
waitfanfare
bufferitemnameplural 1, VAR_0x8004, 1
bufferitemnameplural STR_VAR_2, VAR_0x8004, 1
copyvar VAR_0x8004, VAR_0x8008
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
special TryPutTreasureInvestigatorsOnAir

10
data/scripts/pc_transfer.inc
View File

@@ -14,22 +14,22 @@ Common_EventScript_NameReceivedBoxMon::
return
Common_EventScript_TransferredToPC::
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname 1, VAR_TEMP_1
bufferboxname STR_VAR_1, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname STR_VAR_2, VAR_TEMP_1
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC
call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC
return
EventScript_TransferredSomeonesPC::
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_SomeonesPCBoxFull
msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
return
EventScript_SomeonesPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
bufferboxname STR_VAR_3, VAR_RESULT
msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT
return
@@ -42,7 +42,7 @@ EventScript_TransferredLanettesPC::
EventScript_LanettesPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
bufferboxname STR_VAR_3, VAR_RESULT
msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT
return

8
data/scripts/prof_birch.inc
View File

@@ -73,8 +73,8 @@ ProfBirch_EventScript_RatePokedex::
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen
buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught
buffernumberstring STR_VAR_1, VAR_0x8008 @ Num Hoenn seen
buffernumberstring STR_VAR_2, VAR_0x8009 @ Num Hoenn caught
msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
call ProfBirch_EventScript_ShowRatingMessage
compare VAR_0x800A, 0
@@ -83,7 +83,7 @@ ProfBirch_EventScript_RatePokedex::
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
buffernumberstring 0, VAR_0x8008 @ Num National seen
buffernumberstring 1, VAR_0x8009 @ Num National caught
buffernumberstring STR_VAR_1, VAR_0x8008 @ Num National seen
buffernumberstring STR_VAR_2, VAR_0x8009 @ Num National caught
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return

12
data/scripts/secret_base.inc
View File

@@ -31,7 +31,7 @@ SecretBase_EventScript_CheckEntrance::
goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase
checkpartymove MOVE_SECRET_POWER
setfieldeffectargument 0, VAR_RESULT
buffermovename 1, MOVE_SECRET_POWER
buffermovename STR_VAR_2, MOVE_SECRET_POWER
compare VAR_0x8007, SECRET_BASE_RED_CAVE
goto_if_eq SecretBase_EventScript_Cave
compare VAR_0x8007, SECRET_BASE_BROWN_CAVE
@@ -50,7 +50,7 @@ SecretBase_EventScript_Cave::
lockall
compare VAR_RESULT, PARTY_SIZE
goto_if_eq SecretBase_EventScript_CaveNoSecretPower
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance
@@ -82,7 +82,7 @@ SecretBase_EventScript_Tree::
lockall
compare VAR_RESULT, PARTY_SIZE
goto_if_eq SecretBase_EventScript_TreeNoSecretPower
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance
@@ -114,7 +114,7 @@ SecretBase_EventScript_Shrub::
lockall
compare VAR_RESULT, PARTY_SIZE
goto_if_eq SecretBase_EventScript_ShrubNoSecretPower
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance
@@ -221,8 +221,8 @@ SecretBase_EventScript_AlreadyHasSecretBase::
msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance
bufferpartymonnick 0, VAR_0x8004
buffermovename 1, MOVE_SECRET_POWER
bufferpartymonnick STR_VAR_1, VAR_0x8004
buffermovename STR_VAR_2, MOVE_SECRET_POWER
msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT
closemessage
closemessage

2
data/scripts/surf.inc
View File

@@ -2,7 +2,7 @@ EventScript_UseSurf::
checkpartymove MOVE_SURF
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_EndUseSurf
bufferpartymonnick 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
lockall
msgbox gText_WantToUseSurf, MSGBOX_YESNO

6
data/scripts/trainer_script.inc
View File

@@ -1,6 +1,6 @@
Std_RegisteredInMatchCall::
buffertrainerclassname 0, VAR_0x8000
buffertrainername 1, VAR_0x8000
buffertrainerclassname STR_VAR_1, VAR_0x8000
buffertrainername STR_VAR_2, VAR_0x8000
closemessage
delay 30
playfanfare MUS_REGISTER_MATCH_CALL
@@ -12,7 +12,7 @@ Std_RegisteredInMatchCall::
EventScript_TryGetTrainerScript::
special ShouldTryGetTrainerScript
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_GotoTrainerScript
releaseall
end