diff options
120 files changed, 1148 insertions, 1195 deletions
diff --git a/asm/cable_club.s b/asm/cable_club.s index 3fea2b935..d949cc492 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -446,18 +446,18 @@ sub_8080A4C: @ 8080A4C bne _08080AB0 movs r0, 0x15 bl PlaySE - ldr r0, _08080AA8 @ =gUnknown_81BC4CE + ldr r0, _08080AA8 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel bl ShowFieldAutoScrollMessage ldr r0, _08080AAC @ =sub_8080AD0 b _08080ABE .align 2, 0 _08080AA4: .4byte gTasks -_08080AA8: .4byte gUnknown_81BC4CE +_08080AA8: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel _08080AAC: .4byte sub_8080AD0 _08080AB0: movs r0, 0x16 bl PlaySE - ldr r0, _08080AC8 @ =gUnknown_81BC54C + ldr r0, _08080AC8 @ =CableClub_Text_AwaitingLinkupBCancel bl ShowFieldAutoScrollMessage ldr r0, _08080ACC @ =sub_8080CDC _08080ABE: @@ -467,7 +467,7 @@ _08080AC0: pop {r0} bx r0 .align 2, 0 -_08080AC8: .4byte gUnknown_81BC54C +_08080AC8: .4byte CableClub_Text_AwaitingLinkupBCancel _08080ACC: .4byte sub_8080CDC thumb_func_end sub_8080A4C @@ -564,7 +564,7 @@ sub_8080B20: @ 8080B20 movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r0, _08080BC0 @ =gUnknown_81BC50D + ldr r0, _08080BC0 @ =CableClub_Text_StartLinkWithXPlayersAConfirmBCancel bl ShowFieldAutoScrollMessage mov r0, r9 subs r0, 0x8 @@ -582,7 +582,7 @@ _08080BA8: _08080BB4: .4byte gTasks+0x8 _08080BB8: .4byte gMain _08080BBC: .4byte gStringVar1 -_08080BC0: .4byte gUnknown_81BC50D +_08080BC0: .4byte CableClub_Text_StartLinkWithXPlayersAConfirmBCancel _08080BC4: .4byte sub_8080BC8 thumb_func_end sub_8080B20 @@ -622,7 +622,7 @@ sub_8080BC8: @ 8080BC8 cmp r0, 0 beq _08080C3C _08080C16: - ldr r0, _08080C30 @ =gUnknown_81BC4CE + ldr r0, _08080C30 @ =CableClub_Text_WhenAllPlayersReadyAConfirmBCancel bl ShowFieldAutoScrollMessage ldr r1, _08080C34 @ =gTasks lsls r0, r5, 2 @@ -634,7 +634,7 @@ _08080C16: b _08080C5C .align 2, 0 _08080C2C: .4byte gMain -_08080C30: .4byte gUnknown_81BC4CE +_08080C30: .4byte CableClub_Text_WhenAllPlayersReadyAConfirmBCancel _08080C34: .4byte gTasks _08080C38: .4byte sub_8080AD0 _08080C3C: @@ -1148,8 +1148,8 @@ _0808105A: _08081060: .4byte sub_8080FF0 thumb_func_end sub_808102C - thumb_func_start sub_8081064 -sub_8081064: @ 8081064 + thumb_func_start TryBattleLinkup +TryBattleLinkup: @ 8081064 push {r4,lr} movs r3, 0x2 movs r2, 0x2 @@ -1202,10 +1202,10 @@ _080810B4: .align 2, 0 _080810C4: .4byte gLinkType _080810C8: .4byte 0x00002255 - thumb_func_end sub_8081064 + thumb_func_end TryBattleLinkup - thumb_func_start sub_80810CC -sub_80810CC: @ 80810CC + thumb_func_start TryTradeLinkup +TryTradeLinkup: @ 80810CC push {lr} ldr r1, _080810E8 @ =gLinkType ldr r2, _080810EC @ =0x00001133 @@ -1223,7 +1223,7 @@ sub_80810CC: @ 80810CC _080810E8: .4byte gLinkType _080810EC: .4byte 0x00001133 _080810F0: .4byte gBattleTypeFlags - thumb_func_end sub_80810CC + thumb_func_end TryTradeLinkup thumb_func_start sub_80810F4 sub_80810F4: @ 80810F4 @@ -2012,8 +2012,8 @@ _0808173C: .4byte c2_8056854 _08081740: .4byte CB2_SetUpSaveAfterLinkBattle thumb_func_end sub_8081668 - thumb_func_start sub_8081744 -sub_8081744: @ 8081744 + thumb_func_start CleanupLinkRoomState +CleanupLinkRoomState: @ 8081744 push {lr} ldr r0, _0808176C @ =gSpecialVar_0x8004 ldrh r1, [r0] @@ -2034,7 +2034,7 @@ _08081760: bx r0 .align 2, 0 _0808176C: .4byte gSpecialVar_0x8004 - thumb_func_end sub_8081744 + thumb_func_end CleanupLinkRoomState thumb_func_start sub_8081770 sub_8081770: @ 8081770 @@ -2072,13 +2072,13 @@ _080817A4: beq _0808180C b _08081820 _080817AE: - ldr r0, _080817BC @ =gUnknown_81BC4AC + ldr r0, _080817BC @ =CableClub_Text_PleaseWaitBCancel bl ShowFieldMessage movs r0, 0x1 strh r0, [r5, 0x8] b _08081820 .align 2, 0 -_080817BC: .4byte gUnknown_81BC4AC +_080817BC: .4byte CableClub_Text_PleaseWaitBCancel _080817C0: bl IsFieldMessageBoxHidden lsls r0, 24 @@ -2296,8 +2296,8 @@ _08081970: bx r0 thumb_func_end sub_80818E8 - thumb_func_start sub_8081978 -sub_8081978: @ 8081978 + thumb_func_start EnterTradeSeat +EnterTradeSeat: @ 8081978 push {lr} ldr r0, _0808198C @ =gWirelessCommType ldrb r0, [r0] @@ -2317,7 +2317,7 @@ _0808199A: bx r0 .align 2, 0 _080819A0: .4byte sub_8081850 - thumb_func_end sub_8081978 + thumb_func_end EnterTradeSeat thumb_func_start sub_80819A4 sub_80819A4: @ 80819A4 @@ -2340,8 +2340,8 @@ sub_80819B8: @ 80819B8 bx r0 thumb_func_end sub_80819B8 - thumb_func_start sub_80819C8 -sub_80819C8: @ 80819C8 + thumb_func_start EnterColosseumPlayerSpot +EnterColosseumPlayerSpot: @ 80819C8 push {lr} ldr r1, _080819E4 @ =gLinkType ldr r2, _080819E8 @ =0x00002211 @@ -2367,7 +2367,7 @@ _080819FA: bx r0 .align 2, 0 _08081A00: .4byte sub_8081318 - thumb_func_end sub_80819C8 + thumb_func_end EnterColosseumPlayerSpot thumb_func_start sub_8081A04 sub_8081A04: @ 8081A04 @@ -2382,8 +2382,8 @@ sub_8081A04: @ 8081A04 _08081A18: .4byte sub_808177C thumb_func_end sub_8081A04 - thumb_func_start sp02A_crash_sound -sp02A_crash_sound: @ 8081A1C + thumb_func_start Script_ShowLinkTrainerCard +Script_ShowLinkTrainerCard: @ 8081A1C push {lr} ldr r0, _08081A2C @ =gSpecialVar_0x8006 ldrb r0, [r0] @@ -2394,7 +2394,7 @@ sp02A_crash_sound: @ 8081A1C .align 2, 0 _08081A2C: .4byte gSpecialVar_0x8006 _08081A30: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_end sp02A_crash_sound + thumb_func_end Script_ShowLinkTrainerCard thumb_func_start sub_8081A34 sub_8081A34: @ 8081A34 diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index 9928f14b4..3e9c18491 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -6306,8 +6306,8 @@ sub_81537AC: @ 81537AC _081537BC: .4byte gUnknown_203F3E0 thumb_func_end sub_81537AC - thumb_func_start sub_81537C0 -sub_81537C0: @ 81537C0 + thumb_func_start IsDodrioInParty +IsDodrioInParty: @ 81537C0 push {r4-r6,lr} movs r5, 0 ldr r6, _081537F0 @ =gSpecialVar_Result @@ -6346,10 +6346,10 @@ _08153804: bx r0 .align 2, 0 _0815380C: .4byte gSpecialVar_Result - thumb_func_end sub_81537C0 + thumb_func_end IsDodrioInParty - thumb_func_start sub_8153810 -sub_8153810: @ 8153810 + thumb_func_start ShowDodrioBerryPickingRecords +ShowDodrioBerryPickingRecords: @ 8153810 push {r4,lr} ldr r4, _0815382C @ =sub_8153830 adds r0, r4, 0 @@ -6363,7 +6363,7 @@ sub_8153810: @ 8153810 bx r0 .align 2, 0 _0815382C: .4byte sub_8153830 - thumb_func_end sub_8153810 + thumb_func_end ShowDodrioBerryPickingRecords thumb_func_start sub_8153830 sub_8153830: @ 8153830 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 6a7454475..22a987f03 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1519,10 +1519,10 @@ _0806D488: lsrs r0, 24 cmp r0, 0x1 bne _0806D4A0 - ldr r0, _0806D49C @ =gUnknown_81BBFD8 + ldr r0, _0806D49C @ =CableClub_EventScript_81BBFD8 b _0806D53E .align 2, 0 -_0806D49C: .4byte gUnknown_81BBFD8 +_0806D49C: .4byte CableClub_EventScript_81BBFD8 _0806D4A0: adds r0, r4, 0 bl MetatileBehavior_IsQuestionnaire @@ -1542,10 +1542,10 @@ _0806D4B8: lsrs r0, 24 cmp r0, 0x1 bne _0806D4D0 - ldr r0, _0806D4CC @ =gUnknown_81BB8A7 + ldr r0, _0806D4CC @ =CableClub_EventScript_ShowBattleRecords b _0806D53E .align 2, 0 -_0806D4CC: .4byte gUnknown_81BB8A7 +_0806D4CC: .4byte CableClub_EventScript_ShowBattleRecords _0806D4D0: adds r0, r4, 0 bl MetatileBehavior_IsIndigoPlateauMark diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index efbea2956..ef64c08dd 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -210,8 +210,8 @@ _08115A1C: .4byte gStringVar4 _08115A20: .4byte gUnknown_8457234 thumb_func_end sub_811599C - thumb_func_start sub_8115A24 -sub_8115A24: @ 8115A24 + thumb_func_start TryBecomeLinkLeader +TryBecomeLinkLeader: @ 8115A24 push {lr} ldr r0, _08115A54 @ =sub_8115A68 movs r1, 0 @@ -240,7 +240,7 @@ _08115A58: .4byte gUnknown_203B05C _08115A5C: .4byte gTasks+0x8 _08115A60: .4byte gUnknown_3002024 _08115A64: .4byte gSpecialVar_Result - thumb_func_end sub_8115A24 + thumb_func_end TryBecomeLinkLeader thumb_func_start sub_8115A68 sub_8115A68: @ 8115A68 @@ -1747,8 +1747,8 @@ _081166E4: bx r1 thumb_func_end sub_81165E8 - thumb_func_start BerryBlenderLinkJoinGroup -BerryBlenderLinkJoinGroup: @ 81166F4 + thumb_func_start TryJoinLinkGroup +TryJoinLinkGroup: @ 81166F4 push {lr} ldr r0, _08116724 @ =sub_8116738 movs r1, 0 @@ -1777,7 +1777,7 @@ _08116728: .4byte gUnknown_203B05C _0811672C: .4byte gTasks+0x8 _08116730: .4byte gUnknown_3002028 _08116734: .4byte gSpecialVar_Result - thumb_func_end BerryBlenderLinkJoinGroup + thumb_func_end TryJoinLinkGroup thumb_func_start sub_8116738 sub_8116738: @ 8116738 @@ -3272,7 +3272,7 @@ sub_81173C0: @ 81173C0 adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r5, _0811742C @ =gLinkPlayers @@ -3660,7 +3660,7 @@ _081177A0: ldr r0, _081177C4 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag movs r0, 0x1 @@ -3673,7 +3673,7 @@ _081177A0: _081177C4: .4byte gBlockSendBuffer _081177C8: bl CleanupOverworldWindowsAndTilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r0, _081177EC @ =gBlockSendBuffer @@ -3689,7 +3689,7 @@ _081177C8: _081177EC: .4byte gBlockSendBuffer _081177F0: bl CleanupOverworldWindowsAndTilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl SavePlayerParty bl LoadPlayerBag ldr r0, _08117814 @ =gBlockSendBuffer @@ -7556,8 +7556,8 @@ _08119996: bx r1 thumb_func_end sub_8119944 - thumb_func_start sub_811999C -sub_811999C: @ 811999C + thumb_func_start InitUnionRoom +InitUnionRoom: @ 811999C push {r4-r6,lr} ldr r5, _081199E8 @ =gUnknown_203B04C movs r0, 0x1 @@ -7600,7 +7600,7 @@ _081199EC: .4byte gUnknown_203ADFA _081199F0: .4byte sub_81199FC _081199F4: .4byte gUnknown_203B05C _081199F8: .4byte gUnknown_300202C - thumb_func_end sub_811999C + thumb_func_end InitUnionRoom thumb_func_start sub_81199FC sub_81199FC: @ 81199FC @@ -10685,8 +10685,8 @@ sub_811B148: @ 811B148 bx lr thumb_func_end sub_811B148 - thumb_func_start sub_811B15C -sub_811B15C: @ 811B15C + thumb_func_start Script_ResetUnionRoomTrade +Script_ResetUnionRoomTrade: @ 811B15C push {lr} ldr r0, _0811B168 @ =gUnknown_203B06C bl sub_811B148 @@ -10694,7 +10694,7 @@ sub_811B15C: @ 811B15C bx r0 .align 2, 0 _0811B168: .4byte gUnknown_203B06C - thumb_func_end sub_811B15C + thumb_func_end Script_ResetUnionRoomTrade thumb_func_start sub_811B16C sub_811B16C: @ 811B16C diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 1169905b5..5526b1e50 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1626,3 +1626,10 @@ setvar VAR_0x8008, \gym call EventScript_SetGymTrainers .endm + + @ Appears frequently at start of NPC scripts. Should be used once named/understood + .macro unk_questlog + special sub_8110AB4 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 + .endm diff --git a/asm/overworld.s b/asm/overworld.s index 4fbe39153..fb746285f 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -19,7 +19,7 @@ sub_8054BC8: @ 8054BC8 adds r1, r0, 0 adds r0, r4, 0 bl RemoveMoney - bl sp000_heal_pokemon + bl HealPlayerParty bl sub_8054DD8 bl sub_80554BC bl WarpIntoMap @@ -6453,7 +6453,7 @@ _08057E80: bl sub_8057954 cmp r0, 0x1 bne _08057E96 - ldr r0, _08057EA0 @ =gUnknown_81BB9FC + ldr r0, _08057EA0 @ =CableClub_EventScript_DoLinkRoomExit bl ScriptContext1_SetupScript ldr r0, _08057EA4 @ =sub_8057E6C bl c1_link_related_func_set @@ -6463,7 +6463,7 @@ _08057E96: bx r1 .align 2, 0 _08057E9C: .4byte gUnknown_3000E80 -_08057EA0: .4byte gUnknown_81BB9FC +_08057EA0: .4byte CableClub_EventScript_DoLinkRoomExit _08057EA4: .4byte sub_8057E6C thumb_func_end sub_8057E70 @@ -6798,7 +6798,7 @@ _08058074: cmp r0, 0x80 beq _080580FC _080580E0: - ldr r0, _080580F8 @ =gUnknown_81BB9A3 + ldr r0, _080580F8 @ =CableClub_EventScript_TooBusyToNotice b _08058122 .align 2, 0 _080580E4: .4byte gDirectionToVectors @@ -6806,21 +6806,21 @@ _080580E8: .4byte 0xffff0000 _080580EC: .4byte 0x0000ffff _080580F0: .4byte 0xffffff00 _080580F4: .4byte gUnknown_3000E80 -_080580F8: .4byte gUnknown_81BB9A3 +_080580F8: .4byte CableClub_EventScript_TooBusyToNotice _080580FC: adds r0, r2, 0 bl sub_8081A34 cmp r0, 0 bne _08058110 - ldr r0, _0805810C @ =gUnknown_81BB981 + ldr r0, _0805810C @ =CableClub_EventScript_ReadTrainerCard b _08058122 .align 2, 0 -_0805810C: .4byte gUnknown_81BB981 +_0805810C: .4byte CableClub_EventScript_ReadTrainerCard _08058110: - ldr r0, _08058114 @ =gUnknown_81BB992 + ldr r0, _08058114 @ =CableClub_EventScript_ReadTrainerCardColored b _08058122 .align 2, 0 -_08058114: .4byte gUnknown_81BB992 +_08058114: .4byte CableClub_EventScript_ReadTrainerCardColored _08058118: ldrb r1, [r4, 0xC] ldrb r2, [r4, 0x3] @@ -6837,62 +6837,62 @@ _08058122: sub_805812C: @ 805812C push {lr} adds r1, r0, 0 - ldr r0, _08058178 @ =gUnknown_81BB8DB + ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805817C @ =gUnknown_81BB8F8 + ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 - ldr r0, _08058180 @ =gUnknown_81BB915 + ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2 cmp r1, r0 beq _08058172 - ldr r0, _08058184 @ =gUnknown_81BB932 + ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3 cmp r1, r0 beq _080581B4 - ldr r0, _08058188 @ =gUnknown_81BB980 + ldr r0, _08058188 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _08058172 - ldr r0, _0805818C @ =gUnknown_81BB980 + ldr r0, _0805818C @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _080581B4 - ldr r0, _08058190 @ =gUnknown_81BB980 + ldr r0, _08058190 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _08058172 - ldr r0, _08058194 @ =gUnknown_81BB980 + ldr r0, _08058194 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _080581B4 - ldr r0, _08058198 @ =gUnknown_81BB8C3 + ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805819C @ =gUnknown_81BB8CF + ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 - ldr r0, _080581A0 @ =gUnknown_81BB950 + ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0 cmp r1, r0 bne _080581A4 _08058172: movs r0, 0xA b _080581B6 .align 2, 0 -_08058178: .4byte gUnknown_81BB8DB -_0805817C: .4byte gUnknown_81BB8F8 -_08058180: .4byte gUnknown_81BB915 -_08058184: .4byte gUnknown_81BB932 -_08058188: .4byte gUnknown_81BB980 -_0805818C: .4byte gUnknown_81BB980 -_08058190: .4byte gUnknown_81BB980 -_08058194: .4byte gUnknown_81BB980 -_08058198: .4byte gUnknown_81BB8C3 -_0805819C: .4byte gUnknown_81BB8CF -_080581A0: .4byte gUnknown_81BB950 +_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0 +_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1 +_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2 +_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3 +_08058188: .4byte RecordCenter_EventScript_Spot +_0805818C: .4byte RecordCenter_EventScript_Spot +_08058190: .4byte RecordCenter_EventScript_Spot +_08058194: .4byte RecordCenter_EventScript_Spot +_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0 +_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1 +_080581A0: .4byte TradeCenter_EventScript_Chair0 _080581A4: - ldr r0, _080581B0 @ =gUnknown_81BB95C + ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1 cmp r1, r0 beq _080581B4 movs r0, 0 b _080581B6 .align 2, 0 -_080581B0: .4byte gUnknown_81BB95C +_080581B0: .4byte TradeCenter_EventScript_Chair1 _080581B4: movs r0, 0x9 _080581B6: @@ -6938,13 +6938,13 @@ sub_80581F8: @ 80581F8 push {lr} movs r0, 0x6 bl PlaySE - ldr r0, _08058210 @ =gUnknown_81BB9D4 + ldr r0, _08058210 @ =TradeCenter_ConfirmLeaveRoom bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058210: .4byte gUnknown_81BB9D4 +_08058210: .4byte TradeCenter_ConfirmLeaveRoom thumb_func_end sub_80581F8 thumb_func_start sub_8058214 @@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214 thumb_func_start sub_8058230 sub_8058230: @ 8058230 push {lr} - ldr r0, _08058240 @ =EventScript_1BB9F0 + ldr r0, _08058240 @ =TradeCenter_TerminateLink bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058240: .4byte EventScript_1BB9F0 +_08058240: .4byte TradeCenter_TerminateLink thumb_func_end sub_8058230 thumb_func_start sub_8058244 diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index 8ae94ce5e..38e233d6c 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -4244,8 +4244,8 @@ IsSpeciesAllowedInPokemonJump: @ 8149A00 bx r1 thumb_func_end IsSpeciesAllowedInPokemonJump - thumb_func_start sub_8149A18 -sub_8149A18: @ 8149A18 + thumb_func_start IsPokemonJumpSpeciesInParty +IsPokemonJumpSpeciesInParty: @ 8149A18 push {r4,r5,lr} movs r5, 0 _08149A1C: @@ -4286,7 +4286,7 @@ _08149A5E: bx r0 .align 2, 0 _08149A68: .4byte gSpecialVar_Result - thumb_func_end sub_8149A18 + thumb_func_end IsPokemonJumpSpeciesInParty thumb_func_start sub_8149A6C sub_8149A6C: @ 8149A6C @@ -7808,8 +7808,8 @@ _0814B4FC: _0814B500: .4byte 0x0000270e thumb_func_end sub_814B4E8 - thumb_func_start sub_814B504 -sub_814B504: @ 814B504 + thumb_func_start ShowPokemonJumpRecords +ShowPokemonJumpRecords: @ 814B504 push {r4,lr} ldr r4, _0814B520 @ =sub_814B524 adds r0, r4, 0 @@ -7823,7 +7823,7 @@ sub_814B504: @ 814B504 bx r0 .align 2, 0 _0814B520: .4byte sub_814B524 - thumb_func_end sub_814B504 + thumb_func_end ShowPokemonJumpRecords thumb_func_start sub_814B524 sub_814B524: @ 814B524 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 6f451b90a..17385cd01 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -5,8 +5,8 @@ .text - thumb_func_start sp000_heal_pokemon -sp000_heal_pokemon: @ 80A0058 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 80A0058 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -100,7 +100,7 @@ _080A0104: .align 2, 0 _080A0114: .4byte gPlayerPartyCount _080A0118: .4byte gPlayerParty - thumb_func_end sp000_heal_pokemon + thumb_func_end HealPlayerParty thumb_func_start ScriptGiveMon ScriptGiveMon: @ 80A011C @@ -204,8 +204,8 @@ ScriptGiveEgg: @ 80A01AC bx r1 thumb_func_end ScriptGiveEgg - thumb_func_start CheckForAlivePartyMons -CheckForAlivePartyMons: @ 80A01F4 + thumb_func_start HasEnoughMonsForDoubleBattle +HasEnoughMonsForDoubleBattle: @ 80A01F4 push {lr} bl GetMonsStateToDoubles lsls r0, 24 @@ -228,7 +228,7 @@ _080A0214: bx r0 .align 2, 0 _080A0218: .4byte gSpecialVar_Result - thumb_func_end CheckForAlivePartyMons + thumb_func_end HasEnoughMonsForDoubleBattle thumb_func_start CheckPartyMonHasHeldItem CheckPartyMonHasHeldItem: @ 80A021C @@ -378,8 +378,8 @@ _080A032C: .4byte gPlayerPartyCount _080A0330: .4byte gPlayerParty thumb_func_end ScriptSetMonMoveSlot - thumb_func_start sub_80A0334 -sub_80A0334: @ 80A0334 + thumb_func_start ChooseHalfPartyForBattle +ChooseHalfPartyForBattle: @ 80A0334 push {lr} ldr r1, _080A0348 @ =gMain ldr r0, _080A034C @ =sub_80A0350 @@ -391,7 +391,7 @@ sub_80A0334: @ 80A0334 .align 2, 0 _080A0348: .4byte gMain _080A034C: .4byte sub_80A0350 - thumb_func_end sub_80A0334 + thumb_func_end ChooseHalfPartyForBattle thumb_func_start sub_80A0350 sub_80A0350: @ 80A0350 diff --git a/data/event_scripts.s b/data/event_scripts.s index 4bc69dacf..5e0a0dc8c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5,6 +5,7 @@ #include "constants/items.h" #include "constants/layouts.h" #include "constants/maps.h" +#include "constants/pokemon.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -23,6 +24,7 @@ #include "constants/map_scripts.h" #include "constants/cable_club.h" #include "constants/field_weather.h" +#include "constants/union_room.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -72,11 +74,11 @@ gStdScripts:: @ 8160450 .4byte Std_ReceivedItem gStdScriptsEnd:: - .include "data/maps/UnknownMap_00_00/scripts.inc" - .include "data/maps/UnknownMap_00_01/scripts.inc" - .include "data/maps/UnknownMap_00_02/scripts.inc" - .include "data/maps/UnknownMap_00_03/scripts.inc" - .include "data/maps/UnknownMap_00_04/scripts.inc" + .include "data/maps/BattleColosseum2P/scripts.inc" + .include "data/maps/TradeCenter/scripts.inc" + .include "data/maps/RecordCenter/scripts.inc" + .include "data/maps/BattleColosseum4P/scripts.inc" + .include "data/maps/UnionRoom/scripts.inc" .include "data/maps/ViridianForest/scripts.inc" .include "data/maps/MtMoon_1F/scripts.inc" .include "data/maps/MtMoon_B1F/scripts.inc" @@ -1236,7 +1238,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_BLACK return @@ -1699,73 +1701,16 @@ gUnknown_81A8CED:: @ 81A8CED releaseall end -CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FiveIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -OneIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -PewterCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SevenIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -VermilionCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -FourIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SixIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -TwoIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -Route4_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -SaffronCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -CeladonCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -LavenderTown_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 -ViridianCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6 - call EventScript_1BBA04 - end - -CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FiveIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -OneIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -PewterCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SevenIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -VermilionCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -FourIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SixIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -TwoIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -Route4_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -SaffronCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -CeladonCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -LavenderTown_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC -ViridianCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC - call EventScript_1BBB6A - end - -CeruleanCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FiveIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -OneIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -PewterCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SevenIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -VermilionCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -FourIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SixIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -ThreeIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -TwoIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -Route4_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -SaffronCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -CeladonCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -LavenderTown_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 -ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 - call EventScript_1BBB9C +Common_EventScript_UnionRoomAttendant:: @ 81A8CF6 + call CableClub_EventScript_UnionRoomAttendant + end + +Common_EventScript_WirelessClubAttendant:: @ 81A8CFC + call CableClub_EventScript_WirelessClubAttendant + end + +Common_EventScript_DirectCornerAttendant:: @ 81A8D02 + call CableClub_EventScript_DirectCornerAttendant end VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 diff --git a/data/layouts/UnknownMap_00_00/border.bin b/data/layouts/BattleColosseum2P/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_00/border.bin +++ b/data/layouts/BattleColosseum2P/border.bin diff --git a/data/layouts/UnknownMap_00_00/map.bin b/data/layouts/BattleColosseum2P/map.bin Binary files differindex 8616a5f1b..8616a5f1b 100644 --- a/data/layouts/UnknownMap_00_00/map.bin +++ b/data/layouts/BattleColosseum2P/map.bin diff --git a/data/layouts/UnknownMap_00_01/border.bin b/data/layouts/BattleColosseum4P/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_01/border.bin +++ b/data/layouts/BattleColosseum4P/border.bin diff --git a/data/layouts/UnknownMap_00_03/map.bin b/data/layouts/BattleColosseum4P/map.bin Binary files differindex c68e13ec3..c68e13ec3 100644 --- a/data/layouts/UnknownMap_00_03/map.bin +++ b/data/layouts/BattleColosseum4P/map.bin diff --git a/data/layouts/UnknownMap_00_02/border.bin b/data/layouts/RecordCenter/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_02/border.bin +++ b/data/layouts/RecordCenter/border.bin diff --git a/data/layouts/UnknownMap_00_02/map.bin b/data/layouts/RecordCenter/map.bin index 08209eaca..08209eaca 100644 --- a/data/layouts/UnknownMap_00_02/map.bin +++ b/data/layouts/RecordCenter/map.bin diff --git a/data/layouts/UnknownMap_00_03/border.bin b/data/layouts/TradeCenter/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/UnknownMap_00_03/border.bin +++ b/data/layouts/TradeCenter/border.bin diff --git a/data/layouts/UnknownMap_00_01/map.bin b/data/layouts/TradeCenter/map.bin index 93050f0f5..93050f0f5 100644 --- a/data/layouts/UnknownMap_00_01/map.bin +++ b/data/layouts/TradeCenter/map.bin diff --git a/data/layouts/UnknownMap_00_04/border.bin b/data/layouts/UnionRoom/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnknownMap_00_04/border.bin +++ b/data/layouts/UnionRoom/border.bin diff --git a/data/layouts/UnknownMap_00_04/map.bin b/data/layouts/UnionRoom/map.bin index 829e21554..829e21554 100644 --- a/data/layouts/UnknownMap_00_04/map.bin +++ b/data/layouts/UnionRoom/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index fbeee8c39..6a9b024bd 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -433,52 +433,52 @@ "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P_Layout", "width": 14, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_00/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin" + "border_filepath": "data/layouts/BattleColosseum2P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01_Layout", + "id": "LAYOUT_TRADE_CENTER", + "name": "TradeCenter_Layout", "width": 12, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_01/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin" + "border_filepath": "data/layouts/TradeCenter/border.bin", + "blockdata_filepath": "data/layouts/TradeCenter/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02_Layout", + "id": "LAYOUT_RECORD_CENTER", + "name": "RecordCenter_Layout", "width": 20, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_02/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin" + "border_filepath": "data/layouts/RecordCenter/border.bin", + "blockdata_filepath": "data/layouts/RecordCenter/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P_Layout", "width": 14, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C44", - "border_filepath": "data/layouts/UnknownMap_00_03/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin" + "border_filepath": "data/layouts/BattleColosseum4P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" }, { "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", @@ -2936,16 +2936,16 @@ "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04_Layout", + "id": "LAYOUT_UNION_ROOM", + "name": "UnionRoom_Layout", "width": 15, "height": 12, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D50DC", - "border_filepath": "data/layouts/UnknownMap_00_04/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin" + "border_filepath": "data/layouts/UnionRoom/border.bin", + "blockdata_filepath": "data/layouts/UnionRoom/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/BattleColosseum2P/map.json index 43e5f14ad..aebc124e1 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00", - "layout": "LAYOUT_UNKNOWN_MAP_00_00", + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_00_EventScript_1BB9AF", + "script": "BattleColosseum2P_EventScript_Attendant", "flag": "0" } ], @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8C3" + "script": "BattleColosseum2P_EventScript_PlayerSpot0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8CF" + "script": "BattleColosseum2P_EventScript_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..59a5b3754 --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum2P_MapScripts:: @ 8160478 + .byte 0 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/BattleColosseum4P/map.json index 52295b5ea..d385ca315 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03", - "layout": "LAYOUT_UNKNOWN_MAP_00_03", + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8DB" + "script": "BattleColosseum4P_EventScript_PlayerSpot0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB915" + "script": "BattleColosseum4P_EventScript_PlayerSpot2" }, { "type": "trigger", @@ -69,7 +69,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8F8" + "script": "BattleColosseum4P_EventScript_PlayerSpot1" }, { "type": "trigger", @@ -78,7 +78,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB932" + "script": "BattleColosseum4P_EventScript_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..918c093d0 --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum4P_MapScripts:: @ 816047B + .byte 0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 943d1e396..322968550 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 931b2c4e5..efb05b214 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index b4fefdc98..19975f531 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634 + call CableClub_EventScript_Colosseum end -EventScript_16C63A:: @ 816C63A - call EventScript_1BB6AB +CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A + call CableClub_EventScript_TradeCenter end -EventScript_16C640:: @ 816C640 - call EventScript_1BB7DE +CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index f7b309f3e..a59e9710d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 70a15e76e..837ab4956 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 7c8a7f024..f6f83f0da 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E + call CableClub_EventScript_Colosseum end -EventScript_16AA94:: @ 816AA94 - call EventScript_1BB6AB +CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94 + call CableClub_EventScript_TradeCenter end -EventScript_16AA9A:: @ 816AA9A - call EventScript_1BB7DE +CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c3137faec..626263f76 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 9eafc6d0a..bd8c9d41e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 2f0476988..9cec10be2 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD + call CableClub_EventScript_Colosseum end -EventScript_16EA03:: @ 816EA03 - call EventScript_1BB6AB +CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03 + call CableClub_EventScript_TradeCenter end -EventScript_16EA09:: @ 816EA09 - call EventScript_1BB7DE +CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 01da41d52..21148cede 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 11fb855fb..d28b198ce 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index d518317ed..67f84b9bc 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30 + call CableClub_EventScript_Colosseum end -EventScript_171D36:: @ 8171D36 - call EventScript_1BB6AB +FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36 + call CableClub_EventScript_TradeCenter end -EventScript_171D3C:: @ 8171D3C - call EventScript_1BB7DE +FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 3d99baddb..4ee8e33c1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 53d8c630e..af9538b03 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index c3742867c..a8cc194aa 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32 + call CableClub_EventScript_Colosseum end -EventScript_171C38:: @ 8171C38 - call EventScript_1BB6AB +FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38 + call CableClub_EventScript_TradeCenter end -EventScript_171C3E:: @ 8171C3E - call EventScript_1BB7DE +FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 864a2cb86..428305d1c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 025f090c7..6ce142aac 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 993a88457..2be67866e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739 + call CableClub_EventScript_Colosseum end -EventScript_16D73F:: @ 816D73F - call EventScript_1BB6AB +FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F + call CableClub_EventScript_TradeCenter end -EventScript_16D745:: @ 816D745 - call EventScript_1BB7DE +FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 13491fce9..d1496398b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index ac00b284b..7298dc99f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index a6fc31686..b2b3bd00d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24 + call CableClub_EventScript_Colosseum end -EventScript_16EB2A:: @ 816EB2A - call EventScript_1BB6AB +IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A + call CableClub_EventScript_TradeCenter end -EventScript_16EB30:: @ 816EB30 - call EventScript_1BB7DE +IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 7718ecbfd..2109df4d0 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index cc72593c7..beefaa49a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 45f05a491..2ef3c6643 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137 + call CableClub_EventScript_Colosseum end -EventScript_16B13D:: @ 816B13D - call EventScript_1BB6AB +LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D + call CableClub_EventScript_TradeCenter end -EventScript_16B143:: @ 816B143 - call EventScript_1BB7DE +LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 9f59c9c5c..d32ab0d4a 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -44,7 +44,7 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817D450 setvar VAR_TEMP_1, 1 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 6c7c3e762..4f1a059ad 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 8a847a81c..a74cbc00a 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0d553f8e4..8adbf8907 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349 + call CableClub_EventScript_Colosseum end -EventScript_17134F:: @ 817134F - call EventScript_1BB6AB +OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F + call CableClub_EventScript_TradeCenter end -EventScript_171355:: @ 8171355 - call EventScript_1BB7DE +OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 261b16c1c..0b5008f79 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -487,7 +487,7 @@ Movement_1694BE:: @ 81694BE step_end EventScript_1694C2:: @ 81694C2 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index ababfb549..6cf1f5137 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d07a3ba3f..b5017653f 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 9d3148d6c..1bcf9728b 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA + call CableClub_EventScript_Colosseum end -EventScript_16A7D0:: @ 816A7D0 - call EventScript_1BB6AB +PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0 + call CableClub_EventScript_TradeCenter end -EventScript_16A7D6:: @ 816A7D6 - call EventScript_1BB7DE +PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 7c45a6947..4f9145909 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433 PokemonTower_5F_EventScript_16343C:: @ 816343C lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817A1FA setvar VAR_TEMP_1, 1 diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/RecordCenter/map.json index 8dc5e473f..9dda49e24 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/RecordCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02", - "layout": "LAYOUT_UNKNOWN_MAP_00_02", + "id": "MAP_RECORD_CENTER", + "name": "RecordCenter", + "layout": "LAYOUT_RECORD_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_02_EventScript_1BB9D3", + "script": "RecordCenter_EventScript_Attendant", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" } ], "bg_events": [] diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc new file mode 100644 index 000000000..873fc2826 --- /dev/null +++ b/data/maps/RecordCenter/scripts.inc @@ -0,0 +1,2 @@ +RecordCenter_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d165279d..f81563b0c 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 548ff6007..31472bf81 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index e0262a627..2760e125c 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F + call CableClub_EventScript_Colosseum end -EventScript_16FD15:: @ 816FD15 - call EventScript_1BB6AB +Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15 + call CableClub_EventScript_TradeCenter end -EventScript_16FD1B:: @ 816FD1B - call EventScript_1BB7DE +Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index fcb681783..bd2864629 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route4_PokemonCenter_1F_OnTransition:: @ 816F744 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2f53bfcef..f602e0e25 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index e70f53403..32b1905a4 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED + call CableClub_EventScript_Colosseum end -EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB +Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 + call CableClub_EventScript_TradeCenter end -EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE +Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index fe28e6c75..8639de5af 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 457ef551e..b6ae61450 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 12b688a7d..5a62223a3 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C + call CableClub_EventScript_Colosseum end -EventScript_16F052:: @ 816F052 - call EventScript_1BB6AB +SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052 + call CableClub_EventScript_TradeCenter end -EventScript_16F058:: @ 816F058 - call EventScript_1BB7DE +SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70a27185a..60183ed13 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index c109d3eeb..8d0ef3475 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97 compare VAR_RESULT, 2 call_if_eq EventScript_170B17 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 3992ac871..459806f32 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index dd727d017..c44ce8385 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 654725ffb..7aa713902 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1 + call CableClub_EventScript_Colosseum end -EventScript_170BD7:: @ 8170BD7 - call EventScript_1BB6AB +SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7 + call CableClub_EventScript_TradeCenter end -EventScript_170BDD:: @ 8170BDD - call EventScript_1BB7DE +SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index fb6204f22..713400e2a 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 special sub_815D9E8 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 3316ec0b5..6bde430ab 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 1cb356b1f..9966343f0 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a86377b29..05555c8d1 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35 + call CableClub_EventScript_Colosseum end -EventScript_171E3B:: @ 8171E3B - call EventScript_1BB6AB +SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B + call CableClub_EventScript_TradeCenter end -EventScript_171E41:: @ 8171E41 - call EventScript_1BB7DE +SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index e3cb1e23b..15d568a6f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 5fc3dfcca..7ee8e0316 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index 7589c7946..83b97c22d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A + call CableClub_EventScript_Colosseum end -EventScript_171880:: @ 8171880 - call EventScript_1BB6AB +ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880 + call CableClub_EventScript_TradeCenter end -EventScript_171886:: @ 8171886 - call EventScript_1BB7DE +ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/TradeCenter/map.json index 3cf67c7b1..71310c57f 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/TradeCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01", - "layout": "LAYOUT_UNKNOWN_MAP_00_01", + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_01_EventScript_1BB9C1", + "script": "TradeCenter_EventScript_Attendant", "flag": "0" } ], @@ -51,7 +51,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB950" + "script": "TradeCenter_EventScript_Chair0" }, { "type": "trigger", @@ -60,7 +60,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB95C" + "script": "TradeCenter_EventScript_Chair1" } ], "bg_events": [] diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..fa3ed8869 --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,2 @@ +TradeCenter_MapScripts:: @ 8160479 + .byte 0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4caef4f41..bb927734e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -82,14 +82,14 @@ "x": 1, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { "type": "bg_event_type_0", "x": 0, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] } diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index ce2f7c9ba..0bbb24423 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC060 + goto_if_eq JoyfulGameCorner_EventScript_InfoMan2 goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release @@ -140,7 +140,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC0CE + goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if_eq EventScript_17158A diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index c5da2e223..6661a61eb 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index aa762183c..ba3815e00 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 99da551b4..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 + call CableClub_EventScript_Colosseum end -EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 + call CableClub_EventScript_TradeCenter end -EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnionRoom/map.json index b18296b2c..05afe6e01 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnionRoom/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04", - "layout": "LAYOUT_UNKNOWN_MAP_00_04", + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", "music": "MUS_UNION", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_16050C", + "script": "UnionRoom_EventScript_16050C", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604DA", + "script": "UnionRoom_EventScript_1604DA", "flag": "FLAG_HIDE_UNION_ROOM_4" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_160502", + "script": "UnionRoom_EventScript_160502", "flag": "FLAG_HIDE_UNION_ROOM_8" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604F8", + "script": "UnionRoom_EventScript_1604F8", "flag": "FLAG_HIDE_UNION_ROOM_7" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604EE", + "script": "UnionRoom_EventScript_1604EE", "flag": "FLAG_HIDE_UNION_ROOM_6" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604E4", + "script": "UnionRoom_EventScript_1604E4", "flag": "FLAG_HIDE_UNION_ROOM_5" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604D0", + "script": "UnionRoom_EventScript_1604D0", "flag": "FLAG_HIDE_UNION_ROOM_3" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604C6", + "script": "UnionRoom_EventScript_1604C6", "flag": "FLAG_HIDE_UNION_ROOM_2" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604BC", + "script": "UnionRoom_EventScript_1604BC", "flag": "FLAG_HIDE_UNION_ROOM_1" } ], diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnionRoom/scripts.inc index 2cda124c4..c948682ce 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,9 +1,9 @@ -UnknownMap_00_04_MapScripts:: @ 816047C - map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume - map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition +UnionRoom_MapScripts:: @ 816047C + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 -UnknownMap_00_04_OnResume:: @ 8160487 +UnionRoom_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_1 setflag FLAG_HIDE_UNION_ROOM_2 setflag FLAG_HIDE_UNION_ROOM_3 @@ -23,10 +23,10 @@ UnknownMap_00_04_OnResume:: @ 8160487 special UnionRoomSpecial end -UnknownMap_00_04_OnTransition:: @ 81604BB +UnionRoom_OnTransition:: @ 81604BB end -UnknownMap_00_04_EventScript_1604BC:: @ 81604BC +UnionRoom_EventScript_1604BC:: @ 81604BC lock faceplayer setvar VAR_RESULT, 1 @@ -34,7 +34,7 @@ UnknownMap_00_04_EventScript_1604BC:: @ 81604BC release end -UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 +UnionRoom_EventScript_1604C6:: @ 81604C6 lock faceplayer setvar VAR_RESULT, 2 @@ -42,7 +42,7 @@ UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 release end -UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 +UnionRoom_EventScript_1604D0:: @ 81604D0 lock faceplayer setvar VAR_RESULT, 3 @@ -50,7 +50,7 @@ UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 release end -UnknownMap_00_04_EventScript_1604DA:: @ 81604DA +UnionRoom_EventScript_1604DA:: @ 81604DA lock faceplayer setvar VAR_RESULT, 4 @@ -58,7 +58,7 @@ UnknownMap_00_04_EventScript_1604DA:: @ 81604DA release end -UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 +UnionRoom_EventScript_1604E4:: @ 81604E4 lock faceplayer setvar VAR_RESULT, 5 @@ -66,7 +66,7 @@ UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 release end -UnknownMap_00_04_EventScript_1604EE:: @ 81604EE +UnionRoom_EventScript_1604EE:: @ 81604EE lock faceplayer setvar VAR_RESULT, 6 @@ -74,7 +74,7 @@ UnknownMap_00_04_EventScript_1604EE:: @ 81604EE release end -UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 +UnionRoom_EventScript_1604F8:: @ 81604F8 lock faceplayer setvar VAR_RESULT, 7 @@ -82,7 +82,7 @@ UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 release end -UnknownMap_00_04_EventScript_160502:: @ 8160502 +UnionRoom_EventScript_160502:: @ 8160502 lock faceplayer setvar VAR_RESULT, 8 @@ -90,7 +90,7 @@ UnknownMap_00_04_EventScript_160502:: @ 8160502 release end -UnknownMap_00_04_EventScript_16050C:: @ 816050C +UnionRoom_EventScript_16050C:: @ 816050C lock faceplayer setvar VAR_RESULT, 9 @@ -98,7 +98,7 @@ UnknownMap_00_04_EventScript_16050C:: @ 816050C release end -UnknownMap_00_04_EventScript_160516:: @ 8160516 +UnionRoom_EventScript_160516:: @ 8160516 lockall setvar VAR_RESULT, 10 waitstate diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc deleted file mode 100644 index bd155a889..000000000 --- a/data/maps/UnknownMap_00_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_00_MapScripts:: @ 8160478 - .byte 0 diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc deleted file mode 100644 index 0c05ea80d..000000000 --- a/data/maps/UnknownMap_00_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_01_MapScripts:: @ 8160479 - .byte 0 diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc deleted file mode 100644 index d12ac4304..000000000 --- a/data/maps/UnknownMap_00_02/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_02_MapScripts:: @ 816047A - .byte 0 diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc deleted file mode 100644 index 60c25bf54..000000000 --- a/data/maps/UnknownMap_00_03/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_03_MapScripts:: @ 816047B - .byte 0 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 40ead09e0..ad7e02455 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 30504e96c..4a9190f0f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index 45278dc0f..66539b9b6 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C + call CableClub_EventScript_Colosseum end -EventScript_16B472:: @ 816B472 - call EventScript_1BB6AB +VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472 + call CableClub_EventScript_TradeCenter end -EventScript_16B478:: @ 816B478 - call EventScript_1BB7DE +VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 4a09cff1e..43e74ef4c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 0c3a4361a..c46d275cf 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 165ce15fc..58ada3f9f 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308 + call CableClub_EventScript_Colosseum end -EventScript_16A30E:: @ 816A30E - call EventScript_1BB6AB +ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E + call CableClub_EventScript_TradeCenter end -EventScript_16A314:: @ 816A314 - call EventScript_1BB7DE +ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 8619c19ad..0ff365eae 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -45,11 +45,11 @@ "gMapGroup42" ], "gMapGroup0": [ - "UnknownMap_00_00", - "UnknownMap_00_01", - "UnknownMap_00_02", - "UnknownMap_00_03", - "UnknownMap_00_04" + "BattleColosseum2P", + "TradeCenter", + "RecordCenter", + "BattleColosseum4P", + "UnionRoom" ], "gMapGroup1": [ "ViridianForest", diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4d8ea5f1c..abbd37e06 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -118,17 +118,17 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_ExitTradeCenter:: @ 81BB34F lockall - call EventScript_1BB367 + call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA @@ -136,7 +136,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F releaseall end -EventScript_1BB367:: @ 81BB367 +CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 special CloseLink special HelpSystem_Enable special sub_811390C @@ -144,16 +144,16 @@ EventScript_1BB367:: @ 81BB367 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call EventScript_1BB3E6 + call CableClub_EventScript_TrainerCardDataOverwritten return CableClub_EventScript_ExitUnionRoom:: @ 81BB39C lockall - call EventScript_1BB3B4 + call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA @@ -161,34 +161,34 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C releaseall end -EventScript_1BB3B4:: @ 81BB3B4 +CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 special HelpSystem_Enable special sub_811390C setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88F + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call EventScript_1BB3E6 + call CableClub_EventScript_TrainerCardDataOverwritten return -EventScript_1BB3E6:: @ 81BB3E6 - message Text_1BC918 +CableClub_EventScript_TrainerCardDataOverwritten:: @ 81BB3E6 + message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN - message Text_1BC943 + message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, Movement_1BB88B + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB891 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return @@ -197,413 +197,408 @@ CableClub_EventScript_Tutorial:: @ 81BB415 textcolor 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_81BD898 + msgbox CableClub_Text_FirstTimeRightThisWay closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB447 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachCounter waitmovement 0 delay 30 - msgbox gUnknown_81BD966 + msgbox CableClub_Text_ExplainWirelessClubFirstTime setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 releaseall end -Movement_1BB447:: @ 81BB447 +Movement_PlayerApproachCounter: @ 81BB447 walk_up walk_up step_end -EventScript_1BB44A:: @ 81BB44A - message gUnknown_81BC311 +CableClub_EventScript_WelcomeToCableClub:: @ 81BB44A + message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 15 - goto EventScript_1BB467 + goto CableClub_EventScript_SelectCableClubRoom end -EventScript_1BB459:: @ 81BB459 - msgbox gUnknown_81BC35E - goto EventScript_1BB467 +CableClub_EventScript_UnusedWelcomeToCableClub:: @ 81BB459 + msgbox CableClub_Text_WhichService + goto CableClub_EventScript_SelectCableClubRoom end -EventScript_1BB467:: @ 81BB467 +CableClub_EventScript_SelectCableClubRoom:: @ 81BB467 setvar VAR_0x8004, 0 multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE switch VAR_RESULT - case 0, EventScript_1BB6AB - case 1, EventScript_1BB4A3 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BB4A3:: @ 81BB4A3 +CableClub_EventScript_Colosseum:: @ 81BB4A3 copyvar VAR_0x8007, VAR_LAST_TALKED - goto EventScript_1BB4AE - -EventScript_1BB4AD:: @ 81BB4AD + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB4AE:: @ 81BB4AE - message Text_1BD338 +CableClub_EventScript_SelectBattleMode:: @ 81BB4AE + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT - case 0, EventScript_1BB50F - case 1, EventScript_1BB51A - case 2, EventScript_1BB541 - case 3, EventScript_1BB501 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_SingleBattleMode + case 1, CableClub_EventScript_DoubleBattleMode + case 2, CableClub_EventScript_MultiBattleMode + case 3, CableClub_EventScript_BattleModeInfo + case 4, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BB501:: @ 81BB501 - msgbox gUnknown_81BD390 - goto EventScript_1BB4AE +CableClub_EventScript_BattleModeInfo:: @ 81BB501 + msgbox CableClub_Text_ExplainBattleModes + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB50F:: @ 81BB50F - setvar VAR_0x8004, 1 - goto EventScript_1BB54C +CableClub_EventScript_SingleBattleMode:: @ 81BB50F + setvar VAR_0x8004, USING_SINGLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB51A:: @ 81BB51A - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if_ne EventScript_1BB533 - setvar VAR_0x8004, 2 - goto EventScript_1BB54C +CableClub_EventScript_DoubleBattleMode:: @ 81BB51A + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle + setvar VAR_0x8004, USING_DOUBLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB533:: @ 81BB533 - msgbox gUnknown_81BC409 - goto EventScript_1BB4AE +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 81BB533 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle + goto CableClub_EventScript_SelectBattleMode end -EventScript_1BB541:: @ 81BB541 - setvar VAR_0x8004, 5 - goto EventScript_1BB54C +CableClub_EventScript_MultiBattleMode:: @ 81BB541 + setvar VAR_0x8004, USING_MULTI_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -EventScript_1BB54C:: @ 81BB54C +CableClub_EventScript_TryEnterColosseum:: @ 81BB54C call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - message gUnknown_81BC4AC + goto_if_eq CableClub_EventScript_AbortLink + message CableClub_Text_PleaseWaitBCancel waitmessage special HelpSystem_Disable textcolor 3 - special sub_8081064 + special TryBattleLinkup waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB5B3 + goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 - goto_if_eq EventScript_1BB80F + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq EventScript_1BB81F + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq EventScript_1BB63C + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers compare VAR_RESULT, 5 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq EventScript_1BB7FF + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -EventScript_1BB5B3:: @ 81BB5B3 - special sp000_heal_pokemon +CableClub_EventScript_EnterColosseum:: @ 81BB5B3 + special HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll Text_1BC590 + messageautoscroll CableClub_Text_PleaseEnter waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release - compare VAR_0x8004, 5 - goto_if_eq EventScript_1BB62C + compare VAR_0x8004, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 + warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 special DoCableClubWarp waitstate end -EventScript_1BB621:: @ 81BB621 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB894 +@ Unused +CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 81BB621 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -EventScript_1BB62C:: @ 81BB62C +CableClub_EventScript_WarpTo4PColosseum:: @ 81BB62C special SetCableClubWarp - warp MAP_UNKNOWN_MAP_00_03, 255, 5, 8 + warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 special DoCableClubWarp waitstate end -EventScript_1BB63C:: @ 81BB63C +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 81BB63C switch VAR_0x8004 - case 1, EventScript_1BB68A - case 2, EventScript_1BB679 - case 5, EventScript_1BB668 - goto EventScript_1BB857 - -EventScript_1BB667:: @ 81BB667 + case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle + case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle + case USING_MULTI_BATTLE, CableClub_EventScript_AbortLinkNeedFourPlayers + goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -EventScript_1BB668:: @ 81BB668 +CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 81BB668 special CloseLink - msgbox gUnknown_81BC736 - goto EventScript_1BB69B - -EventScript_1BB678:: @ 81BB678 + msgbox CableClub_Text_NeedFourPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB679:: @ 81BB679 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 81BB679 special CloseLink - msgbox gUnknown_81BC700 - goto EventScript_1BB69B - -EventScript_1BB689:: @ 81BB689 + msgbox CableClub_Text_CantDoubleBattleWithXPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB68A:: @ 81BB68A +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 81BB68A special CloseLink - msgbox gUnknown_81BC6CA - goto EventScript_1BB69B - -EventScript_1BB69A:: @ 81BB69A + msgbox CableClub_Text_CantSingleBattleWithXPlayers + goto CableClub_EventScript_ConfirmNumberAndRestart end -EventScript_1BB69B:: @ 81BB69B - special CloseLink +CableClub_EventScript_ConfirmNumberAndRestart:: @ 81BB69B + special CloseLink @ Redundant special HelpSystem_Enable - msgbox gUnknown_81BC76B + msgbox CableClub_Text_PleaseConfirmNumberAndRestart release end -EventScript_1BB6AB:: @ 81BB6AB +CableClub_EventScript_TradeCenter:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED - call EventScript_1BB79C + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - message gUnknown_81BC4AC + goto_if_eq CableClub_EventScript_AbortLink + message CableClub_Text_PleaseWaitBCancel waitmessage special HelpSystem_Disable textcolor 3 - special sub_80810CC + special TryTradeLinkup waitstate call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB73D + goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 - goto_if_eq EventScript_1BB80F + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq EventScript_1BB81F + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq EventScript_1BB857 + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq EventScript_1BB7FF + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 7 - goto_if_eq EventScript_1BB7DF + goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady compare VAR_RESULT, 9 - goto_if_eq EventScript_1BB7EF + goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -EventScript_1BB73D:: @ 81BB73D - setvar VAR_0x8004, 3 +CableClub_EventScript_EnterTradeCenter:: @ 81BB73D + setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll Text_1BC590 + messageautoscroll CableClub_Text_PleaseEnter waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release special SetCableClubWarp - setwarp MAP_UNKNOWN_MAP_00_01, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 255, 5, 8 special DoCableClubWarp waitstate end -EventScript_1BB79C:: @ 81BB79C +CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if_lt EventScript_1BB7C2 + goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB7D0 - setvar VAR_RESULT, 1 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry + setvar VAR_RESULT, TRUE return -EventScript_1BB7C2:: @ 81BB7C2 - msgbox gUnknown_81BC442 - setvar VAR_RESULT, 0 +CableClub_EventScript_NeedTwoMonsToTrade:: @ 81BB7C2 + msgbox CableClub_Text_NeedTwoMonsToTrade + setvar VAR_RESULT, FALSE return -EventScript_1BB7D0:: @ 81BB7D0 - msgbox gUnknown_81BC47C - setvar VAR_RESULT, 0 +CableClub_EventScript_CantTradeEnigmaBerry:: @ 81BB7D0 + msgbox CableClub_Text_CantTradeEnigmaBerry + setvar VAR_RESULT, FALSE return -EventScript_1BB7DE:: @ 81BB7DE +@ Record Corner is nopped in FRLG +CableClub_EventScript_RecordCorner:: @ 81BB7DE end -EventScript_1BB7DF:: @ 81BB7DF +CableClub_EventScript_AbortLinkPlayerNotReady:: @ 81BB7DF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC95C + msgbox CableClub_Text_NotSetUpForFarAwayRegion release end -EventScript_1BB7EF:: @ 81BB7EF +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 81BB7EF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC9C0 + msgbox CableClub_Text_OtherTrainerNotReady release end -EventScript_1BB7FF:: @ 81BB7FF +CableClub_EventScript_AbortLinkConnectionError:: @ 81BB7FF special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC615 + msgbox CableClub_Text_LinkErrorPleaseReset release end -EventScript_1BB80F:: @ 81BB80F +CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 81BB80F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC5C0 + msgbox CableClub_Text_SomeoneIsNotReadyToLink release end -EventScript_1BB81F:: @ 81BB81F +CableClub_EventScript_AbortLinkDifferentSelections:: @ 81BB81F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC64E + msgbox CableClub_Text_PlayersMadeDifferentSelections release end -EventScript_1BB82F:: @ 81BB82F +CableClub_EventScript_AbortLink:: @ 81BB82F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC68A + msgbox CableClub_Text_PleaseVisitAgain release end -EventScript_1BB83F:: @ 81BB83F +CableClub_EventScript_AbortMinigame:: @ 81BB83F special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BCFD1 + msgbox CableClub_Text_ComeAgain release end -EventScript_1BB84F:: @ 81BB84F +@ Unused +CableClub_EventScript_CableClubWarp:: @ 81BB84F special SetCableClubWarp special DoCableClubWarp waitstate end -EventScript_1BB857:: @ 81BB857 +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 81BB857 special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC6A1 + msgbox CableClub_Text_IncorrectNumberOfParticipants release end -EventScript_1BB867:: @ 81BB867 +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 81BB867 special CloseLink special HelpSystem_Enable - msgbox gUnknown_81BC9E0 + msgbox CableClub_Text_YouHaveAMonThatCantBeTaken release end -EventScript_1BB877:: @ 81BB877 +CableClub_EventScript_WirelessClubAdjustements:: @ 81BB877 msgbox Text_WirelessClubUndergoingAdjustments release end -EventScript_1BB881:: @ 81BB881 +CableClub_EventScript_NotReadyYet:: @ 81BB881 msgbox Text_AppearsToBeUndergoingAdjustments releaseall end -Movement_1BB88B:: @ 81BB88B +Movement_AttendantFaceDown:: @ 81BB88B face_down step_end -Movement_1BB88D:: @ 81BB88D +@ Unused +Movement_AttendantFaceRight:: @ 81BB88D face_right step_end -Movement_1BB88F:: @ 81BB88F +Movement_AttendantFaceLeft:: @ 81BB88F face_left step_end -Movement_1BB891:: @ 81BB891 +Movement_PlayerExitLinkRoom:: @ 81BB891 walk_down walk_down step_end -Movement_1BB894:: @ 81BB894 +Movement_PlayerApproachLinkRoomRight:: @ 81BB894 walk_right walk_up walk_up step_end -Movement_1BB898:: @ 81BB898 +Movement_PlayerApproachLinkRoomLeft:: @ 81BB898 walk_left walk_up walk_up step_end -Movement_1BB89C:: @ 81BB89C +Movement_PlayerEnterLinkRoom:: @ 81BB89C walk_up step_end -Movement_1BB89E:: @ 81BB89E +@ Unused +Movement_PlayerFaceAttendantLeft:: @ 81BB89E face_left step_end -Movement_1BB8A0:: @ 81BB8A0 +Movement_PlayerFaceAttendantRight:: @ 81BB8A0 face_right step_end -Movement_1BB8A2:: @ 81BB8A2 +Movement_PlayerEnterMinigameRoom:: @ 81BB8A2 walk_left walk_up walk_up walk_up step_end -gUnknown_81BB8A7:: @ 81BB8A7 +CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -615,551 +610,521 @@ gUnknown_81BB8A7:: @ 81BB8A7 releaseall end -gUnknown_81BB8C3:: @ 81BB8C3 -UnknownMap_00_00_EventScript_1BB8C3:: @ 81BB8C3 +BattleColosseum2P_EventScript_PlayerSpot0:: @ 81BB8C3 setvar VAR_0x8005, 0 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8CF:: @ 81BB8CF -UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF +BattleColosseum2P_EventScript_PlayerSpot1:: @ 81BB8CF setvar VAR_0x8005, 1 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8DB:: @ 81BB8DB -UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB +BattleColosseum4P_EventScript_PlayerSpot0:: @ 81BB8DB fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 0 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB8F8:: @ 81BB8F8 -UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 +BattleColosseum4P_EventScript_PlayerSpot1:: @ 81BB8F8 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 1 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB915:: @ 81BB915 -UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 +BattleColosseum4P_EventScript_PlayerSpot2:: @ 81BB915 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 2 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -gUnknown_81BB932:: @ 81BB932 -UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 +BattleColosseum4P_EventScript_PlayerSpot3:: @ 81BB932 fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB94F + goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger setvar VAR_0x8005, 3 textcolor 3 - special sub_80819C8 + special EnterColosseumPlayerSpot waitstate end -EventScript_1BB94F:: @ 81BB94F +BattleColosseum4P_EventScript_CancelSpotTrigger:: @ 81BB94F end gUnknown_81BB950:: @ 81BB950 -UnknownMap_00_01_EventScript_1BB950:: @ 81BB950 +TradeCenter_EventScript_Chair0:: @ 81BB950 setvar VAR_0x8005, 0 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -gUnknown_81BB95C:: @ 81BB95C -UnknownMap_00_01_EventScript_1BB95C:: @ 81BB95C +TradeCenter_EventScript_Chair1:: @ 81BB95C setvar VAR_0x8005, 1 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -EventScript_1BB968:: @ 81BB968 +@ Unused +TradeCenter_EventScript_Chair2:: @ 81BB968 setvar VAR_0x8005, 2 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -EventScript_1BB974:: @ 81BB974 +@ Unused +TradeCenter_EventScript_Chair3:: @ 81BB974 setvar VAR_0x8005, 3 textcolor 3 - special sub_8081978 + special EnterTradeSeat waitstate end -gUnknown_81BB980:: @ 81BB980 -UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 +@ Nop in FRLG +RecordCenter_EventScript_Spot:: @ 81BB980 end -gUnknown_81BB981:: @ 81BB981 +CableClub_EventScript_ReadTrainerCard:: @ 81BB981 textcolor 3 msgbox Text_LookedAtPlayersTrainerCard fadescreen FADE_TO_BLACK - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gUnknown_81BB992:: @ 81BB992 +CableClub_EventScript_ReadTrainerCardColored:: @ 81BB992 textcolor 3 msgbox Text_LookedAtPlayersTrainerCardColored fadescreen FADE_TO_BLACK - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gUnknown_81BB9A3:: @ 81BB9A3 +CableClub_EventScript_TooBusyToNotice:: @ 81BB9A3 textcolor 3 msgbox Text_TrainerTooBusyToNotice closemessage end -UnknownMap_00_00_EventScript_1BB9AF:: @ 81BB9AF +BattleColosseum2P_EventScript_Attendant:: @ 81BB9AF textcolor 3 - special sub_8069740 + special Script_FacePlayer msgbox Text_TakeSeatStartBattle - special sub_8069768 + special Script_ClearHeldMovement closemessage end -UnknownMap_00_01_EventScript_1BB9C1:: @ 81BB9C1 +TradeCenter_EventScript_Attendant:: @ 81BB9C1 textcolor 3 - special sub_8069740 + special Script_FacePlayer msgbox Text_TakeSeatStartTrade - special sub_8069768 + special Script_ClearHeldMovement closemessage end -UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 +@ Nop in FRLG +RecordCenter_EventScript_Attendant:: @ 81BB9D3 end -gUnknown_81BB9D4:: @ 81BB9D4 +TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 textcolor 3 msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_1BB9F0 + goto_if_eq TradeCenter_TerminateLink erasebox 0, 0, 29, 19 releaseall end -EventScript_1BB9F0:: @ 81BB9F0 +TradeCenter_TerminateLink:: @ 81BB9F0 textcolor 3 - messageautoscroll Text_1BC7E2 + messageautoscroll Text_TerminateLinkConfirmation waitmessage special sub_8081770 end -gUnknown_81BB9FC:: @ 81BB9FC - special sub_8081744 - special sub_807E704 +CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC + special CleanupLinkRoomState + special ReturnFromLinkRoom waitstate end -EventScript_1BBA04:: @ 81BBA04 +CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB867 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BBB60 - message Text_1BD65B + goto_if_eq CableClub_EventScript_UnionRoomAdapterNotConnected + message CableClub_Text_WelcomeUnionRoomEnter waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA50:: @ 81BBA50 + goto CableClub_EventScript_AskEnterUnionRoom end -EventScript_1BBA51:: @ 81BBA51 +CableClub_EventScript_AskEnterUnionRoom:: @ 81BBA51 multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT - case 0, EventScript_1BBA94 - case 1, EventScript_1BB82F - case 2, EventScript_1BBA88 - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_EnterUnionRoom + case 1, CableClub_EventScript_AbortLink + case 2, CableClub_EventScript_UnionRoomInfo + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBA88:: @ 81BBA88 - message Text_1BD706 +CableClub_EventScript_UnionRoomInfo:: @ 81BBA88 + message CableClub_Text_UnionRoomInfo waitmessage - goto EventScript_1BBA51 - -EventScript_1BBA93:: @ 81BBA93 + goto CableClub_EventScript_AskEnterUnionRoom end -EventScript_1BBA94:: @ 81BBA94 - call EventScript_1BBB1E - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F +CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 + call CableClub_EventScript_CheckPartyUnionRoomRequirements + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AbortLink call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - msgbox gUnknown_81BD86A + goto_if_eq CableClub_EventScript_AbortLink + msgbox CableClub_Text_EnjoyUnionRoom closemessage - special sp000_heal_pokemon - setvar VAR_0x8004, 6 + special HealPlayerParty + setvar VAR_0x8004, USING_UNION_ROOM copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 special HelpSystem_Disable call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 5, 1 waitdooranim - special sub_811B15C + special Script_ResetUnionRoomTrade special SetCableClubWarp - warpteleport2 MAP_UNKNOWN_MAP_00_04, 255, 7, 11 + warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate special UnionRoomSpecial waitstate end -EventScript_1BBB1E:: @ 81BBB1E +CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if_lt EventScript_1BBB44 + goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBB52 - setvar VAR_RESULT, 1 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom + setvar VAR_RESULT, TRUE return -EventScript_1BBB44:: @ 81BBB44 - msgbox gUnknown_81BCBC3 +CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 81BBB44 + msgbox CableClub_Text_NeedTwoMonsForUnionRoom goto EventScript_SetResultFalse - -EventScript_1BBB51:: @ 81BBB51 end -EventScript_1BBB52:: @ 81BBB52 - msgbox gUnknown_81BCC00 +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 81BBB52 + msgbox CableClub_Text_NoEnigmaBerryInUnionRoom goto EventScript_SetResultFalse - -EventScript_1BBB5F:: @ 81BBB5F end -EventScript_1BBB60:: @ 81BBB60 - msgbox gUnknown_81BCC3A +CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 81BBB60 + msgbox CableClub_Text_UnionRoomAdapterNotConnected release return -EventScript_1BBB6A:: @ 81BBB6A +CableClub_EventScript_WirelessClubAttendant:: @ 81BBB6A lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 - msgbox gUnknown_81BDB85, MSGBOX_YESNO + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements + msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BBB92 - msgbox gUnknown_81BDBF8 + goto_if_eq CableClub_EventScript_DontAskAboutLinking + msgbox CableClub_Text_ExplainWirelessClub release return -EventScript_1BBB92:: @ 81BBB92 - msgbox gUnknown_81BDEDF +CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 + msgbox CableClub_Text_HopeYouEnjoyWirelessSystem release return -EventScript_1BBB9C:: @ 81BBB9C +CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB877 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, Special_BadEggInParty - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BB867 + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BB44A - message Text_1BD28D + goto_if_eq CableClub_EventScript_WelcomeToCableClub + message CableClub_Text_WelcomeWhichDirectCornerRoom waitmessage delay 15 - goto EventScript_1BBBE7 - -EventScript_1BBBE6:: @ 81BBBE6 + goto CableClub_EventScript_DirectCornerSelectService end -EventScript_1BBBE7:: @ 81BBBE7 - goto_if_unset FLAG_GOT_POWDER_JAR, EventScript_1BBC32 +CableClub_EventScript_DirectCornerSelectService:: @ 81BBBE7 + goto_if_unset FLAG_GOT_POWDER_JAR, CableClub_EventScript_DirectCornerNoBerry multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BBD35 - case 3, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessBerryCrush + case 3, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBC32:: @ 81BBC32 +CableClub_EventScript_DirectCornerNoBerry:: @ 81BBC32 multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE switch VAR_RESULT - case 0, EventScript_1BBC69 - case 1, EventScript_1BBC97 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBC69:: @ 81BBC69 - msgbox gUnknown_81BD317, MSGBOX_YESNO +CableClub_EventScript_WirelessTrade:: @ 81BBC69 + msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB82F - call EventScript_1BB79C - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F - setvar VAR_0x8004, 3 - goto EventScript_1BBD6F - -EventScript_1BBC96:: @ 81BBC96 + goto_if_eq CableClub_EventScript_AbortLink + call CableClub_EventScript_CheckPartyTradeRequirements + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AbortLink + setvar VAR_0x8004, LINK_GROUP_TRADE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBC97:: @ 81BBC97 - message Text_1BD338 +CableClub_EventScript_WirelessBattleSelect:: @ 81BBC97 + message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT - case 0, EventScript_1BBCEA - case 1, EventScript_1BBCF5 - case 2, EventScript_1BBD1C - case 3, EventScript_1BBD27 - case 4, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_WirelessSingleBattle + case 1, CableClub_EventScript_WirelessDoubleBattle + case 2, CableClub_EventScript_WirelessMultiBattle + case 3, CableClub_EventScript_WirelessBattleInfo + case 4, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBCEA:: @ 81BBCEA - setvar VAR_0x8004, 0 - goto EventScript_1BBD6F - -EventScript_1BBCF4:: @ 81BBCF4 +CableClub_EventScript_WirelessSingleBattle:: @ 81BBCEA + setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBCF5:: @ 81BBCF5 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 - goto_if_ne EventScript_1BBD0E - setvar VAR_0x8004, 1 - goto EventScript_1BBD6F - -EventScript_1BBD0D:: @ 81BBD0D +CableClub_EventScript_WirelessDoubleBattle:: @ 81BBCF5 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle + setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD0E:: @ 81BBD0E - msgbox gUnknown_81BC409 - goto EventScript_1BBC97 - -EventScript_1BBD1B:: @ 81BBD1B +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 81BBD0E + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle + goto CableClub_EventScript_WirelessBattleSelect end -EventScript_1BBD1C:: @ 81BBD1C - setvar VAR_0x8004, 2 - goto EventScript_1BBD6F - -EventScript_1BBD26:: @ 81BBD26 +CableClub_EventScript_WirelessMultiBattle:: @ 81BBD1C + setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD27:: @ 81BBD27 - msgbox gUnknown_81BD390 - goto EventScript_1BBC97 - -EventScript_1BBD34:: @ 81BBD34 +CableClub_EventScript_WirelessBattleInfo:: @ 81BBD27 + msgbox CableClub_Text_ExplainBattleModes + goto CableClub_EventScript_WirelessBattleSelect end -EventScript_1BBD35:: @ 81BBD35 - msgbox gUnknown_81BD362, MSGBOX_YESNO +CableClub_EventScript_WirelessBerryCrush:: @ 81BBD35 + msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink special CheckHasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if_eq EventScript_1BBD61 - setvar VAR_0x8004, 5 - goto EventScript_1BBD6F - -EventScript_1BBD60:: @ 81BBD60 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush + setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH + goto CableClub_EventScript_SaveAndChooseLinkLeader end -EventScript_1BBD61:: @ 81BBD61 - msgbox gUnknown_81BCB81 - goto EventScript_1BBBE7 - -EventScript_1BBD6E:: @ 81BBD6E +CableClub_EventScript_NeedBerryForBerryCrush:: @ 81BBD61 + msgbox CableClub_Text_NeedBerryForBerryCrush + goto CableClub_EventScript_DirectCornerSelectService end -EventScript_1BBD6F:: @ 81BBD6F +CableClub_EventScript_SaveAndChooseLinkLeader:: @ 81BBD6F call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB82F + goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, EventScript_1BBDBC - case 0, EventScript_1BBDBC - case 1, EventScript_1BBDBC - case 2, EventScript_1BBE50 - case 5, EventScript_1BBEE4 + 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 end -EventScript_1BBDBC:: @ 81BBDBC +CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC textcolor 3 - message Text_1BD51B + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBE28 - case 1, EventScript_1BBE00 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroup2Players + case 1, CableClub_EventScript_TryLeadGroup2Players + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBE00:: @ 81BBE00 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroup2Players:: @ 81BBE00 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBDBC + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE00 + goto_if_eq CableClub_EventScript_TryLeadGroup2Players release return -EventScript_1BBE28:: @ 81BBE28 - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroup2Players:: @ 81BBE28 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBDBC + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE28 + goto_if_eq CableClub_EventScript_TryJoinGroup2Players release return -EventScript_1BBE50:: @ 81BBE50 +CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50 textcolor 3 - message Text_1BD582 + message CableClub_Text_ChooseGroupLeaderOfFour waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBEBC - case 1, EventScript_1BBE94 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroup4Players + case 1, CableClub_EventScript_TryLeadGroup4Players + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBE94:: @ 81BBE94 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroup4Players:: @ 81BBE94 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBE50 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBE94 + goto_if_eq CableClub_EventScript_TryLeadGroup4Players release return -EventScript_1BBEBC:: @ 81BBEBC - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroup4Players:: @ 81BBEBC + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBE50 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBEBC + goto_if_eq CableClub_EventScript_TryJoinGroup4Players release return -EventScript_1BBEE4:: @ 81BBEE4 +CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4 textcolor 3 - message Text_1BD5F1 + message CableClub_Text_ChooseGroupLeader waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BBF50 - case 1, EventScript_1BBF28 - case 2, EventScript_1BB82F - case SCR_MENU_CANCEL, EventScript_1BB82F + case 0, CableClub_EventScript_TryJoinGroupXPlayers + case 1, CableClub_EventScript_TryLeadGroupXPlayers + case 2, CableClub_EventScript_AbortLink + case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -EventScript_1BBF28:: @ 81BBF28 - call EventScript_1BBF78 +CableClub_EventScript_TryLeadGroupXPlayers:: @ 81BBF28 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBEE4 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBF28 + goto_if_eq CableClub_EventScript_TryLeadGroupXPlayers release return -EventScript_1BBF50:: @ 81BBF50 - call EventScript_1BBF80 +CableClub_EventScript_TryJoinGroupXPlayers:: @ 81BBF50 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BBF88 + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq EventScript_1BBEE4 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq EventScript_1BBF50 + goto_if_eq CableClub_EventScript_TryJoinGroupXPlayers release return -EventScript_1BBF78:: @ 81BBF78 +CableClub_EventScript_TryBecomeLinkLeader:: @ 81BBF78 special HelpSystem_Disable - special sub_8115A24 + special TryBecomeLinkLeader waitstate return -EventScript_1BBF80:: @ 81BBF80 +CableClub_EventScript_TryJoinLinkGroup:: @ 81BBF80 special HelpSystem_Disable - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return -EventScript_1BBF88:: @ 81BBF88 - messageautoscroll Text_1BC59E +CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 + messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 closemessage @@ -1168,42 +1133,42 @@ EventScript_1BBF88:: @ 81BBF88 special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB898 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB89C + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release waitstate end -gUnknown_81BBFD8:: @ 81BBFD8 +CableClub_EventScript_81BBFD8:: @ 81BBFD8 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BC016 + goto_if_eq CableClub_EventScript_AdapterNotConnected special HelpSystem_Disable fadescreen FADE_TO_BLACK special sub_814F1D4 waitstate - msgbox gUnknown_81BCA43 + msgbox CableClub_Text_ParticipantsStepUpToCounter special HelpSystem_Enable releaseall end -EventScript_1BC016:: @ 81BC016 - msgbox gUnknown_81BCA13 +CableClub_EventScript_AdapterNotConnected:: @ 81BC016 + msgbox CableClub_Text_AdapterNotConnected releaseall end @@ -1231,161 +1196,139 @@ CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052 setmetatile 5, 3, 759, 1 return -CeladonCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FiveIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FourIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -LavenderTown_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -OneIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -PewterCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route10_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -Route4_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SaffronCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SevenIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -SixIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -TwoIsland_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -VermilionCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C -ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C - special sub_811999C - end - -EventScript_1BC060:: @ 81BC060 +CableClub_OnResume:: @ 81BC05C + special InitUnionRoom + end + +JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - message Text_1BCCFF + message Text_DescribeWhichGame waitmessage multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT - case 0, EventScript_1BC0B0 - case 1, EventScript_1BC0BA - case 2, EventScript_1BC0C4 - case SCR_MENU_CANCEL, EventScript_1BC0C4 + case 0, CableClub_EventScript_PokemonJumpInfo + case 1, CableClub_EventScript_DodrioBerryPickingInfo + case 2, CableClub_EventScript_MinigameInfoExit + case SCR_MENU_CANCEL, CableClub_EventScript_MinigameInfoExit end -EventScript_1BC0B0:: @ 81BC0B0 - msgbox gUnknown_81BCD4D +CableClub_EventScript_PokemonJumpInfo:: @ 81BC0B0 + msgbox Text_PokemonJumpInfo release end -EventScript_1BC0BA:: @ 81BC0BA - msgbox gUnknown_81BCE73 +CableClub_EventScript_DodrioBerryPickingInfo:: @ 81BC0BA + msgbox Text_DodrioBerryPickingInfo release end -EventScript_1BC0C4:: @ 81BC0C4 - msgbox gUnknown_81BCF2E +CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 + msgbox Text_TalkToManToPlay release end -EventScript_1BC0CE:: @ 81BC0CE +JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - message Text_1BCF69 + message Text_WelcomeCanYouWait waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE - goto_if_eq EventScript_1BC29C + goto_if_eq CableClub_EventScript_AdapterNotConnectedMinigame delay 60 special HelpSystem_Disable - message Text_1BD02D + message Text_PlayWhichGame waitmessage multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT - case 0, EventScript_1BC13A - case 1, EventScript_1BC184 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F + case 0, CableClub_EventScript_PlayPokemonJump + case 1, CableClub_EventScript_PlayDodrioBerryPicking + case 2, CableClub_EventScript_AbortMinigame + case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -EventScript_1BC13A:: @ 81BC13A +CableClub_EventScript_PlayPokemonJump:: @ 81BC13A setvar VAR_0x8005, 0 - special sub_8149A18 - compare VAR_RESULT, 0 - goto_if_eq EventScript_NoEligiblePkmn - msgbox gUnknown_81BD059 + special IsPokemonJumpSpeciesInParty + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NoEligiblePkmn + msgbox Text_EnterWhichPokemon setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge EventScript_1BB83F + compare VAR_0x8004, PARTY_SIZE + goto_if_ge CableClub_EventScript_AbortMinigame call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB83F - setvar VAR_0x8004, 4 - goto EventScript_1BC1CE - -EventScript_1BC183:: @ 81BC183 + goto_if_eq CableClub_EventScript_AbortMinigame + setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP + goto CableClub_EventScript_ChooseLinkLeaderMinigame end -EventScript_1BC184:: @ 81BC184 +CableClub_EventScript_PlayDodrioBerryPicking:: @ 81BC184 setvar VAR_0x8005, 1 - special sub_81537C0 + special IsDodrioInParty compare VAR_RESULT, 0 - goto_if_eq EventScript_NoEligiblePkmn - msgbox gUnknown_81BD059 + goto_if_eq CableClub_EventScript_NoEligiblePkmn + msgbox Text_EnterWhichPokemon setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge EventScript_1BB83F + compare VAR_0x8004, PARTY_SIZE + goto_if_ge CableClub_EventScript_AbortMinigame call EventScript_AskSaveGame compare VAR_RESULT, 0 - goto_if_eq EventScript_1BB83F - setvar VAR_0x8004, 6 - goto EventScript_1BC1CE - -EventScript_1BC1CD:: @ 81BC1CD + goto_if_eq CableClub_EventScript_AbortMinigame + setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING + goto CableClub_EventScript_ChooseLinkLeaderMinigame end -EventScript_1BC1CE:: @ 81BC1CE +CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE textcolor 3 - message Text_1BD5F1 + message CableClub_Text_ChooseGroupLeader waitmessage call EventScript_1A6675 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT - case 0, EventScript_1BC23A - case 1, EventScript_1BC212 - case 2, EventScript_1BB83F - case SCR_MENU_CANCEL, EventScript_1BB83F + case 0, CableClub_EventScript_TryJoinMinigameLinkGroup + case 1, CableClub_EventScript_TryBecomeMinigameLinkLeader + case 2, CableClub_EventScript_AbortMinigame + case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -EventScript_1BC212:: @ 81BC212 - call EventScript_1BBF78 +CableClub_EventScript_TryBecomeMinigameLinkLeader:: @ 81BC212 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq EventScript_1BC262 + goto_if_eq CableClub_EventScript_EnterMinigame compare VAR_RESULT, 5 - goto_if_eq EventScript_1BC1CE + goto_if_eq CableClub_EventScript_ChooseLinkLeaderMinigame compare VAR_RESULT, 8 - goto_if_eq EventScript_1BC212 + goto_if_eq CableClub_EventScript_TryBecomeMinigameLinkLeader release return -EventScript_1BC23A:: @ 81BC23A - call EventScript_1BBF80 +CableClub_EventScript_TryJoinMinigameLinkGroup:: @ 81BC23A + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq EventScript_1BC262 + goto_if_eq CableClub_EventScript_EnterMinigame compare VAR_RESULT, 5 - goto_if_eq EventScript_1BC1CE + goto_if_eq CableClub_EventScript_ChooseLinkLeaderMinigame compare VAR_RESULT, 8 - goto_if_eq EventScript_1BC23A + goto_if_eq CableClub_EventScript_TryJoinMinigameLinkGroup release return -EventScript_1BC262:: @ 81BC262 - messageautoscroll Text_1BD080 +CableClub_EventScript_EnterMinigame:: @ 81BC262 + messageautoscroll Text_AllGoodToGo waitmessage delay 120 closemessage @@ -1394,156 +1337,156 @@ EventScript_1BC262:: @ 81BC262 special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, Movement_1BB88F + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1BB8A2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobject OBJ_EVENT_ID_PLAYER, MAP_UNKNOWN_MAP_00_00 + hideobject OBJ_EVENT_ID_PLAYER, 0 release waitstate end -EventScript_1BC29C:: @ 81BC29C - msgbox gUnknown_81BCFE8 +CableClub_EventScript_AdapterNotConnectedMinigame:: @ 81BC29C + msgbox Text_AdapterNotConnectedMinigame release end -EventScript_NoEligiblePkmn:: @ 81BC2A6 - msgbox gUnknown_81BD0CF, MSGBOX_YESNO +CableClub_EventScript_NoEligiblePkmn:: @ 81BC2A6 + msgbox EventScript_ExplainPokemonJumpRequirements, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1BB83F + goto_if_eq CableClub_EventScript_AbortMinigame compare VAR_0x8005, 0 - call_if_eq EventScript_1BC2D5 + call_if_eq CableClub_EventScript_ExplainPokemonJumpRequirements compare VAR_0x8005, 1 - call_if_eq EventScript_1BC2DE - goto EventScript_1BB83F - -EventScript_1BC2D4:: @ 81BC2D4 + call_if_eq CableClub_EventScript_ExplainDodrioBerryPickingRequirements + goto CableClub_EventScript_AbortMinigame end -EventScript_1BC2D5:: @ 81BC2D5 - msgbox gUnknown_81BD14B +CableClub_EventScript_ExplainPokemonJumpRequirements:: @ 81BC2D5 + msgbox Text_ShortJumpingPokemonAllowed return -EventScript_1BC2DE:: @ 81BC2DE - msgbox gUnknown_81BD213 +CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE + msgbox Text_OnlyDodrioAllowed return -TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 +TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - special sub_814B504 + special ShowPokemonJumpRecords waitstate releaseall end -TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC +TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - special sub_8153810 + special ShowDodrioBerryPickingRecords waitstate releaseall end -gUnknown_81BC311:: @ 81BC311 +CableClub_Text_WelcomeWhichCableClubService:: @ 81BC311 .string "Welcome to the POKéMON CABLE\n" .string "CLUB.\p" .string "Which of our services do you wish\n" .string "to use?$" -gUnknown_81BC35E:: @ 81BC35E +CableClub_Text_WhichService:: @ 81BC35E .string "Which of our services do you wish\n" .string "to use?$" -Text_1BC388:: @ 81BC388 +CableClub_Text_TradeMonsUsingLinkCable:: @ 81BC388 .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -Text_1BC3C7:: @ 81BC3C7 +CableClub_Text_BattleUsingLinkCable:: @ 81BC3C7 .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" -Text_1BC403:: @ 81BC403 +@ Unused, translated in Emerald +CableClub_Text_CloseThisMenu:: @ 81BC403 .string "おわります$" -gUnknown_81BC409:: @ 81BC409 +CableClub_Text_NeedTwoMonsForDoubleBattle:: @ 81BC409 .string "For a DOUBLE BATTLE, you must\n" .string "have at least two POKéMON.$" -gUnknown_81BC442:: @ 81BC442 +CableClub_Text_NeedTwoMonsToTrade:: @ 81BC442 .string "For trading, you must have at\n" .string "least two POKéMON with you.$" -gUnknown_81BC47C:: @ 81BC47C +CableClub_Text_CantTradeEnigmaBerry:: @ 81BC47C .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can't be traded.$" -gUnknown_81BC4AC:: @ 81BC4AC +CableClub_Text_PleaseWaitBCancel:: @ 81BC4AC .string "Please wait.\n" .string "… … B Button: Cancel$" -gUnknown_81BC4CE:: @ 81BC4CE +CableClub_Text_WhenAllPlayersReadyAConfirmBCancel:: @ 81BC4CE .string "When all players are ready…\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -gUnknown_81BC50D:: @ 81BC50D +CableClub_Text_StartLinkWithXPlayersAConfirmBCancel:: @ 81BC50D .string "Start link with {STR_VAR_1} players.\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -gUnknown_81BC54C:: @ 81BC54C +CableClub_Text_AwaitingLinkupBCancel:: @ 81BC54C .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" -Text_1BC572:: @ 81BC572 +@ Unused, translated in Emerald +CableClub_Text_OkayToSaveProgress:: @ 81BC572 .string "はじめる まえに レポートを\n" .string "かきますが よろしいですか？$" -Text_1BC590:: @ 81BC590 +CableClub_Text_PleaseEnter:: @ 81BC590 .string "Please enter.$" -Text_1BC59E:: @ 81BC59E +CableClub_Text_DirectYouToYourRoom:: @ 81BC59E .string "I'll direct you to your room now.$" -gUnknown_81BC5C0:: @ 81BC5C0 +CableClub_Text_SomeoneIsNotReadyToLink:: @ 81BC5C0 .string "Someone is not ready to link.\p" .string "Please come back after everyone\n" .string "has made preparations.$" -gUnknown_81BC615:: @ 81BC615 +CableClub_Text_LinkErrorPleaseReset:: @ 81BC615 .string "Sorry, we have a link error…\n" .string "Please reset and try again.$" -gUnknown_81BC64E:: @ 81BC64E +CableClub_Text_PlayersMadeDifferentSelections:: @ 81BC64E .string "The link partners appear to have\n" .string "made different selections.$" -gUnknown_81BC68A:: @ 81BC68A +CableClub_Text_PleaseVisitAgain:: @ 81BC68A .string "Please do visit again.$" -gUnknown_81BC6A1:: @ 81BC6A1 +CableClub_Text_IncorrectNumberOfParticipants:: @ 81BC6A1 .string "The number of participants is\n" .string "incorrect.$" -gUnknown_81BC6CA:: @ 81BC6CA +CableClub_Text_CantSingleBattleWithXPlayers:: @ 81BC6CA .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -gUnknown_81BC700:: @ 81BC700 +CableClub_Text_CantDoubleBattleWithXPlayers:: @ 81BC700 .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -gUnknown_81BC736:: @ 81BC736 +CableClub_Text_NeedFourPlayers:: @ 81BC736 .string "There must be four players to play\n" .string "this Battle Mode.$" -gUnknown_81BC76B:: @ 81BC76B +CableClub_Text_PleaseConfirmNumberAndRestart:: @ 81BC76B .string "Please confirm the number of\n" .string "players and start again.$" @@ -1551,7 +1494,7 @@ Text_TerminateLinkIfYouLeaveRoom:: @ 81BC7A1 .string "The link will be terminated if you\n" .string "leave the room. Is that okay?$" -Text_1BC7E2:: @ 81BC7E2 +Text_TerminateLinkConfirmation:: @ 81BC7E2 .string "Terminating link…\n" .string "You will be escorted out of\l" .string "the room. Please wait.$" @@ -1577,88 +1520,95 @@ Text_TakeSeatStartTrade:: @ 81BC8DA .string "Please take your seat and start\n" .string "your trade.$" -Text_1BC906:: @ 81BC906 +@ Unused, leftover from RS +RecordCorner_Text_ThanksForComing:: @ 81BC906 .string "ごりよう ありがとう ございました$" -Text_1BC918:: @ 81BC918 +CableClub_Text_TrainerCardDataOverwritten:: @ 81BC918 .string "The TRAINER CARD data will\n" .string "be overwritten.$" -Text_1BC943:: @ 81BC943 +CableClub_Text_HopeToSeeYouAgain:: @ 81BC943 .string "I hope to see you again!$" -gUnknown_81BC95C:: @ 81BC95C +CableClub_Text_NotSetUpForFarAwayRegion:: @ 81BC95C .string "I'm awfully sorry.\p" .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" -gUnknown_81BC9C0:: @ 81BC9C0 +CableClub_Text_OtherTrainerNotReady:: @ 81BC9C0 .string "The other TRAINER is not ready.$" -gUnknown_81BC9E0:: @ 81BC9E0 +CableClub_Text_YouHaveAMonThatCantBeTaken:: @ 81BC9E0 .string "You have at least one POKéMON\n" .string "that can't be taken.$" -gUnknown_81BCA13:: @ 81BCA13 +CableClub_Text_AdapterNotConnected:: @ 81BCA13 .string "The Wireless Adapter is not\n" .string "connected properly.$" -gUnknown_81BCA43:: @ 81BCA43 +CableClub_Text_ParticipantsStepUpToCounter:: @ 81BCA43 .string "Participants are asked to step up\n" .string "to the reception counter.$" -Text_1BCA7F:: @ 81BCA7F +@ Unused, translated in Emerald +CableClub_Text_Hello:: @ 81BCA7F .string "こんにちは！$" -Text_1BCA86:: @ 81BCA86 +@ Unused, translated in Emerald +CableClub_Text_PleaseWait:: @ 81BCA86 .string "しょうしょう おまちください$" -Text_1BCA95:: @ 81BCA95 +CableClub_Text_YouMayTradeHere:: @ 81BCA95 .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -Text_1BCACB:: @ 81BCACB +CableClub_Text_YouMayBattleHere:: @ 81BCACB .string "You may battle with your friends\n" .string "here.$" -Text_1BCAF2:: @ 81BCAF2 +CableClub_Text_CanMakeBerryPowder:: @ 81BCAF2 .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" -Text_1BCB27:: @ 81BCB27 +@ Unused, Record Mix nopped +CableClub_Text_CanMixRecords:: @ 81BCB27 .string "ワイヤレス クラブでの\n" .string "あそびかたを せつめいします$" -Text_1BCB42:: @ 81BCB42 +CableClub_Text_CancelSelectedItem:: @ 81BCB42 .string "Cancels the selected MENU item.$" -Text_1BCB62:: @ 81BCB62 +@ Unused, translated in Emerald +CableClub_Text_WhichBattleMode:: @ 81BCB62 .string "どちらの しょうぶに しますか？$" -Text_1BCB73:: @ 81BCB73 +@ Unused, translated in Emerald +CableClub_Text_ReturnsToPreviousStep:: @ 81BCB73 .string "ひとつ まえに もどります$" -gUnknown_81BCB81:: @ 81BCB81 +CableClub_Text_NeedBerryForBerryCrush:: @ 81BCB81 .string "To use the BERRY CRUSH service,\n" .string "you must have at least one BERRY.$" -gUnknown_81BCBC3:: @ 81BCBC3 +CableClub_Text_NeedTwoMonsForUnionRoom:: @ 81BCBC3 .string "To enter the UNION ROOM, you must\n" .string "have at least two POKéMON.$" -gUnknown_81BCC00:: @ 81BCC00 +CableClub_Text_NoEnigmaBerryInUnionRoom:: @ 81BCC00 .string "No POKéMON holding the {STR_VAR_1}\n" .string "BERRY may enter the UNION ROOM.$" -gUnknown_81BCC3A:: @ 81BCC3A +CableClub_Text_UnionRoomAdapterNotConnected:: @ 81BCC3A .string "This is the POKéMON WIRELESS CLUB\n" .string "UNION ROOM.\p" .string "Unfortunately, your Wireless\n" .string "Adapter is not connected properly.\p" .string "Please do come again.$" -Text_1BCCBE:: @ 81BCCBE +@ Unused, translated in Emerald +CableClub_Text_OhExcuseMe:: @ 81BCCBE .string "あ‥‥\n" .string "おきゃくさま！$" @@ -1667,12 +1617,12 @@ Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA .string "right now.\l" .string "Go for it!$" -Text_1BCCFF:: @ 81BCCFF +Text_DescribeWhichGame:: @ 81BCCFF .string "I can explain game rules to you,\n" .string "if you'd like.\p" .string "Which game should I describe?$" -gUnknown_81BCD4D:: @ 81BCD4D +Text_PokemonJumpInfo:: @ 81BCD4D .string "“POKéMON JUMP”\p" .string "Make your POKéMON skip the\n" .string "VINE WHIP rope with the A Button.\p" @@ -1685,7 +1635,7 @@ gUnknown_81BCD4D:: @ 81BCD4D .string "Good things happen if everyone\n" .string "jumps in time.$" -gUnknown_81BCE73:: @ 81BCE73 +Text_DodrioBerryPickingInfo:: @ 81BCE73 .string "“DODRIO BERRY-PICKING”\p" .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" @@ -1694,47 +1644,48 @@ gUnknown_81BCE73:: @ 81BCE73 .string "To play this game, you must have\n" .string "a DODRIO.$" -gUnknown_81BCF2E:: @ 81BCF2E +Text_TalkToManToPlay:: @ 81BCF2E .string "If you want to play a game,\n" .string "please tell the man beside me.$" -Text_1BCF69:: @ 81BCF69 +Text_WelcomeCanYouWait:: @ 81BCF69 .string "Hi, welcome!\n" .string "You can play games over the\l" .string "Wireless Communication System.\p" .string "Can you wait just a little bit?$" -gUnknown_81BCFD1:: @ 81BCFD1 +CableClub_Text_ComeAgain:: @ 81BCFD1 .string "All right, come again!$" -gUnknown_81BCFE8:: @ 81BCFE8 +Text_AdapterNotConnectedMinigame:: @ 81BCFE8 .string "The Wireless Adapter isn't\n" .string "connected.\p" .string "Come back when it's hooked up!$" -Text_1BD02D:: @ 81BD02D +Text_PlayWhichGame:: @ 81BD02D .string "All right, which game did you want\n" .string "to play?$" -gUnknown_81BD059:: @ 81BD059 +Text_EnterWhichPokemon:: @ 81BD059 .string "Which POKéMON would you like to\n" .string "enter?$" -Text_1BD080:: @ 81BD080 +Text_AllGoodToGo:: @ 81BD080 .string "Okay, you're all good to go.\n" .string "Don't let the others beat you!$" -Text_1BD0BC:: @ 81BD0BC +@ Unused, translated in Emerald +Text_LeavingDoComeAgain:: @ 81BD0BC .string "きょうは けえるのか？\n" .string "またこいよ！$" -gUnknown_81BD0CF:: @ 81BD0CF +EventScript_ExplainPokemonJumpRequirements:: @ 81BD0CF .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" -gUnknown_81BD14B:: @ 81BD14B +Text_ShortJumpingPokemonAllowed:: @ 81BD14B .string "“POKéMON JUMP” is open to POKéMON\n" .string "around 28 inches or less.\p" .string "What you can't enter are those\n" @@ -1743,17 +1694,18 @@ gUnknown_81BD14B:: @ 81BD14B .string "swim, burrow, or fly.\p" .string "That's all you need to know.$" -gUnknown_81BD213:: @ 81BD213 +Text_OnlyDodrioAllowed:: @ 81BD213 .string "“DODRIO BERRY-PICKING”…\n" .string "Well, the name says it all.\p" .string "You have to have a DODRIO to play\n" .string "this game.$" -Text_1BD274:: @ 81BD274 +@ Unused, translated in Emerald +Text_RetryFromStartPlease:: @ 81BD274 .string "もういちど はじめから\n" .string "やりなおして みて くれ$" -Text_1BD28D:: @ 81BD28D +CableClub_Text_WelcomeWhichDirectCornerRoom:: @ 81BD28D .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB DIRECT CORNER.\p" .string "You may interact directly with\n" @@ -1761,18 +1713,18 @@ Text_1BD28D:: @ 81BD28D .string "Which room would you like to\n" .string "enter?$" -gUnknown_81BD317:: @ 81BD317 +CableClub_Text_TradePokemon:: @ 81BD317 .string "Would you like to trade POKéMON?$" -Text_1BD338:: @ 81BD338 +CableClub_Text_PlayWhichBattleMode:: @ 81BD338 .string "Which Battle Mode would you like\n" .string "to play?$" -gUnknown_81BD362:: @ 81BD362 +CableClub_Text_UseBerryCrush:: @ 81BD362 .string "Would you like to use the\n" .string "BERRY CRUSH System?$" -gUnknown_81BD390:: @ 81BD390 +CableClub_Text_ExplainBattleModes:: @ 81BD390 .string "There are three Battle Modes.\p" .string "SINGLE BATTLE is for two TRAINERS\n" .string "with one or more POKéMON each.\p" @@ -1787,25 +1739,25 @@ gUnknown_81BD390:: @ 81BD390 .string "Each TRAINER can have one POKéMON\n" .string "in battle at a time.$" -Text_1BD51B:: @ 81BD51B +CableClub_Text_ChooseGroupLeaderOfTwo:: @ 81BD51B .string "Please decide which of you two\n" .string "will become the LEADER.\p" .string "The other player must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD582:: @ 81BD582 +CableClub_Text_ChooseGroupLeaderOfFour:: @ 81BD582 .string "Please decide which of you four\n" .string "will become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD5F1:: @ 81BD5F1 +CableClub_Text_ChooseGroupLeader:: @ 81BD5F1 .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -Text_1BD65B:: @ 81BD65B +CableClub_Text_WelcomeUnionRoomEnter:: @ 81BD65B .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB UNION ROOM.\p" .string "You may interact directly with\n" @@ -1813,7 +1765,7 @@ Text_1BD65B:: @ 81BD65B .string "whom you may not even know.\p" .string "Would you like to enter the ROOM?$" -Text_1BD706:: @ 81BD706 +CableClub_Text_UnionRoomInfo:: @ 81BD706 .string "The TRAINERS in the UNION ROOM\n" .string "will be those players around you\l" .string "who have also entered the ROOM.\p" @@ -1827,11 +1779,11 @@ Text_1BD706:: @ 81BD706 .string "trade.\p" .string "Would you like to enter the ROOM?$" -gUnknown_81BD86A:: @ 81BD86A +CableClub_Text_EnjoyUnionRoom:: @ 81BD86A .string "I hope you enjoy your time in\n" .string "the UNION ROOM.$" -gUnknown_81BD898:: @ 81BD898 +CableClub_Text_FirstTimeRightThisWay:: @ 81BD898 .string "Hello!\n" .string "My name is TEALA.\p" .string "This must be your first time\n" @@ -1842,7 +1794,7 @@ gUnknown_81BD898:: @ 81BD898 .string "floor of our POKéMON CENTER.\p" .string "Right this way, please.$" -gUnknown_81BD966:: @ 81BD966 +CableClub_Text_ExplainWirelessClubFirstTime:: @ 81BD966 .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" @@ -1864,14 +1816,14 @@ gUnknown_81BD966:: @ 81BD966 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -gUnknown_81BDB85:: @ 81BDB85 +CableClub_Text_AskAboutLinking:: @ 81BDB85 .string "Hello, {PLAYER}!\p" .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" -gUnknown_81BDBF8:: @ 81BDBF8 +CableClub_Text_ExplainWirelessClub:: @ 81BDBF8 .string "Let me explain how the POKéMON\n" .string "WIRELESS CLUB works.\p" .string "On this, the top floor, there are\n" @@ -1900,6 +1852,6 @@ gUnknown_81BDBF8:: @ 81BDBF8 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -gUnknown_81BDEDF:: @ 81BDEDF +CableClub_Text_HopeYouEnjoyWirelessSystem:: @ 81BDEDF .string "I hope you enjoy the Wireless\n" .string "Communication System.$" diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index cd92dad8a..cfa96774d 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -27,7 +27,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE waitfieldeffect FLDEFF_POKECENTER_HEAL applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown waitmovement 0 - special sp000_heal_pokemon + special HealPlayerParty return EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 320776ae7..f16e30ada 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -27,8 +27,8 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare VAR_RESULT, 0 goto_if_ne EventScript_1A4F20 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -79,8 +79,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare VAR_RESULT, 0 goto_if_eq EventScript_1A4FB0 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 7f7f985a2..dd85dc53a 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -241,7 +241,7 @@ EventScript_1C52D7: end EventScript_1C52E0:: @ 81C52E0 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 11 special sub_815D9E8 warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 diff --git a/data/specials.inc b/data/specials.inc index a12a1ee29..811844759 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -8,11 +8,11 @@ .set __special__, 0 .align 2 gSpecials:: @ 815FD60 - def_special sp000_heal_pokemon + def_special HealPlayerParty def_special SetCableClubWarp def_special DoCableClubWarp - def_special sub_807E704 - def_special sub_8081744 + def_special ReturnFromLinkRoom + def_special CleanupLinkRoomState def_special sub_8081770 def_special nullsub_75 def_special nullsub_75 @@ -36,12 +36,12 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_8081064 - def_special sub_80810CC + def_special TryBattleLinkup + def_special TryTradeLinkup def_special sub_80810F4 def_special CloseLink - def_special sub_80819C8 - def_special sub_8081978 + def_special EnterColosseumPlayerSpot + def_special EnterTradeSeat def_special sub_80819B8 def_special sub_808130C def_special nullsub_75 @@ -49,8 +49,8 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special SavePlayerParty def_special LoadPlayerParty - def_special sub_80A0334 - def_special sp02A_crash_sound + def_special ChooseHalfPartyForBattle + def_special Script_ShowLinkTrainerCard def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -69,7 +69,7 @@ gSpecials:: @ 815FD60 def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem - def_special CheckForAlivePartyMons + def_special HasEnoughMonsForDoubleBattle def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -303,8 +303,8 @@ gSpecials:: @ 815FD60 def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut - def_special sub_8069740 - def_special sub_8069768 + def_special Script_FacePlayer + def_special Script_ClearHeldMovement def_special InitRoamer def_special nullsub_75 def_special Special_PlayerHasGrassPokemonInParty @@ -371,8 +371,8 @@ gSpecials:: @ 815FD60 def_special Special_StickerLadyGetBragFlags def_special sub_80CC524 def_special IsWirelessAdapterConnected - def_special sub_8115A24 - def_special BerryBlenderLinkJoinGroup + def_special TryBecomeLinkLeader + def_special TryJoinLinkGroup def_special UnionRoomSpecial def_special sub_814F1D4 def_special EnableNationalPokedex @@ -394,7 +394,7 @@ gSpecials:: @ 815FD60 def_special HelpSystem_RestoreSomeVariable def_special ValidateReceivedWonderCard def_special sub_810B810 - def_special sub_811999C + def_special InitUnionRoom def_special BufferUnionRoomPlayerName def_special sub_811390C def_special Special_GetMartClerkObjectId @@ -410,10 +410,10 @@ gSpecials:: @ 815FD60 def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene - def_special sub_8149A18 + def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled def_special sub_815D9E8 - def_special sub_814B504 + def_special ShowPokemonJumpRecords def_special Special_ItemIsTM_GetMoveName def_special Special_DaisyMassageServices def_special HelpSystem_Disable @@ -430,7 +430,7 @@ gSpecials:: @ 815FD60 def_special Special_CapeBrinkGetMoveToTeachLeadPokemon def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_Credits - def_special sub_8153810 + def_special ShowDodrioBerryPickingRecords def_special Special_DrawSeagallopDestinationMenu def_special Special_GetSelectedSeagallopDestination def_special sub_8147500 @@ -443,10 +443,10 @@ gSpecials:: @ 815FD60 def_special HasAllMons def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle - def_special sub_811B15C + def_special Script_ResetUnionRoomTrade def_special Special_PlayerPartyContainsSpeciesWithPlayerID def_special sub_809C4A8 - def_special sub_81537C0 + def_special IsDodrioInParty def_special sub_809C5FC def_special Special_InitElevatorFloorSelectMenuPos def_special Special_ComputeLoreleiDollCollection diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 24cdcec13..a9d40220f 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -36,10 +36,10 @@ #define LAYOUT_CINNABAR_ISLAND_GYM 36 #define LAYOUT_VIRIDIAN_CITY_GYM 37 #define LAYOUT_UNUSED_LAYOUT_82D88C8 46 -#define LAYOUT_UNKNOWN_MAP_00_00 47 -#define LAYOUT_UNKNOWN_MAP_00_01 48 -#define LAYOUT_UNKNOWN_MAP_00_02 49 -#define LAYOUT_UNKNOWN_MAP_00_03 50 +#define LAYOUT_BATTLE_COLOSSEUM_2P 47 +#define LAYOUT_TRADE_CENTER 48 +#define LAYOUT_RECORD_CENTER 49 +#define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_UNUSED_LAYOUT_82D9B24 52 #define LAYOUT_UNUSED_LAYOUT_82DA7C8 53 @@ -244,7 +244,7 @@ #define LAYOUT_UNUSED_LAYOUT_83377F0 259 #define LAYOUT_UNUSED_LAYOUT_8338354 260 #define LAYOUT_UNUSED_LAYOUT_8338738 261 -#define LAYOUT_UNKNOWN_MAP_00_04 262 +#define LAYOUT_UNION_ROOM 262 #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263 #define LAYOUT_UNUSED_LAYOUT_8338B4C 264 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 13862d6c7..4d37b0dc8 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -2,11 +2,11 @@ #define GUARD_CONSTANTS_MAP_GROUPS_H // Map Group 0 -#define MAP_UNKNOWN_MAP_00_00 (0 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_01 (1 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_02 (2 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_03 (3 | (0 << 8)) -#define MAP_UNKNOWN_MAP_00_04 (4 | (0 << 8)) +#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) +#define MAP_TRADE_CENTER (1 | (0 << 8)) +#define MAP_RECORD_CENTER (2 | (0 << 8)) +#define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) +#define MAP_UNION_ROOM (4 | (0 << 8)) // Map Group 1 #define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index a2ad90776..c6fc55003 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -87,4 +87,8 @@ #define MON_ALREADY_KNOWS_MOVE 0xFFFE #define MON_HAS_MAX_MOVES 0xFFFF +#define PLAYER_HAS_TWO_USABLE_MONS 0x0 +#define PLAYER_HAS_ONE_MON 0x1 +#define PLAYER_HAS_ONE_USABLE_MON 0x2 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/constants/union_room.h b/include/constants/union_room.h new file mode 100644 index 000000000..2314f85a0 --- /dev/null +++ b/include/constants/union_room.h @@ -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 diff --git a/include/event_scripts.h b/include/event_scripts.h index 08b5b8c01..2fc045a37 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1178,12 +1178,12 @@ extern const u8 gText_DifferentGameFile[]; // script_menu extern const u8 EventScript_1A7AE0[]; -extern const u8 Text_1BC388[]; -extern const u8 Text_1BC3C7[]; -extern const u8 Text_1BCB42[]; -extern const u8 Text_1BCA95[]; -extern const u8 Text_1BCACB[]; -extern const u8 Text_1BCAF2[]; +extern const u8 CableClub_Text_TradeMonsUsingLinkCable[]; +extern const u8 CableClub_Text_BattleUsingLinkCable[]; +extern const u8 CableClub_Text_CancelSelectedItem[]; +extern const u8 CableClub_Text_YouMayTradeHere[]; +extern const u8 CableClub_Text_YouMayBattleHere[]; +extern const u8 CableClub_Text_CanMakeBerryPowder[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_RepelWoreOff[]; diff --git a/include/pokemon.h b/include/pokemon.h index 7bc1239f1..aa75a27fd 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -104,10 +104,6 @@ #define MON_GIVEN_TO_PC 0x1 #define MON_CANT_GIVE 0x2 -#define PLAYER_HAS_TWO_USABLE_MONS 0x0 -#define PLAYER_HAS_ONE_MON 0x1 -#define PLAYER_HAS_ONE_USABLE_MON 0x2 - #define MON_MALE 0x00 #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h index b63a7b0ef..d0b8949e4 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util_80A0058.h @@ -4,7 +4,7 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3); bool8 ScriptGiveEgg(u16 species); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); -void sp000_heal_pokemon(void); +void HealPlayerParty(void); void ReducePlayerPartyToThree(void); #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H diff --git a/src/battle_records.c b/src/battle_records.c index 38889ca67..07ff665d9 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -450,7 +450,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId) void TryRecordLinkBattleOutcome(s32 battlerId) { - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNKNOWN_MAP_00_04) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNKNOWN_MAP_00_04)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM)) { UpdateBattleOutcomeOnTrainerCards(battlerId); AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); diff --git a/src/battle_setup.c b/src/battle_setup.c index 17da53083..dee0c492b 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -901,7 +901,7 @@ static void CB2_EndTrainerBattle(void) gSpecialVar_Result = 1; if (gUnknown_20386CC & 1) { - sp000_heal_pokemon(); + HealPlayerParty(); } else { diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 17ec57b20..ea4fa00b9 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -104,12 +104,12 @@ void sub_80696F0(void) UnfreezeObjectEvents(); } -void sub_8069740(void) +void Script_FacePlayer(void) { ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } -void sub_8069768(void) +void Script_ClearHeldMovement(void) { ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index e2da82de2..dbc5f23b5 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -677,7 +677,7 @@ static void sub_807E678(u8 taskId) } } -void sub_807E704(void) +void ReturnFromLinkRoom(void) { CreateTask(sub_807E678, 10); } diff --git a/src/field_specials.c b/src/field_specials.c index 55f3bcce5..6f42ba764 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1985,7 +1985,7 @@ const u16 sPokeCenter1FMaps[] = { MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, - MAP_UNKNOWN_MAP_00_04, + MAP_UNION_ROOM, MAP_UNDEFINED }; diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 6d4652f35..1e61b9b77 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -14,7 +14,7 @@ bool8 Special_HallOfFame(void) bool8 *r7; int i; bool8 gaveAtLeastOneRibbon; - sp000_heal_pokemon(); + HealPlayerParty(); if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE) { gHasHallOfFameRecords = TRUE; diff --git a/src/save_location.c b/src/save_location.c index 9b679c7ee..561fd2ff2 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -36,8 +36,10 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_FIVE_ISLAND_POKEMON_CENTER_2F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_2F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_2F, - MAP_UNKNOWN_MAP_00_00, MAP_UNKNOWN_MAP_00_01, - MAP_UNKNOWN_MAP_00_03, MAP_UNKNOWN_MAP_00_04, + MAP_BATTLE_COLOSSEUM_2P, + MAP_TRADE_CENTER, + MAP_BATTLE_COLOSSEUM_4P, + MAP_UNION_ROOM, 0xFFFF, }; diff --git a/src/script_menu.c b/src/script_menu.c index 827f79fa6..2a81a7bce 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -598,22 +598,22 @@ const u8 *const gStdStringPtrs[] = { }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { - Text_1BC388, - Text_1BC3C7, - Text_1BCB42 + CableClub_Text_TradeMonsUsingLinkCable, + CableClub_Text_BattleUsingLinkCable, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCAF2, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CanMakeBerryPowder, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CancelSelectedItem }; static const union AnimCmd sMuseumFossilAnim0[] = { |