Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

asm/macros/battle_script.inc

@@ -1044,7 +1044,7 @@
 	.byte 0xcb
 	.endm
 
-	.macro callterrainattack
+	.macro callenvironmentattack
 	.byte 0xcc
 	.endm
 
@@ -1192,7 +1192,7 @@
 	.4byte \ptr
 	.endm
 
-	.macro settypetoterrain ptr:req
+	.macro settypetoenvironment ptr:req
 	.byte 0xeb
 	.4byte \ptr
 	.endm

data/battle_anim_scripts.s

@@ -2097,7 +2097,7 @@ Move_MEAN_LOOK:
 
 Move_ROCK_THROW:
 	loadspritegfx ANIM_TAG_ROCKS
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0
 	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 6
@@ -2119,7 +2119,7 @@ Move_ROCK_THROW:
 Move_ROCK_SLIDE:
 	loadspritegfx ANIM_TAG_ROCKS
 	monbg ANIM_DEF_PARTNER
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1
 	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
@@ -2909,7 +2909,7 @@ Move_BARRAGE:
 	createvisualtask AnimTask_BarrageBall, 3
 	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	delay 24
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1
 	loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2
@@ -3660,7 +3660,7 @@ Move_SUPERPOWER:
 	createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER
 	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	delay 20
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
 	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_EARTHQUAKE, 0
 	delay 40
 	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120
@@ -5011,7 +5011,7 @@ SnoreEffect:
 	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0
 	createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0
 	createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0
 	createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0
@@ -6871,7 +6871,7 @@ Move_ANCIENT_POWER:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 10, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 10, 1
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -48, 50, 2
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -38, 25, 5
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, -28, 40, 3
@@ -7292,14 +7292,14 @@ Move_METAL_CLAW:
 	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
 	delay 8
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 2
 	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
 	waitforvisualfinish
 	end
 
@@ -8515,7 +8515,7 @@ HyperVoiceEffect:
 	createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 1, 0, 6, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 1, 0, 6, 1
 	createvisualtask SoundTask_WaitForCry, 5
 	return
 
@@ -8637,7 +8637,7 @@ Move_DRAGON_CLAW:
 	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, ANIM_ATTACKER
 	delay 2
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, ANIM_ATTACKER
@@ -8650,7 +8650,7 @@ Move_DRAGON_CLAW:
 	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1
-	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
+	createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, ANIM_ATTACKER
 	delay 2
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER
@@ -9111,7 +9111,7 @@ Move_BLAST_BURN:
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 60, -30, 24, 0, 0, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, 3, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 2, 0, 10, 1
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 96, 0, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 60, 30, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 48, 24, 0, 0, 0
@@ -9125,32 +9125,32 @@ Move_BLAST_BURN:
 Move_ROCK_TOMB:
 	loadspritegfx ANIM_TAG_X_SIGN
 	loadspritegfx ANIM_TAG_ROCKS
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 2, 0, 10, 1
 	waitforvisualfinish
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0
 	delay 8
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 0, 2, 3, 1
 	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 98, 0
 	delay 8
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 0, 2, 3, 1
 	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 66, 3, 6, 64, 82, 0
 	delay 8
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 0, 2, 3, 1
 	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -3, 13, 64, 66, 0
 	delay 8
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 0, 2, 3, 1
 	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 24
 	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, ANIM_TARGET, 50
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1
-	createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1
+	createvisualtask AnimTask_ShakeBattlePlatforms, 2, 2, 0, 10, 1
 	waitforvisualfinish
 	end
 
@@ -9635,16 +9635,16 @@ Move_SKY_UPPERCUT:
 	end
 
 Move_SECRET_POWER:
-	createvisualtask AnimTask_GetBattleTerrain, 5
+	createvisualtask AnimTask_GetBattleEnvironment, 5
-	jumpargeq 0, BATTLE_TERRAIN_GRASS,      Move_NEEDLE_ARM
+	jumpargeq 0, BATTLE_ENVIRONMENT_GRASS,      Move_NEEDLE_ARM
-	jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF
+	jumpargeq 0, BATTLE_ENVIRONMENT_LONG_GRASS, Move_MAGICAL_LEAF
-	jumpargeq 0, BATTLE_TERRAIN_SAND,       Move_MUD_SHOT
+	jumpargeq 0, BATTLE_ENVIRONMENT_SAND,       Move_MUD_SHOT
-	jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL
+	jumpargeq 0, BATTLE_ENVIRONMENT_UNDERWATER, Move_WATERFALL
-	jumpargeq 0, BATTLE_TERRAIN_WATER,      Move_SURF
+	jumpargeq 0, BATTLE_ENVIRONMENT_WATER,      Move_SURF
-	jumpargeq 0, BATTLE_TERRAIN_POND,       Move_BUBBLE_BEAM
+	jumpargeq 0, BATTLE_ENVIRONMENT_POND,       Move_BUBBLE_BEAM
-	jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN,   Move_ROCK_THROW
+	jumpargeq 0, BATTLE_ENVIRONMENT_MOUNTAIN,   Move_ROCK_THROW
-	jumpargeq 0, BATTLE_TERRAIN_CAVE,       Move_BITE
+	jumpargeq 0, BATTLE_ENVIRONMENT_CAVE,       Move_BITE
-	jumpargeq 0, BATTLE_TERRAIN_BUILDING,   Move_STRENGTH
+	jumpargeq 0, BATTLE_ENVIRONMENT_BUILDING,   Move_STRENGTH
 	goto Move_SLAM
 
 Move_TWISTER:

data/battle_scripts_1.s

@@ -2289,7 +2289,7 @@ BattleScript_EffectNaturePower::
 	attackcanceler
 	attackstring
 	pause B_WAIT_TIME_SHORT
-	callterrainattack
+	callenvironmentattack
 	printstring STRINGID_NATUREPOWERTURNEDINTO
 	waitmessage B_WAIT_TIME_LONG
 	return
@@ -2799,7 +2799,7 @@ BattleScript_EffectCamouflage::
 	attackcanceler
 	attackstring
 	ppreduce
-	settypetoterrain BattleScript_ButItFailed
+	settypetoenvironment BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_PKMNCHANGEDTYPE

data/event_scripts.s

@@ -60,6 +60,7 @@
 
 	.section script_data, "aw", %progbits
 
+	.set ALLOCATE_SCRIPT_CMD_TABLE, 1
 	.include "data/script_cmd_table.inc"
 
 gSpecialVars::

data/maps/BattleFrontier_Mart/scripts.inc

@@ -26,9 +26,7 @@ BattleFrontier_Mart_Pokemart:
 	.2byte ITEM_ZINC
 	.2byte ITEM_CARBOS
 	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 BattleFrontier_Mart_EventScript_OldMan::
 	msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC

data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

@@ -41,9 +41,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart:
 	.2byte ITEM_FULL_HEAL
 	.2byte ITEM_REVIVE
 	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 @ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
 @ Its assumed the player has the remaining badges

data/maps/FallarborTown_Mart/scripts.inc

@@ -25,9 +25,7 @@ FallarborTown_Mart_Pokemart:
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_DIRE_HIT
 	.2byte ITEM_GUARD_SPEC
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 FallarborTown_Mart_EventScript_Woman::
 	msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC

data/maps/FortreeCity_DecorationShop/scripts.inc

@@ -29,9 +29,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks:
 	.2byte DECOR_BRICK_DESK
 	.2byte DECOR_CAMP_DESK
 	.2byte DECOR_HARD_DESK
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 FortreeCity_DecorationShop_EventScript_ClerkChairs::
 	lock
@@ -53,9 +51,7 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs:
 	.2byte DECOR_BRICK_CHAIR
 	.2byte DECOR_CAMP_CHAIR
 	.2byte DECOR_HARD_CHAIR
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 FortreeCity_DecorationShop_Text_MerchandiseSentToPC:
 	.string "Merchandise you buy here is sent to\n"

data/maps/FortreeCity_Mart/scripts.inc

@@ -23,9 +23,7 @@ FortreeCity_Mart_Pokemart:
 	.2byte ITEM_REVIVE
 	.2byte ITEM_SUPER_REPEL
 	.2byte ITEM_WOOD_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 FortreeCity_Mart_EventScript_Woman::
 	msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC

data/maps/LavaridgeTown_HerbShop/scripts.inc

