Merge branch 'master' into doc-routes1

data/berry_crush.s

@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
 gUnknown_846F470:: @ 846F470
 	spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
 
-gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
-	.byte 9, 2, 8
+gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
+	@ strConvMode, shape, size, priority
+	.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0x9c, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0x9c, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xb4, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0xb4, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xcc, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
+	.2byte 0xcc, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
 
 gUnknown_846F4B8:: @ 846F4B8
 	.4byte gUnknown_841D034

data/data_8479668.s

@@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9::
 gText_UnionRoomChatKeyboard_Emoji10::
 	.string "{EXTRA 210}{EXTRA 208}ょ: $"
 
-	// trainer_tower (again?)
-
 	@ 847ABAC
 .align 2
 	.include "data/trainer_tower/trainers.inc"
 
-	.align 2
-gUnknown_84827AC:: @ 84827AC
-	.byte 0x08, 0x01
-	.align 2
-	.4byte 0
-
-gUnknown_84827B4:: @ 84827B4
-	.4byte gUnknown_847F16C
-	.4byte gUnknown_847D26C
-	.4byte gUnknown_84808AC
-	.4byte gUnknown_847ABAC
-	.4byte gUnknown_847CAAC
-	.4byte gUnknown_847E9AC
-	.4byte gUnknown_847AF8C
-	.4byte gUnknown_847CE8C
-	.4byte gUnknown_847DA2C
-	.4byte gUnknown_847BF0C
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847DE0C
-	.4byte gUnknown_847B74C
-	.4byte gUnknown_847BB2C
-	.4byte gUnknown_848182C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847C2EC
-	.4byte gUnknown_847C6CC
-	.4byte gUnknown_847E5CC
-	.4byte gUnknown_84804CC
-	.4byte gUnknown_84823CC
-	.4byte gUnknown_8481FEC
-	.4byte gUnknown_84800EC
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847ED8C
-	.4byte gUnknown_848106C
-	.4byte gUnknown_8480C8C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847F54C
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847C6CC
-
 	.include "data/text/move_descriptions.inc"
 
 	.align 2, 0

data/event_object_80688E4.s

@@ -1,97 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_83A710C::
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-
-gUnknown_83A714C::
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-
-gUnknown_83A716C::
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-
-gUnknown_83A7184::
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-
-gUnknown_83A7194::
-	.4byte oct_little_steps
-	.4byte oct_little_steps
-
-gUnknown_83A719C:: @ 83A719C
-	.4byte gUnknown_83A710C
-	.4byte gUnknown_83A714C
-	.4byte gUnknown_83A716C
-	.4byte gUnknown_83A7184
-	.4byte gUnknown_83A7194
-
-gUnknown_83A71B0:: @ 83A71B0
-	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
-
-gUnknown_83A71BA::
-	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
-
-gUnknown_83A71CA::
-	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
-
-gUnknown_83A71DA::
-	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
-
-	.align 2
-gUnknown_83A71EC:: @ 83A71EC
-	.4byte gUnknown_83A71BA
-	.4byte gUnknown_83A71CA
-	.4byte gUnknown_83A71DA
-
-	.align 1
-gUnknown_83A71F8:: @ 83A71F8
-	.2byte 0x10, 0x10, 0x20
-
-gUnknown_83A71FE:: @ 83A71FE
-	.byte 0, 0, 1
-
-	.align 1
-gUnknown_83A7202:: @ 83A7202
-	.2byte 0x20, 0x20, 0x40
-
-gUnknown_83A7208:: @ 83A7208
-	.byte 1, 1, 2
-
-	.align 2
-gUnknown_83A720C:: @ 83A720C
-	abspath "evobjmv.c"
-
-	.align 2
-gUnknown_83A7240:: @ 83A7240
-	.asciz "0"

data/event_scripts.s

@@ -17,19 +17,24 @@
 #include "constants/spawn_points.h"
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
+#include "constants/trainer_tower.h"
 #include "constants/object_events.h"
 #include "constants/fame_checker.h"
 #include "constants/seagallop.h"
 #include "constants/game_stat.h"
+#include "constants/coins.h"
 #include "constants/menu.h"
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/cable_club.h"
+#include "constants/field_tasks.h"
 #include "constants/field_weather.h"
+#include "constants/weather.h"
 #include "constants/union_room.h"
 #include "constants/trade.h"
 #include "constants/quest_log.h"
 #include "constants/daycare.h"
