Merge pull request #134 from red031000/master

rename all instances of GF_Camera to Camera
pret · May 16, 2023 · 615228b · 615228b
2 parents 31b57cf + 058dc7a
commit 615228b
Show file tree

Hide file tree

Showing 260 changed files with 1,697 additions and 1,649 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
+  workflow_dispatch:
 
 env:
   LM_LICENSE_FILE: "$GITHUB_WORKSPACE/tools/mwccarm/license.dat"
@@ -21,15 +22,20 @@ jobs:
     steps:
       - name: Update and Install Software
         run: |
-          sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev
+          sudo apt update
+          sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade
+          sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge
+          sudo ppa-purge -y ppa:ubuntu-toolchain-r/test
           sudo dpkg --add-architecture i386
-          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
+          sudo mkdir -pm755 /etc/apt/keyrings
+          sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
           sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
-          sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
+          sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources
+          sudo apt update
           sudo apt -y --allow-downgrades install --install-recommends winehq-stable
 
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Repo
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required (VERSION 3.15)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
+project(PokeHeartGold)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 11)
+
+enable_language(ASM)
+
+if(APPLE)
+    include_directories(/usr/local/include)
+endif(APPLE)
+
+add_compile_options(-fms-extensions)
+
+file(GLOB_RECURSE SOURCES "*.c" "*.cpp" "*.s")
+
+add_executable(PokeHeartGold ${SOURCES})
+target_include_directories(PokeHeartGold PRIVATE include files lib/include lib/include/cw lib/include/nitro lib/include/nnsys lib/include/nitro/os)
+target_compile_definitions(PokeHeartGold PUBLIC __CLION_IDE__)
diff --git a/asm/field_take_photo.s b/asm/field_take_photo.s
@@ -1091,14 +1091,14 @@ sub_0206AFD0: ; 0x0206AFD0
 	ldr r0, _0206B008 ; =_021100C4
 	add r1, r4, #0
 	ldr r0, [r0]
-	bl GF_Camera_SetDistance
+	bl Camera_SetDistance
 	ldr r0, _0206B00C ; =_021100C4 + 4
 	add r1, r4, #0
