diff options
| -rw-r--r-- | data/data1.s | 10 | ||||
| -rw-r--r-- | data/maps/scripts/MauvilleCity_GameCorner.s | 24 | ||||
| -rw-r--r-- | data/maps/scripts/MossdeepCity_SpaceCenter_1F.s | 2 | ||||
| -rw-r--r-- | data/maps/scripts/PacifidlogTown_House2.s | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/data/data1.s b/data/data1.s index d839d2ab9..8ad17dfae 100644 --- a/data/data1.s +++ b/data/data1.s @@ -11526,8 +11526,8 @@ Route123_EventScript_1B0DCC:: @ 81B0DCC checkattack 15 compare RESULT, 6 jumpeq Route103_EventScript_1B0E32 - setanimation 0, 32781 - bufferpartypoke 0, 32781 + setanimation 0, RESULT + bufferpartypoke 0, RESULT bufferattack 1, 15 msgbox Route103_Text_1B0E3F, 5 compare RESULT, 0 @@ -11593,8 +11593,8 @@ VictoryRoad_B1F_EventScript_1B0EB7:: @ 81B0EB7 checkattack 249 compare RESULT, 6 jumpeq Route111_EventScript_1B0F3E - setanimation 0, 32781 - bufferpartypoke 0, 32781 + setanimation 0, RESULT + bufferpartypoke 0, RESULT bufferattack 1, 249 msgbox Route111_Text_1B0F4B, 5 compare RESULT, 0 @@ -11668,7 +11668,7 @@ VictoryRoad_B1F_EventScript_1B0FCB:: @ 81B0FCB checkattack 70 compare RESULT, 6 jumpeq FieryPath_EventScript_1B1026 - setanimation 0, 32781 + setanimation 0, RESULT msgbox FieryPath_Text_1B103D, 5 compare RESULT, 0 jumpeq FieryPath_EventScript_1B103A diff --git a/data/maps/scripts/MauvilleCity_GameCorner.s b/data/maps/scripts/MauvilleCity_GameCorner.s index 073acb9f7..a77e099c5 100644 --- a/data/maps/scripts/MauvilleCity_GameCorner.s +++ b/data/maps/scripts/MauvilleCity_GameCorner.s @@ -520,7 +520,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -531,7 +531,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -542,7 +542,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -553,7 +553,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -564,7 +564,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -575,7 +575,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -586,7 +586,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -597,7 +597,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -608,7 +608,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -619,7 +619,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -630,7 +630,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -641,7 +641,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s b/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s index 4e7fe7fb5..460281ebb 100644 --- a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s +++ b/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer checkdailyflags specialval RESULT, 256 - buffernum 0, 32781 + buffernum 0, RESULT compare RESULT, 0 callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 diff --git a/data/maps/scripts/PacifidlogTown_House2.s b/data/maps/scripts/PacifidlogTown_House2.s index 62821dd11..5348a273d 100644 --- a/data/maps/scripts/PacifidlogTown_House2.s +++ b/data/maps/scripts/PacifidlogTown_House2.s @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialval RESULT, 334 - buffernum 0, 32781 + buffernum 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end |