Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-06-02 21:54:45 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into scrcmd_11

Browse Source
This commit is contained in:
PikalaxALT 2023-12-29 11:39:52 -05:00
commit 9f505e5908
No known key found for this signature in database
GPG Key ID: C7E3D40F3BAC7AEB
196 changed files with 1232 additions and 1721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/alph_puzzle_data.s
View File

@ -28,9 +28,9 @@ ov110_021E6D9C: ; 0x021E6D9C
.public ov110_021E6DA4
ov110_021E6DA4: ; 0x021E6DA4
.word 0x00010200
.word 0x00030400
.word 0x00050600
.word (1 << 16) | (2 << 8) | 0
.word (3 << 16) | (4 << 8) | 0
.word (5 << 16) | (6 << 8) | 0
.public ov110_021E6DB0
ov110_021E6DB0: ; 0x021E6DB0

2
asm/include/overlay_01_021EF7A0.inc
View File

@ -16,7 +16,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BlitBitmapRectToWindow
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_AssertFail
.public String_New
.public String_Delete

2
asm/include/overlay_01_021F3F50.inc
View File

@ -24,7 +24,7 @@
.public CopyWindowToVram
.public FillWindowPixelBuffer
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_AssertFail
.public String_Delete
.public SaveGameNormal

2
asm/include/overlay_02.inc
View File

@ -105,7 +105,7 @@
.public GF_SinDegFX32
.public LCRandom
.public MTRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineATogglePlanes
.public Camera_New
.public Camera_Delete

4
asm/include/overlay_03.inc
View File

@ -67,9 +67,9 @@
.public FillWindowPixelRect
.public GetWindowWidth
.public ScheduleBgTilemapBufferTransfer
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineATogglePlanes
.public GfGfx_EngineASetPlanes
.public GfGfx_EngineBTogglePlanes

2
asm/include/overlay_05.inc
View File

@ -112,7 +112,7 @@
.public sub_0201F988
.public LCRandom
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_08.inc
View File

@ -93,7 +93,7 @@
.public sub_0201F988
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02020A0C
.public sub_02020A18
.public sub_02020A24

2
asm/include/overlay_101.inc
View File

@ -136,7 +136,7 @@
.public LCRandom
.public MTRandom
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020210BC
.public sub_02021148
.public sub_02021238

2
asm/include/overlay_102.inc
View File

@ -110,7 +110,7 @@
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public MsgArray_SkipControlCode
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020215A0
.public sub_0202168C
.public sub_020216C8

2
asm/include/overlay_103.inc
View File

@ -114,7 +114,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020210BC
.public sub_02021148
.public sub_02021238

2
asm/include/overlay_108.inc
View File

@ -142,7 +142,7 @@
.public Draw3dModel
.public Bind3dModelSet
.public AllocAndLoad3dTexResources
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_109.inc
View File

@ -87,7 +87,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public sub_020210BC

2
asm/include/overlay_110.inc
View File

@ -82,7 +82,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public sub_020210BC

4
asm/include/overlay_111.inc
View File

@ -87,8 +87,8 @@
.public ScheduleSetBgPosText
.public ResetAllTextPrinters
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public GfGfx_SetBanks
.public GfGfx_DisableEngineAPlanes
.public GfGfx_EngineATogglePlanes

2
asm/include/overlay_112.inc
View File

@ -158,7 +158,7 @@
.public GF_CalcCRC16
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_113.inc
View File

@ -76,7 +76,7 @@
.public FillWindowPixelBuffer
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_115.inc
View File

@ -23,7 +23,7 @@
.public RemoveWindow
.public FillWindowPixelBuffer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineATogglePlanes
.public sub_0202457C
.public Sprite_Delete

2
asm/include/overlay_117.inc
View File

@ -28,7 +28,7 @@
.public RemoveWindow
.public FillWindowPixelBuffer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineATogglePlanes
.public sub_0202457C
.public Sprite_Delete

2
asm/include/overlay_121.inc
View File

@ -63,7 +63,7 @@
.public FillWindowPixelBuffer
.public DoScheduledBgGpuUpdates
.public ResetAllTextPrinters
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_0202168C

2
asm/include/overlay_12_02264824.inc
View File

@ -32,7 +32,7 @@
.public AddTextWindowTopLeftCorner
.public RemoveWindow
.public GF_SinDegNoWrap
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public Set2dSpriteAnimActiveFlag
.public Sprite_SetAnimCtrlCurrentFrame
.public sub_02024B1C

2
asm/include/overlay_12_02266024.inc
View File

@ -85,7 +85,7 @@
.public RemoveWindow
.public ScheduleBgTilemapBufferTransfer
.public LCRandom
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public sub_02021AC8
.public sub_02021B5C
.public Set2dSpriteAnimSeqNo

2
asm/include/overlay_12_battle_command.inc
View File

@ -58,7 +58,7 @@
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02021AC8
.public sub_02021B5C
.public sub_02021BD0

2
asm/include/overlay_14.inc
View File

@ -180,7 +180,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02020A0C
.public sub_020210BC
.public sub_02021148

2
asm/include/overlay_15.inc
View File

@ -119,7 +119,7 @@
.public sub_0201F63C
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_17.inc
View File

@ -97,7 +97,7 @@
.public FillWindowPixelBuffer
.public DoScheduledBgGpuUpdates
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public sub_020210BC

2
asm/include/overlay_18.inc
View File

