Skip to content
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

Jump to bottom

code_80140DC.s -> string_format #243

Merged
merged 16 commits into from
Nov 1, 2024
Merged

code_80140DC.s -> string_format #243

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1548fbe
CreateMenuDialogueBoxAndPortrait
DizzyEggg Oct 27, 2024
f79211a
AppendString_8014FA8
DizzyEggg Oct 28, 2024
ae3c73f
sub_8015034
DizzyEggg Oct 29, 2024
131ad37
remove gUnknown_202DEA8
DizzyEggg Oct 29, 2024
94edb4c
gAvailablePokemonNames
DizzyEggg Oct 29, 2024
c5a1369
gUnknown_202E748
DizzyEggg Oct 29, 2024
7438e1c
move dialogue variables to ewram
DizzyEggg Oct 29, 2024
b218d90
string_format.c clean-up
DizzyEggg Oct 29, 2024
b71f4b1
rename format string related
DizzyEggg Oct 29, 2024
25f6332
merge master
DizzyEggg Oct 29, 2024
98b1caf
some copyformatstring clean-up
DizzyEggg Oct 29, 2024
a39687b
merge master
DizzyEggg Oct 30, 2024
6c9c980
small clean-up
DizzyEggg Oct 30, 2024
de31304
FormatString - name
DizzyEggg Oct 31, 2024
cc7c519
gSpeakerNameBuffer and gSpeakerNameSeparator
DizzyEggg Oct 31, 2024
48752a4
Format to Formatted
DizzyEggg Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asm/code_800F990.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ sub_80101F8:
adds r2, 0x50
adds r1, r3, 0
movs r3, 0
bl xxx_format_string
bl CopyFormatString
b _08010220
.align 2, 0
_08010214: .4byte gUnknown_80D3EFC
Expand Down Expand Up @@ -2307,7 +2307,7 @@ _08010BD0:
pop {r0}
bx r0
.align 2, 0
_08010C08: .4byte gAvailablePokemonNames
_08010C08: .4byte gFormatBuffer_Monsters
_08010C0C: .4byte gUnknown_80D4074
thumb_func_end sub_8010B74

Expand Down
4 changes: 2 additions & 2 deletions asm/code_8010F28.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,8 +887,8 @@ _08011624: .4byte 0x00004df8
_08011628: .4byte 0x00004ddc
_0801162C: .4byte 0x00004de0
_08011630: .4byte gUnknown_80D4104
_08011634: .4byte gFormatData_202DE30
_08011638: .4byte gFormatItems
_08011634: .4byte gFormatArgs
_08011638: .4byte gFormatBuffer_Items
_0801163C: .4byte gUnknown_80D4120
_08011640:
ldr r1, _08011690
Expand Down
Loading