Merge pull request #350 from pret/revert-320-mic-test

Revert "Mic Test Overlay"

.githooks/pre-commit

@@ -1,9 +1,9 @@
-#!/bin/sh
-# Redirect output to stderr.
-exec 1>&2
-
-# Run clang-format on staged files; abort the commit if any files are changed
-if ! git clang-format --extensions c,cpp,h,hpp ; then
-    echo "linting made changes to source files; aborting commit"
-    exit 1
-fi
+#!/bin/sh
+# Redirect output to stderr.
+exec 1>&2
+
+# Run clang-format on staged files; abort the commit if any files are changed
+if ! git clang-format --extensions c,cpp,h,hpp ; then
+    echo "linting made changes to source files; aborting commit"
+    exit 1
+fi

.github/calcrom/webhook.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
-# Only run this script if it's the main branch build.
-if [[ "$GITHUB_REF" != "refs/heads/main" || "$GITHUB_EVENT_NAME" != "push" ]]; then
+# Only run this script if it's the master branch build.
+if [[ "$GITHUB_REF" != "refs/heads/master" || "$GITHUB_EVENT_NAME" != "push" ]]; then
   exit 0
 fi
 

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
   workflow_dispatch:
 
@@ -113,3 +113,4 @@ jobs:
           cwd: "./xmap"
           add: "*.xMAP"
           message: ${{ env.XMAP_COMMIT_MSG }}
+

CONTRIBUTING.md

@@ -12,7 +12,7 @@ This repository includes an opinionated `clang-format` specification to ensure t
 
 ### Requirements
 
-- `clang-format@18` or newer
+- `clang-format@17` or newer
 
 ### Usage
 
@@ -47,23 +47,3 @@ asm void func() {
 // clang-format on
 #endif // NONMATCHING
 ```
-
-### Ubuntu (WSL) Installation
-
-On older versions of Ubuntu, clang-format will default to earlier versions.
-To install clang-format-18 on Ubuntu (WSL), run the following:
-```sh
-wget https://apt.llvm.org/llvm.sh
-chmod +x llvm.sh
-sudo ./llvm.sh 18
-sudo apt install clang-format-18
-```
-And then create a symbolic link:
-```sh
-ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
-```
-
-If you're using the pre-commit hook, you also want to set up a symlink for git:
-```sh
-git config alias.clang-format clang-format-18
-```

asm/include/overlay_62.inc

@@ -0,0 +1,96 @@
+#include <nitro/fs/overlay.h>
+#pragma once
+.public RegisterMainOverlay
+.public FontID_Alloc
+.public FontID_Release
+.public sub_02005518
+.public GF_MIC_StartAutoSampling
+.public GF_MIC_StopAutoSampling
+.public GF_SndStartFadeOutBGM
+.public PlaySE
+.public OverlayManager_CreateAndGetData
+.public OverlayManager_GetData
+.public OverlayManager_FreeData
+.public GfGfxLoader_LoadCharData
+.public GfGfxLoader_LoadScrnData
+.public GfGfxLoader_GXLoadPal
+.public sub_0200B2E0
+.public sub_0200B2E8
+.public NewMsgDataFromNarc
+.public DestroyMsgData
+.public NewString_ReadMsgData
+.public SpriteRenderer_Create
+.public SpriteRenderer_CreateGfxHandler
+.public SpriteRenderer_CreateOamCharPlttManagers
+.public SpriteRenderer_CreateSpriteList
+.public SpriteGfxHandler_RenderAndAnimateSprites
+.public thunk_OamManager_ApplyAndResetBuffers
+.public SpriteRenderer_Delete
+.public SpriteRenderer_Init2DGfxResManagersFromCountsArray
+.public SpriteRenderer_LoadCharResObjFromNarcId
+.public SpriteRenderer_LoadPlttResObjFromNarcId
+.public SpriteRenderer_LoadCellResObjFromNarcId
+.public SpriteRenderer_LoadAnimResObjFromNarcId
+.public SpriteRenderer_LoadResourcesAndCreateSprite
+.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
+.public UnkImageStruct_Delete
+.public UnkImageStruct_TickSpriteAnimation1Frame
+.public UnkImageStruct_SetSpriteAnimSeqNo
+.public UnkImageStruct_SetSpriteAnimActiveFlag
+.public sub_0200DCA0
+.public UnkImageStruct_SetSpriteVisibleFlag
+.public UnkImageStruct_SetSpritePriority
+.public UnkImageStruct_SetSpritePositionXY
+.public sub_0200E0C0
+.public SysTask_CreateOnMainQueue
+.public SysTask_Destroy
+.public BeginNormalPaletteFade
+.public IsPaletteFadeFinished
+.public sub_0200FBDC
+.public Main_SetVBlankIntrCB
+.public HBlankInterruptDisable
+.public Sys_SetSleepDisableFlag
+.public Sys_ClearSleepDisableFlag
+.public CreateHeap
+.public DestroyHeap
+.public AllocFromHeap
+.public FreeToHeap
+.public BgConfig_Alloc
+.public SetBothScreensModesAndDisable
+.public InitBgFromTemplate
+.public FreeBgTilemapBuffer
+.public BG_ClearCharDataRange
+.public BgClearTilemapBufferAndCommit
+.public AddWindowParameterized
+.public RemoveWindow
+.public CopyWindowToVram
+.public ClearWindowTilemap
+.public ClearWindowTilemapAndCopyToVram
+.public FillWindowPixelBuffer
+.public DoScheduledBgGpuUpdates
+.public SysTask_GetData
+.public GF_SinDegNoWrap
+.public LCRandom
+.public AddTextPrinterParameterizedWithColor
+.public GF_CreateVramTransferManager
+.public GF_DestroyVramTransferManager
+.public GfGfx_SetBanks
+.public GfGfx_DisableEngineAPlanes
+.public GfGfx_EngineATogglePlanes
+.public GfGfx_DisableEngineBPlanes
+.public GfGfx_EngineBTogglePlanes
+.public TouchscreenHitbox_FindRectAtTouchNew
+.public GF_AssertFail
+.public String_Delete
+.public NNS_GfdDoVramTransfer
+.public VEC_Add
+.public MI_CpuFill8
+.public _fadd
+.public _ffix
+.public _fflt
+.public _fsub
+.public _ll_mul
+.public _s32_div_f
+.public gSystem
+.public gApplication_TitleScreen
+.public gApplication_MicTest