diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 12:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 12:06:17 -0500 |
| commit | 5e80a12ec9fcf2201c070712d8e2dcefe2a0e364 (patch) | |
| tree | 3d4f5e7b7c0a4a3217ed070e49b6a96bf0cd9079 /data/scripts/trader.inc | |
| parent | 39efec3f1e9fc604b36b066ed7dc14e1bdb8c323 (diff) | |
| parent | c564ff9afb0a155cec1b2105ef82db99ace91b36 (diff) | |
Merge pull request #378 from PikalaxALT/rename_specials
Rename specials
Diffstat (limited to 'data/scripts/trader.inc')
| -rw-r--r-- | data/scripts/trader.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc index b3a302516..b52c8a2dc 100644 --- a/data/scripts/trader.inc +++ b/data/scripts/trader.inc @@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special 114 + special sub_8109C44 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 message MauvilleCity_PokemonCenter_1F_Text_1AE910 @@ -21,7 +21,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 end MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special 113 + special sub_8109E34 waitstate compare 0x8004, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D @@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special 115 + special sub_8109C58 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 @@ -58,19 +58,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special 117 + special sub_8109CF0 waitstate compare 0x8006, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 compare 0x8006, 65535 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special 116 + special sub_8109C90 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - special 118 + special sub_8109DE0 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 end |