dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync Cable Club scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-10 16:55:58 -05:00
parent a537577671
commit 0bb7f18b8e
120 changed files with 1142 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+28 -28
View File
@@ -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
asm/dodrio_berry_picking.s
+6 -6
View File
@@ -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
asm/field_control_avatar.s
+4 -4
View File
@@ -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
asm/link_rfu_3.s
+16 -16
View File
@@ -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
asm/macros/event.inc
+7
View File
@@ -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
asm/overworld.s
+37 -37
View File
@@ -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
asm/pokemon_jump_2.s
+6 -6
View File
@@ -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
asm/script_pokemon_util_80A0058.s
+9 -9
View File
@@ -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
data/event_scripts.s
+14 -69
View File
@@ -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
Common_EventScript_UnionRoomAttendant:: @ 81A8CF6
call CableClub_EventScript_UnionRoomAttendant
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
Common_EventScript_WirelessClubAttendant:: @ 81A8CFC
call CableClub_EventScript_WirelessClubAttendant
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_DirectCornerAttendant:: @ 81A8D02
call CableClub_EventScript_DirectCornerAttendant
end
VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
data/layouts/UnknownMap_00_00/border.bin → data/layouts/BattleColosseum2P/border.bin
View File
data/layouts/UnknownMap_00_00/map.bin → data/layouts/BattleColosseum2P/map.bin
View File
data/layouts/UnknownMap_00_01/border.bin → data/layouts/BattleColosseum4P/border.bin
View File
data/layouts/UnknownMap_00_03/map.bin → data/layouts/BattleColosseum4P/map.bin
View File
data/layouts/UnknownMap_00_02/border.bin → data/layouts/RecordCenter/border.bin
View File
data/layouts/UnknownMap_00_02/map.bin → data/layouts/RecordCenter/map.bin
View File
data/layouts/UnknownMap_00_03/border.bin → data/layouts/TradeCenter/border.bin
View File
data/layouts/UnknownMap_00_01/map.bin → data/layouts/TradeCenter/map.bin
View File
data/layouts/UnknownMap_00_04/border.bin → data/layouts/UnionRoom/border.bin
View File
data/layouts/UnknownMap_00_04/map.bin → data/layouts/UnionRoom/map.bin
View File
data/layouts/layouts.json
+20 -20
View File
@@ -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",
data/maps/UnknownMap_00_00/map.json → data/maps/BattleColosseum2P/map.json
+6 -6
View File
@@ -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": []
data/maps/BattleColosseum2P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum2P_MapScripts:: @ 8160478
.byte 0
data/maps/UnknownMap_00_03/map.json → data/maps/BattleColosseum4P/map.json
+7 -7
View File
@@ -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": []
data/maps/BattleColosseum4P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum4P_MapScripts:: @ 816047B
.byte 0
data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeladonCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/CeladonCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/FiveIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/FiveIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/FourIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/FourIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/LavenderTown_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+1 -1
View File
@@ -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
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/OneIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/OneIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -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
data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/PewterCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/PewterCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/PokemonTower_5F/scripts.inc
+1 -1
View File
@@ -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
data/maps/UnknownMap_00_02/map.json → data/maps/RecordCenter/map.json
+8 -8
View File
@@ -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": []
data/maps/RecordCenter/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
RecordCenter_MapScripts:: @ 816047A
.byte 0
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route10_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/Route10_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/Route4_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route4_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/Route4_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SaffronCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/SaffronCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11
EventScript_170A1E:: @ 8170A1E
msgbox gUnknown_81A06AB
fadescreen FADE_TO_BLACK
special sub_80A0334
special ChooseHalfPartyForBattle
waitstate
return
data/maps/SevenIsland_House_Room2/scripts.inc
+1 -1
View File
@@ -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
data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SevenIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/SevenIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -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
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SixIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/SixIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/ThreeIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/UnknownMap_00_01/map.json → data/maps/TradeCenter/map.json
+6 -6
View File
@@ -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": []
data/maps/TradeCenter/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
TradeCenter_MapScripts:: @ 8160479
.byte 0
data/maps/TwoIsland_JoyfulGameCorner/map.json
+2 -2
View File
@@ -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"
}
]
}
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+2 -2
View File
@@ -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
data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/TwoIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/TwoIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/UnknownMap_00_04/map.json → data/maps/UnionRoom/map.json
+12 -12
View File
@@ -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"
}
],
data/maps/UnknownMap_00_04/scripts.inc → data/maps/UnionRoom/scripts.inc
+15 -15
View File
@@ -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
data/maps/UnknownMap_00_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_00_MapScripts:: @ 8160478
.byte 0
data/maps/UnknownMap_00_01/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_01_MapScripts:: @ 8160479
.byte 0
data/maps/UnknownMap_00_02/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_02_MapScripts:: @ 816047A
.byte 0
data/maps/UnknownMap_00_03/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_03_MapScripts:: @ 816047B
.byte 0
data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/VermilionCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/VermilionCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/ViridianCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -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
}
],
data/maps/ViridianCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -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
data/maps/map_groups.json
+5 -5
View File
@@ -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",

Some files were not shown because too many files have changed in this diff Show More