summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s50
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc16
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/scripts.inc8
-rw-r--r--data/maps/BattleFrontier_Lounge2/scripts.inc20
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc6
-rw-r--r--data/scripts/cable_club.inc16
-rw-r--r--data/scripts/contest_hall.inc18
7 files changed, 68 insertions, 66 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 6bd631b99..3f3e60dce 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -10,12 +10,14 @@
#include "constants/field_specials.h"
#include "constants/flags.h"
#include "constants/decorations.h"
+#include "constants/item.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"
#include "constants/map_scripts.h"
#include "constants/maps.h"
#include "constants/moves.h"
+#include "constants/script_menu.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
@@ -1394,50 +1396,50 @@ Std_ObtainItem:: @ 8271AD3
EventScript_271AE3:: @ 8271AE3
bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
checkitemtype VAR_0x8000
- call EventScript_271B08
+ call EventScript_BufferStdString
compare VAR_0x8007, 1
call_if_eq EventScript_271B95
compare VAR_0x8007, 0
call_if_eq EventScript_271BA9
return
-EventScript_271B08:: @ 8271B08
+EventScript_BufferStdString:: @ 8271B08
switch VAR_RESULT
- case 1, EventScript_271B45
- case 5, EventScript_271B55
- case 2, EventScript_271B65
- case 3, EventScript_271B75
- case 4, EventScript_271B85
+ case POCKET_ITEMS, EventScript_StdStringItem
+ case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems
+ case POCKET_POKE_BALLS, EventScript_StdStringPokeballs
+ case POCKET_TM_HM, EventScript_StdStringTMHMS
+ case POCKET_BERRIES, EventScript_StdStringBerries
end
-EventScript_271B45:: @ 8271B45
- bufferstdstring 2, 14
+EventScript_StdStringItem:: @ 8271B45
+ bufferstdstring 2, STDSTRING_ITEMS
compare VAR_0x8007, 1
- call_if_eq EventScript_271BAF
+ call_if_eq EventScript_PlayFanfare4
return
-EventScript_271B55:: @ 8271B55
- bufferstdstring 2, 15
+EventScript_StdStringKeyItems:: @ 8271B55
+ bufferstdstring 2, STDSTRING_KEYITEMS
compare VAR_0x8007, 1
- call_if_eq EventScript_271BAF
+ call_if_eq EventScript_PlayFanfare4
return
-EventScript_271B65:: @ 8271B65
- bufferstdstring 2, 16
+EventScript_StdStringPokeballs:: @ 8271B65
+ bufferstdstring 2, STDSTRING_POKEBALLS
compare VAR_0x8007, 1
- call_if_eq EventScript_271BAF
+ call_if_eq EventScript_PlayFanfare4
return
-EventScript_271B75:: @ 8271B75
- bufferstdstring 2, 17
+EventScript_StdStringTMHMS:: @ 8271B75
+ bufferstdstring 2, STDSTRING_TMHMS
compare VAR_0x8007, 1
call_if_eq EventScript_271BB3
return
-EventScript_271B85:: @ 8271B85
- bufferstdstring 2, 18
+EventScript_StdStringBerries:: @ 8271B85
+ bufferstdstring 2, STDSTRING_BERRIES
compare VAR_0x8007, 1
- call_if_eq EventScript_271BAF
+ call_if_eq EventScript_PlayFanfare4
return
EventScript_271B95:: @ 8271B95
@@ -1451,7 +1453,7 @@ EventScript_271BA9:: @ 8271BA9
setvar VAR_RESULT, 0
return
-EventScript_271BAF:: @ 8271BAF
+EventScript_PlayFanfare4:: @ 8271BAF
playfanfare MUS_FANFA4
return
@@ -1495,7 +1497,7 @@ Std_FindItem:: @ 8271BFD
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
checkitemtype VAR_0x8000
- call EventScript_271B08
+ call EventScript_BufferStdString
compare VAR_0x8007, 1
call_if_eq EventScript_PickItemUp
compare VAR_0x8007, 0
@@ -1548,7 +1550,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8005, 1
checkitemtype VAR_0x8005
- call EventScript_271B08
+ call EventScript_BufferStdString
compare VAR_0x8007, 1
goto_if_eq EventScript_271CE8
compare VAR_0x8007, 0
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index ecd7ac78a..22208b41b 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -179,7 +179,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
multichoice 20, 6, 104, 1
@@ -187,7 +187,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
@@ -196,7 +196,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
@@ -207,7 +207,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
@@ -216,7 +216,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
closemessage
@@ -355,7 +355,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
@@ -363,7 +363,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
@@ -384,7 +384,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
multichoicedefault 20, 8, 94, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
- case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+ case MULTICHOICE_B, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
setflag FLAG_TEMP_2
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 0b17e4b6a..ae33c88b7 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -816,19 +816,19 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
return
BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
- bufferstdstring 0, 19
+ bufferstdstring 0, STDSTRING_SINGLE
return
BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9
- bufferstdstring 0, 20
+ bufferstdstring 0, STDSTRING_DOUBLE
return
BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE
- bufferstdstring 0, 21
+ bufferstdstring 0, STDSTRING_MULTI
return
BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
- bufferstdstring 0, 22
+ bufferstdstring 0, STDSTRING_MULTI_LINK
return
BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index bc4880dd3..02dd09a52 100644
--- a/data/maps/BattleFrontier_Lounge2/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
@@ -55,43 +55,43 @@ BattleFrontier_Lounge2_EventScript_260701:: @ 8260701
return
BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A
- bufferstdstring 0, 19
+ bufferstdstring 0, STDSTRING_SINGLE
return
BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F
- bufferstdstring 0, 20
+ bufferstdstring 0, STDSTRING_DOUBLE
return
BattleFrontier_Lounge2_EventScript_260714:: @ 8260714
- bufferstdstring 0, 21
+ bufferstdstring 0, STDSTRING_MULTI
return
BattleFrontier_Lounge2_EventScript_260719:: @ 8260719
- bufferstdstring 0, 22
+ bufferstdstring 0, STDSTRING_MULTI_LINK
return
BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E
- bufferstdstring 0, 24
+ bufferstdstring 0, STDSTRING_BATTLE_DOME
return
BattleFrontier_Lounge2_EventScript_260723:: @ 8260723
- bufferstdstring 0, 25
+ bufferstdstring 0, STDSTRING_BATTLE_FACTORY
return
BattleFrontier_Lounge2_EventScript_260728:: @ 8260728
- bufferstdstring 0, 26
+ bufferstdstring 0, STDSTRING_BATTLE_PALACE
return
BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D
- bufferstdstring 0, 27
+ bufferstdstring 0, STDSTRING_BATTLE_ARENA
return
BattleFrontier_Lounge2_EventScript_260732:: @ 8260732
- bufferstdstring 0, 28
+ bufferstdstring 0, STDSTRING_BATTLE_PIKE
return
BattleFrontier_Lounge2_EventScript_260737:: @ 8260737
- bufferstdstring 0, 29
+ bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
return
BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index d7d7a769c..b124f51d7 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -149,7 +149,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
- bufferstdstring 2, 14
+ bufferstdstring 2, STDSTRING_ITEMS
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
@@ -161,7 +161,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
- bufferstdstring 2, 14
+ bufferstdstring 2, STDSTRING_ITEMS
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
@@ -173,7 +173,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
- bufferstdstring 2, 14
+ bufferstdstring 2, STDSTRING_ITEMS
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
end
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 76988dfeb..7e431382c 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1626,15 +1626,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
.string "Which of our services do you wish\n"
.string "to use?$"
-OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
+CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
.string "Trade POKéMON with another player\n"
.string "using a GBA Game Link cable.$"
-OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
+CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
.string "You may battle another TRAINER\n"
.string "using a GBA Game Link cable.$"
-OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
+CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
.string "You can use the RECORD CORNER with\n"
.string "others using a GBA Game Link cable.$"
@@ -1804,19 +1804,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
.string "Please wait.$"
-OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
+CableClub_Text_YouMayTradeHere:: @ 827879F
.string "You may trade your POKéMON here\n"
.string "with another TRAINER.$"
-OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
+CableClub_Text_YouMayBattleHere:: @ 82787D5
.string "You may battle with your friends\n"
.string "here.$"
-OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
+CableClub_Text_CanMakeBerryPowder:: @ 82787FC
.string "Two to five TRAINERS can make\n"
.string "BERRY POWDER together.$"
-OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
+CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
@@ -1824,7 +1824,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
-OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
+CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 0aa0f31c8..80420541e 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -216,19 +216,19 @@ LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
return
LinkContestRoom1_EventScript_27A024:: @ 827A024
- setvar VAR_0x8009, 5
+ setvar VAR_0x8009, STDSTRING_NORMAL
return
LinkContestRoom1_EventScript_27A02A:: @ 827A02A
- setvar VAR_0x8009, 6
+ setvar VAR_0x8009, STDSTRING_SUPER
return
LinkContestRoom1_EventScript_27A030:: @ 827A030
- setvar VAR_0x8009, 7
+ setvar VAR_0x8009, STDSTRING_HYPER
return
LinkContestRoom1_EventScript_27A036:: @ 827A036
- setvar VAR_0x8009, 8
+ setvar VAR_0x8009, STDSTRING_MASTER
return
LinkContestRoom1_EventScript_27A03C:: @ 827A03C
@@ -241,23 +241,23 @@ LinkContestRoom1_EventScript_27A03C:: @ 827A03C
return
LinkContestRoom1_EventScript_27A079:: @ 827A079
- setvar VAR_0x8008, 0
+ setvar VAR_0x8008, CONTEST_CATEGORY_COOL
return
LinkContestRoom1_EventScript_27A07F:: @ 827A07F
- setvar VAR_0x8008, 1
+ setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
return
LinkContestRoom1_EventScript_27A085:: @ 827A085
- setvar VAR_0x8008, 2
+ setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
return
LinkContestRoom1_EventScript_27A08B:: @ 827A08B
- setvar VAR_0x8008, 3
+ setvar VAR_0x8008, CONTEST_CATEGORY_SMART
return
LinkContestRoom1_EventScript_27A091:: @ 827A091
- setvar VAR_0x8008, 4
+ setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
return
LinkContestRoom1_EventScript_27A097:: @ 827A097
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:32:40 +0000