ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1763 from GriffinRichards/rm-global

Browse Source 
Drop usage of global directive
This commit is contained in:
GriffinR 2022-09-13 15:08:37 -04:00 committed by GitHub
commit c1dfd3c9ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crt0.s
View File

@ -5,8 +5,7 @@
.arm .arm
.align 2, 0 .align 2, 0
.global Init Init::
Init:
mov r0, #PSR_IRQ_MODE mov r0, #PSR_IRQ_MODE
msr cpsr_cf, r0 msr cpsr_cf, r0
ldr sp, sp_irq ldr sp, sp_irq
@ -33,8 +32,7 @@ sp_irq: .word IWRAM_END - 0x60
.arm .arm
.align 2, 0 .align 2, 0
.global IntrMain IntrMain::
IntrMain:
mov r3, #REG_BASE mov r3, #REG_BASE
add r3, r3, #OFFSET_REG_IE add r3, r3, #OFFSET_REG_IE
ldr r2, [r3] ldr r2, [r3]

21
src/rom_header.s
View File

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