Merge pull request #285 from GriffinRichards/doc-scriptclean

Clean up script documentation

asm/field_control_avatar.s

@@ -1664,16 +1664,16 @@ _0806D5A4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D5D8
-	ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall
+	ldr r0, _0806D5D4 @ =EventScript_Waterfall
 	b _0806D5E2
 	.align 2, 0
 _0806D5D0: .4byte 0x00000826
-_0806D5D4: .4byte EventScript_InteractWithWaterfall
+_0806D5D4: .4byte EventScript_Waterfall
 _0806D5D8:
-	ldr r0, _0806D5DC @ =EventScript_81BE2FF
+	ldr r0, _0806D5DC @ =EventScript_CantUseWaterfall
 	b _0806D5E2
 	.align 2, 0
-_0806D5DC: .4byte EventScript_81BE2FF
+_0806D5DC: .4byte EventScript_CantUseWaterfall
 _0806D5E0:
 	movs r0, 0
 _0806D5E2:

asm/field_player_avatar.s

@@ -4157,7 +4157,7 @@ sub_805D240: @ 805D240
 	bl DestroySprite
 	adds r0, r5, 0
 	bl DestroyTask
-	bl sub_812B35C
+	bl SetHelpContextForMap
 _0805D2AE:
 	pop {r4-r6}
 	pop {r0}

asm/field_weather_effects.s

@@ -526,8 +526,8 @@ sub_807B6BC: @ 807B6BC
 	bx lr
 	thumb_func_end sub_807B6BC
 
-	thumb_func_start sub_807B6C0
+	thumb_func_start StartDroughtWeatherBlend
-sub_807B6C0: @ 807B6C0
+StartDroughtWeatherBlend: @ 807B6C0
 	push {lr}
 	ldr r0, _0807B6D0 @ =task50_0807B6D4
 	movs r1, 0x50
@@ -536,7 +536,7 @@ sub_807B6C0: @ 807B6C0
 	bx r0
 	.align 2, 0
 _0807B6D0: .4byte task50_0807B6D4
-	thumb_func_end sub_807B6C0
+	thumb_func_end StartDroughtWeatherBlend
 
 	thumb_func_start task50_0807B6D4
 task50_0807B6D4: @ 807B6D4

asm/macros/event.inc

@@ -1629,7 +1629,7 @@
 
 	@ Jumps to dest if the Quest Log is currently showing playback scenes (dest is usually a release/end)
 	.macro goto_if_questlog dest:req
-	special Special_GetQuestLogState
+	special GetQuestLogState
 	compare VAR_RESULT, 2
 	goto_if_eq \dest
 	.endm

asm/macros/movement.inc

@@ -109,7 +109,7 @@
 	create_movement emote_x
 	create_movement emote_double_exclamation_mark
 	create_movement emote_smile
-	create_movement step_67
+	create_movement reveal_trainer
 	create_movement rock_smash_break
 	create_movement cut_tree
 

asm/macros/trainer_tower.inc

@@ -90,7 +90,7 @@
 	special CallTrainerTowerFunc
 	.endm
 
-	@ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead
+	@ Unused. Displays Trainer Tower results. Handled by ShowBattleRecords instead
 	.macro ttower_showresults
 	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
 	special CallTrainerTowerFunc

asm/naming_screen.s

@@ -491,9 +491,9 @@ sub_809DD60: @ 809DD60
 	bl CreateTask
 	ldr r0, _0809DD84 @ =sub_809FB70
 	bl SetMainCallback2
-	bl HelpSystem_BackupSomeVariable
+	bl BackupHelpContext
-	movs r0, 0x3
+	movs r0, 0x3 @ HELPCONTEXT_NAMING_SCREEN
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -868,7 +868,7 @@ _0809E06C:
 	ldr r0, [r4]
 	bl Free
 	str r5, [r4]
-	bl HelpSystem_RestoreSomeVariable
+	bl RestoreHelpContext
 _0809E096:
 	movs r0, 0
 	pop {r4,r5}

asm/overworld.s

@@ -66,8 +66,8 @@ _08054C40: .4byte sWhiteOutMoneyLossMultipliers
 _08054C44: .4byte gSaveBlock1Ptr
 	thumb_func_end ComputeWhiteOutMoneyLoss
 
-	thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
+	thumb_func_start OverworldWhiteOutGetMoneyLoss
-Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
+OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	push {r4,r5,lr}
 	bl ComputeWhiteOutMoneyLoss
 	adds r4, r0, 0
@@ -85,7 +85,7 @@ Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	bx r0
 	.align 2, 0
 _08054C6C: .4byte gStringVar1
-	thumb_func_end Special_OverworldWhiteOutGetMoneyLoss
+	thumb_func_end OverworldWhiteOutGetMoneyLoss
 
 	thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
 CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
@@ -4012,7 +4012,7 @@ _08056ACE:
 	bl sub_8057074
 	bl sub_80571A8
 	bl sub_8057140
-	bl sub_812B35C
+	bl SetHelpContextForMap
 	b _08056B62
 _08056AE4:
 	bl InitCurrentFlashLevelScanlineEffect
@@ -4152,7 +4152,7 @@ _08056BFE:
 	bl sub_80CC534
 	bl sub_80CC59C
 _08056C16:
-	bl sub_812B35C
+	bl SetHelpContextForMap
 	b _08056CCA
 	.align 2, 0
 _08056C1C: .4byte gQuestLogState