-	bl GF_Camera_SetAngle
+	bl Camera_SetAngle
 	ldr r0, _0206B008 ; =_021100C4
 	add r1, r4, #0
 	ldrh r0, [r0, #0xe]
-	bl GF_Camera_SetPerspectiveAngle
+	bl Camera_SetPerspectiveAngle
 	ldr r0, _0206B008 ; =_021100C4
 	add r1, r4, #0
 	ldrh r0, [r0, #0xc]
@@ -1107,7 +1107,7 @@ sub_0206AFD0: ; 0x0206AFD0
 	bl sub_020233D8
 	ldr r0, _0206B010 ; =_021100C4 + 24
 	add r1, r4, #0
-	bl GF_Camera_ShiftBy
+	bl Camera_ShiftBy
 	pop {r4, pc}
 	.balign 4, 0
 _0206B008: .word _021100C4

diff --git a/asm/include/field_take_photo.inc b/asm/include/field_take_photo.inc
@@ -17,10 +17,10 @@
 .public SetBgPriority
 .public BgCommitTilemapBufferToVram
 .public sub_020233D8
-.public GF_Camera_SetPerspectiveAngle
-.public GF_Camera_ShiftBy
-.public GF_Camera_SetAngle
-.public GF_Camera_SetDistance
+.public Camera_SetPerspectiveAngle
+.public Camera_ShiftBy
+.public Camera_SetAngle
+.public Camera_SetDistance
 .public GF_AssertFail
 .public Sav2_PlayerData_GetProfileAddr
 .public PlayerProfile_GetNamePtr

diff --git a/asm/include/overlay_01_021E5900.inc b/asm/include/overlay_01_021E5900.inc
@@ -41,7 +41,7 @@
 .public GX_BothDispOn
 .public GX_SwapDisplay
 .public sub_02023154
-.public GF_Camera_GetAngle
+.public Camera_GetAngle
 .public sub_02023738
 .public sub_02023778
 .public sub_020237B0

diff --git a/asm/include/overlay_01_021E90C0.inc b/asm/include/overlay_01_021E90C0.inc
@@ -18,9 +18,9 @@
 .public Ascii_GetDelim
 .public Ascii_StrToL
 .public sub_02023234
-.public GF_Camera_SetClipBounds
+.public Camera_SetClipBounds
 .public sub_020234D0
-.public GF_Camera_GetPerspectiveAngle
+.public Camera_GetPerspectiveAngle
 .public GF_AssertFail
 .public sub_0203B58C
 .public TaskManager_Call

diff --git a/asm/include/overlay_01_021EABA8.inc b/asm/include/overlay_01_021EABA8.inc
@@ -4,14 +4,14 @@
 .public FreeToHeap
 .public sub_02023068
 .public sub_020230F8
-.public GF_Camera_Create
+.public Camera_Create
 .public sub_02023120
-.public GF_Camera_RegisterToStaticPtr
+.public Camera_RegisterToStaticPtr
 .public sub_02023148
-.public GF_Camera_SetClipBounds
-.public GF_Camera_InitFromTargetDistanceAndAngle
-.public GF_Camera_ShiftBy
-.public GF_Camera_SetAngle
+.public Camera_SetClipBounds
+.public Camera_InitFromTargetDistanceAndAngle
+.public Camera_ShiftBy
+.public Camera_SetAngle
 .public GF_AssertFail
 .public MI_CpuFill8
 .public _s32_div_f

diff --git a/asm/include/overlay_01_021EB1E8.inc b/asm/include/overlay_01_021EB1E8.inc
@@ -45,8 +45,8 @@
 .public MTRandom
 .public sub_02020E10
 .public GX_EngineAToggleLayers
-.public GF_Camera_GetPerspectiveAngle
-.public GF_Camera_GetDistance
+.public Camera_GetPerspectiveAngle
+.public Camera_GetDistance
 .public SpriteList_Create
 .public sub_02024504
 .public sub_0202457C

diff --git a/asm/include/overlay_01_021EDAFC.inc b/asm/include/overlay_01_021EDAFC.inc
@@ -17,8 +17,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferIntegerAsString
 .public StringExpandPlaceholders
 .public CreateSysTask

diff --git a/asm/include/overlay_01_021EFB38.inc b/asm/include/overlay_01_021EFB38.inc
@@ -62,7 +62,7 @@
 .public sub_0201F988
 .public GX_SetBanks
 .public GX_EngineAToggleLayers
-.public GF_Camera_SetClipBounds
+.public Camera_SetClipBounds
 .public sub_02024504
 .public sub_02024714
 .public GF_AssertFail

diff --git a/asm/include/overlay_01_021F3F50.inc b/asm/include/overlay_01_021F3F50.inc
@@ -9,8 +9,8 @@
 .public DestroyMsgData
 .public NewString_ReadMsgData
 .public ReadMsgData_ExpandPlaceholders
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferPlayersName
 .public BufferIntegerAsString
 .public BufferLandmarkName

diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc
@@ -3,8 +3,8 @@
 .public NewMsgDataFromNarc
 .public DestroyMsgData
 .public ReadMsgDataIntoString
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferPlayersName
 .public StringExpandPlaceholders
 .public LoadUserFrameGfx1

diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc
@@ -4,8 +4,8 @@
 .public NewMsgDataFromNarc
 .public DestroyMsgData
 .public ReadMsgDataIntoString
-.public ScrStrBufs_new_custom
-.public ScrStrBufs_delete
+.public MessageFormat_new_custom
+.public MessageFormat_delete
 .public StringExpandPlaceholders
 .public CreateSysTask
 .public DestroySysTask

diff --git a/asm/include/overlay_01_021FCD2C.inc b/asm/include/overlay_01_021FCD2C.inc
@@ -5,8 +5,8 @@
 .public AllocFromHeapAtEnd
 .public FreeToHeap
 .public sub_0201F988
-.public GF_Camera_SetDistance
-.public GF_Camera_GetDistance
+.public Camera_SetDistance
+.public Camera_GetDistance
 .public memset
 .public _s32_div_f
 .public ov01_021FCD2C

diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -45,8 +45,8 @@
 .public NewMsgDataFromNarc
 .public DestroyMsgData
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferPlayersName
 .public BufferBoxMonSpeciesName
 .public BufferBoxMonNickname
@@ -107,25 +107,25 @@
 .public MTRandom
 .public AddTextPrinterParameterized2
 .public GX_EngineAToggleLayers
-.public GF_Camera_Create
+.public Camera_Create
 .public sub_02023120
 .public sub_02023128
-.public GF_Camera_RegisterToStaticPtr
-.public GF_Camera_SetBindTarget
+.public Camera_RegisterToStaticPtr
+.public Camera_SetBindTarget
 .public sub_02023214
-.public GF_Camera_SetClipBounds
-.public GF_Camera_SetPerspectiveAngle
-.public GF_Camera_ShiftBy
-.public GF_Camera_SetAngle
-.public GF_Camera_SetDistance
-.public GF_Camera_GetPerspectiveAngle
-.public GF_Camera_GetDistance
-.public GF_Camera_GetAngle
-.public GF_Camera_GetTarget
+.public Camera_SetClipBounds
+.public Camera_SetPerspectiveAngle
+.public Camera_ShiftBy
+.public Camera_SetAngle
+.public Camera_SetDistance
+.public Camera_GetPerspectiveAngle
+.public Camera_GetDistance
+.public Camera_GetAngle
+.public Camera_GetTarget
 .public sub_02023640
 .public sub_02023650
 .public sub_02023654
-.public GF_Camera_GetBindTarget
+.public Camera_GetBindTarget
 .public sub_0202365C
 .public sub_0202366C
 .public sub_02023E78

diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc
@@ -24,9 +24,9 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_new_custom
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_new_custom
+.public MessageFormat_delete
 .public BufferString
 .public BufferPlayersName
 .public BufferIntegerAsString
@@ -74,10 +74,10 @@
 .public GX_EngineASetLayers
 .public GX_EngineBToggleLayers
 .public GX_EngineAGetLayers
-.public GF_Camera_Create
+.public Camera_Create
 .public sub_02023120
 .public sub_02023128
-.public GF_Camera_RegisterToStaticPtr
+.public Camera_RegisterToStaticPtr
 .public sub_0202457C
 .public Sprite_Delete
 .public sub_020247D4

diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc
@@ -13,10 +13,10 @@
 .public AllocFromHeapAtEnd
 .public FreeToHeap
 .public GF_ExpHeap_FndInitAllocator
-.public GF_Camera_ShiftBy
-.public GF_Camera_GetPerspectiveAngle
-.public GF_Camera_GetDistance
-.public GF_Camera_GetAngle
+.public Camera_ShiftBy
+.public Camera_GetPerspectiveAngle
+.public Camera_GetDistance
+.public Camera_GetAngle
 .public sub_02023F90
 .public GF_AssertFail
 .public Sav2_GetGymmickPtr

diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc
@@ -25,8 +25,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferBoxMonNickname
 .public StringExpandPlaceholders
 .public MessagePrinter_new
@@ -120,7 +120,7 @@
 .public GX_DisableEngineALayers
 .public GX_EngineAToggleLayers
 .public GX_DisableEngineBLayers
-.public GF_Camera_SetClipBounds
+.public Camera_SetClipBounds
 .public sub_020249B0
 .public GF_AssertFail
 .public String_ctor

diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc
@@ -147,8 +147,8 @@
 .public LCRandom
 .public GF_CreateNewVramTransferTask
 .public sub_02022808
-.public GF_Camera_SetAngle
-.public GF_Camera_GetAngle
+.public Camera_SetAngle
+.public Camera_GetAngle
 .public sub_0202365C
 .public sub_02024B1C
 .public sub_02024B34

diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc
@@ -23,8 +23,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferPlayersName
 .public BufferBoxMonNickname
 .public BufferIntegerAsString

diff --git a/asm/include/overlay_101.inc b/asm/include/overlay_101.inc
@@ -42,8 +42,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new_custom
-.public ScrStrBufs_delete
+.public MessageFormat_new_custom
+.public MessageFormat_delete
 .public BufferString
 .public BufferPlayersName
 .public BufferSpeciesName

diff --git a/asm/include/overlay_102.inc b/asm/include/overlay_102.inc
@@ -31,8 +31,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new_custom
-.public ScrStrBufs_delete
+.public MessageFormat_new_custom
+.public MessageFormat_delete
 .public BufferPocketName
 .public StringExpandPlaceholders
 .public sub_0200DD88

diff --git a/asm/include/overlay_103.inc b/asm/include/overlay_103.inc
@@ -25,8 +25,8 @@
 .public DestroyMsgData
 .public ReadMsgDataIntoString
 .public NewString_ReadMsgData
-.public ScrStrBufs_new
-.public ScrStrBufs_delete
+.public MessageFormat_new
+.public MessageFormat_delete
 .public BufferString
 .public BufferIntegerAsString
 .public StringExpandPlaceholders

diff --git a/asm/include/overlay_104.inc b/asm/include/overlay_104.inc
@@ -25,13 +25,13 @@
 .public GX_DisableEngineALayers
 .public GX_DisableEngineBLayers
 .public GX_SwapDisplay
-.public GF_Camera_Create
+.public Camera_Create
 .public sub_02023120
-.public GF_Camera_RegisterToStaticPtr
+.public Camera_RegisterToStaticPtr
 .public sub_02023154
-.public GF_Camera_SetClipBounds
-.public GF_Camera_InitFromTargetDistanceAndAngle
-.public GF_Camera_ShiftBy
+.public Camera_SetClipBounds
+.public Camera_InitFromTargetDistanceAndAngle
+.public Camera_ShiftBy
 .public Thunk_G3X_Reset
 .public sub_02026E50
 .public sub_020880CC