Merge pull request #241 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/main_0202598C.inc

@@ -32,6 +32,7 @@
 .public GetWindow
 .public GetWindowRectangle
 .public HandleSir0Translation
+.public IsTouchScreenNotOff
 .public LoadFileFromRom
 .public PreprocessStringFromId
 .public RandInt
@@ -67,7 +68,6 @@
 .public sub_02028324
 .public sub_020288DC
 .public sub_020288FC
-.public IsTouchScreenNotOff
 .public TBL_TALK_GROUP_STRING_ID_START
 .public UnloadFile
 .public UpdateWindow

asm/include/main_0202676C.inc

@@ -117,6 +117,7 @@
 .public InitPortraitParams
 .public InitPreprocessorArgs
 .public InitRender3dElement64
+.public IsTouchScreenNotOff
 .public IsValidPortrait
 .public KeyWaitInit
 .public LoadFileFromRom
@@ -195,7 +196,6 @@
 .public sub_0203C984
 .public sub_020469BC
 .public sub_02048240
-.public IsTouchScreenNotOff
 .public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
 .public TEXT_BOX_DEFAULT_WINDOW_PARAMS
 .public UnloadFile

asm/include/main_02034974.inc

@@ -90,6 +90,7 @@
 .public CloseSimpleMenu
 .public CloseTeamSelectionMenu
 .public CloseTextBox
+.public CopyFrameTypeOption
 .public CreateAdvancedMenu
 .public CreateAdvancedTextBox
 .public CreateDebugMenu
@@ -123,6 +124,7 @@
 .public GetMainCharacter2MemberIdx
 .public GetMainCharacter3MemberIdx
 .public GetNameString
+.public GetOptions
 .public GetOptionsMenuResult
 .public GetOptionsMenuStates
 .public GetPartner
@@ -167,8 +169,10 @@
 .public SaveScriptVariableValueBytes
 .public SetAdvancedTextBoxField0x1C2
 .public SetAdvancedTextBoxState5
+.public SetFrameTypeOption
 .public SetMainTeamName
 .public SetNotifyNote
+.public SetOptions
 .public SetSimpleMenuField0x1AC
 .public ShowDialogueBox
 .public ShowPortraitInPortraitBox
@@ -225,10 +229,6 @@
 .public sub_0203C9A0
 .public sub_02048078
 .public sub_0204964C
-.public GetOptions
-.public SetOptions
-.public CopyFrameTypeOption
-.public SetFrameTypeOption
 .public sub_0204DA1C
 .public sub_0204E210
 .public sub_0204E3C8

asm/include/main_0203C774.inc

@@ -147,7 +147,6 @@
 .public _022AAEA8
 .public _022AAEAC
 .public _022AB09C
-.public OPTIONS
 .public _022AB0A1
 .public _022AB0A2
 .public _022AB0A9
@@ -179,6 +178,7 @@
 .public ConvertStorageItemAtIdxToItem
 .public CopyBitsFrom
 .public CopyBitsTo
+.public CopyFrameTypeOption
 .public CopyMenuControlWindowExtraInfo
 .public CopyNStringFromId
 .public CopyProgressInfoFromScratchFrom
@@ -202,6 +202,7 @@
 .public CreateTextBoxWithArg
 .public Debug_GetDebugFlag
 .public Debug_Print0
+.public DebugPrintEventFlagSize
 .public DEFAULT_HERO_ID
 .public DisableIqSkill
 .public DrawTextInWindow
@@ -249,12 +250,12 @@
 .public GetNextIqSkill
 .public GetPartner
 .public GetPartnerMemberIdx
-.public GetResolvedPerformanceProgressFlag
 .public GetPpIncrease
 .public GetPressedButtons
 .public GetRank
 .public GetRankUpEntry
 .public GetReleasedStylus
+.public GetResolvedPerformanceProgressFlag
 .public GetRngSeed
 .public GetSimpleMenuResult__0202AEA4
 .public GetSimpleMenuResult__0202B870
@@ -271,6 +272,7 @@
 .public InitMenu
 .public InitMenuWithWindowExtraInfo
 .public InitMove
+.public InitOptions
 .public InitPortraitParams
 .public InitPortraitParamsWithMonsterId
 .public InitPreprocessorArgs
@@ -309,6 +311,7 @@
 .public MemsetSimple
 .public MemZero
 .public NOTIFY_NOTE
+.public OPTIONS
 .public OS_GetLockID
 .public ov11_023061CC
 .public ov11_023061E4
@@ -356,6 +359,7 @@
 .public SetPortraitLayout
 .public SetPortraitOffset
 .public SetRngSeed
+.public SetSpecialEpisodeOpenOld
 .public SetTeamSetupHeroAndPartnerOnly
 .public SetUnkAdvancedTextBoxFn
 .public SetUnkAdvancedTextBoxWindowFn
@@ -464,10 +468,6 @@
 .public sub_0203909C
 .public sub_02039218
 .public sub_0203931C
-.public DebugPrintEventFlagSize
-.public SetSpecialEpisodeOpenOld
-.public CopyFrameTypeOption
-.public InitOptions
 .public sub_0204CDB8
 .public sub_0204E154
 .public sub_0204E19C

asm/include/main_0204CDB8.inc

@@ -1,6 +1,4 @@
 #pragma once
-.public SCENARIO_FLAG_RESUME_DEBUG_MSG
-.public SCENARIO_FLAG_BACKUP_DEBUG_MSG
 .public _0209E008
 .public _0209E010
 .public _0209E011
@@ -28,6 +26,8 @@
 .public PORTRAIT_LAYOUTS
 .public SaveScriptVariableValue
 .public SaveScriptVariableValueAtIndex
+.public SCENARIO_FLAG_BACKUP_DEBUG_MSG
+.public SCENARIO_FLAG_RESUME_DEBUG_MSG
 .public SetAdventureLogCompleted
 .public sub_02050974
 .public sub_02050990

asm/include/main_0204DE7C.inc

@@ -1,6 +1,13 @@
 #pragma once
-.public ARM9_UNKNOWN_TABLE__NA_209E280
+.public _0209E264
+.public _022AB4F8
+.public _022AB510
+.public _022AB518
+.public _022AB5A8
+.public _022AB5AC
+.public _s32_div_f
 .public ApplyLevelUpBoostsToGroundMonster
+.public ARM9_UNKNOWN_TABLE__NA_209E280
 .public CLIENT_LEVEL_TABLE
 .public CopyLogFrom
 .public CopyLogTo
@@ -18,15 +25,6 @@
 .public SaveOptionsToCtx
 .public SaveScriptVariableValue
 .public StringFromId
-.public WONDER_MAIL_BITS_SWAP
-.public WONDER_MAIL_ENCRYPTION_TABLE
-.public _0209E264
-.public _022AB4F8
-.public _022AB510
-.public _022AB518
-.public _022AB5A8
-.public _022AB5AC
-.public _s32_div_f
 .public sub_02004F80
 .public sub_0200C4CC
 .public sub_02048BFC
@@ -44,3 +42,5 @@
 .public sub_0205BD14
 .public sub_0205F00C
 .public sub_0205FE80
+.public WONDER_MAIL_BITS_SWAP
+.public WONDER_MAIL_ENCRYPTION_TABLE

asm/include/main_0204EFE0.inc

@@ -1,4 +1,13 @@
 #pragma once
+.public _0209E3A1
+.public _0209E3A2
+.public _0209E3A3
+.public _0209E6BD
+.public _020A192C
+.public _022AB4F8
+.public _022AB5AC
+.public _022AB69C
+.public _022AB924
 .public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
 .public ADVENTURE_LOG_PTR
 .public ARM9_UNKNOWN_DATA__NA_209E6BC
@@ -30,8 +39,8 @@
 .public IsRealMove
 .public IsRecruitingAllowed
 .public LoadScriptVariableValue
-.public MISSION_FLOOR_RANKS_PTRS
 .public MemZero
+.public MISSION_FLOOR_RANKS_PTRS
 .public NormalizeTreasureBox
 .public OUTLAW_LEVEL_TABLE
 .public OUTLAW_MINION_LEVEL_TABLE
@@ -42,17 +51,8 @@
 .public StrncpyName
 .public StrncpySimpleNoPad
 .public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TEAM_NAME
-.public _0209E3A1
-.public _0209E3A2
-.public _0209E3A3
-.public _0209E6BD
-.public _020A192C
-.public _022AB4F8
-.public _022AB5AC
-.public _022AB69C
-.public _022AB924
 .public sub_0204CEE0
 .public sub_020515C4
 .public sub_0205EE40
+.public TEAM_MEMBER_TABLE_PTR
+.public TEAM_NAME

asm/include/main_02052A7C.inc

@@ -1,3 +1,3 @@
 #pragma once
-.public MONSTER_DATA_TABLE_PTR
 .public _s32_div_f
+.public MONSTER_DATA_TABLE_PTR

asm/include/main_02052B44.inc

@@ -1,12 +1,30 @@
 #pragma once
+.public _020A1880
+.public _020A1884
+.public _020A189C
+.public _020A18C0
+.public _020A3210
+.public _020A322C
+.public _020A3248
+.public _020A3258
+.public _020A327C
+.public _020A328C
+.public _020A32D4
+.public _020A32F8
+.public _020A3330
+.public _020B09C8
+.public _020B09D0
+.public _020B12F4_EU
+.public _020B1308_EU
+.public _s32_div_f
 .public Debug_Print0
 .public DecompressAtNormalVeneer
 .public DexNumbersEqual
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DungeonToGroundMoveset
 .public EnableAllLearnableIqSkills
-.public FORBIDDEN_FORGOT_MOVE_LIST
 .public FemaleToMaleForm
+.public FORBIDDEN_FORGOT_MOVE_LIST
 .public GetBaseDefensiveStat
 .public GetBaseHp
 .public GetBaseOffensiveStat
@@ -27,8 +45,8 @@
 .public GetNbMoves
 .public GetSpriteSize
 .public GroundToDungeonMoveset
-.public HIDDEN_POWER_BASE_POWER_TABLE
 .public HandleSir0Translation
+.public HIDDEN_POWER_BASE_POWER_TABLE
 .public IsShaymin
 .public IsValidTeamMember
 .public ItemZInit
@@ -36,9 +54,9 @@
 .public LEVEL_UP_DATA_MONSTER_ID
 .public LoadFileFromRom
 .public LoadMonsterMd
-.public MONSTER_DATA_TABLE_PTR
 .public MemAlloc
 .public MemFree
+.public MONSTER_DATA_TABLE_PTR
 .public PointsToZero
 .public Rand16Bit
 .public RandIntSafe
@@ -50,28 +68,6 @@
 .public StrncmpSimple
 .public StrncpyName
 .public StrncpySimple
-.public TEAM_MEMBER_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public ZInit8
-.public _020A1880
-.public _020A1884
-.public _020A189C
-.public _020A18C0
-.public _020A3210
-.public _020A322C
-.public _020A3248
-.public _020A3258
-.public _020A327C
-.public _020A328C
-.public _020A32D4
-.public _020A32F8
-.public _020A3330
-.public _020B09C8
-.public _020B09D0
-.public _020B12F4_EU
-.public _020B1308_EU
-.public _s32_div_f
 .public sub_01FF8F28
 .public sub_02015090
 .public sub_02025304_JP
@@ -85,4 +81,8 @@
 .public sub_020560B8
 .public sub_020564B0
 .public sub_02056504
+.public TEAM_MEMBER_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
 .public vsprintf
+.public ZInit8

asm/include/main_02058F24.inc

@@ -1,205 +1,4 @@
 #pragma once
