Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrienntindall
adrienntindall authored Jul 6, 2023
2 parents 96e0efc + 4d29b63 commit e028716
Show file tree
Hide file tree
Showing 162 changed files with 1,630 additions and 1,614 deletions.
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021E5900.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.public FreeBgTilemapBuffer
.public BG_ClearCharDataRange
.public BgClearTilemapBufferAndCommit
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public sub_0201F590
.public sub_0201F63C
.public GF_CreateVramTransferManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_05.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
.public ScheduleWindowCopyToVram
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public sub_0201F988
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_100.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
.public BG_LoadBlankPltt
.public CopyToBgTilemapRect
.public BgClearTilemapBufferAndCommit
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public DoesPixelAtScreenXYMatchPtrVal
.public GF_CreateVramTransferManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_102.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
.public FillWindowPixelBufferText_AssumeTileSize32
.public BlitBitmapRectToWindow
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F988
.public MsgArray_SkipControlCode
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_103.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BlitBitmapRectToWindow
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_106.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
.public BG_ClearCharDataRange
.public BG_SetMaskColor
.public BgClearTilemapBufferAndCommit
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public sub_0201F51C
.public Draw3dModel
.public sub_0201F590
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_108.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
.public FillWindowPixelRect
.public GetWindowWidth
.public GetWindowHeight
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public DoesPixelAtScreenXYMatchPtrVal
.public Draw3dModel
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_109.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
.public ScheduleWindowCopyToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_110.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
.public ScheduleWindowCopyToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_111.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
.public GetWindowBgId
.public GetWindowX
.public GetWindowY
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public ResetAllTextPrinters
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_112.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public GetWindowWidth
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public GF_CosDeg
.public SetLCRNGSeed
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_113.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
.public ScheduleWindowCopyToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public GF_CreateVramTransferManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_121.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
.public CopyWindowToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ResetAllTextPrinters
.public AddTextPrinterParameterized2
.public GF_RunVramTransferTasks
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_022378C0.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
.public RemoveWindow
.public WindowArray_Delete
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public GetLCRNGSeed
.public SetLCRNGSeed
.public AddTextPrinterParameterized
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_14.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
.public GetWindowX
.public GetWindowY
.public GetWindowBaseTile
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_15.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
.public BlitBitmapRectToWindow
.public FillWindowPixelRect
.public GetWindowWidth
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public sub_0201F51C
.public Draw3dModel
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_17.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
.public ScheduleWindowCopyToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
.public GF_CreateVramTransferManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_18.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
.public GetWindowX
.public GetWindowY
.public GetWindowBaseTile
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_37.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
.public FillWindowPixelBuffer
.public BlitBitmapRectToWindow
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public TextPrinterCheckActive
.public sub_020200A0
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_39_thumb.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
.public AddWindowParameterized
.public RemoveWindow
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_40.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public GetWindowWidth
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public GF_CosDeg
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_41.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
.public CopyWindowToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public sub_0201F988
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_43.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BlitBitmapRectToWindow
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public TextPrinterCheckActive
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_44.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
.public BlitBitmapRectToWindow
.public FillWindowPixelRect
.public SetWindowPaletteNum
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public GF_SinDegNoWrap
.public MTRandom
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_46.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
.public ScheduleWindowCopyToVram
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_47.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
.public FillWindowPixelBuffer
.public BlitBitmapRectToWindow
.public SetWindowPaletteNum
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_48.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
.public FillWindowPixelBuffer
.public GetWindowBgConfig
.public GetWindowBaseTile
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public GF_DegreeToSinCosIdxNoWrap
.public TextPrinterCheckActive
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_49.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public SetWindowPaletteNum
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public Bind3dModelSet
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_53.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
.public CopyWindowToVram
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleSetBgPosText
.public GF_SinDeg
.public ResetAllTextPrinters
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_54.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public TextPrinterCheckActive
.public sub_020200A0
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_56.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
.public CopyWindowToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public DoesPixelAtScreenXYMatchPtrVal
.public TextPrinterCheckActive
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_57.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
.public ClearWindowTilemapAndCopyToVram
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public DoesPixelAtScreenXYMatchPtrVal
.public AddTextPrinterParameterized
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_59.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
.public ClearWindowTilemapAndCopyToVram
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public GF_DegreeToSinCosIdx
.public TextPrinterCheckActive
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_60.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
.public AddWindow
.public RemoveWindow
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public sub_0201F51C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_62.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
.public ClearWindowTilemap
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public sub_0201F988
.public GF_SinDegNoWrap
.public LCRandom
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_63.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
.public ScheduleWindowCopyToVram
.public CopyWindowPixelsToVram_TextMode
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public sub_0201F988
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_64.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
.public ScheduleWindowCopyToVram
.public CopyWindowPixelsToVram_TextMode
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public AddTextPrinterParameterized2
.public sub_020210BC
.public sub_02021148
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_65.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
.public ClearWindowTilemapAndCopyToVram
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public GF_SinDeg
.public LCRandom
.public AddTextPrinterParameterized2
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_67.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public GetWindowWidth
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public AddTextPrinterParameterized2
.public sub_02020A0C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_68.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
.public ClearWindowTilemapAndScheduleTransfer
.public FillWindowPixelBuffer
.public GetWindowWidth
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_70.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public FillWindowPixelRect
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public sub_0201F988
.public LCRandom
.public TextPrinterCheckActive
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_72.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
.public CopyWindowToVram
.public ClearWindowTilemapAndCopyToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public TextPrinterCheckActive
.public AddTextPrinterParameterized
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_73.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
.public RemoveWindow
.public CopyWindowToVram
.public FillWindowPixelBuffer
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public DoesPixelAtScreenXYMatchPtrVal
.public GF_SinDeg
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_74_thumb.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
.public GetWindowY
.public SetWindowX
.public SetWindowY
.public BgConfig_HandleScheduledScrollAndTransferOps
.public DoScheduledBgGpuUpdates
.public ScheduleBgTilemapBufferTransfer
.public ScheduleSetBgPosText
.public DoesPixelAtScreenXYMatchPtrVal
Expand Down
Loading

0 comments on commit e028716

Please sign in to comment.