mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 16:30:19 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Match z_file_copy_erase (#2447)

Browse source 
* [iQue] Match z_file_copy_erase

* Reword comment
This commit is contained in:
cadmic 2025-01-29 11:17:13 -08:00 • committed by GitHub
parent dfe232533f
commit ef53bfd693
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 803 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -585,7 +585,7 @@ EGCS_O_FILES += $(BUILD_DIR)/src/code/z_sram.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_En_Mag/z_en_mag.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_En_Mag/z_en_mag.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_End_Title/z_end_title.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_End_Title/z_end_title.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_Fishing/z_fishing.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_Fishing/z_fishing.o
# EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_opening/z_opening.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_opening/z_opening.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_title/z_title.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/gamestates/ovl_title/z_title.o
EGCS_O_FILES += $(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.o EGCS_O_FILES += $(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.o

4
baseroms/ique-cn/config.yml
View file

@ -928,8 +928,8 @@ assets:
end_offset: 0x59D0 end_offset: 0x59D0
- name: overlays/ovl_file_choose - name: overlays/ovl_file_choose
xml_path: assets/xml/overlays/ovl_file_choose.xml xml_path: assets/xml/overlays/ovl_file_choose.xml
start_offset: 0xEC40 start_offset: 0xF6E0
end_offset: 0xF320 end_offset: 0xFDC0
- name: overlays/ovl_Magic_Dark - name: overlays/ovl_Magic_Dark
xml_path: assets/xml/overlays/ovl_Magic_Dark.xml xml_path: assets/xml/overlays/ovl_Magic_Dark.xml
start_offset: 0xC90 start_offset: 0xC90

2
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -1140,7 +1140,7 @@ static s16 sQuestItemFlags[] = {
QUEST_MEDALLION_WATER, QUEST_MEDALLION_SPIRIT, QUEST_MEDALLION_SHADOW, QUEST_MEDALLION_LIGHT, QUEST_MEDALLION_WATER, QUEST_MEDALLION_SPIRIT, QUEST_MEDALLION_SHADOW, QUEST_MEDALLION_LIGHT,
}; };
#if OOT_NTSC && OOT_VERSION < GC_JP_CE #if (OOT_NTSC && OOT_VERSION < GC_JP_CE) || PLATFORM_IQUE
static void* sSaveXTextures[] = { gFileSelSaveXJPNTex, gFileSelSaveXENGTex }; static void* sSaveXTextures[] = { gFileSelSaveXJPNTex, gFileSelSaveXENGTex };
#endif #endif

815
src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
View file

File diff suppressed because it is too large Load diff

4
tools/disasm/ique-cn/files_ovl_file_choose.csv
View file

@ -6,8 +6,8 @@ offset,vram,.text
offset,vram,.data offset,vram,.data
F6E0,80812DE0,src/overlays/gamestates/ovl_file_choose/z_file_nameset_data F6E0,80812DE0,src/overlays/gamestates/ovl_file_choose/z_file_nameset_data
FDC0,808134C0,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase FDC0,808134C0,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
FE00,80813500,src/overlays/gamestates/ovl_file_choose/z_file_nameset FDF0,808134F0,src/overlays/gamestates/ovl_file_choose/z_file_nameset
FFA0,808136A0,src/overlays/gamestates/ovl_file_choose/z_file_choose FF90,80813690,src/overlays/gamestates/ovl_file_choose/z_file_choose
offset,vram,.rodata offset,vram,.rodata
10280,80813980,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase 10280,80813980,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase

1 offset vram .text
6 F6E0 80812DE0 src/overlays/gamestates/ovl_file_choose/z_file_nameset_data
7 FDC0 808134C0 src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
8 FE00 FDF0 80813500 808134F0 src/overlays/gamestates/ovl_file_choose/z_file_nameset
9 FFA0 FF90 808136A0 80813690 src/overlays/gamestates/ovl_file_choose/z_file_choose
10 offset vram .rodata
11 10280 80813980 src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
12 102B0 808139B0 src/overlays/gamestates/ovl_file_choose/z_file_nameset
13 102C0 808139C0 src/overlays/gamestates/ovl_file_choose/z_file_choose