Leahnaya/Pokemon-Gen3-to-Gen-X
1
0
Fork 0
mirror of https://github.com/Lorenzooone/Pokemon-Gen3-to-Gen-X.git synced 2026-03-21 17:24:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup: Remove tab chars

Browse Source
This commit is contained in:
Lorenzooone 2023-06-02 05:01:41 +02:00
parent cbda3a3ff2
commit b2db219016
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/base_include.h
View File

@ -15,7 +15,7 @@ ALWAYS_INLINE MAX_OPTIMIZE int __get_next_vcount_interrupt(void) {
}
#define __set_next_vcount_interrupt(x) __set_next_vcount_interrupt_gba(x)
#define SCANLINE_IRQ_BIT LCDC_VCNT
#define REG_WAITCNT *(vu16*)(REG_BASE + 0x204) // Wait state Control
#define REG_WAITCNT *(vu16*)(REG_BASE + 0x204) // Wait state Control
#define SRAM_READING_VALID_WAITCYCLES 3
#define NON_SRAM_MASK 0xFFFC
#define BASE_WAITCNT_VAL 0x4314
@ -46,7 +46,7 @@ ALWAYS_INLINE MAX_OPTIMIZE int __get_next_vcount_interrupt(void) {
}
#define __set_next_vcount_interrupt(x) SetYtrigger(x)
#define SCANLINE_IRQ_BIT DISP_YTRIGGER_IRQ
#define REG_WAITCNT REG_EXMEMCNT // Wait state Control
#define REG_WAITCNT REG_EXMEMCNT // Wait state Control
#define SRAM_READING_VALID_WAITCYCLES 3
#define NON_SRAM_MASK 0xFFFC
#define EXMEMCNT_MASK_SLOT2_CLOCKRATE (3<<5)
@ -72,10 +72,10 @@ ALWAYS_INLINE MAX_OPTIMIZE int __get_next_vcount_interrupt(void) {
// Define OBJATTR struct back
typedef struct {
u16 attr0;
u16 attr1;
u16 attr2;
u16 dummy;
u16 attr0;
u16 attr1;
u16 attr2;
u16 dummy;
} ALIGN(4) OBJATTR;
// Define SWIs back

4
source/communicator.c
View File

@ -845,7 +845,7 @@ IWRAM_CODE MAX_OPTIMIZE void slave_routine(void) {
}
IWRAM_CODE MAX_OPTIMIZE void master_routine_gen3(void) {
REG_IF |= IRQ_VCOUNT;
REG_IF |= IRQ_VCOUNT;
#ifdef HAS_SIO
int data;
u8 success = 0;
@ -863,7 +863,7 @@ IWRAM_CODE MAX_OPTIMIZE void master_routine_gen3(void) {
}
IWRAM_CODE MAX_OPTIMIZE void master_routine_gen12(void) {
REG_IF |= IRQ_VCOUNT;
REG_IF |= IRQ_VCOUNT;
#ifdef HAS_SIO
int data;

10
source/main.c
View File

@ -114,18 +114,18 @@ u32 counter = 0;
u32 input_counter = 0;
IWRAM_CODE void vblank_update_function() {
REG_IF |= IRQ_VBLANK;
REG_IF |= IRQ_VBLANK;
flush_screens();
if(has_cartridge_been_removed())
crash_on_cartridge_removed();
move_sprites(counter);
move_cursor_x(counter);
advance_rng();
counter++;
// Handle trading animation
if(curr_state == TRADING_ANIMATION)
advance_trade_animation();

16
source/menu_text_handler.c
View File

@ -135,22 +135,22 @@ u32 crc32b(u8* target, size_t size)
u32 crc32b(u8* UNUSED(target), size_t UNUSED(size))
#endif
{
u32 crc = 0xffffffff;
u32 crc = 0xffffffff;
#if ENABLED_PRINT_INFO
while (size-- !=0) {
while (size-- !=0) {
#if ENABLED_LARGE_CRC_TABLE
crc = poly8_lookup[((u8) crc ^ *(target++))] ^ (crc >> 8);
#else
crc ^= *(target++);
crc = poly8_lookup[((u8) crc ^ *(target++))] ^ (crc >> 8);
#else
crc ^= *(target++);
for(int i = 0; i < 8; i++)
{
u32 t = ~((crc & 1) - 1);
crc = (crc >> 1) ^ (0xEDB88320 & t);
}
#endif
#endif
}
#endif
return (crc ^ 0xffffffff);
#endif
return (crc ^ 0xffffffff);
}
void print_game_info(struct game_data_t* game_data, int index) {

20
source/print_system.c
View File

@ -168,18 +168,18 @@ void init_numbers() {
void set_text_palettes() {
BG_PALETTE[0]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+1]=get_full_colour(FONT_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+2]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+3]=get_full_colour(WINDOW_COLOUR_1_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+4]=get_full_colour(WINDOW_COLOUR_2_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+1]=get_full_colour(FONT_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+2]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+3]=get_full_colour(WINDOW_COLOUR_1_POS);
BG_PALETTE[(PALETTE*PALETTE_SIZE)+4]=get_full_colour(WINDOW_COLOUR_2_POS);
#if defined (__NDS__) && (SAME_ON_BOTH_SCREENS)
BG_PALETTE_SUB[0]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+1]=get_full_colour(FONT_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+2]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+3]=get_full_colour(WINDOW_COLOUR_1_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+4]=get_full_colour(WINDOW_COLOUR_2_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+1]=get_full_colour(FONT_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+2]=get_full_colour(BACKGROUND_COLOUR_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+3]=get_full_colour(WINDOW_COLOUR_1_POS);
BG_PALETTE_SUB[(PALETTE*PALETTE_SIZE)+4]=get_full_colour(WINDOW_COLOUR_2_POS);
#endif
}

10
source/sio.c
View File

@ -53,11 +53,11 @@ IWRAM_CODE void sio_normal_inner_slave() {
IWRAM_CODE MAX_OPTIMIZE void sio_handle_irq_slave(int next_data) {
REG_SIOCNT |= SIO_SO_HIGH;
REG_SIODATA32 = next_data;
REG_SIODATA8 = next_data;
REG_SIOCNT &= ~(SIO_START | SIO_SO_HIGH);
REG_SIODATA32 = next_data;
REG_SIODATA8 = next_data;
REG_SIOCNT &= ~(SIO_START | SIO_SO_HIGH);
// - Set Start=1 and SO=1 (SO=HIGH indicates not ready, applied after transfer).
// (Expl. Old SO=LOW kept output until 1st clock bit received).
// (Expl. New SO=HIGH is automatically output at transfer completion).