summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c26
-rw-r--r--src/data/pokedex_entries_de.h3
-rw-r--r--src/data/pokedex_entries_en.h2
-rw-r--r--src/debug/nohara_debug_menu.c2
-rw-r--r--src/debug/start_menu_debug.c18
-rw-r--r--src/debug/taya_debug_window.c30
-rw-r--r--src/debug/tomomichi_debug_menu.c4
-rw-r--r--src/debug/watanabe_debug_menu.c14
-rw-r--r--src/engine/cable_club.c2
-rw-r--r--src/engine/link.c4
-rw-r--r--src/engine/reset_rtc_screen.c4
-rw-r--r--src/engine/save.c2
-rw-r--r--src/engine/trade.c2
-rw-r--r--src/field/berry.c6
-rw-r--r--src/field/field_player_avatar.c2
-rw-r--r--src/field/field_weather.c2
-rw-r--r--src/field/fldeff_secretpower.c2
-rw-r--r--src/field/item_menu.c2
-rw-r--r--src/field/mauville_man.c2
-rw-r--r--src/field/region_map.c4
-rw-r--r--src/field/safari_zone.c2
-rw-r--r--src/field/start_menu.c2
-rw-r--r--src/field/wild_encounter.c10
-rw-r--r--src/pokemon/mail.c2
24 files changed, 75 insertions, 74 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 7a819a8ef..bedcb0bb6 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -238,7 +238,7 @@ void InitBattle(void)
" strh r2, [r0]\n"
" ldr r0, ._10 + 16\n"
" strh r1, [r0]\n"
- " bl dp12_8087EA4\n"
+ " bl ScanlineEffect_Clear\n"
" ldr r0, ._10 + 20\n"
" mov r3, #0xf0\n"
" mov r5, #0xf0\n"
@@ -272,7 +272,7 @@ void InitBattle(void)
" ldr r0, [r4]\n"
" ldr r1, [r4, #0x4]\n"
" ldr r2, [r4, #0x8]\n"
- " bl sub_80895F8\n"
+ " bl ScanlineEffect_SetParams\n"
" ldr r4, ._10 + 32\n"
" add r0, r4, #0\n"
" bl Text_LoadWindowTemplate\n"
@@ -300,7 +300,7 @@ void InitBattle(void)
" and r0, r0, r1\n"
" cmp r0, #0\n"
" bne ._7 @cond_branch\n"
- " bl GetBattleTerrain\n"
+ " bl BattleSetup_GetTerrain\n"
" ldr r1, ._10 + 72\n"
" strb r0, [r1]\n"
"._7:\n"
@@ -341,7 +341,7 @@ void InitBattle(void)
" .word 0x400004c\n"
" .word 0x5051\n"
" .word gBattle_WIN0H\n"
- " .word gUnknown_03004240\n"
+ " .word gBattle_WIN0V\n"
" .word gScanlineEffectRegBuffers\n"
" .word gUnknown_081F9674\n"
" .word 0xff10\n"
@@ -2641,10 +2641,10 @@ void BattleMainCB2(void)
" .align 2, 0\n"
"._358:\n"
" .word gMain\n"
- " .word gScriptResult\n"
+ " .word gSpecialVar_Result\n"
" .word gBattleOutcome\n"
" .word 0x43d\n"
- " .word gUnknown_03004DC0\n"
+ " .word gScanlineEffect\n"
" .word gPreBattleCallback1\n"
" .word gBattleTypeFlags\n"
" .word sub_805465C+1\n"
@@ -2684,7 +2684,7 @@ void BattleMainCB2(void)
" bl debug_sub_8008264\n"
"._360:\n"
" ldr r0, ._361 + 4\n"
- " bl sub_800374C\n"
+ " bl Text_UpdateWindowInBattle\n"
" bl UpdatePaletteFade\n"
" bl RunTasks\n"
" add sp, sp, #0x4\n"
@@ -3255,7 +3255,7 @@ void debug_sub_80108B8()
" bl LZDecompressVram\n"
" ldr r0, ._507 + 60\n"
" ldr r1, ._507 + 64\n"
- " bl sub_800D238\n"
+ " bl LZDecompressWram\n"
" ldr r4, ._507 + 68\n"
" mov r1, #0xa0\n"
" lsl r1, r1, #0x13\n"
@@ -3271,7 +3271,7 @@ void debug_sub_80108B8()
" bl SetMainCallback2\n"
" bl ResetTasks\n"
" bl ResetSpriteData\n"
- " bl remove_some_task\n"
+ " bl ScanlineEffect_Stop\n"
" ldr r4, ._507 + 84\n"
" add r0, r4, #0\n"
" bl Text_LoadWindowTemplate\n"
@@ -3816,7 +3816,7 @@ void debug_sub_8010CAC()
"._557:\n"
" .align 2, 0\n"
"._556:\n"
- " .word gUnknown_03005E94\n"
+ " .word gCB2_AfterEvolution\n"
" .word debug_sub_80108B8+1\n"
" .word gPlayerParty\n"
"._551:\n"
@@ -5902,7 +5902,7 @@ void debug_sub_8011DD4()
" bl LoadOam\n"
" bl ProcessSpriteCopyRequests\n"
" bl TransferPlttBuffer\n"
- " bl sub_8089668\n"
+ " bl ScanlineEffect_InitHBlankDmaTransfer\n"
" pop {r0}\n"
" bx r0\n"
"._777:\n"
@@ -7167,7 +7167,7 @@ void debug_sub_8012878()
" bl AnimateSprites\n"
" bl BuildOamBuffer\n"
" ldr r0, ._876\n"
- " bl sub_800374C\n"
+ " bl Text_UpdateWindowInBattle\n"
" bl UpdatePaletteFade\n"
" bl RunTasks\n"
" ldr r0, ._876 + 4\n"
@@ -9472,7 +9472,7 @@ void sub_8010874()
" .align 2, 0\n"
"._1215:\n"
" .word gUnknown_02024C4C\n"
- " .word gUnknown_02024C44\n"
+ " .word gLastHitByType\n"
" .word gMoveHitWith\n"
" .word gLastUsedMove\n"
" .word gDisableStructs\n"
diff --git a/src/data/pokedex_entries_de.h b/src/data/pokedex_entries_de.h
index 0f64cba66..413b73d90 100644
--- a/src/data/pokedex_entries_de.h
+++ b/src/data/pokedex_entries_de.h
@@ -6337,7 +6337,8 @@ static const u8 DexDescription_Deoxys_2[] = _(
"dieses POKéMON ist sein Gehirn.");
#endif
-static const struct PokedexEntry gPokedexEntries[] = {
+const struct PokedexEntry gPokedexEntries[] =
+{
{
// Dummy
.categoryName = _("UNBEKANNT"),
diff --git a/src/data/pokedex_entries_en.h b/src/data/pokedex_entries_en.h
index 86da3d67b..933b1fc7d 100644
--- a/src/data/pokedex_entries_en.h
+++ b/src/data/pokedex_entries_en.h
@@ -5389,7 +5389,7 @@ static const u8 DexDescription_Deoxys_2[] = _(
"chest appears to be its brain.");
#endif
-static const struct PokedexEntry gPokedexEntries[] =
+const struct PokedexEntry gPokedexEntries[] =
{
{ //Dummy
.categoryName = _("UNKNOWN"),
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 53c6394ba..629b7b9eb 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -340,7 +340,7 @@ void debug_sub_808F5D8()
"._29:\n"
" ldr r5, ._30 + 8\n"
" strh r4, [r5]\n"
- " bl sub_810F424\n"
+ " bl GetSlotMachineId\n"
" add r1, r0, #0\n"
" lsl r1, r1, #0x10\n"
" lsr r1, r1, #0x10\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 321bbb951..b376a4076 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -46,7 +46,7 @@ void debug_sub_8076AC8()
" mov r0, #0x11\n"
" mov r1, #0x1\n"
" add r2, r4, #0\n"
- " bl PrintMenuItemsReordered\n"
+ " bl Menu_PrintItemsReordered\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0xc\n"
@@ -448,7 +448,7 @@ void DebugMenu_8076D50()
{
asm(
" push {lr}\n"
- " bl ClearSaveData\n"
+ " bl Save_EraseAllData\n"
" mov r0, #0x0\n"
" pop {r1}\n"
" bx r1\n"
@@ -1105,7 +1105,7 @@ void DebugMenu_807719C()
" mov r0, #0x1\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
- " bl PrintMenuItemsReordered\n"
+ " bl Menu_PrintItemsReordered\n"
" ldr r4, ._133 + 8\n"
" ldrb r0, [r4]\n"
" str r0, [sp]\n"
@@ -1698,10 +1698,10 @@ void DebugMenu_NationalDex()
" lsr r4, r4, #0x10\n"
" add r0, r4, #0\n"
" mov r1, #0x2\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" add r0, r4, #0\n"
" mov r1, #0x3\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" cmp r4, r5\n"
" bls ._177 @cond_branch\n"
" ldr r1, ._178 + 4\n"
@@ -1738,10 +1738,10 @@ void DebugMenu_HoennDex()
" lsr r4, r4, #0x10\n"
" add r0, r4, #0\n"
" mov r1, #0x2\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" add r0, r4, #0\n"
" mov r1, #0x3\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" cmp r5, #0xc9\n"
" bls ._180 @cond_branch\n"
" ldr r1, ._181\n"
@@ -2356,7 +2356,7 @@ void DebugMenu_8077974()
" asr r1, r1, #0x18\n"
" lsl r1, r1, #0x10\n"
" lsr r1, r1, #0x10\n"
- " bl unref_sub_8082C2C\n"
+ " bl IsRematchTrainerIn\n"
" cmp r0, #0\n"
" beq ._224 @cond_branch\n"
" ldr r0, ._226 + 4\n"
@@ -4670,7 +4670,7 @@ void DebugMenu_80787EC()
"._467:\n"
" .align 2, 0\n"
"._466:\n"
- " .word gScriptResult\n"
+ " .word gSpecialVar_Result\n"
" .word gStringVar1\n"
" .word gStringVar2\n"
" .word gStringVar3\n"
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 842837b18..8b586deb2 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -893,7 +893,7 @@ void TayaDebugMenu_PKMNLottery()
" .align 2, 0\n"
"._83:\n"
" .word +0x2000000\n"
- " .word gScriptResult\n"
+ " .word gSpecialVar_Result\n"
" .word gCallback_03004AE8\n"
" .word debug_sub_8090C88+1\n"
"\n"
@@ -911,44 +911,44 @@ void TayaDebugMenu_Trainer()
" lsl r0, r4, #0x4\n"
" add r0, r0, r5\n"
" ldrh r0, [r0]\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x10\n"
" lsr r4, r0, #0x10\n"
" cmp r4, #0x37\n"
" bls ._85 @cond_branch\n"
" ldr r0, ._86 + 4\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x85\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 8\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x86\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 12\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x87\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 16\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x88\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 20\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x83\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 24\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" mov r0, #0x84\n"
" lsl r0, r0, #0x1\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" ldr r0, ._86 + 28\n"
- " bl trainer_flag_set\n"
+ " bl SetTrainerFlag\n"
" bl CloseMenu\n"
" mov r0, #0x1\n"
" pop {r4, r5}\n"
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 2d9074d19..28bb2717d 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -5001,7 +5001,7 @@ void debug_sub_808DABC()
"._387:\n"
" .align 2, 0\n"
"._386:\n"
- " .word gScriptResult\n"
+ " .word gSpecialVar_Result\n"
"\n"
);
}
@@ -5043,7 +5043,7 @@ void debug_sub_808DAD4()
" .align 2, 0\n"
"._393:\n"
" .word 0xffff\n"
- " .word gScriptResult\n"
+ " .word gSpecialVar_Result\n"
"\n"
);
}
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index 7288f602e..b0fbebac1 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -116,7 +116,7 @@ void debug_80C35DC()
" str r3, [r2, #0x8]\n"
" ldr r0, [r2, #0x8]\n"
" bl ResetPaletteFade\n"
- " bl remove_some_task\n"
+ " bl ScanlineEffect_Stop\n"
" bl ResetTasks\n"
" bl ResetSpriteData\n"
" bl ResetPaletteFade\n"
@@ -4289,10 +4289,10 @@ void debug_80C53F0()
" lsr r4, r4, #0x10\n"
" add r0, r4, #0\n"
" mov r1, #0x2\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" add r0, r4, #0\n"
" mov r1, #0x3\n"
- " bl GetNationalPokedexFlag\n"
+ " bl GetSetPokedexFlag\n"
" mov r0, #0x5\n"
" bl PlaySE\n"
" b ._400\n"
@@ -7813,7 +7813,7 @@ void debug_80C6FA8()
" ldrh r0, [r1]\n"
" mov r1, #0x0\n"
" mov r2, #0x0\n"
- " bl species_and_otid_get_pal\n"
+ " bl GetMonSpritePal\n"
" ldr r1, [r4]\n"
" ldrb r1, [r1, #0x6]\n"
" lsl r1, r1, #0x14\n"
@@ -7832,7 +7832,7 @@ void debug_80C6FA8()
" ldrh r0, [r1]\n"
" mov r1, #0x0\n"
" mov r2, #0x9\n"
- " bl species_and_otid_get_pal\n"
+ " bl GetMonSpritePal\n"
" ldr r1, [r4]\n"
" ldrb r1, [r1, #0x6]\n"
" lsl r1, r1, #0x14\n"
@@ -9268,7 +9268,7 @@ void debug_80C7B14()
" ldrh r0, [r1]\n"
" mov r1, #0x0\n"
" mov r2, #0x0\n"
- " bl species_and_otid_get_pal\n"
+ " bl GetMonSpritePal\n"
" ldr r1, [r4]\n"
" ldrb r1, [r1, #0x6]\n"
" lsl r1, r1, #0x14\n"
@@ -9287,7 +9287,7 @@ void debug_80C7B14()
" ldrh r0, [r1]\n"
" mov r1, #0x0\n"
" mov r2, #0x9\n"
- " bl species_and_otid_get_pal\n"
+ " bl GetMonSpritePal\n"
" ldr r1, [r4]\n"
" ldrb r1, [r1, #0x6]\n"
" lsl r1, r1, #0x14\n"
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index c0397f67b..4063aee3a 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -407,7 +407,7 @@ void debug_sub_808A55C()
.word gLinkStatus\n\
.word gLink\n\
.word gReceivedRemoteLinkPlayers\n\
- .word gScriptResult\n\
+ .word gSpecialVar_Result\n\
.word gLinkCallback\n\
.word gLinkPlayers\n\
.word 0x4000128");
diff --git a/src/engine/link.c b/src/engine/link.c
index 5747915d7..3bcacd12b 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -67,7 +67,7 @@ u32 sub_8007E40(void);
static void SetBlockReceivedFlag(u8);
static u16 LinkTestCalcBlockChecksum(void *, u16);
static void PrintHexDigit(u8, u8, u8);
-static void PrintHex(u32, u8, u8, u8);
+void PrintHex(u32, u8, u8, u8);
static void LinkCB_RequestPlayerDataExchange(void);
static void Task_PrintTestData(u8);
bool8 sub_8008224(void);
@@ -961,7 +961,7 @@ static void PrintHexDigit(u8 tileNum, u8 x, u8 y)
tilemap[(32 * y) + x] = (gLinkTestBGInfo.paletteNum << 12) | (tileNum + 1);
}
-static void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits)
+void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits)
{
u8 buffer[16];
s32 i;
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index df4ab4f76..0cfa1e71a 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -691,7 +691,7 @@ void debug_sub_806F908(u8 a)
._142:\n\
ldrb r0, [r4, #0x2]\n\
bl DestroyTask\n\
- bl MenuZeroFillScreen\n\
+ bl Menu_EraseScreen\n\
bl ScriptContext2_Disable\n\
add r0, r5, #0\n\
bl DestroyTask\n\
@@ -902,7 +902,7 @@ void debug_sub_806F9E4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._165 @cond_branch\n\
- bl MenuZeroFillScreen\n\
+ bl Menu_EraseScreen\n\
add r0, r7, #0\n\
bl DestroyTask\n\
bl ScriptContext2_Disable\n\
diff --git a/src/engine/save.c b/src/engine/save.c
index 1245d0a62..a9945a80d 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -734,7 +734,7 @@ void sub_813B79C()
" .word sSaveBlockChunks\n"
" .word 0xff4\n"
" .word 0xff6\n"
- " .word gHallOfFameSaveSectionLocations\n"
+ " .word sHallOfFameChunks\n"
"\n"
);
}
diff --git a/src/engine/trade.c b/src/engine/trade.c
index e49cde6cd..715cc0377 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -4514,8 +4514,8 @@ static __attribute__((naked)) void sub_804B41C(void)
}
#endif
-static void sub_804B790(void)
// In-game trade init
+void sub_804B790(void)
{
u8 otName[11];
switch (gMain.state)
diff --git a/src/field/berry.c b/src/field/berry.c
index 7c6640dc8..d6982479e 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -1780,7 +1780,7 @@ u8* DebugOpenBerryInfo(void)
u8 berryTreeId;
struct BerryTree *berryTree;
- if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript)
+ if (GetFieldObjectScriptPointerPlayerFacing() != &S_BerryTree)
return NULL;
berryTreeId = FieldObjectGetBerryTreeId(gSelectedMapObject);
@@ -1809,7 +1809,7 @@ void DebugOpenBerryInfo()
{
asm(
" push {r4, r5, r6, r7, lr}\n"
- " bl GetFieldObjectScriptPointerForComparison\n"
+ " bl GetFieldObjectScriptPointerPlayerFacing\n"
" ldr r1, ._138\n"
" cmp r0, r1\n"
" beq ._136 @cond_branch\n"
@@ -1818,7 +1818,7 @@ void DebugOpenBerryInfo()
"._139:\n"
" .align 2, 0\n"
"._138:\n"
- " .word BerryTreeScript\n"
+ " .word S_BerryTree\n"
"._136:\n"
" ldr r0, ._141\n"
" ldrb r0, [r0]\n"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index db674e52f..795a53d0b 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -1940,7 +1940,7 @@ void debug_sub_805F2DC()
" .word gPlayerAvatar\n"
"._429:\n"
" add r0, r4, #0\n"
- " bl sub_80593F4\n"
+ " bl PlayerGoSpeed4\n"
"._430:\n"
" mov r0, #0x1\n"
" pop {r4}\n"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 1a4985892..4a03322d5 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1308,7 +1308,7 @@ u8 debug_sub_808560C(void)
add r0, r0, r1\n\
ldrb r0, [r0]\n\
strb r0, [r4]\n\
- bl MenuZeroFillScreen\n\
+ bl Menu_EraseScreen\n\
mov r0, #0x16\n\
mov r1, #0x1\n\
mov r2, #0x1c\n\
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index c200ce2f5..3f539fc6e 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -266,7 +266,7 @@ void debug_sub_80D93F4()
._99:\n\
.align 2, 0\n\
._98:\n\
- .word gScriptResult\n\
+ .word gSpecialVar_Result\n\
._96:\n\
ldr r4, ._102\n\
add r1, r4, #2\n\
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index ce1f18cdb..61774f816 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -436,7 +436,7 @@ static bool8 SetupBagMultistep(void)
bl sub_80A34E8\n\
b ._61\n\
._9:\n\
- bl remove_some_task\n\
+ bl ScanlineEffect_Stop\n\
ldr r1, ._27\n\
ldr r0, ._27 + 4\n\
add r1, r1, r0\n\
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 91165a2ee..51bd9bb35 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -331,7 +331,7 @@ void debug_sub_810B32C()
}
#endif
-static u8 GetCurrentMauvilleOldMan(void)
+u8 GetCurrentMauvilleOldMan(void)
{
struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common;
diff --git a/src/field/region_map.c b/src/field/region_map.c
index d6ebf0b9f..9194e791d 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -288,7 +288,7 @@ static void UpdateIconBlink(struct Sprite *);
static void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
const u8 *GetMapSectionName(u8 *, u16, u16);
static void VBlankCB_FlyRegionMap(void);
-static void CB2_FlyRegionMap(void);
+void CB2_FlyRegionMap(void);
void sub_80FC244(void (*func)(void));
static void PrintFlyTargetName(void);
static void CreateFlyTargetGraphics(void);
@@ -1591,7 +1591,7 @@ static void VBlankCB_FlyRegionMap(void)
TransferPlttBuffer();
}
-static void CB2_FlyRegionMap(void)
+void CB2_FlyRegionMap(void)
{
ewram0_3.unk0();
AnimateSprites();
diff --git a/src/field/safari_zone.c b/src/field/safari_zone.c
index e9ca3a9f9..2829001f6 100644
--- a/src/field/safari_zone.c
+++ b/src/field/safari_zone.c
@@ -26,7 +26,7 @@ static void DecrementFeederStepCounters(void);
extern u8 gBattleOutcome;
EWRAM_DATA u8 gNumSafariBalls = 0;
-EWRAM_DATA static u16 gSafariZoneStepCounter = 0;
+EWRAM_DATA u16 gSafariZoneStepCounter = 0;
EWRAM_DATA static struct PokeblockFeeder gPokeblockFeeders[NUM_POKEBLOCK_FEEDERS] = {0};
extern void (*gFieldCallback)(void);
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 17aeb8242..47c7fca05 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -398,7 +398,7 @@ void debug_sub_8075DB4()
" cmp r4, #0x2\n"
" ble ._24 @cond_branch\n"
" add r0, r6, #0\n"
- " bl sub_8136088\n"
+ " bl SetEReaderTrainerChecksum\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
" bx r0\n"
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index 08913f40d..10391348d 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -3698,13 +3698,13 @@ const u16 gRoute119WaterTileData[] =
extern u16 gSpecialVar_Result;
extern u8 S_RepelWoreOff[];
-EWRAM_DATA static u8 sWildEncountersDisabled = 0;
+EWRAM_DATA u8 sWildEncountersDisabled = 0;
EWRAM_DATA static u32 sFeebasRngValue = 0;
#define NUM_FEEBAS_SPOTS 6
-static u16 FeebasRandom(void);
-static void FeebasSeedRng(u16 seed);
+u16 FeebasRandom(void);
+void FeebasSeedRng(u16 seed);
static bool8 IsWildLevelAllowedByRepel(u8 level);
static void ApplyFluteEncounterRateMod(u32 *encRate);
@@ -3791,13 +3791,13 @@ static bool8 CheckFeebas(void)
return FALSE;
}
-static u16 FeebasRandom(void)
+u16 FeebasRandom(void)
{
sFeebasRngValue = 12345 + 0x41C64E6D * sFeebasRngValue;
return sFeebasRngValue >> 16;
}
-static void FeebasSeedRng(u16 seed)
+void FeebasSeedRng(u16 seed)
{
sFeebasRngValue = seed;
}
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index ecff15c21..565a9861b 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -2369,7 +2369,7 @@ void debug_sub_810D388()
" .word unk_debug_bss_2\n"
" .word 0x43c\n"
"._297:\n"
- " bl remove_some_task\n"
+ " bl ScanlineEffect_Stop\n"
" bl ResetPaletteFade\n"
" ldr r0, ._302\n"
" bl SetVBlankCallback\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 14:50:16 +0000