diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 18:11:55 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 19:22:27 -0500 |
| commit | 2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch) | |
| tree | bd8c568b9e43f7467ff4822080c6228c29bca2b9 /maps/Route36.asm | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/Route36.asm')
| -rw-r--r-- | maps/Route36.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm index aaa64ffe9..87e44c101 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -88,7 +88,7 @@ WateredWeirdTreeScript:: if_equal $2, UnknownScript_0x19407b disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - returnafterbattle + reloadmapafterbattle end UnknownScript_0x194079: @@ -96,7 +96,7 @@ UnknownScript_0x194079: end UnknownScript_0x19407b: - returnafterbattle + reloadmapafterbattle applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN @@ -227,7 +227,7 @@ UnknownScript_0x194140: .LoadFight0 loadtrainer SCHOOLBOY, ALAN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 1 clearflag ENGINE_ALAN end @@ -235,7 +235,7 @@ UnknownScript_0x194140: .LoadFight1 loadtrainer SCHOOLBOY, ALAN2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 2 clearflag ENGINE_ALAN end @@ -243,7 +243,7 @@ UnknownScript_0x194140: .LoadFight2 loadtrainer SCHOOLBOY, ALAN3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 3 clearflag ENGINE_ALAN end @@ -251,7 +251,7 @@ UnknownScript_0x194140: .LoadFight3 loadtrainer SCHOOLBOY, ALAN4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 4 clearflag ENGINE_ALAN end @@ -259,7 +259,7 @@ UnknownScript_0x194140: .LoadFight4 loadtrainer SCHOOLBOY, ALAN5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ALAN end |