-.public ARM9_UNKNOWN_TABLE__NA_20A68BC
-.public AURA_BOW_STAT_BOOST
-.public AllocateTemp1024ByteBufferFromPool
-.public BulkItemToItem
-.public CAFE_MISSION_REWARD_TYPE_WEIGHTS
-.public CanEvolve
-.public CloseCollectionMenu
-.public ClosePortraitBox
-.public Copy16BitsFrom
-.public CopyBitsFrom
-.public CopyBitsTo
-.public CopyFrameTypeOption
-.public CopyMovesetFrom
-.public CopyMovesetTo
-.public CopyNStringFromId
-.public CreateCollectionMenu
-.public CreatePortraitBox
-.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
-.public DEF_SCARF_STAT_BOOST
-.public DEMO_TEAMS
-.public Debug_GetDebugFlag
-.public Debug_Print0
-.public DexNumbersEqual
-.public DirectoryFileMngr_ExtractAllDirectoryFiles
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DrawTextInWindow
-.public DungeonGoesUp
-.public DungeonSwapIdToIdx
-.public ENTITIES
-.public EVENTS
-.public EnableAllLearnableIqSkills
-.public EnqueueRender3dTiling
-.public ExplorersOfSkyMain
-.public FemaleToMaleForm
-.public FindItemInInventory
-.public GetAbility
-.public GetAbilityDescStringId
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetAdventureLogDungeonFloor
-.public GetBaseForm
-.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
-.public GetBodySize
-.public GetCategoryString
-.public GetDebugSpecialEpisodeNumber
-.public GetDungeonMode
-.public GetEvoParameters
-.public GetExclusiveItem
-.public GetFirstMatchingMemberIdx
-.public GetHero
-.public GetHeroMemberIdx
-.public GetHpBoostFromExclusiveItems
-.public GetIqGroup
-.public GetIqSkillStringId
-.public GetLanguageType
-.public GetLearnableIqSkills
-.public GetLvlUpEntry
-.public GetMainCharacter1
-.public GetMainCharacter1MemberIdx
-.public GetMainCharacter2
-.public GetMainCharacter2MemberIdx
-.public GetMainCharacter3
-.public GetMainCharacter3MemberIdx
-.public GetMainTeamNameWithCheck
-.public GetMaxItemsAllowed
-.public GetMaxMembersAllowed
-.public GetMaxReachedFloor
-.public GetMaxRescueAttempts
-.public GetMonsterGenderVeneer
-.public GetNameRaw
-.public GetNameString
-.public GetNbFloors
-.public GetPartner
-.public GetPartnerMemberIdx
-.public GetPartyMembers
-.public GetRank
-.public GetResolvedPerformanceProgressFlag
-.public GetScenarioBalance
-.public GetSecondFormIfValid
-.public GetSpecialEpisodeType
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetType
-.public GetTypeStringId
-.public GlobalProgressAlloc
-.public HandleSir0TranslationVeneer
-.public HasMonsterBeenAttackedInDungeons
-.public IQ_GROUP_SKILLS
-.public IQ_SKILLS
-.public ITEM_DELIVERY_TABLE
-.public InitKaomadoStream
-.public InitOptionsVeneer
-.public InitPreprocessorArgs
-.public InitScriptVariableValues
-.public InitSpecialEpisodeHero
-.public InitWanTable
-.public IqSkillFlagTest
-.public IsAuraBow
-.public IsCollectionMenuActive
-.public IsForbiddenFloor
-.public IsInvalidForMission
-.public IsItemAvailableInDungeonGroup
-.public IsItemInBag
-.public IsItemInTimeDarkness
-.public IsItemInTreasureBoxes
-.public IsItemValidVeneer
-.public IsMonsterOnTeam
-.public IsMonsterValid
-.public IsMovesetValid
-.public IsMovesetValidInTimeDarkness
-.public IsSpecialEpisodeBeaten
-.public IsSpecialEpisodeOpen
-.public IsStorableItem
-.public IsStoryBeforePoint
-.public IsThrownItem
-.public IsValidTargetItem
-.public JOB_MENU_ITEMS_1
-.public JOB_MENU_ITEMS_10
-.public JOB_MENU_ITEMS_11
-.public JOB_MENU_ITEMS_12
-.public JOB_MENU_ITEMS_13
-.public JOB_MENU_ITEMS_2
-.public JOB_MENU_ITEMS_3
-.public JOB_MENU_ITEMS_4
-.public JOB_MENU_ITEMS_5
-.public JOB_MENU_ITEMS_6
-.public JOB_MENU_ITEMS_7
-.public JOB_MENU_ITEMS_8
-.public JOB_MENU_ITEMS_9
-.public JOB_WINDOW_PARAMS_1
-.public JOB_WINDOW_PARAMS_2
-.public JoinedAtRangeCheck2
-.public KeyWaitInit
-.public LoadFileFromRom
-.public LoadOverlay
-.public LoadScriptVariableValue
-.public LoadTblTalk
-.public LoadWazaP
-.public MISSION_BANNED_MONSTERS
-.public MISSION_BANNED_STORY_MONSTERS
-.public MISSION_DELIVER_LIST_PTR
-.public MISSION_DUNGEON_UNLOCK_TABLE
-.public MISSION_MENU_STRING_IDS_1
-.public MISSION_MENU_STRING_IDS_2
-.public MISSION_RANK_POINTS
-.public MISSION_STRING_IDS
-.public MISSION_VALIDATION_FUNCTION_LIST
-.public MUNCH_BELT_STAT_BOOST
-.public MainGame
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public MemsetSimple
-.public MissionToWonderMailPassword
-.public MultiplyByFixedPoint
-.public NO_SEND_ITEM_TABLE
-.public NoteLoadBase
-.public NoteSaveBase
-.public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS
-.public OverlayIsLoaded
-.public POWER_BAND_STAT_BOOST
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public RANK_STRING_PTR_TABLE
-.public REMOTE_STRING_PTR_TABLE
-.public Rand16Bit
-.public RandInt
-.public RandIntSafe
-.public RandRangeSafe
-.public ReadSaveHeader
-.public RemoveFirstUnequippedItemOfType
-.public RetrieveFromItemList2
-.public SPECIAL_BAND_STAT_BOOST
-.public STATUS_NAME_STRING_IDS
-.public SaveScriptVariableValue
-.public SetAdventureLogStructLocation
-.public SetBothScreensWindowsColor
-.public SetCollectionMenuField0x1B2
-.public SetGameMode
-.public SetPokemonJoined
-.public SetQuestionMarks
-.public SetScenarioProgressScriptVar
-.public SetSpecialEpisodeOpen
-.public SetSpecialEpisodeType
-.public ShowPortraitInPortraitBox
-.public StrcpyName
-.public StringFromId
-.public StrncmpSimple
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPadSafe
-.public TACTIC_NAME_STRING_IDS
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public UnloadOverlay
-.public UpdateWindow
-.public WAN_TABLE
-.public ZINC_BAND_STAT_BOOST
-.public ZeroInitScriptVariable
 .public _020A1870
 .public _020A18FC
 .public _020A1904
@@ -317,7 +116,167 @@
 .public _022B7310
 .public _022B7320
 .public _s32_div_f
+.public AllocateTemp1024ByteBufferFromPool
+.public ARM9_UNKNOWN_TABLE__NA_20A68BC
+.public AURA_BOW_STAT_BOOST
+.public BulkItemToItem
+.public CAFE_MISSION_REWARD_TYPE_WEIGHTS
+.public CanEvolve
+.public CloseCollectionMenu
+.public ClosePortraitBox
+.public Copy16BitsFrom
+.public CopyBitsFrom
+.public CopyBitsTo
+.public CopyFrameTypeOption
+.public CopyMovesetFrom
+.public CopyMovesetTo
+.public CopyNStringFromId
+.public CreateCollectionMenu
+.public CreatePortraitBox
+.public Debug_GetDebugFlag
+.public Debug_Print0
+.public DEF_SCARF_STAT_BOOST
+.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
+.public DEMO_TEAMS
+.public DexNumbersEqual
+.public DirectoryFileMngr_ExtractAllDirectoryFiles
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DrawTextInWindow
+.public DungeonGoesUp
+.public DungeonSwapIdToIdx
+.public EnableAllLearnableIqSkills
+.public EnqueueRender3dTiling
+.public ENTITIES
+.public EVENTS
+.public ExplorersOfSkyMain
+.public FemaleToMaleForm
+.public FindItemInInventory
+.public GetAbility
+.public GetAbilityDescStringId
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetAdventureLogDungeonFloor
+.public GetBaseForm
+.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
+.public GetBodySize
+.public GetCategoryString
+.public GetDebugSpecialEpisodeNumber
+.public GetDungeonMode
+.public GetEvoParameters
+.public GetExclusiveItem
+.public GetFirstMatchingMemberIdx
+.public GetHero
+.public GetHeroMemberIdx
+.public GetHpBoostFromExclusiveItems
+.public GetIqGroup
+.public GetIqSkillStringId
+.public GetLanguageType
+.public GetLearnableIqSkills
+.public GetLvlUpEntry
+.public GetMainCharacter1
+.public GetMainCharacter1MemberIdx
+.public GetMainCharacter2
+.public GetMainCharacter2MemberIdx
+.public GetMainCharacter3
+.public GetMainCharacter3MemberIdx
+.public GetMainTeamNameWithCheck
+.public GetMaxItemsAllowed
+.public GetMaxMembersAllowed
+.public GetMaxReachedFloor
+.public GetMaxRescueAttempts
+.public GetMonsterGenderVeneer
+.public GetNameRaw
+.public GetNameString
+.public GetNbFloors
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPartyMembers
+.public GetRank
+.public GetResolvedPerformanceProgressFlag
+.public GetScenarioBalance
+.public GetSecondFormIfValid
+.public GetSpecialEpisodeType
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetType
+.public GetTypeStringId
+.public GlobalProgressAlloc
+.public HandleSir0TranslationVeneer
+.public HasMonsterBeenAttackedInDungeons
+.public InitKaomadoStream
+.public InitOptionsVeneer
+.public InitPreprocessorArgs
+.public InitScriptVariableValues
+.public InitSpecialEpisodeHero
+.public InitWanTable
+.public IQ_GROUP_SKILLS
+.public IQ_SKILLS
+.public IqSkillFlagTest
+.public IsAuraBow
+.public IsCollectionMenuActive
+.public IsForbiddenFloor
+.public IsInvalidForMission
+.public IsItemAvailableInDungeonGroup
+.public IsItemInBag
+.public IsItemInTimeDarkness
+.public IsItemInTreasureBoxes
+.public IsItemValidVeneer
+.public IsMonsterOnTeam
+.public IsMonsterValid
+.public IsMovesetValid
+.public IsMovesetValidInTimeDarkness
+.public IsSpecialEpisodeBeaten
+.public IsSpecialEpisodeOpen
+.public IsStorableItem
+.public IsStoryBeforePoint
+.public IsThrownItem
+.public IsValidTargetItem
+.public ITEM_DELIVERY_TABLE
+.public JOB_MENU_ITEMS_1
+.public JOB_MENU_ITEMS_10
+.public JOB_MENU_ITEMS_11
+.public JOB_MENU_ITEMS_12
+.public JOB_MENU_ITEMS_13
+.public JOB_MENU_ITEMS_2
+.public JOB_MENU_ITEMS_3
+.public JOB_MENU_ITEMS_4
+.public JOB_MENU_ITEMS_5
+.public JOB_MENU_ITEMS_6
+.public JOB_MENU_ITEMS_7
+.public JOB_MENU_ITEMS_8
+.public JOB_MENU_ITEMS_9
+.public JOB_WINDOW_PARAMS_1
+.public JOB_WINDOW_PARAMS_2
+.public JoinedAtRangeCheck2
+.public KeyWaitInit
+.public LoadFileFromRom
+.public LoadOverlay
+.public LoadScriptVariableValue
+.public LoadTblTalk
+.public LoadWazaP
+.public MainGame
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
 .public memset
+.public MemsetSimple
+.public MemZero
+.public MISSION_BANNED_MONSTERS
+.public MISSION_BANNED_STORY_MONSTERS
+.public MISSION_DELIVER_LIST_PTR
+.public MISSION_DUNGEON_UNLOCK_TABLE
+.public MISSION_MENU_STRING_IDS_1
+.public MISSION_MENU_STRING_IDS_2
+.public MISSION_RANK_POINTS
+.public MISSION_STRING_IDS
+.public MISSION_VALIDATION_FUNCTION_LIST
+.public MissionToWonderMailPassword
+.public MultiplyByFixedPoint
+.public MUNCH_BELT_STAT_BOOST
+.public NO_SEND_ITEM_TABLE
+.public NoteLoadBase
+.public NoteSaveBase
+.public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS
 .public ov00_022BE0C8
 .public ov01_02337B3C
 .public ov01_02337B68
@@ -333,9 +292,42 @@
 .public ov03_0233CDE4
 .public ov11_022E82CC
 .public ov11_022E96E4
+.public OverlayIsLoaded
+.public PlaySeVolumeWrapper
+.public POWER_BAND_STAT_BOOST
+.public PreprocessString
+.public PreprocessStringFromId
+.public Rand16Bit
+.public RandInt
+.public RandIntSafe
+.public RandRangeSafe
+.public RANK_STRING_PTR_TABLE
+.public ReadSaveHeader
+.public REMOTE_STRING_PTR_TABLE
+.public RemoveFirstUnequippedItemOfType
+.public RetrieveFromItemList2
+.public SaveScriptVariableValue
+.public SetAdventureLogStructLocation
+.public SetBothScreensWindowsColor
+.public SetCollectionMenuField0x1B2
+.public SetGameMode
+.public SetPokemonJoined
+.public SetQuestionMarks
+.public SetScenarioProgressScriptVar
+.public SetSpecialEpisodeOpen
+.public SetSpecialEpisodeType
+.public ShowPortraitInPortraitBox
+.public SPECIAL_BAND_STAT_BOOST
+.public STATUS_NAME_STRING_IDS
 .public strcat
 .public strcpy
+.public StrcpyName
+.public StringFromId
 .public strncat
+.public StrncmpSimple
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
 .public sub_02001AB0
 .public sub_020022C4
 .public sub_020022D0
@@ -460,4 +452,12 @@
 .public sub_02056E04
 .public sub_020584F8
 .public sub_02058C30
+.public TACTIC_NAME_STRING_IDS
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
+.public UnloadOverlay
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE
+.public ZeroInitScriptVariable
+.public ZINC_BAND_STAT_BOOST

asm/include/main_0206A750.inc

@@ -1,39 +1,4 @@
 #pragma once
-.public CosAbs4096
-.public DRIVER_WORK
-.public DUNGEON_SWAP_ID_TABLE
-.public Debug_Print0
-.public DelayWteFree
-.public DeleteWanTableEntryVeneer
-.public DseBgm_StopAll
-.public DseBgm_SysSetupNoteList
-.public DseDriver_StartMainThread
-.public DseDriver_StartTickTimer
-.public DseMem_Clear
-.public DseMem_Quit
-.public DseSe_StopAll
-.public DseSe_SysReset
-.public DseSequence_PauseList
-.public DseSwd_SysInit
-.public DseSwd_SysQuit
-.public DseVoice_ResetAll
-.public DseVoice_ResetHW
-.public GetDungeonMode
-.public GetExecuteSpecialEpisodeType
-.public InitAnimationControlWithSet__0201C0B0
-.public LoadScriptVariableValue
-.public LoadWanTableEntry
-.public LoadWteFromRom
-.public MAP_MARKER_PLACEMENTS
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MultiplyByFixedPoint
-.public Rand16Bit
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public SinAbs4096
-.public WAN_TABLE
 .public _020A94BC
 .public _020A94C6
 .public _020A94D2
@@ -60,11 +25,45 @@
 .public _022B8330
 .public _022B9130
 .public _s32_div_f
+.public CosAbs4096
+.public Debug_Print0
+.public DelayWteFree
+.public DeleteWanTableEntryVeneer
+.public DRIVER_WORK
+.public DseBgm_StopAll
+.public DseBgm_SysSetupNoteList
+.public DseDriver_StartMainThread
+.public DseDriver_StartTickTimer
+.public DseMem_Clear
+.public DseMem_Quit
+.public DseSe_StopAll
+.public DseSe_SysReset
+.public DseSequence_PauseList
+.public DseSwd_SysInit
+.public DseSwd_SysQuit
+.public DseVoice_ResetAll
+.public DseVoice_ResetHW
+.public DUNGEON_SWAP_ID_TABLE
+.public GetDungeonMode
+.public GetExecuteSpecialEpisodeType
+.public InitAnimationControlWithSet__0201C0B0
+.public LoadScriptVariableValue
+.public LoadWanTableEntry
+.public LoadWteFromRom
+.public MAP_MARKER_PLACEMENTS
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public MultiplyByFixedPoint
 .public ov10_022C2340
 .public ov10_022C23B0
 .public ov10_022C23EC
 .public ov10_022C2450
 .public ov10_022C24DC
+.public Rand16Bit
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
+.public SinAbs4096
 .public sub_0201CF5C
 .public sub_0201D12C
 .public sub_0201D9C8
@@ -100,3 +99,4 @@
 .public sub_0207AD54
 .public sub_0207AEF4
 .public sub_0207AFF0
+.public WAN_TABLE

asm/include/main_02075600.inc

@@ -52,8 +52,8 @@
 .public EnableIrqFiqFlags
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
-.public GetProcessorMode
 .public GetGameMode
