summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_frontier_2.s48
-rw-r--r--asm/battle_tower.s6
-rw-r--r--asm/contest.s4
-rw-r--r--asm/contest_link_80F57C4.s4
-rw-r--r--asm/macros/battle_script.inc6
-rw-r--r--asm/party_menu.s10
-rw-r--r--asm/pokemon_summary_screen.s8
-rw-r--r--asm/pokenav.s2
-rw-r--r--asm/rom_8011DC0.s18
-rw-r--r--asm/script_pokemon_util_80F87D8.s4
-rw-r--r--asm/shop.s2
-rw-r--r--asm/slot_machine.s2
-rw-r--r--asm/trade.s6
13 files changed, 60 insertions, 60 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index a58a3d2d2..5fda6ab45 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -19871,8 +19871,8 @@ _081A4C84:
.pool
thumb_func_end sub_81A4C30
- thumb_func_start sub_81A4CB0
-sub_81A4CB0: @ 81A4CB0
+ thumb_func_start GetFrontierBrainTrainerPicIndex
+GetFrontierBrainTrainerPicIndex: @ 81A4CB0
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19881,7 +19881,7 @@ sub_81A4CB0: @ 81A4CB0
ands r0, r1
cmp r0, 0
beq _081A4CD0
- bl sub_8185EA0
+ bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4CDA
@@ -19893,7 +19893,7 @@ _081A4CD0:
lsrs r0, 16
_081A4CDA:
ldr r2, =gTrainers
- ldr r1, =gUnknown_08611D30
+ ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19905,10 +19905,10 @@ _081A4CDA:
pop {r1}
bx r1
.pool
- thumb_func_end sub_81A4CB0
+ thumb_func_end GetFrontierBrainTrainerPicIndex
- thumb_func_start sub_81A4D00
-sub_81A4D00: @ 81A4D00
+ thumb_func_start GetFrontierBrainTrainerClass
+GetFrontierBrainTrainerClass: @ 81A4D00
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19917,7 +19917,7 @@ sub_81A4D00: @ 81A4D00
ands r0, r1
cmp r0, 0
beq _081A4D20
- bl sub_8185EA0
+ bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D2A
@@ -19929,7 +19929,7 @@ _081A4D20:
lsrs r0, 16
_081A4D2A:
ldr r2, =gTrainers
- ldr r1, =gUnknown_08611D30
+ ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19941,10 +19941,10 @@ _081A4D2A:
pop {r1}
bx r1
.pool
- thumb_func_end sub_81A4D00
+ thumb_func_end GetFrontierBrainTrainerClass
- thumb_func_start sub_81A4D50
-sub_81A4D50: @ 81A4D50
+ thumb_func_start CopyFrontierBrainTrainerName
+CopyFrontierBrainTrainerName: @ 81A4D50
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleTypeFlags
@@ -19954,7 +19954,7 @@ sub_81A4D50: @ 81A4D50
ands r0, r1
cmp r0, 0
beq _081A4D70
- bl sub_8185EA0
+ bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D7A
@@ -19968,7 +19968,7 @@ _081A4D7A:
movs r3, 0
lsls r0, 1
ldr r2, =gTrainers
- ldr r1, =gUnknown_08611D30
+ ldr r1, =gFacilityToBrainTrainerId
adds r0, r1
ldrh r1, [r0]
lsls r0, r1, 2
@@ -19991,7 +19991,7 @@ _081A4D90:
pop {r0}
bx r0
.pool
- thumb_func_end sub_81A4D50
+ thumb_func_end CopyFrontierBrainTrainerName
thumb_func_start sub_81A4DB8
sub_81A4DB8: @ 81A4DB8
@@ -20483,7 +20483,7 @@ sub_81A51A8: @ 81A51A8
ands r0, r1
cmp r0, 0
beq _081A51D4
- bl sub_8185EA0
+ bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r4, r0, 24
bl sub_8185EAC
@@ -20646,29 +20646,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_Vs
movs r1, 0x10
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_Mind
movs r1, 0x12
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_Skill
movs r1, 0x13
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_Body
movs r1, 0x14
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
b _081A553E
.pool
_081A53B4:
@@ -20752,7 +20752,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
- bl BattleHandleAddTextPrinter
+ bl BattlePutTextOnWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 788061f2b..1e07bdb9c 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -1353,7 +1353,7 @@ _08162AD0:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162AE4
- bl sub_81A4CB0
+ bl GetFrontierBrainTrainerPicIndex
lsls r0, 24
lsrs r0, 24
b _08162BCA
@@ -1479,7 +1479,7 @@ _08162C08:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162C1C
- bl sub_81A4D00
+ bl GetFrontierBrainTrainerClass
lsls r0, 24
lsrs r0, 24
b _08162D1E
@@ -1729,7 +1729,7 @@ _08162E54:
cmp r5, r0
bne _08162E68
adds r0, r6, 0
- bl sub_81A4D50
+ bl CopyFrontierBrainTrainerName
b _08162F62
.pool
_08162E68:
diff --git a/asm/contest.s b/asm/contest.s
index 327a80d75..453ecb04c 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -6770,8 +6770,8 @@ _080DB1CC:
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
- bl sub_806A068
- ldr r4, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r4, =gMultiuseSpriteTemplate
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s
index 450a235d5..ba1fa1c29 100644
--- a/asm/contest_link_80F57C4.s
+++ b/asm/contest_link_80F57C4.s
@@ -1420,8 +1420,8 @@ _080F64F2:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
movs r1, 0x88
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 083107c08..c03d78df7 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -511,7 +511,7 @@
.byte \bank
.endm
- .macro atk5F
+ .macro swapattackerwithtarget
.byte 0x5f
.endm
@@ -525,7 +525,7 @@
.byte \bank
.endm
- .macro atk62 bank
+ .macro hidepartystatussummary bank
.byte 0x62
.byte \bank
.endm
@@ -1163,7 +1163,7 @@
.4byte \param0
.endm
- .macro snatchsetbanks
+ .macro snatchsetbattlers
.byte 0xed
.endm
diff --git a/asm/party_menu.s b/asm/party_menu.s
index ff370a552..110c5e627 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C
bl sub_81B1B5C
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
- bl sub_805EAE8
+ bl HandleBattleLowHpMusicChange
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -16079,8 +16079,8 @@ _081B89A6:
bx r1
thumb_func_end sub_81B8984
- thumb_func_start sub_81B89AC
-sub_81B89AC: @ 81B89AC
+ thumb_func_start OpenPartyMenuInBattle
+OpenPartyMenuInBattle: @ 81B89AC
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -16107,7 +16107,7 @@ sub_81B89AC: @ 81B89AC
pop {r0}
bx r0
.pool
- thumb_func_end sub_81B89AC
+ thumb_func_end OpenPartyMenuInBattle
thumb_func_start sub_81B89F0
sub_81B89F0: @ 81B89F0
@@ -16288,7 +16288,7 @@ _081B8B94:
ldrb r0, [r0, 0xB]
cmp r0, 0x4
bne _081B8BA8
- bl sub_806E994
+ bl SetMonPreventsSwitchingString
b _081B8C46
.pool
_081B8BA8:
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 12ed6341d..988aaf41e 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -1092,7 +1092,7 @@ _081C4750:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl sub_806A068
+ bl SetMultiuseSpriteTemplateToPokemon
_081C4768:
ldrh r0, [r6]
adds r0, 0x1
@@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE
adds r0, r1, 0
adds r0, 0xC
- bl ShouldPlayNormalPokeCry
+ bl ShouldPlayNormalMonCry
cmp r0, 0x1
bne _081C47A4
ldrh r0, [r4, 0x2]
@@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4
ldr r0, =gUnknown_0203CF1C
ldr r6, [r0]
adds r6, 0x70
- ldr r0, =gUnknown_0202499C
+ ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x28
movs r2, 0x40
movs r3, 0x5
@@ -5297,7 +5297,7 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
- bl copy_textbox_border_tile_patterns_to_vram
+ bl LoadMessageBoxGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 23f5d8d2a..1ad4354a2 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C
lsrs r0, 24
movs r1, 0x42
movs r2, 0x40
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index cec26643d..dc4412f59 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -10976,7 +10976,7 @@ _08018574:
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -15911,7 +15911,7 @@ _0801AD8C:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
bl sub_819789C
ldr r0, =sub_801AC40
bl SetVBlankCallback
@@ -27085,7 +27085,7 @@ sub_8020740: @ 8020740
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
ldr r0, =gUnknown_0860F074
movs r1, 0xE0
movs r2, 0x20
@@ -30171,7 +30171,7 @@ _0802210C:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
@@ -30370,7 +30370,7 @@ _08022296:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
ldrb r0, [r6, 0x2]
movs r1, 0
adds r2, r4, 0
@@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0
ldr r5, =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
ldrb r4, [r4]
bl sub_80247BC
adds r3, r0, 0
@@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
pop {r0}
bx r0
thumb_func_end sub_802902C
@@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index 18a0cec88..1d4173c4c 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -737,8 +737,8 @@ _080F8DD8:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
mov r1, r9
diff --git a/asm/shop.s b/asm/shop.s
index a51b5d628..1412fef22 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1161,7 +1161,7 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
- bl copy_textbox_border_tile_patterns_to_vram
+ bl LoadMessageBoxGfx
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 6ff7e927f..4f76d1b69 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -634,7 +634,7 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xF0
- bl copy_textbox_border_tile_patterns_to_vram
+ bl LoadMessageBoxGfx
movs r1, 0x85
lsls r1, 2
movs r0, 0
diff --git a/asm/trade.s b/asm/trade.s
index c39aa8a17..911b56aec 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -241,7 +241,7 @@ _08077310:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
- bl box_border_load_tiles_and_pal
+ bl LoadUserWindowBorderGfx_
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
@@ -7174,8 +7174,8 @@ _0807ADE0:
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 18:57:24 +0000