Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2019-12-06 02:34:54 -05:00
commit c51e0f3bae
106 files changed
+1964 -1417

No files matched your search

@@ -41,15 +41,13 @@ SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4
SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99
waitmovement 0
setvar VAR_0x8004, 11
special CallBattleFactoryFunction
factory_setopponentgfx
setobjectxyperm 2, 5, 1
removeobject 2
addobject 2
applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
waitmovement 0
setvar VAR_0x8004, 4
special CallVerdanturfTentFunction
battletent_getopponentintro
lockall
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage