summaryrefslogtreecommitdiff
path: root/asm/rom5.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom5.s')
-rw-r--r--asm/rom5.s4272
1 files changed, 2136 insertions, 2136 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index b641e83fe..3792b1948 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -273,7 +273,7 @@ _0807AF88:
ldr r5, _0807B004
adds r0, r5
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -294,7 +294,7 @@ _0807AF88:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -550,7 +550,7 @@ _0807B1DA:
mov r9, r1
add r0, r9
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0807B1FE
b _0807B4D8
@@ -561,7 +561,7 @@ _0807B1FE:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -571,7 +571,7 @@ _0807B1FE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _0807B2C4
adds r0, r7, 0
movs r1, 0x2
@@ -624,7 +624,7 @@ _0807B1FE:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -666,7 +666,7 @@ _0807B2D8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r6, _0807B330
ldr r1, _0807B334
ldrb r0, [r5, 0x8]
@@ -707,7 +707,7 @@ _0807B338:
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r5, _0807B3BC
ldr r0, _0807B3C0
ldrb r0, [r0, 0x8]
@@ -776,7 +776,7 @@ _0807B3D0:
mov r9, r1
add r0, r9
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0807B4D8
ldrh r0, [r6]
@@ -785,7 +785,7 @@ _0807B3D0:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -795,7 +795,7 @@ _0807B3D0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _0807B4F0
adds r0, r7, 0
movs r1, 0x2
@@ -848,7 +848,7 @@ _0807B3D0:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -1054,7 +1054,7 @@ _0807B628:
ldr r1, _0807B65C
adds r0, r1
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0807B68A
adds r0, r6, 0
@@ -1079,7 +1079,7 @@ _0807B660:
ldr r1, _0807B698
adds r0, r1
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0807B68A
adds r0, r6, 0
@@ -13667,7 +13667,7 @@ _08081790:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldrb r0, [r7, 0x2]
bl sub_808161C
movs r1, 0x4
@@ -13760,7 +13760,7 @@ _08081852:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0808189C
bl LoadFontDefaultPalette
ldr r1, _080818A0
@@ -14097,7 +14097,7 @@ sub_8081AFC: @ 8081AFC
movs r1, 0xC4
lsls r1, 1
movs r2, 0x5
- bl sub_803AC44
+ bl CreateMaleMon
bl script_env_2_enable
ldr r1, _08081B30
ldr r0, _08081B34
@@ -14584,7 +14584,7 @@ _08081EFE:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -14594,12 +14594,12 @@ _08081EFE:
beq _08081F42
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08081F42
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
adds r0, r7, r0
lsls r0, 24
lsrs r7, r0, 24
@@ -14755,7 +14755,7 @@ sub_8082034: @ 8082034
lsrs r5, r0, 24
ldr r0, _08082064
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -14888,7 +14888,7 @@ sub_8082138: @ 8082138
push {r4,lr}
ldr r0, _0808215C
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -16350,7 +16350,7 @@ _08082BFA:
pop {r0}
bx r0
.align 2, 0
-_08082C00: .4byte gUnknown_0839AE70
+_08082C00: .4byte gTrainerEyeTrainers
_08082C04: .4byte 0x02025734
_08082C08: .4byte 0x00000978
thumb_func_end sub_8082BD0
@@ -16370,7 +16370,7 @@ sub_8082C0C: @ 8082C0C
pop {r1}
bx r1
.align 2, 0
-_08082C28: .4byte gUnknown_0839AE70
+_08082C28: .4byte gTrainerEyeTrainers
thumb_func_end sub_8082C0C
thumb_func_start unref_sub_8082C2C
@@ -16388,7 +16388,7 @@ unref_sub_8082C2C: @ 8082C2C
pop {r1}
bx r1
.align 2, 0
-_08082C48: .4byte gUnknown_0839AE70
+_08082C48: .4byte gTrainerEyeTrainers
thumb_func_end unref_sub_8082C2C
thumb_func_start sub_8082C4C
@@ -16404,7 +16404,7 @@ sub_8082C4C: @ 8082C4C
pop {r1}
bx r1
.align 2, 0
-_08082C64: .4byte gUnknown_0839AE70
+_08082C64: .4byte gTrainerEyeTrainers
thumb_func_end sub_8082C4C
thumb_func_start sub_8082C68
@@ -16425,7 +16425,7 @@ sub_8082C68: @ 8082C68
lsrs r0, 24
b _08082C96
.align 2, 0
-_08082C8C: .4byte gUnknown_0839AE70
+_08082C8C: .4byte gTrainerEyeTrainers
_08082C90: .4byte 0x0202ff5e
_08082C94:
movs r0, 0x1
@@ -16447,7 +16447,7 @@ sub_8082C9C: @ 8082C9C
pop {r1}
bx r1
.align 2, 0
-_08082CB0: .4byte gUnknown_0839AE70
+_08082CB0: .4byte gTrainerEyeTrainers
_08082CB4: .4byte 0x0202ff5e
thumb_func_end sub_8082C9C
@@ -16462,7 +16462,7 @@ sub_8082CB8: @ 8082CB8
pop {r0}
bx r0
.align 2, 0
-_08082CCC: .4byte gUnknown_0839AE70
+_08082CCC: .4byte gTrainerEyeTrainers
_08082CD0: .4byte 0x0202ff5e
thumb_func_end sub_8082CB8
@@ -16513,12 +16513,12 @@ sub_8082D18: @ 8082D18
movs r1, 0xA
movs r2, 0x1C
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08082D48
movs r1, 0x13
movs r2, 0xB
movs r3, 0x48
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -16533,7 +16533,7 @@ sub_8082D4C: @ 8082D4C
movs r1, 0xA
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_8082D4C
@@ -18194,7 +18194,7 @@ _08083A62:
_08083A68:
bl sub_8055588
bl textbox_close
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -18434,7 +18434,7 @@ _08083C34: .4byte 0x0202e8d0
_08083C38: .4byte 0x020231cc
_08083C3C: .4byte 0x03002978
_08083C40: .4byte 0x020232cc
-_08083C44: .4byte gUnknown_0839B21C
+_08083C44: .4byte gTrainerCardColorNames
_08083C48:
movs r0, 0
_08083C4A:
@@ -18598,7 +18598,7 @@ sub_8083D70: @ 8083D70
sub sp, 0x34
ldr r0, _08083DE4
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -18625,16 +18625,16 @@ sub_8083D70: @ 8083D70
ldr r1, _08083DF0
mov r0, sp
bl StringAppend
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0xE
movs r2, 0x1E
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08083DF4
ldr r0, _08083DF8
str r0, [r1]
@@ -18747,7 +18747,7 @@ _08083E98:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08083EBC
mov r0, sp
@@ -18755,7 +18755,7 @@ _08083E98:
adds r0, r4, 0
movs r1, 0x20
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
_08083EBC:
adds r0, r5, 0x1
lsls r0, 24
@@ -18785,7 +18785,7 @@ sub_8083EEC: @ 8083EEC
ldr r0, _08083F04
ldr r2, _08083F08
movs r1, 0x2
- bl pokemon_setattr
+ bl SetMonData
bl sub_8071C20
movs r0, 0x1
pop {r1}
@@ -18851,17 +18851,17 @@ _08083F66:
unref_sub_8083F6C: @ 8083F6C
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0xA
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08083FB0
movs r0, 0x1
movs r1, 0x1
movs r2, 0x9
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0x9
@@ -20915,7 +20915,7 @@ sub_8084E78: @ 8084E78
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
- bl zero_enemy_party_data
+ bl ZeroEnemyPartyMons
bl sub_8084DC4
lsls r0, 24
lsrs r0, 24
@@ -20925,7 +20925,7 @@ sub_8084E78: @ 8084E78
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x20
- bl pokemon_make_with_nature
+ bl CreateMonWithNature
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -21059,7 +21059,7 @@ _08084F90:
lsls r2, r5, 24
lsrs r2, 24
ldr r0, _08084FC0
- bl sub_803B6A4
+ bl SetMonMoveSlot
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -21184,7 +21184,7 @@ _0808507E:
ldr r4, _080850DC
adds r0, r4, 0
movs r1, 0x6
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080850BA
adds r0, r4, 0
@@ -21846,17 +21846,17 @@ _080855AC:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080855EC
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080855EC
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -21922,7 +21922,7 @@ ApplyCleanseTagWildEncounterRateReduction: @ 8085640
adds r4, r0, 0
ldr r0, _08085664
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xBE
bne _0808565C
ldr r0, [r4]
@@ -22601,7 +22601,7 @@ sub_8085AD4: @ 8085AD4
bl LoadCompressedObjectPalette
adds r0, r4, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r4, _08085B84
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2]
@@ -22690,7 +22690,7 @@ sub_8085B88: @ 8085B88
bl LoadCompressedObjectPalette
adds r0, r5, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _08085C40
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2]
@@ -27485,15 +27485,15 @@ sub_80880C4: @ 80880C4
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
str r0, [r5]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
str r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [r5, 0x8]
ldr r0, [r5]
orrs r0, r6
@@ -27630,9 +27630,9 @@ sub_80881C0: @ 80881C0
bx r0
.align 2, 0
_08088218: .4byte REG_BG0CNT
-_0808821C: .4byte gUnknown_0839E914
+_0808821C: .4byte gFieldMoveStreaksTiles
_08088220: .4byte 0x05000200
-_08088224: .4byte gUnknown_0839EB14
+_08088224: .4byte gFieldMoveStreaksPalette
thumb_func_end sub_80881C0
thumb_func_start sub_8088228
@@ -27840,7 +27840,7 @@ sub_8088380: @ 8088380
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0x26
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -27943,7 +27943,7 @@ _08088452:
bx r0
.align 2, 0
_08088470: .4byte 0x06000140
-_08088474: .4byte gUnknown_0839EB34
+_08088474: .4byte gFieldMoveStreaksTilemap
_08088478: .4byte 0x0000013f
thumb_func_end sub_808843C
@@ -28048,9 +28048,9 @@ sub_80884E8: @ 80884E8
bx r0
.align 2, 0
_08088544: .4byte REG_BG0CNT
-_08088548: .4byte gUnknown_0839EDB4
+_08088548: .4byte gDarknessFieldMoveStreaksTiles
_0808854C: .4byte 0x05000200
-_08088550: .4byte gUnknown_0839EE34
+_08088550: .4byte gDarknessFieldMoveStreaksPalette
thumb_func_end sub_80884E8
thumb_func_start sub_8088554
@@ -28196,7 +28196,7 @@ sub_808862C: @ 808862C
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0x26
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -28366,7 +28366,7 @@ _080887A8:
bx r1
.align 2, 0
_080887B8: .4byte 0x06000140
-_080887BC: .4byte gUnknown_0839EE54
+_080887BC: .4byte gDarknessFieldMoveStreaksTilemap
thumb_func_end sub_8088708
thumb_func_start sub_80887C0
@@ -30817,7 +30817,7 @@ sub_8089A8C: @ 8089A8C
ldr r1, _08089AD8
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08089AE0
ldr r4, _08089ADC
@@ -30860,7 +30860,7 @@ _08089AF4:
adds r0, r1
adds r1, r6, 0
adds r1, 0xD
- bl PokemonGetField
+ bl GetMonData
lsls r1, r4, 1
adds r1, r5
ldrh r1, [r1]
@@ -30903,7 +30903,7 @@ _08089B48:
ldr r6, _08089BAC
adds r0, r6, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08089B76
adds r0, r4, 0
@@ -30919,7 +30919,7 @@ _08089B76:
subs r1, 0x64
adds r0, r1
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
@@ -30995,7 +30995,7 @@ sub_8089BDC: @ 8089BDC
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r5, 0x1
lsls r5, 24
lsrs r5, 24
@@ -31007,7 +31007,7 @@ sub_8089BDC: @ 8089BDC
adds r1, r6, 0
mov r2, r8
ldr r3, [sp, 0x1C]
- bl sub_80728E4
+ bl PrintMenuItemsReordered
add sp, 0x4
pop {r3}
mov r8, r3
@@ -31483,7 +31483,7 @@ sub_808A004: @ 808A004
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -31636,7 +31636,7 @@ sub_808A140: @ 808A140
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0808A178
lsls r0, r4, 2
adds r0, r4
@@ -31673,7 +31673,7 @@ sub_808A180: @ 808A180
ldr r1, _0808A1D4
adds r0, r1
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -31776,7 +31776,7 @@ _0808A278:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -31837,7 +31837,7 @@ sub_808A2DC: @ 808A2DC
ldr r1, _0808A324
adds r0, r1
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -32000,7 +32000,7 @@ sub_808A3F8: @ 808A3F8
ldr r1, _0808A470
adds r0, r1
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
cmp r0, 0
bne _0808A478
@@ -32120,7 +32120,7 @@ _0808A542:
ldr r4, _0808A594
adds r0, r4
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -32134,7 +32134,7 @@ _0808A542:
adds r0, r4
movs r1, 0xC
adds r2, r7, 0
- bl pokemon_setattr
+ bl SetMonData
ldr r2, _0808A598
movs r0, 0
movs r1, 0xFF
@@ -32281,7 +32281,7 @@ sub_808A688: @ 808A688
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r1, _0808A6B4
adds r0, r4, 0
@@ -32304,7 +32304,7 @@ sub_808A6B8: @ 808A6B8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r1, _0808A6E4
adds r0, r4, 0
@@ -32330,7 +32330,7 @@ sub_808A6E8: @ 808A6E8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0808A72C
ldr r2, _0808A730
movs r0, 0
@@ -32505,7 +32505,7 @@ sub_808A848: @ 808A848
ldr r1, _0808A89C
adds r0, r1
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -32565,7 +32565,7 @@ sub_808A8D4: @ 808A8D4
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -32614,7 +32614,7 @@ sub_808A938: @ 808A938
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r0, _0808A978
ldrb r0, [r0]
@@ -32663,7 +32663,7 @@ sub_808A984: @ 808A984
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r4, 0x16]
subs r0, 0xB
lsls r0, 16
@@ -32695,7 +32695,7 @@ _0808A9DC:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r0, _0808AA24
movs r1, 0x1
@@ -32760,7 +32760,7 @@ _0808AA90:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r1, 0x16
ldrsh r0, [r4, r1]
cmp r0, 0x4
@@ -32827,7 +32827,7 @@ _0808AB12:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_808A918
_0808AB24:
@@ -32915,7 +32915,7 @@ sub_808ABA8: @ 808ABA8
ldr r1, _0808ABE8
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldr r1, _0808ABEC
str r0, [r1]
ldr r0, _0808ABF0
@@ -32954,7 +32954,7 @@ _0808AC0E:
movs r1, 0x11
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_808A918
_0808AC20:
@@ -33149,7 +33149,7 @@ unref_sub_808AD88: @ 808AD88
ldr r1, _0808ADA8
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -33289,14 +33289,14 @@ _0808AE9A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0808AF10
adds r0, r5, 0
bl sub_806D668
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0808AECE
adds r0, r4, 0
@@ -33357,12 +33357,12 @@ _0808AF24:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0808AF66
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0808AF58
ldr r0, _0808AF7C
@@ -33437,7 +33437,7 @@ _0808AFC6:
ldr r1, _0808B004
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0808AFE6
_0808AFE2:
@@ -33583,7 +33583,7 @@ _0808B0F0:
ldr r1, _0808B11C
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0808B120
movs r0, 0x20
@@ -33879,7 +33879,7 @@ sub_808B338: @ 808B338
ldr r1, _0808B394
adds r0, r1
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -33973,7 +33973,7 @@ _0808B416:
ldr r4, _0808B474
adds r0, r4
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -33987,7 +33987,7 @@ _0808B416:
adds r0, r4
movs r1, 0xC
adds r2, r7, 0
- bl pokemon_setattr
+ bl SetMonData
ldr r0, _0808B478
movs r1, 0x5
bl CreateTask
@@ -34384,12 +34384,12 @@ _0808B77C: .4byte 0x03001770
_0808B780: .4byte 0x0000043c
_0808B784:
ldr r0, _0808B78C
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _0808B95C
.align 2, 0
_0808B78C: .4byte gWindowConfig_81E71B4
_0808B790:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _0808B79A
b _0808B9B2
@@ -34526,44 +34526,44 @@ _0808B874:
movs r1, 0
movs r2, 0x1B
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0x4
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0808B978
movs r1, 0x4
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, _0808B97C
movs r1, 0x4
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _0808B980
movs r1, 0x4
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _0808B984
movs r1, 0x4
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldr r0, _0808B988
movs r1, 0x4
movs r2, 0xB
- bl Print
+ bl MenuPrint
ldr r0, _0808B98C
movs r1, 0x4
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0808B990
movs r1, 0x4
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0808B994
movs r1, 0x4
movs r2, 0x11
- bl Print
+ bl MenuPrint
ldrb r0, [r4, 0xA]
bl sub_808BCF8
ldrb r0, [r4, 0xC]
@@ -35285,7 +35285,7 @@ _0808BE98:
movs r4, 0
_0808BE9A:
adds r0, r4, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
_0808BEA0:
ldr r0, _0808BEB8
ldrh r1, [r0, 0x2E]
@@ -35305,7 +35305,7 @@ _0808BEBC:
movs r4, 0x13
_0808BEBE:
adds r0, r4, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
_0808BEC4:
adds r0, r4, 0
pop {r4}
@@ -35400,11 +35400,11 @@ _0808BF64:
mov r0, r8
movs r1, 0xF
movs r2, 0xF
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x12
movs r2, 0xF
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3}
mov r8, r3
@@ -35897,7 +35897,7 @@ _0808C344:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -37871,7 +37871,7 @@ _0808D400: .4byte 0x0202ffb4
_0808D404: .4byte 0x0000064a
_0808D408: .4byte REG_BG2VOFS
_0808D40C: .4byte 0x0000062d
-_0808D410: .4byte gUnknown_08E86758
+_0808D410: .4byte gPokedexMenu_Gfx
_0808D414: .4byte gUnknown_08E96738
_0808D418: .4byte 0x06006800
_0808D41C: .4byte gUnknown_08E9C6DC
@@ -37952,7 +37952,7 @@ _0808D4D8:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _0808D4FC
ldr r1, _0808D500
bl LZ77UnCompVram
@@ -38125,7 +38125,7 @@ sub_808D640: @ 808D640
.align 2, 0
_0808D658: .4byte 0x0202ffb4
_0808D65C: .4byte 0x0000064c
-_0808D660: .4byte gUnknown_0839F67E
+_0808D660: .4byte gUnknown_0839F67C + 0x2
_0808D664:
bl sub_806912C
cmp r0, 0
@@ -38137,7 +38137,7 @@ _0808D66E:
bl LoadPalette
b _0808D686
.align 2, 0
-_0808D678: .4byte gUnknown_08E87AF6
+_0808D678: .4byte gPokedexMenu_Pal + 0x2
_0808D67C:
ldr r0, _0808D68C
movs r1, 0x1
@@ -38147,7 +38147,7 @@ _0808D686:
pop {r0}
bx r0
.align 2, 0
-_0808D68C: .4byte gUnknown_0839F73E
+_0808D68C: .4byte gUnknown_0839F73C + 0x2
thumb_func_end sub_808D640
thumb_func_start sub_808D690
@@ -38487,7 +38487,7 @@ _0808D914:
.align 2, 0
_0808D928: .4byte 0x0202ffb4
_0808D92C: .4byte 0x0000060c
-_0808D930: .4byte gUnknown_0839FAC4
+_0808D930: .4byte gPokedexOrder_Alphabetical
_0808D934:
ldr r4, _0808D9B0
lsls r0, r4, 16
@@ -38554,7 +38554,7 @@ _0808D99E:
_0808D9B0: .4byte 0x00000181
_0808D9B4: .4byte 0x0202ffb4
_0808D9B8: .4byte 0x0000060c
-_0808D9BC: .4byte gUnknown_0839FDFA
+_0808D9BC: .4byte gPokedexOrder_Weight
_0808D9C0: .4byte 0xffff0000
_0808D9C4:
movs r4, 0
@@ -38628,7 +38628,7 @@ _0808DA3A:
_0808DA4C: .4byte 0x0202ffb4
_0808DA50: .4byte 0x0000060c
_0808DA54: .4byte 0x00000181
-_0808DA58: .4byte gUnknown_0839FDFA
+_0808DA58: .4byte gPokedexOrder_Weight
_0808DA5C:
ldr r4, _0808DAD8
lsls r0, r4, 16
@@ -38695,7 +38695,7 @@ _0808DAC6:
_0808DAD8: .4byte 0x00000181
_0808DADC: .4byte 0x0202ffb4
_0808DAE0: .4byte 0x0000060c
-_0808DAE4: .4byte gUnknown_083A00FE
+_0808DAE4: .4byte gPokedexOrder_Height
_0808DAE8: .4byte 0xffff0000
_0808DAEC:
movs r4, 0
@@ -38821,7 +38821,7 @@ _0808DBC4:
_0808DBD4: .4byte 0x0202ffb4
_0808DBD8: .4byte 0x0000060c
_0808DBDC: .4byte 0x00000181
-_0808DBE0: .4byte gUnknown_083A00FE
+_0808DBE0: .4byte gPokedexOrder_Height
_0808DBE4: .4byte 0x0000ffff
thumb_func_end sub_808D690
@@ -39261,7 +39261,7 @@ _0808DEEE:
lsrs r1, 24
mov r0, sp
mov r2, r9
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3-r5}
mov r8, r3
@@ -41844,7 +41844,7 @@ _0808F38C:
adds r1, r3
b _0808F682
.align 2, 0
-_0808F3B8: .4byte gUnknown_08E86758
+_0808F3B8: .4byte gPokedexMenu_Gfx
_0808F3BC: .4byte gUnknown_08E96BD4
_0808F3C0: .4byte 0x06007800
_0808F3C4: .4byte 0x0202ffbc
@@ -41870,7 +41870,7 @@ _0808F3F4:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r1, _0808F410
ldr r3, _0808F414
adds r1, r3
@@ -41918,15 +41918,15 @@ _0808F45A:
ldr r0, _0808F4FC
movs r1, 0xB
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _0808F500
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _0808F504
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldr r2, [r5]
ldrb r1, [r2, 0x2]
movs r0, 0x2
@@ -41972,7 +41972,7 @@ _0808F45A:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r1, 0xFF
lsls r1, 2
movs r0, 0xE
@@ -41988,7 +41988,7 @@ _0808F50C:
ldr r0, _0808F524
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0808F528
movs r1, 0x31
movs r2, 0x1E
@@ -42742,7 +42742,7 @@ _0808FB28:
adds r1, r3
b _0808FDA0
.align 2, 0
-_0808FB44: .4byte gUnknown_08E86758
+_0808FB44: .4byte gPokedexMenu_Gfx
_0808FB48: .4byte gUnknown_0839F8A0
_0808FB4C: .4byte 0x06007000
_0808FB50: .4byte 0x03001770
@@ -42779,7 +42779,7 @@ _0808FB9C:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
bl ResetPaletteFade
ldr r1, _0808FBBC
ldr r0, _0808FBC0
@@ -42793,7 +42793,7 @@ _0808FBC4:
ldr r0, _0808FBE8
movs r1, 0xA
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, _0808FBEC
ldr r0, [r0]
ldrh r0, [r0]
@@ -43422,7 +43422,7 @@ _08090120:
adds r1, r2
b _08090368
.align 2, 0
-_0809013C: .4byte gUnknown_08E86758
+_0809013C: .4byte gPokedexMenu_Gfx
_08090140: .4byte gUnknown_0839F988
_08090144: .4byte 0x06007000
_08090148: .4byte 0x03001770
@@ -43446,7 +43446,7 @@ _08090174:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
add r1, sp, 0x4
movs r0, 0xFF
strb r0, [r1]
@@ -43460,7 +43460,7 @@ _08090174:
movs r1, 0x3
movs r2, 0xF
movs r3, 0xC0
- bl Free
+ bl sub_8072BD8
ldr r1, _080901B8
ldr r2, _080901BC
adds r1, r2
@@ -44278,19 +44278,19 @@ _08090800:
strh r0, [r4, 0x8]
b _08090A26
.align 2, 0
-_08090840: .4byte gUnknown_08E86758
+_08090840: .4byte gPokedexMenu_Gfx
_08090844: .4byte 0x06004000
_08090848: .4byte gUnknown_08E96BD4
_0809084C: .4byte 0x06007800
_08090850: .4byte 0x0000027f
_08090854: .4byte 0x03004b20
-_08090858: .4byte gUnknown_08E87AF6
+_08090858: .4byte gPokedexMenu_Pal + 0x2
_0809085C:
ldr r4, _0809088C
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r2, _08090890
add r1, sp, 0x4
movs r0, 0
@@ -44318,7 +44318,7 @@ _080908A0:
movs r1, 0x2
movs r2, 0
movs r3, 0xD0
- bl Free
+ bl sub_8072BD8
bl sub_806912C
cmp r0, 0
bne _080908CC
@@ -44345,15 +44345,15 @@ _080908D6:
ldr r0, _0809094C
movs r1, 0xB
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _08090950
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _08090954
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
lsls r4, r6, 3
adds r4, r6
lsls r4, 2
@@ -44376,7 +44376,7 @@ _080908D6:
ldr r0, [r4]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r1, 0xFF
lsls r1, 2
movs r0, 0xE
@@ -44565,7 +44565,7 @@ _08090AA4:
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _08090B04
lsls r0, r4, 3
adds r0, r4
@@ -44575,7 +44575,7 @@ _08090AA4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r1, _08090B08
ldrh r0, [r1]
adds r0, 0x1
@@ -44637,7 +44637,7 @@ _08090B44:
b _08090B7A
.align 2, 0
_08090B68: .4byte 0x03004b20
-_08090B6C: .4byte gUnknown_08E87AF6
+_08090B6C: .4byte gPokedexMenu_Pal + 0x2
_08090B70:
ldr r0, _08090B88
movs r1, 0x51
@@ -44651,7 +44651,7 @@ _08090B7A:
pop {r0}
bx r0
.align 2, 0
-_08090B88: .4byte gUnknown_08E87B56
+_08090B88: .4byte gPokedexMenu2_Pal + 0x2
thumb_func_end sub_8090A3C
thumb_func_start sub_8090B8C
@@ -44787,7 +44787,7 @@ sub_8090C68: @ 8090C68
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08090CDC
ldr r0, [r4]
ldrh r1, [r0]
@@ -44799,7 +44799,7 @@ sub_8090C68: @ 8090C68
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, [r5]
ldr r1, _08090CD8
adds r0, r1
@@ -44827,7 +44827,7 @@ _08090CE4:
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08090D30
ldr r0, [r4]
ldrh r1, [r0]
@@ -44839,7 +44839,7 @@ _08090CE4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, [r5]
ldr r1, _08090D34
adds r0, r1
@@ -45466,7 +45466,7 @@ sub_8091154: @ 8091154
mov r0, sp
adds r1, r6, 0
mov r2, r8
- bl Print
+ bl MenuPrint
add sp, 0x4
pop {r3}
mov r8, r3
@@ -45550,7 +45550,7 @@ _0809124C:
mov r0, sp
adds r1, r6, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0
add sp, 0xC
pop {r4-r6}
@@ -45634,7 +45634,7 @@ _080912E6:
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0
add sp, 0x28
pop {r3}
@@ -45815,7 +45815,7 @@ _08091402:
mov r0, sp
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r4-r7}
pop {r0}
@@ -45943,7 +45943,7 @@ _080914F8:
mov r0, sp
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -46171,7 +46171,7 @@ _0809166A:
mov r0, sp
mov r1, r10
ldr r2, [sp, 0x10]
- bl Print
+ bl MenuPrint
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -47220,10 +47220,10 @@ _08091F10:
_08091F1C: .4byte 0x0202f388
_08091F20: .4byte 0x0202ffb4
_08091F24: .4byte 0x0000064a
-_08091F28: .4byte gUnknown_08E87DB0
+_08091F28: .4byte gPokedexMenuSearch_Gfx
_08091F2C: .4byte gUnknown_08E96D2C
_08091F30: .4byte 0x06007800
-_08091F34: .4byte gUnknown_08E882DA
+_08091F34: .4byte gPokedexMenuSearch_Pal + 0x2
_08091F38: .4byte 0x06007a80
_08091F3C: .4byte 0x06007b00
_08091F40: .4byte 0x06007ac0
@@ -47235,7 +47235,7 @@ _08091F50:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _08091FAC
bl LoadCompressedObjectPic
ldr r0, _08091FB0
@@ -48117,7 +48117,7 @@ sub_8092644: @ 8092644
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1
bl sub_8092C8C
b _080926E0
@@ -48137,7 +48137,7 @@ _080926B4:
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1
bl sub_8092C8C
ldrh r0, [r6, 0x24]
@@ -48996,7 +48996,7 @@ sub_8092D78: @ 8092D78
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r5, 0
ldrh r4, [r7]
b _08092DE8
@@ -49012,7 +49012,7 @@ _08092DC4:
lsls r2, 24
lsrs r2, 24
movs r1, 0x12
- bl Print
+ bl MenuPrint
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -49554,7 +49554,7 @@ _080931DC:
adds r0, 0x1
strb r0, [r1]
_080931EC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _08093232
b _0809320A
@@ -50322,7 +50322,7 @@ sub_80937BC: @ 80937BC
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
pop {r4}
pop {r0}
bx r0
@@ -50598,7 +50598,7 @@ sub_80939A4: @ 80939A4
movs r1, 0
bl CreateTask
ldr r0, _080939BC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r0}
bx r0
.align 2, 0
@@ -50653,7 +50653,7 @@ _08093A04:
mov r0, sp
movs r1, 0xA
movs r2, 0xC
- bl Print
+ bl MenuPrint
add sp, 0x20
pop {r0}
bx r0
@@ -51155,7 +51155,7 @@ _08093DC4:
thumb_func_start sub_8093DC8
sub_8093DC8: @ 8093DC8
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_80940E4
bl sub_8093F14
bl sub_8093F80
@@ -51169,7 +51169,7 @@ sub_8093DC8: @ 8093DC8
thumb_func_start sub_8093DEC
sub_8093DEC: @ 8093DEC
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_80940E4
bl sub_8093F48
bl sub_8094188
@@ -51246,7 +51246,7 @@ _08093E4E:
bx r0
.align 2, 0
_08093E84: .4byte gUnknown_083B5F6C
-_08093E88: .4byte gUnknown_08E8B4E0
+_08093E88: .4byte gMenuTrainerCard_Gfx
_08093E8C: .4byte 0x040000d4
_08093E90: .4byte 0x80000800
_08093E94: .4byte gBadgesTiles
@@ -51616,7 +51616,7 @@ _0809413C: .4byte 0x06004800
sub_8094140: @ 8094140
push {r4,r5,lr}
ldr r0, _0809417C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r4, _08094180
ldr r5, _08094184
adds r0, r4, 0
@@ -51628,7 +51628,7 @@ sub_8094140: @ 8094140
adds r0, r4, 0
movs r1, 0x7
movs r2, 0x5
- bl Print
+ bl MenuPrint
bl sub_80941D8
bl sub_8094200
bl sub_8094218
@@ -51646,7 +51646,7 @@ _08094184: .4byte 0x02000094
sub_8094188: @ 8094188
push {lr}
ldr r0, _080941D0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
bl sub_80942F8
bl sub_8094334
bl sub_80943C4
@@ -51655,7 +51655,7 @@ sub_8094188: @ 8094188
bl sub_80944E8
bl sub_8094538
ldr r0, _080941D4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
bl sub_8094354
bl sub_80943E4
bl sub_8094448
@@ -51683,7 +51683,7 @@ sub_80941D8: @ 80941D8
mov r0, sp
movs r1, 0x14
movs r2, 0x2
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r0}
bx r0
@@ -51729,7 +51729,7 @@ _08094230:
mov r0, sp
movs r1, 0x10
movs r2, 0xA
- bl PrintCoinsString
+ bl sub_8072B4C
_0809424A:
add sp, 0x10
pop {r0}
@@ -51796,7 +51796,7 @@ sub_809429C: @ 809429C
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xE
- bl Print
+ bl MenuPrint
adds r1, r6, 0
adds r1, 0x40
adds r0, r4, 0
@@ -51809,7 +51809,7 @@ sub_809429C: @ 809429C
adds r0, r4, 0
movs r1, 0x2
movs r2, 0x10
- bl Print
+ bl MenuPrint
_080942EA:
pop {r4-r6}
pop {r0}
@@ -51836,7 +51836,7 @@ sub_80942F8: @ 80942F8
adds r0, r4, 0
movs r1, 0x1C
movs r2, 0x2
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r4,r5}
pop {r0}
bx r0
@@ -51856,7 +51856,7 @@ sub_8094334: @ 8094334
ldr r0, _08094350
movs r1, 0x3
movs r2, 0x5
- bl Print
+ bl MenuPrint
_08094348:
pop {r0}
bx r0
@@ -51906,7 +51906,7 @@ sub_8094354: @ 8094354
ldr r0, _080943BC
movs r1, 0x1C
movs r2, 0x5
- bl PrintCoinsString
+ bl sub_8072B4C
_080943B0:
pop {r4,r5}
pop {r0}
@@ -51927,7 +51927,7 @@ sub_80943C4: @ 80943C4
ldr r0, _080943E0
movs r1, 0x3
movs r2, 0x7
- bl Print
+ bl MenuPrint
_080943D8:
pop {r0}
bx r0
@@ -51952,7 +51952,7 @@ sub_80943E4: @ 80943E4
mov r0, sp
movs r1, 0x16
movs r2, 0x7
- bl PrintCoinsString
+ bl sub_8072B4C
adds r0, r4, 0
adds r0, 0x7A
ldrh r1, [r0]
@@ -51961,7 +51961,7 @@ sub_80943E4: @ 80943E4
mov r0, sp
movs r1, 0x1C
movs r2, 0x7
- bl PrintCoinsString
+ bl sub_8072B4C
_0809441C:
add sp, 0x10
pop {r4}
@@ -51981,7 +51981,7 @@ sub_8094428: @ 8094428
ldr r0, _08094444
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
_0809443C:
pop {r0}
bx r0
@@ -52041,7 +52041,7 @@ sub_8094498: @ 8094498
ldr r0, _080944B4
movs r1, 0x3
movs r2, 0xD
- bl Print
+ bl MenuPrint
_080944AC:
pop {r0}
bx r0
@@ -52068,7 +52068,7 @@ sub_80944B8: @ 80944B8
mov r0, sp
movs r1, 0x1C
movs r2, 0xD
- bl PrintCoinsString
+ bl sub_8072B4C
_080944DE:
add sp, 0x8
pop {r0}
@@ -52087,7 +52087,7 @@ sub_80944E8: @ 80944E8
ldr r0, _08094504
movs r1, 0x3
movs r2, 0xB
- bl Print
+ bl MenuPrint
_080944FC:
pop {r0}
bx r0
@@ -52114,7 +52114,7 @@ sub_8094508: @ 8094508
mov r0, sp
movs r1, 0x1C
movs r2, 0xB
- bl PrintCoinsString
+ bl sub_8072B4C
_0809452E:
add sp, 0x8
pop {r0}
@@ -52133,7 +52133,7 @@ sub_8094538: @ 8094538
ldr r0, _08094554
movs r1, 0x3
movs r2, 0x9
- bl Print
+ bl MenuPrint
_0809454C:
pop {r0}
bx r0
@@ -52160,7 +52160,7 @@ sub_8094558: @ 8094558
mov r0, sp
movs r1, 0x1C
movs r2, 0x9
- bl PrintCoinsString
+ bl sub_8072B4C
_0809457E:
add sp, 0x8
pop {r0}
@@ -52188,7 +52188,7 @@ _0809459E:
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -52228,7 +52228,7 @@ _080945D8:
adds r3, 0xB
lsls r3, 24
lsrs r3, 24
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
lsls r0, r5, 16
movs r1, 0x80
lsls r1, 9
@@ -52283,7 +52283,7 @@ _0809465C:
adds r3, 0x9
lsls r3, 24
lsrs r3, 24
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
lsls r0, r5, 16
movs r1, 0x80
lsls r1, 9
@@ -52358,7 +52358,7 @@ _080946E8:
adds r3, 0xB
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
b _08094730
.align 2, 0
_08094710: .4byte 0x00000801
@@ -52375,7 +52375,7 @@ _08094714:
adds r3, 0x9
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
_08094730:
pop {r3}
mov r8, r3
@@ -52403,14 +52403,14 @@ sub_8094740: @ 8094740
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _08094774
adds r4, 0xC
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r4,r5}
pop {r0}
bx r0
@@ -52440,7 +52440,7 @@ sub_8094778: @ 8094778
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
add sp, 0x20
pop {r4,r5}
pop {r0}
@@ -52463,7 +52463,7 @@ sub_80947B0: @ 80947B0
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
bl GetBadgeCount
adds r1, r0, 0
lsls r1, 24
@@ -52476,7 +52476,7 @@ sub_80947B0: @ 80947B0
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -52499,7 +52499,7 @@ sub_80947F8: @ 80947F8
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
bl GetPokedexSeenCount
adds r1, r0, 0
lsls r1, 16
@@ -52514,7 +52514,7 @@ sub_80947F8: @ 80947F8
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -52537,7 +52537,7 @@ sub_8094844: @ 8094844
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _0809488C
ldrh r1, [r0, 0xE]
ldrb r2, [r0, 0x10]
@@ -52550,7 +52550,7 @@ sub_8094844: @ 8094844
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -53293,12 +53293,12 @@ _08094DBE:
adds r5, r0, r1
adds r0, r5, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08094E0C
adds r0, r5, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08094E0C
movs r0, 0
@@ -53617,7 +53617,7 @@ sub_8095050: @ 8095050
ldr r1, _0809508C
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
adds r5, r0, 0
cmp r5, 0
bne _080950C8
@@ -53762,7 +53762,7 @@ _08095178:
ldr r1, _080951B8
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809521C
bl sub_806D5A4
@@ -54310,7 +54310,7 @@ _08095610:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809566C
bl sub_806D5A4
@@ -54381,7 +54381,7 @@ _080956A8:
adds r7, r0, r1
adds r0, r7, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08095708
bl sub_806D5A4
@@ -54884,7 +54884,7 @@ _08095AF0:
adds r0, r1
adds r0, r6, r0
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
beq _08095B0C
adds r0, r5, 0x1
@@ -54924,7 +54924,7 @@ _08095B36:
adds r0, r1
adds r0, r5, r0
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _08095B58
lsls r0, r4, 16
@@ -54959,12 +54959,12 @@ _08095B72:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08095B9A
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _08095B9A
adds r0, r6, 0x1
@@ -55002,17 +55002,17 @@ _08095BBE:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08095BF6
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _08095BF6
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08095BF6
adds r0, r6, 0x1
@@ -55058,7 +55058,7 @@ _08095C2E:
ldr r1, _08095C5C
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08095C46
adds r0, r5, 0x1
@@ -55321,7 +55321,7 @@ _08095E10:
lsls r0, 4
add r0, r8
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _08095E3C
asrs r0, r6, 16
@@ -55363,12 +55363,12 @@ _08095E5C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
beq _08095E80
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
beq _08095E40
_08095E80:
@@ -55398,7 +55398,7 @@ sub_8095EA0: @ 8095EA0
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
pop {r0}
bx r0
thumb_func_end sub_8095EA0
@@ -55437,7 +55437,7 @@ _08095EE0:
_08095EF4:
ldrb r0, [r4, 0xA]
bl sub_8096168
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r1, _08095F18
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -55447,7 +55447,7 @@ _08095EF4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _08095F28
.align 2, 0
_08095F18: .4byte gUnknown_083B600C
@@ -55535,7 +55535,7 @@ _08095FA2:
ldr r0, [r1]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _080960F4
.align 2, 0
_08095FC0: .4byte 0x03001770
@@ -55546,7 +55546,7 @@ _08095FC8:
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
@@ -55582,7 +55582,7 @@ _08096008:
_08096022:
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x3
strh r0, [r4, 0x8]
b _080960F4
@@ -55664,7 +55664,7 @@ _080960C2:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x2
strh r0, [r4, 0x8]
b _080960F4
@@ -55751,12 +55751,12 @@ sub_8096168: @ 8096168
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080961A4
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
str r4, [sp]
movs r0, 0xC
str r0, [sp, 0x4]
@@ -55817,7 +55817,7 @@ _080961F0:
lsls r0, 4
adds r0, r7
adds r0, r6, r0
- bl zero_pokemon_boxed_data
+ bl ZeroBoxMonData
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -56712,8 +56712,8 @@ _080968E8:
_080968F0: .4byte gWindowConfig_81E6D00
_080968F4:
ldr r0, _08096900
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
b _0809697A
.align 2, 0
_08096900: .4byte gWindowConfig_81E6D00
@@ -56851,8 +56851,8 @@ _08096A34:
_08096A3C: .4byte gWindowConfig_81E6D00
_08096A40:
ldr r0, _08096A4C
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
b _08096AD8
.align 2, 0
_08096A4C: .4byte gWindowConfig_81E6D00
@@ -59324,13 +59324,13 @@ sub_8097E70: @ 8097E70
pop {r0}
bx r0
.align 2, 0
-_08097F2C: .4byte gUnknown_08E8DEC0
+_08097F2C: .4byte gPSSMenuHeader_Gfx
_08097F30: .4byte 0x06005000
-_08097F34: .4byte gUnknown_08E8E128
+_08097F34: .4byte gPSSMenuHeader_Tilemap
_08097F38: .4byte 0x02039760
_08097F3C: .4byte 0x06007800
-_08097F40: .4byte gUnknown_08E8E0E8
-_08097F44: .4byte gUnknown_08E8E108
+_08097F40: .4byte gPSSMenu1_Pal
+_08097F44: .4byte gPSSMenu2_Pal
_08097F48: .4byte gUnknown_083B6D74
_08097F4C: .4byte gUnknown_083B6D94
_08097F50: .4byte gUnknownPalette_81E6692+0x2
@@ -59799,27 +59799,27 @@ _08098302:
movs r1, 0xB
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0809834C
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x10
- bl Print
+ bl MenuPrint
adds r0, r4, 0
subs r0, 0x6B
movs r1, 0x1
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r4, 0
subs r0, 0x46
movs r1, 0
movs r2, 0xD
- bl Print
+ bl MenuPrint
subs r4, 0x21
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -59972,12 +59972,12 @@ sub_8098400: @ 8098400
.align 2, 0
_0809847C: .4byte REG_BG1CNT
_08098480: .4byte 0x00000f01
-_08098484: .4byte gUnknown_08E8E244
+_08098484: .4byte gPSSMenuMisc_Gfx
_08098488: .4byte 0x06006800
-_0809848C: .4byte gUnknown_08E8E6E8
+_0809848C: .4byte gPSSMenuMisc_Tilemap
_08098490: .4byte 0x020000a8
-_08098494: .4byte gUnknown_08E8E6A8
-_08098498: .4byte gUnknown_08E8E6C8
+_08098494: .4byte gPSSMenu3_Pal
+_08098498: .4byte gPSSMenu4_Pal
_0809849C: .4byte 0x06007800
_080984A0: .4byte 0x040000d4
_080984A4: .4byte 0x81000400
@@ -60365,7 +60365,7 @@ _0809878C:
ldr r1, _080987D8
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080987A0
movs r0, 0x1
@@ -60510,7 +60510,7 @@ sub_8098898: @ 8098898
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _080988C4
lsls r0, r5, 3
adds r0, r1
@@ -60682,7 +60682,7 @@ _08098A18:
adds r0, r3, 0
movs r1, 0xB
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -60701,7 +60701,7 @@ sub_8098A38: @ 8098A38
movs r0, 0x17
movs r1, 0xA
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
@@ -60719,12 +60719,12 @@ sub_8098A5C: @ 8098A5C
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x17
movs r1, 0xA
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_8098A5C
@@ -60917,11 +60917,11 @@ sub_8098BF0: @ 8098BF0
adds r4, r5, r0
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -60974,14 +60974,14 @@ _08098C6A:
_08098C70:
adds r0, r6, 0
movs r1, 0x41
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
beq _08098CD8
adds r0, r6, 0
movs r1, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
lsls r2, r5, 1
adds r2, r5
@@ -61083,7 +61083,7 @@ sub_8098D20: @ 8098D20
adds r7, r2, r0
adds r0, r7, 0
movs r1, 0x41
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -61116,7 +61116,7 @@ sub_8098D20: @ 8098D20
lsrs r4, 16
adds r0, r7, 0
movs r1, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
movs r0, 0x2
str r0, [sp]
@@ -61360,7 +61360,7 @@ _08098F42:
adds r4, r1, r2
adds r0, r4
movs r1, 0x41
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@@ -61374,7 +61374,7 @@ _08098F42:
lsls r0, 5
adds r0, r4
movs r1, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
ldr r2, [sp, 0x10]
lsls r3, r2, 16
@@ -61701,12 +61701,12 @@ sub_8099200: @ 8099200
ldr r4, _080992A0
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
movs r0, 0x1
str r0, [sp]
@@ -61731,14 +61731,14 @@ _08099246:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080992AC
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
subs r0, r6, 0x1
lsls r3, r0, 1
@@ -65041,7 +65041,7 @@ sub_809AB8C: @ 809AB8C
ldr r1, _0809ABBC
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
b _0809ABEA
.align 2, 0
_0809ABB4: .4byte 0x020384e4
@@ -65066,7 +65066,7 @@ _0809ABC0:
adds r1, r2
adds r0, r1
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
_0809ABEA:
lsls r0, 16
lsrs r0, 16
@@ -66309,7 +66309,7 @@ sub_809B548: @ 809B548
muls r0, r2
ldr r1, _0809B564
adds r0, r1
- bl zero_pokemon_struct
+ bl ZeroMonData
b _0809B582
.align 2, 0
_0809B564: .4byte 0x03004360
@@ -66325,7 +66325,7 @@ _0809B568:
ldr r2, _0809B588
adds r1, r2
adds r0, r1
- bl zero_pokemon_boxed_data
+ bl ZeroBoxMonData
_0809B582:
pop {r0}
bx r0
@@ -66747,7 +66747,7 @@ _0809B8A6:
ldr r1, _0809B908
adds r0, r6, r1
movs r1, 0x50
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
movs r2, 0x1
@@ -66867,7 +66867,7 @@ _0809B9CC:
ldr r1, _0809BA34
adds r2, r4, r1
movs r1, 0x50
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
movs r0, 0x1
@@ -66978,7 +66978,7 @@ _0809BA9A:
movs r1, 0x50
ldr r7, _0809BB7C
adds r2, r4, r7
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 16
lsrs r3, r0, 16
cmp r3, 0
@@ -67304,7 +67304,7 @@ _0809BD58:
adds r4, r0, r1
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
cmp r0, 0
beq _0809BD90
@@ -67345,7 +67345,7 @@ _0809BDAE:
adds r0, r5, 0
muls r0, r6
adds r0, r4
- bl zero_pokemon_struct
+ bl ZeroMonData
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -67385,7 +67385,7 @@ sub_809BDD8: @ 809BDD8
adds r0, r2, r1
movs r1, 0x8
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
b _0809BE68
.align 2, 0
_0809BE04: .4byte gUnknown_083B6DB4
@@ -67407,7 +67407,7 @@ _0809BE14:
adds r0, r1
movs r1, 0x8
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
_0809BE34:
movs r0, 0
ldrsb r0, [r4, r0]
@@ -67432,7 +67432,7 @@ _0809BE34:
adds r0, r1
movs r1, 0x8
mov r2, sp
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
_0809BE68:
add sp, 0x4
pop {r4}
@@ -67506,7 +67506,7 @@ sub_809BEBC: @ 809BEBC
ldr r2, _0809BF14
adds r0, r1, r2
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0809BF18
_0809BEFC:
@@ -67715,7 +67715,7 @@ sub_809C04C: @ 809C04C
bne _0809C120
adds r0, r7, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
ldr r2, _0809C104
adds r1, r6, r2
strh r0, [r1]
@@ -67726,7 +67726,7 @@ sub_809C04C: @ 809C04C
_0809C08C:
adds r0, r7, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
ldr r2, _0809C108
adds r1, r6, r2
strb r0, [r1]
@@ -67735,24 +67735,24 @@ _0809C08C:
adds r0, r7, 0
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
adds r0, r7, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
ldr r2, _0809C110
adds r1, r6, r2
strb r0, [r1]
adds r0, r7, 0
movs r1, 0x8
- bl PokemonGetField
+ bl GetMonData
ldr r2, _0809C114
adds r1, r6, r2
strb r0, [r1]
adds r0, r7, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
ldr r2, _0809C118
adds r1, r6, r2
str r0, [r1]
@@ -67762,13 +67762,13 @@ _0809C08C:
adds r1, r6, r2
str r0, [r1]
adds r0, r7, 0
- bl pokemon_get_gender
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
str r0, [sp]
adds r0, r7, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
b _0809C1B2
.align 2, 0
_0809C0FC: .4byte gUnknown_083B6DB4
@@ -67785,7 +67785,7 @@ _0809C120:
bne _0809C1D4
adds r0, r7, 0
movs r1, 0x41
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
ldr r2, _0809C1B8
adds r5, r6, r2
strh r0, [r5]
@@ -67794,11 +67794,11 @@ _0809C120:
beq _0809C1EC
adds r0, r7, 0
movs r1, 0x1
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
mov r9, r0
adds r0, r7, 0
movs r1, 0x2D
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
ldr r2, _0809C1BC
adds r1, r6, r2
strb r0, [r1]
@@ -67807,23 +67807,23 @@ _0809C120:
adds r0, r7, 0
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r0, r4, 0
bl StringGetEnd10
adds r0, r7, 0
- bl sub_803B570
+ bl GetLevelFromBoxMonExp
ldr r2, _0809C1C4
adds r1, r6, r2
strb r0, [r1]
adds r0, r7, 0
movs r1, 0x8
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
ldr r2, _0809C1C8
adds r1, r6, r2
strb r0, [r1]
adds r0, r7, 0
movs r1, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r2, r0, 0
ldr r0, _0809C1CC
adds r4, r6, r0
@@ -67836,13 +67836,13 @@ _0809C120:
str r0, [r1]
ldrh r0, [r5]
ldr r1, [r4]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
str r0, [sp]
adds r0, r7, 0
movs r1, 0xC
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
_0809C1B2:
mov r1, r8
strh r0, [r1]
@@ -69531,7 +69531,7 @@ sub_809CE84: @ 809CE84
ldrb r1, [r6]
movs r2, 0x1D
movs r3, 0xF
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r0, [r5]
adds r0, 0x1
lsls r0, 24
@@ -69546,7 +69546,7 @@ sub_809CE84: @ 809CE84
lsls r3, 5
adds r4, r3
adds r3, r4, 0
- bl PrintStringArray
+ bl PrintMenuItems
ldrb r1, [r5]
adds r1, 0x1
lsls r1, 24
@@ -69641,7 +69641,7 @@ _0809CF8E:
ldrb r1, [r1]
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_0809CFB2:
cmp r5, 0
blt _0809CFC4
@@ -70082,10 +70082,10 @@ unref_sub_809D26C: @ 809D26C
pop {r1}
bx r1
.align 2, 0
-_0809D2E0: .4byte gUnknown_083BC5E8
+_0809D2E0: .4byte gOamData_83BC5E8
_0809D2E4: .4byte gMonIconTable
-_0809D2E8: .4byte gUnknown_083BC62C
-_0809D2EC: .4byte gUnknown_083BC660
+_0809D2E8: .4byte gSpriteAnimTable_83BC62C
+_0809D2EC: .4byte gSpriteAffineAnimTable_83BC660
_0809D2F0: .4byte gMonIconPaletteIndices
_0809D2F4: .4byte 0x0000dac0
_0809D2F8: .4byte 0x02020004
@@ -70163,9 +70163,9 @@ _0809D35A:
pop {r1}
bx r1
.align 2, 0
-_0809D38C: .4byte gUnknown_083BC5E8
-_0809D390: .4byte gUnknown_083BC62C
-_0809D394: .4byte gUnknown_083BC660
+_0809D38C: .4byte gOamData_83BC5E8
+_0809D390: .4byte gSpriteAnimTable_83BC62C
+_0809D394: .4byte gSpriteAffineAnimTable_83BC660
_0809D398: .4byte gMonIconPaletteIndices
_0809D39C: .4byte 0x0000dac0
_0809D3A0: .4byte 0x02020004
@@ -70229,10 +70229,10 @@ sub_809D3A4: @ 809D3A4
pop {r1}
bx r1
.align 2, 0
-_0809D418: .4byte gUnknown_083BC5E8
+_0809D418: .4byte gOamData_83BC5E8
_0809D41C: .4byte gMonIconTable
-_0809D420: .4byte gUnknown_083BC62C
-_0809D424: .4byte gUnknown_083BC660
+_0809D420: .4byte gSpriteAnimTable_83BC62C
+_0809D424: .4byte gSpriteAffineAnimTable_83BC660
_0809D428: .4byte gMonIconPaletteIndices
_0809D42C: .4byte 0x0000dac0
_0809D430: .4byte 0x02020004
@@ -70623,7 +70623,7 @@ _0809D686:
ldrb r7, [r5]
b _0809D700
.align 2, 0
-_0809D6E4: .4byte gUnknown_083BC668
+_0809D6E4: .4byte gSpriteImageSizes
_0809D6E8: .4byte 0x06010000
_0809D6EC:
lsls r0, r2, 26
@@ -70746,7 +70746,7 @@ sub_809D710: @ 809D710
pop {r1}
bx r1
.align 2, 0
-_0809D7D8: .4byte gUnknown_083BC668
+_0809D7D8: .4byte gSpriteImageSizes
_0809D7DC: .4byte 0xffff0000
_0809D7E0: .4byte 0x0000ffff
_0809D7E4: .4byte 0x02020004
@@ -70780,7 +70780,7 @@ sub_809D7E8: @ 809D7E8
pop {r0}
bx r0
.align 2, 0
-_0809D81C: .4byte gUnknown_083BC668
+_0809D81C: .4byte gSpriteImageSizes
_0809D820: .4byte 0xffff0000
thumb_func_end sub_809D7E8
@@ -71212,7 +71212,7 @@ _0809DB94:
_0809DB9C: .4byte gWindowConfig_81E6E6C
_0809DBA0:
ldr r0, _0809DBB0
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
ldr r1, _0809DBB4
ldr r2, _0809DBB8
adds r1, r2
@@ -71222,7 +71222,7 @@ _0809DBB0: .4byte gWindowConfig_81E6E6C
_0809DBB4: .4byte 0x03001770
_0809DBB8: .4byte 0x0000043c
_0809DBBC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _0809DBC6
b _0809DE38
@@ -71261,11 +71261,11 @@ _0809DBDC:
add r1, r12
b _0809DDEE
.align 2, 0
-_0809DC08: .4byte gUnknown_083C133C
+_0809DC08: .4byte gSummaryScreenTextTiles
_0809DC0C: .4byte 0x0600d000
_0809DC10: .4byte 0x040000d4
_0809DC14: .4byte 0x800000a0
-_0809DC18: .4byte gUnknown_083C147C
+_0809DC18: .4byte gSummaryScreenButtonTiles
_0809DC1C: .4byte 0x0600d140
_0809DC20: .4byte 0x80000080
_0809DC24: .4byte 0x02018000
@@ -71415,7 +71415,7 @@ _0809DD64: .4byte 0x0000043c
_0809DD68:
ldr r0, _0809DD84
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0
beq _0809DD8C
@@ -71643,7 +71643,7 @@ _0809DF54:
bl LZDecompressVram
b _0809E030
.align 2, 0
-_0809DF60: .4byte gUnknown_08E72A78
+_0809DF60: .4byte gStatusScreen_Gfx
_0809DF64:
ldr r0, _0809DF6C
ldr r1, _0809DF70
@@ -71665,7 +71665,7 @@ _0809DF88:
bl LZDecompressVram
b _0809E030
.align 2, 0
-_0809DF94: .4byte gUnknown_08E73D08
+_0809DF94: .4byte gStatusScreen_Tilemap
_0809DF98: .4byte 0x06004800
_0809DF9C:
ldr r0, _0809DFA4
@@ -71692,7 +71692,7 @@ _0809DFC4:
bl LoadCompressedPalette
b _0809E030
.align 2, 0
-_0809DFD0: .4byte gUnknown_08E73468
+_0809DFD0: .4byte gStatusScreen_Pal
_0809DFD4:
ldr r0, _0809DFDC
bl LoadCompressedObjectPic
@@ -71736,7 +71736,7 @@ _0809E010:
movs r0, 0x1
b _0809E03C
.align 2, 0
-_0809E028: .4byte gUnknown_08E726E4
+_0809E028: .4byte gMoveTypes_Pal
_0809E02C: .4byte 0x02018000
_0809E030:
ldr r1, _0809E040
@@ -72094,7 +72094,7 @@ _0809E308:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809E314:
movs r1, 0x1
negs r1, r1
@@ -72139,7 +72139,7 @@ _0809E360:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809E36C:
adds r0, r4, 0
movs r1, 0x1
@@ -72458,7 +72458,7 @@ sub_809E5C4: @ 809E5C4
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, [sp, 0x8]
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x14]
@@ -72468,7 +72468,7 @@ sub_809E5C4: @ 809E5C4
str r2, [sp, 0xC]
adds r0, r5, 0
adds r1, r2, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
mov r3, r8
@@ -72476,7 +72476,7 @@ sub_809E5C4: @ 809E5C4
str r3, [sp, 0x10]
adds r0, r5, 0
adds r1, r3, 0
- bl PokemonGetField
+ bl GetMonData
mov r7, sp
adds r7, 0x5
str r7, [sp, 0x18]
@@ -72486,13 +72486,13 @@ sub_809E5C4: @ 809E5C4
str r0, [sp, 0x1C]
adds r0, r5, 0
ldr r1, [sp, 0x1C]
- bl PokemonGetField
+ bl GetMonData
add r1, sp, 0x4
mov r10, r1
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r4, sp
adds r4, 0x6
strb r0, [r4]
@@ -72535,23 +72535,23 @@ sub_809E5C4: @ 809E5C4
adds r0, r5, 0
ldr r1, [sp, 0x8]
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
ldr r1, [sp, 0xC]
ldr r2, [sp, 0x14]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
ldr r1, [sp, 0x10]
mov r2, r10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
ldr r1, [sp, 0x1C]
ldr r2, [sp, 0x18]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0x15
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -72590,7 +72590,7 @@ sub_809E6D8: @ 809E6D8
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, [sp, 0x8]
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x14]
@@ -72600,7 +72600,7 @@ sub_809E6D8: @ 809E6D8
str r2, [sp, 0xC]
adds r0, r5, 0
adds r1, r2, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
mov r1, sp
strh r0, [r1]
mov r3, r8
@@ -72608,7 +72608,7 @@ sub_809E6D8: @ 809E6D8
str r3, [sp, 0x10]
adds r0, r5, 0
adds r1, r3, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
mov r7, sp
adds r7, 0x5
str r7, [sp, 0x18]
@@ -72618,13 +72618,13 @@ sub_809E6D8: @ 809E6D8
str r0, [sp, 0x1C]
adds r0, r5, 0
ldr r1, [sp, 0x1C]
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
add r1, sp, 0x4
mov r10, r1
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x15
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
mov r4, sp
adds r4, 0x6
strb r0, [r4]
@@ -72667,23 +72667,23 @@ sub_809E6D8: @ 809E6D8
adds r0, r5, 0
ldr r1, [sp, 0x8]
mov r2, sp
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
adds r0, r5, 0
ldr r1, [sp, 0xC]
ldr r2, [sp, 0x14]
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
adds r0, r5, 0
ldr r1, [sp, 0x10]
mov r2, r10
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
adds r0, r5, 0
ldr r1, [sp, 0x1C]
ldr r2, [sp, 0x18]
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
adds r0, r5, 0
movs r1, 0x15
adds r2, r4, 0
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -73079,12 +73079,12 @@ _0809EAEE:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r1, r6, 0
adds r1, 0x7F
movs r0, 0x6
@@ -73877,7 +73877,7 @@ sub_809F134: @ 809F134
ldr r4, _0809F1AC
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809F1A6
lsls r0, r5, 24
@@ -74099,7 +74099,7 @@ _0809F2F0:
muls r0, r1
adds r0, r7, r0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809F2C6
ldrb r0, [r4, 0x9]
@@ -74118,7 +74118,7 @@ sub_809F310: @ 809F310
push {r4,lr}
adds r4, r0, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0809F33C
ldr r0, _0809F338
@@ -74127,7 +74127,7 @@ sub_809F310: @ 809F310
bne _0809F332
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809F33C
_0809F332:
@@ -74400,7 +74400,7 @@ _0809F51C:
strb r0, [r5]
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0
beq _0809F560
@@ -74612,12 +74612,12 @@ sub_809F6B4: @ 809F6B4
_0809F6D2:
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
lsls r0, r5, 3
ldr r1, _0809F70C
@@ -74643,16 +74643,16 @@ _0809F714: .4byte gUnknown_081FAF4C
_0809F718:
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r5, 0
adds r2, r6, 0
@@ -74661,7 +74661,7 @@ _0809F718:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
_0809F74E:
ldrb r0, [r7]
adds r0, 0x1
@@ -74703,7 +74703,7 @@ _0809F784:
_0809F788:
movs r1, 0x10
_0809F78A:
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -74739,7 +74739,7 @@ _0809F7BC:
_0809F7C0:
movs r1, 0x14
_0809F7C2:
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -74890,7 +74890,7 @@ _0809F8E8:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809F8F4:
ldr r1, _0809F910
lsls r0, r5, 2
@@ -74943,7 +74943,7 @@ _0809F954:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809F960:
ldr r1, _0809F98C
lsls r0, r5, 2
@@ -75026,11 +75026,11 @@ sub_809F9D0: @ 809F9D0
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0809FA28
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
subs r6, 0x8
adds r4, r6
ldr r0, _0809FA2C
@@ -75139,24 +75139,24 @@ sub_809FAC8: @ 809FAC8
sub sp, 0xC
adds r5, r0, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0809FB28
movs r0, 0x1
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x3
movs r1, 0x10
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xC
movs r2, 0xB
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0809FB20
adds r0, r5, 0
adds r1, r4, 0
@@ -75181,7 +75181,7 @@ _0809FB28:
lsrs r6, r0, 24
adds r0, r5, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80406D8
@@ -75231,7 +75231,7 @@ _0809FB96:
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
_0809FBA2:
ldr r1, _0809FBE0
adds r0, r1, 0
@@ -75252,7 +75252,7 @@ _0809FBA2:
ldr r0, _0809FBE0
movs r1, 0x1
movs r2, 0xC
- bl Print
+ bl MenuPrint
adds r0, r5, 0
bl sub_80A0958
_0809FBD6:
@@ -75281,7 +75281,7 @@ _0809FBE8:
movs r1, 0x4
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4}
pop {r0}
bx r0
@@ -75293,7 +75293,7 @@ sub_809FC0C: @ 809FC0C
ldr r0, _0809FC30
movs r1, 0xB
movs r2, 0x6
- bl Print
+ bl MenuPrint
movs r0, 0
movs r1, 0x16
movs r2, 0x4
@@ -75327,10 +75327,10 @@ _0809FC3C:
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0809FD1C
ldr r5, _0809FCD0
@@ -75356,7 +75356,7 @@ _0809FC3C:
ldr r0, _0809FCD0
movs r1, 0xB
movs r2, 0x4
- bl Print
+ bl MenuPrint
movs r0, 0x1
str r0, [sp]
adds r0, r4, 0
@@ -75371,7 +75371,7 @@ _0809FC3C:
bl sub_80A198C
adds r0, r6, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r0, 0
@@ -75398,7 +75398,7 @@ _0809FCEC:
_0809FCF2:
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
b _0809FD0A
.align 2, 0
_0809FCFC: .4byte gUnknown_0840F8BB
@@ -75406,7 +75406,7 @@ _0809FD00:
ldr r0, _0809FD18
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
_0809FD0A:
adds r0, r6, 0
movs r1, 0xB
@@ -75420,10 +75420,10 @@ _0809FD1C:
adds r0, r6, 0
movs r1, 0x7
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r6, 0
movs r1, 0x3
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -75439,7 +75439,7 @@ _0809FD1C:
adds r5, r0, 0
adds r0, r6, 0
movs r1, 0x31
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0809FD70
adds r0, r5, 0
@@ -75470,10 +75470,10 @@ _0809FD74:
ldr r0, _0809FE58
movs r1, 0xB
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
ldr r1, _0809FE5C
ands r1, r0
movs r0, 0xC1
@@ -75489,7 +75489,7 @@ _0809FD74:
bl sub_80A1F98
adds r0, r6, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _0809FE60
@@ -75514,13 +75514,13 @@ _0809FD74:
_0809FDF8:
adds r0, r6, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r6, 0
movs r1, 0x2E
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -75543,7 +75543,7 @@ _0809FDF8:
ldr r0, [r4]
movs r1, 0xB
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0xB
movs r2, 0xE
@@ -75581,22 +75581,22 @@ sub_809FE80: @ 809FE80
movs r1, 0x4
movs r2, 0x12
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x19
movs r1, 0x4
movs r2, 0x1E
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0xE
movs r2, 0x1C
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_809FE80
@@ -75618,7 +75618,7 @@ sub_809FEB8: @ 809FEB8
ldr r0, _0809FF48
movs r1, 0x15
movs r2, 0x10
- bl Print
+ bl MenuPrint
ldr r0, _0809FF4C
movs r4, 0x2A
str r4, [sp]
@@ -75689,7 +75689,7 @@ _0809FF6A:
bls _0809FF6A
adds r0, r5, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0xB
@@ -75700,21 +75700,21 @@ _0809FF6A:
ldr r4, _080A008C
adds r0, r5, 0
movs r1, 0x19
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
adds r0, r4, 0
movs r1, 0x1D
movs r2, 0xE
- bl PrintCoinsString
+ bl sub_8072B4C
adds r0, r5, 0
movs r1, 0x17
movs r2, 0x10
bl sub_80A0C80
adds r0, r5, 0
movs r1, 0x3B
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
@@ -75722,10 +75722,10 @@ _0809FF6A:
movs r1, 0x10
movs r2, 0x9
movs r3, 0x32
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3C
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
@@ -75733,10 +75733,10 @@ _0809FF6A:
movs r1, 0x10
movs r2, 0xB
movs r3, 0x32
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3E
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
@@ -75744,10 +75744,10 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0x7
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3F
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
@@ -75755,10 +75755,10 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0x9
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3D
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl ConvertIntToDecimalString
@@ -75766,10 +75766,10 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0xB
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x18
@@ -75781,7 +75781,7 @@ _0809FF6A:
adds r4, 0x1
adds r0, r5, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x30
@@ -75818,32 +75818,32 @@ sub_80A00A4: @ 80A00A4
movs r1, 0x4
movs r2, 0x13
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x10
movs r1, 0x7
movs r2, 0x15
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x11
movs r1, 0x9
movs r2, 0x15
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1B
movs r1, 0x7
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x16
movs r1, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x17
movs r1, 0x10
movs r2, 0x1C
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80A00A4
@@ -75937,7 +75937,7 @@ _080A0168:
ldr r0, _080A01B4
movs r1, 0x1A
adds r2, r4, 0
- bl Print
+ bl MenuPrint
b _080A0276
.align 2, 0
_080A01B0: .4byte gUnknown_0840E680
@@ -76000,7 +76000,7 @@ _080A020C:
bl GetStringCenterAlignXOffset
mov r0, r8
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -76028,7 +76028,7 @@ _080A020C:
ldr r0, _080A0298
movs r1, 0x19
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_080A0276:
adds r0, r7, 0x1
lsls r0, 24
@@ -76156,7 +76156,7 @@ _080A033E:
ldr r0, _080A0388
movs r1, 0x19
movs r2, 0xC
- bl Print
+ bl MenuPrint
_080A037E:
pop {r4,r5}
pop {r0}
@@ -76181,7 +76181,7 @@ _080A0394:
lsrs r3, 24
movs r0, 0xF
movs r2, 0x1C
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -76261,7 +76261,7 @@ sub_80A0428: @ 80A0428
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A0454
ldrb r0, [r0, 0xB]
cmp r0, 0x2
@@ -76298,7 +76298,7 @@ sub_80A046C: @ 80A046C
ldr r0, [r1]
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A048A:
pop {r0}
bx r0
@@ -76325,7 +76325,7 @@ sub_80A0498: @ 80A0498
ldr r0, [r0]
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A04BC:
pop {r0}
bx r0
@@ -76360,7 +76360,7 @@ sub_80A04CC: @ 80A04CC
ldr r0, _080A050C
movs r1, 0x7
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _080A052A
.align 2, 0
_080A0504: .4byte 0x0000ffff
@@ -76376,7 +76376,7 @@ _080A0514:
ldr r0, _080A0550
movs r1, 0x7
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A052A:
ldr r0, _080A0554
adds r1, r5, r4
@@ -76393,7 +76393,7 @@ _080A052A:
ldr r0, _080A0550
movs r1, 0x7
movs r2, 0x11
- bl Print
+ bl MenuPrint
b _080A0572
.align 2, 0
_080A0550: .4byte 0x020231cc
@@ -76408,7 +76408,7 @@ _080A055C:
ldr r0, _080A0578
movs r1, 0x7
movs r2, 0x11
- bl Print
+ bl MenuPrint
_080A0572:
pop {r4,r5}
pop {r0}
@@ -76581,7 +76581,7 @@ _080A06B0:
_080A06C2:
adds r0, r6, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
ldr r1, _080A06F0
ands r1, r0
cmp r5, r1
@@ -76590,7 +76590,7 @@ _080A06C2:
adds r0, r6, 0
movs r1, 0x7
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
ldr r0, _080A06F4
adds r1, r4, 0
bl StringCompareWithoutExtCtrlCodes
@@ -76626,7 +76626,7 @@ sub_80A0708: @ 80A0708
lsrs r6, r2, 24
mov r8, r6
movs r1, 0x25
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -76641,7 +76641,7 @@ _080A0738: .4byte gUnknown_0842D197
_080A073C:
adds r0, r4, 0
movs r1, 0x23
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0xFF
@@ -76667,7 +76667,7 @@ _080A0768:
_080A076E:
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
b _080A0786
.align 2, 0
_080A0778: .4byte gUnknown_0842D1C3
@@ -76675,7 +76675,7 @@ _080A077C:
ldr r0, _080A0794
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
_080A0786:
pop {r3,r4}
mov r8, r3
@@ -76732,12 +76732,12 @@ _080A07DA:
bne _080A0898
adds r0, r7, 0
movs r1, 0x23
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
adds r0, r7, 0
movs r1, 0x24
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080A0850
adds r0, r5, 0
@@ -76771,7 +76771,7 @@ _080A0850:
bhi _080A08E8
adds r0, r7, 0
movs r1, 0x24
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -76799,7 +76799,7 @@ _080A0894: .4byte gUnknown_0842D0F3
_080A0898:
adds r0, r7, 0
movs r1, 0x25
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -76809,14 +76809,14 @@ _080A0898:
bhi _080A08E8
adds r0, r7, 0
movs r1, 0x23
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0xFF
bne _080A08E4
adds r0, r7, 0
movs r1, 0x24
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -76847,7 +76847,7 @@ _080A08F8: .4byte gUnknown_0842D103
_080A08FC:
adds r0, r7, 0
movs r1, 0x24
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -76872,7 +76872,7 @@ _080A0934:
ldr r0, _080A0954
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -76894,7 +76894,7 @@ sub_80A0958: @ 80A0958
push {r4-r6}
mov r8, r0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -76933,15 +76933,15 @@ sub_80A0958: @ 80A0958
adds r0, r5, 0
movs r1, 0
movs r2, 0xE
- bl Print
+ bl MenuPrint
movs r0, 0x3
movs r1, 0x10
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
mov r0, r8
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -76966,7 +76966,7 @@ sub_80A0958: @ 80A0958
adds r0, r5, 0
movs r1, 0x3
movs r2, 0x10
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x7
movs r2, 0x10
@@ -76992,7 +76992,7 @@ sub_80A0A2C: @ 80A0A2C
lsls r2, 24
lsrs r4, r2, 24
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0x20
@@ -77000,7 +77000,7 @@ sub_80A0A2C: @ 80A0A2C
cmp r0, 0x1D
beq _080A0A84
adds r0, r6, 0
- bl pokemon_get_gender
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -77013,7 +77013,7 @@ sub_80A0A2C: @ 80A0A2C
adds r0, r5, 0
adds r1, r4, 0
adds r2, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
b _080A0A84
_080A0A6E:
ldr r0, _080A0A74
@@ -77041,103 +77041,103 @@ sub_80A0A90: @ 80A0A90
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x32
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x33
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x34
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x35
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x36
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x43
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x44
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x45
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x46
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x47
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x48
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x49
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4A
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4B
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4C
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4D
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4E
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
@@ -77188,7 +77188,7 @@ _080A0BD8:
ldr r0, _080A0BF0
movs r1, 0x15
movs r2, 0x4
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -77256,7 +77256,7 @@ _080A0C68:
ldr r0, _080A0C7C
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r4-r7}
pop {r0}
bx r0
@@ -77286,16 +77286,16 @@ sub_80A0C80: @ 80A0C80
movs r7, 0
adds r0, r4, 0
movs r1, 0x19
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r5, 0x63
@@ -77348,7 +77348,7 @@ _080A0D14:
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp]
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _080A0D58
mov r9, r0
movs r2, 0
@@ -77467,7 +77467,7 @@ sub_80A0DD0: @ 80A0DD0
ldr r0, _080A0E3C
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
adds r4, 0x7F
ldrb r0, [r4]
cmp r0, 0
@@ -77490,7 +77490,7 @@ _080A0E48:
movs r1, 0
movs r2, 0x18
movs r3, 0x1
- bl Reset
+ bl MenuZeroFillWindowRect
_080A0E54:
ldr r2, _080A0E98
adds r0, r2, 0
@@ -77518,7 +77518,7 @@ _080A0E54:
ldr r0, _080A0E98
movs r1, 0x19
movs r2, 0
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -78066,7 +78066,7 @@ sub_80A12D0: @ 80A12D0
movs r1, 0x12
movs r2, 0x5
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1D
bl sub_80A18E4
ldr r0, _080A1310
@@ -78208,7 +78208,7 @@ _080A13F4:
movs r1, 0x13
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A1400:
movs r1, 0
ldrsh r0, [r7, r1]
@@ -78227,7 +78227,7 @@ _080A1410:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x10
adds r0, r4, 0
bl sub_80A0958
@@ -78291,7 +78291,7 @@ sub_80A1488: @ 80A1488
movs r1, 0xE
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A14A6:
ldr r5, _080A14E0
adds r0, r5, 0
@@ -78438,7 +78438,7 @@ _080A15C0:
movs r1, 0x13
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A15CC:
movs r1, 0
ldrsh r0, [r7, r1]
@@ -78457,7 +78457,7 @@ _080A15DC:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x10
adds r0, r4, 0
bl sub_80A0958
@@ -78521,7 +78521,7 @@ sub_80A1654: @ 80A1654
movs r1, 0xE
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A1672:
ldr r5, _080A16AC
adds r0, r5, 0
@@ -78739,7 +78739,7 @@ sub_80A1808: @ 80A1808
mov r7, r8
push {r7}
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
@@ -78810,7 +78810,7 @@ sub_80A1888: @ 80A1888
str r0, [r4, 0x1C]
ldr r0, _080A18C0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080A18B0
ldrh r0, [r4, 0x2E]
@@ -79391,7 +79391,7 @@ sub_80A1CD8: @ 80A1CD8
push {r4,lr}
adds r4, r0, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080A1CEA
movs r0, 0x7
@@ -79399,7 +79399,7 @@ sub_80A1CD8: @ 80A1CD8
_080A1CEA:
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
@@ -79489,7 +79489,7 @@ sub_80A1D84: @ 80A1D84
beq _080A1DBA
adds r0, r5, 0
movs r1, 0x8
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -79506,7 +79506,7 @@ _080A1DBA:
bx r0
.align 2, 0
_080A1DC0: .4byte 0x00007533
-_080A1DC4: .4byte gUnknown_083C131C
+_080A1DC4: .4byte gSummaryScreenMonMarkingsPalette
_080A1DC8: .4byte 0x020384f4
thumb_func_end sub_80A1D84
@@ -79530,7 +79530,7 @@ _080A1DE4: .4byte 0x020384f4
sub_80A1DE8: @ 80A1DE8
push {r4,lr}
movs r1, 0x26
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ball_number_to_ball_processing_index
@@ -79739,7 +79739,7 @@ sub_80A1F48: @ 80A1F48
adds r1, r5, 0
adds r2, r6, 0
ldr r3, [sp]
- bl Free
+ bl sub_8072BD8
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -79825,7 +79825,7 @@ sub_80A1FF8: @ 80A1FF8
mov r0, r8
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -81369,7 +81369,7 @@ sub_80A2B94: @ 80A2B94
push {r4,lr}
adds r4, r0, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
@@ -81378,7 +81378,7 @@ sub_80A2B94: @ 80A2B94
beq _080A2BBC
adds r0, r4, 0
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xFF
beq _080A2BBC
movs r0, 0x1
@@ -81511,13 +81511,13 @@ _080A2C88:
bls _080A2C88
adds r0, r7, 0
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
movs r1, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
adds r0, r4, 0
bl sub_80A2D44
@@ -81543,11 +81543,11 @@ _080A2C88:
adds r0, r7, 0
movs r1, 0x40
mov r2, r8
- bl pokemon_setattr
+ bl SetMonData
adds r0, r7, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
ldrb r0, [r4]
b _080A2D32
.align 2, 0
@@ -81654,7 +81654,7 @@ sub_80A2D88: @ 80A2D88
adds r0, r6, 0
movs r1, 0x40
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
mov r0, sp
strb r5, [r0]
mov r1, sp
@@ -81663,7 +81663,7 @@ sub_80A2D88: @ 80A2D88
adds r0, r6, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
ldrb r0, [r4]
b _080A2DEA
.align 2, 0
@@ -81695,7 +81695,7 @@ sub_80A2DF8: @ 80A2DF8
beq _080A2E46
adds r0, r4, 0
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
add r2, sp, 0x4
strb r0, [r2]
ldr r3, _080A2E50
@@ -81716,11 +81716,11 @@ sub_80A2DF8: @ 80A2DF8
strb r3, [r0, 0x1]
adds r0, r4, 0
movs r1, 0x40
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
_080A2E46:
add sp, 0x8
pop {r4}
@@ -81786,7 +81786,7 @@ _080A2E9E:
adds r0, r5, 0
movs r1, 0x40
str r2, [sp, 0x8]
- bl PokemonGetField
+ bl GetMonData
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -81800,7 +81800,7 @@ _080A2E9E:
stm r4!, {r0,r2,r3}
adds r0, r5, 0
movs r1, 0x40
- bl PokemonGetField
+ bl GetMonData
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -81811,11 +81811,11 @@ _080A2E9E:
adds r0, r5, 0
movs r1, 0x40
mov r2, r9
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r7, 0
b _080A2F1C
.align 2, 0
@@ -82047,12 +82047,12 @@ HideMapNamePopUpWindow: @ 80A30A4
lsls r0, 24
cmp r0, 0
beq _080A30D0
- bl GetMapNamePopUpWindowId
+ bl MenuLoadTextWindowGraphics
movs r0, 0
movs r1, 0
movs r2, 0xD
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A30D8
movs r0, 0
strh r0, [r1]
@@ -82073,7 +82073,7 @@ sub_80A30E0: @ 80A30E0
push {lr}
sub sp, 0x14
movs r0, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
ldr r0, _080A3114
ldrb r1, [r0, 0x14]
mov r0, sp
@@ -82083,12 +82083,12 @@ sub_80A30E0: @ 80A30E0
movs r1, 0
movs r2, 0xD
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x1
movs r2, 0x1
movs r3, 0x60
- bl Free
+ bl sub_8072BD8
add sp, 0x14
pop {r0}
bx r0
@@ -82247,7 +82247,7 @@ _080A3270:
_080A3278: .4byte gWindowConfig_81E6DFC
_080A327C:
ldr r0, _080A328C
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
ldr r1, _080A3290
ldr r0, _080A3294
adds r1, r0
@@ -82257,7 +82257,7 @@ _080A328C: .4byte gWindowConfig_81E6DFC
_080A3290: .4byte 0x03001770
_080A3294: .4byte 0x0000043c
_080A3298:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _080A32A2
b _080A34A8
@@ -82572,7 +82572,7 @@ _080A355C:
bl LZDecompressVram
b _080A35EA
.align 2, 0
-_080A3568: .4byte gUnknown_08E76728
+_080A3568: .4byte gBagScreen_Gfx
_080A356C: .4byte 0x06004000
_080A3570:
ldr r0, _080A3580
@@ -82602,7 +82602,7 @@ _080A3598:
.align 2, 0
_080A35A4: .4byte gSaveBlock2
_080A35A8: .4byte 0x03000701
-_080A35AC: .4byte gUnknown_08E76F94
+_080A35AC: .4byte gBagScreenMale_Pal
_080A35B0:
ldr r0, _080A35BC
movs r1, 0
@@ -82610,7 +82610,7 @@ _080A35B0:
bl LoadCompressedPalette
b _080A35EA
.align 2, 0
-_080A35BC: .4byte gUnknown_08E76FCC
+_080A35BC: .4byte gBagScreenFemale_Pal
_080A35C0:
ldr r0, _080A35D8
ldrb r0, [r0, 0x8]
@@ -84221,7 +84221,7 @@ sub_80A418C: @ 80A418C
mov r0, r8
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -84390,7 +84390,7 @@ sub_80A42B0: @ 80A42B0
adds r0, r4, 0
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
lsls r0, r5, 6
ldr r1, _080A435C
adds r0, r1
@@ -84420,7 +84420,7 @@ _080A4332:
movs r0, 0xE
movs r2, 0x1D
movs r3, 0xD
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _080A4370
.align 2, 0
_080A4344: .4byte 0x02038540
@@ -84437,7 +84437,7 @@ _080A4360:
movs r0, 0xE
movs r2, 0x1D
movs r3, 0x11
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_080A4370:
movs r0, 0x1
b _080A4376
@@ -84522,7 +84522,7 @@ _080A43A4:
ldr r0, _080A4448
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -84612,7 +84612,7 @@ _080A4470:
ldr r0, _080A44F0
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _080A44F8
ldrb r0, [r0]
cmp r0, 0
@@ -84850,7 +84850,7 @@ _080A46AE:
ldr r0, _080A46F8
movs r1, 0xE
ldr r2, [sp, 0x10]
- bl Print
+ bl MenuPrint
mov r0, r8
adds r0, 0x1
lsls r0, 24
@@ -84969,7 +84969,7 @@ _080A4730:
ldr r0, _080A47E4
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85218,7 +85218,7 @@ _080A4988:
movs r0, 0
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A49A4:
add sp, 0x4
pop {r4,r5}
@@ -85252,7 +85252,7 @@ sub_80A49AC: @ 80A49AC
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A49F0
movs r1, 0x4
movs r2, 0x68
@@ -85286,7 +85286,7 @@ _080A4A18:
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A4A28:
lsls r1, r5, 16
asrs r1, 16
@@ -85366,7 +85366,7 @@ sub_80A4A98: @ 80A4A98
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A4AB0:
mov r0, sp
adds r1, r5, 0
@@ -85544,7 +85544,7 @@ _080A4C00:
movs r1, 0x7
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
str r4, [sp]
adds r0, r5, 0
movs r1, 0x1
@@ -85607,7 +85607,7 @@ _080A4C76:
lsls r2, 1
adds r2, 0x8
adds r0, r3, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85659,7 +85659,7 @@ _080A4CF8:
movs r1, 0x5
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x6
str r0, [sp]
adds r0, r5, 0
@@ -85702,7 +85702,7 @@ _080A4D1E:
lsrs r2, 24
adds r0, r5, 0
adds r1, r4, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85753,7 +85753,7 @@ sub_80A4DA4: @ 80A4DA4
movs r1, 0x5
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A7590
add sp, 0x4
pop {r4}
@@ -85807,7 +85807,7 @@ sub_80A4DD8: @ 80A4DD8
lsls r3, 24
lsrs r3, 24
adds r0, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080A4E88
adds r4, 0x1
lsls r4, 24
@@ -87056,7 +87056,7 @@ _080A582C:
movs r0, 0x6
adds r1, r5, 0
movs r2, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
adds r1, r5, 0
bl sub_80A7834
@@ -87558,12 +87558,12 @@ sub_80A5C48: @ 80A5C48
movs r1, 0x7
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A5C94
lsls r0, r4, 2
adds r0, r4
@@ -87591,7 +87591,7 @@ sub_80A5C9C: @ 80A5C9C
movs r1, 0xD
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl sub_8064E2C
@@ -87709,7 +87709,7 @@ sub_80A5D78: @ 80A5D78
movs r0, 0x7
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
add sp, 0x4
pop {r0}
bx r0
@@ -87766,7 +87766,7 @@ sub_80A5DF8: @ 80A5DF8
movs r1, 0x6
movs r2, 0xB
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x4
bl sub_80A7528
pop {r0}
@@ -88051,7 +88051,7 @@ sub_80A6024: @ 80A6024
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A6074
lsls r0, r4, 2
adds r0, r4
@@ -88538,7 +88538,7 @@ sub_80A6444: @ 80A6444
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A6484
lsls r0, r4, 2
adds r0, r4
@@ -88580,7 +88580,7 @@ sub_80A648C: @ 80A648C
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
strh r0, [r4, 0xA]
strh r0, [r4, 0xC]
@@ -88711,7 +88711,7 @@ sub_80A65AC: @ 80A65AC
movs r1, 0x6
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A6600
movs r1, 0x6
str r1, [sp]
@@ -88758,7 +88758,7 @@ sub_80A6618: @ 80A6618
movs r1, 0x6
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A664C
movs r1, 0x6
str r1, [sp]
@@ -88810,7 +88810,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80A6670
movs r1, 0xB
movs r2, 0xC
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A66AC
ldrh r0, [r0]
ldr r2, _080A66B0
@@ -88837,7 +88837,7 @@ _080A66B4:
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A6728
movs r1, 0x3
str r1, [sp]
@@ -88946,12 +88946,12 @@ BuyMenuPrintItemQuantityAndPrice: @ 80A6798
movs r1, 0x4
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A67EC
lsls r0, r4, 2
adds r0, r4
@@ -89345,7 +89345,7 @@ sub_80A6A84: @ 80A6A84
movs r1, 0x6
movs r2, 0xB
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x7
bl sub_80A7528
adds r0, r5, 0
@@ -89747,7 +89747,7 @@ sub_80A6DF0: @ 80A6DF0
movs r0, 0x7
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r2, 0xA
subs r2, r6
lsls r2, 24
@@ -89772,7 +89772,7 @@ sub_80A6DF0: @ 80A6DF0
ldr r0, [r0]
movs r1, 0x8
movs r2, 0xA
- bl Print
+ bl MenuPrint
b _080A6E80
.align 2, 0
_080A6E4C: .4byte 0x02038564
@@ -89788,7 +89788,7 @@ _080A6E58:
ldr r0, [r0]
movs r1, 0x8
movs r2, 0x8
- bl Print
+ bl MenuPrint
ldr r0, [r4]
ldrb r0, [r0, 0x1]
lsls r0, 3
@@ -89796,7 +89796,7 @@ _080A6E58:
ldr r0, [r0]
movs r1, 0x8
movs r2, 0xA
- bl Print
+ bl MenuPrint
_080A6E80:
movs r2, 0xA
subs r2, r6
@@ -90685,7 +90685,7 @@ sub_80A7590: @ 80A7590
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A756C
pop {r0}
bx r0
@@ -90849,7 +90849,7 @@ sub_80A76A0: @ 80A76A0
movs r1, 0x2
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A7678
pop {r0}
bx r0
@@ -90994,7 +90994,7 @@ sub_80A7768: @ 80A7768
lsls r2, 24
lsrs r2, 24
movs r1, 0x7
- bl Print
+ bl MenuPrint
b _080A77FC
.align 2, 0
_080A77A8: .4byte 0x02038550
@@ -91036,7 +91036,7 @@ _080A77DC:
lsls r2, 1
adds r2, 0x8
adds r0, r3, 0
- bl Print
+ bl MenuPrint
_080A77FC:
ldr r1, _080A7824
ldrb r0, [r4, 0x1]
@@ -95839,17 +95839,17 @@ _080A9B24: .4byte gItems
unref_sub_80A9B28: @ 80A9B28
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0x11
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080A9B6C
movs r0, 0x1
movs r1, 0x1
movs r2, 0x7
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0x10
@@ -97257,70 +97257,70 @@ sub_80AA69C: @ 80AA69C
adds r2, r4
adds r0, r6, 0
movs r1, 0x16
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r0, r4, 0x2
adds r2, r0
adds r0, r6, 0
movs r1, 0x18
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r0, r4, 0x1
adds r2, r0
adds r0, r6, 0
movs r1, 0x17
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r0, r4, 0x3
adds r2, r0
adds r0, r6, 0
movs r1, 0x21
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r0, r4, 0x4
adds r2, r0
adds r0, r6, 0
movs r1, 0x2F
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r0, r4, 0x5
adds r2, r0
adds r0, r6, 0
movs r1, 0x30
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
subs r4, 0x8
adds r2, r4
adds r0, r6, 0
movs r1, 0xD
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r2, r4
adds r2, 0x2
adds r0, r6, 0
movs r1, 0xE
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r2, r4
adds r2, 0x4
adds r0, r6, 0
movs r1, 0xF
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 6
adds r2, r4
adds r2, 0x6
adds r0, r6, 0
movs r1, 0x10
- bl pokemon_setattr
+ bl SetMonData
pop {r4-r6}
pop {r0}
bx r0
@@ -98862,8 +98862,8 @@ _080AB2DC:
pop {r0}
bx r0
.align 2, 0
-_080AB300: .4byte gUnknown_08D17D6C
-_080AB304: .4byte gUnknown_08D18818
+_080AB300: .4byte gContestMiscGfx
+_080AB304: .4byte gContestAudienceGfx
_080AB308: .4byte 0x06002000
_080AB30C: .4byte gUnknown_08D1725C
_080AB310: .4byte 0x0600d000
@@ -99430,7 +99430,7 @@ _080AB7A0:
bl LZDecompressVram
b _080AB946
.align 2, 0
-_080AB7AC: .4byte gUnknown_08D17D6C
+_080AB7AC: .4byte gContestMiscGfx
_080AB7B0:
ldr r0, _080AB7EC
ldr r4, _080AB7F0
@@ -99464,7 +99464,7 @@ _080AB7E6:
ldr r0, [r1, 0x8]
b _080AB946
.align 2, 0
-_080AB7EC: .4byte gUnknown_08D18818
+_080AB7EC: .4byte gContestAudienceGfx
_080AB7F0: .4byte 0x06002000
_080AB7F4: .4byte 0x02015800
_080AB7F8: .4byte 0x040000d4
@@ -104454,7 +104454,7 @@ _080AE108:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r4]
lsls r1, 6
adds r1, r5
@@ -104462,7 +104462,7 @@ _080AE108:
adds r0, r6, 0
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
mov r0, sp
bl StringGetEnd10
ldr r0, _080AE188
@@ -104475,7 +104475,7 @@ _080AE108:
bl SkipExtCtrlCodes
adds r0, r6, 0
movs r1, 0x3
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x1
bne _080AE18C
mov r1, sp
@@ -104514,7 +104514,7 @@ _080AE19A:
adds r4, r0
adds r0, r4, 0
movs r1, 0x16
- bl PokemonGetField
+ bl GetMonData
mov r6, r8
subs r6, 0x2
ldrb r1, [r5]
@@ -104524,7 +104524,7 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x17
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
@@ -104532,7 +104532,7 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x18
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
@@ -104540,7 +104540,7 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x21
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
@@ -104548,7 +104548,7 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x2F
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
@@ -104556,7 +104556,7 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x30
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
@@ -104564,35 +104564,35 @@ _080AE19A:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0xD
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
strh r0, [r1, 0x1E]
adds r0, r4, 0
movs r1, 0xE
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
strh r0, [r1, 0x20]
adds r0, r4, 0
movs r1, 0xF
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
strh r0, [r1, 0x22]
adds r0, r4, 0
movs r1, 0x10
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
adds r1, r6
strh r0, [r1, 0x24]
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
mov r2, r8
@@ -104601,7 +104601,7 @@ _080AE19A:
str r0, [r1]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
ldrb r1, [r5]
lsls r1, 6
movs r2, 0x3A
@@ -104610,7 +104610,7 @@ _080AE19A:
str r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r2, r0, 16
mov r8, r2
@@ -104870,7 +104870,7 @@ sub_80AE47C: @ 80AE47C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080AE48E
movs r0, 0x3
@@ -104878,7 +104878,7 @@ sub_80AE47C: @ 80AE47C
_080AE48E:
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080AE49E
movs r0, 0x4
@@ -104923,7 +104923,7 @@ _080AE4E4:
adds r0, r4, 0
movs r1, 0x36
_080AE4E8:
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
b _080AE4F6
@@ -105501,7 +105501,7 @@ unref_sub_80AE908: @ 80AE908
add r0, r9
ldrh r0, [r0]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080AE9EC
mov r2, r8
ldrb r1, [r2]
@@ -105608,7 +105608,7 @@ sub_80AE9FC: @ 80AE9FC
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r4, _080AEAD8
movs r0, 0x2
adds r1, r5, 0
@@ -107091,7 +107091,7 @@ _080AF53E:
adds r0, r1
strh r2, [r0]
ldrh r0, [r4, 0x6]
- bl sub_80B19FC
+ bl contest_get_move_excitement
ldrb r1, [r7, 0x1]
lsls r1, 2
adds r1, r5, r1
@@ -111089,7 +111089,7 @@ _080B1348:
strh r0, [r4]
_080B1362:
ldrh r0, [r4, 0x6]
- bl sub_80B19FC
+ bl contest_get_move_excitement
mov r2, r8
adds r2, 0xC8
strb r0, [r2]
@@ -111900,7 +111900,7 @@ _080B19BC: .4byte 0x02019204
_080B19C0: .4byte 0x02020004
_080B19C4: .4byte 0x06010000
_080B19C8: .4byte REG_BG0CNT
-_080B19CC: .4byte gUnknown_08E6978C
+_080B19CC: .4byte gContestApplauseMeterGfx
thumb_func_end sub_80B1928
thumb_func_start unref_sub_80B19D0
@@ -111926,8 +111926,8 @@ _080B19F4: .4byte gUnknown_083CC2EC
_080B19F8: .4byte 0x03004210
thumb_func_end unref_sub_80B19D0
- thumb_func_start sub_80B19FC
-sub_80B19FC: @ 80B19FC
+ thumb_func_start contest_get_move_excitement
+contest_get_move_excitement: @ 80B19FC
lsls r0, 16
ldr r3, _080B1A20
ldr r1, _080B1A24
@@ -111946,10 +111946,10 @@ sub_80B19FC: @ 80B19FC
ldrsb r0, [r1, r0]
bx lr
.align 2, 0
-_080B1A20: .4byte gUnknown_083CC5B4
+_080B1A20: .4byte gContestExcitementTable
_080B1A24: .4byte gContestMoves
_080B1A28: .4byte 0x0203869c
- thumb_func_end sub_80B19FC
+ thumb_func_end contest_get_move_excitement
thumb_func_start sub_80B1A2C
sub_80B1A2C: @ 80B1A2C
@@ -112814,14 +112814,14 @@ sub_80B208C: @ 80B208C
b _080B20BA
.align 2, 0
_080B20B0: .4byte 0x02019260
-_080B20B4: .4byte gUnknown_08E69478
+_080B20B4: .4byte gContestNextTurnNumbersGfx
_080B20B8:
ldr r0, _080B20C0
_080B20BA:
pop {r1}
bx r1
.align 2, 0
-_080B20C0: .4byte gUnknown_08E69578
+_080B20C0: .4byte gContestNextTurnRandomGfx
thumb_func_end sub_80B208C
thumb_func_start unref_sub_80B20C4
@@ -114446,14 +114446,14 @@ CreateShopMenu: @ 80B2D54
movs r1, 0
movs r2, 0xA
movs r3, 0x7
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080B2D94
ldr r0, _080B2D98
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
movs r2, 0x3
- bl sub_80728E4
+ bl PrintMenuItemsReordered
b _080B2DBC
.align 2, 0
_080B2D90: .4byte 0x03000708
@@ -114466,14 +114466,14 @@ _080B2D9C:
movs r1, 0
movs r2, 0xA
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080B2DEC
ldr r0, _080B2DF0
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
movs r2, 0x2
- bl sub_80728E4
+ bl PrintMenuItemsReordered
_080B2DBC:
ldr r0, _080B2DF4
ldrb r3, [r0, 0xA]
@@ -114701,7 +114701,7 @@ HandleShopMenuQuit: @ 80B2F64
movs r1, 0
movs r2, 0xB
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80BE3BC
bl script_env_2_disable
adds r0, r4, 0
@@ -114959,7 +114959,7 @@ BuyMenuDrawGraphics: @ 80B3108
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
bl BuyMenuDrawMapGraphics
ldr r0, _080B322C
strb r6, [r0, 0x9]
@@ -114968,7 +114968,7 @@ BuyMenuDrawGraphics: @ 80B3108
movs r1, 0
movs r2, 0x20
movs r3, 0x20
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3230
movs r1, 0x92
lsls r1, 3
@@ -115013,9 +115013,9 @@ _080B3204: .4byte REG_BG1HOFS
_080B3208: .4byte 0x0202f388
_080B320C: .4byte 0x040000d4
_080B3210: .4byte 0x85000100
-_080B3214: .4byte gUnknown_08E77804
+_080B3214: .4byte gBuyMenuFrame_Gfx
_080B3218: .4byte 0x06007c00
-_080B321C: .4byte gUnknown_08E77928
+_080B321C: .4byte gBuyMenuFrame_Tilemap
_080B3220: .4byte 0x02018000
_080B3224: .4byte gMenuMoneyPal
_080B3228: .4byte gWindowConfig_81E6DFC
@@ -115836,7 +115836,7 @@ sub_80B37F8: @ 80B37F8
ldr r0, _080B3890
movs r1, 0x1
movs r2, 0xB
- bl Print
+ bl MenuPrint
ldr r0, _080B3894
movs r1, 0x2
str r1, [sp]
@@ -116083,11 +116083,11 @@ _080B3A2E:
movs r0, 0xE
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080B3A6C
movs r1, 0xE
adds r2, r4, 0
- bl Print
+ bl MenuPrint
_080B3A60:
pop {r4-r6}
pop {r0}
@@ -116299,7 +116299,7 @@ sub_80B3BF4: @ 80B3BF4
movs r1, 0x8
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3C7C
movs r1, 0x4
str r1, [sp]
@@ -116442,7 +116442,7 @@ sub_80B3D38: @ 80B3D38
movs r0, 0x7
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _080B3D70
movs r1, 0x4
str r1, [sp]
@@ -116481,7 +116481,7 @@ sub_80B3D7C: @ 80B3D7C
movs r1, 0x8
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3DC4
movs r1, 0x4
str r1, [sp]
@@ -116560,7 +116560,7 @@ _080B3DEE:
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3EB8
movs r1, 0x2
str r1, [sp]
@@ -116652,7 +116652,7 @@ sub_80B3EFC: @ 80B3EFC
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
bl sub_80B37F8
ldr r6, _080B3F7C
@@ -117014,7 +117014,7 @@ _080B41CE:
movs r1, 0xC
movs r2, 0xD
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r0, [r6, 0xC]
cmp r0, 0
bne _080B428C
@@ -117189,12 +117189,12 @@ sub_80B4378: @ 80B4378
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B43E4
movs r1, 0x2
str r1, [sp]
@@ -119119,7 +119119,7 @@ _080B51B8:
mov r0, r9
adds r2, r7, 0
adds r3, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r6, r9
adds r6, 0x1
lsls r6, 24
@@ -119132,7 +119132,7 @@ _080B51B8:
adds r1, r5, 0
mov r2, r8
mov r3, r10
- bl PrintStringArray
+ bl PrintMenuItems
ldr r0, [sp, 0x10]
str r0, [sp]
mov r1, r9
@@ -119304,7 +119304,7 @@ _080B532C:
ldrb r1, [r3, 0xA]
ldrb r2, [r3, 0xC]
ldrb r3, [r3, 0xE]
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119424,7 +119424,7 @@ _080B5408:
mov r0, r8
adds r2, r6, 0
adds r3, r7, 0
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
mov r1, r8
@@ -119475,7 +119475,7 @@ yes_no_box: @ 80B546C
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
adds r0, r6, 0
movs r1, 0x50
bl CreateTask
@@ -119586,7 +119586,7 @@ _080B5542:
adds r3, r1, 0x5
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119782,7 +119782,7 @@ _080B56D2:
ldrb r1, [r3, 0xA]
ldrb r2, [r3, 0xC]
ldrb r3, [r3, 0xE]
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119855,15 +119855,15 @@ _080B5762:
movs r0, 0
movs r1, 0
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080B579C
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _080B57A0
movs r1, 0x1
movs r2, 0x7
- bl Print
+ bl MenuPrint
b _080B57C0
.align 2, 0
_080B5798: .4byte 0x00000804
@@ -119877,11 +119877,11 @@ _080B57A4:
movs r0, 0
movs r1, 0
movs r3, 0x7
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080B57DC
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
_080B57C0:
adds r6, r4, 0
ldr r0, _080B57E0
@@ -119892,7 +119892,7 @@ _080B57C0:
ldr r0, _080B57E4
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
b _080B57F2
.align 2, 0
_080B57DC: .4byte gUnknown_08410782
@@ -119902,12 +119902,12 @@ _080B57E8:
ldr r0, _080B5830
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
_080B57F2:
ldr r0, _080B5834
movs r1, 0x1
movs r2, 0x3
- bl Print
+ bl MenuPrint
movs r4, 0
str r4, [sp]
adds r0, r5, 0x1
@@ -119940,11 +119940,11 @@ _080B5834: .4byte gUnknown_0841076D
thumb_func_start sub_80B5838
sub_80B5838: @ 80B5838
push {lr}
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r0, _080B584C
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -120005,7 +120005,7 @@ _080B58A0:
adds r3, 0xA
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
_080B58BE:
@@ -120040,7 +120040,7 @@ sub_80B58C4: @ 80B58C4
lsrs r3, 24
adds r0, r6, 0
adds r1, r5, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x50
bl CreateTask
@@ -120657,7 +120657,7 @@ sub_80B5DC8: @ 80B5DC8
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
pop {r4}
pop {r0}
bx r0
@@ -120971,7 +120971,7 @@ _080B6048: .4byte 0x02000000
thumb_func_start sub_80B604C
sub_80B604C: @ 80B604C
push {lr}
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _080B6060
@@ -123847,8 +123847,8 @@ sub_80B74FC: @ 80B74FC
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080B7538
- bl sub_8071E2C
- bl sub_8071FFC
+ bl BasicInitMenuWindow
+ bl MenuDisplayMessageBox
adds r0, r4, 0
bl sub_8072044
pop {r4}
@@ -123913,7 +123913,7 @@ sub_80B7568: @ 80B7568
pop {r0}
bx r0
.align 2, 0
-_080B759C: .4byte gUnknown_08E85998
+_080B759C: .4byte gNamingScreenMenu_Gfx
_080B75A0: .4byte 0x0202e9d4
_080B75A4: .4byte 0x040000d4
_080B75A8: .4byte 0x80000400
@@ -124208,7 +124208,7 @@ sub_80B7794: @ 80B7794
adds r0, r1
adds r0, r6
ldr r0, [r0]
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r5, _080B77F4
ldrb r0, [r4, 0xE]
lsls r0, 3
@@ -124223,7 +124223,7 @@ sub_80B7794: @ 80B7794
adds r6, 0x8
adds r1, r6
ldr r0, [r1]
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldrb r0, [r4, 0xE]
lsls r0, 3
adds r5, 0x4
@@ -124254,7 +124254,7 @@ sub_80B77F8: @ 80B77F8
adds r2, 0x8
adds r1, r2
ldr r0, [r1]
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r1, _080B7834
ldrb r0, [r4, 0xE]
lsls r0, 3
@@ -124321,7 +124321,7 @@ _080B786C:
lsls r2, r5, 24
lsrs r2, 24
movs r1, 0x3
- bl Print
+ bl MenuPrint
adds r4, 0x1
lsls r4, 16
lsls r0, r5, 16
@@ -124344,7 +124344,7 @@ _080B78A4: .4byte gUnknown_083CE3A8
sub_80B78A8: @ 80B78A8
push {r4,lr}
ldr r0, _080B78E4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r1, _080B78E8
ldr r4, _080B78EC
ldrb r0, [r4, 0x1]
@@ -124363,7 +124363,7 @@ sub_80B78A8: @ 80B78A8
ldr r0, [r0, 0x8]
movs r1, 0x9
movs r2, 0x2
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -124427,7 +124427,7 @@ _080B7948:
mov r0, sp
movs r1, 0x14
movs r2, 0x4
- bl Print
+ bl MenuPrint
_080B7952:
add sp, 0x4
pop {r0}
@@ -124457,12 +124457,12 @@ sub_80B7960: @ 80B7960
adds r1, r4, 0
bl StringCopy
ldr r0, _080B79A4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080B799C
subs r4, 0x11
ldrb r1, [r4, 0x2]
movs r2, 0x4
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -124639,7 +124639,7 @@ sub_80B7A94: @ 80B7A94
mov r0, sp
adds r1, r6, 0
adds r2, r7, 0
- bl Print
+ bl MenuPrint
b _080B7AE4
_080B7ACE:
adds r1, r6, 0x1
@@ -124681,7 +124681,7 @@ sub_80B7AEC: @ 80B7AEC
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
movs r0, 0xFC
strb r0, [r6]
movs r0, 0x14
@@ -124780,7 +124780,7 @@ _080B7BAA:
pop {r0}
bx r0
.align 2, 0
-_080B7BD8: .4byte gUnknown_08EA2A44
+_080B7BD8: .4byte gDecoration10000_Gfx
_080B7BDC: .4byte 0x06008000
_080B7BE0: .4byte 0xfffff000
_080B7BE4: .4byte 0x0600f800
@@ -124833,7 +124833,7 @@ sub_80B7C14: @ 80B7C14
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
@@ -124899,7 +124899,7 @@ RemoveMoneyLabelObject: @ 80B7C98
lsrs r3, 24
adds r0, r4, 0
adds r1, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4,r5}
pop {r0}
bx r0
@@ -128208,7 +128208,7 @@ _080B9570:
ldr r0, _080B95A8
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
strh r5, [r4, 0x10]
b _080B95E6
.align 2, 0
@@ -128237,7 +128237,7 @@ _080B95C0:
cmp r0, 0
bne _080B95E6
bl sub_8055588
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r5, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -128306,11 +128306,11 @@ _080B963C:
_080B964C: .4byte 0x0000012d
_080B9650:
bl sub_80B9A78
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r0, _080B9674
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0xE1
lsls r0, 3
strh r0, [r5, 0x18]
@@ -129741,7 +129741,7 @@ unref_sub_80BA0EC: @ 80BA0EC
ldr r0, _080BA220
bl SetUpWindowConfig
ldr r0, _080BA224
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -129883,45 +129883,45 @@ sub_80BA258: @ 80BA258
movs r1, 0
movs r2, 0x1B
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0x5
movs r2, 0x1B
movs r3, 0xA
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0xC
movs r2, 0x1B
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x4
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0xE
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0x4
movs r2, 0x6
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0xE
movs r2, 0x6
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x4
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0xE
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0xE
movs r2, 0x12
- bl Print
+ bl MenuPrint
ldr r1, _080BA370
mov r2, r9
lsls r0, r2, 2
@@ -130491,7 +130491,7 @@ _080BA76C:
lsls r2, r7, 24
lsrs r2, 24
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r4-r7}
pop {r0}
@@ -130546,7 +130546,7 @@ _080BA7EC:
lsrs r1, r2, 24
lsrs r2, r5, 24
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -130654,63 +130654,63 @@ sub_80BA800: @ 80BA800
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x13
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xB4]
movs r1, 0x13
movs r2, 0x2
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xB8]
movs r1, 0x2
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xBC]
movs r1, 0x2
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC0]
movs r1, 0x2
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC4]
movs r1, 0x2
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC8]
movs r1, 0x2
movs r2, 0x9
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
mov r0, r10
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
mov r0, r9
movs r1, 0x2
movs r2, 0x11
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x13
movs r2, 0x10
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x13
movs r2, 0xE
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x13
movs r2, 0xC
- bl Print
+ bl MenuPrint
ldr r1, _080BAA20
movs r0, 0xF0
strh r0, [r1]
@@ -130822,7 +130822,7 @@ sub_80BAA48: @ 80BAA48
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BAAA0
lsls r0, r4, 2
adds r0, r4
@@ -131013,7 +131013,7 @@ _080BABF2:
b _080BAC98
.align 2, 0
_080BAC04: .4byte 0x020387d8
-_080BAC08: .4byte gUnknown_084537C0
+_080BAC08: .4byte voicegroup_84537C0
_080BAC0C:
lsls r0, r1, 1
adds r0, r1
@@ -131021,7 +131021,7 @@ _080BAC0C:
ldr r1, _080BAC18
b _080BAC98
.align 2, 0
-_080BAC18: .4byte gUnknown_08452590
+_080BAC18: .4byte voicegroup_8452590
_080BAC1C:
ldr r0, _080BAC30
ldrb r0, [r0]
@@ -131034,7 +131034,7 @@ _080BAC1C:
b _080BAC98
.align 2, 0
_080BAC30: .4byte 0x020387d8
-_080BAC34: .4byte gUnknown_08453DC0
+_080BAC34: .4byte voicegroup_8453DC0
_080BAC38:
lsls r0, r1, 1
adds r0, r1
@@ -131042,7 +131042,7 @@ _080BAC38:
ldr r1, _080BAC44
b _080BAC98
.align 2, 0
-_080BAC44: .4byte gUnknown_08452B90
+_080BAC44: .4byte voicegroup_8452B90
_080BAC48:
ldr r0, _080BAC5C
ldrb r0, [r0]
@@ -131055,7 +131055,7 @@ _080BAC48:
b _080BAC98
.align 2, 0
_080BAC5C: .4byte 0x020387d8
-_080BAC60: .4byte gUnknown_084543C0
+_080BAC60: .4byte voicegroup_84543C0
_080BAC64:
lsls r0, r1, 1
adds r0, r1
@@ -131063,7 +131063,7 @@ _080BAC64:
ldr r1, _080BAC70
b _080BAC98
.align 2, 0
-_080BAC70: .4byte gUnknown_08453190
+_080BAC70: .4byte voicegroup_8453190
_080BAC74:
ldr r0, _080BAC88
ldrb r0, [r0]
@@ -131076,7 +131076,7 @@ _080BAC74:
b _080BAC98
.align 2, 0
_080BAC88: .4byte 0x020387d8
-_080BAC8C: .4byte gUnknown_084549C0
+_080BAC8C: .4byte voicegroup_84549C0
_080BAC90:
lsls r0, r1, 1
adds r0, r1
@@ -131110,7 +131110,7 @@ _080BACC6:
pop {r0}
bx r0
.align 2, 0
-_080BACCC: .4byte gUnknown_08453790
+_080BACCC: .4byte voicegroup_8453790
_080BACD0: .4byte 0x03005d30
_080BACD4: .4byte 0x020387b1
_080BACD8: .4byte 0x020387b2
@@ -131289,7 +131289,7 @@ sub_80BAE10: @ 80BAE10
adds r4, r6
ldrb r2, [r4]
mov r0, r8
- bl Print
+ bl MenuPrint
lsls r5, 1
adds r0, r5, r6
ldrb r1, [r0]
@@ -131297,7 +131297,7 @@ sub_80BAE10: @ 80BAE10
adds r5, r6
ldrb r2, [r5]
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3}
mov r8, r3
@@ -131441,7 +131441,7 @@ _080BAF62:
ldr r4, [sp, 0x28]
lsrs r2, r4, 24
mov r0, r9
- bl Print
+ bl MenuPrint
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -131485,19 +131485,19 @@ sub_80BAF84: @ 80BAF84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x3
movs r2, 0x2
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x3
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x3
movs r2, 0x8
- bl Print
+ bl MenuPrint
ldr r1, _080BB028
movs r0, 0xF0
strh r0, [r1]
@@ -131614,7 +131614,7 @@ _080BB0A2:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BB0FC
lsls r0, r5, 2
adds r0, r5
@@ -131783,7 +131783,7 @@ _080BB228:
_080BB22A:
movs r1, 0x7
movs r2, 0x4
- bl Print
+ bl MenuPrint
b _080BB240
_080BB234:
adds r0, r1, 0
@@ -131814,7 +131814,7 @@ sub_80BB25C: @ 80BB25C
ldr r0, _080BB374
bl SetUpWindowConfig
ldr r0, _080BB378
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r1, _080BB37C
movs r0, 0x1
strh r0, [r1]
@@ -131899,7 +131899,7 @@ _080BB306:
movs r1, 0x10
movs r2, 0x5
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_80BB494
movs r0, 0x1
negs r0, r0
@@ -132044,7 +132044,7 @@ _080BB42E:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BB48C
lsls r0, r5, 2
adds r0, r5
@@ -133914,37 +133914,37 @@ sub_80BC298: @ 80BC298
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1A
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1B
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1C
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1D
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1E
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1F
- bl PokemonGetField
+ bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
@@ -134014,12 +134014,12 @@ _080BC322:
adds r4, r5, r7
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080BC408
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080BC408
movs r4, 0
@@ -134036,7 +134036,7 @@ _080BC38E:
adds r1, 0xD
adds r0, r5, r2
str r2, [sp, 0x8]
- bl PokemonGetField
+ bl GetMonData
mov r3, r8
adds r1, r3, r4
lsls r1, 1
@@ -134056,25 +134056,25 @@ _080BC38E:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldr r5, _080BC42C
adds r1, r5, r7
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
ldr r2, _080BC430
adds r1, r2, r7
strh r0, [r1]
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
ldr r1, _080BC434
add r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
ldr r1, _080BC438
add r1, r8
str r0, [r1]
@@ -134405,7 +134405,7 @@ _080BC65E:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_80BC7D8
ldr r1, _080BC68C
@@ -134506,11 +134506,11 @@ _080BC70E:
movs r0, 0x12
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r7, 0
movs r1, 0x12
adds r2, r4, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -134535,11 +134535,11 @@ _080BC75A:
movs r0, 0x12
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080BC7A4
movs r1, 0x12
adds r2, r4, 0
- bl Print
+ bl MenuPrint
movs r0, 0x1
bl SetBgTilemapBuffer
cmp r6, 0x7
@@ -134552,7 +134552,7 @@ _080BC75A:
movs r0, 0x12
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _080BC7B2
.align 2, 0
_080BC7A0: .4byte 0x020231cc
@@ -134600,7 +134600,7 @@ sub_80BC7D8: @ 80BC7D8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r3, [r4, 0x6]
adds r3, 0x1
lsls r3, 24
@@ -134723,7 +134723,7 @@ _080BC8C2:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_80BCC54
b _080BC940
@@ -134753,7 +134753,7 @@ _080BC91C:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_80BCC54
_080BC940:
@@ -134812,12 +134812,12 @@ sub_80BC980: @ 80BC980
movs r1, 0
movs r2, 0xC
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080BC9D8
movs r0, 0x2
movs r1, 0x1
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xA
@@ -134938,7 +134938,7 @@ sub_80BCA84: @ 80BCA84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080BCADC
ldrb r1, [r4, 0x8]
bl sub_80BC190
@@ -134971,7 +134971,7 @@ sub_80BCAEC: @ 80BCAEC
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _080BCB0C
adds r0, r4, 0
bl sub_80F914C
@@ -134997,7 +134997,7 @@ sub_80BCB10: @ 80BCB10
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080BCB84
movs r0, 0x8
ldrsh r1, [r4, r0]
@@ -135057,7 +135057,7 @@ sub_80BCB90: @ 80BCB90
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BCBB8
ldr r2, _080BCBBC
adds r0, r4, 0
@@ -135081,7 +135081,7 @@ sub_80BCBC0: @ 80BCBC0
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80BC7D8
ldr r1, _080BCBF0
@@ -135126,7 +135126,7 @@ sub_80BCBF8: @ 80BCBF8
movs r1, 0
movs r2, 0xC
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -138124,7 +138124,7 @@ sub_80BE284: @ 80BE284
adds r0, r4
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
strh r0, [r7, 0x2]
ldrb r0, [r6]
muls r0, r5
@@ -138132,7 +138132,7 @@ sub_80BE284: @ 80BE284
adds r2, r7, 0
adds r2, 0x8
movs r1, 0x2
- bl PokemonGetField
+ bl GetMonData
_080BE2FE:
pop {r4-r7}
pop {r0}
@@ -138328,7 +138328,7 @@ sub_80BE478: @ 80BE478
ldr r4, _080BE560
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
ldr r1, _080BE564
mov r9, r1
mov r0, r9
@@ -138362,7 +138362,7 @@ sub_80BE478: @ 80BE478
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4, 0x2]
bl Random
lsls r0, 16
@@ -138389,7 +138389,7 @@ sub_80BE478: @ 80BE478
adds r5, r4, 0x4
movs r1, 0x2
adds r2, r5, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r4, 0
bl sub_80BE160
movs r0, 0x2
@@ -138516,7 +138516,7 @@ sub_80BE5FC: @ 80BE5FC
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4, 0x2]
adds r0, r4, 0
bl sub_80BE160
@@ -138596,7 +138596,7 @@ sub_80BE6A0: @ 80BE6A0
adds r0, r6
movs r1, 0x20
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
lsrs r0, 4
movs r1, 0xF
ands r0, r1
@@ -138627,7 +138627,7 @@ sub_80BE6A0: @ 80BE6A0
adds r5, 0x10
movs r1, 0x2
adds r2, r5, 0
- bl PokemonGetField
+ bl GetMonData
bl sub_810F87C
lsls r0, 24
lsrs r0, 24
@@ -138637,7 +138637,7 @@ sub_80BE6A0: @ 80BE6A0
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4, 0x2]
adds r0, r4, 0
bl sub_80BE160
@@ -140234,7 +140234,7 @@ sub_80BF334: @ 80BF334
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, _080BF398
@@ -140313,7 +140313,7 @@ sub_80BF3DC: @ 80BF3DC
adds r0, r4
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, _080BF45C
@@ -140328,7 +140328,7 @@ sub_80BF3DC: @ 80BF3DC
ldr r4, _080BF460
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
ldr r0, _080BF464
@@ -140447,11 +140447,11 @@ sub_80BF4F4: @ 80BF4F4
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
movs r1, 0xB
muls r0, r1
ldr r1, _080BF538
@@ -141124,7 +141124,7 @@ sub_80BF9B4: @ 80BF9B4
ldr r4, _080BF9E8
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
ldr r0, _080BF9EC
adds r1, r4, 0
bl StringCompareWithoutExtCtrlCodes
@@ -141166,7 +141166,7 @@ sub_80BF9F8: @ 80BF9F8
adds r0, r6
ldr r2, _080BFAA8
movs r1, 0x2
- bl PokemonGetField
+ bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -141177,7 +141177,7 @@ sub_80BF9F8: @ 80BF9F8
mov r10, r1
movs r1, 0x2
mov r2, r10
- bl PokemonGetField
+ bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -141186,7 +141186,7 @@ sub_80BF9F8: @ 80BF9F8
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -141196,7 +141196,7 @@ sub_80BF9F8: @ 80BF9F8
muls r1, r0
adds r0, r1, 0
adds r0, r6
- bl pokemon_get_gender
+ bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -141208,7 +141208,7 @@ sub_80BF9F8: @ 80BF9F8
adds r0, r6
movs r1, 0
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [sp]
ldr r0, _080BFAB0
str r0, [sp, 0x4]
@@ -141244,7 +141244,7 @@ c2_080CC144: @ 80BFAB4
adds r0, r1
ldr r2, _080BFADC
movs r1, 0x2
- bl pokemon_setattr
+ bl SetMonData
bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
bx r0
@@ -141266,7 +141266,7 @@ sub_80BFAE0: @ 80BFAE0
ldr r4, _080BFB0C
movs r1, 0x2
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
pop {r4}
@@ -141291,7 +141291,7 @@ sub_80BFB10: @ 80BFB10
adds r0, r1
movs r1, 0x1
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
cmp r4, r0
bne _080BFB44
ldr r1, _080BFB40
@@ -146987,7 +146987,7 @@ _080C2B14:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080C2BE8
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
@@ -150239,7 +150239,7 @@ _080C44A0:
adds r0, r2, 0
movs r1, 0x36
_080C44A4:
- bl PokemonGetField
+ bl GetMonData
ldr r1, _080C44BC
ldrh r1, [r1]
cmp r0, r1
@@ -150298,7 +150298,7 @@ _080C450C:
ldr r4, _080C454C
adds r0, r4
movs r1, 0x32
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
mov r0, sp
@@ -150335,7 +150335,7 @@ _080C4554:
ldr r5, _080C4590
adds r0, r5
movs r1, 0x33
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -150366,7 +150366,7 @@ _080C4598:
ldr r5, _080C45D4
adds r0, r5
movs r1, 0x34
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -150397,7 +150397,7 @@ _080C45DC:
ldr r5, _080C461C
adds r0, r5
movs r1, 0x35
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -150416,7 +150416,7 @@ _080C45DC:
movs r1, 0x35
_080C4610:
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
b _080C465E
.align 2, 0
_080C4618: .4byte 0x02038694
@@ -150431,7 +150431,7 @@ _080C4624:
ldr r5, _080C466C
adds r0, r5
movs r1, 0x36
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -150449,7 +150449,7 @@ _080C4624:
adds r0, r5
movs r1, 0x36
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
_080C465E:
add sp, 0x4
pop {r4-r7}
@@ -151718,7 +151718,7 @@ sub_80C4FBC: @ 80C4FBC
ldr r4, _080C5020
adds r0, r4
movs r1, 0x46
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -151752,7 +151752,7 @@ sub_80C4FBC: @ 80C4FBC
adds r0, r4
movs r1, 0x46
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
movs r0, 0x1
b _080C503A
.align 2, 0
@@ -151802,7 +151802,7 @@ sub_80C5050: @ 80C5050
movs r1, 0x3
movs r2, 0x13
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r2, _080C5140
ldr r0, _080C5144
ldrh r1, [r0]
@@ -151855,7 +151855,7 @@ sub_80C5050: @ 80C5050
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080C5158
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
@@ -152001,7 +152001,7 @@ _080C5204:
adds r3, 0xA
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
_080C5222:
@@ -152105,7 +152105,7 @@ _080C52CE:
add r4, r10
adds r0, r4, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
lsls r1, r0, 16
strb r0, [r6]
lsrs r1, 24
@@ -152113,10 +152113,10 @@ _080C52CE:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r7, r0, 24
movs r5, 0
@@ -152127,7 +152127,7 @@ _080C5304:
adds r1, r5, 0
adds r1, 0xD
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r7, 0
@@ -152138,7 +152138,7 @@ _080C5304:
adds r1, 0x11
adds r0, r4, 0
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -152155,7 +152155,7 @@ _080C5304:
add r0, r10
movs r1, 0x37
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, r9
lsls r0, r1, 24
lsrs r0, 24
@@ -152204,7 +152204,7 @@ sub_80C5374: @ 80C5374
adds r1, r5, 0
adds r2, r3, 0
movs r3, 0x20
- bl create_pokemon_set_level
+ bl CreateMon
add r0, sp, 0x10
mov r1, r8
strb r1, [r0]
@@ -152213,7 +152213,7 @@ sub_80C5374: @ 80C5374
adds r0, r6, 0
movs r1, 0xC
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r6, 0
bl pokemon_catch
lsls r0, 24
@@ -152257,7 +152257,7 @@ sub_80C53F8: @ 80C53F8
strb r0, [r2]
mov r0, sp
movs r1, 0x2D
- bl pokemon_setattr
+ bl SetMonData
mov r0, sp
bl pokemon_catch
lsls r0, 24
@@ -152309,7 +152309,7 @@ _080C545C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -152318,7 +152318,7 @@ _080C545C:
beq _080C5490
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
cmp r0, r6
bne _080C5490
movs r0, 0x1
@@ -152375,7 +152375,7 @@ sub_80C54D0: @ 80C54D0
lsrs r5, 24
lsls r7, r2, 16
lsrs r6, r7, 16
- bl zero_enemy_party_data
+ bl ZeroEnemyPartyMons
ldr r0, _080C552C
mov r8, r0
movs r0, 0
@@ -152387,7 +152387,7 @@ sub_80C54D0: @ 80C54D0
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x20
- bl create_pokemon_set_level
+ bl CreateMon
cmp r6, 0
beq _080C551E
add r0, sp, 0x10
@@ -152398,7 +152398,7 @@ sub_80C54D0: @ 80C54D0
mov r0, r8
movs r1, 0xC
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
_080C551E:
add sp, 0x14
pop {r3}
@@ -152432,7 +152432,7 @@ _080C554C:
ldr r1, _080C5564
adds r0, r1
adds r1, r4, 0
- bl sub_803B6A4
+ bl SetMonMoveSlot
pop {r4}
pop {r0}
bx r0
@@ -152592,7 +152592,7 @@ _080C5680: .4byte 0x05000096
sub_80C5684: @ 80C5684
push {lr}
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -152623,7 +152623,7 @@ _080C56AE:
beq _080C56CC
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080C56CC
movs r0, 0
@@ -152661,12 +152661,12 @@ sub_80C56DC: @ 80C56DC
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
ldr r5, _080C5724
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
- bl PokemonGetField
+ bl GetMonData
adds r0, r5, 0
bl StringGetEnd10
add sp, 0x4
@@ -152693,12 +152693,12 @@ sub_80C5728: @ 80C5728
beq _080C5768
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080C5768
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
@@ -152835,12 +152835,12 @@ overworld_poison: @ 80C583C
_080C5848:
adds r0, r4, 0
movs r1, 0x5
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080C588C
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
@@ -152848,7 +152848,7 @@ _080C5848:
bne _080C588C
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
str r0, [sp]
cmp r0, 0
beq _080C587E
@@ -152862,7 +152862,7 @@ _080C5880:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r7, 0x1
_080C588C:
adds r4, 0x64
@@ -152906,45 +152906,45 @@ sub_80C58C0: @ 80C58C0
sub sp, 0x8
adds r5, r0, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
str r0, [sp, 0x4]
lsrs r0, 16
str r0, [sp]
adds r0, r5, 0
movs r1, 0x27
- bl PokemonGetField
+ bl GetMonData
adds r7, r0, 0
movs r6, 0xF
ands r7, r6
adds r0, r5, 0
movs r1, 0x28
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
mov r1, r8
ands r1, r6
mov r8, r1
adds r0, r5, 0
movs r1, 0x29
- bl PokemonGetField
+ bl GetMonData
mov r9, r0
mov r3, r9
ands r3, r6
mov r9, r3
adds r0, r5, 0
movs r1, 0x2A
- bl PokemonGetField
+ bl GetMonData
mov r10, r0
ands r0, r6
mov r10, r0
adds r0, r5, 0
movs r1, 0x2B
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
ands r4, r6
adds r0, r5, 0
movs r1, 0x2C
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
ands r2, r6
mov r1, r8
@@ -153141,12 +153141,12 @@ _080C5AA8:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x1
beq _080C5ACA
adds r0, r5, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, r6
beq _080C5AD4
_080C5ACA:
@@ -153371,12 +153371,12 @@ _080C5C70:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080C5CA2
adds r0, r4, 0
movs r1, 0x6
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080C5CA2
mov r1, sp
@@ -153384,7 +153384,7 @@ _080C5C70:
ldrb r1, [r0]
adds r0, r4, 0
mov r2, r8
- bl pokemon_setattr
+ bl SetMonData
movs r7, 0x1
_080C5CA2:
adds r5, 0x1
@@ -160095,7 +160095,7 @@ sub_80C9098: @ 80C9098
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080C90D0
adds r0, r6, 0
adds r1, r5, 0
@@ -160675,7 +160675,7 @@ sub_80C9520: @ 80C9520
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8064E2C
bl script_env_2_disable
adds r0, r4, 0
@@ -161530,7 +161530,7 @@ ItemUseOutOfBattle_CoinCase: @ 80C9B38
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080C9B9C
adds r0, r5, 0
adds r1, r4, 0
@@ -161615,7 +161615,7 @@ unref_sub_80C9BF8: @ 80C9BF8
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _080C9C40
ldr r0, _080C9C44
ldrh r0, [r0]
@@ -161852,12 +161852,12 @@ _080C9DE6:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080C9DE0
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080C9DE0
ldr r0, _080C9E2C
@@ -161939,7 +161939,7 @@ ItemUseOutOfBattle_TMHM: @ 80C9E90
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080C9EBC
ldrh r1, [r0]
movs r0, 0xA9
@@ -162055,7 +162055,7 @@ sub_80C9F80: @ 80C9F80
movs r0, 0x7
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _080C9FB8
movs r1, 0x4
str r1, [sp]
@@ -162412,7 +162412,7 @@ _080CA26C:
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080CA28C
ldr r2, _080CA290
adds r0, r4, 0
@@ -162507,7 +162507,7 @@ ItemUseInBattle_StatIncrease: @ 80CA310
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x64
muls r0, r4
ldr r1, _080CA364
@@ -162662,7 +162662,7 @@ unref_sub_80CA448: @ 80CA448
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _080CA494
ldrh r1, [r4]
movs r0, 0
@@ -162718,7 +162718,7 @@ ItemUseInBattle_Escape: @ 80CA4C8
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080CA4F8
ldrh r1, [r0]
movs r0, 0x8
@@ -178143,7 +178143,7 @@ _080D1B24:
.align 2, 0
_080D1B34: .4byte 0x000027de
_080D1B38: .4byte 0x00002710
-_080D1B3C: .4byte gUnknown_08D229BC
+_080D1B3C: .4byte gBattleAnimSpritePalette_206
_080D1B40: .4byte 0x02018000
_080D1B44: .4byte 0xffffc800
_080D1B48: .4byte 0x02014800
@@ -178977,9 +178977,9 @@ _080D21CC: .4byte 0x030041b4
_080D21D0: .4byte REG_BG1HOFS
_080D21D4: .4byte 0x040000d4
_080D21D8: .4byte 0x85000400
-_080D21DC: .4byte gUnknown_08D24124
-_080D21E0: .4byte gUnknown_08D2368C
-_080D21E4: .4byte gUnknown_08D240FC
+_080D21DC: .4byte gAttractTilemap
+_080D21E0: .4byte gAttractGfx
+_080D21E4: .4byte gAttractPal
_080D21E8: .4byte 0x03004b20
_080D21EC: .4byte sub_80D21F0
thumb_func_end sub_80D2100
@@ -179287,7 +179287,7 @@ _080D2448: .4byte 0x030041b4
_080D244C: .4byte REG_BG1HOFS
_080D2450: .4byte 0x040000d4
_080D2454: .4byte 0x85000400
-_080D2458: .4byte gUnknown_08E6E4C8
+_080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest
_080D245C:
ldr r0, _080D2478
ldrb r0, [r0]
@@ -179303,7 +179303,7 @@ _080D246E:
b _080D2488
.align 2, 0
_080D2478: .4byte 0x0202f7c9
-_080D247C: .4byte gUnknown_08E6E100
+_080D247C: .4byte gBattleAnimBackgroundTilemap_ScaryFacePlayer
_080D2480:
ldr r0, _080D24CC
ldr r1, [sp, 0x4]
@@ -179341,9 +179341,9 @@ _080D24B6:
pop {r0}
bx r0
.align 2, 0
-_080D24CC: .4byte gUnknown_08E6E2E4
-_080D24D0: .4byte gUnknown_08D24DA4
-_080D24D4: .4byte gUnknown_08D24D7C
+_080D24CC: .4byte gBattleAnimBackgroundTilemap_ScaryFaceOpponent
+_080D24D0: .4byte gBattleAnimBackgroundImage_ScaryFace
+_080D24D4: .4byte gBattleAnimBackgroundPalette_ScaryFace
_080D24D8: .4byte 0x03004b20
_080D24DC: .4byte sub_80D24E0
thumb_func_end sub_80D23B4
@@ -182092,9 +182092,9 @@ _080D39CE:
b _080D3A0E
.align 2, 0
_080D39F0: .4byte gUnknown_08E70F0C
-_080D39F4: .4byte gUnknown_08E6F620
+_080D39F4: .4byte gBattleAnimBackgroundImage_Surf
_080D39F8: .4byte 0x03004b00
-_080D39FC: .4byte gUnknown_08E70940
+_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf
_080D3A00:
ldr r0, _080D3A78
mov r1, sp
@@ -182154,7 +182154,7 @@ _080D3A0E:
strh r0, [r7, 0xE]
b _080D3AEE
.align 2, 0
-_080D3A78: .4byte gUnknown_08E6A704
+_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal
_080D3A7C: .4byte sub_80D3D68
_080D3A80: .4byte 0x03004b20
_080D3A84: .4byte 0x0000ffb0
@@ -183368,12 +183368,12 @@ _080D43D8:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
adds r0, r5, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
lsrs r4, 18
@@ -186102,7 +186102,7 @@ _080D58E4: .4byte gSpriteTemplate_83D96C4
_080D58E8: .4byte 0x02020004
_080D58EC: .4byte 0x000003ff
_080D58F0: .4byte 0xfffffc00
-_080D58F4: .4byte gUnknown_083D96DE
+_080D58F4: .4byte gUnknown_083D96DC + 0x2
_080D58F8: .4byte 0x03004b28
thumb_func_end sub_80D57C4
@@ -191440,7 +191440,7 @@ _080D81C0: .4byte 0x040000d4
_080D81C4: .4byte 0x85000400
_080D81C8: .4byte gWeatherFog1Tiles
_080D81CC: .4byte 0x80000400
-_080D81D0: .4byte gUnknown_08E6DE48
+_080D81D0: .4byte gWeatherFog1Tilemap
_080D81D4: .4byte gUnknown_083970E8
_080D81D8: .4byte 0x03004b20
_080D81DC: .4byte sub_80D81E0
@@ -191834,7 +191834,7 @@ _080D84F8: .4byte 0x040000d4
_080D84FC: .4byte 0x85000400
_080D8500: .4byte gWeatherFog1Tiles
_080D8504: .4byte 0x80000400
-_080D8508: .4byte gUnknown_08E6DE48
+_080D8508: .4byte gWeatherFog1Tilemap
_080D850C: .4byte gUnknown_083970E8
_080D8510: .4byte 0x03004b20
_080D8514: .4byte 0x0000ffff
@@ -201714,9 +201714,9 @@ _080DD164: .4byte 0x030041b4
_080DD168: .4byte REG_BG1HOFS
_080DD16C: .4byte 0x040000d4
_080DD170: .4byte 0x85000400
-_080DD174: .4byte gUnknown_08E67ED8
-_080DD178: .4byte gUnknown_08E68054
-_080DD17C: .4byte gUnknown_08E68580
+_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew
+_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew
+_080DD17C: .4byte gBattleAnimSpritePalette_261
_080DD180: .4byte 0x03004b00
_080DD184: .4byte 0x0202f7c8
_080DD188: .4byte 0x03004b20
@@ -209175,7 +209175,7 @@ _080E0BB0:
_080E0BC0:
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
_080E0BCC:
@@ -213963,7 +213963,7 @@ _080E3098:
_080E30A8:
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
_080E30B4:
@@ -214494,7 +214494,7 @@ _080E3508:
_080E3516:
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
_080E3522:
@@ -214534,7 +214534,7 @@ _080E3550:
_080E3568: .4byte 0x02024a6a
_080E356C: .4byte 0x03004360
_080E3570: .4byte 0x02024be0
-_080E3574: .4byte gUnknown_08D2DCDC
+_080E3574: .4byte gBattleStatMask1_Tilemap
_080E3578:
ldr r0, _080E35B0
ldr r1, [sp, 0x4]
@@ -214562,44 +214562,44 @@ _080E3598:
ldr r0, _080E35B8
b _080E35FE
.align 2, 0
-_080E35B0: .4byte gUnknown_08D2DDF8
-_080E35B4: .4byte gUnknown_08D2DACC
-_080E35B8: .4byte gUnknown_08D2DF34
+_080E35B0: .4byte gBattleStatMask2_Tilemap
+_080E35B4: .4byte gBattleStatMask_Gfx
+_080E35B8: .4byte gBattleStatMask2_Pal
_080E35BC:
cmp r0, 0x1
bne _080E35C8
ldr r0, _080E35C4
b _080E35FE
.align 2, 0
-_080E35C4: .4byte gUnknown_08D2DF14
+_080E35C4: .4byte gBattleStatMask1_Pal
_080E35C8:
cmp r0, 0x2
bne _080E35D4
ldr r0, _080E35D0
b _080E35FE
.align 2, 0
-_080E35D0: .4byte gUnknown_08D2DF54
+_080E35D0: .4byte gBattleStatMask3_Pal
_080E35D4:
cmp r0, 0x3
bne _080E35E0
ldr r0, _080E35DC
b _080E35FE
.align 2, 0
-_080E35DC: .4byte gUnknown_08D2DF74
+_080E35DC: .4byte gBattleStatMask4_Pal
_080E35E0:
cmp r0, 0x4
bne _080E35EC
ldr r0, _080E35E8
b _080E35FE
.align 2, 0
-_080E35E8: .4byte gUnknown_08D2DFB4
+_080E35E8: .4byte gBattleStatMask6_Pal
_080E35EC:
cmp r0, 0x5
bne _080E35F8
ldr r0, _080E35F4
b _080E35FE
.align 2, 0
-_080E35F4: .4byte gUnknown_08D2DFD4
+_080E35F4: .4byte gBattleStatMask7_Pal
_080E35F8:
cmp r0, 0x6
bne _080E3610
@@ -214612,7 +214612,7 @@ _080E35FE:
bl LoadCompressedPalette
b _080E361E
.align 2, 0
-_080E360C: .4byte gUnknown_08D2DFF4
+_080E360C: .4byte gBattleStatMask8_Pal
_080E3610:
ldr r0, _080E3644
mov r1, sp
@@ -214641,7 +214641,7 @@ _080E361E:
strh r1, [r0, 0xA]
b _080E3668
.align 2, 0
-_080E3644: .4byte gUnknown_08D2DF94
+_080E3644: .4byte gBattleStatMask5_Pal
_080E3648: .4byte 0x030042c0
_080E364C: .4byte 0x030041b4
_080E3650: .4byte 0x03004b20
@@ -215581,7 +215581,7 @@ _080E3D7C:
_080E3D8A:
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
_080E3D96:
@@ -220554,10 +220554,10 @@ _080E6380:
_080E6388: .4byte gWindowConfig_81E6DA8
_080E638C:
ldr r0, _080E63A0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _080E63A4
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
b _080E6402
.align 2, 0
_080E63A0: .4byte gWindowConfig_81E6D54
@@ -221646,12 +221646,12 @@ _080E6BFA:
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
b _080E6C3E
_080E6C12:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221737,7 +221737,7 @@ _080E6CA6:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
ldrb r0, [r4, 0x8]
@@ -221767,7 +221767,7 @@ _080E6CE8:
.align 2, 0
_080E6CF0: .4byte 0x02001000
_080E6CF4:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221781,7 +221781,7 @@ _080E6D06:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
_080E6D1C:
@@ -221790,7 +221790,7 @@ _080E6D1C:
strh r0, [r4, 0x24]
b _080E6D72
_080E6D24:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221930,12 +221930,12 @@ _080E6E20:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0
bl MoveMenuCursor
b _080E6F3C
_080E6E3C:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r6, r0, 24
cmp r6, 0
@@ -224362,7 +224362,7 @@ _080E809E:
.align 2, 0
_080E80C4: .4byte 0x0200ae14
_080E80C8: .4byte 0xffff61f8
-_080E80CC: .4byte gUnknown_083DB678
+_080E80CC: .4byte gMysteryEventPhrase
_080E80D0:
adds r4, 0x1
adds r3, 0x1
@@ -224474,8 +224474,8 @@ _080E818A:
.align 2, 0
_080E8198: .4byte 0x0200ae6e
_080E819C: .4byte 0xffff6192
-_080E81A0: .4byte gUnknown_083DB680
-_080E81A4: .4byte gUnknown_083DB682
+_080E81A0: .4byte gBerryMasterWifePhrases
+_080E81A4: .4byte gBerryMasterWifePhrases + 0x2
_080E81A8:
lsls r0, r4, 16
lsrs r5, r0, 16
@@ -224530,7 +224530,7 @@ sub_80E81FC: @ 80E81FC
movs r1, 0
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80E81FC
@@ -224568,8 +224568,8 @@ sub_80E8218: @ 80E8218
pop {r0}
bx r0
.align 2, 0
-_080E8260: .4byte gUnknown_083DBBB4
-_080E8264: .4byte gUnknown_083DBBDC
+_080E8260: .4byte gSpriteSheets_Interview
+_080E8264: .4byte gSpritePalettes_Interview
thumb_func_end sub_80E8218
thumb_func_start sub_80E8268
@@ -226243,10 +226243,10 @@ _080E8F34: .4byte 0x00000d09
_080E8F38: .4byte gUnknown_08E945D0
_080E8F3C: .4byte gUnknown_083DB694
_080E8F40: .4byte gUnknown_08E953D0
-_080E8F44: .4byte gUnknown_08E8EE18
+_080E8F44: .4byte gMenuWordGroupFrame_Gfx
_080E8F48: .4byte 0x06008000
_080E8F4C: .4byte 0x06006800
-_080E8F50: .4byte gUnknown_08E8F178
+_080E8F50: .4byte gMenuWordGroupFrame1_Pal
_080E8F54: .4byte REG_BG2CNT
_080E8F58: .4byte 0x00000e02
_080E8F5C: .4byte 0x06007000
@@ -226445,8 +226445,8 @@ _080E90DA:
pop {r0}
bx r0
.align 2, 0
-_080E90F4: .4byte gUnknown_08E8F19A
-_080E90F8: .4byte gUnknown_08E8F1A0
+_080E90F4: .4byte gMenuWordGroupFrame2_Pal + 0x2
+_080E90F8: .4byte gMenuWordGroupFrame2_Pal + 0x8
_080E90FC: .4byte gUnknown_083DB694
_080E9100: .4byte 0x00009c34
_080E9104: .4byte 0x00009c32
@@ -226572,14 +226572,14 @@ sub_80E91D4: @ 80E91D4
lsrs r0, 24
adds r4, r0, 0
ldr r0, _080E91FC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
cmp r4, 0xA
bne _080E9200
movs r0, 0x3
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xA
bl sub_80E9198
b _080E935C
@@ -226595,7 +226595,7 @@ _080E9200:
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
_080E9218:
adds r0, r4, 0
bl sub_80E9198
@@ -226825,7 +226825,7 @@ _080E93F8:
movs r4, 0
_080E93FA:
ldr r0, _080E943C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E9440
ldr r2, [r0]
ldr r0, _080E9444
@@ -226851,7 +226851,7 @@ _080E93FA:
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
b _080E9476
.align 2, 0
_080E943C: .4byte gWindowConfig_81E6D8C
@@ -226872,14 +226872,14 @@ _080E9450:
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x1C
movs r2, 0
- bl Print
+ bl MenuPrint
_080E9476:
ldr r0, _080E9488
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r4,r5}
pop {r0}
bx r0
@@ -227028,7 +227028,7 @@ _080E95A0: .4byte gUnknown_08E94AD0
sub_80E95A4: @ 80E95A4
push {lr}
ldr r0, _080E95C0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E95C4
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227080,7 +227080,7 @@ _080E960A:
bl sub_80E9620
_080E9612:
ldr r0, _080E961C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r0}
bx r0
.align 2, 0
@@ -227160,7 +227160,7 @@ _080E969C:
lsls r2, r7, 24
lsrs r2, 24
adds r0, r4, 0
- bl Print
+ bl MenuPrint
mov r1, r9
lsls r0, r1, 1
add r0, r8
@@ -227202,7 +227202,7 @@ _080E96E4:
lsls r2, r7, 24
lsrs r2, 24
ldr r0, _080E9740
- bl Print
+ bl MenuPrint
_080E970A:
ldr r1, [sp, 0x1C]
lsls r0, r1, 16
@@ -227237,7 +227237,7 @@ _080E9740: .4byte gUnknown_083DBEA8
sub_80E9744: @ 80E9744
push {lr}
ldr r0, _080E9760
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E9764
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227289,7 +227289,7 @@ _080E97AA:
bl sub_80E97C0
_080E97B2:
ldr r0, _080E97BC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r0}
bx r0
.align 2, 0
@@ -227402,7 +227402,7 @@ _080E985E:
lsrs r1, r3, 24
mov r3, r9
lsrs r2, r3, 24
- bl Print
+ bl MenuPrint
mov r1, r10
lsls r0, r1, 16
lsrs r5, r0, 16
@@ -227434,7 +227434,7 @@ _080E98C0: .4byte 0x0000ffff
sub_80E98C4: @ 80E98C4
push {lr}
ldr r0, _080E98E0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E98E4
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227484,9 +227484,9 @@ _080E991E:
lsrs r3, 24
movs r0, 0x2
movs r2, 0x1B
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080E993C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
_080E9936:
pop {r0}
bx r0
@@ -227507,7 +227507,7 @@ sub_80E9940: @ 80E9940
adds r3, 0x1
movs r0, 0x2
movs r2, 0x1F
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r6, 0
adds r1, r5, 0
bl sub_80E9A7C
@@ -227525,7 +227525,7 @@ sub_80E9940: @ 80E9940
sub_80E9974: @ 80E9974
push {r4-r6,lr}
ldr r0, _080E99C4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E99C8
ldr r2, [r0]
adds r0, r2, 0
@@ -227652,7 +227652,7 @@ sub_80E9A60: @ 80E9A60
lsrs r1, 24
lsrs r3, 16
adds r2, r3, 0
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
thumb_func_end sub_80E9A60
@@ -227710,7 +227710,7 @@ _080E9AD0: .4byte gUnknown_083DB694
sub_80E9AD4: @ 80E9AD4
push {r4,lr}
ldr r0, _080E9AF4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r4, 0
_080E9ADE:
adds r0, r4, 0
@@ -227791,7 +227791,7 @@ _080E9B58:
cmp r0, 0x7
bne _080E9B94
ldr r0, _080E9B90
- bl sub_8071E2C
+ bl BasicInitMenuWindow
b _080E9B9A
.align 2, 0
_080E9B7C: .4byte gUnknown_083DB694
@@ -227802,7 +227802,7 @@ _080E9B8C: .4byte 0x00009a2a
_080E9B90: .4byte gWindowConfig_81E6D70
_080E9B94:
ldr r0, _080E9BE0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
_080E9B9A:
ldr r2, _080E9BE4
ldr r4, [r2]
@@ -227844,7 +227844,7 @@ _080E9BEC: .4byte 0x00009e14
_080E9BF0: .4byte 0x000099a6
_080E9BF4:
ldr r0, _080E9C64
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r6, 0
ldr r1, _080E9C68
adds r0, r5, r1
@@ -227917,7 +227917,7 @@ sub_80E9C74: @ 80E9C74
adds r3, 0x1
movs r0, 0
movs r2, 0x1D
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
pop {r0}
bx r0
thumb_func_end sub_80E9C74
@@ -228050,7 +228050,7 @@ _080E9D78: .4byte 0x0000ffff
sub_80E9D7C: @ 80E9D7C
push {r4-r7,lr}
ldr r0, _080E9DAC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080E9DB0
ldr r2, [r0]
movs r0, 0xE0
@@ -238212,7 +238212,7 @@ _080EEE90:
bl LZ77UnCompVram
b _080EEF18
.align 2, 0
-_080EEE9C: .4byte gUnknown_08E88D4C
+_080EEE9C: .4byte gPokenavHoennMapMisc_Gfx
_080EEEA0: .4byte 0x0600c000
_080EEEA4:
ldr r0, _080EEEB0
@@ -238229,7 +238229,7 @@ _080EEEB8:
bl LoadPalette
b _080EEF18
.align 2, 0
-_080EEEC4: .4byte gUnknown_08E89628
+_080EEEC4: .4byte gPokenavHoennMap1_Pal
_080EEEC8:
movs r0, 0
bl sub_80EF58C
@@ -238752,12 +238752,12 @@ _080EF2EA:
_080EF2F4: .4byte gWindowConfig_81E7224
_080EF2F8:
ldr r0, _080EF300
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080EF40C
.align 2, 0
_080EF300: .4byte gWindowConfig_81E7224
_080EF304:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _080EF30E
b _080EF40C
@@ -238937,7 +238937,7 @@ _080EF464:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -239506,17 +239506,17 @@ _080EF8D2:
_080EF8DC: .4byte gWindowConfig_81E7224
_080EF8E0:
ldr r0, _080EF8E8
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080EF9DC
.align 2, 0
_080EF8E8: .4byte gWindowConfig_81E7224
_080EF8EC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _080EF9DC
b _080EF9EA
_080EF8F6:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080EF9DC
_080EF8FC:
ldr r0, _080EF914
@@ -239546,7 +239546,7 @@ _080EF92C:
bl LZ77UnCompVram
b _080EF9DC
.align 2, 0
-_080EF938: .4byte gUnknown_08E892C4
+_080EF938: .4byte gPokenavHoennMapSquares_Gfx
_080EF93C: .4byte 0x06005000
_080EF940:
ldr r0, _080EF950
@@ -239556,7 +239556,7 @@ _080EF940:
bl sub_80EFC3C
b _080EF9DC
.align 2, 0
-_080EF950: .4byte gUnknown_08E89648
+_080EF950: .4byte gPokenavHoennMapSquares_Pal
_080EF954:
bl sub_80EFC64
lsls r0, 24
@@ -239568,7 +239568,7 @@ _080EF960:
movs r1, 0x3
movs r2, 0x1D
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_80EF9F8
b _080EF9DC
_080EF972:
@@ -239768,12 +239768,12 @@ _080EFAC0:
adds r1, r4, 0
movs r2, 0xF
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0x1A
adds r1, r4, 0
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080EFB48
ldr r3, [r6]
movs r1, 0
@@ -239822,7 +239822,7 @@ _080EFB6A:
movs r0, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_080EFB82:
ldr r0, _080EFB98
ldr r0, [r0]
@@ -240396,19 +240396,19 @@ _080EFFE8:
_080EFFF0: .4byte gWindowConfig_81E7080
_080EFFF4:
ldr r0, _080EFFFC
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080F0154
.align 2, 0
_080EFFFC: .4byte gWindowConfig_81E7080
_080F0000:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _080F000A
b _080F0154
_080F000A:
b _080F0162
_080F000C:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F0154
_080F0012:
bl sub_80F1614
@@ -240428,7 +240428,7 @@ _080F0028:
bl LZ77UnCompVram
b _080F0154
.align 2, 0
-_080F0034: .4byte gUnknown_08E89AD8
+_080F0034: .4byte gPokenavConditionView_Gfx
_080F0038: .4byte 0x06005000
_080F003C:
ldr r0, _080F0050
@@ -240442,7 +240442,7 @@ _080F003C:
.align 2, 0
_080F0050: .4byte gUnknown_08E9AC4C
_080F0054: .4byte 0x0600f000
-_080F0058: .4byte gUnknown_08E8A1C0
+_080F0058: .4byte gPokenavConditionMenu2_Pal
_080F005C:
ldr r0, _080F0088
ldr r0, [r0]
@@ -240507,7 +240507,7 @@ _080F00AC:
.align 2, 0
_080F00EC: .4byte gUnknown_083E0254
_080F00F0: .4byte gUnknownPalette_81E6692
-_080F00F4: .4byte gUnknown_08E8A1C2
+_080F00F4: .4byte gPokenavConditionMenu2_Pal + 0x2
_080F00F8:
ldr r0, _080F0110
ldr r0, [r0]
@@ -240642,7 +240642,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r5, r0
movs r1, 0xD
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r1, _080F0250
adds r0, r5, r1
ldrb r0, [r0]
@@ -240656,7 +240656,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r5, r0
movs r1, 0xD
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r0, _080F0258
adds r4, r5, r0
ldr r1, _080F025C
@@ -240675,7 +240675,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x6
- bl Print
+ bl MenuPrint
_080F0242:
pop {r4,r5}
pop {r0}
@@ -240797,19 +240797,19 @@ _080F0344:
_080F034C: .4byte gWindowConfig_81E70D4
_080F0350:
ldr r0, _080F0358
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080F0618
.align 2, 0
_080F0358: .4byte gWindowConfig_81E70D4
_080F035C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _080F0366
b _080F0618
_080F0366:
b _080F0626
_080F0368:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F0618
_080F036E:
ldr r0, _080F0378
@@ -240825,7 +240825,7 @@ _080F0380:
bl LZ77UnCompVram
b _080F0618
.align 2, 0
-_080F038C: .4byte gUnknown_08E9FA08
+_080F038C: .4byte gPokenavConditionSearch2_Gfx
_080F0390: .4byte 0x06008000
_080F0394:
ldr r6, _080F03FC
@@ -240878,7 +240878,7 @@ _080F03FC: .4byte gUnknown_083E02B4
_080F0400: .4byte gUnknown_083E0334
_080F0404: .4byte gUnknown_083DFEC4
_080F0408: .4byte 0x000087ca
-_080F040C: .4byte gUnknown_083E0294
+_080F040C: .4byte gPokenavConditionSearch2_Pal
_080F0410: .4byte 0x0202eac8
_080F0414: .4byte gUnknownPalette_81E6692
_080F0418:
@@ -241354,14 +241354,14 @@ _080F07E0:
bl sub_80F445C
_080F07F4:
ldr r0, _080F0814
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080F0818
ldr r0, [r0]
ldr r1, _080F0810
adds r0, r1
movs r1, 0x1
movs r2, 0x6
- bl Print
+ bl MenuPrint
_080F080A:
pop {r0}
bx r0
@@ -241377,7 +241377,7 @@ sub_80F081C: @ 80F081C
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080F0838
- bl sub_8071E2C
+ bl BasicInitMenuWindow
cmp r5, 0x4
bhi _080F08C6
lsls r0, r5, 2
@@ -241399,7 +241399,7 @@ _080F0854:
ldr r0, _080F08CC
movs r1, 0xA
movs r2, 0x9
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F0862:
@@ -241419,14 +241419,14 @@ _080F0862:
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xB
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F088C:
ldr r0, _080F08DC
movs r1, 0xA
movs r2, 0xD
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F089A:
@@ -241449,7 +241449,7 @@ _080F08AA:
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xF
- bl PrintCoinsString
+ bl sub_8072B4C
_080F08C6:
pop {r4,r5}
pop {r0}
@@ -241467,12 +241467,12 @@ _080F08E0: .4byte 0x0001869f
sub_80F08E4: @ 80F08E4
push {lr}
ldr r0, _080F08FC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r0, 0
movs r1, 0x9
movs r2, 0xB
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -241500,7 +241500,7 @@ sub_80F0900: @ 80F0900
movs r1, 0x1
movs r2, 0x1F
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_080F092A:
ldrh r0, [r5]
lsrs r2, r4, 16
@@ -241652,12 +241652,12 @@ _080F0A40:
adds r1, r3, 0
bl sub_80F4428
ldr r0, _080F0A70
- bl sub_8071E2C
+ bl BasicInitMenuWindow
lsls r2, r5, 24
lsrs r2, 24
adds r0, r4, 0
movs r1, 0xD
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -241686,7 +241686,7 @@ sub_80F0A74: @ 80F0A74
movs r0, 0x1F
ands r7, r0
ldr r0, _080F0AE4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
lsls r2, r7, 3
adds r0, r4, 0
movs r1, 0x61
@@ -241813,12 +241813,12 @@ _080F0B60:
cmp r2, r0
beq _080F0BAA
ldr r0, _080F0BC8
- bl sub_8071E2C
+ bl BasicInitMenuWindow
adds r1, r4, 0
adds r3, r1, 0x1
movs r0, 0xC
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
_080F0BAA:
ldrh r0, [r6]
cmp r0, 0
@@ -241836,7 +241836,7 @@ _080F0BC4: .4byte 0x0000876c
_080F0BC8: .4byte gWindowConfig_81E70D4
_080F0BCC:
ldr r0, _080F0C10
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r1, _080F0C14
adds r0, r5, r1
ldrh r0, [r0]
@@ -241850,7 +241850,7 @@ _080F0BE2:
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x2
movs r0, 0x1F
ands r4, r0
@@ -241929,7 +241929,7 @@ _080F0C64:
movs r0, 0
strh r0, [r1]
ldr r0, _080F0CC4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080F0CC8
adds r1, r4, r0
ldrh r0, [r5]
@@ -242067,7 +242067,7 @@ _080F0D8C:
movs r0, 0
strh r0, [r1]
ldr r0, _080F0DBC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _080F0DC0
adds r1, r4, r0
ldrh r3, [r5]
@@ -242266,12 +242266,12 @@ _080F0F10:
movs r0, 0x1F
ands r4, r0
ldr r0, _080F0F60
- bl sub_8071E2C
+ bl BasicInitMenuWindow
adds r3, r4, 0x1
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -242385,7 +242385,7 @@ sub_80F0FFC: @ 80F0FFC
movs r2, 0
bl sub_80FBFB4
ldr r0, _080F1054
- bl sub_8071E2C
+ bl BasicInitMenuWindow
adds r0, r5, 0
bl sub_80F19DC
ldr r0, _080F1058
@@ -242398,7 +242398,7 @@ sub_80F0FFC: @ 80F0FFC
adds r0, r4, 0
movs r1, 0
movs r2, 0x5
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -242488,19 +242488,19 @@ _080F1104:
_080F110C: .4byte gWindowConfig_81E70B8
_080F1110:
ldr r0, _080F1118
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080F1218
.align 2, 0
_080F1118: .4byte gWindowConfig_81E70B8
_080F111C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _080F1126
b _080F1218
_080F1126:
b _080F1226
_080F1128:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F1218
_080F112E:
bl sub_80F1614
@@ -242536,7 +242536,7 @@ _080F116C:
bl LZ77UnCompVram
b _080F1218
.align 2, 0
-_080F1178: .4byte gUnknown_08E9FB1C
+_080F1178: .4byte gPokenavRibbonView_Gfx
_080F117C: .4byte 0x06008000
_080F1180:
ldr r0, _080F118C
@@ -242571,7 +242571,7 @@ _080F1194:
bl LoadPalette
b _080F1218
.align 2, 0
-_080F11CC: .4byte gUnknown_08E9FAFC
+_080F11CC: .4byte gPokenavRibbonView_Pal
_080F11D0: .4byte gUnknown_083E03A8
_080F11D4: .4byte gUnknown_083E3C60
_080F11D8: .4byte gUnknownPalette_81E6692
@@ -242873,7 +242873,7 @@ _080F1424: .4byte 0x0600b800
_080F1428: .4byte 0x040000d4
_080F142C: .4byte 0x84000140
_080F1430: .4byte 0x0202eac8
-_080F1434: .4byte gUnknown_08E9FB18
+_080F1434: .4byte gPokenavRibbonView_Pal + 0x1C
thumb_func_end sub_80F13FC
thumb_func_start sub_80F1438
@@ -242885,7 +242885,7 @@ sub_80F1438: @ 80F1438
adds r0, r4, r1
movs r1, 0xD
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, _080F1478
adds r5, r4, r0
ldr r1, _080F147C
@@ -242899,7 +242899,7 @@ sub_80F1438: @ 80F1438
adds r0, r5, 0
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -242917,7 +242917,7 @@ sub_80F1480: @ 80F1480
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80F1480
@@ -243038,11 +243038,11 @@ _080F158A:
adds r0, r6, 0
movs r1, 0xC
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0xC
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4-r7}
pop {r0}
bx r0
@@ -243057,7 +243057,7 @@ sub_80F15A8: @ 80F15A8
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080F1600
ldr r4, [r0]
ldr r0, _080F1604
@@ -243088,7 +243088,7 @@ sub_80F15A8: @ 80F15A8
adds r0, r5, 0
movs r1, 0xC
movs r2, 0xD
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -243159,7 +243159,7 @@ _080F1670:
ldr r0, [r0, 0x8]
b _080F16F0
.align 2, 0
-_080F1684: .4byte gUnknown_08EA0028
+_080F1684: .4byte gPokenavRibbonPokeView_Gfx
_080F1688: .4byte 0x0600e000
_080F168C: .4byte 0x040000d4
_080F1690: .4byte 0x80000070
@@ -243347,7 +243347,7 @@ _080F17FE:
bl LZ77UnCompVram
b _080F1914
.align 2, 0
-_080F1808: .4byte gUnknown_08E89AD8
+_080F1808: .4byte gPokenavConditionView_Gfx
_080F180C: .4byte 0x06005000
_080F1810:
ldr r0, _080F1824
@@ -243361,7 +243361,7 @@ _080F1810:
.align 2, 0
_080F1824: .4byte gUnknown_08E9AC4C
_080F1828: .4byte 0x0600f000
-_080F182C: .4byte gUnknown_08E8A1C0
+_080F182C: .4byte gPokenavConditionMenu2_Pal
_080F1830:
ldr r0, _080F1850
ldr r3, _080F1854
@@ -243417,7 +243417,7 @@ _080F186C:
.align 2, 0
_080F18AC: .4byte gUnknown_083E0254
_080F18B0: .4byte gUnknownPalette_81E6692
-_080F18B4: .4byte gUnknown_08E8A1C2
+_080F18B4: .4byte gPokenavConditionMenu2_Pal + 0x2
_080F18B8:
ldr r0, _080F18D0
ldr r0, [r0]
@@ -243626,7 +243626,7 @@ _080F1A46:
movs r0, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0
strb r0, [r5]
_080F1A60:
@@ -243754,7 +243754,7 @@ _080F1B34:
lsls r2, 2
b _080F1B44
.align 2, 0
-_080F1B3C: .4byte gUnknown_08E884CC
+_080F1B3C: .4byte gPokenavMenuOptions_Gfx
_080F1B40:
ldr r0, _080F1B4C
ldr r2, _080F1B50
@@ -243763,7 +243763,7 @@ _080F1B44:
bl LZ77UnCompWram
b _080F1B6C
.align 2, 0
-_080F1B4C: .4byte gUnknown_08E89668
+_080F1B4C: .4byte gPokenavConditionMenu_Gfx
_080F1B50: .4byte 0x00001788
_080F1B54:
ldr r0, _080F1B64
@@ -243773,7 +243773,7 @@ _080F1B54:
movs r0, 0
b _080F1B7C
.align 2, 0
-_080F1B64: .4byte gUnknown_08E8AD04
+_080F1B64: .4byte gPokenavConditionSearch_Gfx
_080F1B68: .4byte 0x00002388
_080F1B6C:
ldr r0, _080F1B84
@@ -245105,9 +245105,9 @@ _080F2532:
ldr r0, _080F2554
b _080F257A
.align 2, 0
-_080F254C: .4byte gUnknown_08E88A28
+_080F254C: .4byte gPokenavMenuOptions1_Pal
_080F2550: .4byte 0xffff0000
-_080F2554: .4byte gUnknown_08E88A48
+_080F2554: .4byte gPokenavMenuOptions2_Pal
_080F2558:
ldr r0, _080F2564
str r0, [sp]
@@ -245116,7 +245116,7 @@ _080F2558:
strh r0, [r1, 0x4]
b _080F2580
.align 2, 0
-_080F2564: .4byte gUnknown_08E89958
+_080F2564: .4byte gPokenavConditionMenu_Pal
_080F2568:
ldr r0, _080F2590
str r0, [sp]
@@ -245139,8 +245139,8 @@ _080F2586:
pop {r0}
bx r0
.align 2, 0
-_080F2590: .4byte gUnknown_08E8B1C4
-_080F2594: .4byte gUnknown_08E8B1E4
+_080F2590: .4byte gPokenavCondition6_Pal
+_080F2594: .4byte gPokenavCondition7_Pal
thumb_func_end sub_80F2514
thumb_func_start sub_80F2598
@@ -245189,8 +245189,8 @@ sub_80F2598: @ 80F2598
_080F25F0: .4byte gUnknown_083DFEC4
_080F25F4: .4byte 0x00006d9c
_080F25F8: .4byte 0x02025734
-_080F25FC: .4byte gUnknown_083E446C
-_080F2600: .4byte gUnknown_083E4474
+_080F25FC: .4byte gSpriteSheet_PokenavBlueLight
+_080F2600: .4byte gSpritePalette_PokenavBlueLight
_080F2604: .4byte gSpriteTemplate_83E4484
_080F2608: .4byte 0x02020004
_080F260C:
@@ -245326,7 +245326,7 @@ _080F2704:
ldr r2, _080F2718
b _080F279C
.align 2, 0
-_080F2710: .4byte gUnknown_08E88358
+_080F2710: .4byte gPokenavMainMenu_Gfx
_080F2714: .4byte gUnknown_083DFEC4
_080F2718: .4byte 0x00003b98
_080F271C:
@@ -245336,7 +245336,7 @@ _080F271C:
ldr r2, _080F2730
b _080F279C
.align 2, 0
-_080F2728: .4byte gUnknown_08E89978
+_080F2728: .4byte gPokenavConditionMenuHeader_Gfx
_080F272C: .4byte gUnknown_083DFEC4
_080F2730: .4byte 0x00004198
_080F2734:
@@ -245346,7 +245346,7 @@ _080F2734:
ldr r2, _080F2748
b _080F279C
.align 2, 0
-_080F2740: .4byte gUnknown_08E8B3A0
+_080F2740: .4byte gPokenavRibbonsHeader_Gfx
_080F2744: .4byte gUnknown_083DFEC4
_080F2748: .4byte 0x00004d98
_080F274C:
@@ -245356,7 +245356,7 @@ _080F274C:
ldr r2, _080F2760
b _080F279C
.align 2, 0
-_080F2758: .4byte gUnknown_08E88A88
+_080F2758: .4byte gPokenavHoennMapHeader_Gfx
_080F275C: .4byte gUnknown_083DFEC4
_080F2760: .4byte 0x00005398
_080F2764:
@@ -245366,7 +245366,7 @@ _080F2764:
ldr r2, _080F2778
b _080F279C
.align 2, 0
-_080F2770: .4byte gUnknown_08E8A1E0
+_080F2770: .4byte gPokenavConditionMenuOptions_Gfx
_080F2774: .4byte gUnknown_083DFEC4
_080F2778: .4byte 0x00005f98
_080F277C:
@@ -245376,7 +245376,7 @@ _080F277C:
ldr r2, _080F2790
b _080F279C
.align 2, 0
-_080F2788: .4byte gUnknown_08E8A5D8
+_080F2788: .4byte gPokenavConditionMenuOptions2_Gfx
_080F278C: .4byte gUnknown_083DFEC4
_080F2790: .4byte 0x00006798
_080F2794:
@@ -245389,7 +245389,7 @@ _080F279C:
bl LZ77UnCompWram
b _080F27C0
.align 2, 0
-_080F27A4: .4byte gUnknown_08E8B204
+_080F27A4: .4byte gPokenavTrainersEyesHeader_Gfx
_080F27A8: .4byte gUnknown_083DFEC4
_080F27AC: .4byte 0x00004798
_080F27B0:
@@ -249171,7 +249171,7 @@ _080F44C8:
adds r0, r1
adds r1, r4, 0
adds r2, r3, 0
- bl PokemonGetField
+ bl GetMonData
b _080F453C
.align 2, 0
_080F44DC: .4byte 0x03004360
@@ -249181,7 +249181,7 @@ _080F44E0:
ldr r1, _080F44F0
adds r0, r1
adds r1, r4, 0
- bl PokemonGetField
+ bl GetMonData
b _080F453C
.align 2, 0
_080F44F0: .4byte 0x03004360
@@ -249204,7 +249204,7 @@ _080F44FC:
adds r0, r1
adds r1, r4, 0
adds r2, r3, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
b _080F453C
.align 2, 0
_080F451C: .4byte 0x020300a4
@@ -249221,7 +249221,7 @@ _080F4520:
adds r1, r2
adds r0, r1
adds r1, r4, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
_080F453C:
pop {r4}
pop {r1}
@@ -249248,7 +249248,7 @@ sub_80F4548: @ 80F4548
adds r0, r1
movs r1, 0x8
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
b _080F4592
.align 2, 0
_080F4570: .4byte 0x03004360
@@ -249266,7 +249266,7 @@ _080F4574:
adds r0, r1
movs r1, 0x8
mov r2, sp
- bl PokemonSetEncryptedField
+ bl SetBoxMonData
_080F4592:
add sp, 0x4
pop {r4}
@@ -250071,7 +250071,7 @@ _080F4BF6:
ldr r1, _080F4CCC
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080F4C58
mov r0, r10
@@ -250308,7 +250308,7 @@ _080F4DCA:
add r1, r8
adds r0, r1
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
beq _080F4E60
ldrb r0, [r6]
@@ -250324,7 +250324,7 @@ _080F4DCA:
add r1, r8
adds r0, r1
movs r1, 0x2D
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _080F4E60
ldrb r1, [r6]
@@ -250356,7 +250356,7 @@ _080F4DCA:
adds r0, r1
mov r2, r9
ldrb r1, [r2]
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 24
lsrs r0, 24
ldr r2, _080F4EB4
@@ -250429,7 +250429,7 @@ _080F4ED6:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _080F4F18
movs r0, 0x1F
@@ -250448,7 +250448,7 @@ _080F4ED6:
adds r0, r2
ldrb r1, [r0]
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
strb r0, [r5]
mov r0, sp
bl sub_80F4944
@@ -253020,7 +253020,7 @@ _080F629A:
add r1, r8
adds r0, r1
movs r1, 0x51
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _080F636C
ldrb r0, [r5]
@@ -253036,7 +253036,7 @@ _080F629A:
add r1, r9
adds r0, r1
movs r1, 0x51
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
cmp r1, 0
bne _080F636C
@@ -253084,7 +253084,7 @@ _080F632A:
ldr r1, _080F635C
adds r0, r1
movs r1, 0x51
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080F6324
ldr r0, _080F6360
@@ -253200,7 +253200,7 @@ _080F63FC:
adds r1, r2
adds r0, r1
movs r1, 0x51
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -253272,7 +253272,7 @@ _080F64A8:
ldr r1, _080F64FC
adds r0, r1
movs r1, 0x51
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -253382,12 +253382,12 @@ _080F655E:
adds r4, r0
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
adds r0, r4, 0
- bl pokemon_get_gender
+ bl GetMonGender
b _080F65EA
.align 2, 0
_080F65A4: .4byte gUnknown_083DFEC4
@@ -253407,7 +253407,7 @@ _080F65B4:
ldr r2, _080F6620
adds r1, r2
adds r0, r1
- bl sub_803B570
+ bl GetLevelFromBoxMonExp
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x8]
@@ -253418,7 +253418,7 @@ _080F65B4:
bl sub_80F44B0
adds r1, r0, 0
mov r0, r9
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
_080F65EA:
lsls r0, 24
lsrs r4, r0, 24
@@ -254360,7 +254360,7 @@ _080F6D0E:
_080F6D44: .4byte gUnknown_083DFEC4
_080F6D48: .4byte 0x0000d158
_080F6D4C: .4byte 0x020260ae
-_080F6D50: .4byte gUnknown_0839AE70
+_080F6D50: .4byte gTrainerEyeTrainers
_080F6D54: .4byte 0x0000cee8
_080F6D58: .4byte 0x0000ceec
_080F6D5C: .4byte 0x0000ceea
@@ -254979,7 +254979,7 @@ sub_80F7224: @ 80F7224
ldr r1, _080F7260
adds r0, r1
movs r1, 0x30
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F7264
@@ -255030,7 +255030,7 @@ sub_80F728C: @ 80F728C
ldr r0, _080F72C4
ldrb r0, [r0, 0x14]
lsrs r0, 3
- bl sub_8064FD4
+ bl GetTextWindowFrameGraphics
ldr r3, _080F72C8
ldr r2, [r3]
ldr r1, [r0]
@@ -255407,7 +255407,7 @@ _080F7558:
b _080F75FE
.align 2, 0
_080F7580: .4byte 0x020388b8
-_080F7584: .4byte gUnknown_08E8A7C4
+_080F7584: .4byte gPokenavConditionMenuMisc_Gfx
_080F7588: .4byte 0x03001770
_080F758C:
movs r0, 0x80
@@ -255740,7 +255740,7 @@ _080F7770:
b _080F787A
.align 2, 0
_080F7820: .4byte 0x020388b8
-_080F7824: .4byte gUnknown_08E8A7C4
+_080F7824: .4byte gPokenavConditionMenuMisc_Gfx
_080F7828: .4byte gUnknown_08E966B8
_080F782C: .4byte gUnknown_083E5214
_080F7830: .4byte gSpriteAnimTable_83E52AC
@@ -256323,7 +256323,7 @@ sub_80F7C54: @ 80F7C54
ldr r0, _080F7C6C
ldrb r0, [r0]
bl sub_80F7F80
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80655F0
pop {r0}
bx r0
@@ -257799,7 +257799,7 @@ sub_80F8758: @ 80F8758
movs r0, 0
movs r1, 0
movs r2, 0x19
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
ldr r1, _080F87BC
ldrb r0, [r1, 0x4]
@@ -257812,7 +257812,7 @@ _080F8784:
bl sub_80F8478
lsrs r2, r5, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
movs r1, 0x80
lsls r1, 18
adds r5, r1
@@ -257831,7 +257831,7 @@ _080F87A4:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -257912,7 +257912,7 @@ _080F8848:
movs r1, 0
movs r2, 0x19
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -258266,19 +258266,19 @@ _080F8B10:
_080F8B18: .4byte gWindowConfig_81E6DFC
_080F8B1C:
ldr r0, _080F8B24
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _080F8D30
.align 2, 0
_080F8B24: .4byte gWindowConfig_81E6DFC
_080F8B28:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
beq _080F8B32
b _080F8D30
_080F8B32:
b _080F8D3C
_080F8B34:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F8D30
_080F8B3A:
mov r0, sp
@@ -258734,7 +258734,7 @@ _080F8E9E:
lsls r2, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x2
lsls r0, 24
lsrs r6, r0, 24
@@ -258753,7 +258753,7 @@ _080F8EF6:
ldrb r1, [r1]
ldr r2, [r0, 0x34]
ldrb r2, [r2, 0x1]
- bl Print
+ bl MenuPrint
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -258934,7 +258934,7 @@ sav2_get_text_speed: @ 80F9058
adds r5, r0, 0
lsls r1, 16
lsrs r4, r1, 16
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
cmp r4, 0
beq _080F907C
ldr r0, _080F908C
@@ -258961,7 +258961,7 @@ sub_80F9090: @ 80F9090
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -259013,7 +259013,7 @@ Task_CallYesOrNoCallback: @ 80F90F4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -259123,7 +259123,7 @@ _080F91D4:
ldr r0, _080F91E8
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -259173,7 +259173,7 @@ _080F9238:
adds r0, r6, 0
adds r1, r7, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_080F9242:
pop {r3}
mov r8, r3
@@ -260934,7 +260934,7 @@ _080F9F48:
adds r0, r1
adds r1, r4, 0
adds r1, 0xD
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080F9F66
ldrh r0, [r5]
@@ -260969,7 +260969,7 @@ sub_80F9F84: @ 80F9F84
ldrh r1, [r0]
adds r1, 0xD
adds r0, r5, 0
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -261014,7 +261014,7 @@ sub_80F9FDC: @ 80F9FDC
str r0, [sp, 0x8]
mov r0, r8
ldr r1, [sp, 0x8]
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x14]
@@ -261024,7 +261024,7 @@ sub_80F9FDC: @ 80F9FDC
str r3, [sp, 0xC]
mov r0, r8
adds r1, r3, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r7, r5, 0
@@ -261032,7 +261032,7 @@ sub_80F9FDC: @ 80F9FDC
str r7, [sp, 0x10]
mov r0, r8
adds r1, r7, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
adds r1, 0x5
str r1, [sp, 0x18]
@@ -261042,13 +261042,13 @@ sub_80F9FDC: @ 80F9FDC
str r3, [sp, 0x1C]
mov r0, r8
adds r1, r3, 0
- bl PokemonGetField
+ bl GetMonData
add r7, sp, 0x4
mov r10, r7
strb r0, [r7]
mov r0, r8
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r6, sp
adds r6, 0x6
strb r0, [r6]
@@ -261087,23 +261087,23 @@ sub_80F9FDC: @ 80F9FDC
mov r0, r8
ldr r1, [sp, 0x8]
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
ldr r1, [sp, 0xC]
ldr r2, [sp, 0x14]
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
ldr r1, [sp, 0x10]
mov r2, r10
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
ldr r1, [sp, 0x1C]
ldr r2, [sp, 0x18]
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
movs r1, 0x15
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -261131,7 +261131,7 @@ sub_80FA0DC: @ 80FA0DC
ldr r4, _080FA144
ldrb r2, [r4]
movs r1, 0
- bl sub_803B6A4
+ bl SetMonMoveSlot
mov r1, r8
ldrh r0, [r1]
muls r0, r6
@@ -261183,7 +261183,7 @@ sub_80FA148: @ 80FA148
movs r1, 0
strh r1, [r4]
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _080FA16A
movs r0, 0x1
@@ -265343,8 +265343,8 @@ _080FC104:
_080FC10C: .4byte gWindowConfig_81E7224
_080FC110:
ldr r0, _080FC11C
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
b _080FC1E6
.align 2, 0
_080FC11C: .4byte gWindowConfig_81E7224
@@ -265519,12 +265519,12 @@ _080FC268:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
adds r0, 0x8
movs r1, 0x11
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldrb r0, [r5, 0x1F]
ldr r1, [r4]
lsls r0, 2
@@ -265532,7 +265532,7 @@ _080FC268:
ldr r0, [r0]
movs r1, 0x1D
movs r2, 0x11
- bl PrintCoinsString
+ bl sub_8072B4C
b _080FC310
.align 2, 0
_080FC2AC: .4byte 0x02000000
@@ -265551,16 +265551,16 @@ _080FC2BE:
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080FC2E8
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x10
movs r1, 0xE
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
b _080FC310
.align 2, 0
_080FC2E8: .4byte 0x02000008
@@ -265569,17 +265569,17 @@ _080FC2EC:
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _080FC318
adds r0, r4, r1
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x10
movs r1, 0xE
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_080FC310:
pop {r4,r5}
pop {r0}
@@ -269652,12 +269652,12 @@ sub_80FE1DC: @ 80FE1DC
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080FE218
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
ldr r0, _080FE21C
ldrb r0, [r0]
str r0, [sp]
@@ -269870,7 +269870,7 @@ sub_80FE394: @ 80FE394
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r1, _080FE3BC
ldr r0, _080FE3C0
ldrb r0, [r0]
@@ -269879,7 +269879,7 @@ sub_80FE394: @ 80FE394
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -269897,12 +269897,12 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 80FE3C4
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0x6
bl FreeSpritePaletteByTag
ldr r0, _080FE404
@@ -270045,7 +270045,7 @@ sub_80FE470: @ 80FE470
ldr r0, _080FE51C
mov r1, r8
mov r2, r9
- bl Print
+ bl MenuPrint
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -270069,7 +270069,7 @@ sub_80FE528: @ 80FE528
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r5, 0
ldr r1, _080FE574
lsls r0, r4, 2
@@ -270119,7 +270119,7 @@ _080FE58E:
ldr r0, _080FE5A8
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -270139,7 +270139,7 @@ sub_80FE5AC: @ 80FE5AC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE528
ldr r0, _080FE5F8
@@ -270269,7 +270269,7 @@ _080FE6DC:
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080FE6FC
ldr r2, _080FE700
adds r0, r5, 0
@@ -270335,7 +270335,7 @@ sub_80FE758: @ 80FE758
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080FE794
lsls r0, r4, 2
adds r0, r4
@@ -270346,7 +270346,7 @@ sub_80FE758: @ 80FE758
cmp r0, 0x2
beq _080FE79C
bl sub_80FE1DC
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80FE394
ldr r0, _080FE798
str r0, [r5]
@@ -270413,7 +270413,7 @@ sub_80FE7EC: @ 80FE7EC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FEC94
ldr r0, _080FE858
@@ -270423,7 +270423,7 @@ sub_80FE7EC: @ 80FE7EC
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r4, _080FE85C
ldr r0, _080FE860
ldrb r0, [r0]
@@ -270540,7 +270540,7 @@ _080FE8EE:
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
_080FE90E:
ldrb r0, [r4]
ldrb r6, [r6]
@@ -270558,7 +270558,7 @@ _080FE92C:
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080FE938:
pop {r3-r5}
mov r8, r3
@@ -270984,7 +270984,7 @@ sub_80FEC94: @ 80FEC94
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0
bl sub_80FEABC
@@ -271003,7 +271003,7 @@ sub_80FECB8: @ 80FECB8
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x1
@@ -271052,12 +271052,12 @@ sub_80FED1C: @ 80FED1C
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xF
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80FED1C
@@ -271379,7 +271379,7 @@ sub_80FEF74: @ 80FEF74
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -271475,7 +271475,7 @@ sub_80FF034: @ 80FF034
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE5AC
pop {r4}
@@ -272462,7 +272462,7 @@ _080FF81C: .4byte gUnknown_083EC954
_080FF820: .4byte 0x020391a8
_080FF824: .4byte 0x02020004
_080FF828: .4byte 0x03004880
-_080FF82C: .4byte gUnknown_083EC93C
+_080FF82C: .4byte gSpriteTemplate_83EC93C
_080FF830: .4byte gUnknown_083EC900
_080FF834:
ldr r2, _080FF888
@@ -273560,7 +273560,7 @@ sub_81000A0: @ 81000A0
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _081000C0
adds r0, r4, 0
bl sub_80F914C
@@ -273580,7 +273580,7 @@ sub_81000C4: @ 81000C4
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8100174
ldr r2, _0810010C
@@ -273773,7 +273773,7 @@ sub_8100248: @ 8100248
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08100268
adds r0, r4, 0
bl sub_80F914C
@@ -273794,7 +273794,7 @@ sub_810026C: @ 810026C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_810028C
pop {r4}
@@ -274316,7 +274316,7 @@ sub_810065C: @ 810065C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08100698
ldr r0, _0810069C
ldrb r1, [r0]
@@ -275205,7 +275205,7 @@ _08100CC4:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
strh r0, [r5, 0xC]
b _08100D24
@@ -275298,7 +275298,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 8100D84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r3, _08100DD8
ldr r2, _08100DDC
ldr r4, _08100DE0
@@ -275468,7 +275468,7 @@ sub_8100EEC: @ 8100EEC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08100F70
ldr r3, _08100F74
ldrb r1, [r3]
@@ -276268,7 +276268,7 @@ sub_8101518: @ 8101518
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08101538
adds r0, r4, 0
bl sub_80F914C
@@ -276314,7 +276314,7 @@ sub_810156C: @ 810156C
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0810158C
adds r0, r4, 0
bl sub_80F914C
@@ -276335,7 +276335,7 @@ sub_8101590: @ 8101590
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_81015B0
pop {r4}
@@ -276451,7 +276451,7 @@ _08101674: .4byte sub_80FE2EC
sub_8101678: @ 8101678
push {lr}
bl pal_fill_black
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80FE220
ldr r0, _08101694
movs r1, 0x8
@@ -276669,7 +276669,7 @@ sub_8101824: @ 8101824
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08101844
adds r0, r4, 0
bl sub_80F914C
@@ -276690,7 +276690,7 @@ sub_8101848: @ 8101848
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xE
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r6, _08101890
ldrb r1, [r6]
ldr r5, _08101894
@@ -277217,7 +277217,7 @@ sub_8101C84: @ 8101C84
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
pop {r4}
pop {r0}
bx r0
@@ -277576,11 +277576,11 @@ _08101F28: .4byte 0x03001770
sub_8101F2C: @ 8101F2C
push {r4,lr}
adds r4, r0, 0
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -277611,7 +277611,7 @@ sub_8101F60: @ 8101F60
ands r0, r1
cmp r0, 0
beq _08101F78
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08101F84
movs r0, 0x5
strb r0, [r1]
@@ -278116,7 +278116,7 @@ sub_8102318: @ 8102318
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
bl sub_814AB84
ldr r1, _08102340
movs r0, 0x16
@@ -278132,12 +278132,12 @@ _08102340: .4byte 0x02000000
thumb_func_start sub_8102344
sub_8102344: @ 8102344
push {lr}
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
bne _0810237C
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
bl sub_8103D8C
movs r0, 0x1
@@ -278162,7 +278162,7 @@ _0810237C:
cmp r1, r0
bne _08102392
_08102388:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08102398
movs r0, 0x5
strb r0, [r1]
@@ -278199,7 +278199,7 @@ sub_81023B8: @ 81023B8
ands r0, r1
cmp r0, 0
beq _081023D0
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _081023DC
movs r0, 0x5
strb r0, [r1]
@@ -278237,7 +278237,7 @@ sub_81023FC: @ 81023FC
ands r0, r1
cmp r0, 0
beq _08102414
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08102420
movs r0, 0x1B
strb r0, [r1]
@@ -283466,7 +283466,7 @@ _08104A50:
pop {r0}
bx r0
.align 2, 0
-_08104A80: .4byte gUnknown_083EEFE0
+_08104A80: .4byte gReelTimeWindowTilemap
_08104A84: .4byte 0x0600e000
thumb_func_end sub_8104A40
@@ -283620,7 +283620,7 @@ sub_8104B80: @ 8104B80
bl sub_8104DA4
bl sub_81065DC
ldr r0, _08104BC0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _08104BC4
movs r1, 0xA
movs r2, 0x20
@@ -283680,9 +283680,9 @@ sub_8104BFC: @ 8104BFC
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08104C3C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
bl sub_81064B8
ldrb r0, [r4, 0xA]
bl sub_8104CAC
@@ -286892,7 +286892,7 @@ sub_81063C0: @ 81063C0
pop {r0}
bx r0
.align 2, 0
-_081063F0: .4byte gUnknown_08E99848
+_081063F0: .4byte gSlotMachineReelTimeLights_Gfx
_081063F4: .4byte 0x02010000
_081063F8: .4byte gUnknown_083EDE8C
_081063FC: .4byte gUnknown_083EDC2C
@@ -286980,7 +286980,7 @@ _08106468:
pop {r0}
bx r0
.align 2, 0
-_081064A0: .4byte gUnknown_08E8F844
+_081064A0: .4byte gSlotMachine_Gfx
_081064A4: .4byte 0x02010000
_081064A8: .4byte 0x040000d4
_081064AC: .4byte 0x80000800
@@ -287528,7 +287528,7 @@ sub_81068FC: @ 81068FC
push {r4,lr}
ldr r4, _08106914
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
adds r0, r4, 0
bl SetUpWindowConfig
pop {r4}
@@ -288859,7 +288859,7 @@ _081073C6:
.align 2, 0
_081073D0: .4byte 0x02016800
_081073D4: .4byte 0x02039238
-_081073D8: .4byte gUnknown_081DA01C
+_081073D8: .4byte BattleAIs
_081073DC: .4byte 0x02024a80
_081073E0: .4byte 0x02024c07
_081073E4:
@@ -291343,17 +291343,17 @@ _081085CA:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08108608
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08108608
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -291861,17 +291861,17 @@ _081089C8:
add r4, r9
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
cmp r5, 0
beq _08108A00
cmp r5, r10
@@ -291947,17 +291947,17 @@ _08108A6C:
add r4, r10
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
cmp r5, 0
beq _08108AB0
movs r1, 0xCE
@@ -293346,7 +293346,7 @@ _081094D2:
adds r2, 0x48
adds r1, r2
ldr r1, [r1]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
ldr r1, _08109504
lsls r0, 24
lsrs r0, 24
@@ -294076,7 +294076,7 @@ _081099E0:
.align 2, 0
_08109A14: .4byte 0x020284c8
_08109A18: .4byte gUnknown_083F62D8
-_08109A1C: .4byte gUnknown_083F62E8
+_08109A1C: .4byte gTraderDecorations
thumb_func_end sub_81099CC
thumb_func_start sub_8109A20
@@ -294142,7 +294142,7 @@ _08109A72:
movs r0, 0
movs r1, 0x1
movs r2, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
mov r1, r9
lsls r1, 2
@@ -294161,7 +294161,7 @@ _08109A98:
lsrs r2, 24
ldr r0, _08109ABC
movs r1, 0x1
- bl Print
+ bl MenuPrint
b _08109AD8
.align 2, 0
_08109AB8: .4byte 0x020284c8
@@ -294177,7 +294177,7 @@ _08109AC0:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
_08109AD8:
adds r0, r5, 0x1
lsls r0, 24
@@ -294195,7 +294195,7 @@ _08109ADE:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0
str r0, [sp]
movs r0, 0xB
@@ -294250,7 +294250,7 @@ _08109B58:
movs r1, 0x1
movs r2, 0xC
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -294469,7 +294469,7 @@ sub_8109D04: @ 8109D04
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl SetBgTilemapBuffer
movs r0, 0x1
@@ -294541,7 +294541,7 @@ sub_8109DAC: @ 8109DAC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _08109DDC
movs r0, 0
strh r0, [r1]
@@ -294734,7 +294734,7 @@ sub_8109E80: @ 8109E80
ldr r0, _0810A0CC
bl SetUpWindowConfig
ldr r0, _0810A0D0
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0x1
negs r0, r0
mov r1, r9
@@ -294887,9 +294887,9 @@ _0810A09C: .4byte 0x8100c000
_0810A0A0: .4byte 0x85000100
_0810A0A4: .4byte 0x81000200
_0810A0A8: .4byte gUnknown_083F66F0
-_0810A0AC: .4byte gUnknown_083F636C
+_0810A0AC: .4byte gBirchBagTilemap
_0810A0B0: .4byte 0x06003000
-_0810A0B4: .4byte gUnknown_083F64F8
+_0810A0B4: .4byte gBirchGrassTilemap
_0810A0B8: .4byte 0x06003800
_0810A0BC: .4byte gUnknown_083F62EC
_0810A0C0: .4byte gUnknown_083F7794
@@ -294945,11 +294945,11 @@ sub_810A134: @ 810A134
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810A170
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0810A174
str r0, [r4]
pop {r4}
@@ -294993,7 +294993,7 @@ sub_810A178: @ 810A178
adds r3, r1, 0x3
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A224
movs r1, 0
strh r1, [r0]
@@ -295151,15 +295151,15 @@ sub_810A2D8: @ 810A2D8
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810A328
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0810A32C
str r0, [r4]
pop {r4}
@@ -295176,7 +295176,7 @@ sub_810A330: @ 810A330
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -295216,7 +295216,7 @@ _0810A37C:
movs r1, 0x7
movs r2, 0x1B
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A3E8
lsls r5, r4, 2
adds r5, r4
@@ -295324,7 +295324,7 @@ sub_810A42C: @ 810A42C
adds r3, r1, 0x3
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A56C
movs r1, 0
strh r1, [r0]
@@ -295404,7 +295404,7 @@ _0810A4D8:
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0
movs r2, 0xF
@@ -295424,7 +295424,7 @@ _0810A4D8:
lsrs r2, 24
mov r0, sp
adds r1, r4, 0
- bl Print
+ bl MenuPrint
lsls r0, r4, 3
adds r0, 0x4
lsls r0, 24
@@ -295504,7 +295504,7 @@ sub_810A580: @ 810A580
bl LoadCompressedObjectPalette
adds r0, r5, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0810A620
mov r1, r8
mov r2, r9
@@ -295790,9 +295790,9 @@ _0810A77C:
.align 2, 0
_0810A7F8: .4byte 0x040000d4
_0810A7FC: .4byte 0x81000800
-_0810A800: .4byte gUnknown_08E8F1B8
+_0810A800: .4byte gMiscClock_Gfx
_0810A804: .4byte 0x0202e8cc
-_0810A808: .4byte gUnknown_08E8F804
+_0810A808: .4byte gMiscClockMale_Pal
_0810A80C:
ldr r0, _0810A850
movs r1, 0
@@ -295811,7 +295811,7 @@ _0810A816:
ldr r0, _0810A85C
bl SetUpWindowConfig
ldr r0, _0810A860
- bl sub_8071C4C
+ bl InitMenuWindow
add sp, 0x8
pop {r3}
mov r8, r3
@@ -295819,7 +295819,7 @@ _0810A816:
pop {r0}
bx r0
.align 2, 0
-_0810A850: .4byte gUnknown_08E8F824
+_0810A850: .4byte gMiscClockFemale_Pal
_0810A854: .4byte gUnknown_083F7A90
_0810A858: .4byte gUnknown_083F7AA0
_0810A85C: .4byte gWindowConfig_81E6C3C
@@ -296321,21 +296321,21 @@ sub_810AC60: @ 810AC60
movs r1, 0x10
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810ACC4
movs r1, 0x3
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0810ACC8
movs r0, 0x18
movs r1, 0x9
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0x1
str r0, [sp]
movs r0, 0x5
@@ -296368,7 +296368,7 @@ c3_80BF560: @ 810ACD4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -296405,12 +296405,12 @@ _0810AD18:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
movs r1, 0x10
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810AD50
lsls r1, r4, 2
adds r1, r4
@@ -296935,7 +296935,7 @@ _0810B0E0:
bx r0
.align 2, 0
_0810B0EC: .4byte 0x03004b20
-_0810B0F0: .4byte gUnknown_083F7B58
+_0810B0F0: .4byte gClockHandCoords
thumb_func_end sub_810B05C
thumb_func_start sub_810B0F4
@@ -297015,7 +297015,7 @@ _0810B178:
bx r0
.align 2, 0
_0810B184: .4byte 0x03004b20
-_0810B188: .4byte gUnknown_083F7B58
+_0810B188: .4byte gClockHandCoords
thumb_func_end sub_810B0F4
thumb_func_start sub_810B18C
@@ -297811,12 +297811,12 @@ _0810B7D4: .4byte 0x03001770
_0810B7D8: .4byte 0x0000043c
_0810B7DC:
ldr r0, _0810B7E4
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _0810B91C
.align 2, 0
_0810B7E4: .4byte gWindowConfig_81E6E34
_0810B7E8:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _0810B7F2
b _0810B960
@@ -297830,12 +297830,12 @@ _0810B7FC: .4byte 0x03001770
_0810B800: .4byte 0x0000043c
_0810B804:
ldr r0, _0810B80C
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _0810B91C
.align 2, 0
_0810B80C: .4byte gWindowConfig_81E6E50
_0810B810:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _0810B81A
b _0810B960
@@ -298048,7 +298048,7 @@ _0810B9D0:
bl LZDecompressVram
b _0810BA0E
.align 2, 0
-_0810B9DC: .4byte gUnknown_08E77AE4
+_0810B9DC: .4byte gMenuPokeblock_Gfx
_0810B9E0: .4byte 0x06008000
_0810B9E4:
ldr r0, _0810B9F0
@@ -298056,7 +298056,7 @@ _0810B9E4:
bl sub_800D238
b _0810BA0E
.align 2, 0
-_0810B9F0: .4byte gUnknown_08E78078
+_0810B9F0: .4byte gMenuPokeblock_Tilemap
_0810B9F4: .4byte 0x020221cc
_0810B9F8:
ldr r0, _0810BA04
@@ -298065,7 +298065,7 @@ _0810B9F8:
bl LoadCompressedPalette
b _0810BA0E
.align 2, 0
-_0810BA04: .4byte gUnknown_08E77D20
+_0810BA04: .4byte gMenuPokeblock_Pal
_0810BA08:
ldr r0, _0810BA1C
bl LoadCompressedObjectPic
@@ -298206,13 +298206,13 @@ _0810BB08: .4byte sub_810B96C
sub_810BB0C: @ 810BB0C
push {lr}
ldr r0, _0810BB28
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _0810BB2C
bl itemid_get_item
movs r1, 0x2
movs r2, 0x1
movs r3, 0x48
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -298224,27 +298224,27 @@ _0810BB2C: .4byte 0x00000111
sub_810BB30: @ 810BB30
push {lr}
ldr r0, _0810BB70
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _0810BB74
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0810BB78
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0810BB7C
movs r1, 0x2
movs r2, 0x11
- bl Print
+ bl MenuPrint
ldr r0, _0810BB80
movs r1, 0x8
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0810BB84
movs r1, 0x8
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -298267,7 +298267,7 @@ sub_810BB88: @ 810BB88
lsrs r0, 24
mov r8, r0
ldr r0, _0810BBF4
- bl sub_8071E2C
+ bl BasicInitMenuWindow
mov r6, r8
adds r0, r6, 0
adds r0, 0x8
@@ -298295,7 +298295,7 @@ _0810BBB0:
orrs r2, r7
mov r0, r9
movs r1, 0xF
- bl Print
+ bl MenuPrint
mov r0, r8
adds r0, 0x8
cmp r6, r0
@@ -298306,7 +298306,7 @@ _0810BBB0:
movs r0, 0xF
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
b _0810BC6C
.align 2, 0
_0810BBF4: .4byte gWindowConfig_81E6E34
@@ -298353,7 +298353,7 @@ _0810BC08:
orrs r2, r7
mov r0, r9
movs r1, 0xF
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -298683,7 +298683,7 @@ _0810BECC:
cmp r6, 0x4
bls _0810BE30
ldr r0, _0810BF10
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _0810BF14
ldrb r2, [r0]
ldrb r1, [r0, 0x1]
@@ -298706,7 +298706,7 @@ _0810BECC:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0x11
- bl Print
+ bl MenuPrint
b _0810BF2C
.align 2, 0
_0810BF10: .4byte gWindowConfig_81E6E34
@@ -298718,7 +298718,7 @@ _0810BF20:
movs r1, 0x11
movs r2, 0xC
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0810BF2C:
pop {r3}
mov r8, r3
@@ -299276,12 +299276,12 @@ _0810C37C:
movs r0, 0x1
bl sub_80F98A4
ldr r0, _0810C3EC
- bl sub_8071E2C
+ bl BasicInitMenuWindow
adds r1, r4, 0x4
movs r0, 0x7
movs r2, 0xD
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r4, 0x5
ldr r5, _0810C3F0
ldrb r2, [r5]
@@ -299291,7 +299291,7 @@ _0810C37C:
str r0, [sp]
movs r0, 0x8
adds r1, r4, 0
- bl sub_80728E4
+ bl PrintMenuItemsReordered
ldrb r3, [r5]
movs r0, 0
str r0, [sp]
@@ -299484,13 +299484,13 @@ sub_810C540: @ 810C540
lsls r5, 24
lsrs r5, 24
ldr r0, _0810C5A0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
bl sub_8072DEC
movs r0, 0x7
movs r1, 0x4
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810C5A4
ldr r4, _0810C5A8
ldr r3, _0810C5AC
@@ -299564,7 +299564,7 @@ sub_810C5EC: @ 810C5EC
movs r0, 0x7
movs r1, 0x6
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0810C60C
adds r0, r4, 0
bl sub_80F914C
@@ -299585,7 +299585,7 @@ sub_810C610: @ 810C610
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C658
ldrb r0, [r1, 0x1]
ldrb r1, [r1]
@@ -299639,17 +299639,17 @@ sub_810C668: @ 810C668
bl sub_80F979C
_0810C698:
ldr r0, _0810C6D0
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r0, 0x7
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C6D4
lsls r0, r4, 2
adds r0, r4
@@ -299699,7 +299699,7 @@ sub_810C704: @ 810C704
lsls r4, 24
lsrs r4, 24
ldr r0, _0810C738
- bl sub_8071E2C
+ bl BasicInitMenuWindow
ldr r0, _0810C73C
ldrb r0, [r0, 0x1]
bl sub_810BC84
@@ -299738,7 +299738,7 @@ sub_810C748: @ 810C748
movs r1, 0x4
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C780
lsls r0, r4, 2
adds r0, r4
@@ -300744,11 +300744,11 @@ sub_810CE78: @ 810CE78
pop {r0}
bx r0
.align 2, 0
-_0810CEE8: .4byte gUnknown_083F828C
+_0810CEE8: .4byte gCaveTransitionTiles
_0810CEEC: .4byte 0x0600c000
-_0810CEF0: .4byte gUnknown_083F80AC
+_0810CEF0: .4byte gCaveTransitionTilemap
_0810CEF4: .4byte 0x0600f800
-_0810CEF8: .4byte gUnknown_083F804C
+_0810CEF8: .4byte gCaveTransitionPalette_White
_0810CEFC: .4byte gUnknown_083F809C
_0810CF00: .4byte REG_BLDCNT
_0810CF04: .4byte 0x00003e41
@@ -300845,7 +300845,7 @@ _0810CFB6:
pop {r0}
bx r0
.align 2, 0
-_0810CFBC: .4byte gUnknown_083F804C
+_0810CFBC: .4byte gCaveTransitionPalette_White
_0810CFC0: .4byte sub_810CFC4
thumb_func_end sub_810CF5C
@@ -300963,15 +300963,15 @@ sub_810D028: @ 810D028
pop {r0}
bx r0
.align 2, 0
-_0810D098: .4byte gUnknown_083F828C
+_0810D098: .4byte gCaveTransitionTiles
_0810D09C: .4byte 0x0600c000
-_0810D0A0: .4byte gUnknown_083F80AC
+_0810D0A0: .4byte gCaveTransitionTilemap
_0810D0A4: .4byte 0x0600f800
_0810D0A8: .4byte REG_BLDCNT
_0810D0AC: .4byte REG_BG0CNT
_0810D0B0: .4byte 0x00001f0c
-_0810D0B4: .4byte gUnknown_083F804C
-_0810D0B8: .4byte gUnknown_083F806C
+_0810D0B4: .4byte gCaveTransitionPalette_White
+_0810D0B8: .4byte gCaveTransitionPalette_Black
_0810D0BC: .4byte 0x03004b20
_0810D0C0: .4byte sub_810D0C4
thumb_func_end sub_810D028
@@ -301067,7 +301067,7 @@ _0810D172:
pop {r0}
bx r0
.align 2, 0
-_0810D178: .4byte gUnknown_083F806C
+_0810D178: .4byte gCaveTransitionPalette_Black
_0810D17C: .4byte 0x03001770
thumb_func_end sub_810D128
@@ -301137,17 +301137,17 @@ _0810D1FC:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0810D23A
adds r0, r4, 0
movs r1, 0x6
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0810D23A
adds r0, r4, 0
movs r1, 0x43
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0810D23A
movs r0, 0x1
@@ -301155,7 +301155,7 @@ _0810D1FC:
adds r0, r4, 0
movs r1, 0x43
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
movs r6, 0x1
_0810D23A:
adds r5, 0x1
@@ -301298,12 +301298,12 @@ _0810D336:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0810D368
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
ldr r1, _0810D364
ands r1, r0
cmp r1, r6
@@ -303402,7 +303402,7 @@ sub_810E384: @ 810E384
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xFF
bne _0810E3AC
movs r0, 0x6
@@ -303412,7 +303412,7 @@ _0810E3A8: .4byte 0x03004360
_0810E3AC:
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810E3BC
movs r0, 0x5
@@ -303420,7 +303420,7 @@ _0810E3AC:
_0810E3BC:
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x95
bls _0810E3CC
movs r0, 0x4
@@ -303428,7 +303428,7 @@ _0810E3BC:
_0810E3CC:
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x63
bls _0810E3DC
movs r0, 0x3
@@ -303436,7 +303436,7 @@ _0810E3CC:
_0810E3DC:
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x31
bls _0810E3EC
movs r0, 0x2
@@ -303444,7 +303444,7 @@ _0810E3DC:
_0810E3EC:
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0810E3FC
movs r0, 0
@@ -304083,7 +304083,7 @@ sub_810E874: @ 810E874
movs r1, 0
movs r2, 0x8
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
str r4, [sp]
movs r0, 0x7
@@ -304111,7 +304111,7 @@ _0810E8C0:
movs r0, 0
movs r1, 0
movs r2, 0x8
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r3, [r4]
movs r0, 0
str r0, [sp]
@@ -304141,7 +304141,7 @@ _0810E8F6:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -304174,12 +304174,12 @@ sub_810E944: @ 810E944
movs r1, 0
movs r2, 0x1D
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810E978
movs r1, 0x15
movs r2, 0x1
movs r3, 0x40
- bl Free
+ bl sub_8072BD8
ldr r1, _0810E97C
ldr r0, _0810E980
ldrh r0, [r0]
@@ -304189,7 +304189,7 @@ sub_810E944: @ 810E944
movs r1, 0x15
movs r2, 0x3
movs r3, 0x40
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -304219,7 +304219,7 @@ sub_810E984: @ 810E984
lsrs r4, r0, 24
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x40
bl sub_810EAC8
@@ -304241,7 +304241,7 @@ _0810E9B8:
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x80
bl sub_810EAC8
@@ -304283,7 +304283,7 @@ _0810E9E8:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_810EC9C
b _0810EABC
@@ -304308,7 +304308,7 @@ _0810EA5C:
movs r3, 0x1
bl FieldObjectTurnByLocalIdAndMap
bl sub_810EEDC
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r6, 0
bl DestroyTask
b _0810EABC
@@ -304330,7 +304330,7 @@ _0810EA94:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_810EC9C
_0810EABC:
@@ -304396,7 +304396,7 @@ _0810EB1C:
movs r1, 0x1
movs r2, 0x7
movs r3, 0xA
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r5, 0
ldr r2, _0810EB88
lsls r1, r4, 2
@@ -304418,7 +304418,7 @@ _0810EB44:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -304916,7 +304916,7 @@ sub_810EF3C: @ 810EF3C
ldr r1, _0810EF5C
adds r0, r1
movs r1, 0x16
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810EF60
movs r0, 0x1
@@ -304941,7 +304941,7 @@ sub_810EF68: @ 810EF68
ldr r1, _0810EF88
adds r0, r1
movs r1, 0x17
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810EF8C
movs r0, 0x1
@@ -304966,7 +304966,7 @@ sub_810EF94: @ 810EF94
ldr r1, _0810EFB4
adds r0, r1
movs r1, 0x18
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810EFB8
movs r0, 0x1
@@ -304991,7 +304991,7 @@ sub_810EFC0: @ 810EFC0
ldr r1, _0810EFE0
adds r0, r1
movs r1, 0x21
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810EFE4
movs r0, 0x1
@@ -305016,7 +305016,7 @@ sub_810EFEC: @ 810EFEC
ldr r1, _0810F00C
adds r0, r1
movs r1, 0x2F
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xC7
bls _0810F010
movs r0, 0x1
@@ -305043,17 +305043,17 @@ _0810F01E:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0810F074
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0810F074
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 3
@@ -305100,7 +305100,7 @@ sub_810F090: @ 810F090
movs r1, 0
movs r2, 0xA
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
str r4, [sp]
movs r0, 0x9
@@ -305125,7 +305125,7 @@ _0810F0CA:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -305172,7 +305172,7 @@ sub_810F118: @ 810F118
lsrs r4, r0, 24
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x40
bl sub_810F1F4
@@ -305194,7 +305194,7 @@ _0810F14A:
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x80
bl sub_810F1F4
@@ -305217,7 +305217,7 @@ _0810F17A:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_810EC9C
_0810F1AE:
@@ -305237,7 +305237,7 @@ _0810F1AE:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_810EC9C
_0810F1DE:
@@ -305303,7 +305303,7 @@ _0810F244:
movs r1, 0x1
movs r2, 0x9
movs r3, 0xA
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r5, 0
ldr r7, _0810F28C
_0810F25C:
@@ -305315,7 +305315,7 @@ _0810F25C:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -305702,7 +305702,7 @@ sub_810F524: @ 810F524
adds r0, r1
movs r1, 0x47
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -305731,7 +305731,7 @@ sub_810F54C: @ 810F54C
adds r0, r1
movs r1, 0x47
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
add sp, 0x4
pop {r0}
bx r0
@@ -305840,35 +305840,35 @@ sub_810F628: @ 810F628
adds r0, r5, 0
movs r2, 0x7
movs r3, 0x20
- bl create_pokemon_set_level
+ bl CreateMon
movs r1, 0x1
add r0, sp, 0x10
strh r1, [r0]
adds r0, r5, 0
movs r1, 0x2E
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
add r1, sp, 0x10
movs r0, 0x21
strh r0, [r1]
adds r0, r5, 0
movs r1, 0xD
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
add r0, sp, 0x10
strh r4, [r0]
adds r0, r5, 0
movs r1, 0xE
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0xF
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0x10
add r2, sp, 0x10
- bl pokemon_setattr
+ bl SetMonData
add sp, 0x14
pop {r4,r5}
pop {r0}
@@ -305900,7 +305900,7 @@ _0810F6B6:
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
cmp r0, r6
bne _0810F6D8
movs r0, 0x1
@@ -305942,7 +305942,7 @@ _0810F6FC:
adds r0, r6, r0
movs r1, 0xB
movs r2, 0
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _0810F71C
movs r0, 0x1
@@ -306156,7 +306156,7 @@ _0810F88C:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -306164,7 +306164,7 @@ _0810F88C:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0810F8C0
adds r0, r5, 0
@@ -306196,7 +306196,7 @@ sub_810F8D4: @ 810F8D4
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -306282,7 +306282,7 @@ sub_810F96C: @ 810F96C
ldr r4, _0810F99C
movs r1, 0x7
adds r2, r4, 0
- bl PokemonGetField
+ bl GetMonData
ldr r0, _0810F9A0
adds r1, r4, 0
bl StringCompareWithoutExtCtrlCodes
@@ -307557,7 +307557,7 @@ sub_81102E8: @ 81102E8
ldr r0, _08110344
movs r1, 0x3
movs r2, 0x3
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -307603,22 +307603,22 @@ sub_8110348: @ 8110348
mov r0, sp
movs r1, 0x3
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldr r1, _081103BC
adds r0, r4, 0
bl StringCopy
mov r0, sp
movs r1, 0xB
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x11
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x17
adds r2, r6, 0
- bl Print
+ bl MenuPrint
b _0811042E
.align 2, 0
_081103B8: .4byte gUnknown_0842CA3C
@@ -307635,7 +307635,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x3
adds r2, r6, 0
- bl Print
+ bl MenuPrint
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x14
@@ -307651,7 +307651,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldrh r1, [r7, 0xC]
adds r0, r5, 0
movs r2, 0x1
@@ -307660,7 +307660,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x11
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldrh r1, [r7, 0xE]
adds r0, r5, 0
movs r2, 0x1
@@ -307669,7 +307669,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x17
adds r2, r6, 0
- bl Print
+ bl MenuPrint
_0811042E:
add sp, 0x10
pop {r4-r7}
@@ -307686,18 +307686,18 @@ sub_811043C: @ 811043C
movs r1, 0
movs r2, 0x1C
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08110488
movs r1, 0
movs r2, 0x1
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
ldr r0, _0811048C
bl sub_81102E8
ldr r0, _08110490
movs r1, 0xC
movs r2, 0x6
- bl Print
+ bl MenuPrint
movs r4, 0
_08110468:
lsls r0, r4, 4
@@ -307774,7 +307774,7 @@ sub_81104E8: @ 81104E8
adds r6, r3, 0
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldr r0, _0811052C
cmp r4, r0
bls _0811050A
@@ -307790,7 +307790,7 @@ _0811050A:
lsls r1, 24
lsrs r1, 24
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -307898,20 +307898,20 @@ sub_81105E4: @ 81105E4
movs r1, 0x1
movs r2, 0x1B
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08110658
movs r1, 0x3
movs r2, 0x2
movs r3, 0xC8
- bl Free
+ bl sub_8072BD8
ldr r0, _0811065C
movs r1, 0x5
movs r2, 0x6
- bl Print
+ bl MenuPrint
ldr r0, _08110660
movs r1, 0x5
movs r2, 0xC
- bl Print
+ bl MenuPrint
movs r4, 0x5
_08110614:
lsls r1, r4, 24
@@ -310521,7 +310521,7 @@ evolution_cutscene: @ 8111984
ldr r0, [sp, 0x20]
movs r1, 0x2
add r2, sp, 0x8
- bl PokemonGetField
+ bl GetMonData
ldr r0, _08111C48
add r1, sp, 0x8
bl StringCopy10
@@ -310535,17 +310535,17 @@ evolution_cutscene: @ 8111984
bl StringCopy
ldr r0, [sp, 0x20]
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
ldr r0, [sp, 0x20]
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x2C]
ldr r0, [sp, 0x20]
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x30]
lsls r0, r6, 3
ldr r1, _08111C54
@@ -310573,7 +310573,7 @@ evolution_cutscene: @ 8111984
bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111C60
mov r9, r0
ldr r1, _08111C64
@@ -310639,7 +310639,7 @@ evolution_cutscene: @ 8111984
bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111C64
mov r1, r9
str r0, [r1, 0x10]
@@ -310788,11 +310788,11 @@ sub_8111C90: @ 8111C90
ldrh r6, [r0, 0x10]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
mov r10, r0
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
movs r0, 0
bl SetHBlankCallback
@@ -310881,7 +310881,7 @@ sub_8111C90: @ 8111C90
bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111E64
ldr r1, _08111E68
str r1, [r0, 0x10]
@@ -311079,16 +311079,16 @@ _08111F88:
ldr r4, _08111FC8
ldr r0, [r4]
adds r0, 0x4
- bl sub_8064F08
+ bl LoadTextWindowGraphics
movs r0, 0x2
- bl sub_8064EF4
+ bl SetTextWindowBaseTileNum
ldr r1, [r4]
adds r1, 0x34
strb r0, [r1]
ldr r0, [r4]
adds r0, 0x4
- bl sub_8064F08
- bl sub_8071EF4
+ bl LoadTextWindowGraphics
+ bl MenuZeroFillScreen
bl ResetPaletteFade
ldr r1, _08111FCC
ldr r0, _08111FD0
@@ -311113,11 +311113,11 @@ _08111FDC:
_08111FE2:
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r5, r0, 0
lsls r0, r7, 3
ldr r1, _08112034
@@ -311156,7 +311156,7 @@ _08112044: .4byte 0x0000043c
_08112048:
adds r0, r7, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08112098
ldr r1, _0811209C
str r1, [r0, 0x10]
@@ -311249,7 +311249,7 @@ sub_81120E4: @ 81120E4
ldr r0, [sp, 0x1C]
movs r1, 0x2
add r2, sp, 0x8
- bl PokemonGetField
+ bl GetMonData
ldr r0, _08112234
add r1, sp, 0x8
bl StringCopy10
@@ -311264,7 +311264,7 @@ sub_81120E4: @ 81120E4
strb r0, [r1]
ldr r0, [sp, 0x1C]
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
mov r1, r8
lsls r1, 16
@@ -311272,11 +311272,11 @@ sub_81120E4: @ 81120E4
mov r8, r1
ldr r0, [sp, 0x1C]
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
ldr r0, [sp, 0x1C]
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r7, r0, 0
ldr r2, _08112244
mov r9, r2
@@ -311307,7 +311307,7 @@ sub_81120E4: @ 81120E4
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08112254
ldr r1, _08112258
str r1, [r0, 0x10]
@@ -311469,13 +311469,13 @@ _081122E2:
adds r0, r5, 0
mov r1, r10
movs r2, 0x64
- bl memcpy_pokemon
+ bl CopyMon
mov r1, r8
adds r2, r1, r4
adds r2, 0xC
adds r0, r5, 0
movs r1, 0xB
- bl pokemon_setattr
+ bl SetMonData
ldrh r1, [r6, 0xC]
movs r0, 0xB
adds r2, r1, 0
@@ -311484,26 +311484,26 @@ _081122E2:
adds r2, r0
adds r0, r5, 0
movs r1, 0x2
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0x8
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
movs r1, 0xA
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
movs r4, 0x32
mov r6, r9
_08112342:
adds r0, r5, 0
adds r1, r4, 0
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r4, 0x1
cmp r4, 0x36
ble _08112342
@@ -311512,22 +311512,22 @@ _08112354:
adds r0, r5, 0
adds r1, r4, 0
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r4, 0x1
cmp r4, 0x4F
ble _08112354
adds r0, r5, 0
movs r1, 0x37
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
movs r0, 0xFF
str r0, [sp]
adds r0, r5, 0
movs r1, 0x40
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r5, 0
- bl pokemon_calc_effective_stats
+ bl CalculateMonStats
bl calc_player_party_count
ldr r0, _081123F4
adds r4, r6, r7
@@ -311547,18 +311547,18 @@ _08112354:
bl sub_8090D90
adds r0, r5, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldr r1, _08112404
cmp r0, r1
bne _081123E2
adds r0, r5, 0
movs r1, 0x3
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x1
bne _081123E2
mov r0, r10
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
movs r1, 0x97
lsls r1, 1
cmp r0, r1
@@ -311566,7 +311566,7 @@ _08112354:
ldr r2, _08112408
adds r0, r5, 0
movs r1, 0x2
- bl pokemon_setattr
+ bl SetMonData
_081123E2:
add sp, 0x4
pop {r3-r5}
@@ -312032,9 +312032,9 @@ _081127BE:
adds r2, 0x10
mov r0, r9
movs r1, 0xB
- bl pokemon_setattr
+ bl SetMonData
mov r0, r9
- bl pokemon_calc_effective_stats
+ bl CalculateMonStats
ldrh r1, [r4, 0xE]
ldrh r2, [r4, 0x10]
mov r0, r9
@@ -312093,7 +312093,7 @@ _08112856:
mov r0, r9
movs r1, 0x2
add r2, sp, 0x4
- bl PokemonGetField
+ bl GetMonData
ldr r0, _081128A8
add r1, sp, 0x4
bl StringCopy10
@@ -312709,7 +312709,7 @@ _08112DCC:
adds r1, r6, 0
adds r1, 0xD
mov r0, r9
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -312762,7 +312762,7 @@ _08112E24:
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
- bl sub_803B6A4
+ bl SetMonMoveSlot
ldr r0, _08112E88
movs r3, 0xCF
lsls r3, 2
@@ -313340,9 +313340,9 @@ _08113316:
adds r2, 0x10
mov r0, r8
movs r1, 0xB
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
- bl pokemon_calc_effective_stats
+ bl CalculateMonStats
ldrh r1, [r4, 0xE]
ldrh r2, [r4, 0x10]
mov r0, r8
@@ -313410,7 +313410,7 @@ _081133C2:
mov r0, r8
movs r1, 0x2
add r2, sp, 0x4
- bl PokemonGetField
+ bl GetMonData
ldr r0, _08113418
add r1, sp, 0x4
bl StringCopy10
@@ -313728,7 +313728,7 @@ _0811369C:
movs r1, 0x18
movs r2, 0x8
movs r3, 0x1D
- bl AddTextPrinterParametrized
+ bl DrawTextWindow
ldr r4, _0811370C
strb r6, [r4, 0x1]
ldr r2, [r5]
@@ -314002,7 +314002,7 @@ _08113910:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -314058,7 +314058,7 @@ _08113970:
ldrh r1, [r0]
mov r0, r8
adds r2, r4, 0
- bl sub_803B6A4
+ bl SetMonMoveSlot
ldr r0, _081139D8
movs r3, 0xCF
lsls r3, 2
@@ -317284,7 +317284,7 @@ _08115322:
ldr r1, _08115360
adds r0, r1
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
movs r0, 0x98
lsls r0, 1
@@ -317414,7 +317414,7 @@ _08115460:
ldr r0, _08115480
bl SetUpWindowConfig
ldr r0, _08115484
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _08115488
movs r2, 0xE0
lsls r2, 1
@@ -317484,11 +317484,11 @@ _081154FC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08115558
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0811555C
movs r2, 0x3C
negs r2, r2
@@ -317732,18 +317732,18 @@ sub_8115734: @ 8115734
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08115770
bl sub_814AAF8
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08115774
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08115778
adds r0, r4, 0
bl sub_80F914C
@@ -317766,7 +317766,7 @@ sub_811577C: @ 811577C
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _081157A4
lsls r0, r4, 2
adds r0, r4
@@ -319646,7 +319646,7 @@ sub_8116638: @ 8116638
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116680
b _0811669A
.align 2, 0
@@ -319661,12 +319661,12 @@ _08116684:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081166A4
_0811669A:
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _081166C4
.align 2, 0
_081166A4: .4byte gUnknown_081C4199
@@ -319677,11 +319677,11 @@ _081166A8:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081166DC
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
_081166C4:
ldr r1, _081166E0
lsls r0, r4, 2
@@ -319806,11 +319806,11 @@ sub_811677C: @ 811677C
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldrb r1, [r6, 0x19]
movs r2, 0xC
ldrsh r0, [r4, r2]
@@ -319997,11 +319997,11 @@ _081168E4:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116968
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0811696C
b _08116992
.align 2, 0
@@ -320022,11 +320022,11 @@ _08116970:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081169A4
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081169A8
_08116992:
ldr r2, _081169AC
@@ -320050,11 +320050,11 @@ _081169BC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081169EC
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081169F0
adds r0, r6, 0
movs r2, 0x3C
@@ -320129,11 +320129,11 @@ _08116A2A:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116A94
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08116A98
ldr r2, _08116A9C
adds r0, r5, 0
@@ -321491,7 +321491,7 @@ sub_81174F8: @ 81174F8
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08117520
bl sub_814AAF8
ldr r1, _08117524
@@ -321542,8 +321542,8 @@ sub_811755C: @ 811755C
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
- bl sub_8071EF4
+ bl MenuZeroFillWindowRect
+ bl MenuZeroFillScreen
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -321585,7 +321585,7 @@ sub_81175C0: @ 81175C0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl script_env_2_disable
adds r0, r4, 0
bl DestroyTask
@@ -321622,7 +321622,7 @@ _08117608:
ldr r1, _0811762C
movs r0, 0x1
strh r0, [r1]
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl script_env_2_disable
adds r0, r4, 0
bl DestroyTask
@@ -321664,11 +321664,11 @@ sub_8117630: @ 8117630
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081176A0
lsls r0, r4, 2
adds r0, r4
@@ -321719,11 +321719,11 @@ sub_81176A8: @ 81176A8
movs r1, 0
movs r2, 0x9
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x9
movs r2, 0x1
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r2, _08117768
ldr r1, _0811776C
mov r8, r1
@@ -321759,11 +321759,11 @@ sub_81176A8: @ 81176A8
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08117770
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08117774
ldr r2, _08117778
adds r0, r7, 0
@@ -321789,11 +321789,11 @@ _0811777C:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081177B4
lsls r0, r7, 2
adds r0, r7
@@ -321815,11 +321815,11 @@ _081177BC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _081177F8
str r0, [r6]
movs r0, 0
@@ -327870,7 +327870,7 @@ sub_811A72C: @ 811A72C
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
@@ -327899,7 +327899,7 @@ sub_811A770: @ 811A770
lsls r4, 18
adds r3, r4
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4}
pop {r0}
bx r0
@@ -327968,7 +327968,7 @@ _0811A7EA:
ldr r0, _0811A828
adds r1, r6, 0
adds r2, r7, 0
- bl Print
+ bl MenuPrint
add sp, 0x10
pop {r4-r7}
pop {r0}
@@ -335124,7 +335124,7 @@ sub_811DE98: @ 811DE98
ldr r1, _0811DF2C
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl nullsub_9
@@ -335903,12 +335903,12 @@ _0811E588:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -335936,12 +335936,12 @@ _0811E5D4:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl PokemonGetField
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -335956,21 +335956,21 @@ _0811E5D4:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -335982,7 +335982,7 @@ _0811E5D4:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -335994,7 +335994,7 @@ _0811E5D4:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -336006,7 +336006,7 @@ _0811E5D4:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl PokemonGetField
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -336017,7 +336017,7 @@ _0811E5D4:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -336028,7 +336028,7 @@ _0811E5D4:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -336040,55 +336040,55 @@ _0811E5D4:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -336101,7 +336101,7 @@ _0811E5D4:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -336111,19 +336111,19 @@ _0811E5D4:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl PokemonGetField
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl PokemonGetField
+ bl GetMonData
mov r2, sp
movs r6, 0
_0811E78C:
@@ -336174,13 +336174,13 @@ _0811E7E2:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -336194,7 +336194,7 @@ _0811E7E2:
ldr r1, _0811E830
adds r0, r1
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -336236,7 +336236,7 @@ _0811E85C:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl PokemonGetField
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -336247,7 +336247,7 @@ _0811E85C:
ldr r1, _0811E888
adds r0, r1
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -336284,7 +336284,7 @@ _0811E8B8:
adds r0, r1
movs r1, 0x19
_0811E8C2:
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -336417,27 +336417,27 @@ _0811E9A8:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _0811EBEE
@@ -336522,7 +336522,7 @@ _0811EA78:
adds r0, r1
movs r1, 0x37
_0811EA82:
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -336611,7 +336611,7 @@ _0811EB1C:
adds r0, r1
movs r1, 0x3F
_0811EB26:
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -336718,7 +336718,7 @@ _0811EBDC:
adds r0, r1
movs r1, 0x36
_0811EBE6:
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_0811EBEE:
@@ -336893,12 +336893,12 @@ _0811ED9C:
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
adds r2, r6, 0
adds r2, 0x2E
adds r0, r4, 0
movs r1, 0xC
- bl pokemon_setattr
+ bl SetMonData
movs r0, 0
mov r8, r0
movs r0, 0x3B
@@ -336939,12 +336939,12 @@ _0811EE02:
adds r1, 0xD
mov r0, r9
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
mov r1, r8
adds r1, 0x11
mov r0, r9
adds r2, r7, 0
- bl pokemon_setattr
+ bl SetMonData
adds r7, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -336960,15 +336960,15 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x15
mov r2, r10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x20
ldr r2, [sp, 0x20]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x19
ldr r2, [sp, 0x28]
- bl pokemon_setattr
+ bl SetMonData
ldrb r0, [r6, 0x14]
lsls r0, 27
lsrs r0, 27
@@ -336977,7 +336977,7 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x27
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x14]
lsls r0, 22
@@ -336986,7 +336986,7 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x28
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x15]
lsls r0, 25
@@ -336995,7 +336995,7 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x29
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldr r0, [r6, 0x14]
lsls r0, 12
@@ -337004,7 +337004,7 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x2A
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x16]
lsls r0, 23
@@ -337013,7 +337013,7 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x2B
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x17]
lsls r0, 26
@@ -337022,47 +337022,47 @@ _0811EE02:
adds r0, r4, 0
movs r1, 0x2C
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0
ldr r2, [sp, 0x2C]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x37
ldr r2, [sp, 0x30]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x38
ldr r2, [sp, 0x1C]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x39
ldr r2, [sp, 0x18]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
ldr r2, [sp, 0x24]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
ldr r2, [sp, 0x4]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
ldr r2, [sp, 0x8]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
ldr r2, [sp, 0xC]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
ldr r2, [sp, 0x10]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
ldr r2, [sp, 0x14]
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811EF30: .4byte 0x03004360
@@ -337076,7 +337076,7 @@ _0811EF34:
lsls r2, 9
adds r2, r7
movs r1, 0xB
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811EF4C: .4byte 0x03004360
@@ -337091,7 +337091,7 @@ _0811EF54:
lsls r2, 9
adds r2, r7
movs r1, 0xC
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811EF6C: .4byte 0x03004360
@@ -337115,12 +337115,12 @@ _0811EF8E:
adds r1, 0xD
adds r0, r7, 0
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
mov r1, r8
adds r1, 0x11
adds r0, r7, 0
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -337134,7 +337134,7 @@ _0811EF8E:
adds r0, r1
movs r1, 0x15
mov r2, r9
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811EFC8: .4byte 0x03004360
@@ -337168,35 +337168,35 @@ _0811EFF4:
adds r2, r7
adds r0, r4, 0
movs r1, 0x11
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x12
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x13
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x14
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x15
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F050: .4byte 0x03004360
@@ -337217,7 +337217,7 @@ _0811F058:
_0811F070:
adds r3, 0x3
adds r2, r3
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F07C: .4byte 0x03004360
@@ -337233,7 +337233,7 @@ _0811F088:
lsls r2, 9
adds r2, r7
movs r1, 0x1
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F0A0: .4byte 0x03004360
@@ -337248,7 +337248,7 @@ _0811F0A8:
lsls r2, 9
adds r2, r7
movs r1, 0x19
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F0C0: .4byte 0x03004360
@@ -337263,7 +337263,7 @@ _0811F0C8:
lsls r2, 9
adds r2, r7
movs r1, 0x1A
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F0E0: .4byte 0x03004360
@@ -337278,7 +337278,7 @@ _0811F0E8:
lsls r2, 9
adds r2, r7
movs r1, 0x1B
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F100: .4byte 0x03004360
@@ -337293,7 +337293,7 @@ _0811F108:
lsls r2, 9
adds r2, r7
movs r1, 0x1C
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F120: .4byte 0x03004360
@@ -337308,7 +337308,7 @@ _0811F128:
lsls r2, 9
adds r2, r7
movs r1, 0x1D
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F140: .4byte 0x03004360
@@ -337323,7 +337323,7 @@ _0811F148:
lsls r2, 9
adds r2, r7
movs r1, 0x1E
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F160: .4byte 0x03004360
@@ -337338,7 +337338,7 @@ _0811F168:
lsls r2, 9
adds r2, r7
movs r1, 0x1F
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F180: .4byte 0x03004360
@@ -337353,7 +337353,7 @@ _0811F188:
lsls r2, 9
adds r2, r7
movs r1, 0x20
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F1A0: .4byte 0x03004360
@@ -337368,7 +337368,7 @@ _0811F1A8:
lsls r2, 9
adds r2, r7
movs r1, 0x22
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F1C0: .4byte 0x03004360
@@ -337383,7 +337383,7 @@ _0811F1C8:
lsls r2, 9
adds r2, r7
movs r1, 0x23
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F1E0: .4byte 0x03004360
@@ -337398,7 +337398,7 @@ _0811F1E8:
lsls r2, 9
adds r2, r7
movs r1, 0x24
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F200: .4byte 0x03004360
@@ -337413,7 +337413,7 @@ _0811F208:
lsls r2, 9
adds r2, r7
movs r1, 0x25
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F220: .4byte 0x03004360
@@ -337428,7 +337428,7 @@ _0811F228:
lsls r2, 9
adds r2, r7
movs r1, 0x26
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F240: .4byte 0x03004360
@@ -337445,35 +337445,35 @@ _0811F248:
adds r2, r7
adds r0, r4, 0
movs r1, 0x27
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x28
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x29
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x2A
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x2B
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x5
@@ -337493,7 +337493,7 @@ _0811F2B8:
lsls r2, 9
adds r2, r7
movs r1, 0x27
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F2D0: .4byte 0x03004360
@@ -337508,7 +337508,7 @@ _0811F2D8:
lsls r2, 9
adds r2, r7
movs r1, 0x28
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F2F0: .4byte 0x03004360
@@ -337523,7 +337523,7 @@ _0811F2F8:
lsls r2, 9
adds r2, r7
movs r1, 0x29
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F310: .4byte 0x03004360
@@ -337538,7 +337538,7 @@ _0811F318:
lsls r2, 9
adds r2, r7
movs r1, 0x2A
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F330: .4byte 0x03004360
@@ -337553,7 +337553,7 @@ _0811F338:
lsls r2, 9
adds r2, r7
movs r1, 0x2B
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F350: .4byte 0x03004360
@@ -337569,7 +337569,7 @@ _0811F358:
adds r2, r7
_0811F368:
movs r1, 0x2C
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F370: .4byte 0x03004360
@@ -337584,7 +337584,7 @@ _0811F378:
lsls r2, 9
adds r2, r7
movs r1, 0
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F390: .4byte 0x03004360
@@ -337599,7 +337599,7 @@ _0811F398:
lsls r2, 9
adds r2, r7
movs r1, 0x9
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F3B0: .4byte 0x03004360
@@ -337614,7 +337614,7 @@ _0811F3B8:
lsls r2, 9
adds r2, r7
movs r1, 0x37
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F3D0: .4byte 0x03004360
@@ -337629,7 +337629,7 @@ _0811F3D8:
lsls r2, 9
adds r2, r7
movs r1, 0x38
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F3F0: .4byte 0x03004360
@@ -337644,7 +337644,7 @@ _0811F3F8:
lsls r2, 9
adds r2, r7
movs r1, 0x39
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F410: .4byte 0x03004360
@@ -337659,7 +337659,7 @@ _0811F418:
lsls r2, 9
adds r2, r7
movs r1, 0x3A
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F430: .4byte 0x03004360
@@ -337674,7 +337674,7 @@ _0811F438:
lsls r2, 9
adds r2, r7
movs r1, 0x3B
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F450: .4byte 0x03004360
@@ -337689,7 +337689,7 @@ _0811F458:
lsls r2, 9
adds r2, r7
movs r1, 0x3C
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F470: .4byte 0x03004360
@@ -337704,7 +337704,7 @@ _0811F478:
lsls r2, 9
adds r2, r7
movs r1, 0x3D
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F490: .4byte 0x03004360
@@ -337719,7 +337719,7 @@ _0811F498:
lsls r2, 9
adds r2, r7
movs r1, 0x3E
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F4B0: .4byte 0x03004360
@@ -337734,7 +337734,7 @@ _0811F4B8:
lsls r2, 9
adds r2, r7
movs r1, 0x3F
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F4D0: .4byte 0x03004360
@@ -337749,7 +337749,7 @@ _0811F4D8:
lsls r2, 9
adds r2, r7
movs r1, 0x16
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F4F0: .4byte 0x03004360
@@ -337764,7 +337764,7 @@ _0811F4F8:
lsls r2, 9
adds r2, r7
movs r1, 0x17
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F510: .4byte 0x03004360
@@ -337779,7 +337779,7 @@ _0811F518:
lsls r2, 9
adds r2, r7
movs r1, 0x18
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F530: .4byte 0x03004360
@@ -337794,7 +337794,7 @@ _0811F538:
lsls r2, 9
adds r2, r7
movs r1, 0x21
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F550: .4byte 0x03004360
@@ -337809,7 +337809,7 @@ _0811F558:
lsls r2, 9
adds r2, r7
movs r1, 0x2F
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F570: .4byte 0x03004360
@@ -337824,7 +337824,7 @@ _0811F578:
lsls r2, 9
adds r2, r7
movs r1, 0x30
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F590: .4byte 0x03004360
@@ -337839,7 +337839,7 @@ _0811F598:
lsls r2, 9
adds r2, r7
movs r1, 0x32
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F5B0: .4byte 0x03004360
@@ -337854,7 +337854,7 @@ _0811F5B8:
lsls r2, 9
adds r2, r7
movs r1, 0x33
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F5D0: .4byte 0x03004360
@@ -337869,7 +337869,7 @@ _0811F5D8:
lsls r2, 9
adds r2, r7
movs r1, 0x34
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F5F0: .4byte 0x03004360
@@ -337884,7 +337884,7 @@ _0811F5F8:
lsls r2, 9
adds r2, r7
movs r1, 0x35
- bl pokemon_setattr
+ bl SetMonData
b _0811F62E
.align 2, 0
_0811F610: .4byte 0x03004360
@@ -337899,7 +337899,7 @@ _0811F618:
lsls r2, 9
adds r2, r7
movs r1, 0x36
- bl pokemon_setattr
+ bl SetMonData
_0811F62E:
ldr r2, _0811F660
ldr r0, _0811F65C
@@ -338009,7 +338009,7 @@ sub_811F6D8: @ 811F6D8
muls r0, r5
adds r0, r4
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -338019,7 +338019,7 @@ sub_811F6D8: @ 811F6D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0811F7D8
mov r8, r0
ldrb r0, [r6]
@@ -338193,7 +338193,7 @@ sub_811F864: @ 811F864
ldr r1, _0811F9B0
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
@@ -338211,7 +338211,7 @@ sub_811F864: @ 811F864
lsls r1, 24
lsrs r1, 24
mov r0, r8
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0811F9BC
mov r10, r0
adds r0, r6, 0
@@ -338520,7 +338520,7 @@ _0811FB34:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _0811FC10
mov r8, r0
lsls r5, 16
@@ -339309,7 +339309,7 @@ sub_812014C: @ 812014C
ldr r4, _081201D4
adds r0, r4
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -339319,7 +339319,7 @@ sub_812014C: @ 812014C
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -339347,7 +339347,7 @@ _081201DC:
ldr r1, _08120228
adds r0, r1
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -339783,7 +339783,7 @@ sub_8120514: @ 8120514
ldr r1, _08120550
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -342212,7 +342212,7 @@ _08121908:
_0812190E:
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
b _0812194A
.align 2, 0
_08121918: .4byte 0x02000000
@@ -342234,7 +342234,7 @@ _08121940:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
_0812194A:
mov r0, sp
bl StringGetEnd10
@@ -342523,7 +342523,7 @@ _08121B64:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
b _08121BC4
.align 2, 0
_08121B84: .4byte 0x03004360
@@ -342554,7 +342554,7 @@ _08121BB0:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
_08121BC4:
mov r0, sp
bl StringGetEnd10
@@ -342598,7 +342598,7 @@ _08121C02:
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
- bl PokemonGetField
+ bl GetMonData
b _08121C3A
.align 2, 0
_08121C24: .4byte 0x03004360
@@ -342610,7 +342610,7 @@ _08121C28:
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
- bl PokemonGetField
+ bl GetMonData
_08121C3A:
adds r0, r6, 0
bl StringGetEnd10
@@ -343132,7 +343132,7 @@ sub_8122030: @ 8122030
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _0812207C
ldr r0, _08122058
@@ -343143,7 +343143,7 @@ sub_8122030: @ 8122030
bne _08122060
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0812207C
b _081220B6
@@ -343161,7 +343161,7 @@ _08122060:
bne _08122088
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0x32
bls _08122088
_0812207C:
@@ -343173,7 +343173,7 @@ _08122084: .4byte 0x00000554
_08122088:
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
ldr r1, _081220C0
@@ -343201,7 +343201,7 @@ _081220B8:
pop {r1}
bx r1
.align 2, 0
-_081220C0: .4byte gUnknown_08405EC4
+_081220C0: .4byte gBattleTowerBanlist
_081220C4: .4byte 0x0000ffff
thumb_func_end sub_8122030
@@ -343245,7 +343245,7 @@ _08122102:
ldr r2, _081221B8
adds r0, r2
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
ldr r1, _081221BC
ldr r2, _081221C0
adds r6, r1, r2
@@ -343256,7 +343256,7 @@ _08122102:
ldr r2, _081221B8
adds r0, r2
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
ldr r1, _081221C4
strh r0, [r1]
adds r1, r5, 0x1
@@ -343284,7 +343284,7 @@ _0812214A:
adds r0, r2, 0
adds r0, r7
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r4, r0
beq _081220F8
movs r1, 0xA0
@@ -343301,7 +343301,7 @@ _0812214A:
adds r0, r1, 0
adds r0, r7
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
cmp r4, r0
beq _081220FC
_0812218E:
@@ -343976,7 +343976,7 @@ _081226DC:
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
bl sub_806D5A4
ldr r0, _0812271C
@@ -344023,7 +344023,7 @@ _0812274A:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
adds r0, r4, 0
bl sub_8122838
@@ -344121,7 +344121,7 @@ sub_81227FC: @ 81227FC
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
movs r0, 0
movs r1, 0
@@ -344246,7 +344246,7 @@ _081228F0:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08122912
adds r0, r6, 0
@@ -344299,12 +344299,12 @@ _08122958:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08122984
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -344350,7 +344350,7 @@ _081229C0:
adds r4, r0, r6
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08122A36
adds r0, r5, 0
@@ -344835,7 +344835,7 @@ sub_8122D94: @ 8122D94
ldr r1, _08122DD0
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
cmp r2, 0
bne _08122DE0
@@ -345240,7 +345240,7 @@ sub_81230F4: @ 81230F4
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
movs r0, 0xF
movs r1, 0
@@ -345635,14 +345635,14 @@ _081233EC:
.align 2, 0
_08123454: .4byte gUnknown_08401CF8
_08123458: .4byte gUnknown_08401D18
-_0812345C: .4byte gUnknown_08401820
+_0812345C: .4byte gCableCarMtChimneyTilemap
_08123460: .4byte 0x02019000
-_08123464: .4byte gUnknown_08401978
-_08123468: .4byte gUnknown_08401AFC
-_0812346C: .4byte gUnknown_08401CD4
+_08123464: .4byte gCableCarTreeTilemap
+_08123468: .4byte gCableCarMountainTilemap
+_0812346C: .4byte gCableCarPylonStemTilemap
_08123470: .4byte 0x000009d8
-_08123474: .4byte gUnknown_08E7EB9C
-_08123478: .4byte gUnknown_08E7EC3C
+_08123474: .4byte gCableCarBG_Pal
+_08123478: .4byte gCableCarBG_Gfx
_0812347C: .4byte 0x03001770
_08123480: .4byte 0x0000043c
_08123484:
@@ -345770,7 +345770,7 @@ _0812357C: .4byte 0x02019168
_08123580: .4byte 0x0600f000
_08123584: .4byte 0x02039274
_08123588: .4byte 0x000008fc
-_0812358C: .4byte gUnknown_08401CC0
+_0812358C: .4byte gCableCarPylonHookTilemapEntries
_08123590: .4byte 0x03001770
_08123594: .4byte 0x0000043c
_08123598:
@@ -346437,7 +346437,7 @@ _08123AD6:
bx r0
.align 2, 0
_08123AE8: .4byte 0x000008fc
-_08123AEC: .4byte gUnknown_08401CC0
+_08123AEC: .4byte gCableCarPylonHookTilemapEntries
_08123AF0: .4byte 0x020199d8
_08123AF4: .4byte 0x030024d0
thumb_func_end sub_81239E4
@@ -346553,7 +346553,7 @@ _08123BB0:
ldr r2, _08123BD8
b _08123BEA
.align 2, 0
-_08123BD4: .4byte gUnknown_08401CC4
+_08123BD4: .4byte gCableCarPylonHookTilemapEntries + 0x4
_08123BD8: .4byte 0x00000942
_08123BDC:
ldr r2, _08123C08
@@ -346579,7 +346579,7 @@ _08123BEE:
ldrsh r0, [r4, r1]
b _08123C26
.align 2, 0
-_08123C08: .4byte gUnknown_08401CC8
+_08123C08: .4byte gCableCarPylonHookTilemapEntries + 0x8
_08123C0C: .4byte 0x00000904
_08123C10: .4byte 0x00000944
_08123C14: .4byte 0x02039274
@@ -347345,10 +347345,10 @@ _081241BE:
bl sub_807C9B4
b _0812431E
.align 2, 0
-_0812422C: .4byte gUnknown_08401D88
-_08124230: .4byte gUnknown_08401D8A
-_08124234: .4byte gUnknown_08401D8E
-_08124238: .4byte gUnknown_08401D96
+_0812422C: .4byte gCableCarPlayerGraphicsIDs
+_08124230: .4byte gMtChimneyHikerGraphicsIDs
+_08124234: .4byte gMtChimneyHikerCoords
+_08124238: .4byte gMtChimneyHikerMovementDelayTable
_0812423C: .4byte gUnknown_08401D9C
_08124240: .4byte 0x0202e8cc
_08124244: .4byte gSaveBlock2
@@ -352141,7 +352141,7 @@ sub_8126608: @ 8126608
bl memcpy
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
@@ -352205,7 +352205,7 @@ _0812668C:
_081266C6:
adds r0, r7, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
@@ -356845,7 +356845,7 @@ _081289BE:
_081289F4: .4byte 0x020192e4
_081289F8: .4byte 0x02039238
_081289FC: .4byte 0x0203858e
-_08128A00: .4byte gUnknown_081DC118
+_08128A00: .4byte gContestAIs
_08128A04:
strh r1, [r4, 0x2]
_08128A06:
@@ -356982,8 +356982,8 @@ _08128ADE:
bx r0
thumb_func_end sub_8128AA8
- thumb_func_start sub_8128AF0
-sub_8128AF0: @ 8128AF0
+ thumb_func_start contest_ai_get_turn
+contest_ai_get_turn: @ 8128AF0
ldr r1, _08128B04
adds r0, r1, 0
subs r0, 0xE0
@@ -356997,12 +356997,12 @@ sub_8128AF0: @ 8128AF0
.align 2, 0
_08128B04: .4byte 0x020192e4
_08128B08: .4byte 0x02039238
- thumb_func_end sub_8128AF0
+ thumb_func_end contest_ai_get_turn
thumb_func_start sub_8128B0C
sub_8128B0C: @ 8128B0C
push {lr}
- bl sub_8128AF0
+ bl contest_ai_get_turn
ldr r0, _08128B3C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357037,7 +357037,7 @@ _08128B48:
thumb_func_start sub_8128B4C
sub_8128B4C: @ 8128B4C
push {lr}
- bl sub_8128AF0
+ bl contest_ai_get_turn
ldr r0, _08128B7C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357072,7 +357072,7 @@ _08128B88:
thumb_func_start sub_8128B8C
sub_8128B8C: @ 8128B8C
push {lr}
- bl sub_8128AF0
+ bl contest_ai_get_turn
ldr r0, _08128BBC
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357107,7 +357107,7 @@ _08128BC8:
thumb_func_start sub_8128BCC
sub_8128BCC: @ 8128BCC
push {lr}
- bl sub_8128AF0
+ bl contest_ai_get_turn
ldr r0, _08128BFC
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357139,8 +357139,8 @@ _08128C08:
bx r0
thumb_func_end sub_8128BCC
- thumb_func_start sub_8128C0C
-sub_8128C0C: @ 8128C0C
+ thumb_func_start contest_ai_get_excitement
+contest_ai_get_excitement: @ 8128C0C
ldr r1, _08128C24
adds r0, r1, 0
subs r0, 0xE0
@@ -357156,12 +357156,12 @@ sub_8128C0C: @ 8128C0C
.align 2, 0
_08128C24: .4byte 0x020192e4
_08128C28: .4byte 0x02039238
- thumb_func_end sub_8128C0C
+ thumb_func_end contest_ai_get_excitement
thumb_func_start sub_8128C2C
sub_8128C2C: @ 8128C2C
push {lr}
- bl sub_8128C0C
+ bl contest_ai_get_excitement
ldr r0, _08128C5C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357196,7 +357196,7 @@ _08128C68:
thumb_func_start sub_8128C6C
sub_8128C6C: @ 8128C6C
push {lr}
- bl sub_8128C0C
+ bl contest_ai_get_excitement
ldr r0, _08128C9C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357231,7 +357231,7 @@ _08128CA8:
thumb_func_start sub_8128CAC
sub_8128CAC: @ 8128CAC
push {lr}
- bl sub_8128C0C
+ bl contest_ai_get_excitement
ldr r0, _08128CDC
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357266,7 +357266,7 @@ _08128CE8:
thumb_func_start sub_8128CEC
sub_8128CEC: @ 8128CEC
push {lr}
- bl sub_8128C0C
+ bl contest_ai_get_excitement
ldr r0, _08128D1C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357298,8 +357298,8 @@ _08128D28:
bx r0
thumb_func_end sub_8128CEC
- thumb_func_start sub_8128D2C
-sub_8128D2C: @ 8128D2C
+ thumb_func_start contest_ai_get_user_order
+contest_ai_get_user_order: @ 8128D2C
ldr r1, _08128D48
adds r2, r1, 0
adds r2, 0x41
@@ -357317,12 +357317,12 @@ sub_8128D2C: @ 8128D2C
.align 2, 0
_08128D48: .4byte 0x020192e4
_08128D4C: .4byte 0x02039238
- thumb_func_end sub_8128D2C
+ thumb_func_end contest_ai_get_user_order
thumb_func_start sub_8128D50
sub_8128D50: @ 8128D50
push {lr}
- bl sub_8128D2C
+ bl contest_ai_get_user_order
ldr r0, _08128D80
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357357,7 +357357,7 @@ _08128D8C:
thumb_func_start sub_8128D90
sub_8128D90: @ 8128D90
push {lr}
- bl sub_8128D2C
+ bl contest_ai_get_user_order
ldr r0, _08128DC0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357392,7 +357392,7 @@ _08128DCC:
thumb_func_start sub_8128DD0
sub_8128DD0: @ 8128DD0
push {lr}
- bl sub_8128D2C
+ bl contest_ai_get_user_order
ldr r0, _08128E00
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357427,7 +357427,7 @@ _08128E0C:
thumb_func_start sub_8128E10
sub_8128E10: @ 8128E10
push {lr}
- bl sub_8128D2C
+ bl contest_ai_get_user_order
ldr r0, _08128E40
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357459,8 +357459,8 @@ _08128E4C:
bx r0
thumb_func_end sub_8128E10
- thumb_func_start sub_8128E50
-sub_8128E50: @ 8128E50
+ thumb_func_start contest_ai_get_user_condition_maybe
+contest_ai_get_user_condition_maybe: @ 8128E50
push {r4,lr}
ldr r4, _08128E88
adds r0, r4, 0
@@ -357490,12 +357490,12 @@ sub_8128E50: @ 8128E50
.align 2, 0
_08128E88: .4byte 0x020192e4
_08128E8C: .4byte 0x02039238
- thumb_func_end sub_8128E50
+ thumb_func_end contest_ai_get_user_condition_maybe
thumb_func_start sub_8128E90
sub_8128E90: @ 8128E90
push {lr}
- bl sub_8128E50
+ bl contest_ai_get_user_condition_maybe
ldr r0, _08128EC0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357530,7 +357530,7 @@ _08128ECC:
thumb_func_start sub_8128ED0
sub_8128ED0: @ 8128ED0
push {lr}
- bl sub_8128E50
+ bl contest_ai_get_user_condition_maybe
ldr r0, _08128F00
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357565,7 +357565,7 @@ _08128F0C:
thumb_func_start sub_8128F10
sub_8128F10: @ 8128F10
push {lr}
- bl sub_8128E50
+ bl contest_ai_get_user_condition_maybe
ldr r0, _08128F40
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -357600,7 +357600,7 @@ _08128F4C:
thumb_func_start sub_8128F50
sub_8128F50: @ 8128F50
push {lr}
- bl sub_8128E50
+ bl contest_ai_get_user_condition_maybe
ldr r0, _08128F80
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358006,8 +358006,8 @@ _0812923C:
bx r0
thumb_func_end sub_81291F8
- thumb_func_start sub_8129244
-sub_8129244: @ 8129244
+ thumb_func_start contest_ai_get_contest_type
+contest_ai_get_contest_type: @ 8129244
ldr r1, _08129258
ldr r0, _0812925C
ldrh r0, [r0]
@@ -358021,12 +358021,12 @@ sub_8129244: @ 8129244
_08129258: .4byte 0x020192e4
_0812925C: .4byte 0x0203869c
_08129260: .4byte 0x02039238
- thumb_func_end sub_8129244
+ thumb_func_end contest_ai_get_contest_type
thumb_func_start sub_8129264
sub_8129264: @ 8129264
push {lr}
- bl sub_8129244
+ bl contest_ai_get_contest_type
ldr r0, _08129294
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358061,7 +358061,7 @@ _081292A0:
thumb_func_start sub_81292A4
sub_81292A4: @ 81292A4
push {lr}
- bl sub_8129244
+ bl contest_ai_get_contest_type
ldr r0, _081292D4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358093,8 +358093,8 @@ _081292E0:
bx r0
thumb_func_end sub_81292A4
- thumb_func_start sub_81292E4
-sub_81292E4: @ 81292E4
+ thumb_func_start contest_ai_get_move_excitement
+contest_ai_get_move_excitement: @ 81292E4
push {r4,lr}
ldr r2, _08129318
ldr r4, _0812931C
@@ -358108,7 +358108,7 @@ sub_81292E4: @ 81292E4
adds r2, 0x1E
adds r1, r2
ldrh r0, [r1]
- bl sub_80B19FC
+ bl contest_get_move_excitement
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0x18]
@@ -358123,12 +358123,12 @@ sub_81292E4: @ 81292E4
_08129318: .4byte 0x02038570
_0812931C: .4byte 0x020192e4
_08129320: .4byte 0x02039238
- thumb_func_end sub_81292E4
+ thumb_func_end contest_ai_get_move_excitement
thumb_func_start sub_8129324
sub_8129324: @ 8129324
push {r4,lr}
- bl sub_81292E4
+ bl contest_ai_get_move_excitement
ldr r0, _08129354
ldr r3, _08129358
ldr r2, [r3]
@@ -358165,7 +358165,7 @@ _08129360:
thumb_func_start sub_8129368
sub_8129368: @ 8129368
push {r4,lr}
- bl sub_81292E4
+ bl contest_ai_get_move_excitement
ldr r0, _08129398
ldr r3, _0812939C
ldr r2, [r3]
@@ -358202,7 +358202,7 @@ _081293A4:
thumb_func_start sub_81293AC
sub_81293AC: @ 81293AC
push {r4,lr}
- bl sub_81292E4
+ bl contest_ai_get_move_excitement
ldr r0, _081293DC
ldr r3, _081293E0
ldr r2, [r3]
@@ -358239,7 +358239,7 @@ _081293E8:
thumb_func_start sub_81293F0
sub_81293F0: @ 81293F0
push {r4,lr}
- bl sub_81292E4
+ bl contest_ai_get_move_excitement
ldr r0, _08129420
ldr r3, _08129424
ldr r2, [r3]
@@ -358273,8 +358273,8 @@ _0812942C:
bx r0
thumb_func_end sub_81293F0
- thumb_func_start sub_8129434
-sub_8129434: @ 8129434
+ thumb_func_start contest_ai_get_move_effect
+contest_ai_get_move_effect: @ 8129434
ldr r2, _08129460
ldr r3, _08129464
ldrb r1, [r3, 0x4]
@@ -358302,12 +358302,12 @@ _08129460: .4byte 0x02038570
_08129464: .4byte 0x020192e4
_08129468: .4byte gContestMoves
_0812946C: .4byte 0x02039238
- thumb_func_end sub_8129434
+ thumb_func_end contest_ai_get_move_effect
thumb_func_start sub_8129470
sub_8129470: @ 8129470
push {lr}
- bl sub_8129434
+ bl contest_ai_get_move_effect
ldr r0, _081294A0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358342,7 +358342,7 @@ _081294AC:
thumb_func_start sub_81294B0
sub_81294B0: @ 81294B0
push {lr}
- bl sub_8129434
+ bl contest_ai_get_move_effect
ldr r0, _081294E0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358374,8 +358374,8 @@ _081294EC:
bx r0
thumb_func_end sub_81294B0
- thumb_func_start sub_81294F0
-sub_81294F0: @ 81294F0
+ thumb_func_start contest_ai_get_move_effect_type
+contest_ai_get_move_effect_type: @ 81294F0
ldr r2, _08129524
ldr r3, _08129528
ldrb r1, [r3, 0x4]
@@ -358408,12 +358408,12 @@ _08129528: .4byte 0x020192e4
_0812952C: .4byte gContestEffects
_08129530: .4byte gContestMoves
_08129534: .4byte 0x02039238
- thumb_func_end sub_81294F0
+ thumb_func_end contest_ai_get_move_effect_type
thumb_func_start sub_8129538
sub_8129538: @ 8129538
push {lr}
- bl sub_81294F0
+ bl contest_ai_get_move_effect_type
ldr r0, _08129568
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358448,7 +358448,7 @@ _08129574:
thumb_func_start sub_8129578
sub_8129578: @ 8129578
push {lr}
- bl sub_81294F0
+ bl contest_ai_get_move_effect_type
ldr r0, _081295A8
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -358480,8 +358480,8 @@ _081295B4:
bx r0
thumb_func_end sub_8129578
- thumb_func_start sub_81295B8
-sub_81295B8: @ 81295B8
+ thumb_func_start contest_ai_check_move_has_highest_appeal
+contest_ai_check_move_has_highest_appeal: @ 81295B8
push {r4-r7,lr}
ldr r2, _08129610
ldr r3, _08129614
@@ -358546,12 +358546,12 @@ _08129626:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_81295B8
+ thumb_func_end contest_ai_check_move_has_highest_appeal
thumb_func_start sub_8129638
sub_8129638: @ 8129638
push {lr}
- bl sub_81295B8
+ bl contest_ai_check_move_has_highest_appeal
ldr r0, _08129664
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359058,8 +359058,8 @@ _081299EC:
bx r0
thumb_func_end sub_81299B0
- thumb_func_start sub_81299F0
-sub_81299F0: @ 81299F0
+ thumb_func_start contest_ai_get_move_used_count
+contest_ai_get_move_used_count: @ 81299F0
push {r4,lr}
ldr r3, _08129A20
ldr r4, _08129A24
@@ -359103,12 +359103,12 @@ _08129A30:
bx r0
.align 2, 0
_08129A40: .4byte 0x02039238
- thumb_func_end sub_81299F0
+ thumb_func_end contest_ai_get_move_used_count
thumb_func_start sub_8129A44
sub_8129A44: @ 8129A44
push {lr}
- bl sub_81299F0
+ bl contest_ai_get_move_used_count
ldr r0, _08129A74
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359143,7 +359143,7 @@ _08129A80:
thumb_func_start sub_8129A84
sub_8129A84: @ 8129A84
push {lr}
- bl sub_81299F0
+ bl contest_ai_get_move_used_count
ldr r0, _08129AB4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359178,7 +359178,7 @@ _08129AC0:
thumb_func_start sub_8129AC4
sub_8129AC4: @ 8129AC4
push {lr}
- bl sub_81299F0
+ bl contest_ai_get_move_used_count
ldr r0, _08129AF4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359213,7 +359213,7 @@ _08129B00:
thumb_func_start sub_8129B04
sub_8129B04: @ 8129B04
push {lr}
- bl sub_81299F0
+ bl contest_ai_get_move_used_count
ldr r0, _08129B34
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359245,8 +359245,8 @@ _08129B40:
bx r0
thumb_func_end sub_8129B04
- thumb_func_start sub_8129B44
-sub_8129B44: @ 8129B44
+ thumb_func_start contest_ai_check_combo_starter
+contest_ai_check_combo_starter: @ 8129B44
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -359306,12 +359306,12 @@ _08129B96:
_08129BAC: .4byte 0x02038570
_08129BB0: .4byte 0x020192e4
_08129BB4: .4byte 0x02039238
- thumb_func_end sub_8129B44
+ thumb_func_end contest_ai_check_combo_starter
thumb_func_start sub_8129BB8
sub_8129BB8: @ 8129BB8
push {lr}
- bl sub_8129B44
+ bl contest_ai_check_combo_starter
ldr r0, _08129BE4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359349,7 +359349,7 @@ _08129BF8: .4byte 0x02039238
thumb_func_start sub_8129BFC
sub_8129BFC: @ 8129BFC
push {lr}
- bl sub_8129B44
+ bl contest_ai_check_combo_starter
ldr r0, _08129C28
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359384,8 +359384,8 @@ _08129C38:
_08129C3C: .4byte 0x02039238
thumb_func_end sub_8129BFC
- thumb_func_start sub_8129C40
-sub_8129C40: @ 8129C40
+ thumb_func_start contest_ai_check_combo_finisher
+contest_ai_check_combo_finisher: @ 8129C40
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -359444,12 +359444,12 @@ _08129C90:
_08129CA8: .4byte 0x02038570
_08129CAC: .4byte 0x020192e4
_08129CB0: .4byte 0x02039238
- thumb_func_end sub_8129C40
+ thumb_func_end contest_ai_check_combo_finisher
thumb_func_start sub_8129CB4
sub_8129CB4: @ 8129CB4
push {lr}
- bl sub_8129C40
+ bl contest_ai_check_combo_finisher
ldr r0, _08129CE0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359487,7 +359487,7 @@ _08129CF4: .4byte 0x02039238
thumb_func_start sub_8129CF8
sub_8129CF8: @ 8129CF8
push {lr}
- bl sub_8129C40
+ bl contest_ai_check_combo_finisher
ldr r0, _08129D24
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359522,8 +359522,8 @@ _08129D34:
_08129D38: .4byte 0x02039238
thumb_func_end sub_8129CF8
- thumb_func_start sub_8129D3C
-sub_8129D3C: @ 8129D3C
+ thumb_func_start contest_ai_check_would_finish_combo
+contest_ai_check_would_finish_combo: @ 8129D3C
push {r4,r5,lr}
movs r5, 0
ldr r3, _08129D8C
@@ -359568,12 +359568,12 @@ _08129D7A:
_08129D8C: .4byte 0x02038570
_08129D90: .4byte 0x020192e4
_08129D94: .4byte 0x02039238
- thumb_func_end sub_8129D3C
+ thumb_func_end contest_ai_check_would_finish_combo
thumb_func_start sub_8129D98
sub_8129D98: @ 8129D98
push {lr}
- bl sub_8129D3C
+ bl contest_ai_check_would_finish_combo
ldr r0, _08129DC4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359611,7 +359611,7 @@ _08129DD8: .4byte 0x02039238
thumb_func_start sub_8129DDC
sub_8129DDC: @ 8129DDC
push {lr}
- bl sub_8129D3C
+ bl contest_ai_check_would_finish_combo
ldr r0, _08129E08
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359646,8 +359646,8 @@ _08129E18:
_08129E1C: .4byte 0x02039238
thumb_func_end sub_8129DDC
- thumb_func_start sub_8129E20
-sub_8129E20: @ 8129E20
+ thumb_func_start contest_ai_get_condition
+contest_ai_get_condition: @ 8129E20
push {r4,r5,lr}
ldr r4, _08129E5C
ldr r0, [r4]
@@ -359678,12 +359678,12 @@ sub_8129E20: @ 8129E20
.align 2, 0
_08129E5C: .4byte 0x02039238
_08129E60: .4byte 0x020192e4
- thumb_func_end sub_8129E20
+ thumb_func_end contest_ai_get_condition
thumb_func_start sub_8129E64
sub_8129E64: @ 8129E64
push {lr}
- bl sub_8129E20
+ bl contest_ai_get_condition
ldr r0, _08129E94
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359718,7 +359718,7 @@ _08129EA0:
thumb_func_start sub_8129EA4
sub_8129EA4: @ 8129EA4
push {lr}
- bl sub_8129E20
+ bl contest_ai_get_condition
ldr r0, _08129ED4
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359753,7 +359753,7 @@ _08129EE0:
thumb_func_start sub_8129EE4
sub_8129EE4: @ 8129EE4
push {lr}
- bl sub_8129E20
+ bl contest_ai_get_condition
ldr r0, _08129F14
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359788,7 +359788,7 @@ _08129F20:
thumb_func_start sub_8129F24
sub_8129F24: @ 8129F24
push {lr}
- bl sub_8129E20
+ bl contest_ai_get_condition
ldr r0, _08129F54
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359820,8 +359820,8 @@ _08129F60:
bx r0
thumb_func_end sub_8129F24
- thumb_func_start sub_8129F64
-sub_8129F64: @ 8129F64
+ thumb_func_start contest_ai_get_used_combo_starter
+contest_ai_get_used_combo_starter: @ 8129F64
push {r4-r6,lr}
movs r6, 0
ldr r5, _08129FAC
@@ -359862,12 +359862,12 @@ _08129FAC: .4byte 0x02039238
_08129FB0: .4byte gContestMoves
_08129FB4: .4byte 0x02019260
_08129FB8: .4byte 0x020192e4
- thumb_func_end sub_8129F64
+ thumb_func_end contest_ai_get_used_combo_starter
thumb_func_start sub_8129FBC
sub_8129FBC: @ 8129FBC
push {lr}
- bl sub_8129F64
+ bl contest_ai_get_used_combo_starter
ldr r0, _08129FEC
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359902,7 +359902,7 @@ _08129FF8:
thumb_func_start sub_8129FFC
sub_8129FFC: @ 8129FFC
push {lr}
- bl sub_8129F64
+ bl contest_ai_get_used_combo_starter
ldr r0, _0812A02C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359937,7 +359937,7 @@ _0812A038:
thumb_func_start sub_812A03C
sub_812A03C: @ 812A03C
push {lr}
- bl sub_8129F64
+ bl contest_ai_get_used_combo_starter
ldr r0, _0812A06C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -359972,7 +359972,7 @@ _0812A078:
thumb_func_start sub_812A07C
sub_812A07C: @ 812A07C
push {lr}
- bl sub_8129F64
+ bl contest_ai_get_used_combo_starter
ldr r0, _0812A0AC
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -360004,8 +360004,8 @@ _0812A0B8:
bx r0
thumb_func_end sub_812A07C
- thumb_func_start sub_812A0BC
-sub_812A0BC: @ 812A0BC
+ thumb_func_start contest_ai_check_can_participate
+contest_ai_check_can_participate: @ 812A0BC
push {lr}
ldr r0, _0812A0DC
ldr r0, [r0]
@@ -360037,12 +360037,12 @@ _0812A0E8:
.align 2, 0
_0812A0F8: .4byte 0x020192e4
_0812A0FC: .4byte 0x02039238
- thumb_func_end sub_812A0BC
+ thumb_func_end contest_ai_check_can_participate
thumb_func_start sub_812A100
sub_812A100: @ 812A100
push {lr}
- bl sub_812A0BC
+ bl contest_ai_check_can_participate
ldr r0, _0812A12C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -360080,7 +360080,7 @@ _0812A140: .4byte 0x02039238
thumb_func_start sub_812A144
sub_812A144: @ 812A144
push {lr}
- bl sub_812A0BC
+ bl contest_ai_check_can_participate
ldr r0, _0812A170
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -360115,8 +360115,8 @@ _0812A180:
_0812A184: .4byte 0x02039238
thumb_func_end sub_812A144
- thumb_func_start sub_812A188
-sub_812A188: @ 812A188
+ thumb_func_start contest_ai_get_val_812A188
+contest_ai_get_val_812A188: @ 812A188
push {r4,lr}
ldr r4, _0812A1BC
ldr r0, [r4]
@@ -360144,12 +360144,12 @@ sub_812A188: @ 812A188
.align 2, 0
_0812A1BC: .4byte 0x02039238
_0812A1C0: .4byte 0x020192e4
- thumb_func_end sub_812A188
+ thumb_func_end contest_ai_get_val_812A188
thumb_func_start sub_812A1C4
sub_812A1C4: @ 812A1C4
push {lr}
- bl sub_812A188
+ bl contest_ai_get_val_812A188
ldr r0, _0812A1F0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -360187,7 +360187,7 @@ _0812A204: .4byte 0x02039238
thumb_func_start sub_812A208
sub_812A208: @ 812A208
push {lr}
- bl sub_812A188
+ bl contest_ai_get_val_812A188
ldr r0, _0812A234
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -361727,8 +361727,8 @@ _0812ACF4:
_0812ACF8: .4byte 0x02039238
thumb_func_end sub_812ACC8
- thumb_func_start sub_812ACFC
-sub_812ACFC: @ 812ACFC
+ thumb_func_start contest_ai_check_for_exciting_move
+contest_ai_check_for_exciting_move: @ 812ACFC
push {r4-r7,lr}
movs r5, 0
movs r4, 0
@@ -361743,7 +361743,7 @@ _0812AD06:
ldrh r0, [r1]
cmp r0, 0
beq _0812AD30
- bl sub_80B19FC
+ bl contest_get_move_excitement
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@@ -361770,12 +361770,12 @@ _0812AD36:
.align 2, 0
_0812AD48: .4byte 0x020192e4
_0812AD4C: .4byte 0x02039238
- thumb_func_end sub_812ACFC
+ thumb_func_end contest_ai_check_for_exciting_move
thumb_func_start sub_812AD50
sub_812AD50: @ 812AD50
push {lr}
- bl sub_812ACFC
+ bl contest_ai_check_for_exciting_move
ldr r0, _0812AD7C
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -361813,7 +361813,7 @@ _0812AD90: .4byte 0x02039238
thumb_func_start sub_812AD94
sub_812AD94: @ 812AD94
push {lr}
- bl sub_812ACFC
+ bl contest_ai_check_for_exciting_move
ldr r0, _0812ADC0
movs r1, 0x18
ldrsh r0, [r0, r1]
@@ -362027,11 +362027,11 @@ sub_812AF10: @ 812AF10
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0812AF2C
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -362454,7 +362454,7 @@ _0812B258:
_0812B266:
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
_0812B272:
@@ -363295,7 +363295,7 @@ sub_812B8B8: @ 812B8B8
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _0812B974
ldr r2, _0812B978
ldrb r1, [r4, 0x8]
@@ -363981,7 +363981,7 @@ sub_812BDF4: @ 812BDF4
ldr r1, _0812BE2C
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -370477,7 +370477,7 @@ _0812F004:
ldr r7, _0812F07C
adds r0, r7
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r9, r0
ldrb r0, [r4]
lsls r0, 1
@@ -370486,7 +370486,7 @@ _0812F004:
muls r0, r5
adds r0, r7
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
ldrb r2, [r4]
lsls r1, r2, 2
@@ -370523,7 +370523,7 @@ _0812F084:
adds r0, r1
_0812F092:
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
b _0812F0A6
@@ -370549,7 +370549,7 @@ _0812F0AC:
ldr r7, _0812F114
adds r0, r7
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r9, r0
ldrb r0, [r4]
lsls r0, 1
@@ -370558,7 +370558,7 @@ _0812F0AC:
muls r0, r5
adds r0, r7
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
ldrb r2, [r4]
lsls r1, r2, 2
@@ -370595,7 +370595,7 @@ _0812F120:
adds r0, r7
_0812F12C:
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
b _0812F13A
@@ -375991,7 +375991,7 @@ _08131A74:
ldr r5, _08131ADC
adds r0, r5
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -376000,7 +376000,7 @@ _08131A74:
muls r0, r6
adds r0, r5
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
mov r9, r0
ldrb r2, [r4]
lsls r1, r2, 2
@@ -376015,7 +376015,7 @@ _08131A74:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
b _08131AE6
@@ -376058,7 +376058,7 @@ _08131B10:
ldr r5, _08131B68
adds r0, r5
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -376067,7 +376067,7 @@ _08131B10:
muls r0, r6
adds r0, r5
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
mov r9, r0
ldrb r2, [r4]
lsls r1, r2, 2
@@ -376082,7 +376082,7 @@ _08131B10:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
b _08131B72
@@ -377577,14 +377577,14 @@ sub_81326D8: @ 81326D8
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
ldr r4, _08132790
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
ldr r0, _08132794
strh r5, [r0]
strh r5, [r0]
@@ -377646,14 +377646,14 @@ sub_81327A4: @ 81327A4
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
ldr r4, _0813285C
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
movs r1, 0x80
lsls r1, 19
movs r2, 0x9A
@@ -377766,7 +377766,7 @@ sub_81328E8: @ 81328E8
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
pop {r4}
pop {r0}
bx r0
@@ -377947,7 +377947,7 @@ _08132AA4:
bl sub_813362C
b _08132FD6
_08132AAA:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132AB6
@@ -377956,7 +377956,7 @@ _08132AB6:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132ACC
ldr r1, [r0]
ldrb r0, [r1]
@@ -377965,7 +377965,7 @@ _08132AB6:
.align 2, 0
_08132ACC: .4byte 0x030007b0
_08132AD0:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -377985,7 +377985,7 @@ _08132AD0:
adds r2, 0x20
adds r2, r1
ldrh r1, [r2]
- bl pokemon_moveset_pad_
+ bl GiveMoveToMon
lsls r0, 16
ldr r1, _08132B28
cmp r0, r1
@@ -378042,7 +378042,7 @@ _08132B6C:
.align 2, 0
_08132B70: .4byte 0x030007b0
_08132B74:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132B80
@@ -378051,7 +378051,7 @@ _08132B80:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132B94
ldr r1, [r0]
ldrb r0, [r1]
@@ -378060,7 +378060,7 @@ _08132B80:
.align 2, 0
_08132B94: .4byte 0x030007b0
_08132B98:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -378115,7 +378115,7 @@ _08132BF0:
_08132C00: .4byte gUnknown_0842CCF8
_08132C04: .4byte 0x030007b0
_08132C08:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132C14
@@ -378124,7 +378124,7 @@ _08132C14:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132C28
ldr r1, [r0]
movs r0, 0x12
@@ -378132,7 +378132,7 @@ _08132C14:
.align 2, 0
_08132C28: .4byte 0x030007b0
_08132C2C:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -378175,7 +378175,7 @@ _08132C74:
_08132C84: .4byte gUnknown_0842CD65
_08132C88: .4byte 0x030007b0
_08132C8C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132C98
@@ -378188,12 +378188,12 @@ _08132C98:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
b _08132FD6
.align 2, 0
_08132CAC: .4byte 0x030007b0
_08132CB0:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -378240,7 +378240,7 @@ _08132D00:
.align 2, 0
_08132D08: .4byte 0x030007b0
_08132D0C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132D18
@@ -378269,7 +378269,7 @@ _08132D38:
.align 2, 0
_08132D3C: .4byte 0x030007b0
_08132D40:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132D4C
@@ -378325,7 +378325,7 @@ _08132DAC: .4byte 0x000002c5
_08132DB0: .4byte 0x03004350
_08132DB4: .4byte sub_81327A4
_08132DB8:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132DC4
@@ -378447,7 +378447,7 @@ _08132EA4:
adds r0, r5
ldrb r1, [r2]
adds r1, 0xD
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _08132F40
@@ -378483,7 +378483,7 @@ _08132EA4:
ldr r2, _08132F48
adds r3, r2
ldrb r2, [r3]
- bl sub_803B6A4
+ bl SetMonMoveSlot
ldr r0, _08132F4C
ldr r1, [r7]
ldrb r2, [r1, 0x1B]
@@ -378515,7 +378515,7 @@ _08132F4C: .4byte 0x020232cc
_08132F50: .4byte gUnknown_0842CD77
_08132F54: .4byte 0x0202e8cc
_08132F58:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08132FD6
@@ -378533,7 +378533,7 @@ _08132F78: .4byte gUnknown_0842CDA3
_08132F7C: .4byte 0x030007b0
_08132F80: .4byte 0x0000016f
_08132F84:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08132FD6
@@ -378589,7 +378589,7 @@ _08132FE8: .4byte 0x030007b0
sub_8132FEC: @ 8132FEC
push {r4-r6,lr}
ldr r0, _08133024
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r5, 0
ldr r4, _08133028
adds r6, r4, 0
@@ -378603,13 +378603,13 @@ _08132FFA:
adds r3, r2
ldrb r2, [r3]
ldrb r3, [r4, 0x3]
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r4, 0x4
adds r5, 0x1
cmp r5, 0x3
bls _08132FFA
ldr r0, _0813302C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r4-r6}
pop {r0}
bx r0
@@ -378682,7 +378682,7 @@ _08133096:
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x5]
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r4, 0x8
ldr r0, [r4]
cmp r0, 0
@@ -378837,7 +378837,7 @@ _081331BA:
ldr r0, _08133240
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
cmp r6, 0
beq _081331F8
adds r1, r4, 0x2
@@ -378850,7 +378850,7 @@ _081331BA:
lsls r3, 24
lsrs r3, 24
adds r0, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
_081331F8:
movs r0, 0x8
add r10, r0
@@ -379337,7 +379337,7 @@ _081335AA:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
ldr r0, _08133604
mov r1, sp
bl StringCopy10
@@ -379518,7 +379518,7 @@ _081336E8:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _08133796
.align 2, 0
_08133738: .4byte 0x030007b0
@@ -379533,7 +379533,7 @@ _08133748:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, [r5]
movs r0, 0xC
strb r0, [r1]
@@ -379559,7 +379559,7 @@ _0813376C:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
_08133796:
ldr r0, _081337D4
ldr r4, [r0]
@@ -379755,7 +379755,7 @@ _08133916:
ldr r0, _0813393C
movs r1, 0xB
movs r2, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0
bl sub_813360C
pop {r3-r5}
@@ -379846,7 +379846,7 @@ _081339D8:
ldrb r1, [r4]
ldrb r2, [r4, 0x1]
mov r0, sp
- bl Print
+ bl MenuPrint
b _08133AE2
_081339E4:
ldrb r2, [r4]
@@ -379855,7 +379855,7 @@ _081339E4:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08133A34
ldr r1, _08133A38
lsls r0, r5, 3
@@ -379917,7 +379917,7 @@ _08133A64:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08133AB4
ldr r1, _08133AB8
lsls r0, r5, 3
@@ -380106,7 +380106,7 @@ _08133BA4:
movs r0, 0xB
movs r2, 0x1C
movs r3, 0xC
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _08133C92
.align 2, 0
_08133BF8: .4byte gUnknown_08402E39
@@ -380122,14 +380122,14 @@ _08133C04:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r2, [r4, 0x12]
ldrb r1, [r4, 0x13]
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
movs r4, 0
ldr r5, _08133C58
adds r3, r6, 0
@@ -380165,7 +380165,7 @@ _08133C5C:
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r0, [r4, 0x9]
ldrb r1, [r4, 0xA]
adds r2, r0, 0x3
@@ -380174,13 +380174,13 @@ _08133C5C:
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
_08133C86:
movs r0, 0xB
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
_08133C92:
add sp, 0x8
pop {r3}
@@ -380199,7 +380199,7 @@ sub_8133CA4: @ 8133CA4
movs r1, 0x7
movs r2, 0x1B
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08133CC8
ldr r0, [r0]
movs r1, 0xB1
@@ -380227,7 +380227,7 @@ sub_8133CCC: @ 8133CCC
ldr r4, _08133D18
adds r0, r4
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -380236,7 +380236,7 @@ sub_8133CCC: @ 8133CCC
muls r0, r6
adds r0, r4
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -380339,7 +380339,7 @@ _08133DA8:
adds r0, r2
str r0, [r5]
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -380348,7 +380348,7 @@ _08133DA8:
beq _08133DDA
ldr r0, [r5]
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
cmp r0, r4
bne _08133DE8
_08133DDA:
@@ -380381,7 +380381,7 @@ _08133DE8:
ldr r1, _08133E64
str r1, [r5, 0x10]
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
ldr r1, _08133E68
lsls r4, r7, 2
adds r4, r7
@@ -380390,7 +380390,7 @@ _08133DE8:
strh r0, [r4, 0x1C]
ldr r0, [r5]
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4, 0x1E]
movs r1, 0x1C
ldrsh r0, [r4, r1]
@@ -380434,7 +380434,7 @@ sub_8133E74: @ 8133E74
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x3
movs r1, 0
bl sub_806D538
@@ -380507,7 +380507,7 @@ sub_8133EF8: @ 8133EF8
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -380983,7 +380983,7 @@ sub_8134240: @ 8134240
adds r1, r6, 0
movs r2, 0x28
movs r3, 0x20
- bl create_pokemon_set_level
+ bl CreateMon
ldr r4, _08134300
movs r0, 0
mov r8, r0
@@ -380996,35 +380996,35 @@ sub_8134240: @ 8134240
strb r0, [r4, 0x13]
adds r0, r5, 0
movs r1, 0x42
- bl PokemonGetField
+ bl GetMonData
str r0, [r4]
adds r0, r5, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [r4, 0x4]
adds r0, r5, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x16
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0xE]
adds r0, r5, 0
movs r1, 0x17
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0xF]
adds r0, r5, 0
movs r1, 0x18
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0x10]
adds r0, r5, 0
movs r1, 0x21
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0x11]
adds r0, r5, 0
movs r1, 0x2F
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0x12]
ldr r4, _08134304
mov r0, r8
@@ -381243,42 +381243,42 @@ sub_8134450: @ 8134450
ldr r0, [r5, 0x4]
str r0, [sp]
adds r0, r4, 0
- bl sub_803ACAC
+ bl CreateMonWithIVsPersonality
adds r2, r5, 0
adds r2, 0xD
adds r0, r4, 0
movs r1, 0x37
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0xA
adds r0, r4, 0
movs r1, 0x39
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0xE
adds r0, r4, 0
movs r1, 0x16
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0xF
adds r0, r4, 0
movs r1, 0x17
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0x10
adds r0, r4, 0
movs r1, 0x18
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0x11
adds r0, r4, 0
movs r1, 0x21
- bl pokemon_setattr
+ bl SetMonData
adds r2, r5, 0
adds r2, 0x12
adds r0, r4, 0
movs r1, 0x2F
- bl pokemon_setattr
+ bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -381323,12 +381323,12 @@ sub_8134504: @ 8134504
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
ldr r4, _08134528
strh r0, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
strb r0, [r4, 0xD]
bl sub_8134348
pop {r4,r5}
@@ -382508,7 +382508,7 @@ sub_8134DD4: @ 8134DD4
add r4, sp, 0xC
movs r0, 0xFF
strb r0, [r4]
- bl zero_enemy_party_data
+ bl ZeroEnemyPartyMons
ldr r1, _08134E04
ldr r2, _08134E08
adds r0, r1, r2
@@ -382707,7 +382707,7 @@ _08134F64:
movs r1, 0xB
movs r2, 0
str r3, [sp, 0x24]
- bl PokemonGetField
+ bl GetMonData
ldr r3, [sp, 0x24]
ldrh r2, [r3]
cmp r0, r2
@@ -382731,14 +382731,14 @@ _08134F94:
movs r1, 0xC
movs r2, 0
str r3, [sp, 0x24]
- bl PokemonGetField
+ bl GetMonData
ldr r3, [sp, 0x24]
cmp r0, 0
beq _08134FC4
adds r0, r4, 0
movs r1, 0xC
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
mov r2, r8
ldrb r1, [r2, 0x2]
lsls r1, 1
@@ -382791,7 +382791,7 @@ _08134FEE:
str r2, [sp]
ldr r2, [sp, 0x10]
ldr r3, [sp, 0x14]
- bl pokemon_make_ev_something
+ bl CreateMonWithEVSpread
movs r5, 0
adds r0, r6, 0x1
mov r9, r0
@@ -382809,7 +382809,7 @@ _0813502E:
lsrs r2, 24
adds r0, r7, r3
str r3, [sp, 0x24]
- bl sub_803B6A4
+ bl SetMonMoveSlot
ldrh r0, [r4]
ldr r3, [sp, 0x24]
cmp r0, 0xDA
@@ -382830,7 +382830,7 @@ _0813504A:
adds r0, r4, 0
movs r1, 0x20
add r2, sp, 0xC
- bl pokemon_setattr
+ bl SetMonData
mov r0, r8
add r0, r10
ldrb r2, [r0, 0x2]
@@ -382839,7 +382839,7 @@ _0813504A:
adds r2, r0
adds r0, r4, 0
movs r1, 0xC
- bl pokemon_setattr
+ bl SetMonData
mov r6, r9
_0813507C:
cmp r6, 0x3
@@ -382892,7 +382892,7 @@ _081350CE:
pop {r1}
bx r1
.align 2, 0
-_081350D8: .4byte gUnknown_08405EC4
+_081350D8: .4byte gBattleTowerBanlist
_081350DC: .4byte 0x0000ffff
thumb_func_end sub_813509C
@@ -383142,7 +383142,7 @@ _081352CE:
pop {r0}
bx r0
.align 2, 0
-_081352DC: .4byte gUnknown_08405EC4
+_081352DC: .4byte gBattleTowerBanlist
_081352E0: .4byte 0x0000ffff
thumb_func_end sub_8135200
@@ -383169,7 +383169,7 @@ _081352FE:
adds r5, r0
adds r0, r5, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
mov r1, r8
lsls r1, 16
@@ -383177,19 +383177,19 @@ _081352FE:
mov r8, r1
adds r0, r5, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
adds r0, r5, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -383259,7 +383259,7 @@ _081353C4: .4byte 0x03004360
_081353C8: .4byte 0x0202e8dc
_081353CC: .4byte 0x020231cc
_081353D0: .4byte 0x0202e8cc
-_081353D4: .4byte gUnknown_08405EC4
+_081353D4: .4byte gBattleTowerBanlist
_081353D8: .4byte 0x0000ffff
_081353DC: .4byte gUnknown_08400E2C
_081353E0: .4byte gUnknown_08400E32
@@ -383402,7 +383402,7 @@ _081354EA:
ldr r0, _08135514
adds r0, r4, r0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
ldr r0, _08135518
@@ -383410,7 +383410,7 @@ _081354EA:
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r5, 0x1
cmp r5, 0x5
ble _081354EA
@@ -383499,7 +383499,7 @@ _081355AE:
ldr r0, _081355F4
adds r0, r4, r0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
ldr r0, _081355F8
@@ -383507,7 +383507,7 @@ _081355AE:
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r5, 0x1
cmp r5, 0x5
ble _081355AE
@@ -383527,7 +383527,7 @@ _081355F4: .4byte 0x03004360
_081355F8: .4byte 0x0202596c
_081355FC: .4byte sub_8135534
_08135600:
- bl zero_enemy_party_data
+ bl ZeroEnemyPartyMons
movs r5, 0
_08135606:
movs r0, 0x64
@@ -384609,7 +384609,7 @@ _08135E8A:
adds r4, r1, r0
adds r0, r4, 0
adds r1, r7, 0
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _08135EB4
movs r0, 0x1
@@ -384617,7 +384617,7 @@ _08135E8A:
adds r0, r4, 0
adds r1, r7, 0
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
_08135EB4:
adds r5, 0x1
cmp r5, 0x2
@@ -385214,12 +385214,12 @@ _08136366:
_08136370: .4byte gWindowConfig_81E7080
_08136374:
ldr r0, _0813637C
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _08136524
.align 2, 0
_0813637C: .4byte gWindowConfig_81E7080
_08136380:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _0813638A
b _0813657A
@@ -386235,7 +386235,7 @@ sub_8136BB8: @ 8136BB8
ldr r2, [r4]
adds r2, 0x10
movs r1, 0x2
- bl PokemonGetField
+ bl GetMonData
ldr r0, [r4]
adds r0, 0x10
bl StringGetEnd10
@@ -386244,21 +386244,21 @@ sub_8136BB8: @ 8136BB8
ldr r1, _08136C38
bl StringAppend
ldr r0, _08136C3C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, [r4]
adds r0, 0x10
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x17
movs r1, 0xA
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0
bl MoveMenuCursor
pop {r4}
@@ -386285,9 +386285,9 @@ sub_8136C40: @ 8136C40
lsrs r0, 24
cmp r0, 0x2
bhi _08136C60
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08136C68
- bl sub_8071E2C
+ bl BasicInitMenuWindow
_08136C60:
adds r0, r4, 0
pop {r4}
@@ -386301,12 +386301,12 @@ _08136C68: .4byte gWindowConfig_81E7080
sub_8136C6C: @ 8136C6C
push {lr}
ldr r0, _08136C8C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08136C90
ldr r0, [r3]
adds r0, 0x53
@@ -386429,16 +386429,16 @@ _08136D5A:
sub_8136D60: @ 8136D60
push {lr}
ldr r0, _08136D84
- bl sub_8071E2C
+ bl BasicInitMenuWindow
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08136D88
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -386449,9 +386449,9 @@ _08136D88: .4byte gUnknown_084115E1
thumb_func_start sub_8136D8C
sub_8136D8C: @ 8136D8C
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08136D9C
- bl sub_8071E2C
+ bl BasicInitMenuWindow
pop {r0}
bx r0
.align 2, 0
@@ -386466,11 +386466,11 @@ sub_8136DA0: @ 8136DA0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -386529,7 +386529,7 @@ _08136E1A:
adds r0, r7
ldr r1, [r0]
adds r0, r6, 0
- bl PokemonGetField
+ bl GetMonData
adds r1, r5, r4
strb r0, [r1]
adds r0, r4, 0x1
@@ -386554,7 +386554,7 @@ sub_8136E40: @ 8136E40
adds r5, r1, 0
adds r0, r5, 0
movs r1, 0x30
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xFF
beq _08136EDC
mov r0, r8
@@ -386569,7 +386569,7 @@ _08136E64:
ldr r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
strb r0, [r7]
@@ -386596,7 +386596,7 @@ _08136E9C:
adds r0, r5, 0
adds r1, r6, 0
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -386604,7 +386604,7 @@ _08136E9C:
bls _08136E64
adds r0, r5, 0
movs r1, 0x30
- bl PokemonGetField
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r2, r8
@@ -386621,7 +386621,7 @@ _08136ECE:
adds r0, r5, 0
movs r1, 0x30
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
_08136EDC:
add sp, 0x4
pop {r3}
@@ -386836,7 +386836,7 @@ sub_8137058: @ 8137058
muls r1, r2
adds r0, r1, r0
movs r1, 0x30
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0xFF
beq _0813709C
movs r0, 0
@@ -386865,7 +386865,7 @@ _081370AC:
ldr r1, _081370C8
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _081370D2
cmp r5, 0
@@ -386906,7 +386906,7 @@ _081370F2:
ldr r1, _08137120
adds r0, r1
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _0813710A
adds r0, r6, 0x1
@@ -387012,8 +387012,8 @@ _081371AC:
pop {r0}
bx r0
.align 2, 0
-_081371C0: .4byte gUnknown_08406148
-_081371C4: .4byte gUnknown_08406150
+_081371C0: .4byte gSpriteSheet_ConditionUpDown
+_081371C4: .4byte gSpritePalette_ConditionUpDown
_081371C8: .4byte 0x02039304
_081371CC: .4byte gUnknown_08406158
_081371D0: .4byte 0x02020020
@@ -388208,12 +388208,12 @@ _08137BB4:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -388241,12 +388241,12 @@ _08137C00:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl PokemonGetField
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl PokemonGetField
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -388261,21 +388261,21 @@ _08137C00:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl PokemonGetField
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -388287,7 +388287,7 @@ _08137C00:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -388299,7 +388299,7 @@ _08137C00:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -388311,7 +388311,7 @@ _08137C00:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl PokemonGetField
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -388322,7 +388322,7 @@ _08137C00:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -388333,7 +388333,7 @@ _08137C00:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -388345,55 +388345,55 @@ _08137C00:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl PokemonGetField
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -388406,7 +388406,7 @@ _08137C00:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl PokemonGetField
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -388416,19 +388416,19 @@ _08137C00:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl PokemonGetField
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl PokemonGetField
+ bl GetMonData
mov r2, sp
movs r6, 0
_08137DB8:
@@ -388479,13 +388479,13 @@ _08137E0E:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl PokemonGetField
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -388499,7 +388499,7 @@ _08137E0E:
ldr r1, _08137E5C
adds r0, r1
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -388541,7 +388541,7 @@ _08137E88:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl PokemonGetField
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -388552,7 +388552,7 @@ _08137E88:
ldr r1, _08137EB4
adds r0, r1
movs r1, 0x15
- bl PokemonGetField
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -388589,7 +388589,7 @@ _08137EE4:
adds r0, r1
movs r1, 0x19
_08137EEE:
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -388722,27 +388722,27 @@ _08137FD4:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _0813821A
@@ -388827,7 +388827,7 @@ _081380A4:
adds r0, r1
movs r1, 0x37
_081380AE:
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -388916,7 +388916,7 @@ _08138148:
adds r0, r1
movs r1, 0x3F
_08138152:
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -389023,7 +389023,7 @@ _08138208:
adds r0, r1
movs r1, 0x36
_08138212:
- bl PokemonGetField
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_0813821A:
@@ -389198,12 +389198,12 @@ _081383C8:
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
adds r2, r6, 0
adds r2, 0x2E
adds r0, r4, 0
movs r1, 0xC
- bl pokemon_setattr
+ bl SetMonData
movs r0, 0
mov r8, r0
movs r0, 0x3B
@@ -389244,12 +389244,12 @@ _0813842E:
adds r1, 0xD
mov r0, r9
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
mov r1, r8
adds r1, 0x11
mov r0, r9
adds r2, r7, 0
- bl pokemon_setattr
+ bl SetMonData
adds r7, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -389265,15 +389265,15 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x15
mov r2, r10
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x20
ldr r2, [sp, 0x20]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x19
ldr r2, [sp, 0x28]
- bl pokemon_setattr
+ bl SetMonData
ldrb r0, [r6, 0x14]
lsls r0, 27
lsrs r0, 27
@@ -389282,7 +389282,7 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x27
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x14]
lsls r0, 22
@@ -389291,7 +389291,7 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x28
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x15]
lsls r0, 25
@@ -389300,7 +389300,7 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x29
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldr r0, [r6, 0x14]
lsls r0, 12
@@ -389309,7 +389309,7 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x2A
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x16]
lsls r0, 23
@@ -389318,7 +389318,7 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x2B
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x17]
lsls r0, 26
@@ -389327,47 +389327,47 @@ _0813842E:
adds r0, r4, 0
movs r1, 0x2C
mov r2, sp
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0
ldr r2, [sp, 0x2C]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x37
ldr r2, [sp, 0x30]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x38
ldr r2, [sp, 0x1C]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x39
ldr r2, [sp, 0x18]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
ldr r2, [sp, 0x24]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
ldr r2, [sp, 0x4]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
ldr r2, [sp, 0x8]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
ldr r2, [sp, 0xC]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
ldr r2, [sp, 0x10]
- bl pokemon_setattr
+ bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
ldr r2, [sp, 0x14]
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813855C: .4byte 0x03004360
@@ -389381,7 +389381,7 @@ _08138560:
lsls r2, 9
adds r2, r7
movs r1, 0xB
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138578: .4byte 0x03004360
@@ -389396,7 +389396,7 @@ _08138580:
lsls r2, 9
adds r2, r7
movs r1, 0xC
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138598: .4byte 0x03004360
@@ -389420,12 +389420,12 @@ _081385BA:
adds r1, 0xD
adds r0, r7, 0
adds r2, r4, 0
- bl pokemon_setattr
+ bl SetMonData
mov r1, r8
adds r1, 0x11
adds r0, r7, 0
adds r2, r6, 0
- bl pokemon_setattr
+ bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -389439,7 +389439,7 @@ _081385BA:
adds r0, r1
movs r1, 0x15
mov r2, r9
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081385F4: .4byte 0x03004360
@@ -389473,35 +389473,35 @@ _08138620:
adds r2, r7
adds r0, r4, 0
movs r1, 0x11
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x12
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x13
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x14
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x15
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813867C: .4byte 0x03004360
@@ -389522,7 +389522,7 @@ _08138684:
_0813869C:
adds r3, 0x3
adds r2, r3
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081386A8: .4byte 0x03004360
@@ -389538,7 +389538,7 @@ _081386B4:
lsls r2, 9
adds r2, r7
movs r1, 0x1
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081386CC: .4byte 0x03004360
@@ -389553,7 +389553,7 @@ _081386D4:
lsls r2, 9
adds r2, r7
movs r1, 0x19
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081386EC: .4byte 0x03004360
@@ -389568,7 +389568,7 @@ _081386F4:
lsls r2, 9
adds r2, r7
movs r1, 0x1A
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813870C: .4byte 0x03004360
@@ -389583,7 +389583,7 @@ _08138714:
lsls r2, 9
adds r2, r7
movs r1, 0x1B
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813872C: .4byte 0x03004360
@@ -389598,7 +389598,7 @@ _08138734:
lsls r2, 9
adds r2, r7
movs r1, 0x1C
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813874C: .4byte 0x03004360
@@ -389613,7 +389613,7 @@ _08138754:
lsls r2, 9
adds r2, r7
movs r1, 0x1D
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813876C: .4byte 0x03004360
@@ -389628,7 +389628,7 @@ _08138774:
lsls r2, 9
adds r2, r7
movs r1, 0x1E
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813878C: .4byte 0x03004360
@@ -389643,7 +389643,7 @@ _08138794:
lsls r2, 9
adds r2, r7
movs r1, 0x1F
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081387AC: .4byte 0x03004360
@@ -389658,7 +389658,7 @@ _081387B4:
lsls r2, 9
adds r2, r7
movs r1, 0x20
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081387CC: .4byte 0x03004360
@@ -389673,7 +389673,7 @@ _081387D4:
lsls r2, 9
adds r2, r7
movs r1, 0x22
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081387EC: .4byte 0x03004360
@@ -389688,7 +389688,7 @@ _081387F4:
lsls r2, 9
adds r2, r7
movs r1, 0x23
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813880C: .4byte 0x03004360
@@ -389703,7 +389703,7 @@ _08138814:
lsls r2, 9
adds r2, r7
movs r1, 0x24
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813882C: .4byte 0x03004360
@@ -389718,7 +389718,7 @@ _08138834:
lsls r2, 9
adds r2, r7
movs r1, 0x25
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813884C: .4byte 0x03004360
@@ -389733,7 +389733,7 @@ _08138854:
lsls r2, 9
adds r2, r7
movs r1, 0x26
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813886C: .4byte 0x03004360
@@ -389750,35 +389750,35 @@ _08138874:
adds r2, r7
adds r0, r4, 0
movs r1, 0x27
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x28
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x29
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x2A
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x2B
- bl pokemon_setattr
+ bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x5
@@ -389798,7 +389798,7 @@ _081388E4:
lsls r2, 9
adds r2, r7
movs r1, 0x27
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081388FC: .4byte 0x03004360
@@ -389813,7 +389813,7 @@ _08138904:
lsls r2, 9
adds r2, r7
movs r1, 0x28
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813891C: .4byte 0x03004360
@@ -389828,7 +389828,7 @@ _08138924:
lsls r2, 9
adds r2, r7
movs r1, 0x29
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813893C: .4byte 0x03004360
@@ -389843,7 +389843,7 @@ _08138944:
lsls r2, 9
adds r2, r7
movs r1, 0x2A
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813895C: .4byte 0x03004360
@@ -389858,7 +389858,7 @@ _08138964:
lsls r2, 9
adds r2, r7
movs r1, 0x2B
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813897C: .4byte 0x03004360
@@ -389874,7 +389874,7 @@ _08138984:
adds r2, r7
_08138994:
movs r1, 0x2C
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_0813899C: .4byte 0x03004360
@@ -389889,7 +389889,7 @@ _081389A4:
lsls r2, 9
adds r2, r7
movs r1, 0
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081389BC: .4byte 0x03004360
@@ -389904,7 +389904,7 @@ _081389C4:
lsls r2, 9
adds r2, r7
movs r1, 0x9
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081389DC: .4byte 0x03004360
@@ -389919,7 +389919,7 @@ _081389E4:
lsls r2, 9
adds r2, r7
movs r1, 0x37
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_081389FC: .4byte 0x03004360
@@ -389934,7 +389934,7 @@ _08138A04:
lsls r2, 9
adds r2, r7
movs r1, 0x38
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138A1C: .4byte 0x03004360
@@ -389949,7 +389949,7 @@ _08138A24:
lsls r2, 9
adds r2, r7
movs r1, 0x39
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138A3C: .4byte 0x03004360
@@ -389964,7 +389964,7 @@ _08138A44:
lsls r2, 9
adds r2, r7
movs r1, 0x3A
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138A5C: .4byte 0x03004360
@@ -389979,7 +389979,7 @@ _08138A64:
lsls r2, 9
adds r2, r7
movs r1, 0x3B
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138A7C: .4byte 0x03004360
@@ -389994,7 +389994,7 @@ _08138A84:
lsls r2, 9
adds r2, r7
movs r1, 0x3C
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138A9C: .4byte 0x03004360
@@ -390009,7 +390009,7 @@ _08138AA4:
lsls r2, 9
adds r2, r7
movs r1, 0x3D
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138ABC: .4byte 0x03004360
@@ -390024,7 +390024,7 @@ _08138AC4:
lsls r2, 9
adds r2, r7
movs r1, 0x3E
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138ADC: .4byte 0x03004360
@@ -390039,7 +390039,7 @@ _08138AE4:
lsls r2, 9
adds r2, r7
movs r1, 0x3F
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138AFC: .4byte 0x03004360
@@ -390054,7 +390054,7 @@ _08138B04:
lsls r2, 9
adds r2, r7
movs r1, 0x16
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138B1C: .4byte 0x03004360
@@ -390069,7 +390069,7 @@ _08138B24:
lsls r2, 9
adds r2, r7
movs r1, 0x17
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138B3C: .4byte 0x03004360
@@ -390084,7 +390084,7 @@ _08138B44:
lsls r2, 9
adds r2, r7
movs r1, 0x18
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138B5C: .4byte 0x03004360
@@ -390099,7 +390099,7 @@ _08138B64:
lsls r2, 9
adds r2, r7
movs r1, 0x21
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138B7C: .4byte 0x03004360
@@ -390114,7 +390114,7 @@ _08138B84:
lsls r2, 9
adds r2, r7
movs r1, 0x2F
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138B9C: .4byte 0x03004360
@@ -390129,7 +390129,7 @@ _08138BA4:
lsls r2, 9
adds r2, r7
movs r1, 0x30
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138BBC: .4byte 0x03004360
@@ -390144,7 +390144,7 @@ _08138BC4:
lsls r2, 9
adds r2, r7
movs r1, 0x32
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138BDC: .4byte 0x03004360
@@ -390159,7 +390159,7 @@ _08138BE4:
lsls r2, 9
adds r2, r7
movs r1, 0x33
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138BFC: .4byte 0x03004360
@@ -390174,7 +390174,7 @@ _08138C04:
lsls r2, 9
adds r2, r7
movs r1, 0x34
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138C1C: .4byte 0x03004360
@@ -390189,7 +390189,7 @@ _08138C24:
lsls r2, 9
adds r2, r7
movs r1, 0x35
- bl pokemon_setattr
+ bl SetMonData
b _08138C5A
.align 2, 0
_08138C3C: .4byte 0x03004360
@@ -390204,7 +390204,7 @@ _08138C44:
lsls r2, 9
adds r2, r7
movs r1, 0x36
- bl pokemon_setattr
+ bl SetMonData
_08138C5A:
ldr r2, _08138C8C
ldr r0, _08138C88
@@ -390330,7 +390330,7 @@ sub_8138D38: @ 8138D38
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _08138DE4
ldr r1, _08138DE8
ldrb r1, [r1, 0x8]
@@ -390424,7 +390424,7 @@ sub_8138E04: @ 8138E04
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _08138EB0
ldr r1, _08138EB4
ldrb r1, [r1, 0x8]
@@ -391218,7 +391218,7 @@ sub_8139444: @ 8139444
ldr r4, _081394CC
adds r0, r4
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -391228,7 +391228,7 @@ sub_8139444: @ 8139444
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl PokemonGetField
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -391256,7 +391256,7 @@ _081394D4:
ldr r1, _08139530
adds r0, r1
movs r1, 0x3A
- bl PokemonGetField
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -391550,7 +391550,7 @@ sub_81396E0: @ 81396E0
ldr r1, _08139718
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -391786,7 +391786,7 @@ sub_81398BC: @ 81398BC
ldr r1, _08139A0C
adds r0, r1
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
@@ -391804,7 +391804,7 @@ sub_81398BC: @ 81398BC
lsls r1, 24
lsrs r1, 24
mov r0, r8
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08139A18
mov r10, r0
adds r0, r6, 0
@@ -392300,7 +392300,7 @@ sub_8139CF4: @ 8139CF4
movs r0, 0
movs r1, 0
movs r2, 0xA
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r2, [r5]
ldr r3, _08139D54
ldr r0, _08139D58
@@ -392308,7 +392308,7 @@ sub_8139CF4: @ 8139CF4
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
- bl sub_80728E4
+ bl PrintMenuItemsReordered
ldrb r3, [r5]
movs r0, 0
str r0, [sp]
@@ -392474,7 +392474,7 @@ sub_8139E6C: @ 8139E6C
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_813AF3C
ldr r1, _08139E9C
movs r2, 0
@@ -392526,7 +392526,7 @@ sub_8139ED8: @ 8139ED8
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE28C
pop {r4}
@@ -392547,7 +392547,7 @@ sub_8139EF8: @ 8139EF8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08139F28
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -392570,7 +392570,7 @@ _08139F3C:
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_enable_and_set_ctx_running
_08139F4C:
adds r0, r4, 0
@@ -392591,17 +392591,17 @@ sub_8139F58: @ 8139F58
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08139FAC
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
str r4, [sp]
movs r0, 0xA
str r0, [sp, 0x4]
@@ -392632,11 +392632,11 @@ sub_8139FB4: @ 8139FB4
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -392794,7 +392794,7 @@ _0813A0F4: .4byte sub_8139FD4
thumb_func_start sub_813A0F8
sub_813A0F8: @ 813A0F8
push {lr}
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
movs r0, 0x1
bl sub_8139F58
ldr r0, _0813A114
@@ -392822,7 +392822,7 @@ sub_813A118: @ 813A118
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A96E4
lsls r0, 24
lsrs r0, 24
@@ -392833,7 +392833,7 @@ sub_813A118: @ 813A118
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
strh r0, [r4, 0xC]
strh r0, [r4]
@@ -392882,7 +392882,7 @@ sub_813A198: @ 813A198
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A96E4
lsls r0, 24
lsrs r0, 24
@@ -392893,7 +392893,7 @@ sub_813A198: @ 813A198
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
strh r0, [r4, 0xC]
movs r0, 0
@@ -392939,7 +392939,7 @@ sub_813A21C: @ 813A21C
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8139E24
pop {r4}
@@ -393240,8 +393240,8 @@ sub_813A468: @ 813A468
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
- bl sub_8071FFC
+ bl MenuZeroFillWindowRect
+ bl MenuDisplayMessageBox
ldr r0, _0813A4AC
lsls r4, r5, 2
adds r4, r5
@@ -393331,7 +393331,7 @@ _0813A542:
movs r1, 0x8
movs r2, 0xD
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrh r0, [r4, 0x6]
movs r1, 0x3
str r1, [sp]
@@ -393484,7 +393484,7 @@ _0813A668:
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -393507,7 +393507,7 @@ _0813A69C:
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -393653,7 +393653,7 @@ sub_813A794: @ 813A794
movs r0, 0x7
movs r1, 0x6
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0813A810
adds r0, r6, 0
bl sub_80F914C
@@ -393696,7 +393696,7 @@ sub_813A83C: @ 813A83C
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0813A86C
bl sub_813AD58
ldr r1, _0813A870
@@ -393730,7 +393730,7 @@ sub_813A878: @ 813A878
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r3, [r5, 0x8]
ldrb r0, [r5]
str r0, [sp]
@@ -393907,7 +393907,7 @@ sub_813A9EC: @ 813A9EC
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -394028,7 +394028,7 @@ sub_813AAC4: @ 813AAC4
ldr r0, _0813AAF8
movs r1, 0x1A
adds r2, r7, 0
- bl Print
+ bl MenuPrint
b _0813AB06
.align 2, 0
_0813AAF4: .4byte 0x020231cc
@@ -394037,7 +394037,7 @@ _0813AAFC:
ldr r0, _0813AB0C
movs r1, 0x1A
adds r2, r7, 0
- bl Print
+ bl MenuPrint
_0813AB06:
pop {r4-r7}
pop {r0}
@@ -394054,7 +394054,7 @@ sub_813AB10: @ 813AB10
lsrs r2, 24
ldr r0, _0813AB24
movs r1, 0x19
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -394075,7 +394075,7 @@ sub_813AB28: @ 813AB28
ldr r0, _0813AB4C
movs r1, 0x10
adds r2, r5, 0
- bl Print
+ bl MenuPrint
b _0813AB5A
.align 2, 0
_0813AB48: .4byte 0x020231cc
@@ -394084,7 +394084,7 @@ _0813AB50:
ldr r0, _0813AB60
movs r1, 0x10
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_0813AB5A:
pop {r4,r5}
pop {r0}
@@ -394290,7 +394290,7 @@ _0813ACCE:
movs r0, 0x10
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_0813ACEA:
movs r2, 0x2
ldrsh r0, [r6, r2]
@@ -394511,17 +394511,17 @@ sub_813AE6C: @ 813AE6C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
movs r1, 0xC
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
movs r1, 0
movs r2, 0xB
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813AEFC
movs r1, 0x93
lsls r1, 3
@@ -394534,7 +394534,7 @@ sub_813AE6C: @ 813AE6C
ldr r0, [r4]
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r6, 0
bl sub_813ABE8
ldrb r3, [r5, 0x8]
@@ -394734,7 +394734,7 @@ _0813B036:
movs r0, 0x15
adds r1, r5, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldrb r0, [r6, 0x3]
cmp r4, r0
beq _0813B0C4
@@ -394750,7 +394750,7 @@ _0813B036:
mov r0, r8
movs r1, 0x15
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -394771,7 +394771,7 @@ _0813B08A:
movs r0, 0x15
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_0813B0A4:
ldrb r0, [r5, 0x2]
cmp r0, 0
@@ -394789,7 +394789,7 @@ _0813B0C4:
ldr r0, _0813B0D0
movs r1, 0x15
adds r2, r5, 0
- bl Print
+ bl MenuPrint
b _0813B08A
.align 2, 0
_0813B0D0: .4byte gUnknown_0840E645
@@ -394835,21 +394835,21 @@ sub_813B108: @ 813B108
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
movs r2, 0x8
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813B16C
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0x14
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
bl sub_813B01C
ldr r0, _0813B170
@@ -395019,7 +395019,7 @@ sub_813B294: @ 813B294
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0813B2E8
ldr r1, _0813B2EC
ldrb r0, [r1]
@@ -395066,7 +395066,7 @@ sub_813B300: @ 813B300
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8139E24
pop {r4}
@@ -395107,12 +395107,12 @@ sub_813B348: @ 813B348
movs r1, 0
movs r2, 0xC
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0813B394
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xB
@@ -395336,7 +395336,7 @@ sub_813B510: @ 813B510
ldr r0, _0813B548
movs r1, 0x1
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r1, _0813B54C
ldr r2, _0813B550
adds r0, r4, 0
@@ -395362,7 +395362,7 @@ sub_813B554: @ 813B554
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0813B574
adds r0, r4, 0
bl sub_80F914C
@@ -395392,7 +395392,7 @@ sub_813B578: @ 813B578
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r6, 0x20]
movs r1, 0x1
bl sub_80A9424
@@ -395454,7 +395454,7 @@ sub_813B610: @ 813B610
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_813B758
pop {r4}
@@ -395605,7 +395605,7 @@ sub_813B734: @ 813B734
movs r1, 0
movs r2, 0xC
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_813B758
pop {r4}
@@ -395734,9 +395734,9 @@ sub_813B808: @ 813B808
pop {r0}
bx r0
.align 2, 0
-_0813B848: .4byte gUnknown_08E9C798
-_0813B84C: .4byte gUnknown_08E9CA24
-_0813B850: .4byte gUnknown_08E9CA44
+_0813B848: .4byte gIntroCopyright_Gfx
+_0813B84C: .4byte gIntroCopyright_Pal
+_0813B850: .4byte gIntroCopyright_Tilemap
thumb_func_end sub_813B808
thumb_func_start SerialCb_CopyrightScreen
@@ -402751,8 +402751,8 @@ sub_813EEE4: @ 813EEE4
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
ldr r1, _0813EFA0
movs r2, 0xF8
lsls r2, 5
@@ -402762,17 +402762,17 @@ sub_813EEE4: @ 813EEE4
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813EFA4
movs r1, 0x16
movs r2, 0x1
movs r3, 0x38
- bl Free
+ bl sub_8072BD8
movs r0, 0x10
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_813F0C8
ldr r0, _0813EFA8
bl SetMainCallback2
@@ -402937,7 +402937,7 @@ sub_813F0C8: @ 813F0C8
movs r1, 0x11
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r1, _0813F0F0
ldrb r0, [r1, 0x1E]
cmp r0, 0
@@ -402946,7 +402946,7 @@ sub_813F0C8: @ 813F0C8
adds r0, 0x8
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
_0813F0EA:
pop {r0}
bx r0
@@ -403894,7 +403894,7 @@ _0813F88C:
_0813F89C:
adds r0, r1
movs r1, 0x26
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ball_number_to_ball_processing_index
@@ -407935,11 +407935,11 @@ sub_8141828: @ 8141828
strb r1, [r0]
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl b_side_obj__get_some_boolean
@@ -408926,13 +408926,13 @@ _08142024:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
adds r3, r0, 0
cmp r3, 0
beq _081420DC
adds r0, r6, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r4, r7, 2
adds r4, r7
lsls r4, 2
@@ -408948,18 +408948,18 @@ _08142024:
strh r1, [r5, 0x8]
adds r0, r6, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
str r0, [r5]
adds r0, r6, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
mov r1, r9
adds r1, 0x4
adds r1, r4
str r0, [r1]
adds r0, r6, 0
movs r1, 0x38
- bl PokemonGetField
+ bl GetMonData
lsls r0, 1
ldrb r2, [r5, 0x9]
movs r1, 0x1
@@ -408969,7 +408969,7 @@ _08142024:
adds r0, r6, 0
movs r1, 0x2
mov r2, sp
- bl PokemonGetField
+ bl GetMonData
movs r2, 0
mov r6, r8
lsls r5, r6, 2
@@ -409186,11 +409186,11 @@ _08142228:
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08142268
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0814226C
mov r0, r10
add r0, r8
@@ -409284,7 +409284,7 @@ sub_81422E8: @ 81422E8
adds r0, r5, 0
bl SetUpWindowConfig
adds r0, r5, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r1, _08142318
lsls r0, r4, 2
adds r0, r4
@@ -409393,7 +409393,7 @@ _0814235E:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, r5
ldr r0, _08142400
str r0, [r4]
@@ -409646,7 +409646,7 @@ _081425C0:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xF
bl sub_8143068
@@ -409760,7 +409760,7 @@ _08142698:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _081426F0
mov r2, r9
adds r0, r2, r6
@@ -409839,7 +409839,7 @@ sub_8142738: @ 8142738
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _08142788
ldrb r0, [r0, 0x8]
movs r1, 0x78
@@ -409909,7 +409909,7 @@ _081427DC:
movs r1, 0x2
movs r2, 0xF
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
movs r1, 0x2
bl sub_8143300
@@ -409917,11 +409917,11 @@ _081427DC:
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08142810
movs r1, 0x4
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _08142814
str r0, [r4]
_0814280A:
@@ -410267,7 +410267,7 @@ _08142AB8:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r1, _08142AF0
adds r0, r6, r5
lsls r0, 3
@@ -410486,7 +410486,7 @@ _08142C3C:
ldr r0, _08142CB8
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
ldr r0, _08142CC4
str r0, [r4]
add sp, 0x10
@@ -410904,11 +410904,11 @@ sub_8142FEC: @ 8142FEC
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08143020
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, _08143024
lsls r0, r4, 2
adds r0, r4
@@ -410930,7 +410930,7 @@ sub_814302C: @ 814302C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08143056
@@ -410968,7 +410968,7 @@ sub_8143068: @ 8143068
lsrs r2, 24
movs r1, 0
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -411034,7 +411034,7 @@ _081430EA:
lsls r2, r4, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r7, r5, 0
movs r3, 0
mov r1, r9
@@ -411090,7 +411090,7 @@ _0814313A:
ldr r3, [sp]
lsls r2, r3, 24
lsrs r2, 24
- bl Print
+ bl MenuPrint
ldr r6, [sp, 0x8]
lsls r1, r6, 24
lsrs r1, 24
@@ -411100,7 +411100,7 @@ _0814313A:
lsrs r3, 24
movs r0, 0
movs r2, 0x1D
- bl Reset
+ bl MenuZeroFillWindowRect
b _081432E4
.align 2, 0
_08143188: .4byte 0x020231cc
@@ -411180,7 +411180,7 @@ _08143204:
lsrs r0, 23
mov r2, r9
ldr r1, [r2, 0x4]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -411218,7 +411218,7 @@ _0814324A:
lsls r2, r3, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
mov r6, r9
ldrb r0, [r6, 0x9]
lsrs r6, r0, 1
@@ -411253,7 +411253,7 @@ _0814324A:
lsrs r4, 24
adds r0, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
mov r0, r9
ldrh r6, [r0]
ldr r1, _081432FC
@@ -411269,7 +411269,7 @@ _0814324A:
lsrs r1, 24
adds r0, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
_081432E4:
add sp, 0x14
pop {r3-r5}
@@ -411308,7 +411308,7 @@ sub_8143300: @ 8143300
lsrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
ldr r0, _081433D0
mov r10, r0
movs r1, 0xE
@@ -411319,14 +411319,14 @@ sub_8143300: @ 8143300
mov r8, r2
mov r1, r8
adds r2, r4, 0
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _081433D4
adds r4, r6, 0x3
lsls r4, 24
lsrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
mov r0, r10
ldrb r1, [r0, 0xA]
ldrb r0, [r0, 0xB]
@@ -411341,14 +411341,14 @@ sub_8143300: @ 8143300
mov r0, r9
mov r1, r8
adds r2, r4, 0
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _081433DC
adds r6, 0x5
lsls r6, 24
lsrs r6, 24
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, r10
ldrh r1, [r0, 0xE]
mov r0, r9
@@ -411372,7 +411372,7 @@ sub_8143300: @ 8143300
mov r0, r9
mov r1, r8
adds r2, r6, 0
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -411385,7 +411385,7 @@ _081433CC: .4byte gUnknown_0840E559
_081433D0: .4byte gSaveBlock2
_081433D4: .4byte gUnknown_0840E560
_081433D8: .4byte 0x020231cc
-_081433DC: .4byte gUnknown_0840DF8B
+_081433DC: .4byte gMainMenuString_Time
thumb_func_end sub_8143300
thumb_func_start sub_81433E0
@@ -411575,7 +411575,7 @@ _0814350A:
pop {r0}
bx r0
.align 2, 0
-_0814354C: .4byte gUnknown_08E8E8B0
+_0814354C: .4byte gHallOfFame_Gfx
_08143550: .4byte 0x040000d4
_08143554: .4byte 0x81000800
_08143558: .4byte 0x06003800
@@ -411583,7 +411583,7 @@ _0814355C: .4byte 0x02000000
_08143560: .4byte 0x06003b80
_08143564: .4byte 0x06003000
_08143568: .4byte 0x000003ff
-_0814356C: .4byte gUnknown_08E8EA78
+_0814356C: .4byte gHallOfFame_Pal
thumb_func_end sub_81433E0
thumb_func_start sub_8143570
@@ -411604,7 +411604,7 @@ sub_8143570: @ 8143570
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
pop {r4}
pop {r0}
bx r0
@@ -412192,7 +412192,7 @@ _08143A0E:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindow
ldr r0, _08143AFC
movs r1, 0x80
movs r2, 0x40
@@ -412623,7 +412623,7 @@ _08143DC8: .4byte 0x03001770
_08143DCC: .4byte 0x0000043c
_08143DD0: .4byte 0x030028f8
_08143DD4: .4byte gUnknown_083F66F0
-_08143DD8: .4byte gUnknown_083F64F8
+_08143DD8: .4byte gBirchGrassTilemap
_08143DDC: .4byte 0x06003800
_08143DE0: .4byte gUnknown_083F62EC + 0x2
_08143DE4: .4byte 0x0201e000
@@ -413241,7 +413241,7 @@ _081442B0:
lsrs r2, 24
movs r1, 0
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -413402,7 +413402,7 @@ _081443F8:
movs r1, 0x9
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08144424
lsls r1, r5, 2
adds r1, r5
@@ -415141,8 +415141,8 @@ _081451D0:
pop {r0}
bx r0
.align 2, 0
-_081451EC: .4byte gUnknown_08EA260C
-_081451F0: .4byte gUnknown_08E9CA24
+_081451EC: .4byte gCreditsCopyrightEnd_Gfx
+_081451F0: .4byte gIntroCopyright_Pal
_081451F4: .4byte 0x000003ff
_081451F8: .4byte 0x060001c8
_081451FC: .4byte 0x06000248
@@ -416344,17 +416344,17 @@ _08145B18:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
beq _08145B74
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetField
+ bl GetMonData
cmp r0, 0
bne _08145B6A
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
ldr r0, _08145C2C
ldrh r0, [r0]
@@ -416400,17 +416400,17 @@ _08145B80:
adds r4, r2, r0
adds r0, r4, 0
movs r1, 0xB
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
beq _08145BD8
adds r0, r4, 0
movs r1, 0x2D
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
cmp r0, 0
bne _08145BD8
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
adds r1, r0, 0
ldr r0, _08145C2C
ldrh r0, [r0]
@@ -416465,7 +416465,7 @@ _08145BD8:
adds r0, r1
ldr r2, _08145C40
movs r1, 0x2
- bl PokemonGetField
+ bl GetMonData
b _08145C6C
.align 2, 0
_08145C24: .4byte 0x0202e8cc
@@ -416495,7 +416495,7 @@ _08145C44:
adds r0, r1
ldr r2, _08145C88
movs r1, 0x2
- bl PokemonGetEncryptedField
+ bl GetBoxMonData
_08145C6C:
ldr r0, _08145C88
bl StringGetEnd10
@@ -416724,7 +416724,7 @@ sub_8145D88: @ 8145D88
ldr r0, _08145ED4
bl SetUpWindowConfig
ldr r0, _08145ED8
- bl sub_8071C4C
+ bl InitMenuWindow
bl pokedex_diploma_something
movs r0, 0x1
negs r0, r0
@@ -416925,7 +416925,7 @@ _08145FF4:
ldr r0, _08146010
movs r1, 0x6
movs r2, 0x2
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -417043,12 +417043,12 @@ _08146108: .4byte 0x03001770
_0814610C: .4byte 0x0000043c
_08146110:
ldr r0, _08146118
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _0814620C
.align 2, 0
_08146118: .4byte gWindowConfig_81E6E18
_0814611C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _08146126
b _08146250
@@ -417285,7 +417285,7 @@ _081462FC:
bl LZDecompressVram
b _081463CA
.align 2, 0
-_08146308: .4byte gUnknown_08E783FC
+_08146308: .4byte gBerryCheck_Gfx
_0814630C:
ldr r0, _0814631C
ldr r1, _08146320
@@ -417364,7 +417364,7 @@ _081463A4:
adds r1, r2
b _081463D0
.align 2, 0
-_081463B8: .4byte gUnknown_08E7883C
+_081463B8: .4byte gBerryCheck_Pal
_081463BC: .4byte 0x02000000
_081463C0: .4byte 0x0001ffff
_081463C4:
@@ -417537,19 +417537,19 @@ sub_81464E4: @ 81464E4
adds r0, r7, 0
movs r1, 0xC
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0xE
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, [r5, 0xC]
movs r1, 0x4
movs r2, 0xE
- bl Print
+ bl MenuPrint
ldr r0, [r5, 0x10]
movs r1, 0x4
movs r2, 0x10
- bl Print
+ bl MenuPrint
ldrh r1, [r5, 0x8]
lsls r0, r1, 5
subs r0, r1
@@ -417578,7 +417578,7 @@ _0814654E:
ldr r0, _081465A4
movs r1, 0xB
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldrh r0, [r5, 0x8]
cmp r0, 0
beq _081465B0
@@ -417595,7 +417595,7 @@ _0814654E:
ldr r0, _081465AC
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
b _081465BA
.align 2, 0
_0814659C: .4byte 0x0203855e
@@ -417607,12 +417607,12 @@ _081465B0:
ldr r0, _081465E0
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
_081465BA:
ldr r0, _081465E4
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldrb r0, [r5, 0x7]
cmp r0, 0
beq _081465EC
@@ -417624,7 +417624,7 @@ _081465BA:
ldr r0, [r1]
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
b _081465F6
.align 2, 0
_081465E0: .4byte gUnknown_0840E674
@@ -417634,7 +417634,7 @@ _081465EC:
ldr r0, _081465FC
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
_081465F6:
pop {r4-r7}
pop {r0}
@@ -418016,7 +418016,7 @@ sub_81468BC: @ 81468BC
movs r1, 0x4
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_81464E4
ldr r4, _081468F8
ldrb r0, [r4]
@@ -418081,8 +418081,8 @@ CB2_InitMysteryEventMenu: @ 8146930
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindow
+ bl MenuZeroFillScreen
movs r1, 0x80
lsls r1, 19
movs r2, 0xA0
@@ -418193,7 +418193,7 @@ _08146A54:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -418222,7 +418222,7 @@ _08146A90: .4byte gUnknown_0842C4C0
_08146A94: .4byte 0x03001770
_08146A98: .4byte 0x0000043c
_08146A9C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146AA8
@@ -418277,7 +418277,7 @@ _08146B0C: .4byte gUnknown_0842C4E9
_08146B10: .4byte 0x03001770
_08146B14: .4byte 0x0000043c
_08146B18:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146B24
@@ -418303,11 +418303,11 @@ _08146B26:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08146B68
movs r1, 0x7
movs r2, 0x6
- bl Print
+ bl MenuPrint
ldr r2, _08146B6C
adds r1, r4, r2
b _08146D82
@@ -418351,7 +418351,7 @@ _08146BA4:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08146BDC
adds r0, r4, 0
movs r1, 0x1
@@ -418383,7 +418383,7 @@ _08146C00:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
_08146C10:
ldr r4, _08146C2C
adds r0, r4, 0
@@ -418424,7 +418424,7 @@ _08146C54:
_08146C5C: .4byte 0x03001770
_08146C60: .4byte 0x0000043c
_08146C64:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146C70
@@ -418507,8 +418507,8 @@ _08146D18:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
- bl sub_8072080
+ bl MenuZeroFillWindowRect
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08146DA4
@@ -418584,7 +418584,7 @@ _08146DA4:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08146E04
adds r0, r4, 0
movs r1, 0x1
@@ -418749,21 +418749,21 @@ _08146E6C:
ldr r0, _08146FF4
bl SetUpWindowConfig
ldr r0, _08146FF8
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0xD
movs r1, 0x8
movs r2, 0x10
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08146FFC
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -418816,9 +418816,9 @@ _08146FC4: .4byte 0x8100c000
_08146FC8: .4byte 0x85000100
_08146FCC: .4byte 0x81000200
_08146FD0: .4byte gUnknown_083F66F0
-_08146FD4: .4byte gUnknown_083F636C
+_08146FD4: .4byte gBirchBagTilemap
_08146FD8: .4byte 0x06003000
-_08146FDC: .4byte gUnknown_083F64F8
+_08146FDC: .4byte gBirchGrassTilemap
_08146FE0: .4byte 0x06003800
_08146FE4: .4byte gUnknown_08411980
_08146FE8: .4byte 0x06010020
@@ -418878,11 +418878,11 @@ _0814705C:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081470D0
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _081470D4
ldrb r0, [r0]
bl sub_8125C3C
@@ -418892,7 +418892,7 @@ _0814705C:
ldr r0, _081470D8
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
_08147096:
adds r0, r4, 0x1
lsls r0, 24
@@ -418909,11 +418909,11 @@ _081470A6:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081470DC
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _081470E0
bl SetMainCallback2
b _0814713E
@@ -418930,7 +418930,7 @@ _081470E4:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08147104
ldr r0, [r0]
cmp r0, 0
@@ -418938,7 +418938,7 @@ _081470E4:
ldr r0, _08147108
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
b _0814713E
.align 2, 0
_08147104: .4byte 0x03005ebc
@@ -418948,11 +418948,11 @@ _0814710C:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0814712C
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _08147130
bl SetMainCallback2
b _08147144
@@ -418963,7 +418963,7 @@ _08147134:
ldr r0, _0814714C
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
_0814713E:
ldr r0, _08147150
bl SetMainCallback2
@@ -418992,11 +418992,11 @@ sub_8147154: @ 8147154
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08147198
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0814719C
bl SetVBlankCallback
ldr r0, _081471A0
@@ -419382,7 +419382,7 @@ sub_8147478: @ 8147478
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
ldr r1, _081474B8
cmp r0, r1
bne _081474C0
@@ -419396,7 +419396,7 @@ sub_8147478: @ 8147478
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl PokemonGetField
+ bl GetMonData
movs r1, 0x9D
lsls r1, 1
cmp r0, r1
@@ -419687,7 +419687,7 @@ _081476FE:
bl sub_8147774
cmp r0, 0
beq _08147716
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0x5
bl audio_play
movs r0, 0x2
@@ -419700,7 +419700,7 @@ _08147716:
lsls r0, 16
cmp r0, 0
bne _0814776A
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0x3
strh r0, [r4]
movs r0, 0x1E
@@ -419991,12 +419991,12 @@ _08147978: .4byte 0x03001770
_0814797C: .4byte 0x0000043c
_08147980:
ldr r0, _08147988
- bl sub_8071C58
+ bl MultistepInitMenuWindowBegin
b _08147A44
.align 2, 0
_08147988: .4byte gWindowConfig_81E6E50
_0814798C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowContinue
cmp r0, 0
bne _08147996
b _08147AD0
@@ -420065,7 +420065,7 @@ _08147A20:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _08147A34
ldr r2, _08147A38
adds r1, r2
@@ -420224,12 +420224,12 @@ _08147B4C:
_08147B70:
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
lsls r0, r5, 3
ldr r1, _08147BAC
@@ -420255,16 +420255,16 @@ _08147BB4: .4byte gUnknown_081FAF4C
_08147BB8:
adds r0, r4, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl PokemonGetField
+ bl GetMonData
adds r6, r0, 0
adds r0, r4, 0
movs r1, 0x1
- bl PokemonGetField
+ bl GetMonData
adds r1, r0, 0
adds r0, r5, 0
adds r2, r6, 0
@@ -420273,7 +420273,7 @@ _08147BB8:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
b _08147C40
_08147BF0:
ldr r0, _08147BF8
@@ -420341,7 +420341,7 @@ _08147C60:
movs r0, 0x1
b _08147C86
.align 2, 0
-_08147C78: .4byte gUnknown_08E62AC0
+_08147C78: .4byte gBattleTerrainPalette_BattleTower
_08147C7C: .4byte 0x02000000
_08147C80: .4byte 0x0001ffff
_08147C84:
@@ -420547,7 +420547,7 @@ sub_8147E10: @ 8147E10
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -420635,7 +420635,7 @@ _08147ED8:
ldr r0, _08147EF8
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, _08147F00
lsls r0, r7, 2
adds r0, r7
@@ -420723,7 +420723,7 @@ sub_8147F84: @ 8147F84
push {r6,r7}
adds r5, r0, 0
movs r1, 0x41
- bl PokemonGetField
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -421080,9 +421080,9 @@ _08148244:
bx r0
.align 2, 0
_0814824C: .4byte 0x03005f34
-_08148250: .4byte gUnknown_08411A10
+_08148250: .4byte gNatureToMonPokeblockAnim
_08148254: .4byte 0x03005f30
-_08148258: .4byte gUnknown_08411A42
+_08148258: .4byte gMonPokeblockAnims
thumb_func_end sub_81481DC
thumb_func_start sub_814825C
@@ -421222,7 +421222,7 @@ _081483E8:
b _08148532
.align 2, 0
_0814841C: .4byte 0x03005f40
-_08148420: .4byte gUnknown_08411A10
+_08148420: .4byte gNatureToMonPokeblockAnim
_08148424: .4byte 0x03005f30
_08148428: .4byte 0x03005f20
_0814842C: .4byte 0x03005f2c
@@ -421282,7 +421282,7 @@ _0814847A:
bl StartSpriteAffineAnim
b _081484EE
.align 2, 0
-_081484A4: .4byte gUnknown_08411A10
+_081484A4: .4byte gNatureToMonPokeblockAnim
_081484A8: .4byte 0x03005f30
_081484AC: .4byte 0x03005f20
_081484B0: .4byte gSpriteAffineAnimTable_8412050
@@ -421409,7 +421409,7 @@ _0814854C:
b _081485C6
.align 2, 0
_081485B4: .4byte 0x03005fa0
-_081485B8: .4byte gUnknown_08411A42
+_081485B8: .4byte gMonPokeblockAnims
_081485BC: .4byte 0x03005f40
_081485C0: .4byte 0x03005f20
_081485C4:
@@ -421761,21 +421761,21 @@ sub_8148830: @ 8148830
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081488AC
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x2
movs r1, 0x1
movs r2, 0x8
movs r3, 0x6
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _081488B0
movs r0, 0x3
movs r1, 0x2
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0x1
str r0, [sp]
movs r0, 0x5
@@ -421809,7 +421809,7 @@ sub_81488BC: @ 81488BC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -422004,7 +422004,7 @@ _08148A2C:
ldr r0, _08148AE0
bl SetUpWindowConfig
ldr r0, _08148AE4
- bl sub_8071C4C
+ bl InitMenuWindow
movs r0, 0x1
negs r0, r0
ldr r1, _08148AE8
@@ -425310,17 +425310,17 @@ sub_814A404: @ 814A404
unref_sub_814A414: @ 814A414
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0x10
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0814A458
movs r0, 0x2
movs r1, 0x1
movs r2, 0x8
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xF
@@ -426155,7 +426155,7 @@ _0814AA98:
_0814AAA8: .4byte gUnknown_0842F790
_0814AAAC: .4byte 0x0203a3d0
_0814AAB0: .4byte 0x02020004
-_0814AAB4: .4byte gUnknown_0842F5C0
+_0814AAB4: .4byte gSubspriteTables_842F5C0
_0814AAB8: .4byte 0x0203a3d1
thumb_func_end sub_814A958
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 10:06:16 +0000