@@ -4275,7 +4275,7 @@ _08056D04:
 	b _08056D30
 _08056D1C:
 	bl sub_8056F08
-	bl sub_812B35C
+	bl SetHelpContextForMap
 	b _08056D30
 _08056D26:
 	bl map_post_load_hook_exec
@@ -4343,7 +4343,7 @@ _08056DAE:
 	bl sub_8057230
 	bl sub_8057100
 	bl sub_805715C
-	bl sub_812B35C
+	bl SetHelpContextForMap
 	b _08056E3E
 _08056DC0:
 	bl InitCurrentFlashLevelScanlineEffect

asm/pokemon_storage_system.s

@@ -1411,8 +1411,8 @@ _0808C3CC:
 	.4byte _0808C5A6
 	.4byte _0808C680
 _0808C3E0:
-	movs r0, 0x1C
+	movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	ldrb r0, [r5, 0xA]
 	adds r1, r5, 0
 	adds r1, 0x26
@@ -2715,8 +2715,8 @@ _0808CE18:
 	bl CreateTask
 	ldr r1, [r4]
 	strb r0, [r1, 0x4]
-	movs r0, 0x1C
+	movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	bl StorageGetCurrentBox
 	ldr r1, _0808CE58 @ =gUnknown_20397B8
 	strb r0, [r1]
@@ -2766,8 +2766,8 @@ _0808CE8C:
 	bl CreateTask
 	ldr r1, [r4]
 	strb r0, [r1, 0x4]
-	movs r0, 0x1C
+	movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	ldr r0, _0808CEC4 @ =c2_Box
 	bl SetMainCallback2
 _0808CEB6:

asm/pokemon_summary_screen.s

@@ -106,8 +106,8 @@ _081345D0:
 	cmp r0, 0x5
 	beq _08134604
 _081345D4:
-	movs r0, 0x6
+	movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	ldr r2, _081345F8 @ =gUnknown_203B140
 	ldr r0, [r2]
 	ldr r3, _081345FC @ =0x00003214
@@ -127,8 +127,8 @@ _081345F8: .4byte gUnknown_203B140
 _081345FC: .4byte 0x00003214
 _08134600: .4byte 0x00003234
 _08134604:
-	movs r0, 0x6
+	movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	ldr r0, [r4]
 	ldr r3, _08134628 @ =0x00003214
 	adds r0, r3
@@ -148,8 +148,8 @@ _08134628: .4byte 0x00003214
 _0813462C: .4byte 0x0000321c
 _08134630: .4byte 0x00003234
 _08134634:
-	movs r0, 0x8
+	movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 	ldr r0, [r4]
 	ldr r3, _08134710 @ =0x00003214
 	adds r0, r3
@@ -7600,15 +7600,15 @@ _08138460: .4byte 0x00003214
 _08138464:
 	cmp r0, 0x3
 	bgt _08138476
-	movs r0, 0x8
+	movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES
 	b _08138472
 _0813846C:
-	movs r0, 0x6
+	movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
 	b _08138472
 _08138470:
-	movs r0, 0x7
+	movs r0, 0x7 @ HELPCONTEXT_POKEMON_SKILLS
 _08138472:
-	bl HelpSystem_SetSomeVariable2
+	bl SetHelpContext
 _08138476:
 	pop {r0}
 	bx r0

common_syms/help_system_812B1E0.txt

@@ -1,2 +1,2 @@
-sHelpSystemState
+gHelpSystemState
-gSomeVariableBackup
+gHelpContextIdBackup

data/event_scripts.s

@@ -35,6 +35,7 @@
 #include "constants/daycare.h"
 #include "constants/easy_chat.h"
 #include "constants/trainer_card.h"
+#include "constants/help_system.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.set FALSE, 0
@@ -957,22 +958,23 @@ Text_VoiceRangOutDontRunAway:: @ 81A5C4D
 	.string "Someone's voice rang out,\n"
 	.string "“Don't run away!”$"
 
-Text_1A5C79:: @ 81A5C79
+@ Uncear what the below unused JP texts were for
+Text_IdLikeToSeeRequest:: @ 81A5C79
 	.string "えっとー\n"
 	.string "{STR_VAR_2}が　みてみたいなー\p"
 	.string "それも　{STR_VAR_1}{STR_VAR_3}\n"
 	.string "{STR_VAR_2}が　みてみたいなー$"
 
-Text_1A5C9F:: @ 81A5C9F
+Text_ThankYouForShowingMe:: @ 81A5C9F
 	.string "わぁー　すごい！\n"
 	.string "{STR_VAR_1}{STR_VAR_3}{STR_VAR_2}だー！\p"
 	.string "ありがとー\n"
 	.string "また　よろしくねー！$"
 
-Text_1A5CC3:: @ 81A5CC3
+Text_ThatsNotRight:: @ 81A5CC3
 	.string "それっ　ちがうよー！$"
 
-Text_1A5CCE:: @ 81A5CCE
+Text_ISee:: @ 81A5CCE
 	.string "そっか‥$"
 
 Text_TheDoorIsClosed:: @ 81A5CD3
@@ -1093,7 +1095,7 @@ EventScript_WallTownMap:: @ 81A6C32
 	msgbox Text_ATownMap
 	goto_if_questlog EventScript_ReleaseEnd
 	fadescreen FADE_TO_BLACK
