Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate

Makefile

@@ -142,6 +142,7 @@ ROMTESTHYDRA := tools/mgba-rom-test-hydra/mgba-rom-test-hydra$(EXE)
 
 PERL := perl
 
+# Inclusive list. If you don't want a tool to be built, don't add it here.
 TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
 CHECKTOOLDIRS = tools/patchelf tools/mgba-rom-test-hydra
 TOOLBASE = $(TOOLDIRS:tools/%=%)

asm/macros/battle_script.inc

@@ -1317,6 +1317,12 @@
 	.2byte \holdEffect
 	.4byte \jumpInstr
 	.endm
+	
+	.macro dostockpilestatchangeswearoff, battler:req, statChangeInstr:req
+	callnative BS_DoStockpileStatChangesWearOff
+	.byte \battler
+	.4byte \statChangeInstr
+	.endm
 
 	.macro jumpifmorethanhalfHP battler:req, jumpInstr:req
 	callnative BS_JumpIfMoreThanHalfHP

asm/macros/event.inc

@@ -1582,15 +1582,15 @@
 	.4byte \value
 	.endm
 
-	@ Sets the eventLegal bit for the Pokemon in the specified slot of the player's party.
-	.macro setmoneventlegal slot:req
+	@ Sets the modernFatefulEncounter bit for the Pokemon in the specified slot of the player's party.
+	.macro setmodernfatefulencounter slot:req
 	.byte 0xcd
 	.2byte \slot
 	.endm
 
-	@ Checks if the eventLegal bit is set for the Pokemon in the specified slot of the player's party. If it isn't set,
+	@ Checks if the modernFatefulEncounter bit is set for the Pokemon in the specified slot of the player's party. If it isn't set,
 	@ VAR_RESULT is TRUE. If the bit is set (or if the specified slot is empty or invalid), VAR_RESULT is FALSE.
-	.macro checkmoneventlegal slot:req
+	.macro checkmodernfatefulencounter slot:req
 	.byte 0xce
 	.2byte \slot
 	.endm
@@ -1938,12 +1938,12 @@
 	closebraillemessage
 	.endm
 
-	@ Creates an "event legal" Pokémon for an encounter
+	@ Creates a Pokémon with the modernFatefulEncounter bit set for an encounter
 	.macro seteventmon species:req, level:req, item=ITEM_NONE
 	setvar VAR_0x8004, \species
 	setvar VAR_0x8005, \level
 	setvar VAR_0x8006, \item
-	special CreateEventLegalEnemyMon
+	special CreateEnemyEventMon
 	.endm
 
 	@ Set up a totem boost for the next battle.

asm/macros/map.inc

@@ -19,11 +19,11 @@
 	.4byte \script
 	.endm
 
-	@ Defines an object event template for map data. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
-	.macro object_event index:req, gfx:req, inConnection:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
+	@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
+	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
 	.byte \index
 	.byte \gfx
-	.byte \inConnection
+	.byte OBJ_KIND_NORMAL
 	.space 1  @ Padding
 	.2byte \x, \y
 	.byte \elevation
@@ -38,6 +38,22 @@
 	inc _num_npcs
 	.endm
 
+	@ Defines an object event template for map data, to be used by a clone object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
+	@ NOTE: The handling for this type of event does not exist in Emerald by default; it is exclusive to FRLG.
+	.macro clone_event index:req, gfx:req, x:req, y:req, target_local_id:req, target_map_id:req
+	.byte \index
+	.byte \gfx
+	.byte OBJ_KIND_CLONE
+	.space 1  @ Padding
+	.2byte \x, \y
+	.byte \target_local_id
+	.space 3  @ Padding
+	.2byte \target_map_id & 0xFF  @ map num
+	.2byte \target_map_id >> 8    @ map group
+	.space 8  @ Padding
+	inc _num_npcs
+	.endm
+
 	@ Defines a warp event for map data. Mirrors the struct layout of WarpEvent in include/global.fieldmap.h
 	.macro warp_def x:req, y:req, elevation:req, warpId:req, map_id:req
 	.2byte \x, \y
@@ -49,12 +65,12 @@
 	.endm
 
 	@ Defines a coord event for map data. Mirrors the struct layout of CoordEvent in include/global.fieldmap.h
-	.macro coord_event x:req, y:req, elevation:req, trigger:req, index:req, script:req
+	.macro coord_event x:req, y:req, elevation:req, var:req, varValue:req, script:req
 	.2byte \x, \y
 	.byte \elevation
 	.space 1  @ Padding
-	.2byte \trigger
-	.2byte \index
+	.2byte \var
+	.2byte \varValue
 	.space 2  @ Padding
 	.4byte \script
 	inc _num_traps

data/battle_anim_scripts.s

@@ -24860,6 +24860,7 @@ General_MegaEvolution:
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, 1, 5, 14
 	waitforvisualfinish
+	createvisualtask SoundTask_PlayNormalCry, 0
 	createsprite gMegaSymbolSpriteTemplate ANIM_ATTACKER, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -25005,6 +25006,7 @@ General_PrimalReversion_Alpha:
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, 1, 5, 14
 	waitforvisualfinish
+	createvisualtask SoundTask_PlayNormalCry, 0
 	createsprite gAlphaSymbolSpriteTemplate ANIM_ATTACKER, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -25031,6 +25033,7 @@ General_PrimalReversion_Omega:
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, 1, 5, 14
 	waitforvisualfinish
+	createvisualtask SoundTask_PlayNormalCry, 0
 	createsprite gOmegaSymbolSpriteTemplate ANIM_ATTACKER, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER

data/battle_scripts_1.s

@@ -485,15 +485,13 @@ BattleScript_Teatimevul:
 	moveendcase MOVEEND_CLEAR_BITS
 	goto BattleScript_MoveEnd
 BattleScript_Teatimesorb:
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_TeatimeLoop
 	moveendcase MOVEEND_CLEAR_BITS
 	goto BattleScript_MoveEnd
 BattleScript_Teatimerod:
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPATK, 1, FALSE
 	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
@@ -505,8 +503,7 @@ BattleScript_Teatimerod:
 	moveendcase MOVEEND_CLEAR_BITS
 	goto BattleScript_MoveEnd
 BattleScript_Teatimemotor:
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPEED, 1, FALSE
 	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
