diff options
Diffstat (limited to 'data')
31 files changed, 228 insertions, 228 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 01120b194..fddae04a9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1062,86 +1062,86 @@ Std_6:: return Event_ResetBerryTrees: @ 19F940 - event_8a 2, 7, 5 - event_8a 1, 3, 5 - event_8a 11, 7, 5 - event_8a 13, 3, 5 - event_8a 4, 7, 5 - event_8a 76, 1, 5 - event_8a 8, 1, 5 - event_8a 10, 6, 5 - event_8a 25, 20, 5 - event_8a 26, 2, 5 - event_8a 66, 2, 5 - event_8a 67, 20, 5 - event_8a 69, 22, 5 - event_8a 70, 22, 5 - event_8a 71, 22, 5 - event_8a 55, 17, 5 - event_8a 56, 17, 5 - event_8a 5, 1, 5 - event_8a 6, 6, 5 - event_8a 7, 1, 5 - event_8a 16, 18, 5 - event_8a 17, 18, 5 - event_8a 18, 18, 5 - event_8a 29, 19, 5 - event_8a 28, 19, 5 - event_8a 27, 19, 5 - event_8a 24, 4, 5 - event_8a 23, 3, 5 - event_8a 22, 3, 5 - event_8a 21, 4, 5 - event_8a 19, 16, 5 - event_8a 20, 16, 5 - event_8a 80, 7, 5 - event_8a 81, 7, 5 - event_8a 77, 8, 5 - event_8a 78, 8, 5 - event_8a 68, 8, 5 - event_8a 31, 10, 5 - event_8a 33, 10, 5 - event_8a 34, 21, 5 - event_8a 35, 21, 5 - event_8a 36, 21, 5 - event_8a 83, 24, 5 - event_8a 84, 24, 5 - event_8a 85, 10, 5 - event_8a 86, 6, 5 - event_8a 37, 5, 5 - event_8a 38, 5, 5 - event_8a 39, 5, 5 - event_8a 40, 3, 5 - event_8a 41, 3, 5 - event_8a 42, 3, 5 - event_8a 46, 19, 5 - event_8a 45, 20, 5 - event_8a 44, 18, 5 - event_8a 43, 16, 5 - event_8a 47, 8, 5 - event_8a 48, 5, 5 - event_8a 49, 4, 5 - event_8a 50, 2, 5 - event_8a 52, 18, 5 - event_8a 53, 18, 5 - event_8a 62, 6, 5 - event_8a 64, 6, 5 - event_8a 58, 21, 5 - event_8a 59, 21, 5 - event_8a 60, 25, 5 - event_8a 61, 25, 5 - event_8a 79, 23, 5 - event_8a 14, 23, 5 - event_8a 15, 21, 5 - event_8a 30, 21, 5 - event_8a 65, 25, 5 - event_8a 72, 25, 5 - event_8a 73, 23, 5 - event_8a 74, 23, 5 - event_8a 87, 3, 5 - event_8a 88, 10, 5 - event_8a 89, 4, 5 - event_8a 82, 36, 5 + plantberrytree 2, 7, 5 + plantberrytree 1, 3, 5 + plantberrytree 11, 7, 5 + plantberrytree 13, 3, 5 + plantberrytree 4, 7, 5 + plantberrytree 76, 1, 5 + plantberrytree 8, 1, 5 + plantberrytree 10, 6, 5 + plantberrytree 25, 20, 5 + plantberrytree 26, 2, 5 + plantberrytree 66, 2, 5 + plantberrytree 67, 20, 5 + plantberrytree 69, 22, 5 + plantberrytree 70, 22, 5 + plantberrytree 71, 22, 5 + plantberrytree 55, 17, 5 + plantberrytree 56, 17, 5 + plantberrytree 5, 1, 5 + plantberrytree 6, 6, 5 + plantberrytree 7, 1, 5 + plantberrytree 16, 18, 5 + plantberrytree 17, 18, 5 + plantberrytree 18, 18, 5 + plantberrytree 29, 19, 5 + plantberrytree 28, 19, 5 + plantberrytree 27, 19, 5 + plantberrytree 24, 4, 5 + plantberrytree 23, 3, 5 + plantberrytree 22, 3, 5 + plantberrytree 21, 4, 5 + plantberrytree 19, 16, 5 + plantberrytree 20, 16, 5 + plantberrytree 80, 7, 5 + plantberrytree 81, 7, 5 + plantberrytree 77, 8, 5 + plantberrytree 78, 8, 5 + plantberrytree 68, 8, 5 + plantberrytree 31, 10, 5 + plantberrytree 33, 10, 5 + plantberrytree 34, 21, 5 + plantberrytree 35, 21, 5 + plantberrytree 36, 21, 5 + plantberrytree 83, 24, 5 + plantberrytree 84, 24, 5 + plantberrytree 85, 10, 5 + plantberrytree 86, 6, 5 + plantberrytree 37, 5, 5 + plantberrytree 38, 5, 5 + plantberrytree 39, 5, 5 + plantberrytree 40, 3, 5 + plantberrytree 41, 3, 5 + plantberrytree 42, 3, 5 + plantberrytree 46, 19, 5 + plantberrytree 45, 20, 5 + plantberrytree 44, 18, 5 + plantberrytree 43, 16, 5 + plantberrytree 47, 8, 5 + plantberrytree 48, 5, 5 + plantberrytree 49, 4, 5 + plantberrytree 50, 2, 5 + plantberrytree 52, 18, 5 + plantberrytree 53, 18, 5 + plantberrytree 62, 6, 5 + plantberrytree 64, 6, 5 + plantberrytree 58, 21, 5 + plantberrytree 59, 21, 5 + plantberrytree 60, 25, 5 + plantberrytree 61, 25, 5 + plantberrytree 79, 23, 5 + plantberrytree 14, 23, 5 + plantberrytree 15, 21, 5 + plantberrytree 30, 21, 5 + plantberrytree 65, 25, 5 + plantberrytree 72, 25, 5 + plantberrytree 73, 23, 5 + plantberrytree 74, 23, 5 + plantberrytree 87, 3, 5 + plantberrytree 88, 10, 5 + plantberrytree 89, 4, 5 + plantberrytree 82, 36, 5 return gUnknown_0819FA81:: @ 819FA81 @@ -1495,7 +1495,7 @@ Std_ObtainItem: @ 819FDF7 return Std_ObtainItem_: @ 819FE07 - bufferitem 1, 0x8000 + getitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 @@ -1514,31 +1514,31 @@ GetItem_HandlePocket: end GetItem_HandlePocket_Items: - bufferstd 2, 0xE + getstdstring 2, 0xE compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: - bufferstd 2, 0xF + getstdstring 2, 0xF compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: - bufferstd 2, 0x10 + getstdstring 2, 0x10 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: - bufferstd 2, 0x11 + getstdstring 2, 0x11 compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: - bufferstd 2, 0x12 + getstdstring 2, 0x12 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1570,7 +1570,7 @@ Std_ObtainDecoration: @ 819FEDA return Std_ObtainDecoration_: @ 819FEE8 - bufferdecor 1, 0x8000 + getdecorname 1, 0x8000 compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 @@ -1596,7 +1596,7 @@ Std_FindItem: @ 819FF21 waitse additem 0x8000, 0x8001 copyvar 0x8007, RESULT - bufferitem 1, 0x8000 + getitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 @@ -1625,7 +1625,7 @@ HiddenItemScript:: @ 819FF7B waitse additem 0x8005, 1 copyvar 0x8007, RESULT - bufferitem 0x1, 0x8005 + getitemname 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 @@ -1813,7 +1813,7 @@ UseSurfScript:: @ 81A0117 checkpokemove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 @@ -2208,8 +2208,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT - buffernum 0, 0x8008 - buffernum 1, 0x8009 + getnumberstring 0, 0x8008 + getnumberstring 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 @@ -2218,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 - buffernum 0, 0x8008 - buffernum 1, 0x8009 + getnumberstring 0, 0x8008 + getnumberstring 1, 0x8009 msgbox Route101_Text_1C4B05, 4 return @@ -2536,7 +2536,7 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitem 0, 0x8004 + getitemname 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage @@ -3601,7 +3601,7 @@ gUnknown_081A2C51:: @ 81A2C51 goto_if_eq EventScript_1A2E45 checkpokemove MOVE_SECRET_POWER setanimation 0, RESULT - bufferattack 1, MOVE_SECRET_POWER + getmovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 @@ -3620,7 +3620,7 @@ EventScript_1A2CB0: lockall compare RESULT, 6 goto_if_eq EventScript_1A2CF1 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3651,7 +3651,7 @@ EventScript_1A2D08: lockall compare RESULT, 6 goto_if_eq EventScript_1A2D49 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3682,7 +3682,7 @@ EventScript_1A2D60: lockall compare RESULT, 6 goto_if_eq EventScript_1A2DA1 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3788,8 +3788,8 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartypoke 0, 0x8004 - bufferattack 1, MOVE_SECRET_POWER + getpartypokename 0, 0x8004 + getmovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage @@ -4917,7 +4917,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall - braillemsg Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_1C533D waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 94f6b356c..a3fbce103 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -6,8 +6,8 @@ S_CuttableTree:: @ 81B0DCC compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_CUT + getpartypokename 0, RESULT + getmovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -64,8 +64,8 @@ S_BreakableRock:: @ 81B0EB7 compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_ROCK_SMASH + getpartypokename 0, RESULT + getmovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -193,7 +193,7 @@ S_UseWaterfall:: @ 81B115A checkpokemove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 @@ -226,7 +226,7 @@ UseDiveScript:: @ 81B1220 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 @@ -249,7 +249,7 @@ S_UseDiveUnderwater:: @ 81B1269 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 1262e259a..38a4a8f3f 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -120,25 +120,25 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawpokepic @ 0x75 .4byte ScrCmd_erasepokepic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 - .4byte ScrCmd_braillemsg @ 0x78 + .4byte ScrCmd_braillemessage @ 0x78 .4byte ScrCmd_givepoke @ 0x79 .4byte ScrCmd_giveegg @ 0x7A .4byte ScrCmd_setpokemove @ 0x7B .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_bufferpoke @ 0x7D - .4byte ScrCmd_bufferfirstpoke @ 0x7E - .4byte ScrCmd_bufferpartypoke @ 0x7F - .4byte ScrCmd_bufferitem @ 0x80 - .4byte ScrCmd_bufferdecor @ 0x81 - .4byte ScrCmd_bufferattack @ 0x82 - .4byte ScrCmd_buffernum @ 0x83 - .4byte ScrCmd_bufferstd @ 0x84 - .4byte ScrCmd_buffertext @ 0x85 + .4byte ScrCmd_getspeciesname @ 0x7D + .4byte ScrCmd_getfirstpartypokename @ 0x7E + .4byte ScrCmd_getpartypokename @ 0x7F + .4byte ScrCmd_getitemname @ 0x80 + .4byte ScrCmd_getdecorname @ 0x81 + .4byte ScrCmd_getmovename @ 0x82 + .4byte ScrCmd_getnumberstring @ 0x83 + .4byte ScrCmd_getstdstring @ 0x84 + .4byte ScrCmd_getstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 .4byte ScrCmd_pokemartdecor @ 0x87 .4byte ScrCmd_pokemartbp @ 0x88 - .4byte ScrCmd_pokecasino @ 0x89 - .4byte ScrCmd_event_8a @ 0x8A + .4byte ScrCmd_playslotmachine @ 0x89 + .4byte ScrCmd_plantberrytree @ 0x8A .4byte ScrCmd_choosecontestpkmn @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 79e1de13b..344c2c18a 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB - buffertext 1, Route102_Text_1A17B7 + getstring 1, Route102_Text_1A17B7 return Route102_EventScript_1A15EB:: @ 81A15EB - buffertext 1, Route102_Text_1A179F + getstring 1, Route102_Text_1A179F return Route102_EventScript_1A15F2:: @ 81A15F2 - buffertext 1, Route102_Text_1A17B0 + getstring 1, Route102_Text_1A17B0 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernum 1, 0x8006 + getnumberstring 1, 0x8006 lock faceplayer msgbox Route102_Text_1A17C0, 5 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 33df12c8c..63209e77b 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -719,7 +719,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 end RecordCorner_EventScript_1A446C:: @ 81A446C - bufferitem 1, 0x4001 + getitemname 1, 0x4001 message RecordCorner_Text_1A4E3B waitmessage waitbutton diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 16e5a6282..56499fced 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstd 0, 0x800b + getstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstd 1, 0x8008 - bufferstd 2, 0x8009 + getstdstring 1, 0x8008 + getstdstring 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 addvar 0x8006, 1 - buffernum 1, 0x8006 + getnumberstring 1, 0x8006 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 @@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 addvar 0x8005, 1 - buffernum 1, 0x8005 + getnumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 0e9a82f4c..6f6499b26 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -35,7 +35,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 lockall checkflag 2130 goto_if_eq AncientTomb_EventScript_15F038 - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 555e32d81..5bb74d35b 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecor 1, 0x8008 + getdecorname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 6b8bb5cdb..93cbb8fe8 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -35,7 +35,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 lockall checkflag 2128 goto_if_eq DesertRuins_EventScript_15CB6D - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 3809e1f01..3fb0f7745 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag 155 release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index ed230477c..55bd4103c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -47,7 +47,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 lockall checkflag 2129 goto_if_eq IslandCave_EventScript_15EF72 - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 @@ -60,7 +60,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC checkflag 2129 goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 09f2e88ea..2bd95eace 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - buffernum 1, 32772 + getnumberstring 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 02f5ca3ca..03d64bbd1 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop - bufferitem 0, 0x4000 + getitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -162,8 +162,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -174,8 +174,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 2b39ea557..80fda6d59 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitem 0, 0x8005 + getitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7c6886209..d7aab95a6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - bufferfirstpoke 0 + getfirstpartypokename 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6952ca4e1..0a853b2fc 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - bufferdecor 0, 88 + getdecorname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - bufferdecor 0, 89 + getdecorname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - bufferdecor 0, 90 + getdecorname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,7 +156,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - bufferitem 0, ITEM_TM32 + getitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - bufferitem 0, ITEM_TM29 + getitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - bufferitem 0, ITEM_TM35 + getitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - bufferitem 0, ITEM_TM24 + getitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - bufferitem 0, ITEM_TM13 + getitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -401,7 +401,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -412,7 +412,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -423,7 +423,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -526,7 +526,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -537,7 +537,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -548,7 +548,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -559,7 +559,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -570,7 +570,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -581,7 +581,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -592,7 +592,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -603,7 +603,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -614,7 +614,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -625,7 +625,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -636,7 +636,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -647,7 +647,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 6098cc617..62edffc8b 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index acd499966..260cb4b6e 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - buffernum 0, RESULT + getnumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 6905b31b3..8bf899780 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -84,7 +84,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitfanfare waitmessage givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - bufferpoke 1, SPECIES_BELDUM + getspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index cef40ecd3..f3a198a08 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - buffernum 0, RESULT + getnumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 1edd445fc..28b9dbd80 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag 154 release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 39b484c8a..d0b608339 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - buffernum 0, 32778 + getnumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - buffernum 1, 32778 + getnumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 13 + getdecorname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 6 + getdecorname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 543736e80..7421e94e0 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitem 0, 0x8008 - bufferitem 1, 0x8009 + getitemname 0, 0x8008 + getitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 784ef8087..f40c1b87b 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,7 +88,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_ROOT_FOSSIL + getitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_CLAW_FOSSIL + getitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 @@ -132,7 +132,7 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - bufferpoke 1, SPECIES_LILEEP + getspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 @@ -152,7 +152,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - bufferpoke 1, SPECIES_ANORITH + getspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index a344738a8..b983617e0 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 027c1c363..526ada367 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53C1 + braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbutton erasebox 0, 0, 29, 19 checkflag 228 @@ -41,7 +41,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53F2 + braillemessage SealedChamber_InnerRoom_Braille_1C53F2 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -49,7 +49,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5414 + braillemessage SealedChamber_InnerRoom_Braille_1C5414 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -57,7 +57,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5435 + braillemessage SealedChamber_InnerRoom_Braille_1C5435 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -65,7 +65,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C545C + braillemessage SealedChamber_InnerRoom_Braille_1C545C waitbutton erasebox 0, 0, 29, 19 releaseall @@ -73,7 +73,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5470 + braillemessage SealedChamber_InnerRoom_Braille_1C5470 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -81,7 +81,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall - braillemsg SealedChamber_InnerRoom_Braille_1C549B + braillemessage SealedChamber_InnerRoom_Braille_1C549B waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 638fc2a85..39542559b 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -29,7 +29,7 @@ SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C534F + braillemessage SealedChamber_OuterRoom_Braille_1C534F waitbutton erasebox 0, 0, 29, 19 releaseall @@ -37,7 +37,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5359 + braillemessage SealedChamber_OuterRoom_Braille_1C5359 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -45,7 +45,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5363 + braillemessage SealedChamber_OuterRoom_Braille_1C5363 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -53,7 +53,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C536D + braillemessage SealedChamber_OuterRoom_Braille_1C536D waitbutton erasebox 0, 0, 29, 19 releaseall @@ -61,7 +61,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5377 + braillemessage SealedChamber_OuterRoom_Braille_1C5377 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -69,7 +69,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5381 + braillemessage SealedChamber_OuterRoom_Braille_1C5381 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -77,7 +77,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C538B + braillemessage SealedChamber_OuterRoom_Braille_1C538B waitbutton erasebox 0, 0, 29, 19 releaseall @@ -85,7 +85,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5396 + braillemessage SealedChamber_OuterRoom_Braille_1C5396 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -93,7 +93,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C539E + braillemessage SealedChamber_OuterRoom_Braille_1C539E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -101,7 +101,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53A9 + braillemessage SealedChamber_OuterRoom_Braille_1C53A9 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -111,7 +111,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall checkflag 2127 goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -124,7 +124,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index dcd550549..bea1455a7 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index cd71d8d51..fa66113b1 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag 200 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - bufferfirstpoke 0 + getfirstpartypokename 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1e1b53956..a0fdc5ca4 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - bufferdecor 1, 117 + getdecorname 1, 117 msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index edc8229a7..836ad86e2 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -20,7 +20,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall - braillemsg Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_1C533D waitbutton erasebox 0, 0, 29, 19 releaseall |