From 4b8cf4324a88fb091f1f11297677df4f3ae19f74 Mon Sep 17 00:00:00 2001 From: Prakxo Date: Sat, 9 Dec 2023 13:34:31 +0100 Subject: [PATCH] repo structure overhaul --- .gitignore | 2 +- common.py | 18 +- config/dol.yml | 2 +- config/symbols.yml | 274 +++++------ configure.py | 22 +- dump/main.dol.sha1 | 1 - dump/static.dol.sha1 | 1 + include/m_font.h | 2 +- progress.py | 2 +- {rel => src}/THA_GA.c | 0 {rel => src}/TwoHeadArena.c | 0 {rel => src}/ac_airplane.c | 0 {rel => src}/ac_animal_logo.c | 2 +- {rel => src}/ac_animal_logo_misc.c | 0 {rel => src}/ac_aprilfool_control.c | 0 {rel => src}/ac_boxManager.c | 0 {rel => src}/ac_boxMove.c | 0 {rel => src}/ac_boxTrick01.c | 0 {rel => src}/ac_douzou.c | 4 +- {rel => src}/ac_douzou_draw.c_inc | 0 {rel => src}/ac_douzou_move.c_inc | 0 {rel => src}/ac_dump.c | 0 {rel => src}/ac_ev_dokutu.c | 2 +- {rel => src}/ac_ev_dokutu_talk.c_inc | 0 {rel => src}/ac_ev_soncho.c | 2 +- {rel => src}/ac_ev_soncho_talk.c_inc | 0 {rel => src}/ac_groundhog_control.c | 0 {rel => src}/ac_haniwa.c | 2 +- {rel => src}/ac_haniwa_move.c_inc | 0 {rel => src}/ac_radio.c | 4 +- {rel => src}/ac_radio_draw.c_inc | 0 {rel => src}/ac_radio_move.c_inc | 0 {rel => src}/ac_rope.c | 0 {rel => src}/ac_sample.c | 0 {rel => src}/ac_set_manager.c | 0 {rel => src}/ac_set_ovl_gyoei.c | 0 {rel => src}/ac_set_ovl_insect.c | 0 {rel => src}/ac_structure.c | 0 {rel => src}/ac_t_anrium1.c | 0 {rel => src}/ac_t_bag1.c | 0 {rel => src}/ac_t_bag2.c | 0 {rel => src}/ac_t_biscus1.c | 0 {rel => src}/ac_t_biscus2.c | 0 {rel => src}/ac_t_biscus3.c | 0 {rel => src}/ac_t_biscus4.c | 0 {rel => src}/ac_t_cobra1.c | 0 {rel => src}/ac_t_cracker.c | 0 {rel => src}/ac_t_flag.c | 0 {rel => src}/ac_t_hanabi.c | 0 {rel => src}/ac_t_hasu1.c | 0 {rel => src}/ac_t_hat1.c | 0 {rel => src}/ac_t_hat2.c | 0 {rel => src}/ac_t_hat3.c | 0 {rel => src}/ac_t_npc_sao.c | 0 {rel => src}/ac_t_pistol.c | 0 {rel => src}/ac_t_tumbler.c | 0 {rel => src}/ac_tama.c | 4 +- {rel => src}/ac_tama_draw.c_inc | 0 {rel => src}/ac_tama_move.c_inc | 0 {rel => src}/ac_tools.c | 0 {rel => src}/ac_toudai.c | 4 +- {rel => src}/ac_toudai_draw.c_inc | 0 {rel => src}/ac_toudai_move.c_inc | 0 {rel => src}/ac_train0.c | 4 +- {rel => src}/ac_train0_draw.c_inc | 0 {rel => src}/ac_train0_move.c_inc | 0 {rel => src}/ac_train1.c | 4 +- {rel => src}/ac_train1_draw.c_inc | 0 {rel => src}/ac_train1_move.c_inc | 0 {rel => src}/ac_train_door.c | 0 {rel => src}/ac_train_window.c | 0 {rel => src}/ac_weather.c | 0 {rel => src}/ac_weather_fine.c | 0 {rel => src}/ac_weather_leaf.c | 0 {rel => src}/ac_weather_rain.c | 0 {rel => src}/ac_weather_sakura.c | 0 {rel => src}/ac_weather_snow.c | 0 src/asm/__exception.s | 462 ------------------ {rel => src}/audio.c | 0 {rel => src}/c_keyframe.c | 0 {rel => src}/data/combi/data_combi.c | 0 {rel => src}/data/field/bg/beach_pal.c | 0 {rel => src}/data/field/bg/bush_pal.c | 0 {rel => src}/data/field/bg/cliff_pal.c | 0 {rel => src}/data/field/bg/earth_pal.c | 0 {rel => src}/data/field/bg/rail_pal.c | 0 {rel => src}/data/npc/default_list.c | 0 {rel => src}/data/npc/grow_list.c | 0 {rel => src}/data/npc/house_list.c | 0 {rel => src}/data/titledemo/pact0.c | 0 {rel => src}/data/titledemo/pact1.c | 0 {rel => src}/data/titledemo/pact2.c | 0 {rel => src}/data/titledemo/pact3.c | 0 {rel => src}/data/titledemo/pact4.c | 0 {rel => src}/ef_lamp_light.c | 0 {rel => src}/ef_room_sunshine.c | 0 {rel => src}/ef_room_sunshine_minsect.c | 0 {rel => src}/ef_room_sunshine_museum.c | 0 {rel => src}/ef_room_sunshine_police.c | 0 {rel => src}/ef_room_sunshine_posthouse.c | 0 {rel => src}/evw_anime.c | 0 {rel => src}/executor.c | 0 {rel => src}/famicom_emu.c | 0 {rel => src}/first_game.c | 0 {rel => src}/game.c | 0 {rel => src}/gamealloc.c | 0 {rel => src}/gfxalloc.c | 0 {rel => src}/graph.c | 0 {rel => src}/irqmgr.c | 0 {rel => src}/lb_reki.c | 0 {rel => src}/lb_rtc.c | 0 {rel => src}/m_actor.c | 0 {rel => src}/m_actor_dlftbls.c | 0 {rel => src}/m_actor_shadow.c | 0 {rel => src}/m_all_grow.c | 0 {rel => src}/m_all_grow_ovl.c | 0 {rel => src}/m_bank_ovl.c | 0 {rel => src}/m_banti.c | 0 {rel => src}/m_bg_item.c | 0 {rel => src}/m_bg_tex.c | 0 {rel => src}/m_calendar.c | 0 {rel => src}/m_camera2.c | 0 {rel => src}/m_cockroach.c | 0 {rel => src}/m_collision_bg.c | 0 {rel => src}/m_collision_obj.c | 0 {rel => src}/m_common_data.c | 0 {rel => src}/m_controller.c | 0 {rel => src}/m_cpak.c | 0 {rel => src}/m_debug.c | 0 {rel => src}/m_debug_display.c | 0 {rel => src}/m_debug_hayakawa.c | 0 {rel => src}/m_debug_mode.c | 0 {rel => src}/m_demo.c | 0 {rel => src}/m_eappli.c | 0 {rel => src}/m_editEndChk_ovl.c | 0 {rel => src}/m_editor_ovl.c | 0 {rel => src}/m_event.c | 0 {rel => src}/m_fbdemo.c | 0 {rel => src}/m_fbdemo_fade.c | 0 {rel => src}/m_fbdemo_triforce.c | 0 {rel => src}/m_fbdemo_wipe1.c | 0 {rel => src}/m_field_assessment.c | 0 {rel => src}/m_field_info.c | 0 {rel => src}/m_field_make.c | 0 {rel => src}/m_fishrecord.c | 0 {rel => src}/m_flashrom.c | 14 +- {rel => src}/m_font.c | 10 +- {rel => src}/m_font_main.c_inc | 14 +- {rel => src}/m_font_mark.c_inc | 0 {rel => src}/m_font_offset.c_inc | 2 +- {rel => src}/m_font_rect.c_inc | 0 {rel => src}/m_fuusen.c | 0 {rel => src}/m_game_dlftbls.c | 0 {rel => src}/m_handbill.c | 0 {rel => src}/m_haniwaPortrait_ovl.c | 0 {rel => src}/m_hboard_ovl.c | 0 {rel => src}/m_home.c | 0 {rel => src}/m_house.c | 0 {rel => src}/m_huusui_room.c | 0 {rel => src}/m_huusui_room_ovl.c | 2 +- {rel => src}/m_huusui_room_ovl_data.inc | 0 {rel => src}/m_island.c | 0 {rel => src}/m_item_debug.c | 0 {rel => src}/m_item_name.c | 0 {rel => src}/m_kabu_manager.c | 0 {rel => src}/m_kankyo.c | 2 +- {rel => src}/m_kankyo_weather.c_inc | 0 {rel => src}/m_land.c | 0 {rel => src}/m_lib.c | 0 {rel => src}/m_lights.c | 0 {rel => src}/m_mail.c | 0 {rel => src}/m_mail_check.c | 0 {rel => src}/m_mail_check_ovl.c | 0 {rel => src}/m_mail_password_check.c | 0 {rel => src}/m_malloc.c | 0 {rel => src}/m_map_ovl.c | 0 {rel => src}/m_mark_room.c | 0 {rel => src}/m_mark_room_ovl.c | 0 {rel => src}/m_melody.c | 0 {rel => src}/m_museum.c | 0 {rel => src}/m_museum_display.c | 0 {rel => src}/m_mushroom.c | 0 {rel => src}/m_music_ovl.c | 0 {rel => src}/m_name_table.c | 0 {rel => src}/m_needlework.c | 0 {rel => src}/m_notice.c | 0 {rel => src}/m_npc.c | 0 {rel => src}/m_npc_schedule.c | 0 {rel => src}/m_npc_walk.c | 0 {rel => src}/m_olib.c | 0 {rel => src}/m_passwordChk_ovl.c | 0 {rel => src}/m_passwordMake_ovl.c | 0 {rel => src}/m_pause.c | 0 {rel => src}/m_play.c | 0 {rel => src}/m_player_call.c | 0 {rel => src}/m_police_box.c | 0 {rel => src}/m_post_office.c | 0 {rel => src}/m_prenmi.c | 0 {rel => src}/m_private.c | 0 {rel => src}/m_quest.c | 0 {rel => src}/m_random_field.c | 0 {rel => src}/m_random_field_ovl.c | 0 {rel => src}/m_rcp.c | 0 {rel => src}/m_roll_lib.c | 0 {rel => src}/m_room_type.c | 0 {rel => src}/m_scene.c | 0 {rel => src}/m_scene_ftr.c | 0 {rel => src}/m_select.c | 0 {rel => src}/m_shop.c | 2 +- {rel => src}/m_skin_matrix.c | 0 {rel => src}/m_snowman.c | 0 {rel => src}/m_soncho.c | 0 {rel => src}/m_start_data_init.c | 0 {rel => src}/m_string.c | 0 {rel => src}/m_submenu.c | 0 {rel => src}/m_submenu_ovl.c | 0 {rel => src}/m_time.c | 0 {rel => src}/m_timeIn_ovl.c | 0 {rel => src}/m_titledemo.c | 0 {rel => src}/m_trademark.c | 0 {rel => src}/m_train_control.c | 0 {rel => src}/m_vibctl.c | 0 {rel => src}/m_view.c | 0 {rel => src}/m_warning_ovl.c | 0 {rel => src}/m_watch_my_step.c | 0 {rel => src}/main.c | 0 {rel => src}/player_select.c | 0 {rel => src}/save_check.c_inc | 0 {rel => src}/save_check_MYK.c_inc | 0 {rel => src}/save_check_NSW.c_inc | 0 {rel => src}/save_check_YSD.c_inc | 0 {rel => src}/save_check_gen.c_inc | 0 {rel => src}/save_check_komatu.c_inc | 0 {rel => src}/save_check_take.c_inc | 0 {rel => src}/save_menu.c | 0 {rel => src}/second_game.c | 0 src/{ => static}/GBA/GBA.c | 0 src/{ => static}/GBA/GBAGetProcessStatus.c | 0 src/{ => static}/GBA/GBAJoyBoot.c | 0 src/{ => static}/GBA/GBAKey.c | 0 src/{ => static}/GBA/GBARead.c | 0 src/{ => static}/GBA/GBAWrite.c | 0 src/{ => static}/GBA/GBAXfer.c | 0 src/{ => static}/GBA2/JoyBoot.c | 0 src/{ => static}/JSystem/JGadget/linklist.cpp | 0 src/{ => static}/JSystem/JKernel/JKRAram.cpp | 0 .../JSystem/JKernel/JKRAramArchive.cpp | 0 .../JSystem/JKernel/JKRAramBlock.cpp | 0 .../JSystem/JKernel/JKRAramHeap.cpp | 0 .../JSystem/JKernel/JKRAramPiece.cpp | 0 .../JSystem/JKernel/JKRAramStream.cpp | 0 .../JSystem/JKernel/JKRArchivePri.cpp | 0 .../JSystem/JKernel/JKRArchivePub.cpp | 0 .../JSystem/JKernel/JKRCompArchive.cpp | 0 .../JSystem/JKernel/JKRDecomp.cpp | 0 .../JSystem/JKernel/JKRDisposer.cpp | 0 .../JSystem/JKernel/JKRDvdAramRipper.cpp | 0 .../JSystem/JKernel/JKRDvdArchive.cpp | 0 .../JSystem/JKernel/JKRDvdFile.cpp | 0 .../JSystem/JKernel/JKRDvdRipper.cpp | 0 .../JSystem/JKernel/JKRExpHeap.cpp | 0 src/{ => static}/JSystem/JKernel/JKRFile.cpp | 0 .../JSystem/JKernel/JKRFileFinder.cpp | 0 .../JSystem/JKernel/JKRFileLoader.cpp | 0 src/{ => static}/JSystem/JKernel/JKRHeap.cpp | 0 .../JSystem/JKernel/JKRMemArchive.cpp | 0 .../JSystem/JKernel/JKRThread.cpp | 0 .../JSystem/JSupport/JSUFileStream.cpp | 0 .../JSystem/JSupport/JSUInputStream.cpp | 0 .../JSystem/JUtility/JUTGamePad.cpp | 0 src/{ => static}/MSL_C/rand.c | 0 src/{ => static}/TRK/dispatch.c | 0 src/{ => static}/TRK/dolphin_trk.c | 0 src/{ => static}/TRK/init/mem_TRK.c | 0 src/{ => static}/TRK/mainloop.c | 0 src/{ => static}/TRK/nubevent.c | 0 src/{ => static}/TRK/nubinit.c | 0 src/{ => static}/TRK/usr_put.c | 0 src/{ => static}/boot.c | 0 src/{ => static}/bootdata/gam_win1.c | 0 src/{ => static}/bootdata/gam_win2.c | 0 src/{ => static}/bootdata/gam_win3.c | 0 src/{ => static}/bootdata/logo_nin.c | 0 src/{ => static}/ctors.s | 2 +- src/{ => static}/dolphin/BASE/ppcarch.c | 0 src/{ => static}/dolphin/__ppc_eabi_init.cpp | 0 .../dolphin/amcstubs/AmcExi2Stubs.c | 0 src/{ => static}/dolphin/gx/GXStubs.c | 0 .../dolphin/odenotstub/odenotstub.c | 0 src/{ => static}/dolphin/os/OSAlarm.c | 0 src/{ => static}/dolphin/os/OSArena.c | 0 src/{ => static}/dolphin/os/OSAudioSystem.C | 0 src/{ => static}/dolphin/os/OSCache.c | 0 src/{ => static}/dolphin/os/OSContext.c | 0 .../dolphin/os/OSDisableInterrupts.c | 0 .../dolphin/os/OSEnableInterrupts.c | 0 src/{ => static}/dolphin/os/OSError.c | 0 src/{ => static}/dolphin/os/OSMemory.c | 0 .../dolphin/os/OSRestoreInterrupts.c | 0 src/{ => static}/dolphin/os/OSRtc.c | 0 .../dolphin/os/__ppc_eabi_init.cpp | 0 src/{ => static}/dolphin/os/__start.c | 0 src/{ => static}/dvderr.c | 0 src/{ => static}/initial_menu.c | 0 src/{ => static}/jaudio_NES/dummyprobe.c | 0 src/{ => static}/jaudio_NES/emusound.c | 0 src/{ => static}/jaudio_NES/melody.c | 0 src/{ => static}/jaudio_NES/verysimple.c | 0 src/{ => static}/jsyswrap.cpp | 0 src/{ => static}/libc64/__osMalloc.c | 0 src/{ => static}/libc64/aprintf.c | 0 src/{ => static}/libc64/malloc.c | 0 src/{ => static}/libc64/math64.c | 0 src/{ => static}/libc64/qrand.c | 0 src/{ => static}/libc64/sleep.c | 0 src/{ => static}/libc64/sprintf.c | 0 src/{ => static}/libforest/ReconfigBATs.c | 0 src/{ => static}/libforest/emu64/emu64.cc | 0 src/{ => static}/libforest/fault.c | 0 src/{ => static}/libforest/osreport.c | 0 src/{ => static}/libu64/debug.c | 0 src/{ => static}/libu64/gfxprint.c | 0 src/{ => static}/libu64/gfxprint_data.c | 0 src/{ => static}/libu64/pad.c | 0 src/{ => static}/libultra/contreaddata.c | 0 src/{ => static}/libultra/gu/lookathil.c | 0 src/{ => static}/libultra/gu/mtxutil.c | 0 src/{ => static}/libultra/gu/normalize.c | 0 src/{ => static}/libultra/gu/ortho.c | 0 src/{ => static}/libultra/gu/scale.c | 0 src/{ => static}/libultra/gu/sins.c | 0 src/{ => static}/libultra/gu/translate.c | 0 src/{ => static}/libultra/initialize.c | 0 src/{ => static}/libultra/ultra.c | 0 src/{ => static}/libultra/xldtob.c | 0 src/{ => static}/libultra/xlitob.c | 0 src/{ => static}/libultra/xprintf.c | 0 src/{ => static}/nintendo_hi_0.c | 0 src/{ => static}/runtime/__mem.c | 0 src/{ => static}/version.c | 0 {rel => src}/sys_dynamic.c | 0 {rel => src}/sys_math.c | 0 {rel => src}/sys_math_atan.c | 0 {rel => src}/sys_matrix.c | 0 {rel => src}/sys_romcheck.c | 0 {rel => src}/sys_stacks.c | 0 {rel => src}/sys_ucode.c | 0 {rel => src}/sys_vimgr.c | 0 {rel => src}/zurumode.c | 0 349 files changed, 204 insertions(+), 662 deletions(-) delete mode 100644 dump/main.dol.sha1 create mode 100644 dump/static.dol.sha1 rename {rel => src}/THA_GA.c (100%) rename {rel => src}/TwoHeadArena.c (100%) rename {rel => src}/ac_airplane.c (100%) rename {rel => src}/ac_animal_logo.c (99%) rename {rel => src}/ac_animal_logo_misc.c (100%) rename {rel => src}/ac_aprilfool_control.c (100%) rename {rel => src}/ac_boxManager.c (100%) rename {rel => src}/ac_boxMove.c (100%) rename {rel => src}/ac_boxTrick01.c (100%) rename {rel => src}/ac_douzou.c (98%) rename {rel => src}/ac_douzou_draw.c_inc (100%) rename {rel => src}/ac_douzou_move.c_inc (100%) rename {rel => src}/ac_dump.c (100%) rename {rel => src}/ac_ev_dokutu.c (97%) rename {rel => src}/ac_ev_dokutu_talk.c_inc (100%) rename {rel => src}/ac_ev_soncho.c (98%) rename {rel => src}/ac_ev_soncho_talk.c_inc (100%) rename {rel => src}/ac_groundhog_control.c (100%) rename {rel => src}/ac_haniwa.c (98%) rename {rel => src}/ac_haniwa_move.c_inc (100%) rename {rel => src}/ac_radio.c (94%) rename {rel => src}/ac_radio_draw.c_inc (100%) rename {rel => src}/ac_radio_move.c_inc (100%) rename {rel => src}/ac_rope.c (100%) rename {rel => src}/ac_sample.c (100%) rename {rel => src}/ac_set_manager.c (100%) rename {rel => src}/ac_set_ovl_gyoei.c (100%) rename {rel => src}/ac_set_ovl_insect.c (100%) rename {rel => src}/ac_structure.c (100%) rename {rel => src}/ac_t_anrium1.c (100%) rename {rel => src}/ac_t_bag1.c (100%) rename {rel => src}/ac_t_bag2.c (100%) rename {rel => src}/ac_t_biscus1.c (100%) rename {rel => src}/ac_t_biscus2.c (100%) rename {rel => src}/ac_t_biscus3.c (100%) rename {rel => src}/ac_t_biscus4.c (100%) rename {rel => src}/ac_t_cobra1.c (100%) rename {rel => src}/ac_t_cracker.c (100%) rename {rel => src}/ac_t_flag.c (100%) rename {rel => src}/ac_t_hanabi.c (100%) rename {rel => src}/ac_t_hasu1.c (100%) rename {rel => src}/ac_t_hat1.c (100%) rename {rel => src}/ac_t_hat2.c (100%) rename {rel => src}/ac_t_hat3.c (100%) rename {rel => src}/ac_t_npc_sao.c (100%) rename {rel => src}/ac_t_pistol.c (100%) rename {rel => src}/ac_t_tumbler.c (100%) rename {rel => src}/ac_tama.c (92%) rename {rel => src}/ac_tama_draw.c_inc (100%) rename {rel => src}/ac_tama_move.c_inc (100%) rename {rel => src}/ac_tools.c (100%) rename {rel => src}/ac_toudai.c (97%) rename {rel => src}/ac_toudai_draw.c_inc (100%) rename {rel => src}/ac_toudai_move.c_inc (100%) rename {rel => src}/ac_train0.c (95%) rename {rel => src}/ac_train0_draw.c_inc (100%) rename {rel => src}/ac_train0_move.c_inc (100%) rename {rel => src}/ac_train1.c (95%) rename {rel => src}/ac_train1_draw.c_inc (100%) rename {rel => src}/ac_train1_move.c_inc (100%) rename {rel => src}/ac_train_door.c (100%) rename {rel => src}/ac_train_window.c (100%) rename {rel => src}/ac_weather.c (100%) rename {rel => src}/ac_weather_fine.c (100%) rename {rel => src}/ac_weather_leaf.c (100%) rename {rel => src}/ac_weather_rain.c (100%) rename {rel => src}/ac_weather_sakura.c (100%) rename {rel => src}/ac_weather_snow.c (100%) delete mode 100644 src/asm/__exception.s rename {rel => src}/audio.c (100%) rename {rel => src}/c_keyframe.c (100%) rename {rel => src}/data/combi/data_combi.c (100%) rename {rel => src}/data/field/bg/beach_pal.c (100%) rename {rel => src}/data/field/bg/bush_pal.c (100%) rename {rel => src}/data/field/bg/cliff_pal.c (100%) rename {rel => src}/data/field/bg/earth_pal.c (100%) rename {rel => src}/data/field/bg/rail_pal.c (100%) rename {rel => src}/data/npc/default_list.c (100%) rename {rel => src}/data/npc/grow_list.c (100%) rename {rel => src}/data/npc/house_list.c (100%) rename {rel => src}/data/titledemo/pact0.c (100%) rename {rel => src}/data/titledemo/pact1.c (100%) rename {rel => src}/data/titledemo/pact2.c (100%) rename {rel => src}/data/titledemo/pact3.c (100%) rename {rel => src}/data/titledemo/pact4.c (100%) rename {rel => src}/ef_lamp_light.c (100%) rename {rel => src}/ef_room_sunshine.c (100%) rename {rel => src}/ef_room_sunshine_minsect.c (100%) rename {rel => src}/ef_room_sunshine_museum.c (100%) rename {rel => src}/ef_room_sunshine_police.c (100%) rename {rel => src}/ef_room_sunshine_posthouse.c (100%) rename {rel => src}/evw_anime.c (100%) rename {rel => src}/executor.c (100%) rename {rel => src}/famicom_emu.c (100%) rename {rel => src}/first_game.c (100%) rename {rel => src}/game.c (100%) rename {rel => src}/gamealloc.c (100%) rename {rel => src}/gfxalloc.c (100%) rename {rel => src}/graph.c (100%) rename {rel => src}/irqmgr.c (100%) rename {rel => src}/lb_reki.c (100%) rename {rel => src}/lb_rtc.c (100%) rename {rel => src}/m_actor.c (100%) rename {rel => src}/m_actor_dlftbls.c (100%) rename {rel => src}/m_actor_shadow.c (100%) rename {rel => src}/m_all_grow.c (100%) rename {rel => src}/m_all_grow_ovl.c (100%) rename {rel => src}/m_bank_ovl.c (100%) rename {rel => src}/m_banti.c (100%) rename {rel => src}/m_bg_item.c (100%) rename {rel => src}/m_bg_tex.c (100%) rename {rel => src}/m_calendar.c (100%) rename {rel => src}/m_camera2.c (100%) rename {rel => src}/m_cockroach.c (100%) rename {rel => src}/m_collision_bg.c (100%) rename {rel => src}/m_collision_obj.c (100%) rename {rel => src}/m_common_data.c (100%) rename {rel => src}/m_controller.c (100%) rename {rel => src}/m_cpak.c (100%) rename {rel => src}/m_debug.c (100%) rename {rel => src}/m_debug_display.c (100%) rename {rel => src}/m_debug_hayakawa.c (100%) rename {rel => src}/m_debug_mode.c (100%) rename {rel => src}/m_demo.c (100%) rename {rel => src}/m_eappli.c (100%) rename {rel => src}/m_editEndChk_ovl.c (100%) rename {rel => src}/m_editor_ovl.c (100%) rename {rel => src}/m_event.c (100%) rename {rel => src}/m_fbdemo.c (100%) rename {rel => src}/m_fbdemo_fade.c (100%) rename {rel => src}/m_fbdemo_triforce.c (100%) rename {rel => src}/m_fbdemo_wipe1.c (100%) rename {rel => src}/m_field_assessment.c (100%) rename {rel => src}/m_field_info.c (100%) rename {rel => src}/m_field_make.c (100%) rename {rel => src}/m_fishrecord.c (100%) rename {rel => src}/m_flashrom.c (98%) rename {rel => src}/m_font.c (96%) rename {rel => src}/m_font_main.c_inc (99%) rename {rel => src}/m_font_mark.c_inc (100%) rename {rel => src}/m_font_offset.c_inc (95%) rename {rel => src}/m_font_rect.c_inc (100%) rename {rel => src}/m_fuusen.c (100%) rename {rel => src}/m_game_dlftbls.c (100%) rename {rel => src}/m_handbill.c (100%) rename {rel => src}/m_haniwaPortrait_ovl.c (100%) rename {rel => src}/m_hboard_ovl.c (100%) rename {rel => src}/m_home.c (100%) rename {rel => src}/m_house.c (100%) rename {rel => src}/m_huusui_room.c (100%) rename {rel => src}/m_huusui_room_ovl.c (99%) rename {rel => src}/m_huusui_room_ovl_data.inc (100%) rename {rel => src}/m_island.c (100%) rename {rel => src}/m_item_debug.c (100%) rename {rel => src}/m_item_name.c (100%) rename {rel => src}/m_kabu_manager.c (100%) rename {rel => src}/m_kankyo.c (99%) rename {rel => src}/m_kankyo_weather.c_inc (100%) rename {rel => src}/m_land.c (100%) rename {rel => src}/m_lib.c (100%) rename {rel => src}/m_lights.c (100%) rename {rel => src}/m_mail.c (100%) rename {rel => src}/m_mail_check.c (100%) rename {rel => src}/m_mail_check_ovl.c (100%) rename {rel => src}/m_mail_password_check.c (100%) rename {rel => src}/m_malloc.c (100%) rename {rel => src}/m_map_ovl.c (100%) rename {rel => src}/m_mark_room.c (100%) rename {rel => src}/m_mark_room_ovl.c (100%) rename {rel => src}/m_melody.c (100%) rename {rel => src}/m_museum.c (100%) rename {rel => src}/m_museum_display.c (100%) rename {rel => src}/m_mushroom.c (100%) rename {rel => src}/m_music_ovl.c (100%) rename {rel => src}/m_name_table.c (100%) rename {rel => src}/m_needlework.c (100%) rename {rel => src}/m_notice.c (100%) rename {rel => src}/m_npc.c (100%) rename {rel => src}/m_npc_schedule.c (100%) rename {rel => src}/m_npc_walk.c (100%) rename {rel => src}/m_olib.c (100%) rename {rel => src}/m_passwordChk_ovl.c (100%) rename {rel => src}/m_passwordMake_ovl.c (100%) rename {rel => src}/m_pause.c (100%) rename {rel => src}/m_play.c (100%) rename {rel => src}/m_player_call.c (100%) rename {rel => src}/m_police_box.c (100%) rename {rel => src}/m_post_office.c (100%) rename {rel => src}/m_prenmi.c (100%) rename {rel => src}/m_private.c (100%) rename {rel => src}/m_quest.c (100%) rename {rel => src}/m_random_field.c (100%) rename {rel => src}/m_random_field_ovl.c (100%) rename {rel => src}/m_rcp.c (100%) rename {rel => src}/m_roll_lib.c (100%) rename {rel => src}/m_room_type.c (100%) rename {rel => src}/m_scene.c (100%) rename {rel => src}/m_scene_ftr.c (100%) rename {rel => src}/m_select.c (100%) rename {rel => src}/m_shop.c (99%) rename {rel => src}/m_skin_matrix.c (100%) rename {rel => src}/m_snowman.c (100%) rename {rel => src}/m_soncho.c (100%) rename {rel => src}/m_start_data_init.c (100%) rename {rel => src}/m_string.c (100%) rename {rel => src}/m_submenu.c (100%) rename {rel => src}/m_submenu_ovl.c (100%) rename {rel => src}/m_time.c (100%) rename {rel => src}/m_timeIn_ovl.c (100%) rename {rel => src}/m_titledemo.c (100%) rename {rel => src}/m_trademark.c (100%) rename {rel => src}/m_train_control.c (100%) rename {rel => src}/m_vibctl.c (100%) rename {rel => src}/m_view.c (100%) rename {rel => src}/m_warning_ovl.c (100%) rename {rel => src}/m_watch_my_step.c (100%) rename {rel => src}/main.c (100%) rename {rel => src}/player_select.c (100%) rename {rel => src}/save_check.c_inc (100%) rename {rel => src}/save_check_MYK.c_inc (100%) rename {rel => src}/save_check_NSW.c_inc (100%) rename {rel => src}/save_check_YSD.c_inc (100%) rename {rel => src}/save_check_gen.c_inc (100%) rename {rel => src}/save_check_komatu.c_inc (100%) rename {rel => src}/save_check_take.c_inc (100%) rename {rel => src}/save_menu.c (100%) rename {rel => src}/second_game.c (100%) rename src/{ => static}/GBA/GBA.c (100%) rename src/{ => static}/GBA/GBAGetProcessStatus.c (100%) rename src/{ => static}/GBA/GBAJoyBoot.c (100%) rename src/{ => static}/GBA/GBAKey.c (100%) rename src/{ => static}/GBA/GBARead.c (100%) rename src/{ => static}/GBA/GBAWrite.c (100%) rename src/{ => static}/GBA/GBAXfer.c (100%) rename src/{ => static}/GBA2/JoyBoot.c (100%) rename src/{ => static}/JSystem/JGadget/linklist.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAram.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAramArchive.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAramBlock.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAramHeap.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAramPiece.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRAramStream.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRArchivePri.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRArchivePub.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRCompArchive.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDecomp.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDisposer.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDvdAramRipper.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDvdArchive.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDvdFile.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRDvdRipper.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRExpHeap.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRFile.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRFileFinder.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRFileLoader.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRHeap.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRMemArchive.cpp (100%) rename src/{ => static}/JSystem/JKernel/JKRThread.cpp (100%) rename src/{ => static}/JSystem/JSupport/JSUFileStream.cpp (100%) rename src/{ => static}/JSystem/JSupport/JSUInputStream.cpp (100%) rename src/{ => static}/JSystem/JUtility/JUTGamePad.cpp (100%) rename src/{ => static}/MSL_C/rand.c (100%) rename src/{ => static}/TRK/dispatch.c (100%) rename src/{ => static}/TRK/dolphin_trk.c (100%) rename src/{ => static}/TRK/init/mem_TRK.c (100%) rename src/{ => static}/TRK/mainloop.c (100%) rename src/{ => static}/TRK/nubevent.c (100%) rename src/{ => static}/TRK/nubinit.c (100%) rename src/{ => static}/TRK/usr_put.c (100%) rename src/{ => static}/boot.c (100%) rename src/{ => static}/bootdata/gam_win1.c (100%) rename src/{ => static}/bootdata/gam_win2.c (100%) rename src/{ => static}/bootdata/gam_win3.c (100%) rename src/{ => static}/bootdata/logo_nin.c (100%) rename src/{ => static}/ctors.s (78%) rename src/{ => static}/dolphin/BASE/ppcarch.c (100%) rename src/{ => static}/dolphin/__ppc_eabi_init.cpp (100%) rename src/{ => static}/dolphin/amcstubs/AmcExi2Stubs.c (100%) rename src/{ => static}/dolphin/gx/GXStubs.c (100%) rename src/{ => static}/dolphin/odenotstub/odenotstub.c (100%) rename src/{ => static}/dolphin/os/OSAlarm.c (100%) rename src/{ => static}/dolphin/os/OSArena.c (100%) rename src/{ => static}/dolphin/os/OSAudioSystem.C (100%) rename src/{ => static}/dolphin/os/OSCache.c (100%) rename src/{ => static}/dolphin/os/OSContext.c (100%) rename src/{ => static}/dolphin/os/OSDisableInterrupts.c (100%) rename src/{ => static}/dolphin/os/OSEnableInterrupts.c (100%) rename src/{ => static}/dolphin/os/OSError.c (100%) rename src/{ => static}/dolphin/os/OSMemory.c (100%) rename src/{ => static}/dolphin/os/OSRestoreInterrupts.c (100%) rename src/{ => static}/dolphin/os/OSRtc.c (100%) rename src/{ => static}/dolphin/os/__ppc_eabi_init.cpp (100%) rename src/{ => static}/dolphin/os/__start.c (100%) rename src/{ => static}/dvderr.c (100%) rename src/{ => static}/initial_menu.c (100%) rename src/{ => static}/jaudio_NES/dummyprobe.c (100%) rename src/{ => static}/jaudio_NES/emusound.c (100%) rename src/{ => static}/jaudio_NES/melody.c (100%) rename src/{ => static}/jaudio_NES/verysimple.c (100%) rename src/{ => static}/jsyswrap.cpp (100%) rename src/{ => static}/libc64/__osMalloc.c (100%) rename src/{ => static}/libc64/aprintf.c (100%) rename src/{ => static}/libc64/malloc.c (100%) rename src/{ => static}/libc64/math64.c (100%) rename src/{ => static}/libc64/qrand.c (100%) rename src/{ => static}/libc64/sleep.c (100%) rename src/{ => static}/libc64/sprintf.c (100%) rename src/{ => static}/libforest/ReconfigBATs.c (100%) rename src/{ => static}/libforest/emu64/emu64.cc (100%) rename src/{ => static}/libforest/fault.c (100%) rename src/{ => static}/libforest/osreport.c (100%) rename src/{ => static}/libu64/debug.c (100%) rename src/{ => static}/libu64/gfxprint.c (100%) rename src/{ => static}/libu64/gfxprint_data.c (100%) rename src/{ => static}/libu64/pad.c (100%) rename src/{ => static}/libultra/contreaddata.c (100%) rename src/{ => static}/libultra/gu/lookathil.c (100%) rename src/{ => static}/libultra/gu/mtxutil.c (100%) rename src/{ => static}/libultra/gu/normalize.c (100%) rename src/{ => static}/libultra/gu/ortho.c (100%) rename src/{ => static}/libultra/gu/scale.c (100%) rename src/{ => static}/libultra/gu/sins.c (100%) rename src/{ => static}/libultra/gu/translate.c (100%) rename src/{ => static}/libultra/initialize.c (100%) rename src/{ => static}/libultra/ultra.c (100%) rename src/{ => static}/libultra/xldtob.c (100%) rename src/{ => static}/libultra/xlitob.c (100%) rename src/{ => static}/libultra/xprintf.c (100%) rename src/{ => static}/nintendo_hi_0.c (100%) rename src/{ => static}/runtime/__mem.c (100%) rename src/{ => static}/version.c (100%) rename {rel => src}/sys_dynamic.c (100%) rename {rel => src}/sys_math.c (100%) rename {rel => src}/sys_math_atan.c (100%) rename {rel => src}/sys_matrix.c (100%) rename {rel => src}/sys_romcheck.c (100%) rename {rel => src}/sys_stacks.c (100%) rename {rel => src}/sys_ucode.c (100%) rename {rel => src}/sys_vimgr.c (100%) rename {rel => src}/zurumode.c (100%) diff --git a/.gitignore b/.gitignore index b1bf6917..e64f6365 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ src/*/*/*.s out/ dump/* !dump/foresta.rel.sha1 -!dump/main.dol.sha1 +!dump/static.dol.sha1 *.dol *.rel *.exe diff --git a/common.py b/common.py index 7702845f..27744d08 100644 --- a/common.py +++ b/common.py @@ -148,10 +148,10 @@ def load_from_yaml(path: str, default=None): ################ # Directory for decompiled dol code -DOL_SRCDIR = "src" +DOL_SRCDIR = "src/static" # Directory for decompiled rel code -REL_SRCDIR = "rel" +REL_SRCDIR = "src" # Include directory INCDIR = "include" @@ -244,15 +244,15 @@ DOL_DISASM_OVERRIDES = f"{CONFIG}/disasm_overrides.yml" REL_DISASM_OVERRIDES = f"{CONFIG}/rel_disasm_overrides.yml" # Binaries -DOL = f"{ORIG}/main.dol" # read in python code +DOL = f"{ORIG}/static.dol" # read in python code REL = f"{ORIG}/foresta.rel" # read in python code DOL_YML = f"{CONFIG}/dol.yml" REL_YML = f"{CONFIG}/rel.yml" -DOL_SHA = f"{ORIG}/main.dol.sha1" +DOL_SHA = f"{ORIG}/static.dol.sha1" REL_SHA = f"{ORIG}/foresta.rel.sha1" -DOL_OK = f"{BUILDDIR}/main.dol.ok" +DOL_OK = f"{BUILDDIR}/static.dol.ok" REL_OK = f"{BUILDDIR}/foresta.rel.ok" -DOL_ASM_LIST = f"{BUILDDIR}/main.dol.asml" +DOL_ASM_LIST = f"{BUILDDIR}/static.dol.asml" REL_ASM_LIST = f"{BUILDDIR}/foresta.rel.asml" # Symbols @@ -275,11 +275,11 @@ DOL_LCF = f"{BUILDDIR}/dol.lcf" REL_LCF = f"{CONFIG}/rel.lcf" # Outputs -DOL_ELF = f"{BUILDDIR}/main.elf" +DOL_ELF = f"{BUILDDIR}/static.elf" REL_PLF = f"{BUILDDIR}/foresta.plf" -DOL_OUT = f"{OUTDIR}/main.dol" +DOL_OUT = f"{OUTDIR}/static.dol" REL_OUT = f"{OUTDIR}/foresta.rel" -DOL_MAP = f"{OUTDIR}/main.map" +DOL_MAP = f"{OUTDIR}/static.map" REL_MAP = f"{OUTDIR}/foresta.map" # Optional full disassembly diff --git a/config/dol.yml b/config/dol.yml index f012f0fc..520a2a3c 100644 --- a/config/dol.yml +++ b/config/dol.yml @@ -1,4 +1,4 @@ -path: dump/main.dol +path: dump/static.dol r13: 0x8021fb80 r2: 0x80220be0 section_defs: diff --git a/config/symbols.yml b/config/symbols.yml index c6e6b186..7b8ead3b 100644 --- a/config/symbols.yml +++ b/config/symbols.yml @@ -52692,16 +52692,16 @@ global: 0x8148DA70: freeXfbBase 0x8148DA74: freeXfbSize 0x8148DA78: S_ongenpos_refuse_fg -src/bankread.c: +src/static/bankread.c: 0x800305e0: PTconvert__FPPvUl -src/waveread.c: +src/static/waveread.c: 0x800309c0: PTconvert__FPPvUl -src/famicom.cpp: +src/static/famicom.cpp: 0x80041614: calcSum__FPUcUl 0x800d9984: __RTTI__13JKRFileFinder -src/famicom_nesinfo.cpp: +src/static/famicom_nesinfo.cpp: 0x80046d88: calcSum__FPUcUl -src/JKRAram.cpp: +src/static/JKRAram.cpp: 0x80066a08: decompSZS_subroutine__FPUcPUc 0x80066c8c: firstSrcData__Fv 0x80066d24: nextSrcData__FPUc @@ -52718,7 +52718,7 @@ src/JKRAram.cpp: 0x80218748: fileOffset 0x8021874c: readCount 0x80218750: maxDest -src/JKRDvdRipper.cpp: +src/static/JKRDvdRipper.cpp: 0x8006c42c: decompSZS_subroutine__FPUcPUc 0x8006c6c0: firstSrcData__Fv 0x8006c774: nextSrcData__FPUc @@ -52734,7 +52734,7 @@ src/JKRDvdRipper.cpp: 0x8021879c: fileOffset 0x802187a0: readCount 0x802187a4: maxDest -src/JKRDvdAramRipper.cpp: +src/static/JKRDvdAramRipper.cpp: 0x8006d370: firstSrcData__Fv 0x8006d424: nextSrcData__FPUc 0x802187a8: szpBuf @@ -52749,47 +52749,47 @@ src/JKRDvdAramRipper.cpp: 0x802187d8: fileOffset 0x802187dc: readCount 0x802187e0: maxDest -src/GBA.c: +src/static/GBA.c: 0x80048120: OnReset 0x800da9c8: ResetFunctionInfo -src/OSMemory.c: +src/static/OSMemory.c: 0x8007bf04: OnReset 0x8007c070: Config24MB 0x8007c0f0: Config48MB 0x800e01a8: ResetFunctionInfo -src/libforest/ReconfigBATs.c: +src/static/libforest/ReconfigBATs.c: 0x8005adac: Config24MB 0x8005ae18: Config48MB -src/SIBios.c: +src/static/SIBios.c: 0x80082924: AlarmHandler 0x800e0a3c: Type -src/dvdlow.c: +src/static/dvdlow.c: 0x80083bdc: AlarmHandler 0x80218998: Callback -src/dvd.c: +src/static/dvd.c: 0x80085dfc: AlarmHandler 0x80218a3c: LastState -src/Pad.c: +src/static/Pad.c: 0x8008b664: OnReset 0x800e1430: ResetFunctionInfo 0x80208490: Type -src/CARDBios.c: +src/static/CARDBios.c: 0x8008e504: OnReset 0x800e1440: ResetFunctionInfo -src/CARDBlock.c: +src/static/CARDBlock.c: 0x8008e7dc: WriteCallback 0x8008e8b0: EraseCallback -src/CARDDir.c: +src/static/CARDDir.c: 0x8008ebe0: WriteCallback 0x8008ecb0: EraseCallback -src/CARDWrite.c: +src/static/CARDWrite.c: 0x80091e88: WriteCallback 0x80091ff8: EraseCallback -src/__init_cpp_exceptions.cpp: +src/static/__init_cpp_exceptions.cpp: 0x800a97c0: __destroy_global_chain_reference -src/global_destructor_chain.c: +src/static/global_destructor_chain.c: 0x800a97c8: __destroy_global_chain_reference -src/bootdata.obj: +src/static/bootdata.obj: 0x800b9a40: att_win_waku1_tex 0x800b9e40: att_win_waku2_tex 0x800ba240: att_win_waku3_tex @@ -52804,88 +52804,88 @@ src/bootdata.obj: 0x800bcf00: att_win_waku5_tex 0x800bd300: att_win_waku6_tex 0x800bd820: gam_win_moji3_tex -src/emusound.c: +src/static/emusound.c: 0x800cea20: NOISE_TABLE -src/driver.c: +src/static/driver.c: 0x800d0298: NOISE_TABLE -src/dspbuf.c: +src/static/dspbuf.c: 0x801864b0: dsp_buf -src/cpubuf.c: +src/static/cpubuf.c: 0x801864c0: dsp_buf -src/audiothread.c: +src/static/audiothread.c: 0x8017ffe0: msgbuf -src/dvdthread.c: +src/static/dvdthread.c: 0x801865b0: msgbuf -src/JKRHeap.cpp: +src/static/JKRHeap.cpp: 0x80217e6c: __RTTI__11JKRDisposer 0x80217e74: __RTTI__7JKRHeap -src/JKRExpHeap.cpp: +src/static/JKRExpHeap.cpp: 0x80217ea0: __RTTI__11JKRDisposer 0x80217eb0: __RTTI__7JKRHeap -src/JKRDisposer.cpp: +src/static/JKRDisposer.cpp: 0x80217ec0: __RTTI__11JKRDisposer -src/JKRThread.cpp: +src/static/JKRThread.cpp: 0x80217ec8: __RTTI__11JKRDisposer 0x80217ed0: __RTTI__9JKRThread -src/JKRAramHeap.cpp: +src/static/JKRAramHeap.cpp: 0x80217ef8: __RTTI__11JKRDisposer -src/JKRAramStream.cpp: +src/static/JKRAramStream.cpp: 0x80217f20: __RTTI__11JKRDisposer 0x80217f28: __RTTI__9JKRThread -src/JKRFileLoader.cpp: +src/static/JKRFileLoader.cpp: 0x80217f40: __RTTI__11JKRDisposer 0x80217f48: __RTTI__13JKRFileLoader -src/JKRFileFinder.cpp: +src/static/JKRFileFinder.cpp: 0x80217f50: __RTTI__13JKRFileFinder -src/JKRArchivePub.cpp: +src/static/JKRArchivePub.cpp: 0x80217f60: __RTTI__11JKRDisposer 0x80217f68: __RTTI__13JKRFileLoader 0x80217f70: __RTTI__10JKRArchive -src/JKRMemArchive.cpp: +src/static/JKRMemArchive.cpp: 0x80217f78: __RTTI__11JKRDisposer 0x80217f80: __RTTI__13JKRFileLoader 0x80217f88: __RTTI__10JKRArchive -src/JKRAramArchive.cpp: +src/static/JKRAramArchive.cpp: 0x80217fa0: __RTTI__11JKRDisposer 0x80217fa8: __RTTI__7JKRFile 0x80217fb0: __RTTI__13JKRFileLoader 0x80217fb8: __RTTI__10JKRArchive -src/JKRDvdArchive.cpp: +src/static/JKRDvdArchive.cpp: 0x80217fc8: __RTTI__11JKRDisposer 0x80217fd0: __RTTI__13JKRFileLoader 0x80217fd8: __RTTI__10JKRArchive -src/JKRCompArchive.cpp: +src/static/JKRCompArchive.cpp: 0x80217fe8: __RTTI__11JKRDisposer 0x80217ff0: __RTTI__13JKRFileLoader 0x80217ff8: __RTTI__10JKRArchive -src/JKRDvdFile.cpp: +src/static/JKRDvdFile.cpp: 0x80218008: __RTTI__11JKRDisposer 0x80218018: __RTTI__7JKRFile -src/JKRDecomp.cpp: +src/static/JKRDecomp.cpp: 0x80218038: __RTTI__11JKRDisposer 0x80218040: __RTTI__9JKRThread -src/JSUInputStream.cpp: +src/static/JSUInputStream.cpp: 0x80218050: __RTTI__10JSUIosBase 0x80218058: __RTTI__14JSUInputStream 0x80218060: __RTTI__20JSURandomInputStream -src/JSUFileStream.cpp: +src/static/JSUFileStream.cpp: 0x80218068: __RTTI__10JSUIosBase 0x80218070: __RTTI__14JSUInputStream 0x80218078: __RTTI__20JSURandomInputStream -src/JUTFont.cpp: +src/static/JUTFont.cpp: 0x80218098: __RTTI__7JUTFont -src/JUTResFont.cpp: +src/static/JUTResFont.cpp: 0x802180a8: __RTTI__7JUTFont -src/JUTGamePad.cpp: +src/static/JUTGamePad.cpp: 0x802180c0: __RTTI__11JKRDisposer -src/JUTException.cpp: +src/static/JUTException.cpp: 0x80218100: __RTTI__11JKRDisposer 0x80218108: __RTTI__9JKRThread -src/J2DGrafContext.cpp: +src/static/J2DGrafContext.cpp: 0x80218158: __RTTI__14J2DGrafContext -src/J2DOrthoGraph.cpp: +src/static/J2DOrthoGraph.cpp: 0x80218160: __RTTI__14J2DGrafContext -src/dvderr.c: +src/static/dvderr.c: 0x800a97f8: this 0x800b1c60: ctl_att_w1_tex 0x800b2060: ctl_att_w2_tex @@ -52893,21 +52893,21 @@ src/dvderr.c: 0x800b2860: ctl_att_w4_tex 0x800b2c60: ctl_att_w5_tex 0x800b3060: ctl_att_w6_tex -src/fault.c: +src/static/fault.c: 0x80218628: this -src/OSReboot.c: +src/static/OSReboot.c: 0x8007c6e0: Callback -src/OS.c: +src/static/OS.c: 0x802188b0: BootInfo -src/dvdfs.c: +src/static/dvdfs.c: 0x802189d8: BootInfo -src/OSResetSW.c: +src/static/OSResetSW.c: 0x80218938: LastState -#src/boot.c: +#src/static/boot.c: # 0x800060f8: main -#rel/main.c: +#src/main.c: # 0x80407CB9: main -rel/ac_quest_talk_island.c: +src/ac_quest_talk_island.c: 0x8048D769: aQMgr_init_normal_info 0x8048D7A5: aQMgr_set_number_free_str 0x8048D809: aQMgr_set_number_item_str @@ -52999,7 +52999,7 @@ rel/ac_quest_talk_island.c: 0x8068B424: constellation_table 0x812FCAA8: l_aqmgr_str 0x812FCAB8: l_normal_info -rel/ac_quest_talk_normal_init.c: +src/ac_quest_talk_normal_init.c: 0x804915F5: aQMgr_init_normal_info 0x80491631: aQMgr_set_number_free_str 0x80491695: aQMgr_set_number_item_str @@ -53091,7 +53091,7 @@ rel/ac_quest_talk_normal_init.c: 0x8068B9F4: constellation_table 0x812FCB5C: l_aqmgr_str 0x812FCB6C: l_normal_info -rel/bg_cherry_item.c: +src/bg_cherry_item.c: 0x804AFE75: bIT_copy_vtx 0x804AFEC9: bIT_draw_shadow 0x804B003D: bIT_clip_ct @@ -53588,7 +53588,7 @@ rel/bg_cherry_item.c: 0x806927EC: rnd_data_x 0x8069282C: rnd_data_z 0x80692BC8: type_data_table_p_a -rel/bg_item.c: +src/bg_item.c: 0x804B71F9: bIT_copy_vtx 0x804B724D: bIT_draw_shadow 0x804B73C1: bIT_clip_ct @@ -54089,7 +54089,7 @@ rel/bg_item.c: 0x8069574C: rnd_data_x 0x8069578C: rnd_data_z 0x80695B20: type_data_table_p_a -rel/bg_winter_item.c: +src/bg_winter_item.c: 0x804BECF1: bIT_copy_vtx 0x804BED45: bIT_draw_shadow 0x804BEEB9: bIT_clip_ct @@ -54590,7 +54590,7 @@ rel/bg_winter_item.c: 0x8069891C: rnd_data_x 0x8069895C: rnd_data_z 0x80698CF8: type_data_table_p_a -rel/bg_xmas_item.c: +src/bg_xmas_item.c: 0x804C6109: bIT_copy_vtx 0x804C615D: bIT_draw_shadow 0x804C62D1: bIT_clip_ct @@ -55091,23 +55091,23 @@ rel/bg_xmas_item.c: 0x8069B91C: rnd_data_x 0x8069B95C: rnd_data_z 0x8069BCF4: type_data_table_p_a -rel/m_all_grow.c: +src/m_all_grow.c: 0x80373BD9: mAGrw_ChangeItemBlock2 -rel/m_all_grow_ovl.c: +src/m_all_grow_ovl.c: 0x80510F99: mAGrw_ChangeItemBlock2 -rel/ac_ev_ghost.c: +src/ac_ev_ghost.c: 0x8051FED9: aEGH_change_talk_proc 0x806A07E0: umbrella_list 0x806A08D4: dt_tbl 0x806A08F8: proc_table 0x806A090C: init_table -rel/ac_ev_soncho.c: +src/ac_ev_soncho.c: 0x8052438D: aEGH_change_talk_proc -rel/ac_hatumode_control.c: +src/ac_hatumode_control.c: 0x80429581: aHN0_set_request_act 0x80683F5C: dt_tbl 0x80684044: init_table -rel/ac_hanabi_npc0.c: +src/ac_hanabi_npc0.c: 0x80528515: aHN0_actor_ct 0x80528599: aHN0_actor_save 0x805285D1: aHN0_actor_dt @@ -55123,7 +55123,7 @@ rel/ac_hanabi_npc0.c: 0x80528F09: aHN0_schedule_proc 0x80528FCD: aHN0_talk_init 0x80528FF1: aHN0_talk_end_chk -rel/ac_hatumode_npc0.c: +src/ac_hatumode_npc0.c: 0x8052AB55: aHN0_actor_ct 0x8052AC71: aHN0_actor_save 0x8052AC91: aHN0_actor_dt @@ -55139,7 +55139,7 @@ rel/ac_hatumode_npc0.c: 0x8052BC41: aHN0_schedule_main_proc 0x8052BCF9: aHN0_schedule_proc 0x806A1428: proc_table -rel/ac_npc.c: +src/ac_npc.c: 0x8052C131: aNPC_dma_cloth_data 0x8052C1ED: aNPC_getP_cloth_tex_rom 0x8052C251: aNPC_getP_cloth_pal_rom @@ -55410,7 +55410,7 @@ rel/ac_npc.c: 0x806A2AE0: aNPC_sche_proc 0x81301840: aNPC_ctrlActor 0x81319AC8: aNPC_clip -rel/ac_npc2.c: +src/ac_npc2.c: 0x8053AD41: aNPC_dma_cloth_data 0x8053ADFD: aNPC_getP_cloth_tex_rom 0x8053AE61: aNPC_getP_cloth_pal_rom @@ -55681,7 +55681,7 @@ rel/ac_npc2.c: 0x806A3FA0: aNPC_sche_proc 0x81319BF8: aNPC_ctrlActor 0x81319F94: aNPC_clip -rel/ac_npc_conv_master.c: +src/ac_npc_conv_master.c: 0x80545B7D: aNSC_set_animation 0x80545BCD: aNSC_BGcheck 0x80545C11: aNSC_check_present_balloon @@ -55864,7 +55864,7 @@ rel/ac_npc_conv_master.c: 0x806A4A74: aNSC_item1_F_tanni_type 0x806A4A78: aNSC_item_tanni_type 0x806A4B6C: aNSC_exchange_itemNo -rel/ac_npc_depart_master.c: +src/ac_npc_depart_master.c: 0x8054D495: aNSC_set_animation 0x8054D4E5: aNSC_BGcheck 0x8054D529: aNSC_check_present_balloon @@ -56047,7 +56047,7 @@ rel/ac_npc_depart_master.c: 0x806A5C88: aNSC_item1_F_tanni_type 0x806A5C8C: aNSC_item_tanni_type 0x806A5D80: aNSC_exchange_itemNo -rel/ac_npc_mamedanuki.c: +src/ac_npc_mamedanuki.c: 0x8055A4ED: aNSC_set_animation 0x8055A53D: aNSC_BGcheck 0x8055A581: aNSC_calc_talk_start_tim @@ -56205,7 +56205,7 @@ rel/ac_npc_mamedanuki.c: 0x806A9E18: aNSC_item1_F_tanni_type 0x806A9E1C: aNSC_item_tanni_type 0x806A9F30: aNSC_exchange_itemNo -rel/ac_npc_shop_master.c: +src/ac_npc_shop_master.c: 0x80577115: aNSC_set_animation 0x80577165: aNSC_BGcheck 0x805771A9: aNSC_check_present_balloon @@ -56388,25 +56388,25 @@ rel/ac_npc_shop_master.c: 0x806C024C: aNSC_item1_F_tanni_type 0x806C0250: aNSC_item_tanni_type 0x806C0344: aNSC_exchange_itemNo -rel/ac_npc_needlework.c: +src/ac_npc_needlework.c: 0x80564CA1: player_go_away 0x80564CE1: player_buy 0x806BE35C: dt_tbl 0x806BE3A8: proc_table 0x806BE3C8: init_table -rel/ac_npc_shop_mastersp.c: +src/ac_npc_shop_mastersp.c: 0x8057CB61: player_go_away 0x8057CBB9: player_buy -rel/ac_npc_p_sel2.c: +src/ac_npc_p_sel2.c: 0x805682D1: aNPS2_make_door_data 0x8056852D: aNPS2_setup_game_start -rel/ac_npc_station_master.c: +src/ac_npc_station_master.c: 0x8057F7C1: aNPS2_make_door_data 0x8057F825: aNPS2_setup_game_start 0x806C0C14: proc_table 0x806C0C5C: dt_tbl 0x806C0CCC: init_table -rel/ac_npc_super_master.c: +src/ac_npc_super_master.c: 0x80580C21: aNSC_set_animation 0x80580C71: aNSC_BGcheck 0x80580CB5: aNSC_check_present_balloon @@ -56589,18 +56589,18 @@ rel/ac_npc_super_master.c: 0x806C1790: aNSC_item1_F_tanni_type 0x806C1794: aNSC_item_tanni_type 0x806C1888: aNSC_exchange_itemNo -rel/ac_tokyoso_control.c: +src/ac_tokyoso_control.c: 0x804AB041: aTKN1_set_request_act 0x8068F438: init_table -rel/ac_tokyoso_npc1.c: +src/ac_tokyoso_npc1.c: 0x8058C3BD: aTKN1_set_request_act 0x806C2400: dt_tbl 0x806C2474: proc_table -rel/ac_br_shop.c: +src/ac_br_shop.c: 0x805A8769: change_FGUnit -rel/ac_buggy.c: +src/ac_buggy.c: 0x805A9E19: change_FGUnit -rel/ac_count02.c: +src/ac_count02.c: 0x805AB8B9: aCOU_actor_ct 0x805AB989: aCOU_actor_dt 0x805ABAE9: aCOU_wait @@ -56609,7 +56609,7 @@ rel/ac_count02.c: 0x805ABDAD: aCOU_actor_init 0x805ABE25: aCOU_actor_draw_before 0x805ABE89: aCOU_actor_draw -rel/ac_countdown.c: +src/ac_countdown.c: 0x805AC0AD: aCOU_actor_ct 0x805AC121: aCOU_actor_dt 0x805AC335: aCOU_wait @@ -56618,76 +56618,76 @@ rel/ac_countdown.c: 0x805AC5ED: aCOU_actor_init 0x805AC665: aCOU_actor_draw_before 0x805AC7B1: aCOU_actor_draw -rel/ac_house.c: +src/ac_house.c: 0x805AFB2D: change_FGUnit -rel/ac_kamakura.c: +src/ac_kamakura.c: 0x805B1DE5: change_FGUnit -rel/ac_mikanbox.c: +src/ac_mikanbox.c: 0x805B3011: aMIK_actor_ct 0x805B3E59: aMIK_actor_init 0x805B4055: aMIK_actor_draw 0x806C5BB0: init_table 0x806C5BD0: obj_e_mikanbox_v -rel/ac_mikuji.c: +src/ac_mikuji.c: 0x805B414D: aMIK_actor_ct 0x805B437D: aMIK_actor_init 0x805B43F5: aMIK_actor_draw -rel/ac_turi_npc0.c: +src/ac_turi_npc0.c: 0x805900B1: aTR0_actor_ct 0x805901D9: aTR0_actor_dt 0x80590285: aTR0_actor_move 0x805902BD: aTR0_actor_draw -rel/ac_train0.c: +src/ac_train0.c: 0x805BFC29: aTR0_actor_ct 0x805BFCDD: aTR0_actor_dt 0x805C00F5: calc_speed1 0x805C014D: calc_speed2 0x805C03ED: aTR0_actor_move 0x805C04E1: aTR0_actor_draw -rel/ac_train1.c: +src/ac_train1.c: 0x805C0709: calc_speed1 0x805C0761: calc_speed2 -rel/ac_ev_angler.c: +src/ac_ev_angler.c: 0x80518395: get_fish_save_area 0x805186F5: getP_top_of_angler_pID 0x80518719: set_top_of_angler_pID 0x80518751: get_top_of_angler_size -rel/ac_turi.c: +src/ac_turi.c: 0x805C1291: get_fish_save_area 0x805C12F1: get_top_of_angler_size 0x805C1315: set_top_of_angler_pID 0x805C134D: getP_top_of_angler_pID -rel/m_submenu.c: +src/m_submenu.c: 0x803EFD79: mSM_move_End -rel/m_submenu_ovl.c: +src/m_submenu_ovl.c: 0x805EF449: mSM_move_End -rel/m_inventory_ovl.c: +src/m_inventory_ovl.c: 0x805E448D: mIV_get_win_posY -rel/m_tag_ovl.c: +src/m_tag_ovl.c: 0x805F89B1: mIV_get_win_posY -rel/ef_turi_hane0.c: +src/ef_turi_hane0.c: 0x80624049: eTH0_init 0x806240BD: eTH0_ct 0x80624139: eTH0_mv 0x8062413D: eTH0_dw -rel/ef_turi_hane1.c: +src/ef_turi_hane1.c: 0x80624261: eTH0_init 0x806242D5: eTH0_ct 0x806242F5: eTH0_mv 0x806242F9: eTH0_dw -rel/ef_takurami.c: +src/ef_takurami.c: 0x80620A7D: eTM_init 0x80620BC5: eTM_ct 0x80620D05: eTM_mv 0x80620DBD: eTM_dw -rel/ef_turi_mizu.c: +src/ef_turi_mizu.c: 0x806247C1: eTM_init 0x80624891: eTM_ct 0x80624989: eTM_mv 0x80624B11: eTM_dw -rel/padmgr.c: +src/padmgr.c: 0x8065F138: this -rel/ac_gyo_release.c: +src/ac_gyo_release.c: 0x80682D1C: gyoei_type 0x80682E84: aGYO_funa_dl 0x80682E90: aGYO_hera_dl @@ -56734,7 +56734,7 @@ rel/ac_gyo_release.c: 0x8068307C: aGYO_taiya_dl 0x80683088: aGYO_displayList 0x8068313C: aGYO_shadow_scale -rel/ac_handOverItem.c: +src/ac_handOverItem.c: 0x806832E4: aGYO_funa_dl 0x806832F0: aGYO_hera_dl 0x806832FC: aGYO_koi_dl @@ -56781,56 +56781,56 @@ rel/ac_handOverItem.c: 0x806834E8: aGYO_displayList 0x8068359C: mode_DL_table 0x80683670: vtx_DL_table -rel/m_collision_bg.c: +src/m_collision_bg.c: 0x80650D78: norm_table -rel/ac_my_room.c: +src/ac_my_room.c: 0x806874B4: furniture_quality 0x80688F78: norm_table -rel/ac_uki.c: +src/ac_uki.c: 0x8068F898: gyoei_type -rel/bg_police_item.c: +src/bg_police_item.c: 0x80695B5C: mode_DL_table 0x80695C30: vtx_DL_table -rel/m_huusui_room_ovl.c: +src/m_huusui_room_ovl.c: 0x8069C0F0: mMkRm_ftr_info -rel/m_mark_room_ovl.c: +src/m_mark_room_ovl.c: 0x8069CFFC: mMkRm_ftr_info -rel/ac_ev_dozaemon.c: +src/ac_ev_dozaemon.c: 0x806A0658: dt_tbl 0x806A0674: proc_table 0x806A067C: init_table -rel/ac_ev_soncho2.c: +src/ac_ev_soncho2.c: 0x806A0DE4: dt_tbl 0x806A0E30: proc_table 0x806A0E50: init_table -rel/ac_npc_soncho.c: +src/ac_npc_soncho.c: 0x806C0B68: dt_tbl 0x806C0B70: proc_table 0x806C0B74: init_table -rel/ac_npc_totakeke.c: +src/ac_npc_totakeke.c: 0x806C1D34: proc_table 0x806C1D50: dt_tbl -rel/ac_tamaire_npc0.c: +src/ac_tamaire_npc0.c: 0x806C2154: dt_tbl 0x806C2184: proc_table 0x806C2198: init_table -rel/ac_tamaire_npc1.c: +src/ac_tamaire_npc1.c: 0x806C222C: dt_tbl 0x806C2264: proc_table 0x806C228C: init_table -rel/ac_tokyoso_npc0.c: +src/ac_tokyoso_npc0.c: 0x806C2338: dt_tbl 0x806C2360: proc_table 0x806C237C: init_table -rel/ac_tunahiki_npc0.c: +src/ac_tunahiki_npc0.c: 0x806C2710: dt_tbl 0x806C271C: proc_table 0x806C2724: init_table -rel/ac_tunahiki_npc1.c: +src/ac_tunahiki_npc1.c: 0x806C27A8: dt_tbl 0x806C27BC: proc_table 0x806C27C8: init_table -rel/ac_gyoei.c: +src/ac_gyoei.c: 0x806C37FC: aGYO_funa_dl 0x806C3808: aGYO_hera_dl 0x806C3814: aGYO_koi_dl @@ -56878,34 +56878,34 @@ rel/ac_gyoei.c: 0x806C3B38: aGYO_texture_table 0x806C3B48: aGYO_2tile_texture_idx 0x806C3B70: aGYO_prim_f -rel/ac_gyo_kage.c: +src/ac_gyo_kage.c: 0x80682C7C: aGYO_texture_table 0x80682C8C: aGYO_2tile_texture_idx 0x80682CB4: aGYO_prim_f -rel/ac_gyo_test.c: +src/ac_gyo_test.c: 0x806C3D58: gyoei_type 0x806C3F30: aGYO_shadow_scale -rel/ac_gyo_kaseki.c: +src/ac_gyo_kaseki.c: 0x806C40A8: gyoei_type -rel/m_catalog_ovl.c: +src/m_catalog_ovl.c: 0x806C8AB0: furniture_quality 0x806C9E78: paper_disp_model 0x806CA278: paper_disp_sen_model -rel/m_board_ovl.c: +src/m_board_ovl.c: 0x806C7C60: paper_disp_model 0x806C8060: paper_disp_sen_model 0x806C8460: letter_color -rel/m_diary_ovl.c: +src/m_diary_ovl.c: 0x806CBA70: letter_color -rel/ef_effect_control.c: +src/ef_effect_control.c: 0x8069BD10: profile_tbl -rel/ac_weather.c: +src/ac_weather.c: 0x806D1D50: profile_tbl -rel/ac_museum_fish.c: +src/ac_museum_fish.c: 0x80684F7C: suisou_pos -rel/ef_suisou_awa.c: +src/ef_suisou_awa.c: 0x806D37F0: suisou_pos -rel/dataobject.obj: +src/dataobject.obj: 0x8074FE80: obj_flower_tex 0x807508C0: obj_flower_tex 0x80752700: obj_melody_pal @@ -58181,9 +58181,9 @@ rel/dataobject.obj: 0x810DEEE0: int_tak_cone02_asi_tex_pal 0x810DF400: int_tak_cone02_asi_tex_pal 0x81106D80: rom_train_3_pal -rel/irqmgr.c: +src/irqmgr.c: 0x812F357C: this -rel/m_malloc.c: +src/m_malloc.c: 0x81297CA0: zelda_arena foresta.rel: 0x80641254: _ctors diff --git a/configure.py b/configure.py index 4b4830fb..74662539 100644 --- a/configure.py +++ b/configure.py @@ -21,6 +21,10 @@ import common as c # Setup Validation # #################### +# Rename main.dol to static.dol +if os.path.exists("dump/main.dol"): + os.rename("dump/main.dol", "dump/static.dol") + # Check CodeWarrior was added assert os.path.exists("tools/1.3.2/mwcceppc.exe") and \ os.path.exists("tools/1.2.5n/mwcceppc.exe"), \ @@ -615,31 +619,31 @@ class AsmSource(Source): class CSource(Source): def __init__(self, ctx: c.SourceContext, path: str): - if path.startswith("src/dolphin/"): + if path.startswith("src/static/dolphin/"): self.cflags = c.SDK_FLAGS self.cc = c.OCC - elif path.startswith("src/JSystem/JGadget/"): + elif path.startswith("src/static/JSystem/JGadget/"): self.cflags = c.JSYSTEM_JGADGET_CFLAGS self.cc = c.CC - elif path.startswith("src/JSystem/"): + elif path.startswith("src/static/JSystem/"): self.cflags = c.JSYSTEM_CFLAGS self.cc = c.CC - elif path.startswith("src/GBA2/"): + elif path.startswith("src/static/GBA2/"): self.cflags = c.DOL_CFLAGS_SDATA0_CFLAGS self.cc = c.CC - elif path.startswith("src/bootdata/") or path == "src/boot.c" or path == "src/initial_menu.c": + elif path.startswith("src/static/bootdata/") or path == "src/static/boot.c" or path == "src/static/initial_menu.c": self.cflags = c.DOL_BOOT_CFLAGS self.cc = c.CC - elif path == "src/dvderr.c": + elif path == "src/static/dvderr.c": self.cflags = c.DOL_DVDERR_CFLAGS self.cc = c.CC - elif path.startswith("src/jaudio_NES"): + elif path.startswith("src/static/jaudio_NES"): self.cc = c.CC self.cflags = c.DOL_CPPFLAGS - elif path.startswith("src/TRK") and not path.startswith("src/TRK/init"): + elif path.startswith("src/static/TRK") and not path.startswith("src/static/TRK/init"): self.cc = c.CC self.cflags = c.DOL_TRK_CFLAGS - elif os.path.dirname(path).endswith("src"): + elif os.path.dirname(path).endswith("src/static"): self.cflags = c.DOL_CFLAGS_SDATA0_CFLAGS self.cc = c.CC else: diff --git a/dump/main.dol.sha1 b/dump/main.dol.sha1 deleted file mode 100644 index 651f34a4..00000000 --- a/dump/main.dol.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ae8f56e7791d37e165bd5900921f2269f9515bf *out/main.dol \ No newline at end of file diff --git a/dump/static.dol.sha1 b/dump/static.dol.sha1 new file mode 100644 index 00000000..8f332595 --- /dev/null +++ b/dump/static.dol.sha1 @@ -0,0 +1 @@ +2ae8f56e7791d37e165bd5900921f2269f9515bf *out/static.dol \ No newline at end of file diff --git a/include/m_font.h b/include/m_font.h index ffe2b1a4..4337a880 100644 --- a/include/m_font.h +++ b/include/m_font.h @@ -506,7 +506,7 @@ extern void mFont_ct(); extern int mFont_UnintToString(u8* str, int figure, u32 num, int figure_start, int left_cut, int fill_zero, int separator); extern int mFont_char_save_data_check(u8 c); extern u8 mFont_small_to_capital(u8 small); -extern int mFont_GetCodeWidth(int c, int cut); +extern int mFont_GetCodeWidth(u8 c, int cut); extern int mFont_GetStringWidth(u8* str, int len, int cut); extern int mFont_GetStringWidth2(u8* str, int len, int cut); extern int mFont_CodeSize_get(u8* str); diff --git a/progress.py b/progress.py index d9bc44e5..2d62f99f 100644 --- a/progress.py +++ b/progress.py @@ -90,5 +90,5 @@ if __name__=="__main__": ] else: dol_secs = rel_secs = [".text"] - print_binary_progress(dol_secs, decomp_sizes, total_sizes, "main.dol", args.full) + print_binary_progress(dol_secs, decomp_sizes, total_sizes, "static.dol", args.full) print_binary_progress(rel_secs, rel_decomp_sizes, rel_total_sizes, "foresta.rel", args.full) \ No newline at end of file diff --git a/rel/THA_GA.c b/src/THA_GA.c similarity index 100% rename from rel/THA_GA.c rename to src/THA_GA.c diff --git a/rel/TwoHeadArena.c b/src/TwoHeadArena.c similarity index 100% rename from rel/TwoHeadArena.c rename to src/TwoHeadArena.c diff --git a/rel/ac_airplane.c b/src/ac_airplane.c similarity index 100% rename from rel/ac_airplane.c rename to src/ac_airplane.c diff --git a/rel/ac_animal_logo.c b/src/ac_animal_logo.c similarity index 99% rename from rel/ac_animal_logo.c rename to src/ac_animal_logo.c index bfdad44b..bd16e0bc 100644 --- a/rel/ac_animal_logo.c +++ b/src/ac_animal_logo.c @@ -69,7 +69,7 @@ ACTOR_PROFILE Animal_Logo_Profile = { // TODO: once proper building is possible, fix this -//#include "../rel/ac_animal_logo_misc.c" +//#include "../src/ac_animal_logo_misc.c" static void aAL_setupAction(ANIMAL_LOGO_ACTOR* actor, GAME* game, int action); static void aAL_title_decide_p_sel_npc(); diff --git a/rel/ac_animal_logo_misc.c b/src/ac_animal_logo_misc.c similarity index 100% rename from rel/ac_animal_logo_misc.c rename to src/ac_animal_logo_misc.c diff --git a/rel/ac_aprilfool_control.c b/src/ac_aprilfool_control.c similarity index 100% rename from rel/ac_aprilfool_control.c rename to src/ac_aprilfool_control.c diff --git a/rel/ac_boxManager.c b/src/ac_boxManager.c similarity index 100% rename from rel/ac_boxManager.c rename to src/ac_boxManager.c diff --git a/rel/ac_boxMove.c b/src/ac_boxMove.c similarity index 100% rename from rel/ac_boxMove.c rename to src/ac_boxMove.c diff --git a/rel/ac_boxTrick01.c b/src/ac_boxTrick01.c similarity index 100% rename from rel/ac_boxTrick01.c rename to src/ac_boxTrick01.c diff --git a/rel/ac_douzou.c b/src/ac_douzou.c similarity index 98% rename from rel/ac_douzou.c rename to src/ac_douzou.c index aedba775..fda4c6d6 100644 --- a/rel/ac_douzou.c +++ b/src/ac_douzou.c @@ -191,5 +191,5 @@ static void aDOU_actor_dt(ACTOR* actor, GAME* game) { cKF_SkeletonInfo_R_dt(&douzou->keyframe); } -#include "../rel/ac_douzou_move.c_inc" -#include "../rel/ac_douzou_draw.c_inc" +#include "../src/ac_douzou_move.c_inc" +#include "../src/ac_douzou_draw.c_inc" diff --git a/rel/ac_douzou_draw.c_inc b/src/ac_douzou_draw.c_inc similarity index 100% rename from rel/ac_douzou_draw.c_inc rename to src/ac_douzou_draw.c_inc diff --git a/rel/ac_douzou_move.c_inc b/src/ac_douzou_move.c_inc similarity index 100% rename from rel/ac_douzou_move.c_inc rename to src/ac_douzou_move.c_inc diff --git a/rel/ac_dump.c b/src/ac_dump.c similarity index 100% rename from rel/ac_dump.c rename to src/ac_dump.c diff --git a/rel/ac_ev_dokutu.c b/src/ac_ev_dokutu.c similarity index 97% rename from rel/ac_ev_dokutu.c rename to src/ac_ev_dokutu.c index b020f8fe..5bee6989 100644 --- a/rel/ac_ev_dokutu.c +++ b/src/ac_ev_dokutu.c @@ -2,7 +2,7 @@ #include "m_common_data.h" -#include "../rel/ac_ev_dokutu_talk.c_inc" +#include "../src/ac_ev_dokutu_talk.c_inc" static void aEVD_actor_ct(ACTOR* actorx, GAME* game); static void aEVD_actor_dt(ACTOR* actorx, GAME* game); diff --git a/rel/ac_ev_dokutu_talk.c_inc b/src/ac_ev_dokutu_talk.c_inc similarity index 100% rename from rel/ac_ev_dokutu_talk.c_inc rename to src/ac_ev_dokutu_talk.c_inc diff --git a/rel/ac_ev_soncho.c b/src/ac_ev_soncho.c similarity index 98% rename from rel/ac_ev_soncho.c rename to src/ac_ev_soncho.c index 2af85dcb..72286a63 100644 --- a/rel/ac_ev_soncho.c +++ b/src/ac_ev_soncho.c @@ -80,4 +80,4 @@ static void aESC_actor_draw(ACTOR* actorx, GAME* game) { (*Common_Get(clip).npc_clip->draw_proc)(actorx, game); } -#include "../rel/ac_ev_soncho_talk.c_inc" +#include "../src/ac_ev_soncho_talk.c_inc" diff --git a/rel/ac_ev_soncho_talk.c_inc b/src/ac_ev_soncho_talk.c_inc similarity index 100% rename from rel/ac_ev_soncho_talk.c_inc rename to src/ac_ev_soncho_talk.c_inc diff --git a/rel/ac_groundhog_control.c b/src/ac_groundhog_control.c similarity index 100% rename from rel/ac_groundhog_control.c rename to src/ac_groundhog_control.c diff --git a/rel/ac_haniwa.c b/src/ac_haniwa.c similarity index 98% rename from rel/ac_haniwa.c rename to src/ac_haniwa.c index ea448620..6ab7e0bf 100644 --- a/rel/ac_haniwa.c +++ b/src/ac_haniwa.c @@ -94,7 +94,7 @@ static void aHNW_actor_dt(ACTOR* actor, GAME* game) { ClObjPipe_dt(play, &haniwa->col_pipe); } -#include "../rel/ac_haniwa_move.c_inc" +#include "../src/ac_haniwa_move.c_inc" static void aHNW_actor_draw(ACTOR* actor, GAME* game) { static Gfx hnw_tex_model[] = { diff --git a/rel/ac_haniwa_move.c_inc b/src/ac_haniwa_move.c_inc similarity index 100% rename from rel/ac_haniwa_move.c_inc rename to src/ac_haniwa_move.c_inc diff --git a/rel/ac_radio.c b/src/ac_radio.c similarity index 94% rename from rel/ac_radio.c rename to src/ac_radio.c index c4a5201c..e2d781d2 100644 --- a/rel/ac_radio.c +++ b/src/ac_radio.c @@ -52,6 +52,6 @@ static void aRAD_actor_ct(ACTOR* actor, GAME* game){ aRAD_set_bgOffset(radio, 1); } -#include "../rel/ac_radio_move.c_inc" +#include "../src/ac_radio_move.c_inc" -#include "../rel/ac_radio_draw.c_inc" +#include "../src/ac_radio_draw.c_inc" diff --git a/rel/ac_radio_draw.c_inc b/src/ac_radio_draw.c_inc similarity index 100% rename from rel/ac_radio_draw.c_inc rename to src/ac_radio_draw.c_inc diff --git a/rel/ac_radio_move.c_inc b/src/ac_radio_move.c_inc similarity index 100% rename from rel/ac_radio_move.c_inc rename to src/ac_radio_move.c_inc diff --git a/rel/ac_rope.c b/src/ac_rope.c similarity index 100% rename from rel/ac_rope.c rename to src/ac_rope.c diff --git a/rel/ac_sample.c b/src/ac_sample.c similarity index 100% rename from rel/ac_sample.c rename to src/ac_sample.c diff --git a/rel/ac_set_manager.c b/src/ac_set_manager.c similarity index 100% rename from rel/ac_set_manager.c rename to src/ac_set_manager.c diff --git a/rel/ac_set_ovl_gyoei.c b/src/ac_set_ovl_gyoei.c similarity index 100% rename from rel/ac_set_ovl_gyoei.c rename to src/ac_set_ovl_gyoei.c diff --git a/rel/ac_set_ovl_insect.c b/src/ac_set_ovl_insect.c similarity index 100% rename from rel/ac_set_ovl_insect.c rename to src/ac_set_ovl_insect.c diff --git a/rel/ac_structure.c b/src/ac_structure.c similarity index 100% rename from rel/ac_structure.c rename to src/ac_structure.c diff --git a/rel/ac_t_anrium1.c b/src/ac_t_anrium1.c similarity index 100% rename from rel/ac_t_anrium1.c rename to src/ac_t_anrium1.c diff --git a/rel/ac_t_bag1.c b/src/ac_t_bag1.c similarity index 100% rename from rel/ac_t_bag1.c rename to src/ac_t_bag1.c diff --git a/rel/ac_t_bag2.c b/src/ac_t_bag2.c similarity index 100% rename from rel/ac_t_bag2.c rename to src/ac_t_bag2.c diff --git a/rel/ac_t_biscus1.c b/src/ac_t_biscus1.c similarity index 100% rename from rel/ac_t_biscus1.c rename to src/ac_t_biscus1.c diff --git a/rel/ac_t_biscus2.c b/src/ac_t_biscus2.c similarity index 100% rename from rel/ac_t_biscus2.c rename to src/ac_t_biscus2.c diff --git a/rel/ac_t_biscus3.c b/src/ac_t_biscus3.c similarity index 100% rename from rel/ac_t_biscus3.c rename to src/ac_t_biscus3.c diff --git a/rel/ac_t_biscus4.c b/src/ac_t_biscus4.c similarity index 100% rename from rel/ac_t_biscus4.c rename to src/ac_t_biscus4.c diff --git a/rel/ac_t_cobra1.c b/src/ac_t_cobra1.c similarity index 100% rename from rel/ac_t_cobra1.c rename to src/ac_t_cobra1.c diff --git a/rel/ac_t_cracker.c b/src/ac_t_cracker.c similarity index 100% rename from rel/ac_t_cracker.c rename to src/ac_t_cracker.c diff --git a/rel/ac_t_flag.c b/src/ac_t_flag.c similarity index 100% rename from rel/ac_t_flag.c rename to src/ac_t_flag.c diff --git a/rel/ac_t_hanabi.c b/src/ac_t_hanabi.c similarity index 100% rename from rel/ac_t_hanabi.c rename to src/ac_t_hanabi.c diff --git a/rel/ac_t_hasu1.c b/src/ac_t_hasu1.c similarity index 100% rename from rel/ac_t_hasu1.c rename to src/ac_t_hasu1.c diff --git a/rel/ac_t_hat1.c b/src/ac_t_hat1.c similarity index 100% rename from rel/ac_t_hat1.c rename to src/ac_t_hat1.c diff --git a/rel/ac_t_hat2.c b/src/ac_t_hat2.c similarity index 100% rename from rel/ac_t_hat2.c rename to src/ac_t_hat2.c diff --git a/rel/ac_t_hat3.c b/src/ac_t_hat3.c similarity index 100% rename from rel/ac_t_hat3.c rename to src/ac_t_hat3.c diff --git a/rel/ac_t_npc_sao.c b/src/ac_t_npc_sao.c similarity index 100% rename from rel/ac_t_npc_sao.c rename to src/ac_t_npc_sao.c diff --git a/rel/ac_t_pistol.c b/src/ac_t_pistol.c similarity index 100% rename from rel/ac_t_pistol.c rename to src/ac_t_pistol.c diff --git a/rel/ac_t_tumbler.c b/src/ac_t_tumbler.c similarity index 100% rename from rel/ac_t_tumbler.c rename to src/ac_t_tumbler.c diff --git a/rel/ac_tama.c b/src/ac_tama.c similarity index 92% rename from rel/ac_tama.c rename to src/ac_tama.c index 6334e1fe..80e50890 100644 --- a/rel/ac_tama.c +++ b/src/ac_tama.c @@ -34,6 +34,6 @@ static void aTAM_actor_ct(ACTOR* actorx, GAME* game) { tama->structure_class.structure_pal = aSTR_PAL_KAGO_R + tama->structure_class.action; } -#include "../rel/ac_tama_move.c_inc" +#include "../src/ac_tama_move.c_inc" -#include "../rel/ac_tama_draw.c_inc" +#include "../src/ac_tama_draw.c_inc" diff --git a/rel/ac_tama_draw.c_inc b/src/ac_tama_draw.c_inc similarity index 100% rename from rel/ac_tama_draw.c_inc rename to src/ac_tama_draw.c_inc diff --git a/rel/ac_tama_move.c_inc b/src/ac_tama_move.c_inc similarity index 100% rename from rel/ac_tama_move.c_inc rename to src/ac_tama_move.c_inc diff --git a/rel/ac_tools.c b/src/ac_tools.c similarity index 100% rename from rel/ac_tools.c rename to src/ac_tools.c diff --git a/rel/ac_toudai.c b/src/ac_toudai.c similarity index 97% rename from rel/ac_toudai.c rename to src/ac_toudai.c index 9aaa3bec..94601880 100644 --- a/rel/ac_toudai.c +++ b/src/ac_toudai.c @@ -123,6 +123,6 @@ static void aTOU_actor_dt(ACTOR* actor, GAME* game){ } -#include "../rel/ac_toudai_move.c_inc" +#include "../src/ac_toudai_move.c_inc" -#include "../rel/ac_toudai_draw.c_inc" +#include "../src/ac_toudai_draw.c_inc" diff --git a/rel/ac_toudai_draw.c_inc b/src/ac_toudai_draw.c_inc similarity index 100% rename from rel/ac_toudai_draw.c_inc rename to src/ac_toudai_draw.c_inc diff --git a/rel/ac_toudai_move.c_inc b/src/ac_toudai_move.c_inc similarity index 100% rename from rel/ac_toudai_move.c_inc rename to src/ac_toudai_move.c_inc diff --git a/rel/ac_train0.c b/src/ac_train0.c similarity index 95% rename from rel/ac_train0.c rename to src/ac_train0.c index 74950cfb..26e0e38b 100644 --- a/rel/ac_train0.c +++ b/src/ac_train0.c @@ -61,6 +61,6 @@ static void aTR0_actor_dt(ACTOR* actor, GAME* game){ Common_Set(train_exists_flag, 0); } -#include "../rel/ac_train0_move.c_inc" +#include "../src/ac_train0_move.c_inc" -#include "../rel/ac_train0_draw.c_inc" +#include "../src/ac_train0_draw.c_inc" diff --git a/rel/ac_train0_draw.c_inc b/src/ac_train0_draw.c_inc similarity index 100% rename from rel/ac_train0_draw.c_inc rename to src/ac_train0_draw.c_inc diff --git a/rel/ac_train0_move.c_inc b/src/ac_train0_move.c_inc similarity index 100% rename from rel/ac_train0_move.c_inc rename to src/ac_train0_move.c_inc diff --git a/rel/ac_train1.c b/src/ac_train1.c similarity index 95% rename from rel/ac_train1.c rename to src/ac_train1.c index 97eadea9..66f58e31 100644 --- a/rel/ac_train1.c +++ b/src/ac_train1.c @@ -60,6 +60,6 @@ static void aTR1_actor_dt(ACTOR* actor, GAME* game){ cKF_SkeletonInfo_R_dt(&train1->keyframe); } -#include "../rel/ac_train1_move.c_inc" +#include "../src/ac_train1_move.c_inc" -#include "../rel/ac_train1_draw.c_inc" +#include "../src/ac_train1_draw.c_inc" diff --git a/rel/ac_train1_draw.c_inc b/src/ac_train1_draw.c_inc similarity index 100% rename from rel/ac_train1_draw.c_inc rename to src/ac_train1_draw.c_inc diff --git a/rel/ac_train1_move.c_inc b/src/ac_train1_move.c_inc similarity index 100% rename from rel/ac_train1_move.c_inc rename to src/ac_train1_move.c_inc diff --git a/rel/ac_train_door.c b/src/ac_train_door.c similarity index 100% rename from rel/ac_train_door.c rename to src/ac_train_door.c diff --git a/rel/ac_train_window.c b/src/ac_train_window.c similarity index 100% rename from rel/ac_train_window.c rename to src/ac_train_window.c diff --git a/rel/ac_weather.c b/src/ac_weather.c similarity index 100% rename from rel/ac_weather.c rename to src/ac_weather.c diff --git a/rel/ac_weather_fine.c b/src/ac_weather_fine.c similarity index 100% rename from rel/ac_weather_fine.c rename to src/ac_weather_fine.c diff --git a/rel/ac_weather_leaf.c b/src/ac_weather_leaf.c similarity index 100% rename from rel/ac_weather_leaf.c rename to src/ac_weather_leaf.c diff --git a/rel/ac_weather_rain.c b/src/ac_weather_rain.c similarity index 100% rename from rel/ac_weather_rain.c rename to src/ac_weather_rain.c diff --git a/rel/ac_weather_sakura.c b/src/ac_weather_sakura.c similarity index 100% rename from rel/ac_weather_sakura.c rename to src/ac_weather_sakura.c diff --git a/rel/ac_weather_snow.c b/src/ac_weather_snow.c similarity index 100% rename from rel/ac_weather_snow.c rename to src/ac_weather_snow.c diff --git a/src/asm/__exception.s b/src/asm/__exception.s deleted file mode 100644 index 3c8ee9f5..00000000 --- a/src/asm/__exception.s +++ /dev/null @@ -1,462 +0,0 @@ -.include "macros.inc" -.section .init, "ax" -.global gTRKInterruptVectorTable -gTRKInterruptVectorTable: - -/* 80003534 4D657472 */ .4byte 0x4d657472 -/* 80003538 6F776572 */ xoris r23, r27, 0x6572 -/* 8000353C 6B732054 */ xori r19, r27, 0x2054 -/* 80003540 61726765 */ ori r18, r11, 0x6765 -/* 80003544 74205265 */ andis. r0, r1, 0x5265 -/* 80003548 73696465 */ andi. r9, r27, 0x6465 -/* 8000354C 6E74204B */ xoris r20, r19, 0x204b -/* 80003550 65726E65 */ oris r18, r11, 0x6e65 -/* 80003554 6C20666F */ xoris r0, r1, 0x666f -/* 80003558 7220506F */ andi. r0, r17, 0x506f -/* 8000355C 77657250 */ andis. r5, r27, 0x7250 -/* 80003560 43000000 */ .4byte 0x43000000 - -.fill 0xD0 - -b __TRK_reset - -.fill 0xFC -/* 80004580 00000680 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004584 00000684 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004588 00000688 7C 00 17 AC */ icbi 0, r2 -/* 8000458C 0000068C 7C 53 02 A6 */ mfdar r2 -/* 80004590 00000690 7C 00 13 AC */ dcbi 0, r2 -/* 80004594 00000694 7C 51 42 A6 */ mfspr r2, 0x111 -/* 80004598 00000698 7C 51 43 A6 */ mtspr 0x111, r2 -/* 8000459C 0000069C 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800045A0 000006A0 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800045A4 000006A4 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800045A8 000006A8 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800045AC 000006AC 7C 60 00 A6 */ mfmsr r3 -/* 800045B0 000006B0 60 63 00 30 */ ori r3, r3, 0x30 -/* 800045B4 000006B4 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800045B8 000006B8 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800045BC 000006BC 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800045C0 000006C0 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800045C4 000006C4 38 60 02 00 */ li r3, 0x200 -/* 800045C8 000006C8 4C 00 00 64 */ rfi -.fill 0xB4 - - -/* 80004680 00000780 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004684 00000784 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004688 00000788 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000468C 0000078C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004690 00000790 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004694 00000794 7C 60 00 A6 */ mfmsr r3 -/* 80004698 00000798 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000469C 0000079C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800046A0 000007A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800046A4 000007A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800046A8 000007A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800046AC 000007AC 38 60 03 00 */ li r3, 0x300 -/* 800046B0 000007B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80004780 00000880 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004784 00000884 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004788 00000888 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000478C 0000088C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004790 00000890 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004794 00000894 7C 60 00 A6 */ mfmsr r3 -/* 80004798 00000898 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000479C 0000089C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800047A0 000008A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800047A4 000008A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800047A8 000008A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800047AC 000008AC 38 60 04 00 */ li r3, 0x400 -/* 800047B0 000008B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80004880 00000980 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004884 00000984 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004888 00000988 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000488C 0000098C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004890 00000990 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004894 00000994 7C 60 00 A6 */ mfmsr r3 -/* 80004898 00000998 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000489C 0000099C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800048A0 000009A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800048A4 000009A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800048A8 000009A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800048AC 000009AC 38 60 05 00 */ li r3, 0x500 -/* 800048B0 000009B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80004980 00000A80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004984 00000A84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004988 00000A88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000498C 00000A8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004990 00000A90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004994 00000A94 7C 60 00 A6 */ mfmsr r3 -/* 80004998 00000A98 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000499C 00000A9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800049A0 00000AA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800049A4 00000AA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800049A8 00000AA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800049AC 00000AAC 38 60 06 00 */ li r3, 0x600 -/* 800049B0 00000AB0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80004A80 00000B80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004A84 00000B84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004A88 00000B88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80004A8C 00000B8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004A90 00000B90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004A94 00000B94 7C 60 00 A6 */ mfmsr r3 -/* 80004A98 00000B98 60 63 00 30 */ ori r3, r3, 0x30 -/* 80004A9C 00000B9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80004AA0 00000BA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80004AA4 00000BA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80004AA8 00000BA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80004AAC 00000BAC 38 60 07 00 */ li r3, 0x700 -/* 80004AB0 00000BB0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80004B80 00000C80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004B84 00000C84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004B88 00000C88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80004B8C 00000C8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004B90 00000C90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004B94 00000C94 7C 60 00 A6 */ mfmsr r3 -/* 80004B98 00000C98 60 63 00 30 */ ori r3, r3, 0x30 -/* 80004B9C 00000C9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80004BA0 00000CA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80004BA4 00000CA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80004BA8 00000CA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80004BAC 00000CAC 38 60 08 00 */ li r3, 0x800 -/* 80004BB0 00000CB0 4C 00 00 64 */ rfi -.fill 0xCC - -/* 80004C80 00000D80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004C84 00000D84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004C88 00000D88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80004C8C 00000D8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004C90 00000D90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004C94 00000D94 7C 60 00 A6 */ mfmsr r3 -/* 80004C98 00000D98 60 63 00 30 */ ori r3, r3, 0x30 -/* 80004C9C 00000D9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80004CA0 00000DA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80004CA4 00000DA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80004CA8 00000DA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80004CAC 00000DAC 38 60 09 00 */ li r3, 0x900 -/* 80004CB0 00000DB0 4C 00 00 64 */ rfi -.fill 0xCC - - -.fill 0x100 -.fill 0x100 - -/* 80004F80 00001080 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80004F84 00001084 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80004F88 00001088 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80004F8C 0000108C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80004F90 00001090 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80004F94 00001094 7C 60 00 A6 */ mfmsr r3 -/* 80004F98 00001098 60 63 00 30 */ ori r3, r3, 0x30 -/* 80004F9C 0000109C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80004FA0 000010A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80004FA4 000010A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80004FA8 000010A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80004FAC 000010AC 38 60 0C 00 */ li r3, 0xc00 -/* 80004FB0 000010B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80005080 00001180 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005084 00001184 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005088 00001188 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000508C 0000118C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005090 00001190 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005094 00001194 7C 60 00 A6 */ mfmsr r3 -/* 80005098 00001198 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000509C 0000119C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800050A0 000011A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800050A4 000011A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800050A8 000011A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800050AC 000011AC 38 60 0D 00 */ li r3, 0xd00 -/* 800050B0 000011B0 4C 00 00 64 */ rfi -.fill 0xCC - - - - -/* 80005180 00001280 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005184 00001284 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005188 00001288 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000518C 0000128C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005190 00001290 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005194 00001294 7C 60 00 A6 */ mfmsr r3 -/* 80005198 00001298 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000519C 0000129C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800051A0 000012A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800051A4 000012A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800051A8 000012A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800051AC 000012AC 38 60 0E 00 */ li r3, 0xe00 -/* 800051B0 000012B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80005280 00001380 48 00 00 54 */ b .L_800052D4 -.fill 0x1C -/* 800052A0 000013A0 7C 51 43 A6 */ mtspr 0x111, r2 -/* 800052A4 000013A4 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800052A8 000013A8 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800052AC 000013AC 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800052B0 000013B0 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800052B4 000013B4 7C 60 00 A6 */ mfmsr r3 -/* 800052B8 000013B8 60 63 00 30 */ ori r3, r3, 0x30 -/* 800052BC 000013BC 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800052C0 000013C0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800052C4 000013C4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800052C8 000013C8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800052CC 000013CC 38 60 0F 20 */ li r3, 0xf20 -/* 800052D0 000013D0 4C 00 00 64 */ rfi -.L_800052D4: -/* 800052D4 000013D4 7C 51 43 A6 */ mtspr 0x111, r2 -/* 800052D8 000013D8 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800052DC 000013DC 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800052E0 000013E0 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800052E4 000013E4 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800052E8 000013E8 7C 60 00 A6 */ mfmsr r3 -/* 800052EC 000013EC 60 63 00 30 */ ori r3, r3, 0x30 -/* 800052F0 000013F0 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800052F4 000013F4 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800052F8 000013F8 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800052FC 000013FC 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80005300 00001400 38 60 0F 00 */ li r3, 0xf00 -/* 80005304 00001404 4C 00 00 64 */ rfi -.fill 0x78 - -/* 80005380 00001480 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005384 00001484 7C 40 00 26 */ mfcr r2 -/* 80005388 00001488 7C 52 43 A6 */ mtspr 0x112, r2 -/* 8000538C 0000148C 7C 40 00 A6 */ mfmsr r2 -/* 80005390 00001490 74 42 00 02 */ andis. r2, r2, 2 -/* 80005394 00001494 41 82 00 1C */ beq .L_800053B0 -/* 80005398 00001498 7C 40 00 A6 */ mfmsr r2 -/* 8000539C 0000149C 6C 42 00 02 */ xoris r2, r2, 2 -/* 800053A0 000014A0 7C 00 04 AC */ sync 0 -/* 800053A4 000014A4 7C 40 01 24 */ mtmsr r2 -/* 800053A8 000014A8 7C 00 04 AC */ sync 0 -/* 800053AC 000014AC 7C 51 43 A6 */ mtspr 0x111, r2 -.L_800053B0: -/* 800053B0 000014B0 7C 52 42 A6 */ mfspr r2, 0x112 -/* 800053B4 000014B4 7C 4F F1 20 */ mtcrf 0xff, r2 -/* 800053B8 000014B8 7C 51 42 A6 */ mfspr r2, 0x111 -/* 800053BC 000014BC 7C 51 43 A6 */ mtspr 0x111, r2 -/* 800053C0 000014C0 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800053C4 000014C4 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800053C8 000014C8 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800053CC 000014CC 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800053D0 000014D0 7C 60 00 A6 */ mfmsr r3 -/* 800053D4 000014D4 60 63 00 30 */ ori r3, r3, 0x30 -/* 800053D8 000014D8 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800053DC 000014DC 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800053E0 000014E0 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800053E4 000014E4 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800053E8 000014E8 38 60 10 00 */ li r3, 0x1000 -/* 800053EC 000014EC 4C 00 00 64 */ rfi -.fill 0x90 - - -/* 80005480 00001580 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005484 00001584 7C 40 00 26 */ mfcr r2 -/* 80005488 00001588 7C 52 43 A6 */ mtspr 0x112, r2 -/* 8000548C 0000158C 7C 40 00 A6 */ mfmsr r2 -/* 80005490 00001590 74 42 00 02 */ andis. r2, r2, 2 -/* 80005494 00001594 41 82 00 1C */ beq .L_800054B0 -/* 80005498 00001598 7C 40 00 A6 */ mfmsr r2 -/* 8000549C 0000159C 6C 42 00 02 */ xoris r2, r2, 2 -/* 800054A0 000015A0 7C 00 04 AC */ sync 0 -/* 800054A4 000015A4 7C 40 01 24 */ mtmsr r2 -/* 800054A8 000015A8 7C 00 04 AC */ sync 0 -/* 800054AC 000015AC 7C 51 43 A6 */ mtspr 0x111, r2 -.L_800054B0: -/* 800054B0 000015B0 7C 52 42 A6 */ mfspr r2, 0x112 -/* 800054B4 000015B4 7C 4F F1 20 */ mtcrf 0xff, r2 -/* 800054B8 000015B8 7C 51 42 A6 */ mfspr r2, 0x111 -/* 800054BC 000015BC 7C 51 43 A6 */ mtspr 0x111, r2 -/* 800054C0 000015C0 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800054C4 000015C4 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800054C8 000015C8 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800054CC 000015CC 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800054D0 000015D0 7C 60 00 A6 */ mfmsr r3 -/* 800054D4 000015D4 60 63 00 30 */ ori r3, r3, 0x30 -/* 800054D8 000015D8 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800054DC 000015DC 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800054E0 000015E0 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800054E4 000015E4 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800054E8 000015E8 38 60 11 00 */ li r3, 0x1100 -/* 800054EC 000015EC 4C 00 00 64 */ rfi -.fill 0x90 - - -/* 80005580 00001680 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005584 00001684 7C 40 00 26 */ mfcr r2 -/* 80005588 00001688 7C 52 43 A6 */ mtspr 0x112, r2 -/* 8000558C 0000168C 7C 40 00 A6 */ mfmsr r2 -/* 80005590 00001690 74 42 00 02 */ andis. r2, r2, 2 -/* 80005594 00001694 41 82 00 1C */ beq .L_800055B0 -/* 80005598 00001698 7C 40 00 A6 */ mfmsr r2 -/* 8000559C 0000169C 6C 42 00 02 */ xoris r2, r2, 2 -/* 800055A0 000016A0 7C 00 04 AC */ sync 0 -/* 800055A4 000016A4 7C 40 01 24 */ mtmsr r2 -/* 800055A8 000016A8 7C 00 04 AC */ sync 0 -/* 800055AC 000016AC 7C 51 43 A6 */ mtspr 0x111, r2 -.L_800055B0: -/* 800055B0 000016B0 7C 52 42 A6 */ mfspr r2, 0x112 -/* 800055B4 000016B4 7C 4F F1 20 */ mtcrf 0xff, r2 -/* 800055B8 000016B8 7C 51 42 A6 */ mfspr r2, 0x111 -/* 800055BC 000016BC 7C 51 43 A6 */ mtspr 0x111, r2 -/* 800055C0 000016C0 7C 72 43 A6 */ mtspr 0x112, r3 -/* 800055C4 000016C4 7C 93 43 A6 */ mtspr 0x113, r4 -/* 800055C8 000016C8 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 800055CC 000016CC 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 800055D0 000016D0 7C 60 00 A6 */ mfmsr r3 -/* 800055D4 000016D4 60 63 00 30 */ ori r3, r3, 0x30 -/* 800055D8 000016D8 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800055DC 000016DC 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800055E0 000016E0 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800055E4 000016E4 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800055E8 000016E8 38 60 12 00 */ li r3, 0x1200 -/* 800055EC 000016EC 4C 00 00 64 */ rfi -.fill 0x90 - - -/* 80005680 00001780 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005684 00001784 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005688 00001788 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000568C 0000178C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005690 00001790 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005694 00001794 7C 60 00 A6 */ mfmsr r3 -/* 80005698 00001798 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000569C 0000179C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800056A0 000017A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800056A4 000017A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800056A8 000017A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800056AC 000017AC 38 60 13 00 */ li r3, 0x1300 -/* 800056B0 000017B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80005780 00001880 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005784 00001884 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005788 00001888 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000578C 0000188C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005790 00001890 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005794 00001894 7C 60 00 A6 */ mfmsr r3 -/* 80005798 00001898 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000579C 0000189C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800057A0 000018A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800057A4 000018A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800057A8 000018A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800057AC 000018AC 38 60 14 00 */ li r3, 0x1400 -/* 800057B0 000018B0 4C 00 00 64 */ rfi -.fill 0x1CC - - -/* 80005980 00001A80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005984 00001A84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005988 00001A88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000598C 00001A8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005990 00001A90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005994 00001A94 7C 60 00 A6 */ mfmsr r3 -/* 80005998 00001A98 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000599C 00001A9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800059A0 00001AA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800059A4 00001AA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800059A8 00001AA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800059AC 00001AAC 38 60 16 00 */ li r3, 0x1600 -/* 800059B0 00001AB0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80005A80 00001B80 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005A84 00001B84 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005A88 00001B88 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80005A8C 00001B8C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005A90 00001B90 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005A94 00001B94 7C 60 00 A6 */ mfmsr r3 -/* 80005A98 00001B98 60 63 00 30 */ ori r3, r3, 0x30 -/* 80005A9C 00001B9C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80005AA0 00001BA0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80005AA4 00001BA4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80005AA8 00001BA8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80005AAC 00001BAC 38 60 17 00 */ li r3, 0x1700 -/* 80005AB0 00001BB0 4C 00 00 64 */ rfi -.fill 0x4CC - - -/* 80005F80 00002080 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80005F84 00002084 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80005F88 00002088 7C 93 43 A6 */ mtspr 0x113, r4 -/* 80005F8C 0000208C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80005F90 00002090 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80005F94 00002094 7C 60 00 A6 */ mfmsr r3 -/* 80005F98 00002098 60 63 00 30 */ ori r3, r3, 0x30 -/* 80005F9C 0000209C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80005FA0 000020A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 80005FA4 000020A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 80005FA8 000020A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80005FAC 000020AC 38 60 1C 00 */ li r3, 0x1c00 -/* 80005FB0 000020B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80006080 00002180 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80006084 00002184 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80006088 00002188 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000608C 0000218C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80006090 00002190 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80006094 00002194 7C 60 00 A6 */ mfmsr r3 -/* 80006098 00002198 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000609C 0000219C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800060A0 000021A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800060A4 000021A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800060A8 000021A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800060AC 000021AC 38 60 1D 00 */ li r3, 0x1d00 -/* 800060B0 000021B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80006180 00002280 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80006184 00002284 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80006188 00002288 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000618C 0000228C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80006190 00002290 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80006194 00002294 7C 60 00 A6 */ mfmsr r3 -/* 80006198 00002298 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000619C 0000229C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800061A0 000022A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800061A4 000022A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800061A8 000022A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800061AC 000022AC 38 60 1E 00 */ li r3, 0x1e00 -/* 800061B0 000022B0 4C 00 00 64 */ rfi -.fill 0xCC - - -/* 80006280 00002380 7C 51 43 A6 */ mtspr 0x111, r2 -/* 80006284 00002384 7C 72 43 A6 */ mtspr 0x112, r3 -/* 80006288 00002388 7C 93 43 A6 */ mtspr 0x113, r4 -/* 8000628C 0000238C 7C 5A 02 A6 */ mfspr r2, 0x1a -/* 80006290 00002390 7C 9B 02 A6 */ mfspr r4, 0x1b -/* 80006294 00002394 7C 60 00 A6 */ mfmsr r3 -/* 80006298 00002398 60 63 00 30 */ ori r3, r3, 0x30 -/* 8000629C 0000239C 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 800062A0 000023A0 3C 60 80 2C */ lis r3, TRKInterruptHandler@h -/* 800062A4 000023A4 60 63 F5 CC */ ori r3, r3, TRKInterruptHandler@l -/* 800062A8 000023A8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 800062AC 000023AC 38 60 1F 00 */ li r3, 0x1f00 -/* 800062B0 000023B0 4C 00 00 64 */ rfi -gTRKInterruptVectorTableEnd: diff --git a/rel/audio.c b/src/audio.c similarity index 100% rename from rel/audio.c rename to src/audio.c diff --git a/rel/c_keyframe.c b/src/c_keyframe.c similarity index 100% rename from rel/c_keyframe.c rename to src/c_keyframe.c diff --git a/rel/data/combi/data_combi.c b/src/data/combi/data_combi.c similarity index 100% rename from rel/data/combi/data_combi.c rename to src/data/combi/data_combi.c diff --git a/rel/data/field/bg/beach_pal.c b/src/data/field/bg/beach_pal.c similarity index 100% rename from rel/data/field/bg/beach_pal.c rename to src/data/field/bg/beach_pal.c diff --git a/rel/data/field/bg/bush_pal.c b/src/data/field/bg/bush_pal.c similarity index 100% rename from rel/data/field/bg/bush_pal.c rename to src/data/field/bg/bush_pal.c diff --git a/rel/data/field/bg/cliff_pal.c b/src/data/field/bg/cliff_pal.c similarity index 100% rename from rel/data/field/bg/cliff_pal.c rename to src/data/field/bg/cliff_pal.c diff --git a/rel/data/field/bg/earth_pal.c b/src/data/field/bg/earth_pal.c similarity index 100% rename from rel/data/field/bg/earth_pal.c rename to src/data/field/bg/earth_pal.c diff --git a/rel/data/field/bg/rail_pal.c b/src/data/field/bg/rail_pal.c similarity index 100% rename from rel/data/field/bg/rail_pal.c rename to src/data/field/bg/rail_pal.c diff --git a/rel/data/npc/default_list.c b/src/data/npc/default_list.c similarity index 100% rename from rel/data/npc/default_list.c rename to src/data/npc/default_list.c diff --git a/rel/data/npc/grow_list.c b/src/data/npc/grow_list.c similarity index 100% rename from rel/data/npc/grow_list.c rename to src/data/npc/grow_list.c diff --git a/rel/data/npc/house_list.c b/src/data/npc/house_list.c similarity index 100% rename from rel/data/npc/house_list.c rename to src/data/npc/house_list.c diff --git a/rel/data/titledemo/pact0.c b/src/data/titledemo/pact0.c similarity index 100% rename from rel/data/titledemo/pact0.c rename to src/data/titledemo/pact0.c diff --git a/rel/data/titledemo/pact1.c b/src/data/titledemo/pact1.c similarity index 100% rename from rel/data/titledemo/pact1.c rename to src/data/titledemo/pact1.c diff --git a/rel/data/titledemo/pact2.c b/src/data/titledemo/pact2.c similarity index 100% rename from rel/data/titledemo/pact2.c rename to src/data/titledemo/pact2.c diff --git a/rel/data/titledemo/pact3.c b/src/data/titledemo/pact3.c similarity index 100% rename from rel/data/titledemo/pact3.c rename to src/data/titledemo/pact3.c diff --git a/rel/data/titledemo/pact4.c b/src/data/titledemo/pact4.c similarity index 100% rename from rel/data/titledemo/pact4.c rename to src/data/titledemo/pact4.c diff --git a/rel/ef_lamp_light.c b/src/ef_lamp_light.c similarity index 100% rename from rel/ef_lamp_light.c rename to src/ef_lamp_light.c diff --git a/rel/ef_room_sunshine.c b/src/ef_room_sunshine.c similarity index 100% rename from rel/ef_room_sunshine.c rename to src/ef_room_sunshine.c diff --git a/rel/ef_room_sunshine_minsect.c b/src/ef_room_sunshine_minsect.c similarity index 100% rename from rel/ef_room_sunshine_minsect.c rename to src/ef_room_sunshine_minsect.c diff --git a/rel/ef_room_sunshine_museum.c b/src/ef_room_sunshine_museum.c similarity index 100% rename from rel/ef_room_sunshine_museum.c rename to src/ef_room_sunshine_museum.c diff --git a/rel/ef_room_sunshine_police.c b/src/ef_room_sunshine_police.c similarity index 100% rename from rel/ef_room_sunshine_police.c rename to src/ef_room_sunshine_police.c diff --git a/rel/ef_room_sunshine_posthouse.c b/src/ef_room_sunshine_posthouse.c similarity index 100% rename from rel/ef_room_sunshine_posthouse.c rename to src/ef_room_sunshine_posthouse.c diff --git a/rel/evw_anime.c b/src/evw_anime.c similarity index 100% rename from rel/evw_anime.c rename to src/evw_anime.c diff --git a/rel/executor.c b/src/executor.c similarity index 100% rename from rel/executor.c rename to src/executor.c diff --git a/rel/famicom_emu.c b/src/famicom_emu.c similarity index 100% rename from rel/famicom_emu.c rename to src/famicom_emu.c diff --git a/rel/first_game.c b/src/first_game.c similarity index 100% rename from rel/first_game.c rename to src/first_game.c diff --git a/rel/game.c b/src/game.c similarity index 100% rename from rel/game.c rename to src/game.c diff --git a/rel/gamealloc.c b/src/gamealloc.c similarity index 100% rename from rel/gamealloc.c rename to src/gamealloc.c diff --git a/rel/gfxalloc.c b/src/gfxalloc.c similarity index 100% rename from rel/gfxalloc.c rename to src/gfxalloc.c diff --git a/rel/graph.c b/src/graph.c similarity index 100% rename from rel/graph.c rename to src/graph.c diff --git a/rel/irqmgr.c b/src/irqmgr.c similarity index 100% rename from rel/irqmgr.c rename to src/irqmgr.c diff --git a/rel/lb_reki.c b/src/lb_reki.c similarity index 100% rename from rel/lb_reki.c rename to src/lb_reki.c diff --git a/rel/lb_rtc.c b/src/lb_rtc.c similarity index 100% rename from rel/lb_rtc.c rename to src/lb_rtc.c diff --git a/rel/m_actor.c b/src/m_actor.c similarity index 100% rename from rel/m_actor.c rename to src/m_actor.c diff --git a/rel/m_actor_dlftbls.c b/src/m_actor_dlftbls.c similarity index 100% rename from rel/m_actor_dlftbls.c rename to src/m_actor_dlftbls.c diff --git a/rel/m_actor_shadow.c b/src/m_actor_shadow.c similarity index 100% rename from rel/m_actor_shadow.c rename to src/m_actor_shadow.c diff --git a/rel/m_all_grow.c b/src/m_all_grow.c similarity index 100% rename from rel/m_all_grow.c rename to src/m_all_grow.c diff --git a/rel/m_all_grow_ovl.c b/src/m_all_grow_ovl.c similarity index 100% rename from rel/m_all_grow_ovl.c rename to src/m_all_grow_ovl.c diff --git a/rel/m_bank_ovl.c b/src/m_bank_ovl.c similarity index 100% rename from rel/m_bank_ovl.c rename to src/m_bank_ovl.c diff --git a/rel/m_banti.c b/src/m_banti.c similarity index 100% rename from rel/m_banti.c rename to src/m_banti.c diff --git a/rel/m_bg_item.c b/src/m_bg_item.c similarity index 100% rename from rel/m_bg_item.c rename to src/m_bg_item.c diff --git a/rel/m_bg_tex.c b/src/m_bg_tex.c similarity index 100% rename from rel/m_bg_tex.c rename to src/m_bg_tex.c diff --git a/rel/m_calendar.c b/src/m_calendar.c similarity index 100% rename from rel/m_calendar.c rename to src/m_calendar.c diff --git a/rel/m_camera2.c b/src/m_camera2.c similarity index 100% rename from rel/m_camera2.c rename to src/m_camera2.c diff --git a/rel/m_cockroach.c b/src/m_cockroach.c similarity index 100% rename from rel/m_cockroach.c rename to src/m_cockroach.c diff --git a/rel/m_collision_bg.c b/src/m_collision_bg.c similarity index 100% rename from rel/m_collision_bg.c rename to src/m_collision_bg.c diff --git a/rel/m_collision_obj.c b/src/m_collision_obj.c similarity index 100% rename from rel/m_collision_obj.c rename to src/m_collision_obj.c diff --git a/rel/m_common_data.c b/src/m_common_data.c similarity index 100% rename from rel/m_common_data.c rename to src/m_common_data.c diff --git a/rel/m_controller.c b/src/m_controller.c similarity index 100% rename from rel/m_controller.c rename to src/m_controller.c diff --git a/rel/m_cpak.c b/src/m_cpak.c similarity index 100% rename from rel/m_cpak.c rename to src/m_cpak.c diff --git a/rel/m_debug.c b/src/m_debug.c similarity index 100% rename from rel/m_debug.c rename to src/m_debug.c diff --git a/rel/m_debug_display.c b/src/m_debug_display.c similarity index 100% rename from rel/m_debug_display.c rename to src/m_debug_display.c diff --git a/rel/m_debug_hayakawa.c b/src/m_debug_hayakawa.c similarity index 100% rename from rel/m_debug_hayakawa.c rename to src/m_debug_hayakawa.c diff --git a/rel/m_debug_mode.c b/src/m_debug_mode.c similarity index 100% rename from rel/m_debug_mode.c rename to src/m_debug_mode.c diff --git a/rel/m_demo.c b/src/m_demo.c similarity index 100% rename from rel/m_demo.c rename to src/m_demo.c diff --git a/rel/m_eappli.c b/src/m_eappli.c similarity index 100% rename from rel/m_eappli.c rename to src/m_eappli.c diff --git a/rel/m_editEndChk_ovl.c b/src/m_editEndChk_ovl.c similarity index 100% rename from rel/m_editEndChk_ovl.c rename to src/m_editEndChk_ovl.c diff --git a/rel/m_editor_ovl.c b/src/m_editor_ovl.c similarity index 100% rename from rel/m_editor_ovl.c rename to src/m_editor_ovl.c diff --git a/rel/m_event.c b/src/m_event.c similarity index 100% rename from rel/m_event.c rename to src/m_event.c diff --git a/rel/m_fbdemo.c b/src/m_fbdemo.c similarity index 100% rename from rel/m_fbdemo.c rename to src/m_fbdemo.c diff --git a/rel/m_fbdemo_fade.c b/src/m_fbdemo_fade.c similarity index 100% rename from rel/m_fbdemo_fade.c rename to src/m_fbdemo_fade.c diff --git a/rel/m_fbdemo_triforce.c b/src/m_fbdemo_triforce.c similarity index 100% rename from rel/m_fbdemo_triforce.c rename to src/m_fbdemo_triforce.c diff --git a/rel/m_fbdemo_wipe1.c b/src/m_fbdemo_wipe1.c similarity index 100% rename from rel/m_fbdemo_wipe1.c rename to src/m_fbdemo_wipe1.c diff --git a/rel/m_field_assessment.c b/src/m_field_assessment.c similarity index 100% rename from rel/m_field_assessment.c rename to src/m_field_assessment.c diff --git a/rel/m_field_info.c b/src/m_field_info.c similarity index 100% rename from rel/m_field_info.c rename to src/m_field_info.c diff --git a/rel/m_field_make.c b/src/m_field_make.c similarity index 100% rename from rel/m_field_make.c rename to src/m_field_make.c diff --git a/rel/m_fishrecord.c b/src/m_fishrecord.c similarity index 100% rename from rel/m_fishrecord.c rename to src/m_fishrecord.c diff --git a/rel/m_flashrom.c b/src/m_flashrom.c similarity index 98% rename from rel/m_flashrom.c rename to src/m_flashrom.c index aaee55d0..0a12b08a 100644 --- a/rel/m_flashrom.c +++ b/src/m_flashrom.c @@ -349,13 +349,13 @@ static int mFRm_get_errInfoNum(mFRm_err_info_c* err_info, int count) { #define mFRm_ERRORLINE(line) mFRm_set_errInfo(l_mfrm_err_info, (line), l_mfrm_now_color) #define mFRm_ERROR() mFRm_ERRORLINE(__LINE__) -#include "../rel/save_check.c_inc" -#include "../rel/save_check_gen.c_inc" -#include "../rel/save_check_MYK.c_inc" -#include "../rel/save_check_NSW.c_inc" -#include "../rel/save_check_take.c_inc" -#include "../rel/save_check_YSD.c_inc" -#include "../rel/save_check_komatu.c_inc" +#include "../src/save_check.c_inc" +#include "../src/save_check_gen.c_inc" +#include "../src/save_check_MYK.c_inc" +#include "../src/save_check_NSW.c_inc" +#include "../src/save_check_take.c_inc" +#include "../src/save_check_YSD.c_inc" +#include "../src/save_check_komatu.c_inc" /** * @brief Perform save data checks. diff --git a/rel/m_font.c b/src/m_font.c similarity index 96% rename from rel/m_font.c rename to src/m_font.c index 36890b95..c38450c7 100644 --- a/rel/m_font.c +++ b/src/m_font.c @@ -2,7 +2,7 @@ #include "audio.h" #include "m_lib.h" -#include "gbi_extensions.h" +#include "libforest/gbi_extensions.h" #include "dataobject.h" #include "game.h" #include "graph.h" @@ -16,10 +16,10 @@ #define mFont_CC_FONT 0, 0, 0, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0 #define mFont_CC_NOFONT 0, 0, 0, PRIMITIVE, 0, PRIMITIVE, TEXEL0, PRIMITIVE -#include "../rel/m_font_offset.c_inc" -#include "../rel/m_font_main.c_inc" -#include "../rel/m_font_mark.c_inc" -#include "../rel/m_font_rect.c_inc" +#include "../src/m_font_offset.c_inc" +#include "../src/m_font_main.c_inc" +#include "../src/m_font_mark.c_inc" +#include "../src/m_font_rect.c_inc" /* @unused static u8* mFont_Get_end_load_texture() */ diff --git a/rel/m_font_main.c_inc b/src/m_font_main.c_inc similarity index 99% rename from rel/m_font_main.c_inc rename to src/m_font_main.c_inc index a55eebf9..e7d4357e 100644 --- a/rel/m_font_main.c_inc +++ b/src/m_font_main.c_inc @@ -2,7 +2,7 @@ static u8* mFont_Get_FontTex_p() { return FONT_nes_tex_font1; } -extern int mFont_GetCodeWidth(int c, int cut) { +extern int mFont_GetCodeWidth(u8 c, int cut) { return mFont_TEX_CHAR_WIDTH - (cut ? mFont_Get_FontOffset(c) : 0); } @@ -490,7 +490,7 @@ static f32 mFont_SetLineStrings_AndSpace_new( f32 scale_x, f32 scale_y, int mode ) { - Gfx* g; + Gfx* gfx; mFontSentence sentence; int use_polygon_opaque = mode == 0; u32 flag; @@ -509,10 +509,10 @@ static f32 mFont_SetLineStrings_AndSpace_new( OPEN_DISP(game->graph); if (use_polygon_opaque) { - g = NOW_POLY_OPA_DISP; + gfx = NOW_POLY_OPA_DISP; } else { - g = NOW_FONT_DISP; + gfx = NOW_FONT_DISP; } flag = mFont_SENTENCE_FLAG_USE_POLY; @@ -536,13 +536,13 @@ static f32 mFont_SetLineStrings_AndSpace_new( color.a = a; mFontSentence_set(&sentence, str, len, flag, &pos, mFont_LineType_Top, &scale, &color, 0, 0, 0, 0, 0); - mFontSentence_gppDraw(&sentence, game, &g); + mFontSentence_gppDraw(&sentence, game, &gfx); if (use_polygon_opaque) { - SET_POLY_OPA_DISP(g); + SET_POLY_OPA_DISP(gfx); } else { - SET_FONT_DISP(g); + SET_FONT_DISP(gfx); } CLOSE_DISP(game->graph); diff --git a/rel/m_font_mark.c_inc b/src/m_font_mark.c_inc similarity index 100% rename from rel/m_font_mark.c_inc rename to src/m_font_mark.c_inc diff --git a/rel/m_font_offset.c_inc b/src/m_font_offset.c_inc similarity index 95% rename from rel/m_font_offset.c_inc rename to src/m_font_offset.c_inc index dd82790f..a3ed7499 100644 --- a/rel/m_font_offset.c_inc +++ b/src/m_font_offset.c_inc @@ -1,4 +1,4 @@ -static int mFont_Get_FontOffset(int c) { +static int mFont_Get_FontOffset(u8 c) { static u8 offset_data[256] = { 6, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 4, 4, 3, 3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 5, 5, diff --git a/rel/m_font_rect.c_inc b/src/m_font_rect.c_inc similarity index 100% rename from rel/m_font_rect.c_inc rename to src/m_font_rect.c_inc diff --git a/rel/m_fuusen.c b/src/m_fuusen.c similarity index 100% rename from rel/m_fuusen.c rename to src/m_fuusen.c diff --git a/rel/m_game_dlftbls.c b/src/m_game_dlftbls.c similarity index 100% rename from rel/m_game_dlftbls.c rename to src/m_game_dlftbls.c diff --git a/rel/m_handbill.c b/src/m_handbill.c similarity index 100% rename from rel/m_handbill.c rename to src/m_handbill.c diff --git a/rel/m_haniwaPortrait_ovl.c b/src/m_haniwaPortrait_ovl.c similarity index 100% rename from rel/m_haniwaPortrait_ovl.c rename to src/m_haniwaPortrait_ovl.c diff --git a/rel/m_hboard_ovl.c b/src/m_hboard_ovl.c similarity index 100% rename from rel/m_hboard_ovl.c rename to src/m_hboard_ovl.c diff --git a/rel/m_home.c b/src/m_home.c similarity index 100% rename from rel/m_home.c rename to src/m_home.c diff --git a/rel/m_house.c b/src/m_house.c similarity index 100% rename from rel/m_house.c rename to src/m_house.c diff --git a/rel/m_huusui_room.c b/src/m_huusui_room.c similarity index 100% rename from rel/m_huusui_room.c rename to src/m_huusui_room.c diff --git a/rel/m_huusui_room_ovl.c b/src/m_huusui_room_ovl.c similarity index 99% rename from rel/m_huusui_room_ovl.c rename to src/m_huusui_room_ovl.c index 5c69daf3..185c08f6 100644 --- a/rel/m_huusui_room_ovl.c +++ b/src/m_huusui_room_ovl.c @@ -28,7 +28,7 @@ typedef struct huusui_room_ftr_info_s { /* table of feng shui data for every item, clearly copy-pasted... should be mHsRm_ftr_info */ static mHsRm_ftr_info_c mMkRm_ftr_info[FTR_NUM] = { -#include "../rel/m_huusui_room_ovl_data.inc" /* data moved out of file due to length */ +#include "../src/m_huusui_room_ovl_data.inc" /* data moved out of file due to length */ }; /* maximum unit position for each main floor size */ diff --git a/rel/m_huusui_room_ovl_data.inc b/src/m_huusui_room_ovl_data.inc similarity index 100% rename from rel/m_huusui_room_ovl_data.inc rename to src/m_huusui_room_ovl_data.inc diff --git a/rel/m_island.c b/src/m_island.c similarity index 100% rename from rel/m_island.c rename to src/m_island.c diff --git a/rel/m_item_debug.c b/src/m_item_debug.c similarity index 100% rename from rel/m_item_debug.c rename to src/m_item_debug.c diff --git a/rel/m_item_name.c b/src/m_item_name.c similarity index 100% rename from rel/m_item_name.c rename to src/m_item_name.c diff --git a/rel/m_kabu_manager.c b/src/m_kabu_manager.c similarity index 100% rename from rel/m_kabu_manager.c rename to src/m_kabu_manager.c diff --git a/rel/m_kankyo.c b/src/m_kankyo.c similarity index 99% rename from rel/m_kankyo.c rename to src/m_kankyo.c index 25bbc539..49cb8c37 100644 --- a/rel/m_kankyo.c +++ b/src/m_kankyo.c @@ -935,7 +935,7 @@ static f32 mEnv_DiffuseLightEffectRate() { return l_mEnv_electric_light.diffuse_light_effect_rate; } -#include "../rel/m_kankyo_weather.c_inc" +#include "../src/m_kankyo_weather.c_inc" extern void mEnv_regist_nature(Kankyo* kankyo, NATURE_PROC nature_proc, void* arg) { kankyo->nature.proc = nature_proc; diff --git a/rel/m_kankyo_weather.c_inc b/src/m_kankyo_weather.c_inc similarity index 100% rename from rel/m_kankyo_weather.c_inc rename to src/m_kankyo_weather.c_inc diff --git a/rel/m_land.c b/src/m_land.c similarity index 100% rename from rel/m_land.c rename to src/m_land.c diff --git a/rel/m_lib.c b/src/m_lib.c similarity index 100% rename from rel/m_lib.c rename to src/m_lib.c diff --git a/rel/m_lights.c b/src/m_lights.c similarity index 100% rename from rel/m_lights.c rename to src/m_lights.c diff --git a/rel/m_mail.c b/src/m_mail.c similarity index 100% rename from rel/m_mail.c rename to src/m_mail.c diff --git a/rel/m_mail_check.c b/src/m_mail_check.c similarity index 100% rename from rel/m_mail_check.c rename to src/m_mail_check.c diff --git a/rel/m_mail_check_ovl.c b/src/m_mail_check_ovl.c similarity index 100% rename from rel/m_mail_check_ovl.c rename to src/m_mail_check_ovl.c diff --git a/rel/m_mail_password_check.c b/src/m_mail_password_check.c similarity index 100% rename from rel/m_mail_password_check.c rename to src/m_mail_password_check.c diff --git a/rel/m_malloc.c b/src/m_malloc.c similarity index 100% rename from rel/m_malloc.c rename to src/m_malloc.c diff --git a/rel/m_map_ovl.c b/src/m_map_ovl.c similarity index 100% rename from rel/m_map_ovl.c rename to src/m_map_ovl.c diff --git a/rel/m_mark_room.c b/src/m_mark_room.c similarity index 100% rename from rel/m_mark_room.c rename to src/m_mark_room.c diff --git a/rel/m_mark_room_ovl.c b/src/m_mark_room_ovl.c similarity index 100% rename from rel/m_mark_room_ovl.c rename to src/m_mark_room_ovl.c diff --git a/rel/m_melody.c b/src/m_melody.c similarity index 100% rename from rel/m_melody.c rename to src/m_melody.c diff --git a/rel/m_museum.c b/src/m_museum.c similarity index 100% rename from rel/m_museum.c rename to src/m_museum.c diff --git a/rel/m_museum_display.c b/src/m_museum_display.c similarity index 100% rename from rel/m_museum_display.c rename to src/m_museum_display.c diff --git a/rel/m_mushroom.c b/src/m_mushroom.c similarity index 100% rename from rel/m_mushroom.c rename to src/m_mushroom.c diff --git a/rel/m_music_ovl.c b/src/m_music_ovl.c similarity index 100% rename from rel/m_music_ovl.c rename to src/m_music_ovl.c diff --git a/rel/m_name_table.c b/src/m_name_table.c similarity index 100% rename from rel/m_name_table.c rename to src/m_name_table.c diff --git a/rel/m_needlework.c b/src/m_needlework.c similarity index 100% rename from rel/m_needlework.c rename to src/m_needlework.c diff --git a/rel/m_notice.c b/src/m_notice.c similarity index 100% rename from rel/m_notice.c rename to src/m_notice.c diff --git a/rel/m_npc.c b/src/m_npc.c similarity index 100% rename from rel/m_npc.c rename to src/m_npc.c diff --git a/rel/m_npc_schedule.c b/src/m_npc_schedule.c similarity index 100% rename from rel/m_npc_schedule.c rename to src/m_npc_schedule.c diff --git a/rel/m_npc_walk.c b/src/m_npc_walk.c similarity index 100% rename from rel/m_npc_walk.c rename to src/m_npc_walk.c diff --git a/rel/m_olib.c b/src/m_olib.c similarity index 100% rename from rel/m_olib.c rename to src/m_olib.c diff --git a/rel/m_passwordChk_ovl.c b/src/m_passwordChk_ovl.c similarity index 100% rename from rel/m_passwordChk_ovl.c rename to src/m_passwordChk_ovl.c diff --git a/rel/m_passwordMake_ovl.c b/src/m_passwordMake_ovl.c similarity index 100% rename from rel/m_passwordMake_ovl.c rename to src/m_passwordMake_ovl.c diff --git a/rel/m_pause.c b/src/m_pause.c similarity index 100% rename from rel/m_pause.c rename to src/m_pause.c diff --git a/rel/m_play.c b/src/m_play.c similarity index 100% rename from rel/m_play.c rename to src/m_play.c diff --git a/rel/m_player_call.c b/src/m_player_call.c similarity index 100% rename from rel/m_player_call.c rename to src/m_player_call.c diff --git a/rel/m_police_box.c b/src/m_police_box.c similarity index 100% rename from rel/m_police_box.c rename to src/m_police_box.c diff --git a/rel/m_post_office.c b/src/m_post_office.c similarity index 100% rename from rel/m_post_office.c rename to src/m_post_office.c diff --git a/rel/m_prenmi.c b/src/m_prenmi.c similarity index 100% rename from rel/m_prenmi.c rename to src/m_prenmi.c diff --git a/rel/m_private.c b/src/m_private.c similarity index 100% rename from rel/m_private.c rename to src/m_private.c diff --git a/rel/m_quest.c b/src/m_quest.c similarity index 100% rename from rel/m_quest.c rename to src/m_quest.c diff --git a/rel/m_random_field.c b/src/m_random_field.c similarity index 100% rename from rel/m_random_field.c rename to src/m_random_field.c diff --git a/rel/m_random_field_ovl.c b/src/m_random_field_ovl.c similarity index 100% rename from rel/m_random_field_ovl.c rename to src/m_random_field_ovl.c diff --git a/rel/m_rcp.c b/src/m_rcp.c similarity index 100% rename from rel/m_rcp.c rename to src/m_rcp.c diff --git a/rel/m_roll_lib.c b/src/m_roll_lib.c similarity index 100% rename from rel/m_roll_lib.c rename to src/m_roll_lib.c diff --git a/rel/m_room_type.c b/src/m_room_type.c similarity index 100% rename from rel/m_room_type.c rename to src/m_room_type.c diff --git a/rel/m_scene.c b/src/m_scene.c similarity index 100% rename from rel/m_scene.c rename to src/m_scene.c diff --git a/rel/m_scene_ftr.c b/src/m_scene_ftr.c similarity index 100% rename from rel/m_scene_ftr.c rename to src/m_scene_ftr.c diff --git a/rel/m_select.c b/src/m_select.c similarity index 100% rename from rel/m_select.c rename to src/m_select.c diff --git a/rel/m_shop.c b/src/m_shop.c similarity index 99% rename from rel/m_shop.c rename to src/m_shop.c index 2312ad78..2343b8ce 100644 --- a/rel/m_shop.c +++ b/src/m_shop.c @@ -2758,4 +2758,4 @@ extern mActor_name_t mSP_GetRandomStationToyItemNo() { return mRmTp_FtrIdx2FtrItemNo(0x42A + RANDOM(15), mRmTp_DIRECT_SOUTH); } -#include "../rel/m_item_debug.c" +#include "../src/m_item_debug.c" diff --git a/rel/m_skin_matrix.c b/src/m_skin_matrix.c similarity index 100% rename from rel/m_skin_matrix.c rename to src/m_skin_matrix.c diff --git a/rel/m_snowman.c b/src/m_snowman.c similarity index 100% rename from rel/m_snowman.c rename to src/m_snowman.c diff --git a/rel/m_soncho.c b/src/m_soncho.c similarity index 100% rename from rel/m_soncho.c rename to src/m_soncho.c diff --git a/rel/m_start_data_init.c b/src/m_start_data_init.c similarity index 100% rename from rel/m_start_data_init.c rename to src/m_start_data_init.c diff --git a/rel/m_string.c b/src/m_string.c similarity index 100% rename from rel/m_string.c rename to src/m_string.c diff --git a/rel/m_submenu.c b/src/m_submenu.c similarity index 100% rename from rel/m_submenu.c rename to src/m_submenu.c diff --git a/rel/m_submenu_ovl.c b/src/m_submenu_ovl.c similarity index 100% rename from rel/m_submenu_ovl.c rename to src/m_submenu_ovl.c diff --git a/rel/m_time.c b/src/m_time.c similarity index 100% rename from rel/m_time.c rename to src/m_time.c diff --git a/rel/m_timeIn_ovl.c b/src/m_timeIn_ovl.c similarity index 100% rename from rel/m_timeIn_ovl.c rename to src/m_timeIn_ovl.c diff --git a/rel/m_titledemo.c b/src/m_titledemo.c similarity index 100% rename from rel/m_titledemo.c rename to src/m_titledemo.c diff --git a/rel/m_trademark.c b/src/m_trademark.c similarity index 100% rename from rel/m_trademark.c rename to src/m_trademark.c diff --git a/rel/m_train_control.c b/src/m_train_control.c similarity index 100% rename from rel/m_train_control.c rename to src/m_train_control.c diff --git a/rel/m_vibctl.c b/src/m_vibctl.c similarity index 100% rename from rel/m_vibctl.c rename to src/m_vibctl.c diff --git a/rel/m_view.c b/src/m_view.c similarity index 100% rename from rel/m_view.c rename to src/m_view.c diff --git a/rel/m_warning_ovl.c b/src/m_warning_ovl.c similarity index 100% rename from rel/m_warning_ovl.c rename to src/m_warning_ovl.c diff --git a/rel/m_watch_my_step.c b/src/m_watch_my_step.c similarity index 100% rename from rel/m_watch_my_step.c rename to src/m_watch_my_step.c diff --git a/rel/main.c b/src/main.c similarity index 100% rename from rel/main.c rename to src/main.c diff --git a/rel/player_select.c b/src/player_select.c similarity index 100% rename from rel/player_select.c rename to src/player_select.c diff --git a/rel/save_check.c_inc b/src/save_check.c_inc similarity index 100% rename from rel/save_check.c_inc rename to src/save_check.c_inc diff --git a/rel/save_check_MYK.c_inc b/src/save_check_MYK.c_inc similarity index 100% rename from rel/save_check_MYK.c_inc rename to src/save_check_MYK.c_inc diff --git a/rel/save_check_NSW.c_inc b/src/save_check_NSW.c_inc similarity index 100% rename from rel/save_check_NSW.c_inc rename to src/save_check_NSW.c_inc diff --git a/rel/save_check_YSD.c_inc b/src/save_check_YSD.c_inc similarity index 100% rename from rel/save_check_YSD.c_inc rename to src/save_check_YSD.c_inc diff --git a/rel/save_check_gen.c_inc b/src/save_check_gen.c_inc similarity index 100% rename from rel/save_check_gen.c_inc rename to src/save_check_gen.c_inc diff --git a/rel/save_check_komatu.c_inc b/src/save_check_komatu.c_inc similarity index 100% rename from rel/save_check_komatu.c_inc rename to src/save_check_komatu.c_inc diff --git a/rel/save_check_take.c_inc b/src/save_check_take.c_inc similarity index 100% rename from rel/save_check_take.c_inc rename to src/save_check_take.c_inc diff --git a/rel/save_menu.c b/src/save_menu.c similarity index 100% rename from rel/save_menu.c rename to src/save_menu.c diff --git a/rel/second_game.c b/src/second_game.c similarity index 100% rename from rel/second_game.c rename to src/second_game.c diff --git a/src/GBA/GBA.c b/src/static/GBA/GBA.c similarity index 100% rename from src/GBA/GBA.c rename to src/static/GBA/GBA.c diff --git a/src/GBA/GBAGetProcessStatus.c b/src/static/GBA/GBAGetProcessStatus.c similarity index 100% rename from src/GBA/GBAGetProcessStatus.c rename to src/static/GBA/GBAGetProcessStatus.c diff --git a/src/GBA/GBAJoyBoot.c b/src/static/GBA/GBAJoyBoot.c similarity index 100% rename from src/GBA/GBAJoyBoot.c rename to src/static/GBA/GBAJoyBoot.c diff --git a/src/GBA/GBAKey.c b/src/static/GBA/GBAKey.c similarity index 100% rename from src/GBA/GBAKey.c rename to src/static/GBA/GBAKey.c diff --git a/src/GBA/GBARead.c b/src/static/GBA/GBARead.c similarity index 100% rename from src/GBA/GBARead.c rename to src/static/GBA/GBARead.c diff --git a/src/GBA/GBAWrite.c b/src/static/GBA/GBAWrite.c similarity index 100% rename from src/GBA/GBAWrite.c rename to src/static/GBA/GBAWrite.c diff --git a/src/GBA/GBAXfer.c b/src/static/GBA/GBAXfer.c similarity index 100% rename from src/GBA/GBAXfer.c rename to src/static/GBA/GBAXfer.c diff --git a/src/GBA2/JoyBoot.c b/src/static/GBA2/JoyBoot.c similarity index 100% rename from src/GBA2/JoyBoot.c rename to src/static/GBA2/JoyBoot.c diff --git a/src/JSystem/JGadget/linklist.cpp b/src/static/JSystem/JGadget/linklist.cpp similarity index 100% rename from src/JSystem/JGadget/linklist.cpp rename to src/static/JSystem/JGadget/linklist.cpp diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/static/JSystem/JKernel/JKRAram.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAram.cpp rename to src/static/JSystem/JKernel/JKRAram.cpp diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/static/JSystem/JKernel/JKRAramArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramArchive.cpp rename to src/static/JSystem/JKernel/JKRAramArchive.cpp diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/src/static/JSystem/JKernel/JKRAramBlock.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramBlock.cpp rename to src/static/JSystem/JKernel/JKRAramBlock.cpp diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/static/JSystem/JKernel/JKRAramHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramHeap.cpp rename to src/static/JSystem/JKernel/JKRAramHeap.cpp diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/src/static/JSystem/JKernel/JKRAramPiece.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramPiece.cpp rename to src/static/JSystem/JKernel/JKRAramPiece.cpp diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/static/JSystem/JKernel/JKRAramStream.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramStream.cpp rename to src/static/JSystem/JKernel/JKRAramStream.cpp diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/static/JSystem/JKernel/JKRArchivePri.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePri.cpp rename to src/static/JSystem/JKernel/JKRArchivePri.cpp diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/static/JSystem/JKernel/JKRArchivePub.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePub.cpp rename to src/static/JSystem/JKernel/JKRArchivePub.cpp diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/static/JSystem/JKernel/JKRCompArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRCompArchive.cpp rename to src/static/JSystem/JKernel/JKRCompArchive.cpp diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/static/JSystem/JKernel/JKRDecomp.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDecomp.cpp rename to src/static/JSystem/JKernel/JKRDecomp.cpp diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/src/static/JSystem/JKernel/JKRDisposer.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDisposer.cpp rename to src/static/JSystem/JKernel/JKRDisposer.cpp diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/static/JSystem/JKernel/JKRDvdAramRipper.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdAramRipper.cpp rename to src/static/JSystem/JKernel/JKRDvdAramRipper.cpp diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/static/JSystem/JKernel/JKRDvdArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdArchive.cpp rename to src/static/JSystem/JKernel/JKRDvdArchive.cpp diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/static/JSystem/JKernel/JKRDvdFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdFile.cpp rename to src/static/JSystem/JKernel/JKRDvdFile.cpp diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/static/JSystem/JKernel/JKRDvdRipper.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdRipper.cpp rename to src/static/JSystem/JKernel/JKRDvdRipper.cpp diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/static/JSystem/JKernel/JKRExpHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRExpHeap.cpp rename to src/static/JSystem/JKernel/JKRExpHeap.cpp diff --git a/src/JSystem/JKernel/JKRFile.cpp b/src/static/JSystem/JKernel/JKRFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFile.cpp rename to src/static/JSystem/JKernel/JKRFile.cpp diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/src/static/JSystem/JKernel/JKRFileFinder.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileFinder.cpp rename to src/static/JSystem/JKernel/JKRFileFinder.cpp diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/static/JSystem/JKernel/JKRFileLoader.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileLoader.cpp rename to src/static/JSystem/JKernel/JKRFileLoader.cpp diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/static/JSystem/JKernel/JKRHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRHeap.cpp rename to src/static/JSystem/JKernel/JKRHeap.cpp diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/static/JSystem/JKernel/JKRMemArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRMemArchive.cpp rename to src/static/JSystem/JKernel/JKRMemArchive.cpp diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/static/JSystem/JKernel/JKRThread.cpp similarity index 100% rename from src/JSystem/JKernel/JKRThread.cpp rename to src/static/JSystem/JKernel/JKRThread.cpp diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/src/static/JSystem/JSupport/JSUFileStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUFileStream.cpp rename to src/static/JSystem/JSupport/JSUFileStream.cpp diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/static/JSystem/JSupport/JSUInputStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUInputStream.cpp rename to src/static/JSystem/JSupport/JSUInputStream.cpp diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/static/JSystem/JUtility/JUTGamePad.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGamePad.cpp rename to src/static/JSystem/JUtility/JUTGamePad.cpp diff --git a/src/MSL_C/rand.c b/src/static/MSL_C/rand.c similarity index 100% rename from src/MSL_C/rand.c rename to src/static/MSL_C/rand.c diff --git a/src/TRK/dispatch.c b/src/static/TRK/dispatch.c similarity index 100% rename from src/TRK/dispatch.c rename to src/static/TRK/dispatch.c diff --git a/src/TRK/dolphin_trk.c b/src/static/TRK/dolphin_trk.c similarity index 100% rename from src/TRK/dolphin_trk.c rename to src/static/TRK/dolphin_trk.c diff --git a/src/TRK/init/mem_TRK.c b/src/static/TRK/init/mem_TRK.c similarity index 100% rename from src/TRK/init/mem_TRK.c rename to src/static/TRK/init/mem_TRK.c diff --git a/src/TRK/mainloop.c b/src/static/TRK/mainloop.c similarity index 100% rename from src/TRK/mainloop.c rename to src/static/TRK/mainloop.c diff --git a/src/TRK/nubevent.c b/src/static/TRK/nubevent.c similarity index 100% rename from src/TRK/nubevent.c rename to src/static/TRK/nubevent.c diff --git a/src/TRK/nubinit.c b/src/static/TRK/nubinit.c similarity index 100% rename from src/TRK/nubinit.c rename to src/static/TRK/nubinit.c diff --git a/src/TRK/usr_put.c b/src/static/TRK/usr_put.c similarity index 100% rename from src/TRK/usr_put.c rename to src/static/TRK/usr_put.c diff --git a/src/boot.c b/src/static/boot.c similarity index 100% rename from src/boot.c rename to src/static/boot.c diff --git a/src/bootdata/gam_win1.c b/src/static/bootdata/gam_win1.c similarity index 100% rename from src/bootdata/gam_win1.c rename to src/static/bootdata/gam_win1.c diff --git a/src/bootdata/gam_win2.c b/src/static/bootdata/gam_win2.c similarity index 100% rename from src/bootdata/gam_win2.c rename to src/static/bootdata/gam_win2.c diff --git a/src/bootdata/gam_win3.c b/src/static/bootdata/gam_win3.c similarity index 100% rename from src/bootdata/gam_win3.c rename to src/static/bootdata/gam_win3.c diff --git a/src/bootdata/logo_nin.c b/src/static/bootdata/logo_nin.c similarity index 100% rename from src/bootdata/logo_nin.c rename to src/static/bootdata/logo_nin.c diff --git a/src/ctors.s b/src/static/ctors.s similarity index 78% rename from src/ctors.s rename to src/static/ctors.s index 415a9375..f26c3f81 100644 --- a/src/ctors.s +++ b/src/static/ctors.s @@ -1 +1 @@ -# there totally is code in this file, needed to bypass a bug caused by trim_ctors \ No newline at end of file +# there totally is code in this file, needed to bypass a bug caused by trim_ctors diff --git a/src/dolphin/BASE/ppcarch.c b/src/static/dolphin/BASE/ppcarch.c similarity index 100% rename from src/dolphin/BASE/ppcarch.c rename to src/static/dolphin/BASE/ppcarch.c diff --git a/src/dolphin/__ppc_eabi_init.cpp b/src/static/dolphin/__ppc_eabi_init.cpp similarity index 100% rename from src/dolphin/__ppc_eabi_init.cpp rename to src/static/dolphin/__ppc_eabi_init.cpp diff --git a/src/dolphin/amcstubs/AmcExi2Stubs.c b/src/static/dolphin/amcstubs/AmcExi2Stubs.c similarity index 100% rename from src/dolphin/amcstubs/AmcExi2Stubs.c rename to src/static/dolphin/amcstubs/AmcExi2Stubs.c diff --git a/src/dolphin/gx/GXStubs.c b/src/static/dolphin/gx/GXStubs.c similarity index 100% rename from src/dolphin/gx/GXStubs.c rename to src/static/dolphin/gx/GXStubs.c diff --git a/src/dolphin/odenotstub/odenotstub.c b/src/static/dolphin/odenotstub/odenotstub.c similarity index 100% rename from src/dolphin/odenotstub/odenotstub.c rename to src/static/dolphin/odenotstub/odenotstub.c diff --git a/src/dolphin/os/OSAlarm.c b/src/static/dolphin/os/OSAlarm.c similarity index 100% rename from src/dolphin/os/OSAlarm.c rename to src/static/dolphin/os/OSAlarm.c diff --git a/src/dolphin/os/OSArena.c b/src/static/dolphin/os/OSArena.c similarity index 100% rename from src/dolphin/os/OSArena.c rename to src/static/dolphin/os/OSArena.c diff --git a/src/dolphin/os/OSAudioSystem.C b/src/static/dolphin/os/OSAudioSystem.C similarity index 100% rename from src/dolphin/os/OSAudioSystem.C rename to src/static/dolphin/os/OSAudioSystem.C diff --git a/src/dolphin/os/OSCache.c b/src/static/dolphin/os/OSCache.c similarity index 100% rename from src/dolphin/os/OSCache.c rename to src/static/dolphin/os/OSCache.c diff --git a/src/dolphin/os/OSContext.c b/src/static/dolphin/os/OSContext.c similarity index 100% rename from src/dolphin/os/OSContext.c rename to src/static/dolphin/os/OSContext.c diff --git a/src/dolphin/os/OSDisableInterrupts.c b/src/static/dolphin/os/OSDisableInterrupts.c similarity index 100% rename from src/dolphin/os/OSDisableInterrupts.c rename to src/static/dolphin/os/OSDisableInterrupts.c diff --git a/src/dolphin/os/OSEnableInterrupts.c b/src/static/dolphin/os/OSEnableInterrupts.c similarity index 100% rename from src/dolphin/os/OSEnableInterrupts.c rename to src/static/dolphin/os/OSEnableInterrupts.c diff --git a/src/dolphin/os/OSError.c b/src/static/dolphin/os/OSError.c similarity index 100% rename from src/dolphin/os/OSError.c rename to src/static/dolphin/os/OSError.c diff --git a/src/dolphin/os/OSMemory.c b/src/static/dolphin/os/OSMemory.c similarity index 100% rename from src/dolphin/os/OSMemory.c rename to src/static/dolphin/os/OSMemory.c diff --git a/src/dolphin/os/OSRestoreInterrupts.c b/src/static/dolphin/os/OSRestoreInterrupts.c similarity index 100% rename from src/dolphin/os/OSRestoreInterrupts.c rename to src/static/dolphin/os/OSRestoreInterrupts.c diff --git a/src/dolphin/os/OSRtc.c b/src/static/dolphin/os/OSRtc.c similarity index 100% rename from src/dolphin/os/OSRtc.c rename to src/static/dolphin/os/OSRtc.c diff --git a/src/dolphin/os/__ppc_eabi_init.cpp b/src/static/dolphin/os/__ppc_eabi_init.cpp similarity index 100% rename from src/dolphin/os/__ppc_eabi_init.cpp rename to src/static/dolphin/os/__ppc_eabi_init.cpp diff --git a/src/dolphin/os/__start.c b/src/static/dolphin/os/__start.c similarity index 100% rename from src/dolphin/os/__start.c rename to src/static/dolphin/os/__start.c diff --git a/src/dvderr.c b/src/static/dvderr.c similarity index 100% rename from src/dvderr.c rename to src/static/dvderr.c diff --git a/src/initial_menu.c b/src/static/initial_menu.c similarity index 100% rename from src/initial_menu.c rename to src/static/initial_menu.c diff --git a/src/jaudio_NES/dummyprobe.c b/src/static/jaudio_NES/dummyprobe.c similarity index 100% rename from src/jaudio_NES/dummyprobe.c rename to src/static/jaudio_NES/dummyprobe.c diff --git a/src/jaudio_NES/emusound.c b/src/static/jaudio_NES/emusound.c similarity index 100% rename from src/jaudio_NES/emusound.c rename to src/static/jaudio_NES/emusound.c diff --git a/src/jaudio_NES/melody.c b/src/static/jaudio_NES/melody.c similarity index 100% rename from src/jaudio_NES/melody.c rename to src/static/jaudio_NES/melody.c diff --git a/src/jaudio_NES/verysimple.c b/src/static/jaudio_NES/verysimple.c similarity index 100% rename from src/jaudio_NES/verysimple.c rename to src/static/jaudio_NES/verysimple.c diff --git a/src/jsyswrap.cpp b/src/static/jsyswrap.cpp similarity index 100% rename from src/jsyswrap.cpp rename to src/static/jsyswrap.cpp diff --git a/src/libc64/__osMalloc.c b/src/static/libc64/__osMalloc.c similarity index 100% rename from src/libc64/__osMalloc.c rename to src/static/libc64/__osMalloc.c diff --git a/src/libc64/aprintf.c b/src/static/libc64/aprintf.c similarity index 100% rename from src/libc64/aprintf.c rename to src/static/libc64/aprintf.c diff --git a/src/libc64/malloc.c b/src/static/libc64/malloc.c similarity index 100% rename from src/libc64/malloc.c rename to src/static/libc64/malloc.c diff --git a/src/libc64/math64.c b/src/static/libc64/math64.c similarity index 100% rename from src/libc64/math64.c rename to src/static/libc64/math64.c diff --git a/src/libc64/qrand.c b/src/static/libc64/qrand.c similarity index 100% rename from src/libc64/qrand.c rename to src/static/libc64/qrand.c diff --git a/src/libc64/sleep.c b/src/static/libc64/sleep.c similarity index 100% rename from src/libc64/sleep.c rename to src/static/libc64/sleep.c diff --git a/src/libc64/sprintf.c b/src/static/libc64/sprintf.c similarity index 100% rename from src/libc64/sprintf.c rename to src/static/libc64/sprintf.c diff --git a/src/libforest/ReconfigBATs.c b/src/static/libforest/ReconfigBATs.c similarity index 100% rename from src/libforest/ReconfigBATs.c rename to src/static/libforest/ReconfigBATs.c diff --git a/src/libforest/emu64/emu64.cc b/src/static/libforest/emu64/emu64.cc similarity index 100% rename from src/libforest/emu64/emu64.cc rename to src/static/libforest/emu64/emu64.cc diff --git a/src/libforest/fault.c b/src/static/libforest/fault.c similarity index 100% rename from src/libforest/fault.c rename to src/static/libforest/fault.c diff --git a/src/libforest/osreport.c b/src/static/libforest/osreport.c similarity index 100% rename from src/libforest/osreport.c rename to src/static/libforest/osreport.c diff --git a/src/libu64/debug.c b/src/static/libu64/debug.c similarity index 100% rename from src/libu64/debug.c rename to src/static/libu64/debug.c diff --git a/src/libu64/gfxprint.c b/src/static/libu64/gfxprint.c similarity index 100% rename from src/libu64/gfxprint.c rename to src/static/libu64/gfxprint.c diff --git a/src/libu64/gfxprint_data.c b/src/static/libu64/gfxprint_data.c similarity index 100% rename from src/libu64/gfxprint_data.c rename to src/static/libu64/gfxprint_data.c diff --git a/src/libu64/pad.c b/src/static/libu64/pad.c similarity index 100% rename from src/libu64/pad.c rename to src/static/libu64/pad.c diff --git a/src/libultra/contreaddata.c b/src/static/libultra/contreaddata.c similarity index 100% rename from src/libultra/contreaddata.c rename to src/static/libultra/contreaddata.c diff --git a/src/libultra/gu/lookathil.c b/src/static/libultra/gu/lookathil.c similarity index 100% rename from src/libultra/gu/lookathil.c rename to src/static/libultra/gu/lookathil.c diff --git a/src/libultra/gu/mtxutil.c b/src/static/libultra/gu/mtxutil.c similarity index 100% rename from src/libultra/gu/mtxutil.c rename to src/static/libultra/gu/mtxutil.c diff --git a/src/libultra/gu/normalize.c b/src/static/libultra/gu/normalize.c similarity index 100% rename from src/libultra/gu/normalize.c rename to src/static/libultra/gu/normalize.c diff --git a/src/libultra/gu/ortho.c b/src/static/libultra/gu/ortho.c similarity index 100% rename from src/libultra/gu/ortho.c rename to src/static/libultra/gu/ortho.c diff --git a/src/libultra/gu/scale.c b/src/static/libultra/gu/scale.c similarity index 100% rename from src/libultra/gu/scale.c rename to src/static/libultra/gu/scale.c diff --git a/src/libultra/gu/sins.c b/src/static/libultra/gu/sins.c similarity index 100% rename from src/libultra/gu/sins.c rename to src/static/libultra/gu/sins.c diff --git a/src/libultra/gu/translate.c b/src/static/libultra/gu/translate.c similarity index 100% rename from src/libultra/gu/translate.c rename to src/static/libultra/gu/translate.c diff --git a/src/libultra/initialize.c b/src/static/libultra/initialize.c similarity index 100% rename from src/libultra/initialize.c rename to src/static/libultra/initialize.c diff --git a/src/libultra/ultra.c b/src/static/libultra/ultra.c similarity index 100% rename from src/libultra/ultra.c rename to src/static/libultra/ultra.c diff --git a/src/libultra/xldtob.c b/src/static/libultra/xldtob.c similarity index 100% rename from src/libultra/xldtob.c rename to src/static/libultra/xldtob.c diff --git a/src/libultra/xlitob.c b/src/static/libultra/xlitob.c similarity index 100% rename from src/libultra/xlitob.c rename to src/static/libultra/xlitob.c diff --git a/src/libultra/xprintf.c b/src/static/libultra/xprintf.c similarity index 100% rename from src/libultra/xprintf.c rename to src/static/libultra/xprintf.c diff --git a/src/nintendo_hi_0.c b/src/static/nintendo_hi_0.c similarity index 100% rename from src/nintendo_hi_0.c rename to src/static/nintendo_hi_0.c diff --git a/src/runtime/__mem.c b/src/static/runtime/__mem.c similarity index 100% rename from src/runtime/__mem.c rename to src/static/runtime/__mem.c diff --git a/src/version.c b/src/static/version.c similarity index 100% rename from src/version.c rename to src/static/version.c diff --git a/rel/sys_dynamic.c b/src/sys_dynamic.c similarity index 100% rename from rel/sys_dynamic.c rename to src/sys_dynamic.c diff --git a/rel/sys_math.c b/src/sys_math.c similarity index 100% rename from rel/sys_math.c rename to src/sys_math.c diff --git a/rel/sys_math_atan.c b/src/sys_math_atan.c similarity index 100% rename from rel/sys_math_atan.c rename to src/sys_math_atan.c diff --git a/rel/sys_matrix.c b/src/sys_matrix.c similarity index 100% rename from rel/sys_matrix.c rename to src/sys_matrix.c diff --git a/rel/sys_romcheck.c b/src/sys_romcheck.c similarity index 100% rename from rel/sys_romcheck.c rename to src/sys_romcheck.c diff --git a/rel/sys_stacks.c b/src/sys_stacks.c similarity index 100% rename from rel/sys_stacks.c rename to src/sys_stacks.c diff --git a/rel/sys_ucode.c b/src/sys_ucode.c similarity index 100% rename from rel/sys_ucode.c rename to src/sys_ucode.c diff --git a/rel/sys_vimgr.c b/src/sys_vimgr.c similarity index 100% rename from rel/sys_vimgr.c rename to src/sys_vimgr.c diff --git a/rel/zurumode.c b/src/zurumode.c similarity index 100% rename from rel/zurumode.c rename to src/zurumode.c