@@ -1268,7 +1265,7 @@ BattleScript_EffectRemoveTerrain:
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
 	removeterrain
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_MoveEnd
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_TERRAINENDS_COUNT, BattleScript_MoveEnd
 	printfromtable gTerrainEndingStringIds
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
@@ -3404,8 +3401,7 @@ BattleScript_EffectAbsorb::
 	setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB
 	goto BattleScript_AbsorbUpdateHp
 BattleScript_AbsorbLiquidOoze::
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	manipulatedamage DMG_CHANGE_SIGN
 	setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB_OOZE
 BattleScript_AbsorbUpdateHp::
@@ -5523,9 +5519,8 @@ BattleScript_NotAffected::
 	goto BattleScript_MoveEnd
 
 BattleScript_NotAffectedAbilityPopUp::
-	copybyte gBattlerAbility, gBattlerTarget
 	pause B_WAIT_TIME_SHORT
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
@@ -5550,6 +5545,9 @@ BattleScript_EffectStockpile::
 	waitanimation
 	printfromtable gStockpileUsedStringIds
 	waitmessage B_WAIT_TIME_LONG
+	.if B_STOCKPILE_RAISES_DEFS < GEN_4
+	goto BattleScript_EffectStockpileEnd
+	.endif
 	jumpifmovehadnoeffect BattleScript_EffectStockpileEnd
 	jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_EffectStockpileDef
 	jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_EffectStockpileEnd
@@ -5570,6 +5568,23 @@ BattleScript_EffectStockpileSpDef::
 BattleScript_EffectStockpileEnd:
 	stockpile 1
 	goto BattleScript_MoveEnd
+	
+BattleScript_MoveEffectStockpileWoreOff::
+	.if B_STOCKPILE_RAISES_DEFS >= GEN_4
+	dostockpilestatchangeswearoff BS_ATTACKER, BattleScript_StockpileStatChangeDown
+	printstring STRINGID_STOCKPILEDEFFECTWOREOFF
+	waitmessage B_WAIT_TIME_SHORT
+	.endif
+	return
+	
+BattleScript_StockpileStatChangeDown:
+	statbuffchange MOVE_EFFECT_AFFECTS_USER, BattleScript_StockpileStatChangeDown_Ret
+	setgraphicalstatchangevalues
+	playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+	printfromtable gStatDownStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_StockpileStatChangeDown_Ret:
+	return
 
 BattleScript_EffectSpitUp::
 	attackcanceler
@@ -6014,8 +6029,7 @@ BattleScript_EffectSkillSwap:
 	attackanimation
 	waitanimation
 .if B_ABILITY_POP_UP == TRUE
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	pause 20
 	copybyte gBattlerAbility, gBattlerAttacker
 	call BattleScript_AbilityPopUp
@@ -6885,29 +6899,17 @@ BattleScript_MagicRoomEnds::
 	printstring STRINGID_MAGICROOMENDS
 	waitmessage B_WAIT_TIME_LONG
 	end2
-
-BattleScript_ElectricTerrainEnds::
-	printstring STRINGID_ELECTRICTERRAINENDS
-	waitmessage B_WAIT_TIME_LONG
-	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
-	end2
-
-BattleScript_MistyTerrainEnds::
-	printstring STRINGID_MISTYTERRAINENDS
-	waitmessage B_WAIT_TIME_LONG
-	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
-	end2
-
-BattleScript_GrassyTerrainEnds::
-	printstring STRINGID_GRASSYTERRAINENDS
-	waitmessage B_WAIT_TIME_LONG
-	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
-	end2
-
-BattleScript_PsychicTerrainEnds::
-	printstring STRINGID_PSYCHICTERRAINENDS
+	
+BattleScript_GrassyTerrainEnds:
+	setbyte cMULTISTRING_CHOOSER, B_MSG_TERRAINENDS_GRASS
+BattleScript_TerrainEnds_Ret::
+	printfromtable gTerrainEndingStringIds
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
+	return
+	
+BattleScript_TerrainEnds::
+	call BattleScript_TerrainEnds_Ret
 	end2
 
 BattleScript_MudSportEnds::
@@ -7451,6 +7453,26 @@ BattleScript_StealthRockFree::
 	printstring STRINGID_PKMNBLEWAWAYSTEALTHROCK
 	waitmessage B_WAIT_TIME_LONG
 	return
+	
+BattleScript_SpikesDefog::
+	printstring STRINGID_SPIKESDISAPPEAREDFROMTEAM
+	waitmessage B_WAIT_TIME_LONG
+	return
+
+BattleScript_ToxicSpikesDefog::
+	printstring STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM
+	waitmessage B_WAIT_TIME_LONG
+	return
+
+BattleScript_StickyWebDefog::
+	printstring STRINGID_STICKYWEBDISAPPEAREDFROMTEAM
+	waitmessage B_WAIT_TIME_LONG
+	return
+
+BattleScript_StealthRockDefog::
+	printstring STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM
+	waitmessage B_WAIT_TIME_LONG
+	return
 
 BattleScript_MonTookFutureAttack::
 	printstring STRINGID_PKMNTOOKATTACK
@@ -7770,9 +7792,8 @@ BattleScript_EnduredMsg::
 	return
 
 BattleScript_SturdiedMsg::
-	copybyte gBattlerAbility, gBattlerTarget
 	pause B_WAIT_TIME_SHORTEST
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	printstring STRINGID_ENDUREDSTURDY
 	waitmessage B_WAIT_TIME_LONG
 	return
@@ -7810,6 +7831,7 @@ BattleScript_MegaEvolution::
 	printstring STRINGID_EMPTYSTRING3
 	trytrainerslidemegaevolutionmsg BS_ATTACKER
 	printstring STRINGID_MEGAEVOREACTING
+BattleScript_MegaEvolutionAfeterString:
 	waitmessage B_WAIT_TIME_LONG
 	setbyte gIsCriticalHit, 0
 	handlemegaevo BS_ATTACKER, 0
@@ -7826,17 +7848,7 @@ BattleScript_WishMegaEvolution::
 	printstring STRINGID_EMPTYSTRING3
 	trytrainerslidemegaevolutionmsg BS_ATTACKER
 	printstring STRINGID_FERVENTWISHREACHED
-	waitmessage B_WAIT_TIME_LONG
-	setbyte gIsCriticalHit, 0
-	handlemegaevo BS_ATTACKER, 0
-	handlemegaevo BS_ATTACKER, 1
-	playanimation BS_ATTACKER, B_ANIM_MEGA_EVOLUTION
-	waitanimation
-	handlemegaevo BS_ATTACKER, 2
-	printstring STRINGID_MEGAEVOEVOLVED
-	waitmessage B_WAIT_TIME_LONG
-	switchinabilities BS_ATTACKER
-	end2
+	goto BattleScript_MegaEvolutionAfeterString
 
 BattleScript_PrimalReversion::
 	printstring STRINGID_EMPTYSTRING3