-	special Special_TownMap
+	special ShowTownMap
 	waitstate
 	releaseall
 	end
@@ -1154,7 +1156,7 @@ EventScript_SetEnteringCyclingRoad:: @ 81A77C1
 	.include "data/scripts/route23.inc"
 
 EventScript_GetElevatorFloor:: @ 81A7AB9
-	special Special_GetElevatorFloor
+	special GetElevatorFloor
 	return
 
 	.include "data/scripts/aide.inc"
@@ -1198,7 +1200,7 @@ EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD
 	return
 
 EventScript_ChooseMonForInGameTrade:: @ 81A8CBD
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
@@ -1307,11 +1309,11 @@ EventScript_TryDarkenRuins:: @ 81A925E
 	return
 
 EventScript_BrailleCursorWaitButton:: @ 81A926C
-	special Special_BrailleCursorToggle
+	special BrailleCursorToggle
 	waitbuttonpress
 	playse SE_SELECT
 	setvar VAR_0x8006, 1
-	special Special_BrailleCursorToggle
+	special BrailleCursorToggle
 	return
 
 EventScript_NoMoreRoomForPokemon:: @ 81A927C
@@ -1356,4 +1358,4 @@ Text_TestMsg:: @ 81ACD45
 	.include "data/scripts/test.inc"
 	.include "data/text/save.inc"
 	.include "data/text/new_game_intro.inc"
-	.include "data/text/poke_dude.inc"
+	.include "data/text/pokedude.inc"

data/maps/BirthIsland_Exterior/scripts.inc

@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
 	.byte 0
 
 BirthIsland_Exterior_OnReturnToField:: @ 8165213
-	special Special_SetDeoxysTriangleObjectPal
+	special SetDeoxysTrianglePalette
 	end
 
 BirthIsland_Exterior_OnTransition:: @ 8165217
@@ -33,7 +33,7 @@ BirthIsland_Exterior_OnResume:: @ 8165253
 	end
 
 BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 2
@@ -44,7 +44,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
 	faceplayer
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	special DoDeoxysRockInteraction
+	special DoDeoxysTriangleInteraction
 	waitstate
 	switch VAR_RESULT
 	case 0, BirthIsland_Exterior_EventScript_NotSolved1
@@ -86,10 +86,10 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/CeladonCity/map.json

@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {

data/maps/CeladonCity_Condominiums_3F/scripts.inc

@@ -32,7 +32,7 @@ CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418
 	waitmessage
 	delay 60
 	goto_if_questlog EventScript_ReleaseEnd
-	special Special_ShowDiploma
+	special ShowDiploma
 	waitstate
 	release
 	end

data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc

@@ -6,11 +6,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153
 	setvar VAR_0x8004, 3
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F
 	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F
@@ -106,15 +106,15 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6
 	end
 
 CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -259,7 +259,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
 	setfieldeffectarg 2, 14
 	dofieldeffect FLDEFF_SMILEY_FACE_ICON
 	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
-	specialvar VAR_RESULT, Special_GetRandomSlotMachine
+	specialvar VAR_RESULT, GetRandomSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end

data/maps/CeladonCity_Gym/map.json

@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -155,7 +155,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     }
   ],

data/maps/CeruleanCave_1F/map.json

@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     }
   ],

data/maps/CeruleanCave_2F/map.json

@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -155,7 +155,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -168,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     },
     {
@@ -181,7 +181,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1B"
     }
   ],

data/maps/CeruleanCave_B1F/map.json

@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -155,7 +155,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -168,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     }
   ],

data/maps/CeruleanCave_B1F/scripts.inc

@@ -8,7 +8,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9
 	end
 
 CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
 	waitbuttonpress
 	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/CeruleanCity/map.json

@@ -150,7 +150,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {

data/maps/CeruleanCity_House1/scripts.inc

@@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0
 	message CeruleanCity_House1_Text_DescribeWhichBadge
 	waitmessage
 	setvar VAR_0x8004, LISTMENU_BADGES
-	special Special_ListMenu
+	special ListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge
@@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0
 CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D
 	message CeruleanCity_House1_Text_DescribeWhichBadge
 	waitmessage
-	special Special_ReturnToListMenu
+	special ReturnToListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge

data/maps/CeruleanCity_House4/scripts.inc

@@ -5,7 +5,7 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
-	specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
+	specialvar VAR_0x8004, GetMENewsJisanItemAndState
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8004, 0
 	goto_if_eq CeruleanCity_House4_EventScript_NoNews

data/maps/CeruleanCity_House5/scripts.inc

@@ -38,7 +38,7 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8
 	message CeruleanCity_House5_Text_ExchangeWithWhat
 	waitmessage
 	setvar VAR_0x8004, LISTMENU_BERRY_POWDER
-	special Special_ListMenu
+	special ListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, CeruleanCity_House5_EventScript_EnergyPowder
@@ -144,14 +144,14 @@ CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055
 	compare VAR_RESULT, NO
 	goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
 	copyvar VAR_0x8004, VAR_0x8009
-	specialvar VAR_RESULT, Special_HasEnoughBerryPowder
+	specialvar VAR_RESULT, Script_HasEnoughBerryPowder
 	compare VAR_RESULT, FALSE
 	goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder
 	giveitem VAR_0x8008
 	compare VAR_RESULT, FALSE
 	goto_if_eq CeruleanCity_House5_EventScript_BagIsFull
 	copyvar VAR_0x8004, VAR_0x8009
-	special Special_TakeBerryPowder
+	special Script_TakeBerryPowder
 	special PrintPlayerBerryPowderAmount
 	msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO
 	compare VAR_RESULT, YES

data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc

@@ -53,7 +53,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E
 	msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, PARTY_SIZE

data/maps/FiveIsland_Meadow/map.json

@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -59,7 +59,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal"
     },
     {
       "type": "sign",
@@ -67,7 +67,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
+      "script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal"
     }
   ]
 }

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -33,7 +33,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B
 
 FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19
 	copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
