From f81b360785946adf817212507b5e834626436fe8 Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Fri, 12 May 2023 23:33:04 +0100 Subject: [PATCH 01/11] rename all instances of GF_Camera to Camera --- asm/field_take_photo.s | 8 +-- asm/include/field_take_photo.inc | 8 +-- asm/include/overlay_01_021E5900.inc | 2 +- asm/include/overlay_01_021E90C0.inc | 4 +- asm/include/overlay_01_021EABA8.inc | 12 ++-- asm/include/overlay_01_021EB1E8.inc | 4 +- asm/include/overlay_01_021EFB38.inc | 2 +- asm/include/overlay_01_021FCD2C.inc | 4 +- asm/include/overlay_02.inc | 26 ++++----- asm/include/overlay_03.inc | 4 +- asm/include/overlay_04.inc | 8 +-- asm/include/overlay_05.inc | 2 +- asm/include/overlay_07.inc | 4 +- asm/include/overlay_104.inc | 10 ++-- asm/include/overlay_105.inc | 10 ++-- asm/include/overlay_106.inc | 8 +-- asm/include/overlay_108.inc | 12 ++-- asm/include/overlay_116.inc | 10 ++-- asm/include/overlay_119.inc | 4 +- asm/include/overlay_15.inc | 8 +-- asm/include/overlay_48.inc | 8 +-- asm/include/overlay_49.inc | 8 +-- asm/include/overlay_59.inc | 6 +- asm/include/overlay_60.inc | 10 ++-- asm/include/overlay_63.inc | 10 ++-- asm/include/overlay_68.inc | 6 +- asm/include/overlay_69.inc | 10 ++-- asm/include/overlay_71.inc | 14 ++--- asm/include/overlay_80_02239960.inc | 2 +- asm/include/overlay_85.inc | 8 +-- asm/include/overlay_89.inc | 24 ++++---- asm/include/overlay_91.inc | 14 ++--- asm/include/overlay_92.inc | 6 +- asm/include/overlay_93_thumb_1.inc | 8 +-- asm/include/overlay_95.inc | 2 +- asm/include/overlay_96.inc | 12 ++-- asm/include/unk_02014DA0.inc | 6 +- asm/include/unk_02022D74.inc | 28 +++++----- asm/include/unk_02056680.inc | 6 +- asm/include/unk_020773AC.inc | 2 +- asm/include/unk_0208DE40.inc | 6 +- asm/overlay_01_021E5900.s | 2 +- asm/overlay_01_021E90C0.s | 20 +++---- asm/overlay_01_021EABA8.s | 18 +++--- asm/overlay_01_021EB1E8.s | 4 +- asm/overlay_01_021EFB38.s | 2 +- asm/overlay_01_021FCD2C.s | 6 +- asm/overlay_02.s | 68 +++++++++++------------ asm/overlay_03.s | 6 +- asm/overlay_04.s | 14 ++--- asm/overlay_05.s | 2 +- asm/overlay_07.s | 20 +++---- asm/overlay_104.s | 10 ++-- asm/overlay_105.s | 10 ++-- asm/overlay_106.s | 8 +-- asm/overlay_108.s | 12 ++-- asm/overlay_116.s | 14 ++--- asm/overlay_119.s | 24 ++++---- asm/overlay_15.s | 10 ++-- asm/overlay_48.s | 10 ++-- asm/overlay_49.s | 8 +-- asm/overlay_59.s | 8 +-- asm/overlay_60.s | 16 +++--- asm/overlay_63.s | 10 ++-- asm/overlay_68.s | 6 +- asm/overlay_69.s | 10 ++-- asm/overlay_71.s | 18 +++--- asm/overlay_80_02239960.s | 2 +- asm/overlay_85.s | 8 +-- asm/overlay_89.s | 54 +++++++++--------- asm/overlay_91.s | 14 ++--- asm/overlay_92.s | 6 +- asm/overlay_93_thumb_1.s | 18 +++--- asm/overlay_95.s | 2 +- asm/overlay_96.s | 12 ++-- asm/unk_02014DA0.s | 8 +-- asm/unk_02022D74.s | 86 ++++++++++++++--------------- asm/unk_02056680.s | 24 ++++---- asm/unk_020773AC.s | 2 +- asm/unk_0208DE40.s | 6 +- include/camera_translation.h | 4 +- include/field_system.h | 2 +- include/unk_02014DA0.h | 2 +- include/unk_02022D74.h | 38 ++++++------- src/camera_translation.c | 46 +++++++-------- src/choose_starter_app.c | 16 +++--- src/overlay_06.c | 8 +-- src/overlay_94.c | 2 +- src/scrcmd_c.c | 2 +- 89 files changed, 522 insertions(+), 522 deletions(-) diff --git a/asm/field_take_photo.s b/asm/field_take_photo.s index 4ce0c32bea..89e8f48a48 100644 --- a/asm/field_take_photo.s +++ b/asm/field_take_photo.s @@ -1091,14 +1091,14 @@ sub_0206AFD0: ; 0x0206AFD0 ldr r0, _0206B008 ; =_021100C4 add r1, r4, #0 ldr r0, [r0] - bl GF_Camera_SetDistance + bl Camera_SetDistance ldr r0, _0206B00C ; =_021100C4 + 4 add r1, r4, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle ldr r0, _0206B008 ; =_021100C4 add r1, r4, #0 ldrh r0, [r0, #0xe] - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle ldr r0, _0206B008 ; =_021100C4 add r1, r4, #0 ldrh r0, [r0, #0xc] @@ -1107,7 +1107,7 @@ sub_0206AFD0: ; 0x0206AFD0 bl sub_020233D8 ldr r0, _0206B010 ; =_021100C4 + 24 add r1, r4, #0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy pop {r4, pc} .balign 4, 0 _0206B008: .word _021100C4 diff --git a/asm/include/field_take_photo.inc b/asm/include/field_take_photo.inc index 624d88e8b8..eaff3d40b7 100644 --- a/asm/include/field_take_photo.inc +++ b/asm/include/field_take_photo.inc @@ -17,10 +17,10 @@ .public SetBgPriority .public BgCommitTilemapBufferToVram .public sub_020233D8 -.public GF_Camera_SetPerspectiveAngle -.public GF_Camera_ShiftBy -.public GF_Camera_SetAngle -.public GF_Camera_SetDistance +.public Camera_SetPerspectiveAngle +.public Camera_ShiftBy +.public Camera_SetAngle +.public Camera_SetDistance .public GF_AssertFail .public Sav2_PlayerData_GetProfileAddr .public PlayerProfile_GetNamePtr diff --git a/asm/include/overlay_01_021E5900.inc b/asm/include/overlay_01_021E5900.inc index 2194ef3251..a5aa05effa 100644 --- a/asm/include/overlay_01_021E5900.inc +++ b/asm/include/overlay_01_021E5900.inc @@ -41,7 +41,7 @@ .public GX_BothDispOn .public GX_SwapDisplay .public sub_02023154 -.public GF_Camera_GetAngle +.public Camera_GetAngle .public sub_02023738 .public sub_02023778 .public sub_020237B0 diff --git a/asm/include/overlay_01_021E90C0.inc b/asm/include/overlay_01_021E90C0.inc index d56377d876..0e7e78b307 100644 --- a/asm/include/overlay_01_021E90C0.inc +++ b/asm/include/overlay_01_021E90C0.inc @@ -18,9 +18,9 @@ .public Ascii_GetDelim .public Ascii_StrToL .public sub_02023234 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_020234D0 -.public GF_Camera_GetPerspectiveAngle +.public Camera_GetPerspectiveAngle .public GF_AssertFail .public sub_0203B58C .public TaskManager_Call diff --git a/asm/include/overlay_01_021EABA8.inc b/asm/include/overlay_01_021EABA8.inc index 212ba407fb..d4f71c11c3 100644 --- a/asm/include/overlay_01_021EABA8.inc +++ b/asm/include/overlay_01_021EABA8.inc @@ -4,14 +4,14 @@ .public FreeToHeap .public sub_02023068 .public sub_020230F8 -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_ShiftBy -.public GF_Camera_SetAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_ShiftBy +.public Camera_SetAngle .public GF_AssertFail .public MI_CpuFill8 .public _s32_div_f diff --git a/asm/include/overlay_01_021EB1E8.inc b/asm/include/overlay_01_021EB1E8.inc index 620c373db0..183699d0bc 100644 --- a/asm/include/overlay_01_021EB1E8.inc +++ b/asm/include/overlay_01_021EB1E8.inc @@ -45,8 +45,8 @@ .public MTRandom .public sub_02020E10 .public GX_EngineAToggleLayers -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance .public SpriteList_Create .public sub_02024504 .public sub_0202457C diff --git a/asm/include/overlay_01_021EFB38.inc b/asm/include/overlay_01_021EFB38.inc index 8f050f2da8..5cf623d40c 100644 --- a/asm/include/overlay_01_021EFB38.inc +++ b/asm/include/overlay_01_021EFB38.inc @@ -62,7 +62,7 @@ .public sub_0201F988 .public GX_SetBanks .public GX_EngineAToggleLayers -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_02024504 .public sub_02024714 .public GF_AssertFail diff --git a/asm/include/overlay_01_021FCD2C.inc b/asm/include/overlay_01_021FCD2C.inc index 6070909c69..cb66788086 100644 --- a/asm/include/overlay_01_021FCD2C.inc +++ b/asm/include/overlay_01_021FCD2C.inc @@ -5,8 +5,8 @@ .public AllocFromHeapAtEnd .public FreeToHeap .public sub_0201F988 -.public GF_Camera_SetDistance -.public GF_Camera_GetDistance +.public Camera_SetDistance +.public Camera_GetDistance .public memset .public _s32_div_f .public ov01_021FCD2C diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 5bd0f168c3..10f80ab964 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -107,25 +107,25 @@ .public MTRandom .public AddTextPrinterParameterized2 .public GX_EngineAToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 .public sub_02023128 -.public GF_Camera_RegisterToStaticPtr -.public GF_Camera_SetBindTarget +.public Camera_RegisterToStaticPtr +.public Camera_SetBindTarget .public sub_02023214 -.public GF_Camera_SetClipBounds -.public GF_Camera_SetPerspectiveAngle -.public GF_Camera_ShiftBy -.public GF_Camera_SetAngle -.public GF_Camera_SetDistance -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance -.public GF_Camera_GetAngle -.public GF_Camera_GetTarget +.public Camera_SetClipBounds +.public Camera_SetPerspectiveAngle +.public Camera_ShiftBy +.public Camera_SetAngle +.public Camera_SetDistance +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance +.public Camera_GetAngle +.public Camera_GetTarget .public sub_02023640 .public sub_02023650 .public sub_02023654 -.public GF_Camera_GetBindTarget +.public Camera_GetBindTarget .public sub_0202365C .public sub_0202366C .public sub_02023E78 diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 36bf1d0879..944f1e8c43 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -74,10 +74,10 @@ .public GX_EngineASetLayers .public GX_EngineBToggleLayers .public GX_EngineAGetLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 .public sub_02023128 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_0202457C .public Sprite_Delete .public sub_020247D4 diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc index d5f865a217..69e7ee28ef 100644 --- a/asm/include/overlay_04.inc +++ b/asm/include/overlay_04.inc @@ -13,10 +13,10 @@ .public AllocFromHeapAtEnd .public FreeToHeap .public GF_ExpHeap_FndInitAllocator -.public GF_Camera_ShiftBy -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance -.public GF_Camera_GetAngle +.public Camera_ShiftBy +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance +.public Camera_GetAngle .public sub_02023F90 .public GF_AssertFail .public Sav2_GetGymmickPtr diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index f3c8c93395..a6b69f6d28 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -120,7 +120,7 @@ .public GX_DisableEngineALayers .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_020249B0 .public GF_AssertFail .public String_ctor diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc index 0e8deb4dd2..5df25900d0 100644 --- a/asm/include/overlay_07.inc +++ b/asm/include/overlay_07.inc @@ -147,8 +147,8 @@ .public LCRandom .public GF_CreateNewVramTransferTask .public sub_02022808 -.public GF_Camera_SetAngle -.public GF_Camera_GetAngle +.public Camera_SetAngle +.public Camera_GetAngle .public sub_0202365C .public sub_02024B1C .public sub_02024B34 diff --git a/asm/include/overlay_104.inc b/asm/include/overlay_104.inc index 262aca9dc0..b12d40b3a0 100644 --- a/asm/include/overlay_104.inc +++ b/asm/include/overlay_104.inc @@ -25,13 +25,13 @@ .public GX_DisableEngineALayers .public GX_DisableEngineBLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_ShiftBy +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_ShiftBy .public Thunk_G3X_Reset .public sub_02026E50 .public sub_020880CC diff --git a/asm/include/overlay_105.inc b/asm/include/overlay_105.inc index ec1afd50b3..cbc832b587 100644 --- a/asm/include/overlay_105.inc +++ b/asm/include/overlay_105.inc @@ -24,13 +24,13 @@ .public GX_DisableEngineALayers .public GX_DisableEngineBLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_ShiftBy +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_ShiftBy .public Thunk_G3X_Reset .public sub_02026E50 .public sub_020880CC diff --git a/asm/include/overlay_106.inc b/asm/include/overlay_106.inc index 830c13f319..149ffbbb26 100644 --- a/asm/include/overlay_106.inc +++ b/asm/include/overlay_106.inc @@ -68,12 +68,12 @@ .public GX_EngineAToggleLayers .public GX_EngineASetLayers .public GX_EngineBSetLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_02024B1C .public sub_02024B34 .public GF_AssertFail diff --git a/asm/include/overlay_108.inc b/asm/include/overlay_108.inc index f943eed86c..ad870428d6 100644 --- a/asm/include/overlay_108.inc +++ b/asm/include/overlay_108.inc @@ -156,14 +156,14 @@ .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_ShiftBy -.public GF_Camera_SetDistance +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_ShiftBy +.public Camera_SetDistance .public sub_02024504 .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_116.inc b/asm/include/overlay_116.inc index b42ed7200b..a720e59b46 100644 --- a/asm/include/overlay_116.inc +++ b/asm/include/overlay_116.inc @@ -5,11 +5,11 @@ .public sub_0200FBF4 .public AllocFromHeap .public GX_EngineAToggleLayers -.public GF_Camera_SetPerspectiveAngle -.public GF_Camera_SetAngle -.public GF_Camera_SetDistance -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance +.public Camera_SetPerspectiveAngle +.public Camera_SetAngle +.public Camera_SetDistance +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance .public memset .public ov01_021EFCDC .public ov01_021EFCF8 diff --git a/asm/include/overlay_119.inc b/asm/include/overlay_119.inc index bfc96fd12d..26976b636b 100644 --- a/asm/include/overlay_119.inc +++ b/asm/include/overlay_119.inc @@ -16,8 +16,8 @@ .public ClearWindowTilemapAndCopyToVram .public FillWindowPixelBuffer .public GX_EngineAToggleLayers -.public GF_Camera_SetDistance -.public GF_Camera_GetDistance +.public Camera_SetDistance +.public Camera_GetDistance .public sub_0202457C .public Sprite_Delete .public sub_020247D4 diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 56a8063704..3f7834404e 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -131,12 +131,12 @@ .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_02025224 .public System_GetTouchHeld .public GF_AssertFail diff --git a/asm/include/overlay_48.inc b/asm/include/overlay_48.inc index 4a4bcf45e0..ff567e9c9d 100644 --- a/asm/include/overlay_48.inc +++ b/asm/include/overlay_48.inc @@ -109,14 +109,14 @@ .public GX_EngineAToggleLayers .public GX_EngineBToggleLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_02023308 .public sub_020233D8 -.public GF_Camera_SetDistance +.public Camera_SetDistance .public sub_02024504 .public sub_0202457C .public sub_02024714 diff --git a/asm/include/overlay_49.inc b/asm/include/overlay_49.inc index 273bf4afb7..daf3b552a6 100644 --- a/asm/include/overlay_49.inc +++ b/asm/include/overlay_49.inc @@ -170,13 +170,13 @@ .public GX_EngineAToggleLayers .public GX_EngineBToggleLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_02024504 .public sub_0202457C .public sub_02024714 diff --git a/asm/include/overlay_59.inc b/asm/include/overlay_59.inc index 29e4e2f148..bab6a0a909 100644 --- a/asm/include/overlay_59.inc +++ b/asm/include/overlay_59.inc @@ -128,12 +128,12 @@ .public GX_DisableEngineALayers .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 .public sub_02023234 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_020232BC .public Sprite_Delete .public sub_020247D4 diff --git a/asm/include/overlay_60.inc b/asm/include/overlay_60.inc index 6064aec770..fe1c10a289 100644 --- a/asm/include/overlay_60.inc +++ b/asm/include/overlay_60.inc @@ -115,16 +115,16 @@ .public GX_EngineBToggleLayers .public GX_BothDispOn .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_02023308 .public sub_020233D8 -.public GF_Camera_SetPerspectiveAngle +.public Camera_SetPerspectiveAngle .public sub_0202365C .public sub_0202366C .public sub_02024504 diff --git a/asm/include/overlay_63.inc b/asm/include/overlay_63.inc index 3a6c2b405a..a627b7012a 100644 --- a/asm/include/overlay_63.inc +++ b/asm/include/overlay_63.inc @@ -103,12 +103,12 @@ .public GX_EngineAToggleLayers .public GX_EngineASetLayers .public GX_EngineBSetLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr -.public GF_Camera_SetBindTarget -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_RegisterToStaticPtr +.public Camera_SetBindTarget +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_02024B1C .public sub_02024B34 .public System_GetTouchNew diff --git a/asm/include/overlay_68.inc b/asm/include/overlay_68.inc index 564c711893..7e1f3b265c 100644 --- a/asm/include/overlay_68.inc +++ b/asm/include/overlay_68.inc @@ -118,12 +118,12 @@ .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 .public sub_02023234 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_020232BC .public System_GetTouchNew .public String_ctor diff --git a/asm/include/overlay_69.inc b/asm/include/overlay_69.inc index 83cef9c32d..e8ee23915b 100644 --- a/asm/include/overlay_69.inc +++ b/asm/include/overlay_69.inc @@ -74,15 +74,15 @@ .public GX_EngineBToggleLayers .public GX_BothDispOn .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_02023308 .public sub_020233D8 -.public GF_Camera_SetDistance -.public GF_Camera_GetDistance +.public Camera_SetDistance +.public Camera_GetDistance .public System_GetTouchNew .public String_ctor .public String_dtor diff --git a/asm/include/overlay_71.inc b/asm/include/overlay_71.inc index 7f705fe99a..9d5001d5b2 100644 --- a/asm/include/overlay_71.inc +++ b/asm/include/overlay_71.inc @@ -99,17 +99,17 @@ .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 .public sub_02023154 -.public GF_Camera_SetBindTarget -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetBindTarget +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_020233D8 -.public GF_Camera_SetPerspectiveAngle -.public GF_Camera_SetAngle +.public Camera_SetPerspectiveAngle +.public Camera_SetAngle .public sub_0202357C .public sub_02023640 .public sub_02024504 diff --git a/asm/include/overlay_80_02239960.inc b/asm/include/overlay_80_02239960.inc index 2966dd2e93..7f08df9978 100644 --- a/asm/include/overlay_80_02239960.inc +++ b/asm/include/overlay_80_02239960.inc @@ -16,7 +16,7 @@ .public sub_02015528 .public AllocFromHeap .public FreeToHeap -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public GF_AssertFail .public Thunk_G3X_Reset .public MI_CpuFill8 diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index 357aabfe9e..555d4b26bc 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -149,12 +149,12 @@ .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetBindTarget -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetBindTarget +.public Camera_InitFromTargetDistanceAndAngle .public sub_02024504 .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_89.inc b/asm/include/overlay_89.inc index 923d8caa64..f4460107cc 100644 --- a/asm/include/overlay_89.inc +++ b/asm/include/overlay_89.inc @@ -147,24 +147,24 @@ .public GX_EngineBToggleLayers .public GX_BothDispOn .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetBindTarget -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetBindTarget +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_020233D8 -.public GF_Camera_ShiftBy +.public Camera_ShiftBy .public sub_02023534 -.public GF_Camera_SetAngle +.public Camera_SetAngle .public sub_020235A8 -.public GF_Camera_SetDistance +.public Camera_SetDistance .public sub_020235FC -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance -.public GF_Camera_GetAngle -.public GF_Camera_GetTarget +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance +.public Camera_GetAngle +.public Camera_GetTarget .public sub_02023640 .public sub_0202365C .public sub_0202366C diff --git a/asm/include/overlay_91.inc b/asm/include/overlay_91.inc index e7d6b401f5..f6756dda07 100644 --- a/asm/include/overlay_91.inc +++ b/asm/include/overlay_91.inc @@ -124,15 +124,15 @@ .public GX_SetBanks .public GX_EngineAToggleLayers .public GX_EngineBToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetBindTarget -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_SetAngle -.public GF_Camera_GetAngle +.public Camera_SetBindTarget +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_SetAngle +.public Camera_GetAngle .public sub_02024504 .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_92.inc b/asm/include/overlay_92.inc index 071f6fdbd0..3ae7ee628f 100644 --- a/asm/include/overlay_92.inc +++ b/asm/include/overlay_92.inc @@ -129,11 +129,11 @@ .public GX_EngineAToggleLayers .public GX_EngineBToggleLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_02023308 .public sub_02025364 .public sub_0202539C diff --git a/asm/include/overlay_93_thumb_1.inc b/asm/include/overlay_93_thumb_1.inc index e6e227406d..76fc49bea4 100644 --- a/asm/include/overlay_93_thumb_1.inc +++ b/asm/include/overlay_93_thumb_1.inc @@ -130,12 +130,12 @@ .public GX_EngineBToggleLayers .public GX_BothDispOn .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_020233D8 .public GF_AssertFail .public String_ctor diff --git a/asm/include/overlay_95.inc b/asm/include/overlay_95.inc index 3828245c6d..9db653adf3 100644 --- a/asm/include/overlay_95.inc +++ b/asm/include/overlay_95.inc @@ -135,7 +135,7 @@ .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers .public GX_BothDispOn -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_02024B34 .public sub_02025224 .public GF_AssertFail diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index 5989e7ad9d..c666e14ad6 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -233,14 +233,14 @@ .public GX_DisableEngineBLayers .public GX_EngineBToggleLayers .public GX_SwapDisplay -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023154 -.public GF_Camera_SetBindTarget -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle -.public GF_Camera_ShiftBy +.public Camera_SetBindTarget +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle +.public Camera_ShiftBy .public sub_02024504 .public sub_0202457C .public CreateSprite diff --git a/asm/include/unk_02014DA0.inc b/asm/include/unk_02014DA0.inc index f9bed5e75d..a498e84160 100644 --- a/asm/include/unk_02014DA0.inc +++ b/asm/include/unk_02014DA0.inc @@ -49,12 +49,12 @@ .public FreeToHeap .public CopyWindowPixelsToVram_TextMode .public AddTextPrinterParameterized2 -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 .public sub_02023154 -.public GF_Camera_SetBindTarget +.public Camera_SetBindTarget .public sub_02023308 .public sub_020233D8 .public GF_AssertFail diff --git a/asm/include/unk_02022D74.inc b/asm/include/unk_02022D74.inc index d601071579..944bffefea 100644 --- a/asm/include/unk_02022D74.inc +++ b/asm/include/unk_02022D74.inc @@ -5,38 +5,38 @@ .public sub_02020C64 .public sub_02023068 .public sub_020230F8 -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 .public sub_02023128 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023148 .public sub_02023154 -.public GF_Camera_SetBindTarget +.public Camera_SetBindTarget .public sub_02023214 .public sub_02023234 -.public GF_Camera_SetClipBounds -.public GF_Camera_InitFromTargetDistanceAndAngle +.public Camera_SetClipBounds +.public Camera_InitFromTargetDistanceAndAngle .public sub_020232BC .public sub_02023308 .public sub_020233D8 -.public GF_Camera_SetPerspectiveAngle +.public Camera_SetPerspectiveAngle .public sub_020234D0 -.public GF_Camera_ShiftBy +.public Camera_ShiftBy .public sub_02023534 -.public GF_Camera_SetAngle +.public Camera_SetAngle .public sub_0202357C .public sub_020235A8 -.public GF_Camera_SetDistance +.public Camera_SetDistance .public sub_020235E0 .public sub_020235FC -.public GF_Camera_GetPerspectiveAngle -.public GF_Camera_GetDistance -.public GF_Camera_GetAngle -.public GF_Camera_GetTarget +.public Camera_GetPerspectiveAngle +.public Camera_GetDistance +.public Camera_GetAngle +.public Camera_GetTarget .public sub_02023640 .public sub_02023650 .public sub_02023654 -.public GF_Camera_GetBindTarget +.public Camera_GetBindTarget .public sub_0202365C .public sub_0202366C .public sub_0202367C diff --git a/asm/include/unk_02056680.inc b/asm/include/unk_02056680.inc index 9b5514fd00..541c4e46ec 100644 --- a/asm/include/unk_02056680.inc +++ b/asm/include/unk_02056680.inc @@ -4,10 +4,10 @@ .public AllocFromHeapAtEnd .public FreeToHeap .public sub_02023214 -.public GF_Camera_ShiftBy +.public Camera_ShiftBy .public sub_020235E0 -.public GF_Camera_GetTarget -.public GF_Camera_GetBindTarget +.public Camera_GetTarget +.public Camera_GetBindTarget .public GF_AssertFail .public TaskManager_Call .public CallApplicationAsTask diff --git a/asm/include/unk_020773AC.inc b/asm/include/unk_020773AC.inc index 0edfc6fc25..92cddc5c9d 100644 --- a/asm/include/unk_020773AC.inc +++ b/asm/include/unk_020773AC.inc @@ -19,7 +19,7 @@ .public GX_DisableEngineALayers .public GX_EngineAToggleLayers .public GX_DisableEngineBLayers -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public GF_AssertFail .public Thunk_G3X_Reset .public sub_02026E50 diff --git a/asm/include/unk_0208DE40.inc b/asm/include/unk_0208DE40.inc index 9a5f9394e9..79c86590eb 100644 --- a/asm/include/unk_0208DE40.inc +++ b/asm/include/unk_0208DE40.inc @@ -9,11 +9,11 @@ .public sub_02016F2C .public sub_02017088 .public GX_EngineAToggleLayers -.public GF_Camera_Create +.public Camera_Create .public sub_02023120 -.public GF_Camera_RegisterToStaticPtr +.public Camera_RegisterToStaticPtr .public sub_02023234 -.public GF_Camera_SetClipBounds +.public Camera_SetClipBounds .public sub_020232BC .public sub_02025224 .public GetPokemonSpriteCharAndPlttNarcIds diff --git a/asm/overlay_01_021E5900.s b/asm/overlay_01_021E5900.s index b7f1183688..23f428dbb6 100644 --- a/asm/overlay_01_021E5900.s +++ b/asm/overlay_01_021E5900.s @@ -1083,7 +1083,7 @@ ov01_021E6220: ; 0x021E6220 bl ov01_021F3C9C ldr r1, [r4, #0x24] add r0, sp, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r2, sp, #0 ldrh r2, [r2] mov r0, #0x47 diff --git a/asm/overlay_01_021E90C0.s b/asm/overlay_01_021E90C0.s index 4f19bdccd4..943f89f6aa 100644 --- a/asm/overlay_01_021E90C0.s +++ b/asm/overlay_01_021E90C0.s @@ -309,7 +309,7 @@ _021E9308: ldr r1, _021E936C ; =0x00456000 ldr r2, [r6, #0x24] lsl r0, r0, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r1, [r6, #0x24] mov r0, #4 bl CreateCameraTranslationWrapper @@ -492,7 +492,7 @@ _021E9476: pop {r3, r4, r5, r6, r7, pc} _021E9486: ldr r0, [r4, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle strh r0, [r6, #0xe] ldr r1, [sp, #0x20] add r0, r4, #0 @@ -605,7 +605,7 @@ _021E9572: cmp r0, #0 beq _021E95B0 ldr r0, [r4, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle ldrh r1, [r6, #0xe] cmp r1, r0 bne _021E95B0 @@ -659,7 +659,7 @@ ov01_021E95CC: ; 0x021E95CC lsr r4, r0, #0x18 _021E95EC: add r0, r6, #0 - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle sub r0, r0, r4 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -699,7 +699,7 @@ _021E962E: mov r4, #0x10 _021E9630: add r0, r6, #0 - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r0, r0, r4 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -1517,7 +1517,7 @@ _021E9C7A: str r0, [r6, #0x10] strb r0, [r6, #0xd] ldr r0, [r4, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle strh r0, [r6, #0xe] ldr r0, _021E9EE4 ; =0x0000FFA0 ldr r1, [r4, #0x24] @@ -1682,7 +1682,7 @@ _021E9DEA: cmp r0, #0 beq _021E9ECC ldr r0, [r4, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle ldrh r1, [r6, #0xe] cmp r1, r0 bne _021E9ECC @@ -1764,7 +1764,7 @@ _021E9E9C: cmp r0, #0 beq _021E9ECC ldr r0, [r4, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle ldrh r1, [r6, #0xe] cmp r1, r0 bne _021E9ECC @@ -1974,7 +1974,7 @@ _021EA052: str r0, [r4, #4] strb r0, [r4, #1] ldr r0, [r5, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle strh r0, [r4, #2] ldr r0, _021EA124 ; =0x0000FFA0 ldr r1, [r5, #0x24] @@ -2052,7 +2052,7 @@ _021EA0F0: cmp r0, #0 beq _021EA110 ldr r0, [r5, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle ldrh r1, [r4, #2] cmp r1, r0 bne _021EA110 diff --git a/asm/overlay_01_021EABA8.s b/asm/overlay_01_021EABA8.s index 049f7d547e..618c4717d5 100644 --- a/asm/overlay_01_021EABA8.s +++ b/asm/overlay_01_021EABA8.s @@ -31,7 +31,7 @@ ov01_021EABA8: ; 0x021EABA8 bl GF_AssertFail _021EABC4: mov r0, #4 - bl GF_Camera_Create + bl Camera_Create str r0, [r5, #0x24] ldrh r0, [r4, #0xc] add r2, r4, #4 @@ -45,17 +45,17 @@ _021EABC4: ldrh r3, [r4, #0xe] ldr r0, [sp, #0xc] ldr r1, [r4] - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r0, [r5, #0x24] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr ldr r0, [r4, #0x10] ldr r1, [r4, #0x14] ldr r2, [r5, #0x24] - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add r4, #0x18 ldr r1, [r5, #0x24] add r0, r4, #0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy cmp r7, #0 beq _021EAC16 ldr r0, [r5, #0x24] @@ -143,10 +143,10 @@ ov01_021EAC6C: ; 0x021EAC6C strh r3, [r1] strb r2, [r4, #7] ldr r1, [r4] - bl GF_Camera_SetAngle + bl Camera_SetAngle ldr r1, [r4] add r0, r5, #4 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy _021EACAE: add sp, #8 pop {r3, r4, r5, pc} @@ -403,7 +403,7 @@ _021EAE92: strh r1, [r0] add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #8 pop {r3, r4, r5, pc} thumb_func_end ov01_021EAE50 @@ -433,7 +433,7 @@ ov01_021EAEA4: ; 0x021EAEA4 str r0, [sp, #8] add r0, sp, #0 add r1, r7, #0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_01_021EB1E8.s b/asm/overlay_01_021EB1E8.s index a699020be0..77ddde139f 100644 --- a/asm/overlay_01_021EB1E8.s +++ b/asm/overlay_01_021EB1E8.s @@ -2382,14 +2382,14 @@ ov01_021EC31C: ; 0x021EC31C lsl r0, r0, #2 ldr r0, [r1, r0] ldr r0, [r0, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle str r0, [sp, #0xc] mov r0, #0x41 ldr r1, [r5] lsl r0, r0, #2 ldr r0, [r1, r0] ldr r0, [r0, #0x24] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 add r0, sp, #0x10 str r0, [sp] diff --git a/asm/overlay_01_021EFB38.s b/asm/overlay_01_021EFB38.s index a174867ee4..d7d4cf825b 100644 --- a/asm/overlay_01_021EFB38.s +++ b/asm/overlay_01_021EFB38.s @@ -2747,7 +2747,7 @@ _021F0F64: mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r2, #0 add r0, r5, #0 add r1, r4, #0 diff --git a/asm/overlay_01_021FCD2C.s b/asm/overlay_01_021FCD2C.s index 6d958202dc..ada13bc5bb 100644 --- a/asm/overlay_01_021FCD2C.s +++ b/asm/overlay_01_021FCD2C.s @@ -32,7 +32,7 @@ ov01_021FCD2C: ; 0x021FCD2C str r5, [r4, #0x2c] ldr r0, [r5, #0x24] str r0, [r4, #0x30] - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [r4, #0x10] str r0, [r4, #0x20] ldr r0, _021FCD64 ; =ov01_021FCDA8 @@ -170,13 +170,13 @@ _021FCE2A: thumb_func_start ov01_021FCE34 ov01_021FCE34: ; 0x021FCE34 - ldr r3, _021FCE40 ; =GF_Camera_SetDistance + ldr r3, _021FCE40 ; =Camera_SetDistance add r1, r0, #0 ldr r0, [r1, #0x20] ldr r1, [r1, #0x30] bx r3 nop -_021FCE40: .word GF_Camera_SetDistance +_021FCE40: .word Camera_SetDistance thumb_func_end ov01_021FCE34 thumb_func_start ov01_021FCE44 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index fce7e1307f..42841a529a 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -1246,7 +1246,7 @@ ov02_0224650C: ; 0x0224650C str r6, [r4] add r0, r6, #0 str r5, [r4, #4] - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #0x18] add r0, r4, #0 pop {r4, r5, r6, pc} @@ -1342,7 +1342,7 @@ _022465D8: bl sub_02023128 ldr r1, [r5, #0x18] add r0, sp, #0 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r4, sp, #0 add r3, r5, #0 add r3, #0x20 @@ -1362,7 +1362,7 @@ _022465D8: add r0, r2, #0 bl sub_02023214 ldr r0, [r5, #0x18] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -1377,7 +1377,7 @@ ov02_0224662C: ; 0x0224662C ldr r0, [r0, #0x24] bx r3 .balign 4, 0 -_02246638: .word GF_Camera_RegisterToStaticPtr +_02246638: .word Camera_RegisterToStaticPtr thumb_func_end ov02_0224662C thumb_func_start ov02_0224663C @@ -16782,7 +16782,7 @@ ov02_0224D9C0: ; 0x0224D9C0 bl ov02_0224D044 ldr r1, [r5, #0x24] add r0, sp, #0x10 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #0x10 add r2, r4, #0 ldmia r3!, {r0, r1} @@ -16898,7 +16898,7 @@ ov02_0224DAA4: ; 0x0224DAA4 bl ov02_0224CFD8 ldr r1, [r5, #0x24] add r0, sp, #0x10 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #0x10 add r2, r4, #0 ldmia r3!, {r0, r1} @@ -17039,7 +17039,7 @@ _0224DBB0: add r0, #0xe5 ldr r1, [r5, #0x24] add r0, r4, r0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy b _0224DC1C _0224DBF4: add r0, r4, #0 @@ -23205,7 +23205,7 @@ ov02_02250A60: ; 0x02250A60 str r0, [r4, #0x24] ldr r1, [r5, #0x24] add r0, sp, #0xc - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #0xc add r2, r4, #0 ldmia r3!, {r0, r1} @@ -24440,41 +24440,41 @@ _02251440: ldr r0, [r4, r0] ldr r1, [r5, #0x24] ldr r0, [r0, r6] - bl GF_Camera_SetDistance + bl Camera_SetDistance mov r0, #0x4b lsl r0, r0, #4 ldr r0, [r4, r0] ldr r1, [r5, #0x24] add r0, r0, r6 add r0, r0, #4 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #0x4b lsl r0, r0, #4 ldr r0, [r4, r0] ldr r1, [r5, #0x24] add r0, r0, r6 ldrh r0, [r0, #0xe] - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle ldr r0, _022514C0 ; =0x000004B4 ldr r1, [r4, r0] mov r0, #0xc mul r0, r7 add r0, r1, r0 ldr r1, [r5, #0x24] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy mov r0, #0x96 ldr r1, _022514C4 ; =0x006A4000 ldr r2, [r5, #0x24] lsl r0, r0, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r1, [r5, #0x24] add r0, sp, #8 - bl GF_Camera_GetTarget + bl Camera_GetTarget ldr r0, [r5, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget ldr r1, [r5, #0x24] add r0, sp, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -24585,12 +24585,12 @@ ov02_02251568: ; 0x02251568 beq _0225159C ldr r1, [r4, #0x24] add r0, sp, #8 - bl GF_Camera_GetTarget + bl Camera_GetTarget ldr r0, [r4, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget ldr r1, [r4, #0x24] add r0, sp, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add sp, #0x14 mov r0, #1 pop {r3, r4, pc} @@ -25521,11 +25521,11 @@ ov02_02251CF0: ; 0x02251CF0 pop {r3, r4, r5, pc} _02251D1A: ldr r0, [r5, #0x24] - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [r4] ldr r1, [r5, #0x24] add r0, sp, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4, #4] @@ -25537,7 +25537,7 @@ _02251D1A: strh r0, [r4, #0xa] ldr r1, [r5, #0x24] add r0, sp, #8 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #8 ldmia r3!, {r0, r1} add r2, sp, #0x14 @@ -25545,14 +25545,14 @@ _02251D1A: ldr r0, [r3] str r0, [r2] ldr r0, [r5, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget add r2, r4, #0 add r1, r0, #0 add r0, sp, #0x14 add r2, #0xc bl VEC_Subtract ldr r0, [r5, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle strh r0, [r4, #0x18] ldr r0, [r5, #0x24] bl sub_02023654 @@ -25562,21 +25562,21 @@ _02251D1A: str r0, [r4, #0x20] ldr r0, _02251DB0 ; =0x0029AEC1 ldr r1, [r5, #0x24] - bl GF_Camera_SetDistance + bl Camera_SetDistance ldr r0, _02251DB4 ; =ov02_02253C74 ldr r1, [r5, #0x24] - bl GF_Camera_SetAngle + bl Camera_SetAngle ldr r0, _02251DB8 ; =0x000005C1 ldr r1, [r5, #0x24] - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle ldr r0, _02251DBC ; =ov02_02253BC4 ldr r1, [r5, #0x24] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy mov r0, #0x96 ldr r1, _02251DC0 ; =0x006A4000 ldr r2, [r5, #0x24] lsl r0, r0, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add sp, #0x20 pop {r3, r4, r5, pc} nop @@ -25672,7 +25672,7 @@ ov02_02251E44: ; 0x02251E44 ldr r0, [r5, #0x1c] ldr r1, [r5, #0x20] ldr r2, [r4, #0x24] - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r0, #1 pop {r4, r5, r6, pc} _02251E70: @@ -26805,7 +26805,7 @@ _02252716: str r0, [r2] ldr r0, [r4, #8] ldr r0, [r0, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r1, sp, #0 strh r0, [r1, #8] add r0, r4, #0 @@ -26854,7 +26854,7 @@ ov02_02252764: ; 0x02252764 strh r1, [r0] ldr r0, [r5, #8] ldr r0, [r0, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r1, r5, #0 add r1, #0xea strh r0, [r1] @@ -26943,11 +26943,11 @@ ov02_022527B0: ; 0x022527B0 bl MTX_MultVec33 ldr r1, [sp] add r0, sp, #0x34 - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget lsl r0, r4, #0x10 ldr r1, [sp] lsr r0, r0, #0x10 - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle add r0, r5, #0 add r0, #0xe6 add r5, #0xe8 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 18d1a5b473..d93d0f447b 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -6361,7 +6361,7 @@ ov03_022570D4: ; 0x022570D4 add r0, r4, #0 bl ov03_02257134 mov r0, #0xb - bl GF_Camera_Create + bl Camera_Create add r1, r4, #0 add r1, #0x90 str r0, [r1] @@ -6373,7 +6373,7 @@ ov03_022570D4: ; 0x022570D4 add r0, r4, #0 add r0, #0x90 ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr ldr r0, _02257130 ; =0x00000281 mov r1, #0 strb r1, [r4, r0] @@ -8483,7 +8483,7 @@ _0225818C: ldr r0, [r0] bl sub_02023120 ldr r0, [r5, #0x24] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add r0, r4, #0 bl ov03_02258288 mov r0, #0x1b diff --git a/asm/overlay_04.s b/asm/overlay_04.s index deae759319..a08cab0749 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -1661,7 +1661,7 @@ _02254B76: cmp r3, #0 bne _02254BB0 ldr r1, [r5, #0x24] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy ldr r0, [r4, #0x44] add r0, r0, #1 str r0, [r4, #0x44] @@ -4495,7 +4495,7 @@ _02256102: ; jump table _02256110: ldr r1, [r6, #0x24] add r0, sp, #0xc - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #4 ldrh r1, [r0, #8] strh r1, [r0, #0x18] @@ -4509,7 +4509,7 @@ _02256110: add r0, sp, #0x44 strh r1, [r0] ldr r0, [r6, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r1, sp, #0x44 ldr r3, _02256274 ; =ov04_02257660 strh r0, [r1, #2] @@ -4519,7 +4519,7 @@ _02256110: ldr r0, [r3] str r0, [r2] ldr r0, [r6, #0x24] - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [sp, #0x54] ldr r1, [r6, #0x24] mov r0, #4 @@ -4598,7 +4598,7 @@ _022561E8: str r0, [r1, #8] ldr r1, [r6, #0x24] add r0, sp, #4 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #4 ldrh r1, [r0] strh r1, [r0, #0x10] @@ -4611,7 +4611,7 @@ _022561E8: ldrh r1, [r0, #0x10] strh r1, [r0, #0x2c] ldr r0, [r6, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r1, sp, #4 add r3, sp, #0x24 strh r0, [r1, #0x2e] @@ -4621,7 +4621,7 @@ _022561E8: ldr r0, [r3] str r0, [r2] ldr r0, [r6, #0x24] - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [sp, #0x40] ldr r1, [r6, #0x24] mov r0, #4 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index a6bb6d32af..e82b0a2008 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -4014,7 +4014,7 @@ ov05_0221D9F0: ; 0x0221D9F0 mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r2, [r4] mov r0, #0x3b ldr r2, [r2, #0x24] diff --git a/asm/overlay_07.s b/asm/overlay_07.s index 1dd8f8820c..a8efbaa8c3 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -9083,10 +9083,10 @@ _0221FFE6: add r4, r0, #0 add r0, sp, #8 add r1, r4, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #8 add r1, r4, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #0x34 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -12984,7 +12984,7 @@ ov07_02221CEC: ; 0x02221CEC bl sub_02015524 add r1, r0, #0 add r0, sp, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #8 pop {r3, pc} @@ -13013,7 +13013,7 @@ ov07_02221D10: ; 0x02221D10 bl sub_02015528 add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #8 pop {r3, r4, r5, pc} @@ -13046,7 +13046,7 @@ ov07_02221D4C: ; 0x02221D4C bl sub_02015524 add r1, r0, #0 add r0, sp, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #0x18 pop {r4, pc} @@ -13075,7 +13075,7 @@ ov07_02221D88: ; 0x02221D88 bl sub_02015528 add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #8 pop {r3, r4, r5, pc} @@ -13118,12 +13118,12 @@ ov07_02221DC4: ; 0x02221DC4 bne _02221E12 add r0, sp, #8 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle b _02221E1A _02221E12: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle _02221E1A: mov r0, #1 add sp, #0x10 @@ -13155,7 +13155,7 @@ ov07_02221E24: ; 0x02221E24 bl sub_02015528 add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #8 pop {r3, r4, r5, pc} @@ -13186,7 +13186,7 @@ ov07_02221E60: ; 0x02221E60 bl sub_02015528 add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle mov r0, #1 add sp, #8 pop {r3, r4, r5, pc} diff --git a/asm/overlay_104.s b/asm/overlay_104.s index 902ae8c95f..32c4f978eb 100644 --- a/asm/overlay_104.s +++ b/asm/overlay_104.s @@ -41,7 +41,7 @@ ov104_021E5900: ; 0x021E5900 mov r1, #0 strb r1, [r4, r0] mov r0, #0x95 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] bl ov104_021E5B88 add r0, r4, #0 @@ -401,7 +401,7 @@ ov104_021E5BEC: ; 0x021E5BEC ldr r1, [r1, r6] add r3, r3, r5 ldrh r3, [r6, r3] - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r0, #0x59 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -413,7 +413,7 @@ ov104_021E5BEC: ; 0x021E5BEC mul r0, r7 add r0, r1, r0 ldr r1, [r4] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy mov r0, #0x59 lsl r0, r0, #2 ldrb r3, [r4, r0] @@ -430,9 +430,9 @@ ov104_021E5BEC: ; 0x021E5BEC ldr r2, [r4] lsl r0, r0, #0xc lsl r1, r1, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_105.s b/asm/overlay_105.s index 18f8e3df40..f16ae9c0b7 100644 --- a/asm/overlay_105.s +++ b/asm/overlay_105.s @@ -38,7 +38,7 @@ ov105_021E5900: ; 0x021E5900 add r0, #0x9e strb r1, [r0] mov r0, #0x97 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] bl ov105_021E5B68 add r0, r4, #0 @@ -386,7 +386,7 @@ ov105_021E5BCC: ; 0x021E5BCC ldr r1, [r1, r6] add r3, r3, r5 ldrh r3, [r6, r3] - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle add r0, r4, #0 add r0, #0x9c ldrb r1, [r0] @@ -398,7 +398,7 @@ ov105_021E5BCC: ; 0x021E5BCC mul r0, r7 add r0, r1, r0 ldr r1, [r4] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add r0, r4, #0 add r0, #0x9c ldrb r0, [r0] @@ -413,9 +413,9 @@ ov105_021E5BCC: ; 0x021E5BCC ldr r2, [r4] lsl r0, r0, #0xc lsl r1, r1, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_106.s b/asm/overlay_106.s index 23d4430b18..ee6dbe9529 100644 --- a/asm/overlay_106.s +++ b/asm/overlay_106.s @@ -167,13 +167,13 @@ ov106_021E59FC: ; 0x021E59FC ldrh r3, [r4, #0xe] ldr r1, [r4] add r2, r4, #4 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r0, [r4, #0x20] ldr r1, [r4, #0x24] ldr r2, [r5, #0x18] - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r5, #0x18] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov106_021E59FC @@ -615,7 +615,7 @@ ov106_021E5D70: ; 0x021E5D70 sub sp, #8 add r4, r0, #0 mov r0, #0x99 - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #0x18] mov r0, #0x99 bl sub_0201F590 diff --git a/asm/overlay_108.s b/asm/overlay_108.s index 4e099f684a..0af2704868 100644 --- a/asm/overlay_108.s +++ b/asm/overlay_108.s @@ -7011,7 +7011,7 @@ _021E90B0: bl _ffix ldr r1, [sp, #4] ldr r1, [r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -7223,7 +7223,7 @@ ov108_021E9230: ; 0x021E9230 sub sp, #0xc add r4, r0, #0 add r0, r1, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] add r0, r4, #0 mov r1, #0 @@ -7245,18 +7245,18 @@ ov108_021E9230: ; 0x021E9230 ldr r2, _021E9290 ; =ov108_021EA9C4 ldr r3, _021E9294 ; =0x000005C1 add r0, #0xdc - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r0, #0x19 mov r1, #0x4b ldr r2, [r4] lsl r0, r0, #0xe lsl r1, r1, #0x10 - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, _021E9298 ; =ov108_021EA9D8 ldr r1, [r4] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add sp, #0xc pop {r3, r4, pc} nop diff --git a/asm/overlay_116.s b/asm/overlay_116.s index 6b382867b5..a49df8c0db 100644 --- a/asm/overlay_116.s +++ b/asm/overlay_116.s @@ -12,10 +12,10 @@ ov116_0225F020: ; 0x0225F020 add r5, r0, #0 ldrh r0, [r4, #8] ldr r1, [r5, #0x24] - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle ldr r0, [r4] ldr r1, [r5, #0x24] - bl GF_Camera_SetDistance + bl Camera_SetDistance ldrh r1, [r4, #4] add r0, sp, #0 strh r1, [r0] @@ -25,7 +25,7 @@ ov116_0225F020: ; 0x0225F020 strh r1, [r0, #4] ldr r1, [r5, #0x24] add r0, sp, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #8 pop {r3, r4, r5, pc} .balign 4, 0 @@ -292,7 +292,7 @@ _0225F24A: str r0, [r5] ldr r0, [r4, #0x10] ldr r0, [r0, #0x24] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle ldr r2, [r6, #4] add r1, r0, #0 add r5, #8 @@ -315,7 +315,7 @@ _0225F276: lsl r0, r0, #0x10 ldr r1, [r1, #0x24] lsr r0, r0, #0x10 - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle cmp r7, #1 bne _0225F356 ldr r0, [r4] @@ -332,7 +332,7 @@ _0225F2A0: bpl _0225F356 ldr r0, [r4, #0x10] ldr r0, [r0, #0x24] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 ldrb r0, [r6, #2] add r5, #0x1c @@ -355,7 +355,7 @@ _0225F2CE: add r6, r0, #0 ldr r0, [r5, #0x1c] ldr r1, [r1, #0x24] - bl GF_Camera_SetDistance + bl Camera_SetDistance cmp r6, #1 bne _0225F356 ldr r0, [r4] diff --git a/asm/overlay_119.s b/asm/overlay_119.s index 2594b2c7eb..ac4102360e 100644 --- a/asm/overlay_119.s +++ b/asm/overlay_119.s @@ -272,7 +272,7 @@ _0225F1FE: mov r0, #7 lsl r0, r0, #6 ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #6 str r0, [sp] @@ -351,7 +351,7 @@ _0225F28A: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance add r0, r7, #0 bl ov01_021EFE30 cmp r0, #0 @@ -679,7 +679,7 @@ _0225F5A0: mov r0, #0x69 lsl r0, r0, #2 ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #8 str r0, [sp] @@ -705,7 +705,7 @@ _0225F5DA: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance add r0, r6, #0 bl ov01_021EFE30 cmp r0, #1 @@ -1080,7 +1080,7 @@ _0225F8DE: mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #8 str r0, [sp] @@ -1144,7 +1144,7 @@ _0225F95A: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance ldr r0, [sp, #0x18] cmp r0, #1 bne _0225F9F0 @@ -1452,7 +1452,7 @@ _0225FBFE: _0225FC00: sub r0, #0x1c ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #0x10 str r0, [sp] @@ -1693,7 +1693,7 @@ _0225FDFC: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance mov r1, #2 lsl r1, r1, #8 ldr r0, [r4, r1] @@ -2114,7 +2114,7 @@ _0226017E: mov r0, #0x1d lsl r0, r0, #4 ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #8 str r0, [sp] @@ -2152,7 +2152,7 @@ _022601CC: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance bl IsPaletteFadeFinished cmp r0, #0 beq _02260238 @@ -2599,7 +2599,7 @@ _0226056E: mov r0, #0x82 lsl r0, r0, #2 ldr r0, [r4, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 mov r0, #0x40 str r0, [sp] @@ -2637,7 +2637,7 @@ _022605B4: ldr r0, [r4, r1] sub r1, r1, #4 ldr r1, [r4, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance cmp r5, #1 bne _02260688 ldr r0, [sp, #0x18] diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 0e9c231dbd..46857dfe0a 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -8810,7 +8810,7 @@ ov15_021FD93C: ; 0x021FD93C add r1, r0, #0 bl GX_EngineAToggleLayers mov r0, #6 - bl GF_Camera_Create + bl Camera_Create ldr r2, _021FDAAC ; =0x00000818 ldr r4, _021FDAB0 ; =ov15_02200500 str r0, [r5, r2] @@ -8848,7 +8848,7 @@ ov15_021FD93C: ; 0x021FD93C ldr r1, [r5, r1] add r0, r6, #0 add r2, r5, r2 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r0, _021FDABC ; =0x00000934 ldr r3, _021FDAC0 ; =ov15_0220050C add r2, r5, r0 @@ -8874,10 +8874,10 @@ ov15_021FD93C: ; 0x021FD93C ldr r1, _021FDAC8 ; =0x006A4000 ldr r2, [r5, r2] lsl r0, r0, #0xc - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, _021FDAAC ; =0x00000818 ldr r0, [r5, r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r6, #1 ldr r7, _021FDA9C ; =0x00007FFF mov r4, #0 @@ -9205,7 +9205,7 @@ _021FDC94: ldr r1, [r5, r1] add r0, r5, r0 add r2, r5, r2 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle bl Thunk_G3X_Reset bl sub_02023154 ldr r0, _021FDD4C ; =0x0000081C diff --git a/asm/overlay_48.s b/asm/overlay_48.s index 5b59c4f200..aa8d5d2b98 100644 --- a/asm/overlay_48.s +++ b/asm/overlay_48.s @@ -2580,7 +2580,7 @@ ov48_02259BC0: ; 0x02259BC0 sub sp, #8 add r4, r0, #0 add r0, r3, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] mov r3, #0 str r3, [sp] @@ -2594,12 +2594,12 @@ ov48_02259BC0: ; 0x02259BC0 ldr r2, [r4] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r1, [r4] mov r0, #0 bl sub_020233D8 ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr ldr r0, [sp, #0x14] lsl r0, r0, #0x1f lsr r0, r0, #0x1f @@ -2618,7 +2618,7 @@ _02259C16: str r0, [r4, #0xc] ldr r0, [r4, #0xc] ldr r1, [r4] - bl GF_Camera_SetDistance + bl Camera_SetDistance add sp, #8 pop {r4} pop {r3} @@ -2738,7 +2738,7 @@ _02259CE0: _02259CEA: ldr r0, [r2, #0xc] ldr r1, [r2] - bl GF_Camera_SetDistance + bl Camera_SetDistance mov r0, #0 pop {r3, pc} nop diff --git a/asm/overlay_49.s b/asm/overlay_49.s index a118f4c786..52c01639b9 100644 --- a/asm/overlay_49.s +++ b/asm/overlay_49.s @@ -9134,7 +9134,7 @@ _0225CB8C: sub r1, r1, #1 bne _0225CB8C add r0, r5, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] mov r0, #0 str r0, [sp] @@ -9147,15 +9147,15 @@ _0225CB8C: ldr r2, _0225CBD4 ; =ov49_02269A6C ldr r3, _0225CBD8 ; =0x000005C1 add r0, #8 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r0, #0x96 mov r1, #0xe1 ldr r2, [r4] lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add r0, r4, #0 add sp, #0xc pop {r4, r5, pc} diff --git a/asm/overlay_59.s b/asm/overlay_59.s index 4b471fd8af..e160ada2f0 100644 --- a/asm/overlay_59.s +++ b/asm/overlay_59.s @@ -9318,7 +9318,7 @@ ov59_0223C53C: ; 0x0223C53C mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds _0223C574: add r0, r4, #0 add sp, #8 @@ -9381,7 +9381,7 @@ ov59_0223C5C4: ; 0x0223C5C4 strh r0, [r1, #4] strh r0, [r1, #6] add r0, r2, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #8] mov r1, #1 str r1, [sp] @@ -9396,11 +9396,11 @@ ov59_0223C5C4: ; 0x0223C5C4 ldr r2, [r4, #8] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r4, #8] bl sub_02023234 ldr r0, [r4, #8] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x1c pop {r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_60.s b/asm/overlay_60.s index 7ecd79fa30..6c12884051 100644 --- a/asm/overlay_60.s +++ b/asm/overlay_60.s @@ -1245,7 +1245,7 @@ _021E62C0: sub r0, #0x20 str r1, [r5, r0] add r0, r4, #0 - bl GF_Camera_Create + bl Camera_Create add r1, r5, #0 add r1, #0xb8 str r0, [r1] @@ -1269,7 +1269,7 @@ _021E62C0: ldr r2, [r2] mov r0, #0 lsl r1, r1, #0xa - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add r1, r5, #0 add r1, #0xb8 ldr r1, [r1] @@ -1278,7 +1278,7 @@ _021E62C0: add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r3, #0x77 lsl r3, r3, #2 add r2, r3, #2 @@ -8180,7 +8180,7 @@ _021E9A6A: ldr r0, [sp, #0x18] bl NARC_dtor mov r0, #0x4a - bl GF_Camera_Create + bl Camera_Create ldr r1, [sp, #0xc] add r3, sp, #0x2c add r1, #0x80 @@ -8202,17 +8202,17 @@ _021E9A6A: str r0, [sp, #8] add r0, r2, #0 ldr r2, _021E9B58 ; =_021EB29C - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle ldr r1, [sp, #0xc] ldr r0, _021E9B5C ; =0x00000981 add r1, #0x80 ldr r1, [r1] - bl GF_Camera_SetPerspectiveAngle + bl Camera_SetPerspectiveAngle ldr r0, [sp, #0xc] add r0, #0x80 str r0, [sp, #0xc] ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r0, #0x1f str r0, [sp] mov r0, #2 @@ -8577,7 +8577,7 @@ ov60_021E9D78: ; 0x021E9D78 mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r0, #0x3b mov r1, #4 mov r2, #0x4a diff --git a/asm/overlay_63.s b/asm/overlay_63.s index be8514317c..f62ff46bca 100644 --- a/asm/overlay_63.s +++ b/asm/overlay_63.s @@ -6214,7 +6214,7 @@ ov63_0221F130: ; 0x0221F130 sub sp, #0x18 add r4, r0, #0 mov r0, #0x3e - bl GF_Camera_Create + bl Camera_Create add r1, r4, #0 add r1, #0xe0 str r0, [r1] @@ -6251,7 +6251,7 @@ ov63_0221F130: ; 0x0221F130 add r0, #0xe4 lsl r1, r1, #0xc add r2, #0xf0 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r1, #0 mov r0, #1 lsl r0, r0, #0xc @@ -6262,18 +6262,18 @@ ov63_0221F130: ; 0x0221F130 add r1, #0xe0 ldr r1, [r1] add r0, sp, #0xc - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget add r0, r4, #0 add r0, #0xe0 ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add r4, #0xe0 mov r0, #1 mov r1, #0x7d ldr r2, [r4] lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add sp, #0x18 pop {r4, pc} nop diff --git a/asm/overlay_68.s b/asm/overlay_68.s index 8cab50fad1..76b58c26c3 100644 --- a/asm/overlay_68.s +++ b/asm/overlay_68.s @@ -3113,7 +3113,7 @@ ov68_021E71C4: ; 0x021E71C4 strh r0, [r1, #4] strh r0, [r1, #6] add r0, r2, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r4] mov r1, #1 str r1, [sp] @@ -3128,11 +3128,11 @@ ov68_021E71C4: ; 0x021E71C4 ldr r2, [r4] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r4] bl sub_02023234 ldr r0, [r4] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x1c pop {r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_69.s b/asm/overlay_69.s index 7640150d86..4875442423 100644 --- a/asm/overlay_69.s +++ b/asm/overlay_69.s @@ -90,7 +90,7 @@ _021E5960: ldr r1, _021E5A28 ; =0x0000C080 str r0, [r5, r1] ldr r0, [r5] - bl GF_Camera_Create + bl Camera_Create ldr r1, _021E5A2C ; =0x0000C2DC str r0, [r5, r1] mov r0, #0 @@ -2785,14 +2785,14 @@ ov69_021E6FE8: ; 0x021E6FE8 ldr r2, [r4, r2] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r1, _021E7060 ; =0x0000C2DC mov r0, #0 ldr r1, [r4, r1] bl sub_020233D8 ldr r0, _021E7060 ; =0x0000C2DC ldr r0, [r4, r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr ldr r0, _021E7068 ; =0x0000C304 ldrh r1, [r4, r0] cmp r1, #0 @@ -3239,7 +3239,7 @@ ov69_021E737C: ; 0x021E737C add r5, r0, #0 ldr r0, _021E7400 ; =0x0000C2DC ldr r0, [r5, r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance ldr r1, _021E7404 ; =0x0000C2E8 mov r4, #0 ldrh r2, [r5, r1] @@ -3300,7 +3300,7 @@ _021E73EE: _021E73F4: ldr r1, _021E7400 ; =0x0000C2DC ldr r1, [r5, r1] - bl GF_Camera_SetDistance + bl Camera_SetDistance add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_71.s b/asm/overlay_71.s index 2ead4fb195..3bc4e022df 100644 --- a/asm/overlay_71.s +++ b/asm/overlay_71.s @@ -1979,13 +1979,13 @@ ov71_022477EC: ; 0x022477EC thumb_func_start ov71_0224780C ov71_0224780C: ; 0x0224780C - ldr r3, _02247818 ; =GF_Camera_SetAngle + ldr r3, _02247818 ; =Camera_SetAngle add r2, r0, #0 add r0, r1, #0 ldr r1, [r2] bx r3 nop -_02247818: .word GF_Camera_SetAngle +_02247818: .word Camera_SetAngle thumb_func_end ov71_0224780C thumb_func_start ov71_0224781C @@ -2012,13 +2012,13 @@ _02247838: .word sub_020233D8 thumb_func_start ov71_0224783C ov71_0224783C: ; 0x0224783C - ldr r3, _02247848 ; =GF_Camera_SetPerspectiveAngle + ldr r3, _02247848 ; =Camera_SetPerspectiveAngle add r2, r0, #0 add r0, r1, #0 ldr r1, [r2] bx r3 nop -_02247848: .word GF_Camera_SetPerspectiveAngle +_02247848: .word Camera_SetPerspectiveAngle thumb_func_end ov71_0224783C thumb_func_start ov71_0224784C @@ -2030,7 +2030,7 @@ ov71_0224784C: ; 0x0224784C add r4, r1, #0 add r6, r2, #0 add r7, r3, #0 - bl GF_Camera_Create + bl Camera_Create str r0, [r5] str r4, [r5, #4] str r6, [r5, #8] @@ -2050,7 +2050,7 @@ ov71_0224784C: ; 0x0224784C add r0, r5, #4 lsl r1, r1, #0xe add r2, #0x10 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r1, #0 mov r0, #1 lsl r0, r0, #0xc @@ -2059,14 +2059,14 @@ ov71_0224784C: ; 0x0224784C str r1, [sp, #0x14] ldr r1, [r5] add r0, sp, #0xc - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget ldr r0, [r5] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r1, #0xfa ldr r2, [r5] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_80_02239960.s b/asm/overlay_80_02239960.s index f7bd60bf5e..31c3a71798 100644 --- a/asm/overlay_80_02239960.s +++ b/asm/overlay_80_02239960.s @@ -77,7 +77,7 @@ _022399BA: mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r1, [sp, #8] add r0, r4, #0 bl sub_02015528 diff --git a/asm/overlay_85.s b/asm/overlay_85.s index 629b240a95..3e2f75f8d1 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -3508,7 +3508,7 @@ ov85_021E7424: ; 0x021E7424 ldr r0, _021E748C ; =0x00000D0C add r4, r5, r0 mov r0, #0x66 - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #0x1c] mov r2, #0 str r2, [r4, #8] @@ -3536,7 +3536,7 @@ ov85_021E7424: ; 0x021E7424 add r0, #8 add r2, #0x14 lsr r3, r3, #0x10 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r1, #0 mov r0, #1 lsl r0, r0, #0xc @@ -3545,9 +3545,9 @@ ov85_021E7424: ; 0x021E7424 str r1, [sp, #0x14] ldr r1, [r4, #0x1c] add r0, sp, #0xc - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget ldr r0, [r4, #0x1c] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x18 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_89.s b/asm/overlay_89.s index 62c6ec403b..ef637f8573 100644 --- a/asm/overlay_89.s +++ b/asm/overlay_89.s @@ -2218,7 +2218,7 @@ ov89_02259B00: ; 0x02259B00 ldr r0, [r3] str r0, [r2] mov r0, #0x7d - bl GF_Camera_Create + bl Camera_Create add r1, r5, #0 add r1, #0xcc str r0, [r1] @@ -2234,7 +2234,7 @@ ov89_02259B00: ; 0x02259B00 ldr r3, _02259B98 ; =0x00000FA4 add r0, sp, #0x14 lsl r1, r1, #0xe - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle add r2, r5, #0 add r2, #0xcc mov r0, #1 @@ -2242,20 +2242,20 @@ ov89_02259B00: ; 0x02259B00 ldr r2, [r2] lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl GF_Camera_GetPerspectiveAngle + bl Camera_GetPerspectiveAngle add r4, r0, #0 add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl GF_Camera_GetDistance + bl Camera_GetDistance add r1, r0, #0 add r0, sp, #0xc str r0, [sp] @@ -2361,7 +2361,7 @@ ov89_02259C0C: ; 0x02259C0C add r0, r4, #0 add r0, #0xcc ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add r1, r4, #0 add r1, #0xcc ldr r1, [r1] @@ -7070,7 +7070,7 @@ _0225BF4C: ; jump table .short _0225BFA4 - _0225BF4C - 2 ; case 3 _0225BF54: add r0, r5, #0 - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [r4] ldrb r0, [r4, #6] add r0, r0, #1 @@ -7120,14 +7120,14 @@ _0225BFA4: cmp r0, #6 bge _0225BFC6 add r0, r5, #0 - bl GF_Camera_GetDistance + bl Camera_GetDistance ldr r1, [r4] cmp r0, r1 blt _0225BFD2 _0225BFC6: ldr r0, [r4] add r1, r5, #0 - bl GF_Camera_SetDistance + bl Camera_SetDistance mov r0, #1 pop {r3, r4, r5, pc} _0225BFD2: @@ -7225,7 +7225,7 @@ _0225C054: _0225C078: add r0, r5, #0 add r1, r4, #0 - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget b _0225C086 _0225C082: mov r0, #1 @@ -7267,7 +7267,7 @@ _0225C0B8: ; jump table _0225C0C0: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4] @@ -7338,7 +7338,7 @@ _0225C130: blt _0225C15E add r0, r4, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #0x10 mov r0, #1 pop {r3, r4, r5, pc} @@ -7380,7 +7380,7 @@ _0225C190: ; jump table _0225C198: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4] @@ -7451,7 +7451,7 @@ _0225C208: bgt _0225C236 add r0, r4, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #0x10 mov r0, #1 pop {r3, r4, r5, pc} @@ -7493,7 +7493,7 @@ _0225C268: ; jump table _0225C270: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4] @@ -7563,7 +7563,7 @@ _0225C2DE: bgt _0225C30C add r0, r4, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #0x10 mov r0, #1 pop {r3, r4, r5, pc} @@ -7598,7 +7598,7 @@ ov89_0225C31C: ; 0x0225C31C _0225C33E: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4] @@ -7704,7 +7704,7 @@ _0225C402: ; jump table .short _0225C45A - _0225C402 - 2 ; case 3 _0225C40A: add r0, r5, #0 - bl GF_Camera_GetDistance + bl Camera_GetDistance str r0, [r4] ldrb r0, [r4, #6] add r0, r0, #1 @@ -7754,14 +7754,14 @@ _0225C45A: cmp r0, #6 bge _0225C47C add r0, r5, #0 - bl GF_Camera_GetDistance + bl Camera_GetDistance ldr r1, [r4] cmp r0, r1 bgt _0225C488 _0225C47C: ldr r0, [r4] add r1, r5, #0 - bl GF_Camera_SetDistance + bl Camera_SetDistance mov r0, #1 pop {r3, r4, r5, pc} _0225C488: @@ -7804,7 +7804,7 @@ _0225C4B8: add r1, r5, #0 str r0, [r2] add r0, sp, #0 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #0 ldmia r3!, {r0, r1} add r2, r4, #0 @@ -7868,7 +7868,7 @@ _0225C520: bl sub_0202366C add r0, sp, #0x18 add r1, r5, #0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy b _0225C564 _0225C55E: add sp, #0x24 @@ -7913,7 +7913,7 @@ _0225C590: add r1, r5, #0 str r0, [r2] add r0, sp, #0 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r3, sp, #0 ldmia r3!, {r0, r1} add r2, r4, #0 @@ -7977,7 +7977,7 @@ _0225C5F8: bl sub_0202366C add r0, sp, #0x18 add r1, r5, #0 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy b _0225C63C _0225C636: add sp, #0x24 @@ -8021,7 +8021,7 @@ _0225C670: ; jump table _0225C678: add r0, sp, #0 add r1, r5, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 ldrh r1, [r0] strh r1, [r4] @@ -8091,7 +8091,7 @@ _0225C6E6: blt _0225C714 add r0, r4, #0 add r1, r5, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #0x10 mov r0, #1 pop {r3, r4, r5, pc} diff --git a/asm/overlay_91.s b/asm/overlay_91.s index cd206a08a7..61ec3ff694 100644 --- a/asm/overlay_91.s +++ b/asm/overlay_91.s @@ -7301,7 +7301,7 @@ ov91_0225FD2C: ; 0x0225FD2C add r0, r3, #0 add r4, r1, #0 add r6, r2, #0 - bl GF_Camera_Create + bl Camera_Create mov r1, #0x19 lsl r1, r1, #4 str r0, [r5, r1] @@ -7334,7 +7334,7 @@ ov91_0225FD2C: ; 0x0225FD2C ldr r1, _0225FDC4 ; =0x001D9000 add r0, r5, r0 add r2, sp, #0xc - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r1, #0 mov r0, #1 lsl r0, r0, #0xc @@ -7345,18 +7345,18 @@ ov91_0225FD2C: ; 0x0225FD2C lsl r1, r1, #4 ldr r1, [r5, r1] add r0, sp, #0x14 - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r5, r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r0, #0x32 lsl r0, r0, #0xe lsr r2, r0, #0xb mov r1, #0xfa ldr r2, [r5, r2] lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add sp, #0x20 pop {r4, r5, r6, pc} nop @@ -10237,14 +10237,14 @@ ov91_02261384: ; 0x02261384 lsl r1, r1, #4 ldr r1, [r5, r1] add r0, sp, #0 - bl GF_Camera_GetAngle + bl Camera_GetAngle add r0, sp, #0 mov r1, #0x19 strh r4, [r0] lsl r1, r1, #4 ldr r1, [r5, r1] add r0, sp, #0 - bl GF_Camera_SetAngle + bl Camera_SetAngle add sp, #8 pop {r3, r4, r5, pc} thumb_func_end ov91_02261384 diff --git a/asm/overlay_92.s b/asm/overlay_92.s index 7077b28c71..0e334eec83 100644 --- a/asm/overlay_92.s +++ b/asm/overlay_92.s @@ -1795,7 +1795,7 @@ ov92_0225D3CC: ; 0x0225D3CC bl GF_3DVramMan_Create str r0, [r4, #0x60] mov r0, #0x71 - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #0x64] add r0, r4, #0 bl ov92_0225DD88 @@ -2930,9 +2930,9 @@ ov92_0225DD88: ; 0x0225DD88 ldr r0, _0225DDD4 ; =0xFFC18000 ldr r2, [r4, #0x64] lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds ldr r0, [r4, #0x64] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_93_thumb_1.s b/asm/overlay_93_thumb_1.s index f275923ff3..4ae9d9ac59 100644 --- a/asm/overlay_93_thumb_1.s +++ b/asm/overlay_93_thumb_1.s @@ -1240,7 +1240,7 @@ ov93_0225CFC0: ; 0x0225CFC0 ldr r0, [r3] str r0, [r2] mov r0, #0x75 - bl GF_Camera_Create + bl Camera_Create add r1, r4, #0 add r1, #0x9c str r0, [r1] @@ -1257,7 +1257,7 @@ ov93_0225CFC0: ; 0x0225CFC0 ldr r3, _0225D060 ; =0x00000FA4 add r0, sp, #0xc lsl r1, r1, #0xc - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle add r2, r4, #0 add r2, #0x9c mov r0, #1 @@ -1265,13 +1265,13 @@ ov93_0225CFC0: ; 0x0225CFC0 ldr r2, [r2] lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add r0, r4, #0 add r0, #0x9c ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr mov r0, #0x75 - bl GF_Camera_Create + bl Camera_Create add r1, r4, #0 add r1, #0xa0 str r0, [r1] @@ -1288,14 +1288,14 @@ ov93_0225CFC0: ; 0x0225CFC0 ldr r3, _0225D060 ; =0x00000FA4 add r0, sp, #0xc lsl r1, r1, #0x10 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle add r4, #0xa0 mov r0, #1 mov r1, #0xe1 ldr r2, [r4] lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds add sp, #0x18 pop {r4, pc} nop @@ -1363,7 +1363,7 @@ ov93_0225D07C: ; 0x0225D07C add r0, r4, #0 add r0, #0x9c ldr r0, [r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add r1, r4, #0 add r1, #0x9c ldr r1, [r1] @@ -2044,7 +2044,7 @@ ov93_0225D674: ; 0x0225D674 mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r0, #0xd5 mov r1, #0 mov r2, #0x75 diff --git a/asm/overlay_95.s b/asm/overlay_95.s index 0ee3ceeba3..65d3500583 100644 --- a/asm/overlay_95.s +++ b/asm/overlay_95.s @@ -630,7 +630,7 @@ ov95_021E5DD0: ; 0x021E5DD0 mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds _021E5E08: add r0, r4, #0 add sp, #8 diff --git a/asm/overlay_96.s b/asm/overlay_96.s index ab213f6432..0f17393e0a 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -34346,7 +34346,7 @@ ov96_021F6138: ; 0x021F6138 ldr r0, _021F61C4 ; =0x04000580 str r1, [r0] ldr r0, [r4, #0x54] - bl GF_Camera_Create + bl Camera_Create mov r1, #0x19 lsl r1, r1, #4 str r0, [r4, r1] @@ -34599,19 +34599,19 @@ ov96_021F6398: ; 0x021F6398 mov r1, #0x19 lsl r1, r1, #0xe mov r3, #0xa4 - bl GF_Camera_InitFromTargetDistanceAndAngle + bl Camera_InitFromTargetDistanceAndAngle mov r1, #0x19 lsl r1, r1, #4 ldr r1, [r4, r1] add r0, sp, #0x14 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy mov r2, #0x19 mov r0, #1 lsl r2, r2, #4 lsl r0, r0, #0xe ldr r2, [r4, r2] lsl r1, r0, #6 - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r1, #0 mov r0, #1 lsl r0, r0, #0xc @@ -34622,11 +34622,11 @@ ov96_021F6398: ; 0x021F6398 lsl r1, r1, #4 ldr r1, [r4, r1] add r0, sp, #0x20 - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x2c pop {r3, r4, pc} .balign 4, 0 diff --git a/asm/unk_02014DA0.s b/asm/unk_02014DA0.s index a22f0d1928..45011de780 100644 --- a/asm/unk_02014DA0.s +++ b/asm/unk_02014DA0.s @@ -137,7 +137,7 @@ _02014DEC: cmp r0, #1 bne _02014E80 ldr r0, [sp, #0x2c] - bl GF_Camera_Create + bl Camera_Create str r0, [r4, #0x20] mov r3, #0 str r3, [r4, #0x24] @@ -158,7 +158,7 @@ _02014DEC: add r0, #0xdb strb r1, [r0] ldr r0, [r4, #0x20] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr _02014E80: mov r0, #6 str r0, [sp] @@ -966,7 +966,7 @@ sub_020153D8: ; 0x020153D8 ldrb r0, [r0] bl sub_020233D8 ldr r0, [r4, #0x20] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr bl sub_02023154 _020153F4: bl NNS_G3dGlbFlushP @@ -1145,7 +1145,7 @@ sub_020154E4: ; 0x020154E4 str r0, [r2] ldr r1, [r5, #0x20] add r0, r4, #0 - bl GF_Camera_SetBindTarget + bl Camera_SetBindTarget pop {r3, r4, r5, pc} .balign 4, 0 thumb_func_end sub_020154E4 diff --git a/asm/unk_02022D74.s b/asm/unk_02022D74.s index acd3c47a1d..b4b6f28194 100644 --- a/asm/unk_02022D74.s +++ b/asm/unk_02022D74.s @@ -510,14 +510,14 @@ _02023112: pop {r4, pc} thumb_func_end sub_020230F8 - thumb_func_start GF_Camera_Create -GF_Camera_Create: ; 0x02023114 + thumb_func_start Camera_Create +Camera_Create: ; 0x02023114 ldr r3, _0202311C ; =AllocFromHeap mov r1, #0x68 bx r3 nop _0202311C: .word AllocFromHeap - thumb_func_end GF_Camera_Create + thumb_func_end Camera_Create thumb_func_start sub_02023120 sub_02023120: ; 0x02023120 @@ -542,14 +542,14 @@ _02023130: bx lr thumb_func_end sub_02023128 - thumb_func_start GF_Camera_RegisterToStaticPtr -GF_Camera_RegisterToStaticPtr: ; 0x0202313C + thumb_func_start Camera_RegisterToStaticPtr +Camera_RegisterToStaticPtr: ; 0x0202313C ldr r1, _02023144 ; =_021D2204 str r0, [r1] bx lr nop _02023144: .word _021D2204 - thumb_func_end GF_Camera_RegisterToStaticPtr + thumb_func_end Camera_RegisterToStaticPtr thumb_func_start sub_02023148 sub_02023148: ; 0x02023148 @@ -587,7 +587,7 @@ sub_02023154: ; 0x02023154 ldr r1, _020231EC ; =_021D2204 add r0, sp, #0 ldr r1, [r1] - bl GF_Camera_ShiftBy + bl Camera_ShiftBy ldr r0, _020231EC ; =_021D2204 ldr r3, [r0] ldr r2, [r3, #0x54] @@ -644,8 +644,8 @@ _020231FC: .word NNS_G3dGlb + 0x4C _02023200: .word NNS_G3dGlb + 0x80 thumb_func_end sub_02023154 - thumb_func_start GF_Camera_SetBindTarget -GF_Camera_SetBindTarget: ; 0x02023204 + thumb_func_start Camera_SetBindTarget +Camera_SetBindTarget: ; 0x02023204 add r3, r0, #0 add r2, r1, #0 ldmia r3!, {r0, r1} @@ -654,7 +654,7 @@ GF_Camera_SetBindTarget: ; 0x02023204 ldr r0, [r3] str r0, [r2] bx lr - thumb_func_end GF_Camera_SetBindTarget + thumb_func_end Camera_SetBindTarget thumb_func_start sub_02023214 sub_02023214: ; 0x02023214 @@ -686,8 +686,8 @@ sub_02023234: ; 0x02023234 bx lr thumb_func_end sub_02023234 - thumb_func_start GF_Camera_SetClipBounds -GF_Camera_SetClipBounds: ; 0x02023240 + thumb_func_start Camera_SetClipBounds +Camera_SetClipBounds: ; 0x02023240 str r0, [r2, #0xc] add r0, r2, #0 str r1, [r2, #0x10] @@ -698,10 +698,10 @@ GF_Camera_SetClipBounds: ; 0x02023240 bx r3 .balign 4, 0 _02023250: .word sub_020233D8 - thumb_func_end GF_Camera_SetClipBounds + thumb_func_end Camera_SetClipBounds - thumb_func_start GF_Camera_InitFromTargetDistanceAndAngle -GF_Camera_InitFromTargetDistanceAndAngle: ; 0x02023254 + thumb_func_start Camera_InitFromTargetDistanceAndAngle +Camera_InitFromTargetDistanceAndAngle: ; 0x02023254 push {r3, r4, r5, r6, r7, lr} ldr r4, [sp, #0x20] add r6, r0, #0 @@ -752,7 +752,7 @@ GF_Camera_InitFromTargetDistanceAndAngle: ; 0x02023254 str r0, [r4, #0x60] _020232BA: pop {r3, r4, r5, r6, r7, pc} - thumb_func_end GF_Camera_InitFromTargetDistanceAndAngle + thumb_func_end Camera_InitFromTargetDistanceAndAngle thumb_func_start sub_020232BC sub_020232BC: ; 0x020232BC @@ -988,8 +988,8 @@ _0202348C: .word NNS_G3dGlb + 0x80 _02023490: .word _0210F6DC thumb_func_end sub_020233D8 - thumb_func_start GF_Camera_SetPerspectiveAngle -GF_Camera_SetPerspectiveAngle: ; 0x02023494 + thumb_func_start Camera_SetPerspectiveAngle +Camera_SetPerspectiveAngle: ; 0x02023494 add r2, r1, #0 add r2, #0x46 strh r0, [r2] @@ -1018,7 +1018,7 @@ GF_Camera_SetPerspectiveAngle: ; 0x02023494 nop _020234C8: .word sub_020233D8 _020234CC: .word FX_SinCosTable_ - thumb_func_end GF_Camera_SetPerspectiveAngle + thumb_func_end Camera_SetPerspectiveAngle thumb_func_start sub_020234D0 sub_020234D0: ; 0x020234D0 @@ -1056,8 +1056,8 @@ _0202350C: .word sub_020233D8 _02023510: .word FX_SinCosTable_ thumb_func_end sub_020234D0 - thumb_func_start GF_Camera_ShiftBy -GF_Camera_ShiftBy: ; 0x02023514 + thumb_func_start Camera_ShiftBy +Camera_ShiftBy: ; 0x02023514 push {r3, r4, r5, lr} add r4, r1, #0 add r5, r0, #0 @@ -1072,7 +1072,7 @@ GF_Camera_ShiftBy: ; 0x02023514 add r2, r4, #0 bl VEC_Add pop {r3, r4, r5, pc} - thumb_func_end GF_Camera_ShiftBy + thumb_func_end Camera_ShiftBy thumb_func_start sub_02023534 sub_02023534: ; 0x02023534 @@ -1095,8 +1095,8 @@ sub_02023534: ; 0x02023534 _02023554: .word sub_02022E54 thumb_func_end sub_02023534 - thumb_func_start GF_Camera_SetAngle -GF_Camera_SetAngle: ; 0x02023558 + thumb_func_start Camera_SetAngle +Camera_SetAngle: ; 0x02023558 ldrh r2, [r0] strh r2, [r1, #0x3c] ldrh r2, [r0, #2] @@ -1114,7 +1114,7 @@ GF_Camera_SetAngle: ; 0x02023558 bx r3 nop _02023578: .word sub_02022D74 - thumb_func_end GF_Camera_SetAngle + thumb_func_end Camera_SetAngle thumb_func_start sub_0202357C sub_0202357C: ; 0x0202357C @@ -1166,15 +1166,15 @@ sub_020235A8: ; 0x020235A8 _020235D0: .word sub_02022D74 thumb_func_end sub_020235A8 - thumb_func_start GF_Camera_SetDistance -GF_Camera_SetDistance: ; 0x020235D4 + thumb_func_start Camera_SetDistance +Camera_SetDistance: ; 0x020235D4 ldr r3, _020235DC ; =sub_02022D74 str r0, [r1, #0x38] add r0, r1, #0 bx r3 .balign 4, 0 _020235DC: .word sub_02022D74 - thumb_func_end GF_Camera_SetDistance + thumb_func_end Camera_SetDistance thumb_func_start sub_020235E0 sub_020235E0: ; 0x020235E0 @@ -1205,22 +1205,22 @@ sub_020235FC: ; 0x020235FC _02023608: .word sub_02022D74 thumb_func_end sub_020235FC - thumb_func_start GF_Camera_GetPerspectiveAngle -GF_Camera_GetPerspectiveAngle: ; 0x0202360C + thumb_func_start Camera_GetPerspectiveAngle +Camera_GetPerspectiveAngle: ; 0x0202360C add r0, #0x46 ldrh r0, [r0] bx lr .balign 4, 0 - thumb_func_end GF_Camera_GetPerspectiveAngle + thumb_func_end Camera_GetPerspectiveAngle - thumb_func_start GF_Camera_GetDistance -GF_Camera_GetDistance: ; 0x02023614 + thumb_func_start Camera_GetDistance +Camera_GetDistance: ; 0x02023614 ldr r0, [r0, #0x38] bx lr - thumb_func_end GF_Camera_GetDistance + thumb_func_end Camera_GetDistance - thumb_func_start GF_Camera_GetAngle -GF_Camera_GetAngle: ; 0x02023618 + thumb_func_start Camera_GetAngle +Camera_GetAngle: ; 0x02023618 ldrh r2, [r1, #0x3c] strh r2, [r0] ldrh r2, [r1, #0x3e] @@ -1233,10 +1233,10 @@ GF_Camera_GetAngle: ; 0x02023618 ldrh r1, [r1] strh r1, [r0, #6] bx lr - thumb_func_end GF_Camera_GetAngle + thumb_func_end Camera_GetAngle - thumb_func_start GF_Camera_GetTarget -GF_Camera_GetTarget: ; 0x02023630 + thumb_func_start Camera_GetTarget +Camera_GetTarget: ; 0x02023630 add r2, r1, #0 add r2, #0x20 add r3, r0, #0 @@ -1245,7 +1245,7 @@ GF_Camera_GetTarget: ; 0x02023630 ldr r0, [r2] str r0, [r3] bx lr - thumb_func_end GF_Camera_GetTarget + thumb_func_end Camera_GetTarget thumb_func_start sub_02023640 sub_02023640: ; 0x02023640 @@ -1271,11 +1271,11 @@ sub_02023654: ; 0x02023654 bx lr thumb_func_end sub_02023654 - thumb_func_start GF_Camera_GetBindTarget -GF_Camera_GetBindTarget: ; 0x02023658 + thumb_func_start Camera_GetBindTarget +Camera_GetBindTarget: ; 0x02023658 ldr r0, [r0, #0x54] bx lr - thumb_func_end GF_Camera_GetBindTarget + thumb_func_end Camera_GetBindTarget thumb_func_start sub_0202365C sub_0202365C: ; 0x0202365C diff --git a/asm/unk_02056680.s b/asm/unk_02056680.s index 7f13ae2279..4969f6819c 100644 --- a/asm/unk_02056680.s +++ b/asm/unk_02056680.s @@ -481,11 +481,11 @@ sub_02056A54: ; 0x02056A54 sub sp, #0x34 add r4, r0, #0 ldr r0, [r4, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget add r5, r0, #0 ldr r1, [r4, #0x24] add r0, sp, #4 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r6, sp, #4 add r3, sp, #0x10 ldmia r6!, {r0, r1} @@ -540,7 +540,7 @@ _02056AAC: bl sub_02023214 ldr r1, [r4, #0x24] add r0, sp, #0x1c - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add sp, #0x34 pop {r3, r4, r5, r6, pc} thumb_func_end sub_02056A54 @@ -551,11 +551,11 @@ sub_02056AEC: ; 0x02056AEC sub sp, #0x34 add r5, r0, #0 ldr r0, [r5, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget add r4, r0, #0 ldr r1, [r5, #0x24] add r0, sp, #4 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r6, sp, #4 add r3, sp, #0x10 ldmia r6!, {r0, r1} @@ -627,7 +627,7 @@ _02056B70: bl sub_02023214 ldr r1, [r5, #0x24] add r0, sp, #0x1c - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add r0, r5, #0 bl FollowingPokemon_IsActive cmp r0, #0 @@ -648,11 +648,11 @@ sub_02056BC8: ; 0x02056BC8 sub sp, #0x30 add r4, r0, #0 ldr r0, [r4, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget add r5, r0, #0 ldr r1, [r4, #0x24] add r0, sp, #0 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r6, sp, #0 add r3, sp, #0xc ldmia r6!, {r0, r1} @@ -692,7 +692,7 @@ sub_02056BC8: ; 0x02056BC8 bl sub_02023214 ldr r1, [r4, #0x24] add r0, sp, #0x18 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add r0, r5, #0 bl MapObject_ClearHeldMovementIfActive mov r1, #2 @@ -714,11 +714,11 @@ sub_02056C64: ; 0x02056C64 sub sp, #0x30 add r4, r0, #0 ldr r0, [r4, #0x24] - bl GF_Camera_GetBindTarget + bl Camera_GetBindTarget add r5, r0, #0 ldr r1, [r4, #0x24] add r0, sp, #0 - bl GF_Camera_GetTarget + bl Camera_GetTarget add r6, sp, #0 add r3, sp, #0xc ldmia r6!, {r0, r1} @@ -758,7 +758,7 @@ sub_02056C64: ; 0x02056C64 bl sub_02023214 ldr r1, [r4, #0x24] add r0, sp, #0x18 - bl GF_Camera_ShiftBy + bl Camera_ShiftBy add r0, r5, #0 bl MapObject_ClearHeldMovementIfActive mov r1, #2 diff --git a/asm/unk_020773AC.s b/asm/unk_020773AC.s index e597542251..cabbf8996e 100644 --- a/asm/unk_020773AC.s +++ b/asm/unk_020773AC.s @@ -236,7 +236,7 @@ sub_0207753C: ; 0x0207753C mov r1, #0xe1 lsl r0, r0, #0xc lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds _02077574: add r0, r4, #0 add sp, #8 diff --git a/asm/unk_0208DE40.s b/asm/unk_0208DE40.s index dc7e6d49c5..b7306c1b77 100644 --- a/asm/unk_0208DE40.s +++ b/asm/unk_0208DE40.s @@ -142,7 +142,7 @@ sub_0208DF2C: ; 0x0208DF2C strh r0, [r1, #4] strh r0, [r1, #6] mov r0, #0x13 - bl GF_Camera_Create + bl Camera_Create mov r1, #0xa7 lsl r1, r1, #2 str r0, [r4, r1] @@ -161,7 +161,7 @@ sub_0208DF2C: ; 0x0208DF2C ldr r2, [r4, r2] mov r0, #0 lsl r1, r1, #0xe - bl GF_Camera_SetClipBounds + bl Camera_SetClipBounds mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -169,7 +169,7 @@ sub_0208DF2C: ; 0x0208DF2C mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r4, r0] - bl GF_Camera_RegisterToStaticPtr + bl Camera_RegisterToStaticPtr add sp, #0x1c pop {r3, r4, pc} nop diff --git a/include/camera_translation.h b/include/camera_translation.h index e5a7818238..5c2808f201 100644 --- a/include/camera_translation.h +++ b/include/camera_translation.h @@ -12,7 +12,7 @@ struct CameraTranslationPathTemplate { }; typedef struct GFCameraTranslationWrapper { - GF_Camera *camera; + Camera *camera; u8 duration; u8 step; u8 mode; @@ -22,7 +22,7 @@ typedef struct GFCameraTranslationWrapper { SysTask *task; // returned from CreateSysTask } GFCameraTranslationWrapper; -GFCameraTranslationWrapper *CreateCameraTranslationWrapper(HeapID heapId, GF_Camera *camera); +GFCameraTranslationWrapper *CreateCameraTranslationWrapper(HeapID heapId, Camera *camera); void DeleteCameraTranslationWrapper(GFCameraTranslationWrapper *wrapper); void SetCameraTranslationPath(GFCameraTranslationWrapper *wrapper, struct CameraTranslationPathTemplate *template, int duration); u8 IsCameraTranslationFinished(GFCameraTranslationWrapper *wrapper); diff --git a/include/field_system.h b/include/field_system.h index 9140e589cc..6a2571b0d8 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -117,7 +117,7 @@ struct FieldSystem { FieldEnvSubUnk18 *unk18; int unk1C; Location *location; - GF_Camera *camera; + Camera *camera; void *unk28; FsysUnkSub2C *unk2C; MAPMATRIX *mapMatrix; diff --git a/include/unk_02014DA0.h b/include/unk_02014DA0.h index d019575368..cc32519077 100644 --- a/include/unk_02014DA0.h +++ b/include/unk_02014DA0.h @@ -13,7 +13,7 @@ typedef u32 (*plttAllocFun)(u32 szByte, BOOL is4pltt); void sub_02014DA0(void); ParticleSystem *sub_02014DB4(texAllocFun texAlloc, plttAllocFun plttAlloc, void *particleHeap, u32 workSize, BOOL a4, HeapID heapId); void sub_02014EBC(ParticleSystem *mgr); -GF_Camera *sub_02015524(ParticleSystem *param_1); +Camera *sub_02015524(ParticleSystem *param_1); void *sub_02015264(NarcId narcId, int fileId, HeapID heapId); void sub_0201526C(ParticleSystem *mgr, void *data, u32 flag, BOOL loadNow); void sub_02015354(NNSGfdTexKey texKey); diff --git a/include/unk_02022D74.h b/include/unk_02022D74.h index bd966d7aba..5056a7c2dc 100644 --- a/include/unk_02022D74.h +++ b/include/unk_02022D74.h @@ -3,31 +3,31 @@ #include "heap.h" -typedef struct GF_Camera GF_Camera; -typedef struct GF_CameraAngle { +typedef struct Camera Camera; +typedef struct CameraAngle { u16 x; u16 y; u16 z; u16 dummy; -} GF_CameraAngle; +} CameraAngle; -GF_Camera *GF_Camera_Create(HeapID heapId); +Camera *Camera_Create(HeapID heapId); -void GF_Camera_SetClipBounds(fx32, fx32, GF_Camera *); -void sub_02023120(GF_Camera *unk); +void Camera_SetClipBounds(fx32, fx32, Camera *); +void sub_02023120(Camera *unk); void sub_02023154(void); -void GF_Camera_InitFromTargetDistanceAndAngle(VecFx32 *target, int distance, GF_CameraAngle *angle, u16 a3, u8 a4, BOOL a5, GF_Camera *camera); -void GF_Camera_ShiftBy(const VecFx32 *, GF_Camera *); -void GF_Camera_SetBindTarget(VecFx32 *, GF_Camera *); -void GF_Camera_RegisterToStaticPtr(GF_Camera *); -u16 GF_Camera_GetPerspectiveAngle(GF_Camera *camera); -fx32 GF_Camera_GetDistance(GF_Camera *camera); -GF_CameraAngle GF_Camera_GetAngle(GF_Camera *camera); -VecFx32 GF_Camera_GetTarget(GF_Camera *camera); -VecFx32 *GF_Camera_GetBindTarget(GF_Camera *camera); -void GF_Camera_SetAngle(GF_CameraAngle *angle, GF_Camera *camera); -void GF_Camera_SetPerspectiveAngle(u16 a0, GF_Camera *a1); -void GF_Camera_SetDistance(fx32 a0, GF_Camera *a1); -void sub_02023214(VecFx32 *vec, GF_Camera *a1); +void Camera_InitFromTargetDistanceAndAngle(VecFx32 *target, int distance, CameraAngle *angle, u16 a3, u8 a4, BOOL a5, Camera *camera); +void Camera_ShiftBy(const VecFx32 *, Camera *); +void Camera_SetBindTarget(VecFx32 *, Camera *); +void Camera_RegisterToStaticPtr(Camera *); +u16 Camera_GetPerspectiveAngle(Camera *camera); +fx32 Camera_GetDistance(Camera *camera); +CameraAngle Camera_GetAngle(Camera *camera); +VecFx32 Camera_GetTarget(Camera *camera); +VecFx32 *Camera_GetBindTarget(Camera *camera); +void Camera_SetAngle(CameraAngle *angle, Camera *camera); +void Camera_SetPerspectiveAngle(u16 a0, Camera *a1); +void Camera_SetDistance(fx32 a0, Camera *a1); +void sub_02023214(VecFx32 *vec, Camera *a1); #endif //POKEHEARTGOLD_UNK_02022D74_H diff --git a/src/camera_translation.c b/src/camera_translation.c index de0a5db0ff..436618e0dc 100644 --- a/src/camera_translation.c +++ b/src/camera_translation.c @@ -2,15 +2,15 @@ #include "unk_0200E320.h" static void sysTask_MoveCameraAlongTrack(SysTask *unk, GFCameraTranslationWrapper *wrapper); -static void stepCamera(GF_Camera *camera, struct CameraTranslationPathTemplate *first, struct CameraTranslationPathTemplate *last, u8 step, u8 duration); +static void stepCamera(Camera *camera, struct CameraTranslationPathTemplate *first, struct CameraTranslationPathTemplate *last, u8 step, u8 duration); static void resetWrapper(GFCameraTranslationWrapper *wrapper); -static void stepAngleX(GF_Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration); -static void stepDistance(GF_Camera *camera, const fx32 *first, const fx32 *last, u8 step, u8 duration); -static void stepPerspective(GF_Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration); -static void stepPosition(GF_Camera *camera, const VecFx32 *first, const VecFx32 *last, u8 step, u8 duration); +static void stepAngleX(Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration); +static void stepDistance(Camera *camera, const fx32 *first, const fx32 *last, u8 step, u8 duration); +static void stepPerspective(Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration); +static void stepPosition(Camera *camera, const VecFx32 *first, const VecFx32 *last, u8 step, u8 duration); static fx32 calcPositionComponentStep(fx32 component, u8 step, u8 duration); -GFCameraTranslationWrapper *CreateCameraTranslationWrapper(HeapID heapId, GF_Camera *camera) { +GFCameraTranslationWrapper *CreateCameraTranslationWrapper(HeapID heapId, Camera *camera) { GFCameraTranslationWrapper *ret = AllocFromHeap(heapId, sizeof(GFCameraTranslationWrapper)); MI_CpuClear8(ret, sizeof(GFCameraTranslationWrapper)); ret->camera = camera; @@ -22,27 +22,27 @@ void DeleteCameraTranslationWrapper(GFCameraTranslationWrapper *wrapper) { FreeToHeap(wrapper); } -static inline GF_CameraAngle getBoundCameraAngle(GFCameraTranslationWrapper *wrapper) { - return GF_Camera_GetAngle(wrapper->camera); +static inline CameraAngle getBoundCameraAngle(GFCameraTranslationWrapper *wrapper) { + return Camera_GetAngle(wrapper->camera); } static inline VecFx32 getBoundCameraTarget(GFCameraTranslationWrapper *wrapper) { - return GF_Camera_GetTarget(wrapper->camera); + return Camera_GetTarget(wrapper->camera); } void SetCameraTranslationPath(GFCameraTranslationWrapper *wrapper, struct CameraTranslationPathTemplate *template, int duration) { VecFx32 target; - GF_CameraAngle angle; + CameraAngle angle; VecFx32 *bindTarget; if (!wrapper->active && duration != 0) { wrapper->active = TRUE; wrapper->target = *template; angle = getBoundCameraAngle(wrapper); target = getBoundCameraTarget(wrapper); - bindTarget = GF_Camera_GetBindTarget(wrapper->camera); + bindTarget = Camera_GetBindTarget(wrapper->camera); wrapper->init.angleX = angle.x; - wrapper->init.perspectiveAngle = GF_Camera_GetPerspectiveAngle(wrapper->camera); + wrapper->init.perspectiveAngle = Camera_GetPerspectiveAngle(wrapper->camera); if (bindTarget != NULL) { VEC_Subtract(&target, bindTarget, &wrapper->init.position); } else { @@ -50,7 +50,7 @@ void SetCameraTranslationPath(GFCameraTranslationWrapper *wrapper, struct Camera wrapper->init.position.y = 0; wrapper->init.position.z = 0; } - wrapper->init.distance = GF_Camera_GetDistance(wrapper->camera); + wrapper->init.distance = Camera_GetDistance(wrapper->camera); wrapper->duration = duration; wrapper->step = 0; wrapper->task = CreateSysTask((SysTaskFunc)sysTask_MoveCameraAlongTrack, wrapper, 0); @@ -88,15 +88,15 @@ static void resetWrapper(GFCameraTranslationWrapper *wrapper) { wrapper->active = FALSE; } -static void stepCamera(GF_Camera *camera, struct CameraTranslationPathTemplate *first, struct CameraTranslationPathTemplate *last, u8 step, u8 duration) { +static void stepCamera(Camera *camera, struct CameraTranslationPathTemplate *first, struct CameraTranslationPathTemplate *last, u8 step, u8 duration) { stepDistance(camera, &first->distance, &last->distance, step, duration); stepAngleX(camera, &first->angleX, &last->angleX, step, duration); stepPerspective(camera, &first->perspectiveAngle, &last->perspectiveAngle, step, duration); stepPosition(camera, &first->position, &last->position, step, duration); } -static void stepAngleX(GF_Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration) { - GF_CameraAngle cameraAngle = {}; +static void stepAngleX(Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration) { + CameraAngle cameraAngle = {}; u16 diff; int scaled; if (*last >= *first) { @@ -107,31 +107,31 @@ static void stepAngleX(GF_Camera *camera, const u16 *first, const u16 *last, u8 scaled = -((diff * step) / duration); } cameraAngle.x = *first + scaled; - GF_Camera_SetAngle(&cameraAngle, camera); + Camera_SetAngle(&cameraAngle, camera); } -static void stepDistance(GF_Camera *camera, const fx32 *first, const fx32 *last, u8 step, u8 duration) { +static void stepDistance(Camera *camera, const fx32 *first, const fx32 *last, u8 step, u8 duration) { fx32 diff = *last - *first; int scaled = (diff * step) / duration; fx32 new = *first + scaled; - GF_Camera_SetDistance(new, camera); + Camera_SetDistance(new, camera); } -static void stepPerspective(GF_Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration) { +static void stepPerspective(Camera *camera, const u16 *first, const u16 *last, u8 step, u8 duration) { int diff = *last - *first; int scaled = (diff * step) / duration; int new = *first + scaled; - GF_Camera_SetPerspectiveAngle(new, camera); + Camera_SetPerspectiveAngle(new, camera); } -static void stepPosition(GF_Camera *camera, const VecFx32 *first, const VecFx32 *last, u8 step, u8 duration) { +static void stepPosition(Camera *camera, const VecFx32 *first, const VecFx32 *last, u8 step, u8 duration) { VecFx32 scaled; VecFx32 diff; VEC_Subtract(last, first, &diff); scaled.x = calcPositionComponentStep(diff.x, step, duration); scaled.y = calcPositionComponentStep(diff.y, step, duration); scaled.z = calcPositionComponentStep(diff.z, step, duration); - GF_Camera_ShiftBy(&scaled, camera); + Camera_ShiftBy(&scaled, camera); } static fx32 calcPositionComponentStep(fx32 component, u8 step, u8 duration) { diff --git a/src/choose_starter_app.c b/src/choose_starter_app.c index 56fc05795c..ddfccfe041 100644 --- a/src/choose_starter_app.c +++ b/src/choose_starter_app.c @@ -170,7 +170,7 @@ struct ChooseStarterAppWork { HeapID heapId; BGCONFIG *bgConfig; struct GF3DVramMan *_3dMan; - GF_Camera *camera; + Camera *camera; VecFx32 cameraTarget; NNSFndAllocator allocator; // 020 struct ChooseStarter3dRes _3dObjRes[CS_3DRES_MAX]; @@ -290,7 +290,7 @@ BOOL ChooseStarterApplication_OvyInit(OVY_MANAGER *ovy, int *state_p) { loadBgGraphics(work->bgConfig, work->heapId); createObjResMans(work); initObjRenderers(work); - work->camera = GF_Camera_Create(work->heapId); + work->camera = Camera_Create(work->heapId); work->cameraTranslation = CreateCameraTranslationWrapper(work->heapId, work->camera); initCameraPosition(work); initBallModelPositions(work); @@ -752,7 +752,7 @@ static void initBgLayers(BGCONFIG *bgConfig, HeapID heapId) { static void initCameraPosition(struct ChooseStarterAppWork *work) { VecFx32 bindTarget; const VecFx32 shiftVec = {0, 0, 14 * FX32_ONE}; - GF_CameraAngle cameraAngle; + CameraAngle cameraAngle; work->cameraTarget.x = 0; work->cameraTarget.y = FX32_ONE * 15; @@ -761,14 +761,14 @@ static void initCameraPosition(struct ChooseStarterAppWork *work) { cameraAngle.x = 0xDCC0; cameraAngle.y = 0; cameraAngle.z = 0; - GF_Camera_InitFromTargetDistanceAndAngle(&work->cameraTarget, 100 * FX32_ONE, &cameraAngle, 0x11A4, 0, 1, work->camera); - GF_Camera_ShiftBy(&shiftVec, work->camera); - GF_Camera_SetClipBounds(FX32_ONE * 4, FX32_ONE * 256, work->camera); + Camera_InitFromTargetDistanceAndAngle(&work->cameraTarget, 100 * FX32_ONE, &cameraAngle, 0x11A4, 0, 1, work->camera); + Camera_ShiftBy(&shiftVec, work->camera); + Camera_SetClipBounds(FX32_ONE * 4, FX32_ONE * 256, work->camera); bindTarget.x = 0; bindTarget.y = FX32_ONE; bindTarget.z = 0; - GF_Camera_SetBindTarget(&bindTarget, work->camera); - GF_Camera_RegisterToStaticPtr(work->camera); + Camera_SetBindTarget(&bindTarget, work->camera); + Camera_RegisterToStaticPtr(work->camera); } static void createObjResMans(struct ChooseStarterAppWork *work) { diff --git a/src/overlay_06.c b/src/overlay_06.c index 0e33aede27..a5fe3c7372 100644 --- a/src/overlay_06.c +++ b/src/overlay_06.c @@ -18,13 +18,13 @@ void ov06_0221BA1C(int param_1, int param_2, int unused, int param_4, u32 param_ ParticleSystem *ov06_0221BA40(HeapID heap_id) { void *particleHeap; ParticleSystem *pPVar1; - GF_Camera *pGVar2; + Camera *pGVar2; particleHeap = AllocFromHeap(heap_id, 0x4800); pPVar1 = sub_02014DB4(ov06_0221BB14, ov06_0221BB30, particleHeap, 0x4800, TRUE, heap_id); pGVar2 = sub_02015524(pPVar1); if (pGVar2 != NULL) { - GF_Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, pGVar2); + Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, pGVar2); } return pPVar1; } @@ -32,7 +32,7 @@ ParticleSystem *ov06_0221BA40(HeapID heap_id) { ParticleSystem *ov06_0221BA88(HeapID heap_id) { void *particleHeap; ParticleSystem *pPVar1; - GF_Camera *pGVar2; + Camera *pGVar2; particleHeap = AllocFromHeap(heap_id, 0x4200); if (particleHeap == NULL) { @@ -41,7 +41,7 @@ ParticleSystem *ov06_0221BA88(HeapID heap_id) { pPVar1 = sub_02014DB4(ov06_0221BB14, ov06_0221BB30, particleHeap, 0x4200, TRUE, heap_id); pGVar2 = sub_02015524(pPVar1); if (pGVar2 != NULL) { - GF_Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, pGVar2); + Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, pGVar2); } return pPVar1; } diff --git a/src/overlay_94.c b/src/overlay_94.c index b268d36f59..15a7519b47 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -147,7 +147,7 @@ static void _CreateParticleSystem(IconFormeChangeWork* unkPtr) { unkPtr->particleSystem = sub_02014DB4(texAlloc, plttAlloc, particleHeap, PARTICLE_HEAP_SIZE, 1, HEAPID_PARTY_MENU); - GF_Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, sub_02015524(unkPtr->particleSystem)); + Camera_SetClipBounds(1 * FX32_ONE, 900 * FX32_ONE, sub_02015524(unkPtr->particleSystem)); } static void _EmitParticles(IconFormeChangeWork* unkPtr) { diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 894744c4be..f64bf01afd 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1543,7 +1543,7 @@ BOOL ScrCmd_107(SCRIPTCONTEXT *ctx) { shift_v.z = FX32_CONST(z); sub_0205F9A0(PlayerAvatar_GetMapObject(ctx->fsys->playerAvatar), &shift_v); - GF_Camera_ShiftBy(&shift_v, ctx->fsys->camera); + Camera_ShiftBy(&shift_v, ctx->fsys->camera); return FALSE; } From 206b49c92cd6c713f6f97f4eb54759216289b7a0 Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Sat, 13 May 2023 03:54:59 +0100 Subject: [PATCH 02/11] ListMenu2 to ListMenu2D --- include/list_menu_2.h | 43 ------------- include/list_menu_2d.h | 43 +++++++++++++ include/script.h | 14 ++--- main.lsf | 2 +- src/fieldmap.c | 88 +++++++++++++-------------- src/{list_menu_2.c => list_menu_2d.c} | 58 +++++++++--------- src/scrcmd_c.c | 8 +-- 7 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 include/list_menu_2.h create mode 100644 include/list_menu_2d.h rename src/{list_menu_2.c => list_menu_2d.c} (75%) diff --git a/include/list_menu_2.h b/include/list_menu_2.h deleted file mode 100644 index 40b49d9c3e..0000000000 --- a/include/list_menu_2.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef POKEHEARTGOLD_LIST_MENU_2_H -#define POKEHEARTGOLD_LIST_MENU_2_H - -#include "list_menu_items.h" -#include "list_menu_cursor.h" - -struct ListMenu2Template { - LISTMENUITEM *items; - WINDOW *window; - u8 fontId; - u8 itemsWide; - u8 itemsHigh; - u8 yTop:4; - u8 cursorType:2; - u8 enableWrap:2; -}; - -struct ListMenu2 { - struct ListMenu2Template template; - struct ListMenuCursor *cursor; - int cancelKey; - u8 unk14; - u8 selectedIndex; - u8 maxItemWidth; - u8 x; - u8 y; - u8 maxGlyphWidth; - u8 maxGlyphHeight; - u8 scheduledScroll; - u8 heapId; - u8 pad_1D[3]; -}; // size=0x20 - -struct ListMenu2 *Create2dMenu(const struct ListMenu2Template *template, u8 initialSelection, u8 heapId); -void Delete2dMenu(struct ListMenu2 *menu, u8 *ret_p); -int Handle2dMenuInput(struct ListMenu2 *menu); -u8 Get2dMenuSelection(struct ListMenu2 *menu); -struct ListMenu2 *CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, HeapID heapId); -struct ListMenu2 *Std_CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, HeapID heapId); -int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2 *menu, HeapID heapId); -void Clear2dMenuWindowAndDelete(struct ListMenu2 *menu, HeapID heapId); - -#endif //POKEHEARTGOLD_LIST_MENU_2_H diff --git a/include/list_menu_2d.h b/include/list_menu_2d.h new file mode 100644 index 0000000000..175bbd7ee8 --- /dev/null +++ b/include/list_menu_2d.h @@ -0,0 +1,43 @@ +#ifndef POKEHEARTGOLD_LIST_MENU_2D_H +#define POKEHEARTGOLD_LIST_MENU_2D_H + +#include "list_menu_items.h" +#include "list_menu_cursor.h" + +struct ListMenu2DTemplate { + LISTMENUITEM *items; + WINDOW *window; + u8 fontId; + u8 itemsWide; + u8 itemsHigh; + u8 yTop:4; + u8 cursorType:2; + u8 enableWrap:2; +}; + +struct ListMenu2D { + struct ListMenu2DTemplate template; + struct ListMenuCursor *cursor; + int cancelKey; + u8 unk14; + u8 selectedIndex; + u8 maxItemWidth; + u8 x; + u8 y; + u8 maxGlyphWidth; + u8 maxGlyphHeight; + u8 scheduledScroll; + u8 heapId; + u8 pad_1D[3]; +}; // size=0x20 + +struct ListMenu2D *Create2dMenu(const struct ListMenu2DTemplate *template, u8 initialSelection, u8 heapId); +void Delete2dMenu(struct ListMenu2D *menu, u8 *ret_p); +int Handle2dMenuInput(struct ListMenu2D *menu); +u8 Get2dMenuSelection(struct ListMenu2D *menu); +struct ListMenu2D *CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, HeapID heapId); +struct ListMenu2D *Std_CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, HeapID heapId); +int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2D *menu, HeapID heapId); +void Clear2dMenuWindowAndDelete(struct ListMenu2D *menu, HeapID heapId); + +#endif //POKEHEARTGOLD_LIST_MENU_2D_H diff --git a/include/script.h b/include/script.h index fd612e5425..1dc9873c8e 100644 --- a/include/script.h +++ b/include/script.h @@ -11,7 +11,7 @@ #include "constants/vars.h" #include "overlay_manager.h" #include "unk_0200E320.h" -#include "list_menu_2.h" +#include "list_menu_2d.h" #include "unk_0200E398.h" #include "unk_02022D74.h" #include "field_system.h" @@ -54,7 +54,7 @@ typedef struct ScriptEnvironment { u32 unk_C; u32 unk_10; WINDOW unk_14; - struct ListMenu2 *listMenu; + struct ListMenu2D *listMenu2D; int facingDirection; LocalMapObject *lastTalked; u32 cameraFocusObj; @@ -76,10 +76,10 @@ typedef struct ScriptEnvironment { struct SaveStatsPrinter *unk_DC; } ScriptEnvironment; -enum ScriptEnvField { - SCRIPTENV_MENU_WINDOW = 0, - SCRIPTENV_WINDOW = 1, - SCRIPTENV_MENU = 2, +typedef enum ScriptEnvField { + SCRIPTENV_MENU_WINDOW, + SCRIPTENV_WINDOW, + SCRIPTENV_LIST_MENU_2D, SCRIPTENV_PRINTER_NUM = 3, SCRIPTENV_NUM_ACTIVE_MOVEMENT = 4, SCRIPTENV_07 = 5, @@ -133,7 +133,7 @@ enum ScriptEnvField { SCRIPTENV_SPECIAL_VAR_800B = 53, SCRIPTENV_SPECIAL_VAR_RESULT = 54, SCRIPTENV_SPECIAL_VAR_LAST_TALKED = 55, -}; +} ScriptEnvField; struct UnkStruct_020FC5CC { u32 unk0_00:4; diff --git a/main.lsf b/main.lsf index 94199e7fba..12e7a5f58f 100644 --- a/main.lsf +++ b/main.lsf @@ -12,7 +12,7 @@ Static main Object src/pm_version.o Object src/main.o Object src/list_menu.o - Object src/list_menu_2.o + Object src/list_menu_2d.o Object src/string_util.o Object asm/render_text.o Object src/font.o diff --git a/src/fieldmap.c b/src/fieldmap.c index 9dbd7bcf2d..c986ba71a7 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -215,90 +215,90 @@ void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fsys, SCRIPTCONTEXT *ctx) ctx->msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, GetCurrentMapMessageBank(fsys->location->mapId), HEAP_ID_FIELDMAP); } -void *FieldSysGetAttrAddrInternal(ScriptEnvironment *unk, enum ScriptEnvField field) { +void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnvField field) { switch (field) { case SCRIPTENV_MENU_WINDOW: - return &unk->unk_10; + return &environment->unk_10; case SCRIPTENV_WINDOW: - return &unk->unk_14; - case SCRIPTENV_MENU: - return &unk->listMenu; + return &environment->unk_14; + case SCRIPTENV_LIST_MENU_2D: + return &environment->listMenu2D; case SCRIPTENV_PRINTER_NUM: - return &unk->textPrinterNum; + return &environment->textPrinterNum; case SCRIPTENV_NUM_ACTIVE_MOVEMENT: - return &unk->numActiveMovement; + return &environment->numActiveMovement; case SCRIPTENV_07: - return &unk->unk_7; + return &environment->unk_7; case SCRIPTENV_08: - return &unk->unk_8; + return &environment->unk_8; case SCRIPTENV_NUM_ACTIVE_SCRCTX: - return &unk->numActiveScrCtx; + return &environment->numActiveScrCtx; case SCRIPTENV_SCRIPT: - return &unk->script; + return &environment->script; case SCRIPTENV_FACING_DIRECTION: - return &unk->facingDirection; + return &environment->facingDirection; case SCRIPTENV_LAST_TALKED: - return &unk->lastTalked; + return &environment->lastTalked; case SCRIPTENV_CAMERA_FOCUS_OBJ: - return &unk->cameraFocusObj; + return &environment->cameraFocusObj; case SCRIPTENV_34: - return &unk->unk_34; + return &environment->unk_34; case SCRIPTENV_SCRCTX_0: case SCRIPTENV_SCRCTX_1: case SCRIPTENV_SCRCTX_2: - return &unk->scriptContexts[field - SCRIPTENV_SCRCTX_0]; + return &environment->scriptContexts[field - SCRIPTENV_SCRCTX_0]; case SCRIPTENV_MSGFMT: - return &unk->msgfmt; + return &environment->msgfmt; case SCRIPTENV_STRBUF1: - return &unk->strbuf1; + return &environment->strbuf1; case SCRIPTENV_STRBUF2: - return &unk->strbuf2; + return &environment->strbuf2; case SCRIPTENV_WAITING_ICON: - return &unk->unk_50; + return &environment->unk_50; case SCRIPTENV_AC: - return &unk->unk_AC; + return &environment->unk_AC; case SCRIPTENV_GENERIC_WORK_PTR: - return &unk->genericWorkPtr; + return &environment->genericWorkPtr; case SCRIPTENV_B4: - return &unk->unk_B4; + return &environment->unk_B4; case SCRIPTENV_B8: - return &unk->unk_B8; + return &environment->unk_B8; case SCRIPTENV_0C: - return &unk->unk_C; + return &environment->unk_C; case SCRIPTENV_54_0_00: - return &unk->engagedTrainers[0].unk0; + return &environment->engagedTrainers[0].unk0; case SCRIPTENV_54_0_04: - return &unk->engagedTrainers[0].unk4; + return &environment->engagedTrainers[0].unk4; case SCRIPTENV_54_0_08: - return &unk->engagedTrainers[0].unk8; + return &environment->engagedTrainers[0].unk8; case SCRIPTENV_EYE_TRAINER_1_NUM: - return &unk->engagedTrainers[0].trainerNum; + return &environment->engagedTrainers[0].trainerNum; case SCRIPTENV_EYE_TRAINER_1_ENCTYPE: - return &unk->engagedTrainers[0].encounterType; + return &environment->engagedTrainers[0].encounterType; case SCRIPTENV_EYE_TRAINER_1_OBJPTR: - return &unk->engagedTrainers[0].objectEvent; + return &environment->engagedTrainers[0].objectEvent; case SCRIPTENV_54_0_18: - return &unk->engagedTrainers[0].unk18; + return &environment->engagedTrainers[0].unk18; case SCRIPTENV_54_1_00: - return &unk->engagedTrainers[1].unk0; + return &environment->engagedTrainers[1].unk0; case SCRIPTENV_54_1_04: - return &unk->engagedTrainers[1].unk4; + return &environment->engagedTrainers[1].unk4; case SCRIPTENV_54_1_08: - return &unk->engagedTrainers[1].unk8; + return &environment->engagedTrainers[1].unk8; case SCRIPTENV_EYE_TRAINER_2_NUM: - return &unk->engagedTrainers[1].trainerNum; + return &environment->engagedTrainers[1].trainerNum; case SCRIPTENV_EYE_TRAINER_2_ENCTYPE: - return &unk->engagedTrainers[1].encounterType; + return &environment->engagedTrainers[1].encounterType; case SCRIPTENV_EYE_TRAINER_2_OBJPTR: - return &unk->engagedTrainers[1].objectEvent; + return &environment->engagedTrainers[1].objectEvent; case SCRIPTENV_54_1_18: - return &unk->engagedTrainers[1].unk18; + return &environment->engagedTrainers[1].unk18; case SCRIPTENV_BC: - return &unk->unk_BC; + return &environment->unk_BC; case SCRIPTENV_MONEY_BOX: - return &unk->moneyBox; + return &environment->moneyBox; case SCRIPTENV_DC: - return &unk->unk_DC; + return &environment->unk_DC; case SCRIPTENV_SPECIAL_VAR_8000: case SCRIPTENV_SPECIAL_VAR_8001: case SCRIPTENV_SPECIAL_VAR_8002: @@ -313,9 +313,9 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *unk, enum ScriptEnvField fi case SCRIPTENV_SPECIAL_VAR_800B: case SCRIPTENV_SPECIAL_VAR_RESULT: case SCRIPTENV_SPECIAL_VAR_LAST_TALKED: - return &unk->specialVars[field - SCRIPTENV_SPECIAL_VAR_8000]; + return &environment->specialVars[field - SCRIPTENV_SPECIAL_VAR_8000]; default: - GF_ASSERT(0); + GF_ASSERT(FALSE); return NULL; } } diff --git a/src/list_menu_2.c b/src/list_menu_2d.c similarity index 75% rename from src/list_menu_2.c rename to src/list_menu_2d.c index b0a5114937..20247e51b0 100644 --- a/src/list_menu_2.c +++ b/src/list_menu_2d.c @@ -1,4 +1,4 @@ -#include "list_menu_2.h" +#include "list_menu_2d.h" #include "font.h" #include "system.h" #include "text.h" @@ -7,17 +7,17 @@ #include "constants/sndseq.h" #include "msgdata/msg/msg_0191.h" -static struct ListMenu2 *Create2dMenuInternalEx(const struct ListMenu2Template *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey); -static struct ListMenu2 *Create2dMenuInternal(const struct ListMenu2Template *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey); -static BOOL TryMove2dMenuCursor(struct ListMenu2 *menu, int direction, u16 seqno); -static BOOL TryMove2dMenuCursorInternal(struct ListMenu2 *menu, int direction); -static u8 Get2dMenuMaxItemWidth(struct ListMenu2 *listMenu); -static void Print2dMenuItemTexts(struct ListMenu2 *listMenu); -static void Draw2dMenuCursor(struct ListMenu2 *listMenu); -static void Get2dMenuSelectionCoords(struct ListMenu2 *listMenu, u8 *x, u8 *y, u8 selectedIdx); - -static struct ListMenu2 *Create2dMenuInternalEx(const struct ListMenu2Template *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey) { - struct ListMenu2 *ret = AllocFromHeap(heapId, sizeof(struct ListMenu2)); +static struct ListMenu2D *Create2dMenuInternalEx(const struct ListMenu2DTemplate *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey); +static struct ListMenu2D *Create2dMenuInternal(const struct ListMenu2DTemplate *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey); +static BOOL TryMove2dMenuCursor(struct ListMenu2D *menu, int direction, u16 seqno); +static BOOL TryMove2dMenuCursorInternal(struct ListMenu2D *menu, int direction); +static u8 Get2dMenuMaxItemWidth(struct ListMenu2D *listMenu); +static void Print2dMenuItemTexts(struct ListMenu2D *listMenu); +static void Draw2dMenuCursor(struct ListMenu2D *listMenu); +static void Get2dMenuSelectionCoords(struct ListMenu2D *listMenu, u8 *x, u8 *y, u8 selectedIdx); + +static struct ListMenu2D *Create2dMenuInternalEx(const struct ListMenu2DTemplate *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey) { + struct ListMenu2D *ret = AllocFromHeap(heapId, sizeof(struct ListMenu2D)); ret->template = *template; ret->cursor = ListMenuCursorNew(heapId); ret->cancelKey = cancelKey; @@ -33,17 +33,17 @@ static struct ListMenu2 *Create2dMenuInternalEx(const struct ListMenu2Template * return ret; } -static struct ListMenu2 *Create2dMenuInternal(const struct ListMenu2Template *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey) { - struct ListMenu2 *ret = Create2dMenuInternalEx(template, x, y, initialSelection, heapId, cancelKey); +static struct ListMenu2D *Create2dMenuInternal(const struct ListMenu2DTemplate *template, u8 x, u8 y, u8 initialSelection, u8 heapId, int cancelKey) { + struct ListMenu2D *ret = Create2dMenuInternalEx(template, x, y, initialSelection, heapId, cancelKey); CopyWindowToVram(ret->template.window); return ret; } -struct ListMenu2 *Create2dMenu(const struct ListMenu2Template *template, u8 initialSelection, u8 heapId) { +struct ListMenu2D *Create2dMenu(const struct ListMenu2DTemplate *template, u8 initialSelection, u8 heapId) { return Create2dMenuInternal(template, GetFontAttribute(template->fontId, 0), 0, initialSelection, heapId, PAD_BUTTON_B); } -void Delete2dMenu(struct ListMenu2 *menu, u8 *ret_p) { +void Delete2dMenu(struct ListMenu2D *menu, u8 *ret_p) { if (ret_p != NULL) { *ret_p = menu->selectedIndex; } @@ -51,7 +51,7 @@ void Delete2dMenu(struct ListMenu2 *menu, u8 *ret_p) { FreeToHeapExplicit(menu->heapId, menu); } -int Handle2dMenuInput(struct ListMenu2 *menu) { +int Handle2dMenuInput(struct ListMenu2D *menu) { menu->scheduledScroll = 0; if (gSystem.newKeys & PAD_BUTTON_A) { PlaySE(SEQ_SE_DP_SELECT); @@ -84,11 +84,11 @@ int Handle2dMenuInput(struct ListMenu2 *menu) { } } -u8 Get2dMenuSelection(struct ListMenu2 *menu) { +u8 Get2dMenuSelection(struct ListMenu2D *menu) { return menu->selectedIndex; } -static BOOL TryMove2dMenuCursor(struct ListMenu2 *menu, int direction, u16 seqno) { +static BOOL TryMove2dMenuCursor(struct ListMenu2D *menu, int direction, u16 seqno) { u8 selection = menu->selectedIndex; u8 x, y; u8 fillval; @@ -103,7 +103,7 @@ static BOOL TryMove2dMenuCursor(struct ListMenu2 *menu, int direction, u16 seqno return TRUE; } -static BOOL TryMove2dMenuCursorInternal(struct ListMenu2 *menu, int direction) { +static BOOL TryMove2dMenuCursorInternal(struct ListMenu2D *menu, int direction) { s8 newPos; if (direction == 0) { if (menu->template.itemsHigh <= 1) { @@ -157,7 +157,7 @@ static BOOL TryMove2dMenuCursorInternal(struct ListMenu2 *menu, int direction) { return TRUE; } -static u8 Get2dMenuMaxItemWidth(struct ListMenu2 *listMenu) { +static u8 Get2dMenuMaxItemWidth(struct ListMenu2D *listMenu) { u8 i; u8 ret = 0, cur; @@ -170,7 +170,7 @@ static u8 Get2dMenuMaxItemWidth(struct ListMenu2 *listMenu) { return ret; } -static void Print2dMenuItemTexts(struct ListMenu2 *listMenu) { +static void Print2dMenuItemTexts(struct ListMenu2D *listMenu) { u8 i, j; u8 dx; u8 x; @@ -193,7 +193,7 @@ static void Print2dMenuItemTexts(struct ListMenu2 *listMenu) { } } -static void Draw2dMenuCursor(struct ListMenu2 *listMenu) { +static void Draw2dMenuCursor(struct ListMenu2D *listMenu) { if (listMenu->template.cursorType != 1) { u8 x, y; Get2dMenuSelectionCoords(listMenu, &x, &y, listMenu->selectedIndex); @@ -201,13 +201,13 @@ static void Draw2dMenuCursor(struct ListMenu2 *listMenu) { } } -static void Get2dMenuSelectionCoords(struct ListMenu2 *listMenu, u8 *x, u8 *y, u8 selectedIdx) { +static void Get2dMenuSelectionCoords(struct ListMenu2D *listMenu, u8 *x, u8 *y, u8 selectedIdx) { *x = (selectedIdx / listMenu->template.itemsHigh) * (listMenu->maxItemWidth + listMenu->maxGlyphWidth * 2); *y = listMenu->y + (selectedIdx % listMenu->template.itemsHigh) * (listMenu->maxGlyphHeight + listMenu->template.yTop); } -struct ListMenu2 *CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, HeapID heapId) { - struct ListMenu2Template menuTemplate; +struct ListMenu2D *CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, HeapID heapId) { + struct ListMenu2DTemplate menuTemplate; MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0191_bin, heapId); LISTMENUITEM *items = ListMenuItems_ctor(2, heapId); ListMenuItems_AppendFromMsgData(items, msgData, msg_0191_00042, 0); @@ -226,11 +226,11 @@ struct ListMenu2 *CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *wind return Create2dMenuInternal(&menuTemplate, 8, 0, initialSelection, heapId, PAD_BUTTON_B); } -struct ListMenu2 *Std_CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, HeapID heapId) { +struct ListMenu2D *Std_CreateYesNoMenu(BGCONFIG *bgConfig, const WINDOWTEMPLATE *windowTemplate, u16 tileNum, u8 paletteNum, HeapID heapId) { return CreateYesNoMenu(bgConfig, windowTemplate, tileNum, paletteNum, 0, heapId); } -int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2 *menu, HeapID heapId) { +int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2D *menu, HeapID heapId) { int ret = Handle2dMenuInput(menu); if (ret != LIST_NOTHING_CHOSEN) { Clear2dMenuWindowAndDelete(menu, heapId); @@ -238,7 +238,7 @@ int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2 *menu, HeapID heapId) { return ret; } -void Clear2dMenuWindowAndDelete(struct ListMenu2 *menu, HeapID heapId) { +void Clear2dMenuWindowAndDelete(struct ListMenu2D *menu, HeapID heapId) { sub_0200E5D4(menu->template.window, FALSE); RemoveWindow(menu->template.window); FreeToHeapExplicit(heapId, menu->template.window); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index f64bf01afd..319290f0c6 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -931,10 +931,10 @@ BOOL ScrCmd_061(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_YesNo(SCRIPTCONTEXT* ctx) { FieldSystem *fsys = ctx->fsys; - struct ListMenu2 **listMenu = FieldSysGetAttrAddr(fsys, SCRIPTENV_MENU); + struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fsys, SCRIPTENV_LIST_MENU_2D); u16 data = ScriptReadHalfword(ctx); LoadUserFrameGfx1(fsys->bgConfig, 3, 0x3D9, 11, 0, 4); - *listMenu = Std_CreateYesNoMenu(fsys->bgConfig, &_020FAC94, 0x3D9, 11, 4); + *listMenu2D = Std_CreateYesNoMenu(fsys->bgConfig, &_020FAC94, 0x3D9, 11, 4); ctx->data[0] = data; SetupNativeScript(ctx, sub_020416E4); return TRUE; @@ -942,9 +942,9 @@ BOOL ScrCmd_YesNo(SCRIPTCONTEXT* ctx) { BOOL sub_020416E4(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - struct ListMenu2 **listMenu = FieldSysGetAttrAddr(fsys, SCRIPTENV_MENU); + struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fsys, SCRIPTENV_LIST_MENU_2D); u16 *ret_p = GetVarPointer(fsys, ctx->data[0]); - int selection = Handle2dMenuInput_DeleteOnFinish(*listMenu, 4); + int selection = Handle2dMenuInput_DeleteOnFinish(*listMenu2D, 4); if (selection == LIST_NOTHING_CHOSEN) { return FALSE; } else { From 500025a4c2520b3daaf36524a35bb296acebcc58 Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Sat, 13 May 2023 05:10:07 +0100 Subject: [PATCH 03/11] start renaming script environment enum --- include/script.h | 8 ++++---- src/fieldmap.c | 8 ++++---- src/scrcmd_c.c | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/script.h b/include/script.h index 1dc9873c8e..b969a12979 100644 --- a/include/script.h +++ b/include/script.h @@ -46,7 +46,7 @@ typedef struct ScriptEnvironment { u32 check; u8 state; u8 textPrinterNum; - u8 numActiveMovement; + u8 activeMovementCounter; u8 unk_7; u8 unk_8; u8 numActiveScrCtx; @@ -80,9 +80,9 @@ typedef enum ScriptEnvField { SCRIPTENV_MENU_WINDOW, SCRIPTENV_WINDOW, SCRIPTENV_LIST_MENU_2D, - SCRIPTENV_PRINTER_NUM = 3, - SCRIPTENV_NUM_ACTIVE_MOVEMENT = 4, - SCRIPTENV_07 = 5, + SCRIPTENV_TEXT_PRINTER_NUMBER, + SCRIPTENV_ACTIVE_MOVEMENT_COUNTER, + SCRIPTENV_FIELD_07, SCRIPTENV_08 = 6, SCRIPTENV_NUM_ACTIVE_SCRCTX = 7, SCRIPTENV_SCRIPT = 8, diff --git a/src/fieldmap.c b/src/fieldmap.c index c986ba71a7..339b2ea980 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -223,11 +223,11 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->unk_14; case SCRIPTENV_LIST_MENU_2D: return &environment->listMenu2D; - case SCRIPTENV_PRINTER_NUM: + case SCRIPTENV_TEXT_PRINTER_NUMBER: return &environment->textPrinterNum; - case SCRIPTENV_NUM_ACTIVE_MOVEMENT: - return &environment->numActiveMovement; - case SCRIPTENV_07: + case SCRIPTENV_ACTIVE_MOVEMENT_COUNTER: + return &environment->activeMovementCounter; + case SCRIPTENV_FIELD_07: return &environment->unk_7; case SCRIPTENV_08: return &environment->unk_8; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 319290f0c6..89fe79bebd 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -332,7 +332,7 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_0 + *num_active_script_contexts); @@ -351,7 +351,7 @@ BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); return (*unk & (1 << ctx->id)) == 0; @@ -359,7 +359,7 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RestartCurrentScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); *unk ^= (1 << (ctx->id - 1)); @@ -826,7 +826,7 @@ static BOOL sub_02041520(SCRIPTCONTEXT* ctx); BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_PRINTER_NUM); + u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2); STRING** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1); MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); @@ -851,7 +851,7 @@ BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) { static BOOL sub_02041520(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_PRINTER_NUM); + u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); u16* ret_ptr = GetVarPointer(fsys, ctx->data[0]); u8 unused = ov01_021F3D84(fsys->unk68); @@ -1127,7 +1127,7 @@ BOOL ScrCmd_ApplyMovement(SCRIPTCONTEXT *ctx) { ov01_021F7704(object); } mvtMan = EventObjectMovementMan_Create(object, (const MovementScriptCommand *)(ctx->script_ptr + offset)); - mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_NUM_ACTIVE_MOVEMENT); + mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); (*mvtCounter)++; _ScheduleObjectEventMovement(ctx->fsys, mvtMan, NULL); return FALSE; @@ -1171,7 +1171,7 @@ BOOL ScrCmd_563(SCRIPTCONTEXT *ctx) { cmd[i].length = 0; mvtMan = EventObjectMovementMan_Create(object, cmd); - mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_NUM_ACTIVE_MOVEMENT); + mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); (*mvtCounter)++; _ScheduleObjectEventMovement(ctx->fsys, mvtMan, cmd); return FALSE; @@ -1188,16 +1188,16 @@ LocalMapObject *sub_02041C70(FieldSystem *fsys, u16 person) { } } -BOOL _IsAllMovementFinish(SCRIPTCONTEXT *ctx); +static BOOL IsAllMovementFinished(SCRIPTCONTEXT *ctx); BOOL ScrCmd_WaitMovement(SCRIPTCONTEXT *ctx) { - SetupNativeScript(ctx, _IsAllMovementFinish); + SetupNativeScript(ctx, IsAllMovementFinished); return TRUE; } -BOOL _IsAllMovementFinish(SCRIPTCONTEXT *ctx) { - u8 *ptr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_NUM_ACTIVE_MOVEMENT); - return *ptr == 0; +static BOOL IsAllMovementFinished(SCRIPTCONTEXT *ctx) { + u8 *movCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); + return *movCounter == 0; } struct ObjectMovementTaskEnv { @@ -1222,7 +1222,7 @@ void _ScheduleObjectEventMovement(FieldSystem *fsys, EventObjectMovementMan *mvt } void _RunObjectEventMovement(SysTask *task, struct ObjectMovementTaskEnv *env) { - u8 *mvtCnt = FieldSysGetAttrAddr(env->fsys, SCRIPTENV_NUM_ACTIVE_MOVEMENT); + u8 *mvtCnt = FieldSysGetAttrAddr(env->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); if (EventObjectMovementMan_IsFinish(env->mvtMan) == TRUE) { EventObjectMovementMan_Delete(env->mvtMan); DestroySysTask(env->task); @@ -2384,7 +2384,7 @@ BOOL ScrCmd_TrainerMessage(SCRIPTCONTEXT *ctx) { u16 *p_scripno = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT); STRING **p_strbuf1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1); - u8 *p_printerno = FieldSysGetAttrAddr(fsys, SCRIPTENV_PRINTER_NUM); + u8 *p_printerno = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); u16 trainerno = ScriptGetVar(ctx); u16 msgno = ScriptGetVar(ctx); From 4eeb205f32707d95e98e6ddaba600fdb3f37bffd Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Sat, 13 May 2023 23:27:07 +0100 Subject: [PATCH 04/11] more enum renaming --- include/script.h | 12 ++++++------ src/fieldmap.c | 22 +++++++++++----------- src/scrcmd_battle.c | 10 +++++----- src/scrcmd_c.c | 18 +++++++++--------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/script.h b/include/script.h index b969a12979..4bd1e1e13f 100644 --- a/include/script.h +++ b/include/script.h @@ -49,8 +49,8 @@ typedef struct ScriptEnvironment { u8 activeMovementCounter; u8 unk_7; u8 unk_8; - u8 numActiveScrCtx; - u16 script; + u8 activeScriptContextCount; + u16 activeScriptNumber; u32 unk_C; u32 unk_10; WINDOW unk_14; @@ -83,10 +83,10 @@ typedef enum ScriptEnvField { SCRIPTENV_TEXT_PRINTER_NUMBER, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER, SCRIPTENV_FIELD_07, - SCRIPTENV_08 = 6, - SCRIPTENV_NUM_ACTIVE_SCRCTX = 7, - SCRIPTENV_SCRIPT = 8, - SCRIPTENV_FACING_DIRECTION = 9, + SCRIPTENV_FIELD_08, + SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT, + SCRIPTENV_ACTIVE_SCRIPT_NUMBER, + SCRIPTENV_FACING_DIRECTION, SCRIPTENV_LAST_TALKED = 10, SCRIPTENV_CAMERA_FOCUS_OBJ = 11, SCRIPTENV_34 = 12, diff --git a/src/fieldmap.c b/src/fieldmap.c index 339b2ea980..ce991d3c9a 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -100,8 +100,8 @@ BOOL Task_RunScripts(TaskManager *taskman) { switch (env->state) { case 0: - env->scriptContexts[0] = CreateScriptContext(fsys, env->script); - env->numActiveScrCtx = 1; + env->scriptContexts[0] = CreateScriptContext(fsys, env->activeScriptNumber); + env->activeScriptContextCount = 1; env->msgfmt = ScrStrBufs_new_custom(8, 64, HEAP_ID_FIELDMAP); env->strbuf1 = String_ctor(1024, HEAP_ID_FIELDMAP); env->strbuf2 = String_ctor(1024, HEAP_ID_FIELDMAP); @@ -117,11 +117,11 @@ BOOL Task_RunScripts(TaskManager *taskman) { continue; } DestroyScriptContext(ctx); - GF_ASSERT(env->numActiveScrCtx != 0); + GF_ASSERT(env->activeScriptContextCount != 0); env->scriptContexts[i] = NULL; - env->numActiveScrCtx--; + env->activeScriptContextCount--; } - if (env->numActiveScrCtx == 0) { + if (env->activeScriptContextCount == 0) { void (*callback)(FieldSystem *a0) = env->scrctx_end_cb; ScrStrBufs_delete(env->msgfmt); String_dtor(env->strbuf1); @@ -158,7 +158,7 @@ void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, Lo u16 *varLastTalked = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_LAST_TALKED); env->facingDirection = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); env->lastTalked = lastTalked; - env->script = script; + env->activeScriptNumber = script; env->unk_34 = a4; if (lastTalked != NULL) { *varLastTalked = MapObject_GetID(lastTalked); @@ -229,12 +229,12 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->activeMovementCounter; case SCRIPTENV_FIELD_07: return &environment->unk_7; - case SCRIPTENV_08: + case SCRIPTENV_FIELD_08: return &environment->unk_8; - case SCRIPTENV_NUM_ACTIVE_SCRCTX: - return &environment->numActiveScrCtx; - case SCRIPTENV_SCRIPT: - return &environment->script; + case SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT: + return &environment->activeScriptContextCount; + case SCRIPTENV_ACTIVE_SCRIPT_NUMBER: + return &environment->activeScriptNumber; case SCRIPTENV_FACING_DIRECTION: return &environment->facingDirection; case SCRIPTENV_LAST_TALKED: diff --git a/src/scrcmd_battle.c b/src/scrcmd_battle.c index 08fa7626fd..9762f92803 100644 --- a/src/scrcmd_battle.c +++ b/src/scrcmd_battle.c @@ -89,7 +89,7 @@ BOOL ScrCmd_GetEyeTrainerNum(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_GetTrainerNum(SCRIPTCONTEXT *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_SCRIPT); + u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *retTrainerNum = ScriptGetVarPointer(ctx); *retTrainerNum = ScriptNumToTrainerNum(*script); return FALSE; @@ -97,7 +97,7 @@ BOOL ScrCmd_GetTrainerNum(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_TrainerBattle(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - u16 *script = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT); + u16 *script = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u32 *scriptUnk0C = FieldSysGetAttrAddr(fsys, SCRIPTENV_0C); u16 var0 = ScriptGetVar(ctx); u16 var1 = ScriptGetVar(ctx); @@ -125,7 +125,7 @@ BOOL ScrCmd_MultiBattle(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_GetTrainerMsgParams(SCRIPTCONTEXT *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_SCRIPT); + u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *msgPtr0 = ScriptGetVarPointer(ctx); u16 *msgPtr1 = ScriptGetVarPointer(ctx); u16 *msgPtr2 = ScriptGetVarPointer(ctx); @@ -154,7 +154,7 @@ BOOL ScrCmd_GetTrainerMsgParams(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_GetRematchMsgParams(SCRIPTCONTEXT *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_SCRIPT); + u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *msgPtr0 = ScriptGetVarPointer(ctx); u16 *msgPtr1 = ScriptGetVarPointer(ctx); u16 *msgPtr2 = ScriptGetVarPointer(ctx); @@ -183,7 +183,7 @@ BOOL ScrCmd_GetRematchMsgParams(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_TrainerIsDoubleBattle(SCRIPTCONTEXT *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_SCRIPT); + u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *retDoubleBattle = ScriptGetVarPointer(ctx); *retDoubleBattle = TrainerNumIsDouble(ScriptNumToTrainerNum(*script)); return FALSE; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 89fe79bebd..ed4afe9e42 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -318,7 +318,7 @@ BOOL ScrCmd_CompareVarToVar(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RunScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); SCRIPTCONTEXT** new_context_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_1); u16 script_to_run = ScriptReadHalfword(ctx); @@ -333,7 +333,7 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_0 + *num_active_script_contexts); u16 script_to_run = ScriptReadHalfword(ctx); @@ -352,7 +352,7 @@ BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); return (*unk & (1 << ctx->id)) == 0; } @@ -360,7 +360,7 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RestartCurrentScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); *unk ^= (1 << (ctx->id - 1)); return FALSE; @@ -662,7 +662,7 @@ static BOOL sub_020410F0(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_OpenMsg(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_08); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); sub_0205B514(fsys->bgConfig, FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), 3); sub_0205B564(FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), Sav2_PlayerData_GetOptionsAddr(ctx->fsys->savedata)); @@ -676,7 +676,7 @@ BOOL ScrCmd_OpenMsg(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_CloseMsg(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; WINDOW* window = FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_08); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); ClearFrameAndWindow2(window, 0); RemoveWindow(window); @@ -690,7 +690,7 @@ BOOL ScrCmd_CloseMsg(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_HoldMsg(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; WINDOW* window = FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_08); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); RemoveWindow(window); @@ -2382,7 +2382,7 @@ BOOL ScrCmd_SetStarterChoice(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_TrainerMessage(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - u16 *p_scripno = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT); + u16 *p_scripno = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); STRING **p_strbuf1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1); u8 *p_printerno = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); u16 trainerno = ScriptGetVar(ctx); @@ -4682,7 +4682,7 @@ BOOL ScrCmd_LoadPhoneDat(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_GetPhoneContactMsgIds(SCRIPTCONTEXT *ctx) { - u16 *p_scriptno = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_SCRIPT); + u16 *p_scriptno = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u8 r6 = ScriptReadByte(ctx); u16 *sp0 = ScriptGetVarPointer(ctx); u16 *p_ret_msg = ScriptGetVarPointer(ctx); From 90026fd7c50afa90d1e6efac03dd30f0d65a2b28 Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Mon, 15 May 2023 03:37:06 +0100 Subject: [PATCH 05/11] LAST_TALKED to LAST_INTERACTED --- include/script.h | 4 +-- src/fieldmap.c | 26 +++++++------- src/scrcmd_apricorn.c | 8 ++--- src/scrcmd_battle.c | 8 ++--- src/scrcmd_c.c | 78 ++++++++++++++++++++--------------------- tools/nitrogfx/Makefile | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/include/script.h b/include/script.h index 4bd1e1e13f..a3c67e8056 100644 --- a/include/script.h +++ b/include/script.h @@ -56,7 +56,7 @@ typedef struct ScriptEnvironment { WINDOW unk_14; struct ListMenu2D *listMenu2D; int facingDirection; - LocalMapObject *lastTalked; + LocalMapObject *lastInteracted; u32 cameraFocusObj; LocalMapObject *unk_34; SCRIPTCONTEXT *scriptContexts[3]; @@ -87,7 +87,7 @@ typedef enum ScriptEnvField { SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT, SCRIPTENV_ACTIVE_SCRIPT_NUMBER, SCRIPTENV_FACING_DIRECTION, - SCRIPTENV_LAST_TALKED = 10, + SCRIPTENV_LAST_INTERACTED, SCRIPTENV_CAMERA_FOCUS_OBJ = 11, SCRIPTENV_34 = 12, SCRIPTENV_SCRCTX_0 = 13, diff --git a/src/fieldmap.c b/src/fieldmap.c index ce991d3c9a..93ae78f8a5 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -59,9 +59,9 @@ const struct ScriptBankMapping sScriptBankMapping[30] = { {_std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin}, }; -void StartMapSceneScript(FieldSystem *fsys, u16 script, LocalMapObject *lastTalked) { +void StartMapSceneScript(FieldSystem *fsys, u16 script, LocalMapObject *lastInteracted) { ScriptEnvironment *r4 = ScriptEnvironment_new(); - SetupScriptEngine(fsys, r4, script, lastTalked, NULL); + SetupScriptEngine(fsys, r4, script, lastInteracted, NULL); FieldSys_CreateTask(fsys, Task_RunScripts, r4); } @@ -76,17 +76,17 @@ void FieldSys_SetEngagedTrainer(FieldSystem *fsys, LocalMapObject *obj, int a2, r0->objectEvent = obj; } -void QueueScript(TaskManager *taskman, u16 script, LocalMapObject *lastTalked, void *a3) { +void QueueScript(TaskManager *taskman, u16 script, LocalMapObject *lastInteracted, void *a3) { FieldSystem *fsys = TaskManager_GetSys(taskman); ScriptEnvironment *env = ScriptEnvironment_new(); - SetupScriptEngine(fsys, env, script, lastTalked, a3); + SetupScriptEngine(fsys, env, script, lastInteracted, a3); TaskManager_Call(taskman, Task_RunScripts, env); } -void StartScriptFromMenu(TaskManager *taskman, u16 script, LocalMapObject *lastTalked) { +void StartScriptFromMenu(TaskManager *taskman, u16 script, LocalMapObject *lastInteracted) { FieldSystem *fsys = TaskManager_GetSys(taskman); ScriptEnvironment *env = ScriptEnvironment_new(); - SetupScriptEngine(fsys, env, script, lastTalked, NULL); + SetupScriptEngine(fsys, env, script, lastInteracted, NULL); TaskManager_Jump(taskman, Task_RunScripts, env); } @@ -154,14 +154,14 @@ void DestroyScriptContext(SCRIPTCONTEXT *ctx) { FreeToHeap(ctx); } -void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, LocalMapObject *lastTalked, void* a4) { - u16 *varLastTalked = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_LAST_TALKED); +void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, LocalMapObject *lastInteracted, void* a4) { + u16 *varLastInteracted = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_LAST_TALKED); env->facingDirection = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); - env->lastTalked = lastTalked; + env->lastInteracted = lastInteracted; env->activeScriptNumber = script; env->unk_34 = a4; - if (lastTalked != NULL) { - *varLastTalked = MapObject_GetID(lastTalked); + if (lastInteracted != NULL) { + *varLastInteracted = MapObject_GetID(lastInteracted); } if (script >= _std_hidden_item && script <= _std_safari - 1) { GetHiddenItemParams(env, script); @@ -237,8 +237,8 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->activeScriptNumber; case SCRIPTENV_FACING_DIRECTION: return &environment->facingDirection; - case SCRIPTENV_LAST_TALKED: - return &environment->lastTalked; + case SCRIPTENV_LAST_INTERACTED: + return &environment->lastInteracted; case SCRIPTENV_CAMERA_FOCUS_OBJ: return &environment->cameraFocusObj; case SCRIPTENV_34: diff --git a/src/scrcmd_apricorn.c b/src/scrcmd_apricorn.c index 99780ca155..ebac042b59 100644 --- a/src/scrcmd_apricorn.c +++ b/src/scrcmd_apricorn.c @@ -5,17 +5,17 @@ BOOL ScrCmd_AnimApricornTree(SCRIPTCONTEXT *ctx) { u16 varId = ScriptReadHalfword(ctx); - LocalMapObject **lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u16 *retPtr = GetVarPointer(ctx->fsys, varId); - FieldSys_AnimApricornTree(ctx->fsys, *lastTalked, retPtr); + FieldSys_AnimApricornTree(ctx->fsys, *lastInteracted, retPtr); return TRUE; } BOOL ScrCmd_ApricornTreeGetApricorn(SCRIPTCONTEXT *ctx) { u16 varId = ScriptReadHalfword(ctx); - LocalMapObject **lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u16 *retPtr = GetVarPointer(ctx->fsys, varId); - *retPtr = FieldSys_ApricornTree_GetApricorn(ctx->fsys, *lastTalked); + *retPtr = FieldSys_ApricornTree_GetApricorn(ctx->fsys, *lastInteracted); return FALSE; } diff --git a/src/scrcmd_battle.c b/src/scrcmd_battle.c index 9762f92803..555f742a64 100644 --- a/src/scrcmd_battle.c +++ b/src/scrcmd_battle.c @@ -243,17 +243,17 @@ BOOL ScrCmd_223(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_224(SCRIPTCONTEXT *ctx) { - LocalMapObject **lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); - u32 mapObjectId = MapObject_GetID(*lastTalked); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + u32 mapObjectId = MapObject_GetID(*lastInteracted); TrainerFlagSet(ctx->fsys->savedata, (u16)mapObjectId); return FALSE; } BOOL ScrCmd_GotoIfTrainerDefeated(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - LocalMapObject **lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u32 offset = ScriptReadWord(ctx); - u32 mapObjectId = MapObject_GetID(*lastTalked); + u32 mapObjectId = MapObject_GetID(*lastInteracted); if (TrainerFlagCheck(fsys->savedata, (u16)mapObjectId) == TRUE) { ScriptJump(ctx, ctx->script_ptr + offset); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index ed4afe9e42..07b40fe16e 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -374,7 +374,7 @@ BOOL ScrCmd_GoTo(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_ObjectGoTo(SCRIPTCONTEXT* ctx) { - LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u8 id = ScriptReadByte(ctx); u32 offset_in_script = ScriptReadWord(ctx); @@ -1241,16 +1241,16 @@ void _RunObjectEventMovement(SysTask *task, struct ObjectMovementTaskEnv *env) { BOOL _WaitFollowPokePaused(SCRIPTCONTEXT *ctx); BOOL ScrCmd_LockAll(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_lastTalked; - LocalMapObject *tsurePoke; + LocalMapObject **p_lastInteracted; + LocalMapObject *followingPoke; FieldSystem *fsys = ctx->fsys; - p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); - if (*p_lastTalked == NULL) { + p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); + if (*p_lastInteracted == NULL) { MapObjectMan_PauseAllMovement(fsys->mapObjectMan); - tsurePoke = FollowingPokemon_GetMapObject(fsys); - if (FollowingPokemon_IsActive(fsys) && MapObject_IsSingleMovementActive(tsurePoke)) { - MapObject_UnpauseMovement(tsurePoke); + followingPoke = FollowingPokemon_GetMapObject(fsys); + if (FollowingPokemon_IsActive(fsys) && MapObject_IsSingleMovementActive(followingPoke)) { + MapObject_UnpauseMovement(followingPoke); SetupNativeScript(ctx, _WaitFollowPokePaused); return TRUE; } @@ -1282,7 +1282,7 @@ static inline void _ResetMovementPauseWaitFlags(void) { BOOL _WaitMovementPauseBeforeMsg(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); LocalMapObject *unk; @@ -1294,8 +1294,8 @@ BOOL _WaitMovementPauseBeforeMsg(SCRIPTCONTEXT *ctx) { } if (_CheckMovementPauseWaitFlag(4)) { - if (MapObject_IsSingleMovementActive(*p_lastTalked) == FALSE) { - MapObject_PauseMovement(*p_lastTalked); + if (MapObject_IsSingleMovementActive(*p_lastInteracted) == FALSE) { + MapObject_PauseMovement(*p_lastInteracted); _ClearMovementPauseWaitFlag(4); } } @@ -1309,7 +1309,7 @@ BOOL _WaitMovementPauseBeforeMsg(SCRIPTCONTEXT *ctx) { } if (_CheckMovementPauseWaitFlag(8)) { - unk = sub_020660C0(*p_lastTalked); + unk = sub_020660C0(*p_lastInteracted); if (MapObject_IsSingleMovementActive(unk) == FALSE) { MapObject_PauseMovement(unk); _ClearMovementPauseWaitFlag(8); @@ -1331,10 +1331,10 @@ BOOL _WaitFollowPokePaused(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_LockLastTalked(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); LocalMapObject *playerObject = PlayerAvatar_GetMapObject(fsys->playerAvatar); LocalMapObject *unk = sub_0205EEB4(fsys->mapObjectMan, 0x30); - LocalMapObject *unk2 = sub_020660C0(*p_lastTalked); + LocalMapObject *unk2 = sub_020660C0(*p_lastInteracted); MapObjectMan *mapObjectMan = fsys->mapObjectMan; _ResetMovementPauseWaitFlags(); @@ -1346,9 +1346,9 @@ BOOL ScrCmd_LockLastTalked(SCRIPTCONTEXT *ctx) { MapObject_UnpauseMovement(playerObject); } - if (MapObject_IsSingleMovementActive(*p_lastTalked) != FALSE) { + if (MapObject_IsSingleMovementActive(*p_lastInteracted) != FALSE) { _SetMovementPauseWaitFlag(4); - MapObject_UnpauseMovement(*p_lastTalked); + MapObject_UnpauseMovement(*p_lastInteracted); } if (unk != NULL && FollowingPokemon_IsActive(fsys) && MapObject_IsSingleMovementActive(unk) == FALSE) { @@ -1460,37 +1460,37 @@ BOOL ScrCmd_679(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_FacePlayer(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u32 rvsDir = sub_020611F4(PlayerAvatar_GetFacingDirection(fsys->playerAvatar)); - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); u32 oldDir; int x, y; int metatile; - if (*p_lastTalked == NULL) { + if (*p_lastInteracted == NULL) { return FALSE; } - oldDir = MapObject_GetFacingDirection(*p_lastTalked); - ov01_021F9408(*p_lastTalked, rvsDir); - if (MapObject_GetID(*p_lastTalked) == obj_partner_poke) { - if (ov01_022055DC(*p_lastTalked) && oldDir != rvsDir) { - ov01_02205604(*p_lastTalked, &x, &y); + oldDir = MapObject_GetFacingDirection(*p_lastInteracted); + ov01_021F9408(*p_lastInteracted, rvsDir); + if (MapObject_GetID(*p_lastInteracted) == obj_partner_poke) { + if (ov01_022055DC(*p_lastInteracted) && oldDir != rvsDir) { + ov01_02205604(*p_lastInteracted, &x, &y); metatile = GetMetatileBehaviorAt(fsys, x, y); if (rvsDir == 2 || rvsDir == 3) { if (sub_0205B6E8(metatile) == TRUE) { - ov01_021FF0E4(*p_lastTalked, 0, x, y, 1); + ov01_021FF0E4(*p_lastInteracted, 0, x, y, 1); } else if (sub_0205B6F4(metatile) == TRUE) { - ov01_021FF964(*p_lastTalked, 0, x, y, 1); + ov01_021FF964(*p_lastInteracted, 0, x, y, 1); } } if (sub_0205B6E8(metatile) == FALSE && sub_0205B6F4(metatile) == FALSE - && sub_02060E54(*p_lastTalked, metatile) == FALSE + && sub_02060E54(*p_lastInteracted, metatile) == FALSE && sub_0205B984(metatile) == FALSE && sub_0205B7A4(metatile) == FALSE - && sub_02060EBC(*p_lastTalked, metatile) == FALSE + && sub_02060EBC(*p_lastInteracted, metatile) == FALSE && sub_0205B8AC(metatile) == FALSE && sub_0205BA70(metatile) == FALSE ) { - MapObject_ClearFlagsBits(*p_lastTalked, MAPOBJECTFLAG_UNK20); + MapObject_ClearFlagsBits(*p_lastInteracted, MAPOBJECTFLAG_UNK20); } } } @@ -1883,10 +1883,10 @@ BOOL sub_02042C78(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_454(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC); - if (*p_lastTalked != NULL) { - ov26_022599D8(ctx->fsys, *p_lastTalked); + if (*p_lastInteracted != NULL) { + ov26_022599D8(ctx->fsys, *p_lastInteracted); } UnloadOverlayByID(FS_OVERLAY_ID(OVY_26)); return FALSE; @@ -2687,7 +2687,7 @@ BOOL ScrCmd_261(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_264(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 r4 = ScriptReadHalfword(ctx); PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys)); @@ -2695,7 +2695,7 @@ BOOL ScrCmd_264(SCRIPTCONTEXT *ctx) { u16 objId; if (r4 == 0) { - objId = MapObject_GetID(*p_lastTalked); + objId = MapObject_GetID(*p_lastInteracted); } else { objId = 0; } @@ -2722,11 +2722,11 @@ BOOL sub_020441C4(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_267(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u16 sp0 = ScriptReadHalfword(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); - *p_ret = sub_0205A750(ctx->fsys->unk80, MapObject_GetID(*p_lastTalked), sp0, *p_msgFmt); + *p_ret = sub_0205A750(ctx->fsys->unk80, MapObject_GetID(*p_lastInteracted), sp0, *p_msgFmt); return FALSE; } @@ -2742,18 +2742,18 @@ BOOL ScrCmd_586(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_268(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0205A200(fsys->unk80, MapObject_GetID(*p_lastTalked)); + *p_ret = sub_0205A200(fsys->unk80, MapObject_GetID(*p_lastInteracted)); return FALSE; } BOOL ScrCmd_274(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastTalked = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_TALKED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); u16 r7 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0205A284(fsys->unk80, MapObject_GetID(*p_lastTalked), r7); + *p_ret = sub_0205A284(fsys->unk80, MapObject_GetID(*p_lastInteracted), r7); return FALSE; } diff --git a/tools/nitrogfx/Makefile b/tools/nitrogfx/Makefile index 4963a9dcc8..c09aef9e0e 100644 --- a/tools/nitrogfx/Makefile +++ b/tools/nitrogfx/Makefile @@ -31,7 +31,7 @@ nitrogfx: $(OBJS) $(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $< clean: - $(RM) nitrogfx nitrogfx.exe $(OBJS) $(DEPDIR) + $(RM) -r nitrogfx nitrogfx.exe $(OBJS) $(DEPDIR) $(DEPDIR): ; @mkdir -p $@ From 76fac402ac1fea3cb1fb051f9e718a83e2d11752 Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Mon, 15 May 2023 04:22:47 +0100 Subject: [PATCH 06/11] SCRIPTENV_CAMERA_TARGET --- include/script.h | 4 ++-- src/fieldmap.c | 4 ++-- src/scrcmd_c.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/script.h b/include/script.h index a3c67e8056..dd3f74e7f2 100644 --- a/include/script.h +++ b/include/script.h @@ -57,7 +57,7 @@ typedef struct ScriptEnvironment { struct ListMenu2D *listMenu2D; int facingDirection; LocalMapObject *lastInteracted; - u32 cameraFocusObj; + u32 cameraTarget; LocalMapObject *unk_34; SCRIPTCONTEXT *scriptContexts[3]; MSGFMT *msgfmt; @@ -88,7 +88,7 @@ typedef enum ScriptEnvField { SCRIPTENV_ACTIVE_SCRIPT_NUMBER, SCRIPTENV_FACING_DIRECTION, SCRIPTENV_LAST_INTERACTED, - SCRIPTENV_CAMERA_FOCUS_OBJ = 11, + SCRIPTENV_CAMERA_TARGET, SCRIPTENV_34 = 12, SCRIPTENV_SCRCTX_0 = 13, SCRIPTENV_SCRCTX_1 = 14, diff --git a/src/fieldmap.c b/src/fieldmap.c index 93ae78f8a5..f8952a8551 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -239,8 +239,8 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->facingDirection; case SCRIPTENV_LAST_INTERACTED: return &environment->lastInteracted; - case SCRIPTENV_CAMERA_FOCUS_OBJ: - return &environment->cameraFocusObj; + case SCRIPTENV_CAMERA_TARGET: + return &environment->cameraTarget; case SCRIPTENV_34: return &environment->unk_34; case SCRIPTENV_SCRCTX_0: diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 07b40fe16e..a360345323 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1181,7 +1181,7 @@ LocalMapObject *sub_02041C70(FieldSystem *fsys, u16 person) { if (person == 0xF2) { return sub_0205EEB4(fsys->mapObjectMan, 0x30); } else if (person == 0xF1) { - LocalMapObject **attr = FieldSysGetAttrAddr(fsys, SCRIPTENV_CAMERA_FOCUS_OBJ); + LocalMapObject **attr = FieldSysGetAttrAddr(fsys, SCRIPTENV_CAMERA_TARGET); return *attr; } else { return GetMapObjectByID(fsys->mapObjectMan, person); @@ -1418,7 +1418,7 @@ BOOL ScrCmd_HidePerson(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_102(SCRIPTCONTEXT *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId); sub_02061070(*p_cameraObj); @@ -1431,7 +1431,7 @@ BOOL ScrCmd_102(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_103(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; MapObject_Remove(*p_cameraObj); pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fsys->mapObjectMan, obj_player)); @@ -1443,7 +1443,7 @@ BOOL ScrCmd_103(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_678(SCRIPTCONTEXT *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId); sub_02061070(*p_cameraObj); MapObject_SetFlag9(*p_cameraObj, TRUE); @@ -1452,7 +1452,7 @@ BOOL ScrCmd_678(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_679(SCRIPTCONTEXT *ctx) { - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); MapObject_Remove(*p_cameraObj); return FALSE; } From f631676bf71b46c86df979466a05f9db0f98aa1a Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 16 May 2023 00:56:50 +0100 Subject: [PATCH 07/11] SCRIPTENV_FIELD_34 --- include/script.h | 2 +- src/fieldmap.c | 2 +- src/scrcmd_c.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/script.h b/include/script.h index dd3f74e7f2..9825704592 100644 --- a/include/script.h +++ b/include/script.h @@ -89,7 +89,7 @@ typedef enum ScriptEnvField { SCRIPTENV_FACING_DIRECTION, SCRIPTENV_LAST_INTERACTED, SCRIPTENV_CAMERA_TARGET, - SCRIPTENV_34 = 12, + SCRIPTENV_FIELD_34, SCRIPTENV_SCRCTX_0 = 13, SCRIPTENV_SCRCTX_1 = 14, SCRIPTENV_SCRCTX_2 = 15, diff --git a/src/fieldmap.c b/src/fieldmap.c index f8952a8551..e86525740d 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -241,7 +241,7 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->lastInteracted; case SCRIPTENV_CAMERA_TARGET: return &environment->cameraTarget; - case SCRIPTENV_34: + case SCRIPTENV_FIELD_34: return &environment->unk_34; case SCRIPTENV_SCRCTX_0: case SCRIPTENV_SCRCTX_1: diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index a360345323..44735e73bc 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -3026,7 +3026,7 @@ BOOL ScrCmd_344(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_347(SCRIPTCONTEXT *ctx) { - u16 **r5 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_34); + u16 **r5 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FIELD_34); u16 r0 = ScriptGetVar(ctx); if (*r5 != NULL) { **r5 = r0; From f6c418d8d51580536b62961b1e165f053400533e Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 16 May 2023 01:28:20 +0100 Subject: [PATCH 08/11] script contexts --- include/script.h | 8 ++++---- src/fieldmap.c | 10 +++++----- src/scrcmd_c.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/script.h b/include/script.h index 9825704592..e8695c10e9 100644 --- a/include/script.h +++ b/include/script.h @@ -84,15 +84,15 @@ typedef enum ScriptEnvField { SCRIPTENV_ACTIVE_MOVEMENT_COUNTER, SCRIPTENV_FIELD_07, SCRIPTENV_FIELD_08, - SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT, + SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT, SCRIPTENV_ACTIVE_SCRIPT_NUMBER, SCRIPTENV_FACING_DIRECTION, SCRIPTENV_LAST_INTERACTED, SCRIPTENV_CAMERA_TARGET, SCRIPTENV_FIELD_34, - SCRIPTENV_SCRCTX_0 = 13, - SCRIPTENV_SCRCTX_1 = 14, - SCRIPTENV_SCRCTX_2 = 15, + SCRIPTENV_SCRIPT_CONTEXT_0, + SCRIPTENV_SCRIPT_CONTEXT_1, + SCRIPTENV_SCRIPT_CONTEXT_2, SCRIPTENV_MSGFMT = 16, SCRIPTENV_STRBUF1 = 17, SCRIPTENV_STRBUF2 = 18, diff --git a/src/fieldmap.c b/src/fieldmap.c index e86525740d..d8c7ab1ff0 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -231,7 +231,7 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->unk_7; case SCRIPTENV_FIELD_08: return &environment->unk_8; - case SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT: + case SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT: return &environment->activeScriptContextCount; case SCRIPTENV_ACTIVE_SCRIPT_NUMBER: return &environment->activeScriptNumber; @@ -243,10 +243,10 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv return &environment->cameraTarget; case SCRIPTENV_FIELD_34: return &environment->unk_34; - case SCRIPTENV_SCRCTX_0: - case SCRIPTENV_SCRCTX_1: - case SCRIPTENV_SCRCTX_2: - return &environment->scriptContexts[field - SCRIPTENV_SCRCTX_0]; + case SCRIPTENV_SCRIPT_CONTEXT_0: + case SCRIPTENV_SCRIPT_CONTEXT_1: + case SCRIPTENV_SCRIPT_CONTEXT_2: + return &environment->scriptContexts[field - SCRIPTENV_SCRIPT_CONTEXT_0]; case SCRIPTENV_MSGFMT: return &environment->msgfmt; case SCRIPTENV_STRBUF1: diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 44735e73bc..7230a22fea 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -318,8 +318,8 @@ BOOL ScrCmd_CompareVarToVar(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RunScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); - SCRIPTCONTEXT** new_context_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_1); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + SCRIPTCONTEXT** new_context_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT_CONTEXT_1); u16 script_to_run = ScriptReadHalfword(ctx); *new_context_ptr = CreateScriptContext(fsys, script_to_run); @@ -333,8 +333,8 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); - SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_0 + *num_active_script_contexts); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT_CONTEXT_0 + *num_active_script_contexts); u16 script_to_run = ScriptReadHalfword(ctx); SCRIPTCONTEXT* new_context = CreateScriptContext(fsys, script_to_run); @@ -352,7 +352,7 @@ BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); return (*unk & (1 << ctx->id)) == 0; } @@ -360,7 +360,7 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RestartCurrentScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); *unk ^= (1 << (ctx->id - 1)); return FALSE; From 0e71a8a8d11d552521d6539cc64a619a9a7aeaca Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 16 May 2023 05:36:43 +0100 Subject: [PATCH 09/11] rename MSGFMT to MessageFormat --- CMakeLists.txt | 20 ++ asm/include/overlay_01_021EDAFC.inc | 4 +- asm/include/overlay_01_021F3F50.inc | 4 +- asm/include/overlay_01_021F6CFC.inc | 4 +- asm/include/overlay_01_021FC66C.inc | 4 +- asm/include/overlay_02.inc | 4 +- asm/include/overlay_03.inc | 6 +- asm/include/overlay_05.inc | 4 +- asm/include/overlay_08.inc | 4 +- asm/include/overlay_101.inc | 4 +- asm/include/overlay_102.inc | 4 +- asm/include/overlay_103.inc | 4 +- asm/include/overlay_108.inc | 4 +- asm/include/overlay_109.inc | 4 +- asm/include/overlay_110.inc | 4 +- asm/include/overlay_111.inc | 4 +- asm/include/overlay_112.inc | 6 +- asm/include/overlay_113.inc | 4 +- asm/include/overlay_115.inc | 4 +- asm/include/overlay_117.inc | 4 +- asm/include/overlay_121.inc | 4 +- asm/include/overlay_12_022378C0.inc | 4 +- asm/include/overlay_14.inc | 4 +- asm/include/overlay_15.inc | 4 +- asm/include/overlay_17.inc | 4 +- asm/include/overlay_18.inc | 4 +- asm/include/overlay_19.inc | 4 +- asm/include/overlay_27.inc | 4 +- asm/include/overlay_30.inc | 4 +- asm/include/overlay_31.inc | 4 +- asm/include/overlay_32.inc | 4 +- asm/include/overlay_34.inc | 4 +- asm/include/overlay_37.inc | 4 +- asm/include/overlay_39_thumb.inc | 6 +- asm/include/overlay_40.inc | 6 +- asm/include/overlay_41.inc | 4 +- asm/include/overlay_43.inc | 4 +- asm/include/overlay_44.inc | 4 +- asm/include/overlay_45_thumb.inc | 4 +- asm/include/overlay_46.inc | 4 +- asm/include/overlay_47.inc | 4 +- asm/include/overlay_48.inc | 6 +- asm/include/overlay_49.inc | 6 +- asm/include/overlay_53.inc | 4 +- asm/include/overlay_59.inc | 4 +- asm/include/overlay_63.inc | 4 +- asm/include/overlay_64.inc | 4 +- asm/include/overlay_65.inc | 6 +- asm/include/overlay_67.inc | 4 +- asm/include/overlay_68.inc | 4 +- asm/include/overlay_69.inc | 4 +- asm/include/overlay_70.inc | 6 +- asm/include/overlay_71.inc | 4 +- asm/include/overlay_72.inc | 4 +- asm/include/overlay_73.inc | 6 +- asm/include/overlay_74_thumb.inc | 4 +- asm/include/overlay_75.inc | 4 +- asm/include/overlay_78.inc | 4 +- asm/include/overlay_80_0222A84C.inc | 4 +- asm/include/overlay_81.inc | 4 +- asm/include/overlay_82.inc | 4 +- asm/include/overlay_83.inc | 4 +- asm/include/overlay_85.inc | 4 +- asm/include/overlay_86.inc | 4 +- asm/include/overlay_87.inc | 4 +- asm/include/overlay_89.inc | 4 +- asm/include/overlay_90.inc | 6 +- asm/include/overlay_91.inc | 4 +- asm/include/overlay_93_thumb_1.inc | 4 +- asm/include/overlay_95.inc | 4 +- asm/include/overlay_96.inc | 4 +- asm/include/overlay_97.inc | 4 +- asm/include/overlay_98.inc | 4 +- asm/include/overlay_trainer_card_main.inc | 4 +- .../overlay_trainer_card_signature.inc | 4 +- asm/include/scrcmd_9.inc | 2 +- asm/include/scrcmd_message.inc | 2 +- asm/include/unk_02058AEC.inc | 4 +- asm/include/unk_020755E8.inc | 4 +- asm/include/unk_02078E30.inc | 4 +- asm/include/unk_02082908.inc | 4 +- asm/include/unk_02088288.inc | 4 +- asm/include/unk_0208E600.inc | 4 +- asm/include/unk_020961D8.inc | 4 +- asm/overlay_01_021EDAFC.s | 12 +- asm/overlay_01_021F3F50.s | 8 +- asm/overlay_01_021F6CFC.s | 4 +- asm/overlay_01_021FC66C.s | 4 +- asm/overlay_02.s | 8 +- asm/overlay_03.s | 28 +-- asm/overlay_05.s | 8 +- asm/overlay_08.s | 8 +- asm/overlay_101.s | 20 +- asm/overlay_102.s | 4 +- asm/overlay_103.s | 4 +- asm/overlay_108.s | 8 +- asm/overlay_109.s | 4 +- asm/overlay_110.s | 4 +- asm/overlay_111.s | 4 +- asm/overlay_112.s | 12 +- asm/overlay_113.s | 4 +- asm/overlay_115.s | 8 +- asm/overlay_117.s | 4 +- asm/overlay_121.s | 4 +- asm/overlay_12_022378C0.s | 4 +- asm/overlay_14.s | 4 +- asm/overlay_15.s | 4 +- asm/overlay_17.s | 4 +- asm/overlay_18.s | 8 +- asm/overlay_19.s | 4 +- asm/overlay_27.s | 8 +- asm/overlay_30.s | 4 +- asm/overlay_31.s | 4 +- asm/overlay_32.s | 4 +- asm/overlay_34.s | 4 +- asm/overlay_37.s | 4 +- asm/overlay_39_thumb.s | 8 +- asm/overlay_40.s | 70 +++---- asm/overlay_41.s | 4 +- asm/overlay_43.s | 4 +- asm/overlay_44.s | 12 +- asm/overlay_45_thumb.s | 4 +- asm/overlay_46.s | 4 +- asm/overlay_47.s | 4 +- asm/overlay_48.s | 6 +- asm/overlay_49.s | 8 +- asm/overlay_53.s | 8 +- asm/overlay_59.s | 8 +- asm/overlay_63.s | 4 +- asm/overlay_64.s | 4 +- asm/overlay_65.s | 16 +- asm/overlay_67.s | 4 +- asm/overlay_68.s | 4 +- asm/overlay_69.s | 4 +- asm/overlay_70.s | 6 +- asm/overlay_71.s | 4 +- asm/overlay_72.s | 4 +- asm/overlay_73.s | 8 +- asm/overlay_74_thumb.s | 64 +++--- asm/overlay_75.s | 4 +- asm/overlay_78.s | 4 +- asm/overlay_80_0222A84C.s | 4 +- asm/overlay_81.s | 4 +- asm/overlay_82.s | 4 +- asm/overlay_83.s | 8 +- asm/overlay_85.s | 8 +- asm/overlay_86.s | 4 +- asm/overlay_87.s | 4 +- asm/overlay_89.s | 4 +- asm/overlay_90.s | 8 +- asm/overlay_91.s | 4 +- asm/overlay_93_thumb_1.s | 4 +- asm/overlay_95.s | 8 +- asm/overlay_96.s | 76 +++---- asm/overlay_97.s | 4 +- asm/overlay_98.s | 4 +- asm/overlay_trainer_card_main.s | 12 +- asm/overlay_trainer_card_signature.s | 4 +- asm/scrcmd_9.s | 2 +- asm/scrcmd_message.s | 2 +- asm/unk_02058AEC.s | 8 +- asm/unk_020755E8.s | 4 +- asm/unk_02078E30.s | 4 +- asm/unk_02082908.s | 4 +- asm/unk_02088288.s | 4 +- asm/unk_0208E600.s | 4 +- asm/unk_020961D8.s | 4 +- include/battle_arcade_game_board.h | 4 +- include/bug_contest.h | 4 +- include/get_egg.h | 12 +- include/message_format.h | 97 +++++++++ include/msgdata.h | 4 +- include/msgfmt.h | 97 --------- include/overlay_01.h | 4 +- include/overlay_03.h | 4 +- include/overlay_94.h | 2 +- include/script.h | 2 +- include/unk_0205A44C.h | 8 +- include/unk_0205B3DC.h | 4 +- include/voltorb_flip/voltorb_flip_work.h | 2 +- main.lsf | 2 +- src/bag_view.c | 16 +- src/battle_arcade_game_board.c | 12 +- src/communication_error.c | 9 +- src/field_black_out.c | 6 +- src/fieldmap.c | 4 +- src/game_clear.c | 4 +- src/get_egg.c | 26 +-- src/mail_message.c | 8 +- src/{msgfmt.c => message_format.c} | 186 +++++++++--------- src/msgdata.c | 7 +- src/overlay_bug_contest.c | 6 +- src/scrcmd_8.c | 2 +- src/scrcmd_c.c | 38 ++-- src/scrcmd_daycare.c | 12 +- src/scrcmd_lottery.c | 2 +- src/scrcmd_pokemon_misc.c | 34 ++-- src/scrcmd_size_record.c | 2 +- src/scrcmd_strbuf.c | 86 ++++---- src/unk_0205B3DC.c | 3 +- src/voltorb_flip/voltorb_flip.c | 7 +- 201 files changed, 906 insertions(+), 864 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 include/message_format.h delete mode 100644 include/msgfmt.h rename src/{msgfmt.c => message_format.c} (77%) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..b5b3472059 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required (VERSION 3.15) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") +set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") +project(PokeHeartGold) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_C_STANDARD 11) + +enable_language(ASM) + +if(APPLE) + include_directories(/usr/local/include) +endif(APPLE) + +add_compile_options(-fms-extensions) + +file(GLOB_RECURSE SOURCES "*.c" "*.cpp" "*.s") + +add_executable(PokeHeartGold ${SOURCES}) +target_include_directories(PokeHeartGold PRIVATE include files lib/include lib/include/cw lib/include/nitro lib/include/nnsys lib/include/nitro/os) +target_compile_definitions(PokeHeartGold PUBLIC __CLION_IDE__) diff --git a/asm/include/overlay_01_021EDAFC.inc b/asm/include/overlay_01_021EDAFC.inc index e5c4f1a751..4386864c52 100644 --- a/asm/include/overlay_01_021EDAFC.inc +++ b/asm/include/overlay_01_021EDAFC.inc @@ -17,8 +17,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferIntegerAsString .public StringExpandPlaceholders .public CreateSysTask diff --git a/asm/include/overlay_01_021F3F50.inc b/asm/include/overlay_01_021F3F50.inc index 072d7251fa..bcd08a1c43 100644 --- a/asm/include/overlay_01_021F3F50.inc +++ b/asm/include/overlay_01_021F3F50.inc @@ -9,8 +9,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferLandmarkName diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc index 516151429b..46ec609fd0 100644 --- a/asm/include/overlay_01_021F6CFC.inc +++ b/asm/include/overlay_01_021F6CFC.inc @@ -3,8 +3,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public StringExpandPlaceholders .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc index 0a45678d0c..0b8dc09a8b 100644 --- a/asm/include/overlay_01_021FC66C.inc +++ b/asm/include/overlay_01_021FC66C.inc @@ -4,8 +4,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public StringExpandPlaceholders .public CreateSysTask .public DestroySysTask diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 10f80ab964..79f88509e2 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -45,8 +45,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonSpeciesName .public BufferBoxMonNickname diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 944f1e8c43..e1f10467ae 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -24,9 +24,9 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferIntegerAsString diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index a6b69f6d28..477c7b03c2 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -25,8 +25,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonNickname .public StringExpandPlaceholders .public MessagePrinter_new diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index 9d1a3f0798..bfc6fd1a40 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -23,8 +23,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonNickname .public BufferIntegerAsString diff --git a/asm/include/overlay_101.inc b/asm/include/overlay_101.inc index eb496dbd63..9dbda0e8bf 100644 --- a/asm/include/overlay_101.inc +++ b/asm/include/overlay_101.inc @@ -42,8 +42,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferSpeciesName diff --git a/asm/include/overlay_102.inc b/asm/include/overlay_102.inc index 015df7bc18..6ffc145951 100644 --- a/asm/include/overlay_102.inc +++ b/asm/include/overlay_102.inc @@ -31,8 +31,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPocketName .public StringExpandPlaceholders .public sub_0200DD88 diff --git a/asm/include/overlay_103.inc b/asm/include/overlay_103.inc index 415af4254f..bb4ab1418f 100644 --- a/asm/include/overlay_103.inc +++ b/asm/include/overlay_103.inc @@ -25,8 +25,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_108.inc b/asm/include/overlay_108.inc index ad870428d6..0dcbc0c5e8 100644 --- a/asm/include/overlay_108.inc +++ b/asm/include/overlay_108.inc @@ -42,8 +42,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_109.inc b/asm/include/overlay_109.inc index 1fcd2cad70..09cb593119 100644 --- a/asm/include/overlay_109.inc +++ b/asm/include/overlay_109.inc @@ -20,8 +20,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferIntegerAsString diff --git a/asm/include/overlay_110.inc b/asm/include/overlay_110.inc index a2cfef3f3a..26b9045525 100644 --- a/asm/include/overlay_110.inc +++ b/asm/include/overlay_110.inc @@ -28,8 +28,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public sub_0200CF18 .public sub_0200CF38 .public sub_0200CF70 diff --git a/asm/include/overlay_111.inc b/asm/include/overlay_111.inc index 09b7f36ce6..eeccd24d42 100644 --- a/asm/include/overlay_111.inc +++ b/asm/include/overlay_111.inc @@ -18,8 +18,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public MessagePrinter_new .public MessagePrinter_delete diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc index 2250c2add8..78fcf8ee40 100644 --- a/asm/include/overlay_112.inc +++ b/asm/include/overlay_112.inc @@ -60,9 +60,9 @@ .public GetSpeciesNameIntoArray .public ReadMsgData_ExpandPlaceholders .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferSpeciesName .public BufferBoxMonNickname diff --git a/asm/include/overlay_113.inc b/asm/include/overlay_113.inc index 52acd307c9..15a2dcef75 100644 --- a/asm/include/overlay_113.inc +++ b/asm/include/overlay_113.inc @@ -22,8 +22,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferIntegerAsString .public StringExpandPlaceholders .public sub_0200CF18 diff --git a/asm/include/overlay_115.inc b/asm/include/overlay_115.inc index c6652eeb68..fdf2a229fb 100644 --- a/asm/include/overlay_115.inc +++ b/asm/include/overlay_115.inc @@ -7,8 +7,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferRivalsName .public BufferTrainerName .public StringExpandPlaceholders diff --git a/asm/include/overlay_117.inc b/asm/include/overlay_117.inc index d1cb959d1f..cf4407242e 100644 --- a/asm/include/overlay_117.inc +++ b/asm/include/overlay_117.inc @@ -7,8 +7,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferTrainerName .public StringExpandPlaceholders .public BeginNormalPaletteFade diff --git a/asm/include/overlay_121.inc b/asm/include/overlay_121.inc index 7f5ab5040b..7d41a4504e 100644 --- a/asm/include/overlay_121.inc +++ b/asm/include/overlay_121.inc @@ -29,8 +29,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_12_022378C0.inc b/asm/include/overlay_12_022378C0.inc index e128aab4a6..6a0278a146 100644 --- a/asm/include/overlay_12_022378C0.inc +++ b/asm/include/overlay_12_022378C0.inc @@ -42,8 +42,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public MessagePrinter_new .public MessagePrinter_delete .public sub_0200CF18 diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index e1c71e610b..6f61d23e59 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -38,8 +38,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public BufferBoxMonNickname .public BufferIntegerAsString diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 3f7834404e..2dc8e42518 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -31,8 +31,8 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferMoveName diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index 2dc78c068f..5b80d04599 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -23,8 +23,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferItemName diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 59f45935a3..c71ab0b6d4 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -63,8 +63,8 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferLandmarkName diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index 0ab529d1fb..de24d33a76 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -13,8 +13,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferIntegerAsString diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index 49292dc0de..00102d1046 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -34,8 +34,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public sub_0200DDC4 diff --git a/asm/include/overlay_30.inc b/asm/include/overlay_30.inc index f462bb1923..e88a9f9112 100644 --- a/asm/include/overlay_30.inc +++ b/asm/include/overlay_30.inc @@ -12,8 +12,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public LoadUserFrameGfx2 .public DrawFrameAndWindow2 diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 010477ff56..9271a863fe 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -15,8 +15,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferIntegerAsString .public BufferItemName .public BufferItemNameWithIndefArticle diff --git a/asm/include/overlay_32.inc b/asm/include/overlay_32.inc index 55a81912e1..c6e9358d04 100644 --- a/asm/include/overlay_32.inc +++ b/asm/include/overlay_32.inc @@ -28,8 +28,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 378bca3a1c..38d290c3cc 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -24,8 +24,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public MailMsg_GetExpandedString diff --git a/asm/include/overlay_37.inc b/asm/include/overlay_37.inc index 37fa76deb4..b632e9fba1 100644 --- a/asm/include/overlay_37.inc +++ b/asm/include/overlay_37.inc @@ -31,8 +31,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public StringExpandPlaceholders .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_39_thumb.inc b/asm/include/overlay_39_thumb.inc index 6dc55e98bc..87d800bfd9 100644 --- a/asm/include/overlay_39_thumb.inc +++ b/asm/include/overlay_39_thumb.inc @@ -21,9 +21,9 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferIntegerAsString .public StringExpandPlaceholders .public sub_0200E33C diff --git a/asm/include/overlay_40.inc b/asm/include/overlay_40.inc index 8ea2b99edf..e7b6bdbf2e 100644 --- a/asm/include/overlay_40.inc +++ b/asm/include/overlay_40.inc @@ -41,15 +41,15 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public GetSpeciesNameIntoArray -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferCountryName .public BufferCityName .public BufferECWord .public BufferMonthNameAbbr .public StringExpandPlaceholders -.public ScrStrBufs_ResetBuffers +.public MessageFormat_ResetBuffers .public sub_0200CF18 .public sub_0200CF38 .public sub_0200CF6C diff --git a/asm/include/overlay_41.inc b/asm/include/overlay_41.inc index ebc47d79d1..7d5e3cce95 100644 --- a/asm/include/overlay_41.inc +++ b/asm/include/overlay_41.inc @@ -64,8 +64,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferECWord .public StringExpandPlaceholders .public sub_0200E374 diff --git a/asm/include/overlay_43.inc b/asm/include/overlay_43.inc index fdf5c0066f..292b8c42e1 100644 --- a/asm/include/overlay_43.inc +++ b/asm/include/overlay_43.inc @@ -50,8 +50,8 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferWiFiPlazaActivityName diff --git a/asm/include/overlay_44.inc b/asm/include/overlay_44.inc index 0bda6df137..1a18904198 100644 --- a/asm/include/overlay_44.inc +++ b/asm/include/overlay_44.inc @@ -67,8 +67,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferWiFiPlazaActivityName diff --git a/asm/include/overlay_45_thumb.inc b/asm/include/overlay_45_thumb.inc index 4d84b77fef..f0460286a3 100644 --- a/asm/include/overlay_45_thumb.inc +++ b/asm/include/overlay_45_thumb.inc @@ -22,8 +22,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferWiFiPlazaActivityName diff --git a/asm/include/overlay_46.inc b/asm/include/overlay_46.inc index 4975e9ad86..ba42711109 100644 --- a/asm/include/overlay_46.inc +++ b/asm/include/overlay_46.inc @@ -17,8 +17,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferIntegerAsString .public StringExpandPlaceholders .public sub_0200E33C diff --git a/asm/include/overlay_47.inc b/asm/include/overlay_47.inc index 8def7f676d..72698733a1 100644 --- a/asm/include/overlay_47.inc +++ b/asm/include/overlay_47.inc @@ -41,8 +41,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public StringExpandPlaceholders .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_48.inc b/asm/include/overlay_48.inc index ff567e9c9d..b40ccf34b3 100644 --- a/asm/include/overlay_48.inc +++ b/asm/include/overlay_48.inc @@ -40,12 +40,12 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferCountryName .public BufferCityName .public StringExpandPlaceholders -.public ScrStrBufs_ResetBuffers +.public MessageFormat_ResetBuffers .public sub_0200E374 .public DestroySysTask .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_49.inc b/asm/include/overlay_49.inc index daf3b552a6..22ce873a7b 100644 --- a/asm/include/overlay_49.inc +++ b/asm/include/overlay_49.inc @@ -55,8 +55,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferTypeName @@ -73,7 +73,7 @@ .public BufferDEGreeting .public BufferSPGreeting .public StringExpandPlaceholders -.public ScrStrBufs_ResetBuffers +.public MessageFormat_ResetBuffers .public sub_0200E374 .public DestroySysTask .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_53.inc b/asm/include/overlay_53.inc index 7df5964600..29eeecdf0d 100644 --- a/asm/include/overlay_53.inc +++ b/asm/include/overlay_53.inc @@ -39,8 +39,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public StringExpandPlaceholders .public sub_0200CF18 diff --git a/asm/include/overlay_59.inc b/asm/include/overlay_59.inc index bab6a0a909..ed6ed87887 100644 --- a/asm/include/overlay_59.inc +++ b/asm/include/overlay_59.inc @@ -32,8 +32,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferItemName diff --git a/asm/include/overlay_63.inc b/asm/include/overlay_63.inc index a627b7012a..9398c3255e 100644 --- a/asm/include/overlay_63.inc +++ b/asm/include/overlay_63.inc @@ -24,8 +24,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonSpeciesName .public BufferBoxMonNickname diff --git a/asm/include/overlay_64.inc b/asm/include/overlay_64.inc index 7f1b7f6186..3d2f7b6a8f 100644 --- a/asm/include/overlay_64.inc +++ b/asm/include/overlay_64.inc @@ -21,8 +21,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferIntegerAsString .public BufferMonthNameAbbr .public StringExpandPlaceholders diff --git a/asm/include/overlay_65.inc b/asm/include/overlay_65.inc index 0cb00b171e..7444d69d54 100644 --- a/asm/include/overlay_65.inc +++ b/asm/include/overlay_65.inc @@ -49,9 +49,9 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonNickname .public LoadUserFrameGfx1 diff --git a/asm/include/overlay_67.inc b/asm/include/overlay_67.inc index 9ae314f0bb..613235e291 100644 --- a/asm/include/overlay_67.inc +++ b/asm/include/overlay_67.inc @@ -18,8 +18,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferCountryName diff --git a/asm/include/overlay_68.inc b/asm/include/overlay_68.inc index 7e1f3b265c..a9937fa018 100644 --- a/asm/include/overlay_68.inc +++ b/asm/include/overlay_68.inc @@ -32,8 +32,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonSpeciesName .public BufferBoxMonNickname diff --git a/asm/include/overlay_69.inc b/asm/include/overlay_69.inc index e8ee23915b..953349252a 100644 --- a/asm/include/overlay_69.inc +++ b/asm/include/overlay_69.inc @@ -26,8 +26,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferCountryName .public BufferCityName .public StringExpandPlaceholders diff --git a/asm/include/overlay_70.inc b/asm/include/overlay_70.inc index dae2baae70..5ffa1058ac 100644 --- a/asm/include/overlay_70.inc +++ b/asm/include/overlay_70.inc @@ -53,15 +53,15 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public BufferBoxMonNickname .public BufferIntegerAsString .public BufferCountryName .public BufferCityName .public StringExpandPlaceholders -.public ScrStrBufs_ResetBuffers +.public MessageFormat_ResetBuffers .public MessagePrinter_new .public MessagePrinter_delete .public sub_0200CDAC diff --git a/asm/include/overlay_71.inc b/asm/include/overlay_71.inc index 9d5001d5b2..66a31e09d2 100644 --- a/asm/include/overlay_71.inc +++ b/asm/include/overlay_71.inc @@ -41,8 +41,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonNickname .public StringExpandPlaceholders diff --git a/asm/include/overlay_72.inc b/asm/include/overlay_72.inc index 00065f5883..99ef79a171 100644 --- a/asm/include/overlay_72.inc +++ b/asm/include/overlay_72.inc @@ -39,8 +39,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferIntegerAsString .public StringExpandPlaceholders .public sub_0200E33C diff --git a/asm/include/overlay_73.inc b/asm/include/overlay_73.inc index 473497789f..4d814aecf3 100644 --- a/asm/include/overlay_73.inc +++ b/asm/include/overlay_73.inc @@ -44,9 +44,9 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_74_thumb.inc b/asm/include/overlay_74_thumb.inc index 91af68888e..8424ce38c8 100644 --- a/asm/include/overlay_74_thumb.inc +++ b/asm/include/overlay_74_thumb.inc @@ -53,8 +53,8 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferIntegerAsString diff --git a/asm/include/overlay_75.inc b/asm/include/overlay_75.inc index 3979748c0d..e707646e86 100644 --- a/asm/include/overlay_75.inc +++ b/asm/include/overlay_75.inc @@ -32,8 +32,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_78.inc b/asm/include/overlay_78.inc index 8f35c03069..3c260d262f 100644 --- a/asm/include/overlay_78.inc +++ b/asm/include/overlay_78.inc @@ -16,8 +16,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonNickname .public StringExpandPlaceholders diff --git a/asm/include/overlay_80_0222A84C.inc b/asm/include/overlay_80_0222A84C.inc index 455123fc0b..074834cb37 100644 --- a/asm/include/overlay_80_0222A84C.inc +++ b/asm/include/overlay_80_0222A84C.inc @@ -3,8 +3,8 @@ .public AllocAndReadWholeNarcMemberByIdPair .public NewMsgDataFromNarc .public DestroyMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public AllocFromHeap .public FreeToHeap .public GF_AssertFail diff --git a/asm/include/overlay_81.inc b/asm/include/overlay_81.inc index 11098ee8fa..dfc9cbcebf 100644 --- a/asm/include/overlay_81.inc +++ b/asm/include/overlay_81.inc @@ -64,8 +64,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_82.inc b/asm/include/overlay_82.inc index 7aee8382ea..13c1bc3b14 100644 --- a/asm/include/overlay_82.inc +++ b/asm/include/overlay_82.inc @@ -46,8 +46,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferIntegerAsString .public BufferTypeName .public StringExpandPlaceholders diff --git a/asm/include/overlay_83.inc b/asm/include/overlay_83.inc index e1b74449bd..1dfac64086 100644 --- a/asm/include/overlay_83.inc +++ b/asm/include/overlay_83.inc @@ -55,8 +55,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonSpeciesName .public BufferBoxMonNickname diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index 555d4b26bc..7a835d7723 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -59,8 +59,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferItemName diff --git a/asm/include/overlay_86.inc b/asm/include/overlay_86.inc index 60f10d68d6..9c8b66c8b2 100644 --- a/asm/include/overlay_86.inc +++ b/asm/include/overlay_86.inc @@ -26,8 +26,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_87.inc b/asm/include/overlay_87.inc index a987e24bcb..4dcc288e12 100644 --- a/asm/include/overlay_87.inc +++ b/asm/include/overlay_87.inc @@ -45,8 +45,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferIntegerAsString .public BufferItemName .public StringExpandPlaceholders diff --git a/asm/include/overlay_89.inc b/asm/include/overlay_89.inc index f4460107cc..0a1a1296e2 100644 --- a/asm/include/overlay_89.inc +++ b/asm/include/overlay_89.inc @@ -37,8 +37,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public StringExpandPlaceholders .public sub_0200CF18 diff --git a/asm/include/overlay_90.inc b/asm/include/overlay_90.inc index ae07f80278..a4385ec668 100644 --- a/asm/include/overlay_90.inc +++ b/asm/include/overlay_90.inc @@ -41,8 +41,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public BufferCountryName @@ -50,7 +50,7 @@ .public BufferWiFiPlazaActivityName .public BufferWiFiPlazaInstrumentName .public StringExpandPlaceholders -.public ScrStrBufs_ResetBuffers +.public MessageFormat_ResetBuffers .public CreateSysTask .public sub_0200E374 .public DestroySysTask diff --git a/asm/include/overlay_91.inc b/asm/include/overlay_91.inc index f6756dda07..5e6e0fef52 100644 --- a/asm/include/overlay_91.inc +++ b/asm/include/overlay_91.inc @@ -40,8 +40,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public LoadUserFrameGfx1 .public DrawFrameAndWindow1 .public sub_0200E5D4 diff --git a/asm/include/overlay_93_thumb_1.inc b/asm/include/overlay_93_thumb_1.inc index 76fc49bea4..4f02018f27 100644 --- a/asm/include/overlay_93_thumb_1.inc +++ b/asm/include/overlay_93_thumb_1.inc @@ -34,8 +34,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public sub_0200CF18 .public sub_0200CF38 .public sub_0200CF6C diff --git a/asm/include/overlay_95.inc b/asm/include/overlay_95.inc index 9db653adf3..141d352c60 100644 --- a/asm/include/overlay_95.inc +++ b/asm/include/overlay_95.inc @@ -44,8 +44,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public StringExpandPlaceholders .public sub_0200CF18 diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index c666e14ad6..43627a7c7a 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -85,8 +85,8 @@ .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferPlayersName .public BufferIntegerAsString diff --git a/asm/include/overlay_97.inc b/asm/include/overlay_97.inc index d2d1e13228..c83e3ec8bf 100644 --- a/asm/include/overlay_97.inc +++ b/asm/include/overlay_97.inc @@ -32,8 +32,8 @@ .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders .public GetSpeciesName -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferPokeathlonCourseName .public BeginNormalPaletteFade diff --git a/asm/include/overlay_98.inc b/asm/include/overlay_98.inc index c1b1d38a49..29b4443ec1 100644 --- a/asm/include/overlay_98.inc +++ b/asm/include/overlay_98.inc @@ -16,8 +16,8 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferIntegerAsString .public StringExpandPlaceholders diff --git a/asm/include/overlay_trainer_card_main.inc b/asm/include/overlay_trainer_card_main.inc index d4608800c6..7a0a327045 100644 --- a/asm/include/overlay_trainer_card_main.inc +++ b/asm/include/overlay_trainer_card_main.inc @@ -42,8 +42,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferString .public BufferIntegerAsString .public BufferMonthNameAbbr diff --git a/asm/include/overlay_trainer_card_signature.inc b/asm/include/overlay_trainer_card_signature.inc index a5b83764c3..e309d3e2d3 100644 --- a/asm/include/overlay_trainer_card_signature.inc +++ b/asm/include/overlay_trainer_card_signature.inc @@ -36,8 +36,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public StringExpandPlaceholders .public LoadUserFrameGfx1 .public LoadUserFrameGfx2 diff --git a/asm/include/scrcmd_9.inc b/asm/include/scrcmd_9.inc index 860cba966c..c7327e0d5c 100644 --- a/asm/include/scrcmd_9.inc +++ b/asm/include/scrcmd_9.inc @@ -7,7 +7,7 @@ .public ReadMsgDataIntoString .public NewString_ReadMsgData .public GetSpeciesNameIntoArray -.public ScrStrBufs_new_custom +.public MessageFormat_new_custom .public BufferString .public BufferIntegerAsString .public AllocFromHeap diff --git a/asm/include/scrcmd_message.inc b/asm/include/scrcmd_message.inc index 2fc06e156f..85e7e09636 100644 --- a/asm/include/scrcmd_message.inc +++ b/asm/include/scrcmd_message.inc @@ -3,7 +3,7 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_delete +.public MessageFormat_delete .public StringExpandPlaceholders .public MailMsg_init .public MailMsg_GetExpandedString diff --git a/asm/include/unk_02058AEC.inc b/asm/include/unk_02058AEC.inc index 4d97930fbb..dbb38a2783 100644 --- a/asm/include/unk_02058AEC.inc +++ b/asm/include/unk_02058AEC.inc @@ -4,8 +4,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferPlayersName .public BufferBoxMonSpeciesName .public StringExpandPlaceholders diff --git a/asm/include/unk_020755E8.inc b/asm/include/unk_020755E8.inc index 70783f41af..520eaa799d 100644 --- a/asm/include/unk_020755E8.inc +++ b/asm/include/unk_020755E8.inc @@ -48,8 +48,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public BufferBoxMonNickname .public BufferMoveName diff --git a/asm/include/unk_02078E30.inc b/asm/include/unk_02078E30.inc index 39eac932e1..0e90a17d77 100644 --- a/asm/include/unk_02078E30.inc +++ b/asm/include/unk_02078E30.inc @@ -24,8 +24,8 @@ .public DestroyMsgData .public ReadMsgDataIntoString .public NewString_ReadMsgData -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonNickname .public BufferIntegerAsString .public BufferItemName diff --git a/asm/include/unk_02082908.inc b/asm/include/unk_02082908.inc index 1dc6e51646..cc3eff799e 100644 --- a/asm/include/unk_02082908.inc +++ b/asm/include/unk_02082908.inc @@ -47,8 +47,8 @@ .public DestroyMsgData .public NewString_ReadMsgData .public ReadMsgData_ExpandPlaceholders -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferString .public BufferBoxMonSpeciesName .public BufferPCBoxName diff --git a/asm/include/unk_02088288.inc b/asm/include/unk_02088288.inc index 040518ca50..2a64a3163d 100644 --- a/asm/include/unk_02088288.inc +++ b/asm/include/unk_02088288.inc @@ -24,8 +24,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public BufferBoxMonSpeciesName .public BufferBoxMonNickname .public BufferBoxMonOTName diff --git a/asm/include/unk_0208E600.inc b/asm/include/unk_0208E600.inc index 9aef719add..6eef2eb142 100644 --- a/asm/include/unk_0208E600.inc +++ b/asm/include/unk_0208E600.inc @@ -3,8 +3,8 @@ .public NewMsgDataFromNarc .public DestroyMsgData .public ReadMsgDataIntoString -.public ScrStrBufs_new_custom -.public ScrStrBufs_delete +.public MessageFormat_new_custom +.public MessageFormat_delete .public BufferIntegerAsString .public BufferLocationName .public BufferMonthNameAbbr diff --git a/asm/include/unk_020961D8.inc b/asm/include/unk_020961D8.inc index 7c4e46ebaa..743498255c 100644 --- a/asm/include/unk_020961D8.inc +++ b/asm/include/unk_020961D8.inc @@ -1,7 +1,7 @@ #include #pragma once -.public ScrStrBufs_new -.public ScrStrBufs_delete +.public MessageFormat_new +.public MessageFormat_delete .public IsPaletteFadeFinished .public MailMsg_init_withBank .public AllocFromHeap diff --git a/asm/overlay_01_021EDAFC.s b/asm/overlay_01_021EDAFC.s index 12cc95ea07..1377b2023e 100644 --- a/asm/overlay_01_021EDAFC.s +++ b/asm/overlay_01_021EDAFC.s @@ -2199,7 +2199,7 @@ MoneyBoxSys_Update: ; 0x021EEB4C bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #0x10 mov r1, #4 @@ -2244,7 +2244,7 @@ MoneyBoxSys_Update: ; 0x021EEB4C add r0, r4, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0xc] bl DestroyMsgData add r0, r5, #0 @@ -2335,7 +2335,7 @@ ov01_021EEC7C: ; 0x021EEC7C bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [sp, #0x10] mov r0, #0x10 mov r1, #4 @@ -2409,7 +2409,7 @@ _021EED04: add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x10] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] @@ -2553,7 +2553,7 @@ ov01_021EEE44: ; 0x021EEE44 bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #0x10 mov r1, #4 @@ -2631,7 +2631,7 @@ ov01_021EEE44: ; 0x021EEE44 add r0, r4, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0xc] bl DestroyMsgData add r0, r5, #0 diff --git a/asm/overlay_01_021F3F50.s b/asm/overlay_01_021F3F50.s index c5447314c5..c135f2979e 100644 --- a/asm/overlay_01_021F3F50.s +++ b/asm/overlay_01_021F3F50.s @@ -335,7 +335,7 @@ Field_CreateSaveStatsPrinter: ; 0x021F41C0 ldr r0, [r6, #8] str r0, [r4, #0xc] add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] ldr r2, _021F4218 ; =0x000001A7 mov r0, #1 @@ -370,7 +370,7 @@ SaveStatsPrinter_Delete: ; 0x021F421C ldr r0, [r4, #0x18] bl DestroyMsgData ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -547,7 +547,7 @@ ov01_021F4360: ; 0x021F4360 ldr r0, [r6, #8] str r0, [r4, #0xc] add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] ldr r2, _021F43CC ; =0x000001A7 mov r0, #1 @@ -588,7 +588,7 @@ ov01_021F43D0: ; 0x021F43D0 ldr r0, [r4, #0x18] bl DestroyMsgData ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/asm/overlay_01_021F6CFC.s b/asm/overlay_01_021F6CFC.s index 00df1872eb..834b1ee058 100644 --- a/asm/overlay_01_021F6CFC.s +++ b/asm/overlay_01_021F6CFC.s @@ -706,7 +706,7 @@ ov01_021F722C: ; 0x021F722C add r4, r0, #0 bl MI_CpuFill8 mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x38] ldr r2, _021F7264 ; =0x0000030B mov r0, #0 @@ -734,7 +734,7 @@ ov01_021F7268: ; 0x021F7268 ldr r0, [r4, #0x3c] bl DestroyMsgData ldr r0, [r4, #0x38] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0xc] bl String_dtor ldr r0, [r4, #8] diff --git a/asm/overlay_01_021FC66C.s b/asm/overlay_01_021FC66C.s index 25230790f8..c24faf0034 100644 --- a/asm/overlay_01_021FC66C.s +++ b/asm/overlay_01_021FC66C.s @@ -703,7 +703,7 @@ ov01_021FCB14: ; 0x021FCB14 mov r0, #8 mov r1, #0x40 mov r2, #4 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x34] pop {r4, pc} thumb_func_end ov01_021FCB14 @@ -713,7 +713,7 @@ ov01_021FCB4C: ; 0x021FCB4C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x34] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x2c] bl String_dtor ldr r0, [r4, #0x30] diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 42841a529a..b72398ba90 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -21415,7 +21415,7 @@ FollowPoke_ExpandInteractionMessage: ; 0x0224FC8C bl NewMsgDataFromNarc add r5, r0, #0 add r0, r4, #0 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 add r0, r6, #0 add r1, r4, #0 @@ -21431,7 +21431,7 @@ FollowPoke_ExpandInteractionMessage: ; 0x0224FC8C add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r5, #0 bl DestroyMsgData pop {r3, r4, r5, r6, r7, pc} @@ -21453,7 +21453,7 @@ ov02_0224FCE0: ; 0x0224FCE0 bl NewMsgDataFromNarc add r7, r0, #0 add r0, r4, #0 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #2 tst r0, r6 @@ -21515,7 +21515,7 @@ _0224FD72: add r0, r5, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r7, #0 bl DestroyMsgData add sp, #8 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index d93d0f447b..56c55cfc9b 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -229,17 +229,17 @@ _02253F84: add r0, #0x40 bl InitWindow mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _02254050 ; =ov03_022598A0 ldr r1, [r1] str r0, [r1, #0x50] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _02254050 ; =ov03_022598A0 ldr r1, [r1] str r0, [r1, #0x54] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _02254050 ; =ov03_022598A0 ldr r2, [r1] str r0, [r2, #0x58] @@ -297,7 +297,7 @@ _0225405C: ldr r0, [r0, #0x50] cmp r0, #0 beq _0225408C - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _022540E4 ; =ov03_022598A0 mov r1, #0 ldr r0, [r0] @@ -308,7 +308,7 @@ _0225408C: ldr r0, [r0, #0x54] cmp r0, #0 beq _022540A2 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _022540E4 ; =ov03_022598A0 mov r1, #0 ldr r0, [r0] @@ -319,7 +319,7 @@ _022540A2: ldr r0, [r0, #0x58] cmp r0, #0 beq _022540B8 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _022540E4 ; =ov03_022598A0 mov r1, #0 ldr r0, [r0] @@ -4940,7 +4940,7 @@ _022565F6: mov r1, #0 bl ov03_02255D68 ldr r0, [r4, #0x64] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x68] bl DestroyMsgData ldr r0, [r4, #0x14] @@ -4984,7 +4984,7 @@ ov03_02256644: ; 0x02256644 add r5, #0xa4 str r0, [r5] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x64] mov r0, #0 mov r1, #0x1b @@ -5133,7 +5133,7 @@ ov03_02256730: ; 0x02256730 bl NewMsgDataFromNarc str r0, [sp, #0x30] mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #0xb4 mov r1, #4 @@ -5426,7 +5426,7 @@ _022569EC: add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0x30] bl DestroyMsgData ldr r0, [sp, #0x18] @@ -6302,7 +6302,7 @@ ov03_02257074: ; 0x02257074 add r1, #0x88 str r0, [r1] mov r0, #0xb - bl ScrStrBufs_new + bl MessageFormat_new add r4, #0x8c str r0, [r4] pop {r4, pc} @@ -6321,7 +6321,7 @@ ov03_0225709C: ; 0x0225709C add r0, r4, #0 add r0, #0x8c ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x9d lsl r0, r0, #2 ldr r0, [r4, r0] @@ -10107,7 +10107,7 @@ ov03_02258DE8: ; 0x02258DE8 mov r0, #3 mov r1, #0x10 mov r2, #4 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x2c] mov r0, #0x80 mov r1, #4 @@ -10144,7 +10144,7 @@ ov03_02258E88: ; 0x02258E88 ldr r0, [r4, #0x30] bl String_dtor ldr r0, [r4, #0x2c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x28] bl DestroyMsgData add r0, r4, #0 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index e82b0a2008..b31c95c04e 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -723,7 +723,7 @@ _0221BF92: str r0, [r5, r1] ldr r0, [r5] ldr r0, [r0, #0x24] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0xbb lsl r1, r1, #4 str r0, [r5, r1] @@ -2761,7 +2761,7 @@ _0221D030: ldr r0, [r4, r0] cmp r0, #0 beq _0221D03E - bl ScrStrBufs_delete + bl MessageFormat_delete _0221D03E: ldr r0, _0221D050 ; =0x00000BAC ldr r0, [r4, r0] @@ -5904,7 +5904,7 @@ ov05_0221E944: ; 0x0221E944 str r0, [sp, #0xc] ldr r0, [r6] ldr r0, [r0, #0x24] - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [r6] str r0, [sp, #8] ldr r1, [r1, #0x24] @@ -5938,7 +5938,7 @@ _0221E9A0: ldr r0, [sp, #0xc] bl MessagePrinter_delete ldr r0, [sp, #8] - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end ov05_0221E944 diff --git a/asm/overlay_08.s b/asm/overlay_08.s index ae024ec3d1..7c5e60bf45 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -2407,7 +2407,7 @@ ov08_0221D0F4: ; 0x0221D0F4 str r0, [r4, r1] ldr r0, [r4] ldr r0, [r0, #0xc] - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _0221D144 ; =0x00001FAC str r0, [r4, r1] ldr r1, [r4] @@ -2437,7 +2437,7 @@ ov08_0221D14C: ; 0x0221D14C bl MessagePrinter_delete ldr r0, _0221D17C ; =0x00001FAC ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _0221D180 ; =0x00001FB0 ldr r0, [r4, r0] bl String_dtor @@ -14230,7 +14230,7 @@ ov08_022231E8: ; 0x022231E8 str r0, [r4, #0xc] ldr r0, [r4] ldr r0, [r0, #0xc] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] ldr r1, [r4] mov r0, #2 @@ -14251,7 +14251,7 @@ ov08_02223228: ; 0x02223228 ldr r0, [r4, #0xc] bl MessagePrinter_delete ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x18] bl String_dtor pop {r4, pc} diff --git a/asm/overlay_101.s b/asm/overlay_101.s index 395f2de65e..2313ed5656 100644 --- a/asm/overlay_101.s +++ b/asm/overlay_101.s @@ -1900,7 +1900,7 @@ ov101_021E85A8: ; 0x021E85A8 ldr r2, [r4] mov r0, #2 mov r1, #0x5b - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r1, r4, #0 add r1, #0x8c str r0, [r1] @@ -1973,7 +1973,7 @@ ov101_021E862C: ; 0x021E862C add r0, r4, #0 add r0, #0x8c ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r4, #0x88 ldr r0, [r4] bl DestroyMsgData @@ -13750,7 +13750,7 @@ ov101_021EE230: ; 0x021EE230 ldr r2, [r4] mov r0, #2 mov r1, #0x5b - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r1, r4, #0 add r1, #0x8c str r0, [r1] @@ -13858,7 +13858,7 @@ ov101_021EE2E8: ; 0x021EE2E8 add r0, r4, #0 add r0, #0x8c ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r4, #0x88 ldr r0, [r4] bl DestroyMsgData @@ -18314,7 +18314,7 @@ ov101_021F05EC: ; 0x021F05EC ldr r2, [r6] mov r0, #2 mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r6, #0x18] mov r0, #0xa ldr r1, [r6] @@ -18369,7 +18369,7 @@ _021F0660: ldr r0, [r6, #0x1c] bl String_dtor ldr r0, [r6, #0x18] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x14] bl DestroyMsgData mov r0, #0 @@ -21507,7 +21507,7 @@ ov101_021F1D74: ; 0x021F1D74 ldr r2, [r4] mov r0, #0x10 mov r1, #0x25 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x50] ldr r0, _021F1E7C ; =0x00000439 ldr r1, [r4] @@ -21578,7 +21578,7 @@ _021F1E88: ldr r0, [r6, #0x54] bl String_dtor ldr r0, [r6, #0x50] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x48] bl DestroyMsgData ldr r0, [r6, #0x44] @@ -29196,7 +29196,7 @@ ov101_021F57B8: ; 0x021F57B8 ldr r2, [r4] mov r0, #8 mov r1, #0x33 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x44] ldr r1, [r4] mov r0, #0x33 @@ -29248,7 +29248,7 @@ ov101_021F58A0: ; 0x021F58A0 ldr r0, [r4, #0x48] bl String_dtor ldr r0, [r4, #0x44] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x20] bl DestroyMsgData add r0, r4, #0 diff --git a/asm/overlay_102.s b/asm/overlay_102.s index c4752fc4a3..e84efe072b 100644 --- a/asm/overlay_102.s +++ b/asm/overlay_102.s @@ -7336,7 +7336,7 @@ _021EAE68: mov r0, #2 mov r1, #0x3c mov r2, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r5, r0, #0 mov r0, #0x4b lsl r0, r0, #2 @@ -7371,7 +7371,7 @@ _021EAE68: add r0, r6, #0 bl String_dtor add r0, r5, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _021EAF34 _021EAECA: ldr r0, [r4, #0x78] diff --git a/asm/overlay_103.s b/asm/overlay_103.s index 1d52558281..829a920359 100644 --- a/asm/overlay_103.s +++ b/asm/overlay_103.s @@ -605,7 +605,7 @@ ov103_021ECE18: ; 0x021ECE18 lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x9d - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x8b lsl r1, r1, #2 str r0, [r4, r1] @@ -635,7 +635,7 @@ ov103_021ECE54: ; 0x021ECE54 mov r0, #0x8b lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x8a lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/asm/overlay_108.s b/asm/overlay_108.s index 0af2704868..5d563f55af 100644 --- a/asm/overlay_108.s +++ b/asm/overlay_108.s @@ -2845,7 +2845,7 @@ ov108_021E6F74: ; 0x021E6F74 ldr r2, [r5] mov r0, #1 mov r1, #0x11 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0xc2 lsl r1, r1, #2 str r0, [r5, r1] @@ -2945,7 +2945,7 @@ _021E7036: mov r0, #0xc2 lsl r0, r0, #2 ldr r0, [r6, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0xc1 lsl r0, r0, #2 ldr r0, [r6, r0] @@ -8472,7 +8472,7 @@ ov108_021E9C3C: ; 0x021E9C3C ldr r2, [r5] mov r0, #2 mov r1, #0x10 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0x31 lsl r1, r1, #4 str r0, [r5, r1] @@ -8558,7 +8558,7 @@ _021E9CDC: mov r0, #0x31 lsl r0, r0, #4 ldr r0, [r6, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0xc3 lsl r0, r0, #2 ldr r0, [r6, r0] diff --git a/asm/overlay_109.s b/asm/overlay_109.s index 63f1a3cd26..bb753b5416 100644 --- a/asm/overlay_109.s +++ b/asm/overlay_109.s @@ -2567,7 +2567,7 @@ ov109_021E6C9C: ; 0x021E6C9C ldr r2, [r5] mov r0, #6 mov r1, #0x16 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #0x28] ldr r1, [r5] mov r0, #0x80 @@ -2654,7 +2654,7 @@ _021E6D54: ldr r0, [r6, #0x2c] bl String_dtor ldr r0, [r6, #0x28] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x24] bl DestroyMsgData mov r0, #4 diff --git a/asm/overlay_110.s b/asm/overlay_110.s index 525759ebb1..b96978a861 100644 --- a/asm/overlay_110.s +++ b/asm/overlay_110.s @@ -1653,7 +1653,7 @@ ov110_021E6580: ; 0x021E6580 ldr r2, [r6] mov r0, #6 mov r1, #0x10 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r6, #0x2c] ldr r1, [r6] mov r0, #0x80 @@ -1701,7 +1701,7 @@ _021E65EA: ldr r0, [r6, #0x30] bl String_dtor ldr r0, [r6, #0x2c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x28] bl DestroyMsgData mov r0, #4 diff --git a/asm/overlay_111.s b/asm/overlay_111.s index 6144c91164..9b28f52e71 100644 --- a/asm/overlay_111.s +++ b/asm/overlay_111.s @@ -1951,7 +1951,7 @@ ov111_021E67EC: ; 0x021E67EC bl NewMsgDataFromNarc str r0, [r4, #0xc] ldr r0, [r4, #0x18] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #8] bl ResetAllTextPrinters ldr r1, [r4, #0x30] @@ -1989,7 +1989,7 @@ ov111_021E685C: ; 0x021E685C ldr r0, [r4, #0xc] bl DestroyMsgData ldr r0, [r4, #8] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] cmp r0, #0 beq _021E687A diff --git a/asm/overlay_112.s b/asm/overlay_112.s index 8a7a63b656..a345845b87 100644 --- a/asm/overlay_112.s +++ b/asm/overlay_112.s @@ -4529,7 +4529,7 @@ ov112_021E7C18: ; 0x021E7C18 str r0, [r4, r1] mov r0, #0x10 mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom ldr r1, _021E7C64 ; =0x0001E448 str r0, [r4, r1] mov r0, #0x19 @@ -4561,7 +4561,7 @@ ov112_021E7C6C: ; 0x021E7C6C bl DestroyMsgData ldr r0, _021E7CA0 ; =0x0001E448 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} nop _021E7C94: .word 0x0001E454 @@ -21350,7 +21350,7 @@ ov112_021F03BC: ; 0x021F03BC bl NewMsgDataFromNarc str r0, [r4, #0x68] ldr r0, [r4] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x6c] ldr r1, [r4] mov r0, #0xb @@ -21416,7 +21416,7 @@ ov112_021F051C: ; 0x021F051C ldr r0, [r7, #0x68] bl DestroyMsgData ldr r0, [r7, #0x6c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r7, #0x70] bl String_dtor add r0, r7, #0 @@ -23157,7 +23157,7 @@ _021F129C: ldr r2, [r5, #4] mov r0, #0xd mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r4, r5, #0 ldr r6, _021F1320 ; =ov112_021FF350 str r0, [r5, #0x58] @@ -23212,7 +23212,7 @@ _021F132E: cmp r4, #4 blt _021F132E ldr r0, [r6, #0x58] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x5c] bl DestroyMsgData ldr r0, [r6, #0x60] diff --git a/asm/overlay_113.s b/asm/overlay_113.s index 593ed07f8b..44f2382625 100644 --- a/asm/overlay_113.s +++ b/asm/overlay_113.s @@ -1750,7 +1750,7 @@ ov113_021E6680: ; 0x021E6680 mov r0, #0x10 ldr r2, [r4] add r1, r0, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x48] mov r0, #2 ldr r1, [r4] @@ -1794,7 +1794,7 @@ ov113_021E66E4: ; 0x021E66E4 ldr r0, [r4, #0x4c] bl String_dtor ldr r0, [r4, #0x48] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x44] bl DestroyMsgData mov r0, #4 diff --git a/asm/overlay_115.s b/asm/overlay_115.s index 624b50891a..89103a466a 100644 --- a/asm/overlay_115.s +++ b/asm/overlay_115.s @@ -180,7 +180,7 @@ ov115_0225F158: ; 0x0225F158 bl NewMsgDataFromNarc add r6, r0, #0 add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #0x80 add r1, r5, #0 @@ -205,7 +205,7 @@ ov115_0225F158: ; 0x0225F158 add r0, r6, #0 bl DestroyMsgData add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r5, #0 bl String_dtor add r0, r7, #0 @@ -224,7 +224,7 @@ ov115_0225F1BC: ; 0x0225F1BC bl NewMsgDataFromNarc add r6, r0, #0 add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #0x80 add r1, r5, #0 @@ -249,7 +249,7 @@ ov115_0225F1BC: ; 0x0225F1BC add r0, r6, #0 bl DestroyMsgData add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r5, #0 bl String_dtor add r0, r7, #0 diff --git a/asm/overlay_117.s b/asm/overlay_117.s index 2fe721bee9..b882c57c34 100644 --- a/asm/overlay_117.s +++ b/asm/overlay_117.s @@ -547,7 +547,7 @@ ov117_0225F470: ; 0x0225F470 bl NewMsgDataFromNarc add r6, r0, #0 add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #0x80 add r1, r5, #0 @@ -572,7 +572,7 @@ ov117_0225F470: ; 0x0225F470 add r0, r6, #0 bl DestroyMsgData add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r5, #0 bl String_dtor add r0, r7, #0 diff --git a/asm/overlay_121.s b/asm/overlay_121.s index 50d8bcc300..ccdffa3b8f 100644 --- a/asm/overlay_121.s +++ b/asm/overlay_121.s @@ -2157,7 +2157,7 @@ ov121_021E69F0: ; 0x021E69F0 mov r0, #2 mov r1, #0x4c mov r2, #0x9e - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r6, #0x68] mov r0, #0x4c mov r1, #0x9e @@ -2208,7 +2208,7 @@ _021E6A54: ldr r0, [r6, #0x6c] bl String_dtor ldr r0, [r6, #0x68] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x64] bl DestroyMsgData pop {r4, r5, r6, pc} diff --git a/asm/overlay_12_022378C0.s b/asm/overlay_12_022378C0.s index 8e02dc182f..d07b3b7886 100644 --- a/asm/overlay_12_022378C0.s +++ b/asm/overlay_12_022378C0.s @@ -1013,7 +1013,7 @@ _02237FD8: bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #5 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] mov r0, #5 lsl r0, r0, #6 @@ -1568,7 +1568,7 @@ _0223861E: ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 0369e72c51..b627eca1bc 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -575,7 +575,7 @@ ov14_021E5D78: ; 0x021E5D78 ldr r1, [r4, #0x34] str r0, [r1, #0x1c] mov r0, #0xa - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [r4, #0x34] str r0, [r1, #0x24] mov r0, #1 @@ -597,7 +597,7 @@ ov14_021E5DB8: ; 0x021E5DB8 bl String_dtor ldr r0, [r4, #0x34] ldr r0, [r0, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x34] ldr r0, [r0, #0x1c] bl MessagePrinter_delete diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 46857dfe0a..80be03339f 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -620,7 +620,7 @@ ov15_BagApp_exit: ; 0x021F982C mov r0, #0xbd lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x91 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1115,7 +1115,7 @@ ov15_021F9CBC: ; 0x021F9CBC lsl r1, r1, #2 str r0, [r4, r1] mov r0, #6 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0xbd lsl r1, r1, #2 str r0, [r4, r1] diff --git a/asm/overlay_17.s b/asm/overlay_17.s index 1064150424..d954f342bf 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -2502,7 +2502,7 @@ ov17_02202F0C: ; 0x02202F0C mov r0, #0x10 ldr r2, [r6] add r1, r0, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r1, r6, #0 add r1, #0xa0 str r0, [r1] @@ -2565,7 +2565,7 @@ _02202F84: add r0, r6, #0 add r0, #0xa0 ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r6, #0x9c ldr r0, [r6] bl DestroyMsgData diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 33d64c1856..2d40de94de 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -1163,7 +1163,7 @@ ov18_021E6244: ; 0x021E6244 ldr r1, _021E6278 ; =0x0000065C str r0, [r4, r1] mov r0, #0x25 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x66 lsl r1, r1, #4 str r0, [r4, r1] @@ -1190,7 +1190,7 @@ ov18_021E6280: ; 0x021E6280 mov r0, #0x66 lsl r0, r0, #4 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _021E62A4 ; =0x0000065C ldr r0, [r4, r0] bl DestroyMsgData @@ -38408,7 +38408,7 @@ _021F8CDA: bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x14] - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #1 ldr r1, [r5, #0x14] @@ -38567,7 +38567,7 @@ _021F8CDA: mov r3, #0x14 bl ov18_021F9648 add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData bl GetDexHeightMsgBank diff --git a/asm/overlay_19.s b/asm/overlay_19.s index da952580b5..76b9ed1c99 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -491,7 +491,7 @@ ov19_02259C68: ; 0x02259C68 ldr r2, [r6] mov r0, #6 mov r1, #0x16 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r6, #0x28] ldr r1, [r6] mov r0, #0x80 @@ -534,7 +534,7 @@ _02259CC4: ldr r0, [r6, #0x2c] bl String_dtor ldr r0, [r6, #0x28] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x24] bl DestroyMsgData mov r0, #4 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index fd37c0f093..6899bd740b 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -86,7 +86,7 @@ ov27_02259F80: ; 0x02259F80 mov r1, #8 bl FontID_Alloc mov r0, #8 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _0225A18C ; =0x000004AC mov r2, #0xc4 str r0, [r4, r1] @@ -264,7 +264,7 @@ _0225A1C8: bl DestroyMsgData ldr r0, _0225A2BC ; =0x000004AC ldr r0, [r6, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r7, #0x55 mov r4, #0 add r5, r6, #0 @@ -5221,7 +5221,7 @@ ov27_0225C914: ; 0x0225C914 push {r4, lr} add r4, r0, #0 mov r0, #8 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x50] mov r0, #0 mov r1, #0x1b @@ -5239,7 +5239,7 @@ ov27_0225C930: ; 0x0225C930 ldr r0, [r4, #0x4c] bl DestroyMsgData ldr r0, [r4, #0x50] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov27_0225C930 diff --git a/asm/overlay_30.s b/asm/overlay_30.s index 97fcda4c9a..d7716f8428 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -371,7 +371,7 @@ ov30_0225D83C: ; 0x0225D83C push {r4, lr} add r4, r0, #0 mov r0, #8 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x3c] mov r0, #0 mov r1, #0x1b @@ -397,7 +397,7 @@ ov30_0225D86C: ; 0x0225D86C ldr r0, [r4, #0x38] bl DestroyMsgData ldr r0, [r4, #0x3c] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov30_0225D86C diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 0254795000..982f89d034 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -110,7 +110,7 @@ ov31_0225D60C: ; 0x0225D60C mov r0, #8 mov r1, #0x40 add r2, r0, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r2, #0x55 lsl r2, r2, #2 str r0, [r4, r2] @@ -158,7 +158,7 @@ ov31_0225D654: ; 0x0225D654 mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov31_0225D654 diff --git a/asm/overlay_32.s b/asm/overlay_32.s index 3ae5461bc0..e7c7241341 100644 --- a/asm/overlay_32.s +++ b/asm/overlay_32.s @@ -278,7 +278,7 @@ ov32_0225D748: ; 0x0225D748 lsl r1, r1, #2 str r0, [r4, r1] mov r0, #8 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x52 lsl r1, r1, #2 str r0, [r4, r1] @@ -292,7 +292,7 @@ ov32_0225D76C: ; 0x0225D76C mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x51 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 6b75fe19d8..0463522d1b 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -137,7 +137,7 @@ ov34_0225D5F8: ; 0x0225D5F8 sub r1, #0xa mov r0, #4 strh r2, [r4, r1] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x18] ldr r2, _0225D64C ; =0x000002E2 mov r0, #0 @@ -453,7 +453,7 @@ _0225D8B2: ldr r0, [r6, #0x1c] bl DestroyMsgData ldr r0, [r6, #0x18] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r1, #0x72 lsl r1, r1, #2 add r0, r6, r1 diff --git a/asm/overlay_37.s b/asm/overlay_37.s index 3e2667b732..cecccf108f 100644 --- a/asm/overlay_37.s +++ b/asm/overlay_37.s @@ -51,7 +51,7 @@ _021E5916: bl BgConfig_Alloc str r0, [r4] mov r0, #0x27 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0xc] mov r0, #0 mov r1, #0x1b @@ -365,7 +365,7 @@ _021E5BF8: ldr r0, [r6, #0x10] bl DestroyMsgData ldr r0, [r6, #0xc] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r7] add r0, r0, #1 str r0, [r7] diff --git a/asm/overlay_39_thumb.s b/asm/overlay_39_thumb.s index a6b6b05586..dbec5e67dd 100644 --- a/asm/overlay_39_thumb.s +++ b/asm/overlay_39_thumb.s @@ -293,7 +293,7 @@ _0222722C: lsl r1, r1, #2 str r0, [r5, r1] ldr r0, [r4, #4] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0xfe lsl r1, r1, #2 str r0, [r5, r1] @@ -349,7 +349,7 @@ ov39_022272EC: ; 0x022272EC mov r0, #0xfe lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0xfd lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2430,7 +2430,7 @@ ov39_02228140: ; 0x02228140 mov r0, #0xb mov r1, #0x40 mov r2, #0x7c - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #0x20] ldr r2, _022282F8 ; =0x00000307 mov r0, #0 @@ -2636,7 +2636,7 @@ _02228394: ldr r0, [r4, #0x24] bl DestroyMsgData ldr r0, [r4, #0x20] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x38] bl String_dtor ldr r0, [r4, #0x3c] diff --git a/asm/overlay_40.s b/asm/overlay_40.s index bccc7e7383..a37198199e 100644 --- a/asm/overlay_40.s +++ b/asm/overlay_40.s @@ -3651,7 +3651,7 @@ _0222D410: ldr r0, [sp, #0x14] bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _0222D504 _0222D478: cmp r2, #0x29 @@ -3708,7 +3708,7 @@ _0222D494: ldr r0, [sp, #0x18] bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _0222D504 _0222D4FC: add r1, r2, #0 @@ -4447,13 +4447,13 @@ ov40_0222DAA8: ; 0x0222DAA8 thumb_func_start ov40_0222DAB0 ov40_0222DAB0: ; 0x0222DAB0 - ldr r3, _0222DABC ; =ScrStrBufs_new_custom + ldr r3, _0222DABC ; =MessageFormat_new_custom add r2, r0, #0 mov r0, #4 mov r1, #0x40 bx r3 nop -_0222DABC: .word ScrStrBufs_new_custom +_0222DABC: .word MessageFormat_new_custom thumb_func_end ov40_0222DAB0 thumb_func_start ov40_0222DAC0 @@ -5363,7 +5363,7 @@ _0222E0D6: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] bl sub_020316F0 str r0, [sp, #0x34] @@ -5418,7 +5418,7 @@ _0222E0D6: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r5, [sp, #0x14] ldr r0, [r7, #0x48] add r5, #0x3c @@ -5558,7 +5558,7 @@ _0222E33C: bl String_dtor _0222E3F6: add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r5, [sp, #0x14] ldr r0, [r7, #0x48] add r5, #0x6c @@ -5625,7 +5625,7 @@ _0222E46A: add r0, r5, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0xd8 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -6125,7 +6125,7 @@ _0222E884: add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete _0222E890: mov r0, #0x10 str r0, [sp] @@ -6871,7 +6871,7 @@ _0222EE7A: ldr r0, [sp, #0x34] bl String_dtor add r0, r5, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] ldr r1, [r4, #0x10] add r0, r0, #4 @@ -6887,7 +6887,7 @@ _0222EEB4: ldr r0, [sp, #0x50] bl ScheduleWindowCopyToVram add r0, r5, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x1fc add sp, #0xe0 pop {r4, r5, r6, r7, pc} @@ -7466,7 +7466,7 @@ _0222F32A: ldr r0, [sp, #0x48] bl String_dtor add r0, r5, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] add r6, #0x10 add r0, r0, #4 @@ -7482,7 +7482,7 @@ _0222F36A: ldr r0, [sp, #0x58] bl ScheduleWindowCopyToVram add r0, r5, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #8 ldrsh r0, [r4, r0] str r0, [r4, #0xc] @@ -9267,7 +9267,7 @@ _02230062: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [sp, #0x14] mov r1, #3 ldr r0, [r0, #4] @@ -9299,7 +9299,7 @@ _02230062: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [sp, #0x14] mov r1, #2 ldr r0, [r0, #4] @@ -9368,7 +9368,7 @@ _02230062: add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers b _02230206 _022301F4: ldr r5, [sp, #0x14] @@ -9539,9 +9539,9 @@ _022302BA: add r0, r5, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x9c pop {r4, r5, r6, r7, pc} nop @@ -20504,7 +20504,7 @@ _02235C54: add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x18] - bl ScrStrBufs_delete + bl MessageFormat_delete _02235C72: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -20640,7 +20640,7 @@ _02235D84: add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x18] - bl ScrStrBufs_delete + bl MessageFormat_delete _02235DA2: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -23115,7 +23115,7 @@ ov40_0223707C: ; 0x0223707C add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -27744,9 +27744,9 @@ _0223973A: ldr r0, [sp, #0x18] bl String_dtor add r0, r6, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x1fc add sp, #0x30 pop {r4, r5, r6, r7, pc} @@ -29395,7 +29395,7 @@ ov40_0223A510: ; 0x0223A510 add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _0223A602 _0223A58A: cmp r4, #0x66 @@ -29442,7 +29442,7 @@ _0223A58A: add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _0223A602 _0223A5FA: ldr r0, [r5, #0x48] @@ -31018,7 +31018,7 @@ _0223B2BC: add r0, r6, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete _0223B31A: add r0, sp, #0x18 bl InitWindow @@ -33464,7 +33464,7 @@ ov40_0223C710: ; 0x0223C710 add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _0223C7CE _0223C7C4: ldr r0, [r5, #0x48] @@ -36368,7 +36368,7 @@ _0223DE78: add r0, r5, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete _0223DE84: mov r1, #0 str r1, [sp] @@ -42066,7 +42066,7 @@ _02240D70: add r0, r6, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete _02240DCE: add r0, sp, #0x18 bl InitWindow @@ -42182,7 +42182,7 @@ ov40_02240E28: ; 0x02240E28 add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _02240EE4 _02240EDA: ldr r0, [r5, #0x48] @@ -42268,7 +42268,7 @@ ov40_02240F24: ; 0x02240F24 add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _02241014 _02240F9C: cmp r4, #0x66 @@ -42315,7 +42315,7 @@ _02240F9C: add r0, r4, #0 bl String_dtor add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _02241014 _0224100C: ldr r0, [r5, #0x48] @@ -46114,9 +46114,9 @@ ov40_02242E4C: ; 0x02242E4C ldr r0, [sp, #0x2c] bl String_dtor add r0, r6, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -48726,7 +48726,7 @@ ov40_022442F0: ; 0x022442F0 add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete b _02244372 _0224436A: ldr r0, [r5, #0x48] diff --git a/asm/overlay_41.s b/asm/overlay_41.s index fe24421c4d..2c2ff1ed23 100644 --- a/asm/overlay_41.s +++ b/asm/overlay_41.s @@ -12928,7 +12928,7 @@ ov41_0224BE80: ; 0x0224BE80 bl GF_AssertFail _0224BE9C: mov r0, #0xd - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #0x66 lsl r0, r0, #2 @@ -13026,7 +13026,7 @@ _0224BE9C: ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_43.s b/asm/overlay_43.s index 5b59e9e7cf..3731f5151a 100644 --- a/asm/overlay_43.s +++ b/asm/overlay_43.s @@ -1206,7 +1206,7 @@ ov43_0222A87C: ; 0x0222A87C add r4, r1, #0 add r5, r0, #0 add r0, r4, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x50] ldr r2, _0222A8A4 ; =0x0000030B mov r0, #0 @@ -1231,7 +1231,7 @@ ov43_0222A8A8: ; 0x0222A8A8 ldr r0, [r4, #0x54] bl DestroyMsgData ldr r0, [r4, #0x50] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} thumb_func_end ov43_0222A8A8 diff --git a/asm/overlay_44.s b/asm/overlay_44.s index 6c964f4d9a..e826b97cde 100644 --- a/asm/overlay_44.s +++ b/asm/overlay_44.s @@ -537,7 +537,7 @@ ov44_0222A1FC: ; 0x0222A1FC lsl r2, r2, #2 str r0, [r1, r2] mov r0, #0x35 - bl ScrStrBufs_new + bl MessageFormat_new mov r2, #0x59 ldr r1, [sp, #4] lsl r2, r2, #2 @@ -1139,7 +1139,7 @@ _0222A6F0: mov r0, #0x59 lsl r0, r0, #2 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _0222A754 ; =FS_OVERLAY_ID(OVY_42) bl UnloadOverlayByID pop {r3, r4, r5, r6, r7, pc} @@ -11450,7 +11450,7 @@ ov44_0222F9A0: ; 0x0222F9A0 ldr r1, _0222FA20 ; =0x00000B68 str r0, [r5, r1] add r0, r4, #0 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _0222FA14 ; =0x00000B1C add r2, r4, #0 str r0, [r5, r1] @@ -11491,7 +11491,7 @@ ov44_0222FA28: ; 0x0222FA28 str r1, [r4, r0] sub r0, #0x4c ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _0222FA7C ; =0x00000B1C mov r1, #0 str r1, [r4, r0] @@ -19154,7 +19154,7 @@ ov44_0223362C: ; 0x0223362C add r5, r0, #0 add r0, r6, #0 add r4, r1, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #4] ldr r2, _02233674 ; =0x0000030A mov r0, #0 @@ -19194,7 +19194,7 @@ ov44_02233678: ; 0x02233678 ldr r0, [r4, #8] bl DestroyMsgData ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov44_02233678 diff --git a/asm/overlay_45_thumb.s b/asm/overlay_45_thumb.s index 6ab622d74e..1221f0af57 100644 --- a/asm/overlay_45_thumb.s +++ b/asm/overlay_45_thumb.s @@ -8963,7 +8963,7 @@ _0222DD8E: bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [sp, #0x28] - bl ScrStrBufs_new + bl MessageFormat_new ldrb r6, [r4] str r0, [sp, #0xc] cmp r6, #9 @@ -8987,7 +8987,7 @@ _0222DDCC: add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/overlay_46.s b/asm/overlay_46.s index 419b4c0376..169638abb5 100644 --- a/asm/overlay_46.s +++ b/asm/overlay_46.s @@ -1341,7 +1341,7 @@ ov46_022592EC: ; 0x022592EC add r0, r4, #0 add r7, r1, #0 add r6, r2, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5] ldr r2, [sp, #0x14] mov r0, #0 @@ -1577,7 +1577,7 @@ _022594BC: ldr r0, [r4, #4] bl DestroyMsgData ldr r0, [r4] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov46_02259494 diff --git a/asm/overlay_47.s b/asm/overlay_47.s index f1cec298ed..91919cbf62 100644 --- a/asm/overlay_47.s +++ b/asm/overlay_47.s @@ -566,7 +566,7 @@ _02258C7E: cmp r6, #9 blt _02258C7E add r0, r7, #0 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [sp] str r0, [r1, #0x24] mov r0, #1 @@ -600,7 +600,7 @@ _02258CC8: cmp r4, #9 blt _02258CC8 ldr r0, [r6, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x28] bl String_dtor ldr r0, [r6, #0x2c] diff --git a/asm/overlay_48.s b/asm/overlay_48.s index aa8d5d2b98..7feec5314c 100644 --- a/asm/overlay_48.s +++ b/asm/overlay_48.s @@ -5413,7 +5413,7 @@ ov48_0225B068: ; 0x0225B068 mov r0, #8 mov r1, #0x40 add r2, r4, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #4] mov r0, #0x80 add r1, r4, #0 @@ -5435,7 +5435,7 @@ ov48_0225B0A4: ; 0x0225B0A4 ldr r0, [r4] bl DestroyMsgData ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #8] bl String_dtor ldr r0, [r4, #0xc] @@ -5492,7 +5492,7 @@ ov48_0225B108: ; 0x0225B108 ldr r0, [r5, #4] add r4, r1, #0 add r6, r2, #0 - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, [r5] ldr r2, [r5, #0xc] mov r1, #3 diff --git a/asm/overlay_49.s b/asm/overlay_49.s index 52c01639b9..9d94294a51 100644 --- a/asm/overlay_49.s +++ b/asm/overlay_49.s @@ -5900,7 +5900,7 @@ ov49_0225B308: ; 0x0225B308 mov r0, #8 mov r1, #0x40 add r2, r7, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom ldr r1, [sp] ldr r4, _0225B358 ; =ov49_02269714 str r0, [r1] @@ -5940,7 +5940,7 @@ ov49_0225B35C: ; 0x0225B35C push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, [r6] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r4, #0 add r5, r6, #0 _0225B36A: @@ -6079,11 +6079,11 @@ _0225B434: .word BufferECWord thumb_func_start ov49_0225B438 ov49_0225B438: ; 0x0225B438 - ldr r3, _0225B440 ; =ScrStrBufs_ResetBuffers + ldr r3, _0225B440 ; =MessageFormat_ResetBuffers ldr r0, [r0] bx r3 nop -_0225B440: .word ScrStrBufs_ResetBuffers +_0225B440: .word MessageFormat_ResetBuffers thumb_func_end ov49_0225B438 thumb_func_start ov49_0225B444 diff --git a/asm/overlay_53.s b/asm/overlay_53.s index 84e7f2ba35..b2819d8c97 100644 --- a/asm/overlay_53.s +++ b/asm/overlay_53.s @@ -637,7 +637,7 @@ ov53_021E5E6C: ; 0x021E5E6C lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [r4] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x46 lsl r1, r1, #2 str r0, [r4, r1] @@ -660,7 +660,7 @@ ov53_021E5EB8: ; 0x021E5EB8 mov r0, #0x46 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -4955,7 +4955,7 @@ _021E8108: ldr r0, [sp, #0x20] strb r0, [r4, #0x18] ldr r0, [sp, #4] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] add r0, r6, #0 mov r1, #1 @@ -4978,7 +4978,7 @@ _021E8156: add r0, r4, #0 bl ov53_021E8310 ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/asm/overlay_59.s b/asm/overlay_59.s index e160ada2f0..fb26f33be2 100644 --- a/asm/overlay_59.s +++ b/asm/overlay_59.s @@ -3305,7 +3305,7 @@ ov59_02239704: ; 0x02239704 ldr r2, [r5] mov r0, #0x10 mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #0x60] mov r0, #1 ldr r1, [r5] @@ -3387,7 +3387,7 @@ _022397AA: ldr r0, [r6, #0x64] bl String_dtor ldr r0, [r6, #0x60] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x5c] bl DestroyMsgData mov r0, #4 @@ -7453,7 +7453,7 @@ ov59_0223B68C: ; 0x0223B68C mov r0, #0x10 ldr r2, [r6] add r1, r0, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r6, #0x60] mov r0, #1 ldr r1, [r6] @@ -7500,7 +7500,7 @@ ov59_0223B6FC: ; 0x0223B6FC ldr r0, [r4, #0x64] bl String_dtor ldr r0, [r4, #0x60] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x5c] bl DestroyMsgData mov r0, #0 diff --git a/asm/overlay_63.s b/asm/overlay_63.s index f62ff46bca..37e26a8908 100644 --- a/asm/overlay_63.s +++ b/asm/overlay_63.s @@ -50,7 +50,7 @@ ov63_0221BE20: ; 0x0221BE20 add r1, #0x84 str r0, [r1] mov r0, #0x3e - bl ScrStrBufs_new + bl MessageFormat_new add r1, r5, #0 add r1, #0x88 str r0, [r1] @@ -142,7 +142,7 @@ ov63_0221BF28: ; 0x0221BF28 add r0, r4, #0 add r0, #0x88 ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r4, #0x84 ldr r0, [r4] bl DestroyMsgData diff --git a/asm/overlay_64.s b/asm/overlay_64.s index 877b9c59ab..e985a13d4d 100644 --- a/asm/overlay_64.s +++ b/asm/overlay_64.s @@ -918,7 +918,7 @@ ov64_021E607C: ; 0x021E607C lsl r1, r1, #4 str r0, [r4, r1] mov r0, #0x3b - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x49 lsl r1, r1, #2 str r0, [r4, r1] @@ -986,7 +986,7 @@ ov64_021E6118: ; 0x021E6118 mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] diff --git a/asm/overlay_65.s b/asm/overlay_65.s index 819170c40d..1b0f4e1a00 100644 --- a/asm/overlay_65.s +++ b/asm/overlay_65.s @@ -54,17 +54,17 @@ ov65_0221BE20: ; 0x0221BE20 mov r0, #0xc mov r1, #0x16 mov r2, #0x1a - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0x61 lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x1a - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x62 lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x1a - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x63 lsl r1, r1, #2 str r0, [r4, r1] @@ -1851,15 +1851,15 @@ ov65_0221CD74: ; 0x0221CD74 mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x66 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5012,7 +5012,7 @@ _0221E77C: mov r0, #0xda lsl r0, r0, #6 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x13 bl sub_02037AC0 mov r3, #0x61 @@ -5131,7 +5131,7 @@ ov65_0221E858: ; 0x0221E858 pop {r3, r4, pc} _0221E898: mov r0, #0x1a - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0xda lsl r1, r1, #6 str r0, [r4, r1] diff --git a/asm/overlay_67.s b/asm/overlay_67.s index 253a8951c2..cdc0415b5e 100644 --- a/asm/overlay_67.s +++ b/asm/overlay_67.s @@ -966,7 +966,7 @@ ov67_021E60B4: ; 0x021E60B4 ldr r2, [r4] mov r0, #2 mov r1, #0x40 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x2c] mov r0, #2 ldr r1, [r4] @@ -995,7 +995,7 @@ ov67_021E60F4: ; 0x021E60F4 ldr r0, [r4, #0x30] bl String_dtor ldr r0, [r4, #0x2c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x28] bl DestroyMsgData pop {r4, pc} diff --git a/asm/overlay_68.s b/asm/overlay_68.s index 76b58c26c3..a8d88f7bfa 100644 --- a/asm/overlay_68.s +++ b/asm/overlay_68.s @@ -702,7 +702,7 @@ ov68_021E5EBC: ; 0x021E5EBC add r1, #0xf8 str r0, [r1] mov r0, #0x42 - bl ScrStrBufs_new + bl MessageFormat_new add r1, r4, #0 add r1, #0xfc str r0, [r1] @@ -744,7 +744,7 @@ ov68_021E5F18: ; 0x021E5F18 add r0, r4, #0 add r0, #0xfc ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #1 lsl r0, r0, #8 ldr r0, [r4, r0] diff --git a/asm/overlay_69.s b/asm/overlay_69.s index 4875442423..a8e111ca9e 100644 --- a/asm/overlay_69.s +++ b/asm/overlay_69.s @@ -86,7 +86,7 @@ _021E5960: ldr r2, [r5] mov r0, #8 mov r1, #0x40 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom ldr r1, _021E5A28 ; =0x0000C080 str r0, [r5, r1] ldr r0, [r5] @@ -903,7 +903,7 @@ ov69_021E6080: ; 0x021E6080 bl sub_02023120 ldr r0, _021E60EC ; =0x0000C080 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete bl sub_0201F63C ldr r0, _021E60F0 ; =0x0000C010 ldr r0, [r4, r0] diff --git a/asm/overlay_70.s b/asm/overlay_70.s index e27c709411..8d6b30642a 100644 --- a/asm/overlay_70.s +++ b/asm/overlay_70.s @@ -1610,7 +1610,7 @@ _02238446: mov r0, #0xb mov r1, #0x40 mov r2, #0x3d - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom ldr r1, _0223859C ; =0x00000B9C ldr r2, _022385A0 ; =0x00000307 str r0, [r4, r1] @@ -1882,7 +1882,7 @@ ov70_022386F4: ; 0x022386F4 bl DestroyMsgData ldr r0, _022387A0 ; =0x00000B9C ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl ov70_0223887C bl sub_02034DE0 @@ -6761,7 +6761,7 @@ ov70_0223AE98: ; 0x0223AE98 str r0, [r5, r1] sub r1, #0x20 ldr r0, [r5, r1] - bl ScrStrBufs_ResetBuffers + bl MessageFormat_ResetBuffers ldr r0, _0223AF1C ; =0x0000011E ldrb r2, [r4, r0] cmp r2, #0 diff --git a/asm/overlay_71.s b/asm/overlay_71.s index 3bc4e022df..20a125b66a 100644 --- a/asm/overlay_71.s +++ b/asm/overlay_71.s @@ -57,7 +57,7 @@ _022469A6: bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x38 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0xc] ldr r2, [r4] ldr r0, [r2, #0x10] @@ -249,7 +249,7 @@ ov71_02246B58: ; 0x02246B58 bl DestroySysTask bl sub_0203A914 ldr r0, [r4, #0xc] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] diff --git a/asm/overlay_72.s b/asm/overlay_72.s index 1c47645049..dd88ca23fe 100644 --- a/asm/overlay_72.s +++ b/asm/overlay_72.s @@ -794,7 +794,7 @@ _02237E36: mov r0, #0xb mov r1, #0x20 mov r2, #0x43 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0xbd lsl r1, r1, #4 str r0, [r4, r1] @@ -1026,7 +1026,7 @@ _02238086: mov r0, #0xbd lsl r0, r0, #4 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl ov72_02238160 bl sub_02034DE0 diff --git a/asm/overlay_73.s b/asm/overlay_73.s index dfd9adfbf9..504fc84368 100644 --- a/asm/overlay_73.s +++ b/asm/overlay_73.s @@ -68,7 +68,7 @@ _021E5916: lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x32 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x24] ldr r2, _021E5AA4 ; =0x000001A6 mov r0, #0 @@ -353,7 +353,7 @@ _021E5BD8: ldr r0, [r6, #0x28] bl DestroyMsgData ldr r0, [r6, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #8] mov r1, #0xc5 lsl r1, r1, #2 @@ -4829,7 +4829,7 @@ _021E7E62: mov r0, #0xb mov r1, #0x20 mov r2, #0x96 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0xbd lsl r1, r1, #4 str r0, [r4, r1] @@ -5049,7 +5049,7 @@ ov73_021E808C: ; 0x021E808C mov r0, #0xbd lsl r0, r0, #4 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl ov73_021E8164 bl sub_02034DE0 diff --git a/asm/overlay_74_thumb.s b/asm/overlay_74_thumb.s index 85b0eac293..0f2c91c407 100644 --- a/asm/overlay_74_thumb.s +++ b/asm/overlay_74_thumb.s @@ -1857,7 +1857,7 @@ ov74_MainMenu_PrintContinueButton: ; 0x02227E94 bl NewMsgDataFromNarc str r0, [sp, #0x24] mov r0, #0x4f - bl ScrStrBufs_new + bl MessageFormat_new str r0, [sp, #0x28] ldr r0, [sp, #0x10] ldr r0, [r0, #0xc] @@ -2024,7 +2024,7 @@ _02227FEA: add r0, #0xec str r2, [r0] ldr r0, [sp, #0x28] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0x24] bl DestroyMsgData mov r0, #1 @@ -4066,7 +4066,7 @@ ov74_02229084: ; 0x02229084 sub sp, #0x20 add r5, r0, #0 ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #1 str r0, [sp] @@ -4174,7 +4174,7 @@ ov74_02229084: ; 0x02229084 add r3, r2, #0 bl ov74_02235568 add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x20 pop {r3, r4, r5, pc} .balign 4, 0 @@ -4541,7 +4541,7 @@ ov74_0222947C: ; 0x0222947C bl NewMsgDataFromNarc add r6, r0, #0 ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0xc6 mov r2, #7 lsl r1, r1, #6 @@ -4648,7 +4648,7 @@ ov74_0222947C: ; 0x0222947C lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [sp] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r6, #0 bl DestroyMsgData ldr r0, _022295C4 ; =0x00003174 @@ -7322,7 +7322,7 @@ ov74_0222AA18: ; 0x0222AA18 bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x54 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0xc] mov r0, #1 mov r1, #6 @@ -7366,7 +7366,7 @@ _0222AA86: ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0xc] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0xff str r0, [r4, #0x68] add sp, #0x10 @@ -7658,7 +7658,7 @@ _0222ACEC: mov r1, #0 bl BgClearTilemapBufferAndCommit mov r0, #0x54 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #2 str r1, [sp] mov r1, #1 @@ -7698,7 +7698,7 @@ _0222ACEC: add r3, r2, #0 bl ov74_02235568 add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x5c pop {r3, r4, r5, r6, pc} nop @@ -7773,7 +7773,7 @@ ov74_0222ADBC: ; 0x0222ADBC bl NewMsgDataFromNarc str r0, [sp, #4] mov r0, #0x54 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [sp, #4] add r2, r5, #0 mov r3, #0x54 @@ -7788,7 +7788,7 @@ ov74_0222ADBC: ; 0x0222ADBC bl ov74_0222AA18 ldr r0, [sp, #8] str r7, [r4, #0x74] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #4] bl DestroyMsgData b _0222AE36 @@ -12188,7 +12188,7 @@ ov74_0222D1D4: ; 0x0222D1D4 bl NewMsgDataFromNarc add r4, r0, #0 mov r0, #0x55 - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 mov r0, #1 mov r1, #6 @@ -12220,7 +12220,7 @@ ov74_0222D1D4: ; 0x0222D1D4 add r0, r4, #0 bl DestroyMsgData add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -12991,7 +12991,7 @@ ov74_0222D824: ; 0x0222D824 ldr r1, _0222D9CC ; =0x00002A04 str r0, [r5, r1] ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x2a lsl r1, r1, #8 str r0, [r5, r1] @@ -13170,7 +13170,7 @@ _0222D98A: mov r0, #0x2a lsl r0, r0, #8 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0x14] cmp r0, #0 bne _0222D9C2 @@ -13243,7 +13243,7 @@ _0222DA2A: ldr r1, _0222DAE8 ; =0x00002A04 str r0, [r5, r1] mov r0, #0x55 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x2a lsl r1, r1, #8 str r0, [r5, r1] @@ -13287,7 +13287,7 @@ _0222DA58: mov r0, #0x2a lsl r0, r0, #8 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete _0222DAB2: ldr r0, _0222DAF4 ; =0x00002BD0 add r0, r5, r0 @@ -15097,7 +15097,7 @@ _0222E926: bl ov74_0222E85C str r0, [sp, #0x34] mov r0, #0x55 - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #1 mov r1, #0x1b @@ -15216,7 +15216,7 @@ _0222EA5E: ldr r0, [sp, #0x1c] bl DestroyMsgData add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r6, #0 add sp, #0x48 pop {r3, r4, r5, r6, r7, pc} @@ -15245,7 +15245,7 @@ ov74_0222EA88: ; 0x0222EA88 ldr r1, _0222EB20 ; =0x00002A04 str r0, [r5, r1] mov r0, #0x55 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x2a lsl r1, r1, #8 str r0, [r5, r1] @@ -15292,7 +15292,7 @@ ov74_0222EA88: ; 0x0222EA88 mov r0, #0x2a lsl r0, r0, #8 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -15949,7 +15949,7 @@ ov74_0222F024: ; 0x0222F024 ldr r1, _0222F1A8 ; =0x00002A04 str r0, [r5, r1] ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x2a lsl r1, r1, #8 str r0, [r5, r1] @@ -16110,7 +16110,7 @@ _0222F166: mov r0, #0x2a lsl r0, r0, #8 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0x14] cmp r0, #0 bne _0222F19E @@ -16183,7 +16183,7 @@ _0222F206: ldr r1, _0222F2C4 ; =0x00002A04 str r0, [r5, r1] mov r0, #0x55 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x2a lsl r1, r1, #8 str r0, [r5, r1] @@ -16227,7 +16227,7 @@ _0222F234: mov r0, #0x2a lsl r0, r0, #8 ldr r0, [r5, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete _0222F28E: ldr r0, _0222F2D0 ; =0x00002BC4 add r0, r5, r0 @@ -21559,7 +21559,7 @@ _02231A7E: cmp r0, #0 bne _02231AA6 mov r0, #0x4c - bl ScrStrBufs_new + bl MessageFormat_new str r0, [sp, #0x14] _02231AA6: ldr r0, _02231BB4 ; =0x00012608 @@ -21600,7 +21600,7 @@ _02231AA6: cmp r0, #0 bne _02231B02 ldr r0, [sp, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete _02231B02: ldr r0, [sp, #0x18] bl DestroyMsgData @@ -24209,7 +24209,7 @@ ov74_02232F9C: ; 0x02232F9C mov r2, #8 bl ConvertRSStringToDPStringInternational mov r0, #0x4c - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 mov r0, #8 mov r1, #0x4c @@ -24245,7 +24245,7 @@ ov74_02232F9C: ; 0x02232F9C add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r5, #0 bl ov74_02232F5C add sp, #0x18 @@ -29158,7 +29158,7 @@ _022354A6: cmp r6, #0 bne _022354CC ldr r0, [r4, #8] - bl ScrStrBufs_new + bl MessageFormat_new add r6, r0, #0 _022354CC: ldr r1, [sp, #0x10] @@ -29222,7 +29222,7 @@ _02235542: cmp r0, #0 bne _02235554 add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete _02235554: ldr r0, [sp, #0x10] bl DestroyMsgData diff --git a/asm/overlay_75.s b/asm/overlay_75.s index 382d23ec11..29253824b4 100644 --- a/asm/overlay_75.s +++ b/asm/overlay_75.s @@ -845,7 +845,7 @@ ov75_02246F0C: ; 0x02246F0C mov r0, #0xb mov r1, #0x40 mov r2, #0x74 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #0x20] ldr r2, _02247104 ; =0x00000307 mov r0, #0 @@ -1084,7 +1084,7 @@ _022471A4: ldr r0, [r4, #0x24] bl DestroyMsgData ldr r0, [r4, #0x20] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x3c] bl String_dtor ldr r0, [r4, #0x40] diff --git a/asm/overlay_78.s b/asm/overlay_78.s index 7f17e34d8b..f252f8053e 100644 --- a/asm/overlay_78.s +++ b/asm/overlay_78.s @@ -559,7 +559,7 @@ ov78_021E5D94: ; 0x021E5D94 bl NewMsgDataFromNarc str r0, [r4, #0x38] ldr r0, [r4] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x3c] mov r1, #0 add r0, sp, #8 @@ -615,7 +615,7 @@ ov78_021E5E24: ; 0x021E5E24 add r0, #0x18 bl RemoveWindow ldr r0, [r4, #0x3c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x38] bl DestroyMsgData pop {r4, pc} diff --git a/asm/overlay_80_0222A84C.s b/asm/overlay_80_0222A84C.s index 4e41fb1933..3362864ed9 100644 --- a/asm/overlay_80_0222A84C.s +++ b/asm/overlay_80_0222A84C.s @@ -32,7 +32,7 @@ ov80_0222A84C: ; 0x0222A84C mov r0, #8 mov r1, #0x40 add r2, r5, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #0x44] mov r0, #1 lsl r0, r0, #0xa @@ -124,7 +124,7 @@ ov80_0222A920: ; 0x0222A920 bl GF_AssertFail _0222A930: ldr r0, [r4, #0x44] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x48] bl String_dtor ldr r0, [r4, #0x4c] diff --git a/asm/overlay_81.s b/asm/overlay_81.s index e2db2b91c1..a454c253d5 100644 --- a/asm/overlay_81.s +++ b/asm/overlay_81.s @@ -5766,7 +5766,7 @@ _02240C6C: ldr r0, [r5, #0x1c] bl DestroyMsgData ldr r0, [r5, #0x20] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r5, #0x24] bl String_dtor ldr r0, [r5, #0x28] @@ -5891,7 +5891,7 @@ ov81_02240D64: ; 0x02240D64 bl NewMsgDataFromNarc str r0, [r5, #0x1c] mov r0, #0x64 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x20] mov r0, #0x32 lsl r0, r0, #4 diff --git a/asm/overlay_82.s b/asm/overlay_82.s index af9a3d142e..0408148db8 100644 --- a/asm/overlay_82.s +++ b/asm/overlay_82.s @@ -1466,7 +1466,7 @@ _0223E8E4: ldr r0, [r6, #0x20] bl DestroyMsgData ldr r0, [r6, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x28] bl String_dtor ldr r0, [r6, #0x2c] @@ -1575,7 +1575,7 @@ ov82_0223E9E8: ; 0x0223E9E8 bl NewMsgDataFromNarc str r0, [r5, #0x20] mov r0, #0x69 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x24] mov r0, #0x96 lsl r0, r0, #2 diff --git a/asm/overlay_83.s b/asm/overlay_83.s index 43cb951c57..7a4b27837b 100644 --- a/asm/overlay_83.s +++ b/asm/overlay_83.s @@ -2309,7 +2309,7 @@ _0223F0F0: ldr r0, [r5, #0x1c] bl DestroyMsgData ldr r0, [r5, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r5, #0x28] bl String_dtor ldr r0, [r5, #0x2c] @@ -2413,7 +2413,7 @@ ov83_0223F200: ; 0x0223F200 bl NewMsgDataFromNarc str r0, [r5, #0x1c] mov r0, #0x6b - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x24] mov r0, #0x96 lsl r0, r0, #2 @@ -11777,7 +11777,7 @@ _02243EDC: bl DestroyMsgData ldr r0, [sp] ldr r0, [r0, #0x24] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp] ldr r0, [r0, #0x28] bl String_dtor @@ -11876,7 +11876,7 @@ ov83_02243FD4: ; 0x02243FD4 bl NewMsgDataFromNarc str r0, [r5, #0x20] mov r0, #0x6b - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x24] mov r0, #0x96 lsl r0, r0, #2 diff --git a/asm/overlay_85.s b/asm/overlay_85.s index 3e2f75f8d1..76e3d72605 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -3106,7 +3106,7 @@ ov85_021E705C: ; 0x021E705C bl NewMsgDataFromNarc str r0, [r4, #4] mov r0, #0x66 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #8] ldr r0, _021E713C ; =0x00000D84 add r1, r4, #0 @@ -3164,7 +3164,7 @@ ov85_021E7148: ; 0x021E7148 ldr r0, [r4, #4] bl DestroyMsgData ldr r0, [r4, #8] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x6c] bl String_dtor mov r4, #0 @@ -6508,7 +6508,7 @@ _021E890A: bl BgConfig_Alloc str r0, [r4, #0x14] mov r0, #0x66 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x34] mov r0, #0 mov r1, #0x1b @@ -6759,7 +6759,7 @@ _021E8B34: ldr r0, [r6, #0x38] bl DestroyMsgData ldr r0, [r6, #0x34] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r2, _021E8BAC ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb diff --git a/asm/overlay_86.s b/asm/overlay_86.s index e6a459136b..a2fb66245b 100644 --- a/asm/overlay_86.s +++ b/asm/overlay_86.s @@ -88,7 +88,7 @@ ov86_021E5900: ; 0x021E5900 lsl r1, r1, #4 str r0, [r5, r1] mov r0, #0x79 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x85 lsl r1, r1, #2 str r0, [r5, r1] @@ -220,7 +220,7 @@ ov86_021E5AA4: ; 0x021E5AA4 mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x86 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/asm/overlay_87.s b/asm/overlay_87.s index 8b9ae61de4..24c978e294 100644 --- a/asm/overlay_87.s +++ b/asm/overlay_87.s @@ -1921,7 +1921,7 @@ _021E6816: ldr r0, [r6, #0x38] bl DestroyMsgData ldr r0, [r6, #0x3c] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x40] bl String_dtor ldr r0, [r6, #0x44] @@ -1999,7 +1999,7 @@ ov87_021E68DC: ; 0x021E68DC bl NewMsgDataFromNarc str r0, [r5, #0x38] mov r0, #0x7a - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x3c] mov r0, #0x96 lsl r0, r0, #2 diff --git a/asm/overlay_89.s b/asm/overlay_89.s index ef637f8573..6b4f68465d 100644 --- a/asm/overlay_89.s +++ b/asm/overlay_89.s @@ -128,7 +128,7 @@ ov89_02258800: ; 0x02258800 mov r1, #0x7d bl FontID_Alloc mov r0, #0x7d - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x2c] ldr r2, _02258AE0 ; =0x000002F2 mov r0, #0 @@ -822,7 +822,7 @@ ov89_02258F00: ; 0x02258F00 ldr r0, [r4, #0x30] bl DestroyMsgData ldr r0, [r4, #0x2c] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl ov89_02259D50 ldr r0, [r4, #8] diff --git a/asm/overlay_90.s b/asm/overlay_90.s index bc1cb5c5fd..2d41c6cfb5 100644 --- a/asm/overlay_90.s +++ b/asm/overlay_90.s @@ -1347,7 +1347,7 @@ ov90_02259184: ; 0x02259184 mov r0, #8 mov r1, #0x40 add r2, r4, #0 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r5, #4] mov r0, #0x80 add r1, r4, #0 @@ -1380,7 +1380,7 @@ ov90_022591D4: ; 0x022591D4 ldr r0, [r4, #8] bl String_dtor ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4] bl DestroyMsgData pop {r4, pc} @@ -1389,11 +1389,11 @@ ov90_022591D4: ; 0x022591D4 thumb_func_start ov90_022591F4 ov90_022591F4: ; 0x022591F4 - ldr r3, _022591FC ; =ScrStrBufs_ResetBuffers + ldr r3, _022591FC ; =MessageFormat_ResetBuffers ldr r0, [r0, #4] bx r3 nop -_022591FC: .word ScrStrBufs_ResetBuffers +_022591FC: .word MessageFormat_ResetBuffers thumb_func_end ov90_022591F4 thumb_func_start ov90_02259200 diff --git a/asm/overlay_91.s b/asm/overlay_91.s index 61ec3ff694..7685ff4521 100644 --- a/asm/overlay_91.s +++ b/asm/overlay_91.s @@ -7257,7 +7257,7 @@ ov91_0225FCD8: ; 0x0225FCD8 add r4, r1, #0 add r5, r0, #0 add r0, r4, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #4] mov r0, #0 mov r1, #0x1b @@ -7288,7 +7288,7 @@ ov91_0225FD0C: ; 0x0225FD0C ldr r0, [r4, #8] bl DestroyMsgData ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete pop {r4, pc} .balign 4, 0 thumb_func_end ov91_0225FD0C diff --git a/asm/overlay_93_thumb_1.s b/asm/overlay_93_thumb_1.s index 4ae9d9ac59..3f98aa59a1 100644 --- a/asm/overlay_93_thumb_1.s +++ b/asm/overlay_93_thumb_1.s @@ -450,7 +450,7 @@ ov93_0225C768: ; 0x0225C768 add r1, #0x80 str r0, [r1] mov r0, #0x75 - bl ScrStrBufs_new + bl MessageFormat_new add r1, r5, #0 add r1, #0x84 str r0, [r1] @@ -1043,7 +1043,7 @@ _0225CD72: add r0, r4, #0 add r0, #0x84 ldr r0, [r0] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 add r0, #0x80 ldr r0, [r0] diff --git a/asm/overlay_95.s b/asm/overlay_95.s index 65d3500583..1dfcf9d732 100644 --- a/asm/overlay_95.s +++ b/asm/overlay_95.s @@ -478,7 +478,7 @@ ov95_021E5CAC: ; 0x021E5CAC bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x46 - bl ScrStrBufs_new + bl MessageFormat_new add r5, r0, #0 add r0, r7, #0 add r1, r4, #0 @@ -514,7 +514,7 @@ ov95_021E5CAC: ; 0x021E5CAC ldr r0, [sp, #0x14] bl String_dtor add r0, r5, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r6, #0 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -2916,7 +2916,7 @@ _021E7042: str r5, [r4, #0xc] str r6, [r4, #4] str r7, [r4, #8] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x14] ldr r1, [r4] mov r0, #4 @@ -2942,7 +2942,7 @@ _021E7082: mov r0, #4 bl FontID_Release ldr r0, [r4, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0xc] mov r1, #4 bl FreeBgTilemapBuffer diff --git a/asm/overlay_96.s b/asm/overlay_96.s index 0f17393e0a..a14cc0ed08 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -8307,7 +8307,7 @@ ov96_021E95F8: ; 0x021E95F8 str r6, [r4] ldr r0, [sp, #8] str r5, [r4, #0xc] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #1 str r1, [sp] str r1, [sp, #4] @@ -8324,7 +8324,7 @@ ov96_021E95F8: ; 0x021E95F8 bl ReadMsgData_ExpandPlaceholders add r5, r0, #0 add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] add r1, r5, #0 bl StringCopy @@ -8359,7 +8359,7 @@ ov96_021E966C: ; 0x021E966C str r5, [r4] ldr r0, [sp, #8] str r6, [r4, #0xc] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #1 str r1, [sp] str r1, [sp, #4] @@ -8387,7 +8387,7 @@ ov96_021E966C: ; 0x021E966C bl ReadMsgData_ExpandPlaceholders add r6, r0, #0 add r0, r5, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] add r1, r6, #0 bl StringCopy @@ -19019,7 +19019,7 @@ _021EE774: bl NewMsgDataFromNarc str r0, [r5, #0xc] ldr r0, [r5, #0x14] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #4] bl ResetAllTextPrinters ldr r1, [r5, #0x34] @@ -19061,7 +19061,7 @@ ov96_021EE808: ; 0x021EE808 ldr r0, [r4, #0xc] bl DestroyMsgData ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] cmp r0, #0 beq _021EE828 @@ -27939,7 +27939,7 @@ ov96_021F2EFC: ; 0x021F2EFC bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x14] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0 str r1, [sp] mov r2, #1 @@ -27968,7 +27968,7 @@ ov96_021F2EFC: ; 0x021F2EFC add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData add r0, r5, #4 @@ -29734,7 +29734,7 @@ ov96_021F3BF0: ; 0x021F3BF0 bl NewMsgDataFromNarc str r0, [r4, #0x5c] add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x60] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -29788,7 +29788,7 @@ _021F3C84: cmp r5, #2 blt _021F3C84 ldr r0, [r7, #0x60] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r7, #0x5c] bl DestroyMsgData add r4, r7, #0 @@ -36267,7 +36267,7 @@ ov96_021F70AC: ; 0x021F70AC bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x54] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #1 str r1, [sp] str r1, [sp, #4] @@ -36297,7 +36297,7 @@ ov96_021F70AC: ; 0x021F70AC add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData add r5, #0x44 @@ -37343,7 +37343,7 @@ ov96_021F78C4: ; 0x021F78C4 bl NewMsgDataFromNarc add r7, r0, #0 add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new ldr r2, _021F792C ; =0x0000012F add r1, r7, #0 add r3, r5, #0 @@ -37364,7 +37364,7 @@ ov96_021F78C4: ; 0x021F78C4 add r0, r5, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r7, #0 bl DestroyMsgData add r0, r4, #0 @@ -45206,7 +45206,7 @@ ov96_021FB808: ; 0x021FB808 bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new add r4, r0, #0 add r0, r6, #0 mov r1, #0x1e @@ -45255,7 +45255,7 @@ ov96_021FB808: ; 0x021FB808 add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r7, #0 bl DestroyMsgData add r5, #8 @@ -53976,7 +53976,7 @@ _021FFDB0: bl NewMsgDataFromNarc add r6, r0, #0 ldr r0, [r5, #0x14] - bl ScrStrBufs_new + bl MessageFormat_new mov r3, #2 str r3, [sp] mov r1, #1 @@ -54013,7 +54013,7 @@ _021FFDB0: add r0, r7, #0 bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r6, #0 bl DestroyMsgData add r0, r5, #4 @@ -54200,7 +54200,7 @@ ov96_021FFF3C: ; 0x021FFF3C bl NewMsgDataFromNarc str r0, [r7, #0x2c] add r0, r6, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r7, #0x30] mov r4, #0 add r5, r7, #0 @@ -54298,7 +54298,7 @@ _02200030: blt _02200030 ldr r0, [sp] ldr r0, [r0, #0x30] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp] ldr r0, [r0, #0x2c] bl DestroyMsgData @@ -60600,7 +60600,7 @@ ov96_0220337C: ; 0x0220337C bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x44] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0 str r1, [sp] mov r2, #1 @@ -60629,7 +60629,7 @@ ov96_0220337C: ; 0x0220337C add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData add r0, r5, #4 @@ -69096,7 +69096,7 @@ ov96_02207774: ; 0x02207774 bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x14] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0 str r1, [sp] mov r2, #1 @@ -69125,7 +69125,7 @@ ov96_02207774: ; 0x02207774 add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData add r0, r5, #4 @@ -69842,7 +69842,7 @@ ov96_02207CCC: ; 0x02207CCC bl NewMsgDataFromNarc str r0, [r7, #0x1c] add r0, r6, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r7, #0x20] mov r4, #0 add r5, r7, #0 @@ -69931,7 +69931,7 @@ _02207DAC: blt _02207DAC ldr r0, [sp] ldr r0, [r0, #0x20] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp] ldr r0, [r0, #0x1c] bl DestroyMsgData @@ -73849,7 +73849,7 @@ _02209CB0: mov r0, #0x97 lsl r0, r0, #2 ldr r0, [r6, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x96 lsl r0, r0, #2 ldr r0, [r6, r0] @@ -74000,7 +74000,7 @@ ov96_02209DE4: ; 0x02209DE4 lsl r1, r1, #2 str r0, [r6, r1] ldr r0, [r6] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x97 lsl r1, r1, #2 str r0, [r6, r1] @@ -84351,7 +84351,7 @@ _0220EDD4: str r0, [r1, #0x18] add r0, r1, #0 ldr r0, [r0] - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [sp] str r0, [r1, #0x14] ldr r1, [r1] @@ -84376,7 +84376,7 @@ ov96_0220EE4C: ; 0x0220EE4C add r0, #0x24 bl RemoveWindow ldr r0, [r6, #0x14] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x18] bl DestroyMsgData ldr r5, _0220EE88 ; =ov96_0221CF58 @@ -93563,7 +93563,7 @@ ov96_022136A4: ; 0x022136A4 bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #0x58] - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0 str r1, [sp] mov r2, #1 @@ -93593,7 +93593,7 @@ ov96_022136A4: ; 0x022136A4 add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl DestroyMsgData add r5, #8 @@ -94942,7 +94942,7 @@ ov96_022140F4: ; 0x022140F4 bl NewMsgDataFromNarc str r0, [sp, #0xc] ldr r0, [r5, #0x58] - bl ScrStrBufs_new + bl MessageFormat_new add r7, r0, #0 ldr r0, [sp, #0xc] ldr r1, _0221419C ; =0x00000133 @@ -94995,7 +94995,7 @@ _02214140: cmp r4, #4 blo _02214140 add r0, r7, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0xc] bl DestroyMsgData add sp, #0x10 @@ -95687,7 +95687,7 @@ ov96_0221464C: ; 0x0221464C bl NewMsgDataFromNarc str r0, [r4, #0x34] add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x38] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -95702,7 +95702,7 @@ ov96_02214690: ; 0x02214690 ldr r0, [r4, #0x40] bl FreeToHeap ldr r0, [r4, #0x38] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x34] bl DestroyMsgData add r0, r4, #0 @@ -99788,7 +99788,7 @@ _02216584: str r0, [r1, #0x14] add r0, r1, #0 ldr r0, [r0] - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, [sp] str r0, [r1, #0x10] ldr r1, [r1] @@ -99813,7 +99813,7 @@ ov96_022165FC: ; 0x022165FC add r0, #0x20 bl RemoveWindow ldr r0, [r6, #0x10] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r6, #0x14] bl DestroyMsgData ldr r5, _02216638 ; =ov96_0221D738 diff --git a/asm/overlay_97.s b/asm/overlay_97.s index a2e44cccea..8151f39085 100644 --- a/asm/overlay_97.s +++ b/asm/overlay_97.s @@ -1229,7 +1229,7 @@ ov97_0221EEA4: ; 0x0221EEA4 bl NewMsgDataFromNarc str r0, [r5, #0x6c] ldr r0, [r5] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r5, #0x70] ldr r1, [r5] mov r0, #0xb @@ -1308,7 +1308,7 @@ ov97_0221F020: ; 0x0221F020 ldr r0, [r7, #0x6c] bl DestroyMsgData ldr r0, [r7, #0x70] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r7, #0x74] bl String_dtor add r0, r7, #0 diff --git a/asm/overlay_98.s b/asm/overlay_98.s index 7aab31184c..19c5eba91c 100644 --- a/asm/overlay_98.s +++ b/asm/overlay_98.s @@ -733,7 +733,7 @@ _0221EB44: bl NewMsgDataFromNarc str r0, [r4, #8] ldr r0, [sp] - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x10] mov r0, #1 ldr r1, [sp] @@ -760,7 +760,7 @@ ov98_0221EB84: ; 0x0221EB84 ldr r0, [r5, #0x14] bl String_dtor ldr r0, [r5, #0x10] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r5, #0xc] bl DestroyMsgData ldr r0, [r5, #8] diff --git a/asm/overlay_trainer_card_main.s b/asm/overlay_trainer_card_main.s index 81d0095df3..782a3f6254 100644 --- a/asm/overlay_trainer_card_main.s +++ b/asm/overlay_trainer_card_main.s @@ -2529,7 +2529,7 @@ _021E6F68: mov r2, #0x19 str r0, [sp, #0x18] mov r0, #6 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r4, r0, #0 ldr r0, _021E71CC ; =0x000033D4 mov r2, #0 @@ -2776,7 +2776,7 @@ _021E710A: ldr r0, [sp, #0x1c] bl String_dtor add r0, r4, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -2866,7 +2866,7 @@ _021E721C: ldr r4, [r0, r1] mov r0, #6 mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom ldr r1, [sp, #0x18] add r6, r0, #0 add r1, #0x33 @@ -3131,7 +3131,7 @@ _021E7324: add r0, r7, #0 bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -3272,7 +3272,7 @@ _021E758E: mov r0, #2 mov r1, #0x20 mov r2, #0x19 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom add r6, r0, #0 ldr r0, [r5, #0x18] bl GetIGTHours @@ -3324,7 +3324,7 @@ _021E758E: ldr r0, [sp, #0x14] bl String_dtor add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_trainer_card_signature.s b/asm/overlay_trainer_card_signature.s index 9ce1da4980..af530483b8 100644 --- a/asm/overlay_trainer_card_signature.s +++ b/asm/overlay_trainer_card_signature.s @@ -62,7 +62,7 @@ _021E80D6: bl NARC_ctor add r7, r0, #0 mov r0, #0x27 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x10] mov r0, #0 mov r1, #0x1b @@ -277,7 +277,7 @@ _021E82FC: ldr r0, [r6, #0x14] bl DestroyMsgData ldr r0, [r6, #0x10] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r6, #0 bl ov52_021E8568 ldr r0, [sp] diff --git a/asm/scrcmd_9.s b/asm/scrcmd_9.s index 2ae74e58ba..2d8f3d2dac 100644 --- a/asm/scrcmd_9.s +++ b/asm/scrcmd_9.s @@ -3344,7 +3344,7 @@ sub_0204B538: ; 0x0204B538 mov r0, #0x13 mov r1, #0xe mov r2, #4 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom mov r1, #0 str r1, [sp] mov r3, #1 diff --git a/asm/scrcmd_message.s b/asm/scrcmd_message.s index 2c424f2053..c95cee5531 100644 --- a/asm/scrcmd_message.s +++ b/asm/scrcmd_message.s @@ -318,7 +318,7 @@ ScrCmd_444: ; 0x021EF268 mov r3, #1 bl ov01_021EF5C8 add r0, r6, #0 - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r1, _021EF2DC ; =ov01_021EF348 add r0, r5, #0 bl SetupNativeScript diff --git a/asm/unk_02058AEC.s b/asm/unk_02058AEC.s index 45ea9ed438..1ce4cc573b 100644 --- a/asm/unk_02058AEC.s +++ b/asm/unk_02058AEC.s @@ -1330,7 +1330,7 @@ _02059546: str r5, [r4, #0x24] str r6, [r4, #8] mov r0, #0xb - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x28] mov r0, #0 mov r1, #0x1b @@ -1460,7 +1460,7 @@ _02059672: ldr r0, [r4, #0x2c] bl DestroyMsgData ldr r0, [r4, #0x28] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0xc] bl String_dtor ldr r0, [r4, #0x10] @@ -2164,7 +2164,7 @@ _02059B96: ; jump table .short _02059D24 - _02059B96 - 2 ; case 7 _02059BA6: mov r0, #4 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0x18] mov r0, #0 mov r1, #0x1b @@ -2271,7 +2271,7 @@ _02059C6C: ldr r0, [r4, #0x1c] bl DestroyMsgData ldr r0, [r4, #0x18] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4] bl String_dtor ldr r0, [r4, #4] diff --git a/asm/unk_020755E8.s b/asm/unk_020755E8.s index a1e5029516..c1c42df77f 100644 --- a/asm/unk_020755E8.s +++ b/asm/unk_020755E8.s @@ -846,7 +846,7 @@ sub_02075A7C: ; 0x02075A7C bl NewMsgDataFromNarc str r0, [r4, #8] add r0, r5, #0 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #0xc] mov r0, #5 lsl r0, r0, #6 @@ -1006,7 +1006,7 @@ sub_02075D4C: ; 0x02075D4C ldr r0, [r4, #8] bl DestroyMsgData ldr r0, [r4, #0xc] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #0x10] bl FreeToHeap ldr r0, [r4, #0x3c] diff --git a/asm/unk_02078E30.s b/asm/unk_02078E30.s index 7af8846062..afacb9d8fc 100644 --- a/asm/unk_02078E30.s +++ b/asm/unk_02078E30.s @@ -1053,7 +1053,7 @@ _0207963E: bl MessagePrinter_delete ldr r0, _020796AC ; =0x000007C4 ldr r0, [r6, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, _020796B0 ; =0x00000C74 ldr r0, [r6, r0] cmp r0, #0 @@ -1747,7 +1747,7 @@ _02079C26: ldr r1, _02079CD0 ; =0x000007BC str r0, [r4, r1] mov r0, #0xc - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _02079CD4 ; =0x000007C4 mov r6, #0 add r7, r1, #0 diff --git a/asm/unk_02082908.s b/asm/unk_02082908.s index 8aea32b699..5bb9134809 100644 --- a/asm/unk_02082908.s +++ b/asm/unk_02082908.s @@ -72,7 +72,7 @@ _0208291E: bl NARC_ctor add r7, r0, #0 mov r0, #0x12 - bl ScrStrBufs_new + bl MessageFormat_new mov r1, #0x5a lsl r1, r1, #2 str r0, [r4, r1] @@ -927,7 +927,7 @@ _02083060: mov r0, #0x5a lsl r0, r0, #2 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [sp, #0x10] bl OverlayManager_FreeData mov r0, #0 diff --git a/asm/unk_02088288.s b/asm/unk_02088288.s index 682f31bcaf..fd84173c03 100644 --- a/asm/unk_02088288.s +++ b/asm/unk_02088288.s @@ -746,7 +746,7 @@ sub_02088894: ; 0x02088894 ldr r1, _02088948 ; =0x0000079C str r0, [r4, r1] mov r0, #0x13 - bl ScrStrBufs_new + bl MessageFormat_new ldr r1, _0208894C ; =0x000007A8 str r0, [r4, r1] mov r0, #0xc @@ -824,7 +824,7 @@ sub_0208895C: ; 0x0208895C bl MessagePrinter_delete ldr r0, _020889C8 ; =0x000007A8 ldr r0, [r4, r0] - bl ScrStrBufs_delete + bl MessageFormat_delete mov r0, #0x23 lsl r0, r0, #4 ldr r0, [r4, r0] diff --git a/asm/unk_0208E600.s b/asm/unk_0208E600.s index 8342a08da9..ac6172580e 100644 --- a/asm/unk_0208E600.s +++ b/asm/unk_0208E600.s @@ -34,7 +34,7 @@ sub_0208E600: ; 0x0208E600 ldr r2, [r4] mov r0, #9 mov r1, #0x20 - bl ScrStrBufs_new_custom + bl MessageFormat_new_custom str r0, [r4, #8] str r5, [r4, #0xc] str r6, [r4, #0x10] @@ -458,7 +458,7 @@ _0208E9C0: bl FreeToHeap _0208E9CA: ldr r0, [r4, #8] - bl ScrStrBufs_delete + bl MessageFormat_delete ldr r0, [r4, #4] bl DestroyMsgData add r0, r4, #0 diff --git a/asm/unk_020961D8.s b/asm/unk_020961D8.s index e126d700ac..4ed6f6181d 100644 --- a/asm/unk_020961D8.s +++ b/asm/unk_020961D8.s @@ -22,7 +22,7 @@ sub_020961D8: ; 0x020961D8 add r4, r0, #0 str r5, [r4] mov r0, #0x20 - bl ScrStrBufs_new + bl MessageFormat_new str r0, [r4, #4] mov r3, #0x20 str r3, [sp] @@ -66,7 +66,7 @@ sub_02096248: ; 0x02096248 ldr r0, [r4, #0x10] bl sub_02090D0C ldr r0, [r4, #4] - bl ScrStrBufs_delete + bl MessageFormat_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/include/battle_arcade_game_board.h b/include/battle_arcade_game_board.h index aa10e68e0b..a2906c3ecb 100644 --- a/include/battle_arcade_game_board.h +++ b/include/battle_arcade_game_board.h @@ -2,7 +2,7 @@ #define POKEHEARTGOLD_BATTLE_ARCADE_GAME_BOARD_H #include "msgdata.h" -#include "msgfmt.h" +#include "message_format.h" #include "overlay_manager.h" #include "party.h" #include "player_data.h" @@ -102,7 +102,7 @@ typedef struct GAME_BOARD_WORK { u8 unk44[32]; u8 unk64; MSGDATA *msgData; - MSGFMT *msgFmt; + MessageFormat *msgFmt; STRING *unk70; STRING *unk74; STRING *unk78[2]; diff --git a/include/bug_contest.h b/include/bug_contest.h index 4b673c96fe..7bdb97ddcd 100644 --- a/include/bug_contest.h +++ b/include/bug_contest.h @@ -8,9 +8,9 @@ void FieldSys_StartBugContestTimer(FieldSystem *fsys); BUGCONTEST *BugContest_new(FieldSystem *fsys, u32 weekday); void BugContest_delete(BUGCONTEST *bugContest); void BugContest_Judge(BUGCONTEST *bugContest); -void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MSGDATA *msgData, MSGFMT *msgFmt, u8 place); +void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MSGDATA *msgData, MessageFormat *msgFmt, u8 place); BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id); -BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MSGFMT *msgFmt, u8 slot); +BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFmt, u8 slot); void BugContest_BackUpParty(BUGCONTEST *bugContest); void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n); diff --git a/include/get_egg.h b/include/get_egg.h index 798dc9d445..3bd1e99307 100644 --- a/include/get_egg.h +++ b/include/get_egg.h @@ -5,18 +5,18 @@ #include "script.h" void Sav2_DayCare_PutMonIn(PARTY *party, u8 partyIdx, DAYCARE *dayCare, SAVEDATA *saveData); -u16 Sav2_DayCare_RetrieveMon(PARTY *party, MSGFMT *msgFmt, DAYCARE *daycare, u8 whomst); +u16 Sav2_DayCare_RetrieveMon(PARTY *party, MessageFormat *msgFmt, DAYCARE *daycare, u8 whomst); int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon); -u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MSGFMT *msgFmt); -u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MSGFMT *msgFmt); +u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MessageFormat *msgFmt); +u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MessageFormat *msgFmt); void Sav2_DayCare_ResetEggStats(DAYCARE *dayCare); void SetEggStats(POKEMON *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); void GiveEggToPlayer(DAYCARE *dayCare, PARTY *party, PLAYERPROFILE* profile); BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys); POKEMON *sub_0206CE44(PARTY *party); -void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt); -void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MSGFMT *msgFmt); -u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt); +void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MessageFormat *msgFmt); +void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MessageFormat *msgFmt); +u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MessageFormat *msgFmt); u8 Sav2_DayCare_GetState(DAYCARE *dayCare); u8 Sav2_DayCare_CalcCompatibility(DAYCARE *dayCare); void sub_0206D328(POKEMON *pokemon, HeapID heapId); diff --git a/include/message_format.h b/include/message_format.h new file mode 100644 index 0000000000..d643920e78 --- /dev/null +++ b/include/message_format.h @@ -0,0 +1,97 @@ +#ifndef GUARD_MESSAGE_FORMAT_H +#define GUARD_MESSAGE_FORMAT_H + +#include "pm_string.h" +#include "player_data.h" +#include "save_misc_data.h" +#include "pokemon_types_def.h" +#include "trainer_data.h" +#include "pokemon_storage_system.h" + +typedef struct MessageFormatAttrs { + u8 data[4]; +} MessageFormatAttrs; + +typedef struct MessageFormatFields { + MessageFormatAttrs attrs; + STRING *msg; +} MessageFormatFields; + +typedef struct MessageFormat { + u32 count; + HeapID heapId; + MessageFormatFields *fields; + STRING *buffer; +} MessageFormat; + +MessageFormat *MessageFormat_new(HeapID heap_id); +MessageFormat *MessageFormat_new_custom(u32 nstr, u32 _strlen, HeapID heapId); +void MessageFormat_delete(MessageFormat *messageFormat); +void StringExpandPlaceholders(MessageFormat *messageFormat, STRING *dest, STRING *src); +void BufferString(MessageFormat *messageFormat, u32 fieldno, const STRING *string, s32 a3, s32 a4, s32 a5); +void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 numDigits, STRCONVMODE strconvmode, BOOL whichCharset); +void BufferPlayersName(MessageFormat *messageFormat, u32 idx, PLAYERPROFILE *playerProfile); +void BufferECWord(MessageFormat *messageFormat, u32 idx, u16 wordno); +void BufferSpeciesName(MessageFormat *messageFormat, u32 idx, u16 species); +void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species); +void BufferTrainerClassName(MessageFormat *messageFormat, u32 fieldno, u32 trainerClassId); +void MessageFormat_InitFields(MessageFormatFields *fields); +void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 fieldno, const STRING *string, const MessageFormatAttrs *attrs); +void BufferRivalsName(MessageFormat *messageFormat, u32 fieldno, SAVEDATA *saveData); +void BufferFriendsName(MessageFormat *messageFormat, u32 fieldno, SAVEDATA *saveData); +void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon); +void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon); +void BufferBoxMonNickname(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon); +void BufferBoxMonOTName(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon); +void BufferMoveName(MessageFormat *messageFormat, u32 fieldno, u32 moveId); +void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 fieldno, u32 decoId); +void BufferAbilityName(MessageFormat *messageFormat, u32 fieldno, u32 abilityId); +void BufferNatureName(MessageFormat *messageFormat, u32 fieldno, u32 natureId); +void BufferItemName(MessageFormat *messageFormat, u32 fieldno, u32 itemId); +void BufferItemNameWithIndefArticle(MessageFormat *messageFormat, u32 fieldno, u32 itemId); +void BufferItemNamePlural(MessageFormat *messageFormat, u32 fieldno, u32 itemId); +void BufferPocketName(MessageFormat *messageFormat, u32 fieldno, u32 pocketId); +void BufferTypeName(MessageFormat *messageFormat, u32 fieldno, u32 typeId); +void BufferStatName(MessageFormat *messageFormat, u32 fieldno, u32 statId); +void BufferStatusName(MessageFormat *messageFormat, u32 fieldno, u32 statusId); +void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 fieldno, u32 flavorId); +void BufferLandmarkName(MessageFormat *messageFormat, u32 fieldno, u32 landmarkId); +void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 fieldno, u32 trainerClassId); +void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer); +void BufferTrainerName(MessageFormat *messageFormat, u32 fieldno, u32 trainerId); +void BufferFrontierOpponentName(MessageFormat *messageFormat, u32 fieldno, u32 opponentId); +void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer); +void BufferDecorationName(MessageFormat *messageFormat, u32 fieldno, u32 decorationId); +void BufferGenderSymbol(MessageFormat *messageFormat, u32 fieldno, u8 gender); +void BufferPCBoxName(MessageFormat *messageFormat, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno); +void BufferCountryName(MessageFormat *messageFormat, u32 fieldno, u32 countryId); +void BufferCityName(MessageFormat *messageFormat, u32 fieldno, u32 countryId, u32 cityId); +void BufferSealName(MessageFormat *messageFormat, u32 fieldno, u32 sealId); +void BufferSealNamePlural(MessageFormat *messageFormat, u32 fieldno, u32 sealId); +void BufferLocationName(MessageFormat *messageFormat, u32 fieldno, u32 mapsecId); +void BufferFashionName(MessageFormat *messageFormat, u32 fieldno, u32 fashionId); +void BufferFashionNameWithArticle(MessageFormat *messageFormat, u32 fieldno, u32 fashionId); +void BufferContestBackgroundName(MessageFormat *messageFormat, u32 fieldno, u32 bgId); +void BufferGroupName(MessageFormat *messageFormat, SAVEDATA *saveData, s32 groupId, s32 fieldno, s32 nameType); +void BufferWiFiPlazaActivityName(MessageFormat *messageFormat, u32 fieldno, u32 activityId); +void BufferWiFiPlazaEventName(MessageFormat *messageFormat, u32 fieldno, u32 eventId); +void BufferWiFiPlazaInstrumentName(MessageFormat *messageFormat, u32 fieldno, u32 instrumentId); +void BufferJPGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferENGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferFRGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferITGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferDEGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferSPGreeting(MessageFormat *messageFormat, u32 fieldno, u32 timeOfDay); +void BufferPokeathlonCourseName(MessageFormat *messageFormat, u32 fieldno, u32 courseId); +void BufferPokeathlonMedalName(MessageFormat *messageFormat, u32 fieldno, u32 medalId); +void BufferPokeathlonEventName(MessageFormat *messageFormat, u32 fieldno, u32 eventId); +void BufferApricornName(MessageFormat *messageFormat, u32 fieldno, u32 apricornId); +void BufferSafariZoneObjectName(MessageFormat *messageFormat, u32 fieldno, u32 objectId); +void BufferSafariZoneAreaName(MessageFormat *messageFormat, u32 fieldno, u32 areaId); +void BufferPokewalkerCourseName(MessageFormat *messageFormat, u32 fieldno, u32 courseId); +void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 fieldno, u32 month); +void MessageFormat_UpperFirstChar(MessageFormat *messageFormat, u32 fieldno); +void BufferDeptStoreFloorNo(MessageFormat *messageFormat, u32 fieldno, u32 floor); +void MessageFormat_ResetBuffers(MessageFormat *messageFormat); + +#endif //GUARD_MESSAGE_FORMAT_H diff --git a/include/msgdata.h b/include/msgdata.h index 5e95bed05f..666bac592d 100644 --- a/include/msgdata.h +++ b/include/msgdata.h @@ -3,7 +3,7 @@ #include "pm_string.h" #include "filesystem.h" -#include "msgfmt.h" +#include "message_format.h" #include "msgdata/msg.naix" typedef enum MsgDataLoadType { @@ -40,7 +40,7 @@ void ReadMsgDataIntoString(MSGDATA *msgData, s32 strno, STRING *dest); void GetSpeciesNameIntoArray(u16 species, HeapID heap_id, u16 *dest); STRING *GetSpeciesName(u16 species, HeapID heap_id); void ReadMsgData_NewNarc_ExistingString(NarcId narcId, s32 fileId, u32 msgId, HeapID heapId, STRING *dest); -STRING * ReadMsgData_ExpandPlaceholders(MSGFMT * a0, MSGDATA * msgData, u32 msgno, HeapID heap_id); +STRING * ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, MSGDATA * msgData, u32 msgno, HeapID heap_id); STRING * ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, u32 heap_id); u32 MsgDataGetCount(MSGDATA *msgData); void ReadMsgDataIntoU16Array(MSGDATA *msgData, u32 msgno, u16 *dest); diff --git a/include/msgfmt.h b/include/msgfmt.h deleted file mode 100644 index 542b893481..0000000000 --- a/include/msgfmt.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef GUARD_MSGFMT_H -#define GUARD_MSGFMT_H - -#include "pm_string.h" -#include "player_data.h" -#include "save_misc_data.h" -#include "pokemon_types_def.h" -#include "trainer_data.h" -#include "pokemon_storage_system.h" - -typedef struct MsgPlaceholderFieldAttrs { - u8 data[4]; -} MSGFMT_FIELD_ATTRS; - -typedef struct PlaceholderField { - MSGFMT_FIELD_ATTRS attrs; - STRING *msg; -} MSGFMT_FIELD; - -typedef struct MSGFMT { - u32 nstr; - HeapID heapId; - MSGFMT_FIELD *fields; - STRING *buffer; -} MSGFMT; - -MSGFMT *ScrStrBufs_new(u32 heap_id); -MSGFMT *ScrStrBufs_new_custom(u32 nstr, u32 _strlen, HeapID heapId); -void ScrStrBufs_delete(MSGFMT *msgFmt); -void StringExpandPlaceholders(MSGFMT *msgFmt, STRING *dest, STRING *src); -void BufferString(MSGFMT *msgFmt, u32 fieldno, const STRING *string, int a3, int a4, int a5); -void BufferIntegerAsString(MSGFMT *msgFmt, u32 idx, int num, u32 numDigits, STRCONVMODE strconvmode, BOOL whichCharset); -void BufferPlayersName(MSGFMT *msgFmt, u32 idx, PLAYERPROFILE *playerProfile); -void BufferECWord(MSGFMT *msgFmt, u32 idx, u16 wordno); -void BufferSpeciesName(MSGFMT *msgFmt, u32 idx, u16 species); -void BufferSpeciesNameWithArticle(MSGFMT *msgFmt, u32 idx, u32 species); -void BufferTrainerClassName(MSGFMT *msgFmt, u32 fieldno, u32 trainerClassId); -void ScrStrBufs_InitSub(MSGFMT_FIELD *field); -void SetStringAsPlaceholder(MSGFMT *msgFmt, u32 fieldno, const STRING *string, const MSGFMT_FIELD_ATTRS *attrs); -void BufferRivalsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); -void BufferFriendsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferMoveName(MSGFMT *msgFmt, u32 fieldno, u32 moveId); -void BufferRibbonNameOrDesc(MSGFMT *msgFmt, u32 fieldno, u32 decoId); -void BufferAbilityName(MSGFMT *msgFmt, u32 fieldno, u32 abilityId); -void BufferNatureName(MSGFMT *msgFmt, u32 fieldno, u32 natureId); -void BufferItemName(MSGFMT *msgFmt, u32 fieldno, u32 itemId); -void BufferItemNameWithIndefArticle(MSGFMT *msgFmt, u32 fieldno, u32 itemId); -void BufferItemNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 itemId); -void BufferPocketName(MSGFMT *msgFmt, u32 fieldno, u32 pocketId); -void BufferTypeName(MSGFMT *msgFmt, u32 fieldno, u32 typeId); -void BufferStatName(MSGFMT *msgFmt, u32 fieldno, u32 statId); -void BufferStatusName(MSGFMT *msgFmt, u32 fieldno, u32 statusId); -void BufferFlavorDislikeText(MSGFMT *msgFmt, u32 fieldno, u32 flavorId); -void BufferLandmarkName(MSGFMT *msgFmt, u32 fieldno, u32 landmarkId); -void BufferTrainerClassNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 trainerClassId); -void BufferTrainerClassNameFromDataStruct(MSGFMT *msgFmt, u32 fieldno, TRAINER *trainer); -void BufferTrainerName(MSGFMT *msgFmt, u32 fieldno, u32 trainerId); -void BufferFrontierOpponentName(MSGFMT *msgFmt, u32 fieldno, u32 opponentId); -void BufferTrainerNameFromDataStruct(MSGFMT *msgFmt, u32 fieldno, TRAINER *trainer); -void BufferDecorationName(MSGFMT *msgFmt, u32 fieldno, u32 decorationId); -void BufferGenderSymbol(MSGFMT *msgFmt, u32 fieldno, u8 gender); -void BufferPCBoxName(MSGFMT *msgFmt, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno); -void BufferCountryName(MSGFMT *msgFmt, u32 fieldno, u32 countryId); -void BufferCityName(MSGFMT *msgFmt, u32 fieldno, u32 countryId, u32 cityId); -void BufferSealName(MSGFMT *msgFmt, u32 fieldno, u32 sealId); -void BufferSealNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 sealId); -void BufferLocationName(MSGFMT *msgFmt, u32 fieldno, u32 mapsecId); -void BufferFashionName(MSGFMT *msgFmt, u32 fieldno, u32 fashionId); -void BufferFashionNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 fashionId); -void BufferContestBackgroundName(MSGFMT *msgFmt, u32 fieldno, u32 bgId); -void BufferGroupName(MSGFMT *msgFmt, SAVEDATA *saveData, int groupId, int fieldno, int nameType); -void BufferWiFiPlazaActivityName(MSGFMT *msgFmt, u32 fieldno, u32 activityId); -void BufferWiFiPlazaEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId); -void BufferWiFiPlazaInstrumentName(MSGFMT *msgFmt, u32 fieldno, u32 instrumentId); -void BufferJPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferENGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferFRGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferITGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferDEGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferSPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay); -void BufferPokeathlonCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId); -void BufferPokeathlonMedalName(MSGFMT *msgFmt, u32 fieldno, u32 medalId); -void BufferPokeathlonEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId); -void BufferApricornName(MSGFMT *msgFmt, u32 fieldno, u32 apricornId); -void BufferSafariZoneObjectName(MSGFMT *msgFmt, u32 fieldno, u32 objectId); -void BufferSafariZoneAreaName(MSGFMT *msgFmt, u32 fieldno, u32 areaId); -void BufferPokewalkerCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId); -void BufferMonthNameAbbr(MSGFMT *msgFmt, u32 fieldno, u32 month); -void ScrStrBufs_UpperFirstChar(MSGFMT *msgFmt, u32 fieldno); -void BufferDeptStoreFloorNo(MSGFMT *msgFmt, u32 fieldno, u32 floor); -void ScrStrBufs_ResetBuffers(MSGFMT * msgFmt); - -#endif //GUARD_MSGFMT_H diff --git a/include/overlay_01.h b/include/overlay_01.h index a87739b413..4273448b38 100644 --- a/include/overlay_01.h +++ b/include/overlay_01.h @@ -55,7 +55,7 @@ WINDOW* ov01_021F3D80(struct FieldSystemUnkSub68*); u8 ov01_021F3D84(struct FieldSystemUnkSub68*); BOOL ov01_021F3D88(struct FieldSystemUnkSub68*); void ov01_021F3D98(FieldSystem* fsys); -struct UnkStruct_ov01_021EDC28 *ov01_021EDF78(FieldSystem *fsys, u8 x, u8 y, u8 initCursorPos, u8 cancellable, u16 *ret_p, MSGFMT *msgFmt, WINDOW *window, MSGDATA *msgData); +struct UnkStruct_ov01_021EDC28 *ov01_021EDF78(FieldSystem *fsys, u8 x, u8 y, u8 initCursorPos, u8 cancellable, u16 *ret_p, MessageFormat *msgFmt, WINDOW *window, MSGDATA *msgData); struct UnkStruct_ov01_021EDC28 **ov01_021F6B20(FieldSystem *fsys); void ov01_021EDC7C(struct UnkStruct_ov01_021EDC28 *menu, u32 msgId, u32 value); void ov01_021EDC84(struct UnkStruct_ov01_021EDC28 *menu); @@ -85,7 +85,7 @@ u32 ov01_021F149C(void *, int); void ov01_021F14A8(void *, int, void *); void ov01_021F1448(void *); int MapNumToFloorNo(u32 mapId); -void PrintCurFloorInNewWindow(FieldSystem *fsys, u8 x, u8 y, u16 *p_ret, MSGFMT *msgFmt, u16 floor); +void PrintCurFloorInNewWindow(FieldSystem *fsys, u8 x, u8 y, u16 *p_ret, MessageFormat *msgFmt, u16 floor); int Field_SaveGameNormal(FieldSystem *fsys); void ov01_021E9AE8(FieldSystem *fsys, int a1, int a2, u8 a3); void ov01_021E9C00(FieldSystem *fsys, u8 a1); diff --git a/include/overlay_03.h b/include/overlay_03.h index c83520b66a..c24075dcd3 100644 --- a/include/overlay_03.h +++ b/include/overlay_03.h @@ -14,8 +14,8 @@ int ov03_02255BFC(void); void ov03_02255C18(FieldSystem *fsys, u16 a1, u16 a2, u16 a3); int ov03_02255C64(void); void ov03_022566B0(TaskManager *taskManager, u16 *p_var); -void ov03_022566D0(FieldSystem *fsys, MSGFMT *msgFmt, u16 ruleset); -u16 ov03_02256A2C(FieldSystem *fsys, MSGFMT *msgFmt, u16 a2); +void ov03_022566D0(FieldSystem *fsys, MessageFormat *msgFmt, u16 ruleset); +u16 ov03_02256A2C(FieldSystem *fsys, MessageFormat *msgFmt, u16 a2); void ov03_02256710(FieldSystem *fsys, u16 a1); void ov03_02258910(FieldSystem *fsys); void ov03_02258CFC(TaskManager *taskManager, enum PokeathlonData data); diff --git a/include/overlay_94.h b/include/overlay_94.h index 19987eac5f..81a1db09b1 100644 --- a/include/overlay_94.h +++ b/include/overlay_94.h @@ -33,7 +33,7 @@ typedef struct PartyMenuStruct { UnkStruct_Overlay_94_B* unk654; //0x654 u8 unk658[0x167]; MSGDATA* msgData; //0x7c0 - MSGFMT* unk7c4; + MessageFormat* unk7c4; STRING* unk7c8; u8 unk7cc[0x498]; u8 unkc64; diff --git a/include/script.h b/include/script.h index e8695c10e9..1b5c87dd0d 100644 --- a/include/script.h +++ b/include/script.h @@ -60,7 +60,7 @@ typedef struct ScriptEnvironment { u32 cameraTarget; LocalMapObject *unk_34; SCRIPTCONTEXT *scriptContexts[3]; - MSGFMT *msgfmt; + MessageFormat *msgfmt; STRING *strbuf1; STRING *strbuf2; struct WaitingIconManager *unk_50; diff --git a/include/unk_0205A44C.h b/include/unk_0205A44C.h index b84c11b933..c535383b38 100644 --- a/include/unk_0205A44C.h +++ b/include/unk_0205A44C.h @@ -6,12 +6,12 @@ BOOL sub_0205A478(struct UnkStruct_02059E1C *fsys_unk80); BOOL sub_0205A4D8(struct UnkStruct_02059E1C *fsys_unk80); -int sub_0205A6AC(MSGFMT *msgFmt); -int sub_0205A750(struct UnkStruct_02059E1C *fsys_unk80, int objId, int a2, MSGFMT *msgFmt); +int sub_0205A6AC(MessageFormat *msgFmt); +int sub_0205A750(struct UnkStruct_02059E1C *fsys_unk80, int objId, int a2, MessageFormat *msgFmt); u32 sub_0205A894(void); void sub_0205A904(int command); -int sub_0205A9A0(struct UnkStruct_02059E1C *fsys_unk80, MSGFMT *msgFmt); -void sub_0205AA9C(MSGFMT *msgFmt, u16 a1, u16 objId, PLAYERPROFILE *profile, SAVE_EASY_CHAT_T *easyChat); +int sub_0205A9A0(struct UnkStruct_02059E1C *fsys_unk80, MessageFormat *msgFmt); +void sub_0205AA9C(MessageFormat *msgFmt, u16 a1, u16 objId, PLAYERPROFILE *profile, SAVE_EASY_CHAT_T *easyChat); void sub_0205ABB0(struct UnkStruct_02059E1C *fsys_unk80); #endif //POKEHEARTGOLD_UNK_0205A44C_H diff --git a/include/unk_0205B3DC.h b/include/unk_0205B3DC.h index d242c46a95..a6cf349f51 100644 --- a/include/unk_0205B3DC.h +++ b/include/unk_0205B3DC.h @@ -1,9 +1,9 @@ #ifndef POKEHEARTGOLD_UNK_0205B3DC_H #define POKEHEARTGOLD_UNK_0205B3DC_H -#include "msgfmt.h" +#include "message_format.h" -void sub_0205B3DC(u32 trainerId, u32 playerGender, MSGFMT *msgFmt); +void sub_0205B3DC(u32 trainerId, u32 playerGender, MessageFormat *msgFmt); int sub_0205B418(u32 trainerId, u32 playerGender, u32 choice); int sub_0205B464(int playerGender, int trclass); int sub_0205B46C(int playerGender, int trclass, int attr); diff --git a/include/voltorb_flip/voltorb_flip_work.h b/include/voltorb_flip/voltorb_flip_work.h index c5f9b6ccb8..e724c3c872 100644 --- a/include/voltorb_flip/voltorb_flip_work.h +++ b/include/voltorb_flip/voltorb_flip_work.h @@ -44,7 +44,7 @@ typedef struct VoltorbFlipAppWork { void *unk148; UnkStruct_0200CF18 *unk14C[0xd]; MSGDATA *msgData; - MSGFMT *msgFmt; + MessageFormat *msgFmt; u16 unk188[10][8]; u8 unk228; u8 unk229; diff --git a/main.lsf b/main.lsf index 12e7a5f58f..adc3c66aa5 100644 --- a/main.lsf +++ b/main.lsf @@ -34,7 +34,7 @@ Static main Object asm/unk_0200B150.o Object asm/unk_0200B380.o Object src/msgdata.o - Object src/msgfmt.o + Object src/message_format.o Object asm/message_printer.o Object asm/unk_0200CE7C.o Object asm/unk_0200CF18.o diff --git a/src/bag_view.c b/src/bag_view.c index 63c30e942b..71ab576278 100644 --- a/src/bag_view.c +++ b/src/bag_view.c @@ -7,7 +7,7 @@ #include "fashion_case.h" #include "frontier_data.h" #include "msgdata.h" -#include "msgfmt.h" +#include "message_format.h" #include "constants/items.h" #include "msgdata/msg/msg_0010.h" @@ -106,10 +106,10 @@ static u32 get_num_battle_points(SAVEDATA *saveData) { BOOL TryFormatRegisteredKeyItemUseMessage(SAVEDATA *saveData, STRING *dest, u16 itemId, u32 heap_id) { MSGDATA *msgData; STRING *fmtStr; - MSGFMT *msgFmt; + MessageFormat *msgFmt; msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0010_bin, heap_id); - msgFmt = ScrStrBufs_new(heap_id); + msgFmt = MessageFormat_new(heap_id); if (itemId == ITEM_NONE) { fmtStr = NewString_ReadMsgData(msgData, msg_0010_00102); @@ -127,13 +127,13 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SAVEDATA *saveData, STRING *dest, u16 fmtStr = NewString_ReadMsgData(msgData, msg_0010_00058); BufferIntegerAsString(msgFmt, 0, get_num_coins(saveData), 5, STRCONVMODE_LEFT_ALIGN, TRUE); } else { - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); DestroyMsgData(msgData); return FALSE; } StringExpandPlaceholders(msgFmt, dest, fmtStr); String_dtor(fmtStr); - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); DestroyMsgData(msgData); return TRUE; } @@ -163,16 +163,16 @@ void GetItemUseErrorMessage(PLAYERPROFILE *playerProfile, STRING *dest, u16 item default: { // {PLAYER}! This isn't the time to use that! - MSGFMT *msgFmt; + MessageFormat *msgFmt; STRING *string; msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0040_bin, heap_id); - msgFmt = ScrStrBufs_new(heap_id); + msgFmt = MessageFormat_new(heap_id); string = NewString_ReadMsgData(msgData, msg_0040_00037); BufferPlayersName(msgFmt, 0, playerProfile); StringExpandPlaceholders(msgFmt, dest, string); String_dtor(string); - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); DestroyMsgData(msgData); } break; diff --git a/src/battle_arcade_game_board.c b/src/battle_arcade_game_board.c index 38921a7b10..c2f565a6c4 100644 --- a/src/battle_arcade_game_board.c +++ b/src/battle_arcade_game_board.c @@ -2,6 +2,7 @@ #include "filesystem.h" #include "font.h" #include "gf_gfx_loader.h" +#include "global.h" #include "gx_layers.h" #include "math_util.h" #include "overlay_80.h" @@ -22,6 +23,11 @@ #include "unk_02022588.h" #include "unk_020215A0.h" #include "unk_0200A090.h" +#include "vram_transfer_manager.h" +#include "unk_0200B150.h" +#include "pokemon.h" +#include "unk_0200ACF0.h" +#include "pokemon_icon_idx.h" FS_EXTERN_OVERLAY(OVY_80); @@ -79,6 +85,8 @@ static void ov84_0223F894(BATTLE_ARCADE_OBJECT *obj, POKEMON *mon); static void ov84_0223F8A8(BATTLE_ARCADE_OBJECT *obj, int flag); static void ov84_0223F8B4(BGCONFIG *config, WINDOW *window); static void ov84_0223F8E4(WINDOW *window); +static BOOL BattleArcadeGameBoard_EndMulti(GAME_BOARD_WORK *work); +static BOOL BattleArcadeGameBoard_End(GAME_BOARD_WORK *work); BOOL BattleArcadeGameBoard_InitOverlay(OVY_MANAGER *man, int *state) { int i; @@ -518,7 +526,7 @@ static void BattleArcadeGameBoard_Delete(GAME_BOARD_WORK *work) { ov84_0223F418(&work->unk3E8); DestroyMsgData(work->msgData); - ScrStrBufs_delete(work->msgFmt); + MessageFormat_delete(work->msgFmt); String_dtor(work->unk70); String_dtor(work->unk74); @@ -550,7 +558,7 @@ static void BattleArcadeGameBoard_InitObjects(GAME_BOARD_WORK *work) { ov84_0223E934(work); work->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0425_bin, HEAP_ID_GAME_BOARD); - work->msgFmt = ScrStrBufs_new(HEAP_ID_GAME_BOARD); + work->msgFmt = MessageFormat_new(HEAP_ID_GAME_BOARD); work->unk70 = String_ctor(600, HEAP_ID_GAME_BOARD); work->unk74 = String_ctor(600, HEAP_ID_GAME_BOARD); diff --git a/src/communication_error.c b/src/communication_error.c index f297ce5309..bcf0b8fd7f 100644 --- a/src/communication_error.c +++ b/src/communication_error.c @@ -13,6 +13,7 @@ #include "unk_0200B380.h" #include "unk_02037C94.h" #include "overlay_00_thumb.h" +#include "global.h" static const GF_GXBanksConfig sCommunicationErrorBanksConfig = { .bg = GX_VRAM_BG_256_AB, @@ -161,15 +162,15 @@ void ShowCommunicationError(HeapID heap_id, u32 error, u32 error_code) { ResetAllTextPrinters(); - MSGFMT* msg_fmt = ScrStrBufs_new(heap_id); + MessageFormat* messageFormat = MessageFormat_new(heap_id); AddWindow(bg_config, &window, &sCommunicationErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); DrawFrameAndWindow1(&window, FALSE, 0x1F7, 2); - BufferIntegerAsString(msg_fmt, 0, error_code, 5, STRCONVMODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(messageFormat, 0, error_code, 5, STRCONVMODE_LEADING_ZEROS, TRUE); ReadMsgDataIntoString(errors_msgdata, msg_no, tmp_str); - StringExpandPlaceholders(msg_fmt, error_str, tmp_str); + StringExpandPlaceholders(messageFormat, error_str, tmp_str); AddTextPrinterParameterized(&window, 0, error_str, 0, 0, 0, NULL); String_dtor(error_str); // BUG: tmp_str is never destroyed. @@ -181,6 +182,6 @@ void ShowCommunicationError(HeapID heap_id, u32 error, u32 error_code) { RemoveWindow(&window); DestroyMsgData(errors_msgdata); - ScrStrBufs_delete(msg_fmt); + MessageFormat_delete(messageFormat); FreeToHeap(bg_config); } diff --git a/src/field_black_out.c b/src/field_black_out.c index 959716079f..b1e7c27091 100644 --- a/src/field_black_out.c +++ b/src/field_black_out.c @@ -23,7 +23,7 @@ struct BlackoutScreenWork { BGCONFIG *bgConfig; WINDOW window; MSGDATA *msgData; - MSGFMT *msgFmt; + MessageFormat *msgFmt; }; void _InitDisplays(BGCONFIG *bgConfig); @@ -82,7 +82,7 @@ static void _DrawScurryMessageScreen(FieldSystem *fsys, TaskManager *taskManager sub_0200FBDC(1); _InitDisplays(env->bgConfig); env->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0203_bin, (HeapID)11); - env->msgFmt = ScrStrBufs_new((HeapID)11); + env->msgFmt = MessageFormat_new((HeapID)11); { static const WINDOWTEMPLATE _020FC51C = { 3, @@ -134,7 +134,7 @@ static BOOL _Task_ShowPrintedMessage(TaskManager *taskManager) { case 4: ClearFrameAndWindow2(&work->window, 0); RemoveWindow(&work->window); - ScrStrBufs_delete(work->msgFmt); + MessageFormat_delete(work->msgFmt); DestroyMsgData(work->msgData); FreeBgTilemapBuffer(work->bgConfig, 3); FreeToHeap(work->bgConfig); diff --git a/src/fieldmap.c b/src/fieldmap.c index d8c7ab1ff0..8bab77b047 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -102,7 +102,7 @@ BOOL Task_RunScripts(TaskManager *taskman) { case 0: env->scriptContexts[0] = CreateScriptContext(fsys, env->activeScriptNumber); env->activeScriptContextCount = 1; - env->msgfmt = ScrStrBufs_new_custom(8, 64, HEAP_ID_FIELDMAP); + env->msgfmt = MessageFormat_new_custom(8, 64, HEAP_ID_FIELDMAP); env->strbuf1 = String_ctor(1024, HEAP_ID_FIELDMAP); env->strbuf2 = String_ctor(1024, HEAP_ID_FIELDMAP); env->state++; @@ -123,7 +123,7 @@ BOOL Task_RunScripts(TaskManager *taskman) { } if (env->activeScriptContextCount == 0) { void (*callback)(FieldSystem *a0) = env->scrctx_end_cb; - ScrStrBufs_delete(env->msgfmt); + MessageFormat_delete(env->msgfmt); String_dtor(env->strbuf1); String_dtor(env->strbuf2); env->check = 0; diff --git a/src/game_clear.c b/src/game_clear.c index e268df9f98..da8a572cb6 100644 --- a/src/game_clear.c +++ b/src/game_clear.c @@ -331,10 +331,10 @@ static void GameClearSave_PrintSaveStatus(FieldSystem *fsys, GameClearWork *env, MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0040_bin, 4); if (writeStatus == 2) { - MSGFMT *msgFmt = ScrStrBufs_new(4); + MessageFormat *msgFmt = MessageFormat_new(4); BufferPlayersName(msgFmt, 0, Sav2_PlayerData_GetProfileAddr(fsys->savedata)); env->windowText = ReadMsgData_ExpandPlaceholders(msgFmt, msgData, msg_0040_00016, 4); - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); } else { env->windowText = NewString_ReadMsgData(msgData, msg_0040_00018); } diff --git a/src/get_egg.c b/src/get_egg.c index 540c9169f8..c1d228a6e1 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -22,10 +22,10 @@ static int Sav2_DayCare_GetAvailableSlot(DAYCARE *daycare); static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON *daycareMon, SAVEDATA *saveData); static void Sav2_DayCare_Compaction(DAYCARE *daycare); static void Daycare_LearnLevelUpMoves(POKEMON *pokemon); -static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt); +static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MessageFormat *msgFmt); static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps); -static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt); -static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MSGFMT *msgFmt); +static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MessageFormat *msgFmt); +static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MessageFormat *msgFmt); static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BOXMON **boxmons); static int Daycare_EverstoneCheck(DAYCARE *dayCare); static void GenerateEggPID(DAYCARE *dayCare); @@ -152,7 +152,7 @@ static void Daycare_LearnLevelUpMoves(POKEMON *pokemon) { CalcMonLevelAndStats(pokemon); } -static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt) { +static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MessageFormat *msgFmt) { u32 exp; POKEMON *pokemon; BOXMON *boxmon; @@ -183,10 +183,10 @@ static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSG return species; } -u16 Sav2_DayCare_RetrieveMon(PARTY *party, MSGFMT *msgFmt, DAYCARE *daycare, u8 whomst) { +u16 Sav2_DayCare_RetrieveMon(PARTY *party, MessageFormat *msgFmt, DAYCARE *daycare, u8 whomstdve) { u16 ret; - ret = Sav2_DayCare_MoveMonToParty(party, Sav2_DayCare_GetMonX(daycare, whomst), msgFmt); + ret = Sav2_DayCare_MoveMonToParty(party, Sav2_DayCare_GetMonX(daycare, whomstdve), msgFmt); Sav2_DayCare_Compaction(daycare); return ret; } @@ -219,7 +219,7 @@ int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon) { return new_level - cur_level; } -static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt) { +static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MessageFormat *msgFmt) { BOXMON *boxmon; int levelGrowth; @@ -230,7 +230,7 @@ static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *ms return levelGrowth; } -static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MSGFMT *msgFmt) { +static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MessageFormat *msgFmt) { BOXMON *boxmon; u16 levelGrowth; u16 price; @@ -242,11 +242,11 @@ static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MSGFMT return price; } -u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MSGFMT *msgFmt) { +u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MessageFormat *msgFmt) { return DayCareMon_BufferNickAndRetrievalPrice(Sav2_DayCare_GetMonX(dayCare, slot), msgFmt); } -u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MSGFMT *msgFmt) { +u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MessageFormat *msgFmt) { DAYCAREMON *daycareMon; daycareMon = Sav2_DayCare_GetMonX(dayCare, slot); @@ -917,7 +917,7 @@ POKEMON *sub_0206CE44(PARTY *party) { return NULL; } -void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt) { +void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MessageFormat *msgFmt) { BOXMON *parents[2]; Daycare_GetBothBoxMonsPtr(dayCare, parents); @@ -930,7 +930,7 @@ void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt) { } } -void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MSGFMT *msgFmt) { +void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MessageFormat *msgFmt) { DAYCAREMON *daycareMon; BOXMON *boxmon; u8 level; @@ -954,7 +954,7 @@ void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_i BufferGenderSymbol(msgFmt, gender_idx, gender); } -u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt) { +u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MessageFormat *msgFmt) { BOXMON *mon1; BOXMON *mon2; u16 species1; diff --git a/src/mail_message.c b/src/mail_message.c index 06221aca3c..daa8d4ac51 100644 --- a/src/mail_message.c +++ b/src/mail_message.c @@ -2,7 +2,7 @@ #include "constants/easy_chat.h" #include "msgdata/msg.naix" #include "easy_chat.h" -#include "msgfmt.h" +#include "message_format.h" #include "msgdata.h" #include "string_control_code.h" @@ -52,12 +52,12 @@ void MailMsg_init_fromTemplate(MAIL_MESSAGE *mailMessage, const MAIL_MSG_TEMPLAT } STRING *MailMsg_GetExpandedString(const MAIL_MESSAGE *mailMessage, HeapID heapId) { - MSGFMT *msgFmt; + MessageFormat *msgFmt; MSGDATA *msgData; STRING *string; int i; - msgFmt = ScrStrBufs_new(heapId); + msgFmt = MessageFormat_new(heapId); for (i = 0; i < MAILMSG_FIELDS_MAX; i++) { if (mailMessage->fields[i] == EC_WORD_NULL) { break; @@ -68,7 +68,7 @@ STRING *MailMsg_GetExpandedString(const MAIL_MESSAGE *mailMessage, HeapID heapId msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, sMessageBanks[mailMessage->msg_bank], heapId); string = ReadMsgData_ExpandPlaceholders(msgFmt, msgData, mailMessage->msg_no, heapId); DestroyMsgData(msgData); - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); return string; } diff --git a/src/msgfmt.c b/src/message_format.c similarity index 77% rename from src/msgfmt.c rename to src/message_format.c index e68939c1b9..761663eb0f 100644 --- a/src/msgfmt.c +++ b/src/message_format.c @@ -1,4 +1,4 @@ -#include "msgfmt.h" +#include "message_format.h" #include "msgdata.h" #include "pokemon.h" #include "trainer_data.h" @@ -18,28 +18,26 @@ #include "msgdata/msg/msg_0274.h" #include "msgdata/msg/msg_0191.h" -void ScrStrBufs_InitSub(MSGFMT_FIELD *field); - -MSGFMT *ScrStrBufs_new(HeapID heapId) { - return ScrStrBufs_new_custom(8, 32, heapId); +MessageFormat *MessageFormat_new(HeapID heapId) { + return MessageFormat_new_custom(8, 32, heapId); } -MSGFMT *ScrStrBufs_new_custom(u32 nstr, u32 len, HeapID heapId) { - MSGFMT *ret; +MessageFormat *MessageFormat_new_custom(u32 nstr, u32 len, HeapID heapId) { + MessageFormat *ret; int i; GF_ASSERT(nstr != 0); GF_ASSERT(len != 0); - ret = AllocFromHeapAtEnd(heapId, sizeof(MSGFMT)); + ret = AllocFromHeapAtEnd(heapId, sizeof(MessageFormat)); if (ret != NULL) { - ret->nstr = nstr; + ret->count = nstr; ret->heapId = heapId; ret->buffer = String_ctor(len, heapId); if (ret->buffer != NULL) { - ret->fields = AllocFromHeapAtEnd(heapId, nstr * sizeof(MSGFMT_FIELD)); + ret->fields = AllocFromHeapAtEnd(heapId, nstr * sizeof(MessageFormatFields)); if (ret->fields != NULL) { for (i = 0; i < nstr; i++) { - ScrStrBufs_InitSub(&ret->fields[i]); + MessageFormat_InitFields(&ret->fields[i]); ret->fields[i].msg = String_ctor(len, heapId); if (ret->fields[i].msg == NULL) { break; @@ -55,32 +53,32 @@ MSGFMT *ScrStrBufs_new_custom(u32 nstr, u32 len, HeapID heapId) { return NULL; } -void ScrStrBufs_delete(MSGFMT *msgFmt) { - int i; - GF_ASSERT(msgFmt->nstr != 0); - if (msgFmt->fields != NULL) { - for (i = 0; i < msgFmt->nstr; i++) { - if (msgFmt->fields[i].msg == NULL) { +void MessageFormat_delete(MessageFormat *messageFormat) { + s32 i; + GF_ASSERT(messageFormat->count != 0); + if (messageFormat->fields != NULL) { + for (i = 0; i < messageFormat->count; i++) { + if (messageFormat->fields[i].msg == NULL) { break; } - String_dtor(msgFmt->fields[i].msg); + String_dtor(messageFormat->fields[i].msg); } - FreeToHeap(msgFmt->fields); + FreeToHeap(messageFormat->fields); } - if (msgFmt->buffer != NULL) { - String_dtor(msgFmt->buffer); + if (messageFormat->buffer != NULL) { + String_dtor(messageFormat->buffer); } - msgFmt->nstr = 0; - FreeToHeap(msgFmt); + messageFormat->count = 0; + FreeToHeap(messageFormat); } -void ScrStrBufs_InitSub(MSGFMT_FIELD *field) { +void MessageFormat_InitFields(MessageFormatFields *field) { #pragma unused(field) } -void SetStringAsPlaceholder(MSGFMT *msgFmt, u32 fieldno, const STRING *string, const MSGFMT_FIELD_ATTRS *attrs) { - GF_ASSERT(fieldno < msgFmt->nstr); - if (fieldno < msgFmt->nstr) { +void SetStringAsPlaceholder(MessageFormat *msgFmt, u32 fieldno, const STRING *string, const MessageFormatAttrs *attrs) { + GF_ASSERT(fieldno < msgFmt->count); + if (fieldno < msgFmt->count) { if (attrs != NULL) { msgFmt->fields[fieldno].attrs = *attrs; } @@ -88,22 +86,22 @@ void SetStringAsPlaceholder(MSGFMT *msgFmt, u32 fieldno, const STRING *string, c } } -void BufferString(MSGFMT *msgFmt, u32 fieldno, const STRING *string, int a3, int a4, int a5) { +void BufferString(MessageFormat *msgFmt, u32 fieldno, const STRING *string, s32 a3, s32 a4, s32 a5) { #pragma unused(a3, a4, a5) SetStringAsPlaceholder(msgFmt, fieldno, string, NULL); } -void BufferPlayersName(MSGFMT *msgFmt, u32 fieldno, PLAYERPROFILE *playerProfile) { +void BufferPlayersName(MessageFormat *msgFmt, u32 fieldno, PLAYERPROFILE *playerProfile) { CopyU16ArrayToString(msgFmt->buffer, PlayerProfile_GetNamePtr(playerProfile)); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferRivalsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData) { +void BufferRivalsName(MessageFormat *msgFmt, u32 fieldno, SAVEDATA *saveData) { CopyU16ArrayToString(msgFmt->buffer, Sav2_Misc_RivalName_const_get(Sav2_Misc_const_get(saveData))); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferFriendsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData) { +void BufferFriendsName(MessageFormat *msgFmt, u32 fieldno, SAVEDATA *saveData) { PLAYERPROFILE *playerProfile = Sav2_PlayerData_GetProfileAddr(saveData); MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0445_bin, msgFmt->heapId); if (PlayerProfile_GetTrainerGender(playerProfile) == PLAYER_GENDER_MALE) { @@ -115,44 +113,44 @@ void BufferFriendsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData) { DestroyMsgData(msgData); } -void BufferSpeciesName(MSGFMT *msgFmt, u32 fieldno, u16 species) { +void BufferSpeciesName(MessageFormat *msgFmt, u32 fieldno, u16 species) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0237_bin, msgFmt->heapId); ReadMsgDataIntoString(msgData, species, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); DestroyMsgData(msgData); } -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonSpeciesName(MessageFormat *msgFmt, u32 fieldno, BOXMON *boxmon) { BufferSpeciesName(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); } -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonSpeciesNameWithArticle(MessageFormat *msgFmt, u32 fieldno, BOXMON *boxmon) { BufferSpeciesNameWithArticle(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); } -void BufferSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 species) { +void BufferSpeciesNameWithArticle(MessageFormat *msgFmt, u32 fieldno, u32 species) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0238_bin, msgFmt->heapId); ReadMsgDataIntoString(msgData, species, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); DestroyMsgData(msgData); } -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonNickname(MessageFormat *msgFmt, u32 fieldno, BOXMON *boxmon) { GetBoxMonData(boxmon, MON_DATA_NICKNAME_3, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonOTName(MessageFormat *msgFmt, u32 fieldno, BOXMON *boxmon) { GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferIntegerAsString(MSGFMT *msgFmt, u32 fieldno, int num, u32 numDigits, STRCONVMODE strconvmode, BOOL whichCharset) { +void BufferIntegerAsString(MessageFormat *msgFmt, u32 fieldno, s32 num, u32 numDigits, STRCONVMODE strconvmode, BOOL whichCharset) { String16_FormatInteger(msgFmt->buffer, num, numDigits, strconvmode, whichCharset); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferMoveName(MSGFMT *msgFmt, u32 fieldno, u32 moveId) { +void BufferMoveName(MessageFormat *msgFmt, u32 fieldno, u32 moveId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0750_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, moveId, msgFmt->buffer); @@ -161,7 +159,7 @@ void BufferMoveName(MSGFMT *msgFmt, u32 fieldno, u32 moveId) { } } -void BufferRibbonNameOrDesc(MSGFMT *msgFmt, u32 fieldno, u32 decoId) { +void BufferRibbonNameOrDesc(MessageFormat *msgFmt, u32 fieldno, u32 decoId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0424_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, decoId, msgFmt->buffer); @@ -170,7 +168,7 @@ void BufferRibbonNameOrDesc(MSGFMT *msgFmt, u32 fieldno, u32 decoId) { } } -void BufferAbilityName(MSGFMT *msgFmt, u32 fieldno, u32 abilityId) { +void BufferAbilityName(MessageFormat *msgFmt, u32 fieldno, u32 abilityId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0720_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, abilityId, msgFmt->buffer); @@ -179,14 +177,14 @@ void BufferAbilityName(MSGFMT *msgFmt, u32 fieldno, u32 abilityId) { } } -void BufferNatureName(MSGFMT *msgFmt, u32 fieldno, u32 natureId) { +void BufferNatureName(MessageFormat *msgFmt, u32 fieldno, u32 natureId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0034_bin, msgFmt->heapId); ReadMsgDataIntoString(msgData, natureId, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); DestroyMsgData(msgData); } -void BufferItemName(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { +void BufferItemName(MessageFormat *msgFmt, u32 fieldno, u32 itemId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0222_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, itemId, msgFmt->buffer); @@ -195,7 +193,7 @@ void BufferItemName(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { } } -void BufferItemNameWithIndefArticle(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { +void BufferItemNameWithIndefArticle(MessageFormat *msgFmt, u32 fieldno, u32 itemId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0223_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, itemId, msgFmt->buffer); @@ -204,7 +202,7 @@ void BufferItemNameWithIndefArticle(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { } } -void BufferItemNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { +void BufferItemNamePlural(MessageFormat *msgFmt, u32 fieldno, u32 itemId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0224_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, itemId, msgFmt->buffer); @@ -213,7 +211,7 @@ void BufferItemNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 itemId) { } } -void BufferPocketName(MSGFMT *msgFmt, u32 fieldno, u32 pocketId) { +void BufferPocketName(MessageFormat *msgFmt, u32 fieldno, u32 pocketId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0226_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, pocketId, msgFmt->buffer); @@ -222,7 +220,7 @@ void BufferPocketName(MSGFMT *msgFmt, u32 fieldno, u32 pocketId) { } } -void BufferTypeName(MSGFMT *msgFmt, u32 fieldno, u32 typeId) { +void BufferTypeName(MessageFormat *msgFmt, u32 fieldno, u32 typeId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0735_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, typeId, msgFmt->buffer); @@ -231,7 +229,7 @@ void BufferTypeName(MSGFMT *msgFmt, u32 fieldno, u32 typeId) { } } -void BufferStatName(MSGFMT *msgFmt, u32 fieldno, u32 statId) { +void BufferStatName(MessageFormat *msgFmt, u32 fieldno, u32 statId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0443_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, statId, msgFmt->buffer); @@ -240,7 +238,7 @@ void BufferStatName(MSGFMT *msgFmt, u32 fieldno, u32 statId) { } } -void BufferStatusName(MSGFMT *msgFmt, u32 fieldno, u32 statusId) { +void BufferStatusName(MessageFormat *msgFmt, u32 fieldno, u32 statusId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0044_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, statusId, msgFmt->buffer); @@ -249,7 +247,7 @@ void BufferStatusName(MSGFMT *msgFmt, u32 fieldno, u32 statusId) { } } -void BufferFlavorDislikeText(MSGFMT *msgFmt, u32 fieldno, u32 flavorId) { +void BufferFlavorDislikeText(MessageFormat *msgFmt, u32 fieldno, u32 flavorId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0639_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, flavorId, msgFmt->buffer); @@ -258,7 +256,7 @@ void BufferFlavorDislikeText(MSGFMT *msgFmt, u32 fieldno, u32 flavorId) { } } -void BufferLandmarkName(MSGFMT *msgFmt, u32 fieldno, u32 landmarkId) { +void BufferLandmarkName(MessageFormat *msgFmt, u32 fieldno, u32 landmarkId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0279_bin, msgFmt->heapId); if (msgData != NULL) { if (landmarkId == 0 || landmarkId >= MsgDataGetCount(msgData)) { @@ -272,7 +270,7 @@ void BufferLandmarkName(MSGFMT *msgFmt, u32 fieldno, u32 landmarkId) { } } -void BufferTrainerClassName(MSGFMT *msgFmt, u32 fieldno, u32 trainerClassId) { +void BufferTrainerClassName(MessageFormat *msgFmt, u32 fieldno, u32 trainerClassId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0730_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trainerClassId, msgFmt->buffer); @@ -281,7 +279,7 @@ void BufferTrainerClassName(MSGFMT *msgFmt, u32 fieldno, u32 trainerClassId) { } } -void BufferTrainerClassNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 trainerClassId) { +void BufferTrainerClassNameWithArticle(MessageFormat *msgFmt, u32 fieldno, u32 trainerClassId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0731_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trainerClassId, msgFmt->buffer); @@ -290,7 +288,7 @@ void BufferTrainerClassNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 trainerC } } -void BufferTrainerClassNameFromDataStruct(MSGFMT *msgFmt, u32 fieldno, TRAINER *trainer) { +void BufferTrainerClassNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, TRAINER *trainer) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0730_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trainer->trainerClass, msgFmt->buffer); @@ -299,7 +297,7 @@ void BufferTrainerClassNameFromDataStruct(MSGFMT *msgFmt, u32 fieldno, TRAINER * } } -void BufferTrainerName(MSGFMT *msgFmt, u32 fieldno, u32 trainerId) { +void BufferTrainerName(MessageFormat *msgFmt, u32 fieldno, u32 trainerId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0729_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, trainerId, msgFmt->buffer); @@ -308,7 +306,7 @@ void BufferTrainerName(MSGFMT *msgFmt, u32 fieldno, u32 trainerId) { } } -void BufferFrontierOpponentName(MSGFMT *msgFmt, u32 fieldno, u32 opponentId) { +void BufferFrontierOpponentName(MessageFormat *msgFmt, u32 fieldno, u32 opponentId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0027_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, opponentId, msgFmt->buffer); @@ -317,13 +315,13 @@ void BufferFrontierOpponentName(MSGFMT *msgFmt, u32 fieldno, u32 opponentId) { } } -void BufferTrainerNameFromDataStruct(MSGFMT *msgFmt, u32 fieldno, TRAINER *trainer) { +void BufferTrainerNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, TRAINER *trainer) { CopyU16ArrayToString(msgFmt->buffer, trainer->name); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } // The GMM associated with this routine is blanked. -void BufferDecorationName(MSGFMT *msgFmt, u32 fieldno, u32 decorationId) { +void BufferDecorationName(MessageFormat *msgFmt, u32 fieldno, u32 decorationId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0737_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, decorationId, msgFmt->buffer); @@ -332,7 +330,7 @@ void BufferDecorationName(MSGFMT *msgFmt, u32 fieldno, u32 decorationId) { } } -void BufferGenderSymbol(MSGFMT *msgFmt, u32 fieldno, u8 gender) { +void BufferGenderSymbol(MessageFormat *msgFmt, u32 fieldno, u8 gender) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0040_bin, msgFmt->heapId); switch (gender) { case PLAYER_GENDER_MALE: @@ -349,12 +347,12 @@ void BufferGenderSymbol(MSGFMT *msgFmt, u32 fieldno, u8 gender) { DestroyMsgData(msgData); } -void BufferPCBoxName(MSGFMT *msgFmt, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno) { +void BufferPCBoxName(MessageFormat *msgFmt, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno) { PCStorage_GetBoxName(pcStorage, boxno, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferCountryName(MSGFMT *msgFmt, u32 fieldno, u32 countryId) { +void BufferCountryName(MessageFormat *msgFmt, u32 fieldno, u32 countryId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0798_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, countryId, msgFmt->buffer); @@ -363,7 +361,7 @@ void BufferCountryName(MSGFMT *msgFmt, u32 fieldno, u32 countryId) { } } -void BufferCityName(MSGFMT *msgFmt, u32 fieldno, u32 countryId, u32 cityId) { +void BufferCityName(MessageFormat *msgFmt, u32 fieldno, u32 countryId, u32 cityId) { MSGDATA *msgData; int msgBank = GetCityNamesMsgdataIdByCountry(countryId); if (msgBank != 0 && cityId != 0) { @@ -376,12 +374,12 @@ void BufferCityName(MSGFMT *msgFmt, u32 fieldno, u32 countryId, u32 cityId) { } } -void BufferECWord(MSGFMT *msgFmt, u32 fieldno, u16 ecWordIdx) { +void BufferECWord(MessageFormat *msgFmt, u32 fieldno, u16 ecWordIdx) { GetECWordIntoStringByIndex(ecWordIdx, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferSealName(MSGFMT *msgFmt, u32 fieldno, u32 sealId) { +void BufferSealName(MessageFormat *msgFmt, u32 fieldno, u32 sealId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0015_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, sealId, msgFmt->buffer); @@ -390,7 +388,7 @@ void BufferSealName(MSGFMT *msgFmt, u32 fieldno, u32 sealId) { } } -void BufferSealNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 sealId) { +void BufferSealNamePlural(MessageFormat *msgFmt, u32 fieldno, u32 sealId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0016_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, sealId, msgFmt->buffer); @@ -399,7 +397,7 @@ void BufferSealNamePlural(MSGFMT *msgFmt, u32 fieldno, u32 sealId) { } } -void BufferLocationName(MSGFMT *msgFmt, u32 fieldno, u32 mapsecId) { +void BufferLocationName(MessageFormat *msgFmt, u32 fieldno, u32 mapsecId) { static const u16 msgBanks[] = { NARC_msg_msg_0279_bin, NARC_msg_msg_0281_bin, @@ -433,7 +431,7 @@ void BufferLocationName(MSGFMT *msgFmt, u32 fieldno, u32 mapsecId) { } } -void BufferFashionName(MSGFMT *msgFmt, u32 fieldno, u32 fashionId) { +void BufferFashionName(MessageFormat *msgFmt, u32 fieldno, u32 fashionId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0216_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, fashionId, msgFmt->buffer); @@ -442,7 +440,7 @@ void BufferFashionName(MSGFMT *msgFmt, u32 fieldno, u32 fashionId) { } } -void BufferFashionNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 fashionId) { +void BufferFashionNameWithArticle(MessageFormat *msgFmt, u32 fieldno, u32 fashionId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0217_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, fashionId, msgFmt->buffer); @@ -451,7 +449,7 @@ void BufferFashionNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 fashionId) { } } -void BufferContestBackgroundName(MSGFMT *msgFmt, u32 fieldno, u32 bgId) { +void BufferContestBackgroundName(MessageFormat *msgFmt, u32 fieldno, u32 bgId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0218_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, bgId, msgFmt->buffer); @@ -460,7 +458,7 @@ void BufferContestBackgroundName(MSGFMT *msgFmt, u32 fieldno, u32 bgId) { } } -void BufferGroupName(MSGFMT *msgFmt, SAVEDATA *saveData, int groupId, int fieldno, int nameType) { +void BufferGroupName(MessageFormat *msgFmt, SAVEDATA *saveData, s32 groupId, s32 fieldno, s32 nameType) { SAV_FRIEND_GRP *friendGrp = Save_FriendGroup_get(saveData); u8 sp10 = sub_0202C830(friendGrp, groupId); u8 r7 = sub_0202C83C(friendGrp, groupId); @@ -470,7 +468,7 @@ void BufferGroupName(MSGFMT *msgFmt, SAVEDATA *saveData, int groupId, int fieldn String_dtor(dest); } -void BufferWiFiPlazaActivityName(MSGFMT *msgFmt, u32 fieldno, u32 activityId) { +void BufferWiFiPlazaActivityName(MessageFormat *msgFmt, u32 fieldno, u32 activityId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0755_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, activityId, msgFmt->buffer); @@ -479,7 +477,7 @@ void BufferWiFiPlazaActivityName(MSGFMT *msgFmt, u32 fieldno, u32 activityId) { } } -void BufferWiFiPlazaEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId) { +void BufferWiFiPlazaEventName(MessageFormat *msgFmt, u32 fieldno, u32 eventId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0753_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, eventId, msgFmt->buffer); @@ -488,7 +486,7 @@ void BufferWiFiPlazaEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId) { } } -void BufferWiFiPlazaInstrumentName(MSGFMT *msgFmt, u32 fieldno, u32 instrumentId) { +void BufferWiFiPlazaInstrumentName(MessageFormat *msgFmt, u32 fieldno, u32 instrumentId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0756_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, instrumentId, msgFmt->buffer); @@ -497,7 +495,7 @@ void BufferWiFiPlazaInstrumentName(MSGFMT *msgFmt, u32 fieldno, u32 instrumentId } } -void BufferJPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferJPGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0771_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -506,7 +504,7 @@ void BufferJPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferENGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferENGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0767_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -515,7 +513,7 @@ void BufferENGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferFRGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferFRGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0768_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -524,7 +522,7 @@ void BufferFRGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferITGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferITGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0770_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -533,7 +531,7 @@ void BufferITGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferDEGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferDEGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0769_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -542,7 +540,7 @@ void BufferDEGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferSPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { +void BufferSPGreeting(MessageFormat *msgFmt, u32 fieldno, u32 timeOfDay) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0772_bin, msgFmt->heapId); if (msgData != NULL) { ReadMsgDataIntoString(msgData, timeOfDay, msgFmt->buffer); @@ -551,7 +549,7 @@ void BufferSPGreeting(MSGFMT *msgFmt, u32 fieldno, u32 timeOfDay) { } } -void BufferPokeathlonCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId) { +void BufferPokeathlonCourseName(MessageFormat *msgFmt, u32 fieldno, u32 courseId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0313_bin, msgFmt->heapId); GF_ASSERT(courseId < 11); ReadMsgDataIntoString(msgData, courseId + msg_0313_00000, msgFmt->buffer); @@ -559,7 +557,7 @@ void BufferPokeathlonCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId) { DestroyMsgData(msgData); } -void BufferPokeathlonMedalName(MSGFMT *msgFmt, u32 fieldno, u32 medalId) { +void BufferPokeathlonMedalName(MessageFormat *msgFmt, u32 fieldno, u32 medalId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0313_bin, msgFmt->heapId); GF_ASSERT(medalId < 5); ReadMsgDataIntoString(msgData, medalId + msg_0313_00015, msgFmt->buffer); @@ -567,7 +565,7 @@ void BufferPokeathlonMedalName(MSGFMT *msgFmt, u32 fieldno, u32 medalId) { DestroyMsgData(msgData); } -void BufferPokeathlonEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId) { +void BufferPokeathlonEventName(MessageFormat *msgFmt, u32 fieldno, u32 eventId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0313_bin, msgFmt->heapId); GF_ASSERT(eventId < 10); ReadMsgDataIntoString(msgData, eventId + msg_0313_00020, msgFmt->buffer); @@ -575,7 +573,7 @@ void BufferPokeathlonEventName(MSGFMT *msgFmt, u32 fieldno, u32 eventId) { DestroyMsgData(msgData); } -void BufferApricornName(MSGFMT *msgFmt, u32 fieldno, u32 apricornId) { +void BufferApricornName(MessageFormat *msgFmt, u32 fieldno, u32 apricornId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0021_bin, msgFmt->heapId); if (apricornId >= 7) { GF_ASSERT(apricornId < 7); @@ -586,7 +584,7 @@ void BufferApricornName(MSGFMT *msgFmt, u32 fieldno, u32 apricornId) { DestroyMsgData(msgData); } -void BufferSafariZoneObjectName(MSGFMT *msgFmt, u32 fieldno, u32 objectId) { +void BufferSafariZoneObjectName(MessageFormat *msgFmt, u32 fieldno, u32 objectId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0430_bin, msgFmt->heapId); if (objectId >= 24) { GF_ASSERT(objectId < 24); @@ -597,7 +595,7 @@ void BufferSafariZoneObjectName(MSGFMT *msgFmt, u32 fieldno, u32 objectId) { DestroyMsgData(msgData); } -void BufferSafariZoneAreaName(MSGFMT *msgFmt, u32 fieldno, u32 areaId) { +void BufferSafariZoneAreaName(MessageFormat *msgFmt, u32 fieldno, u32 areaId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0428_bin, msgFmt->heapId); if (areaId >= 12) { GF_ASSERT(areaId < 12); @@ -608,7 +606,7 @@ void BufferSafariZoneAreaName(MSGFMT *msgFmt, u32 fieldno, u32 areaId) { DestroyMsgData(msgData); } -void BufferPokewalkerCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId) { +void BufferPokewalkerCourseName(MessageFormat *msgFmt, u32 fieldno, u32 courseId) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0274_bin, msgFmt->heapId); if (courseId >= 27) { GF_ASSERT(courseId < 27); @@ -619,7 +617,7 @@ void BufferPokewalkerCourseName(MSGFMT *msgFmt, u32 fieldno, u32 courseId) { DestroyMsgData(msgData); } -void BufferMonthNameAbbr(MSGFMT *msgFmt, u32 fieldno, u32 month) { +void BufferMonthNameAbbr(MessageFormat *msgFmt, u32 fieldno, u32 month) { MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0239_bin, msgFmt->heapId); if (msgData != NULL) { if (month < 1 || month > 12) { @@ -631,12 +629,12 @@ void BufferMonthNameAbbr(MSGFMT *msgFmt, u32 fieldno, u32 month) { } } -void ScrStrBufs_UpperFirstChar(MSGFMT *msgFmt, u32 fieldno) { +void MessageFormat_UpperFirstChar(MessageFormat *msgFmt, u32 fieldno) { StrUpperCharN(msgFmt->fields[fieldno].msg, 0); } -void BufferDeptStoreFloorNo(MSGFMT *msgFmt, u32 fieldno, u32 floor) { - int msgno; +void BufferDeptStoreFloorNo(MessageFormat *msgFmt, u32 fieldno, u32 floor) { + s32 msgno; MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0191_bin, msgFmt->heapId); GF_ASSERT(floor <= 6); if (msgData != NULL) { @@ -651,14 +649,14 @@ void BufferDeptStoreFloorNo(MSGFMT *msgFmt, u32 fieldno, u32 floor) { } } -void StringExpandPlaceholders(MSGFMT * msgFmt, STRING * dest, STRING * src) { +void StringExpandPlaceholders(MessageFormat * msgFmt, STRING * dest, STRING * src) { const u16 * cstr = String_c_str(src); StringSetEmpty(dest); while (*cstr != EOS) { if (*cstr == EXT_CTRL_CODE_BEGIN) { if (MsgArray_ControlCodeIsStrVar(cstr)) { u32 idx = MsgArray_ControlCodeGetField(cstr, 0); - GF_ASSERT(idx < msgFmt->nstr); + GF_ASSERT(idx < msgFmt->count); StringCat_HandleTrainerName(dest, msgFmt->fields[idx].msg); cstr = MsgArray_SkipControlCode(cstr); } else { @@ -674,8 +672,8 @@ void StringExpandPlaceholders(MSGFMT * msgFmt, STRING * dest, STRING * src) { } } -void ScrStrBufs_ResetBuffers(MSGFMT * msgFmt) { - for (int i = 0; i < msgFmt->nstr; i++) { +void MessageFormat_ResetBuffers(MessageFormat * msgFmt) { + for (int i = 0; i < msgFmt->count; i++) { StringSetEmpty(msgFmt->fields[i].msg); } } diff --git a/src/msgdata.c b/src/msgdata.c index da8f48b808..4ad5a72228 100644 --- a/src/msgdata.c +++ b/src/msgdata.c @@ -1,6 +1,7 @@ +#include "global.h" #include "heap.h" #include "msgdata.h" -#include "msgfmt.h" +#include "message_format.h" static void CopyEncryptedMessage16(u16 *dest, const u16 *src, MAT_ENTRY *alloc); static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, u32 heap_id, STRING * dest); @@ -275,14 +276,14 @@ void GetSpeciesNameIntoArray(u16 species, u32 heap_id, u16 * dest) { DestroyMsgData(msgData); } -STRING * ReadMsgData_ExpandPlaceholders(MSGFMT * a0, MSGDATA * msgData, u32 msgno, HeapID heap_id) { +STRING * ReadMsgData_ExpandPlaceholders(MessageFormat * messageFormat, MSGDATA * msgData, u32 msgno, HeapID heap_id) { STRING * ret = NULL; STRING * r4 = String_ctor(1024, 0); STRING * r5; if (r4 != NULL) { r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { - StringExpandPlaceholders(a0, r4, r5); + StringExpandPlaceholders(messageFormat, r4, r5); ret = StringDup(r4, heap_id); String_dtor(r5); } diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index c486c35f98..19bb81883f 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -1,7 +1,7 @@ #include "bug_contest.h" #include "pokedex.h" #include "math_util.h" -#include "msgfmt.h" +#include "message_format.h" #include "wild_encounter.h" #include "pokemon_storage_system.h" #include "constants/items.h" @@ -122,7 +122,7 @@ void BugContest_Judge(BUGCONTEST *bugContest) { } } -void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MSGDATA *msgData, MSGFMT *msgFmt, u8 place) { +void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MSGDATA *msgData, MessageFormat *msgFmt, u8 place) { BUGCONTESTANT *contestant; STRING *string; @@ -149,7 +149,7 @@ BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id) { return FALSE; } -BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MSGFMT *msgFmt, u8 slot) { +BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFmt, u8 slot) { STRING *string; if (!bugContest->caught_poke) { diff --git a/src/scrcmd_8.c b/src/scrcmd_8.c index 7914cc4379..4c5eb730c9 100644 --- a/src/scrcmd_8.c +++ b/src/scrcmd_8.c @@ -13,7 +13,7 @@ BOOL ScrCmd_GetStaticEncounterOutcomeFlag(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_465(SCRIPTCONTEXT *ctx) { - MSGFMT **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); SAV_FRIEND_GRP *group = Save_FriendGroup_get(ctx->fsys->savedata); SAVEDATA *save = ctx->fsys->savedata; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 7230a22fea..d04703612b 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -768,7 +768,7 @@ BOOL ScrCmd_DirectionSignpost(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2); STRING** unk1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 msg_no = ScriptReadByte(ctx); unk2 = ScriptReadByte(ctx); u16 arrow = ScriptReadHalfword(ctx); @@ -829,7 +829,7 @@ BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) { u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2); STRING** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF1); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 msg_no = ScriptReadByte(ctx); u16 result_var_id = ScriptReadHalfword(ctx); @@ -972,7 +972,7 @@ BOOL ScrCmd_RemoveWaitingIcon(SCRIPTCONTEXT *ctx) { void sub_02041770(SCRIPTCONTEXT *ctx, struct UnkStruct_ov01_021EDC28 **a1, MSGDATA *msgData) { FieldSystem *fsys = ctx->fsys; - MSGFMT **msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat **msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); u8 initCursorPos = ScriptReadByte(ctx); @@ -2159,7 +2159,7 @@ BOOL ScrCmd_PromptEasyChat(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_494(SCRIPTCONTEXT *ctx) { - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 idx = ScriptGetVar(ctx); u16 word = ScriptGetVar(ctx); BufferECWord(*p_msgFmt, idx, word); @@ -2499,7 +2499,7 @@ BOOL ScrCmd_GetDynamicWarpFloorNo(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_ElevatorCurFloorBox(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); @@ -2658,7 +2658,7 @@ BOOL ScrCmd_258(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_259(SCRIPTCONTEXT *ctx) { - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = sub_0205A6AC(*p_msgFmt); @@ -2667,7 +2667,7 @@ BOOL ScrCmd_259(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_260(SCRIPTCONTEXT *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); *p_ret = sub_0205A9A0(ctx->fsys->unk80, *p_msgFmt); return FALSE; @@ -2688,7 +2688,7 @@ BOOL ScrCmd_261(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_264(SCRIPTCONTEXT *ctx) { LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 r4 = ScriptReadHalfword(ctx); PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys)); SAVE_EASY_CHAT_T *easyChat = SaveData_EasyChat_get(FieldSys_GetSaveDataPtr(ctx->fsys)); @@ -2725,7 +2725,7 @@ BOOL ScrCmd_267(SCRIPTCONTEXT *ctx) { LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); u16 sp0 = ScriptReadHalfword(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); *p_ret = sub_0205A750(ctx->fsys->unk80, MapObject_GetID(*p_lastInteracted), sp0, *p_msgFmt); return FALSE; } @@ -2856,7 +2856,7 @@ BOOL ScrCmd_286(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_287(SCRIPTCONTEXT *ctx) { PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys)); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); sub_0205B3DC( PlayerProfile_GetTrainerID(profile), PlayerProfile_GetTrainerGender(profile), @@ -3840,7 +3840,7 @@ BOOL ScrCmd_530(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BufferBackgroundName(SCRIPTCONTEXT *ctx) { - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 bufferId = ScriptReadByte(ctx); u16 backgroundId = ScriptGetVar(ctx); BufferContestBackgroundName(*p_msgFmt, bufferId, backgroundId); @@ -3868,7 +3868,7 @@ BOOL ScrCmd_537(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_538(SCRIPTCONTEXT *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u16 wordIdx = ScriptGetVar(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); int trendy = SaveEasyChat_RandomTrendySayingSet(SaveData_EasyChat_get(ctx->fsys->savedata)); if (trendy == 32) { *p_ret = 0xFFFF; @@ -4042,7 +4042,7 @@ BOOL ScrCmd_571(SCRIPTCONTEXT *ctx) { u16 r7 = ScriptGetVar(ctx); STRING *r7_str; STRING *sp0_str; - MSGFMT *msgFmt = ScrStrBufs_new(32); + MessageFormat *msgFmt = MessageFormat_new(32); MSGDATA *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0202_bin, 32); BufferECWord(msgFmt, 0, sp4); BufferECWord(msgFmt, 1, sp8); @@ -4054,7 +4054,7 @@ BOOL ScrCmd_571(SCRIPTCONTEXT *ctx) { String_dtor(r7_str); String_dtor(sp0_str); DestroyMsgData(msgData); - ScrStrBufs_delete(msgFmt); + MessageFormat_delete(msgFmt); return FALSE; } @@ -4066,7 +4066,7 @@ BOOL ScrCmd_573(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_576(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u16 *p_ret = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); *p_ret = sub_0205A6AC(*p_msgFmt); return FALSE; } @@ -5283,14 +5283,14 @@ BOOL ScrCmd_CheckBankBalance(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_BufferRulesetName(SCRIPTCONTEXT *ctx) { u16 ruleset = ScriptReadHalfword(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); ov03_022566D0(ctx->fsys, *p_msgFmt, ruleset); return FALSE; } BOOL ScrCmd_799(SCRIPTCONTEXT *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); ov03_022566D0(ctx->fsys, *p_msgFmt, *p_var); return FALSE; } @@ -5317,7 +5317,7 @@ BOOL ScrCmd_802(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_803(SCRIPTCONTEXT *ctx) { u16 *r4 = ScriptGetVarPointer(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); *r6 = ov03_02256A2C(ctx->fsys, *p_msgFmt, *r4); return FALSE; } @@ -5374,7 +5374,7 @@ BOOL ScrCmd_822(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_823(SCRIPTCONTEXT *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - MSGFMT **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); PLAYERPROFILE *profile = PlayerProfile_new(4); SafariZone_GetLinkLeaderToProfile(Save_SafariZone_get(ctx->fsys->savedata), profile); BufferPlayersName(*p_msgFmt, *p_var, profile); diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index a7374842c4..66d71000a8 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -14,7 +14,7 @@ static LocalMapObject* CreateDayCareMonSpriteInternal(MapObjectMan* object_man, BOOL ScrCmd_BufferDayCareMonNicks(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); DAYCARE* daycare = Sav2_DayCare_get(savedata); Sav2_DayCare_BufferStoredMonNicks(daycare, *msg_fmt); @@ -54,7 +54,7 @@ BOOL ScrCmd_GiveDayCareEgg(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); SAVEDATA* savedata = fsys->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); @@ -68,7 +68,7 @@ BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); SAVEDATA* savedata = fsys->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); @@ -81,7 +81,7 @@ BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); DAYCARE* daycare = SavArray_get(savedata, SAVE_DAYCARE); @@ -93,7 +93,7 @@ BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_GetTailDayCareMonSpeciesAndNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16* ret_ptr = ScriptGetVarPointer(ctx); DAYCARE* daycare = Sav2_DayCare_get(fsys->savedata); @@ -116,7 +116,7 @@ BOOL ScrCmd_PutMonInDayCare(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareMonStats(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 nickname_idx = ScriptGetVar(ctx); u16 level_idx = ScriptGetVar(ctx); u16 gender_idx = ScriptGetVar(ctx); diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index 8437c94a04..9e8ff9128f 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -6,7 +6,7 @@ u8 LotoId_CountDigitsMatched(u16 lotoId, u16 otid); BOOL ScrCmd_BufferDeptStoreFloorNo(SCRIPTCONTEXT *ctx) { - MSGFMT **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 fieldno = ScriptReadByte(ctx); u8 floor = ScriptReadByte(ctx); BufferDeptStoreFloorNo(*msg, fieldno, floor); diff --git a/src/scrcmd_pokemon_misc.c b/src/scrcmd_pokemon_misc.c index 52fa0ad3bc..31a565fa00 100644 --- a/src/scrcmd_pokemon_misc.c +++ b/src/scrcmd_pokemon_misc.c @@ -23,6 +23,18 @@ #include "msgdata/msg/msg_0066_D23R0102.h" #include "constants/items.h" #include "constants/moves.h" +#include "unk_0200FA24.h" +#include "unk_02005D10.h" +#include "unk_0202CA24.h" +#include "field_follow_poke.h" +#include "get_egg.h" +#include "map_section.h" +#include "map_header.h" +#include "update_dex_received.h" +#include "math_util.h" +#include "sys_vars.h" +#include "system.h" +#include "unk_02092BE8.h" typedef struct UnkStructScr_648 { FieldSystem *fsys; @@ -31,7 +43,7 @@ typedef struct UnkStructScr_648 { WINDOW *window_18; STRING *stringArr_1C[120]; MSGDATA *msgdata; - MSGFMT *msgfmt; + MessageFormat *msgfmt; u8 unk_204; u8 unk_205; u8 unk_206; @@ -58,8 +70,8 @@ typedef struct UnkStructScr_648 { static BOOL ov01_02200C6C(SCRIPTCONTEXT *ctx); static void *ov01_02200C94(HeapID heapId, s32 fileId, u32 *unkPtr); static void ov01_02200CB4(SCR_648_STRUCT *unkPtr, MSGDATA *msgdata); -static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MSGFMT *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove); -static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MSGFMT *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove); +static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove); +static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove); static void ov01_02200DF8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3); static void ov01_02200E00(SCR_648_STRUCT *unkPtr); static void ov01_02200EC8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3); @@ -87,7 +99,7 @@ BOOL ScrCmd_648(SCRIPTCONTEXT *ctx) { u16 *cursorPos; u16 *itemsAbove; WINDOW *window; - MSGFMT **msgfmt; + MessageFormat **msgfmt; MSGDATA *msgdata; FieldSystem *fsys = ctx->fsys; @@ -159,7 +171,7 @@ static void ov01_02200CB4(SCR_648_STRUCT *unkPtr, MSGDATA *msgdata) { unkPtr->msgdata = msgdata; } -static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MSGFMT *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove) { +static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove) { int i; unkPtr->msgdata = msgdata; unkPtr->unk_207 = unkPtr->unk_207 & ~0x2; @@ -192,7 +204,7 @@ static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, *unkPtr->input = 0xEEEE; } -static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MSGFMT *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove) { +static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, WINDOW *window, MSGDATA *msgdata, u16 *cursorPos, u16 *itemsAbove) { SCR_648_STRUCT *unkPtr = AllocFromHeap(4, sizeof(SCR_648_STRUCT)); if (!unkPtr) { return NULL; @@ -854,7 +866,7 @@ BOOL ScrCmd_741(SCRIPTCONTEXT *ctx) { UnkStruct_02031CEC unkOut; RTCDate date; s32 unkVar; - struct MSGFMT **msgfmt; + MessageFormat **msgfmt; SaveApricornBox *apricornBox; u16 *price; u16 *unkPtrA; @@ -1186,7 +1198,7 @@ BOOL ScrCmd_CasinoGame(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_BufferPokeathlonCourseName(SCRIPTCONTEXT *ctx) { u8 fieldNo = *(ctx->script_ptr++); u32 courseId = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - BufferPokeathlonCourseName(*(MSGFMT**)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT), fieldNo, (u8) courseId); + BufferPokeathlonCourseName(*(MessageFormat**)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT), fieldNo, (u8) courseId); return FALSE; } @@ -1427,7 +1439,7 @@ BOOL ScrCmd_BugContestAction(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BufferBugContestWinner(SCRIPTCONTEXT *ctx) { - struct MSGFMT **msgfmt; + MessageFormat **msgfmt; BUGCONTEST *bugContest; msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); @@ -1464,7 +1476,7 @@ BOOL ScrCmd_JudgeBugContest(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BufferBugContestMonNick(SCRIPTCONTEXT *ctx) { - struct MSGFMT **msgfmt; + MessageFormat **msgfmt; BUGCONTEST *bugContest; u32 script_index; @@ -1479,7 +1491,7 @@ BOOL ScrCmd_BufferBugContestMonNick(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BugContestGetTimeLeft(SCRIPTCONTEXT *ctx) { - struct MSGFMT **msgfmt; + MessageFormat **msgfmt; BUGCONTEST *bugContest; u32 script_index; u32 timeLeft; diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index c755fda77a..133ef551d9 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -66,7 +66,7 @@ static u32 GetMonSize(int species, int rand) { } static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u16 rand) { - MSGFMT ** msgFmt; + MessageFormat ** msgFmt; u32 score; u32 r4; diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index a7753a1956..c8c082ca5a 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -16,7 +16,7 @@ static STRING* _get_species_name(u16 species, HeapID heap_id); BOOL ScrCmd_BufferStatName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 stat_id = ScriptGetVar(ctx); @@ -27,7 +27,7 @@ BOOL ScrCmd_BufferStatName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPlayersName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); PLAYERPROFILE* profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(fsys)); @@ -38,7 +38,7 @@ BOOL ScrCmd_BufferPlayersName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferRivalsName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); BufferRivalsName(*msg_fmt, idx, fsys->savedata); @@ -48,7 +48,7 @@ BOOL ScrCmd_BufferRivalsName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferFriendsName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); BufferFriendsName(*msg_fmt, idx, fsys->savedata); @@ -58,7 +58,7 @@ BOOL ScrCmd_BufferFriendsName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); @@ -70,7 +70,7 @@ BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTypeName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 type_id = ScriptGetVar(ctx); @@ -80,7 +80,7 @@ BOOL ScrCmd_BufferTypeName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -90,7 +90,7 @@ BOOL ScrCmd_BufferItemName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferPocketName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 pocket_id = ScriptGetVar(ctx); @@ -100,7 +100,7 @@ BOOL ScrCmd_BufferPocketName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTMHMMoveName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -110,7 +110,7 @@ BOOL ScrCmd_BufferTMHMMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferMoveName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -120,7 +120,7 @@ BOOL ScrCmd_BufferMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferInt(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); @@ -130,7 +130,7 @@ BOOL ScrCmd_BufferInt(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferIntEx(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -147,7 +147,7 @@ BOOL ScrCmd_BufferIntEx(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_661(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u32 number = ScriptReadWord(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -165,7 +165,7 @@ BOOL ScrCmd_661(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); @@ -179,7 +179,7 @@ BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; PC_STORAGE* pc = GetStoragePCPointer(fsys->savedata); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); @@ -190,7 +190,7 @@ BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerClassName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -203,7 +203,7 @@ BOOL ScrCmd_BufferPlayerUnionAvatarClassName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; SAVEDATA* savedata = FieldSys_GetSaveDataPtr(fsys); PLAYERPROFILE* profile = Sav2_PlayerData_GetProfileAddr(savedata); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u32 gender = PlayerProfile_GetTrainerGender(profile); u8 avatar = PlayerProfile_GetAvatar(profile); @@ -214,7 +214,7 @@ BOOL ScrCmd_BufferPlayerUnionAvatarClassName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = ScriptGetVar(ctx); u16 unk2 = ScriptReadHalfword(ctx); @@ -235,7 +235,7 @@ STRING* _get_species_name(u16 species, HeapID heap_id) { } BOOL ScrCmd_BufferStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = GetStarterFromScriptState(SavArray_Flags_get(ctx->fsys->savedata)); @@ -247,7 +247,7 @@ BOOL ScrCmd_BufferStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetRivalSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -259,7 +259,7 @@ BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetFriendStarterSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -271,7 +271,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDecorationName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 decoration_id = ScriptGetVar(ctx); @@ -282,7 +282,7 @@ BOOL ScrCmd_BufferDecorationName(SCRIPTCONTEXT* ctx) { // This may be what's left of ScrCmd_GetUndergroundTrapName from D/P/Pt. BOOL ScrCmd_208(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -291,7 +291,7 @@ BOOL ScrCmd_208(SCRIPTCONTEXT* ctx) { // This may be what's left of ScrCmd_GetUndergroundItemName from D/P/Pt. BOOL ScrCmd_209(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -300,7 +300,7 @@ BOOL ScrCmd_209(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferMapSecName(SCRIPTCONTEXT* ctx) { STRING* str = String_ctor(22, 4); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 mapno = ScriptGetVar(ctx); @@ -312,7 +312,7 @@ BOOL ScrCmd_BufferMapSecName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferBerryName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 berry_id = ScriptGetVar(ctx); u16 unk = ScriptGetVar(ctx); @@ -325,7 +325,7 @@ BOOL ScrCmd_BufferBerryName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferNatureName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 nature_id = ScriptGetVar(ctx); @@ -335,7 +335,7 @@ BOOL ScrCmd_BufferNatureName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferFashionName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -346,7 +346,7 @@ BOOL ScrCmd_BufferFashionName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); @@ -360,7 +360,7 @@ BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferRibbonName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 unk = ScriptGetVar(ctx); @@ -371,7 +371,7 @@ BOOL ScrCmd_BufferRibbonName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSealName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -381,7 +381,7 @@ BOOL ScrCmd_BufferSealName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_id = ScriptGetVar(ctx); @@ -391,7 +391,7 @@ BOOL ScrCmd_BufferTrainerName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferApricornName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 apricorn_id = ScriptGetVar(ctx); @@ -401,7 +401,7 @@ BOOL ScrCmd_BufferApricornName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -411,7 +411,7 @@ BOOL ScrCmd_BufferItemNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemNamePlural(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -422,7 +422,7 @@ BOOL ScrCmd_BufferItemNamePlural(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_slot = ScriptGetVar(ctx); @@ -434,7 +434,7 @@ BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSpeciesNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); u16 unused1 = ScriptReadHalfword(ctx); @@ -446,7 +446,7 @@ BOOL ScrCmd_BufferSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetFriendStarterSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -456,7 +456,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferFashionNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -466,7 +466,7 @@ BOOL ScrCmd_BufferFashionNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerClassNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -476,7 +476,7 @@ BOOL ScrCmd_BufferTrainerClassNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSealNamePlural(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -486,10 +486,10 @@ BOOL ScrCmd_BufferSealNamePlural(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_Capitalize(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); - ScrStrBufs_UpperFirstChar(*msg_fmt, idx); + MessageFormat_UpperFirstChar(*msg_fmt, idx); return FALSE; } diff --git a/src/unk_0205B3DC.c b/src/unk_0205B3DC.c index edc8acdc79..7c4089fdc0 100644 --- a/src/unk_0205B3DC.c +++ b/src/unk_0205B3DC.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_0205B3DC.h" #include "gf_gfx_loader.h" @@ -33,7 +34,7 @@ static const u8 _020FCA44[][3] = { { 0x3F, TRAINERCLASS_LADY, TRAINERCLASS_LADY }, }; -void sub_0205B3DC(u32 trainerId, u32 playerGender, MSGFMT *msgFmt) { +void sub_0205B3DC(u32 trainerId, u32 playerGender, MessageFormat *msgFmt) { int idx; int i; int sprite; diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index ea1b3c4e2f..d51f9e5ffa 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -1,10 +1,11 @@ #include "coins.h" #include "font.h" #include "game_stats.h" +#include "global.h" #include "gf_gfx_loader.h" #include "list_menu_items.h" #include "math_util.h" -#include "msgfmt.h" +#include "message_format.h" #include "options.h" #include "overlay_manager.h" #include "player_data.h" @@ -2025,7 +2026,7 @@ static void ov122_021E8094(OVY_MANAGER *man) { work->narc = NARC_ctor(0x10a, work->heapId); work->msgData = NewMsgDataFromNarc(0, 0x1b, 0x27, work->heapId); - work->msgFmt = ScrStrBufs_new(work->heapId); + work->msgFmt = MessageFormat_new(work->heapId); work->unk13C = sub_0201660C(work->heapId); ov122_021E7928(work); @@ -2070,7 +2071,7 @@ static void FreeOverlayData(OVY_MANAGER *man) { ov122_021E765C(work); ov122_021E79A4(work); - ScrStrBufs_delete(work->msgFmt); + MessageFormat_delete(work->msgFmt); DestroyMsgData(work->msgData); NARC_dtor(work->narc); ov122_021E8068(); From 3b82fc9f2b8aed11dd70e93a6a7796b9d43199ba Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 16 May 2023 15:59:16 +0100 Subject: [PATCH 10/11] fix CI build --- .github/workflows/build.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dca39629c..6447032a6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: [ master ] pull_request: + workflow_dispatch: env: LM_LICENSE_FILE: "$GITHUB_WORKSPACE/tools/mwccarm/license.dat" @@ -21,15 +22,21 @@ jobs: steps: - name: Update and Install Software run: | - sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev + sudo apt update + sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade + sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge + sudo ppa-purge -y ppa:ubuntu-toolchain-r/test sudo dpkg --add-architecture i386 - wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - + sudo mkdir -pm755 /etc/apt/keyrings + sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport - sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main" + sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources + sudo apt update + sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade sudo apt -y --allow-downgrades install --install-recommends winehq-stable - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Repo run: | From 058dc7a0087b9cb919d78b9fec55b3d34bf8715b Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 16 May 2023 16:12:57 +0100 Subject: [PATCH 11/11] remove an automatic downgrade --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6447032a6c..3ae0ed6dd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,6 @@ jobs: sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources sudo apt update - sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade sudo apt -y --allow-downgrades install --install-recommends winehq-stable - name: Checkout Repo