@@ -7917,8 +7929,7 @@ BattleScript_CudChewActivates::
 
 BattleScript_TargetFormChange::
 	pause 5
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 1
 	handleformchange BS_TARGET, 0
@@ -7930,8 +7941,7 @@ BattleScript_TargetFormChange::
 
 BattleScript_TargetFormChangeWithString::
 	pause 5
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 1
 	handleformchange BS_TARGET, 0
@@ -8394,6 +8404,8 @@ BattleScript_AbilityRaisesDefenderStat::
 	waitmessage B_WAIT_TIME_LONG
 	return
 
+BattleScript_AbilityPopUpTarget:
+	copybyte gBattlerAbility, gBattlerTarget
 BattleScript_AbilityPopUp:
 	.if B_ABILITY_POP_UP == TRUE
 	showabilitypopup BS_ABILITY_BATTLER
@@ -8633,8 +8645,10 @@ BattleScript_IntimidateEffect:
 	copybyte sBATTLER, gBattlerAttacker
 	statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateLoopIncrement
 	setgraphicalstatchangevalues
+	jumpifability BS_TARGET, ABILITY_CONTRARY, BattleScript_IntimidateContrary
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
 	printstring STRINGID_PKMNCUTSATTACKWITH
+BattleScript_IntimidateEffect_WaitString:
 	waitmessage B_WAIT_TIME_LONG
 	copybyte sBATTLER, gBattlerTarget
 	call BattleScript_TryAdrenalineOrb
@@ -8646,6 +8660,16 @@ BattleScript_IntimidateEnd:
 	pause B_WAIT_TIME_MED
 	end3
 
+BattleScript_IntimidateContrary:
+	call BattleScript_AbilityPopUpTarget
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_IntimidateContrary_WontIncrease
+	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+	printfromtable gStatUpStringIds
+	goto BattleScript_IntimidateEffect_WaitString
+BattleScript_IntimidateContrary_WontIncrease:
+	printstring STRINGID_TARGETSTATWONTGOHIGHER
+	goto BattleScript_IntimidateEffect_WaitString
+
 BattleScript_IntimidatePrevented:
 	call BattleScript_AbilityPopUp
 	pause B_WAIT_TIME_LONG
@@ -8659,8 +8683,7 @@ BattleScript_IntimidatePrevented_Item:
 
 BattleScript_IntimidateInReverse:
 	copybyte sBATTLER, gBattlerTarget
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	pause B_WAIT_TIME_SHORT
 	modifybattlerstatstage BS_TARGET, STAT_ATK, INCREASE, 1, BattleScript_IntimidateLoopIncrement, ANIM_ON
 	call BattleScript_TryAdrenalineOrb
@@ -8903,8 +8926,7 @@ BattleScript_SturdyPreventsOHKO::
 
 BattleScript_DampStopsExplosion::
 	pause B_WAIT_TIME_SHORT
-	copybyte gBattlerAbility, gBattlerTarget
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpTarget
 	printstring STRINGID_PKMNPREVENTSUSAGE
 	pause B_WAIT_TIME_LONG
 	moveendto MOVEEND_NEXT_TARGET

data/maps/PetalburgWoods/map.json

@@ -168,7 +168,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
-      "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
+      "flag": "FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_GIRL_2",

data/maps/Route110/map.json

@@ -288,7 +288,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route110_EventScript_ItemRareCandy",
-      "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
+      "flag": "FLAG_ITEM_ROUTE_110_RARE_CANDY"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M",

data/maps/Route114/map.json

@@ -503,7 +503,7 @@
       "y": 30,
       "elevation": 3,
       "item": "ITEM_REVIVE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE"
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_REVIVE"
     }
   ]
 }

data/script_cmd_table.inc

@@ -1,232 +1,232 @@
 	.align 2
 gScriptCmdTable::