+#include "constants/easy_chat.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.set FALSE, 0
@@ -208,17 +213,17 @@ gStdScriptsEnd::
 	.include "data/maps/SixIsland_PatternBush/scripts.inc"
 	.include "data/maps/SixIsland_AlteringCave/scripts.inc"
 	.include "data/maps/NavelRock_Exterior/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc"
+	.include "data/maps/TrainerTower_1F/scripts.inc"
+	.include "data/maps/TrainerTower_2F/scripts.inc"
+	.include "data/maps/TrainerTower_3F/scripts.inc"
+	.include "data/maps/TrainerTower_4F/scripts.inc"
+	.include "data/maps/TrainerTower_5F/scripts.inc"
+	.include "data/maps/TrainerTower_6F/scripts.inc"
+	.include "data/maps/TrainerTower_7F/scripts.inc"
+	.include "data/maps/TrainerTower_8F/scripts.inc"
+	.include "data/maps/TrainerTower_Roof/scripts.inc"
+	.include "data/maps/TrainerTower_Lobby/scripts.inc"
+	.include "data/maps/TrainerTower_Elevator/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room2/scripts.inc"
@@ -278,7 +283,7 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland/scripts.inc"
 	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
 	.include "data/maps/SaffronCity/scripts.inc"
-	.include "data/maps/SaffronCity_Classic/scripts.inc"
+	.include "data/maps/SaffronCity_Connection/scripts.inc"
 	.include "data/maps/OneIsland/scripts.inc"
 	.include "data/maps/TwoIsland/scripts.inc"
 	.include "data/maps/ThreeIsland/scripts.inc"
@@ -317,10 +322,10 @@ gStdScriptsEnd::
 	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
 	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
 	.include "data/maps/ThreeIsland_Port/scripts.inc"
-	.include "data/maps/UnknownMap_03_50/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
 	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
 	.include "data/maps/FiveIsland_Meadow/scripts.inc"
@@ -415,15 +420,15 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_Mart/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_1F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_2F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
 	.include "data/maps/SaffronCity_Dojo/scripts.inc"
 	.include "data/maps/SaffronCity_Gym/scripts.inc"
-	.include "data/maps/SaffronCity_House2/scripts.inc"
+	.include "data/maps/SaffronCity_House/scripts.inc"
 	.include "data/maps/SaffronCity_Mart/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House3/scripts.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
 	.include "data/maps/Route2_House/scripts.inc"
@@ -593,7 +598,7 @@ gStdScriptsEnd::
 	.include "data/maps/FiveIsland_RocketWarehouse/text.inc"
 	.include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc"
 	.include "data/maps/SixIsland_PatternBush/text.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc"
+	.include "data/maps/TrainerTower_Lobby/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
@@ -658,6 +663,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TrainerTower/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
+	.include "data/maps/SevenIsland_TanobyRuins/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
 	.include "data/maps/PalletTown_GarysHouse/text.inc"
@@ -730,14 +736,14 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
 	.include "data/maps/CinnabarIsland_Mart/text.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_2F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
 	.include "data/maps/SaffronCity_Dojo/text.inc"
 	.include "data/maps/SaffronCity_Gym/text.inc"
-	.include "data/maps/SaffronCity_House2/text.inc"
+	.include "data/maps/SaffronCity_House/text.inc"
 	.include "data/maps/SaffronCity_Mart/text.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House3/text.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
 	.include "data/maps/Route2_House/text.inc"
@@ -966,7 +972,7 @@ Text_HavePokedexRated:: @ 81A5C03
 Text_ClosedLinkToProfOaksPC:: @ 81A5C2E
 	.string "Closed link to PROF. OAK's PC.$"
 
-Text_1A5C4D:: @ 81A5C4D
+Text_VoiceRangOutDontRunAway:: @ 81A5C4D
 	.string "Someone's voice rang out,\n"
 	.string "“Don't run away!”$"
 
@@ -1169,10 +1175,9 @@ EventScript_ResetEliteFour:: @ 81A6551
 	.include "data/scripts/obtain_item.inc"
 	.include "data/scripts/pc.inc"
 
-@ DoEasyChatScreen?
-EventScript_1A6AC0:: @ 81A6AC0
+Common_ShowEasyChatScreen:: @ 81A6AC0
 	fadescreen FADE_TO_BLACK
-	special sub_80FEE44
+	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
@@ -1258,71 +1263,7 @@ EventScript_1A74F2:: @ 81A74F2
 	removeitem VAR_0x8004, 1
 	return
 