+.public GetProcessorMode
 .public gGXState
 .public GXi_DmaId
 .public GXi_VRamLockId

asm/include/main_rodata_020908D4.inc

@@ -43,7 +43,6 @@
 .public _0209CE9C
 .public _0209CEA4
 .public _0209CEBC
-.public SUM_MSG
 .public _0209CFA8
 .public _0209CFB0
 .public _0209CFBC
@@ -79,7 +78,6 @@
 .public _0209D168
 .public _0209D178
 .public _0209D188
-.public SUB30_PROJECTP
 .public _0209D1A8
 .public _0209D1B8
 .public _0209D1C8
@@ -97,7 +95,6 @@
 .public _0209D290
 .public _0209D2A4
 .public _0209D2B8
-.public NOTE_MODIFY_FLAG
 .public _0209D2E0
 .public _0209D2F4
 .public _0209D308
@@ -263,8 +260,10 @@
 .public IsAOrBPressed
 .public memset
 .public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1
+.public NOTE_MODIFY_FLAG_MSG
 .public snprintf
 .public sprintf
+.public SUB30_PROJECTP_MSG
 .public sub_02005D14
 .public sub_02005D90
 .public sub_02005DE0
@@ -412,6 +411,7 @@
 .public sub_0209081C
 .public sub_0209086C
 .public sub_020908A8
+.public SUM_MSG
 .public TryAppendToSlice
 .public TryAssignByteWrapper
 .public UpdateAdvancedMenu

asm/include/main_rodata_0209CECC.inc

@@ -1,11 +1,8 @@
 #pragma once
-.public ARM9_UNKNOWN_DATA__NA_209EAAC
-.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1
 .public _0209CE8C
 .public _0209CE94
 .public _0209CE9C
 .public _0209CEA4
-.public SUM_MSG
 .public _0209CFA8
 .public _0209CFB0
 .public _0209CFBC
@@ -41,7 +38,6 @@
 .public _0209D168
 .public _0209D178
 .public _0209D188
-.public SUB30_PROJECTP
 .public _0209D1A8
 .public _0209D1B8
 .public _0209D1C8
@@ -59,7 +55,6 @@
 .public _0209D290
 .public _0209D2A4
 .public _0209D2B8
-.public NOTE_MODIFY_FLAG
 .public _0209D2E0
 .public _0209D2F4
 .public _0209D308
@@ -218,3 +213,8 @@
 .public _0209F330
 .public _0209F394
 .public _0209F3F8
+.public ARM9_UNKNOWN_DATA__NA_209EAAC
+.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1
+.public NOTE_MODIFY_FLAG_MSG
+.public SUB30_PROJECTP_MSG
+.public SUM_MSG

asm/include/main_rodata_020A1894.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/main_rodata_020A18BC.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/main_rodata_020A1BB0.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/main_rodata_020A20B1.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/main_rodata_020A2808.inc

@@ -35,11 +35,6 @@
 .public _02092EBC
 .public _02092ED0
 .public _02094D00
-.public ST_I2N_I_BIN
-.public ST_I2N_E_BIN
-.public ST_I2N_S_BIN
-.public ST_I2N_G_BIN
-.public ST_I2N_F_BIN
 .public _02098DAC
 .public _02098DC8
 .public _02098EB0
@@ -1684,6 +1679,11 @@
 .public SoundLfoWave_InvalidFunc
 .public SoundLfoWave_ReverseSawFunc
 .public SoundLfoWave_SawFunc
+.public ST_I2N_E_BIN
+.public ST_I2N_F_BIN
+.public ST_I2N_G_BIN
+.public ST_I2N_I_BIN
+.public ST_I2N_S_BIN
 .public STRING_BALANCE_M_LEVEL_BIN
 .public STRING_DUNGEON_DUNGEON_BIN
 .public STRING_EFFECT_EFFECT_BIN

asm/include/overlay_00.inc

@@ -26,6 +26,7 @@
 .public ArrayFill16
 .public ArrayFill32
 .public ArrayFill32Fast
+.public Crypto_RC4Encrypt
 .public CRYPTO_RC4Init
 .public Debug_GetDebugFlag
 .public EnableIrqFlag
@@ -39,6 +40,9 @@
 .public HardwareInterrupt
 .public InitMenu
 .public LoadOverlay
+.public MD5_Digest
+.public MD5_Init
+.public MD5_Update
 .public MemAlloc
 .public memcmp
 .public memcpy
@@ -1087,7 +1091,6 @@
 .public sub_020590DC
 .public sub_0205B77C
 .public sub_0205B80C
-.public sub_020757B0
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
@@ -1140,9 +1143,6 @@
 .public sub_0207F70C
 .public sub_0207F818
 .public sub_0207F828
-.public sub_020800FC
-.public sub_0208013C
-.public sub_02080204
 .public sub_0208266C
 .public sub_02082748
 .public sub_020827F4

asm/include/overlay_00_0230D398.inc

@@ -27,14 +27,6 @@
 .public ov00_022F4DCC
 .public ov00_022F4E44
 .public ov00_022F4E8C
-.public ov00_022F4FA0
-.public ov00_022F4FB4
-.public ov00_022F4FDC
-.public ov00_022F503C
-.public ov00_022F5088
-.public ov00_022F509C
-.public ov00_022F50CC
-.public ov00_022F50E0
 .public ov00_022F514C
 .public ov00_022F5178
 .public ov00_022F5194
@@ -269,6 +261,14 @@
 .public ov09_0233CA80
 .public ov09_0233CBC8
 .public ov09_0233CBF8
+.public SocketBind
+.public SocketClose
+.public SocketConnect
+.public SocketCreate
+.public SocketRecv
+.public SocketRecvFrom
+.public SocketSend
+.public SocketSendTo
 .public strchr
 .public strcmp
 .public strcpy

asm/include/overlay_01.inc

@@ -64,9 +64,9 @@
 .public GetNbPokemonJoined
 .public GetNbRecycled
 .public GetNbSkyGiftsSent
-.public GetResolvedPerformanceProgressFlag
 .public GetPressedButtons
 .public GetReleasedStylus
+.public GetResolvedPerformanceProgressFlag
 .public GetSimpleMenuResult__0202AEA4
 .public GetSimpleMenuResult__0202B870
 .public GetSosMailCount
@@ -97,6 +97,7 @@
 .public IsSpecialEpisodeOpenMismatch
 .public IsSpecialEpisodeOpenOld
 .public IsTextBoxActive
+.public IsTouchScreenNotOff
 .public LoadScriptVariableValueAtIndex
 .public LoadWanTableEntry
 .public LoadWanTableEntryFromPack
@@ -336,7 +337,6 @@
 .public sub_02049D4C
 .public sub_0204a1cc
 .public sub_0204A1CC
-.public IsTouchScreenNotOff
 .public sub_0204DF54
 .public sub_0204DFB0
 .public sub_0204E02C

asm/include/overlay_02.inc

@@ -11,7 +11,9 @@
 .public ArrayFill16
 .public ArrayFill32
 .public ArrayFill32Fast
+.public bind
 .public ClearIrqFlag
+.public CloseVeneer
 .public EnableIrqFlag
 .public FileInit
 .public FX_DivS32
@@ -74,6 +76,7 @@
 .public GXS_LoadOBJPltt
 .public GXS_SetGraphicsMode
 .public GXx_SetMasterBrightness_
+.public InitWfc
 .public MemAlloc
 .public memcmp
 .public memcpy
@@ -122,11 +125,6 @@
 .public ov00_022C759C
 .public ov00_022C75D8
 .public ov00_022CEF10
-.public ov00_022CF1AC
-.public ov00_022CF1D8
-.public ov00_022CF284
-.public ov00_022CF338
-.public ov00_022CF3C8
 .public ov00_022CF674
 .public ov00_022CF7E8
 .public ov00_022CF8F8
@@ -143,7 +141,6 @@
 .public ov00_022D6C88
 .public ov00_022D6D04
 .public ov00_022D75EC
-.public ov00_022D7794
 .public ov00_022D7864
 .public ov00_022D7958
 .public ov00_022D7AB0
@@ -165,7 +162,10 @@
 .public ov00_02318160
 .public ov00_023250C8
 .public PM_ForceToPowerOff
+.public recvfrom
+.public sendto
 .public SetIrqFlag
+.public socket
 .public StartThread
 .public strcpy
 .public strlen

asm/include/overlay_03_0233CA98.inc

@@ -42,6 +42,7 @@
 .public IsMonsterIllegalForMissions
 .public IsRecruitingAllowed
 .public IsScrollBoxActive
+.public IsTouchScreenNotOff
 .public ItemZInit
 .public LoadFileFromRom
 .public MemAlloc
@@ -246,7 +247,6 @@
 .public sub_02046D20
 .public sub_0204A018
 .public sub_0204A1CC
-.public IsTouchScreenNotOff
 .public sub_0204DBA0
 .public sub_0204DCA0
 .public sub_0204E210

asm/include/overlay_05.inc

@@ -19,6 +19,7 @@
 .public IsAdvancedMenuActive2
 .public IsMonsterIllegalForMissions
 .public IsMovesetValid
+.public IsTouchScreenNotOff
 .public MemAlloc
 .public MemFree
 .public MemZero
@@ -93,7 +94,6 @@
 .public sub_02047150
 .public sub_0204A018
 .public sub_0204A1CC
-.public IsTouchScreenNotOff
 .public sub_0204E210
 .public sub_0204E5E4
 .public sub_02050CD0

asm/include/overlay_06.inc

@@ -16,6 +16,7 @@
 .public IsMissionSuspendedAndValid
 .public IsMissionTypeSpecialEpisode
 .public IsSpecialEpisodeOpen
+.public IsTouchScreenNotOff
 .public MemAlloc
 .public MemcpySimple
 .public MemFree
@@ -50,6 +51,7 @@
 .public ov01_02338EC4
 .public ov01_02339888
 .public ov01_023398A4
+.public SetSpecialEpisodeOpen
 .public ShowKeyboard
 .public sub_02003B94
 .public sub_02003BC8
@@ -70,8 +72,6 @@
 .public sub_02046D20
 .public sub_0204A018
 .public sub_0204A1CC
-.public IsTouchScreenNotOff
-.public SetSpecialEpisodeOpen
 .public sub_0204E210
 .public sub_02050974
 .public sub_020509BC

asm/include/overlay_09.inc

@@ -18,6 +18,7 @@
 .public IsDialogueBoxActive
 .public IsEmptyString
 .public IsMenuOptionActive
+.public IsSpecialEpisodeBeaten
 .public MemAlloc
 .public MemFree
 .public NewWindowScreenCheck
@@ -63,6 +64,5 @@
 .public sub_02032684
 .public sub_02032984
 .public sub_02033758
-.public IsSpecialEpisodeBeaten
 .public sub_02052060
 .public UpdateWindow

asm/include/overlay_11.inc

@@ -30,6 +30,7 @@
 .public Debug_GetLogFlag
 .public Debug_Print
 .public Debug_Print0
+.public DefaultInitScriptVariable
 .public DrawTeamStats
 .public DungeonRequestsDoneWrapper
 .public DungeonSwapIdxToId
@@ -69,13 +70,14 @@
 .public GetNameRaw
 .public GetPartner
 .public GetPartyMembers
-.public GetResolvedPerformanceProgressFlag
 .public GetPressedButtons
 .public GetRank
 .public GetReleasedStylus
+.public GetResolvedPerformanceProgressFlag
 .public GetScenarioBalance
 .public GetScriptEntityMonsterId
 .public GetSosMailCount
+.public GetSpeedOption
 .public GetStringFromFileVeneer
 .public GetTalkLine
 .public GetTeamMember
@@ -105,6 +107,8 @@
 .public IsStoryAtPoint
 .public IsStoryBeforeOrAtPoint
 .public IsStoryBeforePoint
+.public IsTouchScreenNotOff
+.public IsTouchScreenUseAnywhere
 .public ItemAtTableIdx
 .public KeyWaitInit
 .public LoadAndCompareScriptVarAndValue
@@ -503,6 +507,7 @@
 .public SetPortraitEmotion
 .public SetPortraitLayout
 .public SetPortraitOffset
+.public SetResolvedPerformanceProgressFlag
 .public SetScenarioProgressScriptVar
 .public SetSpecialEpisodeBeaten
 .public SetTeamSetupHeroAndPartnerOnly
@@ -636,11 +641,6 @@
 .public sub_02048614
 .public sub_02049338
 .public sub_0204964C
-.public IsTouchScreenNotOff
-.public IsTouchScreenUseAnywhere
-.public GetSpeedOption
-.public DefaultInitScriptVariable
-.public SetResolvedPerformanceProgressFlag
 .public sub_0204CDE8
 .public sub_0204CE48
 .public sub_0204D018

asm/include/overlay_11_022EE5E4.inc

@@ -97,15 +97,16 @@
 .public GetNameWithGender
 .public GetNbItemsInBag
 .public GetPartner
-.public GetResolvedPerformanceProgressFlag
 .public GetPressedButtons
 .public GetRank
 .public GetRankupPoints
+.public GetResolvedPerformanceProgressFlag
 .public GetSimpleMenuResult__0202AEA4
 .public GetSimpleMenuResult__0202B870
 .public GetSpriteIndex__02052724
 .public GetStringFromFileVeneer
 .public GetTeamMember
+.public GetTopScreenOption
 .public GetWindowContents
 .public GetWindowIdPageStart
 .public GetWindowIdSelectedItemOnPage
@@ -942,7 +943,6 @@
 .public sub_020483D8
 .public sub_02048764
 .public sub_02048794
-.public GetTopScreenOption
 .public sub_0204AFD0
 .public sub_0204CDCC
 .public sub_0204CE00

asm/include/overlay_14.inc

@@ -35,6 +35,7 @@
 .public IsDialogueBoxActive
 .public IsSimpleMenuActive
 .public IsTextBoxActive
+.public IsTouchScreenNotOff
 .public LoadObjectAnimData
 .public MemAlloc
 .public MemFree
@@ -67,5 +68,4 @@
 .public sub_0202BC60
 .public sub_0202F334
 .public sub_0202F954
-.public IsTouchScreenNotOff
 .public UpdateWindow

asm/include/overlay_17_0238A754.inc

@@ -21,8 +21,8 @@
 .public GetGameMode
 .public GetMainCharacter1MemberIdx
 .public GetPartnerMemberIdx
-.public GetResolvedPerformanceProgressFlag
 .public GetPressedButtons
+.public GetResolvedPerformanceProgressFlag
 .public GetSimpleMenuResult__0202B870
 .public GetTeamMember
 .public InitPortraitParamsWithMonsterId