@@ -17,9 +17,7 @@ LavaridgeTown_HerbShop_Pokemart:
 	.2byte ITEM_ENERGY_ROOT
 	.2byte ITEM_HEAL_POWDER
 	.2byte ITEM_REVIVAL_HERB
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LavaridgeTown_HerbShop_EventScript_ExpertM::
 	msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC

data/maps/LavaridgeTown_Mart/scripts.inc

@@ -22,9 +22,7 @@ LavaridgeTown_Mart_Pokemart:
 	.2byte ITEM_REVIVE
 	.2byte ITEM_SUPER_REPEL
 	.2byte ITEM_X_SPEED
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LavaridgeTown_Mart_EventScript_ExpertM::
 	msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC

data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc

@@ -36,9 +36,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart1:
 	.2byte ITEM_ICE_HEAL
 	.2byte ITEM_AWAKENING
 	.2byte ITEM_FLUFFY_TAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight::
 	lock
@@ -62,9 +60,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart2:
 	.2byte ITEM_MAX_REPEL
 	.2byte ITEM_WAVE_MAIL
 	.2byte ITEM_MECH_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly:
 	.string "Learn to use items properly.\n"

data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc

@@ -19,9 +19,7 @@ LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins:
 	.2byte ITEM_ZINC
 	.2byte ITEM_CARBOS
 	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight::
 	lock
@@ -42,9 +40,7 @@ LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters:
 	.2byte ITEM_DIRE_HIT
 	.2byte ITEM_GUARD_SPEC
 	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM::
 	msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC

data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc

@@ -29,9 +29,7 @@ LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs:
 	.2byte ITEM_TM_THUNDER
 	.2byte ITEM_TM_BLIZZARD
 	.2byte ITEM_TM_HYPER_BEAM
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight::
 	lock
@@ -49,9 +47,7 @@ LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs:
 	.2byte ITEM_TM_SAFEGUARD
 	.2byte ITEM_TM_REFLECT
 	.2byte ITEM_TM_LIGHT_SCREEN
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM:
 	.string "Hmm…\p"

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -39,9 +39,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
 	.2byte DECOR_SKITTY_DOLL
 	.2byte DECOR_SWABLU_DOLL
 	.2byte DECOR_GULPIN_DOLL
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft::
 	lock
@@ -64,9 +62,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions:
 	.2byte DECOR_GRASS_CUSHION
 	.2byte DECOR_FIRE_CUSHION
 	.2byte DECOR_WATER_CUSHION
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight::
 	lock
@@ -89,9 +85,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters:
 	.2byte DECOR_LONG_POSTER
 	.2byte DECOR_SEA_POSTER
 	.2byte DECOR_SKY_POSTER
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight::
 	lock
@@ -115,9 +109,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats:
 	.2byte DECOR_GLITTER_MAT
 	.2byte DECOR_JUMP_MAT
 	.2byte DECOR_SPIN_MAT
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_PokefanF::
 	msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC

data/maps/MauvilleCity_Mart/scripts.inc

@@ -25,9 +25,7 @@ MauvilleCity_Mart_Pokemart:
 	.2byte ITEM_GUARD_SPEC
 	.2byte ITEM_DIRE_HIT
 	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 MauvilleCity_Mart_EventScript_ExpertM::
 	msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC

data/maps/MossdeepCity_Mart/scripts.inc

@@ -22,9 +22,7 @@ MossdeepCity_Mart_Pokemart:
 	.2byte ITEM_MAX_REPEL
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 MossdeepCity_Mart_EventScript_Woman::
 	msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC

data/maps/OldaleTown_Mart/scripts.inc

@@ -18,9 +18,7 @@ OldaleTown_Mart_Pokemart_Basic:
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
 	.2byte ITEM_AWAKENING
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 OldaleTown_Mart_ExpandedItems::
 	pokemart OldaleTown_Mart_Pokemart_Expanded
@@ -35,9 +33,7 @@ OldaleTown_Mart_Pokemart_Expanded:
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
 	.2byte ITEM_AWAKENING
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 OldaleTown_Mart_EventScript_Woman::
 	lock

data/maps/PetalburgCity_Mart/scripts.inc

@@ -25,9 +25,7 @@ PetalburgCity_Mart_Pokemart_Basic:
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_ORANGE_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 PetalburgCity_Mart_EventScript_ExpandedItems::
 	pokemart PetalburgCity_Mart_Pokemart_Expanded
@@ -50,9 +48,7 @@ PetalburgCity_Mart_Pokemart_Expanded:
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_ORANGE_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 PetalburgCity_Mart_EventScript_Woman::
 	msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC

data/maps/Route104_PrettyPetalFlowerShop/scripts.inc

@@ -57,9 +57,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants:
 	.2byte DECOR_COLORFUL_PLANT
 	.2byte DECOR_BIG_PLANT
 	.2byte DECOR_GORGEOUS_PLANT
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl::
 	lock

data/maps/RustboroCity_Mart/scripts.inc

@@ -28,9 +28,7 @@ RustboroCity_Mart_Pokemart_Basic:
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 RustboroCity_Mart_EventScript_PokemartExpanded::
 	pokemart RustboroCity_Mart_Pokemart_Expanded
@@ -52,9 +50,7 @@ RustboroCity_Mart_Pokemart_Expanded:
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 RustboroCity_Mart_EventScript_PokefanF::
 	msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC

data/maps/SlateportCity/scripts.inc

@@ -131,9 +131,7 @@ SlateportCity_Pokemart_EnergyGuru:
 	.2byte ITEM_ZINC
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 SlateportCity_EventScript_EffortRibbonWoman::
 	lock
@@ -491,9 +489,7 @@ SlateportCity_PokemartDecor_Dolls:
 	.2byte DECOR_AZURILL_DOLL
 	.2byte DECOR_MARILL_DOLL
 	.2byte DECOR_SKITTY_DOLL
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 SlateportCity_EventScript_ComeBackWithSecretPower::
 	msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT
@@ -527,9 +523,7 @@ SlateportCity_PokemartDecor:
 	.2byte DECOR_A_NOTE_MAT
 	.2byte DECOR_B_NOTE_MAT
 	.2byte DECOR_C_HIGH_NOTE_MAT
-	.2byte DECOR_NONE
+	pokemartlistend
-	release
-	end
 
 SlateportCity_EventScript_PowerTMClerk::
 	lock
@@ -545,9 +539,7 @@ SlateportCity_EventScript_PowerTMClerk::
 SlateportCity_Pokemart_PowerTMs:
 	.2byte ITEM_TM_HIDDEN_POWER
 	.2byte ITEM_TM_SECRET_POWER
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 @ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine
 SlateportCity_EventScript_CaptStern::

data/maps/SlateportCity_Mart/scripts.inc

@@ -22,9 +22,7 @@ SlateportCity_Mart_Pokemart:
 	.2byte ITEM_ESCAPE_ROPE
 	.2byte ITEM_REPEL
 	.2byte ITEM_HARBOR_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 SlateportCity_Mart_EventScript_BlackBelt::
 	msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC

data/maps/SootopolisCity_Mart/scripts.inc

@@ -22,9 +22,7 @@ SootopolisCity_Mart_Pokemart:
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_SHADOW_MAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 SootopolisCity_Mart_EventScript_FatMan::
 	lock

data/maps/TrainerHill_Entrance/scripts.inc

@@ -260,9 +260,7 @@ TrainerHill_Entrance_Pokemart_Basic:
 	.2byte ITEM_DIRE_HIT
 	.2byte ITEM_GUARD_SPEC
 	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 TrainerHill_Entrance_EventScript_ExpandedPokemart::
 	pokemart TrainerHill_Entrance_Pokemart_Expanded
@@ -284,9 +282,7 @@ TrainerHill_Entrance_Pokemart_Expanded:
 	.2byte ITEM_DIRE_HIT
 	.2byte ITEM_GUARD_SPEC
 	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 TrainerHill_Entrance_Text_StillGettingReady:
 	.string "This is the TRAINER HILL where\n"

data/maps/VerdanturfTown_Mart/scripts.inc

@@ -24,9 +24,7 @@ VerdanturfTown_Mart_Pokemart:
 	.2byte ITEM_REPEL
 	.2byte ITEM_X_SPECIAL
 	.2byte ITEM_FLUFFY_TAIL
-	.2byte ITEM_NONE
+	pokemartlistend
-	release
-	end
 
 VerdanturfTown_Mart_EventScript_Boy::
 	msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC

