Skip to content

Sync string_gf.c with pokediamond and pokeplatinum #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AsparagusEduardo wants to merge 27 commits into from
Closed

Sync string_gf.c with pokediamond and pokeplatinum #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f5f3f4a
Rename to string_gf
AsparagusEduardo Dec 30, 2025
aa208a9
str -> string
AsparagusEduardo Dec 30, 2025
cbb3e6e
String_Assert
AsparagusEduardo Dec 30, 2025
5c86eef
String_Delete -> String_Free
AsparagusEduardo Dec 30, 2025
60496d0
String_Dup -> String_Clone
AsparagusEduardo Dec 30, 2025
50c8723
String16_FormatInteger -> String_FormatInt
AsparagusEduardo Dec 30, 2025
ecd28c3
String_SetEmpty -> String_Clear
AsparagusEduardo Dec 30, 2025
d0acdaf
String_Cat -> String_Concat
AsparagusEduardo Dec 30, 2025
797f22d
CopyStringToU16Array -> String_ToChars
AsparagusEduardo Dec 30, 2025
578e6bd
CopyU16ArrayToString -> String_CopyChars
AsparagusEduardo Dec 30, 2025
06386c4
String16_FormatUnsignedLongLong -> String_FormatU64
AsparagusEduardo Dec 30, 2025
437340b
String_RadioAddStatic -> String_AddRadioStatic
AsparagusEduardo Dec 30, 2025
96d0f16
String_GetLineN -> String_CopyLine
AsparagusEduardo Dec 30, 2025
38c4280
String_atoi -> String_AtoI
AsparagusEduardo Dec 30, 2025
c19cb60
CopyU16ArrayToStringN -> String_CopyNumChars
AsparagusEduardo Dec 30, 2025
771b88b
String_CopyChars -> String_CopyFromChars
AsparagusEduardo Dec 30, 2025
8ba85f7
String_ToChars -> String_CopyToChars
AsparagusEduardo Dec 30, 2025
2982d1e
String_cstr -> String_GetChars
AsparagusEduardo Dec 30, 2025
0064df3
String_AddChar -> String_AppendChar
AsparagusEduardo Dec 30, 2025
ae41342
String_Cat_HandleTrainerName -> String_ConcatTrainerName
AsparagusEduardo Dec 30, 2025
acc41c0
String_UpperCharN -> String_UpperChar
AsparagusEduardo Dec 30, 2025
ffddb68
maxsize -> maxSize
AsparagusEduardo Dec 30, 2025
cbedd93
magic -> integrity
AsparagusEduardo Dec 30, 2025
61228cd
Inner style + PaddingMode
AsparagusEduardo Jan 1, 2026
17252b2
Header sync
AsparagusEduardo Jan 1, 2026
1b036cc
Using charcode_t
AsparagusEduardo Jan 1, 2026
ebb778b
Header sync 2
AsparagusEduardo Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions asm/frontier_system.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ _0222A930:
ldr r0, [r4, #0x44]
bl MessageFormat_Delete
ldr r0, [r4, #0x48]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x4c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x40]
bl Heap_Free
ldr r0, [r4, #0x3c]
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021EDAFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
.public AddTextPrinterParameterized
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetCoinsAddr
.public PlayerProfile_GetMoney
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F3F50.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
.public AddTextPrinterParameterized
.public AddTextPrinterParameterizedWithColor
.public GF_AssertFail
.public String_Delete
.public String_Free
.public SaveGameNormal
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetIGTAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F6CFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.public RemoveWindow
.public TextPrinterCheckActive
.public String_New
.public String_Delete
.public String_Free
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_New
.public Save_Profile_PlayerName_Set
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FC66C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.public LCRandom
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Save_PlayerData_GetOptionsAddr
.public Save_GameStats_Get
.public GameStats_Inc
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_02.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
.public Sprite_SetDrawPriority
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_03.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
.public System_GetTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public String16_FormatInteger
.public String_Free
.public String_FormatInt
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Save_PlayerData_GetIGTAddr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_05.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.public Sprite_UpdateAnim
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Thunk_G3X_Reset
.public GF_3DVramMan_Create
.public GF_3DVramMan_Delete
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_08.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
.public TouchscreenHitbox_FindRectAtTouchNew
.public System_GetTouchNew
.public String_New
.public String_Delete
.public String_Free
.public GetMonData
.public GetMonExpBySpeciesAndLevel
.public GetMonGender
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_102.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@
.public TouchscreenHitbox_PointIsIn
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public String_CountLines
.public String_GetLineN
.public CopyU16ArrayToStringN
.public String_cstr
.public String_CopyLine
.public String_CopyNumChars
.public String_GetChars
.public TouchHitboxController_Create
.public TouchHitboxController_Destroy
.public TouchHitboxController_IsTriggered
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_103.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
.public TouchscreenHitbox_FindRectAtTouchNew
.public System_GetTouchNew
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public String_Free
.public String_CopyFromChars
.public Save_PlayerData_GetOptionsAddr
.public Options_GetTextFrameDelay
.public Options_GetFrame
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_108.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
.public System_GetTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Thunk_G3X_Reset
.public GF_3DVramMan_InitLinkedListTexVramManager
.public GF_3DVramMan_InitLinkedListPlttVramManager
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_109.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
.public Sprite_IsAnimated
.public TouchscreenHitbox_FindRectAtTouchNew
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public String_Free
.public String_CopyFromChars
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Options_GetTextFrameDelay
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_111.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
.public Sprite_GetVramType
.public System_GetTouchNew
.public GF_AssertFail
.public String_Delete
.public String_Free
.public Options_GetTextFrameDelay
.public Options_GetFrame
.public GetMonData
Expand Down
12 changes: 6 additions & 6 deletions asm/include/overlay_112.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@
.public TouchscreenHitbox_TouchNewIsIn
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public String_Copy
.public String_GetLength
.public CopyU16ArrayToString
.public CopyU16ArrayToStringN
.public CopyStringToU16Array
.public String_Cat
.public String_AddChar
.public String_CopyFromChars
.public String_CopyNumChars
.public String_CopyToChars
.public String_Concat
.public String_AppendChar
.public SaveArray_PCStorage_Get
.public SaveGameNormal
.public Save_ClearStatusFlags
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_113.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
.public Sprite_IsAnimated
.public TouchscreenHitbox_FindHitboxAtTouchNew
.public String_New
.public String_Delete
.public String_Free
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetPlayerName_NewString
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_115.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.public Sprite_SetPriority
.public Sprite_GetPaletteProxy
.public String_New
.public String_Delete
.public String_Free
.public Thunk_G3X_Reset
.public RequestSwap3DBuffers
.public Save_PlayerData_GetProfile
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_117.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
.public Sprite_SetPriority
.public Sprite_SetOamMode
.public String_New
.public String_Delete
.public String_Free
.public G2x_SetBlendAlpha_
.public memset
.public _s32_div_f
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
.public GfGfx_BothDispOn
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public RequestSwap3DBuffers
.public GetMainBgPlttAddr
.public sub_02026E8C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_command.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
.public Sprite_SetPalOffsetRespectVramOffset
.public System_GetTouchNew
.public GF_AssertFail
.public String_Delete
.public String_Free
.public CalcMonStats
.public GetMonData
.public SetMonData
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
.public System_GetTouchHeldCoords
.public System_GetTouchNewCoords
.public String_New
.public String_Delete
.public String_Free
.public SaveArray_PCStorage_Get
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_15.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
.public System_GetTouchHeld
.public GF_AssertFail
.public String_New
.public String_Delete
.public String16_FormatInteger
.public String_Free
.public String_FormatInt
.public Thunk_G3X_Reset
.public RequestSwap3DBuffers
.public Save_PlayerData_GetProfile
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_18.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
.public System_GetTouchNewCoords
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public PlayerProfile_GetPlayerName_NewString
.public PlayerProfile_GetTrainerGender
.public Pokedex_CheckMonCaughtFlag
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_27.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
.public TouchscreenHitbox_FindRectAtTouchNew
.public System_GetTouchNew
.public GF_AssertFail
.public String_Delete
.public String_Free
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetTrainerGender
.public sub_0203769C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_28.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
.public TouchscreenHitbox_TouchNewIsIn
.public System_GetTouchNew
.public System_GetTouchHeldCoords
.public String_Delete
.public String_Free
.public FieldSystem_GetFacingObject
.public sub_0203DF8C
.public FieldSystem_IsPlayerMovementAllowed
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
.public Sprite_SetAnimCtrlSeq
.public Sprite_UpdateAnim
.public TouchscreenHitbox_FindRectAtTouchNew
.public String_Delete
.public String_Free
.public GXS_SetGraphicsMode
.public GX_SetBankForSubBG
.public GX_SetBankForSubOBJ
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_31.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.public TouchscreenHitbox_FindRectAtTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetMoney
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_32.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
.public Sprite_UpdateAnim
.public TouchscreenHitbox_FindRectAtTouchNew
.public String_New
.public String_Delete
.public String_Free
.public PlayerProfile_New
.public Save_Profile_PlayerName_Set
.public sub_0202C254
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_33.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
.public AddTextPrinterParameterizedWithColor
.public TouchscreenHitbox_FindRectAtTouchHeld
.public TouchscreenHitbox_FindRectAtTouchNew
.public String_Delete
.public String_Free
.public GXS_SetGraphicsMode
.public GX_SetBankForSubBG
.public GX_SetBankForSubOBJ
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_34.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
.public System_GetTouchHeldCoords
.public GF_AssertFail
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public String_Free
.public String_CopyFromChars
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetNamePtr
.public PlayerProfile_GetTrainerID
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_37.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
.public TouchscreenHitbox_FindRectAtTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_Free
.public PlayerName_FlatToString
.public Options_GetFrame
.public sub_02033250
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_39_thumb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
.public System_GetTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public CopyStringToU16Array
.public String_Free
.public String_CopyToChars
.public SaveArray_CalcCRC16
.public Save_SysInfo_Get
.public Save_SysInfo_GetDwcProfileId
Expand Down
16 changes: 8 additions & 8 deletions asm/include/overlay_40.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@
.public System_GetTouchNewCoords
.public GF_AssertFail
.public String_New
.public String_Delete
.public String_SetEmpty
.public String16_FormatInteger
.public String16_FormatUnsignedLongLong
.public String_Free
.public String_Clear
.public String_FormatInt
.public String_FormatU64
.public String_CountLines
.public String_GetLineN
.public CopyU16ArrayToString
.public CopyStringToU16Array
.public String_Cat
.public String_CopyLine
.public String_CopyFromChars
.public String_CopyToChars
.public String_Concat
.public TouchHitboxController_Create
.public TouchHitboxController_Destroy
.public TouchHitboxController_IsTriggered
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_41.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
.public GF2dGfxRawResMan_DoesNotHaveObjWithId
.public GF2dGfxRawResMan_AllocObj
.public String_New
.public String_Delete
.public String_Free
.public TouchHitboxController_Create
.public TouchHitboxController_Destroy
.public TouchHitboxController_IsTriggered
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_43.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@
.public GF_AssertFail
.public GF_SetG2dRendererSurface
.public String_New
.public String_Delete
.public String_SetEmpty
.public String_Free
.public String_Clear
.public String_Copy
.public String_atoi
.public CopyU16ArrayToString
.public String_cstr
.public String_AtoI
.public String_CopyFromChars
.public String_GetChars
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_New
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_44.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
.public System_GetTouchNew
.public GF_AssertFail
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public String_Free
.public String_CopyFromChars
.public TouchHitboxController_Create
.public TouchHitboxController_Destroy
.public TouchHitboxController_IsTriggered
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_45_thumb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
.public GF3dGfxRawResObj_GetTex4x4Key
.public GF3dGfxRawResObj_GetPlttKey
.public String_New
.public String_Delete
.public CopyStringToU16Array
.public String_Free
.public String_CopyToChars
.public sub_02026E18
.public SaveArray_CalcCRC16
.public Save_SysInfo_RTC_Get
Expand Down
Loading