asm/include/overlay_19.inc

@@ -29,8 +29,8 @@
 .public GetItemAtIdx
 .public GetLearnableIqSkills
 .public GetMaxReachedFloor
-.public GetResolvedPerformanceProgressFlag
 .public GetPressedButtons
+.public GetResolvedPerformanceProgressFlag
 .public GetScenarioBalance
 .public GetSecondFormIfValid
 .public GetStringFromFileVeneer

asm/include/overlay_29_022DEBA4.inc

@@ -37,6 +37,7 @@
 .public GetLeader
 .public GetMaxReachedFloor
 .public GetMaxRescueAttempts
+.public GetTopScreenOption
 .public GetTurnLimit
 .public IncrementNbSteals
 .public InitAlertBoxInfo
@@ -235,7 +236,6 @@
 .public sub_02009194
 .public sub_020091B0
 .public sub_02017B00
-.public GetTopScreenOption
 .public sub_0204F1B4
 .public sub_020510E8
 .public sub_02051134

asm/include/overlay_29_022E08A0.inc

@@ -15,6 +15,7 @@
 .public GetScenarioBalance
 .public HandleSir0Translation
 .public IsCurrentTilesetBackground
+.public IsTouchScreenUseAnywhere
 .public LoadTextureUi
 .public LoadWteFromFileDirectory
 .public Memcpy32
@@ -57,6 +58,5 @@
 .public sub_0201B43C
 .public sub_0201E380
 .public sub_0201F598
-.public IsTouchScreenUseAnywhere
 .public UnloadFile
 .public UnloadWte

asm/include/overlay_29_022E37DC.inc

@@ -37,6 +37,7 @@
 .public GetSecondFormIfValid
 .public GetSpriteFileSize
 .public GetSpriteSize
+.public GetTopScreenOption
 .public HandleSir0Translation
 .public InitPreprocessorArgs
 .public IsBossFight
@@ -48,6 +49,7 @@
 .public IsFullFloorFixedRoom
 .public IsInSpawnList
 .public IsItemForSpecialSpawnInBag
+.public IsTeamStatsOnTopScreen
 .public LoadFileFromRom
 .public LoadFixedRoom
 .public LogMessageByIdWithPopup
@@ -155,8 +157,6 @@
 .public sub_020483B8
 .public sub_020483D8
 .public sub_02048400
-.public GetTopScreenOption
-.public IsTeamStatsOnTopScreen
 .public SubstitutePlaceholderStringTags
 .public TOP_SCREEN_STATUS_PTR
 .public UnloadFile

asm/include/overlay_29_022E9618.inc

@@ -13,8 +13,10 @@
 .public DungeonRandInt
 .public EntityIsValid__022E95F4
 .public FlashLeaderIcon
+.public GetBottomScreenOption
 .public GetLeader
 .public GetTile
+.public GetTopScreenOption
 .public GetTreatmentBetweenMonsters
 .public HandleTopScreenFades
 .public InitWeirdMinimapMatrix
@@ -48,8 +50,6 @@
 .public ov29_0237C888
 .public RenderWeather3D
 .public sub_0201BAC8
-.public GetTopScreenOption
-.public GetBottomScreenOption
 .public sub_02051E20
 .public UpdateCamera
 .public UpdateMinimap

asm/include/overlay_29_022F05B4.inc

@@ -26,7 +26,10 @@
 .public EntityIsValid__022F0590
 .public ExecuteMoveEffect
 .public GetActiveTeamMember
+.public GetBottomScreenOption
+.public GetCheckDirectionOption
 .public GetDirectionTowardsPosition
+.public GetDPadAttackOption
 .public GetEntityMoveTargetAndRange
 .public GetEquippedThrowableItem
 .public GetHero
@@ -45,6 +48,7 @@
 .public GetTile
 .public GetTileAtEntity
 .public GetTileSafe
+.public GetTopScreenOption
 .public GetTrapInfo
 .public GetTreatmentBetweenMonsters
 .public HasHeldItem
@@ -60,6 +64,7 @@
 .public IsFloorOver
 .public IsGoldenChamber
 .public IsSecretBazaarNpc
+.public IsTextLogOnTopScreen
 .public ItemZInit
 .public LEADER_PTR
 .public LogItemBlockedByEmbargo
@@ -176,6 +181,7 @@
 .public SetMessageLogPreprocessorArgsSpeakerId0x30000
 .public SetMessageLogPreprocessorArgsStringToName
 .public SetMonsterActionFields
+.public SetTopScreenOption
 .public ShouldMonsterRunAway
 .public ShouldMonsterRunAwayAndShowEffect
 .public SpawnItem
@@ -186,12 +192,6 @@
 .public sub_0201CF90
 .public sub_02026268
 .public sub_02027B1C
-.public GetTopScreenOption
-.public SetTopScreenOption
-.public GetBottomScreenOption
-.public GetDPadAttackOption
-.public GetCheckDirectionOption
-.public IsTextLogOnTopScreen
 .public SubstitutePlaceholderStringTags
 .public TryAddMonsterToActiveTeam
 .public TryLeaderItemPickUp

asm/include/overlay_29_022F9744.inc

@@ -21,6 +21,7 @@
 .public GetActiveTeamMember
 .public GetConversion2ConvertToType
 .public GetDirectionTowardsPosition
+.public GetFarOffPalsOption
 .public GetIdleAnimationId
 .public GetLearnableIqSkills
 .public GetMaxPpWrapper
@@ -52,7 +53,6 @@
 .public SetPreprocessorArgsStringToName
 .public ShouldDisplayEntityWrapper
 .public sub_02017C50
-.public GetFarOffPalsOption
 .public sub_02050FF8
 .public sub_02052E2C
 .public sub_02056228

asm/include/overlay_29_023047DC.inc

@@ -14,6 +14,7 @@
 .public EntityIsValid__0230558C
 .public GetDirectionTowardsPosition
 .public GetShadowSize
+.public GetSpeedOption
 .public GetTileAtEntity
 .public IncrementEntityPixelPosXY
 .public IsFloorOver
@@ -39,7 +40,6 @@
 .public SetAndPlayAnimationForAnimationControl
 .public SetSpriteIdForAnimationControl
 .public ShouldDisplayEntityWrapper
-.public GetSpeedOption
 .public sub_02053038
 .public TryForcedLoss
 .public UpdateEntityPixelPos

asm/include/overlay_29_02308FE0.inc

@@ -22,6 +22,7 @@
 .public ExclusiveItemEffectIsActiveWithLogging
 .public FreeOtherWrappedMonsters
 .public GetActiveTeamMember
+.public GetDamageTurnOption
 .public GetDirectionTowardsPosition
 .public GetExp
 .public GetIdleAnimationId
@@ -106,7 +107,6 @@
 .public SetPokemonBattled
 .public ShouldDisplayEntityWrapper
 .public SpawnDroppedItemWrapper
-.public GetDamageTurnOption
 .public SubInitMonster
 .public SubstitutePlaceholderStringTags
 .public TryEndPetrifiedOrSleepStatus

asm/include/overlay_29_02336450.inc

@@ -8,6 +8,7 @@
 .public EntityIsValid__02337CA8
 .public FloorSecondaryTerrainIsChasm
 .public GetBgRegionArea
+.public GetGridsOption
 .public GetLeader
 .public GetTile
 .public GetTileSafe
@@ -37,6 +38,5 @@
 .public ov29_0237CAAC
 .public RandIntSafe
 .public SECONDARY_TERRAIN_TYPES
-.public GetGridsOption
 .public sub_02051D8C
 .public sub_02051E60

asm/include/overlay_29_0233861C.inc

@@ -13,6 +13,7 @@
 .public DungeonRandRange
 .public FLOOR_GENERATION_STATUS
 .public GenerateSecondaryTerrainFormations
+.public GetBottomScreenOption
 .public GetFinalKecleonShopSpawnChance
 .public GetFloorType
 .public GetHiddenStairsType
@@ -21,6 +22,7 @@
 .public GetNextFixedRoomAction
 .public GetTile
 .public GetTileSafe
+.public GetTopScreenOption
 .public GetTrapInfo
 .public HandleSir0Translation
 .public HIDDEN_STAIRS_SPAWN_BLOCKED
@@ -33,6 +35,7 @@
 .public IsExperienceLocked
 .public IsGoldenChamber
 .public IsHiddenStairsFloor
+.public IsMapShownOnEitherScreen
 .public IsOutlawMonsterHouseFloor
 .public IsSecretBazaar
 .public LoadFixedRoomData
@@ -88,9 +91,6 @@
 .public sub_0200C008
 .public sub_0201B9F8
 .public sub_0201F2A0
-.public GetTopScreenOption
-.public GetBottomScreenOption
-.public IsMapShownOnEitherScreen
 .public TeamMemberHasExclusiveItemEffectActive
 .public TILESET_PROPERTIES
 .public UnloadFile

asm/include/overlay_29_0234CA84.inc

@@ -8,9 +8,9 @@
 .public GetItemCategoryVeneer
 .public GetLeader
 .public GetMessageLogPreprocessorArgs
-.public GetResolvedPerformanceProgressFlag
 .public GetPlayerGender
 .public GetRandomExplorerMazeMonster
+.public GetResolvedPerformanceProgressFlag
 .public IsFullFloorFixedRoom
 .public IsFutureDungeon
 .public IsMonster__0234D460

asm/include/overlay_29_0234DDF4.inc

@@ -9,6 +9,7 @@
 .public EntityIsValid__0234EC14
 .public EntryOverlay31
 .public GetActiveTeamMember
+.public GetCheckDirectionOption
 .public GetItemMoveId16
 .public GetItemToUse
 .public GetLeader
@@ -62,7 +63,6 @@
 .public sub_0200B3D4
 .public sub_020282F4
 .public sub_0202AAE8
-.public GetCheckDirectionOption
 .public TeamMenu
 .public TryPointCameraToMonster
 .public UnloadOverlay

asm/include/overlay_31_023833D8.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public GetTopScreenOption
 .public ov31_02383328
 .public ov31_0238335C
 .public ov31_023833B4
@@ -6,4 +7,3 @@
 .public OVERLAY31_UNKNOWN_POINTER__NA_238A268
 .public sub_020355DC
 .public sub_02035CE4
-.public GetTopScreenOption

asm/main_02075600.s

@@ -139,8 +139,8 @@ _02075764:
 	bx lr
 	arm_func_end CRYPTO_RC4Init
 