-	.4byte ScrCmd_nop      	                @ 0x00
-	.4byte ScrCmd_nop1                      @ 0x01
-	.4byte ScrCmd_end      	                @ 0x02
-	.4byte ScrCmd_return                    @ 0x03
-	.4byte ScrCmd_call                      @ 0x04
-	.4byte ScrCmd_goto                      @ 0x05
-	.4byte ScrCmd_goto_if                   @ 0x06
-	.4byte ScrCmd_call_if                   @ 0x07
-	.4byte ScrCmd_gotostd                   @ 0x08
-	.4byte ScrCmd_callstd                   @ 0x09
-	.4byte ScrCmd_gotostd_if                @ 0x0a
-	.4byte ScrCmd_callstd_if                @ 0x0b
-	.4byte ScrCmd_returnram                 @ 0x0c
-	.4byte ScrCmd_endram                    @ 0x0d
-	.4byte ScrCmd_setmysteryeventstatus     @ 0x0e
-	.4byte ScrCmd_loadword                  @ 0x0f
-	.4byte ScrCmd_loadbyte                  @ 0x10
-	.4byte ScrCmd_setptr                    @ 0x11
-	.4byte ScrCmd_loadbytefromptr           @ 0x12
-	.4byte ScrCmd_setptrbyte                @ 0x13
-	.4byte ScrCmd_copylocal                 @ 0x14
-	.4byte ScrCmd_copybyte                  @ 0x15
-	.4byte ScrCmd_setvar                    @ 0x16
-	.4byte ScrCmd_addvar                    @ 0x17
-	.4byte ScrCmd_subvar                    @ 0x18
-	.4byte ScrCmd_copyvar                   @ 0x19
-	.4byte ScrCmd_setorcopyvar              @ 0x1a
-	.4byte ScrCmd_compare_local_to_local    @ 0x1b
-	.4byte ScrCmd_compare_local_to_value    @ 0x1c
-	.4byte ScrCmd_compare_local_to_ptr      @ 0x1d
-	.4byte ScrCmd_compare_ptr_to_local      @ 0x1e
-	.4byte ScrCmd_compare_ptr_to_value      @ 0x1f
-	.4byte ScrCmd_compare_ptr_to_ptr        @ 0x20
-	.4byte ScrCmd_compare_var_to_value      @ 0x21
-	.4byte ScrCmd_compare_var_to_var        @ 0x22
-	.4byte ScrCmd_callnative                @ 0x23
-	.4byte ScrCmd_gotonative                @ 0x24
-	.4byte ScrCmd_special                   @ 0x25
-	.4byte ScrCmd_specialvar                @ 0x26
-	.4byte ScrCmd_waitstate                 @ 0x27
-	.4byte ScrCmd_delay                     @ 0x28
-	.4byte ScrCmd_setflag                   @ 0x29
-	.4byte ScrCmd_clearflag                 @ 0x2a
-	.4byte ScrCmd_checkflag                 @ 0x2b
-	.4byte ScrCmd_initclock                 @ 0x2c
-	.4byte ScrCmd_dotimebasedevents         @ 0x2d
-	.4byte ScrCmd_gettime                   @ 0x2e
-	.4byte ScrCmd_playse                    @ 0x2f
-	.4byte ScrCmd_waitse                    @ 0x30
-	.4byte ScrCmd_playfanfare               @ 0x31
-	.4byte ScrCmd_waitfanfare               @ 0x32
-	.4byte ScrCmd_playbgm                   @ 0x33
-	.4byte ScrCmd_savebgm                   @ 0x34
-	.4byte ScrCmd_fadedefaultbgm            @ 0x35
-	.4byte ScrCmd_fadenewbgm                @ 0x36
-	.4byte ScrCmd_fadeoutbgm                @ 0x37
-	.4byte ScrCmd_fadeinbgm                 @ 0x38
-	.4byte ScrCmd_warp                      @ 0x39
-	.4byte ScrCmd_warpsilent                @ 0x3a
-	.4byte ScrCmd_warpdoor                  @ 0x3b
-	.4byte ScrCmd_warphole                  @ 0x3c
-	.4byte ScrCmd_warpteleport              @ 0x3d
-	.4byte ScrCmd_setwarp                   @ 0x3e
-	.4byte ScrCmd_setdynamicwarp            @ 0x3f
-	.4byte ScrCmd_setdivewarp               @ 0x40
-	.4byte ScrCmd_setholewarp               @ 0x41
-	.4byte ScrCmd_getplayerxy               @ 0x42
-	.4byte ScrCmd_getpartysize              @ 0x43
-	.4byte ScrCmd_additem                   @ 0x44
-	.4byte ScrCmd_removeitem                @ 0x45
-	.4byte ScrCmd_checkitemspace            @ 0x46
-	.4byte ScrCmd_checkitem                 @ 0x47
-	.4byte ScrCmd_checkitemtype             @ 0x48
-	.4byte ScrCmd_addpcitem                 @ 0x49
-	.4byte ScrCmd_checkpcitem               @ 0x4a
-	.4byte ScrCmd_adddecoration             @ 0x4b
-	.4byte ScrCmd_removedecoration          @ 0x4c
-	.4byte ScrCmd_checkdecor                @ 0x4d
-	.4byte ScrCmd_checkdecorspace           @ 0x4e
-	.4byte ScrCmd_applymovement             @ 0x4f
-	.4byte ScrCmd_applymovementat           @ 0x50
-	.4byte ScrCmd_waitmovement              @ 0x51
-	.4byte ScrCmd_waitmovementat            @ 0x52
-	.4byte ScrCmd_removeobject              @ 0x53
-	.4byte ScrCmd_removeobjectat            @ 0x54
-	.4byte ScrCmd_addobject                 @ 0x55
-	.4byte ScrCmd_addobjectat               @ 0x56
-	.4byte ScrCmd_setobjectxy               @ 0x57
-	.4byte ScrCmd_showobjectat              @ 0x58
-	.4byte ScrCmd_hideobjectat              @ 0x59
-	.4byte ScrCmd_faceplayer                @ 0x5a
-	.4byte ScrCmd_turnobject                @ 0x5b
-	.4byte ScrCmd_trainerbattle             @ 0x5c
-	.4byte ScrCmd_dotrainerbattle           @ 0x5d
-	.4byte ScrCmd_gotopostbattlescript      @ 0x5e
-	.4byte ScrCmd_gotobeatenscript          @ 0x5f
-	.4byte ScrCmd_checktrainerflag          @ 0x60
-	.4byte ScrCmd_settrainerflag            @ 0x61
-	.4byte ScrCmd_cleartrainerflag          @ 0x62
-	.4byte ScrCmd_setobjectxyperm           @ 0x63
-	.4byte ScrCmd_copyobjectxytoperm        @ 0x64
-	.4byte ScrCmd_setobjectmovementtype     @ 0x65
-	.4byte ScrCmd_waitmessage               @ 0x66
-	.4byte ScrCmd_message                   @ 0x67
-	.4byte ScrCmd_closemessage              @ 0x68
-	.4byte ScrCmd_lockall                   @ 0x69
-	.4byte ScrCmd_lock                      @ 0x6a
-	.4byte ScrCmd_releaseall                @ 0x6b
-	.4byte ScrCmd_release                   @ 0x6c
-	.4byte ScrCmd_waitbuttonpress           @ 0x6d
-	.4byte ScrCmd_yesnobox                  @ 0x6e
-	.4byte ScrCmd_multichoice               @ 0x6f
-	.4byte ScrCmd_multichoicedefault        @ 0x70
-	.4byte ScrCmd_multichoicegrid           @ 0x71
-	.4byte ScrCmd_drawbox                   @ 0x72
-	.4byte ScrCmd_erasebox                  @ 0x73
-	.4byte ScrCmd_drawboxtext               @ 0x74
-	.4byte ScrCmd_showmonpic                @ 0x75
-	.4byte ScrCmd_hidemonpic                @ 0x76
-	.4byte ScrCmd_showcontestpainting       @ 0x77
-	.4byte ScrCmd_braillemessage            @ 0x78
-	.4byte ScrCmd_givemon                   @ 0x79
-	.4byte ScrCmd_giveegg                   @ 0x7a
-	.4byte ScrCmd_setmonmove                @ 0x7b
-	.4byte ScrCmd_checkpartymove            @ 0x7c
-	.4byte ScrCmd_bufferspeciesname         @ 0x7d
-	.4byte ScrCmd_bufferleadmonspeciesname  @ 0x7e
-	.4byte ScrCmd_bufferpartymonnick        @ 0x7f
-	.4byte ScrCmd_bufferitemname            @ 0x80
-	.4byte ScrCmd_bufferdecorationname      @ 0x81
-	.4byte ScrCmd_buffermovename            @ 0x82
-	.4byte ScrCmd_buffernumberstring        @ 0x83
-	.4byte ScrCmd_bufferstdstring           @ 0x84
-	.4byte ScrCmd_bufferstring              @ 0x85
-	.4byte ScrCmd_pokemart                  @ 0x86
-	.4byte ScrCmd_pokemartdecoration        @ 0x87
-	.4byte ScrCmd_pokemartdecoration2       @ 0x88
-	.4byte ScrCmd_playslotmachine           @ 0x89
-	.4byte ScrCmd_setberrytree              @ 0x8a
-	.4byte ScrCmd_choosecontestmon          @ 0x8b
-	.4byte ScrCmd_startcontest              @ 0x8c
-	.4byte ScrCmd_showcontestresults        @ 0x8d
-	.4byte ScrCmd_contestlinktransfer       @ 0x8e
-	.4byte ScrCmd_random                    @ 0x8f
-	.4byte ScrCmd_addmoney                  @ 0x90
-	.4byte ScrCmd_removemoney               @ 0x91
-	.4byte ScrCmd_checkmoney                @ 0x92
-	.4byte ScrCmd_showmoneybox              @ 0x93
-	.4byte ScrCmd_hidemoneybox              @ 0x94
-	.4byte ScrCmd_updatemoneybox            @ 0x95
-	.4byte ScrCmd_getpokenewsactive         @ 0x96
-	.4byte ScrCmd_fadescreen                @ 0x97
-	.4byte ScrCmd_fadescreenspeed           @ 0x98
-	.4byte ScrCmd_setflashlevel             @ 0x99
-	.4byte ScrCmd_animateflash              @ 0x9a
-	.4byte ScrCmd_messageautoscroll         @ 0x9b
-	.4byte ScrCmd_dofieldeffect             @ 0x9c
-	.4byte ScrCmd_setfieldeffectargument    @ 0x9d
-	.4byte ScrCmd_waitfieldeffect           @ 0x9e
-	.4byte ScrCmd_setrespawn                @ 0x9f
-	.4byte ScrCmd_checkplayergender         @ 0xa0
-	.4byte ScrCmd_playmoncry                @ 0xa1
-	.4byte ScrCmd_setmetatile               @ 0xa2
-	.4byte ScrCmd_resetweather              @ 0xa3
-	.4byte ScrCmd_setweather                @ 0xa4
-	.4byte ScrCmd_doweather                 @ 0xa5
-	.4byte ScrCmd_setstepcallback           @ 0xa6
-	.4byte ScrCmd_setmaplayoutindex         @ 0xa7
-	.4byte ScrCmd_setobjectsubpriority      @ 0xa8
-	.4byte ScrCmd_resetobjectsubpriority    @ 0xa9
-	.4byte ScrCmd_createvobject             @ 0xaa
-	.4byte ScrCmd_turnvobject               @ 0xab
-	.4byte ScrCmd_opendoor                  @ 0xac
-	.4byte ScrCmd_closedoor                 @ 0xad
-	.4byte ScrCmd_waitdooranim              @ 0xae
-	.4byte ScrCmd_setdooropen               @ 0xaf
-	.4byte ScrCmd_setdoorclosed             @ 0xb0
-	.4byte ScrCmd_addelevmenuitem           @ 0xb1
-	.4byte ScrCmd_showelevmenu              @ 0xb2
-	.4byte ScrCmd_checkcoins                @ 0xb3
-	.4byte ScrCmd_addcoins                  @ 0xb4
-	.4byte ScrCmd_removecoins               @ 0xb5
-	.4byte ScrCmd_setwildbattle             @ 0xb6
-	.4byte ScrCmd_dowildbattle              @ 0xb7
-	.4byte ScrCmd_setvaddress               @ 0xb8
-	.4byte ScrCmd_vgoto                     @ 0xb9
-	.4byte ScrCmd_vcall                     @ 0xba
-	.4byte ScrCmd_vgoto_if                  @ 0xbb
-	.4byte ScrCmd_vcall_if                  @ 0xbc
-	.4byte ScrCmd_vmessage                  @ 0xbd
-	.4byte ScrCmd_vbuffermessage            @ 0xbe
-	.4byte ScrCmd_vbufferstring             @ 0xbf
-	.4byte ScrCmd_showcoinsbox              @ 0xc0
-	.4byte ScrCmd_hidecoinsbox              @ 0xc1
-	.4byte ScrCmd_updatecoinsbox            @ 0xc2
-	.4byte ScrCmd_incrementgamestat         @ 0xc3
-	.4byte ScrCmd_setescapewarp             @ 0xc4
-	.4byte ScrCmd_waitmoncry                @ 0xc5
-	.4byte ScrCmd_bufferboxname             @ 0xc6
-	.4byte ScrCmd_nop1                      @ 0xc7
-	.4byte ScrCmd_nop1                      @ 0xc8
-	.4byte ScrCmd_nop1                      @ 0xc9
-	.4byte ScrCmd_nop1                      @ 0xca
-	.4byte ScrCmd_nop1                      @ 0xcb
-	.4byte ScrCmd_nop1                      @ 0xcc
-	.4byte ScrCmd_setmoneventlegal          @ 0xcd
-	.4byte ScrCmd_checkmoneventlegal        @ 0xce
-	.4byte ScrCmd_trywondercardscript       @ 0xcf
-	.4byte ScrCmd_nop1                      @ 0xd0
-	.4byte ScrCmd_warpspinenter             @ 0xd1
-	.4byte ScrCmd_setmonmetlocation         @ 0xd2
-	.4byte ScrCmd_moverotatingtileobjects   @ 0xd3
-	.4byte ScrCmd_turnrotatingtileobjects   @ 0xd4
-	.4byte ScrCmd_initrotatingtilepuzzle    @ 0xd5
-	.4byte ScrCmd_freerotatingtilepuzzle    @ 0xd6
-	.4byte ScrCmd_warpmossdeepgym           @ 0xd7
-	.4byte ScrCmd_selectapproachingtrainer  @ 0xd8
-	.4byte ScrCmd_lockfortrainer            @ 0xd9
-	.4byte ScrCmd_closebraillemessage       @ 0xda
-	.4byte ScrCmd_messageinstant            @ 0xdb
-	.4byte ScrCmd_fadescreenswapbuffers     @ 0xdc
-	.4byte ScrCmd_buffertrainerclassname    @ 0xdd
-	.4byte ScrCmd_buffertrainername         @ 0xde
-	.4byte ScrCmd_pokenavcall               @ 0xdf
-	.4byte ScrCmd_warpwhitefade             @ 0xe0
-	.4byte ScrCmd_buffercontestname         @ 0xe1
-	.4byte ScrCmd_bufferitemnameplural      @ 0xe2
+	.4byte ScrCmd_nop      	                        @ 0x00
+	.4byte ScrCmd_nop1                              @ 0x01
+	.4byte ScrCmd_end      	                        @ 0x02
+	.4byte ScrCmd_return                            @ 0x03
+	.4byte ScrCmd_call                              @ 0x04
+	.4byte ScrCmd_goto                              @ 0x05
+	.4byte ScrCmd_goto_if                           @ 0x06
+	.4byte ScrCmd_call_if                           @ 0x07
+	.4byte ScrCmd_gotostd                           @ 0x08
+	.4byte ScrCmd_callstd                           @ 0x09
+	.4byte ScrCmd_gotostd_if                        @ 0x0a
+	.4byte ScrCmd_callstd_if                        @ 0x0b
+	.4byte ScrCmd_returnram                         @ 0x0c
+	.4byte ScrCmd_endram                            @ 0x0d
+	.4byte ScrCmd_setmysteryeventstatus             @ 0x0e
+	.4byte ScrCmd_loadword                          @ 0x0f
+	.4byte ScrCmd_loadbyte                          @ 0x10
+	.4byte ScrCmd_setptr                            @ 0x11
+	.4byte ScrCmd_loadbytefromptr                   @ 0x12
+	.4byte ScrCmd_setptrbyte                        @ 0x13
+	.4byte ScrCmd_copylocal                         @ 0x14
+	.4byte ScrCmd_copybyte                          @ 0x15
+	.4byte ScrCmd_setvar                            @ 0x16
+	.4byte ScrCmd_addvar                            @ 0x17
+	.4byte ScrCmd_subvar                            @ 0x18
+	.4byte ScrCmd_copyvar                           @ 0x19
+	.4byte ScrCmd_setorcopyvar                      @ 0x1a
+	.4byte ScrCmd_compare_local_to_local            @ 0x1b
+	.4byte ScrCmd_compare_local_to_value            @ 0x1c
+	.4byte ScrCmd_compare_local_to_ptr              @ 0x1d
+	.4byte ScrCmd_compare_ptr_to_local              @ 0x1e
+	.4byte ScrCmd_compare_ptr_to_value              @ 0x1f
+	.4byte ScrCmd_compare_ptr_to_ptr                @ 0x20
+	.4byte ScrCmd_compare_var_to_value              @ 0x21
+	.4byte ScrCmd_compare_var_to_var                @ 0x22
+	.4byte ScrCmd_callnative                        @ 0x23
+	.4byte ScrCmd_gotonative                        @ 0x24
+	.4byte ScrCmd_special                           @ 0x25
+	.4byte ScrCmd_specialvar                        @ 0x26
+	.4byte ScrCmd_waitstate                         @ 0x27
+	.4byte ScrCmd_delay                             @ 0x28
+	.4byte ScrCmd_setflag                           @ 0x29
+	.4byte ScrCmd_clearflag                         @ 0x2a
+	.4byte ScrCmd_checkflag                         @ 0x2b
+	.4byte ScrCmd_initclock                         @ 0x2c
+	.4byte ScrCmd_dotimebasedevents                 @ 0x2d
+	.4byte ScrCmd_gettime                           @ 0x2e
+	.4byte ScrCmd_playse                            @ 0x2f
+	.4byte ScrCmd_waitse                            @ 0x30
+	.4byte ScrCmd_playfanfare                       @ 0x31
+	.4byte ScrCmd_waitfanfare                       @ 0x32
+	.4byte ScrCmd_playbgm                           @ 0x33
+	.4byte ScrCmd_savebgm                           @ 0x34
+	.4byte ScrCmd_fadedefaultbgm                    @ 0x35
+	.4byte ScrCmd_fadenewbgm                        @ 0x36
+	.4byte ScrCmd_fadeoutbgm                        @ 0x37
+	.4byte ScrCmd_fadeinbgm                         @ 0x38
+	.4byte ScrCmd_warp                              @ 0x39
+	.4byte ScrCmd_warpsilent                        @ 0x3a
+	.4byte ScrCmd_warpdoor                          @ 0x3b
+	.4byte ScrCmd_warphole                          @ 0x3c
+	.4byte ScrCmd_warpteleport                      @ 0x3d
+	.4byte ScrCmd_setwarp                           @ 0x3e
+	.4byte ScrCmd_setdynamicwarp                    @ 0x3f
+	.4byte ScrCmd_setdivewarp                       @ 0x40
+	.4byte ScrCmd_setholewarp                       @ 0x41
+	.4byte ScrCmd_getplayerxy                       @ 0x42
+	.4byte ScrCmd_getpartysize                      @ 0x43
+	.4byte ScrCmd_additem                           @ 0x44
+	.4byte ScrCmd_removeitem                        @ 0x45
+	.4byte ScrCmd_checkitemspace                    @ 0x46
+	.4byte ScrCmd_checkitem                         @ 0x47
+	.4byte ScrCmd_checkitemtype                     @ 0x48
+	.4byte ScrCmd_addpcitem                         @ 0x49
+	.4byte ScrCmd_checkpcitem                       @ 0x4a
+	.4byte ScrCmd_adddecoration                     @ 0x4b
+	.4byte ScrCmd_removedecoration                  @ 0x4c
+	.4byte ScrCmd_checkdecor                        @ 0x4d
+	.4byte ScrCmd_checkdecorspace                   @ 0x4e
+	.4byte ScrCmd_applymovement                     @ 0x4f
+	.4byte ScrCmd_applymovementat                   @ 0x50
+	.4byte ScrCmd_waitmovement                      @ 0x51
+	.4byte ScrCmd_waitmovementat                    @ 0x52
+	.4byte ScrCmd_removeobject                      @ 0x53
+	.4byte ScrCmd_removeobjectat                    @ 0x54
+	.4byte ScrCmd_addobject                         @ 0x55
+	.4byte ScrCmd_addobjectat                       @ 0x56
+	.4byte ScrCmd_setobjectxy                       @ 0x57
+	.4byte ScrCmd_showobjectat                      @ 0x58
+	.4byte ScrCmd_hideobjectat                      @ 0x59
+	.4byte ScrCmd_faceplayer                        @ 0x5a
+	.4byte ScrCmd_turnobject                        @ 0x5b
+	.4byte ScrCmd_trainerbattle                     @ 0x5c
+	.4byte ScrCmd_dotrainerbattle                   @ 0x5d
+	.4byte ScrCmd_gotopostbattlescript              @ 0x5e
+	.4byte ScrCmd_gotobeatenscript                  @ 0x5f
+	.4byte ScrCmd_checktrainerflag                  @ 0x60
+	.4byte ScrCmd_settrainerflag                    @ 0x61
+	.4byte ScrCmd_cleartrainerflag                  @ 0x62
+	.4byte ScrCmd_setobjectxyperm                   @ 0x63
+	.4byte ScrCmd_copyobjectxytoperm                @ 0x64
+	.4byte ScrCmd_setobjectmovementtype             @ 0x65
+	.4byte ScrCmd_waitmessage                       @ 0x66
+	.4byte ScrCmd_message                           @ 0x67
+	.4byte ScrCmd_closemessage                      @ 0x68
+	.4byte ScrCmd_lockall                           @ 0x69
+	.4byte ScrCmd_lock                              @ 0x6a
+	.4byte ScrCmd_releaseall                        @ 0x6b
+	.4byte ScrCmd_release                           @ 0x6c
+	.4byte ScrCmd_waitbuttonpress                   @ 0x6d
+	.4byte ScrCmd_yesnobox                          @ 0x6e
+	.4byte ScrCmd_multichoice                       @ 0x6f
+	.4byte ScrCmd_multichoicedefault                @ 0x70
+	.4byte ScrCmd_multichoicegrid                   @ 0x71
+	.4byte ScrCmd_drawbox                           @ 0x72
+	.4byte ScrCmd_erasebox                          @ 0x73
+	.4byte ScrCmd_drawboxtext                       @ 0x74
+	.4byte ScrCmd_showmonpic                        @ 0x75
+	.4byte ScrCmd_hidemonpic                        @ 0x76
+	.4byte ScrCmd_showcontestpainting               @ 0x77
+	.4byte ScrCmd_braillemessage                    @ 0x78
+	.4byte ScrCmd_givemon                           @ 0x79
+	.4byte ScrCmd_giveegg                           @ 0x7a
+	.4byte ScrCmd_setmonmove                        @ 0x7b
+	.4byte ScrCmd_checkpartymove                    @ 0x7c
+	.4byte ScrCmd_bufferspeciesname                 @ 0x7d
+	.4byte ScrCmd_bufferleadmonspeciesname          @ 0x7e
+	.4byte ScrCmd_bufferpartymonnick                @ 0x7f
+	.4byte ScrCmd_bufferitemname                    @ 0x80
+	.4byte ScrCmd_bufferdecorationname              @ 0x81
+	.4byte ScrCmd_buffermovename                    @ 0x82
+	.4byte ScrCmd_buffernumberstring                @ 0x83
+	.4byte ScrCmd_bufferstdstring                   @ 0x84
+	.4byte ScrCmd_bufferstring                      @ 0x85
+	.4byte ScrCmd_pokemart                          @ 0x86
+	.4byte ScrCmd_pokemartdecoration                @ 0x87
+	.4byte ScrCmd_pokemartdecoration2               @ 0x88
+	.4byte ScrCmd_playslotmachine                   @ 0x89
+	.4byte ScrCmd_setberrytree                      @ 0x8a
+	.4byte ScrCmd_choosecontestmon                  @ 0x8b
+	.4byte ScrCmd_startcontest                      @ 0x8c
+	.4byte ScrCmd_showcontestresults                @ 0x8d
+	.4byte ScrCmd_contestlinktransfer               @ 0x8e
+	.4byte ScrCmd_random                            @ 0x8f
+	.4byte ScrCmd_addmoney                          @ 0x90
+	.4byte ScrCmd_removemoney                       @ 0x91
+	.4byte ScrCmd_checkmoney                        @ 0x92
+	.4byte ScrCmd_showmoneybox                      @ 0x93
+	.4byte ScrCmd_hidemoneybox                      @ 0x94
+	.4byte ScrCmd_updatemoneybox                    @ 0x95
+	.4byte ScrCmd_getpokenewsactive                 @ 0x96
+	.4byte ScrCmd_fadescreen                        @ 0x97
+	.4byte ScrCmd_fadescreenspeed                   @ 0x98
+	.4byte ScrCmd_setflashlevel                     @ 0x99
+	.4byte ScrCmd_animateflash                      @ 0x9a
+	.4byte ScrCmd_messageautoscroll                 @ 0x9b
+	.4byte ScrCmd_dofieldeffect                     @ 0x9c
+	.4byte ScrCmd_setfieldeffectargument            @ 0x9d
+	.4byte ScrCmd_waitfieldeffect                   @ 0x9e
+	.4byte ScrCmd_setrespawn                        @ 0x9f
+	.4byte ScrCmd_checkplayergender                 @ 0xa0
+	.4byte ScrCmd_playmoncry                        @ 0xa1
+	.4byte ScrCmd_setmetatile                       @ 0xa2
+	.4byte ScrCmd_resetweather                      @ 0xa3
+	.4byte ScrCmd_setweather                        @ 0xa4
+	.4byte ScrCmd_doweather                         @ 0xa5
+	.4byte ScrCmd_setstepcallback                   @ 0xa6
+	.4byte ScrCmd_setmaplayoutindex                 @ 0xa7
+	.4byte ScrCmd_setobjectsubpriority              @ 0xa8
+	.4byte ScrCmd_resetobjectsubpriority            @ 0xa9
+	.4byte ScrCmd_createvobject                     @ 0xaa
+	.4byte ScrCmd_turnvobject                       @ 0xab
+	.4byte ScrCmd_opendoor                          @ 0xac
+	.4byte ScrCmd_closedoor                         @ 0xad
+	.4byte ScrCmd_waitdooranim                      @ 0xae
+	.4byte ScrCmd_setdooropen                       @ 0xaf
+	.4byte ScrCmd_setdoorclosed                     @ 0xb0
+	.4byte ScrCmd_addelevmenuitem                   @ 0xb1
+	.4byte ScrCmd_showelevmenu                      @ 0xb2
+	.4byte ScrCmd_checkcoins                        @ 0xb3
+	.4byte ScrCmd_addcoins                          @ 0xb4
+	.4byte ScrCmd_removecoins                       @ 0xb5
+	.4byte ScrCmd_setwildbattle                     @ 0xb6
+	.4byte ScrCmd_dowildbattle                      @ 0xb7
+	.4byte ScrCmd_setvaddress                       @ 0xb8
+	.4byte ScrCmd_vgoto                             @ 0xb9
+	.4byte ScrCmd_vcall                             @ 0xba
+	.4byte ScrCmd_vgoto_if                          @ 0xbb
+	.4byte ScrCmd_vcall_if                          @ 0xbc
+	.4byte ScrCmd_vmessage                          @ 0xbd
+	.4byte ScrCmd_vbuffermessage                    @ 0xbe
+	.4byte ScrCmd_vbufferstring                     @ 0xbf
+	.4byte ScrCmd_showcoinsbox                      @ 0xc0
+	.4byte ScrCmd_hidecoinsbox                      @ 0xc1
+	.4byte ScrCmd_updatecoinsbox                    @ 0xc2
+	.4byte ScrCmd_incrementgamestat                 @ 0xc3
+	.4byte ScrCmd_setescapewarp                     @ 0xc4
+	.4byte ScrCmd_waitmoncry                        @ 0xc5
+	.4byte ScrCmd_bufferboxname                     @ 0xc6
+	.4byte ScrCmd_nop1                              @ 0xc7
+	.4byte ScrCmd_nop1                              @ 0xc8
+	.4byte ScrCmd_nop1                              @ 0xc9
+	.4byte ScrCmd_nop1                              @ 0xca
+	.4byte ScrCmd_nop1                              @ 0xcb
+	.4byte ScrCmd_nop1                              @ 0xcc
+	.4byte ScrCmd_setmonmodernfatefulencounter      @ 0xcd
+	.4byte ScrCmd_checkmonmodernfatefulencounter    @ 0xce
+	.4byte ScrCmd_trywondercardscript               @ 0xcf
+	.4byte ScrCmd_nop1                              @ 0xd0
+	.4byte ScrCmd_warpspinenter                     @ 0xd1
+	.4byte ScrCmd_setmonmetlocation                 @ 0xd2
+	.4byte ScrCmd_moverotatingtileobjects           @ 0xd3
+	.4byte ScrCmd_turnrotatingtileobjects           @ 0xd4
+	.4byte ScrCmd_initrotatingtilepuzzle            @ 0xd5
+	.4byte ScrCmd_freerotatingtilepuzzle            @ 0xd6
+	.4byte ScrCmd_warpmossdeepgym                   @ 0xd7
+	.4byte ScrCmd_selectapproachingtrainer          @ 0xd8
+	.4byte ScrCmd_lockfortrainer                    @ 0xd9
+	.4byte ScrCmd_closebraillemessage               @ 0xda
+	.4byte ScrCmd_messageinstant                    @ 0xdb
+	.4byte ScrCmd_fadescreenswapbuffers             @ 0xdc
+	.4byte ScrCmd_buffertrainerclassname            @ 0xdd
+	.4byte ScrCmd_buffertrainername                 @ 0xde
+	.4byte ScrCmd_pokenavcall                       @ 0xdf
+	.4byte ScrCmd_warpwhitefade                     @ 0xe0
+	.4byte ScrCmd_buffercontestname                 @ 0xe1
+	.4byte ScrCmd_bufferitemnameplural              @ 0xe2
 
 gScriptCmdTableEnd::
 	.4byte ScrCmd_nop