data/script_cmd_table.inc

@@ -1,232 +1,249 @@
+	.ifndef SCRIPT_CMD_TABLE_ENTRY_MACRO
+	.set SCRIPT_CMD_TABLE_ENTRY_MACRO, 1
+	.macro script_cmd_table_entry constant:req value:req
+	.if ALLOCATE_SCRIPT_CMD_TABLE
+	.4byte \value
+	.else
+	enum \constant
+	.endif
+	.endm
+	.endif
+
+
+	enum_start
+	.if ALLOCATE_SCRIPT_CMD_TABLE
 	.align 2
 gScriptCmdTable::
-	.4byte ScrCmd_nop      	                        @ 0x00
+	.endif
-	.4byte ScrCmd_nop1                              @ 0x01
+	script_cmd_table_entry SCR_OP_NOP                           ScrCmd_nop                            @ 0x00
-	.4byte ScrCmd_end      	                        @ 0x02
+	script_cmd_table_entry SCR_OP_NOP1                          ScrCmd_nop1                           @ 0x01
-	.4byte ScrCmd_return                            @ 0x03
+	script_cmd_table_entry SCR_OP_END                           ScrCmd_end                            @ 0x02
-	.4byte ScrCmd_call                              @ 0x04
+	script_cmd_table_entry SCR_OP_RETURN                        ScrCmd_return                         @ 0x03
-	.4byte ScrCmd_goto                              @ 0x05
+	script_cmd_table_entry SCR_OP_CALL                          ScrCmd_call                           @ 0x04
-	.4byte ScrCmd_goto_if                           @ 0x06
+	script_cmd_table_entry SCR_OP_GOTO                          ScrCmd_goto                           @ 0x05
-	.4byte ScrCmd_call_if                           @ 0x07
+	script_cmd_table_entry SCR_OP_GOTO_IF                       ScrCmd_goto_if                        @ 0x06
-	.4byte ScrCmd_gotostd                           @ 0x08
+	script_cmd_table_entry SCR_OP_CALL_IF                       ScrCmd_call_if                        @ 0x07
-	.4byte ScrCmd_callstd                           @ 0x09
+	script_cmd_table_entry SCR_OP_GOTO_STD                      ScrCmd_gotostd                        @ 0x08
-	.4byte ScrCmd_gotostd_if                        @ 0x0a
+	script_cmd_table_entry SCR_OP_CALL_STD                      ScrCmd_callstd                        @ 0x09
-	.4byte ScrCmd_callstd_if                        @ 0x0b
+	script_cmd_table_entry SCR_OP_GOTO_STD_IF                   ScrCmd_gotostd_if                     @ 0x0a
-	.4byte ScrCmd_returnram                         @ 0x0c
+	script_cmd_table_entry SCR_OP_CALL_STD_IF                   ScrCmd_callstd_if                     @ 0x0b
-	.4byte ScrCmd_endram                            @ 0x0d
+	script_cmd_table_entry SCR_OP_RETURNRAM                     ScrCmd_returnram                      @ 0x0c
-	.4byte ScrCmd_setmysteryeventstatus             @ 0x0e
+	script_cmd_table_entry SCR_OP_ENDRAM                        ScrCmd_endram                         @ 0x0d
-	.4byte ScrCmd_loadword                          @ 0x0f
+	script_cmd_table_entry SCR_OP_SETMYSTERYEVENTSTATUS         ScrCmd_setmysteryeventstatus          @ 0x0e
-	.4byte ScrCmd_loadbyte                          @ 0x10
+	script_cmd_table_entry SCR_OP_LOAD_WORD                     ScrCmd_loadword                       @ 0x0f
-	.4byte ScrCmd_setptr                            @ 0x11
+	script_cmd_table_entry SCR_OP_LOAD_BYTE                     ScrCmd_loadbyte                       @ 0x10
-	.4byte ScrCmd_loadbytefromptr                   @ 0x12
+	script_cmd_table_entry SCR_OP_SETPTR                        ScrCmd_setptr                         @ 0x11
-	.4byte ScrCmd_setptrbyte                        @ 0x13
+	script_cmd_table_entry SCR_OP_LOADBYTEFROMPTR               ScrCmd_loadbytefromptr                @ 0x12
-	.4byte ScrCmd_copylocal                         @ 0x14
+	script_cmd_table_entry SCR_OP_SETPTRBYTE                    ScrCmd_setptrbyte                     @ 0x13
-	.4byte ScrCmd_copybyte                          @ 0x15
+	script_cmd_table_entry SCR_OP_COPYLOCAL                     ScrCmd_copylocal                      @ 0x14
-	.4byte ScrCmd_setvar                            @ 0x16
+	script_cmd_table_entry SCR_OP_COPYBYTE                      ScrCmd_copybyte                       @ 0x15
-	.4byte ScrCmd_addvar                            @ 0x17
+	script_cmd_table_entry SCR_OP_SETVAR                        ScrCmd_setvar                         @ 0x16
-	.4byte ScrCmd_subvar                            @ 0x18
+	script_cmd_table_entry SCR_OP_ADDVAR                        ScrCmd_addvar                         @ 0x17
-	.4byte ScrCmd_copyvar                           @ 0x19
+	script_cmd_table_entry SCR_OP_SUBVAR                        ScrCmd_subvar                         @ 0x18
-	.4byte ScrCmd_setorcopyvar                      @ 0x1a
+	script_cmd_table_entry SCR_OP_COPYVAR                       ScrCmd_copyvar                        @ 0x19
-	.4byte ScrCmd_compare_local_to_local            @ 0x1b
+	script_cmd_table_entry SCR_OP_SETORCOPYVAR                  ScrCmd_setorcopyvar                   @ 0x1a
-	.4byte ScrCmd_compare_local_to_value            @ 0x1c
+	script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_LOCAL        ScrCmd_compare_local_to_local         @ 0x1b
-	.4byte ScrCmd_compare_local_to_ptr              @ 0x1d
+	script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_VALUE        ScrCmd_compare_local_to_value         @ 0x1c
-	.4byte ScrCmd_compare_ptr_to_local              @ 0x1e
+	script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_PTR          ScrCmd_compare_local_to_ptr           @ 0x1d
-	.4byte ScrCmd_compare_ptr_to_value              @ 0x1f
+	script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_LOCAL          ScrCmd_compare_ptr_to_local           @ 0x1e
-	.4byte ScrCmd_compare_ptr_to_ptr                @ 0x20
+	script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_VALUE          ScrCmd_compare_ptr_to_value           @ 0x1f
-	.4byte ScrCmd_compare_var_to_value              @ 0x21
+	script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_PTR            ScrCmd_compare_ptr_to_ptr             @ 0x20
-	.4byte ScrCmd_compare_var_to_var                @ 0x22
+	script_cmd_table_entry SCR_OP_COMPARE_VAR_TO_VALUE          ScrCmd_compare_var_to_value           @ 0x21
-	.4byte ScrCmd_callnative                        @ 0x23
+	script_cmd_table_entry SCR_OP_COMPARE_VAR_TO_VAR            ScrCmd_compare_var_to_var             @ 0x22
-	.4byte ScrCmd_gotonative                        @ 0x24
+	script_cmd_table_entry SCR_OP_CALLNATIVE                    ScrCmd_callnative                     @ 0x23
-	.4byte ScrCmd_special                           @ 0x25
+	script_cmd_table_entry SCR_OP_GOTONATIVE                    ScrCmd_gotonative                     @ 0x24
-	.4byte ScrCmd_specialvar                        @ 0x26
+	script_cmd_table_entry SCR_OP_SPECIAL                       ScrCmd_special                        @ 0x25
-	.4byte ScrCmd_waitstate                         @ 0x27
+	script_cmd_table_entry SCR_OP_SPECIALVAR                    ScrCmd_specialvar                     @ 0x26
-	.4byte ScrCmd_delay                             @ 0x28
+	script_cmd_table_entry SCR_OP_WAITSTATE                     ScrCmd_waitstate                      @ 0x27
-	.4byte ScrCmd_setflag                           @ 0x29
+	script_cmd_table_entry SCR_OP_DELAY                         ScrCmd_delay                          @ 0x28
-	.4byte ScrCmd_clearflag                         @ 0x2a
+	script_cmd_table_entry SCR_OP_SETFLAG                       ScrCmd_setflag                        @ 0x29
-	.4byte ScrCmd_checkflag                         @ 0x2b
+	script_cmd_table_entry SCR_OP_CLEARFLAG                     ScrCmd_clearflag                      @ 0x2a
-	.4byte ScrCmd_initclock                         @ 0x2c
+	script_cmd_table_entry SCR_OP_CHECKFLAG                     ScrCmd_checkflag                      @ 0x2b
-	.4byte ScrCmd_dotimebasedevents                 @ 0x2d
+	script_cmd_table_entry SCR_OP_INITCLOCK                     ScrCmd_initclock                      @ 0x2c
-	.4byte ScrCmd_gettime                           @ 0x2e
+	script_cmd_table_entry SCR_OP_DOTIMEBASEDEVENTS             ScrCmd_dotimebasedevents              @ 0x2d
-	.4byte ScrCmd_playse                            @ 0x2f
+	script_cmd_table_entry SCR_OP_GETTIME                       ScrCmd_gettime                        @ 0x2e
-	.4byte ScrCmd_waitse                            @ 0x30
+	script_cmd_table_entry SCR_OP_PLAYSE                        ScrCmd_playse                         @ 0x2f
-	.4byte ScrCmd_playfanfare                       @ 0x31
+	script_cmd_table_entry SCR_OP_WAITSE                        ScrCmd_waitse                         @ 0x30
-	.4byte ScrCmd_waitfanfare                       @ 0x32
+	script_cmd_table_entry SCR_OP_PLAYFANFARE                   ScrCmd_playfanfare                    @ 0x31
-	.4byte ScrCmd_playbgm                           @ 0x33
+	script_cmd_table_entry SCR_OP_WAITFANFARE                   ScrCmd_waitfanfare                    @ 0x32
-	.4byte ScrCmd_savebgm                           @ 0x34
+	script_cmd_table_entry SCR_OP_PLAYBGM                       ScrCmd_playbgm                        @ 0x33
-	.4byte ScrCmd_fadedefaultbgm                    @ 0x35
+	script_cmd_table_entry SCR_OP_SAVEBGM                       ScrCmd_savebgm                        @ 0x34
-	.4byte ScrCmd_fadenewbgm                        @ 0x36
+	script_cmd_table_entry SCR_OP_FADEDEFAULTBGM                ScrCmd_fadedefaultbgm                 @ 0x35
-	.4byte ScrCmd_fadeoutbgm                        @ 0x37
+	script_cmd_table_entry SCR_OP_FADENEWBGM                    ScrCmd_fadenewbgm                     @ 0x36
-	.4byte ScrCmd_fadeinbgm                         @ 0x38
+	script_cmd_table_entry SCR_OP_FADEOUTBGM                    ScrCmd_fadeoutbgm                     @ 0x37
-	.4byte ScrCmd_warp                              @ 0x39
+	script_cmd_table_entry SCR_OP_FADEINBGM                     ScrCmd_fadeinbgm                      @ 0x38
-	.4byte ScrCmd_warpsilent                        @ 0x3a
+	script_cmd_table_entry SCR_OP_WARP                          ScrCmd_warp                           @ 0x39
-	.4byte ScrCmd_warpdoor                          @ 0x3b
+	script_cmd_table_entry SCR_OP_WARPSILENT                    ScrCmd_warpsilent                     @ 0x3a
-	.4byte ScrCmd_warphole                          @ 0x3c
+	script_cmd_table_entry SCR_OP_WARPDOOR                      ScrCmd_warpdoor                       @ 0x3b
-	.4byte ScrCmd_warpteleport                      @ 0x3d
+	script_cmd_table_entry SCR_OP_WARPHOLE                      ScrCmd_warphole                       @ 0x3c
-	.4byte ScrCmd_setwarp                           @ 0x3e
+	script_cmd_table_entry SCR_OP_WARPTELEPORT                  ScrCmd_warpteleport                   @ 0x3d
-	.4byte ScrCmd_setdynamicwarp                    @ 0x3f
+	script_cmd_table_entry SCR_OP_SETWARP                       ScrCmd_setwarp                        @ 0x3e
-	.4byte ScrCmd_setdivewarp                       @ 0x40
+	script_cmd_table_entry SCR_OP_SETDYNAMICWARP                ScrCmd_setdynamicwarp                 @ 0x3f
-	.4byte ScrCmd_setholewarp                       @ 0x41
+	script_cmd_table_entry SCR_OP_SETDIVEWARP                   ScrCmd_setdivewarp                    @ 0x40
-	.4byte ScrCmd_getplayerxy                       @ 0x42
+	script_cmd_table_entry SCR_OP_SETHOLEWARP                   ScrCmd_setholewarp                    @ 0x41
-	.4byte ScrCmd_getpartysize                      @ 0x43
+	script_cmd_table_entry SCR_OP_GETPLAYERXY                   ScrCmd_getplayerxy                    @ 0x42
-	.4byte ScrCmd_additem                           @ 0x44
+	script_cmd_table_entry SCR_OP_GETPARTYSIZE                  ScrCmd_getpartysize                   @ 0x43
-	.4byte ScrCmd_removeitem                        @ 0x45
+	script_cmd_table_entry SCR_OP_ADDITEM                       ScrCmd_additem                        @ 0x44
-	.4byte ScrCmd_checkitemspace                    @ 0x46
+	script_cmd_table_entry SCR_OP_REMOVEITEM                    ScrCmd_removeitem                     @ 0x45
-	.4byte ScrCmd_checkitem                         @ 0x47
+	script_cmd_table_entry SCR_OP_CHECKITEMSPACE                ScrCmd_checkitemspace                 @ 0x46
-	.4byte ScrCmd_checkitemtype                     @ 0x48
+	script_cmd_table_entry SCR_OP_CHECKITEM                     ScrCmd_checkitem                      @ 0x47
-	.4byte ScrCmd_addpcitem                         @ 0x49
+	script_cmd_table_entry SCR_OP_CHECKITEMTYPE                 ScrCmd_checkitemtype                  @ 0x48
-	.4byte ScrCmd_checkpcitem                       @ 0x4a
+	script_cmd_table_entry SCR_OP_ADDPCITEM                     ScrCmd_addpcitem                      @ 0x49
-	.4byte ScrCmd_adddecoration                     @ 0x4b
+	script_cmd_table_entry SCR_OP_CHECKPCITEM                   ScrCmd_checkpcitem                    @ 0x4a
-	.4byte ScrCmd_removedecoration                  @ 0x4c
+	script_cmd_table_entry SCR_OP_ADDDECORATION                 ScrCmd_adddecoration                  @ 0x4b
-	.4byte ScrCmd_checkdecor                        @ 0x4d
+	script_cmd_table_entry SCR_OP_REMOVEDECORATION              ScrCmd_removedecoration               @ 0x4c
-	.4byte ScrCmd_checkdecorspace                   @ 0x4e
+	script_cmd_table_entry SCR_OP_CHECKDECOR                    ScrCmd_checkdecor                     @ 0x4d
-	.4byte ScrCmd_applymovement                     @ 0x4f
+	script_cmd_table_entry SCR_OP_CHECKDECORSPACE               ScrCmd_checkdecorspace                @ 0x4e
-	.4byte ScrCmd_applymovementat                   @ 0x50
+	script_cmd_table_entry SCR_OP_APPLYMOVEMENT                 ScrCmd_applymovement                  @ 0x4f
-	.4byte ScrCmd_waitmovement                      @ 0x51
+	script_cmd_table_entry SCR_OP_APPLYMOVEMENTAT               ScrCmd_applymovementat                @ 0x50
-	.4byte ScrCmd_waitmovementat                    @ 0x52
+	script_cmd_table_entry SCR_OP_WAITMOVEMENT                  ScrCmd_waitmovement                   @ 0x51
-	.4byte ScrCmd_removeobject                      @ 0x53
+	script_cmd_table_entry SCR_OP_WAITMOVEMENTAT                ScrCmd_waitmovementat                 @ 0x52
-	.4byte ScrCmd_removeobjectat                    @ 0x54
+	script_cmd_table_entry SCR_OP_REMOVEOBJECT                  ScrCmd_removeobject                   @ 0x53
-	.4byte ScrCmd_addobject                         @ 0x55
+	script_cmd_table_entry SCR_OP_REMOVEOBJECTAT                ScrCmd_removeobjectat                 @ 0x54
-	.4byte ScrCmd_addobjectat                       @ 0x56
+	script_cmd_table_entry SCR_OP_ADDOBJECT                     ScrCmd_addobject                      @ 0x55
-	.4byte ScrCmd_setobjectxy                       @ 0x57
+	script_cmd_table_entry SCR_OP_ADDOBJECTAT                   ScrCmd_addobjectat                    @ 0x56
-	.4byte ScrCmd_showobjectat                      @ 0x58
+	script_cmd_table_entry SCR_OP_SETOBJECTXY                   ScrCmd_setobjectxy                    @ 0x57
-	.4byte ScrCmd_hideobjectat                      @ 0x59
+	script_cmd_table_entry SCR_OP_SHOWOBJECTAT                  ScrCmd_showobjectat                   @ 0x58
-	.4byte ScrCmd_faceplayer                        @ 0x5a
+	script_cmd_table_entry SCR_OP_HIDEOBJECTAT                  ScrCmd_hideobjectat                   @ 0x59
-	.4byte ScrCmd_turnobject                        @ 0x5b
+	script_cmd_table_entry SCR_OP_FACEPLAYER                    ScrCmd_faceplayer                     @ 0x5a
-	.4byte ScrCmd_trainerbattle                     @ 0x5c
+	script_cmd_table_entry SCR_OP_TURNOBJECT                    ScrCmd_turnobject                     @ 0x5b
-	.4byte ScrCmd_dotrainerbattle                   @ 0x5d
+	script_cmd_table_entry SCR_OP_TRAINERBATTLE                 ScrCmd_trainerbattle                  @ 0x5c
-	.4byte ScrCmd_gotopostbattlescript              @ 0x5e
+	script_cmd_table_entry SCR_OP_DOTRAINERBATTLE               ScrCmd_dotrainerbattle                @ 0x5d
-	.4byte ScrCmd_gotobeatenscript                  @ 0x5f
+	script_cmd_table_entry SCR_OP_GOTOPOSTBATTLESCRIPT          ScrCmd_gotopostbattlescript           @ 0x5e
-	.4byte ScrCmd_checktrainerflag                  @ 0x60
+	script_cmd_table_entry SCR_OP_GOTOBEATENSCRIPT              ScrCmd_gotobeatenscript               @ 0x5f
-	.4byte ScrCmd_settrainerflag                    @ 0x61
+	script_cmd_table_entry SCR_OP_CHECKTRAINERFLAG              ScrCmd_checktrainerflag               @ 0x60
-	.4byte ScrCmd_cleartrainerflag                  @ 0x62
+	script_cmd_table_entry SCR_OP_SETTRAINERFLAG                ScrCmd_settrainerflag                 @ 0x61
-	.4byte ScrCmd_setobjectxyperm                   @ 0x63
+	script_cmd_table_entry SCR_OP_CLEARTRAINERFLAG              ScrCmd_cleartrainerflag               @ 0x62
-	.4byte ScrCmd_copyobjectxytoperm                @ 0x64
+	script_cmd_table_entry SCR_OP_SETOBJECTXYPERM               ScrCmd_setobjectxyperm                @ 0x63
-	.4byte ScrCmd_setobjectmovementtype             @ 0x65
+	script_cmd_table_entry SCR_OP_COPYOBJECTXYTOPERM            ScrCmd_copyobjectxytoperm             @ 0x64
-	.4byte ScrCmd_waitmessage                       @ 0x66
+	script_cmd_table_entry SCR_OP_SETOBJECTMOVEMENTTYPE         ScrCmd_setobjectmovementtype          @ 0x65
-	.4byte ScrCmd_message                           @ 0x67
+	script_cmd_table_entry SCR_OP_WAITMESSAGE                   ScrCmd_waitmessage                    @ 0x66
-	.4byte ScrCmd_closemessage                      @ 0x68
+	script_cmd_table_entry SCR_OP_MESSAGE                       ScrCmd_message                        @ 0x67
-	.4byte ScrCmd_lockall                           @ 0x69
+	script_cmd_table_entry SCR_OP_CLOSEMESSAGE                  ScrCmd_closemessage                   @ 0x68
-	.4byte ScrCmd_lock                              @ 0x6a
+	script_cmd_table_entry SCR_OP_LOCKALL                       ScrCmd_lockall                        @ 0x69
-	.4byte ScrCmd_releaseall                        @ 0x6b
+	script_cmd_table_entry SCR_OP_LOCK                          ScrCmd_lock                           @ 0x6a
-	.4byte ScrCmd_release                           @ 0x6c
+	script_cmd_table_entry SCR_OP_RELEASEALL                    ScrCmd_releaseall                     @ 0x6b
-	.4byte ScrCmd_waitbuttonpress                   @ 0x6d
+	script_cmd_table_entry SCR_OP_RELEASE                       ScrCmd_release                        @ 0x6c
-	.4byte ScrCmd_yesnobox                          @ 0x6e
+	script_cmd_table_entry SCR_OP_WAITBUTTONPRESS               ScrCmd_waitbuttonpress                @ 0x6d
-	.4byte ScrCmd_multichoice                       @ 0x6f
+	script_cmd_table_entry SCR_OP_YESNOBOX                      ScrCmd_yesnobox                       @ 0x6e
-	.4byte ScrCmd_multichoicedefault                @ 0x70
+	script_cmd_table_entry SCR_OP_MULTICHOICE                   ScrCmd_multichoice                    @ 0x6f
-	.4byte ScrCmd_multichoicegrid                   @ 0x71
+	script_cmd_table_entry SCR_OP_MULTICHOICEDEFAULT            ScrCmd_multichoicedefault             @ 0x70
-	.4byte ScrCmd_drawbox                           @ 0x72
+	script_cmd_table_entry SCR_OP_MULTICHOICEGRID               ScrCmd_multichoicegrid                @ 0x71
-	.4byte ScrCmd_erasebox                          @ 0x73
+	script_cmd_table_entry SCR_OP_DRAWBOX                       ScrCmd_drawbox                        @ 0x72
-	.4byte ScrCmd_drawboxtext                       @ 0x74
+	script_cmd_table_entry SCR_OP_ERASEBOX                      ScrCmd_erasebox                       @ 0x73
-	.4byte ScrCmd_showmonpic                        @ 0x75
+	script_cmd_table_entry SCR_OP_DRAWBOXTEXT                   ScrCmd_drawboxtext                    @ 0x74
-	.4byte ScrCmd_hidemonpic                        @ 0x76
+	script_cmd_table_entry SCR_OP_SHOWMONPIC                    ScrCmd_showmonpic                     @ 0x75
-	.4byte ScrCmd_showcontestpainting               @ 0x77
+	script_cmd_table_entry SCR_OP_HIDEMONPIC                    ScrCmd_hidemonpic                     @ 0x76
-	.4byte ScrCmd_braillemessage                    @ 0x78
+	script_cmd_table_entry SCR_OP_SHOWCONTESTPAINTING           ScrCmd_showcontestpainting            @ 0x77
-	.4byte ScrCmd_givemon                           @ 0x79
+	script_cmd_table_entry SCR_OP_BRAILLEMESSAGE                ScrCmd_braillemessage                 @ 0x78
-	.4byte ScrCmd_giveegg                           @ 0x7a
+	script_cmd_table_entry SCR_OP_GIVEMON                       ScrCmd_givemon                        @ 0x79
-	.4byte ScrCmd_setmonmove                        @ 0x7b
+	script_cmd_table_entry SCR_OP_GIVEEGG                       ScrCmd_giveegg                        @ 0x7a
-	.4byte ScrCmd_checkpartymove                    @ 0x7c
+	script_cmd_table_entry SCR_OP_SETMONMOVE                    ScrCmd_setmonmove                     @ 0x7b
-	.4byte ScrCmd_bufferspeciesname                 @ 0x7d
+	script_cmd_table_entry SCR_OP_CHECKPARTYMOVE                ScrCmd_checkpartymove                 @ 0x7c
-	.4byte ScrCmd_bufferleadmonspeciesname          @ 0x7e
+	script_cmd_table_entry SCR_OP_BUFFERSPECIESNAME             ScrCmd_bufferspeciesname              @ 0x7d
-	.4byte ScrCmd_bufferpartymonnick                @ 0x7f
+	script_cmd_table_entry SCR_OP_BUFFERLEADMONSPECIESNAME      ScrCmd_bufferleadmonspeciesname       @ 0x7e
-	.4byte ScrCmd_bufferitemname                    @ 0x80
+	script_cmd_table_entry SCR_OP_BUFFERPARTYMONNICK            ScrCmd_bufferpartymonnick             @ 0x7f
-	.4byte ScrCmd_bufferdecorationname              @ 0x81
+	script_cmd_table_entry SCR_OP_BUFFERITEMNAME                ScrCmd_bufferitemname                 @ 0x80
-	.4byte ScrCmd_buffermovename                    @ 0x82
+	script_cmd_table_entry SCR_OP_BUFFERDECORATIONNAME          ScrCmd_bufferdecorationname           @ 0x81
-	.4byte ScrCmd_buffernumberstring                @ 0x83
+	script_cmd_table_entry SCR_OP_BUFFERMOVENAME                ScrCmd_buffermovename                 @ 0x82
-	.4byte ScrCmd_bufferstdstring                   @ 0x84
+	script_cmd_table_entry SCR_OP_BUFFERNUMBERSTRING            ScrCmd_buffernumberstring             @ 0x83
-	.4byte ScrCmd_bufferstring                      @ 0x85
+	script_cmd_table_entry SCR_OP_BUFFERSTDSTRING               ScrCmd_bufferstdstring                @ 0x84
-	.4byte ScrCmd_pokemart                          @ 0x86
+	script_cmd_table_entry SCR_OP_BUFFERSTRING                  ScrCmd_bufferstring                   @ 0x85
-	.4byte ScrCmd_pokemartdecoration                @ 0x87
+	script_cmd_table_entry SCR_OP_POKEMART                      ScrCmd_pokemart                       @ 0x86
-	.4byte ScrCmd_pokemartdecoration2               @ 0x88
+	script_cmd_table_entry SCR_OP_POKEMARTDECORATION            ScrCmd_pokemartdecoration             @ 0x87
-	.4byte ScrCmd_playslotmachine                   @ 0x89
+	script_cmd_table_entry SCR_OP_POKEMARTDECORATION2           ScrCmd_pokemartdecoration2            @ 0x88
-	.4byte ScrCmd_setberrytree                      @ 0x8a
+	script_cmd_table_entry SCR_OP_PLAYSLOTMACHINE               ScrCmd_playslotmachine                @ 0x89
-	.4byte ScrCmd_choosecontestmon                  @ 0x8b
+	script_cmd_table_entry SCR_OP_SETBERRYTREE                  ScrCmd_setberrytree                   @ 0x8a
-	.4byte ScrCmd_startcontest                      @ 0x8c
+	script_cmd_table_entry SCR_OP_CHOOSECONTESTMON              ScrCmd_choosecontestmon               @ 0x8b
-	.4byte ScrCmd_showcontestresults                @ 0x8d
+	script_cmd_table_entry SCR_OP_STARTCONTEST                  ScrCmd_startcontest                   @ 0x8c
-	.4byte ScrCmd_contestlinktransfer               @ 0x8e
+	script_cmd_table_entry SCR_OP_SHOWCONTESTRESULTS            ScrCmd_showcontestresults             @ 0x8d
-	.4byte ScrCmd_random                            @ 0x8f
+	script_cmd_table_entry SCR_OP_CONTESTLINKTRANSFER           ScrCmd_contestlinktransfer            @ 0x8e
-	.4byte ScrCmd_addmoney                          @ 0x90
+	script_cmd_table_entry SCR_OP_RANDOM                        ScrCmd_random                         @ 0x8f
-	.4byte ScrCmd_removemoney                       @ 0x91
+	script_cmd_table_entry SCR_OP_ADDMONEY                      ScrCmd_addmoney                       @ 0x90
-	.4byte ScrCmd_checkmoney                        @ 0x92
+	script_cmd_table_entry SCR_OP_REMOVEMONEY                   ScrCmd_removemoney                    @ 0x91
-	.4byte ScrCmd_showmoneybox                      @ 0x93
+	script_cmd_table_entry SCR_OP_CHECKMONEY                    ScrCmd_checkmoney                     @ 0x92
-	.4byte ScrCmd_hidemoneybox                      @ 0x94
+	script_cmd_table_entry SCR_OP_SHOWMONEYBOX                  ScrCmd_showmoneybox                   @ 0x93
-	.4byte ScrCmd_updatemoneybox                    @ 0x95
+	script_cmd_table_entry SCR_OP_HIDEMONEYBOX                  ScrCmd_hidemoneybox                   @ 0x94
-	.4byte ScrCmd_getpokenewsactive                 @ 0x96
+	script_cmd_table_entry SCR_OP_UPDATEMONEYBOX                ScrCmd_updatemoneybox                 @ 0x95
-	.4byte ScrCmd_fadescreen                        @ 0x97
+	script_cmd_table_entry SCR_OP_GETPOKENEWSACTIVE             ScrCmd_getpokenewsactive              @ 0x96
-	.4byte ScrCmd_fadescreenspeed                   @ 0x98
+	script_cmd_table_entry SCR_OP_FADESCREEN                    ScrCmd_fadescreen                     @ 0x97
-	.4byte ScrCmd_setflashlevel                     @ 0x99
+	script_cmd_table_entry SCR_OP_FADESCREENSPEED               ScrCmd_fadescreenspeed                @ 0x98
-	.4byte ScrCmd_animateflash                      @ 0x9a
+	script_cmd_table_entry SCR_OP_SETFLASHLEVEL                 ScrCmd_setflashlevel                  @ 0x99
-	.4byte ScrCmd_messageautoscroll                 @ 0x9b
+	script_cmd_table_entry SCR_OP_ANIMATEFLASH                  ScrCmd_animateflash                   @ 0x9a
-	.4byte ScrCmd_dofieldeffect                     @ 0x9c
+	script_cmd_table_entry SCR_OP_MESSAGEAUTOSCROLL             ScrCmd_messageautoscroll              @ 0x9b
-	.4byte ScrCmd_setfieldeffectargument            @ 0x9d
+	script_cmd_table_entry SCR_OP_DOFIELDEFFECT                 ScrCmd_dofieldeffect                  @ 0x9c
-	.4byte ScrCmd_waitfieldeffect                   @ 0x9e
+	script_cmd_table_entry SCR_OP_SETFIELDEFFECTARGUMENT        ScrCmd_setfieldeffectargument         @ 0x9d
-	.4byte ScrCmd_setrespawn                        @ 0x9f
+	script_cmd_table_entry SCR_OP_WAITFIELDEFFECT               ScrCmd_waitfieldeffect                @ 0x9e
-	.4byte ScrCmd_checkplayergender                 @ 0xa0
+	script_cmd_table_entry SCR_OP_SETRESPAWN                    ScrCmd_setrespawn                     @ 0x9f
-	.4byte ScrCmd_playmoncry                        @ 0xa1
+	script_cmd_table_entry SCR_OP_CHECKPLAYERGENDER             ScrCmd_checkplayergender              @ 0xa0
-	.4byte ScrCmd_setmetatile                       @ 0xa2
+	script_cmd_table_entry SCR_OP_PLAYMONCRY                    ScrCmd_playmoncry                     @ 0xa1
-	.4byte ScrCmd_resetweather                      @ 0xa3
+	script_cmd_table_entry SCR_OP_SETMETATILE                   ScrCmd_setmetatile                    @ 0xa2
-	.4byte ScrCmd_setweather                        @ 0xa4
+	script_cmd_table_entry SCR_OP_RESETWEATHER                  ScrCmd_resetweather                   @ 0xa3
-	.4byte ScrCmd_doweather                         @ 0xa5
+	script_cmd_table_entry SCR_OP_SETWEATHER                    ScrCmd_setweather                     @ 0xa4
-	.4byte ScrCmd_setstepcallback                   @ 0xa6
+	script_cmd_table_entry SCR_OP_DOWEATHER                     ScrCmd_doweather                      @ 0xa5
-	.4byte ScrCmd_setmaplayoutindex                 @ 0xa7
+	script_cmd_table_entry SCR_OP_SETSTEPCALLBACK               ScrCmd_setstepcallback                @ 0xa6
-	.4byte ScrCmd_setobjectsubpriority              @ 0xa8
+	script_cmd_table_entry SCR_OP_SETMAPLAYOUTINDEX             ScrCmd_setmaplayoutindex              @ 0xa7
-	.4byte ScrCmd_resetobjectsubpriority            @ 0xa9
+	script_cmd_table_entry SCR_OP_SETOBJECTSUBPRIORITY          ScrCmd_setobjectsubpriority           @ 0xa8
-	.4byte ScrCmd_createvobject                     @ 0xaa
+	script_cmd_table_entry SCR_OP_RESETOBJECTSUBPRIORITY        ScrCmd_resetobjectsubpriority         @ 0xa9
-	.4byte ScrCmd_turnvobject                       @ 0xab
+	script_cmd_table_entry SCR_OP_CREATEVOBJECT                 ScrCmd_createvobject                  @ 0xaa
-	.4byte ScrCmd_opendoor                          @ 0xac
+	script_cmd_table_entry SCR_OP_TURNVOBJECT                   ScrCmd_turnvobject                    @ 0xab
-	.4byte ScrCmd_closedoor                         @ 0xad
+	script_cmd_table_entry SCR_OP_OPENDOOR                      ScrCmd_opendoor                       @ 0xac
-	.4byte ScrCmd_waitdooranim                      @ 0xae
+	script_cmd_table_entry SCR_OP_CLOSEDOOR                     ScrCmd_closedoor                      @ 0xad
-	.4byte ScrCmd_setdooropen                       @ 0xaf
+	script_cmd_table_entry SCR_OP_WAITDOORANIM                  ScrCmd_waitdooranim                   @ 0xae
-	.4byte ScrCmd_setdoorclosed                     @ 0xb0
+	script_cmd_table_entry SCR_OP_SETDOOROPEN                   ScrCmd_setdooropen                    @ 0xaf
-	.4byte ScrCmd_addelevmenuitem                   @ 0xb1
+	script_cmd_table_entry SCR_OP_SETDOORCLOSED                 ScrCmd_setdoorclosed                  @ 0xb0
-	.4byte ScrCmd_showelevmenu                      @ 0xb2
+	script_cmd_table_entry SCR_OP_ADDELEVMENUITEM               ScrCmd_addelevmenuitem                @ 0xb1
-	.4byte ScrCmd_checkcoins                        @ 0xb3
+	script_cmd_table_entry SCR_OP_SHOWELEVMENU                  ScrCmd_showelevmenu                   @ 0xb2
-	.4byte ScrCmd_addcoins                          @ 0xb4
+	script_cmd_table_entry SCR_OP_CHECKCOINS                    ScrCmd_checkcoins                     @ 0xb3
-	.4byte ScrCmd_removecoins                       @ 0xb5
+	script_cmd_table_entry SCR_OP_ADDCOINS                      ScrCmd_addcoins                       @ 0xb4
-	.4byte ScrCmd_setwildbattle                     @ 0xb6
+	script_cmd_table_entry SCR_OP_REMOVECOINS                   ScrCmd_removecoins                    @ 0xb5
-	.4byte ScrCmd_dowildbattle                      @ 0xb7
+	script_cmd_table_entry SCR_OP_SETWILDBATTLE                 ScrCmd_setwildbattle                  @ 0xb6
-	.4byte ScrCmd_setvaddress                       @ 0xb8
+	script_cmd_table_entry SCR_OP_DOWILDBATTLE                  ScrCmd_dowildbattle                   @ 0xb7
-	.4byte ScrCmd_vgoto                             @ 0xb9
+	script_cmd_table_entry SCR_OP_SETVADDRESS                   ScrCmd_setvaddress                    @ 0xb8
-	.4byte ScrCmd_vcall                             @ 0xba
+	script_cmd_table_entry SCR_OP_VGOTO                         ScrCmd_vgoto                          @ 0xb9
-	.4byte ScrCmd_vgoto_if                          @ 0xbb
+	script_cmd_table_entry SCR_OP_VCALL                         ScrCmd_vcall                          @ 0xba
-	.4byte ScrCmd_vcall_if                          @ 0xbc
+	script_cmd_table_entry SCR_OP_VGOTO_IF                      ScrCmd_vgoto_if                       @ 0xbb
-	.4byte ScrCmd_vmessage                          @ 0xbd
+	script_cmd_table_entry SCR_OP_VCALL_IF                      ScrCmd_vcall_if                       @ 0xbc
-	.4byte ScrCmd_vbuffermessage                    @ 0xbe
+	script_cmd_table_entry SCR_OP_VMESSAGE                      ScrCmd_vmessage                       @ 0xbd
-	.4byte ScrCmd_vbufferstring                     @ 0xbf
+	script_cmd_table_entry SCR_OP_VBUFFERMESSAGE                ScrCmd_vbuffermessage                 @ 0xbe
-	.4byte ScrCmd_showcoinsbox                      @ 0xc0
+	script_cmd_table_entry SCR_OP_VBUFFERSTRING                 ScrCmd_vbufferstring                  @ 0xbf
-	.4byte ScrCmd_hidecoinsbox                      @ 0xc1
+	script_cmd_table_entry SCR_OP_SHOWCOINSBOX                  ScrCmd_showcoinsbox                   @ 0xc0
-	.4byte ScrCmd_updatecoinsbox                    @ 0xc2
+	script_cmd_table_entry SCR_OP_HIDECOINSBOX                  ScrCmd_hidecoinsbox                   @ 0xc1
-	.4byte ScrCmd_incrementgamestat                 @ 0xc3
+	script_cmd_table_entry SCR_OP_UPDATECOINSBOX                ScrCmd_updatecoinsbox                 @ 0xc2
-	.4byte ScrCmd_setescapewarp                     @ 0xc4
+	script_cmd_table_entry SCR_OP_INCREMENTGAMESTAT             ScrCmd_incrementgamestat              @ 0xc3
-	.4byte ScrCmd_waitmoncry                        @ 0xc5
+	script_cmd_table_entry SCR_OP_SETESCAPEWARP                 ScrCmd_setescapewarp                  @ 0xc4
-	.4byte ScrCmd_bufferboxname                     @ 0xc6
+	script_cmd_table_entry SCR_OP_WAITMONCRY                    ScrCmd_waitmoncry                     @ 0xc5
-	.4byte ScrCmd_nop1                              @ 0xc7
+	script_cmd_table_entry SCR_OP_BUFFERBOXNAME                 ScrCmd_bufferboxname                  @ 0xc6
-	.4byte ScrCmd_nop1                              @ 0xc8
+	script_cmd_table_entry SCR_OP_TEXTCOLOR                     ScrCmd_nop1                           @ 0xc7
-	.4byte ScrCmd_nop1                              @ 0xc9
+	script_cmd_table_entry SCR_OP_LOADHELP                      ScrCmd_nop1                           @ 0xc8
-	.4byte ScrCmd_nop1                              @ 0xca
+	script_cmd_table_entry SCR_OP_UNLOADHELP                    ScrCmd_nop1                           @ 0xc9
-	.4byte ScrCmd_nop1                              @ 0xcb
+	script_cmd_table_entry SCR_OP_SIGNMSG                       ScrCmd_nop1                           @ 0xca
-	.4byte ScrCmd_nop1                              @ 0xcc
+	script_cmd_table_entry SCR_OP_NORMALMSG                     ScrCmd_nop1                           @ 0xcb
-	.4byte ScrCmd_setmodernfatefulencounter         @ 0xcd
+	script_cmd_table_entry SCR_OP_COMPAREHIDDENVAR              ScrCmd_nop1                           @ 0xcc
-	.4byte ScrCmd_checkmodernfatefulencounter       @ 0xce
+	script_cmd_table_entry SCR_OP_SETMODERNFATEFULENCOUNTER     ScrCmd_setmodernfatefulencounter      @ 0xcd
-	.4byte ScrCmd_trywondercardscript               @ 0xcf
+	script_cmd_table_entry SCR_OP_CHECKMODERNFATEFULENCOUNTER   ScrCmd_checkmodernfatefulencounter    @ 0xce
-	.4byte ScrCmd_nop1                              @ 0xd0
+	script_cmd_table_entry SCR_OP_TRYWONDERCARDSCRIPT           ScrCmd_trywondercardscript            @ 0xcf
-	.4byte ScrCmd_warpspinenter                     @ 0xd1
+	script_cmd_table_entry SCR_OP_SETWORLDMAPFLAG               ScrCmd_nop1                           @ 0xd0
-	.4byte ScrCmd_setmonmetlocation                 @ 0xd2
+	script_cmd_table_entry SCR_OP_WARPSPINENTER                 ScrCmd_warpspinenter                  @ 0xd1
-	.4byte ScrCmd_moverotatingtileobjects           @ 0xd3
+	script_cmd_table_entry SCR_OP_SETMONMETLOCATION             ScrCmd_setmonmetlocation              @ 0xd2
-	.4byte ScrCmd_turnrotatingtileobjects           @ 0xd4
+	script_cmd_table_entry SCR_OP_MOVEROTATINGTILEOBJECTS       ScrCmd_moverotatingtileobjects        @ 0xd3
-	.4byte ScrCmd_initrotatingtilepuzzle            @ 0xd5
+	script_cmd_table_entry SCR_OP_TURNROTATINGTILEOBJECTS       ScrCmd_turnrotatingtileobjects        @ 0xd4
-	.4byte ScrCmd_freerotatingtilepuzzle            @ 0xd6
+	script_cmd_table_entry SCR_OP_INITROTATINGTILEPUZZLE        ScrCmd_initrotatingtilepuzzle         @ 0xd5
-	.4byte ScrCmd_warpmossdeepgym                   @ 0xd7
+	script_cmd_table_entry SCR_OP_FREEROTATINGTILEPUZZLE        ScrCmd_freerotatingtilepuzzle         @ 0xd6
-	.4byte ScrCmd_selectapproachingtrainer          @ 0xd8
+	script_cmd_table_entry SCR_OP_WARPMOSSDEEPGYM               ScrCmd_warpmossdeepgym                @ 0xd7
-	.4byte ScrCmd_lockfortrainer                    @ 0xd9
+	script_cmd_table_entry SCR_OP_SELECTAPPROACHINGTRAINER      ScrCmd_selectapproachingtrainer       @ 0xd8
-	.4byte ScrCmd_closebraillemessage               @ 0xda
+	script_cmd_table_entry SCR_OP_LOCKFORTRAINER                ScrCmd_lockfortrainer                 @ 0xd9
-	.4byte ScrCmd_messageinstant                    @ 0xdb
+	script_cmd_table_entry SCR_OP_CLOSEBRAILLEMESSAGE           ScrCmd_closebraillemessage            @ 0xda
-	.4byte ScrCmd_fadescreenswapbuffers             @ 0xdc
+	script_cmd_table_entry SCR_OP_MESSAGEINSTANT                ScrCmd_messageinstant                 @ 0xdb
-	.4byte ScrCmd_buffertrainerclassname            @ 0xdd
+	script_cmd_table_entry SCR_OP_FADESCREENSWAPBUFFERS         ScrCmd_fadescreenswapbuffers          @ 0xdc
-	.4byte ScrCmd_buffertrainername                 @ 0xde
+	script_cmd_table_entry SCR_OP_BUFFERTRAINERCLASSNAME        ScrCmd_buffertrainerclassname         @ 0xdd
-	.4byte ScrCmd_pokenavcall                       @ 0xdf
+	script_cmd_table_entry SCR_OP_BUFFERTRAINERNAME             ScrCmd_buffertrainername              @ 0xde
-	.4byte ScrCmd_warpwhitefade                     @ 0xe0
+	script_cmd_table_entry SCR_OP_POKENAVCALL                   ScrCmd_pokenavcall                    @ 0xdf
-	.4byte ScrCmd_buffercontestname                 @ 0xe1
+	script_cmd_table_entry SCR_OP_WARPWHITEFADE                 ScrCmd_warpwhitefade                  @ 0xe0
-	.4byte ScrCmd_bufferitemnameplural              @ 0xe2
+	script_cmd_table_entry SCR_OP_BUFFERCONTESTNAME             ScrCmd_buffercontestname              @ 0xe1
+	script_cmd_table_entry SCR_OP_BUFFERITEMNAMEPLURAL          ScrCmd_bufferitemnameplural           @ 0xe2
 