@ -189,7 +189,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02020A0C
.public sub_020210BC
.public sub_02021148

2
asm/include/overlay_19.inc
View File

@ -39,7 +39,7 @@
.public FillWindowPixelBuffer
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineBTogglePlanes
.public sub_0202457C
.public Sprite_Delete

2
asm/include/overlay_27.inc
View File

@ -64,7 +64,7 @@
.public GetWindowY
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineBTogglePlanes
.public SpriteList_Delete
.public sub_0202457C

2
asm/include/overlay_28.inc
View File

@ -48,7 +48,7 @@
.public GF_SinDeg
.public GF_CosDeg
.public GF_DegreeToSinCosIdx
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public SpriteList_Delete
.public sub_0202457C
.public CreateSprite

2
asm/include/overlay_29.inc
View File

@ -48,7 +48,7 @@
.public GetWindowWidth
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public SpriteList_Delete
.public sub_0202457C
.public CreateSprite

2
asm/include/overlay_31.inc
View File

@ -54,7 +54,7 @@
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineBTogglePlanes
.public sub_02025224
.public GF_AssertFail

2
asm/include/overlay_32.inc
View File

@ -54,7 +54,7 @@
.public GetWindowWidth
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public SpriteList_Delete
.public sub_0202457C
.public CreateSprite

2
asm/include/overlay_33.inc
View File

@ -31,7 +31,7 @@
.public GetWindowWidth
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02025204
.public sub_02025224
.public String_Delete

2
asm/include/overlay_34.inc
View File

@ -46,7 +46,7 @@
.public ScheduleWindowCopyToVram
.public FillWindowPixelBuffer
.public sub_0201F988
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_EngineBTogglePlanes
.public SpriteList_Delete
.public sub_0202457C

4
asm/include/overlay_37.inc
View File

@ -69,9 +69,9 @@
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020210BC
.public sub_02021148

2
asm/include/overlay_39_thumb.inc
View File

@ -64,7 +64,7 @@
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_40.inc
View File

@ -141,7 +141,7 @@
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public GF_CosDeg
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_41.inc
View File

@ -138,7 +138,7 @@
.public sub_0201F988
.public MTRandom
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020210BC
.public sub_02021148
.public sub_02021238

4
asm/include/overlay_43.inc
View File

@ -113,8 +113,8 @@
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

4
asm/include/overlay_44.inc
View File

@ -143,9 +143,9 @@
.public GF_SinDegNoWrap
.public MTRandom
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_CreateNewVramTransferTask

4
asm/include/overlay_46.inc
View File

@ -57,9 +57,9 @@
.public FillWindowPixelBuffer
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_SetBanks
.public GfGfx_EngineATogglePlanes
.public GfGfx_SwapDisplay

4
asm/include/overlay_47.inc
View File

@ -75,8 +75,8 @@
.public SetWindowPaletteNum
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

4
asm/include/overlay_48.inc
View File

@ -92,9 +92,9 @@
.public ScheduleBgTilemapBufferTransfer
.public GF_DegreeToSinCosIdxNoWrap
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_CreateNewVramTransferTask

4
asm/include/overlay_49.inc
View File

@ -150,9 +150,9 @@
.public GF_DegreeToSinCosIdx
.public MTRandom
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_53.inc
View File

@ -97,7 +97,7 @@
.public ResetAllTextPrinters
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GfGfx_SetBanks

4
asm/include/overlay_54.inc
View File

@ -65,8 +65,8 @@
.public FillWindowPixelRect
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GfGfx_SetBanks

2
asm/include/overlay_56.inc
View File

@ -87,7 +87,7 @@
.public ScheduleBgTilemapBufferTransfer
.public DoesPixelAtScreenXYMatchPtrVal
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GfGfx_SetBanks

2
asm/include/overlay_57.inc
View File

@ -142,7 +142,7 @@
.public DoScheduledBgGpuUpdates
.public DoesPixelAtScreenXYMatchPtrVal
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_59.inc
View File

@ -117,7 +117,7 @@
.public GF_DegreeToSinCosIdx
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_60.inc
View File

@ -100,7 +100,7 @@
.public Draw3dModel
.public GetLCRNGSeed
.public SetLCRNGSeed
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public sub_02020D2C
.public sub_020215A0
.public sub_0202168C

2
asm/include/overlay_62.inc
View File

@ -71,7 +71,7 @@
.public sub_0201F988
.public GF_SinDegNoWrap
.public LCRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GfGfx_SetBanks

2
asm/include/overlay_63.inc
View File

@ -98,7 +98,7 @@
.public GF_CosDegNoWrap
.public SetLCRNGSeed
.public LCRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_SetBanks
.public GfGfx_EngineATogglePlanes
.public GfGfx_EngineASetPlanes

2
asm/include/overlay_64.inc
View File

@ -80,7 +80,7 @@
.public CopyWindowPixelsToVram_TextMode
.public FillWindowPixelBuffer
.public DoScheduledBgGpuUpdates
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020210BC
.public sub_02021148
.public sub_02021238

2
asm/include/overlay_65.inc
View File

@ -111,7 +111,7 @@
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public LCRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_0202168C

2
asm/include/overlay_67.inc
View File

@ -77,7 +77,7 @@
.public GetWindowWidth
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02020A0C
.public GfGfx_SetBanks
.public GfGfx_DisableEngineAPlanes

2
asm/include/overlay_68.inc
View File

