From c5dde1054f1da53ca39e2d2b7f205d0642e089a7 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 9 Mar 2023 00:40:22 +0900 Subject: [PATCH] cn -> ique (#969) --- Jenkinsfile | 8 +++---- coverage.py | 2 +- include/common_structs.h | 2 +- include/enums.h | 2 +- include/functions.h | 2 +- src/C50A0.c | 2 +- src/a5dd0_len_114e0.c | 2 +- src/audio/25f00_len_940.c | 2 +- src/d0a70_len_4fe0.c | 2 +- src/encounter.c | 2 +- src/filemenu/filemenu_common.c | 2 +- src/filemenu/filemenu_info.c | 4 ++-- src/filemenu/filemenu_main.c | 2 +- src/filemenu/filemenu_msg.c | 14 +++++------ src/filemenu/filemenu_yesno.c | 2 +- src/hud_element.c | 2 +- src/main.c | 6 ++--- src/main_loop.c | 2 +- src/msg.c | 18 +++++++------- src/os/nusys/nugfxtaskmgr.c | 2 +- src/os/nusys/nusimgr.c | 4 ++-- src/pause/pause_badges.c | 6 ++--- src/pause/pause_gfx.c | 4 ++-- src/pause/pause_main.c | 2 +- src/pause/pause_stats.c | 4 ++-- src/state_battle.c | 2 +- src/state_demo.c | 2 +- src/state_title_screen.c | 4 ++-- src/world/area_end/common/Credits.inc.c | 2 +- src/world/area_end/end_01/credits_jobs.inc.c | 4 ++-- src/world/area_gv/gv_01/gv_01_1_main.c | 2 +- src/world/world.c | 4 ++-- tools/build/configure.py | 6 ++--- ver/cn/checksum.sha1 | 1 - ver/{cn => ique}/asm/bss.s | 0 ver/{cn => ique}/asm/bss3.s | 0 ver/{cn => ique}/asm/data/libultra.data.s | 0 ver/{cn => ique}/asm/data/libultra.rodata.s | 0 ver/{cn => ique}/asm/data/pause/18AF30.data.s | 0 ver/{cn => ique}/asm/entry_point.s | 0 ver/{cn => ique}/asm/header.s | 0 ver/{cn => ique}/asm/libultra/bb/sa/common.s | 0 ver/{cn => ique}/asm/libultra/bb/sa/strcmp.s | 0 ver/{cn => ique}/asm/libultra/bb/sk/skapi.s | 0 ver/{cn => ique}/asm/libultra/monegi/ai/ai.s | 0 .../asm/libultra/monegi/ai/aigetlen.s | 0 .../asm/libultra/monegi/ai/aigetstat.s | 0 .../asm/libultra/monegi/ai/aisetfreq.s | 0 .../asm/libultra/monegi/ai/aisetnextbuf.s | 0 .../asm/libultra/monegi/cache/invaldcache.s | 0 .../asm/libultra/monegi/cache/invalicache.s | 0 .../libultra/monegi/cache/writebackdcache.s | 0 .../monegi/cache/writebackdcacheall.s | 0 .../asm/libultra/monegi/cont/contquery.s | 0 .../asm/libultra/monegi/cont/contreaddata.s | 0 .../asm/libultra/monegi/cont/controller.s | 0 .../monegi/convert/virtualtophysical.s | 0 .../asm/libultra/monegi/gu/frustum.s | 0 .../asm/libultra/monegi/gu/lookat.s | 0 .../asm/libultra/monegi/gu/lookathil.s | 0 .../asm/libultra/monegi/gu/lookatref.s | 0 .../asm/libultra/monegi/gu/ortho.s | 0 .../asm/libultra/monegi/gu/perspective.s | 0 .../asm/libultra/monegi/gu/position.s | 0 .../asm/libultra/monegi/gu/rotateRPY.s | 0 .../asm/libultra/monegi/gu/sins.s | 0 .../asm/libultra/monegi/gu/sqrtf.s | 0 .../asm/libultra/monegi/libc/bcmp.s | 0 .../asm/libultra/monegi/libc/bcopy.s | 0 .../asm/libultra/monegi/libc/bzero.s | 0 .../asm/libultra/monegi/libc/ldiv.s | 0 .../asm/libultra/monegi/libc/string.s | 0 .../asm/libultra/monegi/libc/xldtob.s | 0 .../asm/libultra/monegi/libc/xlitob.s | 0 .../asm/libultra/monegi/libc/xprintf.s | 0 .../libultra/monegi/message/createmesgqueue.s | 0 .../asm/libultra/monegi/message/jammesg.s | 0 .../asm/libultra/monegi/message/recvmesg.s | 0 .../asm/libultra/monegi/message/sendmesg..s | 0 .../libultra/monegi/message/seteventmesg.s | 0 .../asm/libultra/monegi/mgu/mtxcatf.s | 0 .../asm/libultra/monegi/mgu/mtxcatl.s | 0 .../asm/libultra/monegi/mgu/mtxf2l.s | 0 .../asm/libultra/monegi/mgu/mtxident.s | 0 .../asm/libultra/monegi/mgu/mtxidentf.s | 0 .../asm/libultra/monegi/mgu/mtxl2f.s | 0 .../asm/libultra/monegi/mgu/mtxxfmf.s | 0 .../asm/libultra/monegi/mgu/mtxxfml.s | 0 .../asm/libultra/monegi/mgu/normalize.s | 0 .../asm/libultra/monegi/mgu/rotate.s | 0 .../asm/libultra/monegi/mgu/scale.s | 0 .../asm/libultra/monegi/mgu/scalef.s | 0 .../asm/libultra/monegi/mgu/translate.s | 0 .../asm/libultra/monegi/mgu/translatef.s | 0 .../asm/libultra/monegi/reg/_getcount.s | 0 .../asm/libultra/monegi/reg/_setcompare.s | 0 .../asm/libultra/monegi/reg/getcause.s | 0 .../asm/libultra/monegi/reg/getsr.s | 0 .../asm/libultra/monegi/reg/setfpccsr.s | 0 .../asm/libultra/monegi/reg/setsr.s | 0 .../asm/libultra/monegi/reg/setwatchlo.s | 0 ver/{cn => ique}/asm/libultra/monegi/rsp/sp.s | 0 .../asm/libultra/monegi/rsp/spgetstat.s | 0 .../asm/libultra/monegi/rsp/sprawdma.s | 0 .../asm/libultra/monegi/rsp/spsetpc.s | 0 .../asm/libultra/monegi/rsp/spsetstat.s | 0 .../asm/libultra/monegi/rsp/sptask.s | 0 .../asm/libultra/monegi/rsp/sptaskyield.s | 0 .../asm/libultra/monegi/rsp/sptaskyielded.s | 0 ver/{cn => ique}/asm/libultra/monegi/si/si.s | 0 .../asm/libultra/monegi/si/siacs.s | 0 .../asm/libultra/monegi/si/sirawdma.s | 0 .../asm/libultra/monegi/si/sirawread.s | 0 .../asm/libultra/monegi/si/sirawwrite.s | 0 .../asm/libultra/monegi/thread/createthread.s | 0 .../libultra/monegi/thread/destroythread.s | 0 .../libultra/monegi/thread/getactivequeue.s | 0 .../asm/libultra/monegi/thread/getthreadpri.s | 0 .../asm/libultra/monegi/thread/setthreadpri.s | 0 .../asm/libultra/monegi/thread/startthread.s | 0 .../asm/libultra/monegi/thread/stopthread.s | 0 .../asm/libultra/monegi/thread/thread.s | 0 .../asm/libultra/monegi/thread/yieldthread.s | 0 .../asm/libultra/monegi/time/gettime.s | 0 .../asm/libultra/monegi/time/settime.s | 0 .../asm/libultra/monegi/time/settimer.s | 0 .../asm/libultra/monegi/time/timerintr.s | 0 .../asm/libultra/monegi/tlb/maptlb.s | 0 .../asm/libultra/monegi/tlb/maptlbrdb.s | 0 .../asm/libultra/monegi/tlb/probetlb.s | 0 .../asm/libultra/monegi/tlb/unmaptlb.s | 0 .../asm/libultra/monegi/tlb/unmaptlball.s | 0 ver/{cn => ique}/asm/libultra/monegi/vi/vi.s | 0 .../asm/libultra/monegi/vi/viblack.s | 0 .../asm/libultra/monegi/vi/vigetcurrcontext.s | 0 .../libultra/monegi/vi/vigetcurrframebuf.s | 0 .../asm/libultra/monegi/vi/vigetmode.s | 0 .../libultra/monegi/vi/vigetnextframebuf.s | 0 .../asm/libultra/monegi/vi/vimgr.s | 0 .../asm/libultra/monegi/vi/virepeatline.s | 0 .../asm/libultra/monegi/vi/visetevent.s | 0 .../asm/libultra/monegi/vi/visetmode.s | 0 .../asm/libultra/monegi/vi/visetspecial.s | 0 .../asm/libultra/monegi/vi/visetyscale.s | 0 .../asm/libultra/monegi/vi/viswapbuf.s | 0 .../asm/libultra/monegi/vi/viswapcontext.s | 0 .../libultra/nintendo/exception/exceptasm.s | 0 .../libultra/nintendo/exception/interrupt.s | 0 .../nintendo/exception/resetglobalintmask.s | 0 .../nintendo/exception/setglobalintmask.s | 0 .../libultra/nintendo/exception/setintmask.s | 0 .../asm/libultra/nintendo/flash/flashinit.s | 0 .../libultra/nintendo/flash/flashreadarray.s | 0 .../nintendo/flash/flashsectorerase.s | 0 .../libultra/nintendo/flash/flashwritearray.s | 0 .../nintendo/flash/flashwritebuffer.s | 0 .../asm/libultra/nintendo/pi/cartrominit.s | 0 .../asm/libultra/nintendo/pi/devmgr.s | 0 .../asm/libultra/nintendo/pi/epidma.s | 0 .../asm/libultra/nintendo/pi/epilinkhandle.s | 0 .../asm/libultra/nintendo/pi/epirawdma.s | 0 .../asm/libultra/nintendo/pi/epirawread.s | 0 .../asm/libultra/nintendo/pi/epirawwrite.s | 0 .../asm/libultra/nintendo/pi/epiread.s | 0 .../asm/libultra/nintendo/pi/epiwrite.s | 0 .../asm/libultra/nintendo/pi/piacs.s | 0 .../asm/libultra/nintendo/pi/pigetcmdq.s | 0 .../asm/libultra/nintendo/pi/pimgr.s | 0 .../asm/libultra/nintendo/pi/pirawdma.s | 0 .../asm/libultra/shared/motor/motor.s | 0 .../asm/libultra/shared/pfs/contpfs.s | 0 .../asm/libultra/shared/pfs/contramread.s | 0 .../asm/libultra/shared/pfs/contramwrite.s | 0 .../asm/libultra/shared/pfs/pfsallocatefile.s | 0 .../asm/libultra/shared/pfs/pfschecker.s | 0 .../asm/libultra/shared/pfs/pfsdeletefile.s | 0 .../asm/libultra/shared/pfs/pfsfilestate.s | 0 .../asm/libultra/shared/pfs/pfsfreeblocks.s | 0 .../asm/libultra/shared/pfs/pfsgetstatus.s | 0 .../asm/libultra/shared/pfs/pfsinitpak.s | 0 .../asm/libultra/shared/pfs/pfsisplug.s | 0 .../asm/libultra/shared/pfs/pfsnumfiles.s | 0 .../libultra/shared/pfs/pfsreadwritefile.s | 0 .../asm/libultra/shared/pfs/pfsrepairid.s | 0 .../asm/libultra/shared/pfs/pfssearchfile.s | 0 .../asm/libultra/shared/pfs/pfsselectbank.s | 0 .../asm/libultra/shared/system/afterprenmi.s | 0 .../asm/libultra/shared/system/initialize.s | 0 .../9d10_len_1080/update_camera_mode_1.s | 0 .../9d10_len_1080/update_camera_mode_2.s | 0 .../B4580/appendGfx_animator_node.s | 0 .../C50A0/draw_image_with_clipping.s | 0 .../C50A0/test_item_player_collision.s | 0 .../a5dd0_len_114e0/mdl_project_tex_coords.s | 0 .../appendGfx_shading_palette.s | 0 .../hud_element/render_hud_element.s | 0 .../asm/nonmatchings/msg/appendGfx_message.s | 0 .../msg/msg_copy_to_print_buffer.s | 0 .../asm/nonmatchings/msg/msg_draw_char.s | 0 .../npc/npc_do_player_collision.s | 0 .../title_screen_draw_copyright.s | 0 ver/{cn => ique}/asm/os/decode_yay0.s | 0 ver/{cn => ique}/asm/os/parameters.s | 0 ver/ique/checksum.sha1 | 1 + ver/{cn => ique}/effects.yaml | 0 ver/{cn => ique}/include/message_ids.h | 0 ver/{cn => ique}/splat.yaml | 24 +++++++++---------- ver/{cn => ique}/symbol_addrs.txt | 0 ver/{cn => ique}/undefined_funcs_auto.txt | 0 ver/{cn => ique}/undefined_syms.txt | 0 ver/{cn => ique}/undefined_syms_auto.txt | 0 211 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 ver/cn/checksum.sha1 rename ver/{cn => ique}/asm/bss.s (100%) rename ver/{cn => ique}/asm/bss3.s (100%) rename ver/{cn => ique}/asm/data/libultra.data.s (100%) rename ver/{cn => ique}/asm/data/libultra.rodata.s (100%) rename ver/{cn => ique}/asm/data/pause/18AF30.data.s (100%) rename ver/{cn => ique}/asm/entry_point.s (100%) rename ver/{cn => ique}/asm/header.s (100%) rename ver/{cn => ique}/asm/libultra/bb/sa/common.s (100%) rename ver/{cn => ique}/asm/libultra/bb/sa/strcmp.s (100%) rename ver/{cn => ique}/asm/libultra/bb/sk/skapi.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/ai/ai.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/ai/aigetlen.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/ai/aigetstat.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/ai/aisetfreq.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/ai/aisetnextbuf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cache/invaldcache.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cache/invalicache.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cache/writebackdcache.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cache/writebackdcacheall.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cont/contquery.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cont/contreaddata.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/cont/controller.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/convert/virtualtophysical.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/frustum.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/lookat.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/lookathil.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/lookatref.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/ortho.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/perspective.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/position.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/rotateRPY.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/sins.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/gu/sqrtf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/bcmp.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/bcopy.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/bzero.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/ldiv.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/string.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/xldtob.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/xlitob.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/libc/xprintf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/message/createmesgqueue.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/message/jammesg.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/message/recvmesg.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/message/sendmesg..s (100%) rename ver/{cn => ique}/asm/libultra/monegi/message/seteventmesg.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxcatf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxcatl.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxf2l.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxident.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxidentf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxl2f.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxxfmf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/mtxxfml.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/normalize.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/rotate.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/scale.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/scalef.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/translate.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/mgu/translatef.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/_getcount.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/_setcompare.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/getcause.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/getsr.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/setfpccsr.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/setsr.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/reg/setwatchlo.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/sp.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/spgetstat.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/sprawdma.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/spsetpc.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/spsetstat.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/sptask.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/sptaskyield.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/rsp/sptaskyielded.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/si/si.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/si/siacs.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/si/sirawdma.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/si/sirawread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/si/sirawwrite.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/createthread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/destroythread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/getactivequeue.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/getthreadpri.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/setthreadpri.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/startthread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/stopthread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/thread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/thread/yieldthread.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/time/gettime.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/time/settime.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/time/settimer.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/time/timerintr.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/tlb/maptlb.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/tlb/maptlbrdb.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/tlb/probetlb.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/tlb/unmaptlb.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/tlb/unmaptlball.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vi.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/viblack.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vigetcurrcontext.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vigetcurrframebuf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vigetmode.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vigetnextframebuf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/vimgr.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/virepeatline.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/visetevent.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/visetmode.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/visetspecial.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/visetyscale.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/viswapbuf.s (100%) rename ver/{cn => ique}/asm/libultra/monegi/vi/viswapcontext.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/exception/exceptasm.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/exception/interrupt.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/exception/resetglobalintmask.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/exception/setglobalintmask.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/exception/setintmask.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/flash/flashinit.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/flash/flashreadarray.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/flash/flashsectorerase.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/flash/flashwritearray.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/flash/flashwritebuffer.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/cartrominit.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/devmgr.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epidma.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epilinkhandle.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epirawdma.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epirawread.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epirawwrite.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epiread.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/epiwrite.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/piacs.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/pigetcmdq.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/pimgr.s (100%) rename ver/{cn => ique}/asm/libultra/nintendo/pi/pirawdma.s (100%) rename ver/{cn => ique}/asm/libultra/shared/motor/motor.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/contpfs.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/contramread.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/contramwrite.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsallocatefile.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfschecker.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsdeletefile.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsfilestate.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsfreeblocks.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsgetstatus.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsinitpak.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsisplug.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsnumfiles.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsreadwritefile.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsrepairid.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfssearchfile.s (100%) rename ver/{cn => ique}/asm/libultra/shared/pfs/pfsselectbank.s (100%) rename ver/{cn => ique}/asm/libultra/shared/system/afterprenmi.s (100%) rename ver/{cn => ique}/asm/libultra/shared/system/initialize.s (100%) rename ver/{cn => ique}/asm/nonmatchings/9d10_len_1080/update_camera_mode_1.s (100%) rename ver/{cn => ique}/asm/nonmatchings/9d10_len_1080/update_camera_mode_2.s (100%) rename ver/{cn => ique}/asm/nonmatchings/B4580/appendGfx_animator_node.s (100%) rename ver/{cn => ique}/asm/nonmatchings/C50A0/draw_image_with_clipping.s (100%) rename ver/{cn => ique}/asm/nonmatchings/C50A0/test_item_player_collision.s (100%) rename ver/{cn => ique}/asm/nonmatchings/a5dd0_len_114e0/mdl_project_tex_coords.s (100%) rename ver/{cn => ique}/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s (100%) rename ver/{cn => ique}/asm/nonmatchings/hud_element/render_hud_element.s (100%) rename ver/{cn => ique}/asm/nonmatchings/msg/appendGfx_message.s (100%) rename ver/{cn => ique}/asm/nonmatchings/msg/msg_copy_to_print_buffer.s (100%) rename ver/{cn => ique}/asm/nonmatchings/msg/msg_draw_char.s (100%) rename ver/{cn => ique}/asm/nonmatchings/npc/npc_do_player_collision.s (100%) rename ver/{cn => ique}/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s (100%) rename ver/{cn => ique}/asm/os/decode_yay0.s (100%) rename ver/{cn => ique}/asm/os/parameters.s (100%) create mode 100644 ver/ique/checksum.sha1 rename ver/{cn => ique}/effects.yaml (100%) rename ver/{cn => ique}/include/message_ids.h (100%) rename ver/{cn => ique}/splat.yaml (99%) rename ver/{cn => ique}/symbol_addrs.txt (100%) rename ver/{cn => ique}/undefined_funcs_auto.txt (100%) rename ver/{cn => ique}/undefined_syms.txt (100%) rename ver/{cn => ique}/undefined_syms_auto.txt (100%) diff --git a/Jenkinsfile b/Jenkinsfile index f68d7cbd64..21f22678a1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { steps { sh 'cp /usr/local/etc/roms/papermario.us.z64 ver/us/baserom.z64' sh 'cp /usr/local/etc/roms/papermario.jp.z64 ver/jp/baserom.z64' - sh 'cp /usr/local/etc/roms/papermario.cn.z64 ver/cn/baserom.z64' + sh 'cp /usr/local/etc/roms/papermario.ique.z64 ver/ique/baserom.z64' sh 'curl -L "https://github.com/pmret/gcc-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc' sh 'curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc' sh 'curl -L "https://github.com/decompals/ido-static-recomp/releases/download/v0.2/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3' @@ -34,7 +34,7 @@ pipeline { if (env.CHANGE_ID) { def us_progress = sh(returnStdout: true, script: "python3 progress.py us --pr-comment").trim() def jp_progress = sh(returnStdout: true, script: "python3 progress.py jp --pr-comment").trim() - def cn_progress = sh(returnStdout: true, script: "python3 progress.py cn --pr-comment").trim() + def cn_progress = sh(returnStdout: true, script: "python3 progress.py ique --pr-comment").trim() def warnings = sh(returnStdout: true, script: "./tools/warnings_count/check_new_warnings.sh --jenkins").trim() def comment_id = -1 @@ -71,8 +71,8 @@ pipeline { sh 'python3 progress.py jp --csv >> reports/progress_jp.csv' sh 'python3 progress.py jp --shield-json > reports/progress_jp_shield.json' - sh 'python3 progress.py cn --csv >> reports/progress_cn.csv' - sh 'python3 progress.py cn --shield-json > reports/progress_cn_shield.json' + sh 'python3 progress.py ique --csv >> reports/progress_cn.csv' + sh 'python3 progress.py ique --shield-json > reports/progress_cn_shield.json' sh 'cat build_log.txt | grep warning | sort > tools/warnings_count/warnings.txt' sh 'cp tools/warnings_count/warnings.txt reports/warnings.txt' diff --git a/coverage.py b/coverage.py index cd131be85a..2f659e87c0 100755 --- a/coverage.py +++ b/coverage.py @@ -78,4 +78,4 @@ def stuff(version): stuff("us") stuff("jp") -stuff("cn") +stuff("ique") diff --git a/include/common_structs.h b/include/common_structs.h index 4eb77d59ed..cdb58991fb 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -2217,7 +2217,7 @@ typedef struct { #if VERSION_JP #define DISPLAYCONTEXT_GFX_COUNT 0x2000 -#elif VERSION_CN +#elif VERSION_IQUE #define DISPLAYCONTEXT_GFX_COUNT 0x2200 #else #define DISPLAYCONTEXT_GFX_COUNT 0x2080 diff --git a/include/enums.h b/include/enums.h index 0ce09a28d3..578fb1fabb 100644 --- a/include/enums.h +++ b/include/enums.h @@ -6382,7 +6382,7 @@ enum MsgChars { MSG_CHAR_SINGLE_QUOTE_CLOSE = 0xA5, // 0xA6 to 0xEF are unused -#if VERSION_CN +#if VERSION_IQUE // All US characters are in the rom, but their range is used for multibyte characters MSG_CHAR_MULTIBYTE_FIRST = 0x5F, MSG_CHAR_MULTIBYTE_LAST = 0x8F, diff --git a/include/functions.h b/include/functions.h index 55e628c22d..6031d5387b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -816,7 +816,7 @@ s32 is_actor_hp_bar_visible(Actor*); void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); void load_font(s32 font); -#if VERSION_CN +#if VERSION_IQUE void load_font_data(Addr offset, u32 size, void* dest); #else void load_font_data(Addr offset, u16 size, void* dest); diff --git a/src/C50A0.c b/src/C50A0.c index 8f84c4586d..9f09136f73 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -9,7 +9,7 @@ #include "nu/nusys.h" #include "ld_addrs.h" -#if VERSION_CN +#if VERSION_IQUE // TODO: remove if section is split in iQue release extern Addr icon_present_ROM_START; #endif diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 824a28b594..3d8da6322a 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -8,7 +8,7 @@ #include "nu/nusys.h" #include "model_clear_render_tasks.h" -#if VERSION_CN +#if VERSION_IQUE // TODO: remove if sections are split in iQue release extern Addr entity_jan_iwa_ROM_START; extern Addr entity_jan_iwa_ROM_END; diff --git a/src/audio/25f00_len_940.c b/src/audio/25f00_len_940.c index d5e8926c84..3235e6b5db 100644 --- a/src/audio/25f00_len_940.c +++ b/src/audio/25f00_len_940.c @@ -57,7 +57,7 @@ void create_audio_system(void) { nuAuTasks[i].next = NULL; nuAuTasks[i].msg = 0; nuAuTasks[i].list.t.type = M_AUDTASK; -#if VERSION_CN +#if VERSION_IQUE nuAuTasks[i].list.t.ucode_boot = (u64*) rspbootTextStart; nuAuTasks[i].list.t.ucode_boot_size = (u32) rspbootTextEnd - (u32) rspbootTextStart; #else diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index 023f4c4a78..d6db74250d 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -2,7 +2,7 @@ #include "ld_addrs.h" #include "sprite.h" -#if VERSION_CN +#if VERSION_IQUE // TODO: remove if section is split in iQue release extern Addr fold_gfx_data_ROM_START; #endif diff --git a/src/encounter.c b/src/encounter.c index 50bc17e841..6a54425b73 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -8,7 +8,7 @@ #include "sprite.h" #include "model.h" -#if !VERSION_JP && !VERSION_CN +#if !VERSION_JP && !VERSION_IQUE // TODO: remove this conditional when more of the JP rom has been processed #include "sprite/npc/BattleMerlee.h" #else diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 11ab25332b..47a1587d2a 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -116,7 +116,7 @@ BSS s32 filemenu_8024C0A4[3]; BSS s32 filemenu_hudElemIDs[20]; BSS s32 filemenu_createfile_hudElems[4]; -#if VERSION_CN +#if VERSION_IQUE BSS u8 filemenu_glyphBuffer[20][0x80]; #endif diff --git a/src/filemenu/filemenu_info.c b/src/filemenu/filemenu_info.c index 0ba123a930..5982d79ba7 100644 --- a/src/filemenu/filemenu_info.c +++ b/src/filemenu/filemenu_info.c @@ -2,7 +2,7 @@ #include "filemenu.h" #include "hud_element.h" -#if VERSION_CN +#if VERSION_IQUE #define CREATE_SUCCESS_NUMBER_X 49 #define NUMBER_OFFSET_Y 1 #else @@ -60,7 +60,7 @@ void filemenu_info_draw_message_contents( filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_HAS_BEEN_DELETED), baseX + 49, baseY + 4, 255, 0, 0); break; case 2: -#if VERSION_CN +#if VERSION_IQUE filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_COPY_FROM), baseX + 10, baseY + 7, 255, 0, 0); filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 42, baseY + 7, 255, 0, 0); draw_number(filemenu_loadedFileIdx + 1, baseX + 84, baseY + 10, DRAW_NUMBER_CHARSET_NORMAL, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c index 4fc37ec525..bc9559a52e 100644 --- a/src/filemenu/filemenu_main.c +++ b/src/filemenu/filemenu_main.c @@ -27,7 +27,7 @@ extern HudScript HES_OptionStereoOff; BSS u8 filemenu_filename[8]; -#if VERSION_CN +#if VERSION_IQUE #define OFFSET_WIDTH 5 #define DELETE_OFFSET_X 9 #define CENTER_CANCEL_X 30 diff --git a/src/filemenu/filemenu_msg.c b/src/filemenu/filemenu_msg.c index 2d19bd9fc6..bac927c61f 100644 --- a/src/filemenu/filemenu_msg.c +++ b/src/filemenu/filemenu_msg.c @@ -2,7 +2,7 @@ #include "filemenu.h" #include "ld_addrs.h" -#if VERSION_CN +#if VERSION_IQUE // TODO: remove when charset segment is split for iQue extern Addr charset_standard_OFFSET; #endif @@ -11,7 +11,7 @@ extern MessageCharset* gMsgCharsets[5]; extern PAL_BIN D_802F4560[80][8]; extern u8 filemenu_glyphBuffer[20][0x80]; -#if VERSION_CN +#if VERSION_IQUE u8 filemenu_msg_C6[] = { 0xF7, 0xF7, 0x84, 0x05, 0x62, 0x14, 0xFD }; u8 filemenu_msg_C7[] = { 0xFD }; u8 filemenu_msg_C8[] = { 0xFD }; @@ -48,12 +48,12 @@ s32 filemenu_charset = 0; s32 filemenu_charset_raster_id = 0; s32 filemenu_char_color = -1; -#if VERSION_CN +#if VERSION_IQUE u32 filemenu_glyphBufferIndex = 0; #endif -#if VERSION_CN +#if VERSION_IQUE u8 filemenu_msg_01[] = { 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0x7A, 0x14, 0x7B, 0x14, 0x79, 0x19, 0x7F, 0x06, 0x79, 0x04, 0x7A, 0x04, 0xFD }; u8 filemenu_msg_02[] = { 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0x7A, 0x14, 0x7B, 0x14, 0x79, 0x19, 0x7F, 0x06, 0x8C, 0x30, 0x6C, 0x12, 0xFD }; u8 filemenu_msg_03[] = { 0x7A, 0x14, 0x7B, 0x14, 0x79, 0x19, 0x7F, 0x06, 0x89, 0x0D, 0x71, 0x15, 0xFD }; @@ -220,7 +220,7 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { return charWidth; } -#if VERSION_CN +#if VERSION_IQUE if (c >= 0x100) { int offset; s32 character; @@ -306,7 +306,7 @@ void filemenu_draw_message(u8* message, s32 x, s32 y, s32 alpha, s32 color, u32 filemenu_draw_char(0xF3, x, y, flag1, color, flag2); tmp = message; while (*tmp != 0xFD) { -#if VERSION_CN +#if VERSION_IQUE int ord = *tmp; if (ord >= MSG_CHAR_MULTIBYTE_FIRST && ord <= MSG_CHAR_MULTIBYTE_LAST) { tmp++; @@ -336,7 +336,7 @@ void filemenu_draw_file_name(u8* filename, s32 length, s32 x, s32 y, s32 alpha, u32 c = filename[i]; if (c != 0xF7) { -#if VERSION_CN +#if VERSION_IQUE // Numerals get drawn one pixel lower than other characters if (c >= MSG_CHAR_DIGIT_0 && c <= MSG_CHAR_DIGIT_9) { filemenu_draw_message((u8*)c, x + (i * charWidth), y + 1, alpha, arg5, arg6); diff --git a/src/filemenu/filemenu_yesno.c b/src/filemenu/filemenu_yesno.c index bad11d08d5..bc2a8b126f 100644 --- a/src/filemenu/filemenu_yesno.c +++ b/src/filemenu/filemenu_yesno.c @@ -2,7 +2,7 @@ #include "filemenu.h" #include "fio.h" -#if VERSION_CN +#if VERSION_IQUE #define DELETE_FILE_DELETE_X 20 #define DELETE_FILE_FILE_X 50 #define DELETE_FILE_NUMBER_X 93 diff --git a/src/hud_element.c b/src/hud_element.c index 3c6f1e4fae..632fac2911 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -3,7 +3,7 @@ #include "nu/nusys.h" #include "ld_addrs.h" -#if VERSION_CN +#if VERSION_IQUE // TODO: remove if section is split in iQue release extern Addr icon_present_ROM_START; #endif diff --git a/src/main.c b/src/main.c index fa3f76eee7..12d4c44172 100644 --- a/src/main.c +++ b/src/main.c @@ -52,13 +52,13 @@ void boot_main(void* data) { crash_screen_init(); #endif -#if !VERSION_CN +#if !VERSION_IQUE is_debug_init(); #endif nuGfxInit(); gGameStatusPtr->contBitPattern = nuContInit(); -#if VERSION_CN +#if VERSION_IQUE create_audio_system(); load_engine_data(); #else @@ -181,7 +181,7 @@ void gfx_task_main(void) { gCurrentDisplayContextIndex ^= 1; } -#if VERSION_CN +#if VERSION_IQUE NOP_FIX #endif diff --git a/src/main_loop.c b/src/main_loop.c index 7e96ab7c76..6fb97720f3 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -358,6 +358,6 @@ s32 get_time_freeze_mode(void) { return timeFreezeMode; } -#if VERSION_CN +#if VERSION_IQUE static const f32 rodata_padding[] = {0.0f, 0.0f}; #endif diff --git a/src/msg.c b/src/msg.c index c4c5fe559a..762c63f66c 100644 --- a/src/msg.c +++ b/src/msg.c @@ -3,13 +3,13 @@ #include "message_ids.h" #include "sprite.h" -#if !VERSION_CN +#if !VERSION_IQUE // TODO: remove if assets are dumped in iQue release #include "charset/postcard.png.h" #include "charset/letter_content_1.png.h" #endif -#if VERSION_CN +#if VERSION_IQUE // TODO: remove if section is split in iQue release extern Addr charset_ROM_START; extern Addr charset_standard_OFFSET; @@ -212,7 +212,7 @@ Gfx D_8014C500[] = { u8 D_8014C580[] = { 50, 80, 100, 105, 100, 0, 0, 0 }; u8 D_8014C588[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0, 0, 0}; -#if VERSION_CN +#if VERSION_IQUE u32 D_8014AD24 = 2; #else u8 D_8014C594[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -263,7 +263,7 @@ void clear_printers(void) { load_font(0); } -#if VERSION_CN +#if VERSION_IQUE void load_font_data(Addr offset, u32 size, void* dest) { #else void load_font_data(Addr offset, u16 size, void* dest) { @@ -678,7 +678,7 @@ extern s32 D_802EB5C0[]; extern s32 D_802EB5F0[]; extern struct_D_802EB620 D_802EB620[]; -#if VERSION_CN +#if VERSION_IQUE INCLUDE_ASM(s32, "msg", msg_copy_to_print_buffer); #else void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { @@ -1577,7 +1577,7 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgS return 0; } -#if VERSION_CN +#if VERSION_IQUE if (character >= 0x5F && character<=0x8F) { charWidth = 16.0; return charWidth * msgScale; @@ -1905,7 +1905,7 @@ void get_msg_properties(s32 msgID, s32* height, s32* width, s32* maxLineChars, s endl = FALSE; } -#if VERSION_CN +#if VERSION_IQUE if (prevChar >= 0x5f && prevChar <= 0x8F) { break; } @@ -2340,7 +2340,7 @@ void draw_message_window(MessagePrintState* printer) { } } -#if VERSION_CN +#if VERSION_IQUE INCLUDE_ASM(s32, "msg", appendGfx_message); #else void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 additionalOffsetX, u16 additionalOffsetY, @@ -3670,7 +3670,7 @@ void msg_reset_gfx_state(void) { gSPDisplayList(gMasterGfxPos++, D_8014C500); } -#if VERSION_CN +#if VERSION_IQUE INCLUDE_ASM(s32, "msg", msg_draw_char); #else void msg_draw_char(MessagePrintState* printer, MessageDrawState* drawState, s32 charIndex, s32 palette, s32 posX, s32 posY) { diff --git a/src/os/nusys/nugfxtaskmgr.c b/src/os/nusys/nugfxtaskmgr.c index 8d723197d0..d8b65eefe1 100644 --- a/src/os/nusys/nugfxtaskmgr.c +++ b/src/os/nusys/nugfxtaskmgr.c @@ -69,7 +69,7 @@ void nuGfxTaskMgrInit(void) { nuGfxTask[i].msgQ = &D_800DAC90; nuGfxTask[i].list.t.type = M_GFXTASK; nuGfxTask[i].list.t.flags = 0; -#if VERSION_CN +#if VERSION_IQUE nuGfxTask[i].list.t.ucode_boot = (u64*) rspbootTextStart; nuGfxTask[i].list.t.ucode_boot_size = (u32) rspbootTextEnd - (u32) rspbootTextStart; #else diff --git a/src/os/nusys/nusimgr.c b/src/os/nusys/nusimgr.c index 6ebc804648..4b1190aa9d 100644 --- a/src/os/nusys/nusimgr.c +++ b/src/os/nusys/nusimgr.c @@ -11,7 +11,7 @@ static void nuSiMgrThread(void* arg); extern u64 siMgrStack[NU_SI_STACK_SIZE/sizeof(u64)]; -#if !VERSION_JP && !VERSION_CN +#if !VERSION_JP && !VERSION_IQUE u8 nuSiMgrInit(void) { u8 pattern; OSContStatus status[NU_CONT_MAXCONTROLLERS]; @@ -114,7 +114,7 @@ void nuSiMgrThread(void* arg) { } } -#if VERSION_JP || VERSION_CN +#if VERSION_JP || VERSION_IQUE u8 nuSiMgrInit(void) { u8 pattern; OSContStatus status[NU_CONT_MAXCONTROLLERS]; diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 63d2976238..382704bce1 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -10,7 +10,7 @@ void pause_badges_cleanup(MenuPanel* panel); static s16 gPauseBadgesItemIds[128]; static s32 gPauseBadgesCurrentPage; -#if !VERSION_CN +#if !VERSION_IQUE static s32 D_80270284; #endif static PauseItemPage gPauseBadgesPages[20]; @@ -25,7 +25,7 @@ static s32 gPauseBadgesTargetScrollIndex; static s32 gPauseBadgesLevel; static s32 gPauseBadgesCurrentTab; static s32 gPauseBadgesShowNotEnoughBP; -#if !VERSION_CN +#if !VERSION_IQUE static s32 D_802703A4; #endif static s32 gPauseBadgesIconIDs[22]; @@ -35,7 +35,7 @@ static s32 gPauseBadgesIconIDs[22]; // Invalid badge ID filled in unused slots of gPauseBadgesItemIds #define BADGE_INVALID 0x7FFF -#if VERSION_CN +#if VERSION_IQUE #define OFFSET_1_X 47 #define OFFSET_1_Y 82 #define OFFSET_2_X 10 diff --git a/src/pause/pause_gfx.c b/src/pause/pause_gfx.c index ee137e10c2..d95154935c 100644 --- a/src/pause/pause_gfx.c +++ b/src/pause/pause_gfx.c @@ -276,7 +276,7 @@ Gfx gPauseDLAvailable[] = { gsSPEndDisplayList(), }; -#if VERSION_CN +#if VERSION_IQUE #undef pause_prompt_check_abilities_png_height #define pause_prompt_check_abilities_png_height 16 #endif @@ -318,7 +318,7 @@ Gfx gPauseDLSpiritsBg[] = { gsSPEndDisplayList(), }; -#if VERSION_CN +#if VERSION_IQUE s8 gPauseMsg_17[] = { 0x8F, 0x0C, 0x75, 0x12, 0xFD }; s8 gPauseMsg_18[] = { 0x7B, 0x0E, 0x7C, 0x0E, 0xFD }; s8 gPauseMsg_19[] = { 0x77, 0x10, 0x74, 0x0D, 0xFD }; diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index 50e43617ab..806d38eab9 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -28,7 +28,7 @@ BSS s8 gPauseMenuCurrentTab; BSS s8 D_802700D[7]; //padding static s32 gPauseTutorialFrameCounter; -#if !VERSION_CN +#if !VERSION_IQUE static s32 D_802700E4; #endif static s32 gPauseCommonIconIDs[8]; diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index 02473b8c57..9f586994fa 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -7,7 +7,7 @@ void pause_stats_cleanup(MenuPanel* panel); static s32 gPauseStatsIconIDs[12]; -#if VERSION_CN +#if VERSION_IQUE #define NUMBER_OFFSET_Y 2 #define ROW_1_Y 48 #define ROW_2_Y 49 @@ -190,7 +190,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, level = gPlayerData.level; draw_box(4, &gPauseWS_10, baseX + 7, baseY + 12, 0, level >= 10 ? 0x79 : 0x71, 17, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); -#if !VERSION_CN +#if !VERSION_IQUE hud_element_set_render_pos(gPauseStatsIconIDs[0], baseX + 61, baseY + 21); hud_element_draw_without_clipping(gPauseStatsIconIDs[0]); #endif diff --git a/src/state_battle.c b/src/state_battle.c index b96d12318c..838d877f27 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -57,7 +57,7 @@ void state_step_battle(void) { gGameStatusPtr->isBattle = TRUE; backup_map_collision_data(); -#if VERSION_CN +#if VERSION_IQUE battle_heap_create(); #else load_obfuscation_shims(); diff --git a/src/state_demo.c b/src/state_demo.c index df6853fbec..6fc6ba33b4 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -144,7 +144,7 @@ DemoSceneData DemoScenes[] = { char versionString[] = "Prg Ver.00/07/06 22:22"; #elif VERSION_US char versionString[] = "Prg Ver.00/12/05 16:54"; -#elif VERSION_CN +#elif VERSION_IQUE char versionString[] = "Prg Ver.04/05/18 10:52"; #else char versionString[] = "Prg Ver.??/??/?? ??:??"; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index d0b3526c75..afd83f89aa 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -409,7 +409,7 @@ void title_screen_draw_logo(f32 arg0) { gDPPipeSync(gMasterGfxPos++); } -#if VERSION_CN +#if VERSION_IQUE #define VAR_1 20 #define VAR_2 628 #else @@ -454,7 +454,7 @@ void title_screen_draw_press_start(void) { gDPPipeSync(gMasterGfxPos++); } -#if VERSION_CN +#if VERSION_IQUE INCLUDE_ASM(void, "state_title_screen", title_screen_draw_copyright); #else void title_screen_draw_copyright(f32 arg0) { diff --git a/src/world/area_end/common/Credits.inc.c b/src/world/area_end/common/Credits.inc.c index 5e03ff3550..13633d9719 100644 --- a/src/world/area_end/common/Credits.inc.c +++ b/src/world/area_end/common/Credits.inc.c @@ -7,7 +7,7 @@ void dma_load_msg(u32 msgID, void* dest); BSS CreditsData N(CreditsData); BSS CreditsData* N(CreditsDataPtr); -#if !VERSION_CN +#if !VERSION_IQUE BSS s32 N(BSS_PAD_1)[2]; #endif BSS u8 N(CreditsMessageBuffers)[23][256]; diff --git a/src/world/area_end/end_01/credits_jobs.inc.c b/src/world/area_end/end_01/credits_jobs.inc.c index 7c71401021..f62ca7334d 100644 --- a/src/world/area_end/end_01/credits_jobs.inc.c +++ b/src/world/area_end/end_01/credits_jobs.inc.c @@ -103,7 +103,7 @@ CreditsEntry N(Credits_Jobs)[] = { .perCharDelayIn = 0, .next = 60, }, -#if VERSION_CN +#if VERSION_IQUE // *©2000-2004* NINTENDO // *©2004* IQUE { @@ -209,7 +209,7 @@ CreditsEntry N(Credits_Jobs)[] = { .perCharDelayIn = 0, .next = 30, }, -#if VERSION_CN +#if VERSION_IQUE // *GAME BY* // INTELLIGENT SYSTEMS // IQUE ENGINEERING diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index f4bc294c85..34c9a6160e 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -90,7 +90,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(TranslateGroup, MODEL_e2, 0, 200, 0) EVT_CALL(TranslateGroup, MODEL_r, 0, 200, 0) EVT_THREAD -#if VERSION_CN +#if VERSION_IQUE EVT_WAIT(6) EVT_SET(LVar0, MODEL_g) EVT_EXEC(N(EVS_DropLetter)) diff --git a/src/world/world.c b/src/world/world.c index 14e0b9c92a..88db9be1e7 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -80,7 +80,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_WORLD; -#if VERSION_CN +#if VERSION_IQUE general_heap_create(); #else load_obfuscation_shims(); @@ -152,7 +152,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { load_map_bg(wMapBgName); } -#if VERSION_CN +#if VERSION_IQUE general_heap_create(); #else load_obfuscation_shims(); diff --git a/tools/build/configure.py b/tools/build/configure.py index 8430fb3267..a364848683 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -10,7 +10,7 @@ import ninja_syntax from glob import glob # Configuration: -VERSIONS = ["us", "jp", "cn"] +VERSIONS = ["us", "jp", "ique"] DO_SHA1_CHECK = True # Paths: @@ -418,7 +418,7 @@ class Configure: cflags = cflags.replace("gcc_272", "") encoding = "SHIFT-JIS" - if version == "cn": + if version == "ique": encoding = "EUC-JP" # Dead cod @@ -715,7 +715,7 @@ class Configure: variables={ "version": self.version, "mapfile": str(self.map_path()) }, ) - if self.version == "cn": + if self.version == "ique": ninja.build( str(self.rom_path()), "z64_ique", diff --git a/ver/cn/checksum.sha1 b/ver/cn/checksum.sha1 deleted file mode 100644 index ca929d17ac..0000000000 --- a/ver/cn/checksum.sha1 +++ /dev/null @@ -1 +0,0 @@ -5c724685085eba796537573dd6f84aaddedc8582 ver/cn/build/papermario.z64 diff --git a/ver/cn/asm/bss.s b/ver/ique/asm/bss.s similarity index 100% rename from ver/cn/asm/bss.s rename to ver/ique/asm/bss.s diff --git a/ver/cn/asm/bss3.s b/ver/ique/asm/bss3.s similarity index 100% rename from ver/cn/asm/bss3.s rename to ver/ique/asm/bss3.s diff --git a/ver/cn/asm/data/libultra.data.s b/ver/ique/asm/data/libultra.data.s similarity index 100% rename from ver/cn/asm/data/libultra.data.s rename to ver/ique/asm/data/libultra.data.s diff --git a/ver/cn/asm/data/libultra.rodata.s b/ver/ique/asm/data/libultra.rodata.s similarity index 100% rename from ver/cn/asm/data/libultra.rodata.s rename to ver/ique/asm/data/libultra.rodata.s diff --git a/ver/cn/asm/data/pause/18AF30.data.s b/ver/ique/asm/data/pause/18AF30.data.s similarity index 100% rename from ver/cn/asm/data/pause/18AF30.data.s rename to ver/ique/asm/data/pause/18AF30.data.s diff --git a/ver/cn/asm/entry_point.s b/ver/ique/asm/entry_point.s similarity index 100% rename from ver/cn/asm/entry_point.s rename to ver/ique/asm/entry_point.s diff --git a/ver/cn/asm/header.s b/ver/ique/asm/header.s similarity index 100% rename from ver/cn/asm/header.s rename to ver/ique/asm/header.s diff --git a/ver/cn/asm/libultra/bb/sa/common.s b/ver/ique/asm/libultra/bb/sa/common.s similarity index 100% rename from ver/cn/asm/libultra/bb/sa/common.s rename to ver/ique/asm/libultra/bb/sa/common.s diff --git a/ver/cn/asm/libultra/bb/sa/strcmp.s b/ver/ique/asm/libultra/bb/sa/strcmp.s similarity index 100% rename from ver/cn/asm/libultra/bb/sa/strcmp.s rename to ver/ique/asm/libultra/bb/sa/strcmp.s diff --git a/ver/cn/asm/libultra/bb/sk/skapi.s b/ver/ique/asm/libultra/bb/sk/skapi.s similarity index 100% rename from ver/cn/asm/libultra/bb/sk/skapi.s rename to ver/ique/asm/libultra/bb/sk/skapi.s diff --git a/ver/cn/asm/libultra/monegi/ai/ai.s b/ver/ique/asm/libultra/monegi/ai/ai.s similarity index 100% rename from ver/cn/asm/libultra/monegi/ai/ai.s rename to ver/ique/asm/libultra/monegi/ai/ai.s diff --git a/ver/cn/asm/libultra/monegi/ai/aigetlen.s b/ver/ique/asm/libultra/monegi/ai/aigetlen.s similarity index 100% rename from ver/cn/asm/libultra/monegi/ai/aigetlen.s rename to ver/ique/asm/libultra/monegi/ai/aigetlen.s diff --git a/ver/cn/asm/libultra/monegi/ai/aigetstat.s b/ver/ique/asm/libultra/monegi/ai/aigetstat.s similarity index 100% rename from ver/cn/asm/libultra/monegi/ai/aigetstat.s rename to ver/ique/asm/libultra/monegi/ai/aigetstat.s diff --git a/ver/cn/asm/libultra/monegi/ai/aisetfreq.s b/ver/ique/asm/libultra/monegi/ai/aisetfreq.s similarity index 100% rename from ver/cn/asm/libultra/monegi/ai/aisetfreq.s rename to ver/ique/asm/libultra/monegi/ai/aisetfreq.s diff --git a/ver/cn/asm/libultra/monegi/ai/aisetnextbuf.s b/ver/ique/asm/libultra/monegi/ai/aisetnextbuf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/ai/aisetnextbuf.s rename to ver/ique/asm/libultra/monegi/ai/aisetnextbuf.s diff --git a/ver/cn/asm/libultra/monegi/cache/invaldcache.s b/ver/ique/asm/libultra/monegi/cache/invaldcache.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cache/invaldcache.s rename to ver/ique/asm/libultra/monegi/cache/invaldcache.s diff --git a/ver/cn/asm/libultra/monegi/cache/invalicache.s b/ver/ique/asm/libultra/monegi/cache/invalicache.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cache/invalicache.s rename to ver/ique/asm/libultra/monegi/cache/invalicache.s diff --git a/ver/cn/asm/libultra/monegi/cache/writebackdcache.s b/ver/ique/asm/libultra/monegi/cache/writebackdcache.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cache/writebackdcache.s rename to ver/ique/asm/libultra/monegi/cache/writebackdcache.s diff --git a/ver/cn/asm/libultra/monegi/cache/writebackdcacheall.s b/ver/ique/asm/libultra/monegi/cache/writebackdcacheall.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cache/writebackdcacheall.s rename to ver/ique/asm/libultra/monegi/cache/writebackdcacheall.s diff --git a/ver/cn/asm/libultra/monegi/cont/contquery.s b/ver/ique/asm/libultra/monegi/cont/contquery.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cont/contquery.s rename to ver/ique/asm/libultra/monegi/cont/contquery.s diff --git a/ver/cn/asm/libultra/monegi/cont/contreaddata.s b/ver/ique/asm/libultra/monegi/cont/contreaddata.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cont/contreaddata.s rename to ver/ique/asm/libultra/monegi/cont/contreaddata.s diff --git a/ver/cn/asm/libultra/monegi/cont/controller.s b/ver/ique/asm/libultra/monegi/cont/controller.s similarity index 100% rename from ver/cn/asm/libultra/monegi/cont/controller.s rename to ver/ique/asm/libultra/monegi/cont/controller.s diff --git a/ver/cn/asm/libultra/monegi/convert/virtualtophysical.s b/ver/ique/asm/libultra/monegi/convert/virtualtophysical.s similarity index 100% rename from ver/cn/asm/libultra/monegi/convert/virtualtophysical.s rename to ver/ique/asm/libultra/monegi/convert/virtualtophysical.s diff --git a/ver/cn/asm/libultra/monegi/gu/frustum.s b/ver/ique/asm/libultra/monegi/gu/frustum.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/frustum.s rename to ver/ique/asm/libultra/monegi/gu/frustum.s diff --git a/ver/cn/asm/libultra/monegi/gu/lookat.s b/ver/ique/asm/libultra/monegi/gu/lookat.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/lookat.s rename to ver/ique/asm/libultra/monegi/gu/lookat.s diff --git a/ver/cn/asm/libultra/monegi/gu/lookathil.s b/ver/ique/asm/libultra/monegi/gu/lookathil.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/lookathil.s rename to ver/ique/asm/libultra/monegi/gu/lookathil.s diff --git a/ver/cn/asm/libultra/monegi/gu/lookatref.s b/ver/ique/asm/libultra/monegi/gu/lookatref.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/lookatref.s rename to ver/ique/asm/libultra/monegi/gu/lookatref.s diff --git a/ver/cn/asm/libultra/monegi/gu/ortho.s b/ver/ique/asm/libultra/monegi/gu/ortho.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/ortho.s rename to ver/ique/asm/libultra/monegi/gu/ortho.s diff --git a/ver/cn/asm/libultra/monegi/gu/perspective.s b/ver/ique/asm/libultra/monegi/gu/perspective.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/perspective.s rename to ver/ique/asm/libultra/monegi/gu/perspective.s diff --git a/ver/cn/asm/libultra/monegi/gu/position.s b/ver/ique/asm/libultra/monegi/gu/position.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/position.s rename to ver/ique/asm/libultra/monegi/gu/position.s diff --git a/ver/cn/asm/libultra/monegi/gu/rotateRPY.s b/ver/ique/asm/libultra/monegi/gu/rotateRPY.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/rotateRPY.s rename to ver/ique/asm/libultra/monegi/gu/rotateRPY.s diff --git a/ver/cn/asm/libultra/monegi/gu/sins.s b/ver/ique/asm/libultra/monegi/gu/sins.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/sins.s rename to ver/ique/asm/libultra/monegi/gu/sins.s diff --git a/ver/cn/asm/libultra/monegi/gu/sqrtf.s b/ver/ique/asm/libultra/monegi/gu/sqrtf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/gu/sqrtf.s rename to ver/ique/asm/libultra/monegi/gu/sqrtf.s diff --git a/ver/cn/asm/libultra/monegi/libc/bcmp.s b/ver/ique/asm/libultra/monegi/libc/bcmp.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/bcmp.s rename to ver/ique/asm/libultra/monegi/libc/bcmp.s diff --git a/ver/cn/asm/libultra/monegi/libc/bcopy.s b/ver/ique/asm/libultra/monegi/libc/bcopy.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/bcopy.s rename to ver/ique/asm/libultra/monegi/libc/bcopy.s diff --git a/ver/cn/asm/libultra/monegi/libc/bzero.s b/ver/ique/asm/libultra/monegi/libc/bzero.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/bzero.s rename to ver/ique/asm/libultra/monegi/libc/bzero.s diff --git a/ver/cn/asm/libultra/monegi/libc/ldiv.s b/ver/ique/asm/libultra/monegi/libc/ldiv.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/ldiv.s rename to ver/ique/asm/libultra/monegi/libc/ldiv.s diff --git a/ver/cn/asm/libultra/monegi/libc/string.s b/ver/ique/asm/libultra/monegi/libc/string.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/string.s rename to ver/ique/asm/libultra/monegi/libc/string.s diff --git a/ver/cn/asm/libultra/monegi/libc/xldtob.s b/ver/ique/asm/libultra/monegi/libc/xldtob.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/xldtob.s rename to ver/ique/asm/libultra/monegi/libc/xldtob.s diff --git a/ver/cn/asm/libultra/monegi/libc/xlitob.s b/ver/ique/asm/libultra/monegi/libc/xlitob.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/xlitob.s rename to ver/ique/asm/libultra/monegi/libc/xlitob.s diff --git a/ver/cn/asm/libultra/monegi/libc/xprintf.s b/ver/ique/asm/libultra/monegi/libc/xprintf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/libc/xprintf.s rename to ver/ique/asm/libultra/monegi/libc/xprintf.s diff --git a/ver/cn/asm/libultra/monegi/message/createmesgqueue.s b/ver/ique/asm/libultra/monegi/message/createmesgqueue.s similarity index 100% rename from ver/cn/asm/libultra/monegi/message/createmesgqueue.s rename to ver/ique/asm/libultra/monegi/message/createmesgqueue.s diff --git a/ver/cn/asm/libultra/monegi/message/jammesg.s b/ver/ique/asm/libultra/monegi/message/jammesg.s similarity index 100% rename from ver/cn/asm/libultra/monegi/message/jammesg.s rename to ver/ique/asm/libultra/monegi/message/jammesg.s diff --git a/ver/cn/asm/libultra/monegi/message/recvmesg.s b/ver/ique/asm/libultra/monegi/message/recvmesg.s similarity index 100% rename from ver/cn/asm/libultra/monegi/message/recvmesg.s rename to ver/ique/asm/libultra/monegi/message/recvmesg.s diff --git a/ver/cn/asm/libultra/monegi/message/sendmesg..s b/ver/ique/asm/libultra/monegi/message/sendmesg..s similarity index 100% rename from ver/cn/asm/libultra/monegi/message/sendmesg..s rename to ver/ique/asm/libultra/monegi/message/sendmesg..s diff --git a/ver/cn/asm/libultra/monegi/message/seteventmesg.s b/ver/ique/asm/libultra/monegi/message/seteventmesg.s similarity index 100% rename from ver/cn/asm/libultra/monegi/message/seteventmesg.s rename to ver/ique/asm/libultra/monegi/message/seteventmesg.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxcatf.s b/ver/ique/asm/libultra/monegi/mgu/mtxcatf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxcatf.s rename to ver/ique/asm/libultra/monegi/mgu/mtxcatf.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxcatl.s b/ver/ique/asm/libultra/monegi/mgu/mtxcatl.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxcatl.s rename to ver/ique/asm/libultra/monegi/mgu/mtxcatl.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxf2l.s b/ver/ique/asm/libultra/monegi/mgu/mtxf2l.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxf2l.s rename to ver/ique/asm/libultra/monegi/mgu/mtxf2l.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxident.s b/ver/ique/asm/libultra/monegi/mgu/mtxident.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxident.s rename to ver/ique/asm/libultra/monegi/mgu/mtxident.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxidentf.s b/ver/ique/asm/libultra/monegi/mgu/mtxidentf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxidentf.s rename to ver/ique/asm/libultra/monegi/mgu/mtxidentf.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxl2f.s b/ver/ique/asm/libultra/monegi/mgu/mtxl2f.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxl2f.s rename to ver/ique/asm/libultra/monegi/mgu/mtxl2f.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxxfmf.s b/ver/ique/asm/libultra/monegi/mgu/mtxxfmf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxxfmf.s rename to ver/ique/asm/libultra/monegi/mgu/mtxxfmf.s diff --git a/ver/cn/asm/libultra/monegi/mgu/mtxxfml.s b/ver/ique/asm/libultra/monegi/mgu/mtxxfml.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/mtxxfml.s rename to ver/ique/asm/libultra/monegi/mgu/mtxxfml.s diff --git a/ver/cn/asm/libultra/monegi/mgu/normalize.s b/ver/ique/asm/libultra/monegi/mgu/normalize.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/normalize.s rename to ver/ique/asm/libultra/monegi/mgu/normalize.s diff --git a/ver/cn/asm/libultra/monegi/mgu/rotate.s b/ver/ique/asm/libultra/monegi/mgu/rotate.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/rotate.s rename to ver/ique/asm/libultra/monegi/mgu/rotate.s diff --git a/ver/cn/asm/libultra/monegi/mgu/scale.s b/ver/ique/asm/libultra/monegi/mgu/scale.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/scale.s rename to ver/ique/asm/libultra/monegi/mgu/scale.s diff --git a/ver/cn/asm/libultra/monegi/mgu/scalef.s b/ver/ique/asm/libultra/monegi/mgu/scalef.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/scalef.s rename to ver/ique/asm/libultra/monegi/mgu/scalef.s diff --git a/ver/cn/asm/libultra/monegi/mgu/translate.s b/ver/ique/asm/libultra/monegi/mgu/translate.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/translate.s rename to ver/ique/asm/libultra/monegi/mgu/translate.s diff --git a/ver/cn/asm/libultra/monegi/mgu/translatef.s b/ver/ique/asm/libultra/monegi/mgu/translatef.s similarity index 100% rename from ver/cn/asm/libultra/monegi/mgu/translatef.s rename to ver/ique/asm/libultra/monegi/mgu/translatef.s diff --git a/ver/cn/asm/libultra/monegi/reg/_getcount.s b/ver/ique/asm/libultra/monegi/reg/_getcount.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/_getcount.s rename to ver/ique/asm/libultra/monegi/reg/_getcount.s diff --git a/ver/cn/asm/libultra/monegi/reg/_setcompare.s b/ver/ique/asm/libultra/monegi/reg/_setcompare.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/_setcompare.s rename to ver/ique/asm/libultra/monegi/reg/_setcompare.s diff --git a/ver/cn/asm/libultra/monegi/reg/getcause.s b/ver/ique/asm/libultra/monegi/reg/getcause.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/getcause.s rename to ver/ique/asm/libultra/monegi/reg/getcause.s diff --git a/ver/cn/asm/libultra/monegi/reg/getsr.s b/ver/ique/asm/libultra/monegi/reg/getsr.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/getsr.s rename to ver/ique/asm/libultra/monegi/reg/getsr.s diff --git a/ver/cn/asm/libultra/monegi/reg/setfpccsr.s b/ver/ique/asm/libultra/monegi/reg/setfpccsr.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/setfpccsr.s rename to ver/ique/asm/libultra/monegi/reg/setfpccsr.s diff --git a/ver/cn/asm/libultra/monegi/reg/setsr.s b/ver/ique/asm/libultra/monegi/reg/setsr.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/setsr.s rename to ver/ique/asm/libultra/monegi/reg/setsr.s diff --git a/ver/cn/asm/libultra/monegi/reg/setwatchlo.s b/ver/ique/asm/libultra/monegi/reg/setwatchlo.s similarity index 100% rename from ver/cn/asm/libultra/monegi/reg/setwatchlo.s rename to ver/ique/asm/libultra/monegi/reg/setwatchlo.s diff --git a/ver/cn/asm/libultra/monegi/rsp/sp.s b/ver/ique/asm/libultra/monegi/rsp/sp.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/sp.s rename to ver/ique/asm/libultra/monegi/rsp/sp.s diff --git a/ver/cn/asm/libultra/monegi/rsp/spgetstat.s b/ver/ique/asm/libultra/monegi/rsp/spgetstat.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/spgetstat.s rename to ver/ique/asm/libultra/monegi/rsp/spgetstat.s diff --git a/ver/cn/asm/libultra/monegi/rsp/sprawdma.s b/ver/ique/asm/libultra/monegi/rsp/sprawdma.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/sprawdma.s rename to ver/ique/asm/libultra/monegi/rsp/sprawdma.s diff --git a/ver/cn/asm/libultra/monegi/rsp/spsetpc.s b/ver/ique/asm/libultra/monegi/rsp/spsetpc.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/spsetpc.s rename to ver/ique/asm/libultra/monegi/rsp/spsetpc.s diff --git a/ver/cn/asm/libultra/monegi/rsp/spsetstat.s b/ver/ique/asm/libultra/monegi/rsp/spsetstat.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/spsetstat.s rename to ver/ique/asm/libultra/monegi/rsp/spsetstat.s diff --git a/ver/cn/asm/libultra/monegi/rsp/sptask.s b/ver/ique/asm/libultra/monegi/rsp/sptask.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/sptask.s rename to ver/ique/asm/libultra/monegi/rsp/sptask.s diff --git a/ver/cn/asm/libultra/monegi/rsp/sptaskyield.s b/ver/ique/asm/libultra/monegi/rsp/sptaskyield.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/sptaskyield.s rename to ver/ique/asm/libultra/monegi/rsp/sptaskyield.s diff --git a/ver/cn/asm/libultra/monegi/rsp/sptaskyielded.s b/ver/ique/asm/libultra/monegi/rsp/sptaskyielded.s similarity index 100% rename from ver/cn/asm/libultra/monegi/rsp/sptaskyielded.s rename to ver/ique/asm/libultra/monegi/rsp/sptaskyielded.s diff --git a/ver/cn/asm/libultra/monegi/si/si.s b/ver/ique/asm/libultra/monegi/si/si.s similarity index 100% rename from ver/cn/asm/libultra/monegi/si/si.s rename to ver/ique/asm/libultra/monegi/si/si.s diff --git a/ver/cn/asm/libultra/monegi/si/siacs.s b/ver/ique/asm/libultra/monegi/si/siacs.s similarity index 100% rename from ver/cn/asm/libultra/monegi/si/siacs.s rename to ver/ique/asm/libultra/monegi/si/siacs.s diff --git a/ver/cn/asm/libultra/monegi/si/sirawdma.s b/ver/ique/asm/libultra/monegi/si/sirawdma.s similarity index 100% rename from ver/cn/asm/libultra/monegi/si/sirawdma.s rename to ver/ique/asm/libultra/monegi/si/sirawdma.s diff --git a/ver/cn/asm/libultra/monegi/si/sirawread.s b/ver/ique/asm/libultra/monegi/si/sirawread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/si/sirawread.s rename to ver/ique/asm/libultra/monegi/si/sirawread.s diff --git a/ver/cn/asm/libultra/monegi/si/sirawwrite.s b/ver/ique/asm/libultra/monegi/si/sirawwrite.s similarity index 100% rename from ver/cn/asm/libultra/monegi/si/sirawwrite.s rename to ver/ique/asm/libultra/monegi/si/sirawwrite.s diff --git a/ver/cn/asm/libultra/monegi/thread/createthread.s b/ver/ique/asm/libultra/monegi/thread/createthread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/createthread.s rename to ver/ique/asm/libultra/monegi/thread/createthread.s diff --git a/ver/cn/asm/libultra/monegi/thread/destroythread.s b/ver/ique/asm/libultra/monegi/thread/destroythread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/destroythread.s rename to ver/ique/asm/libultra/monegi/thread/destroythread.s diff --git a/ver/cn/asm/libultra/monegi/thread/getactivequeue.s b/ver/ique/asm/libultra/monegi/thread/getactivequeue.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/getactivequeue.s rename to ver/ique/asm/libultra/monegi/thread/getactivequeue.s diff --git a/ver/cn/asm/libultra/monegi/thread/getthreadpri.s b/ver/ique/asm/libultra/monegi/thread/getthreadpri.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/getthreadpri.s rename to ver/ique/asm/libultra/monegi/thread/getthreadpri.s diff --git a/ver/cn/asm/libultra/monegi/thread/setthreadpri.s b/ver/ique/asm/libultra/monegi/thread/setthreadpri.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/setthreadpri.s rename to ver/ique/asm/libultra/monegi/thread/setthreadpri.s diff --git a/ver/cn/asm/libultra/monegi/thread/startthread.s b/ver/ique/asm/libultra/monegi/thread/startthread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/startthread.s rename to ver/ique/asm/libultra/monegi/thread/startthread.s diff --git a/ver/cn/asm/libultra/monegi/thread/stopthread.s b/ver/ique/asm/libultra/monegi/thread/stopthread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/stopthread.s rename to ver/ique/asm/libultra/monegi/thread/stopthread.s diff --git a/ver/cn/asm/libultra/monegi/thread/thread.s b/ver/ique/asm/libultra/monegi/thread/thread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/thread.s rename to ver/ique/asm/libultra/monegi/thread/thread.s diff --git a/ver/cn/asm/libultra/monegi/thread/yieldthread.s b/ver/ique/asm/libultra/monegi/thread/yieldthread.s similarity index 100% rename from ver/cn/asm/libultra/monegi/thread/yieldthread.s rename to ver/ique/asm/libultra/monegi/thread/yieldthread.s diff --git a/ver/cn/asm/libultra/monegi/time/gettime.s b/ver/ique/asm/libultra/monegi/time/gettime.s similarity index 100% rename from ver/cn/asm/libultra/monegi/time/gettime.s rename to ver/ique/asm/libultra/monegi/time/gettime.s diff --git a/ver/cn/asm/libultra/monegi/time/settime.s b/ver/ique/asm/libultra/monegi/time/settime.s similarity index 100% rename from ver/cn/asm/libultra/monegi/time/settime.s rename to ver/ique/asm/libultra/monegi/time/settime.s diff --git a/ver/cn/asm/libultra/monegi/time/settimer.s b/ver/ique/asm/libultra/monegi/time/settimer.s similarity index 100% rename from ver/cn/asm/libultra/monegi/time/settimer.s rename to ver/ique/asm/libultra/monegi/time/settimer.s diff --git a/ver/cn/asm/libultra/monegi/time/timerintr.s b/ver/ique/asm/libultra/monegi/time/timerintr.s similarity index 100% rename from ver/cn/asm/libultra/monegi/time/timerintr.s rename to ver/ique/asm/libultra/monegi/time/timerintr.s diff --git a/ver/cn/asm/libultra/monegi/tlb/maptlb.s b/ver/ique/asm/libultra/monegi/tlb/maptlb.s similarity index 100% rename from ver/cn/asm/libultra/monegi/tlb/maptlb.s rename to ver/ique/asm/libultra/monegi/tlb/maptlb.s diff --git a/ver/cn/asm/libultra/monegi/tlb/maptlbrdb.s b/ver/ique/asm/libultra/monegi/tlb/maptlbrdb.s similarity index 100% rename from ver/cn/asm/libultra/monegi/tlb/maptlbrdb.s rename to ver/ique/asm/libultra/monegi/tlb/maptlbrdb.s diff --git a/ver/cn/asm/libultra/monegi/tlb/probetlb.s b/ver/ique/asm/libultra/monegi/tlb/probetlb.s similarity index 100% rename from ver/cn/asm/libultra/monegi/tlb/probetlb.s rename to ver/ique/asm/libultra/monegi/tlb/probetlb.s diff --git a/ver/cn/asm/libultra/monegi/tlb/unmaptlb.s b/ver/ique/asm/libultra/monegi/tlb/unmaptlb.s similarity index 100% rename from ver/cn/asm/libultra/monegi/tlb/unmaptlb.s rename to ver/ique/asm/libultra/monegi/tlb/unmaptlb.s diff --git a/ver/cn/asm/libultra/monegi/tlb/unmaptlball.s b/ver/ique/asm/libultra/monegi/tlb/unmaptlball.s similarity index 100% rename from ver/cn/asm/libultra/monegi/tlb/unmaptlball.s rename to ver/ique/asm/libultra/monegi/tlb/unmaptlball.s diff --git a/ver/cn/asm/libultra/monegi/vi/vi.s b/ver/ique/asm/libultra/monegi/vi/vi.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vi.s rename to ver/ique/asm/libultra/monegi/vi/vi.s diff --git a/ver/cn/asm/libultra/monegi/vi/viblack.s b/ver/ique/asm/libultra/monegi/vi/viblack.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/viblack.s rename to ver/ique/asm/libultra/monegi/vi/viblack.s diff --git a/ver/cn/asm/libultra/monegi/vi/vigetcurrcontext.s b/ver/ique/asm/libultra/monegi/vi/vigetcurrcontext.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vigetcurrcontext.s rename to ver/ique/asm/libultra/monegi/vi/vigetcurrcontext.s diff --git a/ver/cn/asm/libultra/monegi/vi/vigetcurrframebuf.s b/ver/ique/asm/libultra/monegi/vi/vigetcurrframebuf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vigetcurrframebuf.s rename to ver/ique/asm/libultra/monegi/vi/vigetcurrframebuf.s diff --git a/ver/cn/asm/libultra/monegi/vi/vigetmode.s b/ver/ique/asm/libultra/monegi/vi/vigetmode.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vigetmode.s rename to ver/ique/asm/libultra/monegi/vi/vigetmode.s diff --git a/ver/cn/asm/libultra/monegi/vi/vigetnextframebuf.s b/ver/ique/asm/libultra/monegi/vi/vigetnextframebuf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vigetnextframebuf.s rename to ver/ique/asm/libultra/monegi/vi/vigetnextframebuf.s diff --git a/ver/cn/asm/libultra/monegi/vi/vimgr.s b/ver/ique/asm/libultra/monegi/vi/vimgr.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/vimgr.s rename to ver/ique/asm/libultra/monegi/vi/vimgr.s diff --git a/ver/cn/asm/libultra/monegi/vi/virepeatline.s b/ver/ique/asm/libultra/monegi/vi/virepeatline.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/virepeatline.s rename to ver/ique/asm/libultra/monegi/vi/virepeatline.s diff --git a/ver/cn/asm/libultra/monegi/vi/visetevent.s b/ver/ique/asm/libultra/monegi/vi/visetevent.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/visetevent.s rename to ver/ique/asm/libultra/monegi/vi/visetevent.s diff --git a/ver/cn/asm/libultra/monegi/vi/visetmode.s b/ver/ique/asm/libultra/monegi/vi/visetmode.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/visetmode.s rename to ver/ique/asm/libultra/monegi/vi/visetmode.s diff --git a/ver/cn/asm/libultra/monegi/vi/visetspecial.s b/ver/ique/asm/libultra/monegi/vi/visetspecial.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/visetspecial.s rename to ver/ique/asm/libultra/monegi/vi/visetspecial.s diff --git a/ver/cn/asm/libultra/monegi/vi/visetyscale.s b/ver/ique/asm/libultra/monegi/vi/visetyscale.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/visetyscale.s rename to ver/ique/asm/libultra/monegi/vi/visetyscale.s diff --git a/ver/cn/asm/libultra/monegi/vi/viswapbuf.s b/ver/ique/asm/libultra/monegi/vi/viswapbuf.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/viswapbuf.s rename to ver/ique/asm/libultra/monegi/vi/viswapbuf.s diff --git a/ver/cn/asm/libultra/monegi/vi/viswapcontext.s b/ver/ique/asm/libultra/monegi/vi/viswapcontext.s similarity index 100% rename from ver/cn/asm/libultra/monegi/vi/viswapcontext.s rename to ver/ique/asm/libultra/monegi/vi/viswapcontext.s diff --git a/ver/cn/asm/libultra/nintendo/exception/exceptasm.s b/ver/ique/asm/libultra/nintendo/exception/exceptasm.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/exception/exceptasm.s rename to ver/ique/asm/libultra/nintendo/exception/exceptasm.s diff --git a/ver/cn/asm/libultra/nintendo/exception/interrupt.s b/ver/ique/asm/libultra/nintendo/exception/interrupt.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/exception/interrupt.s rename to ver/ique/asm/libultra/nintendo/exception/interrupt.s diff --git a/ver/cn/asm/libultra/nintendo/exception/resetglobalintmask.s b/ver/ique/asm/libultra/nintendo/exception/resetglobalintmask.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/exception/resetglobalintmask.s rename to ver/ique/asm/libultra/nintendo/exception/resetglobalintmask.s diff --git a/ver/cn/asm/libultra/nintendo/exception/setglobalintmask.s b/ver/ique/asm/libultra/nintendo/exception/setglobalintmask.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/exception/setglobalintmask.s rename to ver/ique/asm/libultra/nintendo/exception/setglobalintmask.s diff --git a/ver/cn/asm/libultra/nintendo/exception/setintmask.s b/ver/ique/asm/libultra/nintendo/exception/setintmask.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/exception/setintmask.s rename to ver/ique/asm/libultra/nintendo/exception/setintmask.s diff --git a/ver/cn/asm/libultra/nintendo/flash/flashinit.s b/ver/ique/asm/libultra/nintendo/flash/flashinit.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/flash/flashinit.s rename to ver/ique/asm/libultra/nintendo/flash/flashinit.s diff --git a/ver/cn/asm/libultra/nintendo/flash/flashreadarray.s b/ver/ique/asm/libultra/nintendo/flash/flashreadarray.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/flash/flashreadarray.s rename to ver/ique/asm/libultra/nintendo/flash/flashreadarray.s diff --git a/ver/cn/asm/libultra/nintendo/flash/flashsectorerase.s b/ver/ique/asm/libultra/nintendo/flash/flashsectorerase.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/flash/flashsectorerase.s rename to ver/ique/asm/libultra/nintendo/flash/flashsectorerase.s diff --git a/ver/cn/asm/libultra/nintendo/flash/flashwritearray.s b/ver/ique/asm/libultra/nintendo/flash/flashwritearray.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/flash/flashwritearray.s rename to ver/ique/asm/libultra/nintendo/flash/flashwritearray.s diff --git a/ver/cn/asm/libultra/nintendo/flash/flashwritebuffer.s b/ver/ique/asm/libultra/nintendo/flash/flashwritebuffer.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/flash/flashwritebuffer.s rename to ver/ique/asm/libultra/nintendo/flash/flashwritebuffer.s diff --git a/ver/cn/asm/libultra/nintendo/pi/cartrominit.s b/ver/ique/asm/libultra/nintendo/pi/cartrominit.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/cartrominit.s rename to ver/ique/asm/libultra/nintendo/pi/cartrominit.s diff --git a/ver/cn/asm/libultra/nintendo/pi/devmgr.s b/ver/ique/asm/libultra/nintendo/pi/devmgr.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/devmgr.s rename to ver/ique/asm/libultra/nintendo/pi/devmgr.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epidma.s b/ver/ique/asm/libultra/nintendo/pi/epidma.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epidma.s rename to ver/ique/asm/libultra/nintendo/pi/epidma.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epilinkhandle.s b/ver/ique/asm/libultra/nintendo/pi/epilinkhandle.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epilinkhandle.s rename to ver/ique/asm/libultra/nintendo/pi/epilinkhandle.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epirawdma.s b/ver/ique/asm/libultra/nintendo/pi/epirawdma.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epirawdma.s rename to ver/ique/asm/libultra/nintendo/pi/epirawdma.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epirawread.s b/ver/ique/asm/libultra/nintendo/pi/epirawread.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epirawread.s rename to ver/ique/asm/libultra/nintendo/pi/epirawread.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epirawwrite.s b/ver/ique/asm/libultra/nintendo/pi/epirawwrite.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epirawwrite.s rename to ver/ique/asm/libultra/nintendo/pi/epirawwrite.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epiread.s b/ver/ique/asm/libultra/nintendo/pi/epiread.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epiread.s rename to ver/ique/asm/libultra/nintendo/pi/epiread.s diff --git a/ver/cn/asm/libultra/nintendo/pi/epiwrite.s b/ver/ique/asm/libultra/nintendo/pi/epiwrite.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/epiwrite.s rename to ver/ique/asm/libultra/nintendo/pi/epiwrite.s diff --git a/ver/cn/asm/libultra/nintendo/pi/piacs.s b/ver/ique/asm/libultra/nintendo/pi/piacs.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/piacs.s rename to ver/ique/asm/libultra/nintendo/pi/piacs.s diff --git a/ver/cn/asm/libultra/nintendo/pi/pigetcmdq.s b/ver/ique/asm/libultra/nintendo/pi/pigetcmdq.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/pigetcmdq.s rename to ver/ique/asm/libultra/nintendo/pi/pigetcmdq.s diff --git a/ver/cn/asm/libultra/nintendo/pi/pimgr.s b/ver/ique/asm/libultra/nintendo/pi/pimgr.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/pimgr.s rename to ver/ique/asm/libultra/nintendo/pi/pimgr.s diff --git a/ver/cn/asm/libultra/nintendo/pi/pirawdma.s b/ver/ique/asm/libultra/nintendo/pi/pirawdma.s similarity index 100% rename from ver/cn/asm/libultra/nintendo/pi/pirawdma.s rename to ver/ique/asm/libultra/nintendo/pi/pirawdma.s diff --git a/ver/cn/asm/libultra/shared/motor/motor.s b/ver/ique/asm/libultra/shared/motor/motor.s similarity index 100% rename from ver/cn/asm/libultra/shared/motor/motor.s rename to ver/ique/asm/libultra/shared/motor/motor.s diff --git a/ver/cn/asm/libultra/shared/pfs/contpfs.s b/ver/ique/asm/libultra/shared/pfs/contpfs.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/contpfs.s rename to ver/ique/asm/libultra/shared/pfs/contpfs.s diff --git a/ver/cn/asm/libultra/shared/pfs/contramread.s b/ver/ique/asm/libultra/shared/pfs/contramread.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/contramread.s rename to ver/ique/asm/libultra/shared/pfs/contramread.s diff --git a/ver/cn/asm/libultra/shared/pfs/contramwrite.s b/ver/ique/asm/libultra/shared/pfs/contramwrite.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/contramwrite.s rename to ver/ique/asm/libultra/shared/pfs/contramwrite.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsallocatefile.s b/ver/ique/asm/libultra/shared/pfs/pfsallocatefile.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsallocatefile.s rename to ver/ique/asm/libultra/shared/pfs/pfsallocatefile.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfschecker.s b/ver/ique/asm/libultra/shared/pfs/pfschecker.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfschecker.s rename to ver/ique/asm/libultra/shared/pfs/pfschecker.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsdeletefile.s b/ver/ique/asm/libultra/shared/pfs/pfsdeletefile.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsdeletefile.s rename to ver/ique/asm/libultra/shared/pfs/pfsdeletefile.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsfilestate.s b/ver/ique/asm/libultra/shared/pfs/pfsfilestate.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsfilestate.s rename to ver/ique/asm/libultra/shared/pfs/pfsfilestate.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsfreeblocks.s b/ver/ique/asm/libultra/shared/pfs/pfsfreeblocks.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsfreeblocks.s rename to ver/ique/asm/libultra/shared/pfs/pfsfreeblocks.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsgetstatus.s b/ver/ique/asm/libultra/shared/pfs/pfsgetstatus.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsgetstatus.s rename to ver/ique/asm/libultra/shared/pfs/pfsgetstatus.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsinitpak.s b/ver/ique/asm/libultra/shared/pfs/pfsinitpak.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsinitpak.s rename to ver/ique/asm/libultra/shared/pfs/pfsinitpak.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsisplug.s b/ver/ique/asm/libultra/shared/pfs/pfsisplug.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsisplug.s rename to ver/ique/asm/libultra/shared/pfs/pfsisplug.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsnumfiles.s b/ver/ique/asm/libultra/shared/pfs/pfsnumfiles.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsnumfiles.s rename to ver/ique/asm/libultra/shared/pfs/pfsnumfiles.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsreadwritefile.s b/ver/ique/asm/libultra/shared/pfs/pfsreadwritefile.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsreadwritefile.s rename to ver/ique/asm/libultra/shared/pfs/pfsreadwritefile.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsrepairid.s b/ver/ique/asm/libultra/shared/pfs/pfsrepairid.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsrepairid.s rename to ver/ique/asm/libultra/shared/pfs/pfsrepairid.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfssearchfile.s b/ver/ique/asm/libultra/shared/pfs/pfssearchfile.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfssearchfile.s rename to ver/ique/asm/libultra/shared/pfs/pfssearchfile.s diff --git a/ver/cn/asm/libultra/shared/pfs/pfsselectbank.s b/ver/ique/asm/libultra/shared/pfs/pfsselectbank.s similarity index 100% rename from ver/cn/asm/libultra/shared/pfs/pfsselectbank.s rename to ver/ique/asm/libultra/shared/pfs/pfsselectbank.s diff --git a/ver/cn/asm/libultra/shared/system/afterprenmi.s b/ver/ique/asm/libultra/shared/system/afterprenmi.s similarity index 100% rename from ver/cn/asm/libultra/shared/system/afterprenmi.s rename to ver/ique/asm/libultra/shared/system/afterprenmi.s diff --git a/ver/cn/asm/libultra/shared/system/initialize.s b/ver/ique/asm/libultra/shared/system/initialize.s similarity index 100% rename from ver/cn/asm/libultra/shared/system/initialize.s rename to ver/ique/asm/libultra/shared/system/initialize.s diff --git a/ver/cn/asm/nonmatchings/9d10_len_1080/update_camera_mode_1.s b/ver/ique/asm/nonmatchings/9d10_len_1080/update_camera_mode_1.s similarity index 100% rename from ver/cn/asm/nonmatchings/9d10_len_1080/update_camera_mode_1.s rename to ver/ique/asm/nonmatchings/9d10_len_1080/update_camera_mode_1.s diff --git a/ver/cn/asm/nonmatchings/9d10_len_1080/update_camera_mode_2.s b/ver/ique/asm/nonmatchings/9d10_len_1080/update_camera_mode_2.s similarity index 100% rename from ver/cn/asm/nonmatchings/9d10_len_1080/update_camera_mode_2.s rename to ver/ique/asm/nonmatchings/9d10_len_1080/update_camera_mode_2.s diff --git a/ver/cn/asm/nonmatchings/B4580/appendGfx_animator_node.s b/ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s similarity index 100% rename from ver/cn/asm/nonmatchings/B4580/appendGfx_animator_node.s rename to ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s diff --git a/ver/cn/asm/nonmatchings/C50A0/draw_image_with_clipping.s b/ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s similarity index 100% rename from ver/cn/asm/nonmatchings/C50A0/draw_image_with_clipping.s rename to ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s diff --git a/ver/cn/asm/nonmatchings/C50A0/test_item_player_collision.s b/ver/ique/asm/nonmatchings/C50A0/test_item_player_collision.s similarity index 100% rename from ver/cn/asm/nonmatchings/C50A0/test_item_player_collision.s rename to ver/ique/asm/nonmatchings/C50A0/test_item_player_collision.s diff --git a/ver/cn/asm/nonmatchings/a5dd0_len_114e0/mdl_project_tex_coords.s b/ver/ique/asm/nonmatchings/a5dd0_len_114e0/mdl_project_tex_coords.s similarity index 100% rename from ver/cn/asm/nonmatchings/a5dd0_len_114e0/mdl_project_tex_coords.s rename to ver/ique/asm/nonmatchings/a5dd0_len_114e0/mdl_project_tex_coords.s diff --git a/ver/cn/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s b/ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s similarity index 100% rename from ver/cn/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s rename to ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s diff --git a/ver/cn/asm/nonmatchings/hud_element/render_hud_element.s b/ver/ique/asm/nonmatchings/hud_element/render_hud_element.s similarity index 100% rename from ver/cn/asm/nonmatchings/hud_element/render_hud_element.s rename to ver/ique/asm/nonmatchings/hud_element/render_hud_element.s diff --git a/ver/cn/asm/nonmatchings/msg/appendGfx_message.s b/ver/ique/asm/nonmatchings/msg/appendGfx_message.s similarity index 100% rename from ver/cn/asm/nonmatchings/msg/appendGfx_message.s rename to ver/ique/asm/nonmatchings/msg/appendGfx_message.s diff --git a/ver/cn/asm/nonmatchings/msg/msg_copy_to_print_buffer.s b/ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s similarity index 100% rename from ver/cn/asm/nonmatchings/msg/msg_copy_to_print_buffer.s rename to ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s diff --git a/ver/cn/asm/nonmatchings/msg/msg_draw_char.s b/ver/ique/asm/nonmatchings/msg/msg_draw_char.s similarity index 100% rename from ver/cn/asm/nonmatchings/msg/msg_draw_char.s rename to ver/ique/asm/nonmatchings/msg/msg_draw_char.s diff --git a/ver/cn/asm/nonmatchings/npc/npc_do_player_collision.s b/ver/ique/asm/nonmatchings/npc/npc_do_player_collision.s similarity index 100% rename from ver/cn/asm/nonmatchings/npc/npc_do_player_collision.s rename to ver/ique/asm/nonmatchings/npc/npc_do_player_collision.s diff --git a/ver/cn/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s b/ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s similarity index 100% rename from ver/cn/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s rename to ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s diff --git a/ver/cn/asm/os/decode_yay0.s b/ver/ique/asm/os/decode_yay0.s similarity index 100% rename from ver/cn/asm/os/decode_yay0.s rename to ver/ique/asm/os/decode_yay0.s diff --git a/ver/cn/asm/os/parameters.s b/ver/ique/asm/os/parameters.s similarity index 100% rename from ver/cn/asm/os/parameters.s rename to ver/ique/asm/os/parameters.s diff --git a/ver/ique/checksum.sha1 b/ver/ique/checksum.sha1 new file mode 100644 index 0000000000..c4b007d889 --- /dev/null +++ b/ver/ique/checksum.sha1 @@ -0,0 +1 @@ +5c724685085eba796537573dd6f84aaddedc8582 ver/ique/build/papermario.z64 diff --git a/ver/cn/effects.yaml b/ver/ique/effects.yaml similarity index 100% rename from ver/cn/effects.yaml rename to ver/ique/effects.yaml diff --git a/ver/cn/include/message_ids.h b/ver/ique/include/message_ids.h similarity index 100% rename from ver/cn/include/message_ids.h rename to ver/ique/include/message_ids.h diff --git a/ver/cn/splat.yaml b/ver/ique/splat.yaml similarity index 99% rename from ver/cn/splat.yaml rename to ver/ique/splat.yaml index 89380a6e21..27f5830956 100644 --- a/ver/cn/splat.yaml +++ b/ver/ique/splat.yaml @@ -1,4 +1,4 @@ -name: Mario Story +name: Paper Mario (iQue) options: basename: papermario find_file_boundaries: True @@ -8,24 +8,24 @@ options: subalign: 8 base_path: ../.. - target_path: ver/cn/baserom.z64 + target_path: ver/ique/baserom.z64 extensions_path: tools/splat_ext - symbol_addrs_path: ver/cn/symbol_addrs.txt - ld_script_path: ver/cn/papermario.ld - ld_symbol_header_path: ver/cn/build/include/ld_addrs.h + symbol_addrs_path: ver/ique/symbol_addrs.txt + ld_script_path: ver/ique/papermario.ld + ld_symbol_header_path: ver/ique/build/include/ld_addrs.h src_path: src - asm_path: ver/cn/asm - asset_path: assets/cn - build_path: ver/cn/build - cache_path: ver/cn/.splat_cache + asm_path: ver/ique/asm + asset_path: assets/ique + build_path: ver/ique/build + cache_path: ver/ique/.splat_cache create_undefined_funcs_auto: False - undefined_funcs_auto_path: ver/cn/undefined_funcs_auto.txt + undefined_funcs_auto_path: ver/ique/undefined_funcs_auto.txt create_undefined_syms_auto: False - undefined_syms_auto_path: ver/cn/undefined_syms_auto.txt + undefined_syms_auto_path: ver/ique/undefined_syms_auto.txt symbol_name_format: IQUE_$VRAM symbol_name_format_no_rom: IQUE_$VRAM_$SEG asset_stack: - - cn + - ique segments: - name: header type: header diff --git a/ver/cn/symbol_addrs.txt b/ver/ique/symbol_addrs.txt similarity index 100% rename from ver/cn/symbol_addrs.txt rename to ver/ique/symbol_addrs.txt diff --git a/ver/cn/undefined_funcs_auto.txt b/ver/ique/undefined_funcs_auto.txt similarity index 100% rename from ver/cn/undefined_funcs_auto.txt rename to ver/ique/undefined_funcs_auto.txt diff --git a/ver/cn/undefined_syms.txt b/ver/ique/undefined_syms.txt similarity index 100% rename from ver/cn/undefined_syms.txt rename to ver/ique/undefined_syms.txt diff --git a/ver/cn/undefined_syms_auto.txt b/ver/ique/undefined_syms_auto.txt similarity index 100% rename from ver/cn/undefined_syms_auto.txt rename to ver/ique/undefined_syms_auto.txt