-EventScript_1A7506:: @ 81A7506
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	call EventScript_1A7538
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A751F:: @ 81A751F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
-	waitmovement 0
-	setflag FLAG_TEMP_2
-	playse SE_KI_GASYAN
-	call EventScript_1A759C
-	special DrawWholeMapView
-	return
-
-EventScript_1A7538:: @ 81A7538
-	setmetatile 6, 1, 654, 1
-	setmetatile 6, 2, 662, 0
-	return
-
-EventScript_1A754B:: @ 81A754B
-	lockall
-	textcolor 0
-	msgbox Text_1A5C4D
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3
-	waitmovement 0
-	releaseall
-	end
-
-EventScript_1A7563:: @ 81A7563
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A7589:: @ 81A7589
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	return
-
-EventScript_1A759C:: @ 81A759C
-	setmetatile 5, 11, 669, 1
-	setmetatile 6, 11, 670, 1
-	setmetatile 7, 11, 671, 1
-	setmetatile 5, 12, 677, 1
-	setmetatile 6, 12, 678, 1
-	setmetatile 7, 12, 679, 1
-	return
-
-Movement_1A75D3:: @ 81A75D3
-	walk_up
-	step_end
-
-EventScript_1A75D5:: @ 81A75D5
-	special Special_PokemonLeagueLightingEffect
-	return
-
+	.include "data/scripts/pokemon_league.inc"
 	.include "data/scripts/movement.inc"	
 	.include "data/scripts/flavor_text.inc"
 
@@ -1332,8 +1273,8 @@ gUnknown_81A7702:: @ 81A7702
 	msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1A778A
-	setvar VAR_0x8004, 14
-	call EventScript_1A6AC0
+	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1407,7 +1348,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
 
 	.include "data/scripts/route23.inc"
 
-EventScript_1A7AB9:: @ 81A7AB9
+EventScript_GetElevatorFloor:: @ 81A7AB9
 	special Special_GetElevatorFloor
 	return
 
@@ -1648,9 +1589,9 @@ EventScript_1A8EC0:: @ 81A8EC0
 	.include "data/scripts/seagallop.inc"
 	.include "data/scripts/static_pokemon.inc"
 
-EventScript_1A925E:: @ 81A925E
+EventScript_TryDarkenRuins:: @ 81A925E
 	goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
-	setweather 11
+	setweather WEATHER_SHADE
 	doweather
 	return
 
@@ -1680,419 +1621,35 @@ Text_1ACD45:: @ 81ACD45
 	.include "data/scripts/fame_checker.inc"
 	.include "data/text/fame_checker.inc"
 
-CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
-	lockall
-	showmoneybox 0, 0, 0
-	msgbox gUnknown_81B1D7D, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1B2926
-	checkmoney 50, 0
-	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1B292B
-	playse SE_SHOP
-	removemoney 50, 0
-	updatemoneybox 0, 0, 0
-	waitse
-	message gUnknown_81B1E24
-	waitmessage
-	multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
-	switch VAR_RESULT
-	case 0, EventScript_1B28DB
-	case 1, EventScript_1B28E6
-	case 2, EventScript_1B28F1
-	case 3, EventScript_1B28FC
-	end
+gUnknown_81B1C8B:: @ 81B1C8B
+	.string "Hmm…\n"
+	.string "Is that right…$"
 
-EventScript_1B28DB:: @ 81B28DB
-	setvar VAR_0x8004, 0
-	goto EventScript_1B2907
+gUnknown_81B1C9F:: @ 81B1C9F
+	.string "Oh!\n"
+	.string "Look, look!$"
 
-EventScript_1B28E5:: @ 81B28E5
-	end
+gUnknown_81B1CAF:: @ 81B1CAF
+	.string "Read it, read it!$"
 
-EventScript_1B28E6:: @ 81B28E6
-	setvar VAR_0x8004, 1
-	goto EventScript_1B2907
+gUnknown_81B1CC1:: @ 81B1CC1
+	.string "TRAINER TIPS\p"
+	.string "Press START to open the MENU!$"
 
-EventScript_1B28F0:: @ 81B28F0
-	end
+gUnknown_81B1CEC:: @ 81B1CEC
+	.string "Signs are useful, aren't they?$"
 
-EventScript_1B28F1:: @ 81B28F1
-	setvar VAR_0x8004, 2
-	goto EventScript_1B2907
+gUnknown_81B1D0B:: @ 81B1D0B
+	.string "Look, look!\p"
+	.string "I copied what it said on one of\n"
+	.string "those TRAINER TIPS signs!$"
 
