summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
Diffstat (limited to 'src/field')
-rw-r--r--src/field/berry_tag_screen.c2
-rw-r--r--src/field/choose_party.c2
-rw-r--r--src/field/field_weather.c10
-rw-r--r--src/field/item_menu.c28
-rw-r--r--src/field/mauville_man.c10
-rw-r--r--src/field/region_map.c14
-rw-r--r--src/field/slot_machine.c16
-rw-r--r--src/field/start_menu.c2
8 files changed, 42 insertions, 42 deletions
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index a05d9bf87..56d578464 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -42,7 +42,7 @@ extern u8 gBerryCheck_Pal[];
extern u8 gUnknown_08E788E4[];
extern u8 gUnknown_08E78A84[];
-static const u8 *const gUnknown_0841192C[] =
+const u8 *const gUnknown_0841192C[] =
{
ContestStatsText_VerySoft,
ContestStatsText_Soft,
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index 8a54b0ad0..b108ede5a 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -601,7 +601,7 @@ void debug_sub_81381B4()
" add r2, r4, #0\n"
" bl GetMonData\n"
" add r0, r4, #0\n"
- " bl StripExtCtrlCodes\n"
+ " bl Text_StripExtCtrlCodes\n"
" add r0, r5, #0\n"
" mov r1, #0x3\n"
" bl GetMonData\n"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 97eba16e0..1a4985892 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1256,7 +1256,7 @@ u8 debug_sub_8085564(void)
mov r1, #0x1\n\
mov r2, #0x1c\n\
mov r3, #0x2\n\
- bl MenuFillWindowRectWithBlankTile\n\
+ bl Menu_BlankWindowRect\n\
ldr r1, ._380\n\
ldr r0, ._380 + 4\n\
ldrb r0, [r0]\n\
@@ -1265,7 +1265,7 @@ u8 debug_sub_8085564(void)
ldr r0, [r0]\n\
mov r1, #0x17\n\
mov r2, #0x1\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
._377:\n\
ldr r0, ._380 + 8\n\
ldrh r1, [r0, #0x2e]\n\
@@ -1313,7 +1313,7 @@ u8 debug_sub_808560C(void)
mov r1, #0x1\n\
mov r2, #0x1c\n\
mov r3, #0x2\n\
- bl MenuFillWindowRectWithBlankTile\n\
+ bl Menu_BlankWindowRect\n\
ldr r1, ._384 + 8\n\
ldrb r0, [r4]\n\
lsl r0, r0, #0x2\n\
@@ -1321,7 +1321,7 @@ u8 debug_sub_808560C(void)
ldr r0, [r0]\n\
mov r1, #0x17\n\
mov r2, #0x1\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r1, ._384 + 12\n\
ldr r0, ._384 + 16\n\
str r0, [r1]\n\
@@ -1333,7 +1333,7 @@ u8 debug_sub_808560C(void)
.align 2, 0\n\
._384:\n\
.word gUnknown_0202FF58+0x2\n\
- .word gUnknown_0202F7E8\n\
+ .word gWeather\n\
.word gDebugText_Weather\n\
.word gCallback_03004AE8\n\
.word debug_sub_8085564+1");
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 125edfef2..ce1f18cdb 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -483,7 +483,7 @@ static bool8 SetupBagMultistep(void)
bl ResetSpriteData\n\
b ._61\n\
._14:\n\
- bl sub_80A3520\n\
+ bl LoadBagGraphicsMultistep\n\
lsl r0, r0, #0x18\n\
cmp r0, #0\n\
bne ._37 @cond_branch\n\
@@ -500,12 +500,12 @@ static bool8 SetupBagMultistep(void)
.word 0x43c\n\
._15:\n\
ldr r0, ._43\n\
- bl SetUpWindowConfig\n\
+ bl Text_LoadWindowTemplate\n\
b ._61\n\
._44:\n\
.align 2, 0\n\
._43:\n\
- .word gWindowConfig_81E6DFC\n\
+ .word gWindowTemplate_81E6DFC\n\
._16:\n\
ldr r0, ._46\n\
bl MultistepInitMenuWindowBegin\n\
@@ -516,7 +516,7 @@ static bool8 SetupBagMultistep(void)
._47:\n\
.align 2, 0\n\
._46:\n\
- .word gWindowConfig_81E6DFC\n\
+ .word gWindowTemplate_81E6DFC\n\
.word gMain\n\
.word 0x43c\n\
._17:\n\
@@ -578,7 +578,7 @@ static bool8 SetupBagMultistep(void)
._54:\n\
.align 2, 0\n\
._53:\n\
- .word gUnknown_03000701\n\
+ .word sReturnLocation\n\
.word gMain\n\
.word 0x43c\n\
._19:\n\
@@ -595,15 +595,15 @@ static bool8 SetupBagMultistep(void)
bl sub_80A39B8\n\
ldrb r1, [r5]\n\
add r0, r4, #0\n\
- bl sub_80A3AC0\n\
- bl sub_80A3D08\n\
+ bl DrawPocketIndicatorDots\n\
+ bl UpdateAllBagPockets\n\
ldr r4, ._56 + 12\n\
ldr r0, [r4, #0x10]\n\
ldr r1, [r4, #0x14]\n\
- bl sub_80A3C34\n\
+ bl SortItemSlots\n\
ldr r0, [r4, #0x18]\n\
ldr r1, [r4, #0x1c]\n\
- bl sub_80A3C34\n\
+ bl SortItemSlots\n\
bl sub_80A3D40\n\
ldr r1, ._56 + 16\n\
mov r0, #0x0\n\
@@ -619,9 +619,9 @@ static bool8 SetupBagMultistep(void)
._56:\n\
.word gUnknown_0203855A\n\
.word gBGTilemapBuffers+0x1000\n\
- .word gUnknown_02038559\n\
+ .word sCurrentBagPocket\n\
.word gBagPockets\n\
- .word gUnknown_03005D24\n\
+ .word gCurrentBagPocketItemSlots\n\
._20:\n\
ldr r0, ._59\n\
mov r1, #0x0\n\
@@ -659,9 +659,9 @@ static bool8 SetupBagMultistep(void)
.align 2, 0\n\
._59:\n\
.word 0xffff\n\
- .word gUnknown_03005D10\n\
- .word gUnknown_02038559\n\
- .word gUnknown_03005D24\n\
+ .word gBagPocketScrollStates\n\
+ .word sCurrentBagPocket\n\
+ .word gCurrentBagPocketItemSlots\n\
.word gUnknown_0203855B\n\
.word gUnknown_0203855C\n\
.word gMain\n\
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 1bce9bc3f..91165a2ee 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -293,7 +293,7 @@ void debug_sub_810B32C()
" lsr r2, r0, #0x18\n"
" cmp r2, #0x7\n"
" bls ._31 @cond_branch\n"
- " bl sub_80F7A6C\n"
+ " bl SetupHipster\n"
" mov r2, #0x0\n"
" ldr r3, ._34\n"
"._32:\n"
@@ -313,13 +313,13 @@ void debug_sub_810B32C()
"._34:\n"
" .word gSaveBlock1+0x2d8c\n"
"._27:\n"
- " bl sub_80F7A98\n"
+ " bl SetupTrader\n"
" b ._37\n"
"._28:\n"
- " bl sub_80F7A7C\n"
+ " bl SetupStoryteller\n"
" b ._37\n"
"._29:\n"
- " bl sub_80F7A88\n"
+ " bl SetupGiddy\n"
"._37:\n"
" bl sub_80F83D0\n"
" add sp, sp, #0x8\n"
@@ -1313,7 +1313,7 @@ static void PrintStoryList(void)
Menu_PrintText(gPCText_Cancel, 1, 2 + i * 2);
}
-static u8 gUnknown_03000748;
+u8 gUnknown_03000748;
static void Task_StoryListMenu(u8 taskId)
{
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 3bd64a8a0..d6ebf0b9f 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -289,7 +289,7 @@ static void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
const u8 *GetMapSectionName(u8 *, u16, u16);
static void VBlankCB_FlyRegionMap(void);
static void CB2_FlyRegionMap(void);
-static void sub_80FC244(void (*func)(void));
+void sub_80FC244(void (*func)(void));
static void PrintFlyTargetName(void);
static void CreateFlyTargetGraphics(void);
static void CreateCityTownFlyTargetIcons(void);
@@ -297,7 +297,7 @@ static void CreateSpecialAreaFlyTargetIcons(void);
static void SpriteCB_FlyTargetIcons(struct Sprite *);
static void sub_80FC5B4(void);
static void sub_80FC600(void);
-static void sub_80FC69C(void);
+void sub_80FC69C(void);
void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
{
@@ -1420,7 +1420,7 @@ struct UnknownStruct4
static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter};
-static const struct UnknownStruct4 sUnknown_083E79C0[1] =
+const struct UnknownStruct4 gUnknown_083E79C0[1] =
{
{sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY},
};
@@ -1598,7 +1598,7 @@ static void CB2_FlyRegionMap(void)
BuildOamBuffer();
}
-static void sub_80FC244(void (*func)(void))
+void sub_80FC244(void (*func)(void))
{
ewram0_3.unk0 = func;
ewram0_3.unk4 = 0;
@@ -1611,9 +1611,9 @@ static void PrintFlyTargetName(void)
u16 i = 0;
int zero;
- for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++)
+ for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++)
{
- const struct UnknownStruct4 *r4 = &sUnknown_083E79C0[i];
+ const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i];
if (ewram0_3.regionMap.mapSectionId == r4->mapSectionId)
{
@@ -1796,7 +1796,7 @@ static void sub_80FC600(void)
}
}
-static void sub_80FC69C(void)
+void sub_80FC69C(void)
{
switch (ewram0_3.unk4)
{
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index d84a6e592..c4a4128b3 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -64,7 +64,7 @@ static bool8 sub_8102008(struct Task *task);
static bool8 sub_8102034(struct Task *task);
static bool8 sub_8102058(struct Task *task);
static bool8 sub_8102090(struct Task *task);
-static bool8 sub_81020C8(struct Task *task);
+bool8 sub_81020C8(struct Task *task);
static bool8 sub_81021E0(struct Task *task);
static bool8 sub_81021FC(struct Task *task);
static bool8 sub_8102264(struct Task *task);
@@ -244,7 +244,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
ldr r3, ._1\n\
mov r2, #0x0\n\
strb r2, [r3]\n\
- bl sub_81019B0\n\
+ bl PlaySlotMachine_Internal\n\
ldr r0, ._1 + 4\n\
bl SetMainCallback2\n\
pop {r0}\n\
@@ -253,7 +253,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
.align 2, 0\n\
._1:\n\
.word unk_debug_bss_1+0x1\n\
- .word sub_81018B8+1");
+ .word CB2_SlotMachineSetup+1");
}
#else
void PlaySlotMachine(u8 arg0, MainCallback cb)
@@ -274,7 +274,7 @@ void debug_sub_811609C()
ldr r3, ._3\n\
mov r2, #0x1\n\
strb r2, [r3]\n\
- bl sub_81019B0\n\
+ bl PlaySlotMachine_Internal\n\
ldr r0, ._3 + 4\n\
bl SetMainCallback2\n\
pop {r0}\n\
@@ -283,7 +283,7 @@ void debug_sub_811609C()
.align 2, 0\n\
._3:\n\
.word unk_debug_bss_1+0x1\n\
- .word sub_81018B8+1");
+ .word CB2_SlotMachineSetup+1");
}
#endif
@@ -1412,7 +1412,7 @@ static bool8 sub_8102090(struct Task *task)
#if DEBUG
__attribute__((naked))
-static bool8 sub_81020C8(struct Task *task)
+bool8 sub_81020C8(struct Task *task)
{
asm("\
push {r4, lr}\n\
@@ -1421,7 +1421,7 @@ static bool8 sub_81020C8(struct Task *task)
mov r0, #0xc0\n\
and r0, r0, r1\n\
strb r0, [r4, #0x4]\n\
- bl sub_81027A0\n\
+ bl CheckMatch\n\
ldrb r0, [r4, #0xa]\n\
cmp r0, #0\n\
beq ._163 @cond_branch\n\
@@ -1570,7 +1570,7 @@ static bool8 sub_81020C8(struct Task *task)
.word 0x270f");
}
#else
-static bool8 sub_81020C8(struct Task *task)
+bool8 sub_81020C8(struct Task *task)
{
eSlotMachine->unk04 &= 0xc0;
CheckMatch();
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 1e4eace87..17aeb8242 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -255,7 +255,7 @@ void debug_sub_8075C40()
" .word 0x4000108\n"
" .word 0xc34f\n"
" .word 0x40000b0\n"
- " .word gUnknown_03004DE0\n"
+ " .word gScanlineEffectRegBuffers\n"
" .word 0xc5ff\n"
" .word 0x7fff\n"
" .word 0x4000040\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 23:02:42 +0000