summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <nintendo6496@googlemail.com>2018-10-21 17:10:02 +0200
committerpaul <nintendo6496@googlemail.com>2018-10-21 17:10:02 +0200
commit092462d83dcbbacf21c03252d760732617d45da5 (patch)
tree19e8620b02fccaa9f5c4b9693d2103761e438959
parente396bcdb7229645f4a4893b8e3c1d364a0e7930c (diff)
parent26ca9acfa5858f1caaa67f2a5e0509a6b47ee644 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--asm/bag.s6
-rw-r--r--asm/battle_tower.s24
-rw-r--r--asm/berry_pouch.s10
-rw-r--r--asm/buy_menu_helpers.s4
-rw-r--r--asm/cable_club.s6
-rw-r--r--asm/coins.s346
-rw-r--r--asm/daycare.s8
-rw-r--r--asm/egg_hatch.s4
-rw-r--r--asm/event_data.s4
-rw-r--r--asm/fame_checker.s8
-rw-r--r--asm/field_control_avatar.s4
-rw-r--r--asm/field_player_avatar.s2
-rw-r--r--asm/field_specials.s136
-rw-r--r--asm/item_menu.s6
-rw-r--r--asm/item_pc.s6
-rw-r--r--asm/item_use.s2
-rw-r--r--asm/itemfinder.s4
-rw-r--r--asm/learn_move.s4
-rw-r--r--asm/link_rfu.s6
-rw-r--r--asm/map_name_popup.s2
-rw-r--r--asm/math_util.s202
-rw-r--r--asm/menu.s10
-rw-r--r--asm/menu2.s2
-rw-r--r--asm/money.s409
-rw-r--r--asm/naming_screen.s6
-rw-r--r--asm/new_game.s2
-rw-r--r--asm/oak_speech.s4
-rw-r--r--asm/option_menu.s4
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/party_menu.s24
-rw-r--r--asm/player_pc.s4
-rw-r--r--asm/pokemon_3.s4
-rw-r--r--asm/pokemon_storage_system.s10
-rw-r--r--asm/pokemon_summary_screen.s8
-rw-r--r--asm/prof_pc.s8
-rw-r--r--asm/scrcmd.s28
-rw-r--r--asm/script_menu.s32
-rw-r--r--asm/script_pokemon_util_80BF8FC.s8
-rw-r--r--asm/shop.s12
-rw-r--r--asm/slot_machine.s22
-rw-r--r--asm/start_menu.s4
-rw-r--r--asm/tm_case.s10
-rw-r--r--asm/trade.s30
-rw-r--r--asm/trainer_card.s4
-rw-r--r--asm/trainer_tower.s18
-rw-r--r--asm/union_room_chat.s4
-rw-r--r--asm/unk_8147AA8.s14
-rw-r--r--asm/unk_81507FC.s44
-rw-r--r--asm/unk_815EDDC.s4
-rw-r--r--data/data_83FECCC.s4
-rw-r--r--include/menu.h1
-rw-r--r--include/money.h6
-rw-r--r--include/text.h2
-rw-r--r--include/text_window.h1
-rw-r--r--ld_script.txt6
-rw-r--r--src/coins.c101
-rw-r--r--src/math_util.c86
-rw-r--r--src/money.c140
-rw-r--r--src/text_printer.c2
-rw-r--r--sym_ewram.txt10
60 files changed, 628 insertions, 1256 deletions
diff --git a/asm/bag.s b/asm/bag.s
index 1e2115719..e7c72d082 100644
--- a/asm/bag.s
+++ b/asm/bag.s
@@ -188,7 +188,7 @@ sub_810B994: @ 810B994
movs r0, 0x2
movs r1, 0
adds r2, r4, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r4}
pop {r0}
@@ -403,12 +403,12 @@ sub_810BB40: @ 810BB40
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r3, r0, 0
adds r0, r4, 0
movs r1, 0x81
movs r2, 0xC
- bl sub_809FF48
+ bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r4}
pop {r0}
bx r0
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 34b80978c..10b07d2e0 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2227,17 +2227,17 @@ _080E6A80:
ldr r0, [r6]
adds r0, r2
adds r0, r5
- ldr r1, _080E6AA8 @ =gUnknown_20370C2
+ ldr r1, _080E6AA8 @ =gSpecialVar_0x8005
ldrh r1, [r1]
strb r1, [r0]
b _080E6C80
.align 2, 0
_080E6AA0: .4byte gBattleStruct
_080E6AA4: .4byte 0x0000055e
-_080E6AA8: .4byte gUnknown_20370C2
+_080E6AA8: .4byte gSpecialVar_0x8005
_080E6AAC:
ldr r2, [r6]
- ldr r0, _080E6AC8 @ =gUnknown_20370C2
+ ldr r0, _080E6AC8 @ =gSpecialVar_0x8005
ldrb r0, [r0]
ldr r3, _080E6ACC @ =0x0000055c
adds r2, r3
@@ -2251,7 +2251,7 @@ _080E6AAC:
strb r0, [r2]
b _080E6C80
.align 2, 0
-_080E6AC8: .4byte gUnknown_20370C2
+_080E6AC8: .4byte gSpecialVar_0x8005
_080E6ACC: .4byte 0x0000055c
_080E6AD0:
ldr r0, [r6]
@@ -2260,31 +2260,31 @@ _080E6AD0:
lsls r2, 3
adds r0, r2
adds r0, r1
- ldr r1, _080E6AE0 @ =gUnknown_20370C2
+ ldr r1, _080E6AE0 @ =gSpecialVar_0x8005
b _080E6BC6
.align 2, 0
-_080E6AE0: .4byte gUnknown_20370C2
+_080E6AE0: .4byte gSpecialVar_0x8005
_080E6AE4:
ldr r0, [r6]
lsls r1, r5, 1
ldr r3, _080E6AF4 @ =0x00000564
adds r0, r3
adds r0, r1
- ldr r1, _080E6AF8 @ =gUnknown_20370C2
+ ldr r1, _080E6AF8 @ =gSpecialVar_0x8005
b _080E6BC6
.align 2, 0
_080E6AF4: .4byte 0x00000564
-_080E6AF8: .4byte gUnknown_20370C2
+_080E6AF8: .4byte gSpecialVar_0x8005
_080E6AFC:
ldr r0, [r6]
- ldr r1, _080E6B0C @ =gUnknown_20370C2
+ ldr r1, _080E6B0C @ =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, _080E6B10 @ =0x0000056c
adds r0, r2
strb r1, [r0]
b _080E6C80
.align 2, 0
-_080E6B0C: .4byte gUnknown_20370C2
+_080E6B0C: .4byte gSpecialVar_0x8005
_080E6B10: .4byte 0x0000056c
_080E6B14:
movs r2, 0
@@ -2384,7 +2384,7 @@ _080E6BD0: .4byte 0x00000595
_080E6BD4: .4byte gUnknown_20370D0
_080E6BD8:
ldr r3, [r6]
- ldr r0, _080E6BF8 @ =gUnknown_20370C2
+ ldr r0, _080E6BF8 @ =gSpecialVar_0x8005
ldrb r0, [r0]
ldr r1, _080E6BFC @ =0x0000055c
adds r3, r1
@@ -2399,7 +2399,7 @@ _080E6BD8:
strb r0, [r3]
b _080E6C80
.align 2, 0
-_080E6BF8: .4byte gUnknown_20370C2
+_080E6BF8: .4byte gSpecialVar_0x8005
_080E6BFC: .4byte 0x0000055c
_080E6C00:
ldr r0, [r6]
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index a9523846e..8d79dd1fe 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -3070,7 +3070,7 @@ sub_813E668: @ 813E668
movs r1, 0x38
movs r2, 0xA
adds r3, r4, 0
- bl sub_809FEC4
+ bl PrintMoneyAmount
add sp, 0x4
pop {r4}
pop {r0}
@@ -3299,11 +3299,11 @@ sub_813E7F0: @ 813E7F0
lsrs r4, 24
ldr r0, [r7]
add r0, r10
- bl sub_809FD58
+ bl GetMoney
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
- bl sub_809FE40
+ bl PrintMoneyAmountInMoneyBox
movs r2, 0x8
negs r2, r2
add r9, r2
@@ -3731,12 +3731,12 @@ sub_813EBD4: @ 813EBD4
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r3, r0, 0
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xC
- bl sub_809FF48
+ bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r4}
pop {r0}
bx r0
diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s
index 1f84ec684..734e648b3 100644
--- a/asm/buy_menu_helpers.s
+++ b/asm/buy_menu_helpers.s
@@ -59,12 +59,12 @@ sub_813F6D0: @ 813F6D0
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r3, r0, 0
movs r0, 0
movs r1, 0xA
movs r2, 0xF
- bl sub_809FF48
+ bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/cable_club.s b/asm/cable_club.s
index ff9035000..c4bbd479d 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -69,7 +69,7 @@ sub_808078C: @ 808078C
movs r1, 0x2
adds r2, r5, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -2085,14 +2085,14 @@ _080817C0:
cmp r0, 0
beq _08081820
bl sub_8057F34
- ldr r0, _080817DC @ =gUnknown_20370C2
+ ldr r0, _080817DC @ =gSpecialVar_0x8005
ldrb r0, [r0]
bl sub_80096F8
movs r0, 0x2
strh r0, [r5, 0x8]
b _08081820
.align 2, 0
-_080817DC: .4byte gUnknown_20370C2
+_080817DC: .4byte gSpecialVar_0x8005
_080817E0:
bl sub_8057EC0
cmp r0, 0x1
diff --git a/asm/coins.s b/asm/coins.s
deleted file mode 100644
index 3b914a15a..000000000
--- a/asm/coins.s
+++ /dev/null
@@ -1,346 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_80D0554
-sub_80D0554: @ 80D0554
- ldr r0, _080D0574 @ =gSaveBlock1Ptr
- ldr r1, [r0]
- movs r0, 0xA5
- lsls r0, 2
- adds r1, r0
- ldr r0, _080D0578 @ =gSaveBlock2Ptr
- ldr r0, [r0]
- movs r2, 0xF2
- lsls r2, 4
- adds r0, r2
- ldr r0, [r0]
- ldrh r1, [r1]
- eors r0, r1
- lsls r0, 16
- lsrs r0, 16
- bx lr
- .align 2, 0
-_080D0574: .4byte gSaveBlock1Ptr
-_080D0578: .4byte gSaveBlock2Ptr
- thumb_func_end sub_80D0554
-
- thumb_func_start sub_80D057C
-sub_80D057C: @ 80D057C
- lsls r0, 16
- lsrs r0, 16
- ldr r1, _080D059C @ =gSaveBlock1Ptr
- ldr r2, [r1]
- ldr r1, _080D05A0 @ =gSaveBlock2Ptr
- ldr r1, [r1]
- movs r3, 0xF2
- lsls r3, 4
- adds r1, r3
- ldr r1, [r1]
- eors r0, r1
- movs r1, 0xA5
- lsls r1, 2
- adds r2, r1
- strh r0, [r2]
- bx lr
- .align 2, 0
-_080D059C: .4byte gSaveBlock1Ptr
-_080D05A0: .4byte gSaveBlock2Ptr
- thumb_func_end sub_80D057C
-
- thumb_func_start sub_80D05A4
-sub_80D05A4: @ 80D05A4
- push {r4,lr}
- lsls r0, 16
- lsrs r4, r0, 16
- bl sub_80D0554
- lsls r0, 16
- lsrs r1, r0, 16
- ldr r0, _080D05BC @ =0x0000270e
- cmp r1, r0
- bls _080D05C0
- movs r0, 0
- b _080D05DA
- .align 2, 0
-_080D05BC: .4byte 0x0000270e
-_080D05C0:
- adds r0, r1, r4
- cmp r1, r0
- bgt _080D05D0
- lsls r0, 16
- lsrs r1, r0, 16
- ldr r0, _080D05E0 @ =0x0000270f
- cmp r1, r0
- bls _080D05D2
-_080D05D0:
- ldr r1, _080D05E0 @ =0x0000270f
-_080D05D2:
- adds r0, r1, 0
- bl sub_80D057C
- movs r0, 0x1
-_080D05DA:
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_080D05E0: .4byte 0x0000270f
- thumb_func_end sub_80D05A4
-
- thumb_func_start sub_80D05E4
-sub_80D05E4: @ 80D05E4
- push {r4,lr}
- lsls r0, 16
- lsrs r4, r0, 16
- bl sub_80D0554
- lsls r0, 16
- lsrs r0, 16
- cmp r0, r4
- bcs _080D05FA
- movs r0, 0
- b _080D0606
-_080D05FA:
- subs r0, r4
- lsls r0, 16
- lsrs r0, 16
- bl sub_80D057C
- movs r0, 0x1
-_080D0606:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_80D05E4
-
- thumb_func_start sub_80D060C
-sub_80D060C: @ 80D060C
- push {r4-r6,lr}
- mov r6, r9
- mov r5, r8
- push {r5,r6}
- sub sp, 0xC
- adds r6, r0, 0
- mov r8, r2
- adds r4, r3, 0
- ldr r5, [sp, 0x24]
- lsls r6, 24
- lsrs r6, 24
- mov r0, r8
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r4, 24
- lsrs r4, 24
- lsls r5, 24
- lsrs r5, 24
- ldr r0, _080D0668 @ =gStringVar1
- movs r2, 0x1
- movs r3, 0x4
- bl ConvertIntToDecimalStringN
- ldr r0, _080D066C @ =gStringVar4
- mov r9, r0
- ldr r1, _080D0670 @ =gUnknown_84162C4
- bl StringExpandPlaceholders
- str r4, [sp]
- str r5, [sp, 0x4]
- movs r0, 0
- str r0, [sp, 0x8]
- adds r0, r6, 0
- movs r1, 0
- mov r2, r9
- mov r3, r8
- bl PrintTextOnWindow
- add sp, 0xC
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080D0668: .4byte gStringVar1
-_080D066C: .4byte gStringVar4
-_080D0670: .4byte gUnknown_84162C4
- thumb_func_end sub_80D060C
-
- thumb_func_start sub_80D0674
-sub_80D0674: @ 80D0674
- push {r4-r6,lr}
- mov r6, r8
- push {r6}
- sub sp, 0xC
- adds r6, r0, 0
- adds r4, r1, 0
- adds r5, r2, 0
- mov r8, r3
- lsls r6, 24
- lsrs r6, 24
- lsls r4, 16
- lsrs r4, 16
- lsls r5, 24
- lsrs r5, 24
- adds r0, r6, 0
- movs r1, 0
- adds r2, r4, 0
- adds r3, r5, 0
- bl SetWindowBorderStyle
- ldr r2, _080D06CC @ =gUnknown_8417C2D
- movs r4, 0
- str r4, [sp]
- movs r0, 0xFF
- str r0, [sp, 0x4]
- str r4, [sp, 0x8]
- adds r0, r6, 0
- movs r1, 0x2
- movs r3, 0
- bl PrintTextOnWindow
- str r4, [sp]
- adds r0, r6, 0
- mov r1, r8
- movs r2, 0x10
- movs r3, 0xC
- bl sub_80D060C
- add sp, 0xC
- pop {r3}
- mov r8, r3
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080D06CC: .4byte gUnknown_8417C2D
- thumb_func_end sub_80D0674
-
- thumb_func_start sub_80D06D0
-sub_80D06D0: @ 80D06D0
- push {r4,lr}
- sub sp, 0xC
- adds r1, r0, 0
- ldr r0, _080D071C @ =gStringVar1
- movs r2, 0x1
- movs r3, 0x4
- bl ConvertIntToDecimalStringN
- ldr r4, _080D0720 @ =gStringVar4
- ldr r1, _080D0724 @ =gUnknown_84162C4
- adds r0, r4, 0
- bl StringExpandPlaceholders
- movs r0, 0
- adds r1, r4, 0
- movs r2, 0
- bl GetStringWidth
- ldr r1, _080D0728 @ =gUnknown_2039A28
- ldrb r1, [r1]
- movs r3, 0x40
- subs r3, r0
- lsls r3, 24
- lsrs r3, 24
- movs r0, 0xC
- str r0, [sp]
- movs r0, 0
- str r0, [sp, 0x4]
- str r0, [sp, 0x8]
- adds r0, r1, 0
- movs r1, 0
- adds r2, r4, 0
- bl PrintTextOnWindow
- add sp, 0xC
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D071C: .4byte gStringVar1
-_080D0720: .4byte gStringVar4
-_080D0724: .4byte gUnknown_84162C4
-_080D0728: .4byte gUnknown_2039A28
- thumb_func_end sub_80D06D0
-
- thumb_func_start sub_80D072C
-sub_80D072C: @ 80D072C
- push {r4-r6,lr}
- sub sp, 0x20
- adds r6, r0, 0
- adds r4, r1, 0
- adds r3, r2, 0
- lsls r4, 24
- lsls r3, 24
- movs r0, 0x80
- lsls r0, 17
- adds r4, r0
- lsrs r4, 24
- adds r3, r0
- lsrs r3, 24
- movs r0, 0x8
- str r0, [sp]
- movs r0, 0x3
- str r0, [sp, 0x4]
- movs r0, 0xF
- str r0, [sp, 0x8]
- movs r0, 0x20
- str r0, [sp, 0xC]
- add r0, sp, 0x10
- movs r1, 0
- adds r2, r4, 0
- bl SetWindowTemplateFields
- ldr r0, [sp, 0x10]
- ldr r1, [sp, 0x14]
- str r0, [sp, 0x18]
- str r1, [sp, 0x1C]
- ldr r4, _080D07BC @ =gUnknown_2039A28
- add r0, sp, 0x18
- bl AddWindow
- strb r0, [r4]
- ldrb r0, [r4]
- movs r1, 0
- bl FillWindowPixelBuffer
- ldrb r0, [r4]
- bl PutWindowTilemap
- ldrb r0, [r4]
- ldr r5, _080D07C0 @ =0x0000021d
- adds r1, r5, 0
- movs r2, 0xD0
- bl sub_814FF2C
- ldrb r0, [r4]
- movs r1, 0
- adds r2, r5, 0
- movs r3, 0xD
- bl SetWindowBorderStyle
- ldrb r0, [r4]
- ldr r2, _080D07C4 @ =gUnknown_8417C2D
- movs r3, 0
- str r3, [sp]
- movs r1, 0xFF
- str r1, [sp, 0x4]
- str r3, [sp, 0x8]
- movs r1, 0x2
- bl PrintTextOnWindow
- adds r0, r6, 0
- bl sub_80D06D0
- add sp, 0x20
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080D07BC: .4byte gUnknown_2039A28
-_080D07C0: .4byte 0x0000021d
-_080D07C4: .4byte gUnknown_8417C2D
- thumb_func_end sub_80D072C
-
- thumb_func_start sub_80D07C8
-sub_80D07C8: @ 80D07C8
- push {r4,lr}
- ldr r4, _080D07E8 @ =gUnknown_2039A28
- ldrb r0, [r4]
- bl ClearWindowTilemap
- ldrb r0, [r4]
- movs r1, 0x1
- bl sub_810F4D8
- ldrb r0, [r4]
- bl RemoveWindow
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D07E8: .4byte gUnknown_2039A28
- thumb_func_end sub_80D07C8
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/daycare.s b/asm/daycare.s
index 7479ef544..f6bc7b0e1 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -601,14 +601,14 @@ GetDaycareCost: @ 8045838
ldr r1, _08045858 @ =gUnknown_20370C0
ldrb r1, [r1]
bl GetDaycareCostForMon
- ldr r1, _0804585C @ =gUnknown_20370C2
+ ldr r1, _0804585C @ =gSpecialVar_0x8005
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08045854: .4byte gSaveBlock1Ptr
_08045858: .4byte gUnknown_20370C0
-_0804585C: .4byte gUnknown_20370C2
+_0804585C: .4byte gSpecialVar_0x8005
thumb_func_end GetDaycareCost
thumb_func_start sub_8045860
@@ -3146,14 +3146,14 @@ sub_8046B70: @ 8046B70
ldr r1, _08046B8C @ =0x00003c98
adds r0, r1
bl GetDaycareCostForSelectedMon
- ldr r1, _08046B90 @ =gUnknown_20370C2
+ ldr r1, _08046B90 @ =gSpecialVar_0x8005
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08046B88: .4byte gSaveBlock1Ptr
_08046B8C: .4byte 0x00003c98
-_08046B90: .4byte gUnknown_20370C2
+_08046B90: .4byte gSpecialVar_0x8005
thumb_func_end sub_8046B70
thumb_func_start sub_8046B94
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index f18f3101d..7fe86b9cf 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -575,7 +575,7 @@ _08047090:
ldr r0, _08047150 @ =sub_8046FC0
bl SetVBlankCallback
bl GetCurrentMapMusic
- ldr r1, _08047154 @ =gUnknown_20370C2
+ ldr r1, _08047154 @ =gSpecialVar_0x8005
strh r0, [r1]
bl reset_temp_tile_data_buffers
movs r0, 0
@@ -628,7 +628,7 @@ _08047090:
_08047148: .4byte gUnknown_3000E74
_0804714C: .4byte gUnknown_20370C0
_08047150: .4byte sub_8046FC0
-_08047154: .4byte gUnknown_20370C2
+_08047154: .4byte gSpecialVar_0x8005
_08047158: .4byte gUnknown_826019C
_0804715C:
ldr r0, _0804716C @ =gUnknown_82601A4
diff --git a/asm/event_data.s b/asm/event_data.s
index 1875449fa..a3664d482 100644
--- a/asm/event_data.s
+++ b/asm/event_data.s
@@ -807,7 +807,7 @@ sub_806E6FC: @ 806E6FC
strh r0, [r1]
ldr r1, _0806E764 @ =gUnknown_20370C0
strh r0, [r1]
- ldr r1, _0806E768 @ =gUnknown_20370C2
+ ldr r1, _0806E768 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r1, _0806E76C @ =gUnknown_20370C4
strh r0, [r1]
@@ -846,7 +846,7 @@ _0806E758: .4byte gUnknown_20370BA
_0806E75C: .4byte gUnknown_20370BC
_0806E760: .4byte gUnknown_20370BE
_0806E764: .4byte gUnknown_20370C0
-_0806E768: .4byte gUnknown_20370C2
+_0806E768: .4byte gSpecialVar_0x8005
_0806E76C: .4byte gUnknown_20370C4
_0806E770: .4byte gUnknown_20370C6
_0806E774: .4byte gUnknown_20370C8
diff --git a/asm/fame_checker.s b/asm/fame_checker.s
index d86263801..129d91c0f 100644
--- a/asm/fame_checker.s
+++ b/asm/fame_checker.s
@@ -2239,7 +2239,7 @@ sub_812D5EC: @ 812D5EC
ldrh r0, [r1]
cmp r0, 0xF
bhi _0812D632
- ldr r5, _0812D63C @ =gUnknown_20370C2
+ ldr r5, _0812D63C @ =gSpecialVar_0x8005
ldrh r0, [r5]
cmp r0, 0x5
bhi _0812D632
@@ -2274,7 +2274,7 @@ _0812D632:
bx r0
.align 2, 0
_0812D638: .4byte gUnknown_20370C0
-_0812D63C: .4byte gUnknown_20370C2
+_0812D63C: .4byte gSpecialVar_0x8005
_0812D640: .4byte gSaveBlock1Ptr
_0812D644: .4byte 0x00003a54
_0812D648: .4byte 0x00000fff
@@ -2288,7 +2288,7 @@ sub_812D650: @ 812D650
ldrh r0, [r1]
cmp r0, 0xF
bhi _0812D69E
- ldr r0, _0812D6A8 @ =gUnknown_20370C2
+ ldr r0, _0812D6A8 @ =gSpecialVar_0x8005
ldrh r4, [r0]
adds r0, r4, 0
cmp r0, 0x2
@@ -2329,7 +2329,7 @@ _0812D69E:
bx r0
.align 2, 0
_0812D6A4: .4byte gUnknown_20370C0
-_0812D6A8: .4byte gUnknown_20370C2
+_0812D6A8: .4byte gSpecialVar_0x8005
_0812D6AC: .4byte gSaveBlock1Ptr
_0812D6B0: .4byte 0x00003a54
thumb_func_end sub_812D650
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index c4551463d..6df9717eb 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1160,7 +1160,7 @@ _0806D17A:
ldr r0, [r5, 0x8]
movs r1, 0
bl sub_80CC44C
- ldr r1, _0806D1C4 @ =gUnknown_20370C2
+ ldr r1, _0806D1C4 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r0, [r5, 0x8]
movs r1, 0x1
@@ -1183,7 +1183,7 @@ _0806D17A:
ldr r0, _0806D1D4 @ =gUnknown_81A6843
b _0806D1E6
.align 2, 0
-_0806D1C4: .4byte gUnknown_20370C2
+_0806D1C4: .4byte gSpecialVar_0x8005
_0806D1C8: .4byte gUnknown_20370C0
_0806D1CC: .4byte gUnknown_20370C4
_0806D1D0: .4byte gUnknown_20370D4
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index f0621961a..6cee57666 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -4452,7 +4452,7 @@ _0805D4D4:
str r5, [sp, 0x8]
movs r0, 0
movs r1, 0x2
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
diff --git a/asm/field_specials.s b/asm/field_specials.s
index ec2cb2147..5cadf3dba 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -91,14 +91,14 @@ sub_80CA69C: @ 80CA69C
ldr r2, [r0]
ldrh r0, [r2]
strh r0, [r1]
- ldr r1, _080CA6B8 @ =gUnknown_20370C2
+ ldr r1, _080CA6B8 @ =gSpecialVar_0x8005
ldrh r0, [r2, 0x2]
strh r0, [r1]
bx lr
.align 2, 0
_080CA6B0: .4byte gUnknown_20370C0
_080CA6B4: .4byte gSaveBlock1Ptr
-_080CA6B8: .4byte gUnknown_20370C2
+_080CA6B8: .4byte gSpecialVar_0x8005
thumb_func_end sub_80CA69C
thumb_func_start sub_80CA6BC
@@ -862,7 +862,7 @@ sub_80CAC28: @ 80CAC28
adds r1, r0
lsls r1, 3
adds r1, r2
- ldr r0, _080CAC74 @ =gUnknown_20370C2
+ ldr r0, _080CAC74 @ =gSpecialVar_0x8005
ldrh r0, [r0]
movs r2, 0
strh r0, [r1, 0x8]
@@ -885,7 +885,7 @@ sub_80CAC28: @ 80CAC28
.align 2, 0
_080CAC6C: .4byte sub_80CAC84
_080CAC70: .4byte gTasks
-_080CAC74: .4byte gUnknown_20370C2
+_080CAC74: .4byte gSpecialVar_0x8005
_080CAC78: .4byte gUnknown_20370C4
_080CAC7C: .4byte gUnknown_20370C6
_080CAC80: .4byte gUnknown_20370C0
@@ -1074,7 +1074,7 @@ sub_80CADC4: @ 80CADC4
movs r1, 0x2
add r2, sp, 0xC
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
bl sub_809D424
add sp, 0x10
pop {r0}
@@ -1094,7 +1094,7 @@ sub_80CADEC: @ 80CADEC
lsrs r2, r0, 16
ldr r1, _080CAE20 @ =gUnknown_20370C0
strh r2, [r1]
- ldr r0, _080CAE24 @ =gUnknown_20370C2
+ ldr r0, _080CAE24 @ =gSpecialVar_0x8005
strh r2, [r0]
ldrh r0, [r1]
subs r0, 0x1
@@ -1109,7 +1109,7 @@ _080CAE14:
mov pc, r0
.align 2, 0
_080CAE20: .4byte gUnknown_20370C0
-_080CAE24: .4byte gUnknown_20370C2
+_080CAE24: .4byte gSpecialVar_0x8005
_080CAE28: .4byte _080CAE2C
.align 2, 0
_080CAE2C:
@@ -1136,19 +1136,19 @@ _080CAE68:
ands r0, r1
cmp r0, 0
bne _080CAE84
- ldr r1, _080CAE80 @ =gUnknown_20370C2
+ ldr r1, _080CAE80 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAE80: .4byte gUnknown_20370C2
+_080CAE80: .4byte gSpecialVar_0x8005
_080CAE84:
- ldr r1, _080CAE8C @ =gUnknown_20370C2
+ ldr r1, _080CAE8C @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAE8C: .4byte gUnknown_20370C2
+_080CAE8C: .4byte gSpecialVar_0x8005
_080CAE90:
bl Random
lsls r0, 16
@@ -1159,23 +1159,23 @@ _080CAE90:
lsrs r2, r0, 16
cmp r2, 0
bne _080CAEB4
- ldr r1, _080CAEB0 @ =gUnknown_20370C2
+ ldr r1, _080CAEB0 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAEB0: .4byte gUnknown_20370C2
+_080CAEB0: .4byte gSpecialVar_0x8005
_080CAEB4:
cmp r2, 0x1
beq _080CAEBA
b _080CB014
_080CAEBA:
- ldr r1, _080CAEC4 @ =gUnknown_20370C2
+ ldr r1, _080CAEC4 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAEC4: .4byte gUnknown_20370C2
+_080CAEC4: .4byte gSpecialVar_0x8005
_080CAEC8:
bl Random
lsls r0, 16
@@ -1186,12 +1186,12 @@ _080CAEC8:
beq _080CAEDA
b _080CB014
_080CAEDA:
- ldr r1, _080CAEE4 @ =gUnknown_20370C2
+ ldr r1, _080CAEE4 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAEE4: .4byte gUnknown_20370C2
+_080CAEE4: .4byte gSpecialVar_0x8005
_080CAEE8:
bl Random
lsls r0, 16
@@ -1202,28 +1202,28 @@ _080CAEE8:
lsrs r2, r0, 16
cmp r2, 0
bne _080CAF0C
- ldr r1, _080CAF08 @ =gUnknown_20370C2
+ ldr r1, _080CAF08 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF08: .4byte gUnknown_20370C2
+_080CAF08: .4byte gSpecialVar_0x8005
_080CAF0C:
cmp r2, 0x1
bne _080CAF1C
- ldr r1, _080CAF18 @ =gUnknown_20370C2
+ ldr r1, _080CAF18 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAF18: .4byte gUnknown_20370C2
+_080CAF18: .4byte gSpecialVar_0x8005
_080CAF1C:
- ldr r1, _080CAF24 @ =gUnknown_20370C2
+ ldr r1, _080CAF24 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF24: .4byte gUnknown_20370C2
+_080CAF24: .4byte gSpecialVar_0x8005
_080CAF28:
bl Random
lsls r0, 16
@@ -1233,30 +1233,30 @@ _080CAF28:
lsrs r2, r1, 16
cmp r2, 0
bne _080CAF48
- ldr r1, _080CAF44 @ =gUnknown_20370C2
+ ldr r1, _080CAF44 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF44: .4byte gUnknown_20370C2
+_080CAF44: .4byte gSpecialVar_0x8005
_080CAF48:
cmp r2, 0x1
bne _080CAF58
- ldr r1, _080CAF54 @ =gUnknown_20370C2
+ ldr r1, _080CAF54 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAF54: .4byte gUnknown_20370C2
+_080CAF54: .4byte gSpecialVar_0x8005
_080CAF58:
cmp r2, 0x2
bne _080CB014
- ldr r1, _080CAF64 @ =gUnknown_20370C2
+ ldr r1, _080CAF64 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF64: .4byte gUnknown_20370C2
+_080CAF64: .4byte gSpecialVar_0x8005
_080CAF68:
bl Random
lsls r0, 16
@@ -1267,21 +1267,21 @@ _080CAF68:
lsrs r2, r0, 16
cmp r2, 0
bne _080CAF8C
- ldr r1, _080CAF88 @ =gUnknown_20370C2
+ ldr r1, _080CAF88 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF88: .4byte gUnknown_20370C2
+_080CAF88: .4byte gSpecialVar_0x8005
_080CAF8C:
cmp r2, 0x1
bne _080CB014
- ldr r1, _080CAF98 @ =gUnknown_20370C2
+ ldr r1, _080CAF98 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x5
b _080CB01A
.align 2, 0
-_080CAF98: .4byte gUnknown_20370C2
+_080CAF98: .4byte gSpecialVar_0x8005
_080CAF9C:
bl Random
lsls r0, 16
@@ -1290,19 +1290,19 @@ _080CAF9C:
ands r0, r1
cmp r0, 0
bne _080CAFB8
- ldr r1, _080CAFB4 @ =gUnknown_20370C2
+ ldr r1, _080CAFB4 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CAFB4: .4byte gUnknown_20370C2
+_080CAFB4: .4byte gSpecialVar_0x8005
_080CAFB8:
- ldr r1, _080CAFC0 @ =gUnknown_20370C2
+ ldr r1, _080CAFC0 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAFC0: .4byte gUnknown_20370C2
+_080CAFC0: .4byte gSpecialVar_0x8005
_080CAFC4:
bl Random
lsls r0, 16
@@ -1313,21 +1313,21 @@ _080CAFC4:
lsrs r2, r0, 16
cmp r2, 0
bne _080CAFE8
- ldr r1, _080CAFE4 @ =gUnknown_20370C2
+ ldr r1, _080CAFE4 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CAFE4: .4byte gUnknown_20370C2
+_080CAFE4: .4byte gSpecialVar_0x8005
_080CAFE8:
cmp r2, 0x1
bne _080CB014
- ldr r1, _080CAFF4 @ =gUnknown_20370C2
+ ldr r1, _080CAFF4 @ =gSpecialVar_0x8005
ldrh r0, [r1]
adds r0, 0x1
b _080CB01A
.align 2, 0
-_080CAFF4: .4byte gUnknown_20370C2
+_080CAFF4: .4byte gSpecialVar_0x8005
_080CAFF8:
bl Random
lsls r0, 16
@@ -1336,20 +1336,20 @@ _080CAFF8:
ands r0, r1
cmp r0, 0
bne _080CB014
- ldr r1, _080CB010 @ =gUnknown_20370C2
+ ldr r1, _080CB010 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x5
b _080CB01A
.align 2, 0
-_080CB010: .4byte gUnknown_20370C2
+_080CB010: .4byte gSpecialVar_0x8005
_080CB014:
- ldr r1, _080CB040 @ =gUnknown_20370C2
+ ldr r1, _080CB040 @ =gSpecialVar_0x8005
ldrh r0, [r1]
subs r0, 0x1
_080CB01A:
strh r0, [r1]
_080CB01C:
- ldr r5, _080CB040 @ =gUnknown_20370C2
+ ldr r5, _080CB040 @ =gSpecialVar_0x8005
ldrh r0, [r5]
cmp r0, 0xF
bls _080CB04C
@@ -1367,7 +1367,7 @@ _080CB01C:
subs r0, r4, 0x1
b _080CB04A
.align 2, 0
-_080CB040: .4byte gUnknown_20370C2
+_080CB040: .4byte gSpecialVar_0x8005
_080CB044: .4byte gUnknown_20370C0
_080CB048:
adds r0, r4, 0x1
@@ -1955,7 +1955,7 @@ sub_80CB498: @ 80CB498
strh r3, [r4, 0x4]
movs r6, 0x1
strh r6, [r4, 0x8]
- ldr r0, _080CB4D8 @ =gUnknown_20370C2
+ ldr r0, _080CB4D8 @ =gSpecialVar_0x8005
ldr r1, _080CB4DC @ =gUnknown_20370C4
ldrh r2, [r0]
ldrh r0, [r1]
@@ -1969,7 +1969,7 @@ sub_80CB498: @ 80CB498
.align 2, 0
_080CB4D0: .4byte sub_80CB514
_080CB4D4: .4byte gTasks+0x8
-_080CB4D8: .4byte gUnknown_20370C2
+_080CB4D8: .4byte gSpecialVar_0x8005
_080CB4DC: .4byte gUnknown_20370C4
_080CB4E0:
subs r0, r2
@@ -2088,9 +2088,9 @@ sub_80CB580: @ 80CB580
str r6, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r1, _080CB634 @ =gUnknown_83F5B44
- ldr r0, _080CB638 @ =gUnknown_20370C2
+ ldr r0, _080CB638 @ =gSpecialVar_0x8005
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
@@ -2112,7 +2112,7 @@ sub_80CB580: @ 80CB580
adds r0, r1, 0
movs r1, 0x2
adds r2, r5, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
@@ -2132,7 +2132,7 @@ _080CB628: .4byte gUnknown_83F5B3C
_080CB62C: .4byte 0x0000021d
_080CB630: .4byte gUnknown_8418075
_080CB634: .4byte gUnknown_83F5B44
-_080CB638: .4byte gUnknown_20370C2
+_080CB638: .4byte gSpecialVar_0x8005
thumb_func_end sub_80CB580
thumb_func_start sub_80CB63C
@@ -3895,16 +3895,16 @@ sub_80CC3CC: @ 80CC3CC
ldr r1, _080CC400 @ =0x0000ffff
cmp r6, r1
bls _080CC408
- ldr r0, _080CC404 @ =gUnknown_20370C2
+ ldr r0, _080CC404 @ =gSpecialVar_0x8005
strh r1, [r0]
b _080CC40C
.align 2, 0
_080CC3F8: .4byte gUnknown_20370C0
_080CC3FC: .4byte gUnknown_20370C4
_080CC400: .4byte 0x0000ffff
-_080CC404: .4byte gUnknown_20370C2
+_080CC404: .4byte gSpecialVar_0x8005
_080CC408:
- ldr r0, _080CC440 @ =gUnknown_20370C2
+ ldr r0, _080CC440 @ =gSpecialVar_0x8005
strh r6, [r0]
_080CC40C:
adds r1, r0, 0
@@ -3937,7 +3937,7 @@ _080CC438:
pop {r1}
bx r1
.align 2, 0
-_080CC440: .4byte gUnknown_20370C2
+_080CC440: .4byte gSpecialVar_0x8005
_080CC444: .4byte gUnknown_20370C0
_080CC448: .4byte gUnknown_20370C4
thumb_func_end sub_80CC3CC
@@ -4953,7 +4953,7 @@ _080CCBEA:
ldr r0, _080CCC24 @ =gStringVar2
ldr r1, _080CCC28 @ =gUnknown_82481BE
bl StringCopy
- ldr r1, _080CCC2C @ =gUnknown_20370C2
+ ldr r1, _080CCC2C @ =gSpecialVar_0x8005
movs r0, 0xF
strh r0, [r1]
ldr r0, _080CCC30 @ =0x000002de
@@ -4963,7 +4963,7 @@ _080CCC1C: .4byte gUnknown_83F6203
_080CCC20: .4byte gPlayerParty
_080CCC24: .4byte gStringVar2
_080CCC28: .4byte gUnknown_82481BE
-_080CCC2C: .4byte gUnknown_20370C2
+_080CCC2C: .4byte gSpecialVar_0x8005
_080CCC30: .4byte 0x000002de
_080CCC34:
cmp r7, 0x1
@@ -4971,7 +4971,7 @@ _080CCC34:
ldr r0, _080CCC4C @ =gStringVar2
ldr r1, _080CCC50 @ =gUnknown_824802B
bl StringCopy
- ldr r1, _080CCC54 @ =gUnknown_20370C2
+ ldr r1, _080CCC54 @ =gSpecialVar_0x8005
movs r0, 0x10
strh r0, [r1]
ldr r0, _080CCC58 @ =0x000002df
@@ -4979,13 +4979,13 @@ _080CCC34:
.align 2, 0
_080CCC4C: .4byte gStringVar2
_080CCC50: .4byte gUnknown_824802B
-_080CCC54: .4byte gUnknown_20370C2
+_080CCC54: .4byte gSpecialVar_0x8005
_080CCC58: .4byte 0x000002df
_080CCC5C:
ldr r0, _080CCC80 @ =gStringVar2
ldr r1, _080CCC84 @ =gUnknown_8248038
bl StringCopy
- ldr r1, _080CCC88 @ =gUnknown_20370C2
+ ldr r1, _080CCC88 @ =gSpecialVar_0x8005
movs r0, 0x11
strh r0, [r1]
movs r0, 0xB8
@@ -5002,7 +5002,7 @@ _080CCC7A:
.align 2, 0
_080CCC80: .4byte gStringVar2
_080CCC84: .4byte gUnknown_8248038
-_080CCC88: .4byte gUnknown_20370C2
+_080CCC88: .4byte gSpecialVar_0x8005
_080CCC8C:
movs r0, 0x64
mov r1, r8
@@ -5064,7 +5064,7 @@ _080CCCF4: .4byte gUnknown_20370C4
sub_80CCCF8: @ 80CCCF8
push {r4,lr}
movs r4, 0
- ldr r0, _080CCD0C @ =gUnknown_20370C2
+ ldr r0, _080CCD0C @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0xF
bne _080CCD14
@@ -5072,7 +5072,7 @@ sub_80CCCF8: @ 80CCCF8
bl FlagSet
b _080CCD2C
.align 2, 0
-_080CCD0C: .4byte gUnknown_20370C2
+_080CCD0C: .4byte gSpecialVar_0x8005
_080CCD10: .4byte 0x000002de
_080CCD14:
cmp r0, 0x10
@@ -5537,7 +5537,7 @@ sub_80CD098: @ 80CD098
ldrh r3, [r0]
cmp r3, 0
bne _080CD0E0
- ldr r0, _080CD0D8 @ =gUnknown_20370C2
+ ldr r0, _080CD0D8 @ =gSpecialVar_0x8005
ldrh r2, [r0]
str r3, [sp]
movs r0, 0
@@ -5550,7 +5550,7 @@ sub_80CD098: @ 80CD098
_080CD0CC: .4byte gUnknown_203ADFA
_080CD0D0: .4byte gUnknown_20370C0
_080CD0D4: .4byte gUnknown_20370C4
-_080CD0D8: .4byte gUnknown_20370C2
+_080CD0D8: .4byte gSpecialVar_0x8005
_080CD0DC: .4byte gUnknown_2039A1B
_080CD0E0:
ldr r0, _080CD0F0 @ =gUnknown_2039A1B
@@ -5694,7 +5694,7 @@ sub_80CD1CC: @ 80CD1CC
strh r0, [r4, 0x2]
movs r0, 0x2
ldrsh r1, [r4, r0]
- ldr r0, _080CD220 @ =gUnknown_20370C2
+ ldr r0, _080CD220 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r1, r0
bne _080CD200
@@ -5721,7 +5721,7 @@ _080CD214:
bx r0
.align 2, 0
_080CD21C: .4byte gTasks+0x8
-_080CD220: .4byte gUnknown_20370C2
+_080CD220: .4byte gSpecialVar_0x8005
_080CD224: .4byte gUnknown_20370C0
thumb_func_end sub_80CD1CC
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 15e3a352d..dbb01f15a 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5275,7 +5275,7 @@ sub_810A834: @ 810A834
movs r1, 0x38
movs r2, 0xA
adds r3, r4, 0
- bl sub_809FEC4
+ bl PrintMoneyAmount
add sp, 0x4
pop {r4}
pop {r0}
@@ -5539,11 +5539,11 @@ sub_810A9D4: @ 810A9D4
ldr r2, _0810AAE0 @ =gSaveBlock1Ptr
ldr r0, [r2]
adds r0, r7
- bl sub_809FD58
+ bl GetMoney
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
- bl sub_809FE40
+ bl PrintMoneyAmountInMoneyBox
movs r3, 0x8
negs r3, r3
add r10, r3
diff --git a/asm/item_pc.s b/asm/item_pc.s
index d209e7c0d..2f84e0c36 100644
--- a/asm/item_pc.s
+++ b/asm/item_pc.s
@@ -2072,7 +2072,7 @@ sub_810E418: @ 810E418
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2100,7 +2100,7 @@ _0810E4B8:
adds r0, r1, 0
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2257,7 +2257,7 @@ sub_810E5E0: @ 810E5E0
str r4, [sp, 0x8]
adds r2, r5, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r6, 0
movs r1, 0x1
movs r2, 0x2
diff --git a/asm/item_use.s b/asm/item_use.s
index 8229f5a2b..96e04d4df 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -613,7 +613,7 @@ sub_80A1460: @ 80A1460
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080A14B4 @ =gStringVar1
- bl sub_80D0554
+ bl GetCoins
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
diff --git a/asm/itemfinder.s b/asm/itemfinder.s
index bf4580c1f..d25a0c486 100644
--- a/asm/itemfinder.s
+++ b/asm/itemfinder.s
@@ -374,7 +374,7 @@ sub_813EF40: @ 813EF40
adds r0, r5, 0
movs r1, 0
bl sub_80CC44C
- ldr r1, _0813EF94 @ =gUnknown_20370C2
+ ldr r1, _0813EF94 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r0, _0813EF98 @ =gUnknown_20370C4
movs r5, 0x1
@@ -395,7 +395,7 @@ sub_813EF40: @ 813EF40
.align 2, 0
_0813EF8C: .4byte gTasks+0x8
_0813EF90: .4byte gUnknown_20370C0
-_0813EF94: .4byte gUnknown_20370C2
+_0813EF94: .4byte gSpecialVar_0x8005
_0813EF98: .4byte gUnknown_20370C4
thumb_func_end sub_813EF40
diff --git a/asm/learn_move.s b/asm/learn_move.s
index 743067bfe..a059a8f99 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -222,7 +222,7 @@ sub_80E4800: @ 80E4800
bl sub_80E50CC
ldr r0, _080E485C @ =gUnknown_203AAB4
ldr r0, [r0]
- ldr r1, _080E4860 @ =gUnknown_20370C2
+ ldr r1, _080E4860 @ =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, _080E4864 @ =0x00000261
adds r0, r2
@@ -245,7 +245,7 @@ sub_80E4800: @ 80E4800
bx r0
.align 2, 0
_080E485C: .4byte gUnknown_203AAB4
-_080E4860: .4byte gUnknown_20370C2
+_080E4860: .4byte gSpecialVar_0x8005
_080E4864: .4byte 0x00000261
_080E4868: .4byte sub_80E4620
_080E486C: .4byte sub_80E4870
diff --git a/asm/link_rfu.s b/asm/link_rfu.s
index 3f8d3735c..b6c34eeef 100644
--- a/asm/link_rfu.s
+++ b/asm/link_rfu.s
@@ -3575,7 +3575,7 @@ _080FEEEC:
b _080FEF08
_080FEEF4:
ldr r2, _080FEF18 @ =gSaveBlock1Ptr
- ldr r0, _080FEF1C @ =gUnknown_20370C2
+ ldr r0, _080FEF1C @ =gSpecialVar_0x8005
ldrh r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -3594,7 +3594,7 @@ _080FEF12:
bx r0
.align 2, 0
_080FEF18: .4byte gSaveBlock1Ptr
-_080FEF1C: .4byte gUnknown_20370C2
+_080FEF1C: .4byte gSpecialVar_0x8005
_080FEF20: .4byte 0x00002cd0
_080FEF24: .4byte gUnknown_20370C0
_080FEF28: .4byte sub_80568C4
@@ -7766,7 +7766,7 @@ _08100DAC:
str r0, [sp, 0x8]
adds r0, r5, 0
adds r2, r6, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r4-r6}
pop {r0}
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index 3c67e682a..7d9fffc08 100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -429,7 +429,7 @@ _08098434:
movs r1, 0x2
add r2, sp, 0xC
adds r3, r4, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0x28
pop {r4-r6}
pop {r0}
diff --git a/asm/math_util.s b/asm/math_util.s
deleted file mode 100644
index fc245ab7f..000000000
--- a/asm/math_util.s
+++ /dev/null
@@ -1,202 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_80D8AA0
-sub_80D8AA0: @ 80D8AA0
- push {lr}
- lsls r0, 16
- asrs r0, 16
- lsls r1, 16
- asrs r1, 16
- muls r0, r1
- adds r1, r0, 0
- cmp r0, 0
- bge _080D8AB4
- adds r1, 0xFF
-_080D8AB4:
- lsls r0, r1, 8
- asrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end sub_80D8AA0
-
- thumb_func_start sub_80D8ABC
-sub_80D8ABC: @ 80D8ABC
- push {lr}
- adds r3, r1, 0
- lsls r0, 24
- lsrs r0, 24
- lsls r3, 16
- asrs r3, 16
- lsls r2, 16
- asrs r2, 16
- muls r3, r2
- movs r1, 0x1
- lsls r1, r0
- adds r0, r3, 0
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end sub_80D8ABC
-
- thumb_func_start sub_80D8AE0
-sub_80D8AE0: @ 80D8AE0
- push {r4-r7,lr}
- adds r2, r1, 0
- adds r4, r0, 0
- asrs r5, r0, 31
- asrs r3, r2, 31
- adds r1, r5, 0
- adds r0, r4, 0
- bl __muldi3
- adds r5, r1, 0
- adds r4, r0, 0
- adds r7, r5, 0
- adds r6, r4, 0
- cmp r5, 0
- bge _080D8B06
- movs r6, 0xFF
- movs r7, 0
- adds r6, r4
- adcs r7, r5
-_080D8B06:
- lsls r3, r7, 24
- lsrs r2, r6, 8
- adds r0, r3, 0
- orrs r0, r2
- asrs r1, r7, 8
- adds r5, r1, 0
- adds r4, r0, 0
- adds r0, r4, 0
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_80D8AE0
-
- thumb_func_start sub_80D8B1C
-sub_80D8B1C: @ 80D8B1C
- push {lr}
- lsls r0, 16
- lsrs r0, 16
- lsls r1, 16
- asrs r1, 16
- cmp r1, 0
- beq _080D8B38
- lsls r0, 16
- asrs r0, 8
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- b _080D8B3A
-_080D8B38:
- movs r0, 0
-_080D8B3A:
- pop {r1}
- bx r1
- thumb_func_end sub_80D8B1C
-
- thumb_func_start sub_80D8B40
-sub_80D8B40: @ 80D8B40
- push {lr}
- lsls r0, 24
- lsrs r3, r0, 24
- lsls r1, 16
- lsrs r0, r1, 16
- lsls r2, 16
- asrs r1, r2, 16
- cmp r1, 0
- beq _080D8B62
- lsls r0, 16
- asrs r0, 16
- lsls r0, r3
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- b _080D8B64
-_080D8B62:
- movs r0, 0
-_080D8B64:
- pop {r1}
- bx r1
- thumb_func_end sub_80D8B40
-
- thumb_func_start sub_80D8B68
-sub_80D8B68: @ 80D8B68
- push {r4-r6,lr}
- adds r6, r1, 0
- cmp r6, 0
- beq _080D8B88
- adds r2, r0, 0
- asrs r3, r0, 31
- lsrs r5, r2, 24
- lsls r4, r3, 8
- adds r1, r5, 0
- orrs r1, r4
- lsls r0, r2, 8
- adds r2, r6, 0
- asrs r3, r6, 31
- bl __divdi3
- b _080D8B8A
-_080D8B88:
- movs r0, 0
-_080D8B8A:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_80D8B68
-
- thumb_func_start sub_80D8B90
-sub_80D8B90: @ 80D8B90
- push {lr}
- adds r1, r0, 0
- movs r0, 0x80
- lsls r0, 9
- lsls r1, 16
- asrs r1, 16
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end sub_80D8B90
-
- thumb_func_start sub_80D8BA8
-sub_80D8BA8: @ 80D8BA8
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- movs r2, 0x80
- lsls r2, 1
- lsls r2, r0
- lsls r1, 16
- asrs r1, 16
- adds r0, r2, 0
- bl __divsi3
- lsls r0, 16
- asrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end sub_80D8BA8
-
- thumb_func_start sub_80D8BC8
-sub_80D8BC8: @ 80D8BC8
- push {lr}
- adds r2, r0, 0
- ldr r1, _080D8BE0 @ =0x00000000
- ldr r0, _080D8BDC @ =0x00010000
- asrs r3, r2, 31
- bl __divdi3
- pop {r1}
- bx r1
- .align 2, 0
-_080D8BDC: .4byte 0x00010000
-_080D8BE0: .4byte 0x00000000
- thumb_func_end sub_80D8BC8
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/menu.s b/asm/menu.s
index 9408278bd..8bea8e86f 100644
--- a/asm/menu.s
+++ b/asm/menu.s
@@ -1405,7 +1405,7 @@ RedrawMenuCursor: @ 810F874
movs r4, 0
str r4, [sp, 0x4]
str r4, [sp, 0x8]
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1803,7 +1803,7 @@ _0810FBA0:
adds r0, r6, 0
mov r1, r10
mov r3, r9
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2561,7 +2561,7 @@ _0811017C:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r9
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2658,7 +2658,7 @@ _08110230:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r10
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2899,7 +2899,7 @@ sub_811037C: @ 811037C
str r3, [sp, 0x4]
str r3, [sp, 0x8]
adds r3, r4, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r3-r5}
mov r8, r3
diff --git a/asm/menu2.s b/asm/menu2.s
index 7a68a7cff..c196f77b4 100644
--- a/asm/menu2.s
+++ b/asm/menu2.s
@@ -275,7 +275,7 @@ _0812E70A:
mov r0, r8
movs r1, 0x2
adds r2, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _0812E75C
.align 2, 0
_0812E734: .4byte gSaveBlock2Ptr
diff --git a/asm/money.s b/asm/money.s
deleted file mode 100644
index 05ef6ac98..000000000
--- a/asm/money.s
+++ /dev/null
@@ -1,409 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_809FD58
-sub_809FD58: @ 809FD58
- ldr r1, _0809FD6C @ =gSaveBlock2Ptr
- ldr r1, [r1]
- movs r2, 0xF2
- lsls r2, 4
- adds r1, r2
- ldr r0, [r0]
- ldr r1, [r1]
- eors r0, r1
- bx lr
- .align 2, 0
-_0809FD6C: .4byte gSaveBlock2Ptr
- thumb_func_end sub_809FD58
-
- thumb_func_start sub_809FD70
-sub_809FD70: @ 809FD70
- ldr r2, _0809FD84 @ =gSaveBlock2Ptr
- ldr r2, [r2]
- movs r3, 0xF2
- lsls r3, 4
- adds r2, r3
- ldr r2, [r2]
- eors r2, r1
- str r2, [r0]
- bx lr
- .align 2, 0
-_0809FD84: .4byte gSaveBlock2Ptr
- thumb_func_end sub_809FD70
-
- thumb_func_start IsEnoughMoney
-IsEnoughMoney: @ 809FD88
- push {r4,lr}
- adds r4, r1, 0
- bl sub_809FD58
- cmp r0, r4
- bcs _0809FD98
- movs r0, 0
- b _0809FD9A
-_0809FD98:
- movs r0, 0x1
-_0809FD9A:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end IsEnoughMoney
-
- thumb_func_start AddMoney
-AddMoney: @ 809FDA0
- push {r4-r6,lr}
- adds r6, r0, 0
- adds r4, r1, 0
- bl sub_809FD58
- adds r5, r0, 0
- adds r0, r5, r4
- ldr r5, _0809FDD4 @ =0x000f423f
- adds r4, r5, 0
- cmp r0, r5
- bhi _0809FDC4
- adds r5, r0, 0
- adds r0, r6, 0
- bl sub_809FD58
- cmp r5, r0
- bcs _0809FDC4
- adds r5, r4, 0
-_0809FDC4:
- adds r0, r6, 0
- adds r1, r5, 0
- bl sub_809FD70
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0809FDD4: .4byte 0x000f423f
- thumb_func_end AddMoney
-
- thumb_func_start RemoveMoney
-RemoveMoney: @ 809FDD8
- push {r4,r5,lr}
- adds r5, r0, 0
- adds r4, r1, 0
- bl sub_809FD58
- adds r1, r0, 0
- cmp r1, r4
- bcs _0809FDEC
- movs r1, 0
- b _0809FDEE
-_0809FDEC:
- subs r1, r4
-_0809FDEE:
- adds r0, r5, 0
- bl sub_809FD70
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end RemoveMoney
-
- thumb_func_start IsEnoughForCostInVar0x8005
-IsEnoughForCostInVar0x8005: @ 809FDFC
- push {lr}
- ldr r0, _0809FE18 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- movs r1, 0xA4
- lsls r1, 2
- adds r0, r1
- ldr r1, _0809FE1C @ =gUnknown_20370C2
- ldrh r1, [r1]
- bl IsEnoughMoney
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- .align 2, 0
-_0809FE18: .4byte gSaveBlock1Ptr
-_0809FE1C: .4byte gUnknown_20370C2
- thumb_func_end IsEnoughForCostInVar0x8005
-
- thumb_func_start sub_809FE20
-sub_809FE20: @ 809FE20
- push {lr}
- ldr r0, _0809FE38 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- movs r1, 0xA4
- lsls r1, 2
- adds r0, r1
- ldr r1, _0809FE3C @ =gUnknown_20370C2
- ldrh r1, [r1]
- bl RemoveMoney
- pop {r0}
- bx r0
- .align 2, 0
-_0809FE38: .4byte gSaveBlock1Ptr
-_0809FE3C: .4byte gUnknown_20370C2
- thumb_func_end sub_809FE20
-
- thumb_func_start sub_809FE40
-sub_809FE40: @ 809FE40
- push {r4-r6,lr}
- sub sp, 0xC
- lsls r0, 24
- lsrs r6, r0, 24
- lsls r2, 24
- lsrs r5, r2, 24
- ldr r4, _0809FEB8 @ =gStringVar1
- adds r0, r4, 0
- movs r2, 0
- movs r3, 0x6
- bl ConvertIntToDecimalStringN
- adds r0, r4, 0
- bl StringLength
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x6
- subs r1, r0
- ldr r2, _0809FEBC @ =gStringVar4
- adds r0, r1, 0
- subs r1, 0x1
- cmp r0, 0
- beq _0809FE7E
- movs r3, 0
-_0809FE72:
- strb r3, [r2]
- adds r2, 0x1
- adds r0, r1, 0
- subs r1, 0x1
- cmp r0, 0
- bne _0809FE72
-_0809FE7E:
- ldr r1, _0809FEC0 @ =gUnknown_841697A
- adds r0, r2, 0
- bl StringExpandPlaceholders
- ldr r4, _0809FEBC @ =gStringVar4
- movs r0, 0
- adds r1, r4, 0
- movs r2, 0
- bl GetStringWidth
- movs r3, 0x40
- subs r3, r0
- lsls r3, 24
- lsrs r3, 24
- movs r0, 0xC
- str r0, [sp]
- str r5, [sp, 0x4]
- movs r0, 0
- str r0, [sp, 0x8]
- adds r0, r6, 0
- movs r1, 0
- adds r2, r4, 0
- bl PrintTextOnWindow
- add sp, 0xC
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0809FEB8: .4byte gStringVar1
-_0809FEBC: .4byte gStringVar4
-_0809FEC0: .4byte gUnknown_841697A
- thumb_func_end sub_809FE40
-
- thumb_func_start sub_809FEC4
-sub_809FEC4: @ 809FEC4
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0xC
- ldr r4, [sp, 0x24]
- lsls r0, 24
- lsrs r7, r0, 24
- lsls r1, 24
- lsrs r1, 24
- mov r8, r1
- lsls r2, 24
- lsrs r6, r2, 24
- lsls r4, 24
- lsrs r5, r4, 24
- ldr r4, _0809FF3C @ =gStringVar1
- adds r0, r4, 0
- adds r1, r3, 0
- movs r2, 0
- movs r3, 0x6
- bl ConvertIntToDecimalStringN
- adds r0, r4, 0
- bl StringLength
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x6
- subs r1, r0
- ldr r2, _0809FF40 @ =gStringVar4
- adds r0, r1, 0
- subs r1, 0x1
- cmp r0, 0
- beq _0809FF14
- movs r3, 0
-_0809FF08:
- strb r3, [r2]
- adds r2, 0x1
- adds r0, r1, 0
- subs r1, 0x1
- cmp r0, 0
- bne _0809FF08
-_0809FF14:
- ldr r1, _0809FF44 @ =gUnknown_841697A
- adds r0, r2, 0
- bl StringExpandPlaceholders
- ldr r2, _0809FF40 @ =gStringVar4
- str r6, [sp]
- str r5, [sp, 0x4]
- movs r0, 0
- str r0, [sp, 0x8]
- adds r0, r7, 0
- movs r1, 0
- mov r3, r8
- bl PrintTextOnWindow
- add sp, 0xC
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0809FF3C: .4byte gStringVar1
-_0809FF40: .4byte gStringVar4
-_0809FF44: .4byte gUnknown_841697A
- thumb_func_end sub_809FEC4
-
- thumb_func_start sub_809FF48
-sub_809FF48: @ 809FF48
- push {r4-r6,lr}
- mov r6, r8
- push {r6}
- sub sp, 0xC
- adds r6, r0, 0
- adds r4, r1, 0
- adds r5, r2, 0
- mov r8, r3
- lsls r6, 24
- lsrs r6, 24
- lsls r4, 16
- lsrs r4, 16
- lsls r5, 24
- lsrs r5, 24
- adds r0, r6, 0
- movs r1, 0
- adds r2, r4, 0
- adds r3, r5, 0
- bl SetWindowBorderStyle
- ldr r2, _0809FF9C @ =gUnknown_8419CE7
- movs r1, 0
- str r1, [sp]
- movs r0, 0xFF
- str r0, [sp, 0x4]
- str r1, [sp, 0x8]
- adds r0, r6, 0
- movs r1, 0x2
- movs r3, 0
- bl PrintTextOnWindow
- adds r0, r6, 0
- mov r1, r8
- movs r2, 0
- bl sub_809FE40
- add sp, 0xC
- pop {r3}
- mov r8, r3
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0809FF9C: .4byte gUnknown_8419CE7
- thumb_func_end sub_809FF48
-
- thumb_func_start sub_809FFA0
-sub_809FFA0: @ 809FFA0
- push {lr}
- adds r1, r0, 0
- ldr r0, _0809FFB4 @ =gUnknown_2039990
- ldrb r0, [r0]
- movs r2, 0
- bl sub_809FE40
- pop {r0}
- bx r0
- .align 2, 0
-_0809FFB4: .4byte gUnknown_2039990
- thumb_func_end sub_809FFA0
-
- thumb_func_start sub_809FFB8
-sub_809FFB8: @ 809FFB8
- push {r4-r6,lr}
- sub sp, 0x20
- adds r6, r0, 0
- adds r4, r1, 0
- adds r3, r2, 0
- lsls r4, 24
- lsls r3, 24
- movs r0, 0x80
- lsls r0, 17
- adds r4, r0
- lsrs r4, 24
- adds r3, r0
- lsrs r3, 24
- movs r1, 0x8
- str r1, [sp]
- movs r0, 0x3
- str r0, [sp, 0x4]
- movs r0, 0xF
- str r0, [sp, 0x8]
- str r1, [sp, 0xC]
- add r0, sp, 0x10
- movs r1, 0
- adds r2, r4, 0
- bl SetWindowTemplateFields
- ldr r0, [sp, 0x10]
- ldr r1, [sp, 0x14]
- str r0, [sp, 0x18]
- str r1, [sp, 0x1C]
- ldr r4, _080A002C @ =gUnknown_2039990
- add r0, sp, 0x18
- bl AddWindow
- strb r0, [r4]
- ldrb r0, [r4]
- movs r1, 0
- bl FillWindowPixelBuffer
- ldrb r0, [r4]
- bl PutWindowTilemap
- ldrb r0, [r4]
- ldr r5, _080A0030 @ =0x0000021d
- adds r1, r5, 0
- movs r2, 0xD0
- bl sub_814FF2C
- ldrb r0, [r4]
- adds r1, r5, 0
- movs r2, 0xD
- adds r3, r6, 0
- bl sub_809FF48
- add sp, 0x20
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080A002C: .4byte gUnknown_2039990
-_080A0030: .4byte 0x0000021d
- thumb_func_end sub_809FFB8
-
- thumb_func_start sub_80A0034
-sub_80A0034: @ 80A0034
- push {r4,lr}
- ldr r4, _080A0054 @ =gUnknown_2039990
- ldrb r0, [r4]
- movs r1, 0
- bl sub_810F4D8
- ldrb r0, [r4]
- movs r1, 0x2
- bl CopyWindowToVram
- ldrb r0, [r4]
- bl RemoveWindow
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080A0054: .4byte gUnknown_2039990
- thumb_func_end sub_80A0034
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 2601ab1f1..320cbe788 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -3498,7 +3498,7 @@ sub_809F49C: @ 809F49C
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -3553,7 +3553,7 @@ sub_809F4F0: @ 809F4F0
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x1
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4123,7 +4123,7 @@ _0809F97A:
str r1, [sp, 0x8]
movs r1, 0x2
add r2, sp, 0xC
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
diff --git a/asm/new_game.s b/asm/new_game.s
index b8f6515ef..80affe1cb 100644
--- a/asm/new_game.s
+++ b/asm/new_game.s
@@ -247,7 +247,7 @@ sub_8054A60: @ 8054A60
lsls r1, 2
adds r0, r1
ldr r1, _08054B60 @ =0x00000bb8
- bl sub_809FD70
+ bl SetMoney
bl sub_8054E68
bl InitLinkBattleRecords
bl sub_80A0904
diff --git a/asm/oak_speech.s b/asm/oak_speech.s
index 54451e618..95b77de17 100644
--- a/asm/oak_speech.s
+++ b/asm/oak_speech.s
@@ -5571,7 +5571,7 @@ sub_8131660: @ 8131660
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r0, r8
cmp r0, 0
bne _081316F4
@@ -5610,7 +5610,7 @@ _081316FA:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
lsls r4, 24
lsrs r4, 24
cmp r4, 0x3
diff --git a/asm/option_menu.s b/asm/option_menu.s
index 780b5046e..874d3aed9 100644
--- a/asm/option_menu.s
+++ b/asm/option_menu.s
@@ -1073,7 +1073,7 @@ sub_8088BD0: @ 8088BD0
str r0, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
bl PutWindowTilemap
movs r0, 0
@@ -1287,7 +1287,7 @@ _08088D9A:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index b7c629261..af9b701f7 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -52,7 +52,7 @@ sub_8054C04: @ 8054C04
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
cmp r4, r0
bls _08054C38
adds r4, r0, 0
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 5a3801724..23a1eb60a 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -1254,7 +1254,7 @@ sub_811F430: @ 811F430
ldr r0, _0811F474 @ =gUnknown_20370D0
movs r1, 0
strh r1, [r0]
- ldr r0, _0811F478 @ =gUnknown_20370C2
+ ldr r0, _0811F478 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0xE
bhi _0811F492
@@ -1269,7 +1269,7 @@ _0811F468: .4byte gPlayerParty
_0811F46C: .4byte gUnknown_203AD30
_0811F470: .4byte gUnknown_203B0A0
_0811F474: .4byte gUnknown_20370D0
-_0811F478: .4byte gUnknown_20370C2
+_0811F478: .4byte gSpecialVar_0x8005
_0811F47C:
cmp r0, 0x3
bne _0811F492
@@ -2374,7 +2374,7 @@ _0811FCE8:
ands r0, r1
cmp r0, 0x7
bne _0811FD1A
- ldr r4, _0811FD2C @ =gUnknown_20370C2
+ ldr r4, _0811FD2C @ =gSpecialVar_0x8005
movs r1, 0
ldrsb r1, [r5, r1]
movs r0, 0x64
@@ -2392,7 +2392,7 @@ _0811FD1A:
.align 2, 0
_0811FD24: .4byte gUnknown_20370C0
_0811FD28: .4byte gUnknown_203B0A0
-_0811FD2C: .4byte gUnknown_20370C2
+_0811FD2C: .4byte gSpecialVar_0x8005
_0811FD30: .4byte gPlayerParty
_0811FD34:
adds r0, r5, 0
@@ -3956,7 +3956,7 @@ sub_81208E4: @ 81208E4
adds r5, 0xE
movs r0, 0
strh r0, [r2, 0xE]
- ldr r0, _08120938 @ =gUnknown_20370C2
+ ldr r0, _08120938 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0
bne _08120944
@@ -3987,7 +3987,7 @@ _0812090C:
b _0812096E
.align 2, 0
_08120934: .4byte gUnknown_203B0A0
-_08120938: .4byte gUnknown_20370C2
+_08120938: .4byte gSpecialVar_0x8005
_0812093C: .4byte gPlayerPartyCount
_08120940: .4byte gPlayerParty
_08120944:
@@ -6625,7 +6625,7 @@ _08121DB0:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
_08121DE8:
@@ -13661,7 +13661,7 @@ _08125620:
mov r0, r9
mov r1, r8
adds r3, r4, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
cmp r5, 0
beq _08125680
mov r0, r10
@@ -16547,7 +16547,7 @@ sub_8126DC8: @ 8126DC8
ldr r1, _08126E58 @ =gStringVar1
adds r0, r5, 0
bl GetMonNickname
- ldr r4, _08126E5C @ =gUnknown_20370C2
+ ldr r4, _08126E5C @ =gSpecialVar_0x8005
ldrb r0, [r4]
bl sub_8120BA8
strh r0, [r7, 0xE]
@@ -16587,7 +16587,7 @@ _08126E4C: .4byte gUnknown_2037AB8
_08126E50: .4byte gUnknown_203B0A0
_08126E54: .4byte gPlayerParty
_08126E58: .4byte gStringVar1
-_08126E5C: .4byte gUnknown_20370C2
+_08126E5C: .4byte gSpecialVar_0x8005
_08126E60: .4byte gStringVar2
_08126E64: .4byte gUnknown_8247094
_08126E68: .4byte 0xffff0000
@@ -17836,7 +17836,7 @@ _08127818: .4byte sub_811FB28
sub_812781C: @ 812781C
push {lr}
sub sp, 0xC
- ldr r0, _08127844 @ =gUnknown_20370C2
+ ldr r0, _08127844 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0xE
bhi _08127850
@@ -17853,7 +17853,7 @@ sub_812781C: @ 812781C
bl sub_811EA44
b _08127870
.align 2, 0
-_08127844: .4byte gUnknown_20370C2
+_08127844: .4byte gSpecialVar_0x8005
_08127848: .4byte sub_811FB28
_0812784C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08127850:
diff --git a/asm/player_pc.s b/asm/player_pc.s
index a113049c4..f36e89545 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -522,7 +522,7 @@ sub_80EBA8C: @ 80EBA8C
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r4}
pop {r0}
@@ -1082,7 +1082,7 @@ sub_80EBEB0: @ 80EBEB0
adds r0, r4, 0
movs r1, 0x2
mov r2, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r4, _080EBF38 @ =gUnknown_203AAC4
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 42ab9387b..fab76b56f 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -426,7 +426,7 @@ sub_8044838: @ 8044838
sub sp, 0x14
ldr r0, _08044888 @ =gUnknown_20370C0
ldrh r5, [r0]
- ldr r0, _0804488C @ =gUnknown_20370C2
+ ldr r0, _0804488C @ =gSpecialVar_0x8005
ldrh r4, [r0]
ldr r0, _08044890 @ =gUnknown_20370C4
ldrh r6, [r0]
@@ -462,7 +462,7 @@ _08044880:
bx r0
.align 2, 0
_08044888: .4byte gUnknown_20370C0
-_0804488C: .4byte gUnknown_20370C2
+_0804488C: .4byte gSpecialVar_0x8005
_08044890: .4byte gUnknown_20370C4
_08044894: .4byte gEnemyParty
thumb_func_end sub_8044838
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 37a1eb75a..490a48815 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -7329,7 +7329,7 @@ _0808F4D4:
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x2
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -7352,7 +7352,7 @@ _0808F4D4:
movs r0, 0
movs r1, 0
movs r3, 0x6
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _0808F57E
.align 2, 0
_0808F51C: .4byte gUnknown_20397B0
@@ -7368,7 +7368,7 @@ _0808F528:
str r1, [sp, 0x8]
movs r0, 0
movs r3, 0x6
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r4, 0
movs r5, 0xF
_0808F542:
@@ -7392,7 +7392,7 @@ _0808F558:
movs r0, 0
str r0, [sp, 0x8]
movs r1, 0x2
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -8307,7 +8307,7 @@ _0808FC7C:
movs r0, 0x1
movs r1, 0x1
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 03ede3f37..a7b748eb7 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -9734,7 +9734,7 @@ _08139584:
ldr r0, _081395A4 @ =gUnknown_203B16D
ldrb r0, [r0]
strb r0, [r2]
- ldr r1, _081395AC @ =gUnknown_20370C2
+ ldr r1, _081395AC @ =gSpecialVar_0x8005
ldrb r0, [r2]
strh r0, [r1]
ldr r0, _081395B0 @ =gUnknown_203B140
@@ -9745,7 +9745,7 @@ _08139584:
.align 2, 0
_081395A4: .4byte gUnknown_203B16D
_081395A8: .4byte gUnknown_203B16E
-_081395AC: .4byte gUnknown_20370C2
+_081395AC: .4byte gSpecialVar_0x8005
_081395B0: .4byte gUnknown_203B140
_081395B4: .4byte 0x00003288
_081395B8:
@@ -9771,7 +9771,7 @@ _081395DE:
ldr r1, _081395F8 @ =gUnknown_203B16E
movs r0, 0x4
strb r0, [r1]
- ldr r1, _081395FC @ =gUnknown_20370C2
+ ldr r1, _081395FC @ =gSpecialVar_0x8005
movs r0, 0x4
strh r0, [r1]
ldr r0, [r5]
@@ -9783,7 +9783,7 @@ _081395F0:
b _0813975A
.align 2, 0
_081395F8: .4byte gUnknown_203B16E
-_081395FC: .4byte gUnknown_20370C2
+_081395FC: .4byte gSpecialVar_0x8005
_08139600: .4byte 0x00003288
_08139604:
bl sub_8136F4C
diff --git a/asm/prof_pc.s b/asm/prof_pc.s
index 36722e02b..ae8c68ded 100644
--- a/asm/prof_pc.s
+++ b/asm/prof_pc.s
@@ -14,18 +14,18 @@ sub_80CA3D8: @ 80CA3D8
bne _080CA3FC
movs r0, 0
bl sub_8088EDC
- ldr r1, _080CA3F8 @ =gUnknown_20370C2
+ ldr r1, _080CA3F8 @ =gSpecialVar_0x8005
strh r0, [r1]
movs r0, 0x1
bl sub_8088EDC
b _080CA40C
.align 2, 0
_080CA3F4: .4byte gUnknown_20370C0
-_080CA3F8: .4byte gUnknown_20370C2
+_080CA3F8: .4byte gSpecialVar_0x8005
_080CA3FC:
movs r0, 0
bl pokedex_count
- ldr r1, _080CA41C @ =gUnknown_20370C2
+ ldr r1, _080CA41C @ =gSpecialVar_0x8005
strh r0, [r1]
movs r0, 0x1
bl pokedex_count
@@ -38,7 +38,7 @@ _080CA40C:
pop {r1}
bx r1
.align 2, 0
-_080CA41C: .4byte gUnknown_20370C2
+_080CA41C: .4byte gSpecialVar_0x8005
_080CA420: .4byte gUnknown_20370C4
thumb_func_end sub_80CA3D8
diff --git a/asm/scrcmd.s b/asm/scrcmd.s
index 0bff9395c..22337b6f3 100644
--- a/asm/scrcmd.s
+++ b/asm/scrcmd.s
@@ -3956,7 +3956,7 @@ _0806BC16:
movs r1, 0x6
adds r2, r4, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
add sp, 0xC
pop {r4,r5}
@@ -4699,10 +4699,10 @@ sub_806C1CC: @ 806C1CC
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r1, r5, 0
adds r2, r4, 0
- bl sub_809FFB8
+ bl DrawMoneyBox
_0806C20A:
movs r0, 0
pop {r4,r5}
@@ -4716,7 +4716,7 @@ _0806C218: .4byte gSaveBlock1Ptr
thumb_func_start sub_806C21C
sub_806C21C: @ 806C21C
push {lr}
- bl sub_80A0034
+ bl HideMoneyBox
movs r0, 0
pop {r1}
bx r1
@@ -4739,8 +4739,8 @@ sub_806C228: @ 806C228
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
- bl sub_809FFA0
+ bl GetMoney
+ bl ChangeAmountInMoneyBox
_0806C24E:
movs r0, 0
pop {r1}
@@ -4765,12 +4765,12 @@ sub_806C258: @ 806C258
lsrs r0, 24
cmp r0, 0x1
beq _0806C286
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
adds r2, r4, 0
- bl sub_80D072C
+ bl ShowCoinsWindow
_0806C286:
movs r0, 0
pop {r4,r5}
@@ -4786,7 +4786,7 @@ ScrCmd_hidecoinsbox: @ 806C294
ldr r1, [r0, 0x8]
adds r1, 0x2
str r1, [r0, 0x8]
- bl sub_80D07C8
+ bl HideCoinsWindow
movs r0, 0
pop {r1}
bx r1
@@ -4798,10 +4798,10 @@ ScrCmd_updatecoinsbox: @ 806C2A8
ldr r1, [r0, 0x8]
adds r1, 0x2
str r1, [r0, 0x8]
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
lsrs r0, 16
- bl sub_80D06D0
+ bl PrintCoinsString
movs r0, 0
pop {r1}
bx r1
@@ -5430,7 +5430,7 @@ ScrCmd_checkcoins: @ 806C72C
lsrs r0, 16
bl sub_806E454
adds r4, r0, 0
- bl sub_80D0554
+ bl GetCoins
strh r0, [r4]
movs r0, 0
pop {r4}
@@ -5447,7 +5447,7 @@ ScrCmd_givecoins: @ 806C74C
bl VarGet
lsls r0, 16
lsrs r0, 16
- bl sub_80D05A4
+ bl GiveCoins
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5478,7 +5478,7 @@ ScrCmd_takecoins: @ 806C784
bl VarGet
lsls r0, 16
lsrs r0, 16
- bl sub_80D05E4
+ bl TakeCoins
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 08f1c32b4..7707a7f52 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -1000,7 +1000,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r2, _0809D12C @ =gUnknown_8417BBE
movs r0, 0x32
str r0, [sp]
@@ -1009,7 +1009,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r2, _0809D130 @ =gUnknown_8417BCB
movs r0, 0x42
str r0, [sp]
@@ -1018,7 +1018,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _0809D1A8
.align 2, 0
_0809D11C: .4byte gUnknown_8417BB6
@@ -1065,7 +1065,7 @@ _0809D14C:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_0809D188:
ldr r2, _0809D1D8 @ =gUnknown_8417BCB
mov r0, r9
@@ -1081,7 +1081,7 @@ _0809D188:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_0809D1A8:
ldr r0, _0809D1DC @ =0x00000834
bl FlagGet
@@ -1099,7 +1099,7 @@ _0809D1A8:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _0809D1FA
.align 2, 0
_0809D1D0: .4byte 0x00000829
@@ -1117,7 +1117,7 @@ _0809D1E4:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_0809D1FA:
ldr r4, _0809D24C @ =gStringVar4
ldr r1, _0809D250 @ =gUnknown_8417BB6
@@ -1558,7 +1558,7 @@ _0809D560:
bl LoadPalette
_0809D572:
ldr r0, _0809D608 @ =gUnknown_83E0768
- ldr r1, _0809D60C @ =gUnknown_20370C2
+ ldr r1, _0809D60C @ =gSpecialVar_0x8005
mov r8, r1
ldrh r1, [r1]
lsls r1, 19
@@ -1628,7 +1628,7 @@ _0809D5F4:
_0809D600: .4byte gUnknown_83E17D0
_0809D604: .4byte gUnknown_83E0F80
_0809D608: .4byte gUnknown_83E0768
-_0809D60C: .4byte gUnknown_20370C2
+_0809D60C: .4byte gSpecialVar_0x8005
_0809D610: .4byte gUnknown_20370C4
_0809D614: .4byte gSprites
_0809D618: .4byte sub_809D494
@@ -1814,7 +1814,7 @@ sub_809D764: @ 809D764
bne _0809D784
b _0809D8A8
_0809D784:
- ldr r0, _0809D7A8 @ =gUnknown_20370C2
+ ldr r0, _0809D7A8 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0x1
bne _0809D7B0
@@ -1832,7 +1832,7 @@ _0809D798:
.align 2, 0
_0809D7A0: .4byte gUnknown_20370D0
_0809D7A4: .4byte sub_809D6D4
-_0809D7A8: .4byte gUnknown_20370C2
+_0809D7A8: .4byte gSpecialVar_0x8005
_0809D7AC: .4byte gUnknown_20370C0
_0809D7B0:
movs r4, 0
@@ -1886,7 +1886,7 @@ _0809D7F2:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _0809D82E
.align 2, 0
_0809D820: .4byte gUnknown_20370C0
@@ -1922,7 +1922,7 @@ _0809D844:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r6, 0x1
lsls r0, 24
ldr r2, _0809D8BC @ =gUnknown_84161C8
@@ -1936,7 +1936,7 @@ _0809D844:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0x10
str r0, [sp]
mov r0, r9
@@ -1975,7 +1975,7 @@ sub_809D8C0: @ 809D8C0
adds r1, r2, 0
cmp r1, 0x7F
beq _0809D930
- ldr r0, _0809D8F0 @ =gUnknown_20370C2
+ ldr r0, _0809D8F0 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0x1
bne _0809D924
@@ -1993,7 +1993,7 @@ sub_809D8C0: @ 809D8C0
b _0809D94E
.align 2, 0
_0809D8EC: .4byte gUnknown_20370D0
-_0809D8F0: .4byte gUnknown_20370C2
+_0809D8F0: .4byte gSpecialVar_0x8005
_0809D8F4: .4byte gUnknown_20370C0
_0809D8F8:
cmp r1, 0x1
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s
index c2184904c..8ff65922e 100644
--- a/asm/script_pokemon_util_80BF8FC.s
+++ b/asm/script_pokemon_util_80BF8FC.s
@@ -182,7 +182,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
muls r5, r0
ldr r0, _080BFA94 @ =gPlayerParty
adds r5, r0
- ldr r0, _080BFA98 @ =gUnknown_20370C2
+ ldr r0, _080BFA98 @ =gSpecialVar_0x8005
ldrh r1, [r0]
adds r1, 0xD
adds r0, r5, 0
@@ -205,7 +205,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
.align 2, 0
_080BFA90: .4byte gUnknown_20370C0
_080BFA94: .4byte gPlayerParty
-_080BFA98: .4byte gUnknown_20370C2
+_080BFA98: .4byte gSpecialVar_0x8005
_080BFA9C: .4byte gStringVar1
_080BFAA0: .4byte gStringVar2
_080BFAA4: .4byte gUnknown_8247094
@@ -345,7 +345,7 @@ sub_80BFBA8: @ 80BFBA8
muls r0, r6
ldr r5, _080BFC0C @ =gPlayerParty
adds r0, r5
- ldr r4, _080BFC10 @ =gUnknown_20370C2
+ ldr r4, _080BFC10 @ =gSpecialVar_0x8005
ldrb r2, [r4]
movs r1, 0
bl SetMonMoveSlot
@@ -384,7 +384,7 @@ _080BFBFC:
.align 2, 0
_080BFC08: .4byte gUnknown_20370C0
_080BFC0C: .4byte gPlayerParty
-_080BFC10: .4byte gUnknown_20370C2
+_080BFC10: .4byte gSpecialVar_0x8005
thumb_func_end sub_80BFBA8
thumb_func_start sub_80BFC14
diff --git a/asm/shop.s b/asm/shop.s
index e9401913d..d9f548c1d 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1189,7 +1189,7 @@ _0809B450:
cmp r0, 0
bne _0809B450
_0809B45C:
- ldr r1, _0809B490 @ =gUnknown_841697A
+ ldr r1, _0809B490 @ =gText_PokedollarVar1
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r2, _0809B48C @ =gStringVar4
@@ -1213,7 +1213,7 @@ _0809B480:
.align 2, 0
_0809B488: .4byte gStringVar1
_0809B48C: .4byte gStringVar4
-_0809B490: .4byte gUnknown_841697A
+_0809B490: .4byte gText_PokedollarVar1
thumb_func_end sub_809B408
thumb_func_start sub_809B494
@@ -2111,7 +2111,7 @@ sub_809BB44: @ 809BB44
movs r0, 0x3
movs r1, 0x36
movs r2, 0xA
- bl sub_809FEC4
+ bl PrintMoneyAmount
ldr r0, _0809BBB4 @ =gStringVar1
movs r2, 0x2
ldrsh r1, [r4, r2]
@@ -2301,7 +2301,7 @@ sub_809BCA0: @ 809BCA0
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r4, r0, 0
ldrh r0, [r5, 0xA]
bl itemid_get_market_price
@@ -2539,11 +2539,11 @@ sub_809BF0C: @ 809BF0C
bl PlaySE
ldr r0, [r6]
adds r0, r5
- bl sub_809FD58
+ bl GetMoney
adds r1, r0, 0
movs r0, 0
movs r2, 0
- bl sub_809FE40
+ bl PrintMoneyAmountInMoneyBox
ldr r1, _0809BF60 @ =gTasks
lsls r0, r4, 2
adds r0, r4
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 1f4cd16c8..2350a210e 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -212,7 +212,7 @@ _0813F990:
.4byte _0813FB08
.4byte _0813FB48
_0813F9A4:
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
cmp r0, 0
bne _0813F9BC
@@ -234,7 +234,7 @@ _0813F9BC:
adds r0, 0x1
strh r0, [r1, 0xE]
movs r0, 0x1
- bl sub_80D05E4
+ bl TakeCoins
movs r0, 0x58
bl PlaySE
movs r0, 0x8
@@ -259,7 +259,7 @@ _0813F9FC:
ldrh r0, [r0, 0xE]
movs r7, 0x3
subs r4, r7, r0
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
lsrs r0, 16
cmp r0, r4
@@ -268,18 +268,18 @@ _0813F9FC:
strh r7, [r0, 0xE]
lsls r0, r4, 16
lsrs r0, 16
- bl sub_80D05E4
+ bl TakeCoins
b _0813FA42
.align 2, 0
_0813FA2C: .4byte gUnknown_203F3A0
_0813FA30:
- bl sub_80D0554
+ bl GetCoins
ldr r1, [r5]
ldrh r2, [r1, 0xE]
adds r0, r2
strh r0, [r1, 0xE]
movs r0, 0
- bl sub_80D057C
+ bl SetCoins
_0813FA42:
movs r0, 0x58
bl PlaySE
@@ -347,7 +347,7 @@ _0813FAC2:
ldrh r0, [r0, 0xE]
cmp r0, 0x3
beq _0813FAD6
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
cmp r0, 0
bne _0813FAE0
@@ -649,7 +649,7 @@ _0813FD28:
ldr r0, _0813FD40 @ =gUnknown_203F3A0
ldr r0, [r0]
ldrh r0, [r0, 0xE]
- bl sub_80D05A4
+ bl GiveCoins
movs r0, 0x8
movs r1, 0
bl sub_8141148
@@ -871,7 +871,7 @@ _0813FECC:
ldr r0, [r4]
adds r0, 0x50
ldrh r0, [r0]
- bl sub_80D05A4
+ bl GiveCoins
ldr r0, [r4]
adds r0, 0x50
strh r6, [r0]
@@ -900,7 +900,7 @@ _0813FF28:
cmp r0, 0
beq _0813FF44
movs r0, 0x1
- bl sub_80D05A4
+ bl GiveCoins
ldr r1, [r4]
adds r1, 0x50
ldrh r0, [r1]
@@ -3100,7 +3100,7 @@ sub_8140F2C: @ 8140F2C
mov r6, r9
mov r5, r8
push {r5-r7}
- bl sub_80D0554
+ bl GetCoins
lsls r0, 16
lsrs r0, 16
mov r9, r0
diff --git a/asm/start_menu.s b/asm/start_menu.s
index a776442d5..d31fb0723 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -191,7 +191,7 @@ sub_806EE7C: @ 806EE7C
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x4
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x2
bl CopyWindowToVram
@@ -306,7 +306,7 @@ _0806EFA8:
movs r1, 0x2
mov r2, r9
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_0806EFDA:
movs r0, 0x80
lsls r0, 9
diff --git a/asm/tm_case.s b/asm/tm_case.s
index 303586153..76c0a384e 100644
--- a/asm/tm_case.s
+++ b/asm/tm_case.s
@@ -2380,7 +2380,7 @@ sub_8132B5C: @ 8132B5C
movs r1, 0x38
movs r2, 0xA
adds r3, r6, 0
- bl sub_809FEC4
+ bl PrintMoneyAmount
add sp, 0x14
pop {r4-r6}
pop {r0}
@@ -2612,11 +2612,11 @@ sub_8132D34: @ 8132D34
bl sub_8131F90
ldr r0, [r7]
add r0, r10
- bl sub_809FD58
+ bl GetMoney
adds r1, r0, 0
movs r0, 0x8
movs r2, 0
- bl sub_809FE40
+ bl PrintMoneyAmountInMoneyBox
movs r2, 0x8
negs r2, r2
add r9, r2
@@ -3587,12 +3587,12 @@ sub_81335E0: @ 81335E0
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
adds r3, r0, 0
movs r0, 0x8
movs r1, 0x78
movs r2, 0xD
- bl sub_809FF48
+ bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/trade.s b/asm/trade.s
index cf1cde171..9f35fe6a8 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5872,7 +5872,7 @@ sub_804F5BC: @ 804F5BC
str r0, [sp, 0x8]
movs r1, 0x3
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x14
movs r2, 0xC
@@ -7941,7 +7941,7 @@ _080505F4:
.4byte _08050778
_08050628:
ldr r1, _080506CC @ =gUnknown_2031DA4
- ldr r0, _080506D0 @ =gUnknown_20370C2
+ ldr r0, _080506D0 @ =gSpecialVar_0x8005
ldrh r0, [r0]
movs r5, 0
strb r0, [r1]
@@ -8013,7 +8013,7 @@ _08050628:
b _0805077E
.align 2, 0
_080506CC: .4byte gUnknown_2031DA4
-_080506D0: .4byte gUnknown_20370C2
+_080506D0: .4byte gSpecialVar_0x8005
_080506D4: .4byte gUnknown_2022744
_080506D8: .4byte gSaveBlock2Ptr
_080506DC: .4byte gEnemyParty
@@ -8926,7 +8926,7 @@ _08050EB4:
ldr r0, _08050F04 @ =gStringVar3
adds r1, r4, 0
bl StringCopy10
- ldr r0, _08050F08 @ =gUnknown_20370C2
+ ldr r0, _08050F08 @ =gSpecialVar_0x8005
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -8948,7 +8948,7 @@ _08050EF8: .4byte gUnknown_20370C0
_08050EFC: .4byte gUnknown_826CF8C
_08050F00: .4byte gStringVar1
_08050F04: .4byte gStringVar3
-_08050F08: .4byte gUnknown_20370C2
+_08050F08: .4byte gSpecialVar_0x8005
_08050F0C: .4byte gPlayerParty
_08050F10: .4byte gStringVar2
thumb_func_end sub_8050E24
@@ -11048,7 +11048,7 @@ _08052226:
.align 2, 0
_08052238: .4byte gMain
_0805223C:
- ldr r0, _08052280 @ =gUnknown_20370C2
+ ldr r0, _08052280 @ =gSpecialVar_0x8005
ldrb r0, [r0]
movs r1, 0
bl sub_805080C
@@ -11080,7 +11080,7 @@ _0805223C:
bl TradeEvolutionScene
b _080522A8
.align 2, 0
-_08052280: .4byte gUnknown_20370C2
+_08052280: .4byte gSpecialVar_0x8005
_08052284: .4byte gUnknown_300537C
_08052288: .4byte sub_8050948
_0805228C: .4byte gUnknown_2031DA4
@@ -13273,7 +13273,7 @@ _08053682:
.align 2, 0
_08053694: .4byte gMain
_08053698:
- ldr r0, _080536DC @ =gUnknown_20370C2
+ ldr r0, _080536DC @ =gSpecialVar_0x8005
ldrb r0, [r0]
movs r1, 0
bl sub_805080C
@@ -13305,7 +13305,7 @@ _08053698:
bl TradeEvolutionScene
b _08053704
.align 2, 0
-_080536DC: .4byte gUnknown_20370C2
+_080536DC: .4byte gSpecialVar_0x8005
_080536E0: .4byte gUnknown_300537C
_080536E4: .4byte sub_8050948
_080536E8: .4byte gUnknown_2031DA4
@@ -13824,7 +13824,7 @@ sub_8053AE4: @ 8053AE4
lsls r4, 2
ldr r0, _08053B30 @ =gUnknown_826CF8C
adds r4, r0
- ldr r0, _08053B34 @ =gUnknown_20370C2
+ ldr r0, _08053B34 @ =gSpecialVar_0x8005
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -13850,7 +13850,7 @@ sub_8053AE4: @ 8053AE4
.align 2, 0
_08053B2C: .4byte gUnknown_20370C0
_08053B30: .4byte gUnknown_826CF8C
-_08053B34: .4byte gUnknown_20370C2
+_08053B34: .4byte gSpecialVar_0x8005
_08053B38: .4byte gPlayerParty
_08053B3C: .4byte gStringVar1
_08053B40: .4byte gStringVar2
@@ -14081,7 +14081,7 @@ _08053D28: .4byte gUnknown_826D1A8
thumb_func_start sub_8053D2C
sub_8053D2C: @ 8053D2C
push {r4-r6,lr}
- ldr r6, _08053D58 @ =gUnknown_20370C2
+ ldr r6, _08053D58 @ =gSpecialVar_0x8005
ldrh r0, [r6]
movs r5, 0x64
muls r0, r5
@@ -14100,7 +14100,7 @@ sub_8053D2C: @ 8053D2C
lsrs r0, 16
b _08053D62
.align 2, 0
-_08053D58: .4byte gUnknown_20370C2
+_08053D58: .4byte gSpecialVar_0x8005
_08053D5C: .4byte gPlayerParty
_08053D60:
movs r0, 0
@@ -14113,7 +14113,7 @@ _08053D62:
thumb_func_start sub_8053D68
sub_8053D68: @ 8053D68
push {lr}
- ldr r0, _08053D7C @ =gUnknown_20370C2
+ ldr r0, _08053D7C @ =gSpecialVar_0x8005
ldrb r0, [r0]
ldr r1, _08053D80 @ =gUnknown_20370C0
ldrb r1, [r1]
@@ -14121,7 +14121,7 @@ sub_8053D68: @ 8053D68
pop {r0}
bx r0
.align 2, 0
-_08053D7C: .4byte gUnknown_20370C2
+_08053D7C: .4byte gSpecialVar_0x8005
_08053D80: .4byte gUnknown_20370C0
thumb_func_end sub_8053D68
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 5896ce98d..7f330c8f9 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -441,7 +441,7 @@ _0808937A:
str r0, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1007,7 +1007,7 @@ _080897EE:
movs r1, 0xA4
lsls r1, 2
adds r0, r1
- bl sub_809FD58
+ bl GetMoney
str r0, [r5, 0x24]
movs r2, 0
adds r7, r5, 0
diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s
index 36b5085b3..6ef1e7468 100644
--- a/asm/trainer_tower.s
+++ b/asm/trainer_tower.s
@@ -1036,7 +1036,7 @@ sub_815DF54: @ 815DF54
adds r0, r3, r0
_0815DF7C:
ldrb r1, [r0, 0x1B]
- ldr r0, _0815DF98 @ =gUnknown_20370C2
+ ldr r0, _0815DF98 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0x3
beq _0815DFD4
@@ -1048,7 +1048,7 @@ _0815DF7C:
.align 2, 0
_0815DF90: .4byte gUnknown_20370C4
_0815DF94: .4byte gUnknown_203F458
-_0815DF98: .4byte gUnknown_20370C2
+_0815DF98: .4byte gSpecialVar_0x8005
_0815DF9C:
cmp r0, 0x4
beq _0815E000
@@ -1331,7 +1331,7 @@ _0815E1BC: .4byte sub_815E124
thumb_func_start sub_815E1C0
sub_815E1C0: @ 815E1C0
push {lr}
- ldr r0, _0815E1E4 @ =gUnknown_20370C2
+ ldr r0, _0815E1E4 @ =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0
bne _0815E1DE
@@ -1349,7 +1349,7 @@ _0815E1DE:
pop {r0}
bx r0
.align 2, 0
-_0815E1E4: .4byte gUnknown_20370C2
+_0815E1E4: .4byte gSpecialVar_0x8005
_0815E1E8: .4byte gUnknown_20370D0
_0815E1EC: .4byte gUnknown_203F458
thumb_func_end sub_815E1C0
@@ -1443,7 +1443,7 @@ sub_815E28C: @ 815E28C
ldr r0, [r4]
ldr r5, _0815E2D4 @ =0x00003d34
adds r1, r0, r5
- ldr r0, _0815E2D8 @ =gUnknown_20370C2
+ ldr r0, _0815E2D8 @ =gSpecialVar_0x8005
ldrh r0, [r0]
str r0, [r1]
cmp r0, 0x3
@@ -1471,7 +1471,7 @@ _0815E2A8:
.align 2, 0
_0815E2D0: .4byte gSaveBlock1Ptr
_0815E2D4: .4byte 0x00003d34
-_0815E2D8: .4byte gUnknown_20370C2
+_0815E2D8: .4byte gSpecialVar_0x8005
_0815E2DC: .4byte 0x00003d42
_0815E2E0:
ldr r1, [r4]
@@ -2034,7 +2034,7 @@ sub_815E720: @ 815E720
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x4A
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
mov r8, r0
movs r1, 0xB8
@@ -2111,7 +2111,7 @@ _0815E76C:
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x18
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r1, r10
lsrs r0, r1, 24
str r0, [sp]
@@ -2123,7 +2123,7 @@ _0815E76C:
movs r1, 0x2
ldr r2, _0815E87C @ =gStringVar4
movs r3, 0x60
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0xA0
lsls r0, 21
add r10, r0
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index 48a4e478f..a4c60d00f 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -4273,7 +4273,7 @@ sub_812A424: @ 812A424
str r7, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r6]
ldrb r0, [r0, 0x18]
ldr r2, _0812A518 @ =gUnknown_841793C
@@ -4283,7 +4283,7 @@ sub_812A424: @ 812A424
str r7, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r6]
ldrb r0, [r0, 0x18]
movs r1, 0x1
diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s
index fc9620900..d117d5359 100644
--- a/asm/unk_8147AA8.s
+++ b/asm/unk_8147AA8.s
@@ -5159,7 +5159,7 @@ _0814A0EA:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5245,7 +5245,7 @@ _0814A196:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5366,7 +5366,7 @@ _0814A286:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5448,7 +5448,7 @@ _0814A32A:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5676,7 +5676,7 @@ _0814A4C2:
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x2
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5734,7 +5734,7 @@ sub_814A53C: @ 814A53C
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -5789,7 +5789,7 @@ sub_814A5B4: @ 814A5B4
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s
index cb042d971..7e55e957d 100644
--- a/asm/unk_81507FC.s
+++ b/asm/unk_81507FC.s
@@ -6493,7 +6493,7 @@ sub_81538D0: @ 81538D0
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x1
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r4, 0
add r2, sp, 0x18
mov r8, r2
@@ -6536,7 +6536,7 @@ _08153946:
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x1
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r3, 0xE0
subs r3, r5
lsls r3, 24
@@ -6552,7 +6552,7 @@ _08153946:
adds r0, r7, 0
movs r1, 0x2
mov r2, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r4, r6, 0
cmp r4, 0x2
ble _08153946
@@ -9290,7 +9290,7 @@ _08154E70:
str r3, [sp, 0x8]
movs r1, 0
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -9342,7 +9342,7 @@ _08154EC8:
add r2, sp, 0xC
ldr r4, [sp, 0x6C]
lsrs r3, r4, 24
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r1, _08154F70 @ =gUnknown_203F440
ldr r0, [r1]
add r0, r10
@@ -9356,7 +9356,7 @@ _08154EC8:
str r1, [sp, 0x8]
ldr r2, _08154F68 @ =gUnknown_841CE1C
lsrs r3, 24
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -9512,7 +9512,7 @@ _08155060:
str r5, [sp, 0x8]
movs r1, 0
mov r2, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
@@ -9523,7 +9523,7 @@ _08155060:
str r5, [sp, 0x8]
movs r1, 0
movs r3, 0x44
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
movs r0, 0
mov r9, r0
ldr r1, [sp, 0x84]
@@ -9657,7 +9657,7 @@ _081551D0:
movs r1, 0
str r1, [sp, 0x8]
add r2, sp, 0xC
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_081551FA:
adds r0, r7, 0x1
lsls r0, 24
@@ -9795,7 +9795,7 @@ _081552DC:
movs r1, 0
str r1, [sp, 0x8]
adds r2, r6, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
b _08155658
.align 2, 0
_08155330: .4byte gUnknown_203F440
@@ -9982,7 +9982,7 @@ _08155480:
str r6, [sp, 0x8]
movs r1, 0
adds r2, r5, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
bl UnkTextUtil_Reset
bl sub_8153390
lsls r0, 16
@@ -10007,7 +10007,7 @@ _08155480:
movs r1, 0
add r2, sp, 0xC
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
bl sub_815372C
lsls r0, 24
lsrs r4, r0, 24
@@ -10059,7 +10059,7 @@ _08155580:
str r1, [sp, 0x8]
add r2, sp, 0xC
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
_0815559E:
ldr r4, _081555C8 @ =gUnknown_203F440
ldr r0, [r4]
@@ -10319,7 +10319,7 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r3, r10
ldr r0, [r3]
adds r0, r7
@@ -10331,7 +10331,7 @@ _0815579C:
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r2, r10
ldr r0, [r2]
adds r0, r7
@@ -10343,7 +10343,7 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r3, r10
ldr r0, [r3]
adds r0, r7
@@ -10355,7 +10355,7 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r2, r10
ldr r0, [r2]
add r0, r8
@@ -10435,7 +10435,7 @@ _081558B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r2, r10
ldr r0, [r2]
adds r0, r4
@@ -10448,7 +10448,7 @@ _081558B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
mov r1, r10
ldr r0, [r1]
adds r0, r4
@@ -10475,7 +10475,7 @@ _08155922:
adds r0, r1, 0
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r4, _08155970 @ =gUnknown_203F440
ldr r0, [r4]
ldr r1, _08155974 @ =0x00003009
@@ -10798,7 +10798,7 @@ _08155BA4:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -10970,7 +10970,7 @@ _08155D08:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s
index 07e772bb8..6acbf447d 100644
--- a/asm/unk_815EDDC.s
+++ b/asm/unk_815EDDC.s
@@ -303,7 +303,7 @@ sub_815EFBC: @ 815EFBC
movs r1, 0
mov r2, r9
mov r3, r8
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -345,7 +345,7 @@ sub_815F014: @ 815F014
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl PrintTextOnWindow
+ bl AddTextPrinterParameterized
str r4, [sp]
adds r0, r6, 0
mov r1, r8
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 2266992ab..7cbb2f5d8 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -787,7 +787,7 @@ gUnknown_84162B9:: @ 84162B9
gUnknown_84162BD:: @ 84162BD
.incbin "baserom.gba", 0x4162BD, 0x7
-gUnknown_84162C4:: @ 84162C4
+gText_Coins:: @ 84162C4
.incbin "baserom.gba", 0x4162C4, 0x24
gUnknown_84162E8:: @ 84162E8
@@ -940,7 +940,7 @@ gUnknown_8416936:: @ 8416936
gUnknown_8416959:: @ 8416959
.incbin "baserom.gba", 0x416959, 0x21
-gUnknown_841697A:: @ 841697A
+gText_PokedollarVar1:: @ 841697A
.incbin "baserom.gba", 0x41697A, 0x48
gUnknown_84169C2:: @ 84169C2
diff --git a/include/menu.h b/include/menu.h
index 99ff35adb..6a6e2e828 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -34,5 +34,6 @@ void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
+void sub_810F4D8(u8 windowId, bool32 someBool);
#endif // GUARD_MENU_H
diff --git a/include/money.h b/include/money.h
index 5c7c1c984..48b15db76 100644
--- a/include/money.h
+++ b/include/money.h
@@ -8,9 +8,9 @@ void AddMoney(u32* moneyPtr, u32 toAdd);
void RemoveMoney(u32* moneyPtr, u32 toSub);
bool8 IsEnoughForCostInVar0x8005(void);
void SubtractMoneyFromVar0x8005(void);
-void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed);
-void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed);
-void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount);
+void PrintMoneyAmountInMoneyBoxInMoneyBox(u8 windowId, int amount, u8 speed);
+void PrintMoneyAmountInMoneyBox(u8 windowId, u8 x, u8 y, int amount, u8 speed);
+void PrintMoneyAmountInMoneyBoxInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount);
void ChangeAmountInMoneyBox(int amount);
void DrawMoneyBox(int amount, u8 x, u8 y);
void HideMoneyBox(void);
diff --git a/include/text.h b/include/text.h
index 61ab8cecd..7853598f8 100644
--- a/include/text.h
+++ b/include/text.h
@@ -192,7 +192,7 @@ extern u8 gStringVar4[];
void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void);
-u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
void RunTextPrinters(void);
bool16 IsTextPrinterActive(u8 id);
diff --git a/include/text_window.h b/include/text_window.h
index da3fb301e..3514296c1 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -18,5 +18,6 @@ void rbox_fill_rectangle(u8 windowId);
const u16* stdpal_get(u8 id);
const u16* GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
+void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
#endif // GUARD_TEXT_WINDOW_H
diff --git a/ld_script.txt b/ld_script.txt
index 2b5d8fe4e..462b36717 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -145,7 +145,7 @@ SECTIONS {
asm/berry.o(.text);
asm/script_menu.o(.text);
asm/naming_screen.o(.text);
- asm/money.o(.text);
+ src/money.o(.text);
asm/script_pokemon_util_80A0058.o(.text);
asm/field_poison.o(.text);
asm/pokemon_size_record.o(.text);
@@ -173,12 +173,12 @@ SECTIONS {
asm/field_specials.o(.text);
asm/battle_records.o(.text);
asm/evolution_scene.o(.text);
- asm/coins.o(.text);
+ src/coins.o(.text);
asm/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
asm/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
- asm/math_util.o(.text);
+ src/math_util.o(.text);
asm/roulette_util.o(.text);
asm/cable_car_util.o(.text);
src/save.o(.text);
diff --git a/src/coins.c b/src/coins.c
new file mode 100644
index 000000000..08646e2f9
--- /dev/null
+++ b/src/coins.c
@@ -0,0 +1,101 @@
+#include "global.h"
+#include "string_util.h"
+#include "text.h"
+#include "menu.h"
+#include "text_window.h"
+
+extern const u8 gText_Coins[];
+extern const u8 gUnknown_8417C2D[];
+
+EWRAM_DATA static u8 sCoinsWindowId = 0;
+
+#define MAX_COINS 9999
+
+u16 GetCoins(void)
+{
+ return gSaveBlock1Ptr->coins ^ gSaveBlock2Ptr->encryptionKey;
+}
+
+void SetCoins(u16 coinAmount)
+{
+ gSaveBlock1Ptr->coins = coinAmount ^ gSaveBlock2Ptr->encryptionKey;
+}
+
+bool8 GiveCoins(u16 toAdd)
+{
+ u16 coins = GetCoins();
+ if (coins >= MAX_COINS)
+ return FALSE;
+ // check overflow, can't have less coins than previously
+ if (coins <= coins + toAdd)
+ {
+ coins += toAdd;
+ if (coins > MAX_COINS)
+ coins = MAX_COINS;
+ }
+ else
+ {
+ coins = MAX_COINS;
+ }
+ SetCoins(coins);
+ return TRUE;
+}
+
+bool8 TakeCoins(u16 toSub)
+{
+ u16 coins = GetCoins();
+ if (coins >= toSub)
+ {
+ SetCoins(coins - toSub);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+void PrintCoinsString_Parameterized(u8 windowId, u32 coinAmount, u8 x, u8 y, u8 speed)
+{
+ ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
+ StringExpandPlaceholders(gStringVar4, gText_Coins);
+ AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, speed, NULL);
+}
+
+void sub_80D0674(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount)
+{
+ SetWindowBorderStyle(windowId, FALSE, tileStart, palette);
+ AddTextPrinterParameterized(windowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0);
+ PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0);
+}
+
+void PrintCoinsString(u32 coinAmount)
+{
+ u8 windowId;
+ int width;
+
+ ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
+ StringExpandPlaceholders(gStringVar4, gText_Coins);
+ width = GetStringWidth(0, gStringVar4, 0);
+ windowId = sCoinsWindowId;
+ AddTextPrinterParameterized(windowId, 0, gStringVar4, 64 - width, 0xC, 0, NULL);
+}
+
+void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
+{
+ struct WindowTemplate template, template2;
+
+ SetWindowTemplateFields(&template, 0, x + 1, y + 1, 8, 3, 0xF, 0x20);
+ template2 = template; // again, why...
+ sCoinsWindowId = AddWindow(&template2);
+ FillWindowPixelBuffer(sCoinsWindowId, 0);
+ PutWindowTilemap(sCoinsWindowId);
+ sub_814FF2C(sCoinsWindowId, 0x21D, 0xD0);
+ SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x21D, 0xD);
+ AddTextPrinterParameterized(sCoinsWindowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0);
+ PrintCoinsString(coinAmount);
+}
+
+void HideCoinsWindow(void)
+{
+ ClearWindowTilemap(sCoinsWindowId);
+ sub_810F4D8(sCoinsWindowId, TRUE);
+ RemoveWindow(sCoinsWindowId);
+}
diff --git a/src/math_util.c b/src/math_util.c
new file mode 100644
index 000000000..466a31921
--- /dev/null
+++ b/src/math_util.c
@@ -0,0 +1,86 @@
+#include "global.h"
+
+s16 sub_80D8AA0(s16 x, s16 y)
+{
+ s32 result;
+
+ result = x;
+ result *= y;
+ result /= 256;
+ return result;
+}
+
+s16 sub_80D8ABC(u8 s, s16 x, s16 y)
+{
+ s32 result;
+
+ result = x;
+ result *= y;
+ result /= (1 << s);
+ return result;
+}
+
+s32 sub_80D8AE0(s32 x, s32 y)
+{
+ s64 result;
+
+ result = x;
+ result *= y;
+ result /= 256;
+ return result;
+}
+
+s16 sub_80D8B1C(s16 x, s16 y)
+{
+ if (y == 0)
+ {
+ return 0;
+ }
+ return (x << 8) / y;
+}
+
+s16 sub_80D8B40(u8 s, s16 x, s16 y)
+{
+ if (y == 0)
+ {
+ return 0;
+ }
+ return (x << s) / y;
+}
+
+s32 sub_80D8B68(s32 x, s32 y)
+{
+ s64 _x;
+
+ if (y == 0)
+ {
+ return 0;
+ }
+ _x = x;
+ _x *= 256;
+ return _x / y;
+}
+
+s16 sub_80D8B90(s16 y)
+{
+ s32 x;
+
+ x = 0x10000;
+ return x / y;
+}
+
+s16 sub_80D8BA8(u8 s, s16 y)
+{
+ s32 x;
+
+ x = 0x100 << s;
+ return x / y;
+}
+
+s32 sub_80D8BC8(s32 y)
+{
+ s64 x;
+
+ x = 0x10000;
+ return x / y;
+}
diff --git a/src/money.c b/src/money.c
new file mode 100644
index 000000000..6d9a0fce9
--- /dev/null
+++ b/src/money.c
@@ -0,0 +1,140 @@
+#include "global.h"
+#include "event_data.h"
+#include "text.h"
+#include "string_util.h"
+#include "menu.h"
+#include "text_window.h"
+
+extern const u8 gText_PokedollarVar1[];
+extern const u8 gUnknown_8419CE7[];
+
+#define MAX_MONEY 999999
+
+EWRAM_DATA static u8 sMoneyBoxWindowId = 0;
+
+u32 GetMoney(u32* moneyPtr)
+{
+ return *moneyPtr ^ gSaveBlock2Ptr->encryptionKey;
+}
+
+void SetMoney(u32* moneyPtr, u32 newValue)
+{
+ *moneyPtr = gSaveBlock2Ptr->encryptionKey ^ newValue;
+}
+
+bool8 IsEnoughMoney(u32* moneyPtr, u32 cost)
+{
+ if (GetMoney(moneyPtr) >= cost)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+void AddMoney(u32* moneyPtr, u32 toAdd)
+{
+ u32 toSet = GetMoney(moneyPtr);
+
+ // can't have more money than MAX
+ if (toSet + toAdd > MAX_MONEY)
+ {
+ toSet = MAX_MONEY;
+ }
+ else
+ {
+ toSet += toAdd;
+ // check overflow, can't have less money after you receive more
+ if (toSet < GetMoney(moneyPtr))
+ toSet = MAX_MONEY;
+ }
+
+ SetMoney(moneyPtr, toSet);
+}
+
+void RemoveMoney(u32* moneyPtr, u32 toSub)
+{
+ u32 toSet = GetMoney(moneyPtr);
+
+ // can't subtract more than you already have
+ if (toSet < toSub)
+ toSet = 0;
+ else
+ toSet -= toSub;
+
+ SetMoney(moneyPtr, toSet);
+}
+
+bool8 IsEnoughForCostInVar0x8005(void)
+{
+ return IsEnoughMoney(&gSaveBlock1Ptr->money, gSpecialVar_0x8005);
+}
+
+void SubtractMoneyFromVar0x8005(void)
+{
+ RemoveMoney(&gSaveBlock1Ptr->money, gSpecialVar_0x8005);
+}
+
+void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed)
+{
+ u8 *txtPtr;
+ s32 strLength;
+
+ ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_LEFT_ALIGN, 6);
+
+ strLength = 6 - StringLength(gStringVar1);
+ txtPtr = gStringVar4;
+
+ while (strLength-- != 0)
+ *(txtPtr++) = 0;
+
+ StringExpandPlaceholders(txtPtr, gText_PokedollarVar1);
+ AddTextPrinterParameterized(windowId, 0, gStringVar4, 64 - GetStringWidth(0, gStringVar4, 0), 0xC, speed, NULL);
+}
+
+void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed)
+{
+ u8 *txtPtr;
+ s32 strLength;
+
+ ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_LEFT_ALIGN, 6);
+
+ strLength = 6 - StringLength(gStringVar1);
+ txtPtr = gStringVar4;
+
+ while (strLength-- != 0)
+ *(txtPtr++) = 0;
+
+ StringExpandPlaceholders(txtPtr, gText_PokedollarVar1);
+ AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, speed, NULL);
+}
+
+void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount)
+{
+ SetWindowBorderStyle(windowId, FALSE, tileStart, pallete);
+ AddTextPrinterParameterized(windowId, 2, gUnknown_8419CE7, 0, 0, 0xFF, 0);
+ PrintMoneyAmountInMoneyBox(windowId, amount, 0);
+}
+
+void ChangeAmountInMoneyBox(int amount)
+{
+ PrintMoneyAmountInMoneyBox(sMoneyBoxWindowId, amount, 0);
+}
+
+void DrawMoneyBox(int amount, u8 x, u8 y)
+{
+ struct WindowTemplate template, template2;
+
+ SetWindowTemplateFields(&template, 0, x + 1, y + 1, 8, 3, 15, 8);
+ template2 = template;
+ sMoneyBoxWindowId = AddWindow(&template2);
+ FillWindowPixelBuffer(sMoneyBoxWindowId, 0);
+ PutWindowTilemap(sMoneyBoxWindowId);
+ sub_814FF2C(sMoneyBoxWindowId, 0x21D, 0xD0);
+ PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x21D, 13, amount);
+}
+
+void HideMoneyBox(void)
+{
+ sub_810F4D8(sMoneyBoxWindowId, FALSE);
+ CopyWindowToVram(sMoneyBoxWindowId, 2);
+ RemoveWindow(sMoneyBoxWindowId);
+}
diff --git a/src/text_printer.c b/src/text_printer.c
index a6e55ef1c..04de1af4c 100644
--- a/src/text_printer.c
+++ b/src/text_printer.c
@@ -48,7 +48,7 @@ void DeactivateAllTextPrinters (void)
sTextPrinters[printer].sub_union.sub.active = 0;
}
-u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16))
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16))
{
struct TextSubPrinter subPrinter;
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 2e3010d1f..5ee29a4f6 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -671,7 +671,7 @@ gUnknown_20370BE: @ 20370BE
gUnknown_20370C0: @ 20370C0
.space 0x2
-gUnknown_20370C2: @ 20370C2
+gSpecialVar_0x8005: @ 20370C2
.space 0x2
gUnknown_20370C4: @ 20370C4
@@ -1115,9 +1115,9 @@ gUnknown_2039988: @ 2039988
gUnknown_203998C: @ 203998C
.space 0x4
-gUnknown_2039990: @ 2039990
- .space 0x4
+ .include "src/money.o"
+ .align 2
gUnknown_2039994: @ 2039994
.space 0x2
@@ -1220,9 +1220,9 @@ gUnknown_2039A20: @ 2039A20
gUnknown_2039A24: @ 2039A24
.space 0x4
-gUnknown_2039A28: @ 2039A28
- .space 0x4
+ .include "src/coins.o"
+ .align 2
gUnknown_2039A2C: @ 2039A2C
.space 0x4