-	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
+	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
 	compare VAR_RESULT, TRUE
 	goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
 	goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -21,8 +21,8 @@ FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
 	end
 
 FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47
-	setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0
+	setmetatile 26, 20, METATILE_SilphCo_Arrow_Up, 0
-	setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0
+	setmetatile 27, 20, METATILE_SilphCo_Arrow_Up, 0
 	return
 
 FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A

data/maps/FourIsland/map.json

@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {

data/maps/FourIsland/scripts.inc

@@ -132,7 +132,7 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
 	special GetDaycareMonNicknames
 	msgbox DayCare_Text_YourMonsAreDoingFine
 	special SetDaycareCompatibilityString
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	release

data/maps/FourIsland_IcefallCave_1F/scripts.inc

@@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
 	end
 
 FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
-	special Special_SetIcefallCaveCrackedIceMetatiles
+	special SetIcefallCaveCrackedIceMetatiles
 	end
 
 FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B

data/maps/FourIsland_LoreleisHouse/scripts.inc

@@ -3,7 +3,7 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
 	.byte 0
 
 FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
-	special Special_ComputeLoreleiDollCollection
+	special UpdateLoreleiDollCollection
 	end
 
 FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58

data/maps/FuchsiaCity/map.json

@@ -171,7 +171,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -184,7 +184,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -197,7 +197,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -210,7 +210,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_15"
     },
     {

data/maps/FuchsiaCity/scripts.inc

@@ -71,7 +71,7 @@ FuchsiaCity_EventScript_GymSign:: @ 8166E07
 FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
 	lockall
 	setvar VAR_0x8004, SPECIES_CHANSEY
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_CHANSEY, 10, 3
 	msgbox FuchsiaCity_Text_ChanseySign
 	erasemonpic
@@ -81,7 +81,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
 FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
 	lockall
 	setvar VAR_0x8004, SPECIES_VOLTORB
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_VOLTORB, 10, 3
 	msgbox FuchsiaCity_Text_VoltorbSign
 	erasemonpic
@@ -91,7 +91,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
 FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
 	lockall
 	setvar VAR_0x8004, SPECIES_KANGASKHAN
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_KANGASKHAN, 10, 3
 	msgbox FuchsiaCity_Text_KangaskhanSign
 	erasemonpic
@@ -101,7 +101,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
 FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
 	lockall
 	setvar VAR_0x8004, SPECIES_SLOWPOKE
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_SLOWPOKE, 10, 3
 	msgbox FuchsiaCity_Text_SlowpokeSign
 	erasemonpic
@@ -111,7 +111,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
 FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
 	lockall
 	setvar VAR_0x8004, SPECIES_LAPRAS
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_LAPRAS, 10, 3
 	msgbox FuchsiaCity_Text_LaprasSign
 	erasemonpic
@@ -122,7 +122,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
 	lockall
 	goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
 	setvar VAR_0x8004, SPECIES_KABUTO
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_KABUTO, 10, 3
 	msgbox FuchsiaCity_Text_KabutoSign
 	erasemonpic
@@ -131,7 +131,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
 
 FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE
 	setvar VAR_0x8004, SPECIES_OMANYTE
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_OMANYTE, 10, 3
 	msgbox FuchsiaCity_Text_OmanyteSign
 	erasemonpic

data/maps/FuchsiaCity_House3/scripts.inc

@@ -12,23 +12,23 @@ FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895
 
 FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
 	msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove
-	special Special_IsSelectedMonEgg
+	special IsSelectedMonEgg
 	compare VAR_RESULT, TRUE
 	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg
-	special Special_GetNumMovesSelectedMonHas
+	special GetNumMovesSelectedMonHas
 	compare VAR_RESULT, 1
 	goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove
 	msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten
 	fadescreen FADE_TO_BLACK
-	special Special_SelectMove
+	special SelectMoveDeleterMove
 	fadescreen FADE_FROM_BLACK
 	compare VAR_0x8005, MAX_MON_MOVES
 	goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
-	special Special_BufferMoveDeleterNicknameAndMove
+	special BufferMoveDeleterNicknameAndMove
 	msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove
@@ -36,7 +36,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
 	end
 
 FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
-	special Special_MoveDeleterForgetMove
+	special MoveDeleterForgetMove
 	playfanfare MUS_ME_WASURE
 	waitfanfare
 	msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely
@@ -44,7 +44,7 @@ FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
 	end
 
 FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A
-	special Special_BufferMoveDeleterNicknameAndMove
+	special BufferMoveDeleterNicknameAndMove
 	msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove
 	release
 	end

data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc

@@ -158,7 +158,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462
 	getpartysize
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_ne EventScript_Return
-	specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
+	specialvar VAR_RESULT, IsThereRoomInAnyBoxForMorePokemon
 	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_Return
 	msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull

data/maps/FuchsiaCity_WardensHouse/map.json

@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {

data/maps/IndigoPlateau_Exterior/scripts.inc

@@ -81,7 +81,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
 	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
 	removeobject LOCALID_RIVAL
 	removeobject LOCALID_PROF_OAK
-	special Special_Credits @ noreturn
+	special DoCredits
 	waitstate
 	releaseall
 	end

data/maps/LavenderTown_House2/scripts.inc

@@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_NameRater:: @ 816B266
 
 LavenderTown_House2_EventScript_ChooseMon:: @ 816B287
 	msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon
@@ -27,15 +27,15 @@ LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA
 	end
 
 LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4
-	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
+	specialvar VAR_RESULT, GetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg
-	special Special_GetMonNickname
+	special BufferMonNickname
-	special Special_IsMonOTIDNotPlayers
+	special IsMonOTIDNotPlayers
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
-	specialvar VAR_RESULT, Special_IsMonOTNameNotPlayers
+	specialvar VAR_RESULT, IsMonOTNameNotPlayers
-	special Special_GetMonNickname
+	special BufferMonNickname
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
 	msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO
@@ -59,7 +59,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B
 	msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe
 	call EventScript_ChangePokemonNickname
 	specialvar VAR_RESULT, NameRaterWasNicknameChanged
-	special Special_GetMonNickname
+	special BufferMonNickname
 	compare VAR_RESULT, TRUE
 	goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname
 	msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName

data/maps/MtEmber_Exterior/map.json

@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -155,7 +155,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -168,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -181,7 +181,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -194,7 +194,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -207,7 +207,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -220,7 +220,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -233,7 +233,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {

data/maps/MtEmber_RubyPath_1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     }
   ],

data/maps/MtEmber_RubyPath_B1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     }
   ],