+	.if ALLOCATE_SCRIPT_CMD_TABLE
 gScriptCmdTableEnd::
 	.4byte ScrCmd_nop
+	.endif

data/scripts/mauville_man.inc

@@ -18,7 +18,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard::
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_PlaySong::
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FALSE  @ Play his current song
 	special PlayBardSong
 	delay 60
 	special HasBardSongBeenChanged
@@ -45,7 +45,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics::
 	faceplayer
 	goto_if_eq VAR_RESULT, 0, MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
 	msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, TRUE  @ Play the new song
 	special PlayBardSong
 	delay 60
 	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO

graphics/birch_speech/bg2.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-8
+16
 255 255 164
 255 255 106
 222 222 90
@@ -9,3 +9,11 @@ JASC-PAL
 123 123 49
 90 90 32
 57 57 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/cave_transition/enter.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-8
+16
 148 197 172
 16 16 16
 32 32 32
@@ -9,3 +9,11 @@ JASC-PAL
 82 82 82
 98 98 98
 115 115 115
+131 131 131
+148 148 148
+164 164 164
+180 180 180
+197 197 197
+213 213 213
+230 230 230
+255 255 255

graphics/cave_transition/exit.pal

@@ -1,11 +0,0 @@
-JASC-PAL
-0100
-8
-131 131 131
-148 148 148
-164 164 164
-180 180 180
-197 197 197
-213 213 213
-230 230 230
-255 255 255

