dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use official names for crt0 routines

Browse Source
This commit is contained in:
PikalaxALT
2020-01-07 09:39:57 -05:00
parent ccb5c0f324
commit cdc025132e
5 changed files with 60 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/crt0.s
+49 -46
View File
@@ -1,4 +1,6 @@
.include "constants/gba_constants.inc" .include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/version.inc"
.syntax unified .syntax unified
@@ -8,8 +10,8 @@
.arm .arm
Start: @ 8000000 _start: @ 8000000
b Init b start_vector
.include "asm/rom_header.inc" .include "asm/rom_header.inc"
@@ -32,33 +34,33 @@ GPIOPortReadEnable: @ 80000C8
@ 80000D0 @ 80000D0
@ TODO: figure out what this data is .4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF @ 8000100
.4byte 0xFFFFFFFF .global CartIdent
.4byte 0xFFFFFFFF CartIdent:
.4byte 0xFFFFFFFF .4byte GAME_VERSION
.4byte 0xFFFFFFFF .4byte GAME_LANGUAGE
.4byte 0xFFFFFFFF .game_name:
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.4byte 0xFFFFFFFF
.ifdef FIRERED .ifdef FIRERED
.4byte 4
.4byte 2
.ascii "pokemon red version" .ascii "pokemon red version"
.space 13
.else .else
.ifdef LEAFGREEN .ifdef LEAFGREEN
.4byte 5
.4byte 2
.ascii "pokemon green version" .ascii "pokemon green version"
.space 11
.endif .endif
.endif .endif
.space .game_name+0x20-.
.4byte gMonFrontPicTable .4byte gMonFrontPicTable
.4byte gMonBackPicTable .4byte gMonBackPicTable
.4byte gMonPaletteTable .4byte gMonPaletteTable
@@ -118,32 +120,32 @@ GPIOPortReadEnable: @ 80000C8
.arm .arm
.align 2, 0 .align 2, 0
.global Init .global start_vector
Init: start_vector:
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
mov r0, PSR_SYS_MODE mov r0, PSR_SYS_MODE
msr cpsr_cf, r0 msr cpsr_cf, r0
ldr sp, sp_sys ldr sp, sp_usr
ldr r1, =INTR_VECTOR ldr r1, =INTR_VECTOR
adr r0, IntrMain adr r0, intr_main
str r0, [r1] str r0, [r1]
ldr r1, =AgbMain ldr r1, =AgbMain
mov lr, pc mov lr, pc
bx r1 bx r1
b Init b start_vector
.align 2, 0 .align 2, 0
sp_sys: .word IWRAM_END - 0x1C0 sp_usr: .word IWRAM_END - 0x1C0
sp_irq: .word IWRAM_END - 0x60 sp_irq: .word IWRAM_END - 0x60
.pool .pool
.arm .arm
.align 2, 0 .align 2, 0
.global IntrMain .global intr_main
IntrMain: intr_main:
mov r3, REG_BASE mov r3, REG_BASE
add r3, r3, 0x200 add r3, r3, 0x200
ldr r2, [r3, OFFSET_REG_IE - 0x200] ldr r2, [r3, OFFSET_REG_IE - 0x200]
@@ -155,50 +157,51 @@ IntrMain:
and r1, r2, r2, lsr 16 and r1, r2, r2, lsr 16
mov r12, 0 mov r12, 0
ands r0, r1, INTR_FLAG_VCOUNT ands r0, r1, INTR_FLAG_VCOUNT
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
mov r0, 0x1 mov r0, 0x1
strh r0, [r3, OFFSET_REG_IME - 0x200] strh r0, [r3, OFFSET_REG_IME - 0x200]
ands r0, r1, INTR_FLAG_SERIAL ands r0, r1, INTR_FLAG_SERIAL
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER3 ands r0, r1, INTR_FLAG_TIMER3
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_HBLANK ands r0, r1, INTR_FLAG_HBLANK
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_VBLANK ands r0, r1, INTR_FLAG_VBLANK
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER0 ands r0, r1, INTR_FLAG_TIMER0
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER1 ands r0, r1, INTR_FLAG_TIMER1
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER2 ands r0, r1, INTR_FLAG_TIMER2
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA0 ands r0, r1, INTR_FLAG_DMA0
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA1 ands r0, r1, INTR_FLAG_DMA1
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA2 ands r0, r1, INTR_FLAG_DMA2
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA3 ands r0, r1, INTR_FLAG_DMA3
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_KEYPAD ands r0, r1, INTR_FLAG_KEYPAD
bne IntrMain_FoundIntr bne jump_intr
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_GAMEPAK ands r0, r1, INTR_FLAG_GAMEPAK
strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200]
bne . @ spin loop:
IntrMain_FoundIntr: bne loop @ spin
jump_intr:
strh r0, [r3, OFFSET_REG_IF - 0x200] strh r0, [r3, OFFSET_REG_IF - 0x200]
bic r2, r2, r0 bic r2, r2, r0
ldr r0, =gRfuState ldr r0, =gRfuState
@@ -218,9 +221,9 @@ IntrMain_FoundIntr:
add r1, r1, r12 add r1, r1, r12
ldr r0, [r1] ldr r0, [r1]
stmdb sp!, {lr} stmdb sp!, {lr}
adr lr, IntrMain_RetAddr adr lr, intr_return
bx r0 bx r0
IntrMain_RetAddr: intr_return:
ldmia sp!, {lr} ldmia sp!, {lr}
mrs r3, cpsr mrs r3, cpsr
bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
berry_fix/payload/asm/crt0.s
+4 -4
View File
@@ -16,7 +16,7 @@ Init:
msr cpsr_cf, r0 msr cpsr_cf, r0
ldr sp, sp_sys ldr sp, sp_sys
ldr r1, =INTR_VECTOR ldr r1, =INTR_VECTOR
ldr r0, =IntrMain ldr r0, =intr_main
str r0, [r1] str r0, [r1]
ldr r1, =AgbMain + 1 ldr r1, =AgbMain + 1
mov lr, pc mov lr, pc
@@ -32,8 +32,8 @@ sp_irq: .word IWRAM_END - 0x60
.arm .arm
.align 2, 0 .align 2, 0
.global IntrMain .global intr_main
IntrMain: @ 0x2010048 intr_main: @ 0x2010048
mov ip, REG_BASE mov ip, REG_BASE
add r3, ip, OFFSET_REG_IE add r3, ip, OFFSET_REG_IE
ldr r2, [r3] ldr r2, [r3]
@@ -79,4 +79,4 @@ _020100DC:
ldr r0, [r1] ldr r0, [r1]
bx r0 bx r0
.pool .pool
.size IntrMain, .-IntrMain .size intr_main, .-intr_main
berry_fix/payload/src/main.c
+2 -2
View File
@@ -17,7 +17,7 @@ u32 gGameVersion;
EWRAM_DATA u8 gSharedMem[0x8000] = {}; EWRAM_DATA u8 gSharedMem[0x8000] = {};
void IntrMain(void); void intr_main(void);
void ReadKeys(void); void ReadKeys(void);
void dummy_intr_0(void); void dummy_intr_0(void);
void dummy_intr_1(void); void dummy_intr_1(void);
@@ -62,7 +62,7 @@ void AgbMain(void)
{ {
RegisterRamReset(0x1E); RegisterRamReset(0x1E);
DmaCopy32(3, gIntrFuncPointers, gIntrTable, sizeof gIntrFuncPointers); DmaCopy32(3, gIntrFuncPointers, gIntrTable, sizeof gIntrFuncPointers);
DmaCopy32(3, IntrMain, gIntrVector, sizeof(gIntrVector)); DmaCopy32(3, intr_main, gIntrVector, sizeof(gIntrVector));
INTR_VECTOR = gIntrVector; INTR_VECTOR = gIntrVector;
REG_IE = INTR_FLAG_VBLANK; REG_IE = INTR_FLAG_VBLANK;
if (*RomHeaderMagic == 0x96 && *(u32 *)RomHeaderGameCode == *(u32 *)gBerryFixGameCode) if (*RomHeaderMagic == 0x96 && *(u32 *)RomHeaderGameCode == *(u32 *)gBerryFixGameCode)
constants/version.inc
+3 -89
View File
@@ -1,91 +1,5 @@
.ifdef SAPPHIRE .ifdef FIRERED
.equiv GAME_VERSION, 1 .equiv GAME_VERSION, 4
.else .else
.equiv GAME_VERSION, 2 .equiv GAME_VERSION, 5
.endif
.ifdef SAPPHIRE
.set BGM_EVIL_TEAM, BGM_AQA_0
.set BGM_GOOD_TEAM, BGM_MGM0
.else
.set BGM_EVIL_TEAM, BGM_MGM0
.set BGM_GOOD_TEAM, BGM_AQA_0
.endc
.ifdef SAPPHIRE
.set ITEM_RED_OR_BLUE_ORB, ITEM_BLUE_ORB
.else
.set ITEM_RED_OR_BLUE_ORB, ITEM_RED_ORB
.endif
.ifdef SAPPHIRE
.set SPECIES_GROUDON_OR_KYOGRE, SPECIES_KYOGRE
.else
.set SPECIES_GROUDON_OR_KYOGRE, SPECIES_GROUDON
.endif
.ifdef SAPPHIRE
.set SPECIES_LATIAS_OR_LATIOS, SPECIES_LATIOS
.else
.set SPECIES_LATIAS_OR_LATIOS, SPECIES_LATIAS
.endif
.ifdef SAPPHIRE
.set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_9
.set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_15
.set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_19
.set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_20
.set OPPONENT_514, OPPONENT_HECTOR_1
.set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_MATT_2
.set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_13
.set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_1
.set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_2
.set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_3
.set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_26
.set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_MATT_1
.set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_4
.set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_27
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_5
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_6
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_SHELLY_2
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_7
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_ARCHIE_2
.set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_ARCHIE_3
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_22
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_23
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_24
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_16
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_25
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_17
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_18
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_SHELLY_1
.else
.set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_36
.set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_42
.set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_46
.set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_47
.set OPPONENT_514, OPPONENT_HECTOR_2
.set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_TABITHA_2
.set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_40
.set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_28
.set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_29
.set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_30
.set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_53
.set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_TABITHA_1
.set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_31
.set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_54
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_32
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_33
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_COURTNEY_2
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_34
.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_MAXIE_2
.set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_MAXIE_3
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_49
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_50
.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_51
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_43
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_52
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_44
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_45
.set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_COURTNEY_1
.endif .endif
src/main.c
+2 -2
View File
@@ -36,7 +36,7 @@ extern bool32 sub_80F5118(void);
extern struct SoundInfo gSoundInfo; extern struct SoundInfo gSoundInfo;
extern u32 gFlashMemoryPresent; extern u32 gFlashMemoryPresent;
extern u32 IntrMain[]; extern u32 intr_main[];
extern u8 gHeap[]; extern u8 gHeap[];
extern struct SaveBlock1 gSaveBlock1; extern struct SaveBlock1 gSaveBlock1;
extern struct SaveBlock2 gSaveBlock2; extern struct SaveBlock2 gSaveBlock2;
@@ -313,7 +313,7 @@ void InitIntrHandlers(void)
for (i = 0; i < INTR_COUNT; i++) for (i = 0; i < INTR_COUNT; i++)
gIntrTable[i] = gIntrTableTemplate[i]; gIntrTable[i] = gIntrTableTemplate[i];
DmaCopy32(3, IntrMain, IntrMain_Buffer, sizeof(IntrMain_Buffer)); DmaCopy32(3, intr_main, IntrMain_Buffer, sizeof(IntrMain_Buffer));
INTR_VECTOR = IntrMain_Buffer; INTR_VECTOR = IntrMain_Buffer;