diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-16 09:38:19 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-16 09:38:19 -0400 |
| commit | 119693e1816563b66b19eef216f08cab65a644ba (patch) | |
| tree | 97d9d0bc2aeb0a93eafa741f634d2cca2b138774 /data/maps/PokemonTower_7F/scripts.inc | |
| parent | d4710d9ab81ff29277ba244767c55652d58016a5 (diff) | |
propagate msgbox macro
Diffstat (limited to 'data/maps/PokemonTower_7F/scripts.inc')
| -rw-r--r-- | data/maps/PokemonTower_7F/scripts.inc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 331b2db07..a62969534 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -10,8 +10,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A setflag FLAG_0x034 clearflag FLAG_0x035 setflag FLAG_0x23C - loadword 0, gUnknown_817A529 - callstd 4 + msgbox gUnknown_817A529 closemessage warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 waitstate @@ -20,13 +19,11 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A PokemonTower_7F_EventScript_163586:: @ 8163586 trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 - loadword 0, gUnknown_817A3AF - callstd 6 + msgbox gUnknown_817A3AF, 6 end EventScript_1635A1:: @ 81635A1 - loadword 0, gUnknown_817A3AF - callstd 4 + msgbox gUnknown_817A3AF closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 @@ -109,16 +106,14 @@ Movement_163633:: @ 8163633 PokemonTower_7F_EventScript_16363D:: @ 816363D trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 - loadword 0, gUnknown_817A477 - callstd 6 + msgbox gUnknown_817A477, 6 end EventScript_163658:: @ 8163658 setvar VAR_0x8004, 14 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817A477 - callstd 4 + msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 @@ -179,13 +174,11 @@ Movement_1636CD:: @ 81636CD PokemonTower_7F_EventScript_1636D6:: @ 81636D6 trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - loadword 0, gUnknown_817A506 - callstd 6 + msgbox gUnknown_817A506, 6 end EventScript_1636F1:: @ 81636F1 - loadword 0, gUnknown_817A506 - callstd 4 + msgbox gUnknown_817A506 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 |