Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_2022…

…0909
alaxandir · Sep 13, 2022 · c68ca72 · c68ca72
2 parents de32940 + c1dfd3c
commit c68ca72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/crt0.s b/src/crt0.s
@@ -5,8 +5,7 @@
 	.arm
 
 	.align 2, 0
-	.global Init
-Init:
+Init::
 	mov r0, #PSR_IRQ_MODE
 	msr cpsr_cf, r0
 	ldr sp, sp_irq
@@ -33,8 +32,7 @@ sp_irq: .word IWRAM_END - 0x60
 
 	.arm
 	.align 2, 0
-	.global IntrMain
-IntrMain:
+IntrMain::
 	mov r3, #REG_BASE
 	add r3, r3, #OFFSET_REG_IE
 	ldr r2, [r3]

diff --git a/src/item.c b/src/item.c
@@ -15,8 +15,6 @@
 #include "constants/items.h"
 #include "constants/hold_effects.h"
 
-extern u16 gUnknown_0203CF30[];
-
 // this file's functions
 static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
 static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);

diff --git a/src/rom_header.s b/src/rom_header.s
@@ -1,19 +1,16 @@
 @ Note: ROM header data is empty space here.
 @ It's populated by gbafix using data provided in the Makefile.
 
-	.global Start
-Start:
+Start::
 	b Init
 
-	.global RomHeaderNintendoLogo
-RomHeaderNintendoLogo:
+RomHeaderNintendoLogo::
 	.space 156
 
 RomHeaderGameTitle:
 	.space 12
 
-	.global RomHeaderGameCode
-RomHeaderGameCode:
+RomHeaderGameCode::
 	.space 4
 
 RomHeaderMakerCode:
@@ -31,8 +28,7 @@ RomHeaderDeviceType:
 RomHeaderReserved1:
 	.space 7
 
-	.global RomHeaderSoftwareVersion
-RomHeaderSoftwareVersion:
+RomHeaderSoftwareVersion::
 	.byte 0
 
 RomHeaderChecksum:
@@ -43,16 +39,13 @@ RomHeaderReserved2:
 
 	.word 0
 
-	.global GPIOPortData
-GPIOPortData:
+GPIOPortData::
 	.2byte 0
 
-	.global GPIOPortDirection
-GPIOPortDirection:
+GPIOPortDirection::
 	.2byte 0
 
-	.global GPIOPortReadEnable
-GPIOPortReadEnable:
+GPIOPortReadEnable::
 	.2byte 0
 
 	.2byte 0