graphics_file_rules.mk

@@ -315,6 +315,9 @@ graphics/pokenav/region_map/map.8bpp: %.8bpp: %.png
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
+$(MISCGFXDIR)/mirage_tower.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 73 -Wnum_tiles
+
 $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
                                 $(BATINTGFXDIR)/textbox_1.gbapal
 	@cat $^ >$@

include/bard_music.h

@@ -1,41 +1,49 @@
 #ifndef GUARD_BARD_MUSIC_H
 #define GUARD_BARD_MUSIC_H
 
-#define BARD_SOUND_MAX_LENGTH 6
+// The maximum number of BardSoundTemplates/BardSounds there can be for each easy chat word.
+#define MAX_BARD_SOUNDS_PER_WORD 6
 
-struct BardSound
+// The number of pitch tables there are for each pitch table size (see sPitchTables).
+#define NUM_BARD_PITCH_TABLES_PER_SIZE 5
+
+// This struct describes which phoneme song to play for the sound, and whether to
+// make any adjustments to its length or volume. Very few sounds make any adjustments.
+struct BardSoundTemplate
 {
-    /*0x00*/ u8 songLengthId;
+    u8 songId;
-    /*0x01*/ s8 songLengthOffset;
+    s8 lengthAdjustment;
-    /*0x02*/ u16 unused;
+    u16 unused; // Only set on EC_WORD_WAAAH, and never read.
-    /*0x04*/ s16 volume;
+    s16 volume;
-    /*0x06*/ u16 unused2;
 };
 