data/scripts/debug.inc

@@ -21,7 +21,7 @@ Debug_CheatStart::
 	setflag FLAG_SYS_POKEDEX_GET
 	special SetUnlockedPokedexFlags
 	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
-	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
+	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2
 	setflag FLAG_SYS_NATIONAL_DEX
 	special EnableNationalPokedex
 	setflag FLAG_RECEIVED_RUNNING_SHOES
@@ -41,18 +41,31 @@ Debug_CheatStart::
 	release
 	end
 
-Debug_FlagsNotSetMessage::
+Debug_FlagsNotSetOverworldConfigMessage::
 	lockall
-	message Debug_FlagsNotSetMessage_Text
+	message Debug_FlagsNotSetOverworldConfigMessage_Text
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-Debug_FlagsNotSetMessage_Text:
+Debug_FlagsNotSetOverworldConfigMessage_Text:
 	.string "Feature unavailable!\n"
 	.string "Please define a usable flag in:\l"
-	.string "'include/constants/overworld{UNDERSCORE}config.h'!$"
+	.string "'include/config/overworld.h'!$"
+
+Debug_FlagsNotSetBattleConfigMessage::
+	lockall
+	message Debug_FlagsNotSetBattleConfigMessage_Text
+	waitmessage
+	waitbuttonpress
+	releaseall
+	end
+
+Debug_FlagsNotSetBattleConfigMessage_Text:
+	.string "Feature unavailable!\n"
+	.string "Please define a usable flag in:\l"
+	.string "'include/config/battle.h'!$"
 
 Debug_Script_1::
 	end