-	arm_func_start sub_020757B0
-sub_020757B0: ; 0x020757B0
+	arm_func_start Crypto_RC4Encrypt
+Crypto_RC4Encrypt: ; 0x020757B0
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
 	ldrb r7, [r0]
 	ldrb r6, [r0, #1]
@@ -173,7 +173,7 @@ _02075810:
 	strb r7, [r0, #-4]
 	strb r6, [r0, #-3]
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
-	arm_func_end sub_020757B0
+	arm_func_end Crypto_RC4Encrypt
 
 	arm_func_start MTX_LookAt
 MTX_LookAt: ; 0x02075828

asm/main_0207F894.s

@@ -653,8 +653,8 @@ _020800F0:
 	ldmia sp!, {pc}
 	arm_func_end sub_020800B0
 
-	arm_func_start sub_020800FC
-sub_020800FC: ; 0x020800FC
+	arm_func_start MD5_Init
+MD5_Init: ; 0x020800FC
 	ldr r2, _0208012C ; =0x67452301
 	ldr r1, _02080130 ; =0xEFCDAB89
 	str r2, [r0]
@@ -672,10 +672,10 @@ _0208012C: .word 0x67452301
 _02080130: .word 0xEFCDAB89
 _02080134: .word 0x98BADCFE
 _02080138: .word 0x10325476
-	arm_func_end sub_020800FC
+	arm_func_end MD5_Init
 
-	arm_func_start sub_0208013C
-sub_0208013C: ; 0x0208013C
+	arm_func_start MD5_Update
+MD5_Update: ; 0x0208013C
 	stmdb sp!, {r4, r5, r6, r7, r8, lr}
 	mov r6, r0
 	ldr r3, [r6, #0x10]
@@ -729,10 +729,10 @@ _020801EC:
 	add r1, r6, #0x18
 	bl MemcpyFast
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
-	arm_func_end sub_0208013C
+	arm_func_end MD5_Update
 
-	arm_func_start sub_02080204
-sub_02080204: ; 0x02080204
+	arm_func_start MD5_Digest
+MD5_Digest: ; 0x02080204
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r4, r1
 	ldr r1, [r4, #0x14]
@@ -744,7 +744,7 @@ sub_02080204: ; 0x02080204
 	mov r2, #1
 	orr r6, r6, r3, lsr #29
 	mov r7, r3, lsl #3
-	bl sub_0208013C
+	bl MD5_Update
 	ldr r0, [r4, #0x10]
 	mov r1, #0
 	and r3, r0, #0x3f
@@ -782,7 +782,7 @@ _02080284:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _020802B8: .word _020B2BC0
-	arm_func_end sub_02080204
+	arm_func_end MD5_Digest
 
 	arm_func_start sub_020802BC
 sub_020802BC: ; 0x020802BC

asm/main_rodata_0209CECC.s

@@ -175,8 +175,8 @@ _0209D178:
 _0209D188:
 	.byte 0x48, 0x45, 0x52, 0x4F, 0x5F, 0x54, 0x41, 0x4C, 0x4B, 0x5F, 0x4B, 0x49
 	.byte 0x4E, 0x44, 0x00, 0x00
-	.global SUB30_PROJECTP
-SUB30_PROJECTP:
+	.global SUB30_PROJECTP_MSG
+SUB30_PROJECTP_MSG:
 	.byte 0x53, 0x55, 0x42, 0x33, 0x30, 0x5F, 0x50, 0x52, 0x4F, 0x4A, 0x45, 0x43
 	.byte 0x54, 0x50, 0x00, 0x00
 	.global _0209D1A8
@@ -247,8 +247,8 @@ _0209D2A4:
 _0209D2B8:
 	.byte 0x43, 0x52, 0x59, 0x53, 0x54, 0x41, 0x4C, 0x5F, 0x43, 0x4F, 0x4C, 0x4F
 	.byte 0x52, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x00, 0x00
-	.global NOTE_MODIFY_FLAG
-NOTE_MODIFY_FLAG:
+	.global NOTE_MODIFY_FLAG_MSG
+NOTE_MODIFY_FLAG_MSG:
 	.byte 0x4E, 0x4F, 0x54, 0x45, 0x5F, 0x4D, 0x4F, 0x44
 	.byte 0x49, 0x46, 0x59, 0x5F, 0x46, 0x4C, 0x41, 0x47, 0x00, 0x00, 0x00, 0x00
 	.global _0209D2E0
@@ -853,10 +853,10 @@ SCRIPT_VARS:
 _0209DF70:
 	.byte 0x09, 0x00, 0x02, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.word NOTE_MODIFY_FLAG
+	.word NOTE_MODIFY_FLAG_MSG
 	.byte 0x01, 0x00, 0x06, 0x00
 	.byte 0xB3, 0x02, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00
-	.word SUB30_PROJECTP
+	.word SUB30_PROJECTP_MSG
 	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0xB4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.word SUM_MSG

asm/overlay_00.s

@@ -21900,8 +21900,8 @@ _022CE8CC:
 	ldmia sp!, {r4, pc}
 	arm_func_end ov00_022CE8A0
 
-	arm_func_start ov00_022CE8D4
-ov00_022CE8D4: ; 0x022CE8D4
+	arm_func_start close
+close: ; 0x022CE8D4
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	cmp r4, #0
@@ -21957,7 +21957,7 @@ _022CE974:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _022CE9A0: .word ov00_022CE9A4
-	arm_func_end ov00_022CE8D4
+	arm_func_end close
 
 	arm_func_start ov00_022CE9A4
 ov00_022CE9A4: ; 0x022CE9A4
@@ -22222,7 +22222,7 @@ _022CECFC:
 	cmp r6, #0
 	beq _022CED14
 	mov r0, r6
-	bl ov00_022CE8D4
+	bl close
 	b _022CECC8
 _022CED14:
 	ldr r0, _022CED5C ; =ov00_0232692C
@@ -22262,7 +22262,7 @@ ov00_022CED64: ; 0x022CED64
 	bne _022CEDB0
 	ldr r0, _022CEDDC ; =ov00_023268CC
 	ldr r0, [r0]
-	bl ov00_022CE8D4
+	bl close
 	ldr r0, _022CEDDC ; =ov00_023268CC
 	ldr r0, [r0]
 	bl ov00_022CE8A0
@@ -22618,8 +22618,8 @@ ov00_022CF188: ; 0x022CF188
 _022CF1A8: .word ov00_02326930
 	arm_func_end ov00_022CF188
 
-	arm_func_start ov00_022CF1AC
-ov00_022CF1AC: ; 0x022CF1AC
+	arm_func_start socket
+socket: ; 0x022CF1AC
 	stmdb sp!, {r3, lr}
 	cmp r1, #1
 	bne _022CF1C4
@@ -22633,10 +22633,10 @@ _022CF1C4:
 	.align 2, 0
 _022CF1D0: .word ov00_02318888
 _022CF1D4: .word ov00_02318870
-	arm_func_end ov00_022CF1AC
+	arm_func_end socket
 
-	arm_func_start ov00_022CF1D8
-ov00_022CF1D8: ; 0x022CF1D8
+	arm_func_start bind
+bind: ; 0x022CF1D8
 	ldrh r1, [r1, #2]
 	ldr ip, _022CF200 ; =ov00_022CD690
 	mov r2, r1, asr #8
@@ -22649,10 +22649,10 @@ ov00_022CF1D8: ; 0x022CF1D8
 	bx ip
 	.align 2, 0
 _022CF200: .word ov00_022CD690
-	arm_func_end ov00_022CF1D8
+	arm_func_end bind
 
-	arm_func_start ov00_022CF204
-ov00_022CF204: ; 0x022CF204
+	arm_func_start connect
+connect: ; 0x022CF204
 	stmdb sp!, {r4, lr}
 	ldrh r2, [r1, #2]
 	ldr lr, [r1, #4]
@@ -22676,10 +22676,10 @@ ov00_022CF204: ; 0x022CF204
 	orr r2, r3, r2
 	bl ov00_022CD700
 	ldmia sp!, {r4, pc}
-	arm_func_end ov00_022CF204
+	arm_func_end connect
 
-	arm_func_start ov00_022CF260
-ov00_022CF260: ; 0x022CF260
+	arm_func_start recv
+recv: ; 0x022CF260
 	stmdb sp!, {r3, lr}
 	sub sp, sp, #8
 	mov ip, #0
@@ -22689,10 +22689,10 @@ ov00_022CF260: ; 0x022CF260
 	bl ov00_022CD8C4
 	add sp, sp, #8
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022CF260
+	arm_func_end recv
 
-	arm_func_start ov00_022CF284
-ov00_022CF284: ; 0x022CF284
+	arm_func_start recvfrom
+recvfrom: ; 0x022CF284
 	stmdb sp!, {r3, lr}
 	sub sp, sp, #0x10
 	add ip, sp, #0xc
@@ -22729,10 +22729,10 @@ ov00_022CF284: ; 0x022CF284
 	str r2, [r1, #4]
 	add sp, sp, #0x10
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022CF284
+	arm_func_end recvfrom
 
-	arm_func_start ov00_022CF314
-ov00_022CF314: ; 0x022CF314
+	arm_func_start send
+send: ; 0x022CF314
 	stmdb sp!, {r3, lr}
 	sub sp, sp, #8
 	mov ip, #0
@@ -22742,10 +22742,10 @@ ov00_022CF314: ; 0x022CF314
 	bl ov00_022CE124
 	add sp, sp, #8
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022CF314
+	arm_func_end send
 
-	arm_func_start ov00_022CF338
-ov00_022CF338: ; 0x022CF338
+	arm_func_start sendto
+sendto: ; 0x022CF338
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	sub sp, sp, #8
 	ldr r5, [sp, #0x20]
@@ -22780,7 +22780,7 @@ _022CF3A4:
 	bl ov00_022CE124
 	add sp, sp, #8
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
-	arm_func_end ov00_022CF338
+	arm_func_end sendto
 
 	arm_func_start ov00_022CF3BC
 ov00_022CF3BC: ; 0x022CF3BC
@@ -22790,13 +22790,13 @@ ov00_022CF3BC: ; 0x022CF3BC
 _022CF3C4: .word ov00_022CE7C4
 	arm_func_end ov00_022CF3BC
 
-	arm_func_start ov00_022CF3C8
-ov00_022CF3C8: ; 0x022CF3C8
-	ldr ip, _022CF3D0 ; =ov00_022CE8D4
+	arm_func_start CloseVeneer
+CloseVeneer: ; 0x022CF3C8
+	ldr ip, _022CF3D0 ; =close
 	bx ip
 	.align 2, 0
-_022CF3D0: .word ov00_022CE8D4
-	arm_func_end ov00_022CF3C8
+_022CF3D0: .word close
+	arm_func_end CloseVeneer
 
 	arm_func_start ov00_022CF3D4
 ov00_022CF3D4: ; 0x022CF3D4
@@ -22941,8 +22941,8 @@ ov00_022CF560: ; 0x022CF560
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov00_022CF560
 
-	arm_func_start ov00_022CF5CC
-ov00_022CF5CC: ; 0x022CF5CC
+	arm_func_start fcntl
+fcntl: ; 0x022CF5CC
 	cmp r0, #0
 	mvneq r0, #0
 	bxeq lr
@@ -22966,7 +22966,7 @@ _022CF600:
 _022CF614:
 	mov r0, #0
 	bx lr
-	arm_func_end ov00_022CF5CC
+	arm_func_end fcntl
 
 	arm_func_start ov00_022CF61C
 ov00_022CF61C: ; 0x022CF61C
@@ -29133,26 +29133,26 @@ _022D4A3C:
 
 	arm_func_start ov00_022D4A4C
 ov00_022D4A4C: ; 0x022D4A4C
-	ldr ip, _022D4A54 ; =sub_020800FC
+	ldr ip, _022D4A54 ; =MD5_Init
 	bx ip
 	.align 2, 0
-_022D4A54: .word sub_020800FC
+_022D4A54: .word MD5_Init
 	arm_func_end ov00_022D4A4C
 
 	arm_func_start ov00_022D4A58
 ov00_022D4A58: ; 0x022D4A58
-	ldr ip, _022D4A60 ; =sub_0208013C
+	ldr ip, _022D4A60 ; =MD5_Update
 	bx ip
 	.align 2, 0
-_022D4A60: .word sub_0208013C
+_022D4A60: .word MD5_Update
 	arm_func_end ov00_022D4A58
 
 	arm_func_start ov00_022D4A64
 ov00_022D4A64: ; 0x022D4A64
-	ldr ip, _022D4A6C ; =sub_02080204
+	ldr ip, _022D4A6C ; =MD5_Digest
 	bx ip
 	.align 2, 0
-_022D4A6C: .word sub_02080204
+_022D4A6C: .word MD5_Digest
 	arm_func_end ov00_022D4A64
 
 	arm_func_start ov00_022D4A70
@@ -32574,8 +32574,8 @@ _022D778C: .word ov00_02326C90
 _022D7790: .word 0x00000D18
 	arm_func_end ov00_022D75EC
 
-	arm_func_start ov00_022D7794
-ov00_022D7794: ; 0x022D7794
+	arm_func_start InitWfc
+InitWfc: ; 0x022D7794
 	stmdb sp!, {r3, r4, r5, lr}
 	bl ov00_022D7D5C
 	mov r5, r0
@@ -32635,7 +32635,7 @@ _022D784C:
 	bl ov00_022D7E68
 	mvn r0, #0
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov00_022D7794
+	arm_func_end InitWfc
 
 	arm_func_start ov00_022D7864
 ov00_022D7864: ; 0x022D7864
@@ -35845,14 +35845,14 @@ ov00_022DA1A8: ; 0x022DA1A8
 	mov r5, r0
 	add r0, sp, #0x14
 	mov r4, r1
-	bl sub_020800FC
+	bl MD5_Init
 	add r0, sp, #0x14
 	mov r1, r5
 	mov r2, #0x18
-	bl sub_0208013C
+	bl MD5_Update
 	add r0, sp, #0
 	add r1, sp, #0x14
-	bl sub_02080204
+	bl MD5_Digest
 	add r0, sp, #3
 	mov r1, r4
 	mov r2, #0xd
@@ -36218,7 +36218,7 @@ _022DA63C:
 	add r1, r4, r3
 	add r0, r0, #0x1c00
 	add r3, r4, r3
-	bl sub_020757B0
+	bl Crypto_RC4Encrypt
 	ldr r0, _022DA86C ; =ov00_02326CA4
 	mov r1, #0x70
 	ldr ip, [r0]
@@ -37261,14 +37261,14 @@ _022DB37C:
 	b _022DB3D0
 _022DB3A0:
 	add r0, sp, #0x18
-	bl sub_020800FC
+	bl MD5_Init
 	add r0, sp, #0x18
 	add r1, sp, #0
 	mov r2, #8
-	bl sub_0208013C
+	bl MD5_Update
 	add r0, sp, #8
 	add r1, sp, #0x18
-	bl sub_02080204
+	bl MD5_Digest
 	ldrb r0, [sp, #8]
 	mov r0, r0, asr #1
 	and r0, r0, #0x7f
@@ -43495,7 +43495,7 @@ _022E0838:
 	ldrh r0, [r1, #4]
 	cmp r0, #2
 	bne _022E0858
-	bl ov00_022D7794
+	bl InitWfc
 	ldr r1, _022E0898 ; =ov00_02326D7C
 	ldr r1, [r1, #4]
 	str r0, [r1]
@@ -45117,7 +45117,7 @@ _022E1DE4:
 	ldr r0, _022E1E04 ; =ov00_02326DA0
 	ldr r0, [r0]
 	ldr r0, [r0, #0x68]
-	bl ov00_022F5BF8
+	bl ResolveAvailableNintendoWifi
 	mov r0, #1
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
@@ -64967,7 +64967,7 @@ ov00_022F29B8: ; 0x022F29B8
 	mov r0, #2
 	mov r1, #1
 	mov r2, #0
-	bl ov00_022CF1AC
+	bl socket
 	movs r4, r0
 	bmi _022F2A2C
 	ldr r0, [r5, #8]
@@ -64989,7 +64989,7 @@ ov00_022F29B8: ; 0x022F29B8
 	cmp r0, #0
 	bge _022F2A2C
 	mov r0, r4
-	bl ov00_022CF3C8
+	bl CloseVeneer
 	mvn r4, #0
 _022F2A2C:
 	mov r0, r4
@@ -65000,11 +65000,11 @@ _022F2A34: .word ov00_022F298C
 
 	arm_func_start ov00_022F2A38
 ov00_022F2A38: ; 0x022F2A38
-	ldr ip, _022F2A44 ; =ov00_022CF3C8
+	ldr ip, _022F2A44 ; =CloseVeneer
 	mov r0, r1
 	bx ip
 	.align 2, 0
-_022F2A44: .word ov00_022CF3C8
+_022F2A44: .word CloseVeneer
 	arm_func_end ov00_022F2A38
 
 	arm_func_start ov00_022F2A48
@@ -65012,7 +65012,7 @@ ov00_022F2A48: ; 0x022F2A48
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r6, r1
 	mov r0, r6
-	bl ov00_022CF3C8
+	bl CloseVeneer
 	mvn r4, #0x19
 	cmp r0, r4
 	ldmneia sp!, {r4, r5, r6, pc}
@@ -65021,7 +65021,7 @@ _022F2A68:
 	mov r0, r5
 	bl sub_02079B14
 	mov r0, r6
-	bl ov00_022CF3C8
+	bl CloseVeneer
 	cmp r0, r4
 	beq _022F2A68
 	ldmia sp!, {r4, r5, r6, pc}
@@ -65047,7 +65047,7 @@ ov00_022F2A84: ; 0x022F2A84
 	strb lr, [sp, #1]
 	strh r3, [sp, #2]
 	str r2, [sp, #4]
-	bl ov00_022CF204
+	bl connect
 	cmp r0, #0
 	bge _022F2AF0
 	ldr r0, [r4, #4]
@@ -65072,7 +65072,7 @@ ov00_022F2B00: ; 0x022F2B00
 	mov r1, r2
 	mov r2, r3
 	ldr r3, [sp, #8]
-	bl ov00_022CF260
+	bl recv
 	cmp r0, #0
 	ldmgeia sp!, {r4, pc}
 	ldr r1, [r4, #4]
@@ -65096,7 +65096,7 @@ ov00_022F2B4C: ; 0x022F2B4C
 	mov r1, r2
 	mov r2, r3
 	ldr r3, [sp, #8]
-	bl ov00_022CF314
+	bl send
 	cmp r0, #0
 	ldmgeia sp!, {r4, pc}
 	ldr r1, [r4, #4]
@@ -67790,8 +67790,8 @@ ov00_022F4F3C: ; 0x022F4F3C
 	ldmia sp!, {r4, r5, r6, pc}
 	arm_func_end ov00_022F4F3C
 
-	arm_func_start ov00_022F4F88
-ov00_022F4F88: ; 0x022F4F88
+	arm_func_start SocketCastError
+SocketCastError: ; 0x022F4F88
 	cmp r0, #0
 	ldrlt r2, _022F4F9C ; =ov00_02328788
 	strlt r0, [r2, #4]
@@ -67799,37 +67799,37 @@ ov00_022F4F88: ; 0x022F4F88
 	bx lr
 	.align 2, 0
 _022F4F9C: .word ov00_02328788
-	arm_func_end ov00_022F4F88
+	arm_func_end SocketCastError
 
-	arm_func_start ov00_022F4FA0
-ov00_022F4FA0: ; 0x022F4FA0
+	arm_func_start SocketCreate
+SocketCreate: ; 0x022F4FA0
 	stmdb sp!, {r3, lr}
-	bl ov00_022CF1AC
+	bl socket
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022F4FA0
+	arm_func_end SocketCreate
 
-	arm_func_start ov00_022F4FB4
-ov00_022F4FB4: ; 0x022F4FB4
+	arm_func_start SocketClose
+SocketClose: ; 0x022F4FB4
 	stmdb sp!, {r3, lr}
-	bl ov00_022CF3C8
+	bl CloseVeneer
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022F4FB4
+	arm_func_end SocketClose
 
 	arm_func_start ov00_022F4FC8
 ov00_022F4FC8: ; 0x022F4FC8
 	stmdb sp!, {r3, lr}
 	bl ov00_022CF3BC
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, pc}
 	arm_func_end ov00_022F4FC8
 
-	arm_func_start ov00_022F4FDC
-ov00_022F4FDC: ; 0x022F4FDC
+	arm_func_start SocketBind
+SocketBind: ; 0x022F4FDC
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #8
 	ldrh r3, [r1, #2]
@@ -67850,15 +67850,15 @@ _022F5000:
 	bne _022F5000
 	add r1, sp, #0
 	strb r2, [sp]
-	bl ov00_022CF1D8
+	bl bind
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	add sp, sp, #8
 	ldmia sp!, {r4, pc}
-	arm_func_end ov00_022F4FDC
+	arm_func_end SocketBind
 
-	arm_func_start ov00_022F503C
-ov00_022F503C: ; 0x022F503C
+	arm_func_start SocketConnect
+SocketConnect: ; 0x022F503C
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #8
 	add r4, sp, #0
@@ -67874,49 +67874,49 @@ _022F504C:
 	bne _022F504C
 	add r1, sp, #0
 	strb r2, [sp]
-	bl ov00_022CF204
+	bl connect
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	add sp, sp, #8
 	ldmia sp!, {r4, pc}
-	arm_func_end ov00_022F503C
+	arm_func_end SocketConnect
 
-	arm_func_start ov00_022F5088
-ov00_022F5088: ; 0x022F5088
+	arm_func_start SocketRecv
+SocketRecv: ; 0x022F5088
 	stmdb sp!, {r3, lr}
-	bl ov00_022CF260
+	bl recv
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022F5088
+	arm_func_end SocketRecv
 
-	arm_func_start ov00_022F509C
-ov00_022F509C: ; 0x022F509C
+	arm_func_start SocketRecvFrom
+SocketRecvFrom: ; 0x022F509C
 	stmdb sp!, {r3, r4, r5, lr}
 	ldr r4, [sp, #0x14]
 	ldr r5, [sp, #0x10]
 	ldr ip, [r4]
 	strb ip, [r5]
 	str r5, [sp]
-	bl ov00_022CF284
+	bl recvfrom
 	ldrb r2, [r5]
 	mvn r1, #0
 	str r2, [r4]
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov00_022F509C
+	arm_func_end SocketRecvFrom
 
-	arm_func_start ov00_022F50CC
-ov00_022F50CC: ; 0x022F50CC
+	arm_func_start SocketSend
+SocketSend: ; 0x022F50CC
 	stmdb sp!, {r3, lr}
-	bl ov00_022CF314
+	bl send
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, pc}
-	arm_func_end ov00_022F50CC
+	arm_func_end SocketSend
 
-	arm_func_start ov00_022F50E0
-ov00_022F50E0: ; 0x022F50E0
+	arm_func_start SocketSendTo
+SocketSendTo: ; 0x022F50E0
 	stmdb sp!, {r3, r4, r5, r6, lr}
 	sub sp, sp, #0xc
 	ldr r5, [sp, #0x20]
@@ -67935,21 +67935,21 @@ _022F50F4:
 	add ip, sp, #4
 	strb lr, [sp, #4]
 	str ip, [sp]
-	bl ov00_022CF338
+	bl sendto
 	mvn r1, #0
-	bl ov00_022F4F88
+	bl SocketCastError
 	add sp, sp, #0xc
 	ldmia sp!, {r3, r4, r5, r6, pc}
-	arm_func_end ov00_022F50E0
+	arm_func_end SocketSendTo
 
 	arm_func_start ov00_022F5138
 ov00_022F5138: ; 0x022F5138
-	ldr ip, _022F5148 ; =ov00_022F4F88
+	ldr ip, _022F5148 ; =SocketCastError
 	mov r0, #0
 	sub r1, r0, #1
 	bx ip
 	.align 2, 0
-_022F5148: .word ov00_022F4F88
+_022F5148: .word SocketCastError
 	arm_func_end ov00_022F5138
 
 	arm_func_start ov00_022F514C
@@ -67963,7 +67963,7 @@ ov00_022F514C: ; 0x022F514C
 	ldrb r2, [r5]
 	mvn r1, #0
 	str r2, [r4]
-	bl ov00_022F4F88
+	bl SocketCastError
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov00_022F514C
 
@@ -68058,25 +68058,25 @@ _022F528C:
 	ldmia sp!, {r4, r5, r6, pc}
 	arm_func_end ov00_022F51A4
 
-	arm_func_start ov00_022F529C
-ov00_022F529C: ; 0x022F529C
+	arm_func_start SocketSetBlocking
+SocketSetBlocking: ; 0x022F529C
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r4, r1
 	mov r1, #3
 	mov r2, #0
 	mov r5, r0
-	bl ov00_022CF5CC
+	bl fcntl
 	cmp r4, #0
 	bicne r2, r0, #4
 	orreq r2, r0, #4
 	mov r0, r5
 	mov r1, #4
-	bl ov00_022CF5CC
+	bl fcntl
 	cmp r0, #0
 	moveq r0, #1
 	movne r0, #0
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov00_022F529C
+	arm_func_end SocketSetBlocking
 
 	arm_func_start ov00_022F52DC
 ov00_022F52DC: ; 0x022F52DC
@@ -68354,8 +68354,8 @@ ov00_022F55EC: ; 0x022F55EC
 _022F55F4: .word sub_02079B14
 	arm_func_end ov00_022F55EC
 
-	arm_func_start ov00_022F55F8
-ov00_022F55F8: ; 0x022F55F8
+	arm_func_start DoRand
+DoRand: ; 0x022F55F8
 	ldr r2, _022F5640 ; =0x000041A7
 	mov r1, r0, lsl #0x10
 	mov r0, r0, lsr #0x10
@@ -68376,23 +68376,23 @@ ov00_022F55F8: ; 0x022F55F8
 	bx lr
 	.align 2, 0
 _022F5640: .word 0x000041A7
-	arm_func_end ov00_022F55F8
+	arm_func_end DoRand
 
-	arm_func_start ov00_022F5644
-ov00_022F5644: ; 0x022F5644
+	arm_func_start rand
+rand: ; 0x022F5644
 	stmdb sp!, {r3, lr}
 	ldr r0, _022F5660 ; =ov00_0231A740
 	ldr r0, [r0]
-	bl ov00_022F55F8
+	bl DoRand
 	ldr r1, _022F5660 ; =ov00_0231A740
 	str r0, [r1]
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _022F5660: .word ov00_0231A740
-	arm_func_end ov00_022F5644
+	arm_func_end rand
 
-	arm_func_start ov00_022F5664
-ov00_022F5664: ; 0x022F5664
+	arm_func_start srand
+srand: ; 0x022F5664
 	cmp r0, #0
 	bicne r1, r0, #0x80000000
 	ldr r0, _022F567C ; =ov00_0231A740
@@ -68401,20 +68401,20 @@ ov00_022F5664: ; 0x022F5664
 	bx lr
 	.align 2, 0
 _022F567C: .word ov00_0231A740
-	arm_func_end ov00_022F5664
+	arm_func_end srand
 
-	arm_func_start ov00_022F5680
-ov00_022F5680: ; 0x022F5680
+	arm_func_start RandRangeOverlay0
+RandRangeOverlay0: ; 0x022F5680
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	subs r4, r1, r5
 	ldmeqia sp!, {r3, r4, r5, pc}
-	bl ov00_022F5644
+	bl rand
 	mov r1, r4
 	bl _u32_div_f
 	add r0, r1, r5
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov00_022F5680
+	arm_func_end RandRangeOverlay0
 
 	arm_func_start ov00_022F56A4
 ov00_022F56A4: ; 0x022F56A4
@@ -68828,7 +68828,7 @@ ov00_022F5BA8: ; 0x022F5BA8
 	ldr r2, [r1, #0x4c]
 	ldr r1, _022F5BF4 ; =ov00_02328890
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	bl ov00_022F5594
 	ldr r1, _022F5BF0 ; =ov00_02328884
 	str r0, [r1, #0x50]
@@ -68840,8 +68840,8 @@ _022F5BF0: .word ov00_02328884
 _022F5BF4: .word ov00_02328890
 	arm_func_end ov00_022F5BA8
 
-	arm_func_start ov00_022F5BF8
-ov00_022F5BF8: ; 0x022F5BF8
+	arm_func_start ResolveAvailableNintendoWifi
+ResolveAvailableNintendoWifi: ; 0x022F5BF8
 	stmdb sp!, {r3, r4, r5, lr}
 	sub sp, sp, #0x40
 	mov r4, r0
@@ -68873,7 +68873,7 @@ _022F5C40:
 	mov r0, #2
 	mov r1, r0
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	ldr r2, _022F5CD8 ; =ov00_02328884
 	mvn r1, #0
 	cmp r0, r1
@@ -68906,7 +68906,7 @@ _022F5CE0: .word ov00_0231A7BC
 _022F5CE4: .word 0x00006CFC
 _022F5CE8: .word ov00_02328888
 _022F5CEC: .word ov00_02328895
-	arm_func_end ov00_022F5BF8
+	arm_func_end ResolveAvailableNintendoWifi
 
 	arm_func_start ov00_022F5CF0
 ov00_022F5CF0: ; 0x022F5CF0
@@ -68988,7 +68988,7 @@ _022F5DE0:
 	ldr r0, [r0]
 	mov r2, #0x40
 	mov r3, #0
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r1, r0
 	add r0, sp, #0x18
 	add r2, sp, #0x10
@@ -68998,7 +68998,7 @@ _022F5DE0:
 	bne _022F5E88
 	ldr r0, _022F5EE8 ; =ov00_02328884
 	ldr r0, [r0]
-	bl ov00_022F4FB4
+	bl SocketClose
 	ldr r0, [sp, #8]
 	tst r0, #1
 	beq _022F5E58
@@ -69031,7 +69031,7 @@ _022F5E88:
 	cmp r0, #1
 	bne _022F5EC8
 	ldr r0, [r1]
-	bl ov00_022F4FB4
+	bl SocketClose
 	ldr r1, _022F5EEC ; =ov00_02328800
 	mov r0, #1
 	str r0, [r1]
@@ -69058,7 +69058,7 @@ ov00_022F5EF0: ; 0x022F5EF0
 	mov r7, r1
 	mov r8, r0
 	bl ov00_022F5594
-	bl ov00_022F5664
+	bl srand
 	mov r6, #0
 	cmp r7, #0
 	ldmlsia sp!, {r4, r5, r6, r7, r8, pc}
@@ -69067,7 +69067,7 @@ ov00_022F5EF0: ; 0x022F5EF0
 _022F5F18:
 	mov r0, r5
 	mov r1, r4
-	bl ov00_022F5680
+	bl RandRangeOverlay0
 	add r0, r0, #1
 	strb r0, [r8, r6]
 	add r6, r6, #1
@@ -73159,7 +73159,7 @@ _022F9680:
 	mov r1, r6
 	mov r2, r4
 	mov r3, #0
-	bl ov00_022F5088
+	bl SocketRecv
 	mvn r1, #0
 	cmp r0, r1
 	bne _022F9704
@@ -73216,7 +73216,7 @@ ov00_022F9734: ; 0x022F9734
 	ldmeqia sp!, {r4, pc}
 	ldr r0, [r4, #0x4c]
 	mov r3, #0
-	bl ov00_022F50CC
+	bl SocketSend
 	mvn r1, #0
 	cmp r0, r1
 	bne _022F97A8
@@ -73541,7 +73541,7 @@ ov00_022F9B40: ; 0x022F9B40
 	mov r1, #2
 	bl ov00_022F4FC8
 	ldr r0, [r4, #0x4c]
-	bl ov00_022F4FB4
+	bl SocketClose
 _022F9BD8:
 	add r0, r4, #0x54
 	bl ov00_022F8E64
@@ -73692,7 +73692,7 @@ _022F9D78:
 	mov r1, #2
 	bl ov00_022F4FC8
 	ldr r0, [r4, #0x4c]
-	bl ov00_022F4FB4
+	bl SocketClose
 	mvn r1, #0
 	add r0, r4, #0x54
 	str r1, [r4, #0x4c]
@@ -74359,7 +74359,7 @@ ov00_022FA6A8: ; 0x022FA6A8
 	mov r2, #4
 	bl ov00_022F9FB0
 	bl ov00_022F5594
-	bl ov00_022F5664
+	bl srand
 	mov r8, #0
 	add sb, sp, #0
 	mov r7, r8
@@ -74367,7 +74367,7 @@ ov00_022FA6A8: ; 0x022FA6A8
 _022FA79C:
 	mov r0, r7
 	mov r1, r5
-	bl ov00_022F5680
+	bl RandRangeOverlay0
 	add r8, r8, #1
 	strb r0, [sb, #0xf]
 	cmp r8, #0x1c
@@ -75447,10 +75447,10 @@ _022FB784:
 	mov r6, #0x100
 _022FB7A0:
 	bl ov00_022F5594
-	bl ov00_022F5664
+	bl srand
 	mov r0, r8
 	mov r1, r6
-	bl ov00_022F5680
+	bl RandRangeOverlay0
 	add r1, r7, sb
 	add sb, sb, #1
 	strb r0, [r1, #0x6a4]
@@ -77999,7 +77999,7 @@ ov00_022FDB14: ; 0x022FDB14
 	mov r0, #2
 	mov r1, #1
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	mvn r1, #0
 	str r0, [r4, #0x4c]
 	cmp r0, r1
@@ -78015,7 +78015,7 @@ ov00_022FDB14: ; 0x022FDB14
 	ldmia sp!, {r4, pc}
 _022FDB74:
 	mov r1, #0
-	bl ov00_022F529C
+	bl SocketSetBlocking
 	cmp r0, #0
 	bne _022FDBA8
 	mov r0, #1
@@ -78082,7 +78082,7 @@ _022FDC5C:
 	str r0, [sp, #0xc]
 	ldr r0, [r4, #0x4c]
 	mov r2, #8
-	bl ov00_022F503C
+	bl SocketConnect
 	mvn r1, #0
 	cmp r0, r1
 	bne _022FDCC0
@@ -83366,7 +83366,7 @@ ov00_023026A0: ; 0x023026A0
 	ldr r6, [sp, #0x18]
 	ldr r5, [sp, #0x1c]
 	ldr r4, [sp, #0x20]
-	bl ov00_022F50CC
+	bl SocketSend
 	mvn r1, #0
 	cmp r0, r1
 	bne _0230274C
@@ -83555,7 +83555,7 @@ _02302944:
 	add r1, r4, r5
 	sub r2, r6, r5
 	mov r3, #0
-	bl ov00_022F5088
+	bl SocketRecv
 	mov r7, r0
 	ldr r0, [sp, #8]
 	cmp r7, r0
@@ -84370,7 +84370,7 @@ _0230347C:
 	strneh r1, [r0, #0x30]
 	mov r0, #2
 	mov r1, #1
-	bl ov00_022F4FA0
+	bl SocketCreate
 	mvn r1, #0
 	str r0, [r4, #0x1f0]
 	cmp r0, r1
@@ -84388,7 +84388,7 @@ _0230347C:
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
 _023034DC:
 	mov r1, #0
-	bl ov00_022F529C
+	bl SocketSetBlocking
 	cmp r0, #0
 	bne _02303518
 	ldr r2, _02303650 ; =ov00_0231B144
@@ -84445,7 +84445,7 @@ _023035A0:
 	strh r0, [sp, #0x1e]
 	ldr r0, [r4, #0x1f0]
 	mov r2, #8
-	bl ov00_022F503C
+	bl SocketConnect
 	mvn r1, #0
 	cmp r0, r1
 	bne _02303614
@@ -84928,7 +84928,7 @@ ov00_02303C98: ; 0x02303C98
 	add r0, r5, #0x77
 	add r1, sp, #0
 	add r0, r0, #0x100
-	bl ov00_0230BCE0
+	bl PasswordEncryptString
 	ldr r2, _02303EA8 ; =ov00_0231B324
 	mov r0, sl
 	add r1, r5, #0x210
@@ -84999,7 +84999,7 @@ ov00_02303C98: ; 0x02303C98
 	bl strlen
 	mov r7, r0
 	ldr r0, _02303ECC ; =0x79707367
-	bl ov00_022F5664
+	bl srand
 	cmp r7, #0
 	mov r6, #0
 	bls _02303E20
@@ -85009,7 +85009,7 @@ ov00_02303C98: ; 0x02303C98
 _02303DF0:
 	mov r0, r4
 	mov r1, fp
-	bl ov00_022F5680
+	bl RandRangeOverlay0
 	add r1, sb, r6
 	add r1, r1, #0x200
 	add r6, r6, #1
@@ -85720,7 +85720,7 @@ _023047FC:
 	mov r1, #2
 	bl ov00_022F4FC8
 	ldr r0, [r4, #0x1f0]
-	bl ov00_022F4FB4
+	bl SocketClose
 	mvn r0, #0
 	str r0, [r4, #0x1f0]
 _02304848:
@@ -87207,7 +87207,7 @@ _02305D28:
 	add r0, r4, #0x77
 	add r1, sp, #0
 	add r0, r0, #0x100
-	bl ov00_0230BCE0
+	bl PasswordEncryptString
 	ldr r1, _02306294 ; =ov00_0231B6C4
 	add r2, sp, #0
 	mov r0, r6
@@ -88623,7 +88623,7 @@ ov00_023070F4: ; 0x023070F4
 	mov r1, #2
 	bl ov00_022F4FC8
 	ldr r0, [r5, #4]
-	bl ov00_022F4FB4
+	bl SocketClose
 	ldr r0, [r5, #0x18]
 	bl ov00_022F5B14
 	mov r0, #0
@@ -90822,7 +90822,7 @@ _02308E88:
 	mov r0, #2
 	mov r1, #1
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	mvn r1, #0
 	str r0, [r4, #4]
 	cmp r0, r1
@@ -90840,7 +90840,7 @@ _02308E88:
 	ldmia sp!, {r4, r5, r6, pc}
 _02308ED4:
 	mov r1, #0
-	bl ov00_022F529C
+	bl SocketSetBlocking
 	cmp r0, #0
 	bne _02308F10
 	ldr r2, _02309008 ; =ov00_0231B994
@@ -90885,7 +90885,7 @@ _02308F4C:
 	str r3, [sp, #4]
 	strh r0, [sp, #2]
 	ldr r0, [r4, #4]
-	bl ov00_022F503C
+	bl SocketConnect
 	mvn r1, #0
 	cmp r0, r1
 	bne _02308FE4
@@ -91439,7 +91439,7 @@ _0230972C:
 	bl ov00_02302638
 	add r0, r6, #0xcd
 	add r1, sp, #0x9c
-	bl ov00_0230BCE0
+	bl PasswordEncryptString
 	ldr r2, _0230A194 ; =ov00_0231BB18
 	mov r0, sl
 	add r1, r6, #0x18
@@ -91535,7 +91535,7 @@ _02309860:
 	bl ov00_02302668
 	add r0, r6, #0xcd
 	add r1, sp, #0x9c
-	bl ov00_0230BCE0
+	bl PasswordEncryptString
 	ldr r2, _0230A194 ; =ov00_0231BB18
 	mov r0, sl
 	add r1, r6, #0x18
@@ -91570,7 +91570,7 @@ _0230990C:
 	bl ov00_02302638
 	add r0, r6, #0xcd
 	add r1, sp, #0x9c
-	bl ov00_0230BCE0
+	bl PasswordEncryptString
 	ldr r2, _0230A194 ; =ov00_0231BB18
 	mov r0, sl
 	add r1, r6, #0x18
@@ -94036,8 +94036,8 @@ ov00_0230BCCC: ; 0x0230BCCC
 _0230BCDC: .word ov00_0230B930
 	arm_func_end ov00_0230BCCC
 
-	arm_func_start ov00_0230BCE0
-ov00_0230BCE0: ; 0x0230BCE0
+	arm_func_start PasswordEncryptString
+PasswordEncryptString: ; 0x0230BCE0
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
 	sub sp, sp, #0x20
 	mov sl, r0
@@ -94045,7 +94045,7 @@ ov00_0230BCE0: ; 0x0230BCE0
 	bl strlen
 	mov r7, r0
 	ldr r0, _0230BD64 ; =0x79707367
-	bl ov00_022F5664
+	bl srand
 	cmp r7, #0
 	mov r6, #0
 	bls _0230BD40
@@ -94055,7 +94055,7 @@ ov00_0230BCE0: ; 0x0230BCE0
 _0230BD18:
 	mov r0, r5
 	mov r1, r4
-	bl ov00_022F5680
+	bl RandRangeOverlay0
 	ldrsb r1, [sl, r6]
 	mov r0, r0, lsl #0x18
 	add r6, r6, #1
@@ -94075,7 +94075,7 @@ _0230BD40:
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
 	.align 2, 0
 _0230BD64: .word 0x79707367
-	arm_func_end ov00_0230BCE0
+	arm_func_end PasswordEncryptString
 
 	arm_func_start ov00_0230BD68
 ov00_0230BD68: ; 0x0230BD68
@@ -94498,7 +94498,7 @@ ov00_0230C29C: ; 0x0230C29C
 	bl ov00_022F4FC8
 	ldr r0, _0230C304 ; =ov00_0231BDDC
 	ldr r0, [r0, #4]
-	bl ov00_022F4FB4
+	bl SocketClose
 _0230C2C8:
 	ldr r0, _0230C304 ; =ov00_0231BDDC
 	mvn r1, #0
@@ -94582,7 +94582,7 @@ _0230C3C4:
 	mov r3, r7
 	add r1, r1, r5
 	sub r2, r2, r5
-	bl ov00_022F5088
+	bl SocketRecv
 	cmp r0, #0
 	bgt _0230C3F8
 	bl ov00_0230C29C

asm/overlay_00_0230D398.s

@@ -2832,7 +2832,7 @@ _0230F870:
 	ldr r2, _0230F9B8 ; =0x000005DC
 	mov r1, r8
 	mov r3, #0
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r2, r0
 	cmp r2, r7
 	bne _0230F958
@@ -3717,7 +3717,7 @@ _0231046C:
 	mov r0, #2
 	mov r1, r0
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	str r0, [r4]
 	cmp r5, #3
 	str r5, [r4, #0x40]
@@ -3757,12 +3757,12 @@ _023104C8:
 	beq _02310550
 	ldr r0, [r4]
 	mov r2, #8
-	bl ov00_022F4FDC
+	bl SocketBind
 	mvn r1, #0
 	cmp r0, r1
 	bne _02310550
 	ldr r0, [r4]
-	bl ov00_022F4FB4
+	bl SocketClose
 	ldr r0, [r4, #0xc]
 	bl ov00_022F4C38
 	ldr r0, [r4, #0x10]
@@ -3808,7 +3808,7 @@ ov00_023105A8: ; 0x023105A8
 	strne r0, [r4, #0x14]
 	ldmneia sp!, {r4, pc}
 	ldr r0, [r4]
-	bl ov00_022F4FB4
+	bl SocketClose
 	ldr r0, [r4, #0xc]
 	bl ov00_022F4C38
 	ldr r0, [r4, #0x10]
@@ -4074,7 +4074,7 @@ _02310928:
 	ldr r0, [r6]
 	ldr r1, [sp, #0x34]
 	ldr r2, [sp, #0x38]
-	bl ov00_022F50E0
+	bl SocketSendTo
 	mvn r1, #0
 	cmp r0, r1
 	bne _02310A70
@@ -4542,7 +4542,7 @@ _02310F68:
 	mov r2, #0x200
 	mov r3, #0
 	str r6, [sp, #4]
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r7, r0
 	mvn r0, #0
 	cmp r7, r0
@@ -5051,7 +5051,7 @@ ov00_02311630: ; 0x02311630
 	ldr r2, [sp, #0x18]
 	mov r3, #0
 	str ip, [sp, #4]
-	bl ov00_022F50E0
+	bl SocketSendTo
 	add sp, sp, #0x10
 	ldmia sp!, {r3, pc}
 	arm_func_end ov00_02311630
@@ -5544,7 +5544,7 @@ _02311D20:
 	ldr r0, [r2, #8]
 	cmp r0, r1
 	beq _02311D7C
-	bl ov00_022F4FB4
+	bl SocketClose
 _02311D7C:
 	ldr r0, _02311DBC ; =ov00_0231BF18
 	mvn r1, #0
@@ -5552,7 +5552,7 @@ _02311D7C:
 	ldr r0, [r0, #4]
 	cmp r0, r1
 	beq _02311D98
-	bl ov00_022F4FB4
+	bl SocketClose
 _02311D98:
 	ldr r0, _02311DBC ; =ov00_0231BF18
 	mvn r1, #0
@@ -5689,7 +5689,7 @@ ov00_02311EE0: ; 0x02311EE0
 	str r2, [r4, #0x40]
 	mov r1, r0
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	str r0, [r4]
 	mov r0, #0
 	str r0, [r4, #0x24]
@@ -5726,7 +5726,7 @@ ov00_02311FB0: ; 0x02311FB0
 	mvn r1, #0
 	cmp r0, r1
 	beq _02311FD4
-	bl ov00_022F4FB4
+	bl SocketClose
 _02311FD4:
 	mvn r0, #0
 	str r0, [r4]
@@ -5788,7 +5788,7 @@ _02312090:
 	mov r1, r6
 	mov r2, r5
 	mov r3, r4
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r1, r0
 	cmp r1, sl
 	beq _023120E4
@@ -6516,7 +6516,7 @@ _02312A88:
 	mov r1, r7
 	mov r2, r6
 	mov r3, fp
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r2, r0
 	cmp r2, r4
 	beq _02312AC4
@@ -6662,7 +6662,7 @@ _02312C78:
 	ldrne r1, [r4, #0xc4]
 	cmpne r1, #0
 	beq _02312C94
-	bl ov00_022F4FB4
+	bl SocketClose
 _02312C94:
 	mvn r0, #0
 	str r0, [r4]
@@ -7584,7 +7584,7 @@ _02313920:
 	ldr r2, [r5, #0x578]
 	mov r1, r5
 	mov r3, r8
-	bl ov00_022F50E0
+	bl SocketSendTo
 	str r7, [r5, #0x578]
 	ldr r0, [sp, #0x14]
 	cmp r0, #7
@@ -7614,7 +7614,7 @@ _0231396C:
 	ldr r2, [r5, #0x578]
 	mov r1, r5
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	add sp, sp, #0x128
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
 	arm_func_end ov00_02313820
@@ -8153,7 +8153,7 @@ _02314124:
 	ldr r2, [sp, #0x588]
 	add r1, sp, #0x10
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	add sp, sp, #0x18c
 	add sp, sp, #0x400
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
@@ -8182,7 +8182,7 @@ ov00_02314158: ; 0x02314158
 	ldr r2, [sp, #0x580]
 	add r1, sp, #8
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	bl ov00_022F5594
 	str r0, [r4, #0xb0]
 	add sp, sp, #0x184
@@ -8338,7 +8338,7 @@ _023143C4:
 	ldr r2, [sp, #0xb18]
 	add r1, sp, #0x5a0
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	bl ov00_022F5594
 	str r0, [sl, #0xac]
 	str r0, [sl, #0xb0]
@@ -8852,7 +8852,7 @@ _02314AAC:
 	ldr r0, [r5, #0x20]
 	add r1, sp, #0x14
 	mov r3, #0
-	bl ov00_022F50E0
+	bl SocketSendTo
 	mov r6, #1
 _02314AD0:
 	cmp r6, #0
@@ -8886,7 +8886,7 @@ ov00_02314B1C: ; 0x02314B1C
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	ldr r0, [r4, #0x20]
-	bl ov00_022F4FB4
+	bl SocketClose
 	mvn r1, #0
 	add r0, r4, #0x14
 	str r1, [r4, #0x20]
@@ -9096,7 +9096,7 @@ _02314DE8:
 	mov r0, r7
 	mov r3, #0
 	str r4, [sp, #4]
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	mov r5, r0
 	mvn r0, #0
 	cmp r5, r0
@@ -10742,7 +10742,7 @@ _02316240:
 	mov r0, #2
 	mov r1, #1
 	mov r2, #0
-	bl ov00_022F4FA0
+	bl SocketCreate
 	mvn r1, #0
 	cmp r0, r1
 	str r0, [r4, #0x6b4]
@@ -10752,13 +10752,13 @@ _02316240:
 _02316278:
 	add r1, sp, #0
 	mov r2, #8
-	bl ov00_022F503C
+	bl SocketConnect
 	cmp r0, #0
 	addeq sp, sp, #0x88
 	moveq r0, #0
 	ldmeqia sp!, {r4, pc}
 	ldr r0, [r4, #0x6b4]
-	bl ov00_022F4FB4
+	bl SocketClose
 	mvn r0, #0
 	str r0, [r4, #0x6b4]
 	mov r0, #3
@@ -10959,7 +10959,7 @@ _02316518:
 	mov r2, r8
 	mov r3, r5
 	sub r7, r7, #1
-	bl ov00_022F50CC
+	bl SocketSend
 	mov r6, r0
 	cmp r6, #0
 	bgt _02316590
@@ -11111,7 +11111,7 @@ _02316728:
 	mov r3, #0
 	strb r0, [r1, #1]
 	ldr r0, [r5, #0x6b4]
-	bl ov00_022F50CC
+	bl SocketSend
 	cmp r0, #0
 	bgt _0231678C
 	mov r0, r5
@@ -11214,7 +11214,7 @@ _0231689C:
 	sub r1, r1, #1
 	cmp r0, r1
 	beq _023168BC
-	bl ov00_022F4FB4
+	bl SocketClose
 _023168BC:
 	mvn r1, #0
 	mov r0, r4
@@ -12481,7 +12481,7 @@ _02317A48:
 _02317A60:
 	ldr r0, [r7, #0x6b4]
 	mov r3, r4
-	bl ov00_022F50CC
+	bl SocketSend
 	cmp r0, #0
 	bgt _02317AC0
 	mov r0, #3
@@ -12547,7 +12547,7 @@ ov00_02317B10: ; 0x02317B10
 	add r1, r1, r5
 	rsb r2, r5, #0x1000
 	mov r3, #0
-	bl ov00_022F5088
+	bl SocketRecv
 	add r1, r0, #1
 	cmp r1, #1
 	bhi _02317B64
@@ -12667,7 +12667,7 @@ _02317C28:
 	ldr r2, [sp, #0x50]
 	mov r1, r4
 	mov r3, #0
-	bl ov00_022F50CC
+	bl SocketSend
 	cmp r0, #0
 	movlt r0, #3
 	movge r0, #0
@@ -12751,7 +12751,7 @@ _02317E10:
 	mov r1, r7
 	mov r2, r6
 	mov r3, fp
-	bl ov00_022F509C
+	bl SocketRecvFrom
 	cmp r0, r4
 	beq _02317E8C
 	ldrh r2, [sp, #0xe]
@@ -12788,7 +12788,7 @@ _02317E9C:
 	cmp r0, #0x7d0
 	bls _02317EE4
 	ldr r0, [sl, #0x6b4]
-	bl ov00_022F4FB4
+	bl SocketClose
 	mvn r0, #0
 	str r0, [sl, #0x6b4]
 	mov r0, #1

asm/overlay_02.s

@@ -9815,7 +9815,7 @@ ov02_0232FE08: ; 0x0232FE08
 	ldr r4, [sp, #0x10]
 	strb r5, [r4]
 	str r4, [sp]
-	blx ov00_022CF284
+	blx recvfrom
 	pop {r3, r4, r5, pc}
 	.align 2, 0
 	thumb_func_end ov02_0232FE08
@@ -9869,7 +9869,7 @@ ov02_0232FE70: ; 0x0232FE70
 	ldr r4, [sp, #0x10]
 	strb r5, [r4]
 	str r4, [sp]
-	blx ov00_022CF338
+	blx sendto
 	pop {r3, r4, r5, pc}
 	thumb_func_end ov02_0232FE70
 
@@ -9881,27 +9881,27 @@ ov02_0232FE80: ; 0x0232FE80
 
 	thumb_func_start ov02_0232FE84
 ov02_0232FE84: ; 0x0232FE84
-	ldr r3, _0232FE88 ; =ov00_022CF1AC
+	ldr r3, _0232FE88 ; =socket
 	bx r3
 	.align 2, 0
-_0232FE88: .word ov00_022CF1AC
+_0232FE88: .word socket
 	thumb_func_end ov02_0232FE84
 
 	thumb_func_start ov02_0232FE8C
 ov02_0232FE8C: ; 0x0232FE8C
-	ldr r3, _0232FE94 ; =ov00_022CF1D8
+	ldr r3, _0232FE94 ; =bind
 	strb r2, [r1]
 	bx r3
 	nop
-_0232FE94: .word ov00_022CF1D8
+_0232FE94: .word bind
 	thumb_func_end ov02_0232FE8C
 
 	thumb_func_start ov02_0232FE98
 ov02_0232FE98: ; 0x0232FE98
-	ldr r3, _0232FE9C ; =ov00_022CF3C8
+	ldr r3, _0232FE9C ; =CloseVeneer
 	bx r3
 	.align 2, 0
-_0232FE9C: .word ov00_022CF3C8
+_0232FE9C: .word CloseVeneer
 	thumb_func_end ov02_0232FE98
 
 	thumb_func_start ov02_0232FEA0
@@ -13648,7 +13648,7 @@ ov02_02331A48: ; 0x02331A48
 	str r1, [sp]
 	add r1, r3, #0
 	mov r3, #0
-	blx ov00_022CF338
+	blx sendto
 	cmp r0, #0
 	bge _02331A5E
 	mov r0, #3
@@ -15018,7 +15018,7 @@ _02332442:
 	mov r0, #2
 	add r1, r0, #0
 	mov r2, #0
-	blx ov00_022CF1AC
+	blx socket
 	add r4, r0, #0
 	bpl _0233245A
 	mov r0, #1
@@ -15040,7 +15040,7 @@ _0233245A:
 	strh r3, [r2, #0x16]
 	str r1, [sp, #0x28]
 	add r1, r5, #0
-	blx ov00_022CF1D8
+	blx bind
 	str r0, [sp, #8]
 	cmp r0, #0
 	bge _02332488
@@ -15061,7 +15061,7 @@ _02332490:
 	cmp r0, r1
 	blo _023324AC
 	add r0, r4, #0
-	blx ov00_022CF3C8
+	blx CloseVeneer
 	mov r0, #2
 	mvn r0, r0
 	str r0, [sp, #8]
@@ -15081,7 +15081,7 @@ _023324AC:
 	add r0, r4, #0
 	lsl r2, r2, #0xa
 	mov r3, #4
-	blx ov00_022CF284
+	blx recvfrom
 	cmp r0, #0
 	ble _023325AA
 	ldr r0, _02332718 ; =ov02_0235A204
@@ -15124,7 +15124,7 @@ _0233251C:
 	cmp r0, r1
 	blo _02332538
 	add r0, r4, #0
-	blx ov00_022CF3C8
+	blx CloseVeneer
 	mov r0, #3
 	mvn r0, r0
 	str r0, [sp, #8]
@@ -15138,7 +15138,7 @@ _02332538:
 	add r0, r4, #0
 	lsl r2, r2, #0xa
 	mov r3, #4
-	blx ov00_022CF284
+	blx recvfrom
 	cmp r0, #0
 	ble _023325AC
 	ldr r0, _02332718 ; =ov02_0235A204
@@ -15251,7 +15251,7 @@ _02332622:
 	add r0, r4, #0
 	lsl r2, r2, #0xa
 	mov r3, #4
-	blx ov00_022CF284
+	blx recvfrom
 	cmp r0, #0
 	ble _02332678
 	ldr r0, _02332718 ; =ov02_0235A204
@@ -15300,7 +15300,7 @@ _02332678:
 	cmp r0, #0xa
 	blt _023326A2
 	add r0, r4, #0
-	blx ov00_022CF3C8
+	blx CloseVeneer
 	mov r0, #1
 	mvn r0, r0
 	str r0, [sp, #8]
@@ -15404,7 +15404,7 @@ _02332780:
 	cmp r4, #0
 	beq _0233278A
 	add r0, r4, #0
-	blx ov00_022CF3C8
+	blx CloseVeneer
 _0233278A:
 	ldr r0, _023327A0 ; =ov02_023594D0
 	ldr r0, [r0, #0x10]
@@ -40221,7 +40221,7 @@ ov02_0234562C: ; 0x0234562C
 	ldr r0, [r1, #4]
 	cmp r0, #0
 	beq _02345650
-	bl ov00_022D7794
+	bl InitWfc
 	movs r5, r0
 	ldmeqia sp!, {r3, r4, r5, pc}
 _02345650:

asm/overlay_29_0230027C.s

@@ -17,7 +17,7 @@ ov29_0230027C: ; 0x0230027C
 	ldr r1, _023002C4 ; =ov29_023527C0
 	add r2, sp, #0
 	mov r0, r4
-	bl SprintfStatic
+	bl SprintfStatic__0200E990
 	b _023002B8
 _023002B4:
 	bl GetMonsterName
@@ -33,8 +33,8 @@ _023002C0: .word 0x00000C32
 _023002C4: .word ov29_023527C0
 	arm_func_end ov29_0230027C
 
-	arm_func_start SprintfStatic
-SprintfStatic: ; 0x023002C8
+	arm_func_start SprintfStatic__0200E990
+SprintfStatic__0200E990: ; 0x023002C8
 	stmdb sp!, {r0, r1, r2, r3}
 	stmdb sp!, {r3, lr}
 	add r2, sp, #0xc
@@ -45,7 +45,7 @@ SprintfStatic: ; 0x023002C8
 	ldmia sp!, {r3, lr}
 	add sp, sp, #0x10
 	bx lr
-	arm_func_end SprintfStatic
+	arm_func_end SprintfStatic__0200E990
 
 	arm_func_start ov29_023002F0
 ov29_023002F0: ; 0x023002F0
@@ -61,7 +61,7 @@ ov29_023002F0: ; 0x023002F0
 	ldr r1, _02300354 ; =ov29_023527D0
 	mov r0, r5
 	mov r2, r4
-	bl SprintfStatic
+	bl SprintfStatic__0200E990
 	ldmia sp!, {r3, r4, r5, pc}
 _02300328:
 	ldrb r3, [r1, #6]

src/item_util_1.c

@@ -30,7 +30,7 @@ extern s32 vsprintf(u8* str, const u8* format, va_list ap);
 
 static s16 GetExclusiveItemOffsetEnsureValid(s16 item_id);
 static s16 EnsureValidItem(s16 item_id);
-static void SprintfStatic(char*, const char*, ...);
+static void SprintfStatic__0200E990(char*, const char*, ...);
 
 
 void LoadItemPspi2n(void) {
@@ -44,7 +44,7 @@ void LoadItemPspi2n(void) {
         ZInit8(&ITEM_DATA_TABLE_PTRS.langFile);
 #ifdef EUROPE
         char buf[256];
-        SprintfStatic(buf, &ITEM_ST_I2N_BIN, ITEM_LANG_FILE_ARRAY[GetLanguage()]);
+        SprintfStatic__0200E990(buf, &ITEM_ST_I2N_BIN, ITEM_LANG_FILE_ARRAY[GetLanguage()]);
         LoadFileFromRom(&ITEM_DATA_TABLE_PTRS.langFile, buf, 1);
 #else
         LoadFileFromRom(&ITEM_DATA_TABLE_PTRS.langFile, &ITEM_ST_I2N_BIN, 1);
@@ -53,7 +53,7 @@ void LoadItemPspi2n(void) {
 }
 
 #ifdef EUROPE
-static void SprintfStatic(char* buf, const char* fmt, ...)
+static void SprintfStatic__0200E990(char* buf, const char* fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -120,7 +120,7 @@ void GetItemNameFormatted(char* name, s16 item_id, s32 flag1, s32 flag2)
     category = ITEM_DATA_TABLE_PTRS.data[EnsureValidItem(item_id)].category;
     if ((flag2 != 0) || ((u8)(category + 0xF4) <= 2)) {
         if (flag1 != 0) {
-            SprintfStatic(name, &ITEM_NAME_FORMAT_YELLOW, raw_name);
+            SprintfStatic__0200E990(name, &ITEM_NAME_FORMAT_YELLOW, raw_name);
             return;
         }
         strcpy(name, raw_name);
@@ -128,23 +128,23 @@ void GetItemNameFormatted(char* name, s16 item_id, s32 flag1, s32 flag2)
     }
     if (category == CATEGORY_EXCLUSIVE_ITEMS) {
         if (flag1 != 0) {
-            SprintfStatic(name, &ITEM_NAME_FORMAT_INDIGO, raw_name);
+            SprintfStatic__0200E990(name, &ITEM_NAME_FORMAT_INDIGO, raw_name);
             return;
         }
-        SprintfStatic(name, &ITEM_NAME_FORMAT_PLAIN, raw_name);
+        SprintfStatic__0200E990(name, &ITEM_NAME_FORMAT_PLAIN, raw_name);
         return;
     }
     if (flag1 != 0) {
-        SprintfStatic(name, &ITEM_NAME_FORMAT_CREAM, raw_name);
+        SprintfStatic__0200E990(name, &ITEM_NAME_FORMAT_CREAM, raw_name);
         return;
 
     }
-    SprintfStatic(name, &ITEM_NAME_FORMAT_PLAIN, raw_name);
+    SprintfStatic__0200E990(name, &ITEM_NAME_FORMAT_PLAIN, raw_name);
     return;
 }
 
 #ifndef EUROPE
-static void SprintfStatic(char* buf, const char* fmt, ...)
+static void SprintfStatic__0200E990(char* buf, const char* fmt, ...)
 {
     va_list args;
     va_start(args, fmt);