-struct BardPhoneme
+// This is the length and pitch to play the phoneme song at.
+// These will be calculated in 'CalcWordSounds'.
+struct BardSound
 {
-    /*0x00*/ u16 length;
+    u16 length;
-    /*0x02*/ u16 pitch;
+    u16 pitch;
 };
 
 struct BardSong
 {
-    /*0x00*/ u8 currWord;
+    u8 lyricsIndex;
-    /*0x01*/ u8 currPhoneme;
+    u8 soundIndex;
-    /*0x02*/ u8 phonemeTimer;
+    u8 timer;
-    /*0x03*/ u8 state;
+    u8 state;
-    /*0x04*/ s16 length;
+    s16 length; // Length of the sound for the word currently being sung (i.e. the sum of 'length' in all the current word's phonemes).
-    /*0x06*/ u16 volume;
+    u16 volume;
-    /*0x08*/ s16 pitch;
+    s16 pitch;
-    /*0x0A*/ s16 voiceInflection;
+    s16 voiceInflection;
-    /*0x0C*/ u16 lyrics[BARD_SOUND_MAX_LENGTH];
+    u16 lyrics[NUM_BARD_SONG_WORDS];
-    /*0x18*/ struct BardPhoneme phonemes[BARD_SOUND_MAX_LENGTH];
+    struct BardSound sounds[MAX_BARD_SOUNDS_PER_WORD];
-    /*0x30*/ const struct BardSound *sound;
+    const struct BardSoundTemplate *soundTemplates;
 };
 
 extern const u16 gNumBardWords_Species;
 extern const u16 gNumBardWords_Moves;
-const struct BardSound *GetWordSounds(u16 word);
+
-void GetWordPhonemes(struct BardSong *song, u16 word);
+const struct BardSoundTemplate *GetWordSoundTemplates(u16 easyChatWord);
+void CalcWordSounds(struct BardSong *song, u16 pitchTableIndex);
 
 #endif //GUARD_BARD_MUSIC_H