dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document Contest scripts

Browse Source
This commit is contained in:
GriffinR authored and huderlem committed 2019-11-13 18:20:55 -06:00
1 parent af83b41dd1
commit ef8370566f
82 files changed
+2372 -2287
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/event_scripts.s
+3 -13
View File
@@ -40,6 +40,7 @@
#include "constants/trainer_hill.h"
#include "constants/trainers.h"
#include "constants/tv.h"
#include "constants/union_room.h"
#include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc"
@@ -442,18 +443,7 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc"
.include "data/maps/LinkContestRoom1/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
.include "data/maps/LinkContestRoom2/scripts.inc"
.include "data/maps/LinkContestRoom3/scripts.inc"
.include "data/maps/LinkContestRoom4/scripts.inc"
.include "data/maps/LinkContestRoom5/scripts.inc"
.include "data/maps/LinkContestRoom6/scripts.inc"
.include "data/maps/ContestHall/scripts.inc"
.include "data/maps/InsideOfTruck/scripts.inc"
.include "data/maps/SSTidalCorridor/scripts.inc"
.include "data/maps/SSTidalLowerDeck/scripts.inc"
@@ -1122,7 +1112,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
.include "data/scripts/apprentice.inc"
.include "data/text/battle_dome.inc"
.include "data/scripts/battle_pike.inc"
.include "data/text/contest_hall.inc"
.include "data/text/blend_master.inc"
.include "data/text/battle_tent.inc"
.include "data/text/event_ticket_2.inc"
.include "data/text/move_tutors.inc"
data/layouts/LinkContestRoom1/border.bin → data/layouts/ContestHall/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom1/map.bin → data/layouts/ContestHall/map.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom2/border.bin → data/layouts/ContestHallBeauty/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom2/map.bin → data/layouts/ContestHallBeauty/map.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom3/border.bin → data/layouts/ContestHallCool/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom4/map.bin → data/layouts/ContestHallCool/map.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom4/border.bin → data/layouts/ContestHallCute/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom6/map.bin → data/layouts/ContestHallCute/map.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom5/border.bin → data/layouts/ContestHallSmart/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom5/map.bin → data/layouts/ContestHallSmart/map.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom6/border.bin → data/layouts/ContestHallTough/border.bin
View File
File renamed without changes.
data/layouts/LinkContestRoom3/map.bin → data/layouts/ContestHallTough/map.bin
View File
File renamed without changes.
data/layouts/layouts.json
+24 -24
View File
@@ -2242,14 +2242,14 @@
"blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM1",
"name": "LinkContestRoom1_Layout",
"id": "LAYOUT_CONTEST_HALL",
"name": "ContestHall_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom1/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
"border_filepath": "data/layouts/ContestHall/border.bin",
"blockdata_filepath": "data/layouts/ContestHall/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
@@ -2312,54 +2312,54 @@
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM2",
"name": "LinkContestRoom2_Layout",
"id": "LAYOUT_CONTEST_HALL_BEAUTY",
"name": "ContestHallBeauty_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom2/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
"border_filepath": "data/layouts/ContestHallBeauty/border.bin",
"blockdata_filepath": "data/layouts/ContestHallBeauty/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM3",
"name": "LinkContestRoom3_Layout",
"id": "LAYOUT_CONTEST_HALL_TOUGH",
"name": "ContestHallTough_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom3/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
"border_filepath": "data/layouts/ContestHallTough/border.bin",
"blockdata_filepath": "data/layouts/ContestHallTough/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM4",
"name": "LinkContestRoom4_Layout",
"id": "LAYOUT_CONTEST_HALL_COOL",
"name": "ContestHallCool_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom4/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
"border_filepath": "data/layouts/ContestHallCool/border.bin",
"blockdata_filepath": "data/layouts/ContestHallCool/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM5",
"name": "LinkContestRoom5_Layout",
"id": "LAYOUT_CONTEST_HALL_SMART",
"name": "ContestHallSmart_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom5/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
"border_filepath": "data/layouts/ContestHallSmart/border.bin",
"blockdata_filepath": "data/layouts/ContestHallSmart/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM6",
"name": "LinkContestRoom6_Layout",
"id": "LAYOUT_CONTEST_HALL_CUTE",
"name": "ContestHallCute_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/LinkContestRoom6/border.bin",
"blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
"border_filepath": "data/layouts/ContestHallCute/border.bin",
"blockdata_filepath": "data/layouts/ContestHallCute/map.bin"
},
{
"id": "LAYOUT_INSIDE_OF_TRUCK",
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+1 -1
View File
@@ -1015,7 +1015,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
end
BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
setvar VAR_0x8004, 20
setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER
goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
end
data/maps/LinkContestRoom1/map.json → data/maps/ContestHall/map.json
+4 -4
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_LINK_CONTEST_ROOM1",
"name": "LinkContestRoom1",
"layout": "LAYOUT_LINK_CONTEST_ROOM1",
"id": "MAP_CONTEST_HALL",
"name": "ContestHall",
"layout": "LAYOUT_CONTEST_HALL",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@@ -181,7 +181,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_LINK_CONTEST_POKE_BALL"
"flag": "FLAG_HIDE_CONTEST_POKE_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_3",
data/maps/ContestHall/scripts.inc
+460
View File
@@ -0,0 +1,460 @@
ContestHall_MapScripts:: @ 823B781
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame
map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
map_script MAP_SCRIPT_ON_RESUME, ContestHall_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
.byte 0
ContestHall_OnReturn: @ 823B79B
special LoadLinkContestPlayerPalettes
end
ContestHall_OnTransition: @ 823B79F
call ContestHall_EventScript_ReadyContestMusic
setvar VAR_TEMP_0, 1
call ContestHall_EventScript_AddRandomAudienceMembers
end
ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
call ContestHall_EventScript_TryWaitForLink
special ScriptGetMultiplayerId
compare VAR_RESULT, 0
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
compare VAR_RESULT, 1
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer2
compare VAR_RESULT, 2
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer3
compare VAR_RESULT, 3
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer4
compare VAR_RESULT, 4
call_if_eq ContestHall_EventScript_SaveContestMusic
return
ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
savebgm MUS_TEST1
return
ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
savebgm MUS_TEST2
return
ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
savebgm MUS_TEST3
return
ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
savebgm MUS_TEST4
return
ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
savebgm MUS_CONTEST0
return
ContestHall_OnResume: @ 823B803
compare VAR_TEMP_9, 1
call_if_eq ContestHall_EventScript_ReShowAudience
end
ContestHall_EventScript_ReShowAudience:: @ 823B80F
call ContestHall_EventScript_CreateAudience
return
ContestHall_OnFrame: @ 823B815
map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
.2byte 0
ContestHall_OnWarp: @ 823B81F
map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
.2byte 0
ContestHall_EventScript_Contest:: @ 823B829
call ContestHall_EventScript_DoContest
call ContestHall_EventScript_SetExitWarp
end
ContestHall_EventScript_SetContestObjects:: @ 823B834
special LoadLinkContestPlayerPalettes
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
call ContestHall_EventScript_CreateAudience
end
@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist)
@ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
call ContestHall_EventScript_GetRandomAudienceGfxId
call ContestHall_EventScript_SetRandomAudienceGfx
compare VAR_TEMP_0, 8
goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
return
ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
switch VAR_TEMP_0
case 1, ContestHall_EventScript_SetRandomAudience1
case 2, ContestHall_EventScript_SetRandomAudience2
case 3, ContestHall_EventScript_SetRandomAudience3
case 4, ContestHall_EventScript_SetRandomAudience4
case 5, ContestHall_EventScript_SetRandomAudience5
case 6, ContestHall_EventScript_SetRandomAudience6
case 7, ContestHall_EventScript_SetRandomAudience7
end
ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB
copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6
copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1
copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC
copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7
copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2
copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
setvar VAR_RESULT, 32
special ScriptRandom
addvar VAR_RESULT, 1
switch VAR_RESULT
case 1, ContestHall_EventScript_RandomAudienceNinjaBoy
case 2, ContestHall_EventScript_RandomAudienceTwin
case 3, ContestHall_EventScript_RandomAudienceBoy1
case 4, ContestHall_EventScript_RandomAudienceGirl1
case 5, ContestHall_EventScript_RandomAudienceGirl2
case 6, ContestHall_EventScript_RandomAudienceLittleBoy
case 7, ContestHall_EventScript_RandomAudienceGirl
case 8, ContestHall_EventScript_RandomAudienceBoy3
case 9, ContestHall_EventScript_RandomAudienceGirl3
case 10, ContestHall_EventScript_RandomAudienceRichBoy
case 11, ContestHall_EventScript_RandomAudienceFatMan
case 12, ContestHall_EventScript_RandomAudiencePokefanF
case 13, ContestHall_EventScript_RandomAudienceMan1
case 14, ContestHall_EventScript_RandomAudienceWoman2
case 15, ContestHall_EventScript_RandomAudienceExpertM
case 16, ContestHall_EventScript_RandomAudienceExpertF
case 17, ContestHall_EventScript_RandomAudiencePokefanM
case 18, ContestHall_EventScript_RandomAudienceWoman4
case 19, ContestHall_EventScript_RandomAudienceCook
case 20, ContestHall_EventScript_RandomAudienceLass
case 21, ContestHall_EventScript_RandomAudienceOldWoman
case 22, ContestHall_EventScript_RandomAudienceCamper
case 23, ContestHall_EventScript_RandomAudiencePicnicker
case 24, ContestHall_EventScript_RandomAudienceMan3
case 25, ContestHall_EventScript_RandomAudienceWoman5
case 26, ContestHall_EventScript_RandomAudienceYoungster
case 27, ContestHall_EventScript_RandomAudienceBugCatcher
case 28, ContestHall_EventScript_RandomAudiencePsychicM
case 29, ContestHall_EventScript_RandomAudienceSchoolKidM
case 30, ContestHall_EventScript_RandomAudienceBlackBelt
case 31, ContestHall_EventScript_RandomAudienceBeauty
case 32, ContestHall_EventScript_RandomAudienceScientist1
end
ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B
setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
return
ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71
setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
return
ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
return
ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
return
ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
return
ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
return
ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
return
ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
return
ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
return
ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1
setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
return
ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7
setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
return
ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
return
ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
return
ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
return
ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
return
ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
return
ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
return
ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
return
ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7
setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
return
ContestHall_EventScript_RandomAudienceLass:: @ 823BADD
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
return
ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3
setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
return
ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9
setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
return
ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
return
ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
return
ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
return
ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01
setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
return
ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
return
ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
return
ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
return
ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
return
ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
return
ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
return
ContestHall_EventScript_CreateAudience:: @ 823BB2B
specialvar VAR_RESULT, IsWirelessContest
compare VAR_RESULT, TRUE
goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
switch VAR_CONTEST_TYPE
case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience
case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience
case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_CreateHyperContestAudience
case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_CreateMasterContestAudience
case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience
return
ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
ContestHall_EventScript_SetExitWarp:: @ 823BE44
special ClearLinkContestFlags
switch VAR_CONTEST_TYPE
case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest
case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_SetExitWarpSuperContest
case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_SetExitWarpHyperContest
case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_SetExitWarpMasterContest
case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest
return
ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
waitstate
end
LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
return
LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
data/maps/LinkContestRoom5/map.json → data/maps/ContestHallBeauty/map.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_LINK_CONTEST_ROOM5",
"name": "LinkContestRoom5",
"layout": "LAYOUT_LINK_CONTEST_ROOM5",
"id": "MAP_CONTEST_HALL_BEAUTY",
"name": "ContestHallBeauty",
"layout": "LAYOUT_CONTEST_HALL_BEAUTY",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/LinkContestRoom3/map.json → data/maps/ContestHallCool/map.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_LINK_CONTEST_ROOM3",
"name": "LinkContestRoom3",
"layout": "LAYOUT_LINK_CONTEST_ROOM3",
"id": "MAP_CONTEST_HALL_COOL",
"name": "ContestHallCool",
"layout": "LAYOUT_CONTEST_HALL_COOL",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/LinkContestRoom2/map.json → data/maps/ContestHallCute/map.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_LINK_CONTEST_ROOM2",
"name": "LinkContestRoom2",
"layout": "LAYOUT_LINK_CONTEST_ROOM2",
"id": "MAP_CONTEST_HALL_CUTE",
"name": "ContestHallCute",
"layout": "LAYOUT_CONTEST_HALL_CUTE",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/LinkContestRoom4/map.json → data/maps/ContestHallSmart/map.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_LINK_CONTEST_ROOM4",
"name": "LinkContestRoom4",
"layout": "LAYOUT_LINK_CONTEST_ROOM4",
"id": "MAP_CONTEST_HALL_SMART",
"name": "ContestHallSmart",
"layout": "LAYOUT_CONTEST_HALL_SMART",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/ContestHallTough/map.json
+18
View File
@@ -0,0 +1,18 @@
{
"id": "MAP_CONTEST_HALL_TOUGH",
"name": "ContestHallTough",
"layout": "LAYOUT_CONTEST_HALL_TOUGH",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_bike": false,
"allow_escape_rope": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/FallarborTown/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA
FallarborTown_OnTransition: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setvar VAR_CONTEST_HALL_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED
end
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
LilycoveCity_OnTransition: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setvar VAR_CONTEST_HALL_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
call Common_EventScript_SetupRivalGfxId
data/maps/LilycoveCity_ContestLobby/map.json
+8 -8
View File
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_ContestLobby_EventScript_Blender2Man",
"script": "BerryBlender_EventScript_Blender2Man",
"flag": "0"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_ContestLobby_EventScript_Blender2Twin",
"script": "BerryBlender_EventScript_Blender2Twin",
"flag": "0"
},
{
@@ -206,7 +206,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_ContestLobby_EventScript_Blender3PokefanF",
"script": "BerryBlender_EventScript_Blender3PokefanF",
"flag": "0"
},
{
@@ -219,7 +219,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_ContestLobby_EventScript_Blender1ExpertM",
"script": "BerryBlender_EventScript_Blender1ExpertM",
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
},
{
@@ -378,7 +378,7 @@
"y": 5,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderLink"
"script": "BerryBlender_EventScript_BerryBlenderLink"
},
{
"type": "sign",
@@ -386,7 +386,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LilycoveCity_ContestLobby_EventScript_BerryBlender3"
"script": "BerryBlender_EventScript_BerryBlender3"
},
{
"type": "sign",
@@ -450,7 +450,7 @@
"y": 5,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LilycoveCity_ContestLobby_EventScript_BerryBlender1"
"script": "BerryBlender_EventScript_BerryBlender1"
},
{
"type": "sign",
@@ -458,7 +458,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LilycoveCity_ContestLobby_EventScript_BerryBlender2"
"script": "BerryBlender_EventScript_BerryBlender2"
},
{
"type": "sign",
data/maps/LilycoveCity_ContestLobby/scripts.inc
+375 -373
View File
File diff suppressed because it is too large. Load diff
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+14 -14
View File
@@ -1,9 +1,9 @@
LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
.byte 0
LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790
map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
.2byte 0
@@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
lockall
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -118,7 +118,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
return
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8005, 8
setvar VAR_0x8005, NUM_TRAINER_CLUB_MEMBERS
setvar VAR_0x8004, 8
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
@@ -469,7 +469,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
setvar VAR_0x8004, 15
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
@@ -481,13 +481,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan
msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT
release
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT
LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan:: @ 821CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT
release
end
@@ -608,11 +608,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
end
LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
.string "Oh, wow!\n"
.string "It's {PLAYER}!$"
LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
.string "I've heard the news!\n"
.string "You're really strong, aren't you?\p"
.string "We always argue about who is the\n"
@@ -833,11 +833,11 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
.string "{STR_VAR_1} is definitely stronger!\n"
.string "I'm positive!$"
LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72
.string "You…\p"
.string "Impressive!$"
LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83
.string "Your true worth, it is fine if only\n"
.string "I recognized it.\p"
.string "The others I doubt will understand\n"
data/maps/LinkContestRoom1/scripts.inc
-458
View File
@@ -1,458 +0,0 @@
LinkContestRoom1_MapScripts:: @ 823B781
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F
map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815
map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B
.byte 0
LinkContestRoom1_MapScript1_23B79B: @ 823B79B
special sub_80F8B94
end
LinkContestRoom1_OnTransition: @ 823B79F
call LinkContestRoom1_EventScript_23B7AF
setvar VAR_TEMP_0, 1
call LinkContestRoom1_EventScript_23B842
end
LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
call LinkContestRoom1_EventScript_27A133
special ScriptGetMultiplayerId
compare VAR_RESULT, 0
call_if_eq LinkContestRoom1_EventScript_23B7EF
compare VAR_RESULT, 1
call_if_eq LinkContestRoom1_EventScript_23B7F3
compare VAR_RESULT, 2
call_if_eq LinkContestRoom1_EventScript_23B7F7
compare VAR_RESULT, 3
call_if_eq LinkContestRoom1_EventScript_23B7FB
compare VAR_RESULT, 4
call_if_eq LinkContestRoom1_EventScript_23B7FF
return
LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
savebgm MUS_TEST1
return
LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
savebgm MUS_TEST2
return
LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
savebgm MUS_TEST3
return
LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
savebgm MUS_TEST4
return
LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
savebgm MUS_CONTEST0
return
LinkContestRoom1_MapScript1_23B803: @ 823B803
compare VAR_TEMP_9, 1
call_if_eq LinkContestRoom1_EventScript_23B80F
end
LinkContestRoom1_EventScript_23B80F:: @ 823B80F
call LinkContestRoom1_EventScript_23BB2B
return
LinkContestRoom1_MapScript2_23B815: @ 823B815
map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829
.2byte 0
LinkContestRoom1_MapScript2_23B81F: @ 823B81F
map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834
.2byte 0
LinkContestRoom1_EventScript_23B829:: @ 823B829
call LinkContestRoom1_EventScript_279F97
call LinkContestRoom1_EventScript_23BE44
end
LinkContestRoom1_EventScript_23B834:: @ 823B834
special sub_80F8B94
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
call LinkContestRoom1_EventScript_23BB2B
end
LinkContestRoom1_EventScript_23B842:: @ 823B842
call LinkContestRoom1_EventScript_23B8F8
call LinkContestRoom1_EventScript_23B858
compare VAR_TEMP_0, 8
goto_if_lt LinkContestRoom1_EventScript_23B842
return
LinkContestRoom1_EventScript_23B858:: @ 823B858
switch VAR_TEMP_0
case 1, LinkContestRoom1_EventScript_23B8AB
case 2, LinkContestRoom1_EventScript_23B8B6
case 3, LinkContestRoom1_EventScript_23B8C1
case 4, LinkContestRoom1_EventScript_23B8CC
case 5, LinkContestRoom1_EventScript_23B8D7
case 6, LinkContestRoom1_EventScript_23B8E2
case 7, LinkContestRoom1_EventScript_23B8ED
end
LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
addvar VAR_TEMP_0, 1
return
LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
setvar VAR_RESULT, 32
special ScriptRandom
addvar VAR_RESULT, 1
switch VAR_RESULT
case 1, LinkContestRoom1_EventScript_23BA6B
case 2, LinkContestRoom1_EventScript_23BA71
case 3, LinkContestRoom1_EventScript_23BA77
case 4, LinkContestRoom1_EventScript_23BA7D
case 5, LinkContestRoom1_EventScript_23BA83
case 6, LinkContestRoom1_EventScript_23BA89
case 7, LinkContestRoom1_EventScript_23BA8F
case 8, LinkContestRoom1_EventScript_23BA95
case 9, LinkContestRoom1_EventScript_23BA9B
case 10, LinkContestRoom1_EventScript_23BAA1
case 11, LinkContestRoom1_EventScript_23BAA7
case 12, LinkContestRoom1_EventScript_23BAAD
case 13, LinkContestRoom1_EventScript_23BAB3
case 14, LinkContestRoom1_EventScript_23BAB9
case 15, LinkContestRoom1_EventScript_23BABF
case 16, LinkContestRoom1_EventScript_23BAC5
case 17, LinkContestRoom1_EventScript_23BACB
case 18, LinkContestRoom1_EventScript_23BAD1
case 19, LinkContestRoom1_EventScript_23BAD7
case 20, LinkContestRoom1_EventScript_23BADD
case 21, LinkContestRoom1_EventScript_23BAE3
case 22, LinkContestRoom1_EventScript_23BAE9
case 23, LinkContestRoom1_EventScript_23BAEF
case 24, LinkContestRoom1_EventScript_23BAF5
case 25, LinkContestRoom1_EventScript_23BAFB
case 26, LinkContestRoom1_EventScript_23BB01
case 27, LinkContestRoom1_EventScript_23BB07
case 28, LinkContestRoom1_EventScript_23BB0D
case 29, LinkContestRoom1_EventScript_23BB13
case 30, LinkContestRoom1_EventScript_23BB19
case 31, LinkContestRoom1_EventScript_23BB1F
case 32, LinkContestRoom1_EventScript_23BB25
end
LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
return
LinkContestRoom1_EventScript_23BA71:: @ 823BA71
setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
return
LinkContestRoom1_EventScript_23BA77:: @ 823BA77
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
return
LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
return
LinkContestRoom1_EventScript_23BA83:: @ 823BA83
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
return
LinkContestRoom1_EventScript_23BA89:: @ 823BA89
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
return
LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
return
LinkContestRoom1_EventScript_23BA95:: @ 823BA95
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
return
LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
return
LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
return
LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
return
LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
return
LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
return
LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
return
LinkContestRoom1_EventScript_23BABF:: @ 823BABF
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
return
LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
return
LinkContestRoom1_EventScript_23BACB:: @ 823BACB
setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
return
LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
return
LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
return
LinkContestRoom1_EventScript_23BADD:: @ 823BADD
setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
return
LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
return
LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
return
LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
return
LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
return
LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
return
LinkContestRoom1_EventScript_23BB01:: @ 823BB01
setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
return
LinkContestRoom1_EventScript_23BB07:: @ 823BB07
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
return
LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
return
LinkContestRoom1_EventScript_23BB13:: @ 823BB13
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
return
LinkContestRoom1_EventScript_23BB19:: @ 823BB19
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
return
LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
return
LinkContestRoom1_EventScript_23BB25:: @ 823BB25
setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
return
LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
specialvar VAR_RESULT, sub_80F9160
compare VAR_RESULT, 1
goto_if_eq LinkContestRoom1_EventScript_23BD86
switch VAR_CONTEST_LOCATION
case 1, LinkContestRoom1_EventScript_23BB78
case 2, LinkContestRoom1_EventScript_23BB8B
case 3, LinkContestRoom1_EventScript_23BBE6
case 4, LinkContestRoom1_EventScript_23BC92
case 5, LinkContestRoom1_EventScript_23BC92
return
LinkContestRoom1_EventScript_23BB78:: @ 823BB78
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
LinkContestRoom1_EventScript_23BC92:: @ 823BC92
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
return
LinkContestRoom1_EventScript_23BD86:: @ 823BD86
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
return
LinkContestRoom1_EventScript_23BE44:: @ 823BE44
special sub_80F9154
switch VAR_CONTEST_LOCATION
case 1, LinkContestRoom1_EventScript_23BE84
case 2, LinkContestRoom1_EventScript_23BE8E
case 3, LinkContestRoom1_EventScript_23BE98
case 4, LinkContestRoom1_EventScript_23BEA2
case 5, LinkContestRoom1_EventScript_23BEAC
return
LinkContestRoom1_EventScript_23BE84:: @ 823BE84
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
LinkContestRoom1_EventScript_23BE98:: @ 823BE98
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
waitstate
end
LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
waitstate
end
LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
return
LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
data/maps/LinkContestRoom2/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/LinkContestRoom3/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/LinkContestRoom4/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/LinkContestRoom5/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/LinkContestRoom6/map.json
-18
View File
@@ -1,18 +0,0 @@
{
"id": "MAP_LINK_CONTEST_ROOM6",
"name": "LinkContestRoom6",
"layout": "LAYOUT_LINK_CONTEST_ROOM6",
"music": "MUS_CONTEST0",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_bike": false,
"allow_escape_rope": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
}
data/maps/LinkContestRoom6/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/SlateportCity/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ SlateportCity_OnTransition: @ 81DCC6C
SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
setflag FLAG_VISITED_SLATEPORT_CITY
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setvar VAR_CONTEST_HALL_STATE, 0
setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
return
data/maps/SlateportCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95
SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
lock
faceplayer
goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
goto_if_unset FLAG_ENTERED_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman
switch VAR_SLATEPORT_FAN_CLUB_STATE
case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment
data/maps/UnknownLinkContestRoom_25_29/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_29/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/UnknownLinkContestRoom_25_30/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_30/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/UnknownLinkContestRoom_25_31/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_31/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/UnknownLinkContestRoom_25_32/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_32/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/UnknownLinkContestRoom_25_33/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_33/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/UnknownLinkContestRoom_25_34/map.json
+2 -2
View File
@@ -13,6 +13,6 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "LinkContestRoom1",
"shared_scripts_map": "LinkContestRoom1"
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}
data/maps/UnknownLinkContestRoom_25_34/scripts.inc
-1
View File
@@ -1 +0,0 @@
data/maps/VerdanturfTown/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 81EB566
VerdanturfTown_OnTransition: @ 81EB56C
setflag FLAG_VISITED_VERDANTURF_TOWN
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setvar VAR_CONTEST_HALL_STATE, 0
end
VerdanturfTown_EventScript_Twin:: @ 81EB575
data/maps/map_groups.json
+6 -6
View File
@@ -460,18 +460,18 @@
"TradeCenter",
"RecordCorner",
"BattleColosseum4P",
"LinkContestRoom1",
"ContestHall",
"UnknownLinkContestRoom_25_29",
"UnknownLinkContestRoom_25_30",
"UnknownLinkContestRoom_25_31",
"UnknownLinkContestRoom_25_32",
"UnknownLinkContestRoom_25_33",
"UnknownLinkContestRoom_25_34",
"LinkContestRoom2",
"LinkContestRoom3",
"LinkContestRoom4",
"LinkContestRoom5",
"LinkContestRoom6",
"ContestHallBeauty",
"ContestHallTough",
"ContestHallCool",
"ContestHallSmart",
"ContestHallCute",
"InsideOfTruck",
"SSTidalCorridor",
"SSTidalLowerDeck",
data/scripts/berry_blender.inc
+258 -258
View File
@@ -1,22 +1,22 @@
LilycoveCity_ContestLobby_Text_WantToMakePokeblocks: @ 8292DEE
BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE
.string "Oh? Did you want to make some {POKEBLOCK}S\n"
.string "with this old-timer?$"
LilycoveCity_ContestLobby_Text_Excellent: @ 8292E28
BerryBlender_Text_Excellent: @ 8292E28
.string "Excellent!$"
LilycoveCity_ContestLobby_Text_MadeOldTimerSad: @ 8292E33
BerryBlender_Text_MadeOldTimerSad: @ 8292E33
.string "Oh…\n"
.string "You've made this old-timer sad…$"
LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks: @ 8292E57
BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57
.string "Do you know how to make a {POKEBLOCK}?$"
LilycoveCity_ContestLobby_Text_LetsBerryBlender: @ 8292E78
BerryBlender_Text_LetsBerryBlender: @ 8292E78
.string "Let's get started, then!\p"
.string "Let's BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6
BerryBlender_Text_ExplainBerryBlending: @ 8292EA6
.string "Okay, a little explanation, then.\p"
.string "Oh, don't worry, it's quite simple.\p"
.string "When the BLENDER's arrow comes to\n"
@@ -24,63 +24,63 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6
.string "That's all you have to do.\n"
.string "You'll see how easy it is when you try.$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerries: @ 8292F77
BerryBlender_Text_DontHaveAnyBerries: @ 8292F77
.string "Oh?\n"
.string "You don't have any BERRIES?\p"
.string "If you don't have any BERRIES,\n"
.string "you can't make any {POKEBLOCK}S.$"
LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries: @ 8292FD1
BerryBlender_Text_CanHaveOneOfMyBerries: @ 8292FD1
.string "Well, that won't do at all now, will it?\p"
.string "If you don't mind leftovers, you can\n"
.string "have one of my BERRIES.\p"
.string "That way, we could make some {POKEBLOCK}S\n"
.string "together using the BERRY BLENDER.$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare: @ 829307D
BerryBlender_Text_DontHaveAnyBerriesToSpare: @ 829307D
.string "If I had some BERRIES left over,\n"
.string "I'd gladly give you one…\p"
.string "But, I don't have any to spare today.\n"
.string "We'll have to do this another time.$"
LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull: @ 8293101
BerryBlender_Text_PokeblockCaseIsFull: @ 8293101
.string "But your {POKEBLOCK} CASE is full.\p"
.string "You should use some {POKEBLOCK}S before\n"
.string "you come see me again.$"
LilycoveCity_ContestLobby_Text_DontHavePokeblockCase: @ 8293157
BerryBlender_Text_DontHavePokeblockCase: @ 8293157
.string "But you don't have a {POKEBLOCK} CASE.\p"
.string "You should get a {POKEBLOCK} CASE and then\n"
.string "come see me.$"
LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready: @ 82931AA
BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA
.string "Let's get blending already!$"
LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
.string "This is so exciting!$"
LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs: @ 8293201
BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201
.string "Hi, there! Did you want to blend some\n"
.string "{POKEBLOCK}S with us?$"
LilycoveCity_ContestLobby_Text_Okay: @ 8293237
BerryBlender_Text_Okay: @ 8293237
.string "Okay!$"
LilycoveCity_ContestLobby_Text_ThatsTooBad: @ 829323D
BerryBlender_Text_ThatsTooBad: @ 829323D
.string "That's too bad…\p"
.string "But we'll always be around whenever\n"
.string "you get the urge to blend!$"
LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2: @ 829328C
BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C
.string "Of course, you do know how to\n"
.string "blend {POKEBLOCK}S, don't you?$"
LilycoveCity_ContestLobby_Text_LetsBerryBlender2: @ 82932C3
BerryBlender_Text_LetsBerryBlender2: @ 82932C3
.string "Let's get started, then!\p"
.string "Let's BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1
BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
.string "Okay!\n"
.string "Let me explain it to you!\p"
.string "When the spinning BLENDER's arrow\n"
@@ -89,7 +89,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1
.string "That's all it takes.\n"
.string "Pretty easy, don't you think?$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394
BerryBlender_Text_DontHaveAnyBerries2: @ 8293394
.string "Oh, but wait a second here…\n"
.string "You don't have any BERRIES.\p"
.string "You can't make any {POKEBLOCK}S without\n"
@@ -97,40 +97,40 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394
.string "We'll always be around whenever you\n"
.string "get hold of some BERRIES to blend.$"
LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2: @ 829343E
BerryBlender_Text_PokeblockCaseIsFull2: @ 829343E
.string "Oh, but wait a second here…\n"
.string "Your {POKEBLOCK} CASE is full.\p"
.string "You should use some {POKEBLOCK}S and\n"
.string "then come back.$"
LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2: @ 82934A2
BerryBlender_Text_DontHavePokeblockCase2: @ 82934A2
.string "Oh, but wait a second here…\n"
.string "You don't have a {POKEBLOCK} CASE.\p"
.string "You should get a {POKEBLOCK} CASE and\n"
.string "then come back.$"
@ Unused
LilycoveCity_ContestLobby_Text_MakePokeblocksWithOurGroup: @ 829350B
BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B
.string "Oh, hello! Did you want to make some\n"
.string "{POKEBLOCK}S with our little group?$"
LilycoveCity_ContestLobby_Text_OhDear: @ 829354E
BerryBlender_Text_OhDear: @ 829354E
.string "Oh, dear!$"
LilycoveCity_ContestLobby_Text_LeftUsInShock: @ 8293558
BerryBlender_Text_LeftUsInShock: @ 8293558
.string "Oh, dear me…\p"
.string "You've left us in shock!$"
LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3: @ 829357E
BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E
.string "Naturally, you know how to make\n"
.string "{POKEBLOCK}S, don't you?$"
LilycoveCity_ContestLobby_Text_LetsBerryBlender3: @ 82935B1
BerryBlender_Text_LetsBerryBlender3: @ 82935B1
.string "Okay, dear!\n"
.string "Let's get started!\p"
.string "Let's BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5
BerryBlender_Text_ExplainBerryBlending3: @ 82935E5
.string "Oh, dear!\p"
.string "Then, I'll explain it to you nicely.\p"
.string "When the BLENDER's arrow spins to\n"
@@ -138,7 +138,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5
.string "That's all it takes.\n"
.string "Isn't it simple?$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D
BerryBlender_Text_DontHaveAnyBerries3: @ 829367D
.string "You don't have any BERRIES,\n"
.string "do you?\p"
.string "If you don't have any BERRIES,\n"
@@ -147,84 +147,84 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D
.string "so let's make some together when\l"
.string "you get a BERRY or two.$"
LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3: @ 8293738
BerryBlender_Text_PokeblockCaseIsFull3: @ 8293738
.string "Your {POKEBLOCK} CASE is full,\n"
.string "it looks like.\p"
.string "You should use some {POKEBLOCK}S up\n"
.string "and then come back.$"
LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3: @ 8293792
BerryBlender_Text_DontHavePokeblockCase3: @ 8293792
.string "You haven't gotten a {POKEBLOCK} CASE\n"
.string "yet, it looks like.\p"
.string "You need to get a {POKEBLOCK} CASE before\n"
.string "you come back.$"
LilycoveCity_ContestLobby_Text_SetNewBlenderRecord: @ 82937F9
BerryBlender_Text_SetNewBlenderRecord: @ 82937F9
.string "Okay! Today's going to be the day that\n"
.string "I set a new BLENDER speed record!$"
LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs: @ 8293842
BerryBlender_Text_LookGoodAtBlendingJoinUs: @ 8293842
.string "Oh, dear!\n"
.string "You look as if you're good at blending.\l"
.string "Would you like to join us?$"
LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks: @ 829388F
BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F
.string "I'm going to make delicious {POKEBLOCK}S\n"
.string "and make my POKéMON cuter.$"
LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
BerryBlender_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
.string "{POKEBLOCK}S will be made with your friends \n"
.string "from BERRIES in the BERRY BLENDER.\p"
.string "Is it okay to save the game before\n"
.string "linking with your friends?$"
LilycoveCity_ContestLobby_Text_SearchingForFriends: @ 8293955
BerryBlender_Text_SearchingForFriends: @ 8293955
.string "Searching for your friends…\n"
.string "… … B Button: Cancel$"
LilycoveCity_ContestLobby_Text_Player1Arrived: @ 8293986
BerryBlender_Text_Player1Arrived: @ 8293986
.string "{STR_VAR_1} arrived.$"
LilycoveCity_ContestLobby_Text_Player1And2Arrived: @ 8293992
BerryBlender_Text_Player1And2Arrived: @ 8293992
.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
LilycoveCity_ContestLobby_Text_AllPlayersArrived: @ 82939A5
BerryBlender_Text_AllPlayersArrived: @ 82939A5
.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
.string "{STR_VAR_3} arrived.$"
LilycoveCity_ContestLobby_Text_NoBerriesLink: @ 82939BD
BerryBlender_Text_NoBerriesLink: @ 82939BD
.string "You have no BERRIES.\n"
.string "The BERRY BLENDER can't be used.$"
LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink: @ 82939F3
BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3
.string "Your {POKEBLOCK} CASE is full.\n"
.string "The BERRY BLENDER can't be used.$"
LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink: @ 8293A2D
BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D
.string "You don't have a {POKEBLOCK} CASE.\n"
.string "The BERRY BLENDER can't be used.$"
LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks: @ 8293A6B
BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B
.string "I love making {POKEBLOCK}S.\p"
.string "I always have some BERRIES with me.$"
LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
.string "If you'd like, we could make some\n"
.string "{POKEBLOCK}S together using the\l"
.string "BERRY BLENDER.$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
BerryBlender_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
.string "Oh?\n"
.string "You don't have any BERRIES?\p"
.string "Well, that won't do at all now, will it?\p"
.string "If you don't mind leftovers, you can\n"
.string "have one of my BERRIES.$"
LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether: @ 8293B76
BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76
.string "We'll use it to make {POKEBLOCK}S together\n"
.string "using the BERRY BLENDER.$"
LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
.string "Oh?\n"
.string "You don't have any BERRIES?\p"
.string "If I had some left over, I'd gladly\n"
@@ -232,75 +232,75 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
.string "But, I don't have any to spare today.\n"
.string "Sorry about that.$"
LilycoveCity_ContestLobby_EventScript_BerryBlender1:: @ 8293C3E
BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
lockall
goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, LilycoveCity_ContestLobby_EventScript_BlendMasterPresent
goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
setvar VAR_0x8009, 1
applymovement 16, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_WantToMakePokeblocks, MSGBOX_YESNO
msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1
goto LilycoveCity_ContestLobby_EventScript_DeclineBlender1
goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1
goto BerryBlender_EventScript_DeclineBlender1
end
LilycoveCity_ContestLobby_EventScript_DeclineBlender1: @ 8293C70
msgbox LilycoveCity_ContestLobby_Text_MadeOldTimerSad, MSGBOX_DEFAULT
BerryBlender_EventScript_DeclineBlender1: @ 8293C70
msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender1NoBerries: @ 8293C7A
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A
msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
dotimebasedevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries
goto LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries
goto BerryBlender_EventScript_Blender1GiveSpareBerry
end
LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries: @ 8293C92
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry: @ 8293C9C
msgbox LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1
goto BerryBlender_EventScript_UseBerryBlender1
end
LilycoveCity_ContestLobby_EventScript_UseBerryBlender1: @ 8293CB9
msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9
msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender1
goto LilycoveCity_ContestLobby_EventScript_ExplainBlending1
goto_if_eq BerryBlender_EventScript_StartBlender1
goto BerryBlender_EventScript_ExplainBlending1
end
LilycoveCity_ContestLobby_EventScript_StartBlender1: @ 8293CD2
msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
BerryBlender_EventScript_StartBlender1: @ 8293CD2
msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoBerryBlending
end
LilycoveCity_ContestLobby_EventScript_ExplainBlending1: @ 8293CE0
msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_StartBlender1
BerryBlender_EventScript_ExplainBlending1: @ 8293CE0
msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT
goto BerryBlender_EventScript_StartBlender1
end
LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1: @ 8293CEE
BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoCase
goto_if_eq BerryBlender_EventScript_Blender1NoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1CaseFull
goto_if_eq BerryBlender_EventScript_Blender1CaseFull
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoBerries
msgbox LilycoveCity_ContestLobby_Text_Excellent, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1
goto_if_eq BerryBlender_EventScript_Blender1NoBerries
msgbox BerryBlender_Text_Excellent, MSGBOX_DEFAULT
goto BerryBlender_EventScript_UseBerryBlender1
end
@ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left
LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C
BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
copyvar VAR_0x8004, VAR_0x8009
fadescreen 1
special DoBerryBlending
@@ -308,326 +308,326 @@ LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender1CaseFull: @ 8293D39
msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender1CaseFull: @ 8293D39
msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender1NoCase: @ 8293D43
msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender1NoCase: @ 8293D43
msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_BerryBlender2:: @ 8293D4D
BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
lockall
setvar VAR_0x8009, 2
applymovement 10, Common_Movement_FaceOriginalDirection
applymovement 3, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2
goto LilycoveCity_ContestLobby_EventScript_DeclineBlender2
goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2
goto BerryBlender_EventScript_DeclineBlender2
end
LilycoveCity_ContestLobby_EventScript_DeclineBlender2: @ 8293D7D
msgbox LilycoveCity_ContestLobby_Text_ThatsTooBad, MSGBOX_DEFAULT
BerryBlender_EventScript_DeclineBlender2: @ 8293D7D
msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender2NoBerries: @ 8293D87
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender2NoBerries: @ 8293D87
msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_UseBerryBlender2: @ 8293D91
msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
BerryBlender_EventScript_UseBerryBlender2: @ 8293D91
msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender2
goto LilycoveCity_ContestLobby_EventScript_ExplainBlending2
goto_if_eq BerryBlender_EventScript_StartBlender2
goto BerryBlender_EventScript_ExplainBlending2
end
LilycoveCity_ContestLobby_EventScript_StartBlender2: @ 8293DAA
msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender2, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
BerryBlender_EventScript_StartBlender2: @ 8293DAA
msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoBerryBlending
end
LilycoveCity_ContestLobby_EventScript_ExplainBlending2: @ 8293DB8
msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_StartBlender2
BerryBlender_EventScript_ExplainBlending2: @ 8293DB8
msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
goto BerryBlender_EventScript_StartBlender2
end
LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2: @ 8293DC6
BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoBerries
goto_if_eq BerryBlender_EventScript_Blender2NoBerries
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoCase
msgbox LilycoveCity_ContestLobby_Text_Okay, MSGBOX_DEFAULT
goto_if_eq BerryBlender_EventScript_Blender2NoCase
msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender2
goto_if_ne BerryBlender_EventScript_UseBerryBlender2
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2CaseFull
goto_if_eq BerryBlender_EventScript_Blender2CaseFull
end
LilycoveCity_ContestLobby_EventScript_Blender2CaseFull: @ 8293E0A
msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A
msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender2NoCase: @ 8293E14
msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender2NoCase: @ 8293E14
msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_BerryBlender3:: @ 8293E1E
BerryBlender_EventScript_BerryBlender3:: @ 8293E1E
lockall
setvar VAR_0x8008, 15
setvar VAR_0x8009, 3
applymovement 9, Common_Movement_FaceOriginalDirection
applymovement 17, Common_Movement_FaceOriginalDirection
applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBlender3
goto LilycoveCity_ContestLobby_EventScript_DeclineBlender3
goto_if_eq BerryBlender_EventScript_TryUseBlender3
goto BerryBlender_EventScript_DeclineBlender3
end
LilycoveCity_ContestLobby_EventScript_DeclineBlender3: @ 8293E5A
msgbox LilycoveCity_ContestLobby_Text_LeftUsInShock, MSGBOX_DEFAULT
BerryBlender_EventScript_DeclineBlender3: @ 8293E5A
msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender3NoBerries: @ 8293E64
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender3NoBerries: @ 8293E64
msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_UseBerryBlender3: @ 8293E6E
msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E
msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender3
goto LilycoveCity_ContestLobby_EventScript_ExplainBlending3
goto_if_eq BerryBlender_EventScript_StartBlender3
goto BerryBlender_EventScript_ExplainBlending3
end
LilycoveCity_ContestLobby_EventScript_StartBlender3: @ 8293E87
msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender3, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
BerryBlender_EventScript_StartBlender3: @ 8293E87
msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoBerryBlending
end
LilycoveCity_ContestLobby_EventScript_ExplainBlending3: @ 8293E95
msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_StartBlender3
BerryBlender_EventScript_ExplainBlending3: @ 8293E95
msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
goto BerryBlender_EventScript_StartBlender3
end
LilycoveCity_ContestLobby_EventScript_TryUseBlender3: @ 8293EA3
BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoBerries
goto_if_eq BerryBlender_EventScript_Blender3NoBerries
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoCase
msgbox LilycoveCity_ContestLobby_Text_OhDear, MSGBOX_DEFAULT
goto_if_eq BerryBlender_EventScript_Blender3NoCase
msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender3
goto_if_ne BerryBlender_EventScript_UseBerryBlender3
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3CaseFull
goto_if_eq BerryBlender_EventScript_Blender3CaseFull
end
LilycoveCity_ContestLobby_EventScript_Blender3CaseFull: @ 8293EE7
msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7
msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender3NoCase: @ 8293EF1
msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
BerryBlender_EventScript_Blender3NoCase: @ 8293EF1
msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_BlendMasterPresent: @ 8293EFB
BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
lockall
setvar VAR_0x8009, 1
msgbox LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction, MSGBOX_YESNO
msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster
msgbox LilycoveCity_ContestLobby_Text_TooBusyNowIsee, MSGBOX_DEFAULT
goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster
msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries: @ 8293F1E
msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E
msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster: @ 8293F28
BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase
goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries
goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster
goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull
goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
end
LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster: @ 8293F64
msgbox LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, NO
call_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending
msgbox LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoBerryBlending
end
LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending: @ 8293F85
msgbox LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85
msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
return
LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase: @ 8293F8E
msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E
msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull: @ 8293F98
msgbox LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98
msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_Blender2Man:: @ 8293FA2
msgbox LilycoveCity_ContestLobby_Text_SetNewBlenderRecord, MSGBOX_NPC
BerryBlender_EventScript_Blender2Man:: @ 8293FA2
msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_Blender3PokefanF:: @ 8293FAB
msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB
msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_Blender2Twin:: @ 8293FB4
msgbox LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
BerryBlender_EventScript_Blender2Twin:: @ 8293FB4
msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_Blender1ExpertM:: @ 8293FBD
BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD
setvar VAR_0x8008, 15
goto LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry
goto BerryBlender_EventScript_ExpertMCheckGiveBerry
end
LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
lock
faceplayer
msgbox LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries
goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries
goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
end
LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries: @ 8293FF8
BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
dotimebasedevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
goto LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries
goto BerryBlender_EventScript_ExpertMGiveBerry
end
LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries: @ 8294028
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry: @ 8294032
msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
msgbox LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace: @ 8294053
BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053
walk_in_place_fastest_right
step_end
LilycoveCity_ContestLobby_EventScript_BerryBlenderLink:: @ 8294055
BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
lockall
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries
goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase
goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame
goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull
goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
end
LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame: @ 8294092
msgbox LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender
goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
compare VAR_RESULT, NO
goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender
goto_if_eq BerryBlender_EventScript_CancelLinkBlender
end
LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries: @ 82940B1
msgbox LilycoveCity_ContestLobby_Text_NoBerriesLink, MSGBOX_DEFAULT
BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1
msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender: @ 82940BB
BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
call Common_EventScript_SaveGame
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender
goto_if_eq BerryBlender_EventScript_CancelLinkBlender
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader
message LilycoveCity_ContestLobby_Text_SearchingForFriends
goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader
message BerryBlender_Text_SearchingForFriends
waitmessage
special TryBerryBlenderLinkup
waitstate
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners
goto_if_eq BerryBlender_EventScript_SpawnLinkPartners
compare VAR_RESULT, 2
goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady
goto_if_eq BerryBlender_EventScript_CloseLinkNotReady
compare VAR_RESULT, 3
goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections
goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections
compare VAR_RESULT, 5
goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLink
goto_if_eq BerryBlender_EventScript_CloseLink
compare VAR_RESULT, 6
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkError
goto_if_eq BerryBlender_EventScript_LinkError
end
LilycoveCity_ContestLobby_EventScript_TwoPlayerLink: @ 829411D
msgbox LilycoveCity_ContestLobby_Text_Player1Arrived, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
BerryBlender_EventScript_TwoPlayerLink: @ 829411D
msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoLinkBerryBlending
end
LilycoveCity_ContestLobby_EventScript_ThreePlayerLink: @ 829412B
msgbox LilycoveCity_ContestLobby_Text_Player1And2Arrived, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
BerryBlender_EventScript_ThreePlayerLink: @ 829412B
msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoLinkBerryBlending
end
LilycoveCity_ContestLobby_EventScript_FourPlayerLink: @ 8294139
msgbox LilycoveCity_ContestLobby_Text_AllPlayersArrived, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
BerryBlender_EventScript_FourPlayerLink: @ 8294139
msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoLinkBerryBlending
end
LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147
BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
setvar VAR_0x8004, 0
fadescreen 1
removeobject 240
@@ -639,109 +639,109 @@ LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147
releaseall
end
LilycoveCity_ContestLobby_EventScript_CancelLinkBlender: @ 8294160
BerryBlender_EventScript_CancelLinkBlender: @ 8294160
releaseall
end
LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull: @ 8294162
msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162
msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase: @ 829416C
msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C
msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady: @ 8294176
BerryBlender_EventScript_CloseLinkNotReady: @ 8294176
special CloseLink
msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections: @ 8294183
BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183
special CloseLink
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_CloseLink: @ 8294190
BerryBlender_EventScript_CloseLink: @ 8294190
special CloseLink
msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_LinkError: @ 829419D
BerryBlender_EventScript_LinkError: @ 829419D
special CloseLink
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners: @ 82941AA
BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
fadescreen 1
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
special SpawnLinkPartnerEventObject
goto LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived
goto BerryBlender_EventScript_LinkPlayersArrived
end
LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived: @ 82941C4
BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
fadescreen 0
switch VAR_0x8008
case 2, LilycoveCity_ContestLobby_EventScript_TwoPlayerLink
case 3, LilycoveCity_ContestLobby_EventScript_ThreePlayerLink
case 4, LilycoveCity_ContestLobby_EventScript_FourPlayerLink
case 2, BerryBlender_EventScript_TwoPlayerLink
case 3, BerryBlender_EventScript_ThreePlayerLink
case 4, BerryBlender_EventScript_FourPlayerLink
end
LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader: @ 82941ED
setvar VAR_0x8004, 13
goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER
goto BerryBlender_EventScript_DecideLinkLeader
end
LilycoveCity_ContestLobby_EventScript_DecideLinkLeader: @ 82941F8
message Text_DecideLinkLeader
BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup
case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup
case 2, LilycoveCity_ContestLobby_EventScript_CloseLink
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CloseLink
case 0, BerryBlender_EventScript_TryJoinGroup
case 1, BerryBlender_EventScript_TryLeadGroup
case 2, BerryBlender_EventScript_CloseLink
case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink
end
LilycoveCity_ContestLobby_EventScript_TryLeadGroup: @ 8294235
call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader
BerryBlender_EventScript_TryLeadGroup: @ 8294235
call BerryBlender_EventScript_TryBecomeLinkLeader
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
compare VAR_RESULT, 5
goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
goto_if_eq BerryBlender_EventScript_DecideLinkLeader
compare VAR_RESULT, 8
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup
goto_if_eq BerryBlender_EventScript_TryLeadGroup
release
end
LilycoveCity_ContestLobby_EventScript_TryJoinGroup: @ 829425D
call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup
BerryBlender_EventScript_TryJoinGroup: @ 829425D
call BerryBlender_EventScript_TryJoinLinkGroup
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
compare VAR_RESULT, 5
goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
goto_if_eq BerryBlender_EventScript_DecideLinkLeader
compare VAR_RESULT, 8
goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup
goto_if_eq BerryBlender_EventScript_TryJoinGroup
release
end
LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader: @ 8294285
BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285
special TryBecomeLinkLeader
waitstate
return
LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup: @ 829428A
BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A
special TryJoinLinkGroup
waitstate
return
LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided: @ 829428F
goto LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners
BerryBlender_EventScript_LinkLeaderDecided: @ 829428F
goto BerryBlender_EventScript_SpawnLinkPartners
end
data/scripts/cable_club.inc
+14 -14
View File
@@ -1085,7 +1085,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
call CableClub_EventScript_CheckPartyTradeRequirements
compare VAR_RESULT, 0
goto_if_eq CableClub_EventScript_AbortLink
setvar VAR_0x8004, 3
setvar VAR_0x8004, LINK_GROUP_TRADE
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1103,7 +1103,7 @@ CableClub_EventScript_WirelessBattleSelect:: @ 827783B
end
CableClub_EventScript_WirelessSingleBattle:: @ 827788E
setvar VAR_0x8004, 0
setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1111,7 +1111,7 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 8277899
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle
setvar VAR_0x8004, 1
setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1121,7 +1121,7 @@ CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2
end
CableClub_EventScript_WirelessMultiBattle:: @ 82778C0
setvar VAR_0x8004, 2
setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1134,7 +1134,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9
msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CableClub_EventScript_AbortLink
setvar VAR_0x8004, 12
setvar VAR_0x8004, LINK_GROUP_RECORD_CORNER
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1145,7 +1145,7 @@ CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
special HasAtLeastOneBerry
compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush
setvar VAR_0x8004, 5
setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH
goto CableClub_EventScript_SaveAndChooseLinkLeader
end
@@ -1159,12 +1159,12 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
compare VAR_RESULT, 0
goto_if_eq CableClub_EventScript_AbortLink
switch VAR_0x8004
case 3, CableClub_EventScript_ChooseLinkLeaderFrom2
case 0, CableClub_EventScript_ChooseLinkLeaderFrom2
case 1, CableClub_EventScript_ChooseLinkLeaderFrom2
case 2, CableClub_EventScript_ChooseLinkLeaderFrom4
case 5, CableClub_EventScript_ChooseLinkLeader
case 12, CableClub_EventScript_ChooseLinkLeader
case LINK_GROUP_TRADE, CableClub_EventScript_ChooseLinkLeaderFrom2
case LINK_GROUP_SINGLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
case LINK_GROUP_DOUBLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
case LINK_GROUP_MULTI_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom4
case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader
case LINK_GROUP_RECORD_CORNER, CableClub_EventScript_ChooseLinkLeader
end
CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
@@ -1416,7 +1416,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
setvar VAR_0x8004, 4
setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP
goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
end
@@ -1435,7 +1435,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
setvar VAR_0x8004, 6
setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING
goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
end
data/scripts/contest_hall.inc
+707 -684
View File
File diff suppressed because it is too large. Load diff
data/scripts/interview.inc
+14 -14
View File
@@ -238,27 +238,27 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
release
end
LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
compare VAR_LINK_CONTEST_ROOM_STATE, 2
goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95
LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
compare VAR_CONTEST_HALL_STATE, 2
goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
setvar VAR_0x8005, 6
special InterviewBefore
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95
switch VAR_CONTEST_LOCATION
case 0, LilycoveCity_ContestLobby_EventScript_28CB95
case 2, LilycoveCity_ContestLobby_EventScript_28CB91
case 1, LilycoveCity_ContestLobby_EventScript_28CB91
case 3, LilycoveCity_ContestLobby_EventScript_28CB91
case 4, LilycoveCity_ContestLobby_EventScript_28CB91
case 5, LilycoveCity_ContestLobby_EventScript_28CB95
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
switch VAR_CONTEST_TYPE
case 0, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
case 2, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
case 1, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
case 3, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
case 4, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
end
LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91
LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
return
LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
return
BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
data/scripts/new_game.inc
+1 -1
View File
@@ -82,7 +82,7 @@ EventScript_ResetAllBerries:: @ 827149D
return
EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_LINK_CONTEST_POKE_BALL
setflag FLAG_HIDE_CONTEST_POKE_BALL
setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
data/specials.inc
+25 -25
View File
@@ -87,23 +87,23 @@ gSpecials:: @ 81DBA64
def_special CheckForBigMovieOrEmergencyNewsOnTV
def_special GetMomOrDadStringForTVMessage
def_special ResetTVShowState
def_special sub_80F831C
def_special sub_80F84B0
def_special GetContestWinnerId
def_special GetContestPlayerId
def_special sub_80F8814
def_special sub_80F834C
def_special sub_80F8390
def_special sub_80F8850
def_special sub_80F82B4
def_special BufferContestWinnerTrainerName
def_special BufferContestWinnerMonName
def_special BufferContestTrainerAndMonNames
def_special GetContestMonConditionRanking
def_special SetContestTrainerGfxIds
def_special sub_80F7F30
def_special TryEnterContestMon
def_special sub_80F8970
def_special sub_80F8AFC
def_special sub_80F82FC
def_special sub_80F7F7C
def_special sub_80F7FFC
def_special sub_80F8D24
def_special SetLinkContestPlayerGfx
def_special GetContestMonCondition
def_special HasMonWonThisContestBefore
def_special GiveMonContestRibbon
def_special IsContestDebugActive
def_special GiveMonArtistRibbon
def_special sub_80B3000
def_special TryContestGModeLinkup
def_special SaveGame
def_special DoWateringBerryTreeAnim
def_special ShowEasyChatScreen
@@ -145,8 +145,8 @@ gSpecials:: @ 81DBA64
def_special CalculatePlayerPartyCount
def_special CountPartyNonEggMons
def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
def_special sub_80F88E8
def_special sub_80F88DC
def_special ShouldReadyContestArtist
def_special SaveMuseumContestPainting
def_special sub_80F8864
def_special CountPlayerContestPaintings
def_special ShowContestWinner
@@ -310,7 +310,7 @@ gSpecials:: @ 81DBA64
def_special InitRoamer
def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty
def_special sub_80AFC60
def_special DoContestHallWarp
def_special PutZigzagoonInPlayerParty
def_special IsStarterInParty
def_special CopyCurSecretBaseOwnerName_StrVar1
@@ -331,7 +331,7 @@ gSpecials:: @ 81DBA64
def_special DoDiveWarp
def_special DoFallWarp
def_special ShowContestEntryMonPic
def_special sub_80F8EB8
def_special HideContestEntryMonPic
def_special SetEReaderTrainerGfxId
def_special BattleSetup_StartLatiBattle
def_special SetRoute119Weather
@@ -443,17 +443,17 @@ gSpecials:: @ 81DBA64
def_special OffsetCameraForBattle
def_special GetDeptStoreDefaultFloorChoice
def_special BufferVarsForIVRater
def_special sub_80F905C
def_special LinkContestWaitForConnection
def_special sub_800B518
def_special sub_80F90DC
def_special sub_80F910C
def_special sub_80F9160
def_special LinkContestTryShowWirelessIndicator
def_special LinkContestTryHideWirelessIndicator
def_special IsWirelessContest
def_special ShowRankingHallRecordsWindow
def_special ScrollRankingHallRecordsWindow
def_special ShowFrontierManiacMessage
def_special sub_80F9134
def_special sub_80F9154
def_special sub_80B3028
def_special IsContestWithRSPlayer
def_special ClearLinkContestFlags
def_special TryContestEModeLinkup
def_special ShowScrollableMultichoice
def_special sub_813A630
def_special BufferBattleTowerElevatorFloors
@@ -525,7 +525,7 @@ gSpecials:: @ 81DBA64
def_special TryGetWallpaperWithWaldaPhrase
def_special PlayerNotAtTrainerHillEntrance
def_special GetBattlePyramidHint
def_special sub_80F8B94
def_special LoadLinkContestPlayerPalettes
def_special ShowTrainerHillRecords
def_special PlayerFaceTrainerAfterBattle
def_special ResetHealLocationFromDewford
data/text/contest_hall.inc → data/text/blend_master.inc
+15 -15
View File
@@ -1,34 +1,34 @@
LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster: @ 82C427C
BerryBlender_Text_BlendWithTheBlendMaster: @ 82C427C
.string "BLEND MASTER: Indeed I am!\n"
.string "The BLEND MASTER am I!\p"
.string "Blend with me, and you shall witness\n"
.string "the mastery I bring to blending!$"
LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction: @ 82C42F4
BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
.string "BLEND MASTER: Hmmm! So, you wish to\n"
.string "see my mastery in action?$"
LilycoveCity_ContestLobby_Text_TooBusyNowIsee: @ 82C4332
BerryBlender_Text_TooBusyNowIsee: @ 82C4332
.string "Hmmm!\p"
.string "So, you are too busy now, I see!\p"
.string "But fear not!\n"
.string "I shall be here all day!\l"
.string "Hurry back from your errand!$"
LilycoveCity_ContestLobby_Text_BlendMasterNoBerries: @ 82C439D
BerryBlender_Text_BlendMasterNoBerries: @ 82C439D
.string "Hmmm!\p"
.string "You haven't got a single BERRY!\p"
.string "I shall be here all day!\n"
.string "Hurry back with some BERRIES!$"
LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
.string "Of course!\n"
.string "Of course!\p"
.string "Incidentally…\n"
.string "You do know how to blend {POKEBLOCK}S\l"
.string "from BERRIES?$"
LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending: @ 82C444C
BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
.string "Hmmm!\p"
.string "Ah, but it is a simple process!\p"
.string "When the BLENDER's arrow comes to\n"
@@ -37,40 +37,40 @@ LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending: @ 82C444C
.string "When you see how precisely I press\n"
.string "the A Button, you will understand.$"
LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender: @ 82C451B
BerryBlender_Text_BlendMasterLetsBerryBlender: @ 82C451B
.string "Fine!\p"
.string "Let's get started, then!\p"
.string "All together with the BLEND MASTER,\n"
.string "let's BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase: @ 82C4573
BerryBlender_Text_BlendMasterNoPokeblockCase: @ 82C4573
.string "Hmmm!\p"
.string "You don't appear to have gotten\n"
.string "the {POKEBLOCK} CASE!\p"
.string "I shall be here all day!\n"
.string "Obtain the {POKEBLOCK} CASE and hurry back!$"
LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
BerryBlender_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
.string "Hmmm!\p"
.string "Your {POKEBLOCK} CASE appears to be full!\p"
.string "I shall be here all day!\n"
.string "Use some {POKEBLOCK}S and hurry back!$"
LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B
BerryBlender_Text_WhoaAwesome: @ 82C464B
.string "Whoa!\n"
.string "Awesome!$"
LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A
BerryBlender_Text_WickedlyFast: @ 82C465A
.string "Wickedly fast!$"
LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669
BerryBlender_Text_WhatAnExpert: @ 82C4669
.string "What an expert!$"
LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679
BerryBlender_Text_MadeAmazingPokeblocksWithMaster: @ 82C4679
.string "When I blended with the MASTER,\n"
.string "we made amazing {POKEBLOCK}S!$"
LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
.string "Eyes that track the arrow with\n"
.string "machinelike intensity…\p"
.string "A hand that taps the A Button\n"
@@ -78,7 +78,7 @@ LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
.string "Possessing these qualities makes\n"
.string "the BLEND MASTER truly great.$"
LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763
BerryBlender_Text_MasterWorksOnSkillsInMountains: @ 82C4763
.string "The BLEND MASTER's supposed to work\n"
.string "on his skills deep in the mountains.\p"
.string "Sometimes, he comes to LILYCOVE\n"
include/constants/contest.h
+13
View File
@@ -9,6 +9,19 @@
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
#define CONTEST_RANK_NORMAL 0
#define CONTEST_RANK_SUPER 1
#define CONTEST_RANK_HYPER 2
#define CONTEST_RANK_MASTER 3
#define CONTEST_RANK_LINK 4
// States for VAR_CONTEST_TYPE
#define CONTEST_TYPE_NPC_NORMAL (CONTEST_RANK_NORMAL + 1)
#define CONTEST_TYPE_NPC_SUPER (CONTEST_RANK_SUPER + 1)
#define CONTEST_TYPE_NPC_HYPER (CONTEST_RANK_HYPER + 1)
#define CONTEST_TYPE_NPC_MASTER (CONTEST_RANK_MASTER + 1)
#define CONTEST_TYPE_LINK (CONTEST_RANK_LINK + 1)
#define CONTEST_CATEGORY_COOL 0
#define CONTEST_CATEGORY_BEAUTY 1
#define CONTEST_CATEGORY_CUTE 2
include/constants/flags.h
+3 -3
View File
@@ -95,7 +95,7 @@
#define FLAG_UNUSED_0x054 0x54 // Unused Flag
#define FLAG_UNUSED_0x055 0x55 // Unused Flag
#define FLAG_LINK_CONTEST_POKE_BALL 0x56
#define FLAG_HIDE_CONTEST_POKE_BALL 0x56 // Always set after new game, object it hides is added directly
#define FLAG_MET_RIVAL_MOM 0x57
#define FLAG_BIRCH_AIDE_MET 0x58
#define FLAG_DECLINED_BIKE 0x59
@@ -287,7 +287,7 @@
#define FLAG_RECEIVED_REVIVED_FOSSIL_MON 0x10B
#define FLAG_SECRET_BASE_REGISTRY_ENABLED 0x10C
#define FLAG_RECEIVED_TM46 0x10D
#define FLAG_CONTEST_SKETCH_CREATED 0x10E
#define FLAG_CONTEST_SKETCH_CREATED 0x10E // Set but never read
#define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE 0x10F
#define FLAG_RECEIVED_EXP_SHARE 0x110
#define FLAG_POKERUS_EXPLAINED 0x111
@@ -361,7 +361,7 @@
#define FLAG_MET_BATTLE_FRONTIER_BREEDER 0x153
#define FLAG_MET_BATTLE_FRONTIER_MANIAC 0x154
#define FLAG_ENTERED_LINK_CONTEST 0x155
#define FLAG_ENTERED_CONTEST 0x155
#define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN 0x156
#define FLAG_MET_BATTLE_FRONTIER_BETTOR 0x157
#define FLAG_ENABLE_MR_STONE_POKENAV 0x158
include/constants/layouts.h
+6 -6
View File
@@ -225,18 +225,18 @@
#define LAYOUT_TRADE_CENTER 222
#define LAYOUT_RECORD_CORNER 223
#define LAYOUT_BATTLE_COLOSSEUM_4P 224
#define LAYOUT_LINK_CONTEST_ROOM1 225
#define LAYOUT_CONTEST_HALL 225
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
#define LAYOUT_LINK_CONTEST_ROOM2 232
#define LAYOUT_LINK_CONTEST_ROOM3 233
#define LAYOUT_LINK_CONTEST_ROOM4 234
#define LAYOUT_LINK_CONTEST_ROOM5 235
#define LAYOUT_LINK_CONTEST_ROOM6 236
#define LAYOUT_CONTEST_HALL_BEAUTY 232
#define LAYOUT_CONTEST_HALL_TOUGH 233
#define LAYOUT_CONTEST_HALL_COOL 234
#define LAYOUT_CONTEST_HALL_SMART 235
#define LAYOUT_CONTEST_HALL_CUTE 236
#define LAYOUT_INSIDE_OF_TRUCK 237
#define LAYOUT_SAFARI_ZONE_NORTHWEST 238
#define LAYOUT_SAFARI_ZONE_NORTH 239
include/constants/map_groups.h
+6 -6
View File
@@ -426,18 +426,18 @@
#define MAP_TRADE_CENTER (25 | (25 << 8))
#define MAP_RECORD_CORNER (26 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
#define MAP_CONTEST_HALL (28 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8))
#define MAP_CONTEST_HALL_BEAUTY (35 | (25 << 8))
#define MAP_CONTEST_HALL_TOUGH (36 | (25 << 8))
#define MAP_CONTEST_HALL_COOL (37 | (25 << 8))
#define MAP_CONTEST_HALL_SMART (38 | (25 << 8))
#define MAP_CONTEST_HALL_CUTE (39 | (25 << 8))
#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
include/constants/tv.h
+3
View File
@@ -43,4 +43,7 @@
// //
#define TVSHOW_MASS_OUTBREAK 41
// Number of ribbons to put Spot the Cuties on air
#define NUM_CUTIES_RIBBONS 4
#endif //GUARD_CONSTANTS_TV_H
include/constants/union_room.h
+28
View File
@@ -0,0 +1,28 @@
#ifndef GUARD_CONSTANTS_UNION_ROOM_H
#define GUARD_CONSTANTS_UNION_ROOM_H
#define LINK_GROUP_SINGLE_BATTLE 0
#define LINK_GROUP_DOUBLE_BATTLE 1
#define LINK_GROUP_MULTI_BATTLE 2
#define LINK_GROUP_TRADE 3
#define LINK_GROUP_POKEMON_JUMP 4
#define LINK_GROUP_BERRY_CRUSH 5
#define LINK_GROUP_BERRY_PICKING 6
#define LINK_GROUP_WONDER_CARD 7
#define LINK_GROUP_WONDER_NEWS 8
#define LINK_GROUP_UNK_9 9
#define LINK_GROUP_UNK_10 10
#define LINK_GROUP_UNK_11 11
#define LINK_GROUP_RECORD_CORNER 12
#define LINK_GROUP_BERRY_BLENDER 13
#define LINK_GROUP_UNK_14 14
#define LINK_GROUP_COOL_CONTEST 15
#define LINK_GROUP_BEAUTY_CONTEST 16
#define LINK_GROUP_CUTE_CONTEST 17
#define LINK_GROUP_SMART_CONTEST 18
#define LINK_GROUP_TOUGH_CONTEST 19
#define LINK_GROUP_BATTLE_TOWER 20
#define LINK_GROUP_BATTLE_TOWER_OPEN 21
#define NUM_LINK_GROUP_TYPES 22
#endif //GUARD_CONSTANTS_UNION_ROOM_H
include/constants/vars.h
+2 -2
View File
@@ -148,9 +148,9 @@
#define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084
#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
#define VAR_LINK_CONTEST_ROOM_STATE 0x4086
#define VAR_CONTEST_HALL_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_LOCATION 0x4088
#define VAR_CONTEST_TYPE 0x4088
#define VAR_SECRET_BASE_INITIALIZED 0x4089
#define VAR_CONTEST_PRIZE_PICKUP 0x408A
#define VAR_UNUSED_0x408B 0x408B // Unused Var
include/contest.h
+7 -15
View File
@@ -200,14 +200,6 @@ enum
CONTEST_STRING_NONE = 255
};
enum {
CONTEST_RANK_NORMAL,
CONTEST_RANK_SUPER,
CONTEST_RANK_HYPER,
CONTEST_RANK_MASTER,
CONTEST_RANK_LINK
};
enum {
CONTEST_FILTER_NONE,
CONTEST_FILTER_NO_POSTGAME,
@@ -436,15 +428,15 @@ struct ContestResources
#define eContestDebugMode (gHeap[0x1a000])
#define eUnknownHeap1A004 (*(struct Shared1A004 *)(gHeap + 0x1a004))
extern struct ContestPokemon gContestMons[4];
extern s16 gContestMonConditions[4];
extern s16 gUnknown_02039F08[4];
extern s16 gUnknown_02039F10[4];
extern s16 gUnknown_02039F18[4];
extern u8 gContestFinalStandings[4];
extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
extern s16 gContestMonConditions[CONTESTANT_COUNT];
extern s16 gUnknown_02039F08[CONTESTANT_COUNT];
extern s16 gUnknown_02039F10[CONTESTANT_COUNT];
extern s16 gUnknown_02039F18[CONTESTANT_COUNT];
extern u8 gContestFinalStandings[CONTESTANT_COUNT];
extern u8 gContestMonPartyIndex;
extern u8 gContestPlayerMonIndex;
extern u8 gContestantTurnOrder[4];
extern u8 gContestantTurnOrder[CONTESTANT_COUNT];
extern u8 gLinkContestFlags;
extern u8 gUnknown_02039F2B;
extern u16 gSpecialVar_ContestCategory;
include/contest_link_80F57C4.h
+4 -4
View File
@@ -1,10 +1,10 @@
#ifndef GUARD_CONTEST_LINK_80F57C4_H
#define GUARD_CONTEST_LINK_80F57C4_H
void sub_80F8264(void);
void sub_80F8290(void);
void sub_80F840C(void);
void sub_80F8438(void);
void BufferContestantTrainerName(void);
void BufferContestantMonNickname(void);
void StartContest(void);
void BufferContestantMonSpecies(void);
void sub_80F8484(void);
void sub_80F84C4(u8);
void sub_80FC998(u8 taskId);
include/field_screen_effect.h
+1 -1
View File
@@ -32,7 +32,7 @@ void DoMossdeepGymWarp(void);
void sub_80AF8B8(void);
void sub_80AF948(void);
void sub_80AF9F8(void);
void sub_80AFC60(void);
void DoContestHallWarp(void);
void AnimateFlash(u8 flashLevel);
void WriteBattlePyramidViewScanlineEffectBuffer(void);
void sub_80B0244(void);
include/link.h
+2 -2
View File
@@ -92,8 +92,8 @@
#define LINKTYPE_0x5501 0x5501 // mystery event
#define LINKTYPE_0x5502 0x5502 // unused?
#define LINKTYPE_0x5503 0x5503 // eReader
#define LINKTYPE_0x6601 0x6601
#define LINKTYPE_0x6602 0x6602
#define LINKTYPE_CONTEST_GMODE 0x6601
#define LINKTYPE_CONTEST_EMODE 0x6602
struct LinkStatus
{
include/script_pokemon_util_80F87D8.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
#define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
u16 sub_80F903C(void);
u16 GetContestRand(void);
void ReducePlayerPartyToSelectedMons(void);
void HealPlayerParty(void);
u8 CountPlayerContestPaintings(void);
include/tv.h
+1 -1
View File
@@ -20,7 +20,7 @@ void IncrementDailyPickedBerries(void);
void IncrementDailyBattlePoints(u16 delta);
void sub_80F01B8(void);
void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
u32 GetPlayerIDAsU32(void);
bool8 GetPriceReduction(u8 newsKind);
void sub_80F14F8(TVShow *shows);
src/battle_tower.c
+3 -2
View File
@@ -30,6 +30,7 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/easy_chat.h"
#include "constants/tv.h"
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[];
@@ -3026,9 +3027,9 @@ static void AwardBattleTowerRibbons(void)
ribbons[i] = prevBest;
}
}
if (ribbons[0].count > 4)
if (ribbons[0].count > NUM_CUTIES_RIBBONS)
{
sub_80EE4DC(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
TryPutSpotTheCutiesOnAir(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
}
}
}
src/cable_club.c
+4 -4
View File
@@ -685,16 +685,16 @@ void TryBerryBlenderLinkup(void)
sub_80B236C(2, 4);
}
void sub_80B3000(void)
void TryContestGModeLinkup(void)
{
gLinkType = LINKTYPE_0x6601;
gLinkType = LINKTYPE_CONTEST_GMODE;
gBattleTypeFlags = 0;
sub_80B236C(4, 4);
}
void sub_80B3028(void)
void TryContestEModeLinkup(void)
{
gLinkType = LINKTYPE_0x6602;
gLinkType = LINKTYPE_CONTEST_EMODE;
gBattleTypeFlags = 0;
sub_80B236C(2, 4);
}
src/contest.c
+37 -37
View File
@@ -219,15 +219,15 @@ static void sub_80DF9E0(u8 *, s32);
static void SwapMoveDescAndContestTilemaps(void);
// EWRAM vars.
EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
EWRAM_DATA s16 gContestMonConditions[4] = {0};
EWRAM_DATA s16 gUnknown_02039F08[4] = {0};
EWRAM_DATA s16 gUnknown_02039F10[4] = {0};
EWRAM_DATA s16 gUnknown_02039F18[4] = {0};
EWRAM_DATA u8 gContestFinalStandings[4] = {0};
EWRAM_DATA struct ContestPokemon gContestMons[CONTESTANT_COUNT] = {0};
EWRAM_DATA s16 gContestMonConditions[CONTESTANT_COUNT] = {0};
EWRAM_DATA s16 gUnknown_02039F08[CONTESTANT_COUNT] = {0};
EWRAM_DATA s16 gUnknown_02039F10[CONTESTANT_COUNT] = {0};
EWRAM_DATA s16 gUnknown_02039F18[CONTESTANT_COUNT] = {0};
EWRAM_DATA u8 gContestFinalStandings[CONTESTANT_COUNT] = {0};
EWRAM_DATA u8 gContestMonPartyIndex = 0;
EWRAM_DATA u8 gContestPlayerMonIndex = 0;
EWRAM_DATA u8 gContestantTurnOrder[4] = {0};
EWRAM_DATA u8 gContestantTurnOrder[CONTESTANT_COUNT] = {0};
EWRAM_DATA u8 gLinkContestFlags = 0;
// Bit 0: Is a link contest
// Bit 1: Link contest uses wireless adapter
@@ -1574,7 +1574,7 @@ static void sub_80D8A88(u8 taskId)
{
s32 i;
for (i = 0; i + gNumLinkContestPlayers < 4; i++)
for (i = 0; i + gNumLinkContestPlayers < CONTESTANT_COUNT; i++)
{
eContestantStatus[gNumLinkContestPlayers + i].currMove = GetChosenMove(gNumLinkContestPlayers + i);
}
@@ -1735,7 +1735,7 @@ static void sub_80D8B38(u8 taskId)
{
if (eContestantStatus[r6].effectStringId2 != CONTEST_STRING_NONE)
{
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (i != r6 && eContestantStatus[i].effectStringId != CONTEST_STRING_NONE)
break;
@@ -1838,10 +1838,10 @@ static void sub_80D8B38(u8 taskId)
s32 r2 = 0;
r3 = 0;
for (i = gTasks[taskId].data[1]; i < 4; i++)
for (i = gTasks[taskId].data[1]; i < CONTESTANT_COUNT; i++)
{
r3 = 0;
for (r2 = 0; r2 < 4; r2++)
for (r2 = 0; r2 < CONTESTANT_COUNT; r2++)
{
if (r2 != r6 && gContestantTurnOrder[r2] == i
&& eContestantStatus[r2].effectStringId != CONTEST_STRING_NONE)
@@ -1906,7 +1906,7 @@ static void sub_80D8B38(u8 taskId)
}
return;
case 30:
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (gContestantTurnOrder[i] == gTasks[taskId].data[1])
break;
@@ -2509,7 +2509,7 @@ static void sub_80DA5E8(u8 taskId)
gBattle_BG0_Y = 0;
gBattle_BG2_Y = 0;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
gUnknown_02039F10[i] = eContestantStatus[i].pointTotal;
sub_80DBD18();
ContestClearGeneralTextWindow();
@@ -2786,9 +2786,9 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
opponents[opponentsCount++] = i;
}
opponents[opponentsCount] = 0xFF;
for (i = 0; i < 4 - gNumLinkContestPlayers; i++)
for (i = 0; i < CONTESTANT_COUNT - gNumLinkContestPlayers; i++)
{
u16 rnd = sub_80F903C() % opponentsCount;
u16 rnd = GetContestRand() % opponentsCount;
gContestMons[gNumLinkContestPlayers + i] = gContestOpponents[opponents[rnd]];
sub_80DF9D4(gContestMons[gNumLinkContestPlayers + i].trainerName);
@@ -2934,7 +2934,7 @@ void sub_80DB09C(u8 contestCategory)
{
s32 i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
gContestMonConditions[i] = sub_80DAFE0(i, contestCategory);
}
@@ -3101,7 +3101,7 @@ static void sub_80DB584(void)
{
s32 i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
sub_80DB4E0(eContestantStatus[i].currMove, i);
}
@@ -3212,7 +3212,7 @@ static void sub_80DB884(void)
{
s32 i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
sub_80DB798(i);
}
@@ -3862,7 +3862,7 @@ static void sub_80DC864(void)
{
s32 i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
sub_80DC87C(i);
}
@@ -4259,7 +4259,7 @@ static void sub_80DD080(u8 contestant)
eContestResources8.jam2 = eContestResources8.jam;
eContestResources8.contestant = contestant;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
eContestantStatus[i].jam = 0;
eContestResources8.unnervedPokes[i] = 0;
@@ -4796,7 +4796,7 @@ static void sub_80DE008(bool8 a)
{
s32 i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (eContestantStatus[i].turnOrderMod != 0 && a)
{
@@ -5302,7 +5302,7 @@ void ResetContestLinkResults(void)
gSaveBlock2Ptr->contestLinkResults[i][j] = 0;
}
bool8 sub_80DEDA8(u8 a)
bool8 sub_80DEDA8(u8 rank)
{
s32 i;
u8 r7 = Random() % 3;
@@ -5312,7 +5312,7 @@ bool8 sub_80DEDA8(u8 a)
if (gContestFinalStandings[i] == 0)
break;
}
if (a == 0xFF && i != gContestPlayerMonIndex)
if (rank == 0xFF && i != gContestPlayerMonIndex)
return FALSE;
switch (gSpecialVar_ContestCategory)
{
@@ -5332,9 +5332,9 @@ bool8 sub_80DEDA8(u8 a)
r7 += 12;
break;
}
if (a != 0xFE)
if (rank != 0xFE)
{
u8 r4 = sub_80DEFA8(a, 1);
u8 r4 = sub_80DEFA8(rank, 1);
gSaveBlock1Ptr->contestWinners[r4].personality = gContestMons[i].personality;
gSaveBlock1Ptr->contestWinners[r4].species = gContestMons[i].species;
@@ -5342,11 +5342,11 @@ bool8 sub_80DEDA8(u8 a)
StringCopy(gSaveBlock1Ptr->contestWinners[r4].monName, gContestMons[i].nickname);
StringCopy(gSaveBlock1Ptr->contestWinners[r4].trainerName, gContestMons[i].trainerName);
if(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
gSaveBlock1Ptr->contestWinners[r4].contestRank = 4;
gSaveBlock1Ptr->contestWinners[r4].contestRank = CONTEST_RANK_LINK;
else
gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank;
if (a != 0xFF)
if (rank != 0xFF)
gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory;
else
gSaveBlock1Ptr->contestWinners[r4].contestCategory = r7;
@@ -5363,23 +5363,23 @@ bool8 sub_80DEDA8(u8 a)
return TRUE;
}
u8 sub_80DEFA8(u8 a, u8 b)
u8 sub_80DEFA8(u8 rank, u8 b)
{
s32 i;
switch (a)
switch (rank)
{
case 0:
case 1:
case 2:
case 3:
case CONTEST_RANK_NORMAL:
case CONTEST_RANK_SUPER:
case CONTEST_RANK_HYPER:
case CONTEST_RANK_MASTER:
if (b != 0)
{
for (i = 5; i >= 1; i--)
memcpy(&gSaveBlock1Ptr->contestWinners[i], &gSaveBlock1Ptr->contestWinners[i - 1], sizeof(struct ContestWinner));
}
return 0;
default:
default: // CONTEST_RANK_LINK
switch (gSpecialVar_ContestCategory)
{
case CONTEST_CATEGORY_COOL:
@@ -5434,7 +5434,7 @@ static void sub_80DF080(u8 contestant)
gContestResources->field_1c[contestant].unkC |= 8;
}
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (i != contestant && eContestantStatus[i].jam != 0)
{
@@ -5481,7 +5481,7 @@ static void sub_80DF250(void)
r1 = 0;
var_38 = 0;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
if (gContestFinalStandings[i] == 0)
var_38 = i;
@@ -5508,7 +5508,7 @@ static void sub_80DF250(void)
r12 = FALSE;
r8 = FALSE;
for (j = 0; j < 4; j++)
for (j = 0; j < CONTESTANT_COUNT; j++)
{
if (gContestMonConditions[i] > gContestMonConditions[j])
r12 = TRUE;
src/contest_link_80F57C4.c
+66 -64
View File
@@ -39,6 +39,7 @@
#include "constants/game_stat.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/tv.h"
#include "constants/vars.h"
#include "contest.h"
@@ -265,7 +266,7 @@ void sub_80F5AE0(void)
{
int i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
sub_80F5A74(i);
CopyBgTilemapBufferToVram(1);
@@ -360,12 +361,12 @@ static void sub_80F5CE4(u8 taskId)
sub_80DEDA8(0xFE);
gUnknown_02039F5C = 1;
gUnknown_02039F5D = sub_80DEFA8(0xFE, 0);
var = VarGet(VAR_LINK_CONTEST_ROOM_STATE);
VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0);
var = VarGet(VAR_CONTEST_HALL_STATE);
VarSet(VAR_CONTEST_HALL_STATE, 0);
SetContinueGameWarpStatusToDynamicWarp();
TrySavingData(SAVE_LINK);
ClearContinueGameWarpStatus2();
VarSet(VAR_LINK_CONTEST_ROOM_STATE, var);
VarSet(VAR_CONTEST_HALL_STATE, var);
gTasks[taskId].data[0]++;
break;
case 1:
@@ -576,7 +577,7 @@ static void sub_80F6204(u8 taskId)
}
break;
case 2:
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
newTaskId = CreateTask(sub_80F73DC, 10);
gTasks[newTaskId].data[0] = gContestFinalStandings[i];
@@ -592,7 +593,7 @@ static void sub_80F6204(u8 taskId)
gTasks[taskId].data[1] = 0;
CreateTask(sub_80F74BC, 10);
gTasks[taskId].data[0]++;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
sub_80F77E0(i, 14);
@@ -603,7 +604,7 @@ static void sub_80F6204(u8 taskId)
if (++gTasks[taskId].data[1] == 21)
{
gTasks[taskId].data[1] = 0;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
StringCopy(gStringVar1, gContestMons[i].trainerName);
@@ -636,7 +637,7 @@ static void sub_80F6404(u8 taskId)
case 0:
gBattle_WIN0H = 0x00F0;
gBattle_WIN0V = 0x5050;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
species = gContestMons[i].species;
@@ -732,7 +733,7 @@ static void sub_80F66B4(u8 taskId)
{
if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
{
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
@@ -874,7 +875,7 @@ static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow)
{
int i;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
sub_80F69B8(gContestMons[i].species, i, srcOffset, useDmaNow, gContestMons[i].personality);
}
@@ -882,7 +883,7 @@ static void sub_80F6A9C(void)
{
int i, species;
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
species = gContestMons[i].species;
LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
@@ -1423,48 +1424,48 @@ static void sub_80F71C8(void)
CopyToBgTilemapBufferRect(2, gUnknown_08DC6498, 5, 1, 5, 2);
x = 10;
}
else if (gSpecialVar_ContestRank == 0)
else if (gSpecialVar_ContestRank == CONTEST_RANK_NORMAL)
{
CopyToBgTilemapBufferRect(2, gUnknown_08DC63F8, 5, 1, 10, 2);
x = 15;
}
else if (gSpecialVar_ContestRank == 1)
else if (gSpecialVar_ContestRank == CONTEST_RANK_SUPER)
{
CopyToBgTilemapBufferRect(2, gUnknown_08DC6420, 5, 1, 10, 2);
x = 15;
}
else if (gSpecialVar_ContestRank == 2)
else if (gSpecialVar_ContestRank == CONTEST_RANK_HYPER)
{
CopyToBgTilemapBufferRect(2, gUnknown_08DC6448, 5, 1, 10, 2);
x = 15;
}
else
else // CONTEST_RANK_MASTER
{
CopyToBgTilemapBufferRect(2, gUnknown_08DC6470, 5, 1, 10, 2);
x = 15;
}
if (gSpecialVar_ContestCategory == 0)
if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_COOL)
{
palette = 0;
CopyToBgTilemapBufferRect(2, gUnknown_08DC64AC, x, y, 5, 2);
}
else if (gSpecialVar_ContestCategory == 1)
else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_BEAUTY)
{
palette = 1;
CopyToBgTilemapBufferRect(2, gUnknown_08DC64C0, x, y, 5, 2);
}
else if (gSpecialVar_ContestCategory == 2)
else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_CUTE)
{
palette = 2;
CopyToBgTilemapBufferRect(2, gUnknown_08DC64D4, x, y, 5, 2);
}
else if (gSpecialVar_ContestCategory == 3)
else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_SMART)
{
palette = 3;
CopyToBgTilemapBufferRect(2, gUnknown_08DC64E8, x, y, 5, 2);
}
else
else // CONTEST_CATEGORY_TOUGH
{
palette = 4;
CopyToBgTilemapBufferRect(2, gUnknown_08DC64FC, x, y, 5, 2);
@@ -1550,7 +1551,7 @@ static void sub_80F73DC(u8 taskId)
static void sub_80F74BC(u8 taskId)
{
int i;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
CopyToBgTilemapBufferRect_ChangePalette(2, i * 0xC0 + 0x100 + gUnknown_0203A034->unkC[2], 0, i * 3 + 4, 32, 3, 9);
@@ -1706,7 +1707,7 @@ static void sub_80F7880(void)
}
}
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
{
r4 = (gContestMonConditions[i] * 1000) / abs(r2);
if (r4 % 10 > 4)
@@ -1933,7 +1934,7 @@ static void sub_80F7ED0(int windowId, u8 *str, int arg2)
PutWindowTilemap(windowId);
}
void sub_80F7F30(void)
void TryEnterContestMon(void)
{
u8 eligibility = GetContestEntryEligibility(&gPlayerParty[gContestMonPartyIndex]);
@@ -1947,38 +1948,38 @@ void sub_80F7F30(void)
gSpecialVar_Result = eligibility;
}
u16 sub_80F7F7C(void)
u16 HasMonWonThisContestBefore(void)
{
u16 result = 0;
u16 hasRankRibbon = FALSE;
struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex];
switch (gSpecialVar_ContestCategory)
{
case CONTEST_CATEGORY_COOL:
if (GetMonData(mon, MON_DATA_COOL_RIBBON) > gSpecialVar_ContestRank)
result = 1;
hasRankRibbon = TRUE;
break;
case CONTEST_CATEGORY_BEAUTY:
if (GetMonData(mon, MON_DATA_BEAUTY_RIBBON) > gSpecialVar_ContestRank)
result = 1;
hasRankRibbon = TRUE;
break;
case CONTEST_CATEGORY_CUTE:
if (GetMonData(mon, MON_DATA_CUTE_RIBBON) > gSpecialVar_ContestRank)
result = 1;
hasRankRibbon = TRUE;
break;
case CONTEST_CATEGORY_SMART:
if (GetMonData(mon, MON_DATA_SMART_RIBBON) > gSpecialVar_ContestRank)
result = 1;
hasRankRibbon = TRUE;
break;
case CONTEST_CATEGORY_TOUGH:
if (GetMonData(mon, MON_DATA_TOUGH_RIBBON) > gSpecialVar_ContestRank)
result = 1;
hasRankRibbon = TRUE;
break;
}
return result;
return hasRankRibbon;
}
void sub_80F7FFC(void)
void GiveMonContestRibbon(void)
{
u8 ribbonData;
@@ -1993,8 +1994,8 @@ void sub_80F7FFC(void)
{
ribbonData++;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON, &ribbonData);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
}
break;
case CONTEST_CATEGORY_BEAUTY:
@@ -2003,8 +2004,8 @@ void sub_80F7FFC(void)
{
ribbonData++;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON, &ribbonData);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
}
break;
case CONTEST_CATEGORY_CUTE:
@@ -2013,8 +2014,8 @@ void sub_80F7FFC(void)
{
ribbonData++;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON, &ribbonData);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
}
break;
case CONTEST_CATEGORY_SMART:
@@ -2023,8 +2024,8 @@ void sub_80F7FFC(void)
{
ribbonData++;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON, &ribbonData);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
}
break;
case CONTEST_CATEGORY_TOUGH:
@@ -2033,95 +2034,96 @@ void sub_80F7FFC(void)
{
ribbonData++;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON, &ribbonData);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
}
break;
}
}
void sub_80F8264(void)
void BufferContestantTrainerName(void)
{
StringCopy(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
sub_81DB5AC(gStringVar1);
}
void sub_80F8290(void)
void BufferContestantMonNickname(void)
{
StringCopy(gStringVar3, gContestMons[gSpecialVar_0x8006].nickname);
}
void sub_80F82B4(void)
// Unused script special
void GetContestMonConditionRanking(void)
{
u8 i, count;
u8 i, rank;
for (i = 0, count = 0; i < 4; i++)
for (i = 0, rank = 0; i < CONTESTANT_COUNT; i++)
{
if (gContestMonConditions[gSpecialVar_0x8006] < gContestMonConditions[i])
count++;
rank++;
}
gSpecialVar_0x8004 = count;
gSpecialVar_0x8004 = rank;
}
void sub_80F82FC(void)
void GetContestMonCondition(void)
{
gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006];
}
void sub_80F831C(void)
void GetContestWinnerId(void)
{
u8 i;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
gSpecialVar_0x8005 = i;
}
void sub_80F834C(void)
void BufferContestWinnerTrainerName(void)
{
u8 i;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
StringCopy(gStringVar3, gContestMons[i].trainerName);
sub_81DB5AC(gStringVar3);
}
void sub_80F8390(void)
void BufferContestWinnerMonName(void)
{
u8 i;
for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
;
StringCopy(gStringVar1, gContestMons[i].nickname);
}
void sub_80F83D0(void)
void CB2_SetStartContestCallback(void)
{
SetMainCallback2(CB2_StartContest);
}
static void sub_80F83E0(u8 taskId)
static void Task_StartContest(u8 taskId)
{
if (!gPaletteFade.active)
{
DestroyTask(taskId);
SetMainCallback2(sub_80F83D0);
SetMainCallback2(CB2_SetStartContestCallback);
}
}
void sub_80F840C(void)
void StartContest(void)
{
ScriptContext2_Enable();
CreateTask(sub_80F83E0, 10);
CreateTask(Task_StartContest, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
}
void sub_80F8438(void)
void BufferContestantMonSpecies(void)
{
gSpecialVar_0x8004 = gContestMons[gSpecialVar_0x8006].species;
}
@@ -2142,7 +2144,7 @@ void sub_80F8484(void)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
}
void sub_80F84B0(void)
void GetContestPlayerId(void)
{
gSpecialVar_0x8004 = gContestPlayerMonIndex;
}
@@ -2248,7 +2250,7 @@ void sub_80F8714(u8 taskId)
}
else
{
for (i = 0; i < 4; i++)
for (i = 0; i < CONTESTANT_COUNT; i++)
StringGetEnd10(gContestMons[i].nickname);
DestroyTask(taskId);
src/data/union_room.h
+127 -105
View File
@@ -440,7 +440,7 @@ ALIGNED(4) const u8 sText_CancelRegistrationOfMon[] = _("Cancel the registration
ALIGNED(4) const u8 sText_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?");
ALIGNED(4) const u8 sText_RegistrationCanceled2[] = _("The registration has been canceled.\p");
ALIGNED(4) const u8 sText_TradeTrainersWillBeListed[] = _("TRAINERS wishing to make a trade\nwill be listed."); // unused
ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith2[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
ALIGNED(4) const u8 sText_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?");
ALIGNED(4) const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…"); // unused
ALIGNED(4) const u8 sText_NotRegisteredAMonForTrade[] = _("You have not registered a POKéMON\nfor trading.\p"); // unused
@@ -457,50 +457,51 @@ const u8 *const sUnionRoomTexts_CantTradeRightNow[] = {
ALIGNED(4) const u8 sText_TradeOfferRejected[] = _("Your trade offer was rejected.\p");
ALIGNED(4) const u8 sText_EggTrade[] = _("EGG TRADE");
ALIGNED(4) const u8 gUnknown_082EF7DC[] = _("{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL");
ALIGNED(4) const u8 gUnknown_082EF7F8[] = _("Please choose a TRAINER.");
ALIGNED(4) const u8 gUnknown_082EF814[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
ALIGNED(4) const u8 gUnknown_082EF844[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
ALIGNED(4) const u8 gUnknown_082EF874[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
ALIGNED(4) const u8 gUnknown_082EF8A4[] = _("Please choose the TRAINER to\ntrade with.");
ALIGNED(4) const u8 gUnknown_082EF8D0[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
ALIGNED(4) const u8 gUnknown_082EF908[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
ALIGNED(4) const u8 gUnknown_082EF940[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EF974[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EF99C[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EF9CC[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EF9F8[] = _("RECORD CORNER!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFA24[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFA50[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFA7C[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFAA8[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFAD8[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFB08[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
ALIGNED(4) const u8 gUnknown_082EFB3C[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseJoinCancel[] = _("{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL");
ALIGNED(4) const u8 sText_ChooseTrainer[] = _("Please choose a TRAINER.");
ALIGNED(4) const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
ALIGNED(4) const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
ALIGNED(4) const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER to\ntrade with.");
ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderCards[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderNews[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
ALIGNED(4) const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBerryBlender[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderRecordCorner[] = _("RECORD CORNER!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderCoolContest[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBeautyContest[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderCuteContest[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderSmartContest[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
const u8 *const gUnknown_082EFB70[] = {
gUnknown_082EF814,
gUnknown_082EF844,
gUnknown_082EF874,
gUnknown_082EF8A4,
gUnknown_082EF940,
gUnknown_082EF974,
gUnknown_082EF99C,
gUnknown_082EF8D0,
gUnknown_082EF908,
NULL,
NULL,
NULL,
gUnknown_082EF9F8,
gUnknown_082EF9CC,
NULL,
gUnknown_082EFA24,
gUnknown_082EFA50,
gUnknown_082EFA7C,
gUnknown_082EFAA8,
gUnknown_082EFAD8,
gUnknown_082EFB08,
gUnknown_082EFB3C
static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] =
{
[LINK_GROUP_SINGLE_BATTLE] = sText_ChooseTrainerSingleBattle,
[LINK_GROUP_DOUBLE_BATTLE] = sText_ChooseTrainerDoubleBattle,
[LINK_GROUP_MULTI_BATTLE] = sText_ChooseLeaderMultiBattle,
[LINK_GROUP_TRADE] = sText_ChooseTrainerToTradeWith,
[LINK_GROUP_POKEMON_JUMP] = sText_ChooseLeaderPokemonJump,
[LINK_GROUP_BERRY_CRUSH] = sText_ChooseLeaderBerryCrush,
[LINK_GROUP_BERRY_PICKING] = sText_ChooseLeaderBerryPicking,
[LINK_GROUP_WONDER_CARD] = sText_ChooseTrainerToShareWonderCards,
[LINK_GROUP_WONDER_NEWS] = sText_ChooseTrainerToShareWonderNews,
[LINK_GROUP_UNK_9] = NULL,
[LINK_GROUP_UNK_10] = NULL,
[LINK_GROUP_UNK_11] = NULL,
[LINK_GROUP_RECORD_CORNER] = sText_ChooseLeaderRecordCorner,
[LINK_GROUP_BERRY_BLENDER] = sText_ChooseLeaderBerryBlender,
[LINK_GROUP_UNK_14] = NULL,
[LINK_GROUP_COOL_CONTEST] = sText_ChooseLeaderCoolContest,
[LINK_GROUP_BEAUTY_CONTEST] = sText_ChooseLeaderBeautyContest,
[LINK_GROUP_CUTE_CONTEST] = sText_ChooseLeaderCuteContest,
[LINK_GROUP_SMART_CONTEST] = sText_ChooseLeaderSmartContest,
[LINK_GROUP_TOUGH_CONTEST] = sText_ChooseLeaderToughContest,
[LINK_GROUP_BATTLE_TOWER] = sText_ChooseLeaderBattleTowerLv50,
[LINK_GROUP_BATTLE_TOWER_OPEN] = sText_ChooseLeaderBattleTowerOpenLv
};
ALIGNED(4) const u8 gUnknown_082EFBC8[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait...");
@@ -524,39 +525,39 @@ ALIGNED(4) const u8 gUnknown_082EFD7C[] = _("EXIT");
ALIGNED(4) const u8 gUnknown_082EFD84[] = _("EXIT");
ALIGNED(4) const u8 gUnknown_082EFD8C[] = _("INFO");
ALIGNED(4) const u8 gUnknown_082EFD94[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV.");
ALIGNED(4) const u8 gUnknown_082EFDB0[] = _("SINGLE BATTLE");
ALIGNED(4) const u8 gUnknown_082EFDC0[] = _("DOUBLE BATTLE");
ALIGNED(4) const u8 gUnknown_082EFDD0[] = _("MULTI BATTLE");
ALIGNED(4) const u8 gUnknown_082EFDE0[] = _("POKéMON TRADES");
ALIGNED(4) const u8 gUnknown_082EFDF0[] = _("CHAT");
ALIGNED(4) const u8 gUnknown_082EFDF8[] = _("CARDS");
ALIGNED(4) const u8 gUnknown_082EFE00[] = _("WONDER CARDS");
ALIGNED(4) const u8 gUnknown_082EFE10[] = _("WONDER NEWS");
ALIGNED(4) const u8 gUnknown_082EFE1C[] = _("POKéMON JUMP");
ALIGNED(4) const u8 gUnknown_082EFE2C[] = _("BERRY CRUSH");
ALIGNED(4) const u8 gUnknown_082EFE38[] = _("BERRY-PICKING");
ALIGNED(4) const u8 gUnknown_082EFE48[] = _("SEARCH");
ALIGNED(4) const u8 gUnknown_082EFE50[] = _("BERRY BLENDER");
ALIGNED(4) const u8 gUnknown_082EFE60[] = _("RECORD CORNER");
ALIGNED(4) const u8 gUnknown_082EFE70[] = _("COOL CONTEST");
ALIGNED(4) const u8 gUnknown_082EFE80[] = _("BEAUTY CONTEST");
ALIGNED(4) const u8 gUnknown_082EFE90[] = _("CUTE CONTEST");
ALIGNED(4) const u8 gUnknown_082EFEA0[] = _("SMART CONTEST");
ALIGNED(4) const u8 gUnknown_082EFEB0[] = _("TOUGH CONTEST");
ALIGNED(4) const u8 gUnknown_082EFEC0[] = _("BATTLE TOWER LV. 50");
ALIGNED(4) const u8 gUnknown_082EFED4[] = _("BATTLE TOWER OPEN LEVEL");
ALIGNED(4) const u8 gUnknown_082EFEEC[] = _("It's a NORMAL CARD.");
ALIGNED(4) const u8 gUnknown_082EFF00[] = _("It's a BRONZE CARD!");
ALIGNED(4) const u8 gUnknown_082EFF14[] = _("It's a COPPER CARD!");
ALIGNED(4) const u8 gUnknown_082EFF28[] = _("It's a SILVER CARD!");
ALIGNED(4) const u8 gUnknown_082EFF3C[] = _("It's a GOLD CARD!");
ALIGNED(4) const u8 sText_SingleBattle[] = _("SINGLE BATTLE");
ALIGNED(4) const u8 sText_DoubleBattle[] = _("DOUBLE BATTLE");
ALIGNED(4) const u8 sText_MultiBattle[] = _("MULTI BATTLE");
ALIGNED(4) const u8 sText_PokemonTrades[] = _("POKéMON TRADES");
ALIGNED(4) const u8 sText_Chat[] = _("CHAT");
ALIGNED(4) const u8 sText_Cards[] = _("CARDS");
ALIGNED(4) const u8 sText_WonderCards[] = _("WONDER CARDS");
ALIGNED(4) const u8 sText_WonderNews[] = _("WONDER NEWS");
ALIGNED(4) const u8 sText_PokemonJump[] = _("POKéMON JUMP");
ALIGNED(4) const u8 sText_BerryCrush[] = _("BERRY CRUSH");
ALIGNED(4) const u8 sText_BerryPicking[] = _("BERRY-PICKING");
ALIGNED(4) const u8 sText_Search[] = _("SEARCH");
ALIGNED(4) const u8 sText_BerryBlender[] = _("BERRY BLENDER");
ALIGNED(4) const u8 sText_RecordCorner[] = _("RECORD CORNER");
ALIGNED(4) const u8 sText_CoolContest[] = _("COOL CONTEST");
ALIGNED(4) const u8 sText_BeautyContest[] = _("BEAUTY CONTEST");
ALIGNED(4) const u8 sText_CuteContest[] = _("CUTE CONTEST");
ALIGNED(4) const u8 sText_SmartContest[] = _("SMART CONTEST");
ALIGNED(4) const u8 sText_ToughContest[] = _("TOUGH CONTEST");
ALIGNED(4) const u8 sText_BattleTowerLv50[] = _("BATTLE TOWER LV. 50");
ALIGNED(4) const u8 sText_BattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL");
ALIGNED(4) const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD.");
ALIGNED(4) const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!");
ALIGNED(4) const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!");
ALIGNED(4) const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!");
ALIGNED(4) const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!");
const u8 *const gUnknown_082EFF50[] = {
gUnknown_082EFEEC,
gUnknown_082EFF00,
gUnknown_082EFF14,
gUnknown_082EFF28,
gUnknown_082EFF3C
static const u8 *const sCardColorTexts[] = {
sText_ItsNormalCard,
sText_ItsBronzeCard,
sText_ItsCopperCard,
sText_ItsSilverCard,
sText_ItsGoldCard
};
ALIGNED(4) const u8 gUnknown_082EFF64[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
@@ -573,34 +574,34 @@ ALIGNED(4) const u8 gUnknown_082F0020[] = _("Finished checking {SPECIAL_F7 0x01}
const u8 *const gUnknown_082F0048[] = {
gText_EmptyString,
gUnknown_082EFDB0,
gUnknown_082EFDC0,
gUnknown_082EFDD0,
gUnknown_082EFDE0,
gUnknown_082EFDF0,
gUnknown_082EFE00,
gUnknown_082EFE10,
gUnknown_082EFDF8,
gUnknown_082EFE1C,
gUnknown_082EFE2C,
gUnknown_082EFE38,
gUnknown_082EFE48,
sText_SingleBattle,
sText_DoubleBattle,
sText_MultiBattle,
sText_PokemonTrades,
sText_Chat,
sText_WonderCards,
sText_WonderNews,
sText_Cards,
sText_PokemonJump,
sText_BerryCrush,
sText_BerryPicking,
sText_Search,
gText_EmptyString,
gUnknown_082EFED4,
gUnknown_082EFE60,
gUnknown_082EFE50,
sText_BattleTowerOpenLv,
sText_RecordCorner,
sText_BerryBlender,
gText_EmptyString,
gText_EmptyString,
gText_EmptyString,
gText_EmptyString,
gUnknown_082EFE00,
gUnknown_082EFE10,
gUnknown_082EFE70,
gUnknown_082EFE80,
gUnknown_082EFE90,
gUnknown_082EFEA0,
gUnknown_082EFEB0,
gUnknown_082EFEC0
sText_WonderCards,
sText_WonderNews,
sText_CoolContest,
sText_BeautyContest,
sText_CuteContest,
sText_SmartContest,
sText_ToughContest,
sText_BattleTowerLv50
};
const struct WindowTemplate gUnknown_082F00BC = {
@@ -613,7 +614,7 @@ const struct WindowTemplate gUnknown_082F00BC = {
.baseBlock = 0x0008
};
const u32 gUnknown_082F00C4[] = {
const u32 gUnknown_082F00C4[NUM_LINK_GROUP_TYPES] = {
0x0201,
0x0202,
0x0403,
@@ -1012,7 +1013,7 @@ ALIGNED(4) const u8 gUnknown_082F04CC[] = {0x1b, 0xff};
ALIGNED(4) const u8 gUnknown_082F04D0[] = {0x1c, 0xff};
ALIGNED(4) const u8 gUnknown_082F04D4[] = {0x0e, 0xff};
const u8 *const gUnknown_082F04D8[] = {
const u8 *const gUnknown_082F04D8[NUM_LINK_GROUP_TYPES] = {
gUnknown_082F0474,
gUnknown_082F0478,
gUnknown_082F047C,
@@ -1037,8 +1038,29 @@ const u8 *const gUnknown_082F04D8[] = {
gUnknown_082F04D4
};
const u8 gUnknown_082F0530[] = {
0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x15,
0x16, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x17,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x0e, 0x00, 0x00
// Link group type to ID for gUnknown_02022C2C
const u8 gUnknown_082F0530[NUM_LINK_GROUP_TYPES + 2] =
{
0x01,
0x02,
0x03,
0x04,
0x09,
0x0a,
0x0b,
0x15,
0x16,
0x00,
0x00,
0x00,
0x0f,
0x10,
0x00,
0x17,
0x18,
0x19,
0x1a,
0x1b,
0x1c,
0x0e
};
src/field_screen_effect.c
+1 -1
View File
@@ -752,7 +752,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
}
}
void sub_80AFC60(void)
void DoContestHallWarp(void)
{
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
src/field_specials.c
+2 -2
View File
@@ -1410,9 +1410,9 @@ void GiveLeadMonEffortRibbon(void)
ribbonSet = TRUE;
leadMon = &gPlayerParty[GetLeadMonIndex()];
SetMonData(leadMon, MON_DATA_EFFORT_RIBBON, &ribbonSet);
if (GetRibbonCount(leadMon) > 4)
if (GetRibbonCount(leadMon) > NUM_CUTIES_RIBBONS)
{
sub_80EE4DC(leadMon, 0x47);
TryPutSpotTheCutiesOnAir(leadMon, 0x47);
}
}
src/post_battle_event_funcs.c
+3 -2
View File
@@ -9,6 +9,7 @@
#include "tv.h"
#include "constants/heal_locations.h"
#include "constants/flags.h"
#include "constants/tv.h"
int GameClear(void)
{
@@ -76,9 +77,9 @@ int GameClear(void)
}
}
if (ribbonCounts[0].count > 4)
if (ribbonCounts[0].count > NUM_CUTIES_RIBBONS)
{
sub_80EE4DC(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
TryPutSpotTheCutiesOnAir(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
}
}
src/scrcmd.c
+4 -4
View File
@@ -461,13 +461,13 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
return FALSE;
}
// Note: addvar doesn't support adding from a variable in vanilla. If you were to
// add a VarGet() to the above, make sure you change the `addvar VAR_*, -1`
// in the contest scripts to `subvar VAR_*, 1`, else contests will break.
bool8 ScrCmd_addvar(struct ScriptContext *ctx)
{
u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
*ptr += ScriptReadHalfword(ctx);
// Note: addvar doesn't support adding from a variable in vanilla. If you were to
// add a VarGet() to the above, make sure you change the `addvar VAR_0x8006, 65535`
// in the contest scripts to `subvar VAR_0x8006, 1`, else contests will break.
return FALSE;
}
@@ -1945,7 +1945,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
{
sub_80F840C();
StartContest();
ScriptContext1_Stop();
return TRUE;
}
src/script_pokemon_util_80F87D8.c
+56 -40
View File
@@ -29,6 +29,7 @@
#include "constants/event_objects.h"
#include "constants/items.h"
#include "constants/species.h"
#include "constants/tv.h"
#include "constants/vars.h"
#include "constants/battle_frontier.h"
@@ -39,8 +40,8 @@ extern const u16 gEventObjectPalette34[];
static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
static void sub_80F8EE8(u8 taskId);
static void sub_80F9088(u8 taskId);
static void Task_ShowContestEntryMonPic(u8 taskId);
static void Task_LinkContestWaitForConnection(u8 taskId);
static void CB2_ReturnFromChooseHalfParty(void);
static void sub_80F94B8(void);
@@ -74,11 +75,11 @@ void sub_80F8814(void)
gSpecialVar_0x8004 = var1;
}
void sub_80F8850(void)
void BufferContestTrainerAndMonNames(void)
{
sub_80F8264();
sub_80F8290();
sub_80F8438();
BufferContestantTrainerName();
BufferContestantMonNickname();
BufferContestantMonSpecies();
}
void sub_80F8864(void)
@@ -110,22 +111,22 @@ void sub_80F8864(void)
gSpecialVar_0x8004 = 1;
}
void sub_80F88DC(void)
void SaveMuseumContestPainting(void)
{
sub_80DEDA8(0xFF);
}
void sub_80F88E8(void)
void ShouldReadyContestArtist(void)
{
if (gContestFinalStandings[gContestPlayerMonIndex] == 0
&& gSpecialVar_ContestRank == 3
&& gSpecialVar_ContestRank == CONTEST_RANK_MASTER
&& gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
{
gSpecialVar_0x8004 = 1;
gSpecialVar_0x8004 = TRUE;
}
else
{
gSpecialVar_0x8004 = 0;
gSpecialVar_0x8004 = FALSE;
}
}
@@ -219,11 +220,22 @@ static void ShowContestWinnerCleanup(void)
void ShowContestWinner(void)
{
/*
if(gUnknown_0203856C)
{
sub_80AAF30();
gBattleStruct->unk15DDF = 1;
gBattleStruct->unk15DDE = sub_80B2C4C(254, 0);
Contest_SaveWinner(3);
gUnknown_0203856C = 0;
}
*/
SetMainCallback2(CB2_ContestPainting);
gMain.savedCallback = ShowContestWinnerCleanup;
}
void sub_80F8AFC(void)
void SetLinkContestPlayerGfx(void)
{
int i;
@@ -248,7 +260,7 @@ void sub_80F8AFC(void)
}
}
void sub_80F8B94(void)
void LoadLinkContestPlayerPalettes(void)
{
int i;
u8 eventObjectId;
@@ -287,13 +299,15 @@ u8 GiveMonArtistRibbon(void)
u8 hasArtistRibbon;
hasArtistRibbon = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
if (!hasArtistRibbon && gContestFinalStandings[gContestPlayerMonIndex] == 0 && gSpecialVar_ContestRank == 3
if (!hasArtistRibbon
&& gContestFinalStandings[gContestPlayerMonIndex] == 0
&& gSpecialVar_ContestRank == CONTEST_RANK_MASTER
&& gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
{
hasArtistRibbon = 1;
SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON, &hasArtistRibbon);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
return 1;
}
@@ -303,9 +317,9 @@ u8 GiveMonArtistRibbon(void)
}
}
u8 sub_80F8D24(void)
bool8 IsContestDebugActive(void)
{
return 0;
return FALSE; // gUnknown_0203856C in pokeruby
}
void ShowContestEntryMonPic(void)
@@ -317,7 +331,7 @@ void ShowContestEntryMonPic(void)
u8 taskId;
u8 left, top;
if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF)
if (FindTaskIdByFunc(Task_ShowContestEntryMonPic) == 0xFF)
{
AllocateMonSpritesGfx();
left = 10;
@@ -325,7 +339,7 @@ void ShowContestEntryMonPic(void)
species = gContestMons[gSpecialVar_0x8006].species;
personality = gContestMons[gSpecialVar_0x8006].personality;
otId = gContestMons[gSpecialVar_0x8006].otId;
taskId = CreateTask(sub_80F8EE8, 0x50);
taskId = CreateTask(Task_ShowContestEntryMonPic, 0x50);
gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = species;
if (gSpecialVar_0x8006 == gContestPlayerMonIndex)
@@ -357,9 +371,9 @@ void ShowContestEntryMonPic(void)
}
}
void sub_80F8EB8(void)
void HideContestEntryMonPic(void)
{
u8 taskId = FindTaskIdByFunc(sub_80F8EE8);
u8 taskId = FindTaskIdByFunc(Task_ShowContestEntryMonPic);
if (taskId != 0xFF)
{
gTasks[taskId].data[0]++;
@@ -367,7 +381,7 @@ void sub_80F8EB8(void)
}
}
static void sub_80F8EE8(u8 taskId)
static void Task_ShowContestEntryMonPic(u8 taskId)
{
struct Task *task = &gTasks[taskId];
struct Sprite *sprite;
@@ -403,10 +417,12 @@ static void sub_80F8EE8(u8 taskId)
void ScriptGetMultiplayerId(void)
{
if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) && gNumLinkContestPlayers == 4 && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
&& gNumLinkContestPlayers == CONTESTANT_COUNT
&& !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
gSpecialVar_Result = GetMultiplayerId();
else
gSpecialVar_Result = 4;
gSpecialVar_Result = MAX_LINK_PLAYERS;
}
void ScriptRandom(void)
@@ -428,26 +444,26 @@ void ScriptRandom(void)
*scriptPtr = random % *scriptPtr;
}
u16 sub_80F903C(void)
u16 GetContestRand(void)
{
gContestRngValue = 1103515245 * gContestRngValue + 24691;
return gContestRngValue >> 16;
}
u8 sub_80F905C(void)
bool8 LinkContestWaitForConnection(void)
{
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
{
CreateTask(sub_80F9088, 5);
return 1;
CreateTask(Task_LinkContestWaitForConnection, 5);
return TRUE;
}
else
{
return 0;
return FALSE;
}
}
static void sub_80F9088(u8 taskId)
static void Task_LinkContestWaitForConnection(u8 taskId)
{
switch (gTasks[taskId].data[0])
{
@@ -471,7 +487,7 @@ static void sub_80F9088(u8 taskId)
}
}
void sub_80F90DC(void)
void LinkContestTryShowWirelessIndicator(void)
{
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
{
@@ -483,7 +499,7 @@ void sub_80F90DC(void)
}
}
void sub_80F910C(void)
void LinkContestTryHideWirelessIndicator(void)
{
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
{
@@ -492,25 +508,25 @@ void sub_80F910C(void)
}
}
u8 sub_80F9134(void)
bool8 IsContestWithRSPlayer(void)
{
if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
return 1;
return TRUE;
else
return 0;
return FALSE;
}
void sub_80F9154(void)
void ClearLinkContestFlags(void)
{
gLinkContestFlags = 0;
}
u8 sub_80F9160(void)
bool8 IsWirelessContest(void)
{
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
return 1;
return TRUE;
else
return 0;
return FALSE;
}
void HealPlayerParty(void)
src/tv.c
+1 -1
View File
@@ -2365,7 +2365,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed)
}
}
void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
{
TVShow *show;
src/union_room.c
+7 -6
View File
@@ -52,6 +52,7 @@
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/union_room.h"
EWRAM_DATA u8 sUnionRoomPlayerName[12] = {};
EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -236,7 +237,7 @@ void sub_8012780(u8 taskId)
switch (data->state)
{
case 0:
if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
gSpecialVar_0x8004++;
gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004];
gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8;
@@ -818,7 +819,7 @@ void sub_80134E8(u8 taskId)
switch (data->state)
{
case 0:
if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
gSpecialVar_0x8004++;
gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004];
sub_8010F84(gUnknown_02022C2C, 0, 0);
@@ -830,7 +831,7 @@ void sub_80134E8(u8 taskId)
data->state = 1;
break;
case 1:
if (PrintOnTextbox(&data->textState, gUnknown_082EFB70[gSpecialVar_0x8004]))
if (PrintOnTextbox(&data->textState, sChooseTrainerTexts[gSpecialVar_0x8004]))
data->state = 2;
break;
case 2:
@@ -842,7 +843,7 @@ void sub_80134E8(u8 taskId)
data->field_D = AddWindow(&gUnknown_082F017C);
FillWindowPixelBuffer(data->field_C, PIXEL_FILL(2));
sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4);
sub_80173E0(data->field_C, 0, sText_ChooseJoinCancel, 8, 1, 4);
PutWindowTilemap(data->field_C);
CopyWindowToVram(data->field_C, 2);
@@ -1898,7 +1899,7 @@ void sub_8014F48(u8 taskId)
data->state = 1;
break;
case 1:
AddTextPrinterToWindow1(gUnknown_082EF7F8);
AddTextPrinterToWindow1(sText_ChooseTrainer);
data->state = 2;
break;
case 2:
@@ -4282,7 +4283,7 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->playerName);
StringCopy(arg1->field_174, gUnknown_082EFF50[trainerCard->stars]);
StringCopy(arg1->field_174, sCardColorTexts[trainerCard->stars]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, arg1->field_174);
ConvertIntToDecimalStringN(arg1->field_C0[2], trainerCard->caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3);