@ -109,7 +109,7 @@
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_70.inc
View File

@ -138,7 +138,7 @@
.public LCRandom
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_0202168C

2
asm/include/overlay_72.inc
View File

@ -86,7 +86,7 @@
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_0202168C

4
asm/include/overlay_73.inc
View File

@ -96,9 +96,9 @@
.public DoesPixelAtScreenXYMatchPtrVal
.public GF_SinDeg
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020210BC
.public sub_02021148

2
asm/include/overlay_74_thumb.inc
View File

@ -137,7 +137,7 @@
.public LCRandom
.public ResetAllTextPrinters
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_020215C0

2
asm/include/overlay_75.inc
View File

@ -86,7 +86,7 @@
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_80_0223A00C.inc
View File

@ -52,7 +52,7 @@
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public sub_0201F988
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public sub_02021AC8
.public sub_02021B5C
.public sub_020247F4

2
asm/include/overlay_81.inc
View File

@ -124,7 +124,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215C0
.public sub_0202168C

2
asm/include/overlay_82.inc
View File

@ -91,7 +91,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215C0
.public sub_0202168C

2
asm/include/overlay_83.inc
View File

@ -125,7 +125,7 @@
.public GetWindowWidth
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

4
asm/include/overlay_85.inc
View File

@ -128,9 +128,9 @@
.public GF_SinDeg
.public LCRandom
.public TextPrinterCheckActive
.public sub_020200A0
.public RemoveTextPrinter
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_86.inc
View File

@ -88,7 +88,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02020A0C
.public GfGfx_SetBanks
.public GfGfx_DisableEngineAPlanes

2
asm/include/overlay_87.inc
View File

@ -91,7 +91,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public LCRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_88.inc
View File

@ -54,7 +54,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_CreateNewVramTransferTask

4
asm/include/overlay_89.inc
View File

@ -129,8 +129,8 @@
.public GF_SinDegFX32
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColor
.public AddTextPrinterParameterizedWithColorAndSpacing
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

4
asm/include/overlay_90.inc
View File

@ -99,8 +99,8 @@
.public ScheduleSetBgPosText
.public MTRandom
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_CreateNewVramTransferTask

2
asm/include/overlay_91.inc
View File

@ -106,7 +106,7 @@
.public GF_DegreeToSinCosIdxNoWrap
.public GF_DegreeToSinCosIdx
.public MTRandom
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_92.inc
View File

@ -117,7 +117,7 @@
.public SetLCRNGSeed
.public LCRandom
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_93_thumb_1.inc
View File

@ -116,7 +116,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AllocAndLoad3dTexResources
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_93_thumb_2.inc
View File

@ -53,7 +53,7 @@
.public GF_SinDegFX32
.public GF_CosDegFX32
.public LCRandom
.public AddTextPrinterParameterized3
.public AddTextPrinterParameterizedWithColorAndSpacing
.public sub_02021AC8
.public sub_02021B5C
.public GF_AssertFail

2
asm/include/overlay_95.inc
View File

@ -124,7 +124,7 @@
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

6
asm/include/overlay_96.inc
View File

@ -205,9 +205,9 @@
.public MTRandom
.public ResetAllTextPrinters
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterized3
.public RemoveTextPrinter
.public AddTextPrinterParameterizedWithColor
.public AddTextPrinterParameterizedWithColorAndSpacing
.public GF_CreateVramTransferManager
.public GF_DestroyVramTransferManager
.public GF_RunVramTransferTasks

2
asm/include/overlay_97.inc
View File

@ -53,7 +53,7 @@
.public CopyWindowToVram
.public FillWindowPixelBuffer
.public ResetAllTextPrinters
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_020215A0
.public sub_0202168C
.public sub_020216C8

2
asm/include/overlay_98.inc
View File

@ -56,7 +56,7 @@
.public FillWindowPixelBuffer
.public GetWindowWidth
.public SetWindowY
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GfGfx_SetBanks
.public GfGfx_DisableEngineAPlanes
.public GfGfx_EngineATogglePlanes

2
asm/include/overlay_trainer_card_main.inc
View File

@ -92,7 +92,7 @@
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020210BC
.public sub_02021148

2
asm/include/overlay_trainer_card_signature.inc
View File

@ -73,7 +73,7 @@
.public GF_SinDeg
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020210BC
.public sub_02021148

4
asm/include/render_text.inc
View File

@ -34,8 +34,8 @@
.public MsgArray_SkipControlCode
.public MsgArray_GetControlCode
.public MsgArray_ControlCodeGetField
.public sub_0202036C
.public sub_020204FC
.public GenerateFontHalfRowLookupTable
.public RenderScreenFocusIndicatorTile
.public sub_020252F4
.public sub_02025320
.public GF_AssertFail

26
asm/include/text.inc
View File

@ -1,26 +0,0 @@
#include <nitro/fs/overlay.h>
#pragma once
.public FontID_RenderText
.public GfGfxLoader_GetCharData
.public sub_0200E358
.public DestroySysTask
.public AllocFromHeap
.public FreeToHeap
.public CopyWindowToVram
.public BlitBitmapRectToWindow
.public GetWindowWidth
.public sub_0201F988
.public sub_0201FFE0
.public ResetAllTextPrinters
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterized3
.public AddTextPrinter
.public sub_0202036C
.public DecompressGlyphTile
.public sub_020204FC
.public GF_AssertFail
.public String_cstr
.public MIi_CpuCopy32