data/maps/MtEmber_RubyPath_B1F_Stairs/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     }
   ],

data/maps/MtEmber_RubyPath_B2F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     }
   ],

data/maps/MtEmber_RubyPath_B2F_Stairs/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     }
   ],

data/maps/MtEmber_RubyPath_B3F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     }
   ],

data/maps/MtEmber_Summit/map.json

@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "0"
     }
   ],

data/maps/MtEmber_Summit/scripts.inc

@@ -8,7 +8,7 @@ MtEmber_Summit_OnResume:: @ 8163B07
 	end
 
 MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/MtEmber_SummitPath_2F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     }
   ],

data/maps/NavelRock_Base/scripts.inc

@@ -22,7 +22,7 @@ NavelRock_Base_OnResume:: @ 8165116
 	end
 
 NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 1
@@ -40,14 +40,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
 	setvar VAR_0x8005, 3  @ Horizontal pan
 	setvar VAR_0x8006, 4  @ Num shakes
 	setvar VAR_0x8007, 2  @ Shake delay
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 30
 	playse SE_T_AME_E
 	setvar VAR_0x8004, 0  @ Vertical pan
 	setvar VAR_0x8005, 3  @ Horizontal pan
 	setvar VAR_0x8006, 4  @ Num shakes
 	setvar VAR_0x8007, 2  @ Shake delay
-	special Special_ShakeScreen
+	special ShakeScreen
 	delay 30
 	delay 50
 	waitse
@@ -59,10 +59,10 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq NavelRock_Base_EventScript_DefeatedLugia
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/NavelRock_Summit/scripts.inc

@@ -25,7 +25,7 @@ NavelRock_Summit_OnResume:: @ 8164FDD
 	end
 
 NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject 1
@@ -39,7 +39,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	special SpawnCameraObject
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
-	special Special_LoopWingFlapSound
+	special LoopWingFlapSound
 	applymovement 1, Movement_HoOhAppear
 	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
 	waitmovement 0
@@ -53,7 +53,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	delay 60
 	setvar VAR_0x8004, 3  @ Num loops
 	setvar VAR_0x8005, 35 @ Delay
-	special Special_LoopWingFlapSound
+	special LoopWingFlapSound
 	applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
 	applymovement 1, Movement_HoOhApproach
 	waitmovement 0
@@ -63,11 +63,11 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
 	setvar VAR_0x8006, ITEM_NONE
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	setvar VAR_LAST_TALKED, 1
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/OneIsland_KindleRoad/map.json

