summaryrefslogtreecommitdiff
path: root/data/scripts/maps/UnknownMap_25_34.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/UnknownMap_25_34.inc')
-rw-r--r--data/scripts/maps/UnknownMap_25_34.inc156
1 files changed, 78 insertions, 78 deletions
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index cbd782f35..34d0bb70b 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -14,40 +14,40 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595
LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
special ScriptGetMultiplayerId
compare RESULT, 0
- callif 1, LinkContestRoom1_EventScript_15F5E0
+ call_if 1, LinkContestRoom1_EventScript_15F5E0
compare RESULT, 1
- callif 1, LinkContestRoom1_EventScript_15F5E4
+ call_if 1, LinkContestRoom1_EventScript_15F5E4
compare RESULT, 2
- callif 1, LinkContestRoom1_EventScript_15F5E8
+ call_if 1, LinkContestRoom1_EventScript_15F5E8
compare RESULT, 3
- callif 1, LinkContestRoom1_EventScript_15F5EC
+ call_if 1, LinkContestRoom1_EventScript_15F5EC
compare RESULT, 4
- callif 1, LinkContestRoom1_EventScript_15F5F0
+ call_if 1, LinkContestRoom1_EventScript_15F5F0
return
LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
- playmusicbattle 393
+ savebgm 393
return
LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4
- playmusicbattle 394
+ savebgm 394
return
LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8
- playmusicbattle 395
+ savebgm 395
return
LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC
- playmusicbattle 396
+ savebgm 396
return
LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
- playmusicbattle 440
+ savebgm 440
return
LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
compare 0x4009, 1
- callif 1, LinkContestRoom1_EventScript_15F600
+ call_if 1, LinkContestRoom1_EventScript_15F600
end
LinkContestRoom1_EventScript_15F600:: @ 815F600
@@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A
end
LinkContestRoom1_EventScript_15F625:: @ 815F625
- spriteinvisible 255, 0, 9
+ hideobject 255, 0, 9
call LinkContestRoom1_EventScript_15F919
end
@@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630
call LinkContestRoom1_EventScript_15F6E6
call LinkContestRoom1_EventScript_15F646
compare 0x4000, 8
- jumpif 0, LinkContestRoom1_EventScript_15F630
+ goto_if 0, LinkContestRoom1_EventScript_15F630
return
LinkContestRoom1_EventScript_15F646:: @ 815F646
@@ -302,73 +302,73 @@ LinkContestRoom1_EventScript_15F919:: @ 815F919
return
LinkContestRoom1_EventScript_15F956:: @ 815F956
- createvsprite 5, 20, 3, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
+ createvobject 5, 20, 3, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_15F969:: @ 815F969
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 46, 3, 2, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 12, 13, 12, 8, 3, 3
- createvsprite 47, 20, 3, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 46, 3, 2, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 12, 13, 12, 8, 3, 3
+ createvobject 47, 20, 3, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 48, 3, 2, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 45, 13, 12, 8, 3, 3
- createvsprite 22, 20, 3, 2, 3, 1
- createvsprite 23, 20, 6, 2, 3, 1
- createvsprite 34, 20, 7, 2, 3, 1
- createvsprite 46, 24, 8, 2, 3, 1
- createvsprite 48, 24, 11, 2, 3, 1
- createvsprite 11, 25, 3, 9, 3, 2
- createvsprite 35, 26, 4, 9, 3, 2
- createvsprite 17, 27, 5, 9, 3, 2
- createvsprite 41, 28, 9, 9, 3, 2
- createvsprite 38, 29, 10, 9, 3, 2
- createvsprite 83, 30, 11, 9, 3, 2
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 48, 3, 2, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 45, 13, 12, 8, 3, 3
+ createvobject 22, 20, 3, 2, 3, 1
+ createvobject 23, 20, 6, 2, 3, 1
+ createvobject 34, 20, 7, 2, 3, 1
+ createvobject 46, 24, 8, 2, 3, 1
+ createvobject 48, 24, 11, 2, 3, 1
+ createvobject 11, 25, 3, 9, 3, 2
+ createvobject 35, 26, 4, 9, 3, 2
+ createvobject 17, 27, 5, 9, 3, 2
+ createvobject 41, 28, 9, 9, 3, 2
+ createvobject 38, 29, 10, 9, 3, 2
+ createvobject 83, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_15FA70:: @ 815FA70
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 12, 3, 2, 8, 3, 4
- createvsprite 39, 4, 1, 3, 3, 4
- createvsprite 34, 6, 1, 5, 3, 4
- createvsprite 26, 7, 1, 6, 3, 4
- createvsprite 48, 9, 1, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 45, 13, 12, 8, 3, 3
- createvsprite 50, 14, 13, 3, 3, 3
- createvsprite 52, 15, 13, 4, 3, 3
- createvsprite 65, 17, 13, 6, 3, 3
- createvsprite 83, 18, 13, 7, 3, 3
- createvsprite 116, 19, 13, 8, 3, 3
- createvsprite 25, 20, 3, 2, 3, 1
- createvsprite 31, 21, 6, 2, 3, 1
- createvsprite 33, 22, 7, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
- createvsprite 49, 25, 3, 9, 3, 2
- createvsprite 35, 26, 4, 9, 3, 2
- createvsprite 48, 27, 5, 9, 3, 2
- createvsprite 41, 28, 9, 9, 3, 2
- createvsprite 38, 29, 10, 9, 3, 2
- createvsprite 83, 30, 11, 9, 3, 2
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 12, 3, 2, 8, 3, 4
+ createvobject 39, 4, 1, 3, 3, 4
+ createvobject 34, 6, 1, 5, 3, 4
+ createvobject 26, 7, 1, 6, 3, 4
+ createvobject 48, 9, 1, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 45, 13, 12, 8, 3, 3
+ createvobject 50, 14, 13, 3, 3, 3
+ createvobject 52, 15, 13, 4, 3, 3
+ createvobject 65, 17, 13, 6, 3, 3
+ createvobject 83, 18, 13, 7, 3, 3
+ createvobject 116, 19, 13, 8, 3, 3
+ createvobject 25, 20, 3, 2, 3, 1
+ createvobject 31, 21, 6, 2, 3, 1
+ createvobject 33, 22, 7, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
+ createvobject 49, 25, 3, 9, 3, 2
+ createvobject 35, 26, 4, 9, 3, 2
+ createvobject 48, 27, 5, 9, 3, 2
+ createvobject 41, 28, 9, 9, 3, 2
+ createvobject 38, 29, 10, 9, 3, 2
+ createvobject 83, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_15FB64:: @ 815FB64
@@ -381,25 +381,25 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64
return
LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1
- inccounter GAME_STAT_ENTERED_CONTEST
+ incrementgamestat GAME_STAT_ENTERED_CONTEST
warp VerdanturfTown_ContestLobby, 255, 5, 4
waitstate
end
LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD
- inccounter GAME_STAT_ENTERED_CONTEST
+ incrementgamestat GAME_STAT_ENTERED_CONTEST
warp FallarborTown_ContestLobby, 255, 5, 4
waitstate
end
LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9
- inccounter GAME_STAT_ENTERED_CONTEST
+ incrementgamestat GAME_STAT_ENTERED_CONTEST
warp SlateportCity_ContestLobby, 255, 5, 4
waitstate
end
LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5
- inccounter GAME_STAT_ENTERED_CONTEST
+ incrementgamestat GAME_STAT_ENTERED_CONTEST
warp LilycoveCity_ContestLobby, 255, 6, 4
waitstate
end
@@ -413,11 +413,11 @@ FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
- checkgender
+ checkplayergender
compare RESULT, 0
- jumpeq FallarborTown_ContestLobby_EventScript_15FBF3
+ goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3
compare RESULT, 1
- jumpeq FallarborTown_ContestLobby_EventScript_15FBF9
+ goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9
return
FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3