From eab32f46a8a93e883ab830e9030331acf7201b53 Mon Sep 17 00:00:00 2001 From: Nomura Date: Fri, 7 Apr 2023 12:26:45 +0200 Subject: [PATCH] Modularize incbins --- asm/incbin/arm9_data.bin | Bin 12340 -> 0 bytes asm/incbin/arm9_rodata.bin | Bin 106636 -> 0 bytes .../{arm9_exception.bin => main_etable.bin} | Bin ...overlay14_rodata.bin => ov14_022248A4.bin} | Bin asm/incbin/overlay100_data.bin | Bin 160 -> 0 bytes asm/incbin/overlay100_rodata.bin | Bin 956 -> 0 bytes asm/incbin/overlay101_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay101_rodata.bin | Bin 6332 -> 0 bytes asm/incbin/overlay102_rodata.bin | Bin 92 -> 0 bytes asm/incbin/overlay104_data.bin | Bin 288 -> 0 bytes asm/incbin/overlay104_rodata.bin | Bin 9984 -> 0 bytes asm/incbin/overlay105_rodata.bin | Bin 476 -> 0 bytes asm/incbin/overlay106_rodata.bin | Bin 232 -> 0 bytes asm/incbin/overlay107_rodata.bin | Bin 1304 -> 0 bytes asm/incbin/overlay108_rodata.bin | Bin 264 -> 0 bytes asm/incbin/overlay109_data.bin | Bin 64 -> 0 bytes asm/incbin/overlay109_rodata.bin | Bin 1392 -> 0 bytes asm/incbin/overlay10_rodata.bin | Bin 2080 -> 0 bytes asm/incbin/overlay110_rodata.bin | Bin 396 -> 0 bytes asm/incbin/overlay111_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay111_rodata.bin | Bin 824 -> 0 bytes asm/incbin/overlay112_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay112_rodata.bin | Bin 328 -> 0 bytes asm/incbin/overlay113_rodata.bin | Bin 3252 -> 0 bytes asm/incbin/overlay114_rodata.bin | Bin 856 -> 0 bytes asm/incbin/overlay115_rodata.bin | Bin 3020 -> 0 bytes asm/incbin/overlay116_data.bin | Bin 320 -> 0 bytes asm/incbin/overlay116_rodata.bin | Bin 1996 -> 0 bytes asm/incbin/overlay117_rodata.bin | Bin 1852 -> 0 bytes asm/incbin/overlay118_rodata.bin | Bin 48 -> 0 bytes asm/incbin/overlay119_rodata.bin | Bin 764 -> 0 bytes asm/incbin/overlay11_rodata.bin | Bin 716 -> 0 bytes asm/incbin/overlay120_rodata.bin | Bin 168 -> 0 bytes asm/incbin/overlay121_rodata.bin | Bin 48 -> 0 bytes asm/incbin/overlay12_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay12_rodata.bin | Bin 11116 -> 0 bytes asm/incbin/overlay13_rodata.bin | Bin 4384 -> 0 bytes asm/incbin/overlay16_data.bin | Bin 160 -> 0 bytes asm/incbin/overlay16_rodata.bin | Bin 10416 -> 0 bytes asm/incbin/overlay17_rodata.bin | Bin 8260 -> 0 bytes asm/incbin/overlay18_data.bin | Bin 6912 -> 0 bytes asm/incbin/overlay19_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay19_rodata.bin | Bin 1980 -> 0 bytes asm/incbin/overlay20_rodata.bin | Bin 752 -> 0 bytes asm/incbin/overlay21_rodata.bin | Bin 1092 -> 0 bytes asm/incbin/overlay22_rodata.bin | Bin 256 -> 0 bytes asm/incbin/overlay23_data.bin | Bin 2912 -> 0 bytes asm/incbin/overlay23_rodata.bin | Bin 2232 -> 0 bytes asm/incbin/overlay25_rodata.bin | Bin 836 -> 0 bytes asm/incbin/overlay26_rodata.bin | Bin 104 -> 0 bytes asm/incbin/overlay27_rodata.bin | Bin 280 -> 0 bytes asm/incbin/overlay28_rodata.bin | Bin 1132 -> 0 bytes asm/incbin/overlay29_rodata.bin | Bin 200 -> 0 bytes asm/incbin/overlay30_rodata.bin | Bin 136 -> 0 bytes asm/incbin/overlay31_rodata.bin | Bin 572 -> 0 bytes asm/incbin/overlay32_rodata.bin | Bin 136 -> 0 bytes asm/incbin/overlay33_data.bin | Bin 160 -> 0 bytes asm/incbin/overlay33_rodata.bin | Bin 160 -> 0 bytes asm/incbin/overlay34_rodata.bin | Bin 144 -> 0 bytes asm/incbin/overlay35_rodata.bin | Bin 136 -> 0 bytes asm/incbin/overlay36_rodata.bin | Bin 136 -> 0 bytes asm/incbin/overlay37_rodata.bin | Bin 112 -> 0 bytes asm/incbin/overlay38_rodata.bin | Bin 76 -> 0 bytes asm/incbin/overlay39_rodata.bin | Bin 136 -> 0 bytes asm/incbin/overlay40_rodata.bin | Bin 264 -> 0 bytes asm/incbin/overlay41_rodata.bin | Bin 272 -> 0 bytes asm/incbin/overlay42_rodata.bin | Bin 104 -> 0 bytes asm/incbin/overlay43_rodata.bin | Bin 592 -> 0 bytes asm/incbin/overlay44_rodata.bin | Bin 484 -> 0 bytes asm/incbin/overlay45_rodata.bin | Bin 364 -> 0 bytes asm/incbin/overlay46_rodata.bin | Bin 480 -> 0 bytes asm/incbin/overlay47_rodata.bin | Bin 80 -> 0 bytes asm/incbin/overlay48_rodata.bin | Bin 324 -> 0 bytes asm/incbin/overlay49_rodata.bin | Bin 104 -> 0 bytes asm/incbin/overlay4_rodata.bin | Bin 1544 -> 0 bytes asm/incbin/overlay50_rodata.bin | Bin 356 -> 0 bytes asm/incbin/overlay51_rodata.bin | Bin 76 -> 0 bytes asm/incbin/overlay52_rodata.bin | Bin 292 -> 0 bytes asm/incbin/overlay53_rodata.bin | Bin 368 -> 0 bytes asm/incbin/overlay54_rodata.bin | Bin 316 -> 0 bytes asm/incbin/overlay55_rodata.bin | Bin 76 -> 0 bytes asm/incbin/overlay57_rodata.bin | Bin 520 -> 0 bytes asm/incbin/overlay58_data.bin | Bin 192 -> 0 bytes asm/incbin/overlay58_rodata.bin | Bin 928 -> 0 bytes asm/incbin/overlay59_data.bin | Bin 128 -> 0 bytes asm/incbin/overlay59_rodata.bin | Bin 492 -> 0 bytes asm/incbin/overlay5_data.bin | Bin 1024 -> 0 bytes asm/incbin/overlay5_rodata.bin | Bin 37892 -> 0 bytes asm/incbin/overlay60_rodata.bin | Bin 472 -> 0 bytes asm/incbin/overlay61_data.bin | Bin 352 -> 0 bytes asm/incbin/overlay61_rodata.bin | Bin 356 -> 0 bytes asm/incbin/overlay62_data.bin | Bin 480 -> 0 bytes asm/incbin/overlay62_rodata.bin | Bin 4212 -> 0 bytes asm/incbin/overlay63_rodata.bin | Bin 976 -> 0 bytes asm/incbin/overlay64_data.bin | Bin 224 -> 0 bytes asm/incbin/overlay64_rodata.bin | Bin 668 -> 0 bytes asm/incbin/overlay65_data.bin | Bin 576 -> 0 bytes asm/incbin/overlay65_rodata.bin | Bin 4844 -> 0 bytes asm/incbin/overlay66_rodata.bin | Bin 1008 -> 0 bytes asm/incbin/overlay67_rodata.bin | Bin 160 -> 0 bytes asm/incbin/overlay68_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay68_rodata.bin | Bin 336 -> 0 bytes asm/incbin/overlay69_rodata.bin | Bin 1036 -> 0 bytes asm/incbin/overlay6_data.bin | Bin 224 -> 0 bytes asm/incbin/overlay6_rodata.bin | Bin 2628 -> 0 bytes asm/incbin/overlay70_rodata.bin | Bin 4836 -> 0 bytes asm/incbin/overlay71_rodata.bin | Bin 740 -> 0 bytes asm/incbin/overlay72_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay72_rodata.bin | Bin 500 -> 0 bytes asm/incbin/overlay73_rodata.bin | Bin 804 -> 0 bytes asm/incbin/overlay74_rodata.bin | Bin 284 -> 0 bytes asm/incbin/overlay75_rodata.bin | Bin 296 -> 0 bytes asm/incbin/overlay76_rodata.bin | Bin 628 -> 0 bytes asm/incbin/overlay77_data.bin | Bin 96 -> 0 bytes asm/incbin/overlay77_rodata.bin | Bin 1740 -> 0 bytes asm/incbin/overlay78_rodata.bin | Bin 156 -> 0 bytes asm/incbin/overlay79_data.bin | Bin 160 -> 0 bytes asm/incbin/overlay79_rodata.bin | Bin 1000 -> 0 bytes asm/incbin/overlay7_data.bin | Bin 224 -> 0 bytes asm/incbin/overlay7_rodata.bin | Bin 1948 -> 0 bytes asm/incbin/overlay80_data.bin | Bin 160 -> 0 bytes asm/incbin/overlay80_rodata.bin | Bin 1292 -> 0 bytes asm/incbin/overlay81_rodata.bin | Bin 488 -> 0 bytes asm/incbin/overlay82_rodata.bin | Bin 52 -> 0 bytes asm/incbin/overlay83_data.bin | Bin 64 -> 0 bytes asm/incbin/overlay83_rodata.bin | Bin 924 -> 0 bytes asm/incbin/overlay84_rodata.bin | Bin 1420 -> 0 bytes asm/incbin/overlay85_rodata.bin | Bin 536 -> 0 bytes asm/incbin/overlay86_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay86_rodata.bin | Bin 428 -> 0 bytes asm/incbin/overlay87_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay87_rodata.bin | Bin 176 -> 0 bytes asm/incbin/overlay88_rodata.bin | Bin 976 -> 0 bytes asm/incbin/overlay8_data.bin | Bin 64 -> 0 bytes asm/incbin/overlay8_rodata.bin | Bin 8292 -> 0 bytes asm/incbin/overlay90_data.bin | Bin 128 -> 0 bytes asm/incbin/overlay90_rodata.bin | Bin 452 -> 0 bytes asm/incbin/overlay91_rodata.bin | Bin 1176 -> 0 bytes asm/incbin/overlay92_rodata.bin | Bin 404 -> 0 bytes asm/incbin/overlay93_data.bin | Bin 96 -> 0 bytes asm/incbin/overlay93_rodata.bin | Bin 248 -> 0 bytes asm/incbin/overlay94_data.bin | Bin 1728 -> 0 bytes asm/incbin/overlay94_rodata.bin | Bin 2548 -> 0 bytes asm/incbin/overlay95_data.bin | Bin 32 -> 0 bytes asm/incbin/overlay95_rodata.bin | Bin 1072 -> 0 bytes asm/incbin/overlay96_data.bin | Bin 640 -> 0 bytes asm/incbin/overlay96_rodata.bin | Bin 200 -> 0 bytes asm/incbin/overlay97_data.bin | Bin 4672 -> 0 bytes asm/incbin/overlay97_rodata.bin | Bin 2244 -> 0 bytes asm/incbin/overlay98_data.bin | Bin 192 -> 0 bytes asm/incbin/overlay98_rodata.bin | Bin 552 -> 0 bytes asm/incbin/overlay99_rodata.bin | Bin 3600 -> 0 bytes asm/incbin/overlay9_data.bin | Bin 480 -> 0 bytes asm/incbin/overlay9_rodata.bin | Bin 10464 -> 0 bytes asm/main_etable.s | 42 +-- asm/overlay014/ov14_022248A4.s | 2 +- asm/overlay061/ov61_0222D498.s | 2 +- asm/overlay061/ov61_0222DCDC.s | 6 +- asm/overlay061/ov61_0222E0B8.s | 34 +- asm/overlay097/ov97_02239420.s | 18 +- asm/unk_0209DD54.s | 6 +- asm/unk_020A05BC.s | 3 +- lib/NitroDWC/asm/ac/incbin/search_dwcac.bin | Bin 0 -> 52 bytes lib/NitroDWC/asm/ac/incbin/shop_usb.bin | Bin lib/NitroDWC/asm/ac/incbin/test.bin | Bin 0 -> 72 bytes lib/NitroDWC/asm/ac/makelist.s | 8 +- lib/NitroDWC/asm/ac/search_dwcac.s | 2 +- lib/NitroDWC/asm/ac/shop_usb.s | 38 +- lib/NitroDWC/asm/ac/test.s | 6 +- lib/NitroDWC/asm/ac/wds.s | 2 +- lib/NitroDWC/asm/auth/dwc_auth.s | 66 ++-- lib/NitroDWC/asm/auth/dwc_ca_cybertrust.s | 49 ++- lib/NitroDWC/asm/auth/dwc_ca_globalsign.s | 13 +- lib/NitroDWC/asm/auth/dwc_ca_nas_self.s | 14 +- .../asm/auth/dwc_ca_thawte_premiumserver.s | 13 +- lib/NitroDWC/asm/auth/dwc_ca_thawte_server.s | 14 +- lib/NitroDWC/asm/auth/dwc_ca_verisign.s | 56 ++- lib/NitroDWC/asm/auth/dwc_cal.s | 66 ++-- lib/NitroDWC/asm/auth/dwc_http.s | 115 ++++-- lib/NitroDWC/asm/auth/dwc_nastime.s | 28 +- lib/NitroDWC/asm/auth/dwc_netcheck.s | 73 ++-- lib/NitroDWC/asm/auth/dwc_svl.s | 32 +- .../asm/auth/incbin/dwc_ca_cybertrust.bin | Bin 0 -> 768 bytes .../asm/auth/incbin/dwc_ca_globalsign.bin | Bin 0 -> 256 bytes .../asm/auth/incbin/dwc_ca_nas_self.bin | Bin 0 -> 128 bytes .../incbin/dwc_ca_thawte_premiumserver.bin | Bin 0 -> 128 bytes .../asm/auth/incbin/dwc_ca_thawte_server.bin | Bin 0 -> 128 bytes .../asm/auth/incbin/dwc_ca_verisign.bin | Bin 0 -> 637 bytes lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin | Bin 0 -> 48 bytes lib/NitroDWC/asm/auth/util_base64.s | 4 +- lib/NitroDWC/asm/base/dwc_common.s | 2 +- lib/NitroDWC/asm/bm/dwc_backup.s | 2 +- lib/NitroDWC/asm/bm/util_wifiidtool.s | 4 +- lib/NitroDWC/asm/enc/dwc_encsession.s | 29 +- lib/NitroDWC/asm/ilobby/dwci_lobbydata.s | 79 ++-- lib/NitroDWC/asm/nd/dwci_nd_base64.s | 3 +- lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s | 8 +- lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s | 5 +- lib/NitroDWC/asm/nd/dwci_nd_fileapi.s | 58 ++- lib/NitroDWC/asm/nd/dwci_nd_filelist.s | 3 +- lib/NitroDWC/asm/nd/dwci_nd_string.s | 2 +- .../asm/nd/incbin/dwci_nd_ca_nasself.bin | Bin 0 -> 128 bytes lib/NitroDWC/asm/nd/incbin/dwci_nd_string.bin | Bin 0 -> 128 bytes lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin | Bin 0 -> 36 bytes lib/NitroDWC/asm/nhttp/nhttp_request.s | 7 +- lib/NitroDWC/asm/nhttp/nhttp_response.s | 3 +- lib/NitroDWC/asm/nhttp/nhttp_thread.s | 70 ++-- lib/NitroDWC/asm/nhttp/nhttp_token.s | 2 +- lib/NitroDWC/asm/ppwlobby/dwci_lobby.s | 89 +++-- lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s | 26 +- lib/NitroDWC/asm/ppwlobby/ppw_lobby.s | 142 ++++--- lib/NitroDWC/asm/ppwlobby/ppw_parser.s | 27 +- lib/NitroDWC/asm/ppwlobby/ppw_profile.s | 9 +- lib/NitroDWC/asm/util/anime.s | 2 +- lib/NitroDWC/asm/util/aoss.s | 21 +- lib/NitroDWC/asm/util/aosslink.s | 26 +- lib/NitroDWC/asm/util/archive.s | 14 +- lib/NitroDWC/asm/util/atermset.s | 63 ++-- lib/NitroDWC/asm/util/button.s | 12 +- lib/NitroDWC/asm/util/comment.s | 2 +- lib/NitroDWC/asm/util/common.s | 10 +- lib/NitroDWC/asm/util/dwc_mov_mbp.s | 87 +++-- lib/NitroDWC/asm/util/dwc_mov_wh.s | 280 ++++++++++---- lib/NitroDWC/asm/util/effect.s | 6 +- lib/NitroDWC/asm/util/focus.s | 2 +- lib/NitroDWC/asm/util/font.s | 17 +- lib/NitroDWC/asm/util/foundation.s | 3 +- lib/NitroDWC/asm/util/headline.s | 81 ++-- lib/NitroDWC/asm/util/icon.s | 8 +- .../NitroDWC/asm/util/incbin/atermset.bin | Bin 13068 -> 10288 bytes lib/NitroDWC/asm/util/incbin/button.bin | Bin 0 -> 52 bytes lib/NitroDWC/asm/util/incbin/common.bin | Bin 0 -> 80 bytes lib/NitroDWC/asm/util/incbin/keyboard.bin | Bin 0 -> 708 bytes lib/NitroDWC/asm/util/incbin/keyboard10.bin | Bin 0 -> 272 bytes .../asm/util/include/scenesetedit32.inc | 2 + .../asm/util/include/sceneseteditaddress.inc | 10 + lib/NitroDWC/asm/util/keyboard.s | 351 ++++++++++++++++-- lib/NitroDWC/asm/util/keyboard10.s | 42 +-- lib/NitroDWC/asm/util/libaoss.s | 2 +- lib/NitroDWC/asm/util/move.s | 15 +- lib/NitroDWC/asm/util/sceneinit.s | 66 ++-- lib/NitroDWC/asm/util/scenemenu.s | 17 +- lib/NitroDWC/asm/util/sceneopterase.s | 2 +- lib/NitroDWC/asm/util/sceneopterase1.s | 2 +- lib/NitroDWC/asm/util/sceneoptinfo.s | 140 ++++++- lib/NitroDWC/asm/util/sceneoptmenu.s | 23 +- lib/NitroDWC/asm/util/sceneoptmovcomm.s | 2 +- lib/NitroDWC/asm/util/sceneoptmovconfirm.s | 2 +- lib/NitroDWC/asm/util/sceneoptmovdisconnect.s | 2 +- lib/NitroDWC/asm/util/sceneoptmovfailure.s | 2 +- lib/NitroDWC/asm/util/sceneoptmovuser.s | 3 +- lib/NitroDWC/asm/util/sceneoptmovwait.s | 2 +- lib/NitroDWC/asm/util/scenesetaossbutton.s | 8 +- lib/NitroDWC/asm/util/scenesetaosscomplete.s | 2 +- lib/NitroDWC/asm/util/scenesetaplist.s | 21 +- lib/NitroDWC/asm/util/scenesetedit32.s | 31 +- lib/NitroDWC/asm/util/sceneseteditaddress.s | 42 ++- lib/NitroDWC/asm/util/sceneseterror.s | 13 +- lib/NitroDWC/asm/util/scenesetlist.s | 63 ++-- lib/NitroDWC/asm/util/scenesetlistsave.s | 9 +- lib/NitroDWC/asm/util/scenesetrakubutton.s | 4 +- lib/NitroDWC/asm/util/scenesetrakucomplete.s | 2 +- lib/NitroDWC/asm/util/scenesetrakuready.s | 8 +- lib/NitroDWC/asm/util/scenesetsearch.s | 8 +- lib/NitroDWC/asm/util/scenesetselectap.s | 39 +- lib/NitroDWC/asm/util/scenesetselectway.s | 35 +- lib/NitroDWC/asm/util/scenesettest.s | 13 +- lib/NitroDWC/asm/util/scenesettestcomplete.s | 2 +- lib/NitroDWC/asm/util/scenesettestconfirm.s | 7 +- lib/NitroDWC/asm/util/scenesetusbcomplete.s | 2 +- lib/NitroDWC/asm/util/scenesetusbready.s | 17 +- lib/NitroDWC/asm/util/scrollbar.s | 4 +- lib/NitroDWC/asm/util/search_dwcutil.s | 13 +- lib/NitroDWC/asm/util/setting.s | 5 +- lib/NitroDWC/asm/util/sound.s | 2 +- lib/NitroDWC/asm/util/step.s | 30 +- lib/NitroDWC/asm/util/task.s | 2 +- lib/NitroDWC/asm/util/usbap.s | 14 +- lib/NitroDWC/asm/util/window.s | 46 ++- lib/NitroSDK/asm/dgt/hash1.s | 4 +- lib/NitroSDK/asm/dgt/hash2.s | 54 ++- lib/NitroSDK/asm/dgt/incbin/hash1.bin | Bin 0 -> 256 bytes lib/NitroSDK/asm/dgt/incbin/hash2.bin | Bin 0 -> 225 bytes lib/NitroSDK/asm/dgt/include/hash2.inc | 1 + lib/NitroSDK/asm/os/os_emulator.s | 2 +- lib/NitroSystem/asm/g3d/incbin/nsbca.bin | Bin 0 -> 36 bytes lib/NitroSystem/asm/g3d/nsbca.s | 2 +- lib/NitroWiFi/asm/cps/incbin/network.bin | Bin 0 -> 35 bytes lib/NitroWiFi/asm/cps/network.s | 8 +- lib/NitroWiFi/asm/ssl/incbin/md5.bin | Bin 0 -> 384 bytes lib/NitroWiFi/asm/ssl/incbin/sha1.bin | Bin 0 -> 92 bytes lib/NitroWiFi/asm/ssl/incbin/ssl.bin | Bin 0 -> 109 bytes lib/NitroWiFi/asm/ssl/md5.s | 6 +- lib/NitroWiFi/asm/ssl/sha1.s | 2 +- lib/NitroWiFi/asm/ssl/ssl.s | 30 +- lib/gamespy/asm/available.s | 5 +- lib/gamespy/asm/chat/chatcallbacks.s | 83 +++-- .../asm/chat}/incbin/overlay66_data.bin | Bin lib/gamespy/asm/darray.s | 60 +-- lib/gamespy/asm/ghttp/ghttppost.s | 2 +- lib/gamespy/asm/ghttp/ghttpprocess.s | 7 +- .../asm/ghttp}/incbin/overlay60_data.bin | Bin .../gamespy/asm/gp}/incbin/overlay4_data.bin | Bin lib/gamespy/asm/gstats/gbucket.s | 17 +- lib/gamespy/asm/gstats/gstats.s | 107 ++++-- lib/gamespy/asm/gstats/incbin/gstats.bin | Bin 0 -> 668 bytes lib/gamespy/asm/gstats/include/gstats.inc | 8 + lib/gamespy/asm/gt2/gt2auth.s | 12 +- lib/gamespy/asm/gt2/gt2buffer.s | 26 +- lib/gamespy/asm/gt2/gt2callback.s | 40 +- lib/gamespy/asm/gt2/gt2main.s | 12 +- lib/gamespy/asm/gt2/gt2message.s | 13 +- lib/gamespy/asm/gt2/gt2utility.s | 19 +- lib/gamespy/asm/hashtable.s | 48 ++- lib/gamespy/asm/md5c.s | 3 +- lib/gamespy/asm/natneg/natneg.s | 10 +- lib/gamespy/asm/nonport.s | 24 +- lib/gamespy/asm/qr2/qr2.s | 57 +-- lib/gamespy/asm/qr2/qr2regkeys.s | 114 ++++-- .../asm/serverbrowsing/sb_queryengine.s | 8 +- lib/gamespy/asm/serverbrowsing/sb_server.s | 26 +- .../asm/serverbrowsing/sb_serverbrowsing.s | 2 +- .../asm/serverbrowsing/sb_serverlist.s | 47 ++- lib/libVCT/asm/adpcm.s | 25 +- lib/libVCT/asm/audio.s | 10 +- lib/libVCT/asm/fir.s | 3 +- lib/libVCT/asm/g711.s | 4 +- lib/libVCT/asm/incbin/ssp.bin | Bin 0 -> 264 bytes lib/libVCT/asm/ssp.s | 17 +- lib/libVCT/asm/vad.s | 4 +- lib/msl/asm/MSL_C++/float.s | 8 +- lib/msl/asm/MSL_C++/include/locale_cpp.inc | 1 + lib/msl/asm/MSL_C++/include/msl_thread.inc | 1 + lib/msl/asm/MSL_C++/ios.s | 45 ++- lib/msl/asm/MSL_C++/locale_cpp.s | 9 +- lib/msl/asm/MSL_C++/msl_thread.s | 9 +- lib/msl/asm/MSL_C/ansi_fp.s | 66 ++-- lib/msl/asm/MSL_C/ctype.s | 23 +- lib/msl/asm/MSL_C/e_pow.s | 14 +- lib/msl/asm/MSL_C/incbin/ansi_fp.bin | Bin 0 -> 64 bytes lib/msl/asm/MSL_C/incbin/ctype.bin | Bin 0 -> 256 bytes lib/msl/asm/MSL_C/incbin/locale_c.bin | Bin 0 -> 192 bytes lib/msl/asm/MSL_C/incbin/wctype.bin | Bin 0 -> 768 bytes lib/msl/asm/MSL_C/include/locale_c.inc | 2 + lib/msl/asm/MSL_C/locale_c.s | 33 +- lib/msl/asm/MSL_C/printf.s | 30 +- lib/msl/asm/MSL_C/rand.s | 2 +- lib/msl/asm/MSL_C/scanf.s | 7 +- lib/msl/asm/MSL_C/string.s | 6 +- lib/msl/asm/MSL_C/strtold.s | 7 +- lib/msl/asm/MSL_C/wctype.s | 6 +- lib/msl/asm/MSL_C/wprintf.s | 37 +- lib/msl/asm/runtime/cxxabi_rtti.s | 8 +- lib/msl/asm/runtime/exceptionhandler.s | 41 +- .../asm/runtime/include/exceptionhandler.inc | 1 + lib/msl/asm/runtime/include/new.inc | 1 + lib/msl/asm/runtime/mwexception.s | 4 +- lib/msl/asm/runtime/new.s | 40 +- 358 files changed, 3047 insertions(+), 1319 deletions(-) delete mode 100644 asm/incbin/arm9_data.bin delete mode 100644 asm/incbin/arm9_rodata.bin rename asm/incbin/{arm9_exception.bin => main_etable.bin} (100%) rename asm/incbin/{overlay14_rodata.bin => ov14_022248A4.bin} (100%) delete mode 100644 asm/incbin/overlay100_data.bin delete mode 100644 asm/incbin/overlay100_rodata.bin delete mode 100644 asm/incbin/overlay101_data.bin delete mode 100644 asm/incbin/overlay101_rodata.bin delete mode 100644 asm/incbin/overlay102_rodata.bin delete mode 100644 asm/incbin/overlay104_data.bin delete mode 100644 asm/incbin/overlay104_rodata.bin delete mode 100644 asm/incbin/overlay105_rodata.bin delete mode 100644 asm/incbin/overlay106_rodata.bin delete mode 100644 asm/incbin/overlay107_rodata.bin delete mode 100644 asm/incbin/overlay108_rodata.bin delete mode 100644 asm/incbin/overlay109_data.bin delete mode 100644 asm/incbin/overlay109_rodata.bin delete mode 100644 asm/incbin/overlay10_rodata.bin delete mode 100644 asm/incbin/overlay110_rodata.bin delete mode 100644 asm/incbin/overlay111_data.bin delete mode 100644 asm/incbin/overlay111_rodata.bin delete mode 100644 asm/incbin/overlay112_data.bin delete mode 100644 asm/incbin/overlay112_rodata.bin delete mode 100644 asm/incbin/overlay113_rodata.bin delete mode 100644 asm/incbin/overlay114_rodata.bin delete mode 100644 asm/incbin/overlay115_rodata.bin delete mode 100644 asm/incbin/overlay116_data.bin delete mode 100644 asm/incbin/overlay116_rodata.bin delete mode 100644 asm/incbin/overlay117_rodata.bin delete mode 100644 asm/incbin/overlay118_rodata.bin delete mode 100644 asm/incbin/overlay119_rodata.bin delete mode 100644 asm/incbin/overlay11_rodata.bin delete mode 100644 asm/incbin/overlay120_rodata.bin delete mode 100644 asm/incbin/overlay121_rodata.bin delete mode 100644 asm/incbin/overlay12_data.bin delete mode 100644 asm/incbin/overlay12_rodata.bin delete mode 100644 asm/incbin/overlay13_rodata.bin delete mode 100644 asm/incbin/overlay16_data.bin delete mode 100644 asm/incbin/overlay16_rodata.bin delete mode 100644 asm/incbin/overlay17_rodata.bin delete mode 100644 asm/incbin/overlay18_data.bin delete mode 100644 asm/incbin/overlay19_data.bin delete mode 100644 asm/incbin/overlay19_rodata.bin delete mode 100644 asm/incbin/overlay20_rodata.bin delete mode 100644 asm/incbin/overlay21_rodata.bin delete mode 100644 asm/incbin/overlay22_rodata.bin delete mode 100644 asm/incbin/overlay23_data.bin delete mode 100644 asm/incbin/overlay23_rodata.bin delete mode 100644 asm/incbin/overlay25_rodata.bin delete mode 100644 asm/incbin/overlay26_rodata.bin delete mode 100644 asm/incbin/overlay27_rodata.bin delete mode 100644 asm/incbin/overlay28_rodata.bin delete mode 100644 asm/incbin/overlay29_rodata.bin delete mode 100644 asm/incbin/overlay30_rodata.bin delete mode 100644 asm/incbin/overlay31_rodata.bin delete mode 100644 asm/incbin/overlay32_rodata.bin delete mode 100644 asm/incbin/overlay33_data.bin delete mode 100644 asm/incbin/overlay33_rodata.bin delete mode 100644 asm/incbin/overlay34_rodata.bin delete mode 100644 asm/incbin/overlay35_rodata.bin delete mode 100644 asm/incbin/overlay36_rodata.bin delete mode 100644 asm/incbin/overlay37_rodata.bin delete mode 100644 asm/incbin/overlay38_rodata.bin delete mode 100644 asm/incbin/overlay39_rodata.bin delete mode 100644 asm/incbin/overlay40_rodata.bin delete mode 100644 asm/incbin/overlay41_rodata.bin delete mode 100644 asm/incbin/overlay42_rodata.bin delete mode 100644 asm/incbin/overlay43_rodata.bin delete mode 100644 asm/incbin/overlay44_rodata.bin delete mode 100644 asm/incbin/overlay45_rodata.bin delete mode 100644 asm/incbin/overlay46_rodata.bin delete mode 100644 asm/incbin/overlay47_rodata.bin delete mode 100644 asm/incbin/overlay48_rodata.bin delete mode 100644 asm/incbin/overlay49_rodata.bin delete mode 100644 asm/incbin/overlay4_rodata.bin delete mode 100644 asm/incbin/overlay50_rodata.bin delete mode 100644 asm/incbin/overlay51_rodata.bin delete mode 100644 asm/incbin/overlay52_rodata.bin delete mode 100644 asm/incbin/overlay53_rodata.bin delete mode 100644 asm/incbin/overlay54_rodata.bin delete mode 100644 asm/incbin/overlay55_rodata.bin delete mode 100644 asm/incbin/overlay57_rodata.bin delete mode 100644 asm/incbin/overlay58_data.bin delete mode 100644 asm/incbin/overlay58_rodata.bin delete mode 100644 asm/incbin/overlay59_data.bin delete mode 100644 asm/incbin/overlay59_rodata.bin delete mode 100644 asm/incbin/overlay5_data.bin delete mode 100644 asm/incbin/overlay5_rodata.bin delete mode 100644 asm/incbin/overlay60_rodata.bin delete mode 100644 asm/incbin/overlay61_data.bin delete mode 100644 asm/incbin/overlay61_rodata.bin delete mode 100644 asm/incbin/overlay62_data.bin delete mode 100644 asm/incbin/overlay62_rodata.bin delete mode 100644 asm/incbin/overlay63_rodata.bin delete mode 100644 asm/incbin/overlay64_data.bin delete mode 100644 asm/incbin/overlay64_rodata.bin delete mode 100644 asm/incbin/overlay65_data.bin delete mode 100644 asm/incbin/overlay65_rodata.bin delete mode 100644 asm/incbin/overlay66_rodata.bin delete mode 100644 asm/incbin/overlay67_rodata.bin delete mode 100644 asm/incbin/overlay68_data.bin delete mode 100644 asm/incbin/overlay68_rodata.bin delete mode 100644 asm/incbin/overlay69_rodata.bin delete mode 100644 asm/incbin/overlay6_data.bin delete mode 100644 asm/incbin/overlay6_rodata.bin delete mode 100644 asm/incbin/overlay70_rodata.bin delete mode 100644 asm/incbin/overlay71_rodata.bin delete mode 100644 asm/incbin/overlay72_data.bin delete mode 100644 asm/incbin/overlay72_rodata.bin delete mode 100644 asm/incbin/overlay73_rodata.bin delete mode 100644 asm/incbin/overlay74_rodata.bin delete mode 100644 asm/incbin/overlay75_rodata.bin delete mode 100644 asm/incbin/overlay76_rodata.bin delete mode 100644 asm/incbin/overlay77_data.bin delete mode 100644 asm/incbin/overlay77_rodata.bin delete mode 100644 asm/incbin/overlay78_rodata.bin delete mode 100644 asm/incbin/overlay79_data.bin delete mode 100644 asm/incbin/overlay79_rodata.bin delete mode 100644 asm/incbin/overlay7_data.bin delete mode 100644 asm/incbin/overlay7_rodata.bin delete mode 100644 asm/incbin/overlay80_data.bin delete mode 100644 asm/incbin/overlay80_rodata.bin delete mode 100644 asm/incbin/overlay81_rodata.bin delete mode 100644 asm/incbin/overlay82_rodata.bin delete mode 100644 asm/incbin/overlay83_data.bin delete mode 100644 asm/incbin/overlay83_rodata.bin delete mode 100644 asm/incbin/overlay84_rodata.bin delete mode 100644 asm/incbin/overlay85_rodata.bin delete mode 100644 asm/incbin/overlay86_data.bin delete mode 100644 asm/incbin/overlay86_rodata.bin delete mode 100644 asm/incbin/overlay87_data.bin delete mode 100644 asm/incbin/overlay87_rodata.bin delete mode 100644 asm/incbin/overlay88_rodata.bin delete mode 100644 asm/incbin/overlay8_data.bin delete mode 100644 asm/incbin/overlay8_rodata.bin delete mode 100644 asm/incbin/overlay90_data.bin delete mode 100644 asm/incbin/overlay90_rodata.bin delete mode 100644 asm/incbin/overlay91_rodata.bin delete mode 100644 asm/incbin/overlay92_rodata.bin delete mode 100644 asm/incbin/overlay93_data.bin delete mode 100644 asm/incbin/overlay93_rodata.bin delete mode 100644 asm/incbin/overlay94_data.bin delete mode 100644 asm/incbin/overlay94_rodata.bin delete mode 100644 asm/incbin/overlay95_data.bin delete mode 100644 asm/incbin/overlay95_rodata.bin delete mode 100644 asm/incbin/overlay96_data.bin delete mode 100644 asm/incbin/overlay96_rodata.bin delete mode 100644 asm/incbin/overlay97_data.bin delete mode 100644 asm/incbin/overlay97_rodata.bin delete mode 100644 asm/incbin/overlay98_data.bin delete mode 100644 asm/incbin/overlay98_rodata.bin delete mode 100644 asm/incbin/overlay99_rodata.bin delete mode 100644 asm/incbin/overlay9_data.bin delete mode 100644 asm/incbin/overlay9_rodata.bin create mode 100644 lib/NitroDWC/asm/ac/incbin/search_dwcac.bin create mode 100644 lib/NitroDWC/asm/ac/incbin/shop_usb.bin create mode 100644 lib/NitroDWC/asm/ac/incbin/test.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_nas_self.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_premiumserver.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_server.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin create mode 100644 lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin create mode 100644 lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin create mode 100644 lib/NitroDWC/asm/nd/incbin/dwci_nd_string.bin create mode 100644 lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin rename asm/incbin/overlay18_rodata.bin => lib/NitroDWC/asm/util/incbin/atermset.bin (75%) create mode 100644 lib/NitroDWC/asm/util/incbin/button.bin create mode 100644 lib/NitroDWC/asm/util/incbin/common.bin create mode 100644 lib/NitroDWC/asm/util/incbin/keyboard.bin create mode 100644 lib/NitroDWC/asm/util/incbin/keyboard10.bin create mode 100644 lib/NitroSDK/asm/dgt/incbin/hash1.bin create mode 100644 lib/NitroSDK/asm/dgt/incbin/hash2.bin create mode 100644 lib/NitroSystem/asm/g3d/incbin/nsbca.bin create mode 100644 lib/NitroWiFi/asm/cps/incbin/network.bin create mode 100644 lib/NitroWiFi/asm/ssl/incbin/md5.bin create mode 100644 lib/NitroWiFi/asm/ssl/incbin/sha1.bin create mode 100644 lib/NitroWiFi/asm/ssl/incbin/ssl.bin rename {asm => lib/gamespy/asm/chat}/incbin/overlay66_data.bin (100%) rename {asm => lib/gamespy/asm/ghttp}/incbin/overlay60_data.bin (100%) rename {asm => lib/gamespy/asm/gp}/incbin/overlay4_data.bin (100%) create mode 100644 lib/gamespy/asm/gstats/incbin/gstats.bin create mode 100644 lib/libVCT/asm/incbin/ssp.bin create mode 100644 lib/msl/asm/MSL_C/incbin/ansi_fp.bin create mode 100644 lib/msl/asm/MSL_C/incbin/ctype.bin create mode 100644 lib/msl/asm/MSL_C/incbin/locale_c.bin create mode 100644 lib/msl/asm/MSL_C/incbin/wctype.bin create mode 100644 lib/msl/asm/MSL_C/include/locale_c.inc diff --git a/asm/incbin/arm9_data.bin b/asm/incbin/arm9_data.bin deleted file mode 100644 index a96570b200f893ca5be32e5334c7f619109b8ea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12340 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 Of;JT!YlHkQ;Qs*6)HH+u diff --git a/asm/incbin/arm9_rodata.bin b/asm/incbin/arm9_rodata.bin deleted file mode 100644 index fa638c8339a5c21c2b9d98a3383332400061fb5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106636 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 b|CS^l@_$c~53%SoHmkUo7xB&2vHAZ2)!3E} diff --git a/asm/incbin/arm9_exception.bin b/asm/incbin/main_etable.bin similarity index 100% rename from asm/incbin/arm9_exception.bin rename to asm/incbin/main_etable.bin diff --git a/asm/incbin/overlay14_rodata.bin b/asm/incbin/ov14_022248A4.bin similarity index 100% rename from asm/incbin/overlay14_rodata.bin rename to asm/incbin/ov14_022248A4.bin diff --git a/asm/incbin/overlay100_data.bin b/asm/incbin/overlay100_data.bin deleted file mode 100644 index b073ebfe1db1e6b1afa250695e9b23fe74c88ec5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmd;NU|?VZVunBe|AQz-5CH@r8k;y9P@Dy%019C0k;Peoa@f=)G6XP$Gh{KOF~l)! hV+dwwWGG=s1mZOeAq=}2k{MPoR5Ro-#KMdQ(*SK=4>te+ diff --git a/asm/incbin/overlay100_rodata.bin b/asm/incbin/overlay100_rodata.bin deleted file mode 100644 index 84ea16132318a9e64df56aa301c84fa2890fd07a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 956 zcmb7DyGjE=6umoccH=u36;li*m?mH?SeP}j6F(wFYAv=5oEk)c4l@Artl7D@11jB^V)z43E1rEDO>wQ6+LpU&OB2Z71jV`pua?Qqy2ef zM~c^7DIOBmRVl7lrMO?0qO&DMt0~3BwiM_I8R&0OmyAO&-!nd~%K0Rq$fg!v=ZgbE zqA$)DhPJkIJ71~fIBPgx6w!<&jds2`vYtjbrZXOwbV_~R)g4{YExoCYpifm=p|3EH zeB#wVGhP^@EZZBVX?v6%wdYJBY!2(;sa1nYX_@7?}SrB9`r TA4(l_j+S?&2w>UFnP2(`DjZSd diff --git a/asm/incbin/overlay101_data.bin b/asm/incbin/overlay101_data.bin deleted file mode 100644 index 3afb75bcfa19558c2febab7292dd5283c6b43959..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 WcmZQ#U|?VdVjdu70b*_-Mg{-^)Bqs> diff --git a/asm/incbin/overlay101_rodata.bin b/asm/incbin/overlay101_rodata.bin deleted file mode 100644 index 68ec4fe213908d7bda2596e35dae2a7b2a736d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6332 zcmeH~O>7la6vwBxEgwR~Mym2L@c1b70Zph{mBc2)0)qk(B25rMsVR~A6;V;pm^>0u zyHIh#qKhUp(FF?@E?BT=QWq?`aM6W{8q7>X_oC;9c> zd(OG%oH=)9-ZU`}uWVV?moz1_rKDx%cv15pi`=9sX##X!Wbi z+uG6hz)^4C$ljs-?12%O=~!rbwxy;Q_Q54M(489FvkJ}uvYvUKJ@7MBLAkf%GW=3% z#^47~ylM1J*t?z^h$WJywDaDO!M z_S{Zy+be#}pq^UE`I{B@Tf1zM%-btkIC(5gawb`EzqQLI$wFzj>%Xi06$NuL-}-Bn zVBCRuU6waX^Siu=R+ajyKQR@N3vpl#v1sOL+0(#eruOak`?zitUub{ z@cc^(=A>c&qx}v0UkbaEq~@BV%Zl||yKIuo+bdc)nQ#92Ucc?HO35KB)^F{yNwQ-9 z@9O-MTGa{}t&(KmO@8Z6@NR$Gjl-|=-h7qc*tgue&yU^s$Zyj7zdXQu7vyUXB^-># zFwdD+mhwlU%Jr*@Oz;-Ume}bj@?Q73XT{OJ%A?k2)?ORu!8!EHBfXnneU0CsW4_K3 zW+92|tk9oO=R{jw-ql5aTSJG_>pJ|koFh-QQ7-H6Ym4*7J&E-tLJLW(kK<%~Ooo~x z{YkEO6zsXgJuDGRNal!nVTj*!&^gcLqqX}v4n1Xkna(g zfzjjc8*}^(zC~a$Im)mbzw*1phe_ysKQ$_4fblY11$~QV=&Ho-|Cn!2kWPDhKTXXk zxB}9tL#-dA<^qg?bgHlIFyAb25~?8Gu2-lFE>daQ>UroPeZq>lQ9aa?y_ye$3tY=Pfs?R!JCxKJk9Fd$wfVcyGFW zszEhr)SXwqu292LY8#}sL(IQ|)9@Y~gI|Gd_f*uoC!hx&hbR5Im+>i({b>kxo$)Hr zlcJ|WPs3VBVGWdE1FVDfun{&xCv1W)*a~IX0!gMW=wu}7il0yDUF+x8N2e%}kDpr~ zKes*$t%vjRbL->hg*b7p*e8w?`?y^D$x_dA=mtIde@zFaw}a-|B@{_0x=;^=`X)Ab z=F*4wxXp^Mb5s7q5YKh5iTeDCuV-4QzIsC4s#Wu*q=kHKjGH~P*MDdV)-+LWLxs*r5^+?~S9=+>>#P!5+G!NGm$5H%nU30|=_pIuP-v{dUTxYtZ?0gYsz}-udCZC%xXyvdLfjbX|%g ZAFWll@@Ot3dhbgw?$>j_KmVuu=WkwzqCo%v diff --git a/asm/incbin/overlay102_rodata.bin b/asm/incbin/overlay102_rodata.bin deleted file mode 100644 index f927b7bbfc5a17eda55fb75ec923b9f8d64a408d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 ccmZQzU{H`?Vq{=szz>k+nV?Ep@M~cJ02UYkL;wH) diff --git a/asm/incbin/overlay104_data.bin b/asm/incbin/overlay104_data.bin deleted file mode 100644 index 25da8866f04a64fedf1bd4f44256024e3cdb6db9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 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 F{|Ak4KP~_O diff --git a/asm/incbin/overlay105_rodata.bin b/asm/incbin/overlay105_rodata.bin deleted file mode 100644 index 28709b4c33d918a6aee288531394c40908d536c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmZ`$yA8rH5Ix6EazFajbaB_$;zq@+Y*ft2(tK#>91fdzP%#8!yJ zNiXj{@1AXi*%C8bfhB~Bbjl>Xrcuy|u0TyCaHHS4?bTG#7Me3q0V}}kUdWaBb|HCR zE55^8&RJkj`bVGy9>5zIdi#6*)BAG?Z<0`?HAQV6zG0S{(DO-{VYUAdnTJ`dNw*8$ z;L?^f>DcdztN;{Z32r>#vqy^7C~`PvCOk!LY~OS NJ+UYH4_NfE`T}fLHOK$} diff --git a/asm/incbin/overlay106_rodata.bin b/asm/incbin/overlay106_rodata.bin deleted file mode 100644 index f7a124d9678f7281d541665b1db845d8da6cfb04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmZvWOA3H63`8esY*j1>iU=;enz;84ZoRcB{UF$ZDHC2h4T!}w*0lggT~&Z8f|Zy) zXJM7+g^~Hu!i2%GFPGn`e$3yb#f;8}npGhqbg0jedD>*qi>r6yFQA`0_78}#FP`uM Dx|;*W diff --git a/asm/incbin/overlay107_rodata.bin b/asm/incbin/overlay107_rodata.bin deleted file mode 100644 index 75cb932278fd74c796ea02a3050a9fc7aa2f759d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 zcmb7D%Wl(95Iu8i$ByG0Cpc}YMnKx8kn)t+!m<_H_76bHmIYf@?BEAlKmsKAhf2H( z<^2Y+00{{sRtO=MY$2Svag9@|0(W$Lu4nE%d}lm`X><@%T8I#mLrNP}B&eZ|Z2*KA zUVE^YiaE^Z>K=OB_pr?8Axgf&!A{^AjO5zECbt>?k0iORln70@ zpI}B8?f_X!)H4SOJ^vB!k;o5>ij^JGm73J$8;rceXQc8KZ}A0XX~+l6%1()-BC%8@ zVuySpDoB#+8rWPkZ<^)T+8Ttie&cAydS;B!d(nN9&^njc-E%mP3%H0&xQwTGhUa*J zmw1KOxQ6Svft$F6RouoMtl=*1;XWSVAs*o|o-ogE@mc%-$_!?(i?SPC%u=+r;?h27 z52{2`G`Rf&7K*xjP8h~bMZuWcwwk@+`EuU5-&XUy$$wBtU7X8F>a{OZg!W>Z(7Edn z+K()qn@hb5ok9H+olCX<>s$w1ZTh$*bn0x={}~tL4ZI2c$Mm>HND7=e5U0b)P_Kfi{YvWOhNoSZVN zq=pX>MSm0tX23!uqNCt#H7LdJQQ0MCET2SC#Q3q$Z0YOGay?cE@ zMM1p-%z_4}`2tWHW;!#Fp8&+%K%fAmfqnwxbRfmZBrMIs!^prW!OPCVo67(I5&RXY diff --git a/asm/incbin/overlay109_data.bin b/asm/incbin/overlay109_data.bin deleted file mode 100644 index 4c65a66483b57611f1a5511e370b4a2ea902d47b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 lcmZQ!U|?VaVh$kY0%C3;=0UOrmIZpLC8ZOk#|8NwYFN2z>P=`A{{(*vqPYNfKgzF z4$<~QNXSwU>X1;EKq#mn%7b*VLxE6G2Z_bL^X@yZtK`VXXMR5K?97NPi^vjwm`_0AQ zehl{-ZSeQ1vNmq)tgxG=kk6*vUBWRH@jq5O8jk6Rzlr~kMfYD9iMe&*9=&9BkN&xC zh|1Y^!r#|akiR{MwQZHiGLQT4Qq}c!^+eWZY)mMXv;8NOJ3Mz@-9aw*%k77HU0+SS zNBtpOd_?^*p5Zz67MthEu+jE=i$Q!J#8 zyF*D*!QGYQqYV1>5^ulSTapLzLyoJATubxDv4mA@A>U~90M?)m8r_K^#&8|?v4UvE z=wnzyPuA!wxP=w0VH44u(FR3~;%XDQ50M9R=xAmwhOud53;FQ}`Ml8!_<#zUT8*B- zJl63G$u{kb16#N^!{)8NOe-}|8U)5?cP^7yffyWVmRdQjg}H}2Ag-k!A%Yy zkQ)eA7fu=dsh@Km;EbpjiPM-LH2O78o;Lb!fjh$%y3TTU=sIU~0TWoj8Y;MS-sn3R YW8G~O&TyBQ$0|C=F^vk}Ocss)2hdxIivR!s diff --git a/asm/incbin/overlay10_rodata.bin b/asm/incbin/overlay10_rodata.bin deleted file mode 100644 index 8e25bc8f2f6f0887bf5394d237cf6ea20a8e1861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 zcmeH`zl#%55XWcUzJ2>6x4E~7mleI3TS7$8G-@l?D6tUFUQj_>vC>=@dy5DMViOQT zz$PFz_E!E0VrAiQT{joMw}~2l=q2s zo8S>eP+e1riTo?Spm<6lh(}$`Ug1~Iu<#h{L@^0h`z~m%HzKUscV3_R^A)>zdN38k zELWvs+ZxSQGI3td+4{Pidl_>rS9PVxBPbuAJdZ;^SH3A`{>@nqiuK1ZS8@(rJIIDv z|B7vQcL$^4sQ^>iihvWWh`)rmidduGY`gChHTI?h3gdsm4~0DcWT2EPR!gWm&> z4C{yB3HVcR3;q(^g1-XaH0-}2-csOiiBli^198U(|3sW=!{!Tk2>unk1^ykp1^yE} zHXIy+x51CVQ}BejlY)1cGix}!#KC8xy4J5!Jud!#hRX_BHG>cM_&z&`eWk|+ceL*Oz0&z~7* zUtS$`XU1Q=w>SCWp~|V;G)e+WBiFzhf!(OdJvk@OWY&GsXGss_{o}X3i8=X4>hiC4 z+jj8Wu_JZEDRD#U$R|0~4L~3FYtMnT=3K~ze2|MJ!i#KKkDXzqKC;XyublGA{WoU- Dn=U@GJLFS3U%)jB)@WiW)z4mHv4!zphFV!DMXXq>>Y?yI2G;xhf z-dQuP{{}{V+{ewW08Y5H0b$>m2E=__(+aD}WYTF%*upeTLq)6Ay1e}H^XkLLPoKYh z{nm1G*`k{(*WFyB>6fxazf`XKrA9NTW{W|!To0;^riVVfB=3la0)2tLKwqJ+&{r^o zZoDG9WC(fsJbj)%pbzK++-H`$TYYE|9WcH+U5N4vXkZabSjGz0v4Kr&VVk?z;j}&M z;{b;^!ZA*8iudeEr4!Co6t)WH*4z2%0VdR%>i!}gX8?_=Yero_gI?w%&L04p;ch^4 z{a)(L6zRX5(`(iwpy4z1i8NogSGEcH9HPr=x8*d|q3%&TsNbm>>LWv>EZdS#sSb6L f+CiP7W~grsGnGsWIeUw`(vla3DMJ-z=6dcQ_RWM8 diff --git a/asm/incbin/overlay112_data.bin b/asm/incbin/overlay112_data.bin deleted file mode 100644 index ea4d71e823363ab00dce97f45fbf86a9098260d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 bcmZQzkYJEvkYfOWyQ~ZhPk{I_5W@ffGu;CO diff --git a/asm/incbin/overlay112_rodata.bin b/asm/incbin/overlay112_rodata.bin deleted file mode 100644 index 03e4d8c6f258a21b82289af7fcdfac447ea430ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmY*U!41MN47?E6sZgP)0trDYbreSE9()*qRhWTE*n|-{C&UO#r#t%`JMM=AmH^De z8)O1^CKupJNd+MqLcclbFRW)pM8bNFElgY73YB41lNI|mV7+Kw!dI&CfwU9Lw;S}T v%@gTZbLocoLXtd}zDHYBz~m(t?v0XA%&o_P2yTuq>u<9g@nKh z!E`B72m^sIjUZxSnuK&y1_U8RiZme>)=@&D=+3@;-+lMooO%0ZC3pGeJNKUNeCNFT zW_F((#osxZT18oM-)S$mJKg1OCtJ=sOUp}%5i#EIdqe|~7o-PNXFV{EJm$f~njDca zuqNx^b#MVLz&F7+QGG;)Ko7Yg&_iwr^pG0@T!sG>oK>p`+ykc}E&_8Fzmketpp7c@ zpKpZNfmaTREE$wxh0<8{rl~m)^!vcXteT^!p%1Yix;?;)0kdk3LCd-RPt9AcGy+7eCU6D6jX!|(MADyu z0p8>t;FXr7!M9srm?-v29i9|4S$zjJpG_~M`3 zEj-TMVSwio@XC|m3H}DipXTlw@IA1)nY$anF97wICb?@T?YX(MwW~9qv|ID8%dnfy zB@~Rt(i@F?gVA`fF&b|aqj51BjrqsR!T+6iKl}KAoLqa^y|;gKG5_TAf=leGsc|i!%XUD*=u!XW!BYuB4_KGVtVns-rs8do$6eMRWmhD$ZJlSZ9GhV zr=F~<=lx!vQ91ZoZR|-8^-+C&Z|iF_M$d4rzJ4~VRd357ZhQ{a)$fAmwVckNy?q`U z-K)Pc^)}XeWvz>Sf|t!}Oy0@M>U<1&)7dr;tJC*^Uh!SkW9|tv>o!l-G%uovDMRd z$Gx3N=hPZ|mo^SH(O306x3TW+S%`IR>SIj3f;vSwtLwOrdTNY*O3QQOq47*MKGdj} svaRzo=p4$Sm(}^0d7TBZ`gsrSsd?+sq-7r3 zKw_RI^D>_CJUiLez?Obp7l1Mv_;Mfa&7muS?$gOT2DZrO$YvHst3h@`U%wq%S*PDP zhX>MbQX_lI3=~o|vJPv!qk*M&e0q~2nQ0U?(l)&_O#6YH*^Dkm-Ue<$B1zfw@6!$b zTNm3UR+PCC!saU1^Igt|!qQEish?3YRDxxNq z!~ssY_bCpEs8h!JBQq#m^5gi-_*iYoS)AFp5H2$0cl}MgxPGAzZHSiIc>r(ymkBR& zpyjRd}4A~Mr2gRWLzeYg@u0;(h~3$m@Y69d0Q0u4HygF z8~S;+RQv_}0Zy6>1c7nTF*Ev~U3(Y3Iq@K(s>wYz<&u=!TSOwOT+0Y6O zTXrq&x=866T0s{&j=Gy;8|@%+?8SMtXI`e`sXJnIN@_lZ;S;s0PLk*dA`XN9axmV*n0l<05G0*_im=6K!$T7e=nYG)nd^l4Ua=1MdB>)m00`*yv(o}T}GM)y`LFP4|e)f?%|F1~5w9)Iu1 z+>h)=q;Ym%+Ri__Z+EzYTz&idm+9NSR}RRHZ>#Ub_w1i%dTM+3-tGPF-Of68F7m(o n{^L^dE@fPYy316Vbm;p?1RObg>; diff --git a/asm/incbin/overlay116_data.bin b/asm/incbin/overlay116_data.bin deleted file mode 100644 index e8c3348ec3447a345ec470b597492622d98bfa39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmZQzpe|qp8pniYB!~|ZCkMdHV@A>pGY?q|#D=LwQi{QZsR5~HfyyGA2NOd!4<-hp Jk@bVL0{|A-06_o% diff --git a/asm/incbin/overlay116_rodata.bin b/asm/incbin/overlay116_rodata.bin deleted file mode 100644 index 3d321a75ce83671507d6b6ac9b504bb9d288d69a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1996 zcmcJPD{mB06vxl*&a_L@goYAILjucdDetyHk&3|(3<(B7)d~oLFHqbF5C{YU5-1*ci;Q=0iMy9+iqU=czwO|o^wwPGVEoG) zN4u~70xr7Yi{Mhk_lj~9P{&nGY>F|>(C$v*+XJV;8E_Vy1Lr|M;>r?e$ok8XunP@k z)bMRboM`C2!AB<_sIc8)*R4!Bhn$GcM5hw&DR?%yD$E1DvzVuTE*?5wTz$Ieb>g8f zk06Ivp*;tA*83jzI_YKC*{Y`WTZ~PH`s`m~U^nd>e~+9SS+a}@{7F9Y2J}P8z$Y(% zforaZw~Z_x*?MMgP#uKi*9KbuIC{6Nh*e~3(?8+VIzx%Mx c7rJIYKizx0pSbR?$92A@UtIU+lY{&H0n{#-!2kdN diff --git a/asm/incbin/overlay117_rodata.bin b/asm/incbin/overlay117_rodata.bin deleted file mode 100644 index 38703f4117b7c3e5d8720da0bc1271524b31ab7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1852 zcmb7_J8u&~5Xb+wb{yv&=S3o6xF9$jp5ZA9BDq1L2_nHfN=FK>jxT`Z28o6bK#x$6 zC@4V!iH44Xk}rS+5=B~Q%y0H~?ZiP*GSSa7H#@VlJG*yzT*};wfy`BgGuK95u4nEO z{JNh%E6B5>nX4Yl+#fL4q34NoGavLeCLS-Qqup^hJcY#Pc6bT87me=(QOjuOjPdMF%}w> zB*Uec)2e?S->7}pM&oUH!#mq!QY4Q`HrZGp=9wN157y>M8aoZ94ZBw+HfB;%S^cVN zL`(EDykw4*hB}!T4-X`rpzmE)s~*J9xI))DvNL`DxslWomd#p zp-dQ$JKCx(Zk2tmc-`=Op3yYRm{nJ^C}akoSp!btAxrdy%wh-#iz-sJPr#FWS>}5YW z6J+eQZ((}7PG0s>r>1v4Hb1?*)N+^TGN_ zVl^Qdv+e9E`;TjBvpwkh`@f01^KG`9 zyrBiwJ)ZDxE7^AKdgF@3ZJF6;6v$Yo$Wyo%iY+hLKOJf9LFT5x>^XEL*h}abV`I|~ QGq(mGVEz#{yn!F^5BRIeQvd(} diff --git a/asm/incbin/overlay118_rodata.bin b/asm/incbin/overlay118_rodata.bin deleted file mode 100644 index ccff38b0769b1b5d9bbc8500704ef4bcd89f59f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 qcmeC#|Ns93JqCsjVFrdbIt&awKt6~K!fSXTe2*^>v7C4R{{sN>#ud2$ diff --git a/asm/incbin/overlay119_rodata.bin b/asm/incbin/overlay119_rodata.bin deleted file mode 100644 index 68e94874bcf9698ea8ccbe59318e932397d8ee6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 764 zcmbVI%MF7t40QrR?V%FaszPFgiUHCAIs_-?V1O<_XM#fqqOP9<0R_aNj-EfyFLo3| ziy294EhT#p<$63<3NMr*mk0zq`OMHIP)ORTDyO)vQ{m2nL|_GRjkmyB^{ahTBNM(B zFdH)BLnNjzTbcRgIkIpgC$ei~MAWc7P9|zEcG!Y#tZlCW=XZM+clJ1)75+#EDHUAl zGeb7nbf=Ftl%@JnDs5f3dze7ix}kq<0Nw)w7R|fs+>H6&Kf1$bg{FT)(=;wd{65ss Z4E@tpRi!`p4zs>zRbou?}^R;cHe=$vG5@FiFdfy*ie!X&z zG$;QtrZl!^oNc^Utto#&uSeC8Dk%L95(rkA%EX$zE-@{9L7jS z5!Ukz_U_2`8#54wK0g(idVVW1J#RUKy@&HQ! diff --git a/asm/incbin/overlay121_rodata.bin b/asm/incbin/overlay121_rodata.bin deleted file mode 100644 index 00ad58484f7d439d9c54a76c71c18254d7612f18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 dcmZpE%m4-~5Q?DzN((?~21W>j8Av4nF#uLH0$%_C diff --git a/asm/incbin/overlay12_data.bin b/asm/incbin/overlay12_data.bin deleted file mode 100644 index cd1d153953229fd54ff3cfb7ed2ddcd6caf01366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 RcmWe(U|`^aVi6#X4gdx?06hQz diff --git a/asm/incbin/overlay12_rodata.bin b/asm/incbin/overlay12_rodata.bin deleted file mode 100644 index 194f99f7cada28f16316f0cc866ef9e66e7fcaa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11116 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 diff --git a/asm/incbin/overlay13_rodata.bin b/asm/incbin/overlay13_rodata.bin deleted file mode 100644 index 7e72df19fb78fc68fa66332847db0cad8f007f02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4384 zcmc&%ZHQde89tx)V`lEo-JRKNG*OprgOM5>NJ_R;VZo@Y1hQa$449A!EM`g-_eanH zEjuw$M@reHRWe`#Tbi)a8q`+FXoQVF+7wFsz=%pIwut112=!O?hhco4d+yyChM|92 z>V;>X^S+zPPp1ZLfXW?LrQgf@{znX|L7a&vcM) zZLe+L*Iuh#+R&|57u&1N)tAp#7hgW#T+Q^ALt?RVsM)P8iN)GdbHne(tbuD`ZYA}G z)-^Wzv^UU$z_M{tNj1>B(WlJD0`Cxu!R}_4@k}3a@zhWD;u(x{d2I%(?Crx~|FAvC z_OgU<#sF-uFaVdu5Pg6P2?2(f2Xa6W7y%-n0E_}LVAS{~RlEgU+G4Q_!IlHebl;aGS8QoY&#q!j6#Vg|RYJ(JzIO-iQrP3o}ao0&)R- zn>3^3$E34+Cbc`6+WjN7`$1~=Gikyx*uN?|k!4IRq0Dc{E z1pZdqBo4%Bg1m}K!j=Q2qT7U>2&{^B2&?i172N~-e9?;zO6!-guHC|o+a_%i|NYV? z@h?GU+#f?GZ&5bldQCdd?$rLUa`vmr*?$e0_B(Yi9-GEv(|D|lN5+AQ9>RV`;Gbik zW38em!4dcv)*Tdc(R1hz5cf^edO6trcq49O=okAvL4W6kNyh&R%<)%+NydLIOfv4J zbpLTqWybL*>^tXw7tHxT1aqF_()s;^bbjBJ&hOvA^!uT7em{}U@1v@>e<9+*{>l89 zi4I9?V)$E?cC+zSv?lFVALB2BL-0r7BKR|K9{f3&{=by=2G5h>SJ-C*`5S2?&r{Jg zX~zxX#{Xg5hx|M^1iuI_f`1FngU^8@@LSk7V^s8Ku!p!V3wM5Br031^W4t)OB;F^K zi+4@Act24t-Y>z7_bV{t{RYf-sKIB&)qY8P)&Z^pY*1)9Jt@E4#Aw15i0 ze!ioFoY`eedydcS`p46Mrhgi3zUyaF{%_@A<*yy)(u=|RX8E*`|6Ez`AU`VRBd-r= zCQq<3*+D~AR%Sa=3RPdZ*ip#D9H+HP_G1nPZGgYDj+^-xrqrI_Oeq6gL3Fx{xqUu$~33V$-FH(E%Lx>a9qNih8#H^wl|{}gu>{jV|p6w6?ap*#an z=J`=xNaY52E3h3n1yoX*z9`pHnP*LzK7ydJ-BX@y#p@NLg-YVbr?)k;UXxZC#*gi? zt%dbv?HP~pTVzez*>s(DaGjpgv+Yht8RPMsEz%Chas1HzIg#$qb4v5PG0yV5@$z^) zZ|zw>8Si`krq}RI>I0S_zAv4RIQqfwTrflz4$*N9gJbhUbcG?h2s+M_f%E=9bR(FP zYstX9FZRjQ^NEM(Mu+IehUiK|bmbws@gcei=(vX&7|Z`!_kI1>hRv%`0BgViGDRLN z0O~D38xNojb(E>6J$0E6>c#1n3MgCUvsffGP0)gJ)w2j+mi!0o^upbpf4DzFQf1)P`u-`I;~ z>`uY=F?;&ky*t6pS$B^E*OcOx-kl)popcQ&ZWP%aB-kew=T73zu&>#jOYRB1 z`Gei=E-`(?-6iUl^GiW|6UneE^G0C;=O_Q1>PH2gYdqpYrd}PZ_nBj39r8{ur`GO-;Fo+K}>3 zP>azYYV*YZW9X;+Bx^_XpG80Yq1I3Q{~i65ucDv+M^VGk-%ZN-zYjGyz8L8S({G4emC_@9*sZzt?{R%BQB(QQ*o;Q;PKuRIcuks1G0zyc-eOa}f=W zp8>dcb)XFdabp&P_)GsrQT2jBbdO!yYjb-($arHo8EWg*r^L&1kU|;r3r}9zoUSJM*1ZV*Jf$sq3d851l diff --git a/asm/incbin/overlay16_data.bin b/asm/incbin/overlay16_data.bin deleted file mode 100644 index 9e851d563535703c1821294069a078481976cd79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmZvRI|{=v5JYEm$S;Drxva+h76 J@|NrW=U*&p3ibd1 diff --git a/asm/incbin/overlay16_rodata.bin b/asm/incbin/overlay16_rodata.bin deleted file mode 100644 index 6ba2454443d87ed0e296321a78635e057aa0fc19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10416 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 diff --git a/asm/incbin/overlay17_rodata.bin b/asm/incbin/overlay17_rodata.bin deleted file mode 100644 index 6f72a5bae9dfb1d19a43ad979e8df56770ee7605..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8260 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 diff --git a/asm/incbin/overlay18_data.bin b/asm/incbin/overlay18_data.bin deleted file mode 100644 index 08012f754625a59f19758c25c79610017835c0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6912 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 diff --git a/asm/incbin/overlay19_data.bin b/asm/incbin/overlay19_data.bin deleted file mode 100644 index 4e4e4935707a596987ec1cc32e3d0d587dbe4f04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 KcmZQzzz+ZbAOHaX diff --git a/asm/incbin/overlay19_rodata.bin b/asm/incbin/overlay19_rodata.bin deleted file mode 100644 index 6e77adc99e75e093f0b1d94b4d18af576d241ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1980 zcmZ{l32anF7{~wLytmu#cDKCJi_&h((Uu;7&{k-{0_7+a%6*ihK)HHxl~Rx*k%cHx zW3(}93L(Z@)Tk7V7Gq-}#2BMS#RCsC9;m2Q)JUwFUH@<2P_^p3{Py?0`DW(LzMYvZ z!BesyA#~=1!ksx`pzl5uJmHJP?Z>Rp1Ba|oXT23Vx5NrvDk7F;=U7A;raLN3n}*9B z6>ZlU7$mlJ`TPA}bpb$KiT-IphCRlA76WPj+t0vY&Zl2D%ZUx7oBtX!GFiI|bNx$S zj`Qq4W?wGN-M<_9a?JGaryGm?9dz!>E4VTNJ>9;%-K>V(RU3#j4b(Y4pnYCDtKO-< zpk3DB#9i8fMkg-O-lg54-J>1Y?6lje{iybj+9g|@{4VVd?OyG&txo=C?OyGQZBG3T z?T55aX`k2jZ+F_2YPV{4X!mI6HaYDsYM1PA;x6r8?TTinzE%68cGga(zD#?y_5tm~ z+8x?G+MX7tUzYYdZ4bO~!Cqo2^3%pJ_HZ#o!Hqar7=T##;X^W#kcb4tV;}-t2dP}M zDHw$GK-$nD8JWX}jmXZ*%gq@zGJnifqYDehj=Q?3qisA}2Ll`EF7u3lBMcFl(M>uNV`Y^bl>vbk~lwyn)Ons&A9+;i>j z>-M&CR$e7TM7a!?NRcR5Uc)F6C5b*$szg*`sxniR#2Y@#T&V8r4ye~o1(bN*KBa;X z!#`M5JH(Ze>Q*NZJHTc7eMXGe1GMpbbR(0VPFK=f=$6Q84~E0xVC2sJ_$`c}3%6rG z8ZjG%+~+>lX7asd@+!a#RP$=aK3+%JW|nHiR5D35U;-&7<46%HAY)WLMw5{wkL0L2 zWRpxXT-9PI$xxdRAgO92Qb@AefF!jZ31pyJ2TRo;miX0L#Hcm!kZ83UZdDCat%9Le z@^D*$uq;PNs_=&_!|$Y5mf}}gjLWhJzsN%TEDP|H%*Q2}haY4vzL!dTCv)(vRNxz# zg|B5MzLIi$DbsO5rr`^jiqEACpUGr=DwFVul#+?~SSH}S6yqZqj}K)WK9C~3FNHWK zW62o2C!_JMj3W7XNAmEthMR6FEd~AO}g1Tu=6qy<`vBOGP?#T$!>x>ua~8oNC^{SE#8cdn_{hm9 jr~MRHq`en0+#i0P90PcQ#PP(4=gE=C6C{}@MhgA})!!T< diff --git a/asm/incbin/overlay20_rodata.bin b/asm/incbin/overlay20_rodata.bin deleted file mode 100644 index c6e29e7533f75395d1d570bf172c8613723f5ac2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 zcmaKpId4=k5XWc6ez$k`y|??0U2KpLM<5Om?!X4ZC4m$qkSJ4-K1C>yC{jX~7KtJh zbV#HK1!W4pK^h7^00jjF1?|A(AVq|*_4C;CACLaBXBtO8g~z$0>B7-s>8O3wE-$}t zmnZITY`u81vGp4OSP`-Y;s61{Kx3o=inUTn9O*QSgDeU|&eDjJEao&xfLSX4J@VbO z0;}O*QM{`m93fB#uJ3Dy4hVAG*X)0^!y(YFyca<4Rqt7XzkarDJrx#@I;xI2dUo8= zXW@r1eL~(z_;%9Kg9%69h0Rlr-kx^!eA3Zt;gj%1_$A!)QZIZIaLSPrW`(cPrj0a=dEf?S2Z)ZV0GK+ z>Gm2f*GwGyT;JT0$fd*g|CaveUs$r@MD} zJ#ZM-oi3g7`t5?(&NZ)dSDd5=c`*z5XU zuY(n*zmI#}-u8O+qSv$Moz7i%I-;&i-H5tl`|wwtE+k$rQTL8I&D)Y{kq;GFXxYM2 z0y7h^9ETZ1Bpg*9mP`4j%qveT4f1$jO)3+*ErSj&_bbuW%J(n__)EuYi-6Ig*&cnZ(p4ZMJtum-Q-HH_dP4B!zwh9SsWQ=|uH zU@L4iMEYRau1)VXrJj(7)VG;%-(Yi}LA2)25BmYqy8Qhw8eFq?$i9R(H>5tP zlQ}b)6>G!ZCu%lI?i|A2XBw_V%*(a+wk?Zo{N~!Op!uMU>-GfgMtFns*$H-!6V^f& zM~j@w&!C+Q+C3Y87PpI>%AL^ierv=c8f#w*EuGN5l%49hZf9|~6shXlOABoSt(8ffp5$Km4c{r>aM@dF29Gh9jZJwP{uloM DBwvC| diff --git a/asm/incbin/overlay22_rodata.bin b/asm/incbin/overlay22_rodata.bin deleted file mode 100644 index cb52bae428fab1ef51f53fba04813ae0d43b8849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZQ%KmbM{lLN$U0AdFQ20kElj){Sx3`h$DF^CTbV1*0}j12rB0u{jJzJh+@3 tBLmQE6o5l6|NsC02z|0l49qCHkj&(RyMzU*qyb7NKxvp;K}HAwF#xjT2Ydhk diff --git a/asm/incbin/overlay23_data.bin b/asm/incbin/overlay23_data.bin deleted file mode 100644 index 141f103b4af636764444e950c717fa874ea71332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2912 zcmZ{lTWnNC7{~u}_Uv@nUbcmn(k(1opioM=-=U=iMXTIYR79?YQb3@q#U_0)CN7Eu z6N8AY@v$)}YQ*?p2qwJn)DU@dbQ z%1>6;=#uHR73u8kf&9QgCY`Iz=v>9X07rQOX;@3;hPEptm~pew#;RqJTjM%bB6HGl z+uFX&OA+Qob_~`a0ios6hLS)n+|Jn*wkk>kVg_$aFWTo4lDk+hL`8>4NV$ot5emT|X?eA~&PSD2K|DJZ3{calIvmj{Lk&%oa z)`k*0Y=)%SDENK{BgCk_AGm;PB&3I~4i-lN@uc?c&7P7dm z`2o5`WCz`TO5U8AfemDRQ6H%~oFO|OVJTCGm&rbgFhgB0*|i80U7qY)#}rSUN@cK> z?DrV!Bs0CiJ&L-=$Qokoak6{vzQH@M$13K?&tVJ_j7vS%kZqt3#W*D;_GL5q=1Z|X z!pihal#xkpFaum}%t964ffQLQKD5rFlI$>blHpZ+w4RL@unQ+Au^cn@0EQ#X=ms3Z zeq5Wx=HO}U#UK11Z$JaHAj`a(%j~MbEgP3QdN1Sqn1|E6?>}4{5b$n|I7^lZ?;&|V zA5Y-P$eAVA7C1KW#YVmqRr}ZMd zg1*p)#K!0rJkJX`@dn(3OknM@Fm1MhPY!%tQ z7+XztFvix9ZI7|FWG}|pI}A5vtlQmO}(OUK^nxODHmFJ!j+fsle)wdTVchbT#@mc zH2FxsMH}bY&$E@^zBqrIEb#yibn-U~xT+-YN5SJ_monVq3)Hf{s;;x%gHhINRgY2_ z<4B=X4Y3}>U0XMk*Q!oikFvgw3%36^&(?&y%A<9%e^*Jri9T;!@w{JYjURa44cecy zwn5LkLrV^^PwS_BPWyp2>%&0T-SukM(*EOzj&z+pcIaq--;&<5N6vKf&@BG}?T8cr diff --git a/asm/incbin/overlay23_rodata.bin b/asm/incbin/overlay23_rodata.bin deleted file mode 100644 index 5ae9fd50ceecf450452e95656331db5619d77c2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2232 zcmchZzfTlF6vyYs&i&lIJz)_R;lSLUIT8)=5)(<(7!yg*s8~>FVU&cz!bHkbQHbFW zprkmJf`S4QN{cgKN1}y=rNvq4AAkvkp5M1~v+Nz@D&ot1_Pu%Y-prew*@2XjzLT(= z5y61$=Bao7>SnUC;nJim{mofvAF=8-e%^jGy#A+C+6hE*BZ*5yL~X$1&q-RiYM8mIzVG85PLv-^>Y|w5bLOgm_Qvw4YkA>LkzKkS_sOn zqix2Tg8c-{fJdMTYG4_x02B8=^akeZhN+>3cS58QPZc%a+_b!;Z*6-u}1LvN` z_(^}g69{4p`$JsE{tz43qd2E$13}cVKSX>CvQOabbi>5&p$=jKwGhTn`Z#LgLRu=3 zOl55+*VEfSJm3$WDvWr2C+VX#65R`q@f_%=&*kAqdeFmI)R&9yq2)J$`0@^GS;H9x zHP}9UbV6s!-8SUZ|i~sEjCAq~}|n&plsxzEl|<06#BRM6t|^Wm&FR2%DU?Ca3x2 zv@(V;wl>fO17Y~VMtPP@NSSCoZCBc^6+U(4Tqd~fij0k4v=*t7(#|8rO1YLwT6SKj zbo5hhuPT(KN=vVRl!S{TKV^OS diff --git a/asm/incbin/overlay25_rodata.bin b/asm/incbin/overlay25_rodata.bin deleted file mode 100644 index d67ebaf26ff8a3d59df7023a8e511c4912fddf25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 zcmY+?%WD%+6bA6`jHy;_Y$iaOFbizu>}!tN5MFMDV~bbLQTen|sckV0yliem-9b zya{}J88waeL#8ou*ff3+7|pbn){)S9(uobUls3|GY9Sv5sg7D{A#I{1w3!xAi0Wx8 zt)MnqM%$>7w$mEgK~2<7t7s=RPzNodPFhX7C_rKI(;iw$ducK4qv}qbYB|-r+D}L~ z!VolQY5&K+Iloj3_hwsr-M;7xJ$T>I?z#g8JdQ!m$ke)4kd>7|qIn%bwjxSQ*l4SIQn z!CN;B_#DIWNqwX5XVNtOP=Cra9@7j3`IMfO_FJ#7Xq-ONero0yu!W}=Mg&oGBZfE< zNMZm($l^Mmb#M<8c!Cn1;RR;#7Vq(q@6Yk=S~T&y3UU2Tp5H-qp%*7`8Wz&XU>IY_ z!A2ehOrnTsl(~!7c!v*2NJsIEL?+M5k$k^|ZA-$ra}pg+Nz6Jg@zD!%${vtG`=Z>o zFN>48BIDMGB(1CrS)-CIT$7u{8&aCOC8eA#6PY`b=(;QM-Fa!t-o>j3=9ZShMy@AHH<*%-c$%1B)t~OW(KlvLfH@# GAS3{kcnS&t diff --git a/asm/incbin/overlay27_rodata.bin b/asm/incbin/overlay27_rodata.bin deleted file mode 100644 index 8fdfc5f41b120680b0f400f2f8a76253d35208b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmexYP@rC$tjcs2h<#I3nJxmcX)2HgVkTx5hK<>(OfP|0H%FDJ5r`Rcfiw`y=BY9< zzyJq?!N|bJz<>~Ckj#RpVFXGy0?l9n(#$}tnvbLxq7_I2H8y}XLrnmxMB%fd@!8P$ cKu4gc=S1Ukqw#sr`0PM8urY7}9RhLy0K^s+xc~qF diff --git a/asm/incbin/overlay28_rodata.bin b/asm/incbin/overlay28_rodata.bin deleted file mode 100644 index 192cf8668bb9b3d56b46480c8d8632ef3574b3c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1132 zcmZvbId4-z6ot<`2IB-PSW$|UMrMTQTt=d>MGMGgH>(Y?vj>|c!424KfdIh{OE6(` zN-9@K?%eYW(psXRO@S1NAaQ2q1)gB;=;)rA?_O!%T)nwb<$a-+3d&n7DsOE}d7sCX z*PBpYqaDkY>#=0Ho?^~dGo@HEQ%dDBrF=D!jwKW6R4$RuR~v23THQ>k_NiRgYIPg! zS~rodb+H{`YXk-W&-$O(;`)WSID;&dh>I#}%!kDhuA|~F&mnL4BRqEU^SEI6eLQgT zYq)OsTdX>H31!3Ipy}k(m@)h%UOD+Jt{VOtD^7kE=M2A#drm%yDZ`iXg87&@&UGU2 z{o|N0ypD#mzlbrzm+;)lM^P~RDV{m`Wn3|Q5l@`_A}$&J5DWitJ;Uue&S4(=gk5@` zAMi1-w{z9A4bC^%e*-rI^>OhI?*n`LF8XbP?-T4lh0}rhxVViwf&IVzaxg6AfRte> zLdkx5DniK+Jr&U!lyZn?Q7zUDQBn3rLt(jDQC??WdCgnO+hopizs@|uJWOr!e4Xl0 zS*k*fP{UM*yh7=}p>N7&L9eE**I?QAJLorjFX<1=*qWX6lfDnpular#eb4uO^m}J* zz5Wf0zVD~s@ICFH(09Pd`1R-1_oxB98hlq zm;+S};&Xtc;ksEfRKaXUpcc+d2pc322xWtG--WVSfb7~Vh#FQPdn%L-WWoUeSLY7T diff --git a/asm/incbin/overlay30_rodata.bin b/asm/incbin/overlay30_rodata.bin deleted file mode 100644 index 70ba936331f82bbc8a5f2783493c01f29787cce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmWewFK}KpS(Pajh<5@p0}OCL7>o>j3=A+)2X+Pq2Q~&9kO(7C9?A!@AbcQWYYM~+ XkhEtigbmW331u?_*;AoxAQKJ%Tm1?q diff --git a/asm/incbin/overlay31_rodata.bin b/asm/incbin/overlay31_rodata.bin deleted file mode 100644 index 7c443920af4cd2cebc0205672b571b4b64a0ef69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmY#PQDw>nV#!ohCdQ!xSU>>Xv0woVQAS2=;vg}YILIh41kqqNL=q|rRtI8(0gwW# zfvbhfK;#EC$->XU$N&Qz5C$Uy9|HpuOpt-$Aut_)cp!yu(;#e+fM7a=4U&Ta0FucF AZvX%Q diff --git a/asm/incbin/overlay32_rodata.bin b/asm/incbin/overlay32_rodata.bin deleted file mode 100644 index dca9d01d400e2708093604e8d28c8c2a94de409f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmX?^q{_sZtjaVMh#eSI7#0Ar149Uq4gu0FK)Qv2g@J=X0Ek%__<%GYkQM>bA`EcA i0bwx$s$d=?P{=X|!UhS1LfHtF3=9ArNedDH diff --git a/asm/incbin/overlay33_data.bin b/asm/incbin/overlay33_data.bin deleted file mode 100644 index d04162ff85549f21945564097e9a8375e06af0ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmc~y&d-ZhO^HJ%9Ju~{Rt3u%~EAb1>%)JycdW$vsIZ)b5)sS^MG`| zDwAM=D$`3K?k!YhGGNeQ*Z{-^3^71D21xe+=^h3+;DE3g8Tc3&nBbxeGgDQ;JVv0< M%nS${AAZActXJBC90AdCv5P<|x`Cugs42%qXC@OnXfo1>!BM{4` ULD(PxODLNe$gYI4flN360BLLqRsaA1 diff --git a/asm/incbin/overlay37_rodata.bin b/asm/incbin/overlay37_rodata.bin deleted file mode 100644 index b935b4d566db2bfa04cff1aa9b0ab3fe7334a8ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmeash-t~_h-vwmq{?KOtje?yh#45z85kPa7=QrCMgklVHX{Qcipo>j3=9ZShMma}HH<*%$P^^?P<;Sn2nJvP diff --git a/asm/incbin/overlay39_rodata.bin b/asm/incbin/overlay39_rodata.bin deleted file mode 100644 index e76c1fe5420ee7de0a7c871d2327574753ddb606..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmaEwq{^h4tje?!hy@%#aKQzS3IPX?iUk)MHV8O0Y*=u?i6MkRiP40SiAjWs0R}iA m3`Pb%1_p#ELuQI9n8yf|mQ01PK?0^wHZzc&31ve}fRF&p=@Ewj diff --git a/asm/incbin/overlay40_rodata.bin b/asm/incbin/overlay40_rodata.bin deleted file mode 100644 index bc13364aaf607b7bdaee808e322a8e11c38f5fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmZ9G>kWV)41^1c;v@cd07h~FO>~W}slZY?_CSYXXV_;xH6X$^N85#H)7?@#l zY(NGG164Bu$qn2L3<}I3CPX)g50qy?=0D(IV1@C4vUf97!D>O;WwRh`kU%Mv4YH~i m$_ARl@D$1hn!)fF$_BY0F&m^^e#CDB~l`V6p<)N#}R09lt`350#`}n_AxVW4MJJl zPcu6+yMC{4b@7Go`@Jsqr^RZ2+8vk8_ONWumu9m)G@J9qSjoC1z{4#i^VGRI$I_~3Lt1u z@JMIZ?Y0jTZ@yV91&17$Wf~TZuOW?o26>$BTJ%IOWnbv~5b3GCV$-Et!9R)+5i9hO`9{x4; HibVb^X<%3f diff --git a/asm/incbin/overlay44_rodata.bin b/asm/incbin/overlay44_rodata.bin deleted file mode 100644 index 4f5ad4c6203fb6db0cab998157d3f1f4a645ac65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcma)(Jqp4=5QSe>qX~jodVv()!qP+7iKwV|kYHnJA!wh%O9+;>9>PQTyS|s*NQx9L zEc4CV%)Fh=>Ns4dS$B|T`^$Eem@D^YoS2WbwgW)>NuDc0J$Jz~rJ6)xXhCF?Nz^p%O$OFewHT{I z^heM))nn-8G5Q(wSvBOK=0uzm{^=H(Af0%sY+}xmWrW$va;R|1k#IrzCkK}^u+{g) XUk)DTGMQv&+Ao(68Sj5s_J8vid^8@S diff --git a/asm/incbin/overlay46_rodata.bin b/asm/incbin/overlay46_rodata.bin deleted file mode 100644 index 4c130b99479965cf0f4ba262578c60ae048ef950..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmY+AIS#@w5JiUxI|4z;0ek>TZjjOqQs`2!go33(qI8)CY06Mi(B~+$l-z_r#309# zqxbCD;@8UXbZz*)F?`(`o@a*N*teZwDaTeyD^kkSrg37^By$ocPLj-~m)xd#;pCD# z$qV|eZUqe*5%KSk=)5;yYv5>ks8|mko+I$fa}zu~RxvH`%yS#O@Z14UPE`yrSg7P8 zZOz(?Xz+D_ckR?C)b-P8r9R>79r5tq-x29rgqi$3rl>i7xaP>Lx#oANNgU*duKA&B Ue(3rFI%Ckk=KA2_J@Nzp0ArCVGXMYp diff --git a/asm/incbin/overlay47_rodata.bin b/asm/incbin/overlay47_rodata.bin deleted file mode 100644 index 5f28fb6e513bcb45423974fe6808bcbb1e3b6af5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 wcmcbbtjZ*sqRO-qh#6B=nHXSz1Hxcr;A3Dwh%)TWfT&>vO8aIasfX$V096161ONa4 diff --git a/asm/incbin/overlay48_rodata.bin b/asm/incbin/overlay48_rodata.bin deleted file mode 100644 index 2ad8716c325c1d635b2bbe438ff4e3661228a763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmXxdQ4Yc&3mEIj&qh6)$Jvc6{Mau||28C;=RQ894{6Psr-~*z zdC&o72WJvdBrpkFa>+-*9r@?U^FBu-LDXet7zO(;aAqytUGv!T#7BT)oF)kwob%uE4k zHoOUF@_UHSZbI;?RYx^RD zw&a(y6WO8s@(^jJX@W$ffS4A*E*j0>f4T76#nI`bwc4>G^|_h-Gjp|>sd{62FR*I> zoS+eGLY6Q|xJH2Mgd2oggxiEa2>%i~slOy`t>#Xjj5&t<#12c?%Lwg6C*ixpERM zNEVi2Wy>GNQr)Ze7h>hf6c|Wte?P!78sY91RASpx8ZAcjB>I5Go>%_Aq^lp(Kb=_t zSo~*@%@G2mD?rvk5HPN20f`t@&>#f#-Gc!pSoBLd5Cs?FFaRmYzy`>}Fl>QQ*a5p> z5A25{@FO(gEL^5v_b&Vm|G^V@1@B=M;#k62T*klfDSp5#TVQ{(*DNKSlb%UAeup#p zrfe(sl?Am=d#61MJ=R}_1LKhOD00YAqaR{Qd~V=P@?QGEpqqbQcw0O^a&YY7_{tAc z`>xb~ZEQRB;^)&BgR69w(8ajKIj0i{k!})(tRoVj#&z-HRf9<(I;dK$mJ|daS|++0 zh_fpY)>UC5X~8<}u?k9_6p7^AYEhUNWI+XKvo3Ax>km<)J0pVH?nrgo8DzO7N(!M| yYm~HJDh}F?6RkmH;KHFJB66(@k!;=CxR8S#-6cINkxpYCXrArqeZRzqLAz3$GSSDwgYs=DDj;-a~ zSuVX7WxSB{!nGG^yu{W^?!1&fL}fxG7b4doN)uviL(E->rB7Lzl*y&cb;{DD9NUz0 zmvZU1MVW0Ox0o-kcRc`(H67_GX1K&03I;bIINXAduGvT@I0sIS^1u$aGhqL%#yuXe s#0rmCV*|kx8a(3#uXw{dKJbZ%uOWW7u7=cPxBc$o>j3=9ZShMma}HH<*%$P^^?P<;Sn2nJvP diff --git a/asm/incbin/overlay52_rodata.bin b/asm/incbin/overlay52_rodata.bin deleted file mode 100644 index c323bd538a1e34f1430199949b657c91d6e97dff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmYk0I}XAy5JbnD5Ze$UM9IH#M?p!+B`D}3Ac7!qyc9VK2ce*29Gi%hR`X`Hp7jub zk|Z5a?O0D|RAgq97nAv7wcfO6Cm(ioadNymY1y`NvVS`9Z?;rL-9>+(<~~9jO9^Fy zC=`JFh8id>l78ZS24=;L;A#GR7uhGgZ?0p1zqtqYgI8o`V_AoJO0FaOe>agcvU-Fa KUc@Ofv9B-BdKHoY diff --git a/asm/incbin/overlay53_rodata.bin b/asm/incbin/overlay53_rodata.bin deleted file mode 100644 index 4f3423f92129a2b895b300103c1f5de38a99340c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmcCZisE zLns@e3&dgrVkQO_Ai)LF%)k!BtYAI^n9mL5vw``HU_Q{K1_+-C%;yC1!Omj>JEsAS z&%lK$?*Ot7s0L^sSp5Msz5~d9BzXs*evlb(^=Nztko%D29e{3WK;j=j<2!)dkB|od D6eSgp diff --git a/asm/incbin/overlay54_rodata.bin b/asm/incbin/overlay54_rodata.bin deleted file mode 100644 index 393427f10fb16ea59ebb3526f76d8b16bd499dfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmYL>u?@o@5JeATJGK+0c17ns5ET_WL`fu<76YJ+KuJyS5hAfb#z`OGu*2el|>>7-fo3XPN$|s@LAe7vMnl&76z=6RPpgEQR@5fS! z<<;kj^S><o>j3=9ZShLgz4P$;1a`4Ca5FoSPEX;k?3Q^C2Jq%QJ7xZY ztd0BlQ>elGJY{JJBN&6R_K@;afw?($g*{>Aitl~st(mkOu+r2u{VL)kbaw(kX^Z(YIA8q+cHnF^d#J&@@dK7%-nzj4|1<1iZS3v7G2?|~5_=n=YVvYQCP2b4-MhTs7^bc?Js=xj0 Hso&^6Ilf&H diff --git a/asm/incbin/overlay58_data.bin b/asm/incbin/overlay58_data.bin deleted file mode 100644 index cd65afd503677648a5c5518ce8fcd51974438fb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZQzU|?Vb;#65#CLqPI7fPRm(qCmD;(vjBkUC#E2)$7rLSKc_xe5^eN+^92N`HmY lhKdmRMksBo1mPD#>6uXaCX~JlrT;={MP;adD18!20|2$o6kGrR diff --git a/asm/incbin/overlay58_rodata.bin b/asm/incbin/overlay58_rodata.bin deleted file mode 100644 index 25bfbae8f026a6a2595ce26a47ae03eacb23c259..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 928 zcmZ9IF-yZx6oqeMYbz3Mu%al|8Wh1n3vm(zhk%YQneCKK=oUv8A)8Kbb5?M6eCX)k z@L#yqb6%P@HwV6x*K^;4b32;+{7prqS9IOi!?~_Le{@TZ>jP$xCxcdbs`+B(vZUy&5PD);a}p5W{93J>KIz9GNxP3hy_o*cr5 zat=SJstPWaERymR;X|5=5s;=51f;1H0ck2jK$^-CkfsU*q%L&tg`UIhQO(eM82Jvh z1A33*C5PGpy|0p%L+yaxw`tp0JE10o&Q4|Vh{|7H&VgLXD diff --git a/asm/incbin/overlay59_data.bin b/asm/incbin/overlay59_data.bin deleted file mode 100644 index 7005e932ef3d6e929c14f22cec519d5fffc78260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmew#M$-oc6o-+|!gAI+A)Qtgw;Qwq~1(RZhucA}1(Y^|)1udbmF64!WW( z-O`30X$j52q2gVXpcWG+9M0f%!YDxS+Kh0v{ydpA&;<`~`dk`Mm%}$w!#^T&vY?8N zaOYLAwC6BqS%`r8KbI@j{ev3z7=eI z7@k1y&=>R#=}W_duHol1v-{#bc;Wd5eCpY3na9|Dg&tPS3*2j;y*|etIL?m1eQ=!p ILG}s!3sHhG!~g&Q diff --git a/asm/incbin/overlay5_data.bin b/asm/incbin/overlay5_data.bin deleted file mode 100644 index af01da248b6a71d7825f74f7b446b5577c989130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYdEEJ@T)%Snk(%*)J8RZY=L%FJT`g8%>j{rmqP8;uY{RfiCV===Yl1*8BCu$IX( z{r}I(AcH0j;%2UqWdfOU2a8-JP#-G}xu5fK%kcu`m~rU)SSicIh(j*4PL_!i=niad z`PmQh0~^B{Ebg4!F3ZHmz>HO&>mpeuCI&{Va-6-gOe{Fuk~&3}i5)2Cg2ldtD?o1H z!0MLD)wtbxa2;+r%e5dmb_N|bObdNCfaF*hG%%$YJePyy{{KIKMeb?~ZaK>~kQ@_M zGha>z#S!*+ux$c`C-(H>*$Fa}lVJxIx43Qu$#F4YbLYy$AiomxxEM7busOnVOT50?NQirJ2AioSUDLnuE-a&rK{T&M43WssROq5Q8v-2!kkt P7=t*21cM}l6i^HRHzdOA diff --git a/asm/incbin/overlay5_rodata.bin b/asm/incbin/overlay5_rodata.bin deleted file mode 100644 index 3d04a6ff072e64160f809c8a249282745467ae17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37892 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 diff --git a/asm/incbin/overlay61_data.bin b/asm/incbin/overlay61_data.bin deleted file mode 100644 index 67a7dfb8d91cd28cd748784537f4da7d2253550a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmYd1sl=psN{MMD5bK^+VzLF|k3j5rMu{mEh}S~#OCTM2R*6aU98et)GXOzBc6v&2 zK~a8+US4KiNorn7zFu;^URD7}PFI(KVX}m=1~)r%6O(gS+ieRI$!k9&H?7U8-Sh5& zmHjCn)r>DIqrWR9MCJdIu6!xJkzvlNxVisdE#UPo{g&7oyZg@X6uqj|A78le?C4*? z)wlPd^&gx0Qej6QeRaQiz31%o57pg={aslmG|FY4yj*PMMZV3R pOET{%EKa{K;AEMjdtCX+-M9PFHtRFy<(`nAvDB?B#+DBh4gfj9oMQk0 diff --git a/asm/incbin/overlay61_rodata.bin b/asm/incbin/overlay61_rodata.bin deleted file mode 100644 index f5b27e9545b0101f99efd493e6abdbffddb3bae3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 356 zcmZQzfPkJSN=!9C?7LBk$r6Y&fp{VigJs2e*;#lQ7#N{yVHAwd0u>NIlK^Q>fQf-< z4hV;lK^|EY!iLMqF=1GQkb_x;&<~fBW@3Q2mVp&0%M8RIE=U8&ooqnN3B({Vb|406 u1Brpufq;S^1A`(Ea|8j^0r7`W28NG7d?S*9;U*B@0^-|1{2vHNH6H*C))txo diff --git a/asm/incbin/overlay62_data.bin b/asm/incbin/overlay62_data.bin deleted file mode 100644 index 655ffddc55a9ce4e8d67a107264d602f0c8ccdd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcma*jIZ8uu5C`D@1Hlz7#9b>J6*ca=iN*zlhZYus`&QVxx33bf5YONh#9DYchlO~C z_yq!5C^+!JFf;IjNy0#Q2|M9AJcMoX`oLp&4Id#BT|{rud-NG?n8s|fMXB^ZyKeW` z=YT_wIOc>?&N!!va#d49Ep^n>KqE~w(?Tn4w9`o!-Sp5)AN>q+$rab!FvKmxWEf$T zF~*r-k}0N{VU{`OSzwVYIhI%^&kC!oamPLD{PnZn{#{Jt+*6?=S4`8azD!I~5zOOC NbmFe?b0_J$z5s}OQsw{v diff --git a/asm/incbin/overlay62_rodata.bin b/asm/incbin/overlay62_rodata.bin deleted file mode 100644 index 5cd0b7f34712347872d81955da53b514b29dea8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4212 zcmc(hag5wW702h^-nG}(>)k=CduYp+`5oOBD%-0~wt>=v2yRV*4bZrvlBSqn6PZdFYGA)=;cPereV;+|5wO+eeEP0mZIr?KWRV%ivD&=4t5>*u?>bKMYY zAd>j*KKtIhncvKtnK$$MwYc-rf?2E;vHG3sa)}!9B|utqH9$4m*Xvs;e^E{(0rXN6 z`6YU;CXEWCFi`i@f7|P-#kIChKOE|(>)P5}EI1o_x^Bh{r%sz?x^Cvo3-=j6A8dGb z`njH#3y*h+U3k2APWO54tnptjD!k6ctOc~q?wr@tGp}=Y+pTWDyVoss-*OYw-vRf- zT-IqB`Z!6erE`B< z&GYQj)A*J%k2OquBlg{phkM}TFbwy>7PuD}(iLDUd8)yf?W zJ-=2T=J-Z+=(p3g*ZS!~chvfw!w4F$qcLu0Lw7g)7uVuAM{JT-S06ve%m(2Bcnm5q z4so}~r62OTQZXPn@LWb*M$CSN%fPo}HMbh?_(q^p@+x|++UtNB8@ zsy-y@XBH?1t+UR30<=fsnTI0l9r88?v$lI%TlBUMp5MXz8vYk{dh5Q=+avdT+q8>y zdeB?j!>r#|Y4bI29VKrIzV59x7PrJerlMHeV_i0D_FU8Xyc)VvxpG)fiZwaLuX0Lx zsXTKXodgW%7Mm68Z0U%#%wK4VQ)?kf^v5%a{>oHXi&$)qT?DaqG{id45KqSQ@nmVd zKO4{YXG`PxLOh=@l*ScXy{Gz`XkC<_8lRClTlKxtnUM^A$J@wvy`A3AJfCC@zDLgN z^|tc+-mWW?6X?|=tOIqS?Og|G_Y^rbM%zQ=2dw_3w?}{FZPj7=d4~4z63?wY>aB}$ zv@bfF@pNiDJD94)skk(6<+}1mWu4tn4*8)oD_dx2b$=(yp`#11gZyWwd&cNy4b4LDv4L6+hi$v8MUXG-FJ|qG$fx$2 zZ>Uq>|EoXGtzE3$=ovSPJ_1vacLVr!%Maimz(0V00Dl3$ZvF!P0{#O20{#+yy$wqE zOZZFpOZdz9%lOOq%lOOq%kI$^z4iQ^{Q3ub@K5fhGu&OTdVBUYZ_ED09>DH%|iOKtxVWMSWxH`@PjJ`>o=E7hlHSNuj~$`!Sl2{F*wY`$aV%hI;|&B*kA zeWPvPO#aesEvEl=&sT{dw3DH@TH&qC^{@uI$HF|dhRtQ|aVU>qzXCyifbnW5pnnLj zHI;vaeYUCmIJVwtK{OxDOXpnUtE@F?E^GWy*4%~S32UMIHN>YnwGHL}*I9n6*XhTN zd7*0Z6MmKBK}Iq3?HFVqhVnYdehj^{gFJzuH45@1hQ2L>9Kg_bW{{^abQXgA6hrTw zAQcRK4+a^-sC^$a96v+ryCKNWG4x#;PH?k(Oef^Q0fZ^*R`{4E5jqi=@*EdFX8d~1Rvv6WvWJ9+^_6R%+ zC*dXN$VS!!k7I{Edly7@U}0p(p*KPQFmxGxMa0k>+2$qaD#u8M5g z^2l!Li|p_UVuTl=`#q7(Um4l*bYyGcC_D#epnFwh3&hot?V`MO6LG^C7=tu(*FNgZ z%GNz5Nw_TjdHmLOv7tvBda9uluGnZ-*TqJ8w4tXOdL3`7Yv{e&(BT_kWIOYN`NOQk Hj>!HEpCc*h diff --git a/asm/incbin/overlay63_rodata.bin b/asm/incbin/overlay63_rodata.bin deleted file mode 100644 index fa7265b623e3b228602b5aa9cfc67372b7a951f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 zcmZ9LS8z>H7=_o_H#fQIH;CSH2olnCq9h1Hf~!Ogg6Ki?7QOc%dduh!VZ0cIK|~iu z9t>eTcre-vkC~B)?~2SAd+vA6x&Pkl-|MV7Te2*x%4K}qZsQ}#IDDMGelGujz@Xre zPJo|zlxWFF* zAP|DUI~+1{at%b;jHmV}I-uxxz$@?C~L90wmPbg zIw_ovb(yWlY<(rFfqJMRof@HTOtlHKO%=s%t<+qt6+s7E{pgyamh2X(7-l*%(^YNg z7{%_xD+JYNSduN^6v%wHmE;8l&|Zs|^~bjT)~_nxM_f)KyK?E=@u;8C8}pYKmU6 zTbicnjBJIVby@XVk zlIk)Y#_<_k7UJ>-E|1{;DDIEp@Hh@n;P504PvP)14lm&_7Kd@9l0hohN#zx(oF$Dn z+Nrm=E+^@CB>kSGKa=zqlK!gw`lbW=j+0+1P^Av3iebrN^h0ibDk`y!^MP%0!T%xO zIaEOQBimF$!DGJdC!7T+hm@zbNd*t&Lm9mO``=sp@E@O^*(U6{ZPK9_%Af+ArPZ}? i?*AgbG)|{w{W%02Pp7ZT&t<&FrFyulZ{D+1Gkyb<2fASZ diff --git a/asm/incbin/overlay64_data.bin b/asm/incbin/overlay64_data.bin deleted file mode 100644 index 80d6a79d320e69b62a993e4997bab6304679517b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmb>ZtHi_r1Q((7OkQO$|0$FP$uTepFfe@J2huzYdP>SnYZR54wg9mcki7v&?*QTz zK%6S5%rsR_nMqR=$QDy(Vw6&5dMK^T6e$Za6KqrhkW^p;GeO3}F_6gt#EcLb1UUg{ LFDdE~I>9UepTJV3R8*RhDR-p zFj{pKp6EK}s#9d`Ii-IumV4O;1esGU-^U@Zz#42OcJLn5WnRG@_+Ou~QHP~e%UF1c z?^bb`I*$MgeGD6Fu0ghCC0(TmBAO34h)R0bcF;+7#J8B z92h#>p#uX0g9C|+1ET|jg9C$!6^-Hx^?PIa2fR0*Jil{(=bYT!6Gu^W)^4{)$jcZ- z2?4{X-nO>yTje`e3yW2&ao2ix&w4B3PdfRO%-{z4J9GaN1D}Ixt)K>mzXYuydlGbnMF>o^iRz|Hn>=ySQR)U9)N<%#T`Qi1Dq=eFf_Xv$oz~mNRQe zaDe1&t#iZs10Kz2uXbdGmhE%)Z&&9?5`2CQG@- zY$FLNR+g8RmWfDqvugfJGUAu zvHe{&>(bl)Tg~sPS(l#k>)mYq{5ejt-HZC=ec7$6etq>St`b*W`|5d}Ix5jVbZpd| zZ+$4AWNg?vJz46uCad&FHu6yRI=k@ASTwe?Sd%h~39h-C1 zYB##ONqdgD*RAh8_O)00Q{sESeeL-ib++w${>=zz!#R>UecuPZ_MD5)bGz=Ny*D*h zV(0UHfB4$l`F4AMzV91fd)}Wu-QBNG&Rb7g?>j6Ri}#nKpc(&fWCPJpP4_~X2j{?T zV1E+pZ)SY)4kRO?AOBd~`2PreUDzMX#t;7w#38xe?E8F{`YImE{tun6{0*YQ&(erV z^9_35=giYk&V$xxp&SHX!6ImTjxo3kN?;D$ei6zaApbIyJ>W8U4@%${XnGaOt6&cF zybk3McneBk0rbBKTGH7b@0 diff --git a/asm/incbin/overlay66_rodata.bin b/asm/incbin/overlay66_rodata.bin deleted file mode 100644 index c79f3bf7e80bc8a2ffae1f55ef13f8a2a863a0e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1008 zcmbV~J4_T&6o&sfyR$ErhsFm!R$<54sErHwOjIPImSC*V7(vBgA`v4d6d2cp!a@ib zEi5f8?6laz0uzdj#7Cl~F_t!3Q&^yWcbQ2@r1B)+{^!iObI;EGuc=?2ObN}@HK`qP zG2%&|OnRA=T2oRbEe&R+#hg^mOSR>q_53c{0xbP0+JFMv=mqw~R`^VwU>_eEU?+4! z7aWJvkYZvQ8ledS2w^XD!z({9#%nmWqP0l(q*v;*=myu1>idyaBb|O9+USSS7Cwe{ zl6BtO(EN9yEmPlGqwYzT><%pWXw-koJ1-VP>!o)6Y51Ng+3l#`POre6c>fyfmw7g} zs_*Jk)X%?!Hup8OU*AG=-(Ss^Y$;!|(e))8r_Rc=MAA>CGr5L*V^ed>I?gVa)h4xS zi?*_2o3?AS+?lwu#U5SU71$`;g*kW@QAJq0k=KK#}JW9Rcg12ANDU>2VF_ zy*Hj(*f>V#D?_?aNifZ4a)WYsS-{IOUUuN+QM~NMOCK*&c$vq`M!amt%K$HTR3Q#;0LS+UIsgCw diff --git a/asm/incbin/overlay68_rodata.bin b/asm/incbin/overlay68_rodata.bin deleted file mode 100644 index 7cb0e75b23107346500e87dbda17897fadf62beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmZWl+YQ1n40P;-1O-&VUq7I1!Efi{s}t}n10beg3Z`HWE=e&eSUTU?=Ok84J)cw7#DX{cd+?BlAproRtRZ)FL4jzYag F+izra4r%}Z diff --git a/asm/incbin/overlay69_rodata.bin b/asm/incbin/overlay69_rodata.bin deleted file mode 100644 index c80492c37b0362ce785c59e1559571b80a8632fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1036 zcmZvYJ5Iwu5Qb-MCvhG?pyR0=Ar&ngfg_}#p{JvXkZ7VvxT1DVO&w7oDhfn}I0Q%F z`)!ZC2xc|A^FMa>adJXf6wAE|1m+~7Rf_XaJrg*u^NK}WpB#`G*&`L=OEM+*W$2^i zxJE;>$+*rbd>sGaS);4B;=G!fbO53L?Y01$SQ1i3#^{A!(q{~kL7Fp$=`b5H#@Sd` z3bs|{C>Y@G;xmgKjIv((H8jqejAWD$KUwHIsQN^ dqy8Ug;=G^wi*tN~_89elK@;cw?(mCq`~zS=YDWM7 diff --git a/asm/incbin/overlay6_data.bin b/asm/incbin/overlay6_data.bin deleted file mode 100644 index 8626b00e78283b4068a392093bad5a19b04198fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZQzVPN24fB?%^%1pjMoCw5V5hg|!7FIA|XJ_W%;^JUs<>ch%=3)Z^W@ZM49smC` l8~~~W(H=k=#)gRlh2Y{KHcT9(7N#CV!^9~y2V@5t0027tE6D%= diff --git a/asm/incbin/overlay6_rodata.bin b/asm/incbin/overlay6_rodata.bin deleted file mode 100644 index 31f3a2b1947826d96a580be99a0e25eaeaea7f44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2628 zcma);Uu;xG6o==Y-LhNSZA)S4A1D;|f)qrlin36!6);poB2loYMKF?73`r4)m>6A@ zDvdFKiq;1beBi+c5*y6-pYN|1&MPdDZckkj-BRK7M&&)Yz zX3jk`cV<)BMZztZb94Xan+yK643coAvu^G`f6l{A`SDBeSImkn0g7)D)KBB#*@Rf>#Io{= z%Bt$gQ<76_YU`$;{_cPutY0>iUx#ualxISDDwJO!m4|QDrdTu@k5@H1&8;=oyh8Je zBouO`eIb+{q4|RaX+?_05E%)61B>uDbigLq0?)v+@G`stdto2!hqvGW9E9`mF1!yP zz&CJ;VZVaJdf(d8zI};2x4{pVRe4iUe7FYt;POG=_P>+QkM?suqZ5Lf%Ty!7x?UuB z8JP$?6Y5nT3F}INP$?up^^AN%L$SW7K1duRaQP6iHqu9^sBcD@rxf|$;G-A{aTdkg z*5OgeAFCzir8ba0^sUpTqk zx3epJYq+0STZz#@_8PImW@s%!ZRw9f_F698>f1Uv31g6M^X+rE2u%<8)&s|&bfs^- za0L26{f3dZ>eso-w;j+6AHz8qgSyq^7KUN*gEx-tMo7qrcAe*Xcm^fQK3Jr^P^8oP z4d9pYTqdx{v(mXo#`$H~#+T3)`(OD4qPI+qe0Op^*HQ~k8*4Krpo&YGR_=ghrr zUeo*qw=cZo&PC04-F?sEd+%G4Ub?Jh`3l#(&9}9XhAprgdf^E4!)dqxL$DYuX%$xE z&5XvZ+G?%DDs6^EtU8kP5?+N>dR4T_Tt##mr)9)Nt;CC1xg}kVc~jiB%RU&|uOOA> z`C-3bLVb1E{+{-W*t=mTjKcbzye}kn`L+={cd&0^^$X+#v}O^|pTRZy4B?m9{cm6S zwBRK_N%fUff62T(KTZp+ygfg@+J!mB&sk_|?pyi%pE>@CQQ1>$(J;o6V0_J^UES^G z1*c#iQg>7qsWloz>h0og3H>D31nU-e9l?DTcU{5B8Ru7s&i`)wbU*YVb;o6q705v( zUnKT5!7<#2)ZLdw>XsNpP7drH!8Osx__`Of$f<$7!_@@#E~h)ck9q3?dzY&Z>|IV* zcsFrqyY(R(0{b2}Be3%;iH&xKrTB0kd#Z;s7A}JHI%+<89X+;5uo?>bw*Sy~zQ!2| nXTifq{#Cs6*qeM``}wXQ*~>iGUSd3vpuP^d6`H8;MT)-xpj~ol diff --git a/asm/incbin/overlay70_rodata.bin b/asm/incbin/overlay70_rodata.bin deleted file mode 100644 index fc34226df4a03f1ae10a1ea3a5242a7a425b192d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4836 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
  • C^qOR9XIb8e`(k&Ol&D0_)@l3dtWDmC^iEr+ zZK(?aGziw*JpFB=^I{9Vv_V}K%1%wo30_e{NToSa7;?Rm+I@Q?40u31C~BY9JQcB{ zrhEkN2RhKj-ftAhHuISX1D1+)Vx!n5f@1NJi9bJPkS%CSFiNS}p%!XDmPRl$FC)c+ zeH6)jdo+K{9{W02PPm0uK)l5 diff --git a/asm/incbin/overlay71_rodata.bin b/asm/incbin/overlay71_rodata.bin deleted file mode 100644 index df7a911d490f0f015b29b4a8f6d50aec360c19ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcma))J5Iwu5I|?wh7dq92>}wxp-JPG|DS}8&fx}bsVGB9=d?fpEfP{F=qPBHJCHNv z2$b+9*eF3nVx_0&@$8KEV`Ib`BVs&12t?#&TI3e)UoY=IiJ#sZ_8Hs=kNt+FL=+#! z#>{tQ%&MlxN1l_=6K^~vdCt@)*O|JAolqyC;_3%Z6;~Elce2VlDdJO!POrOH?RFh(GQK#B0Pdk*nvIRhhx}=Ls*9s*n(X+fDLGZ z4sEY3^|*9DQ^55|0rbdv3%u{08f+;ZvX%Q diff --git a/asm/incbin/overlay73_rodata.bin b/asm/incbin/overlay73_rodata.bin deleted file mode 100644 index 267faaf60a9c42d476aebb12bc9c3bfd118e772a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 804 zcma))=TgEz6oogtNeB=y2x1gaiUmPXu=n13!QTDtL-?pZ37+F%hOv!j=9{z0-Me@9 z?h2_)-KZ%cRXAY0NudkZHA4 z>K4_JWWH|Md2jh{()szDdL8*uG17y`qf004Z~{DGhy3b!n; zIFZ(9tS#QYy5@FtCX%VH?)8myCY$T&?d#v%$`2HZgQfD&_ResnIx;#oKC!zuIW;{q zJ2$_ue{gtod~$Jlb^Y*oT01+xxxKr8dd9iZu7)SZdOykQuhhRy@?v-vUl;IVn(=E) MQ`TpUef^K#0V(+=*#H0l diff --git a/asm/incbin/overlay74_rodata.bin b/asm/incbin/overlay74_rodata.bin deleted file mode 100644 index b099546d678d9fa355066e42a8535bbfdc6269b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmZQ(V_{|I&|=^cjNnSP<-bf}!xD0{;5@P~lW*}yP(jYzz zgTzIE7zAMYLFz!j0Zal3m;{Uuqd6c9Mh1CIHE=mOh-EN6AQ~V82pg^s IXde^+02!78#Q*>R diff --git a/asm/incbin/overlay75_rodata.bin b/asm/incbin/overlay75_rodata.bin deleted file mode 100644 index b847398f12b5d94273bea5ed201aa856ec07ca51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmZRO IP981_0L2{yKmY&$ diff --git a/asm/incbin/overlay76_rodata.bin b/asm/incbin/overlay76_rodata.bin deleted file mode 100644 index c49b911816c23650e738ba45ef3ac0d587c42398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmah_u}Z{16rAiGN05sKFJM50z&6*Nb}3gZt}sIEuDjUf2kb1i^at#0g@B!P3Y+@_ zwY615@CQU^H^~~#!WU-ey`A0Jmsh}q2Ph!4A5d^7AykWyY+yp$wb9q>33hNoOfVzQ z$aC_Xyd*Di#S6xVui0Fa2gE1Q`I}r5f{5r9(I=uu#QPcRjCIC3W4((@91{udP!bQs z_dj2N4H$$NW3Pqjrwfx`JWFx?BE{{i6lZTztcd-0DY|pIJ>2zde~5b{q9DS=kHbXe z)6|crsmfLE$7WrWe!M7EUTXiK)M-)G+ox51epA)=AH3Ft-w@yGp6e7hbPr-+2lT7B z0eTn>?NIxg^9=gCP42W!+OEk?8~^RbX1jS5FXF%-j5E@Noi8BC`FnSpu9k&Q(97_OhJ)I1jrvbkf;d)q)0S0^gIFL z5poZZHZ@Y-AXSh!ZN6ELXMN|*h0N;ncs#!z+xz*FD$01_F|+f6j9W}J09QmBis#hz zE{-yymY>@=PbYCfEth8wsiw&M@~Kpnjrp}_y?m`OYPn99I9kk3qN?}MCfl6mvAP=M zPylvLCuUerB+(G~^swNyM+Hv?1(zULBN5T!bE5Ut@*~j`5kY^;R~V0gk%$%L%KyPn zXrf%#rLKTVFGCd`+}p$(mU%3T^<6U2mqGlEf2|N-h^Npv6zE0ka}t*7KI6n^lbRnh zg~s}bHZnb!&LtZ2bM9V#8a1OVyZzpx%6WBKWz!RO-F6aFP4L7x(dpfCu3>+wLrc=0 z*&Z5Vnl5W4`ApZX_pW(VWp62#!?DPH7h3hqE|9cp2+Z1TW33|Xr7%eseitF0H%iC+ zx-6Hk%JOZh@+)!en7_p8ZiDS>ti1vDfPLTqI0Pi_F>n{5&h+fm3HRv#`aF|lUQC`7 zlc_$t-qV7A06Wk8|78O?1RX%0M-Px5%j1zhLm!|MVCe0-IFO|Vh{*`}4*XR98$6B` z=jek%Zar#P`y3AR6^p09Hy|Gs`~f%z*509hAb(%*3)r6lf0S=3m%2kPxi_H(Osgj< GckTw9w?O;= diff --git a/asm/incbin/overlay78_rodata.bin b/asm/incbin/overlay78_rodata.bin deleted file mode 100644 index 556e66a0b022f70dd3f69126961c903f5aa169b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmY#j00IX_AOxQDVqqzWSZH^J2o{Qhh2>$TV5wFXi705N zVv|lgJAXm2_8W92x4W01;=tU@?0YkFGrI!A(!eF=aDyhEP$QinKfx@X5#ttDSjRQm z`5XCac^VkCQ{%cV%}kiL*kFT|bI-Ol^j{qgI?W9x8rw;pdD#hou|C3HKbZPBzh zfR3e94Qxg%4yySA}na(uy+t5XwWv2?bQ%^&NK+suK8) zw*gfu`%Z2jDo55ofl_on(j{K#J3-HM2mI6(H1!X$*p#vZ7?Q;z1;-p}Yq2W+#%g92 zS+dQW$`(fGHX417S(UL_V(P76j2r=}fxmgD#E}2;0&Eh`>5ss*eyhi4DKEvjx9Lx= z6&WZm@Q9=DkAb^dG(e>#`Y6uW4B$M9eXXqv80C_-hgjjM$kzP@1F+>NE*;w Hgv+c)!nVw{kW9fuQe5_+Hjz0ePRDMfq; zCFo`Y-I9B95#zx$HiR$3k#yY2T_ku3E_X^EV64j888!3-Ou|9i3>%z=GjI;hrp)5! zpbp)v(Ji?rH_vz>jh)9Y!i994xhf*#Fzb-*FCVutg`S2}aF}+L%`&c`m*Dy#ynvd9 ze*d3AcW2+b*49%BZ_WJCuqOz=xa@o#&+3fjh0a=QOY6+@sn&h-Q>}f2RO|lHxsv%; z@ah?QRyEN(sb{DzdPiy1NB3M>b<$mzz5%-P(lUq!L7N}1tejBQw_#IH+ zQv5Ece@U-E4K!yJ)YGKbU?SC?8ye4t{myr;*9&LNA5nb*XH6z#*4)|2Wc(-gmf$hG zge)GV`pNg$`}8A=s~Q$nZFe=V=#@*MGcVWLGti#puo#5*&36MOFWfNSD~|`otz_x# zqyr~1`A}^;*|u#GZe?4lHCwTd$-l|JvDRo;=}QeWv)wwaH^+YSP=`fmz%0~UWD_t6 zF-*ZUL@)^7tZDAYkhve_UmRq)U X*nk)Ak-dR;@D$8>evr%e=m7r$Ol3tO diff --git a/asm/incbin/overlay80_data.bin b/asm/incbin/overlay80_data.bin deleted file mode 100644 index bb24ae3090e570fad73a93c0ca13ed0b1a5498dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmYdEEJ@Ta$xSSXPs+(p&elswEMWj*h*(~HL1Kcw$~ITms3Q XNc1VWlrA$|UgG*A!|Ix4{ z79Tkud+(e}#n(efgWg3FeDMjsNUBcA@484r+^%`sB2A~K;>5|gP{dypHx%SXHE?ks ztH_ufvZ5kQ)0SyF*Q!)aYo;Tnqo#G!hUt0JZrvv9r~A((@A2$$sXgc&4DxzQYP`To zmlEqpKX}mZUD>>zxivV3eZb1E6C1y>`Gjfjy!dxCGz?mQP=D`w%oaI2@E)(QCz*eP z&luW(`s#JyD-%6Dt^ER4;Rjx^_e17SU=J^UKFe7|5AYIHuP>mvTI(F>r>I~12e=CQ zdqj8|+kk5@1Oe|Rs(H6TpVQ;bqEF#IR6y%JLf7FrRLy&hZowO_3R3e{y&lvs!8YN6* diff --git a/asm/incbin/overlay81_rodata.bin b/asm/incbin/overlay81_rodata.bin deleted file mode 100644 index 77328eeeb81f17378b7c834d668db11ec792ce45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcma)&SrP&v3`9E_R9qRyZFIIXc>lvG6a+D9mHA21k4{n$euRxWVYFcNCbP*X0%SG- zq-bV6P(_v!WKb;@?Io_vY`(C|)q1ntxq9Cmj;Hgbz23Th7$i`kux~uf p47!B&i!K@Tx=XY&%f+Qu)_Pyb{;9#-vh$y2OxL)(KR5Q2`X^lEng9R* diff --git a/asm/incbin/overlay82_rodata.bin b/asm/incbin/overlay82_rodata.bin deleted file mode 100644 index ca39a4e18ff7bba0f880896bc8e4a20453c03b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmZSi&%m&7t1?sWc4a2Uoytrh3=9k#f&AEQ%1nYlv0xzIQACBwS5$>*ArOZG`2b;M B3o-xz diff --git a/asm/incbin/overlay83_data.bin b/asm/incbin/overlay83_data.bin deleted file mode 100644 index bb952d80128258b22e45c9b89d6f34d8897aa97b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 xcmd;J;ARkDU}0cl&;Vja1{nr^24*l@2*_pyvd=Iw0cE6tY>=916;TYx003RP17-jK diff --git a/asm/incbin/overlay83_rodata.bin b/asm/incbin/overlay83_rodata.bin deleted file mode 100644 index 4de7b61918405ff615205fcb0c587b9adee6410a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 924 zcmaJg8Bau7g!1;8YC!?NJqmBpw9)k0T)OCQb0gLK>S2O z3p8|TDRKa+@OC{;?4U5pWZt~_?9OTZOM!VJyZV z23j%qiN)Z6oiYcKaTCHgbYMU%W-y4LF^RvlbYjIcZ@f-y^q<&Br>E}^rH8e46)_etfLfGLPm zdZaQb)#aLP_{dFiWjaDFb7rrFZobk)%Dy@;+IjqeO^Q#2KuRG54o%i6)M%vx`%Jj5 sx2I!1cAuVD#-E;=dzuFt*Y)Z7HzQh|Y3audnG2g*OYa?`2dwY(&W-|(B> zlLh}yI5pSS)d{~^uhkp=>1vZ3v-#5M`+cj`z-oS4qP$YY$?2nB#s}w%)OM8OG`U zV4xfgdRCCIR}!cDg8>OSXP+L4Owe!HTPND=y9CN00IR1_ScF5dZ)H diff --git a/asm/incbin/overlay85_rodata.bin b/asm/incbin/overlay85_rodata.bin deleted file mode 100644 index af1659ea9786a4eb36d64eb08861645942bea924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcma)2%T5C^3>@3tbZK`Rija^>3pd1>58!dCM9J9FT?XW0N z4viF#6MM#!0No-`mn!Bt%2Xg60g^RY`cs?zA?3B>9yswj-CjCk_Zxo?)G>sLc_l z#(6LUQ{C&G%RW$tmjc-LXWf=hdjDFyso5Iut@S@@HAUkA7i6r%!dUCpKBIBvCR1*l qm7!N;o1Z)Mm6g<{mfzXmDghKHz5;Dc1@(#w58UOwEZn5)jx%ck<$Ge_5 zY6iKWUe<>v!7-2H2%l8`AZ;Ga-&@8@elw_1kWuD5Gz6plDtA2Fup6^Y66_)IIEFZZ zFRysdm48g3TtR08$2Zkz=1G|8y5ZWcsVohwS0L?efAeZ3;a@k~Ull4VK+;)6hJDlE&?3d9UZ002Pf0_6Yz diff --git a/asm/incbin/overlay87_rodata.bin b/asm/incbin/overlay87_rodata.bin deleted file mode 100644 index ac684dd7a5db8235c168d96e96e8c3260b508de3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZQzfB-Ha1;UI_K8QkQ!-N?bo#Q ZKx_fT8c_NKlCU}7kKI{6Zr)cf-y%|gp)GYWa-8IZ)&wvEbFcutX)RXBI=LG7K6ml=pgy+_e}?FD zr~mY^=Wpx#&XNs0%=fwTB+(Py-Mhi{j%HmVFK^+;toK=K$rR|e75EtF=d6$5uYpF& z25d7!au2qdA$bMc%sY4k_L+CE*6%a#V6EQ|_!FJNWWpOu>g!4;Evgz{MvcT$y(b83 z+RUFqGpe~xv}l3RWj>JLwoOGgU|rX^)sE5{BF0%(pD>YjL^)m$9JT8GI6qd`B8`#O zb>_M?ia|RX9be4J*y{at`lsXCyUL^;V{2$^LqDZ8oosHh6e~nL>t2eGVp-L;-|<0} z;@rozUUwVW=u4ko$u380mO9x4)_rF1jBlfs6_^rRfhn;SNYcs@B%VaWM_RCQwICMh d4RT4$)itXHy9Bx8&vW&_>X03SJP~vCCO<=t8M6QY diff --git a/asm/incbin/overlay8_data.bin b/asm/incbin/overlay8_data.bin deleted file mode 100644 index 54768f4be4d4a9cd354764db9b8ec3b5c9d4c9c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQ$U|@J~OoizK5WfK88$iqr6bpEu!ejx&EeI1~Rhq!;f zU+YgGUx)nm##;Xg_%E!#u_CP4TbY`xRE<@RrPNDUEA>N}SYv)GsM@ROYm!uJoqhrSA20FG?{<%Dksj$UgL(5_$ny zLLX5=zk+;xSQjWnveWFrn^tFy4m*#1ZS6xyp5p|I{+u-B42v8Wuy{l0$CxSBG1da> z92UFDI#bk>QKBB!SwJ6BLLaBSL>Ijz#?jIOev~8lK^D-5l+al}IhmjNC`VSh8dx7O zF4p4eVjZlH^|E&Qk!yv;zNV?UYem|Re}Z16eP#PULQB*bx_BKlWq5)-eZN!i1LbnQa}pVoq%F>M$FkG;yihVx=n7{C!F25?C8M;Jnd zVH{Cn7&Qi_D-3OdVO1C!$YsBCHFGz3lYL&}%RL?^%R9Os4 zxrU;TRXO(csVb+wexk|~Uq4o}3kSU3LDI-dD@Ru5iS7q*grx{4R8IO3m$=*eoaSS=#KC4QAHSLX~a`BpCL{U4>75Ko0s`2_}w4}|-`%_>INH>vTMC?B!ub|W@X>tL9mJ38^OcvzO7&hC9b zOJGcv)(MX^%o7l7OV=a~3T>4JZ-XtTEkx`awHcd58m^`X?g%aA-E^nnW71YJWVW_I zIkZp)fzJqGu#vk7#B1vvM9gMw#`*Dmv$wVgC z2E1W2pL@7XTTdq$6=($ zFGX#jtjgt=GD4iypADDuvjtnSy9$xw4!Enx_R*;wxexCI+@)a`KkNeS!R7pB=3ZiH zt~CBYJYZm;iL?C+P^M{dFX`j3^`{~I4G%3{GbV4_`UD|?B0d{2ezIM-ggB;+c*dL+ zHR?N2@5| zk1K;=c_hELa9<3^_>MSEvq4c-_=-=bSuq+P9nUW;pSpCJ;n`p~uIkxhxq9YVaKuSo zR?~Cy^Q))Vz(Lsu`{ZPC{=&uQIv<7I)4GXJ+W+OaGh5cn$EwytjGHg`;PO8@ CPJ#&FVH!}xQ*#oN NOZ1X+z&0>|0RZQjEXM!< diff --git a/asm/incbin/overlay90_rodata.bin b/asm/incbin/overlay90_rodata.bin deleted file mode 100644 index b9c99a286cfc5d812f93b7001cf03ff15649381a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmZ`#%MHRX41F(Ypyfo7DxpfH41rLO92kNlBOoT|fkVe&6b4`!Ho$R{h_9t5+t1H- z9OB*R(|p8SoCh*4ow>o-XmK2=P}4m= zj)lO--C&VBb_7fDM`Bh~j)VBJn()E+rr4%8=(sjfDe(7+5v%Wgsn%pj7Xe%BLyx+z gXO1jz$5|)G*3WaIuE$0~0~?6{x{D}m`lnyICtw~9cmMzZ diff --git a/asm/incbin/overlay91_rodata.bin b/asm/incbin/overlay91_rodata.bin deleted file mode 100644 index a4585f5131a1e53a577fd1cf298c569522bf3bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmaiwzfQw25XR4!G)(iB#-$8y{mCLn}YtlY?DSv^@e#+b699)4n@Cm*_ zElb(GTizsLixuvXpX6I|9stR&fC!*7$rEaz4rERZATw+M4dnR?U=eh{66gZep@j9i z)h$wrBG!9Qh7O@&%z7Uh1+0%qF*jHrlWH>7m(UP8CY3}L))VB#x~`|tnvV32BJQk) zt+7(wAZh6a({i&KwkCXLZj1}qkU3nx7I9~8CO^jGCYH~`=b4$8x=Oj{#`X~vT(~|n zI>A=4kKdEIGDgLHYx{@_E?niqxfw`r*}t++HIY`f|O{LTkP diff --git a/asm/incbin/overlay93_data.bin b/asm/incbin/overlay93_data.bin deleted file mode 100644 index 41afef918322b024704b41f4286f5f18cb630185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmZw8Ne+N83rdTZ HM*Y19J0t+- diff --git a/asm/incbin/overlay93_rodata.bin b/asm/incbin/overlay93_rodata.bin deleted file mode 100644 index 2a3b57e2a28c4f7e31216a51f88333deb372f244..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmZP&U|?W?VTKj~WO#6$CIizopgb5HWCc?owa5Sqp9L!40Hqb6Gy@}q!3?Cp+Fq>*;I$rWm$Xw$!+O^bjjgzrnYt!FV<{B$uo2+lwDwb=kjP+YH?#9IO zY&=uHR`#6tas6;?)VWxXw~=SVaU0VApI?1C#qSXDtY4E!H#kje8(Ld!+wFDk%DZm2q9&3ql@5JgqtF{D{+Pp~(PcttH zpK6Id*K!$Ev@J$Z_lz~X)G~lub6VzJu^#SIt7zw|h{{)|a0PAZj;g>_6??0t3xgjS zhq@(lMeGybBlMZ|V;KF*)CJKm&)PC2}g1g^XCyHnn zBlLm%F(}jusclB`b{Z+hIPC?@294a>Vx)8{&nVhXEzyF@JB)N;5bO0(>XN#t?x{r; z2_yp(fj5C{;5y}7En?eh9l6>OKnH%UtgOTe*)PoRHxk-ST$JoFGK9R45sQ9w?-k8KZf|cZk6X?MLis-LK_c>~cXf1PK7FqP2=UW6W o7#Tqpy>;|oA_q*-E~zmR!x*yI$#0COU%K@E0xkcaa7!aUM7}k1&Y5W@jEyAj$(ObFw`Z@l_qW&D z2g!ij5daiSZ7~^oYFJKV%{zo=3)hT2p>jM(EXFIuAn}F0#`^0zcIFUsiOz;TyR|0q z*c2rLh{MKa%^{~YIkxAF#uc@`J(q2A=!c^pUYZ&Tr|-Y_96^Z+azoa|zy-#+y}HVH#KIgvJ}v z35|1l^)~5Hnx!igjgwQGJ=at%4eL~A)2zKtb6b~q7J2R~-}KiJY{o};2@BDMMXdNG zSX$qM?dQMN7VBq95;dN;UL$tEdOW+fQt08Hda#lhAr25Hi4+Rt3*-yr3*-yr3*<}W zOXN%BOXN%BOXSPs%jC=C%jC=C%j7HME95KWE95KWE11O3_y99txSWbX6%CJ~8M^8) zyqeSSv8wz&w-Ru9)Sz3}LLRRptoxi1ugevU1l(=@peGgx>G5FLn+QdG$*|wwo@@)G zqOo8{TRfDGCBm6_GLlV1qed>(X0&(2j8r;qbYv1nI-4{yxm+&W-l2Xt{29d=C3X_K z%)Y`GLt~yPOdf@qs;4(NB~K`SyKI4Dok}R+_>D zm%EVa_VX@6toaC{j1gzOC7EAoWRT@qX5t0B$O`P_w{spAnDw?4-FTVb+gI@#<1WK; zyw13Ncmr=TCs*MuMqiD$@ebZa5o@rPyI7A6cn|Mm02`U3Lm0*;=I&;EjIG#?9n6>A zJpX>4NDj^QhOjc@QRzN5ycsOva2JV(8L#823Q^SFRt@GE}9@Aw0kFoDas zf~&ZO>$riNxQ#pb6Mx|z?&AS&;SnC3tXM2$oN@c#|4)G>=(T z$>;Nt>l&llgVcMRSV5g9h%TykmzdSN?da^j{%y1Sj$Z68cJ+4`FWxPV&R9_#otXTm k7G6;un$zW$EzB(C)qPv?YL*zVH^+{>zjTYY@A=RC6n#>c761SM diff --git a/asm/incbin/overlay95_data.bin b/asm/incbin/overlay95_data.bin deleted file mode 100644 index 9870828e3938f3276a5cd4a38d05b7281f0cd502..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 KcmZQ%zz+ZbKmY;& diff --git a/asm/incbin/overlay95_rodata.bin b/asm/incbin/overlay95_rodata.bin deleted file mode 100644 index f63f6fbca62cc59ce4ecdcbe58a2df6962f519d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmcJOp-uxq5Qb-`*My*|5Co1k8H1=K0Y@L9Z-7A}(2%yGP)k)?K_~%7tKa~OtUw~_ z;0>riAV~OU_wI7X3TRU1^4;vrPIh)?ch87u8zi!ffpTypymc%*fiA%Ao(R`Zg} zE%mGDx~VL=k)e&$^>bh-G{nxUY8M2c1DA`aSViZ?sQnFWc7$I* zyOjSBl9QrYA+nvwxRX7bFrb1<{MUVbqR+Ly-;ew*+FC+Rm_nL67tXLU^mC;P$61(G z(HvKYKerZm^~XW>T;{C5dM&&Uve|U}AN419V1WBN0fVv2o4pUeZhJo^1e∓M3w|HpfHqk{ diff --git a/asm/incbin/overlay96_data.bin b/asm/incbin/overlay96_data.bin deleted file mode 100644 index 7c6f0d9361df208dbc0c652e32c249867b0cbea5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmbu-El z;VlOoFkXW|AP|TXNCXLgK%g*e$uG~^rvE){)^aYL34*3j(mLVnwBNM8j=RKyPU>d^P0n@}G)7TNy6cjLk?lIFoJi+b>(<{{aO!M## z^;4!bSUNn`+*lVgG#43me;$-_htG+a&&<_rb^$D;&u diff --git a/asm/incbin/overlay97_data.bin b/asm/incbin/overlay97_data.bin deleted file mode 100644 index 2ab6eb26fb8d83f2480718972cf9a74e78ddfcad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4672 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 diff --git a/asm/incbin/overlay98_data.bin b/asm/incbin/overlay98_data.bin deleted file mode 100644 index 80afb088917dee6041a16c10a3daa5e583c2585c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZQ!U|`??;sz)^vs#78uvUdB5Qr`7RG3=ZRG8Mbt1z7fV%827rk_9@+Nr`+3&dN2 z_%0AICAiy(&xx`&5`70WP~AkJIY4YVNrg#qGEmPH lARCBNp?D#XJ_y7|r>ZcmoCahA@mnCCIUQ&(5Cffv0RV=IFysIL diff --git a/asm/incbin/overlay98_rodata.bin b/asm/incbin/overlay98_rodata.bin deleted file mode 100644 index 90241f250e038c48b14ed3ffbc58ae5b36e262ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmZ4aNQvq1V3ssnI7OOBhmZ&iO2ZFu%Doh7~*k-m06HuDrD3JXZ zi1+C7gZYI8Doi_p7{>nzWSaubz{Sr5%FP5~9iVxPK=TxHfP5f6m`dF1v zp#?=i1w=xrA}vTz)L23r6eP5bH5Mr#q$DjU;)BOg>j50UcXl_sC~}Uyod4(E|LmQ) zcP4Z19Hdb3&v6|8?z7JAOAELzH%y$I*x}tF7&Ib$(x09(=Kw`v;vY( zemBf9KM@E=BDIO8;t#dF^2Rk?j6=cDVfS3qjLprM0m4g|;tN$0L&p}2BtU#uKhxb$ zG?nngINmIFE=|AF@OV6l9&_RI6ptsar6=-0BELtk`Hk7p!5`}6m34vf;=SJ*??TsX z`i*OTbHt|c&VAPAc59f5nYy{P)wX66HxW~bTZmF3kGPMRNK7N9 z5HpFKEZcgJI;n?k)pg?<-EFIZdK2{q>ROKPqb?)=jQRw1TL14qPQPr<2TRn1tu#ayR=kS-#4 zb9e{bQp65Y&H(0R>Ocg)a#TXynV3bG{?$w}oo2b&Z4%5SHJ<1~6cf_t%>S&T9&Q3$ zk81`@>Ryw#u86ixm}{H<)y%aQP3}qM@$NN8lXfS}dVP%8Or(40dy;!G_ZK9pL+^h( zn$Z$kg%KllXmxs6qvoH?)n&e$l}4Ls6D2tFZNUp_EJ8k=}zpeAokHx z?5kSrr$+3rPCVfO8i48AgqQ10%+Px{P{(nQ;&}T8YdB`=db~pOafnvoP<3U0&Qd03 zYb*{^5f0Z(9HIF*QmZha&6uNIc%|y`DxJcsmDpSwr2vlB4VbGt@ESdUW3&XX)jAxj z2E0z6W1d>@ivB=;9H+rJUeoZ0dI+!AllUX8#~*7O-k?30uVZ+l`BQ3whTu)g!vaml zo3$JZwGk(3J5JI*{E0rnB9*YRZc!Od)^fa68?jj1af;61ZAxk-{Zy%VyRvbr#^W8D zf_Lg3{FxrbY1)ZD*8!ZaNv!=6-H)YOjCbjIyjwLmLkDrDPU0_=aIy4D&BIxG250Lf zyhkmpbrSDWZ=ZC(M&bk7hC%JY2Xzb|GB2tg))1VdJSK%Mk@8e@SgNrn%tyo=SaIq%g65WkU^$0$pmH4Dy#HX|q zm+1g5*9lyqcoz86>WnLuj?ZWmu2KP(>v3GIwfH+#;TqN9?{x&9)oFZAzGShgQ}B6Z z;W|~}A5@2b)Dc{-)3`ytOQaW+f*X~E6&i<|RE#fbHol~VxLIrPWmV!Us>N5;h?V*R zUsKEW(x227w+~^_!rH`YOTU;+KjJj7rvo-+^$o&Ly7E}Z_37<%D@`s z;w}~9UsZ~K(_H+!R$#3v@Gb4Ye`r6xtxvH|-j32c>WKeTf84DKd{;YgkM`rg^eOI@ zx0AF_b8){`;CrgT1KNQHmCLuFUWNE?mEs}I#Rer_DmBW+|0o0ht6V&+LOh~+d|#*V z1NC9&KdJzJs9AVS3-BYYM6(L>S#i-afxIx9vNH2oh0#(#J}H{AD)U)^(NaWS98FoN z`K-!lnM{6LG-c09Veg5SZ1Pb$19KMup89{!H{^xuY z&PS4u(Ob^(a2_DPR(qZLaGpaxmh16VbIX5QUjl$V`7|+6D%}mb5j) z-DG8N=9^7!-`niV{Y7QKNk00TKlk-E@9V*89IBj6yHk}8yzls}vN6qIq~grqGB37! zhd0B!Hh=Z1(xM&Od-kTXgAI2T__;*otJe^B{_h#ebh0x|ay)xi(<)f2sl8PpV(^!Ko$A57Sh-4E!3cmBti9eD1b z#?wLtHz?^{AtcWN9QqTamTyW12Mu%(kSBqXOm~=)+d)9S0y6TSAtc`#uCO5A1ycMz H=YQu9v$jZh diff --git a/asm/incbin/overlay9_rodata.bin b/asm/incbin/overlay9_rodata.bin deleted file mode 100644 index a1e8a0c769fe88c3eae77da338154f7000b55618..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10464 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" + .byte 0x0 .global Unk_ov4_02216118 Unk_ov4_02216118: ; 0x02216118 - .incbin "incbin/overlay4_data.bin", 0x298, 0x2B0 - 0x298 + .asciz "ALLOC http->lowsendbuf" + .byte 0x0 .global Unk_ov4_02216130 Unk_ov4_02216130: ; 0x02216130 - .incbin "incbin/overlay4_data.bin", 0x2B0, 0x2BC - 0x2B0 + .asciz "Connection" + .byte 0x0 .global Unk_ov4_0221613C Unk_ov4_0221613C: ; 0x0221613C - .incbin "incbin/overlay4_data.bin", 0x2BC, 0x2C4 - 0x2BC + .asciz "close" + .short 0x0 .global Unk_ov4_02216144 Unk_ov4_02216144: ; 0x02216144 - .incbin "incbin/overlay4_data.bin", 0x2C4, 0x2CC - 0x2C4 + .byte 0xD, 0xA + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_0221614C Unk_ov4_0221614C: ; 0x0221614C - .incbin "incbin/overlay4_data.bin", 0x2CC, 0x2D0 - 0x2CC + .ascii "%d" + .short 0x0 .global Unk_ov4_02216150 Unk_ov4_02216150: ; 0x02216150 - .incbin "incbin/overlay4_data.bin", 0x2D0, 0x2E0 - 0x2D0 + .ascii "Content-Length" + .short 0x0 .global Unk_ov4_02216160 Unk_ov4_02216160: ; 0x02216160 - .incbin "incbin/overlay4_data.bin", 0x2E0, 0x2F4 - 0x2E0 + .ascii "Content-Length: " + .word 0x0 .global Unk_ov4_02216174 Unk_ov4_02216174: ; 0x02216174 - .incbin "incbin/overlay4_data.bin", 0x2F4, 0x2F8 - 0x2F4 + .byte 0xD, 0xA + .short 0x0 .global Unk_ov4_02216178 Unk_ov4_02216178: ; 0x02216178 - .incbin "incbin/overlay4_data.bin", 0x2F8, 0x310 - 0x2F8 + .asciz "FREE http->lowrecvbuf" + .short 0x0 .global Unk_ov4_02216190 Unk_ov4_02216190: ; 0x02216190 - .incbin "incbin/overlay4_data.bin", 0x310, 0x328 - 0x310 + .asciz "FREE http->lowsendbuf" + .short 0x0 .global Unk_ov4_022161A8 Unk_ov4_022161A8: ; 0x022161A8 - .incbin "incbin/overlay4_data.bin", 0x328, 0x37C - 0x328 + .ascii "POST /%s HTTP/1.0" + .byte 0xD, 0xA + .ascii "Content-type: application/x-www-form-urlencoded" + .byte 0xD, 0xA + .ascii "Host: %s" + .byte 0xD, 0xA + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_022161FC Unk_ov4_022161FC: ; 0x022161FC - .incbin "incbin/overlay4_data.bin", 0x37C, 0x39C - 0x37C + .ascii "GET /%s HTTP/1.0" + .byte 0xD, 0xA + .ascii "Host: %s" + .byte 0xD, 0xA + .byte 0xD, 0xA + .short 0x0 .global Unk_ov4_0221621C Unk_ov4_0221621C: ; 0x0221621C - .incbin "incbin/overlay4_data.bin", 0x39C, 0x3A8 - 0x39C + .ascii "%s: %s" + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_02216228 Unk_ov4_02216228: ; 0x02216228 - .incbin "incbin/overlay4_data.bin", 0x3A8, 0x3AC - 0x3A8 + .asciz "%s=" .global Unk_ov4_0221622C Unk_ov4_0221622C: ; 0x0221622C - .incbin "incbin/overlay4_data.bin", 0x3AC, 0x3B4 - 0x3AC + .ascii "&%s=" + .word 0x0 .global Unk_ov4_02216234 Unk_ov4_02216234: ; 0x02216234 - .incbin "incbin/overlay4_data.bin", 0x3B4, 0x3B8 - 0x3B4 + .ascii "%s" + .short 0x0 .global Unk_ov4_02216238 Unk_ov4_02216238: ; 0x02216238 - .incbin "incbin/overlay4_data.bin", 0x3B8, 0x3CC - 0x3B8 + .asciz "ALLOC buf->buffer" + .short 0x0 .global Unk_ov4_0221624C Unk_ov4_0221624C: ; 0x0221624C - .incbin "incbin/overlay4_data.bin", 0x3CC, 0x3E0 - 0x3CC + .ascii "FREE buf->buffer" + .word 0x0 .global Unk_ov4_02216260 Unk_ov4_02216260: ; 0x02216260 - .incbin "incbin/overlay4_data.bin", 0x3E0, 0x3F0 - 0x3E0 + .ascii "ALLOC newptr" + .word 0x0 .global Unk_ov4_02216270 Unk_ov4_02216270: ; 0x02216270 - .incbin "incbin/overlay4_data.bin", 0x3F0, 0x3F8 - 0x3F0 + .asciz "http://" .global Unk_ov4_02216278 Unk_ov4_02216278: ; 0x02216278 - .incbin "incbin/overlay4_data.bin", 0x3F8, 0x404 - 0x3F8 + .ascii "https://" + .word 0x0 .global Unk_ov4_02216284 Unk_ov4_02216284: ; 0x02216284 - .incbin "incbin/overlay4_data.bin", 0x404, 0x408 - 0x404 + .asciz ":" + .short 0x0 .global Unk_ov4_02216288 Unk_ov4_02216288: ; 0x02216288 - .incbin "incbin/overlay4_data.bin", 0x408, 0x40C - 0x408 + .asciz "/" + .short 0x0 .global Unk_ov4_0221628C Unk_ov4_0221628C: ; 0x0221628C - .incbin "incbin/overlay4_data.bin", 0x40C, 0x42C - 0x40C + .ascii "ALLOC result->entry[i].label" + .word 0x0 .global Unk_ov4_022162AC Unk_ov4_022162AC: ; 0x022162AC - .incbin "incbin/overlay4_data.bin", 0x42C, 0x44C - 0x42C + .ascii "ALLOC result->entry[i].value" + .word 0x0 .global Unk_ov4_022162CC Unk_ov4_022162CC: ; 0x022162CC - .incbin "incbin/overlay4_data.bin", 0x44C, 0x468 - 0x44C + .asciz "FREE result->entry[i].label" .global Unk_ov4_022162E8 Unk_ov4_022162E8: ; 0x022162E8 - .incbin "incbin/overlay4_data.bin", 0x468, 0x484 - 0x468 + .asciz "FREE result->entry[i].value" .global Unk_ov4_02216304 Unk_ov4_02216304: ; 0x02216304 - .incbin "incbin/overlay4_data.bin", 0x484, 0x488 - 0x484 + .asciz " " + .short 0x0 .global Unk_ov4_02216308 Unk_ov4_02216308: ; 0x02216308 - .incbin "incbin/overlay4_data.bin", 0x488, 0x494 - 0x488 + .ascii "httpresult" + .short 0x0 .global Unk_ov4_02216314 Unk_ov4_02216314: ; 0x02216314 - .incbin "incbin/overlay4_data.bin", 0x494, 0x498 - 0x494 + .asciz "200" .global Unk_ov4_02216318 Unk_ov4_02216318: ; 0x02216318 - .incbin "incbin/overlay4_data.bin", 0x498, 0x49C - 0x498 + .ascii ": " + .short 0x0 .global Unk_ov4_0221631C Unk_ov4_0221631C: ; 0x0221631C - .incbin "incbin/overlay4_data.bin", 0x49C, 0x4A0 - 0x49C + .asciz "=" + .short 0x0 .global Unk_ov4_02216320 Unk_ov4_02216320: ; 0x02216320 - .incbin "incbin/overlay4_data.bin", 0x4A0, 0x4A4 - 0x4A0 + .asciz "&" + .short 0x0 .global Unk_ov4_02216324 Unk_ov4_02216324: ; 0x02216324 - .incbin "incbin/overlay4_data.bin", 0x4A4, 0x4C0 - 0x4A4 + .asciz "FREE array_entry[i].label" + .short 0x0 .global Unk_ov4_02216340 Unk_ov4_02216340: ; 0x02216340 - .incbin "incbin/overlay4_data.bin", 0x4C0, 0x1C + .asciz "FREE array_entry[i].value" + .short 0x0 diff --git a/lib/NitroDWC/asm/auth/dwc_nastime.s b/lib/NitroDWC/asm/auth/dwc_nastime.s index 10cb8f4f4e..14474be019 100644 --- a/lib/NitroDWC/asm/auth/dwc_nastime.s +++ b/lib/NitroDWC/asm/auth/dwc_nastime.s @@ -154,59 +154,59 @@ _021D6CA0: .word DWCnastimediffvalid .global Unk_ov4_02216510 Unk_ov4_02216510: ; 0x02216510 - .incbin "incbin/overlay4_data.bin", 0x690, 0x694 - 0x690 + .asciz "Jun" .global Unk_ov4_02216514 Unk_ov4_02216514: ; 0x02216514 - .incbin "incbin/overlay4_data.bin", 0x694, 0x698 - 0x694 + .asciz "Jul" .global Unk_ov4_02216518 Unk_ov4_02216518: ; 0x02216518 - .incbin "incbin/overlay4_data.bin", 0x698, 0x69C - 0x698 + .asciz "Dec" .global Unk_ov4_0221651C Unk_ov4_0221651C: ; 0x0221651C - .incbin "incbin/overlay4_data.bin", 0x69C, 0x6A0 - 0x69C + .asciz "Sep" .global Unk_ov4_02216520 Unk_ov4_02216520: ; 0x02216520 - .incbin "incbin/overlay4_data.bin", 0x6A0, 0x6A4 - 0x6A0 + .asciz "Aug" .global Unk_ov4_02216524 Unk_ov4_02216524: ; 0x02216524 - .incbin "incbin/overlay4_data.bin", 0x6A4, 0x6A8 - 0x6A4 + .asciz "Nov" .global Unk_ov4_02216528 Unk_ov4_02216528: ; 0x02216528 - .incbin "incbin/overlay4_data.bin", 0x6A8, 0x6AC - 0x6A8 + .asciz "Oct" .global Unk_ov4_0221652C Unk_ov4_0221652C: ; 0x0221652C - .incbin "incbin/overlay4_data.bin", 0x6AC, 0x6B0 - 0x6AC + .asciz "May" .global Unk_ov4_02216530 Unk_ov4_02216530: ; 0x02216530 - .incbin "incbin/overlay4_data.bin", 0x6B0, 0x6B4 - 0x6B0 + .asciz "Apr" .global Unk_ov4_02216534 Unk_ov4_02216534: ; 0x02216534 - .incbin "incbin/overlay4_data.bin", 0x6B4, 0x6B8 - 0x6B4 + .asciz "Mar" .global Unk_ov4_02216538 Unk_ov4_02216538: ; 0x02216538 - .incbin "incbin/overlay4_data.bin", 0x6B8, 0x6BC - 0x6B8 + .asciz "Feb" .global Unk_ov4_0221653C Unk_ov4_0221653C: ; 0x0221653C - .incbin "incbin/overlay4_data.bin", 0x6BC, 0x6C0 - 0x6BC + .asciz "Jan" .global Unk_ov4_02216540 Unk_ov4_02216540: ; 0x02216540 - .incbin "incbin/overlay4_data.bin", 0x6C0, 0x6F0 - 0x6C0 + .incbin "incbin/dwc_nastime.bin", 0x0, 0x30 .global Unk_ov4_02216570 Unk_ov4_02216570: ; 0x02216570 - .incbin "incbin/overlay4_data.bin", 0x6F0, 0x1E + .asciz "Fri, 03 Mar 2006 01:28:13 GMT" diff --git a/lib/NitroDWC/asm/auth/dwc_netcheck.s b/lib/NitroDWC/asm/auth/dwc_netcheck.s index 13e5fdf380..9605b5ad6a 100644 --- a/lib/NitroDWC/asm/auth/dwc_netcheck.s +++ b/lib/NitroDWC/asm/auth/dwc_netcheck.s @@ -1316,111 +1316,130 @@ _021D6A84: .word Unk_ov4_0221A438 .global Unk_ov4_0221635C Unk_ov4_0221635C: ; 0x0221635C - .incbin "incbin/overlay4_data.bin", 0x4DC, 0x4E0 - 0x4DC + .word Unk_ov4_02216360 .global Unk_ov4_02216360 Unk_ov4_02216360: ; 0x02216360 - .incbin "incbin/overlay4_data.bin", 0x4E0, 0x504 - 0x4E0 + .asciz "http://conntest.nintendowifi.net/" + .short 0x0 .global Unk_ov4_02216384 Unk_ov4_02216384: ; 0x02216384 - .incbin "incbin/overlay4_data.bin", 0x504, 0x518 - 0x504 + .asciz "ALLOC DWCnetcheck" + .short 0x0 .global Unk_ov4_02216398 Unk_ov4_02216398: ; 0x02216398 - .incbin "incbin/overlay4_data.bin", 0x518, 0x528 - 0x518 + .asciz "ALLOC DWChttp" + .short 0x0 .global Unk_ov4_022163A8 Unk_ov4_022163A8: ; 0x022163A8 - .incbin "incbin/overlay4_data.bin", 0x528, 0x538 - 0x528 + .ascii "FREE DWChttp" + .word 0x0 .global Unk_ov4_022163B8 Unk_ov4_022163B8: ; 0x022163B8 - .incbin "incbin/overlay4_data.bin", 0x538, 0x554 - 0x538 + .asciz "FREE DWCnetcheck->body_302" + .byte 0x0 .global Unk_ov4_022163D4 Unk_ov4_022163D4: ; 0x022163D4 - .incbin "incbin/overlay4_data.bin", 0x554, 0x574 - 0x554 + .asciz "FREE DWCnetcheck->body_wayport" + .byte 0x0 .global Unk_ov4_022163F4 Unk_ov4_022163F4: ; 0x022163F4 - .incbin "incbin/overlay4_data.bin", 0x574, 0x588 - 0x574 + .ascii "FREE DWCnetcheck" + .word 0x0 .global Unk_ov4_02216408 Unk_ov4_02216408: ; 0x02216408 - .incbin "incbin/overlay4_data.bin", 0x588, 0x5A4 - 0x588 + .asciz "ALLOC DWCnetcheck->body_302" .global Unk_ov4_02216424 Unk_ov4_02216424: ; 0x02216424 - .incbin "incbin/overlay4_data.bin", 0x5A4, 0x5B0 - 0x5A4 + .asciz "ALLOC url" + .short 0x0 .global Unk_ov4_02216430 Unk_ov4_02216430: ; 0x02216430 - .incbin "incbin/overlay4_data.bin", 0x5B0, 0x5C0 - 0x5B0 + .asciz "ALLOC data_len" + .byte 0x0 .global Unk_ov4_02216440 Unk_ov4_02216440: ; 0x02216440 - .incbin "incbin/overlay4_data.bin", 0x5C0, 0x5D0 - 0x5C0 + .asciz "ALLOC wait_len" + .byte 0x0 .global Unk_ov4_02216450 Unk_ov4_02216450: ; 0x02216450 - .incbin "incbin/overlay4_data.bin", 0x5D0, 0x5F0 - 0x5D0 + .asciz "ALLOC DWCnetcheck->body_wayport" .global Unk_ov4_02216470 Unk_ov4_02216470: ; 0x02216470 - .incbin "incbin/overlay4_data.bin", 0x5F0, 0x5FC - 0x5F0 + .asciz "httpresult" + .byte 0x0 .global Unk_ov4_0221647C Unk_ov4_0221647C: ; 0x0221647C - .incbin "incbin/overlay4_data.bin", 0x5FC, 0x61C - 0x5FC + .asciz "https://nas.nintendowifi.net/ac" .global Unk_ov4_0221649C Unk_ov4_0221649C: ; 0x0221649C - .incbin "incbin/overlay4_data.bin", 0x61C, 0x624 - 0x61C + .asciz "action" + .byte 0x0 .global Unk_ov4_022164A4 Unk_ov4_022164A4: ; 0x022164A4 - .incbin "incbin/overlay4_data.bin", 0x624, 0x62C - 0x624 + .asciz "message" .global Unk_ov4_022164AC Unk_ov4_022164AC: ; 0x022164AC - .incbin "incbin/overlay4_data.bin", 0x62C, 0x63C - 0x62C + .asciz "HotSpotResponse" .global Unk_ov4_022164BC Unk_ov4_022164BC: ; 0x022164BC - .incbin "incbin/overlay4_data.bin", 0x63C, 0x644 - 0x63C + .asciz "parse" + .short 0x0 .global Unk_ov4_022164C4 Unk_ov4_022164C4: ; 0x022164C4 - .incbin "incbin/overlay4_data.bin", 0x644, 0x64C - 0x644 + .ascii "HTML" + .word 0x0 .global Unk_ov4_022164CC Unk_ov4_022164CC: ; 0x022164CC - .incbin "incbin/overlay4_data.bin", 0x64C, 0x658 - 0x64C + .ascii "returncd" + .word 0x0 .global Unk_ov4_022164D8 Unk_ov4_022164D8: ; 0x022164D8 - .incbin "incbin/overlay4_data.bin", 0x658, 0x65C - 0x658 + .asciz "url" .global Unk_ov4_022164DC Unk_ov4_022164DC: ; 0x022164DC - .incbin "incbin/overlay4_data.bin", 0x65C, 0x664 - 0x65C + .ascii "data" + .word 0x0 .global Unk_ov4_022164E4 Unk_ov4_022164E4: ; 0x022164E4 - .incbin "incbin/overlay4_data.bin", 0x664, 0x66C - 0x664 + .ascii "wait" + .word 0x0 .global Unk_ov4_022164EC Unk_ov4_022164EC: ; 0x022164EC - .incbin "incbin/overlay4_data.bin", 0x66C, 0x678 - 0x66C + .ascii "FREE url" + .word 0x0 .global Unk_ov4_022164F8 Unk_ov4_022164F8: ; 0x022164F8 - .incbin "incbin/overlay4_data.bin", 0x678, 0x684 - 0x678 + .asciz "FREE data" + .short 0x0 .global Unk_ov4_02216504 Unk_ov4_02216504: ; 0x02216504 - .incbin "incbin/overlay4_data.bin", 0x684, 0xA + .asciz "FREE wait" diff --git a/lib/NitroDWC/asm/auth/dwc_svl.s b/lib/NitroDWC/asm/auth/dwc_svl.s index 012be01f68..9c0f390551 100644 --- a/lib/NitroDWC/asm/auth/dwc_svl.s +++ b/lib/NitroDWC/asm/auth/dwc_svl.s @@ -458,51 +458,59 @@ _021D72DC: .word Unk_ov4_0221661C .global Unk_ov4_02216590 Unk_ov4_02216590: ; 0x02216590 - .incbin "incbin/overlay4_data.bin", 0x710, 0x720 - 0x710 + .asciz "ALLOC intwork" + .short 0x0 .global Unk_ov4_022165A0 Unk_ov4_022165A0: ; 0x022165A0 - .incbin "incbin/overlay4_data.bin", 0x720, 0x730 - 0x720 + .ascii "FREE intwork" + .word 0x0 .global Unk_ov4_022165B0 Unk_ov4_022165B0: ; 0x022165B0 - .incbin "incbin/overlay4_data.bin", 0x730, 0x750 - 0x730 + .asciz "https://nas.nintendowifi.net/ac" .global Unk_ov4_022165D0 Unk_ov4_022165D0: ; 0x022165D0 - .incbin "incbin/overlay4_data.bin", 0x750, 0x758 - 0x750 + .asciz "action" + .byte 0x0 .global Unk_ov4_022165D8 Unk_ov4_022165D8: ; 0x022165D8 - .incbin "incbin/overlay4_data.bin", 0x758, 0x760 - 0x758 + .asciz "SVCLOC" + .byte 0x0 .global Unk_ov4_022165E0 Unk_ov4_022165E0: ; 0x022165E0 - .incbin "incbin/overlay4_data.bin", 0x760, 0x764 - 0x760 + .asciz "svc" .global Unk_ov4_022165E4 Unk_ov4_022165E4: ; 0x022165E4 - .incbin "incbin/overlay4_data.bin", 0x764, 0x76C - 0x764 + .ascii "Date" + .word 0x0 .global Unk_ov4_022165EC Unk_ov4_022165EC: ; 0x022165EC - .incbin "incbin/overlay4_data.bin", 0x76C, 0x778 - 0x76C + .asciz "httpresult" + .byte 0x0 .global Unk_ov4_022165F8 Unk_ov4_022165F8: ; 0x022165F8 - .incbin "incbin/overlay4_data.bin", 0x778, 0x784 - 0x778 + .ascii "returncd" + .word 0x0 .global Unk_ov4_02216604 Unk_ov4_02216604: ; 0x02216604 - .incbin "incbin/overlay4_data.bin", 0x784, 0x78C - 0x784 + .asciz "svchost" .global Unk_ov4_0221660C Unk_ov4_0221660C: ; 0x0221660C - .incbin "incbin/overlay4_data.bin", 0x78C, 0x79C - 0x78C + .ascii "servicetoken" + .word 0x0 .global Unk_ov4_0221661C Unk_ov4_0221661C: ; 0x0221661C - .incbin "incbin/overlay4_data.bin", 0x79C, 0xB + .asciz "statusdata" diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin new file mode 100644 index 0000000000000000000000000000000000000000..222a0133004ff78b75e9c3fb99ca4615754ba948 GIT binary patch literal 768 zcmV+b1ONQm4(6GS&ZFZ`ihld?i-RR=>PR2)DzLeg5d^*PW6|PgX3rem&l^Z9?v06# zny)ECX9`8>+y{fYGwJd${p*4%V%lSEL(MGCB)?_NzgEapvD#2_SLrMpQ=hJ-lA!zUF@=~9F zlaSA&1iK=um_1kMCUTm!dDJQ5;pmlsv9RM?jw>meWZ$7(?XU?2ZQCd=&SIis{Q6EDIW)o^g|kH8Yj2Fse^*~&9|ch>mqx$$U3LP!(Rz`~@iUSR&V zrUm@8-3M6$)L9sqWA&wD;E)V`U9tvx^M&f`)B~C&$dH%FxMUi7er!Bb;WsFAV1KfgQwN_@ z`E6K~(yxteh-ZN2?Xs26axu!K9CEr`0_S8x=lQ8D);bNWjY6s<0XgQJKLLeT4OoXo z_|t`|lW8V}a7chZ5*5dJv>yd8J7Sr*=1;oYn0#@3uSB=g4@TK!<&(iej>o!5jWsQL z=Zn4N1u!g4UN{3Lu7bn> literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin new file mode 100644 index 0000000000000000000000000000000000000000..a4ac2323ba4abcbdf92af675cd2a1ee3f0b03674 GIT binary patch literal 256 zcmV+b0ssD{&m<1ME^jEAMMA`@J|R?_3)6puaQYIn%fE+T#(##>vM^lM{jKqP+~xRS zmI;y&_0Ut^`+I(Kh^$hGdrGFtNv2+?r;J(=yn2G`zKrR!td=DQmr9u`2QRc9cfX1c zwE}z_mbk^aIxM`_61nSHed5pthF@MuYPC6Dh&1fHcnk=bglwqIOSGVU40%oPxGl>e z%GGRJec_-fgrWJaLEtAL*$o+UNVXZN)h98$geCl_^hZ(Jg|#4bl!hJ;b;;=nVf6-W zFm4qY0_jq~V%trbp5kf@L^#d=a literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin new file mode 100644 index 0000000000000000000000000000000000000000..d997fe866829815bd5015b6659888e1b72df5399 GIT binary patch literal 637 zcmV-@0)qX_UeOU*lzWeDLhc*|*`R4{M50Y@@3&D>X;WNBgen;jg9Ph4lqx|~w{cpn-bZyPsrz4*y%loBvc z@HR*F(2)xD7s#by!4^PG`-)+Z<#r&!5e9v$EN-Ut5kZdnEv+hHS)^wsOwj1OQd@8! z1X$5}$)st#gBN721&h4USk8@%_3Q9LNei8qCucHl;jWVv9B{lKO)nVUl8ESRg;x<8 z>3-uT5mcf@mQ{nwFp22g*rV+#fIokEWmi5GAZ7?Jm6N}!M=z*Gm+%te{=y0?QRa5$ zw??<(4W`Vf!%SIKiRS22Tpa41@M0DVr^#Oo@ZQ39&ad}s^7=uhqB9i9<$7b&o?Rgxtai~BYoDag`#6c$8smk^i0Neand>OPeSl@ z-wKe%jv#NC5BRJjUvMclq{)Wov6>*uQ>BIHJ-&UK{v<^++;$c152A5oOl2;CXho-z z&U(SFgFafSiGx?HB>{E}t*(wNH_q!dcw|%q<%B>{$-j>X;);R@(iVm{Rq3%I0hzF1Nfmv;Y2W4;*adtkNcTD3@iB_0MxgDn|8WS!`5m}rb71c>p XEOR<(g0Yu5oNaJtNafuv*2o@vfJrZM literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin b/lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin new file mode 100644 index 0000000000000000000000000000000000000000..5a2bb77c774f7b02a2f2fa23e6d454eced3fdf2e GIT binary patch literal 48 mcmcCXRb;XNViO=X0Ad{=764)qAXWfk86egGVih2k0Ac{rR0t^m literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/auth/util_base64.s b/lib/NitroDWC/asm/auth/util_base64.s index 907a894963..0a52ad26f7 100644 --- a/lib/NitroDWC/asm/auth/util_base64.s +++ b/lib/NitroDWC/asm/auth/util_base64.s @@ -223,9 +223,9 @@ _021D75CC: .global Unk_ov4_02216628 Unk_ov4_02216628: ; 0x02216628 - .incbin "incbin/overlay4_data.bin", 0x7A8, 0x7AC - 0x7A8 + .word Unk_ov4_0221662C .global Unk_ov4_0221662C Unk_ov4_0221662C: ; 0x0221662C - .incbin "incbin/overlay4_data.bin", 0x7AC, 0x41 + .asciz "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-" diff --git a/lib/NitroDWC/asm/base/dwc_common.s b/lib/NitroDWC/asm/base/dwc_common.s index 4b417409e7..c934b1fd8e 100644 --- a/lib/NitroDWC/asm/base/dwc_common.s +++ b/lib/NitroDWC/asm/base/dwc_common.s @@ -216,7 +216,7 @@ _021D8C00: .global Unk_ov4_02217460 Unk_ov4_02217460: ; 0x02217460 - .incbin "incbin/overlay4_data.bin", 0x15E0, 0x9 + .asciz "%c%s%c%s" diff --git a/lib/NitroDWC/asm/bm/dwc_backup.s b/lib/NitroDWC/asm/bm/dwc_backup.s index a78518cb78..09e5b386e0 100644 --- a/lib/NitroDWC/asm/bm/dwc_backup.s +++ b/lib/NitroDWC/asm/bm/dwc_backup.s @@ -919,7 +919,7 @@ _020A3400: .word Unk_021C3A54 .global Unk_020F9534 Unk_020F9534: ; 0x020F9534 - .incbin "incbin/arm9_rodata.bin", 0x148F4, 0x4 + .word 0x0 diff --git a/lib/NitroDWC/asm/bm/util_wifiidtool.s b/lib/NitroDWC/asm/bm/util_wifiidtool.s index 73ddf5cd35..bf0ba46e2b 100644 --- a/lib/NitroDWC/asm/bm/util_wifiidtool.s +++ b/lib/NitroDWC/asm/bm/util_wifiidtool.s @@ -457,9 +457,9 @@ _020A3EE4: .global Unk_020F9538 Unk_020F9538: ; 0x020F9538 - .incbin "incbin/arm9_rodata.bin", 0x148F8, 0x14900 - 0x148F8 + .byte 0x1, 0x2, 0x0, 0x4, 0x3, 0x5, 0x6, 0x7 .global Unk_020F9540 Unk_020F9540: ; 0x020F9540 - .incbin "incbin/arm9_rodata.bin", 0x14900, 0x10 + .byte 0x5, 0x9, 0x1, 0xE, 0xC, 0x2, 0xA, 0x0, 0xB, 0xD, 0x3, 0x4, 0x8, 0x6, 0xF, 0x7 diff --git a/lib/NitroDWC/asm/enc/dwc_encsession.s b/lib/NitroDWC/asm/enc/dwc_encsession.s index 052cc927f6..ae78c7a475 100644 --- a/lib/NitroDWC/asm/enc/dwc_encsession.s +++ b/lib/NitroDWC/asm/enc/dwc_encsession.s @@ -950,7 +950,9 @@ ov66_022588F4: ; 0x022588F4 .global Unk_ov66_02258CE4 Unk_ov66_02258CE4: ; 0x02258CE4 - .incbin "incbin/overlay66_rodata.bin", 0x3CC, 0x24 + .asciz "0123456789abcdef" + .asciz "0123456789abcdef" + .space 0x2 .data @@ -958,7 +960,30 @@ Unk_ov66_02258CE4: ; 0x02258CE4 .global Unk_ov66_0225B528 Unk_ov66_0225B528: ; 0x0225B528 - .incbin "incbin/overlay66_data.bin", 0x2808, 0x188 + .word 0x0 + .word 0x2 + .space 0x9C + .ascii "&hash=" + .space 0x2 + .ascii "error:" + .space 0x2 + .ascii "http://gamestats2.gs.nintendowifi.net/" + .space 0x2 + .ascii "http://sdkdev.gamespy.com/games/" + .space 0x4 + .ascii "http://ishikawa.servebeer.com/games/" + .space 0x4 + .ascii "&data=" + .space 0x2 + .ascii "%d" + .space 0x2 + .asciz "?pid=" + .space 0x2 + .asciz "%s%s%s?pid=%d&hash=%s&data=" + .ascii "0000000000000000000000000000000000000000" + .space 0x8 + + .bss diff --git a/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s b/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s index 89861d62bc..6e837201bc 100644 --- a/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s +++ b/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s @@ -2282,11 +2282,23 @@ _022483A8: .global Unk_ov66_02258CAC Unk_ov66_02258CAC: ; 0x02258CAC - .incbin "incbin/overlay66_rodata.bin", 0x394, 0x39C - 0x394 + .ascii "#GSP" + .word 0x0 .global Unk_ov66_02258CB4 Unk_ov66_02258CB4: ; 0x02258CB4 - .incbin "incbin/overlay66_rodata.bin", 0x39C, 0x30 + .word Unk_ov66_02259268 + .word Unk_ov66_02259270 + .word Unk_ov66_02259284 + .word Unk_ov66_02259288 + .word Unk_ov66_0225928C + .word Unk_ov66_02259290 + .word Unk_ov66_02259294 + .word Unk_ov66_0225927C + .word Unk_ov66_02259274 + .word Unk_ov66_02259278 + .word Unk_ov66_02259280 + .word Unk_ov66_0225926C .data @@ -2294,105 +2306,116 @@ Unk_ov66_02258CB4: ; 0x02258CB4 .global Unk_ov66_02259258 Unk_ov66_02259258: ; 0x02259258 - .incbin "incbin/overlay66_data.bin", 0x538, 0x539 - 0x538 + .byte 0x1 .global Unk_ov66_02259259 Unk_ov66_02259259: ; 0x02259259 - .incbin "incbin/overlay66_data.bin", 0x539, 0x53A - 0x539 + .byte 0x0 .global Unk_ov66_0225925A Unk_ov66_0225925A: ; 0x0225925A - .incbin "incbin/overlay66_data.bin", 0x53A, 0x53B - 0x53A + .byte 0x0 .global Unk_ov66_0225925B Unk_ov66_0225925B: ; 0x0225925B - .incbin "incbin/overlay66_data.bin", 0x53B, 0x53C - 0x53B + .byte 0x1 .global Unk_ov66_0225925C Unk_ov66_0225925C: ; 0x0225925C - .incbin "incbin/overlay66_data.bin", 0x53C, 0x53D - 0x53C + .byte 0x1 .global Unk_ov66_0225925D Unk_ov66_0225925D: ; 0x0225925D - .incbin "incbin/overlay66_data.bin", 0x53D, 0x53E - 0x53D + .byte 0x0 .global Unk_ov66_0225925E Unk_ov66_0225925E: ; 0x0225925E - .incbin "incbin/overlay66_data.bin", 0x53E, 0x53F - 0x53E + .byte 0x0 .global Unk_ov66_0225925F Unk_ov66_0225925F: ; 0x0225925F - .incbin "incbin/overlay66_data.bin", 0x53F, 0x540 - 0x53F + .byte 0x0 .global Unk_ov66_02259260 Unk_ov66_02259260: ; 0x02259260 - .incbin "incbin/overlay66_data.bin", 0x540, 0x548 - 0x540 + .word ov66_02246F78 + .word 0x0 .global Unk_ov66_02259268 Unk_ov66_02259268: ; 0x02259268 - .incbin "incbin/overlay66_data.bin", 0x548, 0x54C - 0x548 + .word 0x52 .global Unk_ov66_0225926C Unk_ov66_0225926C: ; 0x0225926C - .incbin "incbin/overlay66_data.bin", 0x54C, 0x550 - 0x54C + .word 0x54 .global Unk_ov66_02259270 Unk_ov66_02259270: ; 0x02259270 - .incbin "incbin/overlay66_data.bin", 0x550, 0x554 - 0x550 + .word 0x44 .global Unk_ov66_02259274 Unk_ov66_02259274: ; 0x02259274 - .incbin "incbin/overlay66_data.bin", 0x554, 0x558 - 0x554 + .ascii "D7" + .space 0x2 .global Unk_ov66_02259278 Unk_ov66_02259278: ; 0x02259278 - .incbin "incbin/overlay66_data.bin", 0x558, 0x55C - 0x558 + .ascii "D8" + .space 0x2 .global Unk_ov66_0225927C Unk_ov66_0225927C: ; 0x0225927C - .incbin "incbin/overlay66_data.bin", 0x55C, 0x560 - 0x55C + .ascii "D6" + .space 0x2 .global Unk_ov66_02259280 Unk_ov66_02259280: ; 0x02259280 - .incbin "incbin/overlay66_data.bin", 0x560, 0x564 - 0x560 + .ascii "D9" + .space 0x2 .global Unk_ov66_02259284 Unk_ov66_02259284: ; 0x02259284 - .incbin "incbin/overlay66_data.bin", 0x564, 0x568 - 0x564 + .ascii "D1" + .space 0x2 .global Unk_ov66_02259288 Unk_ov66_02259288: ; 0x02259288 - .incbin "incbin/overlay66_data.bin", 0x568, 0x56C - 0x568 + .ascii "D2" + .space 0x2 .global Unk_ov66_0225928C Unk_ov66_0225928C: ; 0x0225928C - .incbin "incbin/overlay66_data.bin", 0x56C, 0x570 - 0x56C + .ascii "D3" + .space 0x2 .global Unk_ov66_02259290 Unk_ov66_02259290: ; 0x02259290 - .incbin "incbin/overlay66_data.bin", 0x570, 0x574 - 0x570 + .ascii "D4" + .space 0x2 .global Unk_ov66_02259294 Unk_ov66_02259294: ; 0x02259294 - .incbin "incbin/overlay66_data.bin", 0x574, 0x578 - 0x574 + .ascii "D5" + .space 0x2 .global Unk_ov66_02259298 Unk_ov66_02259298: ; 0x02259298 - .incbin "incbin/overlay66_data.bin", 0x578, 0x57C - 0x578 + .word 0x21 .global Unk_ov66_0225929C Unk_ov66_0225929C: ; 0x0225929C - .incbin "incbin/overlay66_data.bin", 0x57C, 0x584 - 0x57C + .asciz "N_%d_%u" .global Unk_ov66_022592A4 Unk_ov66_022592A4: ; 0x022592A4 - .incbin "incbin/overlay66_data.bin", 0x584, 0x588 - 0x584 + .word 0x5F .global Unk_ov66_022592A8 Unk_ov66_022592A8: ; 0x022592A8 - .incbin "incbin/overlay66_data.bin", 0x588, 0x58C - 0x588 + .space 0x4 .global Unk_ov66_022592AC Unk_ov66_022592AC: ; 0x022592AC - .incbin "incbin/overlay66_data.bin", 0x58C, 0x1A + .asciz "tree::insert length error" + .space 0x2 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_base64.s b/lib/NitroDWC/asm/nd/dwci_nd_base64.s index ca9fbb87a6..3226f112ff 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_base64.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_base64.s @@ -237,5 +237,6 @@ _022241DC: .global Unk_ov60_02228C78 Unk_ov60_02228C78: ; 0x02228C78 - .incbin "incbin/overlay60_rodata.bin", 0x2C, 0x41 + .ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s b/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s index 590a61f4b8..6f9f5c2254 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s @@ -6,7 +6,8 @@ .global Unk_ov60_02229B20 Unk_ov60_02229B20: ; 0x02229B20 - .incbin "incbin/overlay60_data.bin", 0xCE0, 0xCE4 - 0xCE0 + .short 0x1 + .short 0x1 .global Unk_ov60_02229B24 Unk_ov60_02229B24: ; 0x02229B24 @@ -18,9 +19,10 @@ Unk_ov60_02229B24: ; 0x02229B24 .global Unk_ov60_02229B38 Unk_ov60_02229B38: ; 0x02229B38 - .incbin "incbin/overlay60_data.bin", 0xCF8, 0xD48 - 0xCF8 + .ascii "US, Washington, Nintendo of America Inc, NOA, Nintendo CA, ca@noa.nintendo.com" + .space 0x2 .global Unk_ov60_02229B88 Unk_ov60_02229B88: ; 0x02229B88 - .incbin "incbin/overlay60_data.bin", 0xD48, 0x80 + .incbin "incbin/dwci_nd_ca_nasself.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s b/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s index 606745f015..f9925bd141 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s @@ -139,7 +139,7 @@ _0222462C: .word Unk_ov60_02229C08 .global Unk_ov60_02228CBC Unk_ov60_02228CBC: ; 0x02228CBC - .incbin "incbin/overlay60_rodata.bin", 0x70, 0xD + .ascii "00:0000000-00" @@ -148,7 +148,8 @@ Unk_ov60_02228CBC: ; 0x02228CBC .global Unk_ov60_02229C08 Unk_ov60_02229C08: ; 0x02229C08 - .incbin "incbin/overlay60_data.bin", 0xDC8, 0x18 + .ascii "Nitro WiFi SDK/%d.%d" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s b/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s index 6da22c3f41..578d65df70 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s @@ -876,15 +876,17 @@ _02225210: .word ov60_02227184 .global Unk_ov60_02228CCC Unk_ov60_02228CCC: ; 0x02228CCC - .incbin "incbin/overlay60_rodata.bin", 0x80, 0x8C - 0x80 + .ascii "bGlzdA**" + .space 0x4 .global Unk_ov60_02228CD8 Unk_ov60_02228CD8: ; 0x02228CD8 - .incbin "incbin/overlay60_rodata.bin", 0x8C, 0x98 - 0x8C + .ascii "Y291bnQ*" + .space 0x4 .global Unk_ov60_02228CE4 Unk_ov60_02228CE4: ; 0x02228CE4 - .incbin "incbin/overlay60_rodata.bin", 0x98, 0xD + .asciz "Y29udGVudHM*" @@ -897,71 +899,87 @@ Unk_ov60_02229C20: ; 0x02229C20 .global Unk_ov60_02229C24 Unk_ov60_02229C24: ; 0x02229C24 - .incbin "incbin/overlay60_data.bin", 0xDE4, 0xDF4 - 0xDE4 + .ascii "HTTPSTATUSCODE" + .space 0x2 .global Unk_ov60_02229C34 Unk_ov60_02229C34: ; 0x02229C34 - .incbin "incbin/overlay60_data.bin", 0xDF4, 0xE00 - 0xDF4 + .ascii "returncd" + .space 0x4 .global Unk_ov60_02229C40 Unk_ov60_02229C40: ; 0x02229C40 - .incbin "incbin/overlay60_data.bin", 0xE00, 0xE0C - 0xE00 + .ascii "User-Agent" + .space 0x2 .global Unk_ov60_02229C4C Unk_ov60_02229C4C: ; 0x02229C4C - .incbin "incbin/overlay60_data.bin", 0xE0C, 0xE14 - 0xE0C + .ascii "gamecd" + .space 0x2 .global Unk_ov60_02229C54 Unk_ov60_02229C54: ; 0x02229C54 - .incbin "incbin/overlay60_data.bin", 0xE14, 0xE20 - 0xE14 + .ascii "rhgamecd" + .space 0x4 .global Unk_ov60_02229C60 Unk_ov60_02229C60: ; 0x02229C60 - .incbin "incbin/overlay60_data.bin", 0xE20, 0xE28 - 0xE20 + .ascii "passwd" + .space 0x2 .global Unk_ov60_02229C68 Unk_ov60_02229C68: ; 0x02229C68 - .incbin "incbin/overlay60_data.bin", 0xE28, 0xE30 - 0xE28 + .asciz "token" + .space 0x2 .global Unk_ov60_02229C70 Unk_ov60_02229C70: ; 0x02229C70 - .incbin "incbin/overlay60_data.bin", 0xE30, 0xE38 - 0xE30 + .ascii "userid" + .space 0x2 .global Unk_ov60_02229C78 Unk_ov60_02229C78: ; 0x02229C78 - .incbin "incbin/overlay60_data.bin", 0xE38, 0xE40 - 0xE38 + .ascii "macadr" + .space 0x2 .global Unk_ov60_02229C80 Unk_ov60_02229C80: ; 0x02229C80 - .incbin "incbin/overlay60_data.bin", 0xE40, 0xE48 - 0xE40 + .ascii "action" + .space 0x2 .global Unk_ov60_02229C88 Unk_ov60_02229C88: ; 0x02229C88 - .incbin "incbin/overlay60_data.bin", 0xE48, 0xE50 - 0xE48 + .asciz "attr1" + .space 0x2 .global Unk_ov60_02229C90 Unk_ov60_02229C90: ; 0x02229C90 - .incbin "incbin/overlay60_data.bin", 0xE50, 0xE58 - 0xE50 + .asciz "attr2" + .space 0x2 .global Unk_ov60_02229C98 Unk_ov60_02229C98: ; 0x02229C98 - .incbin "incbin/overlay60_data.bin", 0xE58, 0xE60 - 0xE58 + .asciz "attr3" + .space 0x2 .global Unk_ov60_02229CA0 Unk_ov60_02229CA0: ; 0x02229CA0 - .incbin "incbin/overlay60_data.bin", 0xE60, 0xE68 - 0xE60 + .ascii "apinfo" + .space 0x2 .global Unk_ov60_02229CA8 Unk_ov60_02229CA8: ; 0x02229CA8 - .incbin "incbin/overlay60_data.bin", 0xE68, 0xE70 - 0xE68 + .ascii "offset" + .space 0x2 .global Unk_ov60_02229CB0 Unk_ov60_02229CB0: ; 0x02229CB0 - .incbin "incbin/overlay60_data.bin", 0xE70, 0xE74 - 0xE70 + .asciz "num" .global Unk_ov60_02229CB4 Unk_ov60_02229CB4: ; 0x02229CB4 - .incbin "incbin/overlay60_data.bin", 0xE74, 0xC + .ascii "contents" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_filelist.s b/lib/NitroDWC/asm/nd/dwci_nd_filelist.s index 34ec12557f..c5dc227615 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_filelist.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_filelist.s @@ -194,5 +194,6 @@ _02225514: .word Unk_ov60_02229CC0 .global Unk_ov60_02229CC0 Unk_ov60_02229CC0: ; 0x02229CC0 - .incbin "incbin/overlay60_data.bin", 0xE80, 0x10 + .ascii "Content-Length" + .space 0x2 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_string.s b/lib/NitroDWC/asm/nd/dwci_nd_string.s index a49069f38c..4fa559565a 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_string.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_string.s @@ -118,5 +118,5 @@ _022257F4: .global Unk_ov60_02228CF4 Unk_ov60_02228CF4: ; 0x02228CF4 - .incbin "incbin/overlay60_rodata.bin", 0xA8, 0x80 + .incbin "incbin/dwci_nd_string.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin b/lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin new file mode 100644 index 0000000000000000000000000000000000000000..89139e961b01baa50f36d54bb215d6ff92925edf GIT binary patch literal 128 zcmV-`0Du3p&3Tu1U5c-UsOZ;o9CzOkkRO5gL7pL1-@N=|`x!&=_QY~RNxiK^XioFm z9p+8g`B{kEu0ESM3Ce%}+$5qzcz8*Z)Pz6~xa>aLEtAL*$o+UNVXZN)h93Q49sDmkn7eJ#yAO%7(a6xGRzP%Se literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin b/lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin new file mode 100644 index 0000000000000000000000000000000000000000..53419ebe794e962ecca85c85a1c0acc93d9fd026 GIT binary patch literal 36 qcmZQLHOrde;aAp%X)_ococI|Qv@tRWs53CUU}j)QVPIh30%8Et=Lm5C literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/nhttp/nhttp_request.s b/lib/NitroDWC/asm/nhttp/nhttp_request.s index 1915bc65e6..6d78843eaf 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_request.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_request.s @@ -590,7 +590,7 @@ _02226B68: .word 0x0222A020 .global Unk_ov60_02228D74 Unk_ov60_02228D74: ; 0x02228D74 - .incbin "incbin/overlay60_rodata.bin", 0x128, 0x15 + .asciz "--t9Sf4yfjf1RtvDu3AA" @@ -599,9 +599,10 @@ Unk_ov60_02228D74: ; 0x02228D74 .global Unk_ov60_02229CD0 Unk_ov60_02229CD0: ; 0x02229CD0 - .incbin "incbin/overlay60_data.bin", 0xE90, 0xE98 - 0xE90 + .asciz "http://" .global Unk_ov60_02229CD8 Unk_ov60_02229CD8: ; 0x02229CD8 - .incbin "incbin/overlay60_data.bin", 0xE98, 0xC + .ascii "https://" + .space 0x4 diff --git a/lib/NitroDWC/asm/nhttp/nhttp_response.s b/lib/NitroDWC/asm/nhttp/nhttp_response.s index 27087fb7b3..a32e8179fc 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_response.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_response.s @@ -212,5 +212,6 @@ ov60_02226E8C: ; 0x02226E8C .global Unk_ov60_02229CE4 Unk_ov60_02229CE4: ; 0x02229CE4 - .incbin "incbin/overlay60_data.bin", 0xEA4, 0x10 + .ascii "HTTPSTATUSCODE" + .space 0x2 diff --git a/lib/NitroDWC/asm/nhttp/nhttp_thread.s b/lib/NitroDWC/asm/nhttp/nhttp_thread.s index 41a475a743..e6be5c59f0 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_thread.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_thread.s @@ -1559,11 +1559,16 @@ _0222879C: .word Unk_ov60_0222A014 .global Unk_ov60_02228D8C Unk_ov60_02228D8C: ; 0x02228D8C - .incbin "incbin/overlay60_rodata.bin", 0x140, 0x168 - 0x140 + .ascii "Content-Disposition: form-data; name=" + .byte 0x22 + .space 0x2 .global Unk_ov60_02228DB4 Unk_ov60_02228DB4: ; 0x02228DB4 - .incbin "incbin/overlay60_rodata.bin", 0x168, 0x4C + .ascii "Content-Type: application/octet-stream" + .byte 0xD, 0xA + .ascii "Content-Transfer-Encoding: binary" + .byte 0xD, 0xA @@ -1572,87 +1577,106 @@ Unk_ov60_02228DB4: ; 0x02228DB4 .global Unk_ov60_02229CF4 Unk_ov60_02229CF4: ; 0x02229CF4 - .incbin "incbin/overlay60_data.bin", 0xEB4, 0xEBC - 0xEB4 + .ascii "GET " + .space 0x4 .global Unk_ov60_02229CFC Unk_ov60_02229CFC: ; 0x02229CFC - .incbin "incbin/overlay60_data.bin", 0xEBC, 0xEC4 - 0xEBC + .ascii "POST " + .space 0x3 .global Unk_ov60_02229D04 Unk_ov60_02229D04: ; 0x02229D04 - .incbin "incbin/overlay60_data.bin", 0xEC4, 0xECC - 0xEC4 + .ascii "HEAD " + .space 0x3 .global Unk_ov60_02229D0C Unk_ov60_02229D0C: ; 0x02229D0C - .incbin "incbin/overlay60_data.bin", 0xECC, 0xED0 - 0xECC + .word 0x2F .global Unk_ov60_02229D10 Unk_ov60_02229D10: ; 0x02229D10 - .incbin "incbin/overlay60_data.bin", 0xED0, 0xEDC - 0xED0 + .ascii " HTTP/1.1" + .byte 0xD, 0xA + .space 0x1 .global Unk_ov60_02229D1C Unk_ov60_02229D1C: ; 0x02229D1C - .incbin "incbin/overlay60_data.bin", 0xEDC, 0xEE4 - 0xEDC + .ascii "Host: " + .space 0x2 .global Unk_ov60_02229D24 Unk_ov60_02229D24: ; 0x02229D24 - .incbin "incbin/overlay60_data.bin", 0xEE4, 0xEE8 - 0xEE4 + .byte 0xD, 0xA + .space 0x2 .global Unk_ov60_02229D28 Unk_ov60_02229D28: ; 0x02229D28 - .incbin "incbin/overlay60_data.bin", 0xEE8, 0xEEC - 0xEE8 + .ascii ": " + .space 0x2 .global Unk_ov60_02229D2C Unk_ov60_02229D2C: ; 0x02229D2C - .incbin "incbin/overlay60_data.bin", 0xEEC, 0xF1C - 0xEEC + .ascii "Content-Type: multipart/form-data; boundary=" + .space 0x4 .global Unk_ov60_02229D5C Unk_ov60_02229D5C: ; 0x02229D5C - .incbin "incbin/overlay60_data.bin", 0xF1C, 0xF50 - 0xF1C + .ascii "Content-Type: application/x-www-form-urlencoded" + .byte 0xD, 0xA + .space 0x3 .global Unk_ov60_02229D90 Unk_ov60_02229D90: ; 0x02229D90 - .incbin "incbin/overlay60_data.bin", 0xF50, 0xF64 - 0xF50 + .ascii "Content-Length: " + .space 0x4 .global Unk_ov60_02229DA4 Unk_ov60_02229DA4: ; 0x02229DA4 - .incbin "incbin/overlay60_data.bin", 0xF64, 0xF68 - 0xF64 + .byte 0x22, 0xD, 0xA, 0x0 .global Unk_ov60_02229DA8 Unk_ov60_02229DA8: ; 0x02229DA8 - .incbin "incbin/overlay60_data.bin", 0xF68, 0xF70 - 0xF68 + .ascii "--" + .byte 0xD, 0xA + .space 0x4 .global Unk_ov60_02229DB0 Unk_ov60_02229DB0: ; 0x02229DB0 - .incbin "incbin/overlay60_data.bin", 0xF70, 0xF74 - 0xF70 + .word 0x3D .global Unk_ov60_02229DB4 Unk_ov60_02229DB4: ; 0x02229DB4 - .incbin "incbin/overlay60_data.bin", 0xF74, 0xF78 - 0xF74 + .word 0x26 .global Unk_ov60_02229DB8 Unk_ov60_02229DB8: ; 0x02229DB8 - .incbin "incbin/overlay60_data.bin", 0xF78, 0xF80 - 0xF78 + .ascii "HTTP/" + .space 0x3 .global Unk_ov60_02229DC0 Unk_ov60_02229DC0: ; 0x02229DC0 - .incbin "incbin/overlay60_data.bin", 0xF80, 0xF90 - 0xF80 + .ascii "Content-Length" + .space 0x2 .global Unk_ov60_02229DD0 Unk_ov60_02229DD0: ; 0x02229DD0 - .incbin "incbin/overlay60_data.bin", 0xF90, 0xF9C - 0xF90 + .ascii "Connection" + .space 0x2 .global Unk_ov60_02229DDC Unk_ov60_02229DDC: ; 0x02229DDC - .incbin "incbin/overlay60_data.bin", 0xF9C, 0xFA8 - 0xF9C + .ascii "Keep-Alive" + .space 0x2 .global Unk_ov60_02229DE8 Unk_ov60_02229DE8: ; 0x02229DE8 - .incbin "incbin/overlay60_data.bin", 0xFA8, 0xFBC - 0xFA8 + .ascii "Transfer-Encoding" + .space 0x3 .global Unk_ov60_02229DFC Unk_ov60_02229DFC: ; 0x02229DFC - .incbin "incbin/overlay60_data.bin", 0xFBC, 0x8 + .asciz "chunked" diff --git a/lib/NitroDWC/asm/nhttp/nhttp_token.s b/lib/NitroDWC/asm/nhttp/nhttp_token.s index 779693f816..50dc369f94 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_token.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_token.s @@ -385,5 +385,5 @@ _02228C44: .global Unk_ov60_02228E00 Unk_ov60_02228E00: ; 0x02228E00 - .incbin "incbin/overlay60_rodata.bin", 0x1B4, 0x24 + .incbin "incbin/nhttp_token.bin", 0x0, 0x24 diff --git a/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s b/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s index 49adc61bea..a26959f758 100644 --- a/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s +++ b/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s @@ -3971,107 +3971,144 @@ _02246284: .global Unk_ov66_02259128 Unk_ov66_02259128: ; 0x02259128 - .incbin "incbin/overlay66_data.bin", 0x408, 0x409 - 0x408 + .byte 0x0 .global Unk_ov66_02259129 Unk_ov66_02259129: ; 0x02259129 - .incbin "incbin/overlay66_data.bin", 0x409, 0x40A - 0x409 + .byte 0x1 .global Unk_ov66_0225912A Unk_ov66_0225912A: ; 0x0225912A - .incbin "incbin/overlay66_data.bin", 0x40A, 0x40B - 0x40A + .byte 0x0 .global Unk_ov66_0225912B Unk_ov66_0225912B: ; 0x0225912B - .incbin "incbin/overlay66_data.bin", 0x40B, 0x40C - 0x40B + .byte 0x1 .global Unk_ov66_0225912C Unk_ov66_0225912C: ; 0x0225912C - .incbin "incbin/overlay66_data.bin", 0x40C, 0x40D - 0x40C + .byte 0x0 .global Unk_ov66_0225912D Unk_ov66_0225912D: ; 0x0225912D - .incbin "incbin/overlay66_data.bin", 0x40D, 0x410 - 0x40D + .byte 0x0 .global Unk_ov66_02259130 Unk_ov66_02259130: ; 0x02259130 - .incbin "incbin/overlay66_data.bin", 0x410, 0x428 - 0x410 + .word 0x0 + .word 0x0 + .word ov66_02243C90 + .word ov66_02245E7C + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259148 Unk_ov66_02259148: ; 0x02259148 - .incbin "incbin/overlay66_data.bin", 0x428, 0x440 - 0x428 + .word 0x0 + .word 0x0 + .word ov66_02245EA0 + .word ov66_02245EA4 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259160 Unk_ov66_02259160: ; 0x02259160 - .incbin "incbin/overlay66_data.bin", 0x440, 0x458 - 0x440 + .word 0x0 + .word 0x0 + .word ov66_02245EC8 + .word ov66_02245ECC + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259178 Unk_ov66_02259178: ; 0x02259178 - .incbin "incbin/overlay66_data.bin", 0x458, 0x470 - 0x458 + .word 0x0 + .word 0x0 + .word ov66_02245EF0 + .word ov66_02245EF4 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259190 Unk_ov66_02259190: ; 0x02259190 - .incbin "incbin/overlay66_data.bin", 0x470, 0x488 - 0x470 + .word 0x0 + .word 0x0 + .word ov66_02245F18 + .word ov66_02245F1C + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_022591A8 Unk_ov66_022591A8: ; 0x022591A8 - .incbin "incbin/overlay66_data.bin", 0x488, 0x4A0 - 0x488 + .word 0x0 + .word 0x0 + .word ov66_02245F40 + .word ov66_02245F44 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_022591C0 Unk_ov66_022591C0: ; 0x022591C0 - .incbin "incbin/overlay66_data.bin", 0x4A0, 0x4A8 - 0x4A0 + .ascii "SERVER" + .space 0x2 .global Unk_ov66_022591C8 Unk_ov66_022591C8: ; 0x022591C8 - .incbin "incbin/overlay66_data.bin", 0x4A8, 0x4B8 - 0x4A8 + .ascii "Excess Flood" + .space 0x4 .global Unk_ov66_022591D8 Unk_ov66_022591D8: ; 0x022591D8 - .incbin "incbin/overlay66_data.bin", 0x4B8, 0x4BC - 0x4B8 + .ascii " :" + .space 0x2 .global Unk_ov66_022591DC Unk_ov66_022591DC: ; 0x022591DC - .incbin "incbin/overlay66_data.bin", 0x4BC, 0x4C4 - 0x4BC + .ascii "normal" + .space 0x2 .global Unk_ov66_022591E4 Unk_ov66_022591E4: ; 0x022591E4 - .incbin "incbin/overlay66_data.bin", 0x4C4, 0x4CC - 0x4C4 + .asciz "voice" + .space 0x2 .global Unk_ov66_022591EC Unk_ov66_022591EC: ; 0x022591EC - .incbin "incbin/overlay66_data.bin", 0x4CC, 0x4D0 - 0x4CC + .asciz "ops" .global Unk_ov66_022591F0 Unk_ov66_022591F0: ; 0x022591F0 - .incbin "incbin/overlay66_data.bin", 0x4D0, 0x4DC - 0x4D0 + .ascii "voice+ops" + .space 0x3 .global Unk_ov66_022591FC Unk_ov66_022591FC: ; 0x022591FC - .incbin "incbin/overlay66_data.bin", 0x4DC, 0x4E4 - 0x4DC + .asciz "invalid" .global Unk_ov66_02259204 Unk_ov66_02259204: ; 0x02259204 - .incbin "incbin/overlay66_data.bin", 0x4E4, 0x4E8 - 0x4E4 + .space 0x4 .global Unk_ov66_02259208 Unk_ov66_02259208: ; 0x02259208 - .incbin "incbin/overlay66_data.bin", 0x4E8, 0x4F0 - 0x4E8 + .asciz "DWCUser" .global Unk_ov66_02259210 Unk_ov66_02259210: ; 0x02259210 - .incbin "incbin/overlay66_data.bin", 0x4F0, 0x4F8 - 0x4F0 + .asciz "DWCName" .global Unk_ov66_02259218 Unk_ov66_02259218: ; 0x02259218 - .incbin "incbin/overlay66_data.bin", 0x4F8, 0x4FC - 0x4F8 + .word 0x2E .global Unk_ov66_0225921C Unk_ov66_0225921C: ; 0x0225921C - .incbin "incbin/overlay66_data.bin", 0x4FC, 0x51C - 0x4FC + .ascii "peerchat.gs.nintendowifi.net" + .space 0x4 .global Unk_ov66_0225923C Unk_ov66_0225923C: ; 0x0225923C - .incbin "incbin/overlay66_data.bin", 0x51C, 0x1A + .asciz "tree::insert length error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s b/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s index 312324c06a..bb0cd82076 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s @@ -5085,7 +5085,14 @@ _0224117C: .global Unk_ov66_02258C8C Unk_ov66_02258C8C: ; 0x02258C8C - .incbin "incbin/overlay66_rodata.bin", 0x374, 0x20 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x14 .data @@ -5093,35 +5100,36 @@ Unk_ov66_02258C8C: ; 0x02258C8C .global Unk_ov66_02259098 Unk_ov66_02259098: ; 0x02259098 - .incbin "incbin/overlay66_data.bin", 0x378, 0x379 - 0x378 + .space 0x1 .global Unk_ov66_02259099 Unk_ov66_02259099: ; 0x02259099 - .incbin "incbin/overlay66_data.bin", 0x379, 0x37C - 0x379 + .space 0x3 .global Unk_ov66_0225909C Unk_ov66_0225909C: ; 0x0225909C - .incbin "incbin/overlay66_data.bin", 0x37C, 0x380 - 0x37C + .space 0x4 .global Unk_ov66_022590A0 Unk_ov66_022590A0: ; 0x022590A0 - .incbin "incbin/overlay66_data.bin", 0x380, 0x384 - 0x380 + .space 0x4 .global Unk_ov66_022590A4 Unk_ov66_022590A4: ; 0x022590A4 - .incbin "incbin/overlay66_data.bin", 0x384, 0x388 - 0x384 + .space 0x4 .global Unk_ov66_022590A8 Unk_ov66_022590A8: ; 0x022590A8 - .incbin "incbin/overlay66_data.bin", 0x388, 0x38C - 0x388 + .space 0x4 .global Unk_ov66_022590AC Unk_ov66_022590AC: ; 0x022590AC - .incbin "incbin/overlay66_data.bin", 0x38C, 0x3A4 - 0x38C + .ascii "deque:: length error" + .space 0x4 .global Unk_ov66_022590C4 Unk_ov66_022590C4: ; 0x022590C4 - .incbin "incbin/overlay66_data.bin", 0x3A4, 0x14 + .asciz "cdeque length error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s b/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s index 2a982776f7..2adbe56a32 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s @@ -8887,23 +8887,56 @@ _0223CA04: .global Unk_ov66_02258BF4 Unk_ov66_02258BF4: ; 0x02258BF4 - .incbin "incbin/overlay66_rodata.bin", 0x2DC, 0x2F4 - 0x2DC + .word Unk_ov66_02258E78 + .word Unk_ov66_02258E84 + .word Unk_ov66_02258E80 + .word Unk_ov66_02258E7C + .word Unk_ov66_02258E74 + .word Unk_ov66_02258E90 .global Unk_ov66_02258C0C Unk_ov66_02258C0C: ; 0x02258C0C - .incbin "incbin/overlay66_rodata.bin", 0x2F4, 0x314 - 0x2F4 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x4 .global Unk_ov66_02258C2C Unk_ov66_02258C2C: ; 0x02258C2C - .incbin "incbin/overlay66_rodata.bin", 0x314, 0x334 - 0x314 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x4 .global Unk_ov66_02258C4C Unk_ov66_02258C4C: ; 0x02258C4C - .incbin "incbin/overlay66_rodata.bin", 0x334, 0x354 - 0x334 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x8 .global Unk_ov66_02258C6C Unk_ov66_02258C6C: ; 0x02258C6C - .incbin "incbin/overlay66_rodata.bin", 0x354, 0x20 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x14 .data @@ -8911,159 +8944,180 @@ Unk_ov66_02258C6C: ; 0x02258C6C .global Unk_ov66_02258E58 Unk_ov66_02258E58: ; 0x02258E58 - .incbin "incbin/overlay66_data.bin", 0x138, 0x139 - 0x138 + .space 0x1 .global Unk_ov66_02258E59 Unk_ov66_02258E59: ; 0x02258E59 - .incbin "incbin/overlay66_data.bin", 0x139, 0x13A - 0x139 + .space 0x1 .global Unk_ov66_02258E5A Unk_ov66_02258E5A: ; 0x02258E5A - .incbin "incbin/overlay66_data.bin", 0x13A, 0x13B - 0x13A + .byte 0x1 .global Unk_ov66_02258E5B Unk_ov66_02258E5B: ; 0x02258E5B - .incbin "incbin/overlay66_data.bin", 0x13B, 0x13C - 0x13B + .space 0x1 .global Unk_ov66_02258E5C Unk_ov66_02258E5C: ; 0x02258E5C - .incbin "incbin/overlay66_data.bin", 0x13C, 0x140 - 0x13C + .word Unk_ov66_02258F48 .global Unk_ov66_02258E60 Unk_ov66_02258E60: ; 0x02258E60 - .incbin "incbin/overlay66_data.bin", 0x140, 0x144 - 0x140 + .word Unk_ov66_02258F24 .global Unk_ov66_02258E64 Unk_ov66_02258E64: ; 0x02258E64 - .incbin "incbin/overlay66_data.bin", 0x144, 0x148 - 0x144 + .word Unk_ov66_02258F70 .global Unk_ov66_02258E68 Unk_ov66_02258E68: ; 0x02258E68 - .incbin "incbin/overlay66_data.bin", 0x148, 0x14C - 0x148 + .word Unk_ov66_02258EE4 .global Unk_ov66_02258E6C Unk_ov66_02258E6C: ; 0x02258E6C - .incbin "incbin/overlay66_data.bin", 0x14C, 0x150 - 0x14C + .word Unk_ov66_02258EC8 .global Unk_ov66_02258E70 Unk_ov66_02258E70: ; 0x02258E70 - .incbin "incbin/overlay66_data.bin", 0x150, 0x154 - 0x150 + .word Unk_ov66_02258F04 .global Unk_ov66_02258E74 Unk_ov66_02258E74: ; 0x02258E74 - .incbin "incbin/overlay66_data.bin", 0x154, 0x158 - 0x154 + .word 0x4E .global Unk_ov66_02258E78 Unk_ov66_02258E78: ; 0x02258E78 - .incbin "incbin/overlay66_data.bin", 0x158, 0x15C - 0x158 + .word 0x4D .global Unk_ov66_02258E7C Unk_ov66_02258E7C: ; 0x02258E7C - .incbin "incbin/overlay66_data.bin", 0x15C, 0x160 - 0x15C + .word 0x43 .global Unk_ov66_02258E80 Unk_ov66_02258E80: ; 0x02258E80 - .incbin "incbin/overlay66_data.bin", 0x160, 0x164 - 0x160 + .ascii "F2" + .space 0x2 .global Unk_ov66_02258E84 Unk_ov66_02258E84: ; 0x02258E84 - .incbin "incbin/overlay66_data.bin", 0x164, 0x168 - 0x164 + .ascii "F1" + .space 0x2 .global Unk_ov66_02258E88 Unk_ov66_02258E88: ; 0x02258E88 - .incbin "incbin/overlay66_data.bin", 0x168, 0x170 - 0x168 + .ascii "M%d_%u" + .space 0x2 .global Unk_ov66_02258E90 Unk_ov66_02258E90: ; 0x02258E90 - .incbin "incbin/overlay66_data.bin", 0x170, 0x178 - 0x170 + .asciz "Invalid" .global Unk_ov66_02258E98 Unk_ov66_02258E98: ; 0x02258E98 - .incbin "incbin/overlay66_data.bin", 0x178, 0x188 - 0x178 + .space 0x8 + .word ov66_02235374 + .word ov66_0223A984 .global Unk_ov66_02258EA8 Unk_ov66_02258EA8: ; 0x02258EA8 - .incbin "incbin/overlay66_data.bin", 0x188, 0x198 - 0x188 + .space 0x8 + .word ov66_0223535C + .word ov66_0223A9CC .global Unk_ov66_02258EB8 Unk_ov66_02258EB8: ; 0x02258EB8 - .incbin "incbin/overlay66_data.bin", 0x198, 0x1A8 - 0x198 + .space 0x8 + .word ov66_0223A95C + .word ov66_02235B4C .global Unk_ov66_02258EC8 Unk_ov66_02258EC8: ; 0x02258EC8 - .incbin "incbin/overlay66_data.bin", 0x1A8, 0x1C4 - 0x1A8 + .ascii "/web/enc/lobby/getVIP.asp" + .space 0x3 .global Unk_ov66_02258EE4 Unk_ov66_02258EE4: ; 0x02258EE4 - .incbin "incbin/overlay66_data.bin", 0x1C4, 0x1E4 - 0x1C4 + .ascii "/web/enc/lobby/getSchedule.asp" + .space 0x2 .global Unk_ov66_02258F04 Unk_ov66_02258F04: ; 0x02258F04 - .incbin "incbin/overlay66_data.bin", 0x1E4, 0x204 - 0x1E4 + .asciz "/web/enc/lobby/checkProfile.asp" .global Unk_ov66_02258F24 Unk_ov66_02258F24: ; 0x02258F24 - .incbin "incbin/overlay66_data.bin", 0x204, 0x228 - 0x204 + .asciz "/web/enc/lobby/getQuestionnaire.asp" .global Unk_ov66_02258F48 Unk_ov66_02258F48: ; 0x02258F48 - .incbin "incbin/overlay66_data.bin", 0x228, 0x250 - 0x228 + .ascii "/web/enc/lobby/submitQuestionnaire.asp" + .space 0x2 .global Unk_ov66_02258F70 Unk_ov66_02258F70: ; 0x02258F70 - .incbin "incbin/overlay66_data.bin", 0x250, 0x290 - 0x250 + .asciz "uLMOGEiiJogofchScpXb000244fd00006015100000005b440e7epokemondpds" .global Unk_ov66_02258FB0 Unk_ov66_02258FB0: ; 0x02258FB0 - .incbin "incbin/overlay66_data.bin", 0x290, 0x294 - 0x290 + .word 0x2A .global Unk_ov66_02258FB4 Unk_ov66_02258FB4: ; 0x02258FB4 - .incbin "incbin/overlay66_data.bin", 0x294, 0x298 - 0x294 + .space 0x4 .global Unk_ov66_02258FB8 Unk_ov66_02258FB8: ; 0x02258FB8 - .incbin "incbin/overlay66_data.bin", 0x298, 0x29C - 0x298 + .word 0x21 .global Unk_ov66_02258FBC Unk_ov66_02258FBC: ; 0x02258FBC - .incbin "incbin/overlay66_data.bin", 0x29C, 0x2A4 - 0x29C + .ascii "C%d_%u" + .space 0x2 .global Unk_ov66_02258FC4 Unk_ov66_02258FC4: ; 0x02258FC4 - .incbin "incbin/overlay66_data.bin", 0x2A4, 0x2B4 - 0x2A4 + .ascii "b_lib_u_user" + .space 0x4 .global Unk_ov66_02258FD4 Unk_ov66_02258FD4: ; 0x02258FD4 - .incbin "incbin/overlay66_data.bin", 0x2B4, 0x2C4 - 0x2B4 + .ascii "b_lib_u_system" + .space 0x2 .global Unk_ov66_02258FE4 Unk_ov66_02258FE4: ; 0x02258FE4 - .incbin "incbin/overlay66_data.bin", 0x2C4, 0x2D4 - 0x2C4 + .ascii "b_lib_c_time" + .space 0x4 .global Unk_ov66_02258FF4 Unk_ov66_02258FF4: ; 0x02258FF4 - .incbin "incbin/overlay66_data.bin", 0x2D4, 0x2E4 - 0x2D4 + .ascii "b_lib_c_lobby" + .space 0x3 .global Unk_ov66_02259004 Unk_ov66_02259004: ; 0x02259004 - .incbin "incbin/overlay66_data.bin", 0x2E4, 0x300 - 0x2E4 + .ascii "tree::insert length error" + .space 0x3 .global Unk_ov66_02259020 Unk_ov66_02259020: ; 0x02259020 - .incbin "incbin/overlay66_data.bin", 0x300, 0x324 - 0x300 + .ascii "basic_string::reserve length_error" + .space 0x2 .global Unk_ov66_02259044 Unk_ov66_02259044: ; 0x02259044 - .incbin "incbin/overlay66_data.bin", 0x324, 0x340 - 0x324 + .ascii "basic_string: out_of_range" + .space 0x2 .global Unk_ov66_02259060 Unk_ov66_02259060: ; 0x02259060 - .incbin "incbin/overlay66_data.bin", 0x340, 0x35C - 0x340 + .ascii "string compare: pos > len" + .space 0x3 .global Unk_ov66_0225907C Unk_ov66_0225907C: ; 0x0225907C - .incbin "incbin/overlay66_data.bin", 0x35C, 0x1B + .asciz "basic_string: length_error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_parser.s b/lib/NitroDWC/asm/ppwlobby/ppw_parser.s index f114eac6b1..a39a78b32e 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_parser.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_parser.s @@ -754,49 +754,52 @@ ov66_02241A94: ; 0x02241A94 .global Unk_ov66_022590D8 Unk_ov66_022590D8: ; 0x022590D8 - .incbin "incbin/overlay66_data.bin", 0x3B8, 0x3B9 - 0x3B8 + .space 0x1 .global Unk_ov66_022590D9 Unk_ov66_022590D9: ; 0x022590D9 - .incbin "incbin/overlay66_data.bin", 0x3B9, 0x3BA - 0x3B9 + .space 0x1 .global Unk_ov66_022590DA Unk_ov66_022590DA: ; 0x022590DA - .incbin "incbin/overlay66_data.bin", 0x3BA, 0x3BC - 0x3BA + .space 0x2 .global Unk_ov66_022590DC Unk_ov66_022590DC: ; 0x022590DC - .incbin "incbin/overlay66_data.bin", 0x3BC, 0x3C0 - 0x3BC + .ascii " " + .space 0x2 .global Unk_ov66_022590E0 Unk_ov66_022590E0: ; 0x022590E0 - .incbin "incbin/overlay66_data.bin", 0x3C0, 0x3C4 - 0x3C0 + .word 0x20 .global Unk_ov66_022590E4 Unk_ov66_022590E4: ; 0x022590E4 - .incbin "incbin/overlay66_data.bin", 0x3C4, 0x3C8 - 0x3C4 + .word 0x42 .global Unk_ov66_022590E8 Unk_ov66_022590E8: ; 0x022590E8 - .incbin "incbin/overlay66_data.bin", 0x3C8, 0x3CC - 0x3C8 + .word 0x53 .global Unk_ov66_022590EC Unk_ov66_022590EC: ; 0x022590EC - .incbin "incbin/overlay66_data.bin", 0x3CC, 0x3D0 - 0x3CC + .word 0x0 .global Unk_ov66_022590F0 Unk_ov66_022590F0: ; 0x022590F0 - .incbin "incbin/overlay66_data.bin", 0x3D0, 0x3D4 - 0x3D0 + .ascii "%x" + .space 0x2 .global Unk_ov66_022590F4 Unk_ov66_022590F4: ; 0x022590F4 - .incbin "incbin/overlay66_data.bin", 0x3D4, 0x3D8 - 0x3D4 + .word 0x41 .global Unk_ov66_022590F8 Unk_ov66_022590F8: ; 0x022590F8 - .incbin "incbin/overlay66_data.bin", 0x3D8, 0x3DC - 0x3D8 + .word 0x5F .global Unk_ov66_022590FC Unk_ov66_022590FC: ; 0x022590FC - .incbin "incbin/overlay66_data.bin", 0x3DC, 0x3 + .ascii "%s" + .space 0x2 diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_profile.s b/lib/NitroDWC/asm/ppwlobby/ppw_profile.s index 6b6fa36563..e1d5916f09 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_profile.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_profile.s @@ -1204,17 +1204,18 @@ _02242BFC: .global Unk_ov66_02259100 Unk_ov66_02259100: ; 0x02259100 - .incbin "incbin/overlay66_data.bin", 0x3E0, 0x3E1 - 0x3E0 + .byte 0x1 .global Unk_ov66_02259101 Unk_ov66_02259101: ; 0x02259101 - .incbin "incbin/overlay66_data.bin", 0x3E1, 0x3E4 - 0x3E1 + .space 0x3 .global Unk_ov66_02259104 Unk_ov66_02259104: ; 0x02259104 - .incbin "incbin/overlay66_data.bin", 0x3E4, 0x3EC - 0x3E4 + .word ov66_0224239C + .space 0x4 .global Unk_ov66_0225910C Unk_ov66_0225910C: ; 0x0225910C - .incbin "incbin/overlay66_data.bin", 0x3EC, 0x1A + .asciz "tree::insert length error" diff --git a/lib/NitroDWC/asm/util/anime.s b/lib/NitroDWC/asm/util/anime.s index 3f85494dfa..44e98e5151 100644 --- a/lib/NitroDWC/asm/util/anime.s +++ b/lib/NitroDWC/asm/util/anime.s @@ -144,7 +144,7 @@ _0222AF08: .word 0xFE00FF00 .global Unk_ov18_02248C8C Unk_ov18_02248C8C: ; 0x02248C8C - .incbin "incbin/overlay18_rodata.bin", 0x2858, 0x3 + .byte 0xE, 0x4, 0x5, 0x0 diff --git a/lib/NitroDWC/asm/util/aoss.s b/lib/NitroDWC/asm/util/aoss.s index c0d21a4c5c..81d91e5390 100644 --- a/lib/NitroDWC/asm/util/aoss.s +++ b/lib/NitroDWC/asm/util/aoss.s @@ -4504,7 +4504,7 @@ ov18_02226908: ; 0x02226908 .global Unk_ov18_02246458 Unk_ov18_02246458: ; 0x02246458 - .incbin "incbin/overlay18_rodata.bin", 0x24, 0x4 + .byte 0xFF, 0xFF, 0xFF, 0xFF @@ -4513,27 +4513,34 @@ Unk_ov18_02246458: ; 0x02246458 .global Unk_ov18_02249790 Unk_ov18_02249790: ; 0x02249790 - .incbin "incbin/overlay18_data.bin", 0x30, 0x34 - 0x30 + .word 0x809 .global Unk_ov18_02249794 Unk_ov18_02249794: ; 0x02249794 - .incbin "incbin/overlay18_data.bin", 0x34, 0x38 - 0x34 + .word 0xFFFFFFFF .global Unk_ov18_02249798 Unk_ov18_02249798: ; 0x02249798 - .incbin "incbin/overlay18_data.bin", 0x38, 0x3C - 0x38 + .word 0xFFFFFFFF .global Unk_ov18_0224979C Unk_ov18_0224979C: ; 0x0224979C - .incbin "incbin/overlay18_data.bin", 0x3C, 0x94 - 0x3C + .word 0x01000000 + .word ov18_02226680 + .word ov18_02226698 + .space 0x18 + .word 0x1000 + .word 0x1000 + .space 0x2C .global Unk_ov18_022497F4 Unk_ov18_022497F4: ; 0x022497F4 - .incbin "incbin/overlay18_data.bin", 0x94, 0xA0 - 0x94 + .ascii "ESSID-AOSS" + .space 0x2 .global Unk_ov18_02249800 Unk_ov18_02249800: ; 0x02249800 - .incbin "incbin/overlay18_data.bin", 0xA0, 0x6 + .asciz "MELCO" diff --git a/lib/NitroDWC/asm/util/aosslink.s b/lib/NitroDWC/asm/util/aosslink.s index b62f455ca9..d396be670e 100644 --- a/lib/NitroDWC/asm/util/aosslink.s +++ b/lib/NitroDWC/asm/util/aosslink.s @@ -816,8 +816,30 @@ _02226EEC: .word Unk_ov18_02251B60 .global Unk_ov18_02249808 Unk_ov18_02249808: ; 0x02249808 - .incbin "incbin/overlay18_data.bin", 0xA8, 0x30 - + .short 0x1 + .short 0x2 + .short 0x2 + .short 0x4 + .short 0x4 + .short 0xB + .short 0x8 + .short 0xC + .short 0x10 + .short 0x12 + .short 0x20 + .short 0x16 + .short 0x40 + .short 0x18 + .short 0x80 + .short 0x24 + .short 0x100 + .short 0x30 + .short 0x200 + .short 0x48 + .short 0x400 + .short 0x60 + .short 0x800 + .short 0x6C .bss diff --git a/lib/NitroDWC/asm/util/archive.s b/lib/NitroDWC/asm/util/archive.s index 48a43a7f0e..f112937b1b 100644 --- a/lib/NitroDWC/asm/util/archive.s +++ b/lib/NitroDWC/asm/util/archive.s @@ -348,7 +348,7 @@ ov18_02243860: ; 0x02243860 .global Unk_ov18_02249718 Unk_ov18_02249718: ; 0x02249718 - .incbin "incbin/overlay18_rodata.bin", 0x32E4, 0x4 + .asciz "dwc" @@ -357,19 +357,23 @@ Unk_ov18_02249718: ; 0x02249718 .global Unk_ov18_0224B1E4 Unk_ov18_0224B1E4: ; 0x0224B1E4 - .incbin "incbin/overlay18_data.bin", 0x1A84, 0x1A9C - 0x1A84 + .ascii "rom:/dwc/utility.bin" + .space 0x4 .global Unk_ov18_0224B1FC Unk_ov18_0224B1FC: ; 0x0224B1FC - .incbin "incbin/overlay18_data.bin", 0x1A9C, 0x1AA4 - 0x1A9C + .ascii "%s:/" + .space 0x4 .global Unk_ov18_0224B204 Unk_ov18_0224B204: ; 0x0224B204 - .incbin "incbin/overlay18_data.bin", 0x1AA4, 0x1AAC - 0x1AA4 + .ascii "rom:/" + .space 0x3 .global Unk_ov18_0224B20C Unk_ov18_0224B20C: ; 0x0224B20C - .incbin "incbin/overlay18_data.bin", 0x1AAC, 0x3 + .ascii ".l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/atermset.s b/lib/NitroDWC/asm/util/atermset.s index 82d465f507..c11b541763 100644 --- a/lib/NitroDWC/asm/util/atermset.s +++ b/lib/NitroDWC/asm/util/atermset.s @@ -7362,51 +7362,51 @@ _0222AD30: .word Unk_ov18_02251D10 .global Unk_ov18_0224645C Unk_ov18_0224645C: ; 0x0224645C - .incbin "incbin/overlay18_rodata.bin", 0x28, 0x30 - 0x28 + .incbin "incbin/atermset.bin", 0x0, 0x8 .global Unk_ov18_02246464 Unk_ov18_02246464: ; 0x02246464 - .incbin "incbin/overlay18_rodata.bin", 0x30, 0x58 - 0x30 + .incbin "incbin/atermset.bin", 0x8, 0x30 - 0x8 .global Unk_ov18_0224648C Unk_ov18_0224648C: ; 0x0224648C - .incbin "incbin/overlay18_rodata.bin", 0x58, 0x458 - 0x58 + .incbin "incbin/atermset.bin", 0x30, 0x430 - 0x30 .global Unk_ov18_0224688C Unk_ov18_0224688C: ; 0x0224688C - .incbin "incbin/overlay18_rodata.bin", 0x458, 0x858 - 0x458 + .incbin "incbin/atermset.bin", 0x430, 0x830 - 0x430 .global Unk_ov18_02246C8C Unk_ov18_02246C8C: ; 0x02246C8C - .incbin "incbin/overlay18_rodata.bin", 0x858, 0xC58 - 0x858 + .incbin "incbin/atermset.bin", 0x830, 0xC30 - 0x830 .global Unk_ov18_0224708C Unk_ov18_0224708C: ; 0x0224708C - .incbin "incbin/overlay18_rodata.bin", 0xC58, 0x1058 - 0xC58 + .incbin "incbin/atermset.bin", 0xC30, 0x1030 - 0xC30 .global Unk_ov18_0224748C Unk_ov18_0224748C: ; 0x0224748C - .incbin "incbin/overlay18_rodata.bin", 0x1058, 0x1458 - 0x1058 + .incbin "incbin/atermset.bin", 0x1030, 0x1430 - 0x1030 .global Unk_ov18_0224788C Unk_ov18_0224788C: ; 0x0224788C - .incbin "incbin/overlay18_rodata.bin", 0x1458, 0x1858 - 0x1458 + .incbin "incbin/atermset.bin", 0x1430, 0x1830 - 0x1430 .global Unk_ov18_02247C8C Unk_ov18_02247C8C: ; 0x02247C8C - .incbin "incbin/overlay18_rodata.bin", 0x1858, 0x1C58 - 0x1858 + .incbin "incbin/atermset.bin", 0x1830, 0x1C30 - 0x1830 .global Unk_ov18_0224808C Unk_ov18_0224808C: ; 0x0224808C - .incbin "incbin/overlay18_rodata.bin", 0x1C58, 0x2058 - 0x1C58 + .incbin "incbin/atermset.bin", 0x1C30, 0x2030 - 0x1C30 .global Unk_ov18_0224848C Unk_ov18_0224848C: ; 0x0224848C - .incbin "incbin/overlay18_rodata.bin", 0x2058, 0x2458 - 0x2058 + .incbin "incbin/atermset.bin", 0x2030, 0x2430 - 0x2030 .global Unk_ov18_0224888C Unk_ov18_0224888C: ; 0x0224888C - .incbin "incbin/overlay18_rodata.bin", 0x2458, 0x400 + .incbin "incbin/atermset.bin", 0x2430, 0x400 @@ -7415,43 +7415,62 @@ Unk_ov18_0224888C: ; 0x0224888C .global Unk_ov18_02249838 Unk_ov18_02249838: ; 0x02249838 - .incbin "incbin/overlay18_data.bin", 0xD8, 0xDC - 0xD8 + .word Unk_ov18_02252244 + 0x8 .global Unk_ov18_0224983C Unk_ov18_0224983C: ; 0x0224983C - .incbin "incbin/overlay18_data.bin", 0xDC, 0xE0 - 0xDC + .word 0x1 .global Unk_ov18_02249840 Unk_ov18_02249840: ; 0x02249840 - .incbin "incbin/overlay18_data.bin", 0xE0, 0xE4 - 0xE0 + .word 0x800 .global Unk_ov18_02249844 Unk_ov18_02249844: ; 0x02249844 - .incbin "incbin/overlay18_data.bin", 0xE4, 0xE8 - 0xE4 + .word 0xFFFFFFFF .global Unk_ov18_02249848 Unk_ov18_02249848: ; 0x02249848 - .incbin "incbin/overlay18_data.bin", 0xE8, 0xEC - 0xE8 + .word 0x40 .global Unk_ov18_0224984C Unk_ov18_0224984C: ; 0x0224984C - .incbin "incbin/overlay18_data.bin", 0xEC, 0x144 - 0xEC + .word 0x01000000 + .word ov18_02227BC8 + .word ov18_02227BF8 + .space 0x4 + .short 0xA8C0 + .short 0xB000 + .word 0xFFFFFF + .short 0xA8C0 + .short 0xC800 + .short 0xA8C0 + .short 0x2000 + .space 0x4 + .word 0x1000 + .word 0x1000 + .space 0x1C + .word Unk_ov18_022498AC + .word 0x4 + .space 0x8 .global Unk_ov18_022498A4 Unk_ov18_022498A4: ; 0x022498A4 - .incbin "incbin/overlay18_data.bin", 0x144, 0x14C - 0x144 + .ascii "******" + .space 0x2 .global Unk_ov18_022498AC Unk_ov18_022498AC: ; 0x022498AC - .incbin "incbin/overlay18_data.bin", 0x14C, 0x158 - 0x14C + .asciz "NINTENDO-DS" .global Unk_ov18_022498B8 Unk_ov18_022498B8: ; 0x022498B8 - .incbin "incbin/overlay18_data.bin", 0x158, 0x198 - 0x158 + .word 0x80 + .space 0x3C .global Unk_ov18_022498F8 Unk_ov18_022498F8: ; 0x022498F8 - .incbin "incbin/overlay18_data.bin", 0x198, 0x5 + .asciz "WARP" diff --git a/lib/NitroDWC/asm/util/button.s b/lib/NitroDWC/asm/util/button.s index 9a17fed60f..f0b745bc06 100644 --- a/lib/NitroDWC/asm/util/button.s +++ b/lib/NitroDWC/asm/util/button.s @@ -510,27 +510,27 @@ _0222B57C: .word Unk_ov18_02248CA0 .global Unk_ov18_02248C90 Unk_ov18_02248C90: ; 0x02248C90 - .incbin "incbin/overlay18_rodata.bin", 0x285C, 0x2860 - 0x285C + .incbin "incbin/button.bin", 0x0, 0x4 .global Unk_ov18_02248C94 Unk_ov18_02248C94: ; 0x02248C94 - .incbin "incbin/overlay18_rodata.bin", 0x2860, 0x2864 - 0x2860 + .incbin "incbin/button.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248C98 Unk_ov18_02248C98: ; 0x02248C98 - .incbin "incbin/overlay18_rodata.bin", 0x2864, 0x286C - 0x2864 + .incbin "incbin/button.bin", 0x8, 0x10 - 0x8 .global Unk_ov18_02248CA0 Unk_ov18_02248CA0: ; 0x02248CA0 - .incbin "incbin/overlay18_rodata.bin", 0x286C, 0x287A - 0x286C + .incbin "incbin/button.bin", 0x10, 0x1E - 0x10 .global Unk_ov18_02248CAE Unk_ov18_02248CAE: ; 0x02248CAE - .incbin "incbin/overlay18_rodata.bin", 0x287A, 0x2888 - 0x287A + .incbin "incbin/button.bin", 0x1E, 0x2C - 0x1E .global Unk_ov18_02248CBC Unk_ov18_02248CBC: ; 0x02248CBC - .incbin "incbin/overlay18_rodata.bin", 0x2888, 0x7 + .incbin "incbin/button.bin", 0x2C, 0x8 diff --git a/lib/NitroDWC/asm/util/comment.s b/lib/NitroDWC/asm/util/comment.s index 5517ca26d7..ad261c5c4b 100644 --- a/lib/NitroDWC/asm/util/comment.s +++ b/lib/NitroDWC/asm/util/comment.s @@ -98,7 +98,7 @@ _0222B69C: .word Unk_ov18_0225324C .global Unk_ov18_02249900 Unk_ov18_02249900: ; 0x02249900 - .incbin "incbin/overlay18_data.bin", 0x1A0, 0x12 + .asciz "char/jtNull.nsc.l" diff --git a/lib/NitroDWC/asm/util/common.s b/lib/NitroDWC/asm/util/common.s index a54678aa3a..a9659751a4 100644 --- a/lib/NitroDWC/asm/util/common.s +++ b/lib/NitroDWC/asm/util/common.s @@ -201,23 +201,23 @@ _0222B90C: .word Unk_ov18_02248CD4 .global Unk_ov18_02248CC4 Unk_ov18_02248CC4: ; 0x02248CC4 - .incbin "incbin/overlay18_rodata.bin", 0x2890, 0x2898 - 0x2890 + .incbin "incbin/common.bin", 0x0, 0x8 .global Unk_ov18_02248CCC Unk_ov18_02248CCC: ; 0x02248CCC - .incbin "incbin/overlay18_rodata.bin", 0x2898, 0x28A0 - 0x2898 + .incbin "incbin/common.bin", 0x8, 0x10 - 0x8 .global Unk_ov18_02248CD4 Unk_ov18_02248CD4: ; 0x02248CD4 - .incbin "incbin/overlay18_rodata.bin", 0x28A0, 0x28BC - 0x28A0 + .incbin "incbin/common.bin", 0x10, 0x2C - 0x10 .global Unk_ov18_02248CF0 Unk_ov18_02248CF0: ; 0x02248CF0 - .incbin "incbin/overlay18_rodata.bin", 0x28BC, 0x28D8 - 0x28BC + .incbin "incbin/common.bin", 0x2C, 0x48 - 0x2C .global Unk_ov18_02248D0C Unk_ov18_02248D0C: ; 0x02248D0C - .incbin "incbin/overlay18_rodata.bin", 0x28D8, 0x8 + .incbin "incbin/common.bin", 0x48, 0x8 diff --git a/lib/NitroDWC/asm/util/dwc_mov_mbp.s b/lib/NitroDWC/asm/util/dwc_mov_mbp.s index 43ae7694f0..7e10538e82 100644 --- a/lib/NitroDWC/asm/util/dwc_mov_mbp.s +++ b/lib/NitroDWC/asm/util/dwc_mov_mbp.s @@ -944,107 +944,142 @@ _02241444: .word Unk_ov18_0225339C .global Unk_ov18_0224A648 Unk_ov18_0224A648: ; 0x0224A648 - .incbin "incbin/overlay18_data.bin", 0xEE8, 0xEFC - 0xEE8 + .ascii "MB_COMM_PSTATE_END" + .space 0x2 .global Unk_ov18_0224A65C Unk_ov18_0224A65C: ; 0x0224A65C - .incbin "incbin/overlay18_data.bin", 0xEFC, 0xF10 - 0xEFC + .asciz "MB_COMM_PSTATE_NONE" .global Unk_ov18_0224A670 Unk_ov18_0224A670: ; 0x0224A670 - .incbin "incbin/overlay18_data.bin", 0xF10, 0xF28 - 0xF10 + .ascii "MB_COMM_PSTATE_ERROR" + .space 0x4 .global Unk_ov18_0224A688 Unk_ov18_0224A688: ; 0x0224A688 - .incbin "incbin/overlay18_data.bin", 0xF28, 0xF40 - 0xF28 + .ascii "MB_COMM_PSTATE_KICKED" + .space 0x3 .global Unk_ov18_0224A6A0 Unk_ov18_0224A6A0: ; 0x0224A6A0 - .incbin "incbin/overlay18_data.bin", 0xF40, 0xF58 - 0xF40 + .asciz "DWCi_MOV_MBP_STATE_STOP" .global Unk_ov18_0224A6B8 Unk_ov18_0224A6B8: ; 0x0224A6B8 - .incbin "incbin/overlay18_data.bin", 0xF58, 0xF70 - 0xF58 + .space 0x18 .global Unk_ov18_0224A6D0 Unk_ov18_0224A6D0: ; 0x0224A6D0 - .incbin "incbin/overlay18_data.bin", 0xF70, 0xF90 - 0xF70 + .word Unk_ov18_0224A6A0 + .word Unk_ov18_0224A72C + .word Unk_ov18_0224A760 + .word Unk_ov18_0224A914 + .word Unk_ov18_0224A894 + .word Unk_ov18_0224A824 + .word Unk_ov18_0224A7B4 + .word Unk_ov18_0224A798 .global Unk_ov18_0224A6F0 Unk_ov18_0224A6F0: ; 0x0224A6F0 - .incbin "incbin/overlay18_data.bin", 0xF90, 0xFCC - 0xF90 + .word Unk_ov18_0224A65C + .word Unk_ov18_0224A8B4 + .word Unk_ov18_0224A744 + .word Unk_ov18_0224A808 + .word Unk_ov18_0224A688 + .word Unk_ov18_0224A840 + .word Unk_ov18_0224A85C + .word Unk_ov18_0224A8D4 + .word Unk_ov18_0224A878 + .word Unk_ov18_0224A8F4 + .word Unk_ov18_0224A77C + .word Unk_ov18_0224A7D0 + .word Unk_ov18_0224A648 + .word Unk_ov18_0224A670 + .word Unk_ov18_0224A7EC .global Unk_ov18_0224A72C Unk_ov18_0224A72C: ; 0x0224A72C - .incbin "incbin/overlay18_data.bin", 0xFCC, 0xFE4 - 0xFCC + .asciz "DWCi_MOV_MBP_STATE_IDLE" .global Unk_ov18_0224A744 Unk_ov18_0224A744: ; 0x0224A744 - .incbin "incbin/overlay18_data.bin", 0xFE4, 0x1000 - 0xFE4 + .ascii "MB_COMM_PSTATE_CONNECTED" + .space 0x4 .global Unk_ov18_0224A760 Unk_ov18_0224A760: ; 0x0224A760 - .incbin "incbin/overlay18_data.bin", 0x1000, 0x101C - 0x1000 + .ascii "DWCi_MOV_MBP_STATE_ENTRY" + .space 0x4 .global Unk_ov18_0224A77C Unk_ov18_0224A77C: ; 0x0224A77C - .incbin "incbin/overlay18_data.bin", 0x101C, 0x1038 - 0x101C + .ascii "MB_COMM_PSTATE_REQUESTED" + .space 0x4 .global Unk_ov18_0224A798 Unk_ov18_0224A798: ; 0x0224A798 - .incbin "incbin/overlay18_data.bin", 0x1038, 0x1054 - 0x1038 + .ascii "DWCi_MOV_MBP_STATE_ERROR" + .space 0x4 .global Unk_ov18_0224A7B4 Unk_ov18_0224A7B4: ; 0x0224A7B4 - .incbin "incbin/overlay18_data.bin", 0x1054, 0x1070 - 0x1054 + .asciz "DWCi_MOV_MBP_STATE_CANCEL" + .space 0x2 .global Unk_ov18_0224A7D0 Unk_ov18_0224A7D0: ; 0x0224A7D0 - .incbin "incbin/overlay18_data.bin", 0x1070, 0x108C - 0x1070 + .ascii "MB_COMM_PSTATE_MEMBER_FULL" + .space 0x2 .global Unk_ov18_0224A7EC Unk_ov18_0224A7EC: ; 0x0224A7EC - .incbin "incbin/overlay18_data.bin", 0x108C, 0x10A8 - 0x108C + .asciz "MB_COMM_PSTATE_WAIT_TO_SEND" .global Unk_ov18_0224A808 Unk_ov18_0224A808: ; 0x0224A808 - .incbin "incbin/overlay18_data.bin", 0x10A8, 0x10C4 - 0x10A8 + .asciz "MB_COMM_PSTATE_DISCONNECTED" .global Unk_ov18_0224A824 Unk_ov18_0224A824: ; 0x0224A824 - .incbin "incbin/overlay18_data.bin", 0x10C4, 0x10E0 - 0x10C4 + .asciz "DWCi_MOV_MBP_STATE_COMPLETE" .global Unk_ov18_0224A840 Unk_ov18_0224A840: ; 0x0224A840 - .incbin "incbin/overlay18_data.bin", 0x10E0, 0x10FC - 0x10E0 + .asciz "MB_COMM_PSTATE_REQ_ACCEPTED" .global Unk_ov18_0224A85C Unk_ov18_0224A85C: ; 0x0224A85C - .incbin "incbin/overlay18_data.bin", 0x10FC, 0x1118 - 0x10FC + .asciz "MB_COMM_PSTATE_SEND_PROCEED" .global Unk_ov18_0224A878 Unk_ov18_0224A878: ; 0x0224A878 - .incbin "incbin/overlay18_data.bin", 0x1118, 0x1134 - 0x1118 + .asciz "MB_COMM_PSTATE_BOOT_REQUEST" .global Unk_ov18_0224A894 Unk_ov18_0224A894: ; 0x0224A894 - .incbin "incbin/overlay18_data.bin", 0x1134, 0x1154 - 0x1134 + .ascii "DWCi_MOV_MBP_STATE_REBOOTING" + .space 0x4 .global Unk_ov18_0224A8B4 Unk_ov18_0224A8B4: ; 0x0224A8B4 - .incbin "incbin/overlay18_data.bin", 0x1154, 0x1174 - 0x1154 + .ascii "MB_COMM_PSTATE_INIT_COMPLETE" + .space 0x4 .global Unk_ov18_0224A8D4 Unk_ov18_0224A8D4: ; 0x0224A8D4 - .incbin "incbin/overlay18_data.bin", 0x1174, 0x1194 - 0x1174 + .ascii "MB_COMM_PSTATE_SEND_COMPLETE" + .space 0x4 .global Unk_ov18_0224A8F4 Unk_ov18_0224A8F4: ; 0x0224A8F4 - .incbin "incbin/overlay18_data.bin", 0x1194, 0x11B4 - 0x1194 + .ascii "MB_COMM_PSTATE_BOOT_STARTABLE" + .space 0x3 .global Unk_ov18_0224A914 Unk_ov18_0224A914: ; 0x0224A914 - .incbin "incbin/overlay18_data.bin", 0x11B4, 0x1F + .ascii "DWCi_MOV_MBP_STATE_DATASENDING" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/dwc_mov_wh.s b/lib/NitroDWC/asm/util/dwc_mov_wh.s index 10bd4f59f0..8754368550 100644 --- a/lib/NitroDWC/asm/util/dwc_mov_wh.s +++ b/lib/NitroDWC/asm/util/dwc_mov_wh.s @@ -1422,303 +1422,433 @@ _022425E4: .word ov18_02241CB4 .global Unk_ov18_0224A934 Unk_ov18_0224A934: ; 0x0224A934 - .incbin "incbin/overlay18_data.bin", 0x11D4, 0x11D8 - 0x11D4 + .asciz "N/A" .global Unk_ov18_0224A938 Unk_ov18_0224A938: ; 0x0224A938 - .incbin "incbin/overlay18_data.bin", 0x11D8, 0x11EC - 0x11D8 + .asciz "WM_ERRCODE_FAILED" + .space 0x2 .global Unk_ov18_0224A94C Unk_ov18_0224A94C: ; 0x0224A94C - .incbin "incbin/overlay18_data.bin", 0x11EC, 0x1200 - 0x11EC + .ascii "WM_ERRCODE_NO_DATA" + .space 0x2 .global Unk_ov18_0224A960 Unk_ov18_0224A960: ; 0x0224A960 - .incbin "incbin/overlay18_data.bin", 0x1200, 0x1214 - 0x1200 + .ascii "WM_ERRCODE_TIMEOUT" + .space 0x2 .global Unk_ov18_0224A974 Unk_ov18_0224A974: ; 0x0224A974 - .incbin "incbin/overlay18_data.bin", 0x1214, 0x1228 - 0x1214 + .ascii "WM_ERRCODE_SUCCESS" + .space 0x2 .global Unk_ov18_0224A988 Unk_ov18_0224A988: ; 0x0224A988 - .incbin "incbin/overlay18_data.bin", 0x1228, 0x123C - 0x1228 + .asciz "WM_STATECODE_MP_IND" .global Unk_ov18_0224A99C Unk_ov18_0224A99C: ; 0x0224A99C - .incbin "incbin/overlay18_data.bin", 0x123C, 0x1250 - 0x123C + .asciz "WM_ERRCODE_DCF_TEST" .global Unk_ov18_0224A9B0 Unk_ov18_0224A9B0: ; 0x0224A9B0 - .incbin "incbin/overlay18_data.bin", 0x1250, 0x1264 - 0x1250 + .asciz "WM_ERRCODE_NO_ENTRY" .global Unk_ov18_0224A9C4 Unk_ov18_0224A9C4: ; 0x0224A9C4 - .incbin "incbin/overlay18_data.bin", 0x1264, 0x1278 - 0x1264 + .asciz "WM_ERRCODE_NO_CHILD" .global Unk_ov18_0224A9D8 Unk_ov18_0224A9D8: ; 0x0224A9D8 - .incbin "incbin/overlay18_data.bin", 0x1278, 0x1290 - 0x1278 + .ascii "WM_ERRCODE_OPERATING" + .space 0x4 .global Unk_ov18_0224A9F0 Unk_ov18_0224A9F0: ; 0x0224A9F0 - .incbin "incbin/overlay18_data.bin", 0x1290, 0x12A8 - 0x1290 + .ascii "WM_STATECODE_DCF_IND" + .space 0x4 .global Unk_ov18_0224AA08 Unk_ov18_0224AA08: ; 0x0224AA08 - .incbin "incbin/overlay18_data.bin", 0x12A8, 0x12C0 - 0x12A8 + .asciz "WM_STATECODE_MP_START" + .space 0x2 .global Unk_ov18_0224AA20 Unk_ov18_0224AA20: ; 0x0224AA20 - .incbin "incbin/overlay18_data.bin", 0x12C0, 0x12D8 - 0x12C0 + .asciz "WM_ERRCODE_FIFO_ERROR" + .space 0x2 .global Unk_ov18_0224AA38 Unk_ov18_0224AA38: ; 0x0224AA38 - .incbin "incbin/overlay18_data.bin", 0x12D8, 0x12F0 - 0x12D8 + .asciz "WM_ERRCODE_NO_DATASET" + .space 0x2 .global Unk_ov18_0224AA50 Unk_ov18_0224AA50: ; 0x0224AA50 - .incbin "incbin/overlay18_data.bin", 0x12F0, 0x1308 - 0x12F0 + .asciz "WM_ERRCODE_WM_DISABLE" + .space 0x2 .global Unk_ov18_0224AA68 Unk_ov18_0224AA68: ; 0x0224AA68 - .incbin "incbin/overlay18_data.bin", 0x1308, 0x1320 - 0x1308 + .ascii "WM_STATECODE_PORT_RECV" + .space 0x2 .global Unk_ov18_0224AA80 Unk_ov18_0224AA80: ; 0x0224AA80 - .incbin "incbin/overlay18_data.bin", 0x1320, 0x1338 - 0x1320 + .ascii "WM_STATECODE_CONNECTED" + .space 0x2 .global Unk_ov18_0224AA98 Unk_ov18_0224AA98: ; 0x0224AA98 - .incbin "incbin/overlay18_data.bin", 0x1338, 0x1350 - 0x1338 + .ascii "WM_STATECODE_MPACK_IND" + .space 0x2 .global Unk_ov18_0224AAB0 Unk_ov18_0224AAB0: ; 0x0224AAB0 - .incbin "incbin/overlay18_data.bin", 0x1350, 0x1368 - 0x1350 + .ascii "WM_ERRCODE_SEND_FAILED" + .space 0x2 .global Unk_ov18_0224AAC8 Unk_ov18_0224AAC8: ; 0x0224AAC8 - .incbin "incbin/overlay18_data.bin", 0x1368, 0x1380 - 0x1368 + .ascii "WM_STATECODE_DCF_START" + .space 0x2 .global Unk_ov18_0224AAE0 Unk_ov18_0224AAE0: ; 0x0224AAE0 - .incbin "incbin/overlay18_data.bin", 0x1380, 0x1398 - 0x1380 + .ascii "WM_ERRCODE_FLASH_ERROR" + .space 0x2 .global Unk_ov18_0224AAF8 Unk_ov18_0224AAF8: ; 0x0224AAF8 - .incbin "incbin/overlay18_data.bin", 0x1398, 0x13B0 - 0x1398 + .ascii "WM_STATECODE_MPEND_IND" + .space 0x2 .global Unk_ov18_0224AB10 Unk_ov18_0224AB10: ; 0x0224AB10 - .incbin "incbin/overlay18_data.bin", 0x13B0, 0x13C8 - 0x13B0 + .ascii "WM_STATECODE_PORT_SEND" + .space 0x2 .global Unk_ov18_0224AB28 Unk_ov18_0224AB28: ; 0x0224AB28 - .incbin "incbin/overlay18_data.bin", 0x13C8, 0x13E0 - 0x13C8 + .asciz "WM_STATECODE_SCAN_START" .global Unk_ov18_0224AB40 Unk_ov18_0224AB40: ; 0x0224AB40 - .incbin "incbin/overlay18_data.bin", 0x13E0, 0x13F8 - 0x13E0 + .asciz "WM_STATECODE_FIFO_ERROR" .global Unk_ov18_0224AB58 Unk_ov18_0224AB58: ; 0x0224AB58 - .incbin "incbin/overlay18_data.bin", 0x13F8, 0x1414 - 0x13F8 + .ascii "WM_ERRCODE_ILLEGAL_STATE" + .space 0x4 .global Unk_ov18_0224AB74 Unk_ov18_0224AB74: ; 0x0224AB74 - .incbin "incbin/overlay18_data.bin", 0x1414, 0x1430 - 0x1414 + .ascii "WM_STATECODE_BEACON_LOST" + .space 0x4 .global Unk_ov18_0224AB90 Unk_ov18_0224AB90: ; 0x0224AB90 - .incbin "incbin/overlay18_data.bin", 0x1430, 0x144C - 0x1430 + .ascii "WM_ERRCODE_INVALID_PARAM" + .space 0x4 .global Unk_ov18_0224ABAC Unk_ov18_0224ABAC: ; 0x0224ABAC - .incbin "incbin/overlay18_data.bin", 0x144C, 0x1468 - 0x144C + .ascii "WM_ERRCODE_WL_LENGTH_ERR" + .space 0x4 .global Unk_ov18_0224ABC8 Unk_ov18_0224ABC8: ; 0x0224ABC8 - .incbin "incbin/overlay18_data.bin", 0x1468, 0x1484 - 0x1468 + .ascii "WM_STATECODE_BEACON_RECV" + .space 0x4 .global Unk_ov18_0224ABE4 Unk_ov18_0224ABE4: ; 0x0224ABE4 - .incbin "incbin/overlay18_data.bin", 0x1484, 0x14A0 - 0x1484 + .ascii "WM_STATECODE_REASSOCIATE" + .space 0x4 .global Unk_ov18_0224AC00 Unk_ov18_0224AC00: ; 0x0224AC00 - .incbin "incbin/overlay18_data.bin", 0x14A0, 0x14BC - 0x14A0 + .ascii "WM_STATECODE_BEACON_SENT" + .space 0x4 .global Unk_ov18_0224AC1C Unk_ov18_0224AC1C: ; 0x0224AC1C - .incbin "incbin/overlay18_data.bin", 0x14BC, 0x14D8 - 0x14BC + .asciz "WM_STATECODE_PARENT_FOUND" + .space 0x2 .global Unk_ov18_0224AC38 Unk_ov18_0224AC38: ; 0x0224AC38 - .incbin "incbin/overlay18_data.bin", 0x14D8, 0x14F4 - 0x14D8 + .asciz "WM_STATECODE_DISCONNECTED" + .space 0x2 .global Unk_ov18_0224AC54 Unk_ov18_0224AC54: ; 0x0224AC54 - .incbin "incbin/overlay18_data.bin", 0x14F4, 0x1510 - 0x14F4 + .asciz "DWCi_MOV_WH_SYSSTATE_STOP" + .space 0x2 .global Unk_ov18_0224AC70 Unk_ov18_0224AC70: ; 0x0224AC70 - .incbin "incbin/overlay18_data.bin", 0x1510, 0x152C - 0x1510 + .asciz "WM_ERRCODE_OVER_MAX_ENTRY" + .space 0x2 .global Unk_ov18_0224AC8C Unk_ov18_0224AC8C: ; 0x0224AC8C - .incbin "incbin/overlay18_data.bin", 0x152C, 0x1548 - 0x152C + .asciz "DWCi_MOV_WH_SYSSTATE_IDLE" + .space 0x2 .global Unk_ov18_0224ACA8 Unk_ov18_0224ACA8: ; 0x0224ACA8 - .incbin "incbin/overlay18_data.bin", 0x1548, 0x1564 - 0x1548 + .asciz "WM_STATECODE_DISASSOCIATE" + .space 0x2 .global Unk_ov18_0224ACC4 Unk_ov18_0224ACC4: ; 0x0224ACC4 - .incbin "incbin/overlay18_data.bin", 0x1564, 0x1580 - 0x1564 + .asciz "WM_STATECODE_PARENT_START" + .space 0x2 .global Unk_ov18_0224ACE0 Unk_ov18_0224ACE0: ; 0x0224ACE0 - .incbin "incbin/overlay18_data.bin", 0x1580, 0x159C - 0x1580 + .asciz "DWCi_MOV_WH_SYSSTATE_BUSY" + .space 0x2 .global Unk_ov18_0224ACFC Unk_ov18_0224ACFC: ; 0x0224ACFC - .incbin "incbin/overlay18_data.bin", 0x159C, 0x15B8 - 0x159C + .asciz "WM_STATECODE_AUTHENTICATE" + .space 0x2 .global Unk_ov18_0224AD18 Unk_ov18_0224AD18: ; 0x0224AD18 - .incbin "incbin/overlay18_data.bin", 0x15B8, 0x15D4 - 0x15B8 + .ascii "WM_STATECODE_CONNECT_START" + .space 0x2 .global Unk_ov18_0224AD34 Unk_ov18_0224AD34: ; 0x0224AD34 - .incbin "incbin/overlay18_data.bin", 0x15D4, 0x15F0 - 0x15D4 + .ascii "DWCi_MOV_WH_SYSSTATE_ERROR" + .space 0x2 .global Unk_ov18_0224AD50 Unk_ov18_0224AD50: ; 0x0224AD50 - .incbin "incbin/overlay18_data.bin", 0x15F0, 0x160C - 0x15F0 + .ascii "WM_ERRCODE_SEND_QUEUE_FULL" + .space 0x2 .global Unk_ov18_0224AD6C Unk_ov18_0224AD6C: ; 0x0224AD6C - .incbin "incbin/overlay18_data.bin", 0x160C, 0x1628 - 0x160C + .asciz "WM_ERRCODE_WL_INVALID_PARAM" .global Unk_ov18_0224AD88 Unk_ov18_0224AD88: ; 0x0224AD88 - .incbin "incbin/overlay18_data.bin", 0x1628, 0x1648 - 0x1628 + .ascii "DWCi_MOV_WH_ERRCODE_NO_RADIO" + .space 0x4 .global Unk_ov18_0224ADA8 Unk_ov18_0224ADA8: ; 0x0224ADA8 - .incbin "incbin/overlay18_data.bin", 0x1648, 0x1668 - 0x1648 + .asciz "WM_ERRCODE_INVALID_POLLBITMAP" + .space 0x2 .global Unk_ov18_0224ADC8 Unk_ov18_0224ADC8: ; 0x0224ADC8 - .incbin "incbin/overlay18_data.bin", 0x1668, 0x1688 - 0x1668 + .asciz "DWCi_MOV_WH_SYSSTATE_SCANNING" + .space 0x2 .global Unk_ov18_0224ADE8 Unk_ov18_0224ADE8: ; 0x0224ADE8 - .incbin "incbin/overlay18_data.bin", 0x1688, 0x16A8 - 0x1688 + .asciz "WM_STATECODE_PARENT_NOT_FOUND" + .space 0x2 .global Unk_ov18_0224AE08 Unk_ov18_0224AE08: ; 0x0224AE08 - .incbin "incbin/overlay18_data.bin", 0x16A8, 0x16C8 - 0x16A8 + .ascii "DWCi_MOV_WH_SYSSTATE_CONNECTED" + .space 0x2 .global Unk_ov18_0224AE28 Unk_ov18_0224AE28: ; 0x0224AE28 - .incbin "incbin/overlay18_data.bin", 0x16C8, 0x16E8 - 0x16C8 + .asciz "DWCi_MOV_WH_SYSSTATE_KEYSHARING" .global Unk_ov18_0224AE48 Unk_ov18_0224AE48: ; 0x0224AE48 - .incbin "incbin/overlay18_data.bin", 0x16E8, 0x170C - 0x16E8 + .ascii "DWCi_MOV_WH_SYSSTATE_DATASHARING" + .space 0x4 .global Unk_ov18_0224AE6C Unk_ov18_0224AE6C: ; 0x0224AE6C - .incbin "incbin/overlay18_data.bin", 0x170C, 0x1730 - 0x170C + .ascii "DWCi_MOV_WH_ERRCODE_DISCONNECTED" + .space 0x4 .global Unk_ov18_0224AE90 Unk_ov18_0224AE90: ; 0x0224AE90 - .incbin "incbin/overlay18_data.bin", 0x1730, 0x1754 - 0x1730 + .asciz "DWCi_MOV_WH_SYSSTATE_CONNECT_FAIL" + .space 0x2 .global Unk_ov18_0224AEB4 Unk_ov18_0224AEB4: ; 0x0224AEB4 - .incbin "incbin/overlay18_data.bin", 0x1754, 0x1778 - 0x1754 + .asciz "DWCi_MOV_WH_SYSSTATE_MEASURECHANNEL" .global Unk_ov18_0224AED8 Unk_ov18_0224AED8: ; 0x0224AED8 - .incbin "incbin/overlay18_data.bin", 0x1778, 0x17A0 - 0x1778 + .ascii "DWCi_MOV_WH_ERRCODE_PARENT_NOT_FOUND" + .space 0x4 .global Unk_ov18_0224AF00 Unk_ov18_0224AF00: ; 0x0224AF00 - .incbin "incbin/overlay18_data.bin", 0x17A0, 0x17C8 - 0x17A0 + .word Unk_ov18_0224AC54 + .word Unk_ov18_0224AC8C + .word Unk_ov18_0224ADC8 + .word Unk_ov18_0224ACE0 + .word Unk_ov18_0224AE08 + .word Unk_ov18_0224AE48 + .word Unk_ov18_0224AE28 + .word Unk_ov18_0224AEB4 + .word Unk_ov18_0224AE90 + .word Unk_ov18_0224AD34 .global Unk_ov18_0224AF28 Unk_ov18_0224AF28: ; 0x0224AF28 - .incbin "incbin/overlay18_data.bin", 0x17C8, 0x1824 - 0x17C8 + .word Unk_ov18_0224ACC4 + .word Unk_ov18_0224A934 + .word Unk_ov18_0224AC00 + .word Unk_ov18_0224AB28 + .word Unk_ov18_0224ADE8 + .word Unk_ov18_0224AC1C + .word Unk_ov18_0224AD18 + .word Unk_ov18_0224AA80 + .word Unk_ov18_0224AB74 + .word Unk_ov18_0224AC38 + .word Unk_ov18_0224AA08 + .word Unk_ov18_0224AAF8 + .word Unk_ov18_0224A988 + .word Unk_ov18_0224AA98 + .word Unk_ov18_0224AAC8 + .word Unk_ov18_0224A9F0 + .word Unk_ov18_0224ABC8 + .word Unk_ov18_0224ACA8 + .word Unk_ov18_0224ABE4 + .word Unk_ov18_0224ACFC + .word Unk_ov18_0224AB10 + .word Unk_ov18_0224AA68 + .word Unk_ov18_0224AB40 .global Unk_ov18_0224AF84 Unk_ov18_0224AF84: ; 0x0224AF84 - .incbin "incbin/overlay18_data.bin", 0x1824, 0x1880 - 0x1824 + .word Unk_ov18_0224A974 + .word Unk_ov18_0224A938 + .word Unk_ov18_0224A9D8 + .word Unk_ov18_0224AB58 + .word Unk_ov18_0224AA50 + .word Unk_ov18_0224AA38 + .word Unk_ov18_0224AB90 + .word Unk_ov18_0224A9C4 + .word Unk_ov18_0224AA20 + .word Unk_ov18_0224A960 + .word Unk_ov18_0224AD50 + .word Unk_ov18_0224A9B0 + .word Unk_ov18_0224AC70 + .word Unk_ov18_0224ADA8 + .word Unk_ov18_0224A94C + .word Unk_ov18_0224AAB0 + .word Unk_ov18_0224A99C + .word Unk_ov18_0224AD6C + .word Unk_ov18_0224ABAC + .word Unk_ov18_0224AAE0 + .word Unk_ov18_0224AE6C + .word Unk_ov18_0224AED8 + .word Unk_ov18_0224AD88 .global Unk_ov18_0224AFE0 Unk_ov18_0224AFE0: ; 0x0224AFE0 - .incbin "incbin/overlay18_data.bin", 0x1880, 0x1888 - 0x1880 + .ascii "%s -> " + .space 0x2 .global Unk_ov18_0224AFE8 Unk_ov18_0224AFE8: ; 0x0224AFE8 - .incbin "incbin/overlay18_data.bin", 0x1888, 0x188C - 0x1888 + .ascii "%s" + .byte 0xA + .space 0x1 .global Unk_ov18_0224AFEC Unk_ov18_0224AFEC: ; 0x0224AFEC - .incbin "incbin/overlay18_data.bin", 0x188C, 0x18B8 - 0x188C + .ascii "StartParent - new child (aid %x) connected" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B018 Unk_ov18_0224B018: ; 0x0224B018 - .incbin "incbin/overlay18_data.bin", 0x18B8, 0x18E4 - 0x18B8 + .ascii "StartParent - child (aid %x) disconnected" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B044 Unk_ov18_0224B044: ; 0x0224B044 - .incbin "incbin/overlay18_data.bin", 0x18E4, 0x1904 - 0x18E4 + .ascii "unknown indicate, state = %d" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B064 Unk_ov18_0224B064: ; 0x0224B064 - .incbin "incbin/overlay18_data.bin", 0x1904, 0x1934 - 0x1904 + .ascii "DWCi_MOV_WH_StateInStartParentKeyShare failed" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B094 Unk_ov18_0224B094: ; 0x0224B094 - .incbin "incbin/overlay18_data.bin", 0x1934, 0x195C - 0x1934 + .ascii "DWCi_MOV_WH_StateInEndParent failed" + .byte 0xA + .space 0x4 .global Unk_ov18_0224B0BC Unk_ov18_0224B0BC: ; 0x0224B0BC - .incbin "incbin/overlay18_data.bin", 0x195C, 0x1974 - 0x195C + .ascii "recv buffer size = %d" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B0D4 Unk_ov18_0224B0D4: ; 0x0224B0D4 - .incbin "incbin/overlay18_data.bin", 0x1974, 0x198C - 0x1974 + .ascii "send buffer size = %d" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B0EC Unk_ov18_0224B0EC: ; 0x0224B0EC - .incbin "incbin/overlay18_data.bin", 0x198C, 0x19A4 - 0x198C + .ascii "channel %d bratio = %x" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B104 Unk_ov18_0224B104: ; 0x0224B104 - .incbin "incbin/overlay18_data.bin", 0x19A4, 0x19BC - 0x19A4 + .ascii "decided channel = %d" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B11C Unk_ov18_0224B11C: ; 0x0224B11C - .incbin "incbin/overlay18_data.bin", 0x19BC, 0x19D8 - 0x19BC + .ascii "unknown connect mode %d" + .byte 0xA + .space 0x4 .global Unk_ov18_0224B138 Unk_ov18_0224B138: ; 0x0224B138 - .incbin "incbin/overlay18_data.bin", 0x19D8, 0x1A08 - 0x19D8 + .ascii "DWCi_MOV_WH_StepDataSharing - Warning No Child" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B168 Unk_ov18_0224B168: ; 0x0224B168 - .incbin "incbin/overlay18_data.bin", 0x1A08, 0x1A3C - 0x1A08 + .ascii "DWCi_MOV_WH_StepDataSharing - Warning No DataSet" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B19C Unk_ov18_0224B19C: ; 0x0224B19C - .incbin "incbin/overlay18_data.bin", 0x1A3C, 0x1A60 - 0x1A3C + .ascii "already DWCi_MOV_WH_SYSSTATE_IDLE" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B1C0 Unk_ov18_0224B1C0: ; 0x0224B1C0 - .incbin "incbin/overlay18_data.bin", 0x1A60, 0x22 + .ascii "DWCi_MOV_WH_Finalize, state = %d" + .byte 0xA + .space 0x1 diff --git a/lib/NitroDWC/asm/util/effect.s b/lib/NitroDWC/asm/util/effect.s index cf49cad38e..71853c03e3 100644 --- a/lib/NitroDWC/asm/util/effect.s +++ b/lib/NitroDWC/asm/util/effect.s @@ -247,15 +247,15 @@ ov18_022443EC: ; 0x022443EC .global Unk_ov18_0224971C Unk_ov18_0224971C: ; 0x0224971C - .incbin "incbin/overlay18_rodata.bin", 0x32E8, 0x32EC - 0x32E8 + .byte 0x0, 0xF0, 0x0, 0x10 .global Unk_ov18_02249720 Unk_ov18_02249720: ; 0x02249720 - .incbin "incbin/overlay18_rodata.bin", 0x32EC, 0x32F0 - 0x32EC + .byte 0x11, 0x10, 0x01, 0x0 .global Unk_ov18_02249724 Unk_ov18_02249724: ; 0x02249724 - .incbin "incbin/overlay18_rodata.bin", 0x32F0, 0x4 + .byte 0xF0, 0x0, 0x10, 0x0 diff --git a/lib/NitroDWC/asm/util/focus.s b/lib/NitroDWC/asm/util/focus.s index b89c2c9cff..d6b7e3914d 100644 --- a/lib/NitroDWC/asm/util/focus.s +++ b/lib/NitroDWC/asm/util/focus.s @@ -177,7 +177,7 @@ _0222BB30: .word Unk_ov18_02253290 .global Unk_ov18_02248D14 Unk_ov18_02248D14: ; 0x02248D14 - .incbin "incbin/overlay18_rodata.bin", 0x28E0, 0x8 + .byte 0xA, 0xB, 0x4, 0x5, 0x2, 0x3, 0xC, 0xD diff --git a/lib/NitroDWC/asm/util/font.s b/lib/NitroDWC/asm/util/font.s index df4e92be2e..d3251b665a 100644 --- a/lib/NitroDWC/asm/util/font.s +++ b/lib/NitroDWC/asm/util/font.s @@ -621,12 +621,11 @@ _02244C28: .word Unk_ov18_022533C0 .global Unk_ov18_02249728 Unk_ov18_02249728: ; 0x02249728 - .incbin "incbin/overlay18_rodata.bin", 0x32F4, 0x32F8 - 0x32F4 + .byte 0x0, 0x0, 0x80, 0x1 .global Unk_ov18_0224972C Unk_ov18_0224972C: ; 0x0224972C - .incbin "incbin/overlay18_rodata.bin", 0x32F8, 0x8 - + .short 0x20, 0x18, 0x20, 0xC .data @@ -634,23 +633,25 @@ Unk_ov18_0224972C: ; 0x0224972C .global Unk_ov18_0224B210 Unk_ov18_0224B210: ; 0x0224B210 - .incbin "incbin/overlay18_data.bin", 0x1AB0, 0x1AB8 - 0x1AB0 + .word Unk_ov18_0224B230 + .word Unk_ov18_0224B220 .global Unk_ov18_0224B218 Unk_ov18_0224B218: ; 0x0224B218 - .incbin "incbin/overlay18_data.bin", 0x1AB8, 0x1AC0 - 0x1AB8 + .word Unk_ov18_0224B240 + .word Unk_ov18_0224B220 .global Unk_ov18_0224B220 Unk_ov18_0224B220: ; 0x0224B220 - .incbin "incbin/overlay18_data.bin", 0x1AC0, 0x1AD0 - 0x1AC0 + .asciz "msg/lc_s.NFTR.l" .global Unk_ov18_0224B230 Unk_ov18_0224B230: ; 0x0224B230 - .incbin "incbin/overlay18_data.bin", 0x1AD0, 0x1AE0 - 0x1AD0 + .asciz "msg/kc_m.NFTR.l" .global Unk_ov18_0224B240 Unk_ov18_0224B240: ; 0x0224B240 - .incbin "incbin/overlay18_data.bin", 0x1AE0, 0x10 + .asciz "msg/lc_m.NFTR.l" diff --git a/lib/NitroDWC/asm/util/foundation.s b/lib/NitroDWC/asm/util/foundation.s index f6fc837e04..7969d342ae 100644 --- a/lib/NitroDWC/asm/util/foundation.s +++ b/lib/NitroDWC/asm/util/foundation.s @@ -44,5 +44,6 @@ ov18_02244C50: ; 0x02244C50 .global Unk_ov18_02249734 Unk_ov18_02249734: ; 0x02249734 - .incbin "incbin/overlay18_rodata.bin", 0x3300, 0x8 + .word 0x0 + .word 0xC00100 diff --git a/lib/NitroDWC/asm/util/headline.s b/lib/NitroDWC/asm/util/headline.s index 4d1832e819..a516ca1e73 100644 --- a/lib/NitroDWC/asm/util/headline.s +++ b/lib/NitroDWC/asm/util/headline.s @@ -127,91 +127,128 @@ _0222BC88: .word Unk_ov18_02253294 .global Unk_ov18_02249914 Unk_ov18_02249914: ; 0x02249914 - .incbin "incbin/overlay18_data.bin", 0x1B4, 0x1C8 - 0x1B4 + .ascii "char/jb2HlAp.nsc.l" + .space 0x2 .global Unk_ov18_02249928 Unk_ov18_02249928: ; 0x02249928 - .incbin "incbin/overlay18_data.bin", 0x1C8, 0x1DC - 0x1C8 + .ascii "char/jb4HlIp.nsc.l" + .space 0x2 .global Unk_ov18_0224993C Unk_ov18_0224993C: ; 0x0224993C - .incbin "incbin/overlay18_data.bin", 0x1DC, 0x1F0 - 0x1DC + .asciz "char/jb4HlWep.nsc.l" .global Unk_ov18_02249950 Unk_ov18_02249950: ; 0x02249950 - .incbin "incbin/overlay18_data.bin", 0x1F0, 0x204 - 0x1F0 + .asciz "char/jb4HlUsb.nsc.l" .global Unk_ov18_02249964 Unk_ov18_02249964: ; 0x02249964 - .incbin "incbin/overlay18_data.bin", 0x204, 0x21C - 0x204 + .ascii "char/jb4HlDns1.nsc.l" + .space 0x4 .global Unk_ov18_0224997C Unk_ov18_0224997C: ; 0x0224997C - .incbin "incbin/overlay18_data.bin", 0x21C, 0x234 - 0x21C + .ascii "char/jb4HlSsid.nsc.l" + .space 0x4 .global Unk_ov18_02249994 Unk_ov18_02249994: ; 0x02249994 - .incbin "incbin/overlay18_data.bin", 0x234, 0x24C - 0x234 + .ascii "char/jb5HlMove.nsc.l" + .space 0x4 .global Unk_ov18_022499AC Unk_ov18_022499AC: ; 0x022499AC - .incbin "incbin/overlay18_data.bin", 0x24C, 0x264 - 0x24C + .ascii "char/jb2HlWiFi.nsc.l" + .space 0x4 .global Unk_ov18_022499C4 Unk_ov18_022499C4: ; 0x022499C4 - .incbin "incbin/overlay18_data.bin", 0x264, 0x27C - 0x264 + .ascii "char/jb5HlInfo.nsc.l" + .space 0x4 .global Unk_ov18_022499DC Unk_ov18_022499DC: ; 0x022499DC - .incbin "incbin/overlay18_data.bin", 0x27C, 0x294 - 0x27C + .ascii "char/jb4HlMask.nsc.l" + .space 0x4 .global Unk_ov18_022499F4 Unk_ov18_022499F4: ; 0x022499F4 - .incbin "incbin/overlay18_data.bin", 0x294, 0x2AC - 0x294 + .ascii "char/jb4HlSet2.nsc.l" + .space 0x4 .global Unk_ov18_02249A0C Unk_ov18_02249A0C: ; 0x02249A0C - .incbin "incbin/overlay18_data.bin", 0x2AC, 0x2C4 - 0x2AC + .ascii "char/jb4HlDns0.nsc.l" + .space 0x4 .global Unk_ov18_02249A24 Unk_ov18_02249A24: ; 0x02249A24 - .incbin "incbin/overlay18_data.bin", 0x2C4, 0x2DC - 0x2C4 + .ascii "char/jb4HlSet3.nsc.l" + .space 0x4 .global Unk_ov18_02249A3C Unk_ov18_02249A3C: ; 0x02249A3C - .incbin "incbin/overlay18_data.bin", 0x2DC, 0x2F4 - 0x2DC + .ascii "char/jb4HlSet1.nsc.l" + .space 0x4 .global Unk_ov18_02249A54 Unk_ov18_02249A54: ; 0x02249A54 - .incbin "incbin/overlay18_data.bin", 0x2F4, 0x30C - 0x2F4 + .asciz "char/jb3HlList1.nsc.l" + .space 0x2 .global Unk_ov18_02249A6C Unk_ov18_02249A6C: ; 0x02249A6C - .incbin "incbin/overlay18_data.bin", 0x30C, 0x324 - 0x30C + .asciz "char/jb3HlList2.nsc.l" + .space 0x2 .global Unk_ov18_02249A84 Unk_ov18_02249A84: ; 0x02249A84 - .incbin "incbin/overlay18_data.bin", 0x324, 0x33C - 0x324 + .asciz "char/jb3HlList3.nsc.l" + .space 0x2 .global Unk_ov18_02249A9C Unk_ov18_02249A9C: ; 0x02249A9C - .incbin "incbin/overlay18_data.bin", 0x33C, 0x354 - 0x33C + .asciz "char/jb5HlErase.nsc.l" + .space 0x2 .global Unk_ov18_02249AB4 Unk_ov18_02249AB4: ; 0x02249AB4 - .incbin "incbin/overlay18_data.bin", 0x354, 0x36C - 0x354 + .ascii "char/jb5HlOption.nsc.l" + .space 0x2 .global Unk_ov18_02249ACC Unk_ov18_02249ACC: ; 0x02249ACC - .incbin "incbin/overlay18_data.bin", 0x36C, 0x384 - 0x36C + .asciz "char/jb4HlGateway.nsc.l" .global Unk_ov18_02249AE4 Unk_ov18_02249AE4: ; 0x02249AE4 - .incbin "incbin/overlay18_data.bin", 0x384, 0x3D4 - 0x384 + .word Unk_ov18_022499AC + .word Unk_ov18_02249914 + .word Unk_ov18_02249A54 + .word Unk_ov18_02249A6C + .word Unk_ov18_02249A84 + .word Unk_ov18_02249A3C + .word Unk_ov18_022499F4 + .word Unk_ov18_02249A24 + .word Unk_ov18_02249950 + .word Unk_ov18_0224997C + .word Unk_ov18_0224993C + .word Unk_ov18_02249928 + .word Unk_ov18_022499DC + .word Unk_ov18_02249ACC + .word Unk_ov18_02249A0C + .word Unk_ov18_02249964 + .word Unk_ov18_02249AB4 + .word Unk_ov18_022499C4 + .word Unk_ov18_02249A9C + .word Unk_ov18_02249994 .global Unk_ov18_02249B34 Unk_ov18_02249B34: ; 0x02249B34 - .incbin "incbin/overlay18_data.bin", 0x3D4, 0x12 + .asciz "char/jbBgHl.ncg.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/icon.s b/lib/NitroDWC/asm/util/icon.s index 1d193da59c..a782a4fb86 100644 --- a/lib/NitroDWC/asm/util/icon.s +++ b/lib/NitroDWC/asm/util/icon.s @@ -132,13 +132,13 @@ _0222BE2C: .word 0xFE00FF00 .global Unk_ov18_02248D1C Unk_ov18_02248D1C: ; 0x02248D1C - .incbin "incbin/overlay18_rodata.bin", 0x28E8, 0x28EC - 0x28E8 + .short 0xE5 + .short 0x26 .global Unk_ov18_02248D20 Unk_ov18_02248D20: ; 0x02248D20 - .incbin "incbin/overlay18_rodata.bin", 0x28EC, 0x8 - - + .byte 0x18, 0x17, 0x16, 0x15 + .byte 0x5F, 0x5E, 0x5D, 0x5C .bss diff --git a/asm/incbin/overlay18_rodata.bin b/lib/NitroDWC/asm/util/incbin/atermset.bin similarity index 75% rename from asm/incbin/overlay18_rodata.bin rename to lib/NitroDWC/asm/util/incbin/atermset.bin index 105607a09bdd9bb6f90eb904cc6855d56eeef483..c1b91dbcb69ff0e56a9d66ce21c4139693bae36e 100644 GIT binary patch delta 8 PcmeB4+Yqo(!$1Q75T*kp delta 2810 zcmbW3du$w66^G9}c6RnJMm+8XPif=N#eL^Torp`J8qJuDX|mhiCLUL zLunW*2_Qj4Qn!dAswfE5hTuZPqpCy^5h@Tt5fMTH8bnhGf*MeT_$v}=mhY~;CW(-c zxb`={``Vc^_nvd^T*{uFYS(3rjOPIImRSg=H(P5n_DF* ziN?5Wmtp3i zQ~M4aIV8c5>C=sHWS}>T~^NmTQ;$-9Uxy1}g(@s4D1Ys(Z9ZZCEd< zix{QLO3Y||sjsXdYLz#Z`74^r?aJngKvk?VSRJnl)wEP+dJ?H{-SXPVvevqi`nF}I z4axdwV|zoH*VNHi-n^ozBDS)*GTs@hYUzqsC%Ri|Qr+p=R%dx#o71{1>9p0iJIRI) zr@e87+tIYrUD4d>u8eiLo$+qBE1!02B%Dh0)TX;r%bk!bHSQhvw)4L8uY5i>tDICh z@#-}Tj;x%zyn>)C6KU|+$uNG}fGV$6MK=rsXQrYqg__K;Tys$L@YU@6T5;K?Rg%Uv z9dhGv;&byAR^&>_>NkEwQldK zbjC@E3=IyAJv21n4R;NUl2vSMpO^FUee@P;;kDBZ6edW%0I%`N8{187#fTfCo5X1XOW^3WC@whA3W zC(x(SFS4lm(!JF4o#L$uy~ifp4Y@}T968#*d-72C^pQyn^Rp#a*#JLxx=Ob2%R%%M z`dRcm(NQn&OQ)Egbjvj&-((Z6kt$50^O`(`o4hUk+~h9%IWI~{Y?nJlhC~^ zm*?T?+X?;eU^CDTn<3pdxMOPOKAqyp?77ZK#4w~={|qhAs)C$CWXD;*+6SF$mavQ$`^_gK5My7@c#JBApAuLt!# zu+Y}28LW_2F!~mUku7`V)A)I@oTRP7TD??pd=KsY9s_Ssxw1GxS$`8JvT&{(abGO6 zv{fFsdwiVs6#cKFKU*B zyY%S04ANP+|5fb!CfF>u`YO^iQyTI50ag7EdFpvjllr>H_}1GFhe;L+^(|QB_gJjB z!RfxhX3p)MB$i|WlPtHuSfPEBLq?%oQLzV9J4)!OzoG`@WjQG?56WU?Nkuko8tx(G j@|~%&#Ga=ng%lVqi)u>fnbl$hXN+hm6z#Ii#zg)N@x~Fr diff --git a/lib/NitroDWC/asm/util/incbin/button.bin b/lib/NitroDWC/asm/util/incbin/button.bin new file mode 100644 index 0000000000000000000000000000000000000000..0656a7de722b2cd333569cfe87efde324b0401d4 GIT binary patch literal 52 xcmZQzSiw-iAi%)Eu!f-ph}Gp)8Ppk+Wfd7B8PpXS7#To-krBjTWMTv(1^~3k1h@bI literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/util/incbin/common.bin b/lib/NitroDWC/asm/util/incbin/common.bin new file mode 100644 index 0000000000000000000000000000000000000000..c092eb7615a6cf714cfa9eb9e9699a59f02d79ae GIT binary patch literal 80 zcmd;Ouwi({5XZpFpaG-{7#dg@7#f(c<7@^ch8!TS0peI7jtAmeAPxZHtkksh%;IbY E005&6RsaA1 literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/util/incbin/keyboard.bin b/lib/NitroDWC/asm/util/incbin/keyboard.bin new file mode 100644 index 0000000000000000000000000000000000000000..e08aba3d914c008f6b7783a257a22b0d99ce9deb GIT binary patch literal 708 zcmXZai-*)v6u|K_znR&2{pS6C|7Pd8JMX!7Ra+~vq{LbhDUtLbB@(Nw)>a~s9wZVe z*@{F;BoZl+NTfs}k^Y1p(|76caj)x~b04l@7jZa6)=Y^ko)DQ_J+Ue$hRjJs!dMQ& zG)4CTnml=ql2{s8koc;?7$%`;u3D*F-vHCtf_*rO zv$%%)c#ik@jw*Yvzy@r?0UXD9+`vP;#7F!@n{%$kEOy}tPU8yh;wj$ZD-4;D7;0FF zjo6NZSil9`#3Q^yL3T?I>#!MnFo!d^ihFp5cld^~9FqyG$5!meJkH@d9^eH&;0K!A zY6>&hiNiRB%eajvc!Mu6=xoZ1y0 z(e8*#d!labjd`>$?$v`t*XB=|Mj-9C2QvXjC>wN!bD@z)KJ1DXBJNl*>WN!1Z=w|U zB}Ws3ZnW}(0 K99j#@|MMR(yMr|V literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/util/incbin/keyboard10.bin b/lib/NitroDWC/asm/util/incbin/keyboard10.bin new file mode 100644 index 0000000000000000000000000000000000000000..169fb3cd3d5b6667b3f480bbc321fafb0cf8bad8 GIT binary patch literal 272 zcmW;HJ5Iwu6h`6WdH6XaL7=2y33)%HumR*EVh5HtfT%2&QF}{mCKJXni7#&4mE(tt+Og-rnhjePELkz8z m&2yU-smsgEr&X1fp~$LO=0%J}B>aWn@&AYQX1iFf=I{^8Mk1F0 literal 0 HcmV?d00001 diff --git a/lib/NitroDWC/asm/util/include/scenesetedit32.inc b/lib/NitroDWC/asm/util/include/scenesetedit32.inc index ea5dd8f97e..34ed651eec 100644 --- a/lib/NitroDWC/asm/util/include/scenesetedit32.inc +++ b/lib/NitroDWC/asm/util/include/scenesetedit32.inc @@ -36,6 +36,8 @@ .public ov18_022358B0 .public ov18_02236BE0 .public ov18_0223C21C +.public ov18_0223DE08 +.public ov18_0223DE38 .public ov18_0223E068 .public ov18_0223E994 .public ov18_0223FC48 diff --git a/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc b/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc index 813fbe70d7..99bcd427d3 100644 --- a/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc +++ b/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc @@ -42,6 +42,16 @@ .public ov18_0223654C .public ov18_02236578 .public ov18_02236BE0 +.public ov18_0223DFD0 +.public ov18_0223DFEC +.public ov18_0223E008 +.public ov18_0223E028 +.public ov18_0223E048 +.public ov18_0223E08C +.public ov18_0223E0CC +.public ov18_0223E10C +.public ov18_0223E150 +.public ov18_0223E194 .public ov18_0223E834 .public ov18_0223E994 .public ov18_0223FC48 diff --git a/lib/NitroDWC/asm/util/keyboard.s b/lib/NitroDWC/asm/util/keyboard.s index e70cff8435..b4ac546719 100644 --- a/lib/NitroDWC/asm/util/keyboard.s +++ b/lib/NitroDWC/asm/util/keyboard.s @@ -2127,75 +2127,75 @@ _0222DAD8: .word Unk_ov18_0225329C .global Unk_ov18_02248D28 Unk_ov18_02248D28: ; 0x02248D28 - .incbin "incbin/overlay18_rodata.bin", 0x28F4, 0x28F8 - 0x28F4 + .incbin "incbin/keyboard.bin", 0x0, 0x4 .global Unk_ov18_02248D2C Unk_ov18_02248D2C: ; 0x02248D2C - .incbin "incbin/overlay18_rodata.bin", 0x28F8, 0x28FC - 0x28F8 + .incbin "incbin/keyboard.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248D30 Unk_ov18_02248D30: ; 0x02248D30 - .incbin "incbin/overlay18_rodata.bin", 0x28FC, 0x2900 - 0x28FC + .incbin "incbin/keyboard.bin", 0x8, 0xC - 0x8 .global Unk_ov18_02248D34 Unk_ov18_02248D34: ; 0x02248D34 - .incbin "incbin/overlay18_rodata.bin", 0x2900, 0x2904 - 0x2900 + .incbin "incbin/keyboard.bin", 0xC, 0x10 - 0xC .global Unk_ov18_02248D38 Unk_ov18_02248D38: ; 0x02248D38 - .incbin "incbin/overlay18_rodata.bin", 0x2904, 0x2908 - 0x2904 + .incbin "incbin/keyboard.bin", 0x10, 0x14 - 0x10 .global Unk_ov18_02248D3C Unk_ov18_02248D3C: ; 0x02248D3C - .incbin "incbin/overlay18_rodata.bin", 0x2908, 0x290C - 0x2908 + .incbin "incbin/keyboard.bin", 0x14, 0x18 - 0x14 .global Unk_ov18_02248D40 Unk_ov18_02248D40: ; 0x02248D40 - .incbin "incbin/overlay18_rodata.bin", 0x290C, 0x2910 - 0x290C + .incbin "incbin/keyboard.bin", 0x18, 0x1C - 0x18 .global Unk_ov18_02248D44 Unk_ov18_02248D44: ; 0x02248D44 - .incbin "incbin/overlay18_rodata.bin", 0x2910, 0x2914 - 0x2910 + .incbin "incbin/keyboard.bin", 0x1C, 0x20 - 0x1C .global Unk_ov18_02248D48 Unk_ov18_02248D48: ; 0x02248D48 - .incbin "incbin/overlay18_rodata.bin", 0x2914, 0x2919 - 0x2914 + .incbin "incbin/keyboard.bin", 0x20, 0x21 - 0x20 .global Unk_ov18_02248D4D Unk_ov18_02248D4D: ; 0x02248D4D - .incbin "incbin/overlay18_rodata.bin", 0x2919, 0x291E - 0x2919 + .incbin "incbin/keyboard.bin", 0x21, 0x2A - 0x21 .global Unk_ov18_02248D52 Unk_ov18_02248D52: ; 0x02248D52 - .incbin "incbin/overlay18_rodata.bin", 0x291E, 0x2924 - 0x291E + .incbin "incbin/keyboard.bin", 0x2A, 0x30 - 0x2A .global Unk_ov18_02248D58 Unk_ov18_02248D58: ; 0x02248D58 - .incbin "incbin/overlay18_rodata.bin", 0x2924, 0x292C - 0x2924 + .incbin "incbin/keyboard.bin", 0x30, 0x38 - 0x30 .global Unk_ov18_02248D60 Unk_ov18_02248D60: ; 0x02248D60 - .incbin "incbin/overlay18_rodata.bin", 0x292C, 0x293C - 0x292C + .incbin "incbin/keyboard.bin", 0x38, 0x48 - 0x38 .global Unk_ov18_02248D70 Unk_ov18_02248D70: ; 0x02248D70 - .incbin "incbin/overlay18_rodata.bin", 0x293C, 0x294C - 0x293C + .incbin "incbin/keyboard.bin", 0x48, 0x58 - 0x48 .global Unk_ov18_02248D80 Unk_ov18_02248D80: ; 0x02248D80 - .incbin "incbin/overlay18_rodata.bin", 0x294C, 0x2A08 - 0x294C + .incbin "incbin/keyboard.bin", 0x58, 0x114 - 0x58 .global Unk_ov18_02248E3C Unk_ov18_02248E3C: ; 0x02248E3C - .incbin "incbin/overlay18_rodata.bin", 0x2A08, 0x2ADC - 0x2A08 + .incbin "incbin/keyboard.bin", 0x114, 0x1E8 - 0x114 .global Unk_ov18_02248F10 Unk_ov18_02248F10: ; 0x02248F10 - .incbin "incbin/overlay18_rodata.bin", 0x2ADC, 0x2BB0 - 0x2ADC + .incbin "incbin/keyboard.bin", 0x1E8, 0x2BC - 0x1E8 .global Unk_ov18_02248FE4 Unk_ov18_02248FE4: ; 0x02248FE4 - .incbin "incbin/overlay18_rodata.bin", 0x2BB0, 0x5 + .incbin "incbin/keyboard.bin", 0x2BC, 0x8 @@ -2204,40 +2204,335 @@ Unk_ov18_02248FE4: ; 0x02248FE4 .global Unk_ov18_02249B48 Unk_ov18_02249B48: ; 0x02249B48 - .incbin "incbin/overlay18_data.bin", 0x3E8, 0x3F4 - 0x3E8 + .word Unk_ov18_02249CF8 + .word Unk_ov18_02249C98 + .word Unk_ov18_02249CC8 .global Unk_ov18_02249B54 Unk_ov18_02249B54: ; 0x02249B54 - .incbin "incbin/overlay18_data.bin", 0x3F4, 0x400 - 0x3F4 + .word Unk_ov18_02249B70 + .word Unk_ov18_02249BD2 + .word Unk_ov18_02249C34 .global Unk_ov18_02249B60 Unk_ov18_02249B60: ; 0x02249B60 - .incbin "incbin/overlay18_data.bin", 0x400, 0x410 - 0x400 + .space 0xC + .word 0x2 .global Unk_ov18_02249B70 Unk_ov18_02249B70: ; 0x02249B70 - .incbin "incbin/overlay18_data.bin", 0x410, 0x472 - 0x410 + .ascii "1" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "3" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "5" + .space 0x1 + .ascii "6" + .space 0x1 + .ascii "7" + .space 0x1 + .ascii "8" + .space 0x1 + .ascii "9" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "=" + .space 0x1 + .ascii "q" + .space 0x1 + .ascii "w" + .space 0x1 + .ascii "e" + .space 0x1 + .ascii "r" + .space 0x1 + .ascii "t" + .space 0x1 + .ascii "y" + .space 0x1 + .ascii "u" + .space 0x1 + .ascii "i" + .space 0x1 + .ascii "o" + .space 0x1 + .ascii "p" + .space 0x1 + .ascii "[" + .space 0x1 + .ascii "]" + .space 0x1 + .ascii "a" + .space 0x1 + .ascii "s" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "f" + .space 0x1 + .ascii "g" + .space 0x1 + .ascii "h" + .space 0x1 + .ascii "j" + .space 0x1 + .ascii "k" + .space 0x1 + .ascii "l" + .space 0x1 + .ascii ";" + .space 0x1 + .ascii "'" + .space 0x1 + .ascii "`" + .space 0x1 + .ascii "z" + .space 0x1 + .ascii "x" + .space 0x1 + .ascii "c" + .space 0x1 + .ascii "v" + .space 0x1 + .ascii "b" + .space 0x1 + .ascii "n" + .space 0x1 + .ascii "m" + .space 0x1 + .ascii "," + .space 0x1 + .ascii "." + .space 0x1 + .ascii "/" + .space 0x1 + .byte 0x5C + .space 0x1 + .ascii " " + .space 0x3 .global Unk_ov18_02249BD2 Unk_ov18_02249BD2: ; 0x02249BD2 - .incbin "incbin/overlay18_data.bin", 0x472, 0x4D4 - 0x472 + .ascii "!" + .space 0x1 + .ascii "@" + .space 0x1 + .ascii "#" + .space 0x1 + .ascii "$" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "^" + .space 0x1 + .ascii "&" + .space 0x1 + .ascii "*" + .space 0x1 + .ascii "(" + .space 0x1 + .ascii ")" + .space 0x1 + .ascii "_" + .space 0x1 + .ascii "+" + .space 0x1 + .ascii "Q" + .space 0x1 + .ascii "W" + .space 0x1 + .ascii "E" + .space 0x1 + .ascii "R" + .space 0x1 + .ascii "T" + .space 0x1 + .ascii "Y" + .space 0x1 + .ascii "U" + .space 0x1 + .ascii "I" + .space 0x1 + .ascii "O" + .space 0x1 + .ascii "P" + .space 0x1 + .ascii "{" + .space 0x1 + .ascii "}" + .space 0x1 + .ascii "A" + .space 0x1 + .ascii "S" + .space 0x1 + .ascii "D" + .space 0x1 + .ascii "F" + .space 0x1 + .ascii "G" + .space 0x1 + .ascii "H" + .space 0x1 + .ascii "J" + .space 0x1 + .ascii "K" + .space 0x1 + .ascii "L" + .space 0x1 + .ascii ":" + .space 0x1 + .byte 0x22 + .space 0x1 + .ascii "~" + .space 0x1 + .ascii "Z" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "C" + .space 0x1 + .ascii "V" + .space 0x1 + .ascii "B" + .space 0x1 + .ascii "N" + .space 0x1 + .ascii "M" + .space 0x1 + .ascii "<" + .space 0x1 + .ascii ">" + .space 0x1 + .ascii "?" + .space 0x1 + .ascii "|" + .space 0x1 + .ascii " " + .space 0x3 .global Unk_ov18_02249C34 Unk_ov18_02249C34: ; 0x02249C34 - .incbin "incbin/overlay18_data.bin", 0x4D4, 0x538 - 0x4D4 + .ascii "1" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "3" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "5" + .space 0x1 + .ascii "6" + .space 0x1 + .ascii "7" + .space 0x1 + .ascii "8" + .space 0x1 + .ascii "9" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "=" + .space 0x1 + .ascii "Q" + .space 0x1 + .ascii "W" + .space 0x1 + .ascii "E" + .space 0x1 + .ascii "R" + .space 0x1 + .ascii "T" + .space 0x1 + .ascii "Y" + .space 0x1 + .ascii "U" + .space 0x1 + .ascii "I" + .space 0x1 + .ascii "O" + .space 0x1 + .ascii "P" + .space 0x1 + .ascii "[" + .space 0x1 + .ascii "]" + .space 0x1 + .ascii "A" + .space 0x1 + .ascii "S" + .space 0x1 + .ascii "D" + .space 0x1 + .ascii "F" + .space 0x1 + .ascii "G" + .space 0x1 + .ascii "H" + .space 0x1 + .ascii "J" + .space 0x1 + .ascii "K" + .space 0x1 + .ascii "L" + .space 0x1 + .ascii ";" + .space 0x1 + .ascii "'" + .space 0x1 + .ascii "`" + .space 0x1 + .ascii "Z" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "C" + .space 0x1 + .ascii "V" + .space 0x1 + .ascii "B" + .space 0x1 + .ascii "N" + .space 0x1 + .ascii "M" + .space 0x1 + .ascii "," + .space 0x1 + .ascii "." + .space 0x1 + .ascii "/" + .space 0x1 + .byte 0x5C + .space 0x1 + .ascii " " + .space 0x5 .global Unk_ov18_02249C98 Unk_ov18_02249C98: ; 0x02249C98 - .incbin "incbin/overlay18_data.bin", 0x538, 0x568 - 0x538 + .ascii "!@#$%^&*()_+QWERTYUIOP{}ASDFGHJKL:" + .byte 0x22 + .asciz "~ZXCVBNM<>?|" .global Unk_ov18_02249CC8 Unk_ov18_02249CC8: ; 0x02249CC8 - .incbin "incbin/overlay18_data.bin", 0x568, 0x598 - 0x568 + .ascii "1234567890-=QWERTYUIOP[]ASDFGHJKL;'`ZXCVBNM,./" + .byte 0x5C + .space 0x1 .global Unk_ov18_02249CF8 Unk_ov18_02249CF8: ; 0x02249CF8 - .incbin "incbin/overlay18_data.bin", 0x598, 0x30 - + .ascii "1234567890-=qwertyuiop[]asdfghjkl;'`zxcvbnm,./" + .byte 0x5C + .space 0x1 .bss diff --git a/lib/NitroDWC/asm/util/keyboard10.s b/lib/NitroDWC/asm/util/keyboard10.s index 9c9f6ad5d9..e653502676 100644 --- a/lib/NitroDWC/asm/util/keyboard10.s +++ b/lib/NitroDWC/asm/util/keyboard10.s @@ -1578,87 +1578,87 @@ _0222F02C: .word Unk_ov18_022532A0 .global Unk_ov18_02248FEC Unk_ov18_02248FEC: ; 0x02248FEC - .incbin "incbin/overlay18_rodata.bin", 0x2BB8, 0x2BBC - 0x2BB8 + .incbin "incbin/keyboard10.bin", 0x0, 0x4 .global Unk_ov18_02248FF0 Unk_ov18_02248FF0: ; 0x02248FF0 - .incbin "incbin/overlay18_rodata.bin", 0x2BBC, 0x2BC0 - 0x2BBC + .incbin "incbin/keyboard10.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248FF4 Unk_ov18_02248FF4: ; 0x02248FF4 - .incbin "incbin/overlay18_rodata.bin", 0x2BC0, 0x2BC4 - 0x2BC0 + .incbin "incbin/keyboard10.bin", 0x8, 0xC - 0x8 .global Unk_ov18_02248FF8 Unk_ov18_02248FF8: ; 0x02248FF8 - .incbin "incbin/overlay18_rodata.bin", 0x2BC4, 0x2BC8 - 0x2BC4 + .incbin "incbin/keyboard10.bin", 0xC, 0x10 - 0xC .global Unk_ov18_02248FFC Unk_ov18_02248FFC: ; 0x02248FFC - .incbin "incbin/overlay18_rodata.bin", 0x2BC8, 0x2BCC - 0x2BC8 + .incbin "incbin/keyboard10.bin", 0x10, 0x14 - 0x10 .global Unk_ov18_02249000 Unk_ov18_02249000: ; 0x02249000 - .incbin "incbin/overlay18_rodata.bin", 0x2BCC, 0x2BD0 - 0x2BCC + .incbin "incbin/keyboard10.bin", 0x14, 0x18 - 0x14 .global Unk_ov18_02249004 Unk_ov18_02249004: ; 0x02249004 - .incbin "incbin/overlay18_rodata.bin", 0x2BD0, 0x2BD4 - 0x2BD0 + .incbin "incbin/keyboard10.bin", 0x18, 0x1C - 0x18 .global Unk_ov18_02249008 Unk_ov18_02249008: ; 0x02249008 - .incbin "incbin/overlay18_rodata.bin", 0x2BD4, 0x2BD8 - 0x2BD4 + .incbin "incbin/keyboard10.bin", 0x1C, 0x20 - 0x1C .global Unk_ov18_0224900C Unk_ov18_0224900C: ; 0x0224900C - .incbin "incbin/overlay18_rodata.bin", 0x2BD8, 0x2BDC - 0x2BD8 + .incbin "incbin/keyboard10.bin", 0x20, 0x24 - 0x20 .global Unk_ov18_02249010 Unk_ov18_02249010: ; 0x02249010 - .incbin "incbin/overlay18_rodata.bin", 0x2BDC, 0x2BE0 - 0x2BDC + .incbin "incbin/keyboard10.bin", 0x24, 0x28 - 0x24 .global Unk_ov18_02249014 Unk_ov18_02249014: ; 0x02249014 - .incbin "incbin/overlay18_rodata.bin", 0x2BE0, 0x2BE5 - 0x2BE0 + .incbin "incbin/keyboard10.bin", 0x28, 0x2D - 0x28 .global Unk_ov18_02249019 Unk_ov18_02249019: ; 0x02249019 - .incbin "incbin/overlay18_rodata.bin", 0x2BE5, 0x2BEA - 0x2BE5 + .incbin "incbin/keyboard10.bin", 0x2D, 0x32 - 0x2D .global Unk_ov18_0224901E Unk_ov18_0224901E: ; 0x0224901E - .incbin "incbin/overlay18_rodata.bin", 0x2BEA, 0x2BF0 - 0x2BEA + .incbin "incbin/keyboard10.bin", 0x32, 0x38 - 0x32 .global Unk_ov18_02249024 Unk_ov18_02249024: ; 0x02249024 - .incbin "incbin/overlay18_rodata.bin", 0x2BF0, 0x2BF8 - 0x2BF0 + .incbin "incbin/keyboard10.bin", 0x38, 0x40 - 0x38 .global Unk_ov18_0224902C Unk_ov18_0224902C: ; 0x0224902C - .incbin "incbin/overlay18_rodata.bin", 0x2BF8, 0x2C00 - 0x2BF8 + .incbin "incbin/keyboard10.bin", 0x40, 0x48 - 0x40 .global Unk_ov18_02249034 Unk_ov18_02249034: ; 0x02249034 - .incbin "incbin/overlay18_rodata.bin", 0x2C00, 0x2C08 - 0x2C00 + .incbin "incbin/keyboard10.bin", 0x48, 0x50 - 0x48 .global Unk_ov18_0224903C Unk_ov18_0224903C: ; 0x0224903C - .incbin "incbin/overlay18_rodata.bin", 0x2C08, 0x2C22 - 0x2C08 + .incbin "incbin/keyboard10.bin", 0x50, 0x6A - 0x50 .global Unk_ov18_02249056 Unk_ov18_02249056: ; 0x02249056 - .incbin "incbin/overlay18_rodata.bin", 0x2C22, 0x2C4A - 0x2C22 + .incbin "incbin/keyboard10.bin", 0x6A, 0x92 - 0x6A .global Unk_ov18_0224907E Unk_ov18_0224907E: ; 0x0224907E - .incbin "incbin/overlay18_rodata.bin", 0x2C4A, 0x2C82 - 0x2C4A + .incbin "incbin/keyboard10.bin", 0x92, 0xCA - 0x92 .global Unk_ov18_022490B6 Unk_ov18_022490B6: ; 0x022490B6 - .incbin "incbin/overlay18_rodata.bin", 0x2C82, 0x2CBC - 0x2C82 + .incbin "incbin/keyboard10.bin", 0xCA, 0x104 - 0xCA .global Unk_ov18_022490F0 Unk_ov18_022490F0: ; 0x022490F0 - .incbin "incbin/overlay18_rodata.bin", 0x2CBC, 0xB + .incbin "incbin/keyboard10.bin", 0x104, 0xC diff --git a/lib/NitroDWC/asm/util/libaoss.s b/lib/NitroDWC/asm/util/libaoss.s index 909b65089b..5d222bf456 100644 --- a/lib/NitroDWC/asm/util/libaoss.s +++ b/lib/NitroDWC/asm/util/libaoss.s @@ -160,7 +160,7 @@ _0222F208: .word ov18_022450D0 .global Unk_ov18_022490FC Unk_ov18_022490FC: ; 0x022490FC - .incbin "incbin/overlay18_rodata.bin", 0x2CC8, 0xC + .asciz "NINTENDO-DS" diff --git a/lib/NitroDWC/asm/util/move.s b/lib/NitroDWC/asm/util/move.s index 2c8ac384f2..2e41ae3a90 100644 --- a/lib/NitroDWC/asm/util/move.s +++ b/lib/NitroDWC/asm/util/move.s @@ -336,19 +336,26 @@ _0222FD38: .word Unk_ov18_022532D0 .global Unk_ov18_02249D28 Unk_ov18_02249D28: ; 0x02249D28 - .incbin "incbin/overlay18_data.bin", 0x5C8, 0x5DC - 0x5C8 + .asciz "dwc:/move/child.srl" .global Unk_ov18_02249D3C Unk_ov18_02249D3C: ; 0x02249D3C - .incbin "incbin/overlay18_data.bin", 0x5DC, 0x5F4 - 0x5DC + .ascii "dwc:/move/banner.plt" + .space 0x4 .global Unk_ov18_02249D54 Unk_ov18_02249D54: ; 0x02249D54 - .incbin "incbin/overlay18_data.bin", 0x5F4, 0x60C - 0x5F4 + .asciz "dwc:/move/banner.char" + .space 0x2 .global Unk_ov18_02249D6C Unk_ov18_02249D6C: ; 0x02249D6C - .incbin "incbin/overlay18_data.bin", 0x60C, 0x1C + .word Unk_ov18_02249D28 + .space 0x8 + .word Unk_ov18_02249D54 + .word Unk_ov18_02249D3C + .word 0x159 + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneinit.s b/lib/NitroDWC/asm/util/sceneinit.s index 4397bcc942..3888754aa3 100644 --- a/lib/NitroDWC/asm/util/sceneinit.s +++ b/lib/NitroDWC/asm/util/sceneinit.s @@ -197,87 +197,111 @@ _02230224: .word ov18_0223A6B4 .global Unk_ov18_02249D88 Unk_ov18_02249D88: ; 0x02249D88 - .incbin "incbin/overlay18_data.bin", 0x628, 0x638 - 0x628 + .asciz "msg/kor.bmg.l" + .space 0x2 .global Unk_ov18_02249D98 Unk_ov18_02249D98: ; 0x02249D98 - .incbin "incbin/overlay18_data.bin", 0x638, 0x648 - 0x638 + .asciz "msg/eng.bmg.l" + .space 0x2 .global Unk_ov18_02249DA8 Unk_ov18_02249DA8: ; 0x02249DA8 - .incbin "incbin/overlay18_data.bin", 0x648, 0x658 - 0x648 + .asciz "msg/ita.bmg.l" + .space 0x2 .global Unk_ov18_02249DB8 Unk_ov18_02249DB8: ; 0x02249DB8 - .incbin "incbin/overlay18_data.bin", 0x658, 0x668 - 0x658 + .asciz "msg/ger.bmg.l" + .space 0x2 .global Unk_ov18_02249DC8 Unk_ov18_02249DC8: ; 0x02249DC8 - .incbin "incbin/overlay18_data.bin", 0x668, 0x678 - 0x668 + .asciz "msg/fre.bmg.l" + .space 0x2 .global Unk_ov18_02249DD8 Unk_ov18_02249DD8: ; 0x02249DD8 - .incbin "incbin/overlay18_data.bin", 0x678, 0x688 - 0x678 + .asciz "msg/spa.bmg.l" + .space 0x2 .global Unk_ov18_02249DE8 Unk_ov18_02249DE8: ; 0x02249DE8 - .incbin "incbin/overlay18_data.bin", 0x688, 0x698 - 0x688 + .asciz "msg/jap.bmg.l" + .space 0x2 .global Unk_ov18_02249DF8 Unk_ov18_02249DF8: ; 0x02249DF8 - .incbin "incbin/overlay18_data.bin", 0x698, 0x6B4 - 0x698 + .word Unk_ov18_02249DE8 + .word Unk_ov18_02249D98 + .word Unk_ov18_02249DC8 + .word Unk_ov18_02249DB8 + .word Unk_ov18_02249DA8 + .word Unk_ov18_02249DD8 + .word Unk_ov18_02249D88 .global Unk_ov18_02249E14 Unk_ov18_02249E14: ; 0x02249E14 - .incbin "incbin/overlay18_data.bin", 0x6B4, 0x6C4 - 0x6B4 + .asciz "msg/usa.bmg.l" + .space 0x2 .global Unk_ov18_02249E24 Unk_ov18_02249E24: ; 0x02249E24 - .incbin "incbin/overlay18_data.bin", 0x6C4, 0x6D8 - 0x6C4 + .asciz "char/jtMain.nce.l" + .space 0x2 .global Unk_ov18_02249E38 Unk_ov18_02249E38: ; 0x02249E38 - .incbin "incbin/overlay18_data.bin", 0x6D8, 0x6EC - 0x6D8 + .asciz "char/jbMain.nce.l" + .space 0x2 .global Unk_ov18_02249E4C Unk_ov18_02249E4C: ; 0x02249E4C - .incbin "incbin/overlay18_data.bin", 0x6EC, 0x700 - 0x6EC + .asciz "char/jtBgMain.ncg.l" .global Unk_ov18_02249E60 Unk_ov18_02249E60: ; 0x02249E60 - .incbin "incbin/overlay18_data.bin", 0x700, 0x714 - 0x700 + .asciz "char/jtBgMain.ncl.l" .global Unk_ov18_02249E74 Unk_ov18_02249E74: ; 0x02249E74 - .incbin "incbin/overlay18_data.bin", 0x714, 0x72C - 0x714 + .ascii "char/jtObjMain.ncg.l" + .space 0x4 .global Unk_ov18_02249E8C Unk_ov18_02249E8C: ; 0x02249E8C - .incbin "incbin/overlay18_data.bin", 0x72C, 0x744 - 0x72C + .ascii "char/xtObjMain.ncl.l" + .space 0x4 .global Unk_ov18_02249EA4 Unk_ov18_02249EA4: ; 0x02249EA4 - .incbin "incbin/overlay18_data.bin", 0x744, 0x75C - 0x744 + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_02249EBC Unk_ov18_02249EBC: ; 0x02249EBC - .incbin "incbin/overlay18_data.bin", 0x75C, 0x774 - 0x75C + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_02249ED4 Unk_ov18_02249ED4: ; 0x02249ED4 - .incbin "incbin/overlay18_data.bin", 0x774, 0x78C - 0x774 + .ascii "char/jbObjMain.ncg.l" + .space 0x4 .global Unk_ov18_02249EEC Unk_ov18_02249EEC: ; 0x02249EEC - .incbin "incbin/overlay18_data.bin", 0x78C, 0x7A4 - 0x78C + .ascii "char/ybObjMain.ncl.l" + .space 0x4 .global Unk_ov18_02249F04 Unk_ov18_02249F04: ; 0x02249F04 - .incbin "incbin/overlay18_data.bin", 0x7A4, 0x7B8 - 0x7A4 + .ascii "char/jtTop.nsc.l" + .space 0x4 .global Unk_ov18_02249F18 Unk_ov18_02249F18: ; 0x02249F18 - .incbin "incbin/overlay18_data.bin", 0x7B8, 0x13 + .ascii "char/jtStep1.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenemenu.s b/lib/NitroDWC/asm/util/scenemenu.s index 460cb93445..bf1eed20a0 100644 --- a/lib/NitroDWC/asm/util/scenemenu.s +++ b/lib/NitroDWC/asm/util/scenemenu.s @@ -441,19 +441,19 @@ _0223079C: .word Unk_ov18_022532DC .global Unk_ov18_02249108 Unk_ov18_02249108: ; 0x02249108 - .incbin "incbin/overlay18_rodata.bin", 0x2CD4, 0x2CD6 - 0x2CD4 + .byte 0x1, 0x2 .global Unk_ov18_0224910A Unk_ov18_0224910A: ; 0x0224910A - .incbin "incbin/overlay18_rodata.bin", 0x2CD6, 0x2CE6 - 0x2CD6 + .short 0x8, 0x20, 0xAC, 0xA0, 0xB4, 0x20, 0xF8, 0xA0 .global Unk_ov18_0224911A Unk_ov18_0224911A: ; 0x0224911A - .incbin "incbin/overlay18_rodata.bin", 0x2CE6, 0x2CF6 - 0x2CE6 + .short 0x6, 0x1E, 0x9E, 0x92, 0xB2, 0x1E, 0xEA, 0x92 .global Unk_ov18_0224912A Unk_ov18_0224912A: ; 0x0224912A - .incbin "incbin/overlay18_rodata.bin", 0x2CF6, 0x16 + .asciz "char/ybBgStep11.ncl.l" @@ -462,15 +462,18 @@ Unk_ov18_0224912A: ; 0x0224912A .global Unk_ov18_02249F2C Unk_ov18_02249F2C: ; 0x02249F2C - .incbin "incbin/overlay18_data.bin", 0x7CC, 0x7E4 - 0x7CC + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_02249F44 Unk_ov18_02249F44: ; 0x02249F44 - .incbin "incbin/overlay18_data.bin", 0x7E4, 0x7FC - 0x7E4 + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_02249F5C Unk_ov18_02249F5C: ; 0x02249F5C - .incbin "incbin/overlay18_data.bin", 0x7FC, 0x13 + .ascii "char/jb2Menu.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneopterase.s b/lib/NitroDWC/asm/util/sceneopterase.s index d7272fbfd5..73c4844861 100644 --- a/lib/NitroDWC/asm/util/sceneopterase.s +++ b/lib/NitroDWC/asm/util/sceneopterase.s @@ -336,7 +336,7 @@ _02230B80: .word ov18_022309D8 .global Unk_ov18_02249F70 Unk_ov18_02249F70: ; 0x02249F70 - .incbin "incbin/overlay18_data.bin", 0x810, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneopterase1.s b/lib/NitroDWC/asm/util/sceneopterase1.s index 714f6049ab..fe56800cd6 100644 --- a/lib/NitroDWC/asm/util/sceneopterase1.s +++ b/lib/NitroDWC/asm/util/sceneopterase1.s @@ -206,5 +206,5 @@ ov18_02230D7C: ; 0x02230D7C .global Unk_ov18_02249F84 Unk_ov18_02249F84: ; 0x02249F84 - .incbin "incbin/overlay18_data.bin", 0x824, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptinfo.s b/lib/NitroDWC/asm/util/sceneoptinfo.s index cb59ffeec2..6eee552215 100644 --- a/lib/NitroDWC/asm/util/sceneoptinfo.s +++ b/lib/NitroDWC/asm/util/sceneoptinfo.s @@ -364,17 +364,149 @@ _0223122C: .word ov18_02231230 .global Unk_ov18_02249F98 Unk_ov18_02249F98: ; 0x02249F98 - .incbin "incbin/overlay18_data.bin", 0x838, 0x84C - 0x838 + .ascii "char/jb5Info.nsc.l" + .space 0x2 .global Unk_ov18_02249FAC Unk_ov18_02249FAC: ; 0x02249FAC - .incbin "incbin/overlay18_data.bin", 0x84C, 0x888 - 0x84C + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x3 .global Unk_ov18_02249FE8 Unk_ov18_02249FE8: ; 0x02249FE8 - .incbin "incbin/overlay18_data.bin", 0x888, 0x8B0 - 0x888 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x3 .global Unk_ov18_0224A010 Unk_ov18_0224A010: ; 0x0224A010 - .incbin "incbin/overlay18_data.bin", 0x8B0, 0x28 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x3 diff --git a/lib/NitroDWC/asm/util/sceneoptmenu.s b/lib/NitroDWC/asm/util/sceneoptmenu.s index 000e632e8b..d5a71466be 100644 --- a/lib/NitroDWC/asm/util/sceneoptmenu.s +++ b/lib/NitroDWC/asm/util/sceneoptmenu.s @@ -553,27 +553,32 @@ _02231944: .word ov18_0223D154 .global Unk_ov18_02249140 Unk_ov18_02249140: ; 0x02249140 - .incbin "incbin/overlay18_rodata.bin", 0x2D0C, 0x2D10 - 0x2D0C + .byte 0x1, 0x2, 0x3, 0x0 .global Unk_ov18_02249144 Unk_ov18_02249144: ; 0x02249144 - .incbin "incbin/overlay18_rodata.bin", 0x2D10, 0x2D14 - 0x2D10 + .short 0xE0 + .short 0x84 .global Unk_ov18_02249148 Unk_ov18_02249148: ; 0x02249148 - .incbin "incbin/overlay18_rodata.bin", 0x2D14, 0x2D2A - 0x2D14 + .asciz "char/ybBgOption.ncl.l" .global Unk_ov18_0224915E Unk_ov18_0224915E: ; 0x0224915E - .incbin "incbin/overlay18_rodata.bin", 0x2D2A, 0x2D42 - 0x2D2A + .ascii "char/ybBgOption1.ncl.l" + .space 0x2 .global Unk_ov18_02249176 Unk_ov18_02249176: ; 0x02249176 - .incbin "incbin/overlay18_rodata.bin", 0x2D42, 0x2D5A - 0x2D42 + .short 0x8, 0x24, 0xF8, 0x44, 0x8, 0x50, 0xF8 + .short 0x70, 0x8, 0x7C, 0xF8, 0x9C .global Unk_ov18_0224918E Unk_ov18_0224918E: ; 0x0224918E - .incbin "incbin/overlay18_rodata.bin", 0x2D5A, 0x18 + .short 0x6, 0x22, 0xEA + .short 0x36, 0x6, 0x4E, 0xEA, 0x62, 0x6, 0x7A, 0xEA + .short 0x8E @@ -582,11 +587,13 @@ Unk_ov18_0224918E: ; 0x0224918E .global Unk_ov18_0224A038 Unk_ov18_0224A038: ; 0x0224A038 - .incbin "incbin/overlay18_data.bin", 0x8D8, 0x8F0 - 0x8D8 + .asciz "char/jbBgOption.ncg.l" + .space 0x2 .global Unk_ov18_0224A050 Unk_ov18_0224A050: ; 0x0224A050 - .incbin "incbin/overlay18_data.bin", 0x8F0, 0x16 + .asciz "char/jb5OptMenu.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneoptmovcomm.s b/lib/NitroDWC/asm/util/sceneoptmovcomm.s index 7265414284..20aabc3301 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovcomm.s +++ b/lib/NitroDWC/asm/util/sceneoptmovcomm.s @@ -221,7 +221,7 @@ _02231BBC: .word ov18_02231A7C .global Unk_ov18_0224A068 Unk_ov18_0224A068: ; 0x0224A068 - .incbin "incbin/overlay18_data.bin", 0x908, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovconfirm.s b/lib/NitroDWC/asm/util/sceneoptmovconfirm.s index 8fe8ab1273..3955ed2832 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovconfirm.s +++ b/lib/NitroDWC/asm/util/sceneoptmovconfirm.s @@ -483,7 +483,7 @@ _02232344: .word ov18_02231DD0 .global Unk_ov18_0224A07C Unk_ov18_0224A07C: ; 0x0224A07C - .incbin "incbin/overlay18_data.bin", 0x91C, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s b/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s index 8c8c3a4a2b..b27eed88a4 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s +++ b/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s @@ -176,7 +176,7 @@ _0223252C: .word ov18_0223245C .global Unk_ov18_0224A090 Unk_ov18_0224A090: ; 0x0224A090 - .incbin "incbin/overlay18_data.bin", 0x930, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovfailure.s b/lib/NitroDWC/asm/util/sceneoptmovfailure.s index fc66b6c31a..f251612ac6 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovfailure.s +++ b/lib/NitroDWC/asm/util/sceneoptmovfailure.s @@ -293,7 +293,7 @@ _02232894: .word ov18_02232C90 .global Unk_ov18_0224A0A4 Unk_ov18_0224A0A4: ; 0x0224A0A4 - .incbin "incbin/overlay18_data.bin", 0x944, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovuser.s b/lib/NitroDWC/asm/util/sceneoptmovuser.s index 7ea9cb8592..5ee96deb8b 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovuser.s +++ b/lib/NitroDWC/asm/util/sceneoptmovuser.s @@ -326,7 +326,8 @@ _02232C6C: .word Unk_ov18_02253304 .global Unk_ov18_0224A0B8 Unk_ov18_0224A0B8: ; 0x0224A0B8 - .incbin "incbin/overlay18_data.bin", 0x958, 0x13 + .ascii "char/jb5Move.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneoptmovwait.s b/lib/NitroDWC/asm/util/sceneoptmovwait.s index 7d0305d0a4..e5ae75aea4 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovwait.s +++ b/lib/NitroDWC/asm/util/sceneoptmovwait.s @@ -343,7 +343,7 @@ _02233064: .word ov18_02232E5C .global Unk_ov18_0224A0CC Unk_ov18_0224A0CC: ; 0x0224A0CC - .incbin "incbin/overlay18_data.bin", 0x96C, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaossbutton.s b/lib/NitroDWC/asm/util/scenesetaossbutton.s index a67d54f689..c88cf9af98 100644 --- a/lib/NitroDWC/asm/util/scenesetaossbutton.s +++ b/lib/NitroDWC/asm/util/scenesetaossbutton.s @@ -473,15 +473,17 @@ _02233620: .word ov18_022333C4 .global Unk_ov18_0224A0E0 Unk_ov18_0224A0E0: ; 0x0224A0E0 - .incbin "incbin/overlay18_data.bin", 0x980, 0x998 - 0x980 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A0F8 Unk_ov18_0224A0F8: ; 0x0224A0F8 - .incbin "incbin/overlay18_data.bin", 0x998, 0x9B0 - 0x998 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A110 Unk_ov18_0224A110: ; 0x0224A110 - .incbin "incbin/overlay18_data.bin", 0x9B0, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaosscomplete.s b/lib/NitroDWC/asm/util/scenesetaosscomplete.s index b0466d844f..f11819087b 100644 --- a/lib/NitroDWC/asm/util/scenesetaosscomplete.s +++ b/lib/NitroDWC/asm/util/scenesetaosscomplete.s @@ -179,7 +179,7 @@ _02233814: .word ov18_02233738 .global Unk_ov18_0224A124 Unk_ov18_0224A124: ; 0x0224A124 - .incbin "incbin/overlay18_data.bin", 0x9C4, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaplist.s b/lib/NitroDWC/asm/util/scenesetaplist.s index bb46464b29..a1cfd65f6b 100644 --- a/lib/NitroDWC/asm/util/scenesetaplist.s +++ b/lib/NitroDWC/asm/util/scenesetaplist.s @@ -1611,31 +1611,36 @@ _02234DB0: .word ov18_02233D18 .global Unk_ov18_022491A8 Unk_ov18_022491A8: ; 0x022491A8 - .incbin "incbin/overlay18_rodata.bin", 0x2D74, 0x2D75 - 0x2D74 + .byte 0x2 .global Unk_ov18_022491A9 Unk_ov18_022491A9: ; 0x022491A9 - .incbin "incbin/overlay18_rodata.bin", 0x2D75, 0x2D8B - 0x2D75 + .asciz "char/ybBgStep31.ncl.l" .global Unk_ov18_022491BF Unk_ov18_022491BF: ; 0x022491BF - .incbin "incbin/overlay18_rodata.bin", 0x2D8B, 0x2DA4 - 0x2D8B + .asciz "char/xb4ApListBack.nsc.l" .global Unk_ov18_022491D8 Unk_ov18_022491D8: ; 0x022491D8 - .incbin "incbin/overlay18_rodata.bin", 0x2DA4, 0x2DCC - 0x2DA4 + .short 0x7, 0x32, 0xD0, 0x4C, 0x7, 0x4E + .short 0xD0, 0x68, 0x7, 0x6A, 0xD0, 0x84, 0x7, 0x86 + .short 0xD0, 0xA0, 0x85, 0x1B, 0xFD, 0x2C .global Unk_ov18_02249200 Unk_ov18_02249200: ; 0x02249200 - .incbin "incbin/overlay18_rodata.bin", 0x2DCC, 0x2DF4 - 0x2DCC + .short 0x4, 0x2E + .short 0xDB, 0x3F, 0x4, 0x4A, 0xDB, 0x5B, 0x4, 0x66 + .short 0xDB, 0x77, 0x4, 0x82, 0xDB, 0x93, 0x82, 0x18 + .short 0xF0, 0x2C .global Unk_ov18_02249228 Unk_ov18_02249228: ; 0x02249228 - .incbin "incbin/overlay18_rodata.bin", 0x2DF4, 0x2DF8 - 0x2DF4 + .asciz ".-3" .global Unk_ov18_0224922C Unk_ov18_0224922C: ; 0x0224922C - .incbin "incbin/overlay18_rodata.bin", 0x2DF8, 0x4 + .byte 0x18, 0x17, 0x16, 0x15 @@ -1644,7 +1649,7 @@ Unk_ov18_0224922C: ; 0x0224922C .global Unk_ov18_0224A138 Unk_ov18_0224A138: ; 0x0224A138 - .incbin "incbin/overlay18_data.bin", 0x9D8, 0x15 + .asciz "char/jb4ApList.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetedit32.s b/lib/NitroDWC/asm/util/scenesetedit32.s index efa91d157a..43957016b6 100644 --- a/lib/NitroDWC/asm/util/scenesetedit32.s +++ b/lib/NitroDWC/asm/util/scenesetedit32.s @@ -865,27 +865,31 @@ _022358F0: .word ov18_02234FF8 .global Unk_ov18_02249230 Unk_ov18_02249230: ; 0x02249230 - .incbin "incbin/overlay18_rodata.bin", 0x2DFC, 0x2DFE - 0x2DFC + .byte 0x3E, 0x3D .global Unk_ov18_02249232 Unk_ov18_02249232: ; 0x02249232 - .incbin "incbin/overlay18_rodata.bin", 0x2DFE, 0x2E04 - 0x2DFE + .short 0xE + .word 0x10 .global Unk_ov18_02249238 Unk_ov18_02249238: ; 0x02249238 - .incbin "incbin/overlay18_rodata.bin", 0x2E04, 0x2E0C - 0x2E04 + .word 0x47 + .word 0x48 .global Unk_ov18_02249240 Unk_ov18_02249240: ; 0x02249240 - .incbin "incbin/overlay18_rodata.bin", 0x2E0C, 0x2E14 - 0x2E0C + .word ov18_0223DE08 + .word ov18_0223DE38 .global Unk_ov18_02249248 Unk_ov18_02249248: ; 0x02249248 - .incbin "incbin/overlay18_rodata.bin", 0x2E14, 0x2E18 - 0x2E14 + .byte 0x20, 0x31, 0x0, 0x0 .global Unk_ov18_0224924C Unk_ov18_0224924C: ; 0x0224924C - .incbin "incbin/overlay18_rodata.bin", 0x2E18, 0x10 + .byte 0x8, 0x17, 0x26, 0x35, 0x44, 0x53, 0x62, 0x71 + .byte 0x80, 0x8F, 0x9E, 0xAD, 0xBC, 0xCB, 0xDA, 0xE9 @@ -894,23 +898,28 @@ Unk_ov18_0224924C: ; 0x0224924C .global Unk_ov18_0224A150 Unk_ov18_0224A150: ; 0x0224A150 - .incbin "incbin/overlay18_data.bin", 0x9F0, 0xA04 - 0x9F0 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A164 Unk_ov18_0224A164: ; 0x0224A164 - .incbin "incbin/overlay18_data.bin", 0xA04, 0xA1C - 0xA04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A17C Unk_ov18_0224A17C: ; 0x0224A17C - .incbin "incbin/overlay18_data.bin", 0xA1C, 0xA34 - 0xA1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A194 Unk_ov18_0224A194: ; 0x0224A194 - .incbin "incbin/overlay18_data.bin", 0xA34, 0xA48 - 0xA34 + .ascii "char/xb4Edit.nsc.l" + .space 0x2 .global Unk_ov18_0224A1A8 Unk_ov18_0224A1A8: ; 0x0224A1A8 - .incbin "incbin/overlay18_data.bin", 0xA48, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneseteditaddress.s b/lib/NitroDWC/asm/util/sceneseteditaddress.s index e963889a53..9648fcba4b 100644 --- a/lib/NitroDWC/asm/util/sceneseteditaddress.s +++ b/lib/NitroDWC/asm/util/sceneseteditaddress.s @@ -972,31 +972,42 @@ _022365B8: .word ov18_02235B78 .global Unk_ov18_0224925C Unk_ov18_0224925C: ; 0x0224925C - .incbin "incbin/overlay18_rodata.bin", 0x2E28, 0x2E2C - 0x2E28 + .asciz "255" .global Unk_ov18_02249260 Unk_ov18_02249260: ; 0x02249260 - .incbin "incbin/overlay18_rodata.bin", 0x2E2C, 0x2E30 - 0x2E2C + .short 0xB + .short 0x10 .global Unk_ov18_02249264 Unk_ov18_02249264: ; 0x02249264 - .incbin "incbin/overlay18_rodata.bin", 0x2E30, 0x2E36 - 0x2E30 + .asciz "?@ABC" + .space 0x2 .global Unk_ov18_0224926A Unk_ov18_0224926A: ; 0x0224926A - .incbin "incbin/overlay18_rodata.bin", 0x2E36, 0x2E40 - 0x2E36 + .word 0x29 + .space 0x4 .global Unk_ov18_02249274 Unk_ov18_02249274: ; 0x02249274 - .incbin "incbin/overlay18_rodata.bin", 0x2E40, 0x2E54 - 0x2E40 + .word ov18_0223E08C + .word ov18_0223E0CC + .word ov18_0223E10C + .word ov18_0223E150 + .word ov18_0223E194 .global Unk_ov18_02249288 Unk_ov18_02249288: ; 0x02249288 - .incbin "incbin/overlay18_rodata.bin", 0x2E54, 0x2E68 - 0x2E54 + .word ov18_0223DFD0 + .word ov18_0223DFEC + .word ov18_0223E008 + .word ov18_0223E028 + .word ov18_0223E048 .global Unk_ov18_0224929C Unk_ov18_0224929C: ; 0x0224929C - .incbin "incbin/overlay18_rodata.bin", 0x2E68, 0xC + .byte 0x31, 0x3D, 0x49, 0x5A, 0x66, 0x72, 0x83, 0x8F, 0x9B, 0xAC, 0xB8, 0xC4 @@ -1005,27 +1016,32 @@ Unk_ov18_0224929C: ; 0x0224929C .global Unk_ov18_0224A1C0 Unk_ov18_0224A1C0: ; 0x0224A1C0 - .incbin "incbin/overlay18_data.bin", 0xA60, 0xA64 - 0xA60 + .asciz " 0" .global Unk_ov18_0224A1C4 Unk_ov18_0224A1C4: ; 0x0224A1C4 - .incbin "incbin/overlay18_data.bin", 0xA64, 0xA78 - 0xA64 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A1D8 Unk_ov18_0224A1D8: ; 0x0224A1D8 - .incbin "incbin/overlay18_data.bin", 0xA78, 0xA90 - 0xA78 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A1F0 Unk_ov18_0224A1F0: ; 0x0224A1F0 - .incbin "incbin/overlay18_data.bin", 0xA90, 0xAA8 - 0xA90 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A208 Unk_ov18_0224A208: ; 0x0224A208 - .incbin "incbin/overlay18_data.bin", 0xAA8, 0xAC0 - 0xAA8 + .ascii "char/xb4EditAddr.nsc.l" + .space 0x2 .global Unk_ov18_0224A220 Unk_ov18_0224A220: ; 0x0224A220 - .incbin "incbin/overlay18_data.bin", 0xAC0, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneseterror.s b/lib/NitroDWC/asm/util/sceneseterror.s index c939ed4814..f5a6dcd66e 100644 --- a/lib/NitroDWC/asm/util/sceneseterror.s +++ b/lib/NitroDWC/asm/util/sceneseterror.s @@ -475,16 +475,16 @@ _02236BDC: .word Unk_ov18_02253328 .global Unk_ov18_022492A8 Unk_ov18_022492A8: ; 0x022492A8 - .incbin "incbin/overlay18_rodata.bin", 0x2E74, 0x2E7C - 0x2E74 + .byte 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 .global Unk_ov18_022492B0 Unk_ov18_022492B0: ; 0x022492B0 - .incbin "incbin/overlay18_rodata.bin", 0x2E7C, 0x2E84 - 0x2E7C + .short 0xD, 0x3C, 0xE6, 0x5E .global Unk_ov18_022492B8 Unk_ov18_022492B8: ; 0x022492B8 - .incbin "incbin/overlay18_rodata.bin", 0x2E84, 0x1C - + .short 0x62, 0x22, 0x62, 0x22, 0x3D, 0x22 + .short 0x65, 0x22, 0x6C, 0x22, 0x34, 0x22, 0x4E, 0x22 .data @@ -492,11 +492,12 @@ Unk_ov18_022492B8: ; 0x022492B8 .global Unk_ov18_0224A238 Unk_ov18_0224A238: ; 0x0224A238 - .incbin "incbin/overlay18_data.bin", 0xAD8, 0xAEC - 0xAD8 + .asciz "char/jb4Error.nsc.l" .global Unk_ov18_0224A24C Unk_ov18_0224A24C: ; 0x0224A24C - .incbin "incbin/overlay18_data.bin", 0xAEC, 0x6 + .short 0x25, 0x64 + .space 0x4 diff --git a/lib/NitroDWC/asm/util/scenesetlist.s b/lib/NitroDWC/asm/util/scenesetlist.s index 114d46c78b..14f2a70655 100644 --- a/lib/NitroDWC/asm/util/scenesetlist.s +++ b/lib/NitroDWC/asm/util/scenesetlist.s @@ -2715,71 +2715,81 @@ _022390A8: .word Unk_ov18_0225332C .global Unk_ov18_022492D4 Unk_ov18_022492D4: ; 0x022492D4 - .incbin "incbin/overlay18_rodata.bin", 0x2EA0, 0x2EA4 - 0x2EA0 + .byte 0x6, 0x8, 0x7 + .space 0x1 .global Unk_ov18_022492D8 Unk_ov18_022492D8: ; 0x022492D8 - .incbin "incbin/overlay18_rodata.bin", 0x2EA4, 0x2EA8 - 0x2EA4 + .byte 0x2, 0x3, 0x7, 0x8 .global Unk_ov18_022492DC Unk_ov18_022492DC: ; 0x022492DC - .incbin "incbin/overlay18_rodata.bin", 0x2EA8, 0x2EB0 - 0x2EA8 + .short 0xCC, 0x34, 0x1C, 0x18 .global Unk_ov18_022492E4 Unk_ov18_022492E4: ; 0x022492E4 - .incbin "incbin/overlay18_rodata.bin", 0x2EB0, 0x2EB8 - 0x2EB0 + .short 0x8F, 0x34, 0x2C, 0x18 .global Unk_ov18_022492EC Unk_ov18_022492EC: ; 0x022492EC - .incbin "incbin/overlay18_rodata.bin", 0x2EB8, 0x2EC0 - 0x2EB8 + .short 0xC0, 0x34, 0x2C, 0x18 .global Unk_ov18_022492F4 Unk_ov18_022492F4: ; 0x022492F4 - .incbin "incbin/overlay18_rodata.bin", 0x2EC0, 0x2ECE - 0x2EC0 + .byte 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x3, 0x4, 0x5 .global Unk_ov18_02249302 Unk_ov18_02249302: ; 0x02249302 - .incbin "incbin/overlay18_rodata.bin", 0x2ECE, 0x2EDE - 0x2ECE + .byte 0x0, 0x29, 0x2C, 0x52, 0x53, 0x30, 0x0, 0x2A, 0x30, 0x54, 0x55, 0x0, 0x0, 0x2B + .space 0x2 .global Unk_ov18_02249312 Unk_ov18_02249312: ; 0x02249312 - .incbin "incbin/overlay18_rodata.bin", 0x2EDE, 0x2EF0 - 0x2EDE + .short 0x0, 0x60, 0xE0, 0x140, 0x1C0, 0x240, 0x2A0, 0x320, 0x3A0 .global Unk_ov18_02249324 Unk_ov18_02249324: ; 0x02249324 - .incbin "incbin/overlay18_rodata.bin", 0x2EF0, 0x2F05 - 0x2EF0 + .asciz "char/ybBgStep2.ncl.l" .global Unk_ov18_02249339 Unk_ov18_02249339: ; 0x02249339 - .incbin "incbin/overlay18_rodata.bin", 0x2F05, 0x2F1B - 0x2F05 + .asciz "char/ybBgStep21.ncl.l" .global Unk_ov18_0224934F Unk_ov18_0224934F: ; 0x0224934F - .incbin "incbin/overlay18_rodata.bin", 0x2F1B, 0x2F32 - 0x2F1B + .asciz "char/jb3ListBack.nsc.l" .global Unk_ov18_02249366 Unk_ov18_02249366: ; 0x02249366 - .incbin "incbin/overlay18_rodata.bin", 0x2F32, 0x2F4A - 0x2F32 + .short 0x84, 0x1B, 0xFC, 0x2C, 0x84, 0xAC, 0xFC + .short 0xBD, 0x4, 0xAC, 0x7C, 0xBD .global Unk_ov18_0224937E Unk_ov18_0224937E: ; 0x0224937E - .incbin "incbin/overlay18_rodata.bin", 0x2F4A, 0x2F7C - 0x2F4A + .short 0xC8, 0x31, 0xE0 + .short 0x4D, 0xBC, 0x31, 0xE0, 0x4D, 0x8B, 0x31, 0xAF + .short 0x4D, 0x82, 0x18, 0xEE, 0x2C, 0x82, 0xA9, 0xEE + .short 0xBD, 0x2, 0xA9, 0x6E, 0xBD, 0x0 .global Unk_ov18_022493B0 Unk_ov18_022493B0: ; 0x022493B0 - .incbin "incbin/overlay18_rodata.bin", 0x2F7C, 0x2F84 - 0x2F7C + .byte 0xFF, 0x23, 0x27, 0xFF + .byte 0x23, 0x2F, 0xFF, 0x0 .global Unk_ov18_022493B8 Unk_ov18_022493B8: ; 0x022493B8 - .incbin "incbin/overlay18_rodata.bin", 0x2F84, 0x2F90 - 0x2F84 + .byte 0x0, 0x1, 0xE, 0x4, 0x5, 0x6, 0xE, 0x9, 0xA, 0x0 + .space 0x2 .global Unk_ov18_022493C4 Unk_ov18_022493C4: ; 0x022493C4 - .incbin "incbin/overlay18_rodata.bin", 0x2F90, 0x2F9C - 0x2F90 + .byte 0x0, 0x5, 0x2, 0x7, 0x4, 0x1, 0x6, 0x3 + .space 0x4 .global Unk_ov18_022493D0 Unk_ov18_022493D0: ; 0x022493D0 - .incbin "incbin/overlay18_rodata.bin", 0x2F9C, 0xB + .byte 0x0, 0x1, 0x2, 0x2, 0x3, 0x4, 0x5, 0x6, 0x6, 0x7, 0x8 + .space 0x1 @@ -2788,27 +2798,34 @@ Unk_ov18_022493D0: ; 0x022493D0 .global Unk_ov18_0224A254 Unk_ov18_0224A254: ; 0x0224A254 - .incbin "incbin/overlay18_data.bin", 0xAF4, 0xB08 - 0xAF4 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A268 Unk_ov18_0224A268: ; 0x0224A268 - .incbin "incbin/overlay18_data.bin", 0xB08, 0xB20 - 0xB08 + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A280 Unk_ov18_0224A280: ; 0x0224A280 - .incbin "incbin/overlay18_data.bin", 0xB20, 0xB38 - 0xB20 + .asciz "char/jbBgStep21.ncg.l" + .space 0x2 .global Unk_ov18_0224A298 Unk_ov18_0224A298: ; 0x0224A298 - .incbin "incbin/overlay18_data.bin", 0xB38, 0xB4C - 0xB38 + .ascii "char/jb3List.nsc.l" + .space 0x2 .global Unk_ov18_0224A2AC Unk_ov18_0224A2AC: ; 0x0224A2AC - .incbin "incbin/overlay18_data.bin", 0xB4C, 0xB64 - 0xB4C + .ascii "char/ybObjMain.ncl.l" + .space 0x4 .global Unk_ov18_0224A2C4 Unk_ov18_0224A2C4: ; 0x0224A2C4 - .incbin "incbin/overlay18_data.bin", 0xB64, 0x20 + .short 0x25, 0x33, 0x64, 0x2E, 0x25, 0x33 + .short 0x64, 0x2E, 0x25, 0x33, 0x64, 0x2E, 0x25, 0x33 + .short 0x64, 0x0 diff --git a/lib/NitroDWC/asm/util/scenesetlistsave.s b/lib/NitroDWC/asm/util/scenesetlistsave.s index b14dce274b..99b26dbbea 100644 --- a/lib/NitroDWC/asm/util/scenesetlistsave.s +++ b/lib/NitroDWC/asm/util/scenesetlistsave.s @@ -190,13 +190,16 @@ _022392C8: .word ov18_0223A6B4 .global Unk_ov18_0224A2E4 Unk_ov18_0224A2E4: ; 0x0224A2E4 - .incbin "incbin/overlay18_data.bin", 0xB84, 0xB9C - 0xB84 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A2FC Unk_ov18_0224A2FC: ; 0x0224A2FC - .incbin "incbin/overlay18_data.bin", 0xB9C, 0xBB4 - 0xB9C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A314 Unk_ov18_0224A314: ; 0x0224A314 - .incbin "incbin/overlay18_data.bin", 0xBB4, 0x13 + .ascii "char/xb4None.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesetrakubutton.s b/lib/NitroDWC/asm/util/scenesetrakubutton.s index b6a64a5e45..950ddf8082 100644 --- a/lib/NitroDWC/asm/util/scenesetrakubutton.s +++ b/lib/NitroDWC/asm/util/scenesetrakubutton.s @@ -719,11 +719,11 @@ _02239B30: .word ov18_022398D0 .global Unk_ov18_0224A328 Unk_ov18_0224A328: ; 0x0224A328 - .incbin "incbin/overlay18_data.bin", 0xBC8, 0xBDC - 0xBC8 + .asciz "char/xb4Multi.nsc.l" .global Unk_ov18_0224A33C Unk_ov18_0224A33C: ; 0x0224A33C - .incbin "incbin/overlay18_data.bin", 0xBDC, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetrakucomplete.s b/lib/NitroDWC/asm/util/scenesetrakucomplete.s index ec363d1686..4954c4c34e 100644 --- a/lib/NitroDWC/asm/util/scenesetrakucomplete.s +++ b/lib/NitroDWC/asm/util/scenesetrakucomplete.s @@ -184,7 +184,7 @@ _02239D38: .word ov18_02239C5C .global Unk_ov18_0224A350 Unk_ov18_0224A350: ; 0x0224A350 - .incbin "incbin/overlay18_data.bin", 0xBF0, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetrakuready.s b/lib/NitroDWC/asm/util/scenesetrakuready.s index 4079eb01b5..44a65ba750 100644 --- a/lib/NitroDWC/asm/util/scenesetrakuready.s +++ b/lib/NitroDWC/asm/util/scenesetrakuready.s @@ -389,15 +389,17 @@ _0223A1CC: .word ov18_02239FA4 .global Unk_ov18_0224A364 Unk_ov18_0224A364: ; 0x0224A364 - .incbin "incbin/overlay18_data.bin", 0xC04, 0xC1C - 0xC04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A37C Unk_ov18_0224A37C: ; 0x0224A37C - .incbin "incbin/overlay18_data.bin", 0xC1C, 0xC34 - 0xC1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A394 Unk_ov18_0224A394: ; 0x0224A394 - .incbin "incbin/overlay18_data.bin", 0xC34, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetsearch.s b/lib/NitroDWC/asm/util/scenesetsearch.s index cdd96c2b32..17c7dd3ba6 100644 --- a/lib/NitroDWC/asm/util/scenesetsearch.s +++ b/lib/NitroDWC/asm/util/scenesetsearch.s @@ -402,15 +402,17 @@ _0223A6B0: .word ov18_0223A52C .global Unk_ov18_0224A3A8 Unk_ov18_0224A3A8: ; 0x0224A3A8 - .incbin "incbin/overlay18_data.bin", 0xC48, 0xC60 - 0xC48 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A3C0 Unk_ov18_0224A3C0: ; 0x0224A3C0 - .incbin "incbin/overlay18_data.bin", 0xC60, 0xC78 - 0xC60 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A3D8 Unk_ov18_0224A3D8: ; 0x0224A3D8 - .incbin "incbin/overlay18_data.bin", 0xC78, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetselectap.s b/lib/NitroDWC/asm/util/scenesetselectap.s index cbea3bacb0..badd34e331 100644 --- a/lib/NitroDWC/asm/util/scenesetselectap.s +++ b/lib/NitroDWC/asm/util/scenesetselectap.s @@ -995,35 +995,44 @@ _0223B3F0: .word Unk_ov18_0225334C .global Unk_ov18_022493DC Unk_ov18_022493DC: ; 0x022493DC - .incbin "incbin/overlay18_rodata.bin", 0x2FA8, 0x2FAC - 0x2FA8 + .byte 0x13, 0x14, 0x12, 0x56 .global Unk_ov18_022493E0 Unk_ov18_022493E0: ; 0x022493E0 - .incbin "incbin/overlay18_rodata.bin", 0x2FAC, 0x2FB0 - 0x2FAC + .byte 0x3, 0x4, 0x5, 0x7 .global Unk_ov18_022493E4 Unk_ov18_022493E4: ; 0x022493E4 - .incbin "incbin/overlay18_rodata.bin", 0x2FB0, 0x2FB4 - 0x2FB0 + .byte 0xA, 0x9, 0xB, 0x6 .global Unk_ov18_022493E8 Unk_ov18_022493E8: ; 0x022493E8 - .incbin "incbin/overlay18_rodata.bin", 0x2FB4, 0x2FCA - 0x2FB4 + .asciz "char/ybBgStep11.ncl.l" .global Unk_ov18_022493FE Unk_ov18_022493FE: ; 0x022493FE - .incbin "incbin/overlay18_rodata.bin", 0x2FCA, 0x2FE2 - 0x2FCA + .short 0x8, 0x30, 0x5A + .short 0x30, 0xAC, 0x30, 0xC, 0x58, 0x5E, 0x58, 0xB0 + .short 0x58 .global Unk_ov18_02249416 Unk_ov18_02249416: ; 0x02249416 - .incbin "incbin/overlay18_rodata.bin", 0x2FE2, 0x301A - 0x2FE2 + .short 0x8, 0x20, 0x54, 0x56, 0x5A, 0x20, 0xA6 + .short 0x56, 0xAC, 0x20, 0xF8, 0x56, 0x8, 0x78, 0xF8 + .short 0xA0, 0x8, 0x54, 0x54, 0x70, 0x5A, 0x54, 0xA6 + .short 0x70, 0xAC, 0x54, 0xF8, 0x70 .global Unk_ov18_0224944E Unk_ov18_0224944E: ; 0x0224944E - .incbin "incbin/overlay18_rodata.bin", 0x301A, 0x3054 - 0x301A + .short 0x6, 0x1E, 0x46 + .short 0x48, 0x58, 0x1E, 0x98, 0x48, 0xAA, 0x1E, 0xEA + .short 0x48, 0x6, 0x76, 0xEA, 0x92, 0x9, 0x54, 0x43 + .short 0x70, 0x5B, 0x54, 0x95, 0x70, 0xAD, 0x54, 0xE7 + .word 0x70 .global Unk_ov18_02249488 Unk_ov18_02249488: ; 0x02249488 - .incbin "incbin/overlay18_rodata.bin", 0x3054, 0x7 + .byte 0x3, 0x2D, 0x27, 0x1D, 0x32, 0x30, 0x6, 0x0 @@ -1032,23 +1041,27 @@ Unk_ov18_02249488: ; 0x02249488 .global Unk_ov18_0224A3EC Unk_ov18_0224A3EC: ; 0x0224A3EC - .incbin "incbin/overlay18_data.bin", 0xC8C, 0xCA0 - 0xC8C + .asciz "char/ybObjWay.ncl.l" .global Unk_ov18_0224A400 Unk_ov18_0224A400: ; 0x0224A400 - .incbin "incbin/overlay18_data.bin", 0xCA0, 0xCB8 - 0xCA0 + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_0224A418 Unk_ov18_0224A418: ; 0x0224A418 - .incbin "incbin/overlay18_data.bin", 0xCB8, 0xCD0 - 0xCB8 + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_0224A430 Unk_ov18_0224A430: ; 0x0224A430 - .incbin "incbin/overlay18_data.bin", 0xCD0, 0xCE4 - 0xCD0 + .ascii "char/jb2Ap.nsc.l" + .space 0x4 .global Unk_ov18_0224A444 Unk_ov18_0224A444: ; 0x0224A444 - .incbin "incbin/overlay18_data.bin", 0xCE4, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/scenesetselectway.s b/lib/NitroDWC/asm/util/scenesetselectway.s index 13183705d8..1786592e74 100644 --- a/lib/NitroDWC/asm/util/scenesetselectway.s +++ b/lib/NitroDWC/asm/util/scenesetselectway.s @@ -593,27 +593,41 @@ _0223BBA8: .word Unk_ov18_02253354 .global Unk_ov18_02249490 Unk_ov18_02249490: ; 0x02249490 - .incbin "incbin/overlay18_rodata.bin", 0x305C, 0x3060 - 0x305C + .byte 0x1, 0x2, 0x3, 0x4 .global Unk_ov18_02249494 Unk_ov18_02249494: ; 0x02249494 - .incbin "incbin/overlay18_rodata.bin", 0x3060, 0x3076 - 0x3060 + .asciz "char/ybBgStep21.ncl.l" .global Unk_ov18_022494AA Unk_ov18_022494AA: ; 0x022494AA - .incbin "incbin/overlay18_rodata.bin", 0x3076, 0x3096 - 0x3076 + .short 0xFEFF, 0xFEFF + .short 0x3, 0x3 + .short 0xFFFF, 0xFFFF + .short 0x1, 0x1 + .short 0xFEFF, 0xFEFF + .short 0x3, 0x2, 0x1 + .short 0x3, 0x2, 0x1 .global Unk_ov18_022494CA Unk_ov18_022494CA: ; 0x022494CA - .incbin "incbin/overlay18_rodata.bin", 0x3096, 0x30D6 - 0x3096 + .short 0x8, 0x20, 0xF8, 0x5C, 0x8 + .short 0x64, 0x7E, 0xA0, 0x0, 0x0, 0x0, 0x0, 0x83 + .short 0x64, 0xF8, 0xA0, 0x8, 0x20, 0xF8, 0x5C, 0x8 + .short 0x64, 0x64, 0xA0, 0x68, 0x64, 0xC4, 0xA0, 0xC8 + .short 0x64, 0xF8, 0xA0 .global Unk_ov18_0224950A Unk_ov18_0224950A: ; 0x0224950A - .incbin "incbin/overlay18_rodata.bin", 0x30D6, 0x3118 - 0x30D6 + .short 0x6, 0x1E, 0xEA, 0x4E, 0x6 + .short 0x62, 0x70, 0x92, 0x0, 0x0, 0x0, 0x0, 0x80 + .short 0x62, 0xEA, 0x92, 0x6, 0x1E, 0xEA, 0x4E, 0x6 + .short 0x62, 0x56, 0x92, 0x66, 0x62, 0xB6, 0x92, 0xC6 + .short 0x62, 0xEA, 0x92, 0x0 .global Unk_ov18_0224954C Unk_ov18_0224954C: ; 0x0224954C - .incbin "incbin/overlay18_rodata.bin", 0x3118, 0x7 + .byte 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x6, 0x0 @@ -622,15 +636,18 @@ Unk_ov18_0224954C: ; 0x0224954C .global Unk_ov18_0224A45C Unk_ov18_0224A45C: ; 0x0224A45C - .incbin "incbin/overlay18_data.bin", 0xCFC, 0xD14 - 0xCFC + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A474 Unk_ov18_0224A474: ; 0x0224A474 - .incbin "incbin/overlay18_data.bin", 0xD14, 0xD2C - 0xD14 + .ascii "char/ybBgStep2.ncl.l" + .space 0x4 .global Unk_ov18_0224A48C Unk_ov18_0224A48C: ; 0x0224A48C - .incbin "incbin/overlay18_data.bin", 0xD2C, 0x12 + .asciz "char/jb3Way.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesettest.s b/lib/NitroDWC/asm/util/scenesettest.s index 42d8908492..678e082743 100644 --- a/lib/NitroDWC/asm/util/scenesettest.s +++ b/lib/NitroDWC/asm/util/scenesettest.s @@ -345,7 +345,10 @@ _0223BFA4: .word ov18_022450D0 .global Unk_ov18_02249554 Unk_ov18_02249554: ; 0x02249554 - .incbin "incbin/overlay18_rodata.bin", 0x3120, 0xC + .word ov18_0223BF84 + .word ov18_0223BF98 + .byte 0x3, 0x1 + .space 0x2 @@ -354,15 +357,17 @@ Unk_ov18_02249554: ; 0x02249554 .global Unk_ov18_0224A4A0 Unk_ov18_0224A4A0: ; 0x0224A4A0 - .incbin "incbin/overlay18_data.bin", 0xD40, 0xD58 - 0xD40 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A4B8 Unk_ov18_0224A4B8: ; 0x0224A4B8 - .incbin "incbin/overlay18_data.bin", 0xD58, 0xD70 - 0xD58 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A4D0 Unk_ov18_0224A4D0: ; 0x0224A4D0 - .incbin "incbin/overlay18_data.bin", 0xD70, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesettestcomplete.s b/lib/NitroDWC/asm/util/scenesettestcomplete.s index 67d8031b1f..a478cba16f 100644 --- a/lib/NitroDWC/asm/util/scenesettestcomplete.s +++ b/lib/NitroDWC/asm/util/scenesettestcomplete.s @@ -214,7 +214,7 @@ _0223C218: .word ov18_0223C0B0 .global Unk_ov18_0224A4E4 Unk_ov18_0224A4E4: ; 0x0224A4E4 - .incbin "incbin/overlay18_data.bin", 0xD84, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesettestconfirm.s b/lib/NitroDWC/asm/util/scenesettestconfirm.s index 56d67c970d..8cbbcbdc2d 100644 --- a/lib/NitroDWC/asm/util/scenesettestconfirm.s +++ b/lib/NitroDWC/asm/util/scenesettestconfirm.s @@ -205,7 +205,9 @@ _0223C46C: .word ov18_0223BBAC .global Unk_ov18_02249560 Unk_ov18_02249560: ; 0x02249560 - .incbin "incbin/overlay18_rodata.bin", 0x312C, 0xC + .word 0x2B + .word 0x2B + .word 0x49 @@ -214,5 +216,6 @@ Unk_ov18_02249560: ; 0x02249560 .global Unk_ov18_0224A4F8 Unk_ov18_0224A4F8: ; 0x0224A4F8 - .incbin "incbin/overlay18_data.bin", 0xD98, 0x13 + .ascii "char/xb4None.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesetusbcomplete.s b/lib/NitroDWC/asm/util/scenesetusbcomplete.s index 9435a85a82..94d5121b69 100644 --- a/lib/NitroDWC/asm/util/scenesetusbcomplete.s +++ b/lib/NitroDWC/asm/util/scenesetusbcomplete.s @@ -185,7 +185,7 @@ _0223C678: .word ov18_0223C59C .global Unk_ov18_0224A50C Unk_ov18_0224A50C: ; 0x0224A50C - .incbin "incbin/overlay18_data.bin", 0xDAC, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetusbready.s b/lib/NitroDWC/asm/util/scenesetusbready.s index 0dec91f719..b7c04a5c00 100644 --- a/lib/NitroDWC/asm/util/scenesetusbready.s +++ b/lib/NitroDWC/asm/util/scenesetusbready.s @@ -787,27 +787,32 @@ _0223D000: .word ov18_0223CBEC .global Unk_ov18_0224A520 Unk_ov18_0224A520: ; 0x0224A520 - .incbin "incbin/overlay18_data.bin", 0xDC0, 0xDD8 - 0xDC0 + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A538 Unk_ov18_0224A538: ; 0x0224A538 - .incbin "incbin/overlay18_data.bin", 0xDD8, 0xDF0 - 0xDD8 + .ascii "char/ybBgStep2.ncl.l" + .space 0x4 .global Unk_ov18_0224A550 Unk_ov18_0224A550: ; 0x0224A550 - .incbin "incbin/overlay18_data.bin", 0xDF0, 0xE04 - 0xDF0 + .asciz "char/xb3Multi.nsc.l" .global Unk_ov18_0224A564 Unk_ov18_0224A564: ; 0x0224A564 - .incbin "incbin/overlay18_data.bin", 0xE04, 0xE1C - 0xE04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A57C Unk_ov18_0224A57C: ; 0x0224A57C - .incbin "incbin/overlay18_data.bin", 0xE1C, 0xE34 - 0xE1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A594 Unk_ov18_0224A594: ; 0x0224A594 - .incbin "incbin/overlay18_data.bin", 0xE34, 0x12 + .asciz "char/jb4Usb.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scrollbar.s b/lib/NitroDWC/asm/util/scrollbar.s index 6bfa12d463..7f28478170 100644 --- a/lib/NitroDWC/asm/util/scrollbar.s +++ b/lib/NitroDWC/asm/util/scrollbar.s @@ -547,11 +547,11 @@ _0223D8D8: .word Unk_ov18_0225337C .global Unk_ov18_0224956C Unk_ov18_0224956C: ; 0x0224956C - .incbin "incbin/overlay18_rodata.bin", 0x3138, 0x313C - 0x3138 + .byte 0x10, 0xF, 0xE, 0x0 .global Unk_ov18_02249570 Unk_ov18_02249570: ; 0x02249570 - .incbin "incbin/overlay18_rodata.bin", 0x313C, 0x3 + .byte 0x55, 0x36, 0x1E, 0x0 diff --git a/lib/NitroDWC/asm/util/search_dwcutil.s b/lib/NitroDWC/asm/util/search_dwcutil.s index 3a0b4b4228..6e5c51a411 100644 --- a/lib/NitroDWC/asm/util/search_dwcutil.s +++ b/lib/NitroDWC/asm/util/search_dwcutil.s @@ -362,16 +362,21 @@ _0223DD70: .word Unk_ov18_02249574 .global Unk_ov18_02249574 Unk_ov18_02249574: ; 0x02249574 - .incbin "incbin/overlay18_rodata.bin", 0x3140, 0x3144 - 0x3140 + .byte 0x0, 0x50, 0xF2, 0x1 .global Unk_ov18_02249578 Unk_ov18_02249578: ; 0x02249578 - .incbin "incbin/overlay18_rodata.bin", 0x3144, 0x314C - 0x3144 + .space 0x8 .global Unk_ov18_02249580 Unk_ov18_02249580: ; 0x02249580 - .incbin "incbin/overlay18_rodata.bin", 0x314C, 0x44 - + .space 0x4 + .byte 0x0, 0x4, 0xFF, 0x3F + .space 0x2 + .short 0xFFFF + .short 0xFFFF + .short 0xFFFF + .space 0x34 .bss diff --git a/lib/NitroDWC/asm/util/setting.s b/lib/NitroDWC/asm/util/setting.s index 61d4c8ed20..688b94c247 100644 --- a/lib/NitroDWC/asm/util/setting.s +++ b/lib/NitroDWC/asm/util/setting.s @@ -920,7 +920,7 @@ ov18_0223E8BC: ; 0x0223E8BC .global Unk_ov18_022495C4 Unk_ov18_022495C4: ; 0x022495C4 - .incbin "incbin/overlay18_rodata.bin", 0x3190, 0x4 + .space 0x4 @@ -929,7 +929,8 @@ Unk_ov18_022495C4: ; 0x022495C4 .global Unk_ov18_0224A5A8 Unk_ov18_0224A5A8: ; 0x0224A5A8 - .incbin "incbin/overlay18_data.bin", 0xE48, 0xD + .ascii "%3d%3d%3d%3d" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sound.s b/lib/NitroDWC/asm/util/sound.s index 0bb41efaae..2084f03c78 100644 --- a/lib/NitroDWC/asm/util/sound.s +++ b/lib/NitroDWC/asm/util/sound.s @@ -130,7 +130,7 @@ _0223EA24: .word NNS_SndMain .global Unk_ov18_0224A5B8 Unk_ov18_0224A5B8: ; 0x0224A5B8 - .incbin "incbin/overlay18_data.bin", 0xE58, 0x18 + .asciz "sound/sound_data.sdat.l" diff --git a/lib/NitroDWC/asm/util/step.s b/lib/NitroDWC/asm/util/step.s index 6e5f29618b..72c0ac3a44 100644 --- a/lib/NitroDWC/asm/util/step.s +++ b/lib/NitroDWC/asm/util/step.s @@ -852,15 +852,18 @@ _0223F560: .word Unk_ov18_0225338C .global Unk_ov18_022495C8 Unk_ov18_022495C8: ; 0x022495C8 - .incbin "incbin/overlay18_rodata.bin", 0x3194, 0x31A3 - 0x3194 + .short 0x1, 0x5, 0x406, 0x200, 0x600, 0x4 + .short 0x5 + .byte 0x3 .global Unk_ov18_022495D7 Unk_ov18_022495D7: ; 0x022495D7 - .incbin "incbin/overlay18_rodata.bin", 0x31A3, 0x31B2 - 0x31A3 + .byte 0x2, 0x1, 0x3, 0x1, 0x3, 0x5, 0x1, 0x4, 0x1, 0x5, 0x7, 0x1, 0x7, 0x1, 0x6 .global Unk_ov18_022495E6 Unk_ov18_022495E6: ; 0x022495E6 - .incbin "incbin/overlay18_rodata.bin", 0x31B2, 0x14 + .short 0x20, 0x21, 0x50, 0x30, 0x68, 0x21, 0x98 + .short 0x30, 0xB0, 0x21 @@ -869,28 +872,35 @@ Unk_ov18_022495E6: ; 0x022495E6 .global Unk_ov18_0224A5D0 Unk_ov18_0224A5D0: ; 0x0224A5D0 - .incbin "incbin/overlay18_data.bin", 0xE70, 0xE84 - 0xE70 + .ascii "char/jtTop.nsc.l" + .space 0x4 .global Unk_ov18_0224A5E4 Unk_ov18_0224A5E4: ; 0x0224A5E4 - .incbin "incbin/overlay18_data.bin", 0xE84, 0xE98 - 0xE84 + .ascii "char/jtStep1.nsc.l" + .space 0x2 .global Unk_ov18_0224A5F8 Unk_ov18_0224A5F8: ; 0x0224A5F8 - .incbin "incbin/overlay18_data.bin", 0xE98, 0xEAC - 0xE98 + .ascii "char/jtStep2.nsc.l" + .space 0x2 .global Unk_ov18_0224A60C Unk_ov18_0224A60C: ; 0x0224A60C - .incbin "incbin/overlay18_data.bin", 0xEAC, 0xEC0 - 0xEAC + .ascii "char/jtStep3.nsc.l" + .space 0x2 .global Unk_ov18_0224A620 Unk_ov18_0224A620: ; 0x0224A620 - .incbin "incbin/overlay18_data.bin", 0xEC0, 0xED4 - 0xEC0 + .asciz "char/jtOption.nsc.l" .global Unk_ov18_0224A634 Unk_ov18_0224A634: ; 0x0224A634 - .incbin "incbin/overlay18_data.bin", 0xED4, 0x14 - + .word Unk_ov18_0224A5E4 + .word Unk_ov18_0224A5F8 + .word Unk_ov18_0224A60C + .word Unk_ov18_0224A620 + .word Unk_ov18_0224A5D0 .bss diff --git a/lib/NitroDWC/asm/util/task.s b/lib/NitroDWC/asm/util/task.s index 3558e640f1..a60bdae9c4 100644 --- a/lib/NitroDWC/asm/util/task.s +++ b/lib/NitroDWC/asm/util/task.s @@ -275,7 +275,7 @@ _02246430: .word Unk_ov18_02253424 .global Unk_ov18_0224973C Unk_ov18_0224973C: ; 0x0224973C - .incbin "incbin/overlay18_rodata.bin", 0x3308, 0x2 + .byte 0x80, 0x20, 0x0, 0x0 diff --git a/lib/NitroDWC/asm/util/usbap.s b/lib/NitroDWC/asm/util/usbap.s index 50cb61ed83..9377348126 100644 --- a/lib/NitroDWC/asm/util/usbap.s +++ b/lib/NitroDWC/asm/util/usbap.s @@ -520,15 +520,23 @@ _0223FC44: .word Unk_ov18_022495FC .global Unk_ov18_022495FC Unk_ov18_022495FC: ; 0x022495FC - .incbin "incbin/overlay18_rodata.bin", 0x31C8, 0x31D0 - 0x31C8 + .space 0x8 .global Unk_ov18_02249604 Unk_ov18_02249604: ; 0x02249604 - .incbin "incbin/overlay18_rodata.bin", 0x31D0, 0x31DC - 0x31D0 + .ascii "NWCUSBAP" + .space 0x4 .global Unk_ov18_02249610 Unk_ov18_02249610: ; 0x02249610 - .incbin "incbin/overlay18_rodata.bin", 0x31DC, 0x44 + .space 0x4 + .byte 0x0, 0x4, 0xFF, 0x3F + .space 0x2 + .short 0xFFFF, 0xFFFF, 0xFFFF + .short 0x2, 0x20 + .space 0x20 + .word 0x8 + .space 0xC diff --git a/lib/NitroDWC/asm/util/window.s b/lib/NitroDWC/asm/util/window.s index 3e6fb85ad0..bea88c6272 100644 --- a/lib/NitroDWC/asm/util/window.s +++ b/lib/NitroDWC/asm/util/window.s @@ -839,55 +839,75 @@ _022407AC: .word Unk_ov18_02253398 .global Unk_ov18_02249654 Unk_ov18_02249654: ; 0x02249654 - .incbin "incbin/overlay18_rodata.bin", 0x3220, 0x3224 - 0x3220 + .short 0x8 + .short 0x8 .global Unk_ov18_02249658 Unk_ov18_02249658: ; 0x02249658 - .incbin "incbin/overlay18_rodata.bin", 0x3224, 0x322A - 0x3224 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1, 0x1 .global Unk_ov18_0224965E Unk_ov18_0224965E: ; 0x0224965E - .incbin "incbin/overlay18_rodata.bin", 0x322A, 0x3232 - 0x322A + .short 0x4, 0x1D, 0xFC, 0x44 .global Unk_ov18_02249666 Unk_ov18_02249666: ; 0x02249666 - .incbin "incbin/overlay18_rodata.bin", 0x3232, 0x323C - 0x3232 + .space 0x1 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1 .global Unk_ov18_02249670 Unk_ov18_02249670: ; 0x02249670 - .incbin "incbin/overlay18_rodata.bin", 0x323C, 0x3246 - 0x323C + .short 0x1, 0xFF00 + .short 0x1, 0xFF00, 0x1 .global Unk_ov18_0224967A Unk_ov18_0224967A: ; 0x0224967A - .incbin "incbin/overlay18_rodata.bin", 0x3246, 0x3250 - 0x3246 + .byte 0x1B, 0x19, 0x57, 0x0, 0x23, 0x1D, 0x59, 0x0, 0x23, 0x1D .global Unk_ov18_02249684 Unk_ov18_02249684: ; 0x02249684 - .incbin "incbin/overlay18_rodata.bin", 0x3250, 0x3264 - 0x3250 + .short 0x6C, 0x10, 0x6C, 0x10, 0x78, 0x10, 0x78, 0x10, 0x78, 0x10 .global Unk_ov18_02249698 Unk_ov18_02249698: ; 0x02249698 - .incbin "incbin/overlay18_rodata.bin", 0x3264, 0x327C - 0x3264 + .short 0xD8, 0x50, 0xD8, 0x50, 0xE6, 0x4F + .short 0xE6, 0x4F, 0xE6, 0x48, 0xDA, 0x5C .global Unk_ov18_022496B0 Unk_ov18_022496B0: ; 0x022496B0 - .incbin "incbin/overlay18_rodata.bin", 0x327C, 0x3294 - 0x327C + .short 0xB, 0x27 + .short 0xB, 0x27, 0x4, 0x4C, 0x4, 0x4C, 0x4, 0x54 + .short 0xB, 0x27 .global Unk_ov18_022496C8 Unk_ov18_022496C8: ; 0x022496C8 - .incbin "incbin/overlay18_rodata.bin", 0x3294, 0x32AC - 0x3294 + .short 0xEA, 0x72, 0xEA, 0x72, 0xF8, 0x70 + .short 0xF8, 0x70, 0x64, 0x70, 0xEA, 0x72 .global Unk_ov18_022496E0 Unk_ov18_022496E0: ; 0x022496E0 - .incbin "incbin/overlay18_rodata.bin", 0x32AC, 0x32D4 - 0x32AC + .short 0x10, 0x84 + .short 0x84, 0x84, 0x10, 0x84, 0x84, 0x84, 0x9, 0xA7 + .short 0x83, 0xA7, 0x9, 0xA7, 0x83, 0xA7, 0x9, 0xA7 + .short 0x83, 0xA7 .global Unk_ov18_02249708 Unk_ov18_02249708: ; 0x02249708 - .incbin "incbin/overlay18_rodata.bin", 0x32D4, 0x32DC - 0x32D4 + .space 0x2 + .ascii "FFO/" + .space 0x2 .global Unk_ov18_02249710 Unk_ov18_02249710: ; 0x02249710 - .incbin "incbin/overlay18_rodata.bin", 0x32DC, 0x6 + .byte 0x2, 0x1 + .byte 0x2, 0x1 + .byte 0x2, 0x0 diff --git a/lib/NitroSDK/asm/dgt/hash1.s b/lib/NitroSDK/asm/dgt/hash1.s index 0977558191..fee950d1b5 100644 --- a/lib/NitroSDK/asm/dgt/hash1.s +++ b/lib/NitroSDK/asm/dgt/hash1.s @@ -388,7 +388,7 @@ _020C9178: .word Unk_02101174 .global Unk_02101170 Unk_02101170: ; 0x02101170 - .incbin "incbin/arm9_data.bin", 0x2490, 0x2494 - 0x2490 + .word 0x80 .global Unk_02101174 Unk_02101174: ; 0x02101174 @@ -443,5 +443,5 @@ Unk_02101174: ; 0x02101174 .global Unk_02101234 Unk_02101234: ; 0x02101234 - .incbin "incbin/arm9_data.bin", 0x2554, 0x100 + .incbin "incbin/hash1.bin", 0x0, 0x100 diff --git a/lib/NitroSDK/asm/dgt/hash2.s b/lib/NitroSDK/asm/dgt/hash2.s index de0476be69..5801c4f4fd 100644 --- a/lib/NitroSDK/asm/dgt/hash2.s +++ b/lib/NitroSDK/asm/dgt/hash2.s @@ -1,7 +1,7 @@ .include "macros/function.inc" .include "include/hash2.inc" - + .text @@ -312,15 +312,33 @@ _020C95AC: .word DGT_Hash2GetDigest .global Unk_020FE4E8 Unk_020FE4E8: ; 0x020FE4E8 - .incbin "incbin/arm9_rodata.bin", 0x198A8, 0x198C4 - 0x198A8 + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 .global Unk_020FE504 Unk_020FE504: ; 0x020FE504 - .incbin "incbin/arm9_rodata.bin", 0x198C4, 0x198E0 - 0x198C4 + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 .global Unk_020FE520 Unk_020FE520: ; 0x020FE520 - .incbin "incbin/arm9_rodata.bin", 0x198E0, 0x1C + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 @@ -329,19 +347,25 @@ Unk_020FE520: ; 0x020FE520 .global Unk_02101334 Unk_02101334: ; 0x02101334 - .incbin "incbin/arm9_data.bin", 0x2654, 0x2658 - 0x2654 + .word 0x61 .global Unk_02101338 Unk_02101338: ; 0x02101338 - .incbin "incbin/arm9_data.bin", 0x2658, 0x265C - 0x2658 + .word DGTi_hash2_arm4_small .global Unk_0210133C Unk_0210133C: ; 0x0210133C - .incbin "incbin/arm9_data.bin", 0x265C, 0x266C - 0x265C + .word Unk_021013A0 + .word Unk_021013B8 + .word Unk_02101370 + .word Unk_02101388 .global Unk_0210134C Unk_0210134C: ; 0x0210134C - .incbin "incbin/arm9_data.bin", 0x266C, 0x267C - 0x266C + .word Unk_0210136C + .word Unk_021013D0 + .word Unk_02101334 + .word Unk_0210140C .global Unk_0210135C Unk_0210135C: ; 0x0210135C @@ -352,29 +376,29 @@ Unk_0210135C: ; 0x0210135C .global Unk_0210136C Unk_0210136C: ; 0x0210136C - .incbin "incbin/arm9_data.bin", 0x268C, 0x2690 - 0x268C + .incbin "incbin/hash2.bin", 0x0, 0x4 .global Unk_02101370 Unk_02101370: ; 0x02101370 - .incbin "incbin/arm9_data.bin", 0x2690, 0x26A8 - 0x2690 + .incbin "incbin/hash2.bin", 0x4, 0x1C - 0x4 .global Unk_02101388 Unk_02101388: ; 0x02101388 - .incbin "incbin/arm9_data.bin", 0x26A8, 0x26C0 - 0x26A8 + .incbin "incbin/hash2.bin", 0x1C, 0x34 - 0x1C .global Unk_021013A0 Unk_021013A0: ; 0x021013A0 - .incbin "incbin/arm9_data.bin", 0x26C0, 0x26D8 - 0x26C0 + .incbin "incbin/hash2.bin", 0x34, 0x4C - 0x34 .global Unk_021013B8 Unk_021013B8: ; 0x021013B8 - .incbin "incbin/arm9_data.bin", 0x26D8, 0x26F0 - 0x26D8 + .incbin "incbin/hash2.bin", 0x4C, 0x64 - 0x4C .global Unk_021013D0 Unk_021013D0: ; 0x021013D0 - .incbin "incbin/arm9_data.bin", 0x26F0, 0x272C - 0x26F0 + .incbin "incbin/hash2.bin", 0x64, 0xA0 - 0x64 .global Unk_0210140C Unk_0210140C: ; 0x0210140C - .incbin "incbin/arm9_data.bin", 0x272C, 0x41 + .incbin "incbin/hash2.bin", 0xA0, 0x41 diff --git a/lib/NitroSDK/asm/dgt/incbin/hash1.bin b/lib/NitroSDK/asm/dgt/incbin/hash1.bin new file mode 100644 index 0000000000000000000000000000000000000000..6c11c8512488f5ff2de0babde4db59e599b75fde GIT binary patch literal 256 zcmV+b0ssDZq-xhzx5wz)a3Cb^&b`5}4}A41#)n4}Mlh%Wl}7#8n1E@o_e6`aTmS#Q z*IbDr5s+(>ahUy%LwTkl2((FJB_8%bvp~R6T3#lq$F}KR5HHqK6hs1n=Aqcg`_t#< z&EX-|2RFlq4b}AR6k0_E>Eo&RqwoCL0&i!EOe&2+Ir{&B_Hlb|6@ z&)!R5OS|@PyuZH2ew!%zC!y+vFz?g_9f$-u(A3%GncL?0e4-y^R;avO zkod}(c4qEujaj?wR0}Ht4&}_baAPh=yk&-+i;VT9yj|eEQU_;3G&pF)29( xh*E(l4T#c#CH!QG0FeLy literal 0 HcmV?d00001 diff --git a/lib/NitroSystem/asm/g3d/nsbca.s b/lib/NitroSystem/asm/g3d/nsbca.s index 97fba10536..313d7e615c 100644 --- a/lib/NitroSystem/asm/g3d/nsbca.s +++ b/lib/NitroSystem/asm/g3d/nsbca.s @@ -1604,5 +1604,5 @@ _020B53D4: .word 0x020F981B .global Unk_020F9818 Unk_020F9818: ; 0x020F9818 - .incbin "incbin/arm9_rodata.bin", 0x14BD8, 0x24 + .incbin "incbin/nsbca.bin", 0x0, 0x24 diff --git a/lib/NitroWiFi/asm/cps/incbin/network.bin b/lib/NitroWiFi/asm/cps/incbin/network.bin new file mode 100644 index 0000000000000000000000000000000000000000..4e4f8c0e5d02f7a31a73ef32061b2505a8e9884b GIT binary patch literal 35 kcmWe&U|{$U1`G_VRxty496-##;FpO~$<7Qyx;%DLHW9HyxV&`Gy;O1jwVdvsyU}odw;b&rC z=VRqz=3?aFXX9nzX5wsMpbS(j$+{l4{rHR91qv$f&h0(8p1H~pDny`;`im}&(1znyvA;RxSjXvm$xEOuB!Jhs5j@8Z9_@%z^Rja}KE3C2|ES49p z+^5zngxt+PnMGb*+h)+g<|ze)^4f literal 0 HcmV?d00001 diff --git a/lib/NitroWiFi/asm/ssl/incbin/sha1.bin b/lib/NitroWiFi/asm/ssl/incbin/sha1.bin new file mode 100644 index 0000000000000000000000000000000000000000..4b54fd4659dd20cf7c82ed149869410ed2fd5129 GIT binary patch literal 92 LcmZo*pdA1JE?fYC literal 0 HcmV?d00001 diff --git a/lib/NitroWiFi/asm/ssl/incbin/ssl.bin b/lib/NitroWiFi/asm/ssl/incbin/ssl.bin new file mode 100644 index 0000000000000000000000000000000000000000..fd56ac5b982a79683c66e764e720b569077fd470 GIT binary patch literal 109 zcmWG#VP^RM|33o@11pIBzhj{y(-R=R1H>PI_zw_o0pd^&Mn(o8&}#E&`_9V<=D^r2 fNaCzOwj&TbIWaIeJ3BK32ZaRzxeU%eejyA1rJfxS literal 0 HcmV?d00001 diff --git a/lib/NitroWiFi/asm/ssl/md5.s b/lib/NitroWiFi/asm/ssl/md5.s index 298199ce19..8baa5fdc6c 100644 --- a/lib/NitroWiFi/asm/ssl/md5.s +++ b/lib/NitroWiFi/asm/ssl/md5.s @@ -412,13 +412,13 @@ _0221149C: .word Unk_ov4_0221A264 .global Unk_ov4_0221A224 Unk_ov4_0221A224: ; 0x0221A224 - .incbin "incbin/overlay4_data.bin", 0x43A4, 0x43E4 - 0x43A4 + .incbin "incbin/md5.bin", 0x0, 0x40 .global Unk_ov4_0221A264 Unk_ov4_0221A264: ; 0x0221A264 - .incbin "incbin/overlay4_data.bin", 0x43E4, 0x4424 - 0x43E4 + .incbin "incbin/md5.bin", 0x40, 0x80 - 0x40 .global Unk_ov4_0221A2A4 Unk_ov4_0221A2A4: ; 0x0221A2A4 - .incbin "incbin/overlay4_data.bin", 0x4424, 0x100 + .incbin "incbin/md5.bin", 0x80, 0x100 diff --git a/lib/NitroWiFi/asm/ssl/sha1.s b/lib/NitroWiFi/asm/ssl/sha1.s index e8b56a684b..fa90d198d9 100644 --- a/lib/NitroWiFi/asm/ssl/sha1.s +++ b/lib/NitroWiFi/asm/ssl/sha1.s @@ -631,5 +631,5 @@ _02211D98: .word 0x0221A3A5 .global Unk_ov4_0221A3A4 Unk_ov4_0221A3A4: ; 0x0221A3A4 - .incbin "incbin/overlay4_data.bin", 0x4524, 0x5C + .incbin "incbin/sha1.bin", 0x0, 0x5C diff --git a/lib/NitroWiFi/asm/ssl/ssl.s b/lib/NitroWiFi/asm/ssl/ssl.s index 6b20a36166..eaf317a8a9 100644 --- a/lib/NitroWiFi/asm/ssl/ssl.s +++ b/lib/NitroWiFi/asm/ssl/ssl.s @@ -3886,7 +3886,7 @@ Unk_02000C70: ; 0x02000C70 .global Unk_ov4_02215E40 Unk_ov4_02215E40: ; 0x02215E40 - .incbin "incbin/overlay4_rodata.bin", 0x5D8, 0x7 + .byte 0x15, 0x3, 0x0, 0x0, 0x2, 0x1, 0x29, 0x0 @@ -3895,59 +3895,59 @@ Unk_ov4_02215E40: ; 0x02215E40 .global Unk_ov4_0221A1B4 Unk_ov4_0221A1B4: ; 0x0221A1B4 - .incbin "incbin/overlay4_data.bin", 0x4334, 0x4338 - 0x4334 + .incbin "incbin/ssl.bin", 0x0, 0x4 .global Unk_ov4_0221A1B8 Unk_ov4_0221A1B8: ; 0x0221A1B8 - .incbin "incbin/overlay4_data.bin", 0x4338, 0x433C - 0x4338 + .incbin "incbin/ssl.bin", 0x4, 0x8 - 0x4 .global Unk_ov4_0221A1BC Unk_ov4_0221A1BC: ; 0x0221A1BC - .incbin "incbin/overlay4_data.bin", 0x433C, 0x4340 - 0x433C + .incbin "incbin/ssl.bin", 0x8, 0xC - 0x8 .global Unk_ov4_0221A1C0 Unk_ov4_0221A1C0: ; 0x0221A1C0 - .incbin "incbin/overlay4_data.bin", 0x4340, 0x4344 - 0x4340 + .incbin "incbin/ssl.bin", 0xC, 0x10 - 0xC .global Unk_ov4_0221A1C4 Unk_ov4_0221A1C4: ; 0x0221A1C4 - .incbin "incbin/overlay4_data.bin", 0x4344, 0x435C - 0x4344 + .incbin "incbin/ssl.bin", 0x10, 0x28 - 0x10 .global Unk_ov4_0221A1DC Unk_ov4_0221A1DC: ; 0x0221A1DC - .incbin "incbin/overlay4_data.bin", 0x435C, 0x4364 - 0x435C + .incbin "incbin/ssl.bin", 0x28, 0x30 - 0x28 .global Unk_ov4_0221A1E4 Unk_ov4_0221A1E4: ; 0x0221A1E4 - .incbin "incbin/overlay4_data.bin", 0x4364, 0x4370 - 0x4364 + .incbin "incbin/ssl.bin", 0x30, 0x3C - 0x30 .global Unk_ov4_0221A1F0 Unk_ov4_0221A1F0: ; 0x0221A1F0 - .incbin "incbin/overlay4_data.bin", 0x4370, 0x437C - 0x4370 + .incbin "incbin/ssl.bin", 0x3C, 0x48 - 0x3C .global Unk_ov4_0221A1FC Unk_ov4_0221A1FC: ; 0x0221A1FC - .incbin "incbin/overlay4_data.bin", 0x437C, 0x4388 - 0x437C + .incbin "incbin/ssl.bin", 0x48, 0x54 - 0x48 .global Unk_ov4_0221A208 Unk_ov4_0221A208: ; 0x0221A208 - .incbin "incbin/overlay4_data.bin", 0x4388, 0x438C - 0x4388 + .incbin "incbin/ssl.bin", 0x54, 0x58 - 0x54 .global Unk_ov4_0221A20C Unk_ov4_0221A20C: ; 0x0221A20C - .incbin "incbin/overlay4_data.bin", 0x438C, 0x4390 - 0x438C + .incbin "incbin/ssl.bin", 0x58, 0x5C - 0x58 .global Unk_ov4_0221A210 Unk_ov4_0221A210: ; 0x0221A210 - .incbin "incbin/overlay4_data.bin", 0x4390, 0x4394 - 0x4390 + .incbin "incbin/ssl.bin", 0x5C, 0x60 - 0x5C .global Unk_ov4_0221A214 Unk_ov4_0221A214: ; 0x0221A214 - .incbin "incbin/overlay4_data.bin", 0x4394, 0x439C - 0x4394 + .incbin "incbin/ssl.bin", 0x60, 0x68 - 0x60 .global Unk_ov4_0221A21C Unk_ov4_0221A21C: ; 0x0221A21C - .incbin "incbin/overlay4_data.bin", 0x439C, 0x5 + .incbin "incbin/ssl.bin", 0x68, 0x5 diff --git a/lib/gamespy/asm/available.s b/lib/gamespy/asm/available.s index 0852c53aa3..34e3f78dca 100644 --- a/lib/gamespy/asm/available.s +++ b/lib/gamespy/asm/available.s @@ -276,11 +276,12 @@ _021E99E8: .word Unk_ov4_0221AE50 .global Unk_ov4_022176A4 Unk_ov4_022176A4: ; 0x022176A4 - .incbin "incbin/overlay4_data.bin", 0x1824, 0x1848 - 0x1824 + .ascii "%s.available.gs.nintendowifi.net" + .space 0x4 .global Unk_ov4_022176C8 Unk_ov4_022176C8: ; 0x022176C8 - .incbin "incbin/overlay4_data.bin", 0x1848, 0x4 + .byte 0xFE, 0xFD, 0x9, 0x0 diff --git a/lib/gamespy/asm/chat/chatcallbacks.s b/lib/gamespy/asm/chat/chatcallbacks.s index c823f182d2..10e00beb07 100644 --- a/lib/gamespy/asm/chat/chatcallbacks.s +++ b/lib/gamespy/asm/chat/chatcallbacks.s @@ -3447,121 +3447,144 @@ ov66_0224B3F8: ; 0x0224B3F8 .global Unk_ov66_022592C8 Unk_ov66_022592C8: ; 0x022592C8 - .incbin "incbin/overlay66_data.bin", 0x5A8, 0x5B8 - 0x5A8 + .ascii "ciAddCallback_" + .space 0x2 .global Unk_ov66_022592D8 Unk_ov66_022592D8: ; 0x022592D8 - .incbin "incbin/overlay66_data.bin", 0x5B8, 0x5C8 - 0x5B8 + .ascii "ciCallCallback" + .space 0x2 .global Unk_ov66_022592E8 Unk_ov66_022592E8: ; 0x022592E8 - .incbin "incbin/overlay66_data.bin", 0x5C8, 0x5D8 - 0x5C8 + .asciz "ciCallCallbacks" .global Unk_ov66_022592F8 Unk_ov66_022592F8: ; 0x022592F8 - .incbin "incbin/overlay66_data.bin", 0x5D8, 0x5EC - 0x5D8 + .ascii "ciFreeCallbackData" + .space 0x2 .global Unk_ov66_0225930C Unk_ov66_0225930C: ; 0x0225930C - .incbin "incbin/overlay66_data.bin", 0x5EC, 0x600 - 0x5EC + .ascii "ciCleanupCallbacks" + .space 0x2 .global Unk_ov66_02259320 Unk_ov66_02259320: ; 0x02259320 - .incbin "incbin/overlay66_data.bin", 0x600, 0x618 - 0x600 + .ascii "ciGetCallbackIndexByID" + .space 0x2 .global Unk_ov66_02259338 Unk_ov66_02259338: ; 0x02259338 - .incbin "incbin/overlay66_data.bin", 0x618, 0x638 - 0x618 + .asciz "ciCallbacksArrayElementFreeFn" + .space 0x2 .global Unk_ov66_02259358 Unk_ov66_02259358: ; 0x02259358 - .incbin "incbin/overlay66_data.bin", 0x638, 0x648 - 0x638 + .ascii "data != NULL" + .space 0x4 .global Unk_ov66_02259368 Unk_ov66_02259368: ; 0x02259368 - .incbin "incbin/overlay66_data.bin", 0x648, 0x658 - 0x648 + .asciz "chatCallbacks.c" .global Unk_ov66_02259378 Unk_ov66_02259378: ; 0x02259378 - .incbin "incbin/overlay66_data.bin", 0x658, 0x668 - 0x658 + .asciz "data->type >= 0" .global Unk_ov66_02259388 Unk_ov66_02259388: ; 0x02259388 - .incbin "incbin/overlay66_data.bin", 0x668, 0x684 - 0x668 + .asciz "data->type < CALLBACK_NUM" + .space 0x2 .global Unk_ov66_022593A4 Unk_ov66_022593A4: ; 0x022593A4 - .incbin "incbin/overlay66_data.bin", 0x684, 0x69C - 0x684 + .ascii "data->callback != NULL" + .space 0x2 .global Unk_ov66_022593BC Unk_ov66_022593BC: ; 0x022593BC - .incbin "incbin/overlay66_data.bin", 0x69C, 0x6BC - 0x69C + .ascii "data->callbackParams != NULL" + .space 0x4 .global Unk_ov66_022593DC Unk_ov66_022593DC: ; 0x022593DC - .incbin "incbin/overlay66_data.bin", 0x6BC, 0x6CC - 0x6BC + .asciz "data->ID >= 0" + .space 0x2 .global Unk_ov66_022593EC Unk_ov66_022593EC: ; 0x022593EC - .incbin "incbin/overlay66_data.bin", 0x6CC, 0x6D0 - 0x6CC + .word 0x30 .global Unk_ov66_022593F0 Unk_ov66_022593F0: ; 0x022593F0 - .incbin "incbin/overlay66_data.bin", 0x6D0, 0x6E0 - 0x6D0 + .ascii "chat != NULL" + .space 0x4 .global Unk_ov66_02259400 Unk_ov66_02259400: ; 0x02259400 - .incbin "incbin/overlay66_data.bin", 0x6E0, 0x6EC - 0x6E0 + .asciz "type >= 0" + .space 0x2 .global Unk_ov66_0225940C Unk_ov66_0225940C: ; 0x0225940C - .incbin "incbin/overlay66_data.bin", 0x6EC, 0x700 - 0x6EC + .asciz "type < CALLBACK_NUM" .global Unk_ov66_02259420 Unk_ov66_02259420: ; 0x02259420 - .incbin "incbin/overlay66_data.bin", 0x700, 0x724 - 0x700 + .ascii "connection->callbackList != NULL" + .space 0x4 .global Unk_ov66_02259444 Unk_ov66_02259444: ; 0x02259444 - .incbin "incbin/overlay66_data.bin", 0x724, 0x738 - 0x724 + .ascii "callback != NULL" + .space 0x4 .global Unk_ov66_02259458 Unk_ov66_02259458: ; 0x02259458 - .incbin "incbin/overlay66_data.bin", 0x738, 0x750 - 0x738 + .ascii "callbackParams != NULL" + .space 0x2 .global Unk_ov66_02259470 Unk_ov66_02259470: ; 0x02259470 - .incbin "incbin/overlay66_data.bin", 0x750, 0x768 - 0x750 + .ascii "callbackParamsSize > 0" + .space 0x2 .global Unk_ov66_02259488 Unk_ov66_02259488: ; 0x02259488 - .incbin "incbin/overlay66_data.bin", 0x768, 0x770 - 0x768 + .asciz "ID >= 0" .global Unk_ov66_02259490 Unk_ov66_02259490: ; 0x02259490 - .incbin "incbin/overlay66_data.bin", 0x770, 0x790 - 0x770 + .ascii "srcParams-> numChannels >= 0" + .space 0x4 .global Unk_ov66_022594B0 Unk_ov66_022594B0: ; 0x022594B0 - .incbin "incbin/overlay66_data.bin", 0x790, 0x7AC - 0x790 + .asciz "srcParams->numUsers != NULL" .global Unk_ov66_022594CC Unk_ov66_022594CC: ; 0x022594CC - .incbin "incbin/overlay66_data.bin", 0x7AC, 0x7C8 - 0x7AC + .asciz "srcParams-> numUsers >= 0" + .space 0x2 .global Unk_ov66_022594E8 Unk_ov66_022594E8: ; 0x022594E8 - .incbin "incbin/overlay66_data.bin", 0x7C8, 0x7E4 - 0x7C8 + .ascii "srcParams->modes != NULL" + .space 0x4 .global Unk_ov66_02259504 Unk_ov66_02259504: ; 0x02259504 - .incbin "incbin/overlay66_data.bin", 0x7E4, 0x800 - 0x7E4 + .ascii "srcParams-> numBans >= 0" + .space 0x4 .global Unk_ov66_02259520 Unk_ov66_02259520: ; 0x02259520 - .incbin "incbin/overlay66_data.bin", 0x800, 0x824 - 0x800 + .ascii "srcParams-> numSuggestedNicks >= 0" + .space 0x2 .global Unk_ov66_02259544 Unk_ov66_02259544: ; 0x02259544 - .incbin "incbin/overlay66_data.bin", 0x824, 0x15 + .ascii "srcParams-> num >= 0" + .space 0x4 diff --git a/asm/incbin/overlay66_data.bin b/lib/gamespy/asm/chat/incbin/overlay66_data.bin similarity index 100% rename from asm/incbin/overlay66_data.bin rename to lib/gamespy/asm/chat/incbin/overlay66_data.bin diff --git a/lib/gamespy/asm/darray.s b/lib/gamespy/asm/darray.s index 3ccf5d48ac..a6480349ec 100644 --- a/lib/gamespy/asm/darray.s +++ b/lib/gamespy/asm/darray.s @@ -663,85 +663,103 @@ _021EA1F4: .global Unk_ov4_022176CC Unk_ov4_022176CC: ; 0x022176CC - .incbin "incbin/overlay4_data.bin", 0x184C, 0x1858 - 0x184C + .ascii "ArrayMap" + .space 0x4 .global Unk_ov4_022176D8 Unk_ov4_022176D8: ; 0x022176D8 - .incbin "incbin/overlay4_data.bin", 0x1858, 0x1864 - 0x1858 + .ascii "ArrayNth" + .space 0x4 .global Unk_ov4_022176E4 Unk_ov4_022176E4: ; 0x022176E4 - .incbin "incbin/overlay4_data.bin", 0x1864, 0x1870 - 0x1864 + .ascii "ArrayNew" + .space 0x4 .global Unk_ov4_022176F0 Unk_ov4_022176F0: ; 0x022176F0 - .incbin "incbin/overlay4_data.bin", 0x1870, 0x187C - 0x1870 + .asciz "ArrayFree" + .space 0x2 .global Unk_ov4_022176FC Unk_ov4_022176FC: ; 0x022176FC - .incbin "incbin/overlay4_data.bin", 0x187C, 0x1888 - 0x187C + .asciz "ArrayGrow" + .space 0x2 .global Unk_ov4_02217708 Unk_ov4_02217708: ; 0x02217708 - .incbin "incbin/overlay4_data.bin", 0x1888, 0x1894 - 0x1888 + .asciz "ArrayAppend" .global Unk_ov4_02217714 Unk_ov4_02217714: ; 0x02217714 - .incbin "incbin/overlay4_data.bin", 0x1894, 0x18A4 - 0x1894 + .asciz "ArrayRemoveAt" + .space 0x2 .global Unk_ov4_02217724 Unk_ov4_02217724: ; 0x02217724 - .incbin "incbin/overlay4_data.bin", 0x18A4, 0x18B4 - 0x18A4 + .asciz "ArrayDeleteAt" + .space 0x2 .global Unk_ov4_02217734 Unk_ov4_02217734: ; 0x02217734 - .incbin "incbin/overlay4_data.bin", 0x18B4, 0x18C4 - 0x18B4 + .asciz "ArrayInsertAt" + .space 0x2 .global Unk_ov4_02217744 Unk_ov4_02217744: ; 0x02217744 - .incbin "incbin/overlay4_data.bin", 0x18C4, 0x18D4 - 0x18C4 + .ascii "ArrayReplaceAt" + .space 0x2 .global Unk_ov4_02217754 Unk_ov4_02217754: ; 0x02217754 - .incbin "incbin/overlay4_data.bin", 0x18D4, 0x18E8 - 0x18D4 + .asciz "ArrayMapBackwards" + .space 0x2 .global Unk_ov4_02217768 Unk_ov4_02217768: ; 0x02217768 - .incbin "incbin/overlay4_data.bin", 0x18E8, 0x18FC - 0x18E8 + .asciz "ArrayInsertSorted" + .space 0x2 .global Unk_ov4_0221777C Unk_ov4_0221777C: ; 0x0221777C - .incbin "incbin/overlay4_data.bin", 0x18FC, 0x1910 - 0x18FC + .ascii "ArrayMapBackwards2" + .space 0x2 .global Unk_ov4_02217790 Unk_ov4_02217790: ; 0x02217790 - .incbin "incbin/overlay4_data.bin", 0x1910, 0x191C - 0x1910 + .asciz "array->list" .global Unk_ov4_0221779C Unk_ov4_0221779C: ; 0x0221779C - .incbin "incbin/overlay4_data.bin", 0x191C, 0x1928 - 0x191C + .ascii "darray.c" + .space 0x4 .global Unk_ov4_022177A8 Unk_ov4_022177A8: ; 0x022177A8 - .incbin "incbin/overlay4_data.bin", 0x1928, 0x1930 - 0x1928 + .asciz "array" + .space 0x2 .global Unk_ov4_022177B0 Unk_ov4_022177B0: ; 0x022177B0 - .incbin "incbin/overlay4_data.bin", 0x1930, 0x193C - 0x1930 + .ascii "elemSize" + .space 0x4 .global Unk_ov4_022177BC Unk_ov4_022177BC: ; 0x022177BC - .incbin "incbin/overlay4_data.bin", 0x193C, 0x195C - 0x193C + .ascii "(n >= 0) && (n < array->count)" + .space 0x2 .global Unk_ov4_022177DC Unk_ov4_022177DC: ; 0x022177DC - .incbin "incbin/overlay4_data.bin", 0x195C, 0x197C - 0x195C + .asciz "(n >= 0) && (n <= array->count)" .global Unk_ov4_022177FC Unk_ov4_022177FC: ; 0x022177FC - .incbin "incbin/overlay4_data.bin", 0x197C, 0x1988 - 0x197C + .ascii "comparator" + .space 0x2 .global Unk_ov4_02217808 Unk_ov4_02217808: ; 0x02217808 - .incbin "incbin/overlay4_data.bin", 0x1988, 0x3 + .ascii "fn" + .space 0x2 diff --git a/lib/gamespy/asm/ghttp/ghttppost.s b/lib/gamespy/asm/ghttp/ghttppost.s index 6d21f03a36..a7f822dbfd 100644 --- a/lib/gamespy/asm/ghttp/ghttppost.s +++ b/lib/gamespy/asm/ghttp/ghttppost.s @@ -1110,7 +1110,7 @@ _022227F4: .word Unk_ov60_022298A8 .global Unk_ov60_02228C60 Unk_ov60_02228C60: ; 0x02228C60 - .incbin "incbin/overlay60_rodata.bin", 0x14, 0x4 + .asciz "%00" diff --git a/lib/gamespy/asm/ghttp/ghttpprocess.s b/lib/gamespy/asm/ghttp/ghttpprocess.s index cf25d84164..3885752d61 100644 --- a/lib/gamespy/asm/ghttp/ghttpprocess.s +++ b/lib/gamespy/asm/ghttp/ghttpprocess.s @@ -1571,15 +1571,16 @@ _02223D70: .global Unk_ov60_02228C64 Unk_ov60_02228C64: ; 0x02228C64 - .incbin "incbin/overlay60_rodata.bin", 0x18, 0x1C - 0x18 + .word 0x2000 .global Unk_ov60_02228C68 Unk_ov60_02228C68: ; 0x02228C68 - .incbin "incbin/overlay60_rodata.bin", 0x1C, 0x20 - 0x1C + .word 0x1000 .global Unk_ov60_02228C6C Unk_ov60_02228C6C: ; 0x02228C6C - .incbin "incbin/overlay60_rodata.bin", 0x20, 0xB + .ascii "2147483647" + .space 0x2 diff --git a/asm/incbin/overlay60_data.bin b/lib/gamespy/asm/ghttp/incbin/overlay60_data.bin similarity index 100% rename from asm/incbin/overlay60_data.bin rename to lib/gamespy/asm/ghttp/incbin/overlay60_data.bin diff --git a/asm/incbin/overlay4_data.bin b/lib/gamespy/asm/gp/incbin/overlay4_data.bin similarity index 100% rename from asm/incbin/overlay4_data.bin rename to lib/gamespy/asm/gp/incbin/overlay4_data.bin diff --git a/lib/gamespy/asm/gstats/gbucket.s b/lib/gamespy/asm/gstats/gbucket.s index b2546386f1..2ffc3486a2 100644 --- a/lib/gamespy/asm/gstats/gbucket.s +++ b/lib/gamespy/asm/gstats/gbucket.s @@ -458,27 +458,32 @@ _021F6334: .word 0x00000153 .global Unk_ov4_02219308 Unk_ov4_02219308: ; 0x02219308 - .incbin "incbin/overlay4_data.bin", 0x3488, 0x3490 - 0x3488 + .ascii "DoFind" + .space 0x2 .global Unk_ov4_02219310 Unk_ov4_02219310: ; 0x02219310 - .incbin "incbin/overlay4_data.bin", 0x3490, 0x349C - 0x3490 + .asciz "BucketNew" + .space 0x2 .global Unk_ov4_0221931C Unk_ov4_0221931C: ; 0x0221931C - .incbin "incbin/overlay4_data.bin", 0x349C, 0x34AC - 0x349C + .ascii "BucketConcat" + .space 0x4 .global Unk_ov4_0221932C Unk_ov4_0221932C: ; 0x0221932C - .incbin "incbin/overlay4_data.bin", 0x34AC, 0x34B0 - 0x34AC + .asciz "set" .global Unk_ov4_02219330 Unk_ov4_02219330: ; 0x02219330 - .incbin "incbin/overlay4_data.bin", 0x34B0, 0x34BC - 0x34B0 + .asciz "gbucket.c" + .space 0x2 .global Unk_ov4_0221933C Unk_ov4_0221933C: ; 0x0221933C - .incbin "incbin/overlay4_data.bin", 0x34BC, 0x1C + .ascii "pbucket->type == bt_string" + .space 0x2 diff --git a/lib/gamespy/asm/gstats/gstats.s b/lib/gamespy/asm/gstats/gstats.s index ba5f8e5e76..404cd11237 100644 --- a/lib/gamespy/asm/gstats/gstats.s +++ b/lib/gamespy/asm/gstats/gstats.s @@ -1075,55 +1075,55 @@ _021F7124: .word Unk_ov4_02219448 .global Unk_ov4_0221598C Unk_ov4_0221598C: ; 0x0221598C - .incbin "incbin/overlay4_rodata.bin", 0x124, 0x12C - 0x124 + .incbin "incbin/gstats.bin", 0x0, 0x8 .global Unk_ov4_02215994 Unk_ov4_02215994: ; 0x02215994 - .incbin "incbin/overlay4_rodata.bin", 0x12C, 0x13C - 0x12C + .incbin "incbin/gstats.bin", 0x8, 0x18 - 0x8 .global Unk_ov4_022159A4 Unk_ov4_022159A4: ; 0x022159A4 - .incbin "incbin/overlay4_rodata.bin", 0x13C, 0x14C - 0x13C + .incbin "incbin/gstats.bin", 0x18, 0x28 - 0x18 .global Unk_ov4_022159B4 Unk_ov4_022159B4: ; 0x022159B4 - .incbin "incbin/overlay4_rodata.bin", 0x14C, 0x16A - 0x14C + .incbin "incbin/gstats.bin", 0x28, 0x46 - 0x28 .global Unk_ov4_022159D2 Unk_ov4_022159D2: ; 0x022159D2 - .incbin "incbin/overlay4_rodata.bin", 0x16A, 0x189 - 0x16A + .incbin "incbin/gstats.bin", 0x46, 0x65 - 0x46 .global Unk_ov4_022159F1 Unk_ov4_022159F1: ; 0x022159F1 - .incbin "incbin/overlay4_rodata.bin", 0x189, 0x1AC - 0x189 + .incbin "incbin/gstats.bin", 0x65, 0x88 - 0x65 .global Unk_ov4_02215A14 Unk_ov4_02215A14: ; 0x02215A14 - .incbin "incbin/overlay4_rodata.bin", 0x1AC, 0x1D0 - 0x1AC + .incbin "incbin/gstats.bin", 0x88, 0xAC - 0x88 .global Unk_ov4_02215A38 Unk_ov4_02215A38: ; 0x02215A38 - .incbin "incbin/overlay4_rodata.bin", 0x1D0, 0x1F9 - 0x1D0 + .incbin "incbin/gstats.bin", 0xAC, 0xD5 - 0xAC .global Unk_ov4_02215A61 Unk_ov4_02215A61: ; 0x02215A61 - .incbin "incbin/overlay4_rodata.bin", 0x1F9, 0x223 - 0x1F9 + .incbin "incbin/gstats.bin", 0xD5, 0xFF - 0xD5 .global Unk_ov4_02215A8B Unk_ov4_02215A8B: ; 0x02215A8B - .incbin "incbin/overlay4_rodata.bin", 0x223, 0x24F - 0x223 + .incbin "incbin/gstats.bin", 0xFF, 0x12B - 0xFF .global Unk_ov4_02215AB7 Unk_ov4_02215AB7: ; 0x02215AB7 - .incbin "incbin/overlay4_rodata.bin", 0x24F, 0x280 - 0x24F + .incbin "incbin/gstats.bin", 0x12B, 0x15C - 0x12B .global Unk_ov4_02215AE8 Unk_ov4_02215AE8: ; 0x02215AE8 - .incbin "incbin/overlay4_rodata.bin", 0x280, 0x2BF - 0x280 + .incbin "incbin/gstats.bin", 0x15C, 0x19B - 0x15C .global Unk_ov4_02215B27 Unk_ov4_02215B27: ; 0x02215B27 - .incbin "incbin/overlay4_rodata.bin", 0x2BF, 0x101 + .incbin "incbin/gstats.bin", 0x19B, 0x101 @@ -1132,103 +1132,134 @@ Unk_ov4_02215B27: ; 0x02215B27 .global Unk_ov4_02219358 Unk_ov4_02219358: ; 0x02219358 - .incbin "incbin/overlay4_data.bin", 0x34D8, 0x34DC - 0x34D8 + .word 0xFFFFFFFF .global Unk_ov4_0221935C Unk_ov4_0221935C: ; 0x0221935C - .incbin "incbin/overlay4_data.bin", 0x34DC, 0x34E0 - 0x34DC + .ascii " N" + .space 0x2 .global Unk_ov4_02219360 Unk_ov4_02219360: ; 0x02219360 - .incbin "incbin/overlay4_data.bin", 0x34E0, 0x34E4 - 0x34E0 + .word Unk_ov4_022193A4 .global Unk_ov4_02219364 Unk_ov4_02219364: ; 0x02219364 - .incbin "incbin/overlay4_data.bin", 0x34E4, 0x3500 - 0x34E4 + .word ov4_021F5E18 + .word ov4_021F5E44 + .word ov4_021F5ED8 + .word ov4_021F5F5C + .word ov4_021F5FDC + .word ov4_021F6060 + .word ov4_021F6104 .global Unk_ov4_02219380 Unk_ov4_02219380: ; 0x02219380 - .incbin "incbin/overlay4_data.bin", 0x3500, 0x3524 - 0x3500 + .word ov4_021F6DC4 + .word ov4_021F6E2C + .word ov4_021F6E9C + .word ov4_021F6EF8 + .word ov4_021F6F54 + .word ov4_021F6FB4 + .word ov4_021F7010 + .word ov4_021F706C + .word ov4_021F70CC .global Unk_ov4_022193A4 Unk_ov4_022193A4: ; 0x022193A4 - .incbin "incbin/overlay4_data.bin", 0x3524, 0x3534 - 0x3524 + .space 0x1 + .asciz "ameSpy3D" + .space 0x6 .global Unk_ov4_022193B4 Unk_ov4_022193B4: ; 0x022193B4 - .incbin "incbin/overlay4_data.bin", 0x3534, 0x3544 - 0x3534 + .space 0x1 + .ascii "rojectAphex" + .space 0x4 .global Unk_ov4_022193C4 Unk_ov4_022193C4: ; 0x022193C4 - .incbin "incbin/overlay4_data.bin", 0x3544, 0x3548 - 0x3544 + .space 0x4 .global Unk_ov4_022193C8 Unk_ov4_022193C8: ; 0x022193C8 - .incbin "incbin/overlay4_data.bin", 0x3548, 0x354C - 0x3548 + .word 0x5C .global Unk_ov4_022193CC Unk_ov4_022193CC: ; 0x022193CC - .incbin "incbin/overlay4_data.bin", 0x354C, 0x3554 - 0x354C + .ascii "pauthr" + .space 0x2 .global Unk_ov4_022193D4 Unk_ov4_022193D4: ; 0x022193D4 - .incbin "incbin/overlay4_data.bin", 0x3554, 0x3558 - 0x3554 + .asciz "lid" .global Unk_ov4_022193D8 Unk_ov4_022193D8: ; 0x022193D8 - .incbin "incbin/overlay4_data.bin", 0x3558, 0x3560 - 0x3558 + .ascii "errmsg" + .space 0x2 .global Unk_ov4_022193E0 Unk_ov4_022193E0: ; 0x022193E0 - .incbin "incbin/overlay4_data.bin", 0x3560, 0x3568 - 0x3560 + .asciz "getpidr" .global Unk_ov4_022193E8 Unk_ov4_022193E8: ; 0x022193E8 - .incbin "incbin/overlay4_data.bin", 0x3568, 0x3570 - 0x3568 + .ascii "getpdr" + .space 0x2 .global Unk_ov4_022193F0 Unk_ov4_022193F0: ; 0x022193F0 - .incbin "incbin/overlay4_data.bin", 0x3570, 0x3574 - 0x3570 + .asciz "pid" .global Unk_ov4_022193F4 Unk_ov4_022193F4: ; 0x022193F4 - .incbin "incbin/overlay4_data.bin", 0x3574, 0x3578 - 0x3574 + .asciz "mod" .global Unk_ov4_022193F8 Unk_ov4_022193F8: ; 0x022193F8 - .incbin "incbin/overlay4_data.bin", 0x3578, 0x3580 - 0x3578 + .ascii "length" + .space 0x2 .global Unk_ov4_02219400 Unk_ov4_02219400: ; 0x02219400 - .incbin "incbin/overlay4_data.bin", 0x3580, 0x3588 - 0x3580 + .ascii "\\data\\" + .space 0x2 .global Unk_ov4_02219408 Unk_ov4_02219408: ; 0x02219408 - .incbin "incbin/overlay4_data.bin", 0x3588, 0x3590 - 0x3588 + .ascii "setpdr" + .space 0x2 .global Unk_ov4_02219410 Unk_ov4_02219410: ; 0x02219410 - .incbin "incbin/overlay4_data.bin", 0x3590, 0x359C - 0x3590 + .ascii "\\pauthr\\" + .space 0x4 .global Unk_ov4_0221941C Unk_ov4_0221941C: ; 0x0221941C - .incbin "incbin/overlay4_data.bin", 0x359C, 0x35A8 - 0x359C + .asciz "\\getpidr\\" + .space 0x2 .global Unk_ov4_02219428 Unk_ov4_02219428: ; 0x02219428 - .incbin "incbin/overlay4_data.bin", 0x35A8, 0x35B4 - 0x35A8 + .ascii "\\getpdr\\" + .space 0x4 .global Unk_ov4_02219434 Unk_ov4_02219434: ; 0x02219434 - .incbin "incbin/overlay4_data.bin", 0x35B4, 0x35C0 - 0x35B4 + .ascii "\\setpdr\\" + .space 0x4 .global Unk_ov4_02219440 Unk_ov4_02219440: ; 0x02219440 - .incbin "incbin/overlay4_data.bin", 0x35C0, 0x35C8 - 0x35C0 + .ascii "%s_t%d" + .space 0x2 .global Unk_ov4_02219448 Unk_ov4_02219448: ; 0x02219448 - .incbin "incbin/overlay4_data.bin", 0x35C8, 0x6 + .asciz "%s_%d" + .space 0x2 diff --git a/lib/gamespy/asm/gstats/incbin/gstats.bin b/lib/gamespy/asm/gstats/incbin/gstats.bin new file mode 100644 index 0000000000000000000000000000000000000000..cfc8a99cecd3a1b6d9d642965cc9940510cd379d GIT binary patch literal 668 zcmd^+L2rUU5QS%S3ku8123VA3rAe{DgqT>6l$eMYdoXE?2jj(~*QO``f0x>NG3g)Z zo@OU+=e=+C^znHlen < buffer->size" + .space 0x2 .global Unk_ov4_0221950C Unk_ov4_0221950C: ; 0x0221950C - .incbin "incbin/overlay4_data.bin", 0x368C, 0x3698 - 0x368C + .asciz "gt2Buffer.c" .global Unk_ov4_02219518 Unk_ov4_02219518: ; 0x02219518 - .incbin "incbin/overlay4_data.bin", 0x3698, 0x36BC - 0x3698 + .asciz "(buffer->len + 2) <= buffer->size" + .space 0x2 .global Unk_ov4_0221953C Unk_ov4_0221953C: ; 0x0221953C - .incbin "incbin/overlay4_data.bin", 0x36BC, 0x36E0 - 0x36BC + .asciz "(buffer->len + len) <= buffer->size" .global Unk_ov4_02219560 Unk_ov4_02219560: ; 0x02219560 - .incbin "incbin/overlay4_data.bin", 0x36E0, 0x36F8 - 0x36E0 + .ascii "start <= buffer->len" + .space 0x4 .global Unk_ov4_02219578 Unk_ov4_02219578: ; 0x02219578 - .incbin "incbin/overlay4_data.bin", 0x36F8, 0x23 + .ascii "shortenBy <= (buffer->len - start)" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2callback.s b/lib/gamespy/asm/gt2/gt2callback.s index 037558c748..1033289365 100644 --- a/lib/gamespy/asm/gt2/gt2callback.s +++ b/lib/gamespy/asm/gt2/gt2callback.s @@ -663,57 +663,69 @@ _021F7F50: .word 0x00000197 .global Unk_ov4_0221959C Unk_ov4_0221959C: ; 0x0221959C - .incbin "incbin/overlay4_data.bin", 0x371C, 0x3730 - 0x371C + .ascii "gti2DumpCallback" + .space 0x4 .global Unk_ov4_022195B0 Unk_ov4_022195B0: ; 0x022195B0 - .incbin "incbin/overlay4_data.bin", 0x3730, 0x3744 - 0x3730 + .ascii "gti2PingCallback" + .space 0x4 .global Unk_ov4_022195C4 Unk_ov4_022195C4: ; 0x022195C4 - .incbin "incbin/overlay4_data.bin", 0x3744, 0x3758 - 0x3744 + .ascii "gti2ClosedCallback" + .space 0x2 .global Unk_ov4_022195D8 Unk_ov4_022195D8: ; 0x022195D8 - .incbin "incbin/overlay4_data.bin", 0x3758, 0x3770 - 0x3758 + .ascii "gti2ReceivedCallback" + .space 0x4 .global Unk_ov4_022195F0 Unk_ov4_022195F0: ; 0x022195F0 - .incbin "incbin/overlay4_data.bin", 0x3770, 0x3788 - 0x3770 + .asciz "gti2ConnectedCallback" + .space 0x2 .global Unk_ov4_02219608 Unk_ov4_02219608: ; 0x02219608 - .incbin "incbin/overlay4_data.bin", 0x3788, 0x37A0 - 0x3788 + .ascii "gti2SendFilterCallback" + .space 0x2 .global Unk_ov4_02219620 Unk_ov4_02219620: ; 0x02219620 - .incbin "incbin/overlay4_data.bin", 0x37A0, 0x37B8 - 0x37A0 + .asciz "gti2SocketErrorCallback" .global Unk_ov4_02219638 Unk_ov4_02219638: ; 0x02219638 - .incbin "incbin/overlay4_data.bin", 0x37B8, 0x37D4 - 0x37B8 + .asciz "gti2ReceiveFilterCallback" + .space 0x2 .global Unk_ov4_02219654 Unk_ov4_02219654: ; 0x02219654 - .incbin "incbin/overlay4_data.bin", 0x37D4, 0x37F0 - 0x37D4 + .ascii "gti2ConnectAttemptCallback" + .space 0x2 .global Unk_ov4_02219670 Unk_ov4_02219670: ; 0x02219670 - .incbin "incbin/overlay4_data.bin", 0x37F0, 0x3810 - 0x37F0 + .asciz "gti2UnrecognizedMessageCallback" .global Unk_ov4_02219690 Unk_ov4_02219690: ; 0x02219690 - .incbin "incbin/overlay4_data.bin", 0x3810, 0x3818 - 0x3810 + .ascii "socket" + .space 0x2 .global Unk_ov4_02219698 Unk_ov4_02219698: ; 0x02219698 - .incbin "incbin/overlay4_data.bin", 0x3818, 0x3828 - 0x3818 + .asciz "gt2Callback.c" + .space 0x2 .global Unk_ov4_022196A8 Unk_ov4_022196A8: ; 0x022196A8 - .incbin "incbin/overlay4_data.bin", 0x3828, 0x3840 - 0x3828 + .ascii "socket && connection" + .space 0x4 .global Unk_ov4_022196C0 Unk_ov4_022196C0: ; 0x022196C0 - .incbin "incbin/overlay4_data.bin", 0x3840, 0xB + .ascii "connection" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2main.s b/lib/gamespy/asm/gt2/gt2main.s index 0c104858de..c44423ceef 100644 --- a/lib/gamespy/asm/gt2/gt2main.s +++ b/lib/gamespy/asm/gt2/gt2main.s @@ -318,19 +318,23 @@ _021F87EC: .word 0x000001AA .global Unk_ov4_022196CC Unk_ov4_022196CC: ; 0x022196CC - .incbin "incbin/overlay4_data.bin", 0x384C, 0x3864 - 0x384C + .ascii "gt2SetConnectionData" + .space 0x4 .global Unk_ov4_022196E4 Unk_ov4_022196E4: ; 0x022196E4 - .incbin "incbin/overlay4_data.bin", 0x3864, 0x387C - 0x3864 + .ascii "gt2GetConnectionData" + .space 0x4 .global Unk_ov4_022196FC Unk_ov4_022196FC: ; 0x022196FC - .incbin "incbin/overlay4_data.bin", 0x387C, 0x3888 - 0x387C + .asciz "gt2Main.c" + .space 0x2 .global Unk_ov4_02219708 Unk_ov4_02219708: ; 0x02219708 - .incbin "incbin/overlay4_data.bin", 0x3888, 0xB + .ascii "connection" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2message.s b/lib/gamespy/asm/gt2/gt2message.s index 3833294d77..695e53e371 100644 --- a/lib/gamespy/asm/gt2/gt2message.s +++ b/lib/gamespy/asm/gt2/gt2message.s @@ -2075,21 +2075,24 @@ _021FA358: .global Unk_ov4_02219714 Unk_ov4_02219714: ; 0x02219714 - .incbin "incbin/overlay4_data.bin", 0x3894, 0x38AC - 0x3894 + .ascii "gti2EndReliableMessage" + .space 0x2 .global Unk_ov4_0221972C Unk_ov4_0221972C: ; 0x0221972C - .incbin "incbin/overlay4_data.bin", 0x38AC, 0x38B4 - 0x38AC + .ascii "time" + .space 0x4 .global Unk_ov4_02219734 Unk_ov4_02219734: ; 0x02219734 - .incbin "incbin/overlay4_data.bin", 0x38B4, 0x38B8 - 0x38B4 + .byte 0xFE, 0xFE, 0x0, 0x0 .global Unk_ov4_02219738 Unk_ov4_02219738: ; 0x02219738 - .incbin "incbin/overlay4_data.bin", 0x38B8, 0x38C0 - 0x38B8 + .asciz "len > 0" .global Unk_ov4_02219740 Unk_ov4_02219740: ; 0x02219740 - .incbin "incbin/overlay4_data.bin", 0x38C0, 0xD + .ascii "gt2Message.c" + .space 0x4 diff --git a/lib/gamespy/asm/gt2/gt2utility.s b/lib/gamespy/asm/gt2/gt2utility.s index 08e30f839c..233595ce49 100644 --- a/lib/gamespy/asm/gt2/gt2utility.s +++ b/lib/gamespy/asm/gt2/gt2utility.s @@ -203,31 +203,36 @@ _021FAE7C: .word Unk_ov4_022197A4 .global Unk_ov4_02219750 Unk_ov4_02219750: ; 0x02219750 - .incbin "incbin/overlay4_data.bin", 0x38D0, 0x38E4 - 0x38D0 + .ascii "gt2StringToAddress" + .space 0x2 .global Unk_ov4_02219764 Unk_ov4_02219764: ; 0x02219764 - .incbin "incbin/overlay4_data.bin", 0x38E4, 0x38EC - 0x38E4 + .asciz "%s:%d" + .space 0x2 .global Unk_ov4_0221976C Unk_ov4_0221976C: ; 0x0221976C - .incbin "incbin/overlay4_data.bin", 0x38EC, 0x38F0 - 0x38EC + .ascii "%s" + .space 0x2 .global Unk_ov4_02219770 Unk_ov4_02219770: ; 0x02219770 - .incbin "incbin/overlay4_data.bin", 0x38F0, 0x38F4 - 0x38F0 + .asciz ":%d" .global Unk_ov4_02219774 Unk_ov4_02219774: ; 0x02219774 - .incbin "incbin/overlay4_data.bin", 0x38F4, 0x3914 - 0x38F4 + .ascii "len < GTI2_STACK_HOSTLEN_MAX" + .space 0x4 .global Unk_ov4_02219794 Unk_ov4_02219794: ; 0x02219794 - .incbin "incbin/overlay4_data.bin", 0x3914, 0x3924 - 0x3914 + .ascii "gt2Utility.c" + .space 0x4 .global Unk_ov4_022197A4 Unk_ov4_022197A4: ; 0x022197A4 - .incbin "incbin/overlay4_data.bin", 0x3924, 0x1 + .space 0x1 diff --git a/lib/gamespy/asm/hashtable.s b/lib/gamespy/asm/hashtable.s index 46bbb9242c..c724ae0936 100644 --- a/lib/gamespy/asm/hashtable.s +++ b/lib/gamespy/asm/hashtable.s @@ -452,69 +452,83 @@ _021EA7B0: .word Unk_ov4_02217870 .global Unk_ov4_0221780C Unk_ov4_0221780C: ; 0x0221780C - .incbin "incbin/overlay4_data.bin", 0x198C, 0x1998 - 0x198C + .ascii "TableMap" + .space 0x4 .global Unk_ov4_02217818 Unk_ov4_02217818: ; 0x02217818 - .incbin "incbin/overlay4_data.bin", 0x1998, 0x19A4 - 0x1998 + .asciz "TableNew2" + .space 0x2 .global Unk_ov4_02217824 Unk_ov4_02217824: ; 0x02217824 - .incbin "incbin/overlay4_data.bin", 0x19A4, 0x19B0 - 0x19A4 + .asciz "TableFree" + .space 0x2 .global Unk_ov4_02217830 Unk_ov4_02217830: ; 0x02217830 - .incbin "incbin/overlay4_data.bin", 0x19B0, 0x19BC - 0x19B0 + .ascii "TableEnter" + .space 0x2 .global Unk_ov4_0221783C Unk_ov4_0221783C: ; 0x0221783C - .incbin "incbin/overlay4_data.bin", 0x19BC, 0x19C8 - 0x19BC + .ascii "TableCount" + .space 0x2 .global Unk_ov4_02217848 Unk_ov4_02217848: ; 0x02217848 - .incbin "incbin/overlay4_data.bin", 0x19C8, 0x19D4 - 0x19C8 + .asciz "TableRemove" .global Unk_ov4_02217854 Unk_ov4_02217854: ; 0x02217854 - .incbin "incbin/overlay4_data.bin", 0x19D4, 0x19E0 - 0x19D4 + .asciz "TableLookup" .global Unk_ov4_02217860 Unk_ov4_02217860: ; 0x02217860 - .incbin "incbin/overlay4_data.bin", 0x19E0, 0x19F0 - 0x19E0 + .ascii "TableMapSafe" + .space 0x4 .global Unk_ov4_02217870 Unk_ov4_02217870: ; 0x02217870 - .incbin "incbin/overlay4_data.bin", 0x19F0, 0x1A00 - 0x19F0 + .asciz "TableMapSafe2" + .space 0x2 .global Unk_ov4_02217880 Unk_ov4_02217880: ; 0x02217880 - .incbin "incbin/overlay4_data.bin", 0x1A00, 0x1A08 - 0x1A00 + .ascii "hashFn" + .space 0x2 .global Unk_ov4_02217888 Unk_ov4_02217888: ; 0x02217888 - .incbin "incbin/overlay4_data.bin", 0x1A08, 0x1A14 - 0x1A08 + .asciz "hashtable.c" .global Unk_ov4_02217894 Unk_ov4_02217894: ; 0x02217894 - .incbin "incbin/overlay4_data.bin", 0x1A14, 0x1A1C - 0x1A14 + .ascii "compFn" + .space 0x2 .global Unk_ov4_0221789C Unk_ov4_0221789C: ; 0x0221789C - .incbin "incbin/overlay4_data.bin", 0x1A1C, 0x1A28 - 0x1A1C + .ascii "elemSize" + .space 0x4 .global Unk_ov4_022178A8 Unk_ov4_022178A8: ; 0x022178A8 - .incbin "incbin/overlay4_data.bin", 0x1A28, 0x1A34 - 0x1A28 + .ascii "nBuckets" + .space 0x4 .global Unk_ov4_022178B4 Unk_ov4_022178B4: ; 0x022178B4 - .incbin "incbin/overlay4_data.bin", 0x1A34, 0x1A3C - 0x1A34 + .asciz "table" + .space 0x2 .global Unk_ov4_022178BC Unk_ov4_022178BC: ; 0x022178BC - .incbin "incbin/overlay4_data.bin", 0x1A3C, 0x1A4C - 0x1A3C + .ascii "table->buckets" + .space 0x2 .global Unk_ov4_022178CC Unk_ov4_022178CC: ; 0x022178CC - .incbin "incbin/overlay4_data.bin", 0x1A4C, 0x3 + .ascii "fn" + .space 0x2 diff --git a/lib/gamespy/asm/md5c.s b/lib/gamespy/asm/md5c.s index c6a02e7482..06cd813423 100644 --- a/lib/gamespy/asm/md5c.s +++ b/lib/gamespy/asm/md5c.s @@ -56,5 +56,6 @@ ov4_021EA7F4: ; 0x021EA7F4 .global Unk_ov4_022178D0 Unk_ov4_022178D0: ; 0x022178D0 - .incbin "incbin/overlay4_data.bin", 0x1A50, 0x8 + .ascii "%02x" + .space 0x4 diff --git a/lib/gamespy/asm/natneg/natneg.s b/lib/gamespy/asm/natneg/natneg.s index 5b94ecb9b0..16eacc6da6 100644 --- a/lib/gamespy/asm/natneg/natneg.s +++ b/lib/gamespy/asm/natneg/natneg.s @@ -1121,19 +1121,21 @@ _021FBD18: .global NNMagicData NNMagicData: ; 0x022197A8 - .incbin "incbin/overlay4_data.bin", 0x3928, 0x3930 - 0x3928 + .byte 0xFD, 0xFC, 0x1E, 0x66, 0x6A, 0xB2 + .space 0x2 .global Unk_ov4_022197B0 Unk_ov4_022197B0: ; 0x022197B0 - .incbin "incbin/overlay4_data.bin", 0x3930, 0x3938 - 0x3930 + .asciz "%s.%s" + .space 0x2 .global Unk_ov4_022197B8 Unk_ov4_022197B8: ; 0x022197B8 - .incbin "incbin/overlay4_data.bin", 0x3938, 0x3954 - 0x3938 + .asciz "natneg1.gs.nintendowifi.net" .global Unk_ov4_022197D4 Unk_ov4_022197D4: ; 0x022197D4 - .incbin "incbin/overlay4_data.bin", 0x3954, 0x1C + .asciz "natneg2.gs.nintendowifi.net" diff --git a/lib/gamespy/asm/nonport.s b/lib/gamespy/asm/nonport.s index f3dca17881..a437cf2726 100644 --- a/lib/gamespy/asm/nonport.s +++ b/lib/gamespy/asm/nonport.s @@ -849,15 +849,15 @@ _021EB224: .word 0x55555556 .global Unk_ov4_02215980 Unk_ov4_02215980: ; 0x02215980 - .incbin "incbin/overlay4_rodata.bin", 0x118, 0x11C - 0x118 + .asciz "[]_" .global Unk_ov4_02215984 Unk_ov4_02215984: ; 0x02215984 - .incbin "incbin/overlay4_rodata.bin", 0x11C, 0x120 - 0x11C + .asciz "-_=" .global Unk_ov4_02215988 Unk_ov4_02215988: ; 0x02215988 - .incbin "incbin/overlay4_rodata.bin", 0x120, 0x4 + .asciz "+/=" @@ -866,28 +866,32 @@ Unk_ov4_02215988: ; 0x02215988 .global Unk_ov4_022178D8 Unk_ov4_022178D8: ; 0x022178D8 - .incbin "incbin/overlay4_data.bin", 0x1A58, 0x1A5C - 0x1A58 + .word 0x1 .global Unk_ov4_022178DC Unk_ov4_022178DC: ; 0x022178DC - .incbin "incbin/overlay4_data.bin", 0x1A5C, 0x1A64 - 0x1A5C + .ascii "time" + .space 0x4 .global Unk_ov4_022178E4 Unk_ov4_022178E4: ; 0x022178E4 - .incbin "incbin/overlay4_data.bin", 0x1A64, 0x1A74 - 0x1A64 + .ascii "current_time" + .space 0x4 .global Unk_ov4_022178F4 Unk_ov4_022178F4: ; 0x022178F4 - .incbin "incbin/overlay4_data.bin", 0x1A74, 0x1A94 - 0x1A74 + .ascii "OS_IsTickAvailable() == TRUE" + .space 0x4 .global Unk_ov4_02217914 Unk_ov4_02217914: ; 0x02217914 - .incbin "incbin/overlay4_data.bin", 0x1A94, 0x1AA0 - 0x1A94 + .asciz "nonport.c" + .space 0x2 .global Unk_ov4_02217920 Unk_ov4_02217920: ; 0x02217920 - .incbin "incbin/overlay4_data.bin", 0x1AA0, 0xA - + .asciz "localhost" + .space 0x2 .bss diff --git a/lib/gamespy/asm/qr2/qr2.s b/lib/gamespy/asm/qr2/qr2.s index cc30cd1525..1f7f336337 100644 --- a/lib/gamespy/asm/qr2/qr2.s +++ b/lib/gamespy/asm/qr2/qr2.s @@ -1721,7 +1721,8 @@ _021FD4DC: .word Unk_ov4_022199F4 .global Unk_ov4_02215C28 Unk_ov4_02215C28: ; 0x02215C28 - .incbin "incbin/overlay4_rodata.bin", 0x3C0, 0x8 + .byte 0xFD, 0xFC, 0x1E, 0x66, 0x6A, 0xB2 + .space 0x2 @@ -1730,84 +1731,96 @@ Unk_ov4_02215C28: ; 0x02215C28 .global Unk_ov4_022197F0 Unk_ov4_022197F0: ; 0x022197F0 - .incbin "incbin/overlay4_data.bin", 0x3970, 0x3974 - 0x3970 + .word Unk_ov4_022197F4 .global Unk_ov4_022197F4 Unk_ov4_022197F4: ; 0x022197F4 - .incbin "incbin/overlay4_data.bin", 0x3974, 0x3A84 - 0x3974 + .word 0xFFFFFFFF + .space 0x10C .global Unk_ov4_02219904 Unk_ov4_02219904: ; 0x02219904 - .incbin "incbin/overlay4_data.bin", 0x3A84, 0x3AA4 - 0x3A84 + .asciz "%s.master.gs.nintendowifi.net" + .space 0x2 .global Unk_ov4_02219924 Unk_ov4_02219924: ; 0x02219924 - .incbin "incbin/overlay4_data.bin", 0x3AA4, 0x3ADC - 0x3AA4 + .asciz "No challenge value was received from the master server." .global Unk_ov4_0221995C Unk_ov4_0221995C: ; 0x0221995C - .incbin "incbin/overlay4_data.bin", 0x3ADC, 0x3AE0 - 0x3ADC + .ascii "%d" + .space 0x2 .global Unk_ov4_02219960 Unk_ov4_02219960: ; 0x02219960 - .incbin "incbin/overlay4_data.bin", 0x3AE0, 0x3AF0 - 0x3AE0 + .asciz "255.255.255.255" .global Unk_ov4_02219970 Unk_ov4_02219970: ; 0x02219970 - .incbin "incbin/overlay4_data.bin", 0x3AF0, 0x3AFC - 0x3AF0 + .ascii "%08X%04X" + .space 0x4 .global Unk_ov4_0221997C Unk_ov4_0221997C: ; 0x0221997C - .incbin "incbin/overlay4_data.bin", 0x3AFC, 0x3B04 - 0x3AFC + .asciz "unknown" .global Unk_ov4_02219984 Unk_ov4_02219984: ; 0x02219984 - .incbin "incbin/overlay4_data.bin", 0x3B04, 0x3B08 - 0x3B04 + .space 0x4 .global Unk_ov4_02219988 Unk_ov4_02219988: ; 0x02219988 - .incbin "incbin/overlay4_data.bin", 0x3B08, 0x3B10 - 0x3B08 + .ascii "%s%d" + .space 0x4 .global Unk_ov4_02219990 Unk_ov4_02219990: ; 0x02219990 - .incbin "incbin/overlay4_data.bin", 0x3B10, 0x3B24 - 0x3B10 + .ascii "final\\\\queryid\\1.1" + .space 0x2 .global Unk_ov4_022199A4 Unk_ov4_022199A4: ; 0x022199A4 - .incbin "incbin/overlay4_data.bin", 0x3B24, 0x3B30 - 0x3B24 + .asciz "localip%d" + .space 0x2 .global Unk_ov4_022199B0 Unk_ov4_022199B0: ; 0x022199B0 - .incbin "incbin/overlay4_data.bin", 0x3B30, 0x3B3C - 0x3B30 + .asciz "localport" + .space 0x2 .global Unk_ov4_022199BC Unk_ov4_022199BC: ; 0x022199BC - .incbin "incbin/overlay4_data.bin", 0x3B3C, 0x3B44 - 0x3B3C + .ascii "natneg" + .space 0x2 .global Unk_ov4_022199C4 Unk_ov4_022199C4: ; 0x022199C4 - .incbin "incbin/overlay4_data.bin", 0x3B44, 0x3B48 - 0x3B44 + .word 0x31 .global Unk_ov4_022199C8 Unk_ov4_022199C8: ; 0x022199C8 - .incbin "incbin/overlay4_data.bin", 0x3B48, 0x3B4C - 0x3B48 + .word 0x30 .global Unk_ov4_022199CC Unk_ov4_022199CC: ; 0x022199CC - .incbin "incbin/overlay4_data.bin", 0x3B4C, 0x3B5C - 0x3B4C + .ascii "statechanged" + .space 0x4 .global Unk_ov4_022199DC Unk_ov4_022199DC: ; 0x022199DC - .incbin "incbin/overlay4_data.bin", 0x3B5C, 0x3B68 - 0x3B5C + .ascii "gamename" + .space 0x4 .global Unk_ov4_022199E8 Unk_ov4_022199E8: ; 0x022199E8 - .incbin "incbin/overlay4_data.bin", 0x3B68, 0x3B74 - 0x3B68 + .ascii "publicip" + .space 0x4 .global Unk_ov4_022199F4 Unk_ov4_022199F4: ; 0x022199F4 - .incbin "incbin/overlay4_data.bin", 0x3B74, 0xB - + .ascii "publicport" + .space 0x2 .bss diff --git a/lib/gamespy/asm/qr2/qr2regkeys.s b/lib/gamespy/asm/qr2/qr2regkeys.s index bbacf7b7ab..67a15ed01c 100644 --- a/lib/gamespy/asm/qr2/qr2regkeys.s +++ b/lib/gamespy/asm/qr2/qr2regkeys.s @@ -21,126 +21,176 @@ _021FD4FC: .word Unk_ov4_02219B38 .global Unk_ov4_02219A00 Unk_ov4_02219A00: ; 0x02219A00 - .incbin "incbin/overlay4_data.bin", 0x3B80, 0x3B84 - 0x3B80 + .space 0x4 .global Unk_ov4_02219A04 Unk_ov4_02219A04: ; 0x02219A04 - .incbin "incbin/overlay4_data.bin", 0x3B84, 0x3B8C - 0x3B84 + .ascii "pid_" + .space 0x4 .global Unk_ov4_02219A0C Unk_ov4_02219A0C: ; 0x02219A0C - .incbin "incbin/overlay4_data.bin", 0x3B8C, 0x3B94 - 0x3B8C + .asciz "ping_" + .space 0x2 .global Unk_ov4_02219A14 Unk_ov4_02219A14: ; 0x02219A14 - .incbin "incbin/overlay4_data.bin", 0x3B94, 0x3B9C - 0x3B94 + .asciz "team_" + .space 0x2 .global Unk_ov4_02219A1C Unk_ov4_02219A1C: ; 0x02219A1C - .incbin "incbin/overlay4_data.bin", 0x3B9C, 0x3BA4 - 0x3B9C + .ascii "score_" + .space 0x2 .global Unk_ov4_02219A24 Unk_ov4_02219A24: ; 0x02219A24 - .incbin "incbin/overlay4_data.bin", 0x3BA4, 0x3BAC - 0x3BA4 + .ascii "team_t" + .space 0x2 .global Unk_ov4_02219A2C Unk_ov4_02219A2C: ; 0x02219A2C - .incbin "incbin/overlay4_data.bin", 0x3BAC, 0x3BB4 - 0x3BAC + .ascii "skill_" + .space 0x2 .global Unk_ov4_02219A34 Unk_ov4_02219A34: ; 0x02219A34 - .incbin "incbin/overlay4_data.bin", 0x3BB4, 0x3BBC - 0x3BB4 + .asciz "groupid" .global Unk_ov4_02219A3C Unk_ov4_02219A3C: ; 0x02219A3C - .incbin "incbin/overlay4_data.bin", 0x3BBC, 0x3BC4 - 0x3BBC + .asciz "deaths_" .global Unk_ov4_02219A44 Unk_ov4_02219A44: ; 0x02219A44 - .incbin "incbin/overlay4_data.bin", 0x3BC4, 0x3BCC - 0x3BC4 + .asciz "gamever" .global Unk_ov4_02219A4C Unk_ov4_02219A4C: ; 0x02219A4C - .incbin "incbin/overlay4_data.bin", 0x3BCC, 0x3BD4 - 0x3BCC + .asciz "player_" .global Unk_ov4_02219A54 Unk_ov4_02219A54: ; 0x02219A54 - .incbin "incbin/overlay4_data.bin", 0x3BD4, 0x3BDC - 0x3BD4 + .asciz "score_t" .global Unk_ov4_02219A5C Unk_ov4_02219A5C: ; 0x02219A5C - .incbin "incbin/overlay4_data.bin", 0x3BDC, 0x3BE4 - 0x3BDC + .asciz "mapname" .global Unk_ov4_02219A64 Unk_ov4_02219A64: ; 0x02219A64 - .incbin "incbin/overlay4_data.bin", 0x3BE4, 0x3BF0 - 0x3BE4 + .ascii "gamename" + .space 0x4 .global Unk_ov4_02219A70 Unk_ov4_02219A70: ; 0x02219A70 - .incbin "incbin/overlay4_data.bin", 0x3BF0, 0x3BFC - 0x3BF0 + .ascii "hostport" + .space 0x4 .global Unk_ov4_02219A7C Unk_ov4_02219A7C: ; 0x02219A7C - .incbin "incbin/overlay4_data.bin", 0x3BFC, 0x3C08 - 0x3BFC + .ascii "password" + .space 0x4 .global Unk_ov4_02219A88 Unk_ov4_02219A88: ; 0x02219A88 - .incbin "incbin/overlay4_data.bin", 0x3C08, 0x3C14 - 0x3C08 + .ascii "gametype" + .space 0x4 .global Unk_ov4_02219A94 Unk_ov4_02219A94: ; 0x02219A94 - .incbin "incbin/overlay4_data.bin", 0x3C14, 0x3C20 - 0x3C14 + .ascii "numteams" + .space 0x4 .global Unk_ov4_02219AA0 Unk_ov4_02219AA0: ; 0x02219AA0 - .incbin "incbin/overlay4_data.bin", 0x3C20, 0x3C2C - 0x3C20 + .ascii "gamemode" + .space 0x4 .global Unk_ov4_02219AAC Unk_ov4_02219AAC: ; 0x02219AAC - .incbin "incbin/overlay4_data.bin", 0x3C2C, 0x3C38 - 0x3C2C + .ascii "teamplay" + .space 0x4 .global Unk_ov4_02219AB8 Unk_ov4_02219AB8: ; 0x02219AB8 - .incbin "incbin/overlay4_data.bin", 0x3C38, 0x3C44 - 0x3C38 + .ascii "hostname" + .space 0x4 .global Unk_ov4_02219AC4 Unk_ov4_02219AC4: ; 0x02219AC4 - .incbin "incbin/overlay4_data.bin", 0x3C44, 0x3C50 - 0x3C44 + .asciz "fraglimit" + .space 0x2 .global Unk_ov4_02219AD0 Unk_ov4_02219AD0: ; 0x02219AD0 - .incbin "incbin/overlay4_data.bin", 0x3C50, 0x3C5C - 0x3C50 + .asciz "timelimit" + .space 0x2 .global Unk_ov4_02219ADC Unk_ov4_02219ADC: ; 0x02219ADC - .incbin "incbin/overlay4_data.bin", 0x3C5C, 0x3C68 - 0x3C5C + .asciz "roundtime" + .space 0x2 .global Unk_ov4_02219AE8 Unk_ov4_02219AE8: ; 0x02219AE8 - .incbin "incbin/overlay4_data.bin", 0x3C68, 0x3C74 - 0x3C68 + .ascii "numplayers" + .space 0x2 .global Unk_ov4_02219AF4 Unk_ov4_02219AF4: ; 0x02219AF4 - .incbin "incbin/overlay4_data.bin", 0x3C74, 0x3C80 - 0x3C74 + .ascii "maxplayers" + .space 0x2 .global Unk_ov4_02219B00 Unk_ov4_02219B00: ; 0x02219B00 - .incbin "incbin/overlay4_data.bin", 0x3C80, 0x3C8C - 0x3C80 + .asciz "gamevariant" .global Unk_ov4_02219B0C Unk_ov4_02219B0C: ; 0x02219B0C - .incbin "incbin/overlay4_data.bin", 0x3C8C, 0x3C98 - 0x3C8C + .asciz "timeelapsed" .global Unk_ov4_02219B18 Unk_ov4_02219B18: ; 0x02219B18 - .incbin "incbin/overlay4_data.bin", 0x3C98, 0x3CA8 - 0x3C98 + .ascii "roundelapsed" + .space 0x4 .global Unk_ov4_02219B28 Unk_ov4_02219B28: ; 0x02219B28 - .incbin "incbin/overlay4_data.bin", 0x3CA8, 0x3CB8 - 0x3CA8 + .asciz "teamfraglimit" + .space 0x2 .global Unk_ov4_02219B38 Unk_ov4_02219B38: ; 0x02219B38 - .incbin "incbin/overlay4_data.bin", 0x3CB8, 0x1FC - .incbin "incbin/overlay4_data.bin", 0x3CB8 + 0x1FC, 0x1FC + .word Unk_ov4_02219A00 + .word Unk_ov4_02219AB8 + .word Unk_ov4_02219A64 + .word Unk_ov4_02219A44 + .word Unk_ov4_02219A70 + .word Unk_ov4_02219A5C + .word Unk_ov4_02219A88 + .word Unk_ov4_02219B00 + .word Unk_ov4_02219AE8 + .word Unk_ov4_02219A94 + .word Unk_ov4_02219AF4 + .word Unk_ov4_02219AA0 + .word Unk_ov4_02219AAC + .word Unk_ov4_02219AC4 + .word Unk_ov4_02219B28 + .word Unk_ov4_02219B0C + .word Unk_ov4_02219AD0 + .word Unk_ov4_02219ADC + .word Unk_ov4_02219B18 + .word Unk_ov4_02219A7C + .word Unk_ov4_02219A34 + .word Unk_ov4_02219A4C + .word Unk_ov4_02219A1C + .word Unk_ov4_02219A2C + .word Unk_ov4_02219A0C + .word Unk_ov4_02219A14 + .word Unk_ov4_02219A3C + .word Unk_ov4_02219A04 + .word Unk_ov4_02219A24 + .word Unk_ov4_02219A54 + .space 0x380 diff --git a/lib/gamespy/asm/serverbrowsing/sb_queryengine.s b/lib/gamespy/asm/serverbrowsing/sb_queryengine.s index a68eb7ee60..48e09fd870 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_queryengine.s +++ b/lib/gamespy/asm/serverbrowsing/sb_queryengine.s @@ -703,13 +703,15 @@ ov4_021FE080: ; 0x021FE080 .global Unk_ov4_02219F30 Unk_ov4_02219F30: ; 0x02219F30 - .incbin "incbin/overlay4_data.bin", 0x40B0, 0x40C0 - 0x40B0 + .asciz "\\basic\\\\info\\" + .space 0x2 .global Unk_ov4_02219F40 Unk_ov4_02219F40: ; 0x02219F40 - .incbin "incbin/overlay4_data.bin", 0x40C0, 0x40CC - 0x40C0 + .ascii "\\status\\" + .space 0x4 .global Unk_ov4_02219F4C Unk_ov4_02219F4C: ; 0x02219F4C - .incbin "incbin/overlay4_data.bin", 0x40CC, 0x8 + .asciz "\\final\\" diff --git a/lib/gamespy/asm/serverbrowsing/sb_server.s b/lib/gamespy/asm/serverbrowsing/sb_server.s index 18825e7c96..93d65bf03c 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_server.s +++ b/lib/gamespy/asm/serverbrowsing/sb_server.s @@ -700,7 +700,8 @@ _021FE88C: .word Unk_ov4_0221B750 .global Unk_ov4_02215C30 Unk_ov4_02215C30: ; 0x02215C30 - .incbin "incbin/overlay4_rodata.bin", 0x3C8, 0x8 + .word Unk_ov4_02219F5C + .word Unk_ov4_02219F54 @@ -709,39 +710,44 @@ Unk_ov4_02215C30: ; 0x02215C30 .global Unk_ov4_02219F54 Unk_ov4_02219F54: ; 0x02219F54 - .incbin "incbin/overlay4_data.bin", 0x40D4, 0x40DC - 0x40D4 + .asciz "final" + .space 0x2 .global Unk_ov4_02219F5C Unk_ov4_02219F5C: ; 0x02219F5C - .incbin "incbin/overlay4_data.bin", 0x40DC, 0x40E4 - 0x40DC + .asciz "queryid" .global Unk_ov4_02219F64 Unk_ov4_02219F64: ; 0x02219F64 - .incbin "incbin/overlay4_data.bin", 0x40E4, 0x40FC - 0x40E4 + .asciz "SBServerGetStringValueA" .global Unk_ov4_02219F7C Unk_ov4_02219F7C: ; 0x02219F7C - .incbin "incbin/overlay4_data.bin", 0x40FC, 0x4100 - 0x40FC + .ascii "%d" + .space 0x2 .global Unk_ov4_02219F80 Unk_ov4_02219F80: ; 0x02219F80 - .incbin "incbin/overlay4_data.bin", 0x4100, 0x4108 - 0x4100 + .ascii "server" + .space 0x2 .global Unk_ov4_02219F88 Unk_ov4_02219F88: ; 0x02219F88 - .incbin "incbin/overlay4_data.bin", 0x4108, 0x4114 - 0x4108 + .asciz "sb_server.c" .global Unk_ov4_02219F94 Unk_ov4_02219F94: ; 0x02219F94 - .incbin "incbin/overlay4_data.bin", 0x4114, 0x411C - 0x4114 + .ascii "ping" + .space 0x4 .global Unk_ov4_02219F9C Unk_ov4_02219F9C: ; 0x02219F9C - .incbin "incbin/overlay4_data.bin", 0x411C, 0x4120 - 0x411C + .space 0x4 .global Unk_ov4_02219FA0 Unk_ov4_02219FA0: ; 0x02219FA0 - .incbin "incbin/overlay4_data.bin", 0x4120, 0x5 + .ascii "%s%d" + .space 0x4 diff --git a/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s b/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s index cdb850d25b..2e374d043c 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s +++ b/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s @@ -508,5 +508,5 @@ ServerBrowserGetMyPublicIPAddr: ; 0x021FEEC0 .global Unk_ov4_02219FA8 Unk_ov4_02219FA8: ; 0x02219FA8 - .incbin "incbin/overlay4_data.bin", 0x4128, 0x4 + .asciz "\\%s" diff --git a/lib/gamespy/asm/serverbrowsing/sb_serverlist.s b/lib/gamespy/asm/serverbrowsing/sb_serverlist.s index 603b62b4ae..12d8b02d78 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_serverlist.s +++ b/lib/gamespy/asm/serverbrowsing/sb_serverlist.s @@ -2833,79 +2833,88 @@ _022014FC: .global Unk_ov4_02219FAC Unk_ov4_02219FAC: ; 0x02219FAC - .incbin "incbin/overlay4_data.bin", 0x412C, 0x4130 - 0x412C + .word Unk_ov4_02219FC0 .global Unk_ov4_02219FB0 Unk_ov4_02219FB0: ; 0x02219FB0 - .incbin "incbin/overlay4_data.bin", 0x4130, 0x4140 - 0x4130 + .ascii "SBReleaseStr" + .space 0x4 .global Unk_ov4_02219FC0 Unk_ov4_02219FC0: ; 0x02219FC0 - .incbin "incbin/overlay4_data.bin", 0x4140, 0x4150 - 0x4140 + .asciz "Query Error: " + .space 0x2 .global Unk_ov4_02219FD0 Unk_ov4_02219FD0: ; 0x02219FD0 - .incbin "incbin/overlay4_data.bin", 0x4150, 0x4160 - 0x4150 + .ascii "AllKeysPresent" + .space 0x2 .global Unk_ov4_02219FE0 Unk_ov4_02219FE0: ; 0x02219FE0 - .incbin "incbin/overlay4_data.bin", 0x4160, 0x4174 - 0x4160 + .ascii "SBServerListInit" + .space 0x4 .global Unk_ov4_02219FF4 Unk_ov4_02219FF4: ; 0x02219FF4 - .incbin "incbin/overlay4_data.bin", 0x4174, 0x4188 - 0x4174 + .ascii "ProcessAdHocData" + .space 0x4 .global Unk_ov4_0221A008 Unk_ov4_0221A008: ; 0x0221A008 - .incbin "incbin/overlay4_data.bin", 0x4188, 0x419C - 0x4188 + .asciz "ProcessMainListData" .global Unk_ov4_0221A01C Unk_ov4_0221A01C: ; 0x0221A01C - .incbin "incbin/overlay4_data.bin", 0x419C, 0x41B8 - 0x419C + .asciz "SBServerListConnectAndQuery" .global Unk_ov4_0221A038 Unk_ov4_0221A038: ; 0x0221A038 - .incbin "incbin/overlay4_data.bin", 0x41B8, 0x41BC - 0x41B8 + .space 0x4 .global Unk_ov4_0221A03C Unk_ov4_0221A03C: ; 0x0221A03C - .incbin "incbin/overlay4_data.bin", 0x41BC, 0x41C8 - 0x41BC + .asciz "val != NULL" .global Unk_ov4_0221A048 Unk_ov4_0221A048: ; 0x0221A048 - .incbin "incbin/overlay4_data.bin", 0x41C8, 0x41D8 - 0x41C8 + .asciz "sb_serverlist.c" .global Unk_ov4_0221A058 Unk_ov4_0221A058: ; 0x0221A058 - .incbin "incbin/overlay4_data.bin", 0x41D8, 0x41E8 - 0x41D8 + .asciz "slist != NULL" + .space 0x2 .global Unk_ov4_0221A068 Unk_ov4_0221A068: ; 0x0221A068 - .incbin "incbin/overlay4_data.bin", 0x41E8, 0x41FC - 0x41E8 + .ascii "callback != NULL" + .space 0x4 .global Unk_ov4_0221A07C Unk_ov4_0221A07C: ; 0x0221A07C - .incbin "incbin/overlay4_data.bin", 0x41FC, 0x4218 - 0x41FC + .asciz "%s.ms%d.gs.nintendowifi.net" .global Unk_ov4_0221A098 Unk_ov4_0221A098: ; 0x0221A098 - .incbin "incbin/overlay4_data.bin", 0x4218, 0x4238 - 0x4218 + .asciz "slist->state == sl_disconnected" .global Unk_ov4_0221A0B8 Unk_ov4_0221A0B8: ; 0x0221A0B8 - .incbin "incbin/overlay4_data.bin", 0x4238, 0x423C - 0x4238 + .word 0x30 .global Unk_ov4_0221A0BC Unk_ov4_0221A0BC: ; 0x0221A0BC - .incbin "incbin/overlay4_data.bin", 0x423C, 0x4244 - 0x423C + .word 0xFFFFFFFF + .word 0x0 .global Unk_ov4_0221A0C4 Unk_ov4_0221A0C4: ; 0x0221A0C4 - .incbin "incbin/overlay4_data.bin", 0x4244, 0x4250 - 0x4244 + .ascii "inlen >= 0" + .space 0x2 .global Unk_ov4_0221A0D0 Unk_ov4_0221A0D0: ; 0x0221A0D0 - .incbin "incbin/overlay4_data.bin", 0x4250, 0x18 + .asciz "slist->inbufferlen >= 0" diff --git a/lib/libVCT/asm/adpcm.s b/lib/libVCT/asm/adpcm.s index 529a1cc9fa..aca246dfa6 100644 --- a/lib/libVCT/asm/adpcm.s +++ b/lib/libVCT/asm/adpcm.s @@ -1242,17 +1242,34 @@ _0220268C: .global Unk_ov4_02215C38 Unk_ov4_02215C38: ; 0x02215C38 - .incbin "incbin/overlay4_rodata.bin", 0x3D0, 0x3D4 - 0x3D0 + .short 0x1FF + .short 0x1FF .global Unk_ov4_02215C3C Unk_ov4_02215C3C: ; 0x02215C3C - .incbin "incbin/overlay4_rodata.bin", 0x3D4, 0x3DC - 0x3D4 + .word 0x201FFFF + .word 0x201FFFF .global Unk_ov4_02215C44 Unk_ov4_02215C44: ; 0x02215C44 - .incbin "incbin/overlay4_rodata.bin", 0x3DC, 0x3EC - 0x3DC + .word 0xFFFFFFFF + .byte 0x2, 0x4, 0x6, 0x8 + .word 0xFFFFFFFF + .byte 0x2, 0x4, 0x6, 0x8 .global Unk_ov4_02215C54 Unk_ov4_02215C54: ; 0x02215C54 - .incbin "incbin/overlay4_rodata.bin", 0x3EC, 0xB4 + .short 0x7, 0x8 + .short 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0x10, 0x11 + .short 0x13, 0x15, 0x17, 0x19, 0x1C, 0x1F, 0x22, 0x25 + .short 0x29, 0x2D, 0x32, 0x37, 0x3C, 0x42, 0x49, 0x50 + .short 0x58, 0x61, 0x6B, 0x76, 0x82, 0x8F, 0x9D, 0xAD + .short 0xBE, 0xD1, 0xE6, 0xFD, 0x117, 0x133, 0x151, 0x173 + .short 0x198, 0x1C1, 0x1EE, 0x220, 0x256, 0x292, 0x2D4, 0x31C + .short 0x36C, 0x3C3, 0x424, 0x48E, 0x502, 0x583, 0x610, 0x6AB + .short 0x756, 0x812, 0x8E0, 0x9C3, 0xABD, 0xBD0, 0xCFF, 0xE4C + .short 0xFBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 0x1BDC, 0x1EA5 + .short 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B, 0x3BB9, 0x41B2 + .short 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF + .space 0x2 diff --git a/lib/libVCT/asm/audio.s b/lib/libVCT/asm/audio.s index c189828de1..53d27a7164 100644 --- a/lib/libVCT/asm/audio.s +++ b/lib/libVCT/asm/audio.s @@ -1071,12 +1071,14 @@ _02203500: .word Unk_ov4_02215D12 .global Unk_ov4_02215D08 Unk_ov4_02215D08: ; 0x02215D08 - .incbin "incbin/overlay4_rodata.bin", 0x4A0, 0x4AA - 0x4A0 + .short 0x8, 0x8 + .byte 0x2, 0x4, 0x3, 0x4, 0x4, 0x4 .global Unk_ov4_02215D12 Unk_ov4_02215D12: ; 0x02215D12 - .incbin "incbin/overlay4_rodata.bin", 0x4AA, 0x15 - + .byte 0x1, 0x0, 0x0, 0x1, 0x1, 0x0 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x2, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + .short 0x3 .data @@ -1084,7 +1086,7 @@ Unk_ov4_02215D12: ; 0x02215D12 .global Unk_ov4_0221A0E8 Unk_ov4_0221A0E8: ; 0x0221A0E8 - .incbin "incbin/overlay4_data.bin", 0x4268, 0x4 + .word 0x1 diff --git a/lib/libVCT/asm/fir.s b/lib/libVCT/asm/fir.s index 3f4a448be7..de42aaced4 100644 --- a/lib/libVCT/asm/fir.s +++ b/lib/libVCT/asm/fir.s @@ -287,7 +287,8 @@ _0220589C: .word Unk_ov4_0221C78C .global Unk_ov4_0221A124 Unk_ov4_0221A124: ; 0x0221A124 - .incbin "incbin/overlay4_data.bin", 0x42A4, 0x10 + .byte 0xFB, 0xE9, 0x3D, 0x40, 0xBC, 0xC7, 0xD1, 0x2C, 0x2A, 0xD0, 0x7C, 0x3 + .byte 0xF0, 0x8, 0x93, 0xF5 diff --git a/lib/libVCT/asm/g711.s b/lib/libVCT/asm/g711.s index 8c8d48ae96..67b63400a0 100644 --- a/lib/libVCT/asm/g711.s +++ b/lib/libVCT/asm/g711.s @@ -121,5 +121,7 @@ _022038D4: .global Unk_ov4_0221A0EC Unk_ov4_0221A0EC: ; 0x0221A0EC - .incbin "incbin/overlay4_data.bin", 0x426C, 0x20 + .word 0x3F + .word 0x7F, 0xFF, 0x1FF, 0x3FF + .word 0x7FF, 0xFFF, 0x1FFF diff --git a/lib/libVCT/asm/incbin/ssp.bin b/lib/libVCT/asm/incbin/ssp.bin new file mode 100644 index 0000000000000000000000000000000000000000..ee4fe6ae29b4962ccde2ac3920b36ae3e65b958e GIT binary patch literal 264 zcmYk1Q3Ajq2tsYm`=59iI4k|ACn*|$8DYTy@Wo?hVTsbH8r46#s#;dEb5I7@rptwb vq{7Vap%L|>rYs+vlMe3CNCmw%GV3^x19y?@abcdefghijklmnopqrstuvwxyz[" + .byte 0x5C + .ascii "]^_`abcdefghijklmnopqrstuvwxyz{|}~" + .byte 0x7F + .global Unk_020FE7E4 Unk_020FE7E4: ; 0x020FE7E4 - .incbin "incbin/arm9_rodata.bin", 0x19BA4, 0x19C24 - 0x19BA4 + .byte 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB + .byte 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 + .byte 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F + .ascii " !" + .byte 0x22 + .ascii "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[" + .byte 0x5C + .ascii "]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~" + .byte 0x7F .global Unk_020FE864 Unk_020FE864: ; 0x020FE864 - .incbin "incbin/arm9_rodata.bin", 0x19C24, 0x100 + .incbin "incbin/ctype.bin", 0x0, 0x100 diff --git a/lib/msl/asm/MSL_C/e_pow.s b/lib/msl/asm/MSL_C/e_pow.s index 741f97ba7a..14af321f1b 100644 --- a/lib/msl/asm/MSL_C/e_pow.s +++ b/lib/msl/asm/MSL_C/e_pow.s @@ -1169,7 +1169,8 @@ _020DE038: .global Unk_020E4580 Unk_020E4580: ; 0x020E4580 - .incbin "incbin/arm9_exception.bin", 0x28, 0x8 + .byte 0x20, 0xFF, 0x1, 0xB8 + .space 0x4 .rodata @@ -1177,13 +1178,18 @@ Unk_020E4580: ; 0x020E4580 .global Unk_020FEC9C Unk_020FEC9C: ; 0x020FEC9C - .incbin "incbin/arm9_rodata.bin", 0x1A05C, 0x1A06C - 0x1A05C + .space 0xB + .byte 0x40, 0x3, 0xB8, 0xE2, 0x3F .global Unk_020FECAC Unk_020FECAC: ; 0x020FECAC - .incbin "incbin/arm9_rodata.bin", 0x1A06C, 0x1A07C - 0x1A06C + .space 0x6 + .byte 0xF0, 0x3F + .space 0x6 + .byte 0xF8, 0x3F .global Unk_020FECBC Unk_020FECBC: ; 0x020FECBC - .incbin "incbin/arm9_rodata.bin", 0x1A07C, 0x10 + .space 0x8 + .byte 0x6, 0xD0, 0xCF, 0x43, 0xEB, 0xFD, 0x4C, 0x3E diff --git a/lib/msl/asm/MSL_C/incbin/ansi_fp.bin b/lib/msl/asm/MSL_C/incbin/ansi_fp.bin new file mode 100644 index 0000000000000000000000000000000000000000..a1f3221e797a14238baedf80af64a52581ffb796 GIT binary patch literal 64 scmZQz009*TFvSoFp&j}mbjM)`o%I7uH?-(EG62B^p=2=Ka(%iZ0P-dZW&i*H literal 0 HcmV?d00001 diff --git a/lib/msl/asm/MSL_C/incbin/ctype.bin b/lib/msl/asm/MSL_C/incbin/ctype.bin new file mode 100644 index 0000000000000000000000000000000000000000..fdb56233ad69c756aec3a07007b882a77d3fa5a9 GIT binary patch literal 256 zcmZQ!U_payj4UvSCWEdL#CKx6z<>`%uwX(|^?__ikSUNTh-^Y33ld}~BnraxvoHVv Dm~b+G literal 0 HcmV?d00001 diff --git a/lib/msl/asm/MSL_C/incbin/locale_c.bin b/lib/msl/asm/MSL_C/incbin/locale_c.bin new file mode 100644 index 0000000000000000000000000000000000000000..2d3d00e141d7db2e11f2136b789f360dcdaad4ae GIT binary patch literal 192 zcmWN|*CGM{006)%O0o+jWYa=qlcY#SvPbg&pHcUI0YL)>g@g@>7#1~R)R=J-CaqYt zX5EHOTQah8ro_Zen=vaPZ`-atC5MikI#*UvRdb`E>A{m{FW!9k@}r|GX->+#1r+Qk k+IQf{i8B{2UAb0w>(0GLEp4yfefsw6&%Z@!OP2e)2RG>vasU7T literal 0 HcmV?d00001 diff --git a/lib/msl/asm/MSL_C/incbin/wctype.bin b/lib/msl/asm/MSL_C/incbin/wctype.bin new file mode 100644 index 0000000000000000000000000000000000000000..49324691aa5e5945836726114ebb7dcb1e8a0662 GIT binary patch literal 768 zcmc)HX*1Pf7zg0%9Dm1}WDRMvWKBgklZ_M@b zxqr{heg6mvOA$yFktSV+Oj)vBlH;;mSLDf8piq%wSCuGL=9+TX-Eh+_w^gWArP>`e zYSpRNpwV4T?z!)QW-T6S^+=n?o_MO=GtYJCH0z5wU(H*vXvwk_-+cGOsx?2Y+puZN zwqJJq_QzizeKO^8?6B7Hw zdJyCIT8TKx2V8jnFLdeF