@@ -200,7 +200,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -213,7 +213,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -226,7 +226,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -239,7 +239,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -252,7 +252,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -265,7 +265,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -278,7 +278,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     },
     {
@@ -291,7 +291,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1B"
     },
     {
@@ -304,7 +304,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1C"
     },
     {
@@ -317,7 +317,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1D"
     },
     {
@@ -330,7 +330,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1E"
     },
     {
@@ -343,7 +343,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1F"
     },
     {
@@ -356,7 +356,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {

data/maps/PalletTown/scripts.inc

@@ -56,7 +56,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8
 	goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
 	msgbox PalletTown_Text_OakLetMeSeePokedex
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	getnumberstring 0, VAR_0x8008

data/maps/PalletTown_GarysHouse/scripts.inc

@@ -57,13 +57,13 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
 	compare VAR_RESULT, NO
 	goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming
 	msgbox PalletTown_GarysHouse_Text_GroomWhichOne
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	lock
 	faceplayer
 	compare VAR_0x8004, PARTY_SIZE
 	goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming
-	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
+	specialvar VAR_RESULT, GetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg
 	msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime
@@ -71,9 +71,9 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
 	fadescreen FADE_TO_BLACK
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	special Special_DaisyMassageServices
+	special DaisyMassageServices
 	fadescreen FADE_FROM_BLACK
-	special Special_GetMonNickname
+	special BufferMonNickname
 	msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone
 	release
 	end

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -32,22 +32,22 @@ PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB
 PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
 	goto_if_questlog EventScript_ReleaseEnd
 	lockall
-	setvar VAR_0x8004, 32
+	setvar VAR_0x8004, HELPCONTEXT_BEDROOM_PC
-	special Special_SetSomeVariable
+	special Script_SetHelpContext
 	setvar VAR_0x8004, 1
-	special Special_AnimatePcTurnOn
+	special AnimatePcTurnOn
 	playse SE_PC_ON
 	msgbox Text_PlayerBootedUpPC
 	special BedroomPC
 	waitstate
-	special sub_812B35C
+	special SetHelpContextForMap
 	releaseall
 	end
 
 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
-	special Special_AnimatePcTurnOff
+	special AnimatePcTurnOff
-	special sub_812B35C
+	special SetHelpContextForMap
 	releaseall
 	end

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -849,7 +849,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0
 
 PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	getnumberstring 0, VAR_0x8008

data/maps/PewterCity/map.json

@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {

data/maps/PewterCity_Museum_1F/scripts.inc

@@ -182,9 +182,9 @@ PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512
 	setvar VAR_0x8004, SPECIES_AERODACTYL
 	setvar VAR_0x8005, 10
 	setvar VAR_0x8006, 3
-	special Special_OpenMuseumFossilPic
+	special OpenMuseumFossilPic
 	msgbox PewterCity_Museum_1F_Text_AerodactylFossil
-	special Special_CloseMuseumFossilPic
+	special CloseMuseumFossilPic
 	releaseall
 	end
 
@@ -193,8 +193,8 @@ PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532
 	setvar VAR_0x8004, SPECIES_KABUTOPS
 	setvar VAR_0x8005, 10
 	setvar VAR_0x8006, 3
-	special Special_OpenMuseumFossilPic
+	special OpenMuseumFossilPic
 	msgbox PewterCity_Museum_1F_Text_KabutopsFossil
-	special Special_CloseMuseumFossilPic
+	special CloseMuseumFossilPic
 	releaseall
 	end

data/maps/PokemonLeague_ChampionsRoom/scripts.inc

@@ -78,7 +78,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76
 	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
 	waitmovement 0
 	delay 25
-	specialvar VAR_RESULT, ScrSpecial_GetStarter
+	specialvar VAR_RESULT, GetStarterSpecies
 	getspeciesname 0, VAR_RESULT
 	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
 	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight

data/maps/PokemonLeague_HallOfFame/scripts.inc

@@ -4,10 +4,10 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C
 	.byte 0
 
 PokemonLeague_HallOfFame_OnWarp:: @ 8162D57
-	map_script_2 VAR_TEMP_1, 0, EventScript_162D61
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_162D61:: @ 8162D61
+PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: @ 8162D61
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
@@ -37,7 +37,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70
 	call EventScript_SetDefeatedEliteFourFlagsVars
 	setrespawn SPAWN_PALLET_TOWN
 	fadescreenspeed FADE_TO_BLACK, 24
-	special Special_HallOfFame
+	special EnterHallOfFame
 	waitstate
 	releaseall
 	end

data/maps/PokemonLeague_LancesRoom/scripts.inc

@@ -137,7 +137,7 @@ PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1
 
 PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB
 	setvar VAR_0x8004, 0
-	special Special_TryGainNewFanFromCounter
+	special Script_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_LANCE
 	call PokemonLeague_EventScript_OpenDoorLance
 	msgbox PokemonLeague_LancesRoom_Text_PostBattle

data/maps/PokemonTower_6F/scripts.inc

@@ -7,7 +7,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
 	msgbox PokemonTower_6F_Text_BeGoneIntruders
 	goto_if_questlog EventScript_ReleaseEnd
 	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
-	special ScrSpecial_StartMarowakBattle
+	special StartMarowakBattle
 	waitstate
 	special sub_8112364
 	compare VAR_RESULT, FALSE  @ Set by CB2_EndMarowakBattle

data/maps/PowerPlant/scripts.inc

@@ -8,7 +8,7 @@ PowerPlant_OnResume:: @ 816376F
 	end
 
 PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -48,10 +48,10 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_DefeatedZapdos
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -85,7 +85,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_8112364
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_FoughtElectrode1
 	compare VAR_RESULT, B_OUTCOME_RAN
@@ -114,7 +114,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	special sub_8112364
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq PowerPlant_EventScript_FoughtElectrode2
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/RockTunnel_B1F/map.json

@@ -168,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -181,7 +181,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -194,7 +194,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -207,7 +207,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -220,7 +220,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -233,7 +233,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -246,7 +246,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -259,7 +259,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -272,7 +272,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     },
     {
@@ -285,7 +285,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1B"
     },
     {
@@ -298,7 +298,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1C"
     },
     {
@@ -311,7 +311,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1D"
     },
     {
@@ -324,7 +324,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1E"
     },
     {
@@ -337,7 +337,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1F"
     },
     {
@@ -350,7 +350,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithRockSmashRockObject",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     }
   ],

data/maps/RocketHideout_B1F/scripts.inc

@@ -45,19 +45,19 @@ RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
 	end
 
 RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
-	setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 20, 19, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
-	setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 21, 19, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
-	setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 20, 20, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
-	setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 21, 20, METATILE_SilphCo_HideoutBarrier_BottomRight, 1
-	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
 	return
 
 RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
-	setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 20, 19, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 21, 19, METATILE_Hideout_Floor, 0
+	setmetatile 21, 19, METATILE_SilphCo_HideoutFloor, 0
-	setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 20, 20, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 21, 20, METATILE_Hideout_Floor, 0
+	setmetatile 21, 20, METATILE_SilphCo_HideoutFloor, 0
-	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 21, 21, METATILE_Hideout_Floor, 0
+	setmetatile 21, 21, METATILE_SilphCo_HideoutFloor, 0
 	return

data/maps/RocketHideout_B4F/scripts.inc

@@ -114,19 +114,19 @@ RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
 	return
 
 RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
-	setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 17, 12, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
-	setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 18, 12, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
-	setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 17, 13, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
-	setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 18, 13, METATILE_SilphCo_HideoutBarrier_BottomRight, 1
-	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
 	return
 
 RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
-	setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 17, 12, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 18, 12, METATILE_Hideout_Floor, 0
+	setmetatile 18, 12, METATILE_SilphCo_HideoutFloor, 0
-	setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 17, 13, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 18, 13, METATILE_Hideout_Floor, 0
+	setmetatile 18, 13, METATILE_SilphCo_HideoutFloor, 0
-	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
-	setmetatile 18, 14, METATILE_Hideout_Floor, 0
+	setmetatile 18, 14, METATILE_SilphCo_HideoutFloor, 0
 	return

data/maps/RocketHideout_Elevator/scripts.inc

@@ -7,11 +7,11 @@ RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
 	setvar VAR_0x8004, 2
 	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
+	special DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
 	waitmessage
 	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
 	case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
@@ -73,15 +73,15 @@ RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
 	end
 
 RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
-	special Special_CloseElevatorCurrentFloorWindow
+	special CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special Special_AnimateElevator
+	special AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/Route10/map.json

@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_15"
     }
   ],

