diff options
author | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
commit | c21e746b2dde49532b89d119762f79982b719b7f (patch) | |
tree | 6273318249aa372df3b2c76fd266b6b3e081a507 /data/maps/scripts | |
parent | 13e93ecbb4036a1a19778a235ddb5992de1048ae (diff) | |
parent | 422215e184c026037080032056b0ac56ba9429f5 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
data/data1.s
data/maps/text/SootopolisCity.s
Diffstat (limited to 'data/maps/scripts')
-rw-r--r-- | data/maps/scripts/IslandCave.s | 51 | ||||
-rw-r--r-- | data/maps/scripts/LittlerootTown_BrendansHouse_2F.s | 123 | ||||
-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 | ||||
-rw-r--r-- | data/maps/scripts/SSTidalCorridor.s | 157 | ||||
-rw-r--r-- | data/maps/scripts/SootopolisCity.s | 261 |
7 files changed, 606 insertions, 14 deletions
diff --git a/data/maps/scripts/IslandCave.s b/data/maps/scripts/IslandCave.s index e75f99629..4cad35aab 100644 --- a/data/maps/scripts/IslandCave.s +++ b/data/maps/scripts/IslandCave.s @@ -31,3 +31,54 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end + .global gUnknown_0815EF19 +gUnknown_0815EF19: @ 815EF19 + + .incbin "baserom.gba", 0x15ef19, 0x40 + +IslandCave_EventScript_15EF59:: @ 815EF59 + lockall + checkflag 2129 + jumpeq IslandCave_EventScript_15EF72 + braillemsg IslandCave_Braille_1C54FC + special 280 + waitstate + jump IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF72:: @ 815EF72 + msgbox IslandCave_Text_1A13BE, 4 + releaseall + end + +IslandCave_EventScript_15EF7C:: @ 815EF7C + lockall + braillemsg IslandCave_Braille_1C54FC + checkflag 2129 + jumpeq IslandCave_EventScript_15EF95 + special 280 + waitstate + jump IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF95:: @ 815EF95 + waitbutton + hidebox 0, 0, 29, 19 + releaseall + end + +IslandCave_EventScript_15EF9D:: @ 815EF9D + lock + faceplayer + checksound + pokecry SPECIES_REGICE, 2 + pause 40 + waitpokecry + setwildbattle SPECIES_REGICE, 40, ITEM_NONE + setflag 936 + setflag 2145 + special 313 + waitstate + clearflag 2145 + release + end diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s index ede1d33a5..e22ae74ca 100644 --- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s +++ b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s @@ -29,3 +29,126 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 .incbin "baserom.gba", 0x1527f1, 0x2d + .global gUnknown_0815281E +gUnknown_0815281E: @ 815281E + +LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E + lockall + checkgender + compare RESULT, 0 + jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152837 + compare RESULT, 1 + jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15285D + end + +LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 + setvar 0x8004, 1 + special 214 + playsfx 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 + special 249 + waitstate + releaseall + end + + .global gUnknown_08152850 +gUnknown_08152850: @ 8152850 + + .incbin "baserom.gba", 0x152850, 0xd + +LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D + msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152867:: @ 8152867 +LittlerootTown_MaysHouse_2F_EventScript_152867:: @ 8152867 + msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, 3 + end + +LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870 +LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870 + msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, 3 + end + + .include "data/maps/scripts/LittlerootTown_MaysHouse_1F.s" + .include "data/maps/scripts/LittlerootTown_MaysHouse_2F.s" +LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 + step_down + step_left + step_left + step_left + step_left + step_left + step_left + step_up + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C + step_left + step_left + step_left + step_left + step_left + step_left + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 + step_down + step_right + step_right + step_right + step_right + step_right + step_right + step_up + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 + step_right + step_right + step_right + step_right + step_right + step_right + step_up + step_13 + step_end + + .global gUnknown_08152C39 +gUnknown_08152C39: @ 8152C39 + +LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 + lockall + checkgender + compare RESULT, 0 + jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52 + compare RESULT, 1 + jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C + end + +LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 + msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C + setvar 0x8004, 2 + special 214 + playsfx 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 + special 249 + waitstate + releaseall + end + + .global gUnknown_08152C75 +gUnknown_08152C75: @ 8152C75 + + .incbin "baserom.gba", 0x152c75, 0xd 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 diff --git a/data/maps/scripts/SSTidalCorridor.s b/data/maps/scripts/SSTidalCorridor.s index 90014e7d9..f143d3261 100644 --- a/data/maps/scripts/SSTidalCorridor.s +++ b/data/maps/scripts/SSTidalCorridor.s @@ -40,3 +40,160 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 msgbox SSTidalRooms_Text_1990F8, 4 return + .global gUnknown_0815FD0D +gUnknown_0815FD0D: @ 815FD0D + + .incbin "baserom.gba", 0x15fd0d, 0x17 + +SSTidalCorridor_EventScript_15FD24:: @ 815FD24 + special 204 + setvar 0x40b4, 3 + lockall + playsfx 73 + msgbox SSTidalCorridor_Text_199088, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A + special 204 + setvar 0x40b4, 8 + lockall + playsfx 73 + msgbox SSTidalCorridor_Text_1990B4, 4 + releaseall + end + +SSTidalRooms_EventScript_15FD50:: @ 815FD50 + special 204 + setvar 0x40b4, 8 + playsfx 73 + msgbox SSTidalRooms_Text_1990B4, 4 + return + +SSTidalRooms_EventScript_15FD64:: @ 815FD64 + switch 0x40b4 + case 2, SSTidalRooms_EventScript_15FCF9 + case 3, SSTidalRooms_EventScript_15FCF9 + case 6, SSTidalRooms_EventScript_15FCE5 + case 7, SSTidalRooms_EventScript_15FD50 + return + +SSTidalCorridor_EventScript_15FD96:: @ 815FD96 + msgbox SSTidalCorridor_Text_199291, 2 + end + +SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F + lock + faceplayer + checksound + pokecry SPECIES_WINGULL, 0 + msgbox SSTidalCorridor_Text_199388, 4 + waitpokecry + release + end + +SSTidalCorridor_EventScript_15FDB2:: @ 815FDB2 + msgbox SSTidalCorridor_Text_1993A1, 3 + end + +SSTidalCorridor_EventScript_15FDBB:: @ 815FDBB + msgbox SSTidalCorridor_Text_1993A9, 3 + end + +SSTidalCorridor_EventScript_15FDC4:: @ 815FDC4 + msgbox SSTidalCorridor_Text_1993B1, 3 + end + +SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD + msgbox SSTidalCorridor_Text_1993B9, 3 + end + +SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 + lock + faceplayer + compare 0x40b4, 4 + jumpeq SSTidalCorridor_EventScript_15FDF8 + compare 0x40b4, 8 + jumpeq SSTidalCorridor_EventScript_15FE17 + msgbox SSTidalCorridor_Text_19913B, 4 + release + end + +SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 + sethealplace 8 + msgbox SSTidalCorridor_Text_1991F4, 4 + checkflag 260 + callif 1, SSTidalCorridor_EventScript_15FE36 + warp LilycoveCity_Harbor, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE17:: @ 815FE17 + sethealplace 4 + msgbox SSTidalCorridor_Text_1991F4, 4 + checkflag 260 + callif 1, SSTidalCorridor_EventScript_15FE36 + warp SlateportCity_Harbor, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE36:: @ 815FE36 + setflag 951 + return + +SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A + lockall + compare 0x40b4, 2 + jumpeq SSTidalCorridor_EventScript_15FE5B + compare 0x40b4, 7 + jumpeq SSTidalCorridor_EventScript_15FE5B + msgbox SSTidalCorridor_Text_199268, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B + special 270 + waitstate + end + +SSTidalCorridor_EventScript_15FE60:: @ 815FE60 + lock + faceplayer + checkflag 247 + jumpeq SSTidalCorridor_EventScript_15FE7A + call SSTidalCorridor_EventScript_15FE84 + msgbox SSTidalCorridor_Text_199203, 4 + release + end + +SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A + msgbox SSTidalCorridor_Text_199255, 4 + release + end + +SSTidalCorridor_EventScript_15FE84:: @ 815FE84 + checktrainerflag 494 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 495 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 294 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 255 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 256 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 641 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 138 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 119 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + setflag 247 + jump SSTidalCorridor_EventScript_15FE7A + + .incbin "baserom.gba", 0x15fed4, 0x1 + +SSTidalCorridor_EventScript_15FED5:: @ 815FED5 + return diff --git a/data/maps/scripts/SootopolisCity.s b/data/maps/scripts/SootopolisCity.s index 19e796b7c..1690b8104 100644 --- a/data/maps/scripts/SootopolisCity.s +++ b/data/maps/scripts/SootopolisCity.s @@ -207,3 +207,264 @@ SootopolisCity_EventScript_14D2F6:: @ 814D2F6 msgbox SootopolisCity_Text_16A711, 3 end +ClosedSootopolisGymDoorScript:: @ 814D2FF + msgbox ClosedSootopolisGymDoorText, 3 + end + +SootopolisCity_EventScript_14D308:: @ 814D308 + lockall + move 10, SootopolisCity_Movement_1A083F + move 255, SootopolisCity_Movement_1A0843 + waitmove 0 + playsfx 21 + move 10, SootopolisCity_Movement_1A0833 + waitmove 0 + move 10, SootopolisCity_Movement_1A0835 + waitmove 0 + move 10, SootopolisCity_Movement_14D413 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169988, 4 + .else + msgbox SootopolisCity_Text_169E0F, 4 + .endif + closebutton + move 10, SootopolisCity_Movement_14D417 + move 255, SootopolisCity_Movement_14D440 + waitmove 10 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_1699FD, 4 + .else + msgbox SootopolisCity_Text_169E82, 4 + .endif + playsfx 21 + move 5, SootopolisCity_Movement_1A0833 + waitmove 0 + move 5, SootopolisCity_Movement_1A0835 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AB7, 4 + .else + msgbox SootopolisCity_Text_169F3C, 4 + .endif + closebutton + pause 30 + move 5, SootopolisCity_Movement_14D46A + move 10, SootopolisCity_Movement_14D41D + move 255, SootopolisCity_Movement_14D445 + waitmove 0 + move 5, SootopolisCity_Movement_1A0843 + move 255, SootopolisCity_Movement_1A0843 + waitmove 0 + pause 30 + move 10, SootopolisCity_Movement_1A0845 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AE7, 4 + .else + msgbox SootopolisCity_Text_169F6B, 4 + .endif + closebutton + pause 30 + move 5, SootopolisCity_Movement_14D47C + move 255, SootopolisCity_Movement_14D457 + move 10, SootopolisCity_Movement_14D42D + waitmove 0 + move 5, SootopolisCity_Movement_1A083F + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169BC7, 4 + .else + msgbox SootopolisCity_Text_16A06C, 4 + .endif + move 255, SootopolisCity_Movement_1A083F + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169C99, 4 + .else + msgbox SootopolisCity_Text_16A13E, 4 + .endif + moveoffscreen 5 + spritebehave 5, 9 + moveoffscreen 10 + spritebehave 10, 10 + setvar 0x405e, 2 + releaseall + end + +SootopolisCity_Movement_14D413:: @ 814D413 + step_left + step_left + step_left + step_end + +SootopolisCity_Movement_14D417:: @ 814D417 + step_right + step_right + step_right + step_up + step_25 + step_end + +SootopolisCity_Movement_14D41D:: @ 814D41D + step_down + step_right + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_down + step_down + step_down + step_down + step_left + step_left + step_end + +SootopolisCity_Movement_14D42D:: @ 814D42D + step_left + step_left + step_left + step_left + step_left + step_left + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_end + +SootopolisCity_Movement_14D440:: @ 814D440 + step_right + step_right + step_right + step_right + step_end + +SootopolisCity_Movement_14D445:: @ 814D445 + step_right + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_down + step_down + step_down + step_down + step_left + step_left + step_left + step_left + step_left + step_end + +SootopolisCity_Movement_14D457:: @ 814D457 + step_14 + step_14 + step_left + step_left + step_left + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_right + step_end + +SootopolisCity_Movement_14D46A:: @ 814D46A + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_down + step_down + step_down + step_down + step_left + step_left + step_left + step_left + step_left + step_left + step_end + +SootopolisCity_Movement_14D47C:: @ 814D47C + step_14 + step_14 + step_left + step_left + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_right + step_right + step_end + +SootopolisCity_EventScript_14D48F:: @ 814D48F + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169D37, 2 + .else + msgbox SootopolisCity_Text_16A1DB, 2 + .endif + end + +SootopolisCity_EventScript_14D498:: @ 814D498 + lock + faceplayer + checkflag 113 + jumpeq SootopolisCity_EventScript_14D4AD + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169DA6, 2 + .else + msgbox SootopolisCity_Text_16A249, 4 + .endif + release + end + +SootopolisCity_EventScript_14D4AD:: @ 814D4AD + msgbox SootopolisCity_Text_16A33E, 4 + closebutton + move LAST_TALKED, SootopolisCity_Movement_1A0845 + waitmove 0 + pause 50 + setanimation 0, 1 + doanimation 30 + pause 15 + disappear LAST_TALKED + checkanimation 30 + release + end |