2
asm/include/unk_02014DA0.inc
View File

@ -48,7 +48,7 @@
.public AllocFromHeap
.public FreeToHeap
.public CopyWindowPixelsToVram_TextMode
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public Camera_New
.public Camera_Delete
.public Camera_SetStaticPtr

2
asm/include/unk_020183F0.inc
View File

@ -29,7 +29,7 @@
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02025224
.public GF_AssertFail
.public NNS_G2dGetUnpackedBGCharacterData

2
asm/include/unk_020755E8.inc
View File

@ -109,7 +109,7 @@
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public GfGfx_SetBanks
.public GfGfx_DisableEngineAPlanes

2
asm/include/unk_0207CB7C.inc
View File

@ -43,7 +43,7 @@
.public FillWindowPixelRect
.public GetWindowWidth
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public Set2dSpriteVisibleFlag
.public Set2dSpriteAnimSeqNo
.public Get2dSpriteCurrentAnimSeqNo

2
asm/include/unk_02082908.inc
View File

@ -89,7 +89,7 @@
.public LCRandom
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public sub_020215A0
.public sub_0202168C

2
asm/include/unk_020863F4.inc
View File

@ -49,7 +49,7 @@
.public CopyWindowToVram
.public FillWindowPixelBuffer
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public sub_02021AC8
.public sub_02021B5C
.public GF_AssertFail

2
asm/include/unk_0208C3E4.inc
View File

@ -25,7 +25,7 @@
.public FillWindowPixelBuffer
.public GetWindowWidth
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public String_Delete
.public String_Compare
.public AllocMonZeroed

2
asm/include/unk_020932E0.inc
View File

@ -53,7 +53,7 @@
.public GetWindowWidth
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public AddTextPrinterParameterizedWithColor
.public GF_RunVramTransferTasks
.public GfGfx_EngineATogglePlanes
.public GfGfx_SwapDisplay

2
asm/overlay_01_021EF7A0.s
View File

@ -305,7 +305,7 @@ ov01_021EF9A8: ; 0x021EF9A8
add r3, #0x30
ldrb r3, [r3]
add r0, #0x20
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, pc}
nop

2
asm/overlay_01_021F3F50.s
View File