data/maps/Route10_PokemonCenter_1F/scripts.inc

@@ -38,7 +38,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_OWNED_MONS

data/maps/Route11_EastEntrance_2F/scripts.inc

@@ -65,7 +65,7 @@ Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS

data/maps/Route12/map.json

@@ -145,7 +145,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -210,7 +210,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     }
   ],

data/maps/Route12/scripts.inc

@@ -30,7 +30,7 @@ Route12_EventScript_Snorlax:: @ 8168014
 	setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq Route12_EventScript_FoughtSnorlax
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/Route12_FishingHouse/scripts.inc

@@ -33,12 +33,12 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_MAGIKARP
-	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
+	specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty
 	special GetMagikarpSizeRecordInfo
 	msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee
-	special Special_ChooseMonFromParty
+	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, PARTY_SIZE

data/maps/Route13/map.json

@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     }
   ],

data/maps/Route14/map.json

@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -179,7 +179,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -192,7 +192,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {

data/maps/Route15_WestEntrance_2F/scripts.inc

@@ -11,7 +11,7 @@ Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_ARTICUNO
-	special Special_SetSeenMon
+	special SetSeenMon
 	releaseall
 	end
 
@@ -28,7 +28,7 @@ Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS

data/maps/Route16/map.json

@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {

data/maps/Route16/scripts.inc

@@ -26,7 +26,7 @@ Route16_OnWarp:: @ 8168113
 	.2byte 0
 
 Route16_OnWarpCyclingRoad:: @ 816811D
-	special Special_ForcePlayerOntoBike
+	special ForcePlayerOntoBike
 	end
 
 Route16_EventScript_Snorlax:: @ 8168121
@@ -48,7 +48,7 @@ Route16_EventScript_Snorlax:: @ 8168121
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	dowildbattle
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq Route16_EventScript_FoughtSnorlax
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/Route16_NorthEntrance_2F/scripts.inc

@@ -28,7 +28,7 @@ Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_CAUGHT_MONS

data/maps/Route18/scripts.inc

@@ -17,7 +17,7 @@ Route18_OnWarp:: @ 8168211
 	.2byte 0
 
 Route18_OnWarpCyclingRoad:: @ 816821B
-	special Special_ForcePlayerOntoBike
+	special ForcePlayerOntoBike
 	end
 
 Route18_EventScript_RouteSign:: @ 816821F

data/maps/Route2/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_16"
     },
     {

data/maps/Route21_North/text.inc

@@ -32,6 +32,7 @@ Route21_North_Text_SpencerPostBattle:: @ 8188465
 
 @ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1.
 @ This trainer wasnt used in Gen 3 so their text goes unused/untranslated
+@ Interestingly they did add a rematch intro text for this trainer
 @ English translations from RB are listed
 
 @ "What's wrong with me swimming?"

data/maps/Route25/map.json

@@ -161,7 +161,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {

data/maps/Route25_SeaCottage/scripts.inc

@@ -262,7 +262,7 @@ Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
@@ -271,7 +271,7 @@ Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
@@ -280,7 +280,7 @@ Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
@@ -289,7 +289,7 @@ Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
-	special Special_SetSeenMon
+	special SetSeenMon
 	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 

data/maps/Route2_EastBuilding/scripts.inc

@@ -12,7 +12,7 @@ Route2_EastBuilding_EventScript_Aide:: @ 816F67F
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, Special_GetPokedexCount
+	specialvar VAR_RESULT, GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call Route2_EastBuilding_EventScript_GetAideRequestInfo
 	compare VAR_0x8006, REQUIRED_SEEN_MONS

data/maps/Route5_PokemonDayCare/text.inc

@@ -59,10 +59,10 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
 	.string "You don't have enough money.$"
 
-Text_19E01E:: @ 819E01E
+Route5_PokemonDayCare_Text_WantMeToTakeALookAtYours:: @ 819E01E
     .string "きみの\n"
     .string "みてみるかね？$"
 
-Text_19E02A:: @ 819E02A
+Route5_PokemonDayCare_Text_CantAcceptMonWithHM:: @ 819E02A
     .string "わるいけど　ひでんのわざを　もった\n"
     .string "ポケモンは　あずかれないなぁ$"

data/maps/Route8/map.json

@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {

data/maps/Route9/map.json

@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithCutTreeObject",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {

data/maps/SSAnne_2F_Room1/scripts.inc

@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
 	message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
-	special Special_SetSeenMon
+	special SetSeenMon
 	drawmonpic SPECIES_SNORLAX, 10, 3
 	waitbuttonpress
 	erasemonpic

data/maps/SSAnne_Exterior/scripts.inc

@@ -20,7 +20,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859
 	call_if_ge SSAnne_Exterior_WalkInPlaceDown
 	fadenewbgm MUS_NAMINORI
 	delay 50
-	special Special_SSAnneDepartureCutscene
+	special DoSSAnneDepartureCutscene
 	waitstate
 	removeobject 1
 	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit

data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc

@@ -82,79 +82,79 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B
-	special Special_TryLoseFansFromPlayTime
+	special Script_TryLoseFansFromPlayTime
 	setvar VAR_0x8004, FANCLUB_MEMBER1
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER2
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER3
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER4
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER5
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER6
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER7
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER8
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
 	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207
 	setobjectxyperm 1, 5, 2
-	setobjectmovementtype 1, 7
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213
 	setobjectxyperm 3, 7, 4
-	setobjectmovementtype 3, 9
+	setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F
 	setobjectxyperm 4, 2, 2
-	setobjectmovementtype 4, 7
+	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_UP
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B
 	setobjectxyperm 2, 3, 4
-	setobjectmovementtype 2, 10
+	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237
 	setobjectxyperm 6, 4, 6
-	setobjectmovementtype 6, 7
+	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243
 	setobjectxyperm 5, 10, 3
-	setobjectmovementtype 5, 7
+	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F
 	setobjectxyperm 7, 7, 5
-	setobjectmovementtype 7, 9
+	setobjectmovementtype 7, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B
 	setobjectxyperm 8, 9, 6
-	setobjectmovementtype 8, 9
+	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT
 	return
 
 SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267
@@ -169,13 +169,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER1
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
@@ -183,7 +183,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
@@ -209,13 +209,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER4
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina
@@ -223,7 +223,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay
@@ -249,13 +249,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER2
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero
@@ -263,7 +263,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts
@@ -289,13 +289,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER3
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre
@@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle
@@ -329,11 +329,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER6
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire
@@ -341,7 +341,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle
@@ -362,11 +362,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER5
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks
@@ -374,7 +374,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool
@@ -395,11 +395,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER7
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity
@@ -407,7 +407,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing
@@ -428,11 +428,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER8
-	special Special_BufferFanClubTrainerName
+	special Script_BufferFanClubTrainerName
-	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect
@@ -440,7 +440,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
 	end
 
 SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7
-	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan
 	msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational

data/maps/SeafoamIslands_1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 0,
       "trainer_type": 66,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 67,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2"
     },
     {

data/maps/SeafoamIslands_B1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 0,
       "trainer_type": 68,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 69,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2"
     },
     {

data/maps/SeafoamIslands_B2F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 0,
       "trainer_type": 70,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 0,
       "trainer_type": 71,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2"
     },
     {

data/maps/SeafoamIslands_B3F/map.json

@@ -51,7 +51,7 @@
       "movement_range_y": 0,
       "trainer_type": 77,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 0,
       "trainer_type": 76,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "EventScript_InteractWithStrengthBoulderObject",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3"
     }
   ],

data/maps/SeafoamIslands_B4F/scripts.inc

@@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048
 	end
 
 SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne EventScript_Return
 	removeobject VAR_LAST_TALKED
@@ -64,7 +64,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7
 
 SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
-	special Special_ForcePlayerToStartSurfing
+	special ForcePlayerToStartSurfing
 	end
 
 SeafoamIslands_B4F_OnFrame:: @ 81630F9
@@ -172,10 +172,10 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special Special_StartLegendaryBattle
+	special StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	specialvar VAR_RESULT, Special_GetBattleOutcome
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno
 	compare VAR_RESULT, B_OUTCOME_RAN

data/maps/SevenIsland_House_Room2/scripts.inc

@@ -46,14 +46,14 @@ SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
 
 SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
 SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
-	special Special_ShowStringVar4AsFieldMessage
+	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return