summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s68
-rw-r--r--data/io_reg.s10
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/scripts.inc12
-rw-r--r--data/maps/DewfordTown/scripts.inc4
-rw-r--r--data/maps/DoubleBattleColosseum/map.json8
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc8
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc2
-rw-r--r--data/maps/RecordCorner/map.json8
-rw-r--r--data/maps/Route123_BerryMastersHouse/scripts.inc4
-rw-r--r--data/maps/SingleBattleColosseum/map.json4
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc2
-rw-r--r--data/maps/TradeCenter/map.json4
-rw-r--r--data/scripts/apprentice.inc4
-rw-r--r--data/scripts/cable_club.inc102
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/mauville_man.inc4
-rw-r--r--data/scripts/mystery_event_club.inc8
-rwxr-xr-x[-rw-r--r--]data/slot_machine.s176
-rw-r--r--data/specials.inc14
19 files changed, 220 insertions, 226 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d2828d5ea..1175c8d00 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,6 +1,7 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
+#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
@@ -1147,19 +1148,19 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
EventScript_WhiteOut:: @ 8271857
call EverGrandeCity_HallOfFame_EventScript_2718CC
- goto EventScript_271862
+ goto EventScript_ResetMrBriney
end
-EventScript_271862:: @ 8271862
+EventScript_ResetMrBriney:: @ 8271862
compare VAR_BRINEY_LOCATION, 1
- goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884
+ goto_if_eq EventScript_MoveMrBrineyToHouse
compare VAR_BRINEY_LOCATION, 2
- goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A
+ goto_if_eq EventScript_MoveMrBrineyToDewford
compare VAR_BRINEY_LOCATION, 3
- goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3
+ goto_if_eq EventScript_MoveMrBrineyToRoute108
end
-EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
+EventScript_MoveMrBrineyToHouse:: @ 8271884
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
@@ -1169,7 +1170,7 @@ EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
end
-EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
+EventScript_MoveMrBrineyToDewford:: @ 827189A
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -1180,7 +1181,7 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
end
-EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
+EventScript_MoveMrBrineyToRoute108:: @ 82718B3
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -1598,7 +1599,7 @@ EventScript_271D5E:: @ 8271D5E
goto EventScript_271D89
EventScript_271D83:: @ 8271D83
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer
@@ -1685,18 +1686,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
msgbox gText_PokemonCenterSign, MSGBOX_SIGN
end
-BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C
-DewfordTown_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C
-MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-Route111_EventScript_271E7C:: @ 8271E7C
-Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C
-SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C
-SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C
+Common_ShowEasyChatScreen:: @ 8271E7C
fadescreen 1
- special easy_chat_input_maybe
+ special ShowEasyChatScreen
fadescreen 0
return
@@ -2943,8 +2935,8 @@ EventScript_Questionnaire:: @ 827381B
msgbox gUnknown_0827339F, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_2738FD
- setvar VAR_0x8004, 20
- call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+ call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, sub_813B490
@@ -3760,10 +3752,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- setvar VAR_0x8006, 1
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3815,10 +3807,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- setvar VAR_0x8006, 0
- call SlateportCity_OceanicMuseum_1F_EventScript_271E7C
+ setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3887,17 +3879,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
end
SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
- setvar VAR_0x8004, 7
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
setvar VAR_0x8006, 1
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -3936,10 +3928,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
- call LilycoveCity_ContestLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3957,10 +3949,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
setvar VAR_0x8004, 24
special SetContestCategoryStringVarForInterview
msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1
- call LilycoveCity_ContestLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -4025,9 +4017,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
- setvar VAR_0x8004, 12
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -4497,7 +4489,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
special sub_818E3BC
compare VAR_0x8004, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
- compare VAR_0x8004, 15
+ compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656
LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635
diff --git a/data/io_reg.s b/data/io_reg.s
index e6315cd89..9c5f64f58 100644
--- a/data/io_reg.s
+++ b/data/io_reg.s
@@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784
.4byte 0x02000100
.4byte 0x08000400
-gUnknown_82EC7C4:: @ 82EC7C4
- .2byte 0x0100
- .2byte 0x0200
- .2byte 0x0400
- .2byte 0x0800
+gOverworldBackgroundLayerFlags:: @ 82EC7C4
+ .2byte 0x0100 /* BLDCNT_TGT2_BG0 */
+ .2byte 0x0200 /* BLDCNT_TGT2_BG1 */
+ .2byte 0x0400 /* BLDCNT_TGT2_BG2 */
+ .2byte 0x0800 /* BLDCNT_TGT2_BG3 */
gUnknown_82EC7CC:: @ 82EC7CC
.2byte 0x0001
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 8d407ac1d..6d53a33e1 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT
- setvar VAR_0x8004, 2
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT
- setvar VAR_0x8004, 3
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index d1f382e36..ed8acea17 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948
DewfordTown_EventScript_1E9952:: @ 81E9952
msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
- setvar VAR_0x8004, 9
- call DewfordTown_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json
index 7480e36c1..172bb3fdc 100644
--- a/data/maps/DoubleBattleColosseum/map.json
+++ b/data/maps/DoubleBattleColosseum/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277388"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773BE"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
},
{
"type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773A3"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
},
{
"type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773D9"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
}
],
"bg_events": []
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index f65d901bb..f83be42b9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index aa570010e..41f8af97c 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
waitmovement 0
special SavePlayerParty
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
index 4777472d2..d34ad4903 100644
--- a/data/maps/RecordCorner/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -66,7 +66,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_0827741D"
+ "script": "EventScript_RecordCenter_Spot0"
},
{
"type": "trigger",
@@ -75,7 +75,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277447"
+ "script": "EventScript_RecordCenter_Spot2"
},
{
"type": "trigger",
@@ -84,7 +84,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277432"
+ "script": "EventScript_RecordCenter_Spot1"
},
{
"type": "trigger",
@@ -93,7 +93,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_0827745C"
+ "script": "EventScript_RecordCenter_Spot3"
}
],
"bg_events": []
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 6d4afa30a..31158782d 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
- setvar VAR_0x8004, 13
- call Route123_BerryMastersHouse_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json
index 167344e61..a7ad50f1b 100644
--- a/data/maps/SingleBattleColosseum/map.json
+++ b/data/maps/SingleBattleColosseum/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277374"
+ "script": "EventScript_SingleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_0827737E"
+ "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
}
],
"bg_events": []
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index d107037d4..c7ceb0a4f 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
return
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index 257c7d1c8..1c409132d 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773F5"
+ "script": "EventScript_TradeCenter_Chair0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773FF"
+ "script": "EventScript_TradeCenter_Chair1"
}
],
"bg_events": []
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index ac4bd1979..d6713cde4 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
apprentice_msg TRUE, 11
setvar VAR_0x8004, 25
special CallApprenticeFunction
- setvar VAR_0x8004, 19
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
+ call Common_ShowEasyChatScreen
lock
faceplayer
setvar VAR_0x8004, 21
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 9cf435ade..1914fee4f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
-gUnknown_08277374:: @ 8277374
+EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_0827737E:: @ 827737E
+EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_08277388:: @ 8277388
+EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 0
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773A3:: @ 82773A3
+EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 1
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773BE:: @ 82773BE
+EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 2
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773D9:: @ 82773D9
+EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 3
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4
+EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
end
-gUnknown_082773F5:: @ 82773F5
+EventScript_TradeCenter_Chair0:: @ 82773F5
setvar VAR_0x8005, 0
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_082773FF:: @ 82773FF
+EventScript_TradeCenter_Chair1:: @ 82773FF
setvar VAR_0x8005, 1
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_08277409:: @ 8277409
+/* Never used */
+EventScript_TradeCenter_Chair2:: @ 8277409
setvar VAR_0x8005, 2
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_08277413:: @ 8277413
+/* Never used */
+EventScript_TradeCenter_Chair3:: @ 8277413
setvar VAR_0x8005, 3
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_0827741D:: @ 827741D
+EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_08277432:: @ 8277432
+EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_08277447:: @ 8277447
+EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_0827745C:: @ 827745C
+EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
@@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
releaseall
end
-EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
+gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E
msgbox Text_278452, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
-EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
+gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D
msgbox Text_27847B, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
-EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
+gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C
msgbox Text_27842E, MSGBOX_DEFAULT
closemessage
end
@@ -967,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
closemessage
end
-gUnknown_082774EF:: @ 82774EF
- msgbox Text_2783A8, MSGBOX_YESNO
+EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
+ msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq gUnknown_08277509
+ goto_if_eq EventScript_TerminateLink
erasebox 0, 0, 29, 19
releaseall
end
-gUnknown_08277509:: @ 8277509
- messageautoscroll Text_2783E9
+EventScript_TerminateLink:: @ 8277509
+ messageautoscroll Text_TerminateLinkPleaseWait
waitmessage
- special sub_80B371C
+ special ExitLinkRoom
end
-EventScript_277513:: @ 8277513
- special sub_80B36EC
+EventScript_DoLinkRoomExit:: @ 8277513
+ special CleanupLinkRoomState
special sub_80AF9F8
waitstate
end
@@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372
.string "Please confirm the number of\n"
.string "players and start again.$"
-Text_2783A8: @ 82783A8
+Text_TerminateLinkConfirmation: @ 82783A8
.string "The link will be terminated if you\n"
.string "leave the room. Is that okay?$"
-Text_2783E9: @ 82783E9
+Text_TerminateLinkPleaseWait: @ 82783E9
.string "Terminating link…\n"
.string "You will be escorted out of\l"
.string "the room. Please wait.$"
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index ee0e533bc..31000539c 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, MSGBOX_DEFAULT
- setvar VAR_0x8004, 10
- call Route111_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 2791e5d9f..0ab47ea80 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
end
MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
- setvar VAR_0x8004, 6
- call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index ea805edc4..cc189a96b 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/slot_machine.s b/data/slot_machine.s
index 4a354d71c..a3d502dcc 100644..100755
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -10,7 +10,7 @@ gUnknown_085A7A3C:: @ 85A7A3C
.2byte 0
.2byte 0
.2byte 0
-
+
gUnknown_085A7A44:: @ 85A7A44
.2byte 0x8000
.2byte 0
@@ -22,13 +22,13 @@ gUnknown_085A7A4C:: @ 85A7A4C
.2byte 0x4000
.2byte 0
.2byte 0
-
+
gUnknown_085A7A54:: @ 85A7A54
.2byte 0x8000
.2byte 0x8000
.2byte 0
.2byte 0
-
+
gUnknown_085A7A5C:: @ 85A7A5C
.2byte 0
.2byte 0x8000
@@ -40,7 +40,7 @@ gUnknown_085A7A64:: @ 85A7A64
.2byte 0xC000
.2byte 0
.2byte 0
-
+
gUnknown_085A7A6C:: @ 85A7A6C
.2byte 0x4000
.2byte 0xC000
@@ -95,7 +95,7 @@ gUnknown_085A7ACC:: @ 85A7ACC
.4byte gSlotMachineReelTimePikaAura
.2byte 0x400
.2byte 0
-
+
gUnknown_085A7AD4:: @ 85A7CD4
.4byte gSlotMachineReelTimeExplosion0
.2byte 0x200
@@ -111,7 +111,7 @@ gUnknown_085A7AE4:: @ 85A7AE4
gUnknown_085A7AEC:: @ 85A7AEC
.4byte gSlotMachineReelTimeSmoke
.4byte 0x80
-
+
gUnknown_085A7AF4:: @ 85A7AF4
.4byte gSlotMachineReelTimeBolt
.4byte 32
@@ -123,7 +123,7 @@ gUnknown_085A7AFC:: @ 85A7AFC
gUnknown_085A7B04:: @ 85A7B04
obj_image_anim_frame 0, 1
obj_image_anim_jump 0
-
+
gUnknown_085A7B0C:: @ 85A7B0C
obj_image_anim_frame 0, 16
obj_image_anim_end
@@ -258,18 +258,18 @@ gUnknown_085A7C30:: @ 85A7C30
gUnknown_085A7C34:: @ 85A7C34
.4byte gUnknown_085A7B88
-
+
gUnknown_085A7C38:: @ 85A7C38
.4byte gUnknown_085A7B94
.4byte gUnknown_085A7BA0
-
+
gUnknown_085A7C40:: @ 85A7C40
.4byte gUnknown_085A7BA8
-
+
gUnknown_085A7C44:: @ 85A7C44
.4byte gUnknown_085A7BB4
.4byte gUnknown_085A7BC8
-
+
gUnknown_085A7C4C:: @ 85A7C4C
.4byte gUnknown_085A7BD0
.4byte gUnknown_085A7BD8
@@ -283,7 +283,7 @@ gUnknown_085A7C60:: @ 85A7C60
obj_rot_scal_anim_frame 1, 1, 0, 1
obj_rot_scal_anim_loop 0xFF
obj_rot_scal_anim_end
-
+
gUnknown_085A7C88:: @ 85A7C88
.4byte gUnknown_085A7C60
@@ -301,7 +301,7 @@ gUnknown_085A7C8C:: @ 85A7C8C
gUnknown_085A7CDC:: @ 85A7CDC
.4byte gUnknown_085A7C8C
-
+
gSpriteTemplate_83ED414:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18
@@ -346,52 +346,52 @@ gSpriteTemplate_83ED54C:: @ 85A7E18
gSpriteTemplate_83ED564:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38
-
+
gUnknown_085A7E48:: @ 85A7E48
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7E60:: @ 85A7E60
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7E78:: @ 85A7E78
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7E90:: @ 85A7E90
spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7EA8:: @ 85A7EA8
spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7EC0:: @ 85A7EC0
spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7ED8:: @ 85A7ED8
spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7EF0:: @ 85A7EF0
spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F08:: @ 85A7F08
spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F20:: @ 85A7F20
spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F38:: @ 85A7F38
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F50:: @ 85A7F50
spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F68:: @ 85A7F68
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gUnknown_085A7F80:: @ 85A7F80
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
+
gSpriteTemplate_83ED6CC:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70
-
+
gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, -64, 3, 0, 64x64
subsprite 0, -64, 3, 0, 64x64
@@ -400,7 +400,7 @@ gUnknown_085A7FB0:: @ 85A7FB0
gSubspriteTables_83ED704:: @ 85A7FC0
.4byte 4, gUnknown_085A7FB0
-
+
gUnknown_085A7FC8:: @ 85A7FC8
subsprite -32, -12, 1, 0, 32x8
subsprite 0, -12, 1, 4, 32x8
@@ -416,7 +416,7 @@ gUnknown_085A7FE8:: @ 85A7FE8
subsprite -32, -20, 1, 0, 64x32
subsprite -32, 12, 1, 32, 32x8
subsprite 0, 12, 1, 36, 32x8
-
+
gSubspriteTables_83ED75C:: @ 85A7FF4
.4byte 3, gUnknown_085A7FE8
@@ -426,10 +426,10 @@ gUnknown_085A7FFC:: @ 85A7FFC
subsprite 0, 8, 1, 36, 32x8
subsprite -32, 16, 1, 40, 32x8
subsprite 0, 16, 1, 44, 32x8
-
+
gSubspriteTables_83ED78C:: @ 85A8010
.4byte 5, gUnknown_085A7FFC
-
+
gUnknown_085A8018:: @ 85A8018
subsprite -32, -8, 1, 0, 32x8
subsprite 0, -8, 1, 4, 32x8
@@ -438,7 +438,7 @@ gUnknown_085A8018:: @ 85A8018
gSubspriteTables_83ED7B4:: @ 85A8028
.4byte 4, gUnknown_085A8018
-
+
gUnknown_085A8030:: @ 85A8030
subsprite -8, -12, 1, 0, 16x8
subsprite -8, -4, 1, 0, 16x8
@@ -474,7 +474,7 @@ gUnknown_085A8078:: @ 85A8078
gUnknown_085A8088:: @ 85A8088
.4byte 4, gUnknown_085A8078
-
+
gUnknown_085A8090:: @ 85A8090
subsprite -32, -8, 3, 0, 32x8
subsprite 0, -8, 3, 4, 32x8
@@ -483,7 +483,7 @@ gUnknown_085A8090:: @ 85A8090
gUnknown_085A80A0:: @ 85A80A0
.4byte 4, gUnknown_085A8090
-
+
gUnknown_085A80A8:: @ 85A80A8
subsprite -32, -12, 3, 0, 32x8
subsprite 0, -12, 3, 4, 32x8
@@ -494,19 +494,19 @@ gUnknown_085A80A8:: @ 85A80A8
gUnknown_085A80C0:: @ 85A80C0
.4byte 6, gUnknown_085A80A8
-
+
gUnknown_085A80C8:: @ 85A80C8
subsprite -16, -16, 3, 0, 32x32
-
+
gUnknown_085A80CC:: @ 85A80CC
subsprite -8, -8, 3, 16, 16x16
gUnknown_085A80D0:: @ 85A80D0
.4byte 1, gUnknown_085A80C8
-
+
gUnknown_085A80D8:: @ 85A80D8
.4byte 1, gUnknown_085A80CC
-
+
gUnknown_085A80E0:: @ 85A80E0
subsprite -24, -24, 3, 0, 32x8
subsprite 8, -24, 3, 4, 16x8
@@ -523,78 +523,78 @@ gUnknown_085A80E0:: @ 85A80E0
gUnknown_085A8110:: @ 85A8110
.4byte 12, gUnknown_085A80E0
-
+
gUnknown_085A8118:: @ 85A8118
subsprite -16, -12, 3, 0, 32x16
subsprite -16, 4, 3, 8, 16x8
subsprite 0, 4, 3, 10, 16x8
-
+
gUnknown_085A8124:: @ 85A8124
.4byte 3, gUnknown_085A8118
-
+
gUnknown_085A812C:: @ 85A812C
subsprite -8, -8, 3, 0, 16x8
subsprite -8, 0, 3, 8, 16x8
-
+
gUnknown_085A8134:: @ 85A8134
.4byte 2, gUnknown_085A812C
-
+
gUnknown_085A813C:: @ 85A813C
subsprite -8, -8, 3, 2, 16x8
subsprite -8, 0, 3, 10, 16x8
-
+
gUnknown_085A8144:: @ 85A8144
.4byte 2, gUnknown_085A813C
-
+
gUnknown_085A814C:: @ 85A814C
subsprite -8, -8, 3, 4, 16x8
subsprite -8, 0, 3, 12, 16x8
-
+
gUnknown_085A8154:: @ 85A8154
.4byte 2, gUnknown_085A814C
-
+
gUnknown_085A815C:: @ 85A815C
subsprite -8, -8, 3, 6, 16x8
subsprite -8, 0, 3, 14, 16x8
-
+
gUnknown_085A8164:: @ 85A8164
.4byte 2, gUnknown_085A815C
-
+
gUnknown_085A816C:: @ 85A816C
subsprite -8, -8, 3, 0, 16x8
subsprite -8, 0, 3, 8, 16x8
-
+
gUnknown_085A8174:: @ 85A8174
.4byte 2, gUnknown_085A816C
-
+
gUnknown_085A817C:: @ 85A817C
subsprite -4, -8, 3, 2, 8x8
subsprite -4, 0, 3, 10, 8x8
-
+
gUnknown_085A8184:: @ 85A8184
.4byte 2, gUnknown_085A817C
-
+
gUnknown_085A818C:: @ 85A818C
subsprite -8, -8, 3, 3, 16x8
subsprite -8, 0, 3, 11, 16x8
-
+
gUnknown_085A8194:: @ 85A8194
.4byte 2, gUnknown_085A818C
-
+
gUnknown_085A819C:: @ 85A819C
subsprite -4, -8, 3, 5, 8x8
subsprite -4, 0, 3, 13, 8x8
-
+
gUnknown_085A81A4:: @ 85A81A4
.4byte 2, gUnknown_085A819C
-
+
gUnknown_085A81AC:: @ 85A81AC
subsprite -8, -8, 3, 6, 16x8
subsprite -8, 0, 3, 14, 16x8
-
+
gUnknown_085A81B4:: @ 85A81B4
.4byte 2, gUnknown_085A81AC
-
+
gUnknown_085A81BC:: @ 85A81BC
subsprite -12, -12, 3, 0, 16x8
subsprite 4, -12, 3, 2, 8x8
@@ -602,18 +602,18 @@ gUnknown_085A81BC:: @ 85A81BC
subsprite 4, -4, 3, 10, 8x8
subsprite -12, 4, 3, 16, 16x8
subsprite 4, 4, 3, 18, 8x8
-
+
gUnknown_085A81D4:: @ 85A81D4
.4byte 6, gUnknown_085A81BC
-
+
gUnknown_085A81DC:: @ 85A81DC
subsprite -8, -12, 3, 3, 16x8
subsprite -8, -4, 3, 11, 16x8
subsprite -8, 4, 3, 19, 16x8
-
+
gUnknown_085A81E8:: @ 85A81E8
.4byte 3, gUnknown_085A81DC
-
+
gUnknown_085A81F0:: @ 85A81F0
subsprite -12, -12, 3, 5, 16x8
subsprite 4, -12, 3, 7, 8x8
@@ -621,10 +621,10 @@ gUnknown_085A81F0:: @ 85A81F0
subsprite 4, -4, 3, 15, 8x8
subsprite -12, 4, 3, 21, 16x8
subsprite 4, 4, 3, 0x17, 8x8
-
+
gUnknown_085A8208:: @ 85A8208
.4byte 6, gUnknown_085A81F0
-
+
gUnknown_085A8210:: @ 85A8210
subsprite -12, -12, 3, 0, 16x8
subsprite 4, -12, 3, 2, 8x8
@@ -632,18 +632,18 @@ gUnknown_085A8210:: @ 85A8210
subsprite 4, -4, 3, 10, 8x8
subsprite -12, 4, 3, 16, 16x8
subsprite 4, 4, 3, 18, 8x8
-
+
gUnknown_085A8228:: @ 85A8228
.4byte 6, gUnknown_085A8210
-
+
gUnknown_085A822C:: @ 85A822C
subsprite -8, -12, 3, 3, 16x8
subsprite -8, -4, 3, 11, 16x8
subsprite -8, 4, 3, 19, 16x8
-
+
gUnknown_085A823C:: @ 85A823C
.4byte 3, gUnknown_085A822C
-
+
gUnknown_085A8244:: @ 85A8244
subsprite -12, -12, 3, 5, 16x8
subsprite 4, -12, 3, 7, 8x8
@@ -651,7 +651,7 @@ gUnknown_085A8244:: @ 85A8244
subsprite 4, -4, 3, 15, 8x8
subsprite -12, 4, 3, 21, 16x8
subsprite 4, 4, 3, 23, 8x8
-
+
gUnknown_085A825C:: @ 85A825C
.4byte 6, gUnknown_085A8244
@@ -712,7 +712,7 @@ gUnknown_083EDBC4:: @ 85A82CC
.4byte NULL
.align 2
-sSlotMachineSpriteSheets:: @ 85A8334
+gSlotMachineSpriteSheets:: @ 85A8334
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
@@ -738,19 +738,19 @@ gUnknown_083EDCDC:: @ 85A83E4
.4byte gUnknown_08DD19F8
@ might be a palette idk
.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1
-
-gUnknown_085A83FC:: @ 85A83FC
+
+gUnknown_085A83FC:: @ 85A83FC
.byte 0x91, 0x7F
-
-gUnknown_085A83FE:: @ 85A83FE
+
+gUnknown_085A83FE:: @ 85A83FE
.byte 0xBF, 0x43
gUnknown_085A8400:: @ 85A8400
.byte 0xBF, 0x43
-
+
gUnknown_085A8402:: @ 85A8402
.byte 0xBF, 0x4A
-
+
gUnknown_085A8404:: @ 85A8404
.byte 0xBF, 0x4A, 0, 0
@@ -771,20 +771,20 @@ gUnknown_083EDD1C:: @ 85A841C
gUnknown_083EDD30:: @ 85A8430
.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D
-gUnknown_083EDD35:: @ 85A8435
+gBettingTilesId:: @ 85A8435
.byte 0, 0
.byte 1, 2
.byte 3, 4
-gUnknown_083EDD3B:: @ 85A843B
+gNumberBettingTiles:: @ 85A843B
.byte 1, 2, 2
-
+
gUnknown_085A843E:: @ 85A843E
.incbin "graphics/slot_machine/85A843E.gbapal"
-
+
gUnknown_085A845E:: @ 85A845E
.incbin "graphics/slot_machine/85A845E.gbapal"
-
+
gUnknown_085A847E:: @ 85A847E
.incbin "graphics/slot_machine/85A847E.gbapal"
@@ -796,13 +796,13 @@ gUnknown_083EDDA0:: @ 85A84A0
gUnknown_083EDDAC:: @ 85A84AC
.4byte gSlotMachineMenu_Pal + 0x20
-
+
gUnknown_085A84B0:: @ 85A84B0
.incbin "graphics/slot_machine/85A84B0.gbapal"
-
+
gUnknown_085A84D0:: @ 85A84D0
.incbin "graphics/slot_machine/85A84D0.gbapal"
-
+
gUnknown_085A84F0:: @ 85A84F0
.incbin "graphics/slot_machine/85A84F0.gbapal"
@@ -830,10 +830,10 @@ gSlotMachineSpritePalettes:: @ 85A8544
obj_pal gUnknown_08DCF1F0, 7
null_obj_pal
-sReelTimeGfx:: @ 85A858C
+gReelTimeGfx:: @ 85A858C
.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
-sReelTimeWindowTilemap:: @ 85A96E0
+gReelTimeWindowTilemap:: @ 85A96E0
@if anyone knows what this tilemap is please do share
.incbin "graphics/slot_machine/85A96E0.bin"
diff --git a/data/specials.inc b/data/specials.inc
index eddf9a08b..d57c76bde 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64
def_special SetCableClubWarp
def_special sub_80AF948
def_special sub_80AF9F8
- def_special sub_80B36EC
- def_special sub_80B371C
+ def_special CleanupLinkRoomState
+ def_special ExitLinkRoom
def_special sub_80E8E18
def_special sub_80E8BC8
def_special sub_80E9068
@@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64
def_special sub_80E91F8
def_special sub_80EA30C
def_special DoSecretBasePCTurnOffEffect
- def_special sub_80E6BE8
+ def_special RecordMixingPlayerSpotTriggered
def_special sub_80B2DA4
def_special sub_80B2E4C
def_special sub_80B2E74
def_special sub_80B2EA8
def_special CloseLink
- def_special sub_80B3968
- def_special sub_80B3924
+ def_special ColosseumPlayerSpotTriggered
+ def_special PlayerEnteredTradeSeat
def_special nullsub_37
def_special sub_80B3254
def_special sub_80B2FD8
@@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64
def_special SpawnLinkPartnerEventObject
def_special SavePlayerParty
def_special LoadPlayerParty
- def_special sub_80F9438
+ def_special ChooseHalfPartyForBattle
def_special sp02A_crash_sound
def_special EventObjectInteractionGetBerryTreeData
def_special EventObjectInteractionGetBerryName
@@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B3000
def_special SaveGame
def_special DoWateringBerryTreeAnim
- def_special easy_chat_input_maybe
+ def_special ShowEasyChatScreen
def_special sub_811EECC
def_special ScrSpecial_GetCurrentMauvilleMan
def_special ScrSpecial_HasBardSongBeenChanged
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 13:10:16 +0000