@ -463,7 +463,7 @@ _021F429C:
mov r0, #0
str r0, [sp, #0xc]
ldr r0, [r5, #0x10]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
_021F42E2:

2
asm/overlay_02.s
View File

@ -1755,7 +1755,7 @@ ov02_0224686C: ; 0x0224686C
add r0, #8
mov r1, #3
asr r3, r3, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r5, #8
add r0, r5, #0
bl ScheduleWindowCopyToVram

18
asm/overlay_03.s
View File

@ -20,7 +20,7 @@ ov03_02253E20: ; 0x02253E20
ldr r0, [r0]
add r0, #0x94
ldrb r0, [r0]
bl sub_020200A0
bl RemoveTextPrinter
_02253E42:
cmp r4, #0
beq _02253E64
@ -1108,7 +1108,7 @@ _02254714:
ldr r0, [r0]
add r0, #0x94
ldrb r0, [r0]
bl sub_020200A0
bl RemoveTextPrinter
_02254730:
ldr r0, _022547D0 ; =ov03_022598A0
mov r1, #2
@ -1271,7 +1271,7 @@ _0225486A:
ldr r0, [r0]
add r0, #0x94
ldrb r0, [r0]
bl sub_020200A0
bl RemoveTextPrinter
_022548A6:
add r0, r6, #0
add r1, r4, #0
@ -3314,7 +3314,7 @@ _02255932:
ldr r0, [r0]
add r0, #0x94
ldrb r0, [r0]
bl sub_020200A0
bl RemoveTextPrinter
_02255960:
bl sub_02037454
add r1, r4, #0
@ -6821,7 +6821,7 @@ _022574AA:
add r0, #0x18
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r4, #0
@ -10246,7 +10246,7 @@ ov03_02258F48: ; 0x02258F48
ldr r2, [r5, #0x3c]
add r0, #0x10
mov r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
str r4, [sp]
mov r0, #0xff
str r0, [sp, #4]
@ -10258,7 +10258,7 @@ ov03_02258F48: ; 0x02258F48
ldr r2, [r5, #0x38]
add r0, #0x10
mov r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, r4, r5, pc}
.balign 4, 0
@ -10287,7 +10287,7 @@ ov03_02258F8C: ; 0x02258F8C
ldr r2, [r5, #0x34]
add r0, #0x10
mov r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [r5, #0x24]
add r1, r6, #0
bl ov03_02259070
@ -10363,7 +10363,7 @@ _02259036:
ldr r2, [r5, #0x34]
add r0, #0x10
sub r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop

8
asm/overlay_05.s
View File

@ -3404,7 +3404,7 @@ ov05_0221D530: ; 0x0221D530
add r2, r7, #0
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, _0221D5D0 ; =0x00000B44
ldr r0, [r4, r0]
str r0, [sp, #0x10]
@ -5550,7 +5550,7 @@ _0221E656:
add r3, r1, #0
add r0, r7, r0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
mov r0, #0x18
mul r0, r4
add r2, r5, r0
@ -5578,7 +5578,7 @@ _0221E656:
add r0, r7, r0
mov r3, #0x40
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x24
pop {r4, r5, r6, r7, pc}
_0221E6DC:
@ -5599,7 +5599,7 @@ _0221E6DC:
mov r3, #0x40
add r0, r7, r0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_0221E704:
add sp, #0x24
pop {r4, r5, r6, r7, pc}

126
asm/overlay_08.s
View File

@ -4116,7 +4116,7 @@ ov08_0221DDCC: ; 0x0221DDCC
str r0, [sp, #0xc]
ldrb r3, [r3, #0x10]
add r0, r5, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _0221DE6A
_0221DE4E:
ldrb r7, [r3, #0x14]
@ -4131,7 +4131,7 @@ _0221DE4E:
str r0, [sp, #0xc]
ldrb r3, [r3, #0x10]
add r0, r5, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_0221DE6A:
ldr r0, [sp, #0x18]
bl String_Delete
@ -4177,7 +4177,7 @@ _0221DE6A:
add r0, r5, r4
add r2, r6, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _0221DEE6
_0221DED2:
mov r0, #0xff
@ -4188,7 +4188,7 @@ _0221DED2:
add r0, r5, r4
add r2, r6, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_0221DEE6:
add r0, r6, #0
bl String_Delete
@ -4224,7 +4224,7 @@ _0221DEEE:
add r0, r5, r4
add r2, r6, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _0221DF4A
_0221DF36:
mov r0, #0xff
@ -4235,7 +4235,7 @@ _0221DF36:
add r0, r5, r4
add r2, r6, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_0221DF4A:
add r0, r6, #0
bl String_Delete
@ -4510,7 +4510,7 @@ ov08_0221E120: ; 0x0221E120
add r2, r6, #0
add r0, r0, r4
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -4584,7 +4584,7 @@ _0221E202:
add r2, r6, #0
add r0, r0, r5
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221E240 ; =0x00002070
@ -4661,7 +4661,7 @@ _0221E2AA:
str r0, [sp, #0xc]
ldrh r1, [r1, #0x10]
add r0, r4, r6
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x18]
bl String_Delete
add r0, r7, #0
@ -4702,7 +4702,7 @@ ov08_0221E2E8: ; 0x0221E2E8
ldr r3, [sp, #0x10]
add r0, r0, r5
add r2, r7, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
ldr r0, _0221E33C ; =0x00002070
@ -4749,7 +4749,7 @@ ov08_0221E340: ; 0x0221E340
add r2, r5, #0
add r0, r4, r0
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r5, #0
bl String_Delete
ldr r0, _0221E398 ; =0x00002050
@ -4797,7 +4797,7 @@ ov08_0221E3A4: ; 0x0221E3A4
mov r1, #4
add r2, r7, #0
lsr r3, r3, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
add r0, r5, r4
@ -4842,7 +4842,7 @@ ov08_0221E408: ; 0x0221E408
add r3, r1, #0
add r0, r2, r0
add r2, r7, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
ldr r0, _0221E5D0 ; =0x00001FA8
@ -4886,7 +4886,7 @@ ov08_0221E408: ; 0x0221E408
ldr r0, [r5, r0]
add r3, r1, #0
add r0, r0, r7
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x18]
bl String_Delete
ldr r0, [sp, #0x1c]
@ -4909,7 +4909,7 @@ ov08_0221E408: ; 0x0221E408
add r3, r1, #0
add r0, r2, r0
ldr r2, [sp, #0x20]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x20]
bl String_Delete
ldr r0, _0221E5D0 ; =0x00001FA8
@ -4981,7 +4981,7 @@ _0221E53C:
str r1, [sp, #0xc]
ldr r0, [r5, r0]
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
ldr r0, [sp, #0x10]
@ -5046,7 +5046,7 @@ ov08_0221E5DC: ; 0x0221E5DC
ldr r0, [r5, r0]
add r3, r1, #0
add r0, #0xe0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221E6CC ; =0x00001FA8
@ -5103,7 +5103,7 @@ ov08_0221E5DC: ; 0x0221E5DC
str r1, [sp, #0xc]
ldr r0, [r5, r0]
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -5156,7 +5156,7 @@ ov08_0221E6D8: ; 0x0221E6D8
ldr r0, [r5, r0]
add r3, r1, #0
add r0, #0xf0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221E7C8 ; =0x00001FA8
@ -5213,7 +5213,7 @@ ov08_0221E6D8: ; 0x0221E6D8
str r1, [sp, #0xc]
ldr r0, [r5, r0]
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -5267,7 +5267,7 @@ ov08_0221E7D4: ; 0x0221E7D4
add r3, r1, #0
add r0, r0, r2
add r2, r6, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221E8C8 ; =0x00001FA8
@ -5324,7 +5324,7 @@ ov08_0221E7D4: ; 0x0221E7D4
str r1, [sp, #0xc]
ldr r0, [r5, r0]
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -5380,7 +5380,7 @@ ov08_0221E8D4: ; 0x0221E8D4
add r3, r1, #0
add r0, r2, r0
add r2, r6, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221E9C8 ; =0x00001FA8
@ -5437,7 +5437,7 @@ ov08_0221E8D4: ; 0x0221E8D4
str r1, [sp, #0xc]
ldr r0, [r4, r0]
add r0, r0, r5
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -5493,7 +5493,7 @@ ov08_0221E9D4: ; 0x0221E9D4
add r3, r1, #0
add r0, r2, r0
add r2, r6, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221EAC8 ; =0x00001FA8
@ -5550,7 +5550,7 @@ ov08_0221E9D4: ; 0x0221E9D4
str r1, [sp, #0xc]
ldr r0, [r4, r0]
add r0, r0, r5
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r6, #0
@ -5608,7 +5608,7 @@ ov08_0221EAD4: ; 0x0221EAD4
ldr r0, [r5, r0]
add r3, r1, #0
add r0, #0xd0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
ldr r0, _0221EC60 ; =0x00001FA8
@ -5644,7 +5644,7 @@ ov08_0221EAD4: ; 0x0221EAD4
str r1, [sp, #0xc]
ldr r0, [r5, r0]
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
ldr r0, _0221EC60 ; =0x00001FA8
@ -5688,7 +5688,7 @@ ov08_0221EAD4: ; 0x0221EAD4
ldr r0, [r5, r0]
sub r3, r6, r3
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x18]
bl String_Delete
ldr r0, [sp, #0x1c]
@ -5730,7 +5730,7 @@ ov08_0221EAD4: ; 0x0221EAD4
ldr r0, [r5, r0]
add r3, r6, r3
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x20]
bl String_Delete
ldr r0, [sp, #0x24]
@ -5792,7 +5792,7 @@ ov08_0221EC6C: ; 0x0221EC6C
ldr r0, [r5, r0]
add r3, r1, #0
add r0, r0, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r7, #0
@ -5832,7 +5832,7 @@ ov08_0221ECE8: ; 0x0221ECE8
add r0, r5, r4
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r5, r4
@ -5882,7 +5882,7 @@ ov08_0221ED30: ; 0x0221ED30
str r0, [sp, #8]
add r0, r4, r6
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
b _0221EE00
@ -5932,7 +5932,7 @@ _0221ED8A:
str r0, [sp, #8]
add r0, r4, r6
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
add r0, r7, #0
@ -5970,7 +5970,7 @@ ov08_0221EE18: ; 0x0221EE18
add r0, r5, r4
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r5, r4
@ -6020,7 +6020,7 @@ ov08_0221EE60: ; 0x0221EE60
str r0, [sp, #8]
add r0, r4, r6
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
b _0221EF30
@ -6070,7 +6070,7 @@ _0221EEBA:
str r0, [sp, #8]
add r0, r4, r6
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
add r0, r7, #0
@ -6115,7 +6115,7 @@ ov08_0221EF48: ; 0x0221EF48
add r0, r5, r4
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r7, #0
@ -6165,7 +6165,7 @@ ov08_0221EFA8: ; 0x0221EFA8
str r0, [sp, #8]
add r0, r5, r4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
add r0, r5, r4
@ -6222,7 +6222,7 @@ _0221F04C:
add r0, r5, r4
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r5, r4
@ -6270,7 +6270,7 @@ ov08_0221F07C: ; 0x0221F07C
str r0, [sp, #8]
add r0, r4, r6
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x18]
bl String_Delete
ldr r0, _0221F1A8 ; =0x00001FA8
@ -6312,7 +6312,7 @@ ov08_0221F07C: ; 0x0221F07C
add r0, r4, r6
sub r3, r7, r3
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x20]
bl String_Delete
ldr r0, [sp, #0x24]
@ -6352,7 +6352,7 @@ ov08_0221F07C: ; 0x0221F07C
add r0, r4, r6
add r3, r7, r3
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x28]
bl String_Delete
ldr r0, [sp, #0x2c]
@ -6411,7 +6411,7 @@ _0221F1DA:
mov r1, #4
add r2, r6, #0
lsr r3, r3, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r5, r4
@ -6459,7 +6459,7 @@ _0221F23C:
add r0, r5, #0
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r4, #0
bl String_Delete
add r0, r5, #0
@ -6502,7 +6502,7 @@ ov08_0221F284: ; 0x0221F284
add r0, r4, r6
mov r3, #0x28
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
ldr r0, _0221F3C4 ; =0x00001FA8
@ -6526,7 +6526,7 @@ ov08_0221F284: ; 0x0221F284
add r0, r4, r6
mov r3, #0x50
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x18]
bl String_Delete
ldr r0, _0221F3C4 ; =0x00001FA8
@ -6562,7 +6562,7 @@ ov08_0221F284: ; 0x0221F284
add r2, r7, #0
str r1, [sp, #0xc]
str r3, [sp, #0x1c]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x20]
bl String_Delete
ldr r0, _0221F3C4 ; =0x00001FA8
@ -6602,7 +6602,7 @@ ov08_0221F284: ; 0x0221F284
add r2, r7, #0
sub r3, r3, r5
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x24]
bl String_Delete
add r0, r7, #0
@ -6695,7 +6695,7 @@ ov08_0221F3D0: ; 0x0221F3D0
add r0, r4, r6
sub r3, r3, r5
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
ldr r0, [sp, #0x14]
@ -7040,7 +7040,7 @@ _0221F714:
ldr r0, [sp, #0x18]
mov r1, #4
add r3, r7, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
cmp r5, #0
@ -7062,7 +7062,7 @@ _0221F714:
add r2, r5, #0
add r3, r4, r3
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _0221F794
_0221F778:
mov r0, #8
@ -7077,7 +7077,7 @@ _0221F778:
add r2, r5, #0
add r3, r4, r3
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_0221F794:
add r0, r5, #0
bl String_Delete
@ -8170,7 +8170,7 @@ ov08_02220084: ; 0x02220084
ldr r0, [r5, r0]
add r3, r1, #0
add r0, #0x40
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r4, #0
bl String_Delete
ldr r0, _022201B0 ; =0x00002070
@ -14609,7 +14609,7 @@ ov08_022234A4: ; 0x022234A4
mov r0, #0
str r0, [sp, #0xc]
add r0, r5, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
add r0, r5, r4
@ -14709,7 +14709,7 @@ _02223508:
mov r1, #4
add r0, #0x40
add r2, r4, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r4, #0
bl String_Delete
ldr r0, [r5, #0x2c]
@ -14786,7 +14786,7 @@ ov08_022235D4: ; 0x022235D4
str r0, [sp, #0xc]
ldr r2, [r5, #0x18]
add r0, r4, r6
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
_02223666:
@ -14857,7 +14857,7 @@ ov08_02223678: ; 0x02223678
str r3, [sp, #0xc]
ldr r2, [r5, #0x18]
add r0, r4, r7
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
_022236FA:
@ -15007,7 +15007,7 @@ ov08_022237C4: ; 0x022237C4
add r0, r4, r0
add r3, r6, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x10]
bl String_Delete
ldr r0, [r5, #0x10]
@ -15045,7 +15045,7 @@ ov08_022237C4: ; 0x022237C4
ldr r2, [r5, #0x18]
add r0, r4, r0
add r3, r6, r7
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x14]
bl String_Delete
ldr r0, [r5, #0x10]
@ -15088,7 +15088,7 @@ ov08_022237C4: ; 0x022237C4
ldr r2, [r5, #0x18]
add r0, r4, r0
sub r3, r6, r3
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
mov r0, #0x19
@ -15252,7 +15252,7 @@ ov08_022239CC: ; 0x022239CC
str r1, [sp, #0xc]
ldr r2, [r5, #0x18]
add r0, r4, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
add r0, r4, #0
@ -15300,7 +15300,7 @@ ov08_02223A3C: ; 0x02223A3C
add r0, r4, #0
mov r3, #4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r7, #0
bl String_Delete
add r0, r4, #0

48
asm/overlay_101.s
View File

@ -2542,7 +2542,7 @@ ov101_021E8AE4: ; 0x021E8AE4
ldr r2, [r2]
add r0, r5, r0
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [r5, #0x3c]
str r0, [sp, #0x18]
mov r0, #0x81
@ -6591,7 +6591,7 @@ _021EAA40:
add r2, #0x9c
ldr r2, [r2]
mov r3, #2
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldrb r0, [r5, #0xd]
cmp r0, #0
bne _021EAA9C
@ -6643,7 +6643,7 @@ _021EAABE:
add r2, #0xa4
ldr r2, [r2]
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x1c]
cmp r0, #0
beq _021EAB48
@ -6795,7 +6795,7 @@ _021EAB5A:
add r2, #0x90
ldr r2, [r2]
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r1, [sp, #0x2c]
add r0, r5, #0
ldrh r1, [r1]
@ -6920,7 +6920,7 @@ _021EACC2:
ldr r2, [r2]
mov r1, #0
mov r3, #4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_021EAD1E:
add r6, r6, #1
add r4, #0x28
@ -7055,7 +7055,7 @@ _021EADDE:
ldr r2, [r2]
add r0, r5, r0
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r4, r5, #0
mov r2, #0x81
lsl r2, r2, #2
@ -7120,7 +7120,7 @@ ov101_021EAE54: ; 0x021EAE54
ldr r2, [r2]
add r0, r7, r0
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [r7, #0x10]
mov r1, #1
ldr r0, [r0, #0x74]
@ -7944,7 +7944,7 @@ ov101_021EB4C4: ; 0x021EB4C4
add r5, #0xa8
ldr r2, [r5]
mov r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, r4, r5, pc}
_021EB4FC:
@ -7989,7 +7989,7 @@ _021EB4FC:
add r5, #0x90
ldr r2, [r5]
mov r3, #8
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, r4, r5, pc}
.balign 4, 0
@ -14482,7 +14482,7 @@ _021EE82A:
ldr r2, [r2]
add r0, r5, r0
mov r1, #4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x1c]
mov r1, #1
add r0, #0xe8
@ -17652,7 +17652,7 @@ ov101_021F0080: ; 0x021F0080
ldr r2, [r4, #0x20]
add r0, #0x48
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, _021F00B8 ; =0x000005F3
bl PlaySE
add sp, #0x10
@ -17696,7 +17696,7 @@ _021F00DC:
ldr r2, [r4, #0x20]
add r0, #0x48
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, _021F0174 ; =0x000005DC
bl PlaySE
b _021F0162
@ -18184,7 +18184,7 @@ ov101_021F0464: ; 0x021F0464
add r0, #0x58
add r3, r1, #0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _021F0552
_021F0508:
mov r1, #0
@ -18994,7 +18994,7 @@ ov101_021F0ACC: ; 0x021F0ACC
add r0, r5, #0
ldr r2, [r4, r6]
add r0, #0x78
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _021F0B6C
_021F0B48:
add r0, #0x78
@ -21052,7 +21052,7 @@ _021F1A88:
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r3, #0x10
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
mov r0, #0xff
lsl r0, r0, #2
ldrb r1, [r4, #8]
@ -21070,7 +21070,7 @@ _021F1A88:
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r3, #0x5e
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _021F1B32
_021F1ADE:
mov r0, #0xff
@ -21092,7 +21092,7 @@ _021F1ADE:
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r3, #0x10
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
mov r0, #0xff
lsl r0, r0, #2
ldrb r1, [r4, #8]
@ -21110,7 +21110,7 @@ _021F1ADE:
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r3, #0x5e
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_021F1B32:
ldr r0, [sp, #0x30]
cmp r0, #0
@ -21983,7 +21983,7 @@ PhoneCallMessagePrint: ; 0x021F21A0
str r1, [sp, #0xc]
ldr r0, [r4, #0xc]
ldr r2, [r4, #0x54]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r4, #0x35
strb r0, [r4]
add sp, #0x10
@ -22324,7 +22324,7 @@ _021F2450:
ldr r0, [r5, #0xc]
ldr r2, [r2, #0x68]
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r4, r5, r6, pc}
_021F2472:
@ -22338,7 +22338,7 @@ _021F2472:
ldr r0, [r5, #0xc]
ldr r2, [r2, #0x74]
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r4, r5, r6, pc}
nop
@ -29756,7 +29756,7 @@ ov101_021F5C44: ; 0x021F5C44
str r1, [sp, #0xc]
ldr r0, [r4, #0x10]
ldr r2, [r4, #0x4c]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
mov r1, #0
str r1, [sp]
mov r0, #0xff
@ -29767,7 +29767,7 @@ ov101_021F5C44: ; 0x021F5C44
str r1, [sp, #0xc]
ldr r0, [r4, #0x14]
ldr r2, [r4, #0x50]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [r4, #0x10]
bl ScheduleWindowCopyToVram
ldr r0, [r4, #0x14]
@ -29806,7 +29806,7 @@ _021F5CBE:
ldr r0, [r5, #0xc]
add r2, r4, #0
add r3, r1, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r4, r5, r6, pc}
thumb_func_end PrintRadioLine

26
asm/overlay_102.s
View File

@ -3819,7 +3819,7 @@ _021E92CA:
lsl r0, r0, #2
add r0, r7, r0
add r2, r4, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r0, [sp, #0x1c]
add r6, r6, #1
add r5, #0x10
@ -6932,7 +6932,7 @@ _021EAB84:
ldr r0, [sp, #0x14]
mov r1, #1
add r3, r5, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
ldr r1, [sp, #0x20]
mov r0, #1
mov r2, #0
@ -7257,7 +7257,7 @@ ov102_021EAD98: ; 0x021EAD98
ldrsh r3, [r3, r6]
ldr r2, [r5, #0x7c]
add r0, r4, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_021EADE2:
add sp, #0x14
pop {r3, r4, r5, r6, pc}
@ -7367,7 +7367,7 @@ _021EAE68:
str r3, [sp, #0xc]
ldr r0, [r4, #0x5c]
add r2, r6, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
bl String_Delete
add r0, r5, #0
@ -7388,7 +7388,7 @@ _021EAECA:
str r3, [sp, #0xc]
ldr r0, [r4, #0x5c]
ldr r2, [r4, #0x7c]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _021EAF34
_021EAEEE:
ldr r0, [r4, #0x78]
@ -7405,7 +7405,7 @@ _021EAEEE:
str r3, [sp, #0xc]
ldr r0, [r4, #0x5c]
ldr r2, [r4, #0x7c]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
b _021EAF34
_021EAF12:
ldr r0, [r4, #0x78]
@ -7422,7 +7422,7 @@ _021EAF12:
str r3, [sp, #0xc]
ldr r0, [r4, #0x5c]
ldr r2, [r4, #0x7c]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
_021EAF34:
ldr r0, [r4, #0x5c]
bl CopyWindowToVram
@ -7994,7 +7994,7 @@ _021EB366:
add r0, r4, #0
mov r1, #4
asr r3, r7, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r6, r6, #1
add r4, #0x10
add r5, r5, #4
@ -8087,7 +8087,7 @@ _021EB3F6:
add r0, #0x44
mov r1, #4
asr r3, r4, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, r6, #0
mov r1, #0
bl ScheduleBgTilemapBufferTransfer
@ -8611,7 +8611,7 @@ _021EB7EC:
str r0, [sp, #0xc]
add r0, sp, #0x28
add r2, r5, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r0, sp, #0x28
bl PutWindowTilemap
add r0, sp, #0x28
@ -8708,7 +8708,7 @@ _021EB8FC:
add r0, sp, #0x20
mov r1, #0
add r3, r3, #3
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r5, r5, #1
cmp r5, r7
blo _021EB8D8
@ -9837,7 +9837,7 @@ ov102_021EC13C: ; 0x021EC13C
ldr r2, [r5, #0x3c]
add r0, #0x10
mul r3, r4
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
_021EC178:
@ -9859,7 +9859,7 @@ _021EC178:
add r0, r5, #0
ldr r2, [r5, #0x3c]
add r0, #0x20
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
mov r2, #0
mov r0, #1
add r1, r7, #0

4
asm/overlay_103.s
View File

@ -3510,7 +3510,7 @@ _021EE412:
add r0, r6, #0
add r2, r7, #0
add r3, r5, #0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end ov103_021EE3E4
@ -3991,7 +3991,7 @@ ov103_021EE7DC: ; 0x021EE7DC
add r2, #0x68
ldr r2, [r4, r2]
mov r1, #1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterizedWithColor
add r1, r6, #0
ldr r2, [r5, #0xc]
add r1, #0x6c

Some files were not shown because too many files have changed in this diff Show More