-EventScript_1B28FB:: @ 81B28FB
-	end
-
-EventScript_1B28FC:: @ 81B28FC
-	setvar VAR_0x8004, 3
-	goto EventScript_1B2907
-
-EventScript_1B2906:: @ 81B2906
-	end
-
-EventScript_1B2907:: @ 81B2907
-	message gUnknown_81B1E42
-	waitmessage
-	playse MUS_ME_PHOTO
-	dofieldeffect FLDEFF_UNK_45
-	delay 60
-	special Special_UpdateTrainerCardPhotoIcons
-	msgbox gUnknown_81B1E7D
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B2926:: @ 81B2926
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B292B:: @ 81B292B
-	msgbox gUnknown_81B1E07
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-FourIsland_House2_EventScript_1B2938:: @ 81B2938
-	lock
-	specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
-	goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
-	goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
-	end
-
-EventScript_1B2951:: @ 81B2951
-	setflag FLAG_MET_STICKER_LADY
-	msgbox gUnknown_81B1EB3
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Movement_ExclamationMark
-	waitmovement 0
-	applymovement 1, Movement_Delay48
-	waitmovement 0
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B2B8E
-	message gUnknown_81B1EF8
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B2993:: @ 81B2993
-	end
-
-EventScript_1B2994:: @ 81B2994
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	goto_if_questlog EventScript_ReleaseEnd
-	special sub_8112364
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B29C6
-	message gUnknown_81B2025
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B29C5:: @ 81B29C5
-	end
-
-EventScript_1B29C6:: @ 81B29C6
-	msgbox gUnknown_81B1FEF
-	release
-	end
-
-EventScript_1B29D0:: @ 81B29D0
-	switch VAR_0x8008
-	case 1, EventScript_1B2A23
-	case 2, EventScript_1B2A4F
-	case 4, EventScript_1B2A7B
-	case 3, EventScript_1B2AA7
-	case 5, EventScript_1B2ADE
-	case 6, EventScript_1B2B15
-	case 7, EventScript_1B2B4C
-	end
-
-EventScript_1B2A23:: @ 81B2A23
-	multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A4F:: @ 81B2A4F
-	multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A7B:: @ 81B2A7B
-	multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2D2C
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2AA7:: @ 81B2AA7
-	multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2ADE:: @ 81B2ADE
-	multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B15:: @ 81B2B15
-	multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B4C:: @ 81B2B4C
-	multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2D2C
-	case 3, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B8E:: @ 81B2B8E
-	msgbox gUnknown_81B1EF8
-	release
-	end
-
-EventScript_1B2B98:: @ 81B2B98
-	compare VAR_0x8004, 39
-	goto_if_le EventScript_1B2BC5
-	compare VAR_0x8004, 99
-	goto_if_le EventScript_1B2BE3
-	compare VAR_0x8004, 199
-	goto_if_le EventScript_1B2C01
-	compare VAR_0x8004, 200
-	goto_if_ge EventScript_1B2C1F
-	end
-
-EventScript_1B2BC5:: @ 81B2BC5
-	compare VAR_HOF_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 1
-	msgbox gUnknown_81B206E
-	goto EventScript_1B2C51
-
-EventScript_1B2BE2:: @ 81B2BE2
-	end
-
-EventScript_1B2BE3:: @ 81B2BE3
-	compare VAR_HOF_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 2
-	msgbox gUnknown_81B20CF
-	goto EventScript_1B2C51
-
-EventScript_1B2C00:: @ 81B2C00
-	end
-
-EventScript_1B2C01:: @ 81B2C01
-	compare VAR_HOF_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 3
-	msgbox gUnknown_81B2133
-	goto EventScript_1B2C51
-
-EventScript_1B2C1E:: @ 81B2C1E
-	end
-
-EventScript_1B2C1F:: @ 81B2C1F
-	compare VAR_HOF_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2C47
-	setvar VAR_HOF_BRAG_STATE, 4
-	msgbox gUnknown_81B21C4
-	goto EventScript_1B2C51
-
-EventScript_1B2C3C:: @ 81B2C3C
-	end
-
-EventScript_1B2C3D:: @ 81B2C3D
-	msgbox gUnknown_81B227C
-	release
-	end
-
-EventScript_1B2C47:: @ 81B2C47
-	msgbox gUnknown_81B22B0
-	release
-	end
-
-EventScript_1B2C51:: @ 81B2C51
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B2242
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2C62:: @ 81B2C62
-	compare VAR_0x8005, 99
-	goto_if_le EventScript_1B2C8F
-	compare VAR_0x8005, 199
-	goto_if_le EventScript_1B2CAD
-	compare VAR_0x8005, 299
-	goto_if_le EventScript_1B2CCB
-	compare VAR_0x8005, 300
-	goto_if_ge EventScript_1B2CE9
-	end
-
-EventScript_1B2C8F:: @ 81B2C8F
-	compare VAR_EGG_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 1
-	msgbox gUnknown_81B2308
-	goto EventScript_1B2D1B
-
-EventScript_1B2CAC:: @ 81B2CAC
-	end
-
-EventScript_1B2CAD:: @ 81B2CAD
-	compare VAR_EGG_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 2
-	msgbox gUnknown_81B2372
-	goto EventScript_1B2D1B
-
-EventScript_1B2CCA:: @ 81B2CCA
-	end
-
-EventScript_1B2CCB:: @ 81B2CCB
-	compare VAR_EGG_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 3
-	msgbox gUnknown_81B23E0
-	goto EventScript_1B2D1B
-
-EventScript_1B2CE8:: @ 81B2CE8
-	end
-
-EventScript_1B2CE9:: @ 81B2CE9
-	compare VAR_EGG_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2D11
-	setvar VAR_EGG_BRAG_STATE, 4
-	msgbox gUnknown_81B2448
-	goto EventScript_1B2D1B
-
-EventScript_1B2D06:: @ 81B2D06
-	end
-
-EventScript_1B2D07:: @ 81B2D07
-	msgbox gUnknown_81B251B
-	release
-	end
-
-EventScript_1B2D11:: @ 81B2D11
-	msgbox gUnknown_81B254F
-	release
-	end
-
-EventScript_1B2D1B:: @ 81B2D1B
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B24EA
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2D2C:: @ 81B2D2C
-	compare VAR_0x8006, 19
-	goto_if_le EventScript_1B2D59
-	compare VAR_0x8006, 49
-	goto_if_le EventScript_1B2D77
-	compare VAR_0x8006, 99
-	goto_if_le EventScript_1B2D95
-	compare VAR_0x8006, 100
-	goto_if_ge EventScript_1B2DB3
-	end
-
-EventScript_1B2D59:: @ 81B2D59
-	compare VAR_LINK_WIN_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 1
-	msgbox gUnknown_81B25A7
-	goto EventScript_1B2DE5
-
-EventScript_1B2D76:: @ 81B2D76
-	end
-
-EventScript_1B2D77:: @ 81B2D77
-	compare VAR_LINK_WIN_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 2
-	msgbox gUnknown_81B2609
-	goto EventScript_1B2DE5
-
-EventScript_1B2D94:: @ 81B2D94
-	end
-
-EventScript_1B2D95:: @ 81B2D95
-	compare VAR_LINK_WIN_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 3
-	msgbox gUnknown_81B267B
-	goto EventScript_1B2DE5
-
-EventScript_1B2DB2:: @ 81B2DB2
-	end
-
-EventScript_1B2DB3:: @ 81B2DB3
-	compare VAR_LINK_WIN_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2DDB
-	setvar VAR_LINK_WIN_BRAG_STATE, 4
-	msgbox gUnknown_81B26F6
-	goto EventScript_1B2DE5
-
-EventScript_1B2DD0:: @ 81B2DD0
-	end
-
-EventScript_1B2DD1:: @ 81B2DD1
-	msgbox gUnknown_81B27DB
-	release
-	end
-
-EventScript_1B2DDB:: @ 81B2DDB
-	msgbox gUnknown_81B280F
-	release
-	end
-
-EventScript_1B2DE5:: @ 81B2DE5
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B27A6
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2DF6:: @ 81B2DF6
-	release
-	end
+gUnknown_81B1D51:: @ 81B1D51
+	.string "TRAINER TIPS!\p"
+	.string "Press START to open the MENU!$"
 
+	.include "data/text/trainer_card.inc"
+	.include "data/scripts/trainer_card.inc"
 	.include "data/text/help_system.inc"
 	.include "data/scripts/cable_club.inc"
 	.include "data/scripts/field_moves.inc"

data/graphics.s

@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
+gTilesetPalettes_General:: @ 8EA1B68
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
 
-gTilesetTiles_8EA1D68:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+gTilesetTiles_General:: @ 8EA1D68
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
 
 gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"
 
 	.align 2
-gTilesetPalettes_8EA97F4:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
 
 
-gTilesetTiles_8EA9F88:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
 
 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"