summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/cable_club.s56
-rw-r--r--asm/dodrio_berry_picking.s12
-rw-r--r--asm/field_control_avatar.s8
-rw-r--r--asm/link_rfu_3.s32
-rw-r--r--asm/macros/event.inc7
-rw-r--r--asm/overworld.s74
-rw-r--r--asm/pokemon_jump_2.s12
-rw-r--r--asm/script_pokemon_util_80A0058.s18
8 files changed, 113 insertions, 106 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 11:29:33 +0000