diff --git a/asm/include/main_0200CAFC.inc b/asm/include/main_0200CAFC.inc index 7a644195..4cfcfc8a 100644 --- a/asm/include/main_0200CAFC.inc +++ b/asm/include/main_0200CAFC.inc @@ -16,6 +16,7 @@ .public _020A18BC .public AVAILABLE_ITEMS_IN_GROUP_TABLE .public BAG_ITEMS_PTR_MIRROR +.public BitstreamDebug .public CopyBitsFrom .public CopyBitsTo .public GetDungeonGroup @@ -28,6 +29,8 @@ .public GetItemPaletteId .public GetItemSellPrice .public GetThrownItemQuantityLimit +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitItem .public IsAuraBow .public IsItemValid @@ -43,7 +46,4 @@ .public strncpy .public sub_0200EB64 .public sub_020238E0 -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public vsprintf diff --git a/asm/include/main_02010FC4.inc b/asm/include/main_02010FC4.inc index fc07ff54..3cc2c39a 100644 --- a/asm/include/main_02010FC4.inc +++ b/asm/include/main_02010FC4.inc @@ -25,6 +25,7 @@ .public _s32_div_f .public ApplyExclusiveItemStatBoosts .public BAG_ITEMS_PTR_MIRROR +.public BitstreamDebug .public CALCIUM_STAT_BOOST .public ConvertStorageItemAtIdxToBulkItem .public CopyBitsFrom @@ -62,6 +63,8 @@ .public GINSENG_CHANCE_3 .public GUMMI_STAT_BOOST .public HasMonsterBeenAttackedInDungeons +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitBulkItem .public IQ_GUMMI_GAIN_TABLE .public IRON_STAT_BOOST @@ -95,9 +98,6 @@ .public sub_0200D1F0 .public sub_02010044 .public sub_0201007C -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_02054FB8 .public sub_02054FEC .public sub_02055020 diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index 4a416ff5..f405e996 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -159,6 +159,7 @@ .public Arm9LoadUnkFieldNa0x2029EC8 .public Arm9StoreUnkFieldNa0x2029ED8 .public BAG_ITEMS_PTR_MIRROR +.public BitstreamDebug .public CanMonsterUseMove .public CARD_Init .public CardBackupError @@ -270,6 +271,8 @@ .public GetWindowIdPageStart .public GetWindowIdSelectedItemOnPage .public HidePortraitBox +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitMenu .public InitMenuWithWindowExtraInfo .public InitMove @@ -473,9 +476,6 @@ .public sub_0204E154 .public sub_0204E19C .public sub_0204F9B8 -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_02050C10 .public sub_02050CF8 .public sub_02050D84 diff --git a/asm/include/main_0204CDB8.inc b/asm/include/main_0204CDB8.inc index 9ffc044c..b66b04c9 100644 --- a/asm/include/main_0204CDB8.inc +++ b/asm/include/main_0204CDB8.inc @@ -3,6 +3,7 @@ .public _0209E010 .public _0209E011 .public ARM9_UNKNOWN_TABLE__NA_209E164 +.public BitstreamDebug .public CopyBitsFrom .public CopyBitsTo .public Debug_Print0 @@ -17,6 +18,8 @@ .public GetDexNumber .public GetGameMode .public GLOBAL_PROGRESS_PTR +.public InitBitstreamForRead +.public InitBitstreamForWrite .public KAOMADO_FILEPATH .public KAOMADO_STREAM .public LoadScriptVariableValue @@ -29,8 +32,5 @@ .public SCENARIO_FLAG_BACKUP_DEBUG_MSG .public SCENARIO_FLAG_RESUME_DEBUG_MSG .public SetAdventureLogCompleted -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public VERSION_EXCLUSIVE_MONSTERS .public ZeroInitScriptVariable diff --git a/asm/include/main_0204DB08.inc b/asm/include/main_0204DB08.inc index 59785417..5d4870b0 100644 --- a/asm/include/main_0204DB08.inc +++ b/asm/include/main_0204DB08.inc @@ -1,13 +1,13 @@ #pragma once .public ARM9_UNKNOWN_TABLE__NA_209E12C +.public BitstreamDebug .public CopyBitsFrom +.public InitBitstreamForRead +.public InitBitstreamForWrite .public MemcpySimple .public sub_0204DA2C .public sub_0204E02C .public sub_0204E0A0 -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_0205C2A4 .public sub_0205C548 .public WONDER_MAIL_BITS_MAP diff --git a/asm/include/main_0204DE7C.inc b/asm/include/main_0204DE7C.inc index 68261d5e..5b4d198d 100644 --- a/asm/include/main_0204DE7C.inc +++ b/asm/include/main_0204DE7C.inc @@ -8,6 +8,7 @@ .public _s32_div_f .public ApplyLevelUpBoostsToGroundMonster .public ARM9_UNKNOWN_TABLE__NA_209E280 +.public BitstreamDebug .public CLIENT_LEVEL_TABLE .public CopyLogFrom .public CopyLogTo @@ -16,6 +17,8 @@ .public GetGameMode .public GetResolvedPerformanceProgressFlag .public GetSosMailCount +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitDungeonInit .public LoadOptionsFromCtx .public LoadScriptVariableValue @@ -33,9 +36,6 @@ .public sub_0204F7A8 .public sub_0204F9F4 .public sub_0204FA0C -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_0205633C .public sub_02056360 .public sub_0205BB7C diff --git a/asm/include/main_02059224.inc b/asm/include/main_02059224.inc index cad09c0d..d71db7a1 100644 --- a/asm/include/main_02059224.inc +++ b/asm/include/main_02059224.inc @@ -1,7 +1,7 @@ #pragma once +.public BitstreamDebug .public CopyBitsFrom +.public InitBitstreamForWrite .public ReadMonsterFromSave -.public sub_02050974 -.public sub_020509BC .public sub_0205523C .public TEAM_MEMBER_TABLE_PTR diff --git a/asm/include/main_0205956C.inc b/asm/include/main_0205956C.inc index 9f7cf1ab..e766e272 100644 --- a/asm/include/main_0205956C.inc +++ b/asm/include/main_0205956C.inc @@ -1,17 +1,17 @@ #pragma once .public _020A3498 .public _020A3499 +.public BitstreamDebug .public Copy16BitsFrom .public Copy16BitsTo .public CopyBitsFrom .public CopyBitsTo +.public InitBitstreamForRead .public memset .public sub_0200DF2C .public sub_0200DF74 .public sub_02014B74 .public sub_02014C20 -.public sub_02050990 -.public sub_020509BC .public sub_02051098 .public sub_020510C0 .public sub_020584F8 diff --git a/asm/include/main_0205EDA4.inc b/asm/include/main_0205EDA4.inc index 43eccbcb..63f75b20 100644 --- a/asm/include/main_0205EDA4.inc +++ b/asm/include/main_0205EDA4.inc @@ -66,6 +66,7 @@ .public _s32_div_f .public AlreadyHaveMission .public ARM9_UNKNOWN_TABLE__NA_20A68BC +.public BitstreamDebug .public BulkItemToItem .public CAFE_MISSION_REWARD_TYPE_WEIGHTS .public CloseCollectionMenu @@ -128,6 +129,8 @@ .public GlobalProgressAlloc .public HandleSir0TranslationVeneer .public HasMonsterBeenAttackedInDungeons +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitKaomadoStream .public InitOptionsVeneer .public InitPreprocessorArgs @@ -313,9 +316,6 @@ .public sub_0204F1B4 .public sub_0204F7A8 .public sub_0204F9B8 -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_02052C3C .public sub_02052E2C .public sub_02055410 diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index eb08ea7f..659f6fd8 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -7,6 +7,7 @@ .public AllocateTemp1024ByteBufferFromPool .public ArrayCopy32 .public BAG_ITEMS_PTR_MIRROR +.public BitstreamDebug .public CardBackupError .public CheckParentMenuField0x1A0 .public CheckSimpleMenuField0x1A0 @@ -81,6 +82,8 @@ .public GetWindowIdSelectedItemOnPage .public InitAnimationControl .public InitAnimationControlWithSet__0201C0B0 +.public InitBitstreamForRead +.public InitBitstreamForWrite .public InitMenu .public InitPreprocessorArgs .public IsAdvancedMenuActive @@ -354,9 +357,6 @@ .public sub_0204E644 .public sub_0204E6A4 .public sub_0204F9E0 -.public sub_02050974 -.public sub_02050990 -.public sub_020509BC .public sub_02050CD0 .public sub_02052060 .public sub_020547C8 diff --git a/asm/include/overlay_06.inc b/asm/include/overlay_06.inc index cebda325..87c63365 100644 --- a/asm/include/overlay_06.inc +++ b/asm/include/overlay_06.inc @@ -1,6 +1,7 @@ #pragma once .public AddMissionToJobList .public AlreadyHaveMission +.public BitstreamDebug .public CanSendItem .public CountJobListMissions .public CreateJobSummary @@ -13,6 +14,7 @@ .public GetLanguageType .public GetMainTeamNameWithCheck .public GetReleasedStylus +.public InitBitstreamForWrite .public IsMissionSuspendedAndValid .public IsMissionTypeSpecialEpisode .public IsSpecialEpisodeOpen @@ -73,8 +75,6 @@ .public sub_0204A018 .public sub_0204A1CC .public sub_0204E210 -.public sub_02050974 -.public sub_020509BC .public sub_0205B440 .public sub_0205D1F4 .public sub_0205F5A8 diff --git a/asm/main_0200CAFC.s b/asm/main_0200CAFC.s index 61c8a42f..94d34d40 100644 --- a/asm/main_0200CAFC.s +++ b/asm/main_0200CAFC.s @@ -832,7 +832,7 @@ WriteItemsToSave: ; 0x0200D95C mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead mov r8, #0 ldr r6, _0200DC40 ; =BAG_ITEMS_PTR_MIRROR mov fp, r8 @@ -1015,7 +1015,7 @@ _0200DB24: add r1, r1, #0x1300 bl CopyBitsTo add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -1031,7 +1031,7 @@ ReadItemsFromSave: ; 0x0200DC44 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite mov r8, #0 ldr r6, _0200DF28 ; =BAG_ITEMS_PTR_MIRROR mov fp, r8 @@ -1214,7 +1214,7 @@ _0200DE0C: add r1, r1, #0x1300 bl CopyBitsFrom add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} diff --git a/asm/main_02010FC4.s b/asm/main_02010FC4.s index dfbe89af..072fbe28 100644 --- a/asm/main_02010FC4.s +++ b/asm/main_02010FC4.s @@ -2637,7 +2637,7 @@ sub_02013190: ; 0x02013190 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite ldr r5, _020131EC ; =_022A4BD8 mov r7, #0 add r6, sp, #0 @@ -2651,7 +2651,7 @@ _020131BC: cmp r7, #8 blt _020131BC add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -2667,7 +2667,7 @@ sub_020131F0: ; 0x020131F0 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead ldr r5, _0201324C ; =_022A4BD8 mov r7, #0 add r6, sp, #0 @@ -2681,7 +2681,7 @@ _0201321C: cmp r7, #8 blt _0201321C add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} diff --git a/asm/main_0203C774.s b/asm/main_0203C774.s index 8de03d5b..a14b7e87 100644 --- a/asm/main_0203C774.s +++ b/asm/main_0203C774.s @@ -16968,7 +16968,7 @@ sub_0204A1DC: ; 0x0204A1DC mov r2, r1 add r0, sp, #4 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite ldr r1, _0204A3E0 ; =_020AFF6C add r0, sp, #4 ldr r1, [r1] @@ -17107,7 +17107,7 @@ _0204A298: moveq r2, #0 add r0, sp, #4 strb r2, [r1, #0x1ed + SUB_0204A1DC_OFFSET] - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #0xc] add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} @@ -17132,7 +17132,7 @@ sub_0204A3E4: ; 0x0204A3E4 mov r1, r5 strb r4, [sp, #1] strb r3, [sp] - bl sub_02050990 + bl InitBitstreamForRead ldr r1, _0204A5CC ; =_020AFF6C add r0, sp, #4 ldr r1, [r1] @@ -17260,7 +17260,7 @@ _0204A4AC: add r0, sp, #4 bl CopyBitsTo add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #0xc] add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} diff --git a/asm/main_0204CDB8.s b/asm/main_0204CDB8.s index d01c6edf..1bcd0a03 100644 --- a/asm/main_0204CDB8.s +++ b/asm/main_0204CDB8.s @@ -634,11 +634,11 @@ CopyProgressInfoFromScratchTo: ; 0x0204D548 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #0 bl CopyProgressInfoTo add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, pc} @@ -780,11 +780,11 @@ CopyProgressInfoFromScratchFrom: ; 0x0204D748 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #0 bl CopyProgressInfoFrom add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, pc} diff --git a/asm/main_0204DB08.s b/asm/main_0204DB08.s index e007be34..b5f7947d 100644 --- a/asm/main_0204DB08.s +++ b/asm/main_0204DB08.s @@ -15,7 +15,7 @@ sub_0204DB08: ; 0x0204DB08 mov r5, r0 add r0, sp, #0x38 add r2, r2, r3, asr #3 - bl sub_02050974 + bl InitBitstreamForWrite mov sb, #0 add r8, sp, #0x38 add r7, sp, #0 @@ -31,7 +31,7 @@ _0204DB5C: cmp sb, r4 blt _0204DB48 add r0, sp, #0x38 - bl sub_020509BC + bl BitstreamDebug mov r3, #0 add r2, sp, #0 ldr r1, _0204DB9C ; =WONDER_MAIL_BITS_MAP @@ -111,12 +111,12 @@ _0204DC3C: add r0, sp, #0 add r1, sp, #0x7d mov r2, #0x20 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #0 mov r1, r5 bl sub_0205C2A4 add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug mov r0, #1 _0204DC94: add sp, sp, #0xa0 @@ -143,12 +143,12 @@ _0204DCC0: add r0, sp, #0 add r1, sp, #0x7d mov r2, #0x20 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #0 mov r1, r6 bl sub_0205C548 add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug mov r3, #1 add r2, sp, #0x7c _0204DCFC: diff --git a/asm/main_0204DE7C.s b/asm/main_0204DE7C.s index b4f725bb..73635d44 100644 --- a/asm/main_0204DE7C.s +++ b/asm/main_0204DE7C.s @@ -20,13 +20,13 @@ _0204DE98: add r0, sp, #0 add r1, sp, #0x58 mov r2, #0x11 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #0 mov r1, r5 mov r2, #1 bl sub_0205FE80 add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug add r0, sp, #0x58 mov r1, #0x11 bl sub_02004F80 @@ -251,7 +251,7 @@ sub_0204E154: ; 0x0204E154 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #0 bl SaveOptionsToCtx add r0, sp, #0 @@ -259,7 +259,7 @@ sub_0204E154: ; 0x0204E154 add r0, sp, #0 bl CopyLogTo add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, pc} @@ -273,7 +273,7 @@ sub_0204E19C: ; 0x0204E19C mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #0 bl LoadOptionsFromCtx add r0, sp, #0 @@ -281,7 +281,7 @@ sub_0204E19C: ; 0x0204E19C add r0, sp, #0 bl CopyLogFrom add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, pc} diff --git a/asm/main_0204FE58.s b/asm/main_0204FE58.s index b025808c..6d0ec574 100644 --- a/asm/main_0204FE58.s +++ b/asm/main_0204FE58.s @@ -888,8 +888,8 @@ GetConversion2ConvertToType: ; 0x02050964 _02050970: .word _020A192C arm_func_end GetConversion2ConvertToType - arm_func_start sub_02050974 -sub_02050974: ; 0x02050974 + arm_func_start InitBitstreamForWrite +InitBitstreamForWrite: ; 0x02050974 str r1, [r0] mov r3, #0 str r3, [r0, #8] @@ -897,10 +897,10 @@ sub_02050974: ; 0x02050974 add r1, r1, r2 str r1, [r0, #4] bx lr - arm_func_end sub_02050974 + arm_func_end InitBitstreamForWrite - arm_func_start sub_02050990 -sub_02050990: ; 0x02050990 + arm_func_start InitBitstreamForRead +InitBitstreamForRead: ; 0x02050990 str r1, [r0] mov r3, #0 str r3, [r0, #8] @@ -913,12 +913,12 @@ sub_02050990: ; 0x02050990 bx ip .align 2, 0 _020509B8: .word MemZero - arm_func_end sub_02050990 + arm_func_end InitBitstreamForRead - arm_func_start sub_020509BC -sub_020509BC: ; 0x020509BC + arm_func_start BitstreamDebug +BitstreamDebug: ; 0x020509BC bx lr - arm_func_end sub_020509BC + arm_func_end BitstreamDebug arm_func_start CopyBitsTo CopyBitsTo: ; 0x020509C0 @@ -1249,7 +1249,7 @@ sub_02050CF8: ; 0x02050CF8 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead ldr r1, _02050D70 ; =TEAM_NAME add r0, sp, #0 #ifdef JAPAN @@ -1277,7 +1277,7 @@ sub_02050CF8: ; 0x02050CF8 mov r2, #1 bl CopyBitsTo add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r3, pc} @@ -1297,7 +1297,7 @@ sub_02050D84: ; 0x02050D84 mov r2, r1 add r0, sp, #4 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite ldr r1, _02050DFC ; =TEAM_NAME add r0, sp, #4 #ifdef JAPAN @@ -1325,7 +1325,7 @@ sub_02050D84: ; 0x02050D84 #else strb r2, [r1, #0x10] #endif - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #0xc] add sp, sp, #0x14 ldmia sp!, {pc} diff --git a/asm/main_02059224.s b/asm/main_02059224.s index 474844f5..5b558f04 100644 --- a/asm/main_02059224.s +++ b/asm/main_02059224.s @@ -11,7 +11,7 @@ ReadMonsterInfoFromSave: ; 0x02059224 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite ldr r6, _0205932C ; =TEAM_MEMBER_TABLE_PTR ldr r5, _02059330 ; =0x0000022B mov r8, #0 @@ -68,7 +68,7 @@ _020592F0: cmp r7, #4 blt _020592F0 add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug bl sub_0205523C ldr r0, [sp, #8] add sp, sp, #0x10 diff --git a/asm/main_0205956C.s b/asm/main_0205956C.s index 4d18aa13..2e7ed72f 100644 --- a/asm/main_0205956C.s +++ b/asm/main_0205956C.s @@ -163,7 +163,7 @@ sub_020597B0: ; 0x020597B0 mov r2, r1 add r0, sp, #8 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #8 mov r1, #0 bl sub_0205956C @@ -174,7 +174,7 @@ sub_020597B0: ; 0x020597B0 mov r1, #2 bl sub_0205956C add r0, sp, #8 - bl sub_020509BC + bl BitstreamDebug ldr r1, _02059820 ; =_020A3498 add r0, sp, #0 ldr r2, [r1, #0x10] diff --git a/asm/main_0205EDA4.s b/asm/main_0205EDA4.s index 82cbee3c..9755902c 100644 --- a/asm/main_0205EDA4.s +++ b/asm/main_0205EDA4.s @@ -1054,7 +1054,7 @@ sub_0205FAB0: ; 0x0205FAB0 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050974 + bl InitBitstreamForWrite mov r7, #0 ldr r4, _0205FC1C ; =MISSION_DELIVER_LIST_PTR add r6, sp, #0 @@ -1137,7 +1137,7 @@ _0205FBAC: cmp r8, #0x10 blt _0205FBAC add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug bl Rand16Bit bl sub_020634F4 ldr r0, [sp, #8] @@ -1155,7 +1155,7 @@ sub_0205FC20: ; 0x0205FC20 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_02050990 + bl InitBitstreamForRead mov r7, #0 ldr r4, _0205FD84 ; =MISSION_DELIVER_LIST_PTR add r6, sp, #0 @@ -1238,7 +1238,7 @@ _0205FD1C: cmp r8, #0x10 blt _0205FD1C add r0, sp, #0 - bl sub_020509BC + bl BitstreamDebug ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 16a9ea2d..4747dd0f 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -5087,7 +5087,7 @@ ov01_0232D3C4: ; 0x0232D3C4 orr r7, r7, ip orr r3, r3, r7 str r3, [r6, #0x24] - bl sub_02050990 + bl InitBitstreamForRead cmp r4, #0 add r0, sp, #4 beq _0232D4E0 @@ -5109,7 +5109,7 @@ _0232D4E0: bl CopyBitsTo _0232D4F4: add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug add r0, r6, #0x68 add r1, r5, #0x32 mov r2, #0x12 @@ -5183,7 +5183,7 @@ ov01_0232D5C4: ; 0x0232D5C4 add r0, sp, #4 add r1, r6, #0x50 mov r2, #0x40 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #4 add r1, sp, #0 mov r2, #1 @@ -5213,7 +5213,7 @@ ov01_0232D5C4: ; 0x0232D5C4 bl ov01_0232E58C _0232D650: add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug mov r0, r4 add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} @@ -5520,7 +5520,7 @@ ov01_0232DA1C: ; 0x0232DA1C add r1, r7, #0xc add r0, sp, #0xc mov r2, #0x100 - bl sub_02050990 + bl InitBitstreamForRead add r0, sp, #2 mov r1, #0 bl sub_02057030 @@ -5528,7 +5528,7 @@ ov01_0232DA1C: ; 0x0232DA1C tst r0, #0xff add r0, sp, #0xc bne _0232DADC - bl sub_020509BC + bl BitstreamDebug mov r0, #0 b _0232DB8C _0232DADC: @@ -5579,7 +5579,7 @@ _0232DB74: blt _0232DAFC _0232DB80: add r0, sp, #0xc - bl sub_020509BC + bl BitstreamDebug mov r0, r4 _0232DB8C: add sp, sp, #0x68 @@ -5758,7 +5758,7 @@ _0232DD2C: add r1, sl, #0x24 add r0, sp, #4 mov r2, #0x100 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #4 add r1, sp, #0 mov r2, #3 @@ -5788,7 +5788,7 @@ _0232DE50: cmp r3, #4 blt _0232DE44 add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug add sb, sb, #1 _0232DE64: cmp sb, r5 @@ -5898,7 +5898,7 @@ ov01_0232DF18: ; 0x0232DF18 add r0, sp, #4 add r1, r5, #0x24 mov r2, #0x100 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #4 add r1, sp, #0 mov r2, #3 @@ -5929,7 +5929,7 @@ _0232E020: cmp r3, #4 blt _0232E014 add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end ov01_0232DF18 @@ -6017,7 +6017,7 @@ ov01_0232E0A4: ; 0x0232E0A4 add r0, sp, #4 add r1, r5, #0x24 mov r2, #0x100 - bl sub_02050974 + bl InitBitstreamForWrite add r0, sp, #4 add r1, sp, #0 mov r2, #3 @@ -6048,7 +6048,7 @@ _0232E1AC: cmp r3, #4 blt _0232E1A0 add r0, sp, #4 - bl sub_020509BC + bl BitstreamDebug add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end ov01_0232E0A4 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index a8ed66d5..75a7f40b 100644 --- a/asm/overlay_06.s +++ b/asm/overlay_06.s @@ -1712,7 +1712,7 @@ _0233E07C: ldr r2, [sp, #8] add r1, r7, #0x20 add r0, sp, #0x30 - bl sub_02050974 + bl InitBitstreamForWrite ldr r1, [r4] add r0, sp, #0x30 add r1, r1, #0x18 @@ -1721,7 +1721,7 @@ _0233E07C: mov r2, #0 bl sub_0205FD88 add r0, sp, #0x30 - bl sub_020509BC + bl BitstreamDebug mov r0, r7 bl IsMissionTypeSpecialEpisode cmp r0, #0 diff --git a/src/main_0204DA2C.c b/src/main_0204DA2C.c index cc035c7b..91d3fa3a 100644 --- a/src/main_0204DA2C.c +++ b/src/main_0204DA2C.c @@ -3,9 +3,9 @@ extern u8 ARM9_UNKNOWN_TABLE__NA_209E164[]; -extern void sub_02050990(u8*, u8*, s32); +extern void InitBitstreamForRead(u8*, u8*, s32); extern void CopyBitsTo(u8* write_info, void* buf_write, s32 nbits); -extern void sub_020509BC(u8*); +extern void BitstreamDebug(u8*); s32 sub_0204DA2C(u8* arg0, void* arg1, u8 arg2) { @@ -28,13 +28,13 @@ s32 sub_0204DA2C(u8* arg0, void* arg1, u8 arg2) s32 v1 = arg2 * 5; s32 v2 = (v1 & 7) + 7; - sub_02050990(tmp3, tmp1, (v1 >> 3) + (v2 >> 3)); + InitBitstreamForRead(tmp3, tmp1, (v1 >> 3) + (v2 >> 3)); for (int i = 0; i < arg2; i++) { CopyBitsTo(tmp3, &tmp2[i], 5); } - sub_020509BC(tmp3); + BitstreamDebug(tmp3); MemcpySimple(arg1, tmp1, (v1 >> 3) + (v2 >> 3)); return 1; } diff --git a/src/main_0204DD80.c b/src/main_0204DD80.c index b621ec81..9549c07c 100644 --- a/src/main_0204DD80.c +++ b/src/main_0204DD80.c @@ -8,9 +8,9 @@ extern u8 _0209E264[]; extern u8 sub_0204DA2C(u8(*)[34], UnkStruct_WonderMailPasswordToMission*, s32); extern void sub_0204E0A0(u8, u8*, s32); extern s32 sub_02004F80(u8*, s32); -extern void sub_02050974(u8*, u8*, s32); +extern void InitBitstreamForWrite(u8*, u8*, s32); extern void sub_0205FD88(u8*, u32, s32); -extern void sub_020509BC(u8*); +extern void BitstreamDebug(u8*); s32 WonderMailPasswordToMission(u8* param_1, u32 param_2) { @@ -41,9 +41,9 @@ s32 WonderMailPasswordToMission(u8* param_1, u32 param_2) s32 uVar2 = sub_02004F80(ctx.auStack_20, 0x11); Debug_Print0(_0209E264, uVar2, ctx.y); if (ctx.x == uVar2) { - sub_02050974(auStack_78, ctx.auStack_20, 0x11); + InitBitstreamForWrite(auStack_78, ctx.auStack_20, 0x11); sub_0205FD88(auStack_78, param_2, 1); - sub_020509BC(auStack_78); + BitstreamDebug(auStack_78); ret = 1; } else { ret = 0; diff --git a/src/main_02059060.c b/src/main_02059060.c index 8ce15a4a..1aa4e121 100644 --- a/src/main_02059060.c +++ b/src/main_02059060.c @@ -7,10 +7,10 @@ extern struct team_member_table *TEAM_MEMBER_TABLE_PTR; extern s32 GetLanguageType(void); extern void StrncpySimpleNoPadSafe(u8* dest, const u8* src, u32 n); -extern void sub_02050990(struct WriteMonsterInfoToSave_struct *ptr, void *start_addr, u32 total_len); +extern void InitBitstreamForRead(struct WriteMonsterInfoToSave_struct *ptr, void *start_addr, u32 total_len); extern void WriteMonsterToSave(struct WriteMonsterInfoToSave_struct *write_info, struct ground_monster *monster); extern void CopyBitsTo(void *ctx, void *src, s32 nbits); -extern void sub_020509BC(struct WriteMonsterInfoToSave_struct *ptr); +extern void BitstreamDebug(struct WriteMonsterInfoToSave_struct *ptr); void GetExplorerMazeTeamName(u8 *dest) { @@ -55,7 +55,7 @@ s32 WriteMonsterInfoToSave(void* start_addr, u32 total_len) { struct WriteMonsterInfoToSave_struct local_struct; - sub_02050990(&local_struct, start_addr, total_len); + InitBitstreamForRead(&local_struct, start_addr, total_len); for (s32 i = 0; i < MAX_GROUND_TEAM_MEMBERS; i++) { @@ -72,7 +72,7 @@ s32 WriteMonsterInfoToSave(void* start_addr, u32 total_len) WriteMonsterToSave(&local_struct, &TEAM_MEMBER_TABLE_PTR->explorer_maze_monsters[i]); } - sub_020509BC(&local_struct); + BitstreamDebug(&local_struct); return local_struct.result; } diff --git a/src/main_02059A74.c b/src/main_02059A74.c index 4a81fa5c..8ab9eff0 100644 --- a/src/main_02059A74.c +++ b/src/main_02059A74.c @@ -3,9 +3,9 @@ extern u32 _020A3498[]; -extern void sub_02050974(void *v0, u32 v1, u32 v2); +extern void InitBitstreamForWrite(void *v0, u32 v1, u32 v2); extern void sub_02059824(void *v0, u32 v1); -extern void sub_020509BC(void *v0); +extern void BitstreamDebug(void *v0); extern void sub_020584F8(void *v0); extern void CopyBitsFrom(void *read_info, void *buf_read, s32 nbits); extern void CopyBitsTo(void *ctx, void *src, s32 nbits); @@ -15,11 +15,11 @@ u32 sub_02059A74(u32 a, u32 b) u32 obj1[4]; u32 obj2[2]; - sub_02050974(obj1, a, b); + InitBitstreamForWrite(obj1, a, b); sub_02059824(obj1, 0); sub_02059824(obj1, 1); sub_02059824(obj1, 2); - sub_020509BC(obj1); + BitstreamDebug(obj1); obj2[1] = _020A3498[2]; obj2[0] = _020A3498[1]; diff --git a/src/main_0205BD14.c b/src/main_0205BD14.c index fad75ca1..14ea5e2f 100644 --- a/src/main_0205BD14.c +++ b/src/main_0205BD14.c @@ -9,14 +9,14 @@ extern union unkStruct_020B0A54_union _020B0A54; extern u32 _022B57BC; -extern void sub_02050974(void *v0, u32 v1, u32 v2); +extern void InitBitstreamForWrite(void *v0, u32 v1, u32 v2); extern void CopyBitsFrom(void *read_info, void *buf_read, s32 nbits); extern void* memset(void *s, s32 c, u32 n); extern void Copy16BitsFrom(void *read_info, void *buf_read); extern void CopyMovesetFrom(struct WriteMonsterInfoToSave_struct *read_info, void *dst); -extern void sub_020509BC(struct WriteMonsterInfoToSave_struct *write_info); +extern void BitstreamDebug(struct WriteMonsterInfoToSave_struct *write_info); extern void sub_020634F4(void); -extern void sub_02050990(struct WriteMonsterInfoToSave_struct *write_info, u32 p1, u32 p2); +extern void InitBitstreamForRead(struct WriteMonsterInfoToSave_struct *write_info, u32 p1, u32 p2); extern void CopyBitsTo(void *write_info, void* buf_write, s32 nbits); extern void Copy16BitsTo(void *write_info, void *buf_write); extern void CopyMovesetTo(struct WriteMonsterInfoToSave_struct *write_info, void *buffer_write); @@ -55,7 +55,7 @@ u32 sub_0205BD9C(u32 arg0, u32 arg1) { struct WriteMonsterInfoToSave_struct temp; - sub_02050974(&temp, arg0, arg1); + InitBitstreamForWrite(&temp, arg0, arg1); CopyBitsFrom(&temp, &_022B57BC, 32); for (s32 i = 0; i < 32; i++) @@ -96,7 +96,7 @@ u32 sub_0205BD9C(u32 arg0, u32 arg1) CopyBitsFrom(&temp, _020B0A54.fp[1] + 4 + (i * 8), 64); } - sub_020509BC(&temp); + BitstreamDebug(&temp); Rand16Bit(); sub_020634F4(); @@ -107,7 +107,7 @@ u32 sub_0205BFB0(u32 p0, u32 p1) { struct WriteMonsterInfoToSave_struct stack_var; - sub_02050990(&stack_var, p0, p1); + InitBitstreamForRead(&stack_var, p0, p1); CopyBitsTo(&stack_var, &_022B57BC, 32); for (s32 i = 0; i < 32; i++) @@ -145,7 +145,7 @@ u32 sub_0205BFB0(u32 p0, u32 p1) CopyBitsTo(&stack_var, _020B0A54.fp[1] + 4 + (i * 8), 64); } - sub_020509BC(&stack_var); + BitstreamDebug(&stack_var); return stack_var.result; }