data/scripts/gift_pichu.inc

@@ -29,7 +29,7 @@ SurfPichu_FullParty:
 
 SurfPichu_GiveEgg:
 	giveegg SPECIES_PICHU
-	setmoneventlegal VAR_GIFT_PICHU_SLOT
+	setmodernfatefulencounter VAR_GIFT_PICHU_SLOT
 	setmonmetlocation VAR_GIFT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
 	vgoto_if_eq VAR_GIFT_PICHU_SLOT, 1, SurfPichu_Slot1
 	vgoto_if_eq VAR_GIFT_PICHU_SLOT, 2, SurfPichu_Slot2

data/specials.inc

@@ -489,7 +489,7 @@ gSpecials::
 	def_special ScrollableMultichoice_ClosePersistentMenu
 	def_special DoDeoxysRockInteraction
 	def_special SetDeoxysRockPalette
-	def_special CreateEventLegalEnemyMon
+	def_special CreateEnemyEventMon
 	def_special StartMirageTowerDisintegration
 	def_special StartMirageTowerShake
 	def_special StartMirageTowerFossilFallAndSink

graphics/battle_anims/sprites/black_ball.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 98
+156 205 98
+156 205 98
+131 205 131
+156 205 0
+24 0 106
+156 8 98
+0 213 131
+24 197 0
+164 8 106
+156 8 98
+164 8 106
+156 205 131
+24 213 98
+156 8 106
+164 205 98

graphics/battle_anims/unused/line_sketch_2.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 255
+0 255 255
+148 255 255
+148 205 255
+148 156 255
+0 0 0
+0 0 0
+0 0 0
+255 0 8
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255