Leahnaya/colosseum-mb
1
0
Fork 0
mirror of https://github.com/pret/colosseum-mb.git synced 2026-04-26 00:37:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor lib srcs into gflib, libpmagb

Browse Source
This commit is contained in:
PikalaxALT 2021-08-30 13:06:37 -04:00
parent 9ddfffd564
commit 8deb7bc476
11 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
payload/Makefile
View File

@ -42,9 +42,12 @@ OBJ_DIR := build/$(NAME)
SHELL := /bin/bash -o pipefail
ASM_SRCS := $(wildcard asm/*.s asm/gflib/*.s)
C_SUBDIRS := src src/gflib src/libpmagb
ASM_SUBDIRS := asm asm/gflib asm/libpmagb
ASM_SRCS := $(foreach subdir,$(ASM_SUBDIRS),$(wildcard $(subdir)/*.s))
ASM_OBJS := $(ASM_SRCS:%.s=$(OBJ_DIR)/%.o)
C_SRCS := $(wildcard src/*.c src/gflib/*.c)
C_SRCS := $(foreach subdir,$(C_SUBDIRS),$(wildcard $(subdir)/*.c))
C_OBJS := $(C_SRCS:%.c=$(OBJ_DIR)/%.o)
DATA_ASM_SRCS := $(wildcard data/*.s sound/*.s sound/*/*.s)
DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=$(OBJ_DIR)/%.o)
@ -63,7 +66,7 @@ CFLAGS := -O2 -g -mthumb-interwork -fhex-asm -Wimplicit -Werror
ASFLAGS := -mcpu=arm7tdmi -I include
LIBS := -L../../../tools/agbcc/lib -lgcc -lc
SUBDIRS := asm asm/gflib src src/gflib data sound sound/songs $(MID_SUBDIR)
SUBDIRS := $(ASM_SUBDIRS) $(SRC_SUBDIRS) data sound sound/songs $(MID_SUBDIR)
ALL_OBJS := $(ASM_OBJS) $(C_OBJS) $(DATA_ASM_OBJS) $(MID_ASM_OBJS)

0
payload/asm/gflib/agb_rom.s → payload/asm/libpmagb/agb_rom.s
View File

0
payload/asm/gflib/save.s → payload/asm/libpmagb/save.s
View File

1
payload/include/gflib.h
View File

@ -1,7 +1,6 @@
#ifndef GUARD_GFLIB_H
#define GUARD_GFLIB_H
#include "gflib/agb_rom.h"
#include "gflib/init.h"
#include "gflib/bg.h"
#include "gflib/keys.h"

0
payload/include/gflib/agb_rom.h → payload/include/libpmagb/agb_rom.h
View File

0
payload/include/gflib/save.h → payload/include/libpmagb/save.h
View File

10
payload/ld_script.txt
View File

@ -26,10 +26,10 @@ SECTIONS {
src/gflib/keys.o(.text);
src/gflib/gfxload.o(.text);
src/gflib/sound.o(.text);
asm/gflib/agb_rom.o(.text);
src/gflib/pic_uncomp.o(.text);
src/gflib/save.o(.text);
asm/gflib/save.o(.text);
asm/libpmagb/agb_rom.o(.text);
src/libpmagb/pic_uncomp.o(.text);
src/libpmagb/save.o(.text);
asm/libpmagb/save.o(.text);
asm/pokemon.o(.text);
asm/unk_0200C5DC.o(.text);
src/agb_flash.o(.text);
@ -83,7 +83,7 @@ SECTIONS {
lib_data :
ALIGN(4)
{
src/gflib/save.o(.data);
src/libpmagb/save.o(.data);
data/mb_020094A8.o(.data);
} =0
bss_start = .;

4
payload/src/gflib/agb_rom.c → payload/src/libpmagb/agb_rom.c
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "gflib/agb_rom.h"
#include "gflib/save.h"
#include "libpmagb/agb_rom.h"
#include "libpmagb/save.h"
u16 gSaveRngValue;
void * gSaveBlock1Ptr;

0
payload/src/gflib/pic_uncomp.c → payload/src/libpmagb/pic_uncomp.c
View File

4
payload/src/gflib/save.c → payload/src/libpmagb/save.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "gflib/types.h"
#include "gflib/save.h"
#include "gflib/agb_rom.h"
#include "libpmagb/save.h"
#include "libpmagb/agb_rom.h"
#include "gba/flash_internal.h"
#include "gflib/sound.h"

2
payload/sym_bss.txt
View File

@ -4,7 +4,7 @@
.include "asm/gflib/text.o"
.include "src/gflib/keys.o"
.include "src/gflib/sound.o"
.include "asm/gflib/save.o"
.include "asm/libpmagb/save.o"
.include "src/agb_flash.o"
.include "src/unk_200E344.o"
.include "src/siirtc.o"