summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/item.s56
-rw-r--r--asm/item_menu.s10
-rw-r--r--asm/item_use.s4
-rw-r--r--asm/new_game.s2
-rw-r--r--asm/party_menu.s2
-rw-r--r--data/data_835B488.s2
-rw-r--r--data/data_83FECCC.s4
-rw-r--r--data/graphics.s5
-rw-r--r--graphics/tm_case/unk_8E99118.pngbin0 -> 99 bytes
-rw-r--r--include/strings.h23
-rw-r--r--include/tm_case.h8
-rw-r--r--src/tm_case.c362
12 files changed, 245 insertions, 233 deletions
diff --git a/asm/item.s b/asm/item.s
index 19e87ad10..49722bbea 100644
--- a/asm/item.s
+++ b/asm/item.s
@@ -1577,12 +1577,12 @@ ItemId_GetItem: @ 809A8BC
lsrs r0, 16
movs r1, 0x2C
muls r0, r1
- ldr r1, _0809A8D8 @ =gUnknown_83DB028
+ ldr r1, _0809A8D8 @ =gItems
adds r0, r1
pop {r1}
bx r1
.align 2, 0
-_0809A8D8: .4byte gUnknown_83DB028
+_0809A8D8: .4byte gItems
thumb_func_end ItemId_GetItem
thumb_func_start itemid_get_number
@@ -1590,7 +1590,7 @@ itemid_get_number: @ 809A8DC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A8FC @ =gUnknown_83DB028
+ ldr r4, _0809A8FC @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1602,7 +1602,7 @@ itemid_get_number: @ 809A8DC
pop {r1}
bx r1
.align 2, 0
-_0809A8FC: .4byte gUnknown_83DB028
+_0809A8FC: .4byte gItems
thumb_func_end itemid_get_number
thumb_func_start itemid_get_market_price
@@ -1610,7 +1610,7 @@ itemid_get_market_price: @ 809A900
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A920 @ =gUnknown_83DB028
+ ldr r4, _0809A920 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1622,7 +1622,7 @@ itemid_get_market_price: @ 809A900
pop {r1}
bx r1
.align 2, 0
-_0809A920: .4byte gUnknown_83DB028
+_0809A920: .4byte gItems
thumb_func_end itemid_get_market_price
thumb_func_start ItemId_GetHoldEffect
@@ -1630,7 +1630,7 @@ ItemId_GetHoldEffect: @ 809A924
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A944 @ =gUnknown_83DB028
+ ldr r4, _0809A944 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1642,7 +1642,7 @@ ItemId_GetHoldEffect: @ 809A924
pop {r1}
bx r1
.align 2, 0
-_0809A944: .4byte gUnknown_83DB028
+_0809A944: .4byte gItems
thumb_func_end ItemId_GetHoldEffect
thumb_func_start ItemId_GetHoldEffectParam
@@ -1650,7 +1650,7 @@ ItemId_GetHoldEffectParam: @ 809A948
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A968 @ =gUnknown_83DB028
+ ldr r4, _0809A968 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1662,7 +1662,7 @@ ItemId_GetHoldEffectParam: @ 809A948
pop {r1}
bx r1
.align 2, 0
-_0809A968: .4byte gUnknown_83DB028
+_0809A968: .4byte gItems
thumb_func_end ItemId_GetHoldEffectParam
thumb_func_start ItemId_GetDescription
@@ -1670,7 +1670,7 @@ ItemId_GetDescription: @ 809A96C
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A98C @ =gUnknown_83DB028
+ ldr r4, _0809A98C @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1683,7 +1683,7 @@ ItemId_GetDescription: @ 809A96C
pop {r1}
bx r1
.align 2, 0
-_0809A98C: .4byte gUnknown_83DB028
+_0809A98C: .4byte gItems
thumb_func_end ItemId_GetDescription
thumb_func_start itemid_is_unique
@@ -1691,7 +1691,7 @@ itemid_is_unique: @ 809A990
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A9B0 @ =gUnknown_83DB028
+ ldr r4, _0809A9B0 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1703,7 +1703,7 @@ itemid_is_unique: @ 809A990
pop {r1}
bx r1
.align 2, 0
-_0809A9B0: .4byte gUnknown_83DB028
+_0809A9B0: .4byte gItems
thumb_func_end itemid_is_unique
thumb_func_start itemid_get_x19
@@ -1711,7 +1711,7 @@ itemid_get_x19: @ 809A9B4
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A9D4 @ =gUnknown_83DB028
+ ldr r4, _0809A9D4 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1723,7 +1723,7 @@ itemid_get_x19: @ 809A9B4
pop {r1}
bx r1
.align 2, 0
-_0809A9D4: .4byte gUnknown_83DB028
+_0809A9D4: .4byte gItems
thumb_func_end itemid_get_x19
thumb_func_start ItemId_GetPocket
@@ -1731,7 +1731,7 @@ ItemId_GetPocket: @ 809A9D8
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809A9F8 @ =gUnknown_83DB028
+ ldr r4, _0809A9F8 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1743,7 +1743,7 @@ ItemId_GetPocket: @ 809A9D8
pop {r1}
bx r1
.align 2, 0
-_0809A9F8: .4byte gUnknown_83DB028
+_0809A9F8: .4byte gItems
thumb_func_end ItemId_GetPocket
thumb_func_start ItemId_GetType
@@ -1751,7 +1751,7 @@ ItemId_GetType: @ 809A9FC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809AA1C @ =gUnknown_83DB028
+ ldr r4, _0809AA1C @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1763,7 +1763,7 @@ ItemId_GetType: @ 809A9FC
pop {r1}
bx r1
.align 2, 0
-_0809AA1C: .4byte gUnknown_83DB028
+_0809AA1C: .4byte gItems
thumb_func_end ItemId_GetType
thumb_func_start ItemId_GetFieldFunc
@@ -1771,7 +1771,7 @@ ItemId_GetFieldFunc: @ 809AA20
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809AA40 @ =gUnknown_83DB028
+ ldr r4, _0809AA40 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1784,7 +1784,7 @@ ItemId_GetFieldFunc: @ 809AA20
pop {r1}
bx r1
.align 2, 0
-_0809AA40: .4byte gUnknown_83DB028
+_0809AA40: .4byte gItems
thumb_func_end ItemId_GetFieldFunc
thumb_func_start ItemId_GetBattleUsage
@@ -1792,7 +1792,7 @@ ItemId_GetBattleUsage: @ 809AA44
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809AA64 @ =gUnknown_83DB028
+ ldr r4, _0809AA64 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1805,7 +1805,7 @@ ItemId_GetBattleUsage: @ 809AA44
pop {r1}
bx r1
.align 2, 0
-_0809AA64: .4byte gUnknown_83DB028
+_0809AA64: .4byte gItems
thumb_func_end ItemId_GetBattleUsage
thumb_func_start ItemId_GetBattleFunc
@@ -1813,7 +1813,7 @@ ItemId_GetBattleFunc: @ 809AA68
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809AA88 @ =gUnknown_83DB028
+ ldr r4, _0809AA88 @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1826,7 +1826,7 @@ ItemId_GetBattleFunc: @ 809AA68
pop {r1}
bx r1
.align 2, 0
-_0809AA88: .4byte gUnknown_83DB028
+_0809AA88: .4byte gItems
thumb_func_end ItemId_GetBattleFunc
thumb_func_start ItemId_GetSecondaryId
@@ -1834,7 +1834,7 @@ ItemId_GetSecondaryId: @ 809AA8C
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r4, _0809AAAC @ =gUnknown_83DB028
+ ldr r4, _0809AAAC @ =gItems
bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
@@ -1847,7 +1847,7 @@ ItemId_GetSecondaryId: @ 809AA8C
pop {r1}
bx r1
.align 2, 0
-_0809AAAC: .4byte gUnknown_83DB028
+_0809AAAC: .4byte gItems
thumb_func_end ItemId_GetSecondaryId
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/item_menu.s b/asm/item_menu.s
index b9dc2669a..7ebe3b1cd 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -4763,7 +4763,7 @@ sub_810A434: @ 810A434
ldr r1, _0810A444 @ =sub_810A45C
movs r0, 0x1
movs r2, 0
- bl sub_81317F8
+ bl InitTMCase
pop {r0}
bx r0
.align 2, 0
@@ -4892,7 +4892,7 @@ sub_810A52C: @ 810A52C
ldr r1, _0810A53C @ =sub_810A554
movs r0, 0x3
movs r2, 0
- bl sub_81317F8
+ bl InitTMCase
pop {r0}
bx r0
.align 2, 0
@@ -5037,7 +5037,7 @@ sub_810A654: @ 810A654
ldr r1, _0810A664 @ =sub_810A67C
movs r0, 0x2
movs r2, 0
- bl sub_81317F8
+ bl InitTMCase
pop {r0}
bx r0
.align 2, 0
@@ -6993,7 +6993,7 @@ _0810B68C:
bl sub_810AECC
ldr r0, _0810B6D4 @ =gUnknown_203AD10
ldr r1, [r0]
- ldr r0, _0810B6D8 @ =sub_8132E64
+ ldr r0, _0810B6D8 @ =PokeDude_InitTMCase
str r0, [r1]
mov r0, r9
subs r0, 0x8
@@ -7003,7 +7003,7 @@ _0810B68C:
b _0810B6E6
.align 2, 0
_0810B6D4: .4byte gUnknown_203AD10
-_0810B6D8: .4byte sub_8132E64
+_0810B6D8: .4byte PokeDude_InitTMCase
_0810B6DC: .4byte sub_810B070
_0810B6E0:
ldrh r0, [r6, 0x10]
diff --git a/asm/item_use.s b/asm/item_use.s
index 2b425dec2..79dcb290a 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -1048,7 +1048,7 @@ sub_80A17D4: @ 80A17D4
ldr r1, _080A17E4 @ =UseFameCheckerFromMenu
movs r0, 0
movs r2, 0
- bl sub_81317F8
+ bl InitTMCase
pop {r0}
bx r0
.align 2, 0
@@ -1071,7 +1071,7 @@ sub_80A17E8: @ 80A17E8
ldr r1, _080A181C @ =c2_exit_to_overworld_2_switch
movs r0, 0
movs r2, 0x1
- bl sub_81317F8
+ bl InitTMCase
adds r0, r4, 0
bl DestroyTask
_080A1812:
diff --git a/asm/new_game.s b/asm/new_game.s
index d1d5a1487..63bfd9523 100644
--- a/asm/new_game.s
+++ b/asm/new_game.s
@@ -183,7 +183,7 @@ sub_8054A28: @ 8054A28
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl sub_81089BC
- bl sub_81320AC
+ bl ResetTMCaseCursorPos
bl sub_813D6E4
bl sub_811089C
bl Random
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 085d0da85..5a4a458bd 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -12606,7 +12606,7 @@ sub_8124DA0: @ 8124DA0
movs r0, 0x5
movs r1, 0
movs r2, 0xFF
- bl sub_81317F8
+ bl InitTMCase
pop {r0}
bx r0
thumb_func_end sub_8124DA0
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 1377d8599..2c8a853a8 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -568,7 +568,7 @@ gUnknown_83D427C:: @ 83D427C
gUnknown_83D4294:: @ 83D4294
.incbin "baserom.gba", 0x3D4294, 0x6D94
-gUnknown_83DB028:: @ 83DB028
+gItems:: @ 83DB028
.incbin "baserom.gba", 0x3DB028, 0x4074
gUnknown_83DF09C:: @ 83DF09C
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index dab75e5b5..a212d0acb 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -517,6 +517,7 @@ gUnknown_8415A08:: @ 8415A08
gUnknown_8415A10:: @ 8415A10
.incbin "baserom.gba", 0x415A10, 0x10
+ @ strings
gExpandedPlaceholder_Empty:: @ 8415A20
.incbin "baserom.gba", 0x415A20, 0x1
@@ -2376,8 +2377,9 @@ gUnknown_841EDCA:: @ 841EDCA
.incbin "baserom.gba", 0x41EDCA, 0x61
gUnknown_841EE2B:: @ 841EE2B
- .incbin "baserom.gba", 0x41EE2B, 0x19
+ .incbin "baserom.gba", 0x41EE2B, 0x17
+ .align 2
gUnknown_841EE44:: @ 841EE44
.incbin "baserom.gba", 0x41EE44, 0x20
diff --git a/data/graphics.s b/data/graphics.s
index a1e421f2c..5b54a94e2 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16072,7 +16072,10 @@ gUnknown_8E985D8:: @ 8E985D8
.incbin "baserom.gba", 0xE985D8, 0xB40 @UNKNOWN, FALSEPOSITIVE?
gUnknown_8E99118:: @ 8E99118
- .incbin "baserom.gba", 0xE99118, 0xE0 @UNKNOWN
+ .incbin "graphics/tm_case/unk_8E99118.4bpp"
+
+gUnknown_8E99198::
+ .incbin "baserom.gba", 0xE99198, 0x60 @UNKNOWN
gUnknown_8E991F8:: @ 8E991F8
.incbin "baserom.gba", 0xE991F8, 0x674
diff --git a/graphics/tm_case/unk_8E99118.png b/graphics/tm_case/unk_8E99118.png
new file mode 100644
index 000000000..426e404fe
--- /dev/null
+++ b/graphics/tm_case/unk_8E99118.png
Binary files differ
diff --git a/include/strings.h b/include/strings.h
index 40021a01d..c2173242f 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -92,4 +92,27 @@ extern const u8 gText_Coins[];
extern const u8 gText_EggNickname[];
extern const u8 gText_Pokemon[];
+extern const u8 gUnknown_84161A0[];
+extern const u8 gUnknown_84161B2[];
+extern const u8 gUnknown_84161C8[];
+extern const u8 gUnknown_8416213[];
+extern const u8 gUnknown_8416226[];
+extern const u8 gFameCheckerText_ListMenuCursor[];
+extern const u8 gUnknown_84162B9[];
+extern const u8 gUnknown_8416301[];
+extern const u8 gUnknown_841632A[];
+extern const u8 gUnknown_841635E[];
+extern const u8 gUnknown_84166D3[];
+extern const u8 gUnknown_84166DB[];
+extern const u8 gUnknown_84166E1[];
+extern const u8 gUnknown_84166FF[];
+extern const u8 gUnknown_8416703[];
+extern const u8 gUnknown_84168F1[];
+extern const u8 gUnknown_8416911[];
+extern const u8 gUnknown_8416936[];
+extern const u8 gUnknown_8416959[];
+extern const u8 gUnknown_841C587[];
+extern const u8 gUnknown_841C693[];
+extern const u16 gUnknown_841F408[];
+
#endif //GUARD_STRINGS_H
diff --git a/include/tm_case.h b/include/tm_case.h
new file mode 100644
index 000000000..f77eae457
--- /dev/null
+++ b/include/tm_case.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_TM_CASE_H
+#define GUARD_TM_CASE_H
+
+void InitTMCase(u8 a0, void (* a1)(void), u8 a2);
+void ResetTMCaseCursorPos(void);
+void PokeDude_InitTMCase(void);
+
+#endif //GUARD_TM_CASE_H
diff --git a/src/tm_case.c b/src/tm_case.c
index 6bb74407b..94b3278ab 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -24,6 +24,8 @@
#include "data2.h"
#include "scanline_effect.h"
#include "sound.h"
+#include "strings.h"
+#include "tm_case.h"
#include "menu_indicators.h"
#include "constants/items.h"
#include "constants/songs.h"
@@ -61,103 +63,77 @@ struct UnkStruct_203B11C
u16 unk_162;
};
-EWRAM_DATA struct UnkStruct_203B10C gUnknown_203B10C = {};
-EWRAM_DATA struct UnkStruct_203B118 * gUnknown_203B118 = NULL;
-EWRAM_DATA struct UnkStruct_203B11C * gUnknown_203B11C = NULL;
-EWRAM_DATA void * gUnknown_203B120 = NULL; // tilemap buffer
-EWRAM_DATA struct ListMenuItem * gUnknown_203B124 = NULL;
-EWRAM_DATA u8 (* gUnknown_203B128)[29] = NULL;
-EWRAM_DATA u16 * gUnknown_203B12C = NULL;
-
-void sub_8131894(void);
-bool8 sub_81318C0(void);
-void sub_8131A8C(void);
-void sub_8131AB8(void);
-bool8 sub_8131B20(void);
-void sub_8131C10(void);
-void sub_8131C50(void);
-void sub_8131D48(u8 * dest, u16 itemId);
-void sub_8131E18(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-void sub_8131E68(u8 windowId, s32 itemId, u8 y);
-void sub_8131F0C(s32 itemIndex);
-void sub_8131FB0(u8 a0, u8 a1);
-void sub_8132018(void);
-void sub_81320BC(void);
-void sub_8132120(void);
-void sub_8132170(void);
-void sub_813226C(u8 taskId);
-void sub_81322D4(u8 taskId);
-void SelectTMAction_FromFieldBag(u8 taskId);
-void sub_8132568(u8 taskId);
-void sub_81325F0(u8 taskId);
-void sub_813265C(u8 taskId);
-void sub_81326F8(u8 taskId);
-void sub_8132714(u8 taskId);
-void sub_8132758(u8 taskId);
-void sub_8132780(u8 taskId);
-void sub_81327FC(u8 taskId);
-void sub_8132868(u8 taskId);
-void sub_81328B8(u8 taskId);
-void SelectTMAction_FromSellMenu(u8 taskId);
-void sub_81329C4(u8 taskId);
-void sub_8132A34(u8 taskId);
-void sub_8132A48(u8 taskId);
-void sub_8132AAC(u8 taskId);
-void sub_8132B5C(s16 quantity, s32 value);
-void sub_8132BC8(u8 taskId);
-void sub_8132CAC(u8 taskId);
-void sub_8132D34(u8 taskId);
-void sub_8132E0C(u8 taskId);
-void sub_8132F20(u8 taskId);
-void sub_8132F60(u8 taskId);
-void sub_8133244(void);
-void sub_81332EC(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx);
-void sub_8133354(u8 windowId);
-void sub_8133368(u8 windowId);
-void sub_813337C(u8 taskId, u8 windowId, const u8 * str, TaskFunc func);
-void sub_81333C4(void);
-void sub_8133404(void);
-void sub_8133444(u16 itemId);
-void sub_81335B0(u8 windowId, u8 x, u8 y);
-void sub_81335E0(void);
-void sub_8133604(u8 taskId, const TaskFunc * ptrs);
-u8 sub_8133630(u8 * a0, u8 a1);
-void sub_8133664(u8 * a0);
-u8 sub_813368C(u16 itemId);
-void sub_8133714(struct Sprite * sprite, u8 var);
-void sub_8133730(u8 type);
-void sub_8133790(struct Sprite * sprite, u8 var);
-void sub_81337E4(u8 a0, u16 itemId);
-void sub_8133810(struct Sprite * sprite);
-void sub_81338A8(void);
-
-// data_83FECCC
-extern const u8 gUnknown_84161A0[];
-extern const u8 gUnknown_84161B2[];
-extern const u8 gUnknown_84161C8[];
-extern const u8 gUnknown_8416213[];
-extern const u8 gUnknown_8416226[];
-extern const u8 gFameCheckerText_ListMenuCursor[];
-extern const u8 gUnknown_84162B9[];
-extern const u8 gUnknown_8416301[];
-extern const u8 gUnknown_841632A[];
-extern const u8 gUnknown_841635E[];
-extern const u8 gUnknown_84166D3[];
-extern const u8 gUnknown_84166DB[];
-extern const u8 gUnknown_84166E1[];
-extern const u8 gUnknown_84166FF[];
-extern const u8 gUnknown_8416703[];
-extern const u8 gUnknown_84168F1[];
-extern const u8 gUnknown_8416911[];
-extern const u8 gUnknown_8416936[];
-extern const u8 gUnknown_8416959[];
-extern const u8 gUnknown_841C587[];
-extern const u8 gUnknown_841C693[];
-
-extern const u16 gUnknown_841F408[];
-
-// my rodata
-const struct BgTemplate gUnknown_8463134[] = {
+static EWRAM_DATA struct UnkStruct_203B10C gUnknown_203B10C = {};
+static EWRAM_DATA struct UnkStruct_203B118 * gUnknown_203B118 = NULL;
+static EWRAM_DATA struct UnkStruct_203B11C * gUnknown_203B11C = NULL;
+static EWRAM_DATA void * gUnknown_203B120 = NULL; // tilemap buffer
+static EWRAM_DATA struct ListMenuItem * gUnknown_203B124 = NULL;
+static EWRAM_DATA u8 (* gUnknown_203B128)[29] = NULL;
+static EWRAM_DATA u16 * gUnknown_203B12C = NULL;
+
+static void sub_8131894(void);
+static bool8 sub_81318C0(void);
+static void sub_8131A8C(void);
+static void sub_8131AB8(void);
+static bool8 sub_8131B20(void);
+static void sub_8131C10(void);
+static void sub_8131C50(void);
+static void GetTMNumberAndMoveString(u8 * dest, u16 itemId);
+static void sub_8131E18(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+static void sub_8131E68(u8 windowId, s32 itemId, u8 y);
+static void sub_8131F0C(s32 itemIndex);
+static void sub_8131FB0(u8 a0, u8 a1);
+static void sub_8132018(void);
+static void sub_81320BC(void);
+static void sub_8132120(void);
+static void sub_8132170(void);
+static void sub_813226C(u8 taskId);
+static void sub_81322D4(u8 taskId);
+static void SelectTMAction_FromFieldBag(u8 taskId);
+static void sub_8132568(u8 taskId);
+static void sub_81325F0(u8 taskId);
+static void sub_813265C(u8 taskId);
+static void sub_81326F8(u8 taskId);
+static void sub_8132714(u8 taskId);
+static void sub_8132758(u8 taskId);
+static void sub_8132780(u8 taskId);
+static void sub_81327FC(u8 taskId);
+static void sub_8132868(u8 taskId);
+static void sub_81328B8(u8 taskId);
+static void SelectTMAction_FromSellMenu(u8 taskId);
+static void sub_81329C4(u8 taskId);
+static void sub_8132A34(u8 taskId);
+static void sub_8132A48(u8 taskId);
+static void sub_8132AAC(u8 taskId);
+static void sub_8132B5C(s16 quantity, s32 value);
+static void sub_8132BC8(u8 taskId);
+static void sub_8132CAC(u8 taskId);
+static void sub_8132D34(u8 taskId);
+static void sub_8132E0C(u8 taskId);
+static void sub_8132F20(u8 taskId);
+static void sub_8132F60(u8 taskId);
+static void sub_8133244(void);
+static void sub_81332EC(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx);
+static void sub_8133354(u8 windowId);
+static void sub_8133368(u8 windowId);
+static void sub_813337C(u8 taskId, u8 windowId, const u8 * str, TaskFunc func);
+static void sub_81333C4(void);
+static void sub_8133404(void);
+static void sub_8133444(u16 itemId);
+static void sub_81335B0(u8 windowId, u8 x, u8 y);
+static void sub_81335E0(void);
+static void sub_8133604(u8 taskId, const TaskFunc * ptrs);
+static u8 sub_8133630(u8 * a0, u8 a1);
+static void sub_8133664(u8 * a0);
+static u8 sub_813368C(u16 itemId);
+static void sub_8133714(struct Sprite * sprite, u8 var);
+static void sub_8133730(u8 type);
+static void sub_8133790(struct Sprite * sprite, u8 var);
+static void sub_81337E4(u8 a0, u16 itemId);
+static void sub_8133810(struct Sprite * sprite);
+static void sub_81338A8(void);
+
+static const struct BgTemplate gUnknown_8463134[] = {
{
.bg = 0,
.charBaseIndex = 0,
@@ -185,36 +161,36 @@ const struct BgTemplate gUnknown_8463134[] = {
}
};
-void (*const gUnknown_8463140[])(u8 taskId) = {
+static void (*const gUnknown_8463140[])(u8 taskId) = {
SelectTMAction_FromFieldBag,
sub_8132868,
SelectTMAction_FromSellMenu,
sub_81328B8
};
-const struct MenuAction gUnknown_8463150[] = {
+static const struct MenuAction gUnknown_8463150[] = {
{gUnknown_84161A0, sub_81325F0},
{gUnknown_84161B2, sub_813265C},
{gUnknown_84161C8, sub_81327FC},
};
-const u8 gUnknown_8463168[] = {0, 1, 2};
-const u8 gUnknown_846316B[] = {1, 2, 0};
-const TaskFunc gUnknown_8463170[] = {sub_8132CAC, sub_8132A48};
+static const u8 gUnknown_8463168[] = {0, 1, 2};
+static const u8 gUnknown_846316B[] = {1, 2, 0};
+static const TaskFunc gUnknown_8463170[] = {sub_8132CAC, sub_8132A48};
-const u8 gUnknown_8463178[] = _("{CLEAR_TO 18}");
-const u8 gUnknown_846317C[] = _(" ");
+static const u8 gUnknown_8463178[] = _("{CLEAR_TO 18}");
+static const u8 gUnknown_846317C[] = _(" ");
-ALIGNED(4) const u16 gUnknown_8463180[] = {RGB(8, 8, 8), RGB(30, 16, 6)};
+static ALIGNED(4) const u16 gUnknown_8463180[] = {RGB(8, 8, 8), RGB(30, 16, 6)};
-const struct TextColor gUnknown_8463184[] = {
+static const struct TextColor gUnknown_8463184[] = {
{0, 1, 2},
{0, 2, 3},
{0, 3, 6},
{0, 14, 10}
};
-const struct WindowTemplate gUnknown_8463190[] = {
+static const struct WindowTemplate gUnknown_8463190[] = {
{0x00, 0x0a, 0x01, 0x13, 0x0a, 0x0f, 0x0081},
{0x00, 0x0c, 0x0c, 0x12, 0x08, 0x0a, 0x013f},
{0x01, 0x05, 0x0f, 0x0f, 0x04, 0x0d, 0x01f9},
@@ -227,40 +203,40 @@ const struct WindowTemplate gUnknown_8463190[] = {
DUMMY_WIN_TEMPLATE
};
-const struct WindowTemplate gUnknown_84631E0 = {0x01, 0x15, 0x09, 0x06, 0x04, 0x0f, 0x0335};
+static const struct WindowTemplate gUnknown_84631E0 = {0x01, 0x15, 0x09, 0x06, 0x04, 0x0f, 0x0335};
-const struct WindowTemplate gUnknown_84631E8[] = {
+static const struct WindowTemplate gUnknown_84631E8[] = {
{0x01, 0x16, 0x0d, 0x07, 0x06, 0x0f, 0x01cf},
{0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01cf}
};
-const struct OamData gOamData_84631F8 = {
+static const struct OamData gOamData_84631F8 = {
.size = 2,
.priority = 2
};
-const union AnimCmd gUnknown_8463200[] = {
+static const union AnimCmd gUnknown_8463200[] = {
ANIMCMD_FRAME(0, 0),
ANIMCMD_END
};
-const union AnimCmd gUnknown_8463208[] = {
+static const union AnimCmd gUnknown_8463208[] = {
ANIMCMD_FRAME(16, 0),
ANIMCMD_END
};
-const union AnimCmd *const gUnknown_8463210[] = {
+static const union AnimCmd *const gUnknown_8463210[] = {
gUnknown_8463200,
gUnknown_8463208
};
-const struct CompressedSpriteSheet gUnknown_8463218 = {
+static const struct CompressedSpriteSheet gUnknown_8463218 = {
(const void *)gUnknown_8E84D90,
0x400,
400
};
-const struct SpriteTemplate gUnknown_8463220 = {
+static const struct SpriteTemplate gUnknown_8463220 = {
400,
400,
&gOamData_84631F8,
@@ -270,7 +246,7 @@ const struct SpriteTemplate gUnknown_8463220 = {
SpriteCallbackDummy
};
-const u16 gUnknown_8463238[] = {
+static const u16 gUnknown_8463238[] = {
0x000,
0x090,
0x080,
@@ -291,7 +267,7 @@ const u16 gUnknown_8463238[] = {
0x0f0
};
-void sub_81317F8(u8 a0, void (* a1)(void), u8 a2)
+void InitTMCase(u8 a0, void (* a1)(void), u8 a2)
{
sub_8131A8C();
gUnknown_203B118 = Alloc(sizeof(struct UnkStruct_203B118));
@@ -308,7 +284,7 @@ void sub_81317F8(u8 a0, void (* a1)(void), u8 a2)
SetMainCallback2(sub_8131894);
}
-void sub_8131864(void)
+static void sub_8131864(void)
{
RunTasks();
AnimateSprites();
@@ -317,14 +293,14 @@ void sub_8131864(void)
UpdatePaletteFade();
}
-void sub_8131880(void)
+static void sub_8131880(void)
{
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
-void sub_8131894(void)
+static void sub_8131894(void)
{
while (1)
{
@@ -337,7 +313,7 @@ void sub_8131894(void)
}
}
-bool8 sub_81318C0(void)
+static bool8 sub_81318C0(void)
{
u8 taskId;
@@ -437,7 +413,7 @@ bool8 sub_81318C0(void)
return FALSE;
}
-void sub_8131A8C(void)
+static void sub_8131A8C(void)
{
gUnknown_203B118 = NULL;
gUnknown_203B120 = NULL;
@@ -446,7 +422,7 @@ void sub_8131A8C(void)
gUnknown_203B12C = NULL;
}
-void sub_8131AB8(void)
+static void sub_8131AB8(void)
{
void ** ptr;
sub_80BF7C8();
@@ -464,7 +440,7 @@ void sub_8131AB8(void)
ShowBg(2);
}
-bool8 sub_8131B20(void)
+static bool8 sub_8131B20(void)
{
switch (gUnknown_203B118->unk_12)
{
@@ -504,21 +480,21 @@ bool8 sub_8131B20(void)
return FALSE;
}
-void sub_8131C10(void)
+static void sub_8131C10(void)
{
struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1];
gUnknown_203B124 = Alloc((pocket->capacity + 1) * sizeof(struct ListMenuItem));
gUnknown_203B128 = Alloc(gUnknown_203B118->unk_06 * 29);
}
-void sub_8131C50(void)
+static void sub_8131C50(void)
{
struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1];
u16 i;
for (i = 0; i < gUnknown_203B118->unk_06; i++)
{
- sub_8131D48(gUnknown_203B128[i], pocket->itemSlots[i].itemId);
+ GetTMNumberAndMoveString(gUnknown_203B128[i], pocket->itemSlots[i].itemId);
gUnknown_203B124[i].unk_00 = gUnknown_203B128[i];
gUnknown_203B124[i].unk_04 = i;
}
@@ -544,7 +520,7 @@ void sub_8131C50(void)
gUnknown_3005E70.scrollMultiple = 0;
}
-void sub_8131D48(u8 * dest, u16 itemId)
+static void GetTMNumberAndMoveString(u8 * dest, u16 itemId)
{
StringCopy(gStringVar4, gUnknown_84166FF);
if (itemId >= ITEM_HM01)
@@ -566,7 +542,7 @@ void sub_8131D48(u8 * dest, u16 itemId)
StringCopy(dest, gStringVar4);
}
-void sub_8131E18(s32 itemIndex, bool8 onInit, struct ListMenu *list)
+static void sub_8131E18(s32 itemIndex, bool8 onInit, struct ListMenu *list)
{
u16 itemId;
@@ -584,7 +560,7 @@ void sub_8131E18(s32 itemIndex, bool8 onInit, struct ListMenu *list)
sub_8133444(itemId);
}
-void sub_8131E68(u8 windowId, s32 itemId, u8 y)
+static void sub_8131E68(u8 windowId, s32 itemId, u8 y)
{
if (itemId != -2)
{
@@ -601,7 +577,7 @@ void sub_8131E68(u8 windowId, s32 itemId, u8 y)
}
}
-void sub_8131F0C(s32 itemIndex)
+static void sub_8131F0C(s32 itemIndex)
{
const u8 * str;
if (itemIndex != -2)
@@ -616,18 +592,18 @@ void sub_8131F0C(s32 itemIndex)
sub_81332EC(1, 2, str, 2, 3, 1, 0, 0, 0);
}
-void sub_8131F64(s32 a0)
+static void sub_8131F64(s32 a0)
{
sub_80F6B08(2, 0, 12, 30, 8, 2 * a0 + 1);
schedule_bg_copy_tilemap_to_vram(2);
}
-void sub_8131F90(u8 a0, u8 a1)
+static void sub_8131F90(u8 a0, u8 a1)
{
sub_8131FB0(ListMenuGetYCoordForPrintingArrowCursor(a0), a1);
}
-void sub_8131FB0(u8 a0, u8 a1)
+static void sub_8131FB0(u8 a0, u8 a1)
{
if (a1 == 0xFF)
{
@@ -640,18 +616,18 @@ void sub_8131FB0(u8 a0, u8 a1)
}
}
-void sub_8132018(void)
+static void sub_8132018(void)
{
gUnknown_203B118->unk_08 = AddScrollIndicatorArrowPairParametrized(2, 0xA0, 0x08, 0x58, gUnknown_203B118->unk_06 - gUnknown_203B118->unk_05 + 1, 0x6E, 0x6E, &gUnknown_203B10C.unk_0a);
}
-void sub_8132054(void)
+static void sub_8132054(void)
{
gUnknown_203B118->unk_0a = 1;
gUnknown_203B118->unk_08 = AddScrollIndicatorArrowPairParametrized(2, 0x98, 0x48, 0x68, 2, 0x6E, 0x6E, &gUnknown_203B118->unk_0a);
}
-void sub_813208C(void)
+static void sub_813208C(void)
{
if (gUnknown_203B118->unk_08 != 0xFF)
{
@@ -660,13 +636,13 @@ void sub_813208C(void)
}
}
-void sub_81320AC(void)
+void ResetTMCaseCursorPos(void)
{
gUnknown_203B10C.unk_08 = 0;
gUnknown_203B10C.unk_0a = 0;
}
-void sub_81320BC(void)
+static void sub_81320BC(void)
{
struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1];
u16 i;
@@ -682,7 +658,7 @@ void sub_81320BC(void)
gUnknown_203B118->unk_05 = min(gUnknown_203B118->unk_06 + 1, 5);
}
-void sub_8132120(void)
+static void sub_8132120(void)
{
if (gUnknown_203B10C.unk_0a != 0)
{
@@ -698,7 +674,7 @@ void sub_8132120(void)
}
}
-void sub_8132170(void)
+static void sub_8132170(void)
{
u8 i;
if (gUnknown_203B10C.unk_08 > 3)
@@ -712,7 +688,7 @@ void sub_8132170(void)
}
}
-void sub_81321D4(void)
+static void sub_81321D4(void)
{
if (gUnknown_203B118 != NULL)
Free(gUnknown_203B118);
@@ -727,13 +703,13 @@ void sub_81321D4(void)
FreeAllWindowBuffers();
}
-void sub_8132230(u8 taskId)
+static void sub_8132230(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = sub_813226C;
}
-void sub_813226C(u8 taskId)
+static void sub_813226C(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -750,7 +726,7 @@ void sub_813226C(u8 taskId)
}
}
-void sub_81322D4(u8 taskId)
+static void sub_81322D4(u8 taskId)
{
s16 * data = gTasks[taskId].data;
s32 input;
@@ -794,14 +770,14 @@ void sub_81322D4(u8 taskId)
}
}
-void sub_81323E4(u8 taskId)
+static void sub_81323E4(u8 taskId)
{
sub_8131F64(0);
sub_8132018();
gTasks[taskId].func = sub_81322D4;
}
-void SelectTMAction_FromFieldBag(u8 taskId)
+static void SelectTMAction_FromFieldBag(u8 taskId)
{
u8 * strbuf;
sub_8133368(2);
@@ -820,7 +796,7 @@ void SelectTMAction_FromFieldBag(u8 taskId)
AddItemMenuActionTextPrinters(gUnknown_203B118->unk_07, 2, GetMenuCursorDimensionByFont(2, 0), 2, 0, GetFontAttribute(2, 1) + 2, gUnknown_203B118->unk_10, gUnknown_8463150, gUnknown_203B118->unk_0c);
ProgramAndPlaceMenuCursorOnWindow(gUnknown_203B118->unk_07, 2, 0, 2, GetFontAttribute(2, 1) + 2, gUnknown_203B118->unk_10, 0);
strbuf = Alloc(256);
- sub_8131D48(strbuf, gSpecialVar_ItemId);
+ GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId);
StringAppend(strbuf, gUnknown_8416301);
sub_81332EC(2, 2, strbuf, 0, 2, 1, 0, 0, 1);
Free(strbuf);
@@ -834,7 +810,7 @@ void SelectTMAction_FromFieldBag(u8 taskId)
gTasks[taskId].func = sub_8132568;
}
-void sub_8132568(u8 taskId)
+static void sub_8132568(u8 taskId)
{
s8 input;
@@ -857,7 +833,7 @@ void sub_8132568(u8 taskId)
}
}
-void sub_81325F0(u8 taskId)
+static void sub_81325F0(u8 taskId)
{
sub_8133664(&gUnknown_203B118->unk_07);
sub_810F4D8(2, 0);
@@ -877,7 +853,7 @@ void sub_81325F0(u8 taskId)
}
}
-void sub_813265C(u8 taskId)
+static void sub_813265C(u8 taskId)
{
s16 * data = gTasks[taskId].data;
u16 itemId = sub_809A798(POCKET_TM_CASE, data[1]);
@@ -907,19 +883,19 @@ void sub_813265C(u8 taskId)
}
}
-void sub_81326F8(u8 taskId)
+static void sub_81326F8(u8 taskId)
{
sub_813337C(taskId, 2, gUnknown_841632A, sub_8132758);
}
-void sub_8132714(u8 taskId)
+static void sub_8132714(u8 taskId)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gUnknown_841635E);
sub_813337C(taskId, 2, gStringVar4, sub_8132758);
}
-void sub_8132758(u8 taskId)
+static void sub_8132758(u8 taskId)
{
if (JOY_NEW(A_BUTTON))
{
@@ -928,7 +904,7 @@ void sub_8132758(u8 taskId)
}
}
-void sub_8132780(u8 taskId)
+static void sub_8132780(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -945,7 +921,7 @@ void sub_8132780(u8 taskId)
sub_81323E4(taskId);
}
-void sub_81327FC(u8 taskId)
+static void sub_81327FC(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -962,7 +938,7 @@ void sub_81327FC(u8 taskId)
sub_81323E4(taskId);
}
-void sub_8132868(u8 taskId)
+static void sub_8132868(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -977,7 +953,7 @@ void sub_8132868(u8 taskId)
}
}
-void sub_81328B8(u8 taskId)
+static void sub_81328B8(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -992,7 +968,7 @@ void sub_81328B8(u8 taskId)
}
}
-void SelectTMAction_FromSellMenu(u8 taskId)
+static void SelectTMAction_FromSellMenu(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1021,7 +997,7 @@ void SelectTMAction_FromSellMenu(u8 taskId)
}
}
-void sub_81329C4(u8 taskId)
+static void sub_81329C4(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1030,12 +1006,12 @@ void sub_81329C4(u8 taskId)
sub_813337C(taskId, sub_80BF8E4(), gStringVar4, sub_8132A34);
}
-void sub_8132A34(u8 taskId)
+static void sub_8132A34(u8 taskId)
{
sub_8133604(taskId, gUnknown_8463170);
}
-void sub_8132A48(u8 taskId)
+static void sub_8132A48(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1052,7 +1028,7 @@ void sub_8132A48(u8 taskId)
sub_81323E4(taskId);
}
-void sub_8132AAC(u8 taskId)
+static void sub_8132AAC(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1068,7 +1044,7 @@ void sub_8132AAC(u8 taskId)
gTasks[taskId].func = sub_8132BC8;
}
-void sub_8132B5C(s16 quantity, s32 amount)
+static void sub_8132B5C(s16 quantity, s32 amount)
{
FillWindowPixelBuffer(7, 0x11);
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 2);
@@ -1077,7 +1053,7 @@ void sub_8132B5C(s16 quantity, s32 amount)
PrintMoneyAmount(7, 0x38, 0x0A, amount, 0);
}
-void sub_8132BC8(u8 taskId)
+static void sub_8132BC8(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1111,7 +1087,7 @@ void sub_8132BC8(u8 taskId)
}
}
-void sub_8132CAC(u8 taskId)
+static void sub_8132CAC(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1123,7 +1099,7 @@ void sub_8132CAC(u8 taskId)
sub_813337C(taskId, 2, gStringVar4, sub_8132D34);
}
-void sub_8132D34(u8 taskId)
+static void sub_8132D34(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1141,7 +1117,7 @@ void sub_8132D34(u8 taskId)
gTasks[taskId].func = sub_8132E0C;
}
-void sub_8132E0C(u8 taskId)
+static void sub_8132E0C(u8 taskId)
{
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{
@@ -1156,7 +1132,7 @@ void sub_8132E0C(u8 taskId)
}
}
-void sub_8132E64(void)
+void PokeDude_InitTMCase(void)
{
gUnknown_203B11C = AllocZeroed(sizeof(*gUnknown_203B11C));
memcpy(gUnknown_203B11C->bagPocket_TMHM, gSaveBlock1Ptr->bagPocket_TMHM, sizeof(gSaveBlock1Ptr->bagPocket_TMHM));
@@ -1165,15 +1141,15 @@ void sub_8132E64(void)
gUnknown_203B11C->unk_162 = gUnknown_203B10C.unk_0a;
ClearItemSlots(gSaveBlock1Ptr->bagPocket_TMHM, NELEMS(gSaveBlock1Ptr->bagPocket_TMHM));
ClearItemSlots(gSaveBlock1Ptr->bagPocket_KeyItems, NELEMS(gSaveBlock1Ptr->bagPocket_KeyItems));
- sub_81320AC();
+ ResetTMCaseCursorPos();
AddBagItem(ITEM_TM01, 1);
AddBagItem(ITEM_TM03, 1);
AddBagItem(ITEM_TM09, 1);
AddBagItem(ITEM_TM35, 1);
- sub_81317F8(4, sub_815ABFC, 0);
+ InitTMCase(4, sub_815ABFC, 0);
}
-void sub_8132F20(u8 taskId)
+static void sub_8132F20(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1185,7 +1161,7 @@ void sub_8132F20(u8 taskId)
}
}
-void sub_8132F60(u8 taskId)
+static void sub_8132F60(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@@ -1314,7 +1290,7 @@ void sub_8132F60(u8 taskId)
}
}
-void sub_8133244(void)
+static void sub_8133244(void)
{
u8 i;
@@ -1338,34 +1314,34 @@ void sub_8133244(void)
schedule_bg_copy_tilemap_to_vram(0);
}
-void sub_81332EC(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
+static void sub_81332EC(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
{
AddTextPrinterParametrized2(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_8463184[colorIdx], speed, str);
}
-void sub_8133354(u8 windowId)
+static void sub_8133354(u8 windowId)
{
SetWindowBorderStyle(windowId, FALSE, 0x5B, 0x0E);
}
-void sub_8133368(u8 windowId)
+static void sub_8133368(u8 windowId)
{
SetWindowBorderStyle(windowId, FALSE, 0x78, 0x0D);
}
-void sub_813337C(u8 taskId, u8 windowId, const u8 * str, TaskFunc func)
+static void sub_813337C(u8 taskId, u8 windowId, const u8 * str, TaskFunc func)
{
DisplayMessageAndContinueTask(taskId, 6, 0x64, 0x0B, windowId, GetTextSpeedSetting(), str, func);
schedule_bg_copy_tilemap_to_vram(1);
}
-void sub_81333C4(void)
+static void sub_81333C4(void)
{
u32 distance = 72 - GetStringWidth(1, gUnknown_84166D3, 0);
box_print(3, 1, distance / 2, 1, &gUnknown_8463184[0], 0, gUnknown_84166D3);
}
-void sub_8133404(void)
+static void sub_8133404(void)
{
sub_8107D68(4, 19, 0, 0);
sub_8107D68(4, 20, 0, 12);
@@ -1374,7 +1350,7 @@ void sub_8133404(void)
CopyWindowToVram(4, 2);
}
-void sub_8133444(u16 itemId)
+static void sub_8133444(u16 itemId)
{
u8 i;
u16 move;
@@ -1415,22 +1391,22 @@ void sub_8133444(u16 itemId)
}
}
-void sub_81335B0(u8 windowId, u8 x, u8 y)
+static void sub_81335B0(u8 windowId, u8 x, u8 y)
{
BlitBitmapToWindow(windowId, gUnknown_8E99118, x, y, 16, 12);
}
-void sub_81335E0(void)
+static void sub_81335E0(void)
{
PrintMoneyAmountInMoneyBoxWithBorder(8, 0x78, 0xD, GetMoney(&gSaveBlock1Ptr->money));
}
-void sub_8133604(u8 taskId, const TaskFunc *ptrs)
+static void sub_8133604(u8 taskId, const TaskFunc *ptrs)
{
sub_80BF5D0(taskId, &gUnknown_84631E0, 2, 0, 2, 0x5B, 0x0E, ptrs);
}
-u8 sub_8133630(u8 * a0, u8 a1)
+static u8 sub_8133630(u8 * a0, u8 a1)
{
if (*a0 == 0xFF)
{
@@ -1441,7 +1417,7 @@ u8 sub_8133630(u8 * a0, u8 a1)
return *a0;
}
-void sub_8133664(u8 * a0)
+static void sub_8133664(u8 * a0)
{
sub_810F4D8(*a0, FALSE);
ClearWindowTilemap(*a0);
@@ -1450,7 +1426,7 @@ void sub_8133664(u8 * a0)
*a0 = 0xFF;
}
-u8 sub_813368C(u16 itemId)
+static u8 sub_813368C(u16 itemId)
{
u8 spriteId = CreateSprite(&gUnknown_8463220, 0x29, 0x2E, 0);
u8 r5;
@@ -1469,7 +1445,7 @@ u8 sub_813368C(u16 itemId)
}
}
-void sub_8133714(struct Sprite * sprite, u8 idx)
+static void sub_8133714(struct Sprite * sprite, u8 idx)
{
if (idx >= 50)
StartSpriteAnim(sprite, 1);
@@ -1477,7 +1453,7 @@ void sub_8133714(struct Sprite * sprite, u8 idx)
StartSpriteAnim(sprite, 0);
}
-void sub_8133730(u8 type)
+static void sub_8133730(u8 type)
{
u8 palIndex = IndexOfSpritePaletteTag(400) << 4;
LoadPalette(gUnknown_203B12C + gUnknown_8463238[type], 0x100 | palIndex, 0x20);
@@ -1487,7 +1463,7 @@ void sub_8133730(u8 type)
}
}
-void sub_8133790(struct Sprite * sprite, u8 var)
+static void sub_8133790(struct Sprite * sprite, u8 var)
{
s32 x, y;
if (var == 0xFF)
@@ -1509,14 +1485,14 @@ void sub_8133790(struct Sprite * sprite, u8 var)
sprite->pos1.y = y;
}
-void sub_81337E4(u8 spriteId, u16 itemId)
+static void sub_81337E4(u8 spriteId, u16 itemId)
{
gSprites[spriteId].data[0] = itemId;
gSprites[spriteId].data[1] = 0;
gSprites[spriteId].callback = sub_8133810;
}
-void sub_8133810(struct Sprite * sprite)
+static void sub_8133810(struct Sprite * sprite)
{
switch (sprite->data[1])
{
@@ -1547,7 +1523,7 @@ void sub_8133810(struct Sprite * sprite)
}
}
-void sub_81338A8(void)
+static void sub_81338A8(void)
{
struct SpritePalette spritePalette;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 17:39:42 +0000