diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-08 19:35:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 19:35:48 -0500 |
| commit | 7e2330e7fd01f5eebb7fdeb157d3dd29b4da3f0f (patch) | |
| tree | 8e197c66593ace92b61cebf95ca67fb2592aa6f1 /berry_fix/payload | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
| parent | 4e87e3567f91b0b2ebf792a7a2f9030a63578dfd (diff) | |
Merge pull request #206 from PikalaxALT/region_map
Region map
Diffstat (limited to 'berry_fix/payload')
| -rw-r--r-- | berry_fix/payload/asm/crt0.s | 8 | ||||
| -rw-r--r-- | berry_fix/payload/src/main.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/berry_fix/payload/asm/crt0.s b/berry_fix/payload/asm/crt0.s index edbb83328..9a0e75c77 100644 --- a/berry_fix/payload/asm/crt0.s +++ b/berry_fix/payload/asm/crt0.s @@ -16,7 +16,7 @@ Init: msr cpsr_cf, r0 ldr sp, sp_sys ldr r1, =INTR_VECTOR - ldr r0, =IntrMain + ldr r0, =intr_main str r0, [r1] ldr r1, =AgbMain + 1 mov lr, pc @@ -32,8 +32,8 @@ sp_irq: .word IWRAM_END - 0x60 .arm .align 2, 0 - .global IntrMain -IntrMain: @ 0x2010048 + .global intr_main +intr_main: @ 0x2010048 mov ip, REG_BASE add r3, ip, OFFSET_REG_IE ldr r2, [r3] @@ -79,4 +79,4 @@ _020100DC: ldr r0, [r1] bx r0 .pool - .size IntrMain, .-IntrMain + .size intr_main, .-intr_main diff --git a/berry_fix/payload/src/main.c b/berry_fix/payload/src/main.c index 325d3830e..a017e8f69 100644 --- a/berry_fix/payload/src/main.c +++ b/berry_fix/payload/src/main.c @@ -17,7 +17,7 @@ u32 gGameVersion; EWRAM_DATA u8 gSharedMem[0x8000] = {}; -void IntrMain(void); +void intr_main(void); void ReadKeys(void); void dummy_intr_0(void); void dummy_intr_1(void); @@ -62,7 +62,7 @@ void AgbMain(void) { RegisterRamReset(0x1E); DmaCopy32(3, gIntrFuncPointers, gIntrTable, sizeof gIntrFuncPointers); - DmaCopy32(3, IntrMain, gIntrVector, sizeof(gIntrVector)); + DmaCopy32(3, intr_main, gIntrVector, sizeof(gIntrVector)); INTR_VECTOR = gIntrVector; REG_IE = INTR_FLAG_VBLANK; if (*RomHeaderMagic == 0x96 && *(u32 *)RomHeaderGameCode == *(u32 *)gBerryFixGameCode) |