popux/goldeneye-pc-port
1
0 Fork 0
forked from Ports/goldeneye-pc-port
Code Pull Requests Actions Activity

Update to support shifting, JP, ai macro work and more.

Browse Source
This commit is contained in:
KholdFuzion committed 2019-11-13 07:46:56 -06:00
1 parent 3516197a71
commit c09009d3f4
217 files changed
+90964 -41500
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

assets/Makefile.obseg
+1 -1
View File
@@ -1,4 +1,4 @@
BUILD_DIR := build
BUILD_DIR := build/$(COUNTRYCODE)
OBSEGMENT := obsegment.o
OBSEG_DIR := assets/obseg
assets/images/image_externs.h
+2699 -2698
View File
File diff suppressed because it is too large. Load diff
assets/music/music.s
+18 -2
View File
@@ -117,7 +117,15 @@ _musicsampletblSegmentRomEnd:
.section .musiccompressed
.global \name
\name:
.incbin "build\/assets\/music\/\name\.rz"
.ifdef VERSION_US
.incbin "build\/u\/assets\/music\/\name\.rz"
.endif
.ifdef VERSION_JP
.incbin "build\/j\/assets\/music\/\name\.rz"
.endif
.ifdef VERSION_EU
.incbin "build\/e\/assets\/music\/\name\.rz"
.endif
end_\name:
.section .musicdecompressed
@@ -135,7 +143,15 @@ music_fileA is used for the entries that end with A....the A doesn't seem to be
.section .musiccompressed
.global \name
\name:
.incbin "build\/assets\/music\/\name\.rz"
.ifdef VERSION_US
.incbin "build\/u\/assets\/music\/\name\.rz"
.endif
.ifdef VERSION_JP
.incbin "build\/j\/assets\/music\/\name\.rz"
.endif
.ifdef VERSION_EU
.incbin "build\/e\/assets\/music\/\name\.rz"
.endif
.byte 0xA
end_\name:
assets/obseg/Makefile.bg
+2 -3
View File
@@ -9,12 +9,11 @@ $(BUILD_DIR)/$(OBSEG_DIR)/bg/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/bg/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/bg/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/bg/%.o
$(LD) -T assets/obseg/bg/bg_all_p.ld -o $@
rm build/assets/obseg/bg/bg_all_p.o
$(LD) -T assets/obseg/bg/bg_all_p.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/bg/%.o: $(OBSEG_DIR)/bg/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/bg/bg_all_p.o
BG_SEG_FILES = \
assets/obseg/Makefile.brief
+3 -3
View File
@@ -9,12 +9,12 @@ $(BUILD_DIR)/$(OBSEG_DIR)/brief/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/brief/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/brief/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/brief/%.o
$(LD) -T assets/obseg/brief/Ubrief.ld -o $@
rm build/assets/obseg/brief/Ubrief.o
$(LD) -T assets/obseg/brief/Ubrief.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/brief/%.o: $(OBSEG_DIR)/brief/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/brief/Ubrief.o
BRIEF_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/brief/UbriefarchZ.rz \
assets/obseg/Makefile.chr
+1 -3
View File
@@ -9,12 +9,10 @@ $(BUILD_DIR)/$(OBSEG_DIR)/chr/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/chr/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/chr/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/chr/%.o
$(LD) -T assets/obseg/chr/Cname.ld -o $@
rm build/assets/obseg/chr/Cname.o
$(LD) -T assets/obseg/chr/Cname.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/chr/%.o: $(OBSEG_DIR)/chr/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/chr/Cname.o
CHR_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/chr/CarmourguardZ.rz \
assets/obseg/Makefile.gun
+1 -3
View File
@@ -9,12 +9,10 @@ $(BUILD_DIR)/$(OBSEG_DIR)/gun/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/gun/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/gun/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/gun/%.o
$(LD) -T assets/obseg/gun/Gname.ld -o $@
rm build/assets/obseg/gun/Gname.o
$(LD) -T assets/obseg/gun/Gname.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/gun/%.o: $(OBSEG_DIR)/gun/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/gun/Gname.o
GUN_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/gun/Gak47Z.rz \
assets/obseg/Makefile.prop
+1 -3
View File
@@ -9,12 +9,10 @@ $(BUILD_DIR)/$(OBSEG_DIR)/prop/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/prop/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/prop/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/prop/%.o
$(LD) -T assets/obseg/prop/Pname.ld -o $@
rm build/assets/obseg/prop/Pname.o
$(LD) -T assets/obseg/prop/Pname.ld -o $@ <$
$(BUILD_DIR)/$(OBSEG_DIR)/prop/%.o: $(OBSEG_DIR)/prop/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/prop/Pname.o
PROP_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/prop/Pak47magZ.rz \
assets/obseg/Makefile.setup
+4 -3
View File
@@ -1,5 +1,8 @@
#setup
$(BUILD_DIR)/$(OBSEG_DIR)/setup/%.rz: $(OBSEG_DIR)/setup/$(COUNTRYCODE)/%.bin
$(RZ_COMP) $< $@
$(BUILD_DIR)/$(OBSEG_DIR)/setup/%.rz: $(OBSEG_DIR)/setup/%.bin
$(RZ_COMP) $< $@
@@ -10,12 +13,10 @@ $(BUILD_DIR)/$(OBSEG_DIR)/setup/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/setup/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/setup/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/setup/%.o
$(LD) -T assets/obseg/setup/Usetup.ld -o $@
rm build/assets/obseg/setup/Usetup.o
$(LD) -T assets/obseg/setup/Usetup.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/setup/%.o: $(OBSEG_DIR)/setup/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/setup/Usetup.o
SETUP_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/setup/Ump_setupameZ.rz \
assets/obseg/Makefile.stan
+1 -3
View File
@@ -9,12 +9,10 @@ $(BUILD_DIR)/$(OBSEG_DIR)/stan/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/stan/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/stan/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/stan/%.o
$(LD) -T assets/obseg/stan/Tbg_name_all_p.ld -o $@
rm build/assets/obseg/stan/Tbg_name_all_p.o
$(LD) -T assets/obseg/stan/Tbg_name_all_p.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/stan/%.o: $(OBSEG_DIR)/stan/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/stan/Tbg_name_all_p.o
STAN_RZ_FILES = \
$(BUILD_DIR)/$(OBSEG_DIR)/stan/Tbg_ame_all_p_stanZ.rz \
assets/obseg/Makefile.text
+6 -3
View File
@@ -1,4 +1,7 @@
#text
$(BUILD_DIR)/$(OBSEG_DIR)/text/%.rz: $(OBSEG_DIR)/text/$(COUNTRYCODE)/%.bin
$(RZ_COMP) $< $@
$(BUILD_DIR)/$(OBSEG_DIR)/text/%.rz: $(OBSEG_DIR)/text/%.bin
$(RZ_COMP) $< $@
@@ -9,12 +12,12 @@ $(BUILD_DIR)/$(OBSEG_DIR)/text/%.bin: $(BUILD_DIR)/$(OBSEG_DIR)/text/%.elf
$(OBJCOPY) $< $@ -O binary
$(BUILD_DIR)/$(OBSEG_DIR)/text/%.elf: $(BUILD_DIR)/$(OBSEG_DIR)/text/%.o
$(LD) -T assets/obseg/text/LnameX.ld -o $@
rm build/assets/obseg/text/LnameX.o
$(LD) -T assets/obseg/text/LnameX.ld -o $@ $<
$(BUILD_DIR)/$(OBSEG_DIR)/text/%.o: $(OBSEG_DIR)/text/%.c
$(CC) -c $(CFLAGS) -o $@ -O2 $<
mv $@ build/assets/obseg/text/LnameX.o
TEXT_RZ_FILES := \
$(BUILD_DIR)/$(OBSEG_DIR)/text/LameJ.rz \
assets/obseg/bg/bg_all_p.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UbgDataStart = ADDR(.data);
_UbgDataRomStart = 0x0000;
.data 0x0F000000 : AT(0x0000) {
build/assets/obseg/bg/bg_all_p.o (.data);
* (.data);
}
_UbgDataEnd = ADDR(.data) + SIZEOF(.data);
_UbgDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/bg/bg_ame_all_p.c
+3 -1
View File
@@ -101,7 +101,9 @@ struct room_data_table_entry room_data_table[] = {
{0}
};
u32 global_visibility_commands[] ={0x10000, 0};
u32 global_visibility_commands[] ={
0x00010000, 0x00000000
};
struct portal_data_table_entry portal_data_table[] = {
{&portal_0, 1, 0x26, 0},
assets/obseg/brief/Ubrief.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UbriefDataStart = ADDR(.data);
_UbriefDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/brief/Ubrief.o (.data);
* (.data);
}
_UbriefDataEnd = ADDR(.data) + SIZEOF(.data);
_UbriefDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/chr/Cname.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UchrDataStart = ADDR(.data);
_UchrDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/chr/Cname.o (.data);
* (.data);
}
_UchrDataEnd = ADDR(.data) + SIZEOF(.data);
_UchrDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/gun/Gname.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UgunDataStart = ADDR(.data);
_UgunDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/gun/Gname.o (.data);
* (.data);
}
_UgunDataEnd = ADDR(.data) + SIZEOF(.data);
_UgunDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/ob_seg.s
+68 -167
View File
@@ -1,9 +1,18 @@
.section .ob_seg, "a"
.macro obseg_file_rz path name
.global \name
\name:
.incbin "build\/assets\/obseg\/\path\/\name\.rz"
.ifdef VERSION_US
.incbin "build\/u\/assets\/obseg\/\path\/\name\.rz"
.endif
.ifdef VERSION_JP
.incbin "build\/j\/assets\/obseg\/\path\/\name\.rz"
.endif
.ifdef VERSION_EU
.incbin "build\/e\/assets\/obseg\/\path\/\name\.rz"
.endif
.balign 16
end_\name:
.endm
@@ -11,181 +20,73 @@
.macro obseg_file_Z path name
.global \name
\name:
.incbin "build\/assets\/obseg\/\path\/\name\.rz"
.ifdef VERSION_US
.incbin "build\/u\/assets\/obseg\/\path\/\name\.rz"
.endif
.ifdef VERSION_JP
.incbin "build\/j\/assets\/obseg\/\path\/\name\.rz"
.endif
.ifdef VERSION_EU
.incbin "build\/e\/assets\/obseg\/\path\/\name\.rz"
.endif
.balign 16
end_\name:
.endm
.global bg_sev_all_p_seg
bg_sev_all_p_seg:
.incbin "build/assets/obseg/bg/bg_sev_all_p.seg"
.balign 16
bg_sev_all_p.seg_end:
.macro bg_file_seg name sname
.global \name
\name:
.global bg_silo_all_p_seg
bg_silo_all_p_seg:
.incbin "build/assets/obseg/bg/bg_silo_all_p.seg"
bg_silo_all_p.seg_end:
.ifdef VERSION_US
.incbin "build/u/assets/obseg/bg/\sname\.seg"
.endif
.ifdef VERSION_JP
.incbin "build/j/assets/obseg/bg/\sname\.seg"
.endif
.global bg_stat_all_p_seg
bg_stat_all_p_seg:
.incbin "build/assets/obseg/bg/bg_stat_all_p.seg"
bg_stat_all_p.seg_end:
.ifdef VERSION_EU
.incbin "build/e/assets/obseg/bg/\sname\.seg"
.endif
end_\name:
.endm
.global bg_arec_all_p_seg
bg_arec_all_p_seg:
.incbin "build/assets/obseg/bg/bg_arec_all_p.seg"
bg_arec_all_p.seg_end:
.global bg_arch_all_p_seg
bg_arch_all_p_seg:
.incbin "build/assets/obseg/bg/bg_arch_all_p.seg"
bg_arch_all_p.seg_end:
.global bg_tra_all_p_seg
bg_tra_all_p_seg:
.incbin "build/assets/obseg/bg/bg_tra_all_p.seg"
bg_tra_all_p.seg_end:
.global bg_dest_all_p_seg
bg_dest_all_p_seg:
.incbin "build/assets/obseg/bg/bg_dest_all_p.seg"
bg_dest_all_p.seg_end:
.global bg_sevb_all_p_seg
bg_sevb_all_p_seg:
.incbin "build/assets/obseg/bg/bg_sevb_all_p.seg"
bg_sevb_all_p.seg_end:
.global bg_azt_all_p_seg
bg_azt_all_p_seg:
.incbin "build/assets/obseg/bg/bg_azt_all_p.seg"
bg_azt_all_p.seg_end:
.global bg_pete_all_p_seg
bg_pete_all_p_seg:
.incbin "build/assets/obseg/bg/bg_pete_all_p.seg"
bg_pete_all_p.seg_end:
.global bg_depo_all_p_seg
bg_depo_all_p_seg:
.incbin "build/assets/obseg/bg/bg_depo_all_p.seg"
bg_depo_all_p.seg_end:
.global bg_ref_all_p_seg
bg_ref_all_p_seg:
.incbin "build/assets/obseg/bg/bg_ref_all_p.seg"
bg_ref_all_p.seg_end:
.global bg_cryp_all_p_seg
bg_cryp_all_p_seg:
.incbin "build/assets/obseg/bg/bg_cryp_all_p.seg"
bg_cryp_all_p.seg_end:
.global bg_dam_all_p_seg
bg_dam_all_p_seg:
.incbin "build/assets/obseg/bg/bg_dam_all_p.seg"
bg_dam_all_p.seg_end:
.global bg_ark_all_p_seg
bg_ark_all_p_seg:
.incbin "build/assets/obseg/bg/bg_ark_all_p.seg"
bg_ark_all_p.seg_end:
.global bg_run_all_p_seg
bg_run_all_p_seg:
.incbin "build/assets/obseg/bg/bg_run_all_p.seg"
bg_run_all_p.seg_end:
.global bg_sevx_all_p_seg
bg_sevx_all_p_seg:
.incbin "build/assets/obseg/bg/bg_sevx_all_p.seg"
bg_sevx_all_p.seg_end:
.global bg_jun_all_p_seg
bg_jun_all_p_seg:
.incbin "build/assets/obseg/bg/bg_jun_all_p.seg"
bg_jun_all_p.seg_end:
.global bg_dish_all_p_seg
bg_dish_all_p_seg:
.incbin "build/assets/obseg/bg/bg_dish_all_p.seg"
bg_dish_all_p.seg_end:
.global bg_cave_all_p_seg
bg_cave_all_p_seg:
.incbin "build/assets/obseg/bg/bg_cave_all_p.seg"
bg_cave_all_p.seg_end:
.global bg_cat_all_p_seg
bg_cat_all_p_seg:
.incbin "build/assets/obseg/bg/bg_cat_all_p.seg"
bg_cat_all_p.seg_end:
.global bg_crad_all_p_seg
bg_crad_all_p_seg:
.incbin "build/assets/obseg/bg/bg_crad_all_p.seg"
bg_crad_all_p.seg_end:
.global bg_imp_all_p_seg
bg_imp_all_p_seg:
.incbin "build/assets/obseg/bg/bg_imp_all_p.seg"
bg_imp_all_p.seg_end:
.global bg_ash_all_p_seg
bg_ash_all_p_seg:
.incbin "build/assets/obseg/bg/bg_ash_all_p.seg"
bg_ash_all_p.seg_end:
.global bg_sho_all_p_seg
bg_sho_all_p_seg:
.incbin "build/assets/obseg/bg/bg_sho_all_p.seg"
bg_sho_all_p.seg_end:
.global bg_ame_all_p_seg
bg_ame_all_p_seg:
.incbin "build/assets/obseg/bg/bg_ame_all_p.seg"
bg_ame_all_p.seg_end:
.global bg_oat_all_p_seg
bg_oat_all_p_seg:
.incbin "build/assets/obseg/bg/bg_oat_all_p.seg"
bg_oat_all_p.seg_end:
.global bg_rit_all_p_seg
bg_rit_all_p_seg:
.incbin "build/assets/obseg/bg/bg_rit_all_p.seg"
bg_rit_all_p.seg_end:
.global bg_len_all_p_seg
bg_len_all_p_seg:
.incbin "build/assets/obseg/bg/bg_len_all_p.seg"
bg_len_all_p.seg_end:
.global bg_lee_all_p_seg
bg_lee_all_p_seg:
.incbin "build/assets/obseg/bg/bg_lee_all_p.seg"
bg_lee_all_p.seg_end:
.global bg_ear_all_p_seg
bg_ear_all_p_seg:
.incbin "build/assets/obseg/bg/bg_ear_all_p.seg"
bg_ear_all_p.seg_end:
.global bg_lip_all_p_seg
bg_lip_all_p_seg:
.incbin "build/assets/obseg/bg/bg_lip_all_p.seg"
bg_lip_all_p.seg_end:
.global bg_pam_all_p_seg
bg_pam_all_p_seg:
.incbin "build/assets/obseg/bg/bg_pam_all_p.seg"
bg_pam_all_p.seg_end:
.global bg_wax_all_p_seg
bg_wax_all_p_seg:
.incbin "build/assets/obseg/bg/bg_wax_all_p.seg"
bg_wax_all_p.seg_end:
bg_file_seg bg_sev_all_p_seg, bg_sev_all_p
bg_file_seg bg_silo_all_p_seg, bg_silo_all_p
bg_file_seg bg_stat_all_p_seg, bg_stat_all_p
bg_file_seg bg_arec_all_p_seg, bg_arec_all_p
bg_file_seg bg_arch_all_p_seg, bg_arch_all_p
bg_file_seg bg_tra_all_p_seg, bg_tra_all_p
bg_file_seg bg_dest_all_p_seg, bg_dest_all_p
bg_file_seg bg_sevb_all_p_seg, bg_sevb_all_p
bg_file_seg bg_azt_all_p_seg, bg_azt_all_p
bg_file_seg bg_pete_all_p_seg, bg_pete_all_p
bg_file_seg bg_depo_all_p_seg, bg_depo_all_p
bg_file_seg bg_ref_all_p_seg, bg_ref_all_p
bg_file_seg bg_cryp_all_p_seg, bg_cryp_all_p
bg_file_seg bg_dam_all_p_seg, bg_dam_all_p
bg_file_seg bg_ark_all_p_seg, bg_ark_all_p
bg_file_seg bg_run_all_p_seg, bg_run_all_p
bg_file_seg bg_sevx_all_p_seg, bg_sevx_all_p
bg_file_seg bg_jun_all_p_seg, bg_jun_all_p
bg_file_seg bg_dish_all_p_seg, bg_dish_all_p
bg_file_seg bg_cave_all_p_seg, bg_cave_all_p
bg_file_seg bg_cat_all_p_seg, bg_cat_all_p
bg_file_seg bg_crad_all_p_seg, bg_crad_all_p
bg_file_seg bg_imp_all_p_seg, bg_imp_all_p
bg_file_seg bg_ash_all_p_seg, bg_ash_all_p
bg_file_seg bg_sho_all_p_seg, bg_sho_all_p
bg_file_seg bg_ame_all_p_seg, bg_ame_all_p
bg_file_seg bg_oat_all_p_seg, bg_oat_all_p
bg_file_seg bg_rit_all_p_seg, bg_rit_all_p
bg_file_seg bg_len_all_p_seg, bg_len_all_p
bg_file_seg bg_lee_all_p_seg, bg_lee_all_p
bg_file_seg bg_ear_all_p_seg, bg_ear_all_p
bg_file_seg bg_lip_all_p_seg, bg_lip_all_p
bg_file_seg bg_pam_all_p_seg, bg_pam_all_p
bg_file_seg bg_wax_all_p_seg, bg_wax_all_p
obseg_file_rz chr, CarmourguardZ
obseg_file_rz chr, CbaronsamediZ
assets/obseg/prop/Pname.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UpropDataStart = ADDR(.data);
_UpropDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/prop/Pname.o (.data);
* (.data);
}
_UpropDataEnd = ADDR(.data) + SIZEOF(.data);
_UpropDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/setup/Usetup.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UsetupDataStart = ADDR(.data);
_UsetupDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/setup/Usetup.o (.data);
* (.data);
}
_UsetupDataEnd = ADDR(.data) + SIZEOF(.data);
_UsetupDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/stan/Tbg_name_all_p_stan.ld
+1 -1
View File
@@ -6,7 +6,7 @@ SECTIONS
_UstanDataStart = ADDR(.data);
_UstanDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/stan/Tbg_name_all_p.o (.data);
* (.data);
}
_UstanDataEnd = ADDR(.data) + SIZEOF(.data);
_UstanDataRomEnd = 0x0000 + SIZEOF(.data);
assets/obseg/text/LlenE.c
+18 -2
View File
@@ -138,7 +138,23 @@ struct stringentry LlenE[] = {
"IN NINTENDOVISION\n",
"Produced by Rare\n",
"Presented by Nintendo\n",
#ifdef VERSION_US
"JAMES BOND WILL RETURN\n",
NULL,
NULL
NULL,
NULL
#endif
#ifdef VERSION_JP
"Executive Producer\n",
"Hiroshi Yamauchi\n",
"Nintendo Producer\n",
"Kenji Miki\n",
"NCL Staff\n",
"Eiji Onozuka\n",
"Masashi Goto\n",
"NCL Super Mario Club\n",
"Special Thanks to\n",
"NCL\n",
"JAMES BOND WILL RETURN\n",
#endif
};
assets/obseg/text/LmiscE.c
+3
View File
@@ -69,4 +69,7 @@ struct stringentry LmiscE[] = {
"Fast Animation",
"Slow Animation",
"No Radar [Multi]"
#ifdef VERSION_JP
,"One minute left"
#endif
};
assets/obseg/text/LnameX.ld
+2 -2
View File
@@ -6,7 +6,7 @@ SECTIONS
_LnameXDataStart = ADDR(.data);
_LnameXDataRomStart = 0x0000;
.data 0x00000000 : AT(0x0000) {
build/assets/obseg/text/LnameX.o (.data);
* (.data);
}
_LnameXDataEnd = ADDR(.data) + SIZEOF(.data);
_LnameXDataRomEnd = 0x0000 + SIZEOF(.data);
@@ -16,7 +16,7 @@ SECTIONS
_LnameXRODataStart = ADDR(.rodata);
_LnameXRODataRomStart = _LnameXDataRomEnd;
.rodata : AT(_LnameXDataRomEnd) {
build/assets/obseg/text/LnameX.o (.rodata);
* (.rodata);
}
_LnameXRODataEnd = ADDR( .rodata) + SIZEOF( .rodata);
_LnameXRODataRomEnd = _LnameXDataRomEnd + SIZEOF( .rodata);
assets/obseg/text/LtitleE.c
+19
View File
@@ -288,5 +288,24 @@ struct stringentry LtitleE[] = {
"2.4 Goodhead\n",
"Select Control Style\n",
"Control Style\n",
#ifdef VERSION_US
NULL
#endif
#ifdef VERSION_JP
"Russian Soldier\n",
"Russian Infantry\n",
"Scientist\n",
"Russian Commandant\n",
"Janus Marine\n",
"Naval Officer\n",
"Helicopter Pilot\n",
"St. Petersburg Guard\n",
"Civilian\n",
"Siberian Guard\n",
"Arctic Commando\n",
"Siberian Special Forces\n",
"Jungle Commando\n",
"Janus Special Forces\n",
"Moonraker Elite\n"
#endif
};
assets/romfiles.s
+5
View File
@@ -8,7 +8,12 @@ _jfontdlSegmentEnd:
.global _jfontcharSegmentStart
_jfontcharSegmentStart:
.ifdef VERSION_US
.incbin "assets/ge007.u.117940.jfont_chardata.bin"
.endif
.ifdef VERSION_JP
.incbin "assets/ge007.j.118660.jfont_chardata.bin"
.endif
.global _jfontcharSegmentEnd
_jfontcharSegmentEnd: