diff --git a/asm/Linker/Generated/Symbol/File.s b/asm/Linker/Generated/Symbol/File.s index 5b32fc0d..049c8664 100644 --- a/asm/Linker/Generated/Symbol/File.s +++ b/asm/Linker/Generated/Symbol/File.s @@ -57,14 +57,37 @@ _bss_init_info: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global _eti_init_info _eti_init_info: - .incbin "baserom.dol", 0x402324, 0x3C + .4byte 0x800068E0 ;# ptr + .4byte 0x800069C4 ;# ptr + .4byte 0x80006BD0 ;# ptr + .4byte 0x0000E460 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .ctors, "wa" # 0x80406260 - 0x80406540 .global _ctors$99 _ctors$99: - .incbin "baserom.dol", 0x40262C, 0x14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .dtors, "wa" # 0x80406540 - 0x80406560 .global _dtors$99 _dtors$99: - .incbin "baserom.dol", 0x402648, 0x18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" index cd194877..be872240 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" @@ -66,45 +66,60 @@ __dt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$ .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$210911 $$210911: - .incbin "baserom.dol", 0x402154, 0x8 + .4byte 0x08080000 + .4byte 0 .global $$210953 $$210953: - .incbin "baserom.dol", 0x40215C, 0x8 + .4byte 0x10080000 + .4byte 0 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$210912 $$210912: - .incbin "baserom.dol", 0x4022C4, 0xC + .4byte 0x8001488C ;# ptr + .4byte 0x0000004C + .4byte 0x800067F4 ;# ptr .global $$210954 $$210954: - .incbin "baserom.dol", 0x4022D0, 0xC + .4byte 0x800148E0 ;# ptr + .4byte 0x00000060 + .4byte 0x800067FC ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29022 $$29022: - .incbin "baserom.dol", 0x4036B8, 0x50 + .asciz "std::tr1::detail::shared_ptr_deleter>" .global $$29050 $$29050: - .incbin "baserom.dol", 0x403708, 0x2C + .asciz "std::tr1::detail::shared_ptr_deleter_common" .global $$29165 $$29165: - .incbin "baserom.dol", 0x403734, 0x24 + .asciz "std::detail::default_delete" .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 __vt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1: - .incbin "baserom.dol", 0x41DB28, 0x14 + .4byte 0x80556450 + .4byte 0 + .4byte 0x80014940 ;# ptr + .4byte 0x8001488C ;# ptr + .4byte 0x800148D8 ;# ptr .global $$29023 $$29023: - .incbin "baserom.dol", 0x41DB3C, 0xC + .4byte 0x80556458 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1: - .incbin "baserom.dol", 0x492830, 0x8 + .4byte 0x804075B8 + .4byte 0x80421A3C .global __RTTI__Q43std3tr16detail25shared_ptr_deleter_common __RTTI__Q43std3tr16detail25shared_ptr_deleter_common: - .incbin "baserom.dol", 0x492838, 0x8 + .4byte 0x80407608 + .4byte 0 .global __RTTI__Q33std6detail20default_delete$$0A0_c$$1 __RTTI__Q33std6detail20default_delete$$0A0_c$$1: - .incbin "baserom.dol", 0x492840, 0x8 + .4byte 0x80407634 + .4byte 0 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" index 0b5a58f2..7c14cce1 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" @@ -434,84 +434,174 @@ lbl_80014F00: .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$225556 $$225556: - .incbin "baserom.dol", 0x402164, 0x28 + .4byte 0x18180000 + .4byte 0x00000048 + .4byte 0x00000018 + .4byte 0x00000054 + .4byte 0x00000024 + .4byte 0 + .4byte 0x8F000000 + .4byte 0x0000004C + .4byte 0x00000008 + .4byte 0x8D000008 .global $$226577 $$226577: - .incbin "baserom.dol", 0x40218C, 0x8 + .4byte 0x10080000 + .4byte 0 .global $$227127 $$227127: - .incbin "baserom.dol", 0x402194, 0x60 + .4byte 0x68080000 + .4byte 0x00000094 + .4byte 0x00000038 + .4byte 0x000000B0 + .4byte 0x00000030 + .4byte 0x0000019C + .4byte 0x0000004C + .4byte 0x000001B8 + .4byte 0x00000044 + .4byte 0x0000035C + .4byte 0x00000058 + .4byte 0 + .4byte 0x02000028 + .4byte 0x800148E0 ;# ptr + .4byte 0x8680001D + .4byte 0 + .4byte 0x80006BD0 ;# ptr + .4byte 0x02000020 + .4byte 0x800148E0 ;# ptr + .4byte 0x8680001E + .4byte 0 + .4byte 0x80006BD0 ;# ptr + .4byte 0x82000030 + .4byte 0x800149D8 ;# ptr .global $$227197 $$227197: - .incbin "baserom.dol", 0x4021F4, 0x28 + .4byte 0x18180000 + .4byte 0x0000004C + .4byte 0x00000018 + .4byte 0x00000058 + .4byte 0x00000024 + .4byte 0 + .4byte 0x8F000000 + .4byte 0x00000050 + .4byte 0x00000008 + .4byte 0x8D000008 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$225557 $$225557: - .incbin "baserom.dol", 0x4022DC, 0xC + .4byte 0x80014948 ;# ptr + .4byte 0x00000090 + .4byte 0x80006804 ;# ptr .global $$226578 $$226578: - .incbin "baserom.dol", 0x4022E8, 0xC + .4byte 0x800149D8 ;# ptr + .4byte 0x00000064 + .4byte 0x8000682C ;# ptr .global $$227128 $$227128: - .incbin "baserom.dol", 0x4022F4, 0xC + .4byte 0x80014A3C ;# ptr + .4byte 0x000003F0 + .4byte 0x80006834 ;# ptr .global $$227198 $$227198: - .incbin "baserom.dol", 0x402300, 0xC + .4byte 0x80014E2C ;# ptr + .4byte 0x00000094 + .4byte 0x80006894 ;# ptr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402364, 0x4 + .4byte 0x80014EC4 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$210379 $$210379: - .incbin "baserom.dol", 0x403758, 0x14 + .asciz "std::out_of_range" + .balign 4 .global $$210381 $$210381: - .incbin "baserom.dol", 0x40376C, 0x14 + .asciz "std::length_error" + .balign 4 .global $$210387 $$210387: - .incbin "baserom.dol", 0x403780, 0x14 + .asciz "std::logic_error" + .balign 4 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x403794, 0xE4 + .asciz "vector length error" + .asciz "!std::exception!!std::logic_error!!std::length_error!!" + .byte 0x62 + .asciz "asic_string: out_of_range" + .byte 0x21, 0x73 + .asciz "td::exception!!std::logic_error!!std::out_of_range!!" + .byte 0x43, 0x00, 0x2A + .4byte 0x00626173 + .asciz "ic_string: length_error" + .asciz "basic_string::reserve length_error" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23std12out_of_range __vt__Q23std12out_of_range: - .incbin "baserom.dol", 0x41DB48, 0x10 + .4byte 0x80556468 + .4byte 0 + .4byte 0x80014EC0 ;# ptr + .4byte 0x80014944 ;# ptr .global $$210380 $$210380: - .incbin "baserom.dol", 0x41DB58, 0x18 + .4byte 0x80556420 + .4byte 0 + .4byte 0x80556478 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q23std12length_error __vt__Q23std12length_error: - .incbin "baserom.dol", 0x41DB70, 0x10 + .4byte 0x80556470 + .4byte 0 + .4byte 0x80014E2C ;# ptr + .4byte 0x80014944 ;# ptr .global $$210382 $$210382: - .incbin "baserom.dol", 0x41DB80, 0x18 + .4byte 0x80556420 + .4byte 0 + .4byte 0x80556478 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q23std11logic_error __vt__Q23std11logic_error: - .incbin "baserom.dol", 0x41DB98, 0x10 + .4byte 0x80556478 + .4byte 0 + .4byte 0x80014948 ;# ptr + .4byte 0x80014944 ;# ptr .global $$210388 $$210388: - .incbin "baserom.dol", 0x41DBA8, 0x10 + .4byte 0x80556420 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std12out_of_range __RTTI__Q23std12out_of_range: - .incbin "baserom.dol", 0x492848, 0x8 + .4byte 0x80407658 + .4byte 0x80421A58 .global __RTTI__Q23std12length_error __RTTI__Q23std12length_error: - .incbin "baserom.dol", 0x492850, 0x8 + .4byte 0x8040766C + .4byte 0x80421A80 .global __RTTI__Q23std11logic_error __RTTI__Q23std11logic_error: - .incbin "baserom.dol", 0x492858, 0x8 + .4byte 0x80407680 + .4byte 0x80421AA8 .global $$211481 $$211481: - .incbin "baserom.dol", 0x492860, 0x1 + .byte 0x00 .global $$211495 $$211495: - .incbin "baserom.dol", 0x492861, 0x7 + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2id__Q23std8ctype$$0c$$1 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" index 607211a4..3fc9d491 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" @@ -88,15 +88,26 @@ __dt__Q43std3tr16detail20function_base$$0PFv_v$$1Fv: .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$28323 $$28323: - .incbin "baserom.dol", 0x40221C, 0x8 + .4byte 0x08080000 + .4byte 0 .global $$28430 $$28430: - .incbin "baserom.dol", 0x402224, 0x1C + .4byte 0x10080000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$28324 $$28324: - .incbin "baserom.dol", 0x40230C, 0xC + .4byte 0x80014F18 ;# ptr + .4byte 0x00000078 + .4byte 0x800068BC ;# ptr .global $$28431 $$28431: - .incbin "baserom.dol", 0x402318, 0xC + .4byte 0x80014F90 ;# ptr + .4byte 0x000000A0 + .4byte 0x800068C4 ;# ptr diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" index 91921077..d31aa4eb 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" @@ -375,7 +375,12 @@ lbl_80009730: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global fix_pool_sizes fix_pool_sizes: - .incbin "baserom.dol", 0x402770, 0x18 + .4byte 0x00000004 + .4byte 0x0000000C + .4byte 0x00000014 + .4byte 0x00000024 + .4byte 0x00000034 + .4byte 0x00000044 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2get_malloc_pool__Fv$$2protopool diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" index ee49e63b..50377b0e 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" @@ -85,7 +85,86 @@ lbl_80009834: .section .data, "wa" # 0x80421040 - 0x80496700 .global __files __files: - .incbin "baserom.dol", 0x41D1F8, 0x140 + .4byte 0 + .4byte 0x0A800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80496AB8 + .4byte 0x00000100 + .4byte 0x80496AB8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800186F8 ;# ptr + .4byte 0x80010454 ;# ptr + .4byte 0x80010524 ;# ptr + .4byte 0 + .4byte 0x80421148 + .4byte 0x00000001 + .4byte 0x12800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804969B8 + .4byte 0x00000100 + .4byte 0x804969B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800186F8 ;# ptr + .4byte 0x80010454 ;# ptr + .4byte 0x80010524 ;# ptr + .4byte 0 + .4byte 0x80421198 + .4byte 0x00000002 + .4byte 0x10800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804968B8 + .4byte 0x00000100 + .4byte 0x804968B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800186F8 ;# ptr + .4byte 0x80010454 ;# ptr + .4byte 0x80010524 ;# ptr + .4byte 0 + .4byte 0x804211E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global stderr_buff diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" index 8cc7ed3a..53e3c3e0 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" @@ -20,10 +20,263 @@ lbl_8000A3CC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __ctype_mapC __ctype_mapC: - .incbin "baserom.dol", 0x402868, 0x200 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040106 + .4byte 0x01040104 + .4byte 0x01040104 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x014200D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D00651 + .4byte 0x06510651 + .4byte 0x06510651 + .4byte 0x06510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x025100D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D00471 + .4byte 0x04710471 + .4byte 0x04710471 + .4byte 0x04710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x007100D0 + .4byte 0x00D000D0 + .4byte 0x00D00004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __lower_mapC __lower_mapC: - .incbin "baserom.dol", 0x402A68, 0x100 + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x08090A0B + .4byte 0x0C0D0E0F + .4byte 0x10111213 + .4byte 0x14151617 + .4byte 0x18191A1B + .4byte 0x1C1D1E1F + .4byte 0x20212223 + .4byte 0x24252627 + .4byte 0x28292A2B + .4byte 0x2C2D2E2F + .4byte 0x30313233 + .4byte 0x34353637 + .4byte 0x38393A3B + .4byte 0x3C3D3E3F + .4byte 0x40616263 + .4byte 0x64656667 + .4byte 0x68696A6B + .4byte 0x6C6D6E6F + .4byte 0x70717273 + .4byte 0x74757677 + .4byte 0x78797A5B + .4byte 0x5C5D5E5F + .4byte 0x60616263 + .4byte 0x64656667 + .4byte 0x68696A6B + .4byte 0x6C6D6E6F + .4byte 0x70717273 + .4byte 0x74757677 + .4byte 0x78797A7B + .4byte 0x7C7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959697 + .4byte 0x98999A9B + .4byte 0x9C9D9E9F + .4byte 0xA0A1A2A3 + .4byte 0xA4A5A6A7 + .4byte 0xA8A9AAAB + .4byte 0xACADAEAF + .4byte 0xB0B1B2B3 + .4byte 0xB4B5B6B7 + .4byte 0xB8B9BABB + .4byte 0xBCBDBEBF + .4byte 0xC0C1C2C3 + .4byte 0xC4C5C6C7 + .4byte 0xC8C9CACB + .4byte 0xCCCDCECF + .4byte 0xD0D1D2D3 + .4byte 0xD4D5D6D7 + .4byte 0xD8D9DADB + .4byte 0xDCDDDEDF + .4byte 0xE0E1E2E3 + .4byte 0xE4E5E6E7 + .4byte 0xE8E9EAEB + .4byte 0xECEDEEEF + .4byte 0xF0F1F2F3 + .4byte 0xF4F5F6F7 + .4byte 0xF8F9FAFB + .4byte 0xFCFDFEFF .global __upper_mapC __upper_mapC: - .incbin "baserom.dol", 0x402B68, 0x100 + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x08090A0B + .4byte 0x0C0D0E0F + .4byte 0x10111213 + .4byte 0x14151617 + .4byte 0x18191A1B + .4byte 0x1C1D1E1F + .4byte 0x20212223 + .4byte 0x24252627 + .4byte 0x28292A2B + .4byte 0x2C2D2E2F + .4byte 0x30313233 + .4byte 0x34353637 + .4byte 0x38393A3B + .4byte 0x3C3D3E3F + .4byte 0x40414243 + .4byte 0x44454647 + .4byte 0x48494A4B + .4byte 0x4C4D4E4F + .4byte 0x50515253 + .4byte 0x54555657 + .4byte 0x58595A5B + .4byte 0x5C5D5E5F + .4byte 0x60414243 + .4byte 0x44454647 + .4byte 0x48494A4B + .4byte 0x4C4D4E4F + .4byte 0x50515253 + .4byte 0x54555657 + .4byte 0x58595A7B + .4byte 0x7C7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959697 + .4byte 0x98999A9B + .4byte 0x9C9D9E9F + .4byte 0xA0A1A2A3 + .4byte 0xA4A5A6A7 + .4byte 0xA8A9AAAB + .4byte 0xACADAEAF + .4byte 0xB0B1B2B3 + .4byte 0xB4B5B6B7 + .4byte 0xB8B9BABB + .4byte 0xBCBDBEBF + .4byte 0xC0C1C2C3 + .4byte 0xC4C5C6C7 + .4byte 0xC8C9CACB + .4byte 0xCCCDCECF + .4byte 0xD0D1D2D3 + .4byte 0xD4D5D6D7 + .4byte 0xD8D9DADB + .4byte 0xDCDDDEDF + .4byte 0xE0E1E2E3 + .4byte 0xE4E5E6E7 + .4byte 0xE8E9EAEB + .4byte 0xECEDEEEF + .4byte 0xF0F1F2F3 + .4byte 0xF4F5F6F7 + .4byte 0xF8F9FAFB + .4byte 0xFCFDFEFF diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" index 5931cded..650b9f1b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" @@ -3,4 +3,5 @@ .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __float_nan __float_nan: - .incbin "baserom.dol", 0x492828, 0x8 + .4byte 0x7FFFFFFF + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" index 62414eb4..349fbd54 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" @@ -3,56 +3,180 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2142 $$2142: - .incbin "baserom.dol", 0x402C68, 0x10 + .asciz "%a %b %e %T %Y" + .balign 4 .global $$2143 $$2143: - .incbin "baserom.dol", 0x402C78, 0xC + .asciz "%I:%M:%S %p" .global $$2144 $$2144: - .incbin "baserom.dol", 0x402C84, 0xC + .asciz "%m/%d/%y" + .balign 4 .global $$2146 $$2146: - .incbin "baserom.dol", 0x402C90, 0x58 + .asciz "Sun|Sunday|Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday" + .balign 4 .global $$2147 $$2147: - .incbin "baserom.dol", 0x402CE8, 0x88 + .asciz "Jan|January|Feb|February|Mar|March|Apr|April|May|May|Jun|June|Jul|July|Aug|August|Sep|September|Oct|October|Nov|November|Dec|December" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __lconv __lconv: - .incbin "baserom.dol", 0x41D460, 0x38 + .4byte 0x8055DF88 + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 + .4byte 0x8055DF8C + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 .global _loc_ctyp_C _loc_ctyp_C: - .incbin "baserom.dol", 0x41D498, 0x28 + .4byte 0x43000000 + .4byte 0 + .4byte 0x80406768 + .4byte 0x80406A68 + .4byte 0x80406968 + .4byte 0x80406C98 + .4byte 0x80407098 + .4byte 0x80406E98 + .4byte 0x8000AB6C ;# ptr + .4byte 0x8000ABB8 ;# ptr .global char_coll_tableC char_coll_tableC: - .incbin "baserom.dol", 0x41D4C0, 0xC0 + .4byte 0x00010002 + .4byte 0x00030004 + .4byte 0x00050006 + .4byte 0x00070008 + .4byte 0x0009000A + .4byte 0x000B000C + .4byte 0x000D000E + .4byte 0x000F0010 + .4byte 0x00210022 + .4byte 0x00230024 + .4byte 0x00250026 + .4byte 0x00270028 + .4byte 0x0029002A + .4byte 0x00110012 + .4byte 0x00130014 + .4byte 0x00150016 + .4byte 0x0017002B + .4byte 0x002D002F + .4byte 0x00310033 + .4byte 0x00350037 + .4byte 0x0039003B + .4byte 0x003D003F + .4byte 0x00410043 + .4byte 0x00450047 + .4byte 0x0049004B + .4byte 0x004D004F + .4byte 0x00510053 + .4byte 0x00550057 + .4byte 0x0059005B + .4byte 0x005D0018 + .4byte 0x0019001A + .4byte 0x001B001C + .4byte 0x0000002C + .4byte 0x002E0030 + .4byte 0x00320034 + .4byte 0x00360038 + .4byte 0x003A003C + .4byte 0x003E0040 + .4byte 0x00420044 + .4byte 0x00460048 + .4byte 0x004A004C + .4byte 0x004E0050 + .4byte 0x00520054 + .4byte 0x00560058 + .4byte 0x005A005C + .4byte 0x005E001D + .4byte 0x001E001F + .4byte 0x00200000 .global _loc_coll_C _loc_coll_C: - .incbin "baserom.dol", 0x41D580, 0x1C + .4byte 0x43000000 + .4byte 0 + .4byte 0x00000020 + .4byte 0x0000006E + .4byte 0 + .4byte 0x804213C0 + .4byte 0 .global _loc_mon_C _loc_mon_C: - .incbin "baserom.dol", 0x41D59C, 0x34 + .4byte 0x43000000 + .4byte 0 + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 + .4byte 0x8055DF8C + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 .global _loc_num_C _loc_num_C: - .incbin "baserom.dol", 0x41D5D0, 0x18 + .4byte 0x43000000 + .4byte 0 + .4byte 0x8055DF88 + .4byte 0x8055DF8C + .4byte 0x8055DF8C + .4byte 0 .global _loc_tim_C _loc_tim_C: - .incbin "baserom.dol", 0x41D5E8, 0x28 + .4byte 0x43000000 + .4byte 0 + .4byte 0x8055DF90 + .4byte 0x80406B68 + .4byte 0x80406B78 + .4byte 0x80406B84 + .4byte 0x8055DF98 + .4byte 0x80406B90 + .4byte 0x80406BE8 + .4byte 0x8055DF8C .global _current_locale _current_locale: - .incbin "baserom.dol", 0x41D610, 0x48 + .4byte 0 + .4byte 0x43000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80421480 + .4byte 0x80421398 + .4byte 0x8042149C + .4byte 0x804214D0 + .4byte 0x804214E8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2139 $$2139: - .incbin "baserom.dol", 0x498AC8, 0x4 + .4byte 0x2E000000 .global $$2140 $$2140: - .incbin "baserom.dol", 0x498ACC, 0x4 + .4byte 0 .global $$2141 $$2141: - .incbin "baserom.dol", 0x498AD0, 0x8 + .asciz "AM|PM" + .balign 4 .global $$2145 $$2145: - .incbin "baserom.dol", 0x498AD8, 0x8 + .4byte 0x25540000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" index e0a4005c..2fbf9c65 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" @@ -2794,22 +2794,171 @@ lbl_8000D87C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x402D70, 0x28 + .asciz "-INF" + .byte 0x2D, 0x69, 0x6E + .4byte 0x6600494E + .4byte 0x4600696E + .4byte 0x66002D4E + .4byte 0x414E002D + .4byte 0x6E616E00 + .4byte 0x4E414E00 + .4byte 0x6E616E00 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22465 $$22465: - .incbin "baserom.dol", 0x41D658, 0xE0 + .4byte 0x8000B6B4 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B714 ;# ptr + .4byte 0x8000B66C ;# ptr + .4byte 0x8000B700 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B624 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B6B4 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B788 ;# ptr + .4byte 0x8000B624 ;# ptr + .4byte 0x8000B714 ;# ptr + .4byte 0x8000B66C ;# ptr + .4byte 0x8000B700 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B624 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B7EC ;# ptr + .4byte 0x8000B624 ;# ptr + .4byte 0x8000B764 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B7C0 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B624 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B804 ;# ptr + .4byte 0x8000B624 ;# ptr .global $$22934 $$22934: - .incbin "baserom.dol", 0x41D738, 0x150 + .4byte 0x8000D060 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CDF4 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CC28 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CDF4 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D040 ;# ptr + .4byte 0x8000CACC ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000CD84 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CACC ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CF88 ;# ptr + .4byte 0x8000CC28 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CE64 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CC28 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000D070 ;# ptr + .4byte 0x8000CC28 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2wstringBase0 $$2wstringBase0: - .incbin "baserom.dol", 0x492820, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22604 $$22604: - .incbin "baserom.dol", 0x498AE0, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" index 7964fee2..9a1ea9cd 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" @@ -3,10 +3,391 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __wctype_mapC __wctype_mapC: - .incbin "baserom.dol", 0x402D98, 0x200 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040106 + .4byte 0x01040104 + .4byte 0x01040104 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x014200D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x04580458 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D00651 + .4byte 0x06510651 + .4byte 0x06510651 + .4byte 0x06510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x02510251 + .4byte 0x025100D0 + .4byte 0x00D000D0 + .4byte 0x00D000D0 + .4byte 0x00D00471 + .4byte 0x04710471 + .4byte 0x04710471 + .4byte 0x04710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x00710071 + .4byte 0x007100D0 + .4byte 0x00D000D0 + .4byte 0x00D00004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __wlower_mapC __wlower_mapC: - .incbin "baserom.dol", 0x402F98, 0x200 + .4byte 0x00000001 + .4byte 0x00020003 + .4byte 0x00040005 + .4byte 0x00060007 + .4byte 0x00080009 + .4byte 0x000A000B + .4byte 0x000C000D + .4byte 0x000E000F + .4byte 0x00100011 + .4byte 0x00120013 + .4byte 0x00140015 + .4byte 0x00160017 + .4byte 0x00180019 + .4byte 0x001A001B + .4byte 0x001C001D + .4byte 0x001E001F + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0x006C006D + .4byte 0x006E006F + .4byte 0x00700071 + .4byte 0x00720073 + .4byte 0x00740075 + .4byte 0x00760077 + .4byte 0x00780079 + .4byte 0x007A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0x006C006D + .4byte 0x006E006F + .4byte 0x00700071 + .4byte 0x00720073 + .4byte 0x00740075 + .4byte 0x00760077 + .4byte 0x00780079 + .4byte 0x007A007B + .4byte 0x007C007D + .4byte 0x007E007F + .4byte 0x00800081 + .4byte 0x00820083 + .4byte 0x00840085 + .4byte 0x00860087 + .4byte 0x00880089 + .4byte 0x008A008B + .4byte 0x008C008D + .4byte 0x008E008F + .4byte 0x00900091 + .4byte 0x00920093 + .4byte 0x00940095 + .4byte 0x00960097 + .4byte 0x00980099 + .4byte 0x009A009B + .4byte 0x009C009D + .4byte 0x009E009F + .4byte 0x00A000A1 + .4byte 0x00A200A3 + .4byte 0x00A400A5 + .4byte 0x00A600A7 + .4byte 0x00A800A9 + .4byte 0x00AA00AB + .4byte 0x00AC00AD + .4byte 0x00AE00AF + .4byte 0x00B000B1 + .4byte 0x00B200B3 + .4byte 0x00B400B5 + .4byte 0x00B600B7 + .4byte 0x00B800B9 + .4byte 0x00BA00BB + .4byte 0x00BC00BD + .4byte 0x00BE00BF + .4byte 0x00C000C1 + .4byte 0x00C200C3 + .4byte 0x00C400C5 + .4byte 0x00C600C7 + .4byte 0x00C800C9 + .4byte 0x00CA00CB + .4byte 0x00CC00CD + .4byte 0x00CE00CF + .4byte 0x00D000D1 + .4byte 0x00D200D3 + .4byte 0x00D400D5 + .4byte 0x00D600D7 + .4byte 0x00D800D9 + .4byte 0x00DA00DB + .4byte 0x00DC00DD + .4byte 0x00DE00DF + .4byte 0x00E000E1 + .4byte 0x00E200E3 + .4byte 0x00E400E5 + .4byte 0x00E600E7 + .4byte 0x00E800E9 + .4byte 0x00EA00EB + .4byte 0x00EC00ED + .4byte 0x00EE00EF + .4byte 0x00F000F1 + .4byte 0x00F200F3 + .4byte 0x00F400F5 + .4byte 0x00F600F7 + .4byte 0x00F800F9 + .4byte 0x00FA00FB + .4byte 0x00FC00FD + .4byte 0x00FE00FF .global __wupper_mapC __wupper_mapC: - .incbin "baserom.dol", 0x403198, 0x200 + .4byte 0x00000001 + .4byte 0x00020003 + .4byte 0x00040005 + .4byte 0x00060007 + .4byte 0x00080009 + .4byte 0x000A000B + .4byte 0x000C000D + .4byte 0x000E000F + .4byte 0x00100011 + .4byte 0x00120013 + .4byte 0x00140015 + .4byte 0x00160017 + .4byte 0x00180019 + .4byte 0x001A001B + .4byte 0x001C001D + .4byte 0x001E001F + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A007B + .4byte 0x007C007D + .4byte 0x007E007F + .4byte 0x00800081 + .4byte 0x00820083 + .4byte 0x00840085 + .4byte 0x00860087 + .4byte 0x00880089 + .4byte 0x008A008B + .4byte 0x008C008D + .4byte 0x008E008F + .4byte 0x00900091 + .4byte 0x00920093 + .4byte 0x00940095 + .4byte 0x00960097 + .4byte 0x00980099 + .4byte 0x009A009B + .4byte 0x009C009D + .4byte 0x009E009F + .4byte 0x00A000A1 + .4byte 0x00A200A3 + .4byte 0x00A400A5 + .4byte 0x00A600A7 + .4byte 0x00A800A9 + .4byte 0x00AA00AB + .4byte 0x00AC00AD + .4byte 0x00AE00AF + .4byte 0x00B000B1 + .4byte 0x00B200B3 + .4byte 0x00B400B5 + .4byte 0x00B600B7 + .4byte 0x00B800B9 + .4byte 0x00BA00BB + .4byte 0x00BC00BD + .4byte 0x00BE00BF + .4byte 0x00C000C1 + .4byte 0x00C200C3 + .4byte 0x00C400C5 + .4byte 0x00C600C7 + .4byte 0x00C800C9 + .4byte 0x00CA00CB + .4byte 0x00CC00CD + .4byte 0x00CE00CF + .4byte 0x00D000D1 + .4byte 0x00D200D3 + .4byte 0x00D400D5 + .4byte 0x00D600D7 + .4byte 0x00D800D9 + .4byte 0x00DA00DB + .4byte 0x00DC00DD + .4byte 0x00DE00DF + .4byte 0x00E000E1 + .4byte 0x00E200E3 + .4byte 0x00E400E5 + .4byte 0x00E600E7 + .4byte 0x00E800E9 + .4byte 0x00EA00EB + .4byte 0x00EC00ED + .4byte 0x00EE00EF + .4byte 0x00F000F1 + .4byte 0x00F200F3 + .4byte 0x00F400F5 + .4byte 0x00F600F7 + .4byte 0x00F800F9 + .4byte 0x00FA00FB + .4byte 0x00FC00FD + .4byte 0x00FE00FF diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" index e11f9b05..14ebb1b2 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" @@ -2411,20 +2411,187 @@ lbl_80010318: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x403398, 0x8 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22455 $$22455: - .incbin "baserom.dol", 0x41D888, 0xE0 + .4byte 0x8000E620 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E684 ;# ptr + .4byte 0x8000E5D4 ;# ptr + .4byte 0x8000E670 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E590 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E620 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E6FC ;# ptr + .4byte 0x8000E590 ;# ptr + .4byte 0x8000E684 ;# ptr + .4byte 0x8000E5D4 ;# ptr + .4byte 0x8000E670 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E590 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E768 ;# ptr + .4byte 0x8000E590 ;# ptr + .4byte 0x8000E6D8 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E738 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E590 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E780 ;# ptr + .4byte 0x8000E590 ;# ptr .global $$22923 $$22923: - .incbin "baserom.dol", 0x41D968, 0x150 + .4byte 0x80010030 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FCF8 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FB20 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FCF8 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FFD8 ;# ptr + .4byte 0x8000F9C4 ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x8000FC7C ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000F9C4 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FF20 ;# ptr + .4byte 0x8000FB20 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FD74 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FB20 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x80010040 ;# ptr + .4byte 0x8000FB20 ;# ptr .global $$2wstringBase0 $$2wstringBase0: - .incbin "baserom.dol", 0x41DAB8, 0x70 + .4byte 0x002D0030 + .4byte 0x00580030 + .4byte 0x0000002D + .4byte 0x00300078 + .4byte 0x00300000 + .4byte 0x00300058 + .4byte 0x00300000 + .4byte 0x00300078 + .4byte 0x00300000 + .4byte 0x002D0049 + .4byte 0x004E0046 + .4byte 0x0000002D + .4byte 0x0069006E + .4byte 0x00660000 + .4byte 0x0049004E + .4byte 0x00460000 + .4byte 0x0069006E + .4byte 0x00660000 + .4byte 0x002D004E + .4byte 0x0041004E + .4byte 0x0000002D + .4byte 0x006E0061 + .4byte 0x006E0000 + .4byte 0x004E0041 + .4byte 0x004E0000 + .4byte 0x006E0061 + .4byte 0x006E0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22601 $$22601: - .incbin "baserom.dol", 0x498AE8, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" index 7f1a6a4b..e899404a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" @@ -193,52 +193,69 @@ lbl_800108CC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2505 $$2505: - .incbin "baserom.dol", 0x498AF0, 0x8 + .4byte 0 + .4byte 0 .global $$2506 $$2506: - .incbin "baserom.dol", 0x498AF8, 0x8 + .4byte 0x400921FB + .4byte 0x54442D18 .global $$2507 $$2507: - .incbin "baserom.dol", 0x498B00, 0x8 + .4byte 0x3FF921FB + .4byte 0x54442D18 .global $$2508 $$2508: - .incbin "baserom.dol", 0x498B08, 0x8 + .4byte 0x3FC55555 + .4byte 0x55555555 .global $$2509 $$2509: - .incbin "baserom.dol", 0x498B10, 0x8 + .4byte 0xBFD4D612 + .4byte 0x03EB6F7D .global $$2510 $$2510: - .incbin "baserom.dol", 0x498B18, 0x8 + .4byte 0x3FC9C155 + .4byte 0x0E884455 .global $$2511 $$2511: - .incbin "baserom.dol", 0x498B20, 0x8 + .4byte 0xBFA48228 + .4byte 0xB5688F3B .global $$2512 $$2512: - .incbin "baserom.dol", 0x498B28, 0x8 + .4byte 0x3F49EFE0 + .4byte 0x7501B288 .global $$2513 $$2513: - .incbin "baserom.dol", 0x498B30, 0x8 + .4byte 0x3F023DE1 + .4byte 0x0DFDF709 .global $$2514 $$2514: - .incbin "baserom.dol", 0x498B38, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2515 $$2515: - .incbin "baserom.dol", 0x498B40, 0x8 + .4byte 0xC0033A27 + .4byte 0x1C8A2D4B .global $$2516 $$2516: - .incbin "baserom.dol", 0x498B48, 0x8 + .4byte 0x40002AE5 + .4byte 0x9C598AC8 .global $$2517 $$2517: - .incbin "baserom.dol", 0x498B50, 0x8 + .4byte 0xBFE6066C + .4byte 0x1B8D0159 .global $$2518 $$2518: - .incbin "baserom.dol", 0x498B58, 0x8 + .4byte 0x3FB3B8C5 + .4byte 0xB12E9282 .global $$2519 $$2519: - .incbin "baserom.dol", 0x498B60, 0x8 + .4byte 0x3C91A626 + .4byte 0x33145C07 .global $$2520 $$2520: - .incbin "baserom.dol", 0x498B68, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2521 $$2521: - .incbin "baserom.dol", 0x498B70, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" index af1e01f1..e41f1d47 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" @@ -182,52 +182,69 @@ lbl_80010B54: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2512 $$2512: - .incbin "baserom.dol", 0x498B78, 0x8 + .4byte 0x3FF921FB + .4byte 0x54442D18 .global $$2513 $$2513: - .incbin "baserom.dol", 0x498B80, 0x8 + .4byte 0x3C91A626 + .4byte 0x33145C07 .global $$2514 $$2514: - .incbin "baserom.dol", 0x498B88, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2515 $$2515: - .incbin "baserom.dol", 0x498B90, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2516 $$2516: - .incbin "baserom.dol", 0x498B98, 0x8 + .4byte 0x3FC55555 + .4byte 0x55555555 .global $$2517 $$2517: - .incbin "baserom.dol", 0x498BA0, 0x8 + .4byte 0xBFD4D612 + .4byte 0x03EB6F7D .global $$2518 $$2518: - .incbin "baserom.dol", 0x498BA8, 0x8 + .4byte 0x3FC9C155 + .4byte 0x0E884455 .global $$2519 $$2519: - .incbin "baserom.dol", 0x498BB0, 0x8 + .4byte 0xBFA48228 + .4byte 0xB5688F3B .global $$2520 $$2520: - .incbin "baserom.dol", 0x498BB8, 0x8 + .4byte 0x3F49EFE0 + .4byte 0x7501B288 .global $$2521 $$2521: - .incbin "baserom.dol", 0x498BC0, 0x8 + .4byte 0x3F023DE1 + .4byte 0x0DFDF709 .global $$2522 $$2522: - .incbin "baserom.dol", 0x498BC8, 0x8 + .4byte 0xC0033A27 + .4byte 0x1C8A2D4B .global $$2523 $$2523: - .incbin "baserom.dol", 0x498BD0, 0x8 + .4byte 0x40002AE5 + .4byte 0x9C598AC8 .global $$2524 $$2524: - .incbin "baserom.dol", 0x498BD8, 0x8 + .4byte 0xBFE6066C + .4byte 0x1B8D0159 .global $$2525 $$2525: - .incbin "baserom.dol", 0x498BE0, 0x8 + .4byte 0x3FB3B8C5 + .4byte 0xB12E9282 .global $$2526 $$2526: - .incbin "baserom.dol", 0x498BE8, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2527 $$2527: - .incbin "baserom.dol", 0x498BF0, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$2528 $$2528: - .incbin "baserom.dol", 0x498BF8, 0x8 + .4byte 0x3FE921FB + .4byte 0x54442D18 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" index 82efdb52..cb302fa9 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" @@ -184,34 +184,45 @@ lbl_80010DC8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2583 $$2583: - .incbin "baserom.dol", 0x498C00, 0x8 + .4byte 0x400921FB + .4byte 0x54442D18 .global $$2584 $$2584: - .incbin "baserom.dol", 0x498C08, 0x8 + .4byte 0xC00921FB + .4byte 0x54442D18 .global $$2585 $$2585: - .incbin "baserom.dol", 0x498C10, 0x8 + .4byte 0xBFF921FB + .4byte 0x54442D18 .global $$2586 $$2586: - .incbin "baserom.dol", 0x498C18, 0x8 + .4byte 0x3FF921FB + .4byte 0x54442D18 .global $$2587 $$2587: - .incbin "baserom.dol", 0x498C20, 0x8 + .4byte 0x3FE921FB + .4byte 0x54442D18 .global $$2588 $$2588: - .incbin "baserom.dol", 0x498C28, 0x8 + .4byte 0xBFE921FB + .4byte 0x54442D18 .global $$2589 $$2589: - .incbin "baserom.dol", 0x498C30, 0x8 + .4byte 0x4002D97C + .4byte 0x7F3321D2 .global $$2590 $$2590: - .incbin "baserom.dol", 0x498C38, 0x8 + .4byte 0xC002D97C + .4byte 0x7F3321D2 .global $$2591 $$2591: - .incbin "baserom.dol", 0x498C40, 0x8 + .4byte 0 + .4byte 0 .global $$2592 $$2592: - .incbin "baserom.dol", 0x498C48, 0x8 + .4byte 0x80000000 + .4byte 0 .global $$2593 $$2593: - .incbin "baserom.dol", 0x498C50, 0x8 + .4byte 0x3CA1A626 + .4byte 0x33145C07 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" index 49243709..1411c67e 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" @@ -274,4 +274,7 @@ lbl_80011154: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global Zero Zero: - .incbin "baserom.dol", 0x4033A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80000000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" index 3805091f..cf6af861 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" @@ -192,52 +192,68 @@ lbl_80011408: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2514 $$2514: - .incbin "baserom.dol", 0x498C58, 0x8 + .4byte 0xC3500000 + .4byte 0 .global $$2515 $$2515: - .incbin "baserom.dol", 0x498C60, 0x8 + .4byte 0x43500000 + .4byte 0 .global $$2516 $$2516: - .incbin "baserom.dol", 0x498C68, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2517 $$2517: - .incbin "baserom.dol", 0x498C70, 0x8 + .4byte 0x3FE62E42 + .4byte 0xFEE00000 .global $$2518 $$2518: - .incbin "baserom.dol", 0x498C78, 0x8 + .4byte 0x3DEA39EF + .4byte 0x35793C76 .global $$2519 $$2519: - .incbin "baserom.dol", 0x498C80, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2520 $$2520: - .incbin "baserom.dol", 0x498C88, 0x8 + .4byte 0x3FD55555 + .4byte 0x55555555 .global $$2521 $$2521: - .incbin "baserom.dol", 0x498C90, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$2522 $$2522: - .incbin "baserom.dol", 0x498C98, 0x8 + .4byte 0x3FD99999 + .4byte 0x9997FA04 .global $$2523 $$2523: - .incbin "baserom.dol", 0x498CA0, 0x8 + .4byte 0x3FCC71C5 + .4byte 0x1D8E78AF .global $$2524 $$2524: - .incbin "baserom.dol", 0x498CA8, 0x8 + .4byte 0x3FC39A09 + .4byte 0xD078C69F .global $$2525 $$2525: - .incbin "baserom.dol", 0x498CB0, 0x8 + .4byte 0x3FE55555 + .4byte 0x55555593 .global $$2526 $$2526: - .incbin "baserom.dol", 0x498CB8, 0x8 + .4byte 0x3FD24924 + .4byte 0x94229359 .global $$2527 $$2527: - .incbin "baserom.dol", 0x498CC0, 0x8 + .4byte 0x3FC74664 + .4byte 0x96CB03DE .global $$2528 $$2528: - .incbin "baserom.dol", 0x498CC8, 0x8 + .4byte 0x3FC2F112 + .4byte 0xDF3E5244 .global $$2530 $$2530: - .incbin "baserom.dol", 0x498CD0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global zero diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" index 43e26558..19ced34d 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" @@ -81,22 +81,28 @@ lbl_80011510: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2478 $$2478: - .incbin "baserom.dol", 0x498CD8, 0x8 + .4byte 0xC3500000 + .4byte 0 .global $$2479 $$2479: - .incbin "baserom.dol", 0x498CE0, 0x8 + .4byte 0x43500000 + .4byte 0 .global $$2480 $$2480: - .incbin "baserom.dol", 0x498CE8, 0x8 + .4byte 0x3D59FEF3 + .4byte 0x11F12B36 .global $$2481 $$2481: - .incbin "baserom.dol", 0x498CF0, 0x8 + .4byte 0x3FDBCB7B + .4byte 0x1526E50E .global $$2482 $$2482: - .incbin "baserom.dol", 0x498CF8, 0x8 + .4byte 0x3FD34413 + .4byte 0x509F6000 .global $$2484 $$2484: - .incbin "baserom.dol", 0x498D00, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global zero diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" index 12ea15b1..4303a5ff 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" @@ -569,114 +569,157 @@ lbl_80011CF8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bp bp: - .incbin "baserom.dol", 0x4033B0, 0x10 + .4byte 0x3FF00000 + .4byte 0 + .4byte 0x3FF80000 + .4byte 0 .global dp_h dp_h: - .incbin "baserom.dol", 0x4033C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x3FE2B803 + .4byte 0x40000000 .global dp_l dp_l: - .incbin "baserom.dol", 0x4033D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x3E4CFDEB + .4byte 0x43CFD006 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2794 $$2794: - .incbin "baserom.dol", 0x498D08, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2795 $$2795: - .incbin "baserom.dol", 0x498D10, 0x8 + .4byte 0 + .4byte 0 .global $$2796 $$2796: - .incbin "baserom.dol", 0x498D18, 0x8 + .4byte 0x7FF00000 + .4byte 0 .global $$2797 $$2797: - .incbin "baserom.dol", 0x498D20, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2798 $$2798: - .incbin "baserom.dol", 0x498D28, 0x8 + .4byte 0x3FD55555 + .4byte 0x55555555 .global $$2799 $$2799: - .incbin "baserom.dol", 0x498D30, 0x8 + .4byte 0x3FD00000 + .4byte 0 .global $$2800 $$2800: - .incbin "baserom.dol", 0x498D38, 0x8 + .4byte 0x3FF71547 + .4byte 0x60000000 .global $$2801 $$2801: - .incbin "baserom.dol", 0x498D40, 0x8 + .4byte 0x3E54AE0B + .4byte 0xF85DDF44 .global $$2802 $$2802: - .incbin "baserom.dol", 0x498D48, 0x8 + .4byte 0x3FF71547 + .4byte 0x652B82FE .global $$2803 $$2803: - .incbin "baserom.dol", 0x498D50, 0x8 + .4byte 0x43400000 + .4byte 0 .global $$2804 $$2804: - .incbin "baserom.dol", 0x498D58, 0x8 + .4byte 0x3FE33333 + .4byte 0x33333303 .global $$2805 $$2805: - .incbin "baserom.dol", 0x498D60, 0x8 + .4byte 0x3FDB6DB6 + .4byte 0xDB6FABFF .global $$2806 $$2806: - .incbin "baserom.dol", 0x498D68, 0x8 + .4byte 0x3FD55555 + .4byte 0x518F264D .global $$2807 $$2807: - .incbin "baserom.dol", 0x498D70, 0x8 + .4byte 0x3FD17460 + .4byte 0xA91D4101 .global $$2808 $$2808: - .incbin "baserom.dol", 0x498D78, 0x8 + .4byte 0x3FCD864A + .4byte 0x93C9DB65 .global $$2809 $$2809: - .incbin "baserom.dol", 0x498D80, 0x8 + .4byte 0x3FCA7E28 + .4byte 0x4A454EEF .global $$2810 $$2810: - .incbin "baserom.dol", 0x498D88, 0x8 + .4byte 0x40080000 + .4byte 0 .global $$2811 $$2811: - .incbin "baserom.dol", 0x498D90, 0x8 + .4byte 0x3FEEC709 + .4byte 0xE0000000 .global $$2812 $$2812: - .incbin "baserom.dol", 0x498D98, 0x8 + .4byte 0xBE3E2FE0 + .4byte 0x145B01F5 .global $$2813 $$2813: - .incbin "baserom.dol", 0x498DA0, 0x8 + .4byte 0x3FEEC709 + .4byte 0xDC3A03FD .global $$2814 $$2814: - .incbin "baserom.dol", 0x498DA8, 0x8 + .4byte 0xBFF00000 + .4byte 0 .global $$2815 $$2815: - .incbin "baserom.dol", 0x498DB0, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2816 $$2816: - .incbin "baserom.dol", 0x498DB8, 0x8 + .4byte 0x3C971547 + .4byte 0x652B82FE .global $$2817 $$2817: - .incbin "baserom.dol", 0x498DC0, 0x8 + .4byte 0x01A56E1F + .4byte 0xC2F8F359 .global $$2818 $$2818: - .incbin "baserom.dol", 0x498DC8, 0x8 + .4byte 0x3FE62E43 + .4byte 0 .global $$2819 $$2819: - .incbin "baserom.dol", 0x498DD0, 0x8 + .4byte 0x3FE62E42 + .4byte 0xFEFA39EF .global $$2820 $$2820: - .incbin "baserom.dol", 0x498DD8, 0x8 + .4byte 0xBE205C61 + .4byte 0x0CA86C39 .global $$2821 $$2821: - .incbin "baserom.dol", 0x498DE0, 0x8 + .4byte 0x3FC55555 + .4byte 0x5555553E .global $$2822 $$2822: - .incbin "baserom.dol", 0x498DE8, 0x8 + .4byte 0xBF66C16C + .4byte 0x16BEBD93 .global $$2823 $$2823: - .incbin "baserom.dol", 0x498DF0, 0x8 + .4byte 0x3F11566A + .4byte 0xAF25DE2C .global $$2824 $$2824: - .incbin "baserom.dol", 0x498DF8, 0x8 + .4byte 0xBEBBBD41 + .4byte 0xC5D26BF1 .global $$2825 $$2825: - .incbin "baserom.dol", 0x498E00, 0x8 + .4byte 0x3E663769 + .4byte 0x72BEA4D0 .global $$2826 $$2826: - .incbin "baserom.dol", 0x498E08, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$2828 $$2828: - .incbin "baserom.dol", 0x498E10, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" index df4b1696..28dd44da 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" @@ -247,42 +247,149 @@ lbl_800120A4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global two_over_pi two_over_pi: - .incbin "baserom.dol", 0x4033E0, 0x108 + .4byte 0x00A2F983 + .4byte 0x006E4E44 + .4byte 0x001529FC + .4byte 0x002757D1 + .4byte 0x00F534DD + .4byte 0x00C0DB62 + .4byte 0x0095993C + .4byte 0x00439041 + .4byte 0x00FE5163 + .4byte 0x00ABDEBB + .4byte 0x00C561B7 + .4byte 0x00246E3A + .4byte 0x00424DD2 + .4byte 0x00E00649 + .4byte 0x002EEA09 + .4byte 0x00D1921C + .4byte 0x00FE1DEB + .4byte 0x001CB129 + .4byte 0x00A73EE8 + .4byte 0x008235F5 + .4byte 0x002EBB44 + .4byte 0x0084E99C + .4byte 0x007026B4 + .4byte 0x005F7E41 + .4byte 0x003991D6 + .4byte 0x00398353 + .4byte 0x0039F49C + .4byte 0x00845F8B + .4byte 0x00BDF928 + .4byte 0x003B1FF8 + .4byte 0x0097FFDE + .4byte 0x0005980F + .4byte 0x00EF2F11 + .4byte 0x008B5A0A + .4byte 0x006D1F6D + .4byte 0x00367ECF + .4byte 0x0027CB09 + .4byte 0x00B74F46 + .4byte 0x003F669E + .4byte 0x005FEA2D + .4byte 0x007527BA + .4byte 0x00C7EBE5 + .4byte 0x00F17B3D + .4byte 0x000739F7 + .4byte 0x008A5292 + .4byte 0x00EA6BFB + .4byte 0x005FB11F + .4byte 0x008D5D08 + .4byte 0x00560330 + .4byte 0x0046FC7B + .4byte 0x006BABF0 + .4byte 0x00CFBC20 + .4byte 0x009AF436 + .4byte 0x001DA9E3 + .4byte 0x0091615E + .4byte 0x00E61B08 + .4byte 0x00659985 + .4byte 0x005F14A0 + .4byte 0x0068408D + .4byte 0x00FFD880 + .4byte 0x004D7327 + .4byte 0x00310606 + .4byte 0x001556CA + .4byte 0x0073A8C9 + .4byte 0x0060E27B + .4byte 0x00C08C6B .global npio2_hw npio2_hw: - .incbin "baserom.dol", 0x4034E8, 0x80 + .4byte 0x3FF921FB + .4byte 0x400921FB + .4byte 0x4012D97C + .4byte 0x401921FB + .4byte 0x401F6A7A + .4byte 0x4022D97C + .4byte 0x4025FDBB + .4byte 0x402921FB + .4byte 0x402C463A + .4byte 0x402F6A7A + .4byte 0x4031475C + .4byte 0x4032D97C + .4byte 0x40346B9C + .4byte 0x4035FDBB + .4byte 0x40378FDB + .4byte 0x403921FB + .4byte 0x403AB41B + .4byte 0x403C463A + .4byte 0x403DD85A + .4byte 0x403F6A7A + .4byte 0x40407E4C + .4byte 0x4041475C + .4byte 0x4042106C + .4byte 0x4042D97C + .4byte 0x4043A28C + .4byte 0x40446B9C + .4byte 0x404534AC + .4byte 0x4045FDBB + .4byte 0x4046C6CB + .4byte 0x40478FDB + .4byte 0x404858EB + .4byte 0x404921FB .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2594 $$2594: - .incbin "baserom.dol", 0x498E18, 0x8 + .4byte 0 + .4byte 0 .global $$2595 $$2595: - .incbin "baserom.dol", 0x498E20, 0x8 + .4byte 0x3FF921FB + .4byte 0x54400000 .global $$2596 $$2596: - .incbin "baserom.dol", 0x498E28, 0x8 + .4byte 0x3DD0B461 + .4byte 0x1A626331 .global $$2597 $$2597: - .incbin "baserom.dol", 0x498E30, 0x8 + .4byte 0x3DD0B461 + .4byte 0x1A600000 .global $$2598 $$2598: - .incbin "baserom.dol", 0x498E38, 0x8 + .4byte 0x3BA3198A + .4byte 0x2E037073 .global $$2599 $$2599: - .incbin "baserom.dol", 0x498E40, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2600 $$2600: - .incbin "baserom.dol", 0x498E48, 0x8 + .4byte 0x3FE45F30 + .4byte 0x6DC9C883 .global $$2601 $$2601: - .incbin "baserom.dol", 0x498E50, 0x8 + .4byte 0x3BA3198A + .4byte 0x2E000000 .global $$2602 $$2602: - .incbin "baserom.dol", 0x498E58, 0x8 + .4byte 0x397B839A + .4byte 0x252049C1 .global $$2603 $$2603: - .incbin "baserom.dol", 0x498E60, 0x8 + .4byte 0x41700000 + .4byte 0 .global $$2607 $$2607: - .incbin "baserom.dol", 0x498E68, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" index e54f5d08..bb3906f0 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" @@ -177,4 +177,5 @@ lbl_800147E0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2562 $$2562: - .incbin "baserom.dol", 0x498FF8, 0x8 + .4byte 0x3FF00000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" index f87f1a63..055a8c67 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" @@ -80,28 +80,37 @@ lbl_800121C4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2476 $$2476: - .incbin "baserom.dol", 0x498E70, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2477 $$2477: - .incbin "baserom.dol", 0x498E78, 0x8 + .4byte 0x3FA55555 + .4byte 0x5555554C .global $$2478 $$2478: - .incbin "baserom.dol", 0x498E80, 0x8 + .4byte 0xBF56C16C + .4byte 0x16C15177 .global $$2479 $$2479: - .incbin "baserom.dol", 0x498E88, 0x8 + .4byte 0x3EFA01A0 + .4byte 0x19CB1590 .global $$2480 $$2480: - .incbin "baserom.dol", 0x498E90, 0x8 + .4byte 0xBE927E4F + .4byte 0x809C52AD .global $$2481 $$2481: - .incbin "baserom.dol", 0x498E98, 0x8 + .4byte 0x3E21EE9E + .4byte 0xBDB4B1C4 .global $$2482 $$2482: - .incbin "baserom.dol", 0x498EA0, 0x8 + .4byte 0xBDA8FAE9 + .4byte 0xBE8838D4 .global $$2483 $$2483: - .incbin "baserom.dol", 0x498EA8, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$2484 $$2484: - .incbin "baserom.dol", 0x498EB0, 0x8 + .4byte 0x3FD20000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" index 4b5aae7f..29f98ab8 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" @@ -1587,33 +1587,59 @@ lbl_80013864: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global init_jk init_jk: - .incbin "baserom.dol", 0x403568, 0x10 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000006 .global PIo2 PIo2: - .incbin "baserom.dol", 0x403578, 0x40 + .4byte 0x3FF921FB + .4byte 0x40000000 + .asciz ">tD-" + .balign 4 + .4byte 0x3CF84698 + .4byte 0x80000000 + .4byte 0x3B78CC51 + .4byte 0x60000000 + .4byte 0x39F01B83 + .4byte 0x80000000 + .asciz "8z% @" + .balign 4 + .4byte 0x36E38222 + .4byte 0x80000000 + .4byte 0x3569F31D + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21235 $$21235: - .incbin "baserom.dol", 0x498EB8, 0x8 + .4byte 0 + .4byte 0 .global $$21236 $$21236: - .incbin "baserom.dol", 0x498EC0, 0x8 + .4byte 0x3E700000 + .4byte 0 .global $$21237 $$21237: - .incbin "baserom.dol", 0x498EC8, 0x8 + .4byte 0x41700000 + .4byte 0 .global $$21238 $$21238: - .incbin "baserom.dol", 0x498ED0, 0x8 + .4byte 0x40200000 + .4byte 0 .global $$21239 $$21239: - .incbin "baserom.dol", 0x498ED8, 0x8 + .4byte 0x3FC00000 + .4byte 0 .global $$21240 $$21240: - .incbin "baserom.dol", 0x498EE0, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$21241 $$21241: - .incbin "baserom.dol", 0x498EE8, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$21247 $$21247: - .incbin "baserom.dol", 0x498EF0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" index 630c48ef..3b6b44d1 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" @@ -58,22 +58,29 @@ lbl_8001393C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2470 $$2470: - .incbin "baserom.dol", 0x498EF8, 0x8 + .4byte 0x3F811111 + .4byte 0x1110F8A6 .global $$2471 $$2471: - .incbin "baserom.dol", 0x498F00, 0x8 + .4byte 0xBF2A01A0 + .4byte 0x19C161D5 .global $$2472 $$2472: - .incbin "baserom.dol", 0x498F08, 0x8 + .4byte 0x3EC71DE3 + .4byte 0x57B1FE7D .global $$2473 $$2473: - .incbin "baserom.dol", 0x498F10, 0x8 + .4byte 0xBE5AE5E6 + .4byte 0x8A2B9CEB .global $$2474 $$2474: - .incbin "baserom.dol", 0x498F18, 0x8 + .4byte 0x3DE5D93A + .4byte 0x5ACFD57C .global $$2475 $$2475: - .incbin "baserom.dol", 0x498F20, 0x8 + .4byte 0xBFC55555 + .4byte 0x55555549 .global $$2476 $$2476: - .incbin "baserom.dol", 0x498F28, 0x8 + .4byte 0x3FE00000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" index b1ca3ebe..7895aedc 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" @@ -163,27 +163,59 @@ lbl_80013B7C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T T: - .incbin "baserom.dol", 0x4035B8, 0x68 + .4byte 0x3FD55555 + .4byte 0x55555563 + .4byte 0x3FC11111 + .4byte 0x1110FE7A + .4byte 0x3FABA1BA + .4byte 0x1BB341FE + .4byte 0x3F9664F4 + .4byte 0x8406D637 + .4byte 0x3F8226E3 + .4byte 0xE96E8493 + .4byte 0x3F6D6D22 + .4byte 0xC9560328 + .4byte 0x3F57DBC8 + .4byte 0xFEE08315 + .4byte 0x3F4344D8 + .4byte 0xF2F26501 + .4byte 0x3F3026F7 + .4byte 0x1A8D1068 + .4byte 0x3F147E88 + .4byte 0xA03792A6 + .4byte 0x3F12B80F + .4byte 0x32F0A7E9 + .4byte 0xBEF375CB + .4byte 0xDB605373 + .4byte 0x3EFB2A70 + .4byte 0x74BF7AD4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2516 $$2516: - .incbin "baserom.dol", 0x498F30, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2517 $$2517: - .incbin "baserom.dol", 0x498F38, 0x8 + .4byte 0xBFF00000 + .4byte 0 .global $$2518 $$2518: - .incbin "baserom.dol", 0x498F40, 0x8 + .4byte 0x3FE921FB + .4byte 0x54442D18 .global $$2519 $$2519: - .incbin "baserom.dol", 0x498F48, 0x8 + .4byte 0x3C81A626 + .4byte 0x33145C07 .global $$2520 $$2520: - .incbin "baserom.dol", 0x498F50, 0x8 + .4byte 0 + .4byte 0 .global $$2521 $$2521: - .incbin "baserom.dol", 0x498F58, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$2523 $$2523: - .incbin "baserom.dol", 0x498F60, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" index d5bcbfb0..c54f82af 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" @@ -161,27 +161,67 @@ lbl_80013DBC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global atanhi atanhi: - .incbin "baserom.dol", 0x403620, 0x20 + .4byte 0x3FDDAC67 + .4byte 0x0561BB4F + .4byte 0x3FE921FB + .4byte 0x54442D18 + .4byte 0x3FEF730B + .4byte 0xD281F69B + .4byte 0x3FF921FB + .4byte 0x54442D18 .global atanlo atanlo: - .incbin "baserom.dol", 0x403640, 0x20 + .4byte 0x3C7A2B7F + .4byte 0x222F65E2 + .4byte 0x3C81A626 + .4byte 0x33145C07 + .4byte 0x3C700788 + .4byte 0x7AF0CBBD + .4byte 0x3C91A626 + .4byte 0x33145C07 .global aT aT: - .incbin "baserom.dol", 0x403660, 0x58 + .4byte 0x3FD55555 + .4byte 0x5555550D + .4byte 0xBFC99999 + .4byte 0x9998EBC4 + .4byte 0x3FC24924 + .4byte 0x920083FF + .4byte 0xBFBC71C6 + .4byte 0xFE231671 + .4byte 0x3FB745CD + .4byte 0xC54C206E + .4byte 0xBFB3B0F2 + .4byte 0xAF749A6D + .4byte 0x3FB10D66 + .4byte 0xA0D03D51 + .4byte 0xBFADDE2D + .4byte 0x52DEFD9A + .4byte 0x3FA97B4B + .4byte 0x24760DEB + .4byte 0xBFA2B444 + .4byte 0x2C6A6C2F + .4byte 0x3F90AD3A + .4byte 0xE322DA11 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2532 $$2532: - .incbin "baserom.dol", 0x498F68, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2533 $$2533: - .incbin "baserom.dol", 0x498F70, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$2534 $$2534: - .incbin "baserom.dol", 0x498F78, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$2535 $$2535: - .incbin "baserom.dol", 0x498F80, 0x8 + .4byte 0x3FF80000 + .4byte 0 .global $$2536 $$2536: - .incbin "baserom.dol", 0x498F88, 0x8 + .4byte 0xBFF00000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" index 5cc46cec..18634d9a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" @@ -104,7 +104,9 @@ lbl_80013F08: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2515 $$2515: - .incbin "baserom.dol", 0x498F90, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2516 $$2516: - .incbin "baserom.dol", 0x498F98, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" index b9ce9449..380cda64 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" @@ -64,4 +64,5 @@ lbl_80013FF4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2477 $$2477: - .incbin "baserom.dol", 0x498FA0, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" index 9d9cbb28..5b863d5a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" @@ -105,7 +105,9 @@ lbl_8001414C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2515 $$2515: - .incbin "baserom.dol", 0x498FA8, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2516 $$2516: - .incbin "baserom.dol", 0x498FB0, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" index c6c0bdca..a7458d93 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" @@ -44,4 +44,5 @@ lbl_800141D4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2468 $$2468: - .incbin "baserom.dol", 0x498FB8, 0x8 + .4byte 0x43500000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" index 6c29432e..357a8dbb 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" @@ -108,16 +108,21 @@ lbl_80014330: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2488 $$2488: - .incbin "baserom.dol", 0x498FC0, 0x8 + .4byte 0 + .4byte 0 .global $$2489 $$2489: - .incbin "baserom.dol", 0x498FC8, 0x8 + .4byte 0x43500000 + .4byte 0 .global $$2490 $$2490: - .incbin "baserom.dol", 0x498FD0, 0x8 + .4byte 0x01A56E1F + .4byte 0xC2F8F359 .global $$2491 $$2491: - .incbin "baserom.dol", 0x498FD8, 0x8 + .4byte 0x7E37E43C + .4byte 0x8800759C .global $$2492 $$2492: - .incbin "baserom.dol", 0x498FE0, 0x8 + .4byte 0x3C900000 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" index b2bacfef..b8bbf300 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" @@ -65,4 +65,5 @@ lbl_80014500: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2477 $$2477: - .incbin "baserom.dol", 0x498FE8, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" index b4a136d8..f368cc12 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" @@ -40,4 +40,5 @@ lbl_80014578: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2466 $$2466: - .incbin "baserom.dol", 0x498FF0, 0x8 + .4byte 0 + .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" index 516948fe..e4a7cd8a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" @@ -749,14 +749,112 @@ lbl_8000A2B4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x402788, 0xE0 + .asciz "542101086242752217003726400434970855712890625" + .byte 0x31, 0x31 + .asciz "102230246251565404236316680908203125" + .byte 0x32, 0x33, 0x32 + .asciz "83064365386962890625" + .byte 0x31, 0x35, 0x32 + .asciz "587890625" + .byte 0x33, 0x39 + .asciz "0625" + .byte 0x37, 0x38, 0x31 + .4byte 0x32350031 + .asciz "5625" + .byte 0x33, 0x31, 0x32 + .4byte 0x35003632 + .4byte 0x35003132 + .4byte 0x35003235 + .4byte 0x00350031 + .4byte 0x00320034 + .4byte 0x00380031 + .4byte 0x36003332 + .4byte 0x00363400 + .4byte 0x31323800 + .4byte 0x32353600 + .asciz "179769313486231580793728714053034151" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21232 $$21232: - .incbin "baserom.dol", 0x41D338, 0x128 + .4byte 0x80009CE8 ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009CFC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009D14 ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009D2C ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009EDC ;# ptr + .4byte 0x80009D44 ;# ptr + .4byte 0x80009D5C ;# ptr + .4byte 0x80009D74 ;# ptr + .4byte 0x80009D8C ;# ptr + .4byte 0x80009DA4 ;# ptr + .4byte 0x80009DBC ;# ptr + .4byte 0x80009DD4 ;# ptr + .4byte 0x80009DEC ;# ptr + .4byte 0x80009E04 ;# ptr + .4byte 0x80009E1C ;# ptr + .4byte 0x80009E34 ;# ptr + .4byte 0x80009E4C ;# ptr + .4byte 0x80009E64 ;# ptr + .4byte 0x80009E7C ;# ptr + .4byte 0x80009E94 ;# ptr + .4byte 0x80009EAC ;# ptr + .4byte 0x80009EC4 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21377 $$21377: - .incbin "baserom.dol", 0x498AC0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s index 9a74d582..aa2c6211 100644 --- a/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s +++ b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s @@ -54,4 +54,7 @@ lbl_8000920C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x402700, 0x70 + .asciz "GCN_Mem_Alloc.c : InitDefaultHeap. No Heap Available\n" + .byte 0x4D, 0x65 + .asciz "trowerks CW runtime library initializing default heap\n" + .balign 4 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s index dc6b3c52..8328764c 100644 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s +++ b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s @@ -1656,72 +1656,152 @@ what__Q23std13bad_exceptionCFv: .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2283 $$2283: - .incbin "baserom.dol", 0x4020E8, 0x8 + .4byte 0x10080000 + .4byte 0 .global $$2367 $$2367: - .incbin "baserom.dol", 0x4020F0, 0x8 + .4byte 0x10080000 + .4byte 0 .global $$2557 $$2557: - .incbin "baserom.dol", 0x4020F8, 0x8 + .4byte 0x280A0000 + .4byte 0 .global $$2861 $$2861: - .incbin "baserom.dol", 0x402100, 0x14 + .4byte 0x50080000 + .4byte 0x00000054 + .4byte 0x01250010 + .4byte 0 + .4byte 0x8E000000 .global $$2952 $$2952: - .incbin "baserom.dol", 0x402114, 0x2C + .4byte 0x28180000 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000044 + .4byte 0x004F0028 + .4byte 0 + .4byte 0x90000000 + .4byte 0 + .4byte 0x00000024 + .4byte 0x00000020 + .4byte 0x8D000020 .global $$21130 $$21130: - .incbin "baserom.dol", 0x402140, 0x14 + .4byte 0x28080000 + .4byte 0x00000274 + .4byte 0x000F0010 + .4byte 0 + .4byte 0x8E000000 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2284 $$2284: - .incbin "baserom.dol", 0x40227C, 0xC + .4byte 0x80007B78 ;# ptr + .4byte 0x000001B0 + .4byte 0x80006788 ;# ptr .global $$2368 $$2368: - .incbin "baserom.dol", 0x402288, 0xC + .4byte 0x80007D28 ;# ptr + .4byte 0x000001B0 + .4byte 0x80006790 ;# ptr .global $$2558 $$2558: - .incbin "baserom.dol", 0x402294, 0xC + .4byte 0x80007ED8 ;# ptr + .4byte 0x00000554 + .4byte 0x80006798 ;# ptr .global $$2862 $$2862: - .incbin "baserom.dol", 0x4022A0, 0xC + .4byte 0x8000842C ;# ptr + .4byte 0x0000050C + .4byte 0x800067A0 ;# ptr .global $$2953 $$2953: - .incbin "baserom.dol", 0x4022AC, 0xC + .4byte 0x80008938 ;# ptr + .4byte 0x000001B8 + .4byte 0x800067B4 ;# ptr .global $$21131 $$21131: - .incbin "baserom.dol", 0x4022B8, 0xC + .4byte 0x80008BF8 ;# ptr + .4byte 0x00000408 + .4byte 0x800067E0 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21152 $$21152: - .incbin "baserom.dol", 0x402698, 0x14 + .asciz "std::bad_exception" + .balign 4 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x4026AC, 0x54 + .asciz "!bad_exception!!" + .byte 0x21, 0x73, 0x74 + .asciz "d::exception!!std::bad_exception!!" + .byte 0x21 + .asciz "std::bad_exception!!" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2366 $$2366: - .incbin "baserom.dol", 0x41D140, 0x44 + .4byte 0x80007E90 ;# ptr + .4byte 0x80007E90 ;# ptr + .4byte 0x80007DE8 ;# ptr + .4byte 0x80007DF4 ;# ptr + .4byte 0x80007E00 ;# ptr + .4byte 0x80007E0C ;# ptr + .4byte 0x80007E18 ;# ptr + .4byte 0x80007E18 ;# ptr + .4byte 0x80007E24 ;# ptr + .4byte 0x80007E30 ;# ptr + .4byte 0x80007E3C ;# ptr + .4byte 0x80007E48 ;# ptr + .4byte 0x80007E54 ;# ptr + .4byte 0x80007E6C ;# ptr + .4byte 0x80007E90 ;# ptr + .4byte 0x80007E78 ;# ptr + .4byte 0x80007E60 ;# ptr .global $$2860 $$2860: - .incbin "baserom.dol", 0x41D184, 0x44 + .4byte 0x80008910 ;# ptr + .4byte 0x800084C8 ;# ptr + .4byte 0x800084DC ;# ptr + .4byte 0x80008508 ;# ptr + .4byte 0x8000856C ;# ptr + .4byte 0x800085B8 ;# ptr + .4byte 0x8000860C ;# ptr + .4byte 0x80008660 ;# ptr + .4byte 0x800086B4 ;# ptr + .4byte 0x8000873C ;# ptr + .4byte 0x800087B8 ;# ptr + .4byte 0x80008800 ;# ptr + .4byte 0x8000887C ;# ptr + .4byte 0x800088A4 ;# ptr + .4byte 0x80008910 ;# ptr + .4byte 0x800088F0 ;# ptr + .4byte 0x80008890 ;# ptr .global __vt__Q23std13bad_exception __vt__Q23std13bad_exception: - .incbin "baserom.dol", 0x41D1C8, 0x10 + .4byte 0x80556438 + .4byte 0 + .4byte 0x80008AF0 ;# ptr + .4byte 0x80009170 ;# ptr .global $$21153 $$21153: - .incbin "baserom.dol", 0x41D1D8, 0xC + .4byte 0x80556420 + .4byte 0 + .4byte 0 .global $$2STRING$$2what__Q23std13bad_exceptionCFv $$2STRING$$2what__Q23std13bad_exceptionCFv: - .incbin "baserom.dol", 0x41D1E4, 0x14 + .asciz "bad_exception" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std13bad_exception __RTTI__Q23std13bad_exception: - .incbin "baserom.dol", 0x492818, 0x8 + .4byte 0x80406598 + .4byte 0x804210D8 .section .bss, "wa" # 0x80496700 - 0x805643FC .global fragmentinfo diff --git a/asm/Runtime.PPCEABI.H/NMWException.s b/asm/Runtime.PPCEABI.H/NMWException.s index 34176be5..9ed1ce2b 100644 --- a/asm/Runtime.PPCEABI.H/NMWException.s +++ b/asm/Runtime.PPCEABI.H/NMWException.s @@ -424,35 +424,55 @@ lbl_8000716C: .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2340 $$2340: - .incbin "baserom.dol", 0x4020A8, 0x18 + .4byte 0x28080000 + .4byte 0x00000070 + .4byte 0x00000010 + .4byte 0 + .4byte 0x82000008 + .4byte 0x80006F68 ;# ptr .global $$2351 $$2351: - .incbin "baserom.dol", 0x4020C0, 0x8 + .4byte 0x18080000 + .4byte 0 .global $$2383 $$2383: - .incbin "baserom.dol", 0x4020C8, 0x18 + .4byte 0x20080000 + .4byte 0x0000005C + .4byte 0x00000010 + .4byte 0 + .4byte 0x82000008 + .4byte 0x80006F68 ;# ptr .global $$2401 $$2401: - .incbin "baserom.dol", 0x4020E0, 0x8 + .4byte 0x20080000 + .4byte 0 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2341 $$2341: - .incbin "baserom.dol", 0x40224C, 0xC + .4byte 0x80006E64 ;# ptr + .4byte 0x00000104 + .4byte 0x80006748 ;# ptr .global $$2352 $$2352: - .incbin "baserom.dol", 0x402258, 0xC + .4byte 0x80006F68 ;# ptr + .4byte 0x000000BC + .4byte 0x80006760 ;# ptr .global $$2384 $$2384: - .incbin "baserom.dol", 0x402264, 0xC + .4byte 0x80007024 ;# ptr + .4byte 0x000000F8 + .4byte 0x80006768 ;# ptr .global $$2402 $$2402: - .incbin "baserom.dol", 0x402270, 0xC + .4byte 0x8000711C ;# ptr + .4byte 0x00000078 + .4byte 0x80006780 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global thandler__3std thandler__3std: - .incbin "baserom.dol", 0x492808, 0x4 + .4byte 0x80006C10 ;# ptr .global uhandler__3std uhandler__3std: - .incbin "baserom.dol", 0x49280C, 0x4 + .4byte 0x80006C14 ;# ptr diff --git a/asm/Runtime.PPCEABI.H/New.s b/asm/Runtime.PPCEABI.H/New.s index 59e2e40e..e2bbece3 100644 --- a/asm/Runtime.PPCEABI.H/New.s +++ b/asm/Runtime.PPCEABI.H/New.s @@ -24,19 +24,24 @@ lbl_80006BF8: .section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2190 $$2190: - .incbin "baserom.dol", 0x4020A0, 0x8 + .4byte 0x08080000 + .4byte 0 .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2191 $$2191: - .incbin "baserom.dol", 0x402240, 0xC + .4byte 0x80006BD0 ;# ptr + .4byte 0x00000040 + .4byte 0x80006740 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2278 $$2278: - .incbin "baserom.dol", 0x402660, 0x10 + .asciz "std::exception" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std9exception __RTTI__Q23std9exception: - .incbin "baserom.dol", 0x492800, 0x8 + .4byte 0x80406560 + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s index 19e28599..6a7819a9 100644 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s +++ b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s @@ -40,17 +40,18 @@ lbl_80007A5C: .section .ctors, "wa" # 0x80406260 - 0x80406540 .global __init_cpp_exceptions_reference __init_cpp_exceptions_reference: - .incbin "baserom.dol", 0x402360, 0x4 + .4byte 0x800079FC ;# ptr .section .dtors, "wa" # 0x80406540 - 0x80406560 .global __destroy_global_chain_reference __destroy_global_chain_reference: - .incbin "baserom.dol", 0x402640, 0x4 + .4byte 0x80006B88 ;# ptr .global __fini_cpp_exceptions_reference __fini_cpp_exceptions_reference: - .incbin "baserom.dol", 0x402644, 0x4 + .4byte 0x80007A38 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global fragmentID fragmentID: - .incbin "baserom.dol", 0x492810, 0x8 + .4byte 0xFFFFFFFE + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/ptmf.s b/asm/Runtime.PPCEABI.H/ptmf.s index bb09906f..ac741f74 100644 --- a/asm/Runtime.PPCEABI.H/ptmf.s +++ b/asm/Runtime.PPCEABI.H/ptmf.s @@ -47,4 +47,7 @@ lbl_8000720C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __ptmf_null __ptmf_null: - .incbin "baserom.dol", 0x402670, 0x10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/runtime.s b/asm/Runtime.PPCEABI.H/runtime.s index f4adb1e8..d9ae42cb 100644 --- a/asm/Runtime.PPCEABI.H/runtime.s +++ b/asm/Runtime.PPCEABI.H/runtime.s @@ -729,4 +729,9 @@ lbl_800079F4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __constants __constants: - .incbin "baserom.dol", 0x402680, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x41F00000 + .4byte 0 + .4byte 0x41E00000 + .4byte 0 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" index eaaee5d2..244554f9 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" @@ -80,4 +80,31 @@ lbl_800159F8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2109 $$2109: - .incbin "baserom.dol", 0x41DBB8, 0x70 + .4byte 0x800159F8 ;# ptr + .4byte 0x8001593C ;# ptr + .4byte 0x8001594C ;# ptr + .4byte 0x8001595C ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x8001596C ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x8001597C ;# ptr + .4byte 0x8001598C ;# ptr + .4byte 0x8001599C ;# ptr + .4byte 0x800159AC ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159F8 ;# ptr + .4byte 0x800159EC ;# ptr + .4byte 0x800159BC ;# ptr + .4byte 0x800159CC ;# ptr + .4byte 0x800159DC ;# ptr + .4byte 0 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" index 7b6dcef6..7eeb917d 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" @@ -238,7 +238,22 @@ __TRKreset: .section .data, "wa" # 0x80421040 - 0x80496700 .global TRK_ISR_OFFSETS TRK_ISR_OFFSETS: - .incbin "baserom.dol", 0x41DC28, 0x40 + .4byte 0x00000100 + .4byte 0x00000200 + .4byte 0x00000300 + .4byte 0x00000400 + .4byte 0x00000500 + .4byte 0x00000600 + .4byte 0x00000700 + .4byte 0x00000800 + .4byte 0x00000900 + .4byte 0x00000C00 + .4byte 0x00000D00 + .4byte 0x00000F00 + .4byte 0x00001300 + .4byte 0x00001400 + .4byte 0x00001700 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global lc_base diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" index c6fb10d0..11fe6cd6 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" @@ -275,12 +275,26 @@ InitializeProgramEndTrap: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DC68, 0xE8 + .asciz "Devkit set to : %ld\n" + .byte 0x4D, 0x65, 0x74 + .asciz "roTRK : Sizeof Reply - %ld bytes\n" + .byte 0x4D, 0x65 + .asciz "troTRK : Set to NDEV hardware\n" + .byte 0x4D + .asciz "etroTRK : Set to UNKNOWN hardware. (%ld)\n" + .byte 0x4D, 0x65 + .asciz "troTRK : Invalid hardware ID passed from OS\n" + .byte 0x4D, 0x65, 0x74 + .asciz "roTRK : Defaulting to GDEV Hardware\n" + .byte 0x25, 0x73, 0x0A + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global EndofProgramInstruction$631 EndofProgramInstruction$631: - .incbin "baserom.dol", 0x499000, 0x8 + .4byte 0x00454E44 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gDBCommTable diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" index c232eb03..14b7ab83 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" @@ -34,7 +34,7 @@ lbl_80016F54: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DDD8, 0x28 + .asciz "MetroTRK - TRK_WriteUARTN returned %ld\n" .section .bss, "wa" # 0x80496700 - 0x805643FC .global gPacketSeq diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" index 88827ac2..c58c7d13 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" @@ -617,7 +617,7 @@ lbl_8001775C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DE00, 0x28 + .asciz "MetroTRK - ERROR : No buffer available\n" .section .bss, "wa" # 0x80496700 - 0x805643FC .global gTRKMsgBufs diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" index 4ca2732b..a9c2c015 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" @@ -1109,13 +1109,29 @@ lbl_80018694: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2781 $$2781: - .incbin "baserom.dol", 0x41DE28, 0x1C + .4byte 0x80017AE4 ;# ptr + .4byte 0x80017B04 ;# ptr + .4byte 0x80017ADC ;# ptr + .4byte 0x80017B04 ;# ptr + .4byte 0x80017AEC ;# ptr + .4byte 0x80017AF4 ;# ptr + .4byte 0x80017AFC ;# ptr .global $$2826 $$2826: - .incbin "baserom.dol", 0x41DE44, 0x1C + .4byte 0x80017CF4 ;# ptr + .4byte 0x80017D14 ;# ptr + .4byte 0x80017CEC ;# ptr + .4byte 0x80017D14 ;# ptr + .4byte 0x80017CFC ;# ptr + .4byte 0x80017D04 ;# ptr + .4byte 0x80017D0C ;# ptr .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DE60, 0x30 + .asciz "\nMetroTRK Option : SerialIO - " + .byte 0x45 + .asciz "nable\n" + .byte 0x44 + .asciz "isable\n" .section .bss, "wa" # 0x80496700 - 0x805643FC .global g_CurrentSequence diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" index ddb1ac4a..2faaee4d 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" @@ -127,7 +127,8 @@ TRKDestructEvent: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DD50, 0x20 + .asciz "MetroTRK - Event Queue full\n" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gTRKEventQueue diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" index 3a3067a8..915917b4 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" @@ -108,7 +108,8 @@ lbl_80016444: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DD70, 0x20 + .asciz "MetroTRK for Revolution v0.4" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gTRKBigEndian diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" index 36f3e2c9..8cb5821c 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" @@ -446,4 +446,8 @@ lbl_80016B7C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: - .incbin "baserom.dol", 0x41DD90, 0x48 + .asciz "MetroTRK - bad reply size %ld\n" + .byte 0x4D + .asciz "etroTRK - failed in RequestSend\n" + .balign 4 + .4byte 0 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" index 44b1b0cc..b6c6276f 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" @@ -1739,21 +1739,54 @@ lbl_8001A090: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global gTRKMemMap gTRKMemMap: - .incbin "baserom.dol", 0x403878, 0x10 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0x00000001 .global $$2984 $$2984: - .incbin "baserom.dol", 0x403888, 0x28 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 .global $$2999 $$2999: - .incbin "baserom.dol", 0x4038B0, 0x28 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 .global $$21022 $$21022: - .incbin "baserom.dol", 0x4038D8, 0x28 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 + .4byte 0x60000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global gTRKExceptionStatus gTRKExceptionStatus: - .incbin "baserom.dol", 0x41DE90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gTRKRestoreFlags diff --git a/asm/ai/ai.s b/asm/ai/ai.s index a9df648a..3ba47de0 100644 --- a/asm/ai/ai.s +++ b/asm/ai/ai.s @@ -413,12 +413,14 @@ lbl_80042DD4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42F040, 0x48 + .asciz "<< RVL_SDK - AI \trelease build: Aug 23 2010 17:29:47 (0x4302_145) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AIVersion __AIVersion: - .incbin "baserom.dol", 0x4929F0, 0x8 + .4byte 0x80432F40 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __AI_init_flag diff --git a/asm/arc/arc.s b/asm/arc/arc.s index abe5dd60..6f2908eb 100644 --- a/asm/arc/arc.s +++ b/asm/arc/arc.s @@ -749,12 +749,16 @@ lbl_8004E720: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21127 $$21127: - .incbin "baserom.dol", 0x434598, 0x24 + .asciz "ARCInitHandle: bad archive format" + .balign 4 .global $$21189 $$21189: - .incbin "baserom.dol", 0x4345BC, 0x4C + .asciz "Warning: ARCOpen(): file '%s' was not found under %s in the archive.\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21126 $$21126: - .incbin "baserom.dol", 0x492B80, 0x8 + .asciz "arc.c" + .balign 4 diff --git a/asm/ax/AX.s b/asm/ax/AX.s index d9ef51a2..9c83de41 100644 --- a/asm/ax/AX.s +++ b/asm/ax/AX.s @@ -39,12 +39,14 @@ AXIsInit: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42F088, 0x48 + .asciz "<< RVL_SDK - AX \trelease build: Aug 23 2010 17:29:51 (0x4302_145) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXVersion __AXVersion: - .incbin "baserom.dol", 0x4929F8, 0x8 + .4byte 0x80432F88 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __init diff --git a/asm/ax/AXComp.s b/asm/ax/AXComp.s index fd0c4b21..bc6f13a4 100644 --- a/asm/ax/AXComp.s +++ b/asm/ax/AXComp.s @@ -3,4 +3,1011 @@ .section .data, "wa" # 0x80421040 - 0x80496700 .global __AXCompressorDefaultTable __AXCompressorDefaultTable: - .incbin "baserom.dol", 0x42F160, 0xFC0 + .4byte 0x7F637EC7 + .4byte 0x7E2B7D91 + .4byte 0x7CF77C5E + .4byte 0x7BC57B2E + .4byte 0x7A977A01 + .4byte 0x796B78D6 + .4byte 0x784277AF + .4byte 0x771C768B + .4byte 0x75F97569 + .4byte 0x74D9744A + .4byte 0x73BB732E + .4byte 0x72A07214 + .4byte 0x718870FD + .4byte 0x70736FE9 + .4byte 0x6F606ED7 + .4byte 0x6E506DC8 + .4byte 0x6D426CBC + .4byte 0x6C376BB2 + .4byte 0x6B2E6AAB + .4byte 0x6A2869A6 + .4byte 0x692568A4 + .4byte 0x682467A4 + .4byte 0x672566A7 + .4byte 0x662965AC + .4byte 0x652F64B4 + .4byte 0x643863BD + .4byte 0x634362CA + .4byte 0x625161D8 + .4byte 0x616060E9 + .4byte 0x60725FFC + .4byte 0x5F865F11 + .4byte 0x5E9D5E29 + .4byte 0x5DB65D43 + .4byte 0x5CD15C5F + .4byte 0x5BEE5B7D + .4byte 0x5B0D5A9D + .4byte 0x5A2E59C0 + .4byte 0x595258E5 + .4byte 0x5878580B + .4byte 0x579F5734 + .4byte 0x56C9565F + .4byte 0x55F5558C + .4byte 0x552354BB + .4byte 0x545353EC + .4byte 0x5385531E + .4byte 0x52B95253 + .4byte 0x51EE518A + .4byte 0x512650C3 + .4byte 0x79B67930 + .4byte 0x78AA7825 + .4byte 0x77A0771C + .4byte 0x76997616 + .4byte 0x75947512 + .4byte 0x74917411 + .4byte 0x73917311 + .4byte 0x72927214 + .4byte 0x71967119 + .4byte 0x709C7020 + .4byte 0x6FA46F29 + .4byte 0x6EAF6E35 + .4byte 0x6DBB6D42 + .4byte 0x6CC96C52 + .4byte 0x6BDA6B63 + .4byte 0x6AED6A77 + .4byte 0x6A01698C + .4byte 0x691868A4 + .4byte 0x683167BE + .4byte 0x674B66D9 + .4byte 0x666865F7 + .4byte 0x65876517 + .4byte 0x64A76438 + .4byte 0x63CA635C + .4byte 0x62EE6281 + .4byte 0x621461A8 + .4byte 0x613C60D1 + .4byte 0x60665FFC + .4byte 0x5F925F29 + .4byte 0x5EC05E57 + .4byte 0x5DEF5D88 + .4byte 0x5D215CBA + .4byte 0x5C545BEE + .4byte 0x5B885B23 + .4byte 0x5ABF5A5B + .4byte 0x59F75994 + .4byte 0x593158CF + .4byte 0x586D580B + .4byte 0x57AA574A + .4byte 0x56E95689 + .4byte 0x562A55CB + .4byte 0x556C550E + .4byte 0x54B05453 + .4byte 0x53F65399 + .4byte 0x533D52E1 + .4byte 0x5286522B + .4byte 0x51D05176 + .4byte 0x511C50C3 + .4byte 0x744A73D8 + .4byte 0x736672F5 + .4byte 0x72847214 + .4byte 0x71A47135 + .4byte 0x70C67057 + .4byte 0x6FE96F7B + .4byte 0x6F0E6EA1 + .4byte 0x6E356DC8 + .4byte 0x6D5D6CF2 + .4byte 0x6C876C1C + .4byte 0x6BB26B49 + .4byte 0x6AE06A77 + .4byte 0x6A0E69A6 + .4byte 0x693F68D8 + .4byte 0x6871680A + .4byte 0x67A4673F + .4byte 0x66D96675 + .4byte 0x661065AC + .4byte 0x654864E5 + .4byte 0x64826420 + .4byte 0x63BD635C + .4byte 0x62FA6299 + .4byte 0x623861D8 + .4byte 0x61786119 + .4byte 0x60B9605B + .4byte 0x5FFC5F9E + .4byte 0x5F405EE3 + .4byte 0x5E865E29 + .4byte 0x5DCD5D71 + .4byte 0x5D155CBA + .4byte 0x5C5F5C04 + .4byte 0x5BAA5B50 + .4byte 0x5AF75A9D + .4byte 0x5A4559EC + .4byte 0x5994593C + .4byte 0x58E5588D + .4byte 0x583757E0 + .4byte 0x578A5734 + .4byte 0x56DF5689 + .4byte 0x563555E0 + .4byte 0x558C5538 + .4byte 0x54E45491 + .4byte 0x543E53EC + .4byte 0x53995347 + .4byte 0x52F652A4 + .4byte 0x52535203 + .4byte 0x51B25162 + .4byte 0x511250C3 + .4byte 0x6F1C6EBC + .4byte 0x6E5D6DFE + .4byte 0x6DA06D42 + .4byte 0x6CE46C87 + .4byte 0x6C2A6BCD + .4byte 0x6B706B14 + .4byte 0x6AB86A5D + .4byte 0x6A0169A6 + .4byte 0x694C68F1 + .4byte 0x6897683D + .4byte 0x67E4678B + .4byte 0x673266D9 + .4byte 0x66816629 + .4byte 0x65D2657A + .4byte 0x652364CC + .4byte 0x64766420 + .4byte 0x63CA6374 + .4byte 0x631F62CA + .4byte 0x62756220 + .4byte 0x61CC6178 + .4byte 0x612460D1 + .4byte 0x607E602B + .4byte 0x5FD95F86 + .4byte 0x5F345EE3 + .4byte 0x5E915E40 + .4byte 0x5DEF5D9F + .4byte 0x5D4E5CFE + .4byte 0x5CAE5C5F + .4byte 0x5C105BC1 + .4byte 0x5B725B23 + .4byte 0x5AD55A87 + .4byte 0x5A3A59EC + .4byte 0x599F5952 + .4byte 0x590558B9 + .4byte 0x586D5821 + .4byte 0x57D5578A + .4byte 0x573F56F4 + .4byte 0x56A9565F + .4byte 0x561555CB + .4byte 0x55815538 + .4byte 0x54EF54A6 + .4byte 0x545D5415 + .4byte 0x53CD5385 + .4byte 0x533D52F6 + .4byte 0x52AE5267 + .4byte 0x522151DA + .4byte 0x5194514E + .4byte 0x510850C3 + .4byte 0x6A2869DA + .4byte 0x698C693F + .4byte 0x68F168A4 + .4byte 0x6857680A + .4byte 0x67BE6771 + .4byte 0x672566D9 + .4byte 0x668E6642 + .4byte 0x65F765AC + .4byte 0x65616517 + .4byte 0x64CC6482 + .4byte 0x643863EE + .4byte 0x63A5635C + .4byte 0x631262CA + .4byte 0x62816238 + .4byte 0x61F061A8 + .4byte 0x61606119 + .4byte 0x60D1608A + .4byte 0x60435FFC + .4byte 0x5FB55F6F + .4byte 0x5F295EE3 + .4byte 0x5E9D5E57 + .4byte 0x5E125DCD + .4byte 0x5D885D43 + .4byte 0x5CFE5CBA + .4byte 0x5C765C32 + .4byte 0x5BEE5BAA + .4byte 0x5B675B23 + .4byte 0x5AE05A9D + .4byte 0x5A5B5A18 + .4byte 0x59D65994 + .4byte 0x59525910 + .4byte 0x58CF588D + .4byte 0x584C580B + .4byte 0x57CB578A + .4byte 0x574A5709 + .4byte 0x56C95689 + .4byte 0x564A560A + .4byte 0x55CB558C + .4byte 0x554D550E + .4byte 0x54D05491 + .4byte 0x54535415 + .4byte 0x53D75399 + .4byte 0x535C531E + .4byte 0x52E152A4 + .4byte 0x5267522B + .4byte 0x51EE51B2 + .4byte 0x5176513A + .4byte 0x50FE50C3 + .4byte 0x656E652F + .4byte 0x64F164B4 + .4byte 0x64766438 + .4byte 0x63FB63BD + .4byte 0x63806343 + .4byte 0x630662CA + .4byte 0x628D6251 + .4byte 0x621461D8 + .4byte 0x619C6160 + .4byte 0x612460E9 + .4byte 0x60AD6072 + .4byte 0x60375FFC + .4byte 0x5FC15F86 + .4byte 0x5F4C5F11 + .4byte 0x5ED75E9D + .4byte 0x5E635E29 + .4byte 0x5DEF5DB6 + .4byte 0x5D7C5D43 + .4byte 0x5D0A5CD1 + .4byte 0x5C985C5F + .4byte 0x5C265BEE + .4byte 0x5BB55B7D + .4byte 0x5B455B0D + .4byte 0x5AD55A9D + .4byte 0x5A665A2E + .4byte 0x59F759C0 + .4byte 0x59895952 + .4byte 0x591B58E5 + .4byte 0x58AE5878 + .4byte 0x5841580B + .4byte 0x57D5579F + .4byte 0x576A5734 + .4byte 0x56FF56C9 + .4byte 0x5694565F + .4byte 0x562A55F5 + .4byte 0x55C0558C + .4byte 0x55575523 + .4byte 0x54EF54BB + .4byte 0x54875453 + .4byte 0x541F53EC + .4byte 0x53B85385 + .4byte 0x5352531E + .4byte 0x52EB52B9 + .4byte 0x52865253 + .4byte 0x522151EE + .4byte 0x51BC518A + .4byte 0x51585126 + .4byte 0x50F450C3 + .4byte 0x60E960B9 + .4byte 0x608A605B + .4byte 0x602B5FFC + .4byte 0x5FCD5F9E + .4byte 0x5F6F5F40 + .4byte 0x5F115EE3 + .4byte 0x5EB45E86 + .4byte 0x5E575E29 + .4byte 0x5DFB5DCD + .4byte 0x5D9F5D71 + .4byte 0x5D435D15 + .4byte 0x5CE75CBA + .4byte 0x5C8C5C5F + .4byte 0x5C325C04 + .4byte 0x5BD75BAA + .4byte 0x5B7D5B50 + .4byte 0x5B235AF7 + .4byte 0x5ACA5A9D + .4byte 0x5A715A45 + .4byte 0x5A1859EC + .4byte 0x59C05994 + .4byte 0x5968593C + .4byte 0x591058E5 + .4byte 0x58B9588D + .4byte 0x58625837 + .4byte 0x580B57E0 + .4byte 0x57B5578A + .4byte 0x575F5734 + .4byte 0x570956DF + .4byte 0x56B45689 + .4byte 0x565F5635 + .4byte 0x560A55E0 + .4byte 0x55B6558C + .4byte 0x55625538 + .4byte 0x550E54E4 + .4byte 0x54BB5491 + .4byte 0x5468543E + .4byte 0x541553EC + .4byte 0x53C25399 + .4byte 0x53705347 + .4byte 0x531E52F6 + .4byte 0x52CD52A4 + .4byte 0x527C5253 + .4byte 0x522B5203 + .4byte 0x51DA51B2 + .4byte 0x518A5162 + .4byte 0x513A5112 + .4byte 0x50EA50C3 + .4byte 0x5C985C76 + .4byte 0x5C545C32 + .4byte 0x5C105BEE + .4byte 0x5BCC5BAA + .4byte 0x5B885B67 + .4byte 0x5B455B23 + .4byte 0x5B025AE0 + .4byte 0x5ABF5A9D + .4byte 0x5A7C5A5B + .4byte 0x5A3A5A18 + .4byte 0x59F759D6 + .4byte 0x59B55994 + .4byte 0x59735952 + .4byte 0x59315910 + .4byte 0x58F058CF + .4byte 0x58AE588D + .4byte 0x586D584C + .4byte 0x582C580B + .4byte 0x57EB57CB + .4byte 0x57AA578A + .4byte 0x576A574A + .4byte 0x57295709 + .4byte 0x56E956C9 + .4byte 0x56A95689 + .4byte 0x566A564A + .4byte 0x562A560A + .4byte 0x55EB55CB + .4byte 0x55AB558C + .4byte 0x556C554D + .4byte 0x552D550E + .4byte 0x54EF54D0 + .4byte 0x54B05491 + .4byte 0x54725453 + .4byte 0x54345415 + .4byte 0x53F653D7 + .4byte 0x53B85399 + .4byte 0x537B535C + .4byte 0x533D531E + .4byte 0x530052E1 + .4byte 0x52C352A4 + .4byte 0x52865267 + .4byte 0x5249522B + .4byte 0x520D51EE + .4byte 0x51D051B2 + .4byte 0x51945176 + .4byte 0x5158513A + .4byte 0x511C50FE + .4byte 0x50E050C3 + .4byte 0x58785862 + .4byte 0x584C5837 + .4byte 0x5821580B + .4byte 0x57F657E0 + .4byte 0x57CB57B5 + .4byte 0x579F578A + .4byte 0x5774575F + .4byte 0x574A5734 + .4byte 0x571F5709 + .4byte 0x56F456DF + .4byte 0x56C956B4 + .4byte 0x569F5689 + .4byte 0x5674565F + .4byte 0x564A5635 + .4byte 0x561F560A + .4byte 0x55F555E0 + .4byte 0x55CB55B6 + .4byte 0x55A1558C + .4byte 0x55775562 + .4byte 0x554D5538 + .4byte 0x5523550E + .4byte 0x54F954E4 + .4byte 0x54D054BB + .4byte 0x54A65491 + .4byte 0x547C5468 + .4byte 0x5453543E + .4byte 0x54295415 + .4byte 0x540053EC + .4byte 0x53D753C2 + .4byte 0x53AE5399 + .4byte 0x53855370 + .4byte 0x535C5347 + .4byte 0x5333531E + .4byte 0x530A52F6 + .4byte 0x52E152CD + .4byte 0x52B952A4 + .4byte 0x5290527C + .4byte 0x52675253 + .4byte 0x523F522B + .4byte 0x52175203 + .4byte 0x51EE51DA + .4byte 0x51C651B2 + .4byte 0x519E518A + .4byte 0x51765162 + .4byte 0x514E513A + .4byte 0x51265112 + .4byte 0x50FE50EA + .4byte 0x50D750C3 + .4byte 0x5487547C + .4byte 0x54725468 + .4byte 0x545D5453 + .4byte 0x5449543E + .4byte 0x54345429 + .4byte 0x541F5415 + .4byte 0x540B5400 + .4byte 0x53F653EC + .4byte 0x53E153D7 + .4byte 0x53CD53C2 + .4byte 0x53B853AE + .4byte 0x53A45399 + .4byte 0x538F5385 + .4byte 0x537B5370 + .4byte 0x5366535C + .4byte 0x53525347 + .4byte 0x533D5333 + .4byte 0x5329531E + .4byte 0x5314530A + .4byte 0x530052F6 + .4byte 0x52EB52E1 + .4byte 0x52D752CD + .4byte 0x52C352B9 + .4byte 0x52AE52A4 + .4byte 0x529A5290 + .4byte 0x5286527C + .4byte 0x52725267 + .4byte 0x525D5253 + .4byte 0x5249523F + .4byte 0x5235522B + .4byte 0x52215217 + .4byte 0x520D5203 + .4byte 0x51F851EE + .4byte 0x51E451DA + .4byte 0x51D051C6 + .4byte 0x51BC51B2 + .4byte 0x51A8519E + .4byte 0x5194518A + .4byte 0x51805176 + .4byte 0x516C5162 + .4byte 0x5158514E + .4byte 0x5144513A + .4byte 0x51305126 + .4byte 0x511C5112 + .4byte 0x510850FE + .4byte 0x50F450EA + .4byte 0x50E050D7 + .4byte 0x50CD50C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x50C350C3 + .4byte 0x7A4C7A5B + .4byte 0x7A6A7A79 + .4byte 0x7A887A97 + .4byte 0x7AA67AB5 + .4byte 0x7AC47AD3 + .4byte 0x7AE27AF1 + .4byte 0x7B007B10 + .4byte 0x7B1F7B2E + .4byte 0x7B3D7B4C + .4byte 0x7B5B7B6A + .4byte 0x7B797B89 + .4byte 0x7B987BA7 + .4byte 0x7BB67BC5 + .4byte 0x7BD57BE4 + .4byte 0x7BF37C02 + .4byte 0x7C117C21 + .4byte 0x7C307C3F + .4byte 0x7C4E7C5E + .4byte 0x7C6D7C7C + .4byte 0x7C8C7C9B + .4byte 0x7CAA7CBA + .4byte 0x7CC97CD8 + .4byte 0x7CE77CF7 + .4byte 0x7D067D16 + .4byte 0x7D257D34 + .4byte 0x7D447D53 + .4byte 0x7D627D72 + .4byte 0x7D817D91 + .4byte 0x7DA07DB0 + .4byte 0x7DBF7DCE + .4byte 0x7DDE7DED + .4byte 0x7DFD7E0C + .4byte 0x7E1C7E2B + .4byte 0x7E3B7E4A + .4byte 0x7E5A7E69 + .4byte 0x7E797E88 + .4byte 0x7E987EA7 + .4byte 0x7EB77EC7 + .4byte 0x7ED67EE6 + .4byte 0x7EF57F05 + .4byte 0x7F147F24 + .4byte 0x7F347F43 + .4byte 0x7F537F63 + .4byte 0x7F727F82 + .4byte 0x7F927FA1 + .4byte 0x7FB17FC1 + .4byte 0x7FD07FE0 + .4byte 0x7FF08000 + .4byte 0x74CB74D9 + .4byte 0x74E774F6 + .4byte 0x75047512 + .4byte 0x7521752F + .4byte 0x753E754C + .4byte 0x755A7569 + .4byte 0x75777586 + .4byte 0x759475A2 + .4byte 0x75B175BF + .4byte 0x75CE75DC + .4byte 0x75EB75F9 + .4byte 0x76087616 + .4byte 0x76257633 + .4byte 0x76427650 + .4byte 0x765F766D + .4byte 0x767C768A + .4byte 0x769976A8 + .4byte 0x76B676C5 + .4byte 0x76D376E2 + .4byte 0x76F176FF + .4byte 0x770E771C + .4byte 0x772B773A + .4byte 0x77487757 + .4byte 0x77667774 + .4byte 0x77837792 + .4byte 0x77A077AF + .4byte 0x77BE77CC + .4byte 0x77DB77EA + .4byte 0x77F97807 + .4byte 0x78167825 + .4byte 0x78347842 + .4byte 0x78517860 + .4byte 0x786F787E + .4byte 0x788C789B + .4byte 0x78AA78B9 + .4byte 0x78C878D6 + .4byte 0x78E578F4 + .4byte 0x79037912 + .4byte 0x79217930 + .4byte 0x793E794D + .4byte 0x795C796B + .4byte 0x797A7989 + .4byte 0x799879A7 + .4byte 0x79B679C5 + .4byte 0x79D479E3 + .4byte 0x79F27A01 + .4byte 0x7A107A1F + .4byte 0x7A2E7A3D + .4byte 0x6F896F97 + .4byte 0x6FA46FB2 + .4byte 0x6FC06FCD + .4byte 0x6FDB6FE9 + .4byte 0x6FF77004 + .4byte 0x70127020 + .4byte 0x702E703B + .4byte 0x70497057 + .4byte 0x70657073 + .4byte 0x7080708E + .4byte 0x709C70AA + .4byte 0x70B870C6 + .4byte 0x70D470E1 + .4byte 0x70EF70FD + .4byte 0x710B7119 + .4byte 0x71277135 + .4byte 0x71437150 + .4byte 0x715E716C + .4byte 0x717A7188 + .4byte 0x719671A4 + .4byte 0x71B271C0 + .4byte 0x71CE71DC + .4byte 0x71EA71F8 + .4byte 0x72067214 + .4byte 0x72227230 + .4byte 0x723E724C + .4byte 0x725A7268 + .4byte 0x72767284 + .4byte 0x729272A0 + .4byte 0x72AE72BD + .4byte 0x72CB72D9 + .4byte 0x72E772F5 + .4byte 0x73037311 + .4byte 0x731F732D + .4byte 0x733C734A + .4byte 0x73587366 + .4byte 0x73747382 + .4byte 0x7391739F + .4byte 0x73AD73BB + .4byte 0x73C973D8 + .4byte 0x73E673F4 + .4byte 0x74027411 + .4byte 0x741F742D + .4byte 0x743B744A + .4byte 0x74587466 + .4byte 0x74757483 + .4byte 0x749174A0 + .4byte 0x74AE74BC + .4byte 0x6A846A91 + .4byte 0x6A9E6AAB + .4byte 0x6AB86AC5 + .4byte 0x6AD26ADF + .4byte 0x6AED6AFA + .4byte 0x6B076B14 + .4byte 0x6B216B2E + .4byte 0x6B3B6B49 + .4byte 0x6B566B63 + .4byte 0x6B706B7D + .4byte 0x6B8B6B98 + .4byte 0x6BA56BB2 + .4byte 0x6BBF6BCD + .4byte 0x6BDA6BE7 + .4byte 0x6BF46C02 + .4byte 0x6C0F6C1C + .4byte 0x6C2A6C37 + .4byte 0x6C446C51 + .4byte 0x6C5F6C6C + .4byte 0x6C796C87 + .4byte 0x6C946CA1 + .4byte 0x6CAF6CBC + .4byte 0x6CC96CD7 + .4byte 0x6CE46CF2 + .4byte 0x6CFF6D0C + .4byte 0x6D1A6D27 + .4byte 0x6D346D42 + .4byte 0x6D4F6D5D + .4byte 0x6D6A6D78 + .4byte 0x6D856D93 + .4byte 0x6DA06DAD + .4byte 0x6DBB6DC8 + .4byte 0x6DD66DE3 + .4byte 0x6DF16DFE + .4byte 0x6E0C6E19 + .4byte 0x6E276E34 + .4byte 0x6E426E50 + .4byte 0x6E5D6E6B + .4byte 0x6E786E86 + .4byte 0x6E936EA1 + .4byte 0x6EAF6EBC + .4byte 0x6ECA6ED7 + .4byte 0x6EE56EF3 + .4byte 0x6F006F0E + .4byte 0x6F1B6F29 + .4byte 0x6F376F44 + .4byte 0x6F526F60 + .4byte 0x6F6D6F7B + .4byte 0x65B865C5 + .4byte 0x65D165DE + .4byte 0x65EA65F7 + .4byte 0x66046610 + .4byte 0x661D6629 + .4byte 0x66366642 + .4byte 0x664F665B + .4byte 0x66686675 + .4byte 0x6681668E + .4byte 0x669A66A7 + .4byte 0x66B366C0 + .4byte 0x66CD66D9 + .4byte 0x66E666F3 + .4byte 0x66FF670C + .4byte 0x67196725 + .4byte 0x6732673F + .4byte 0x674B6758 + .4byte 0x67656771 + .4byte 0x677E678B + .4byte 0x679867A4 + .4byte 0x67B167BE + .4byte 0x67CA67D7 + .4byte 0x67E467F1 + .4byte 0x67FD680A + .4byte 0x68176824 + .4byte 0x6831683D + .4byte 0x684A6857 + .4byte 0x68646871 + .4byte 0x687D688A + .4byte 0x689768A4 + .4byte 0x68B168BE + .4byte 0x68CB68D7 + .4byte 0x68E468F1 + .4byte 0x68FE690B + .4byte 0x69186925 + .4byte 0x6932693F + .4byte 0x694C6959 + .4byte 0x69656972 + .4byte 0x697F698C + .4byte 0x699969A6 + .4byte 0x69B369C0 + .4byte 0x69CD69DA + .4byte 0x69E769F4 + .4byte 0x6A016A0E + .4byte 0x6A1B6A28 + .4byte 0x6A356A42 + .4byte 0x6A4F6A5D + .4byte 0x6A6A6A77 + .4byte 0x61246130 + .4byte 0x613C6148 + .4byte 0x61546160 + .4byte 0x616C6178 + .4byte 0x61846190 + .4byte 0x619C61A8 + .4byte 0x61B461C0 + .4byte 0x61CC61D8 + .4byte 0x61E461F0 + .4byte 0x61FC6208 + .4byte 0x62146220 + .4byte 0x622C6238 + .4byte 0x62446250 + .4byte 0x625D6269 + .4byte 0x62756281 + .4byte 0x628D6299 + .4byte 0x62A562B1 + .4byte 0x62BD62C9 + .4byte 0x62D662E2 + .4byte 0x62EE62FA + .4byte 0x63066312 + .4byte 0x631F632B + .4byte 0x63376343 + .4byte 0x634F635B + .4byte 0x63686374 + .4byte 0x6380638C + .4byte 0x639963A5 + .4byte 0x63B163BD + .4byte 0x63CA63D6 + .4byte 0x63E263EE + .4byte 0x63FB6407 + .4byte 0x6413641F + .4byte 0x642C6438 + .4byte 0x64446451 + .4byte 0x645D6469 + .4byte 0x64766482 + .4byte 0x648E649B + .4byte 0x64A764B3 + .4byte 0x64C064CC + .4byte 0x64D964E5 + .4byte 0x64F164FE + .4byte 0x650A6517 + .4byte 0x6523652F + .4byte 0x653C6548 + .4byte 0x65556561 + .4byte 0x656E657A + .4byte 0x65876593 + .4byte 0x659F65AC + .4byte 0x5CC55CD1 + .4byte 0x5CDC5CE7 + .4byte 0x5CF35CFE + .4byte 0x5D0A5D15 + .4byte 0x5D205D2C + .4byte 0x5D375D43 + .4byte 0x5D4E5D5A + .4byte 0x5D655D71 + .4byte 0x5D7C5D88 + .4byte 0x5D935D9F + .4byte 0x5DAA5DB6 + .4byte 0x5DC15DCD + .4byte 0x5DD85DE4 + .4byte 0x5DEF5DFB + .4byte 0x5E065E12 + .4byte 0x5E1D5E29 + .4byte 0x5E355E40 + .4byte 0x5E4C5E57 + .4byte 0x5E635E6E + .4byte 0x5E7A5E86 + .4byte 0x5E915E9D + .4byte 0x5EA95EB4 + .4byte 0x5EC05ECB + .4byte 0x5ED75EE3 + .4byte 0x5EEE5EFA + .4byte 0x5F065F11 + .4byte 0x5F1D5F29 + .4byte 0x5F345F40 + .4byte 0x5F4C5F57 + .4byte 0x5F635F6F + .4byte 0x5F7B5F86 + .4byte 0x5F925F9E + .4byte 0x5FAA5FB5 + .4byte 0x5FC15FCD + .4byte 0x5FD95FE4 + .4byte 0x5FF05FFC + .4byte 0x60086014 + .4byte 0x601F602B + .4byte 0x60376043 + .4byte 0x604F605A + .4byte 0x60666072 + .4byte 0x607E608A + .4byte 0x609660A2 + .4byte 0x60AD60B9 + .4byte 0x60C560D1 + .4byte 0x60DD60E9 + .4byte 0x60F56101 + .4byte 0x610D6119 + .4byte 0x589858A3 + .4byte 0x58AE58B9 + .4byte 0x58C458CF + .4byte 0x58DA58E5 + .4byte 0x58EF58FA + .4byte 0x59055910 + .4byte 0x591B5926 + .4byte 0x5931593C + .4byte 0x59475952 + .4byte 0x595D5968 + .4byte 0x5973597E + .4byte 0x59895994 + .4byte 0x599F59AA + .4byte 0x59B559C0 + .4byte 0x59CB59D6 + .4byte 0x59E159EC + .4byte 0x59F75A02 + .4byte 0x5A0D5A18 + .4byte 0x5A235A2E + .4byte 0x5A395A45 + .4byte 0x5A505A5B + .4byte 0x5A665A71 + .4byte 0x5A7C5A87 + .4byte 0x5A925A9D + .4byte 0x5AA95AB4 + .4byte 0x5ABF5ACA + .4byte 0x5AD55AE0 + .4byte 0x5AEB5AF7 + .4byte 0x5B025B0D + .4byte 0x5B185B23 + .4byte 0x5B2F5B3A + .4byte 0x5B455B50 + .4byte 0x5B5B5B67 + .4byte 0x5B725B7D + .4byte 0x5B885B94 + .4byte 0x5B9F5BAA + .4byte 0x5BB55BC1 + .4byte 0x5BCC5BD7 + .4byte 0x5BE25BEE + .4byte 0x5BF95C04 + .4byte 0x5C105C1B + .4byte 0x5C265C32 + .4byte 0x5C3D5C48 + .4byte 0x5C545C5F + .4byte 0x5C6A5C76 + .4byte 0x5C815C8C + .4byte 0x5C985CA3 + .4byte 0x5CAE5CBA + .4byte 0x549B54A6 + .4byte 0x54B054BB + .4byte 0x54C554CF + .4byte 0x54DA54E4 + .4byte 0x54EF54F9 + .4byte 0x5504550E + .4byte 0x55195523 + .4byte 0x552D5538 + .4byte 0x5542554D + .4byte 0x55575562 + .4byte 0x556C5577 + .4byte 0x5581558C + .4byte 0x559655A1 + .4byte 0x55AB55B6 + .4byte 0x55C055CB + .4byte 0x55D555E0 + .4byte 0x55EB55F5 + .4byte 0x5600560A + .4byte 0x5615561F + .4byte 0x562A5635 + .4byte 0x563F564A + .4byte 0x5654565F + .4byte 0x566A5674 + .4byte 0x567F5689 + .4byte 0x5694569F + .4byte 0x56A956B4 + .4byte 0x56BF56C9 + .4byte 0x56D456DF + .4byte 0x56E956F4 + .4byte 0x56FF5709 + .4byte 0x5714571F + .4byte 0x57295734 + .4byte 0x573F5749 + .4byte 0x5754575F + .4byte 0x576A5774 + .4byte 0x577F578A + .4byte 0x5795579F + .4byte 0x57AA57B5 + .4byte 0x57C057CA + .4byte 0x57D557E0 + .4byte 0x57EB57F6 + .4byte 0x5800580B + .4byte 0x58165821 + .4byte 0x582C5837 + .4byte 0x5841584C + .4byte 0x58575862 + .4byte 0x586D5878 + .4byte 0x5883588D + .4byte 0x50CD50D7 + .4byte 0x50E050EA + .4byte 0x50F450FE + .4byte 0x51085112 + .4byte 0x511C5126 + .4byte 0x5130513A + .4byte 0x5144514E + .4byte 0x51585162 + .4byte 0x516C5176 + .4byte 0x5180518A + .4byte 0x5194519E + .4byte 0x51A851B2 + .4byte 0x51BC51C6 + .4byte 0x51D051DA + .4byte 0x51E451EE + .4byte 0x51F85203 + .4byte 0x520D5217 + .4byte 0x5221522B + .4byte 0x5235523F + .4byte 0x52495253 + .4byte 0x525D5267 + .4byte 0x5272527C + .4byte 0x52865290 + .4byte 0x529A52A4 + .4byte 0x52AE52B9 + .4byte 0x52C352CD + .4byte 0x52D752E1 + .4byte 0x52EB52F6 + .4byte 0x5300530A + .4byte 0x5314531E + .4byte 0x53295333 + .4byte 0x533D5347 + .4byte 0x5352535C + .4byte 0x53665370 + .4byte 0x537A5385 + .4byte 0x538F5399 + .4byte 0x53A453AE + .4byte 0x53B853C2 + .4byte 0x53CD53D7 + .4byte 0x53E153EC + .4byte 0x53F65400 + .4byte 0x540B5415 + .4byte 0x541F5429 + .4byte 0x5434543E + .4byte 0x54495453 + .4byte 0x545D5468 + .4byte 0x5472547C + .4byte 0x54875491 diff --git a/asm/ax/AXVPB.s b/asm/ax/AXVPB.s index edb26777..ee65531d 100644 --- a/asm/ax/AXVPB.s +++ b/asm/ax/AXVPB.s @@ -998,30 +998,66 @@ AXGetMaxVoices: .section .data, "wa" # 0x80421040 - 0x80496700 .global __AXMixCycles __AXMixCycles: - .incbin "baserom.dol", 0x42F0D0, 0x80 + .4byte 0x00000002 + .4byte 0x00000198 + .4byte 0x00000198 + .4byte 0x0000032A + .4byte 0x0000057C + .4byte 0x0000057C + .4byte 0x0000057C + .4byte 0x0000057C + .4byte 0x00000198 + .4byte 0x00000330 + .4byte 0x00000330 + .4byte 0x000004C2 + .4byte 0x00000714 + .4byte 0x00000714 + .4byte 0x00000714 + .4byte 0x00000714 + .4byte 0x000002C3 + .4byte 0x0000045B + .4byte 0x0000045B + .4byte 0x000005ED + .4byte 0x0000083F + .4byte 0x0000083F + .4byte 0x0000083F + .4byte 0x0000083F + .4byte 0x000002C3 + .4byte 0x0000045B + .4byte 0x0000045B + .4byte 0x000005ED + .4byte 0x0000083F + .4byte 0x0000083F + .4byte 0x0000083F + .4byte 0x0000083F .global __AXRmtMixCycles __AXRmtMixCycles: - .incbin "baserom.dol", 0x42F150, 0x10 + .4byte 0x00000004 + .4byte 0x00000056 + .4byte 0x00000097 + .4byte 0x00000097 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23525 $$23525: - .incbin "baserom.dol", 0x4991E8, 0x4 + .4byte 0x40000000 .global $$23526 $$23526: - .incbin "baserom.dol", 0x4991EC, 0x4 + .4byte 0x40C90FDB .global $$23527 $$23527: - .incbin "baserom.dol", 0x4991F0, 0x4 + .4byte 0x46FA0000 .global $$23528 $$23528: - .incbin "baserom.dol", 0x4991F4, 0x4 + .4byte 0x3F800000 .global $$23529 $$23529: - .incbin "baserom.dol", 0x4991F8, 0x8 + .4byte 0x47000000 + .4byte 0 .global $$23533 $$23533: - .incbin "baserom.dol", 0x499200, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __s_AXPB diff --git a/asm/ax/DSPCode.s b/asm/ax/DSPCode.s index 5d2db34d..883d61c2 100644 --- a/asm/ax/DSPCode.s +++ b/asm/ax/DSPCode.s @@ -3,15 +3,2062 @@ .section .data, "wa" # 0x80421040 - 0x80496700 .global axDspSlave axDspSlave: - .incbin "baserom.dol", 0x430120, 0x2000 + .4byte 0 + .4byte 0x029F0F3A + .4byte 0x029F0F46 + .4byte 0x029F0F4B + .4byte 0x029F0F5A + .4byte 0x029F0F5F + .4byte 0x029F0F8B + .4byte 0x029F0F90 + .4byte 0x13021303 + .4byte 0x12041305 + .4byte 0x13068E00 + .4byte 0x8C008B00 + .4byte 0x009200FF + .4byte 0x009E8000 + .4byte 0x00FE0CE5 + .4byte 0x009E8000 + .4byte 0x00FE0CE6 + .4byte 0x00FE0CE7 + .4byte 0x00FE0CE8 + .4byte 0x810000FE + .4byte 0x0CE98900 + .4byte 0x16FCDCD1 + .4byte 0x16FD0000 + .4byte 0x16FB0001 + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x0030029F + .4byte 0x004C1302 + .4byte 0x13031204 + .4byte 0x13051306 + .4byte 0x8E008C00 + .4byte 0x8B000092 + .4byte 0x00FF16FC + .4byte 0xDCD116FD + .4byte 0x000116FB + .4byte 0x000126FC + .4byte 0x02A08000 + .4byte 0x029C0047 + .4byte 0x8E008100 + .4byte 0x8900009F + .4byte 0xBABE26FE + .4byte 0x02C08000 + .4byte 0x029C0051 + .4byte 0x82000294 + .4byte 0x005123FF + .4byte 0x810026FE + .4byte 0x02C08000 + .4byte 0x029C005B + .4byte 0x27FF0240 + .4byte 0x7FFF2ECE + .4byte 0x2FCF16CD + .4byte 0x0C008100 + .4byte 0x2EC91FFB + .4byte 0x2FCB02BF + .4byte 0x00840080 + .4byte 0x0C008E00 + .4byte 0x81008970 + .4byte 0xB1000291 + .4byte 0x00800A0E + .4byte 0xC1000292 + .4byte 0x0080009F + .4byte 0x0D024C00 + .4byte 0x1C7E0213 + .4byte 0x1C7E176F + .4byte 0x16FCBAAD + .4byte 0x2EFD0021 + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x008402DF + .4byte 0x81008970 + .4byte 0x8E782ECE + .4byte 0x2FCF16CD + .4byte 0x0D0816C9 + .4byte 0x000016CB + .4byte 0x00780081 + .4byte 0x0D080082 + .4byte 0x0000009B + .4byte 0x005F009A + .4byte 0x00C08100 + .4byte 0x89008F00 + .4byte 0x02BF0084 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x00AB005A + .4byte 0x1B5E029F + .4byte 0x00B39900 + .4byte 0x1B5E1B5C + .4byte 0x007B00B2 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x00C0193E + .4byte 0x193CB179 + .4byte 0x029400BE + .4byte 0x005A1B5E + .4byte 0x029F00C6 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00C54C00 + .4byte 0x1B5E1B5C + .4byte 0x00820180 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x00D1005A + .4byte 0x1B5E029F + .4byte 0x00D99900 + .4byte 0x1B5E1B5C + .4byte 0x007B00D8 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0400193E + .4byte 0x193CB179 + .4byte 0x029400E4 + .4byte 0x005A1B5E + .4byte 0x029F00EC + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00EB4C00 + .4byte 0x1B5E1B5C + .4byte 0x008204C0 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x00F7005A + .4byte 0x1B5E029F + .4byte 0x00FF9900 + .4byte 0x1B5E1B5C + .4byte 0x007B00FE + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0580193E + .4byte 0x193CB179 + .4byte 0x0294010A + .4byte 0x005A1B5E + .4byte 0x029F0112 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01114C00 + .4byte 0x1B5E1B5C + .4byte 0x00820640 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x011D005A + .4byte 0x1B5E029F + .4byte 0x01259900 + .4byte 0x1B5E1B5C + .4byte 0x007B0124 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0700193E + .4byte 0x193CB179 + .4byte 0x02940130 + .4byte 0x005A1B5E + .4byte 0x029F0138 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01374C00 + .4byte 0x1B5E1B5C + .4byte 0x008207C0 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x0143005A + .4byte 0x1B5E029F + .4byte 0x014B9900 + .4byte 0x1B5E1B5C + .4byte 0x007B014A + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0880193E + .4byte 0x193CB179 + .4byte 0x02940156 + .4byte 0x005A1B5E + .4byte 0x029F015E + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x015D4C00 + .4byte 0x1B5E1B5C + .4byte 0x00820940 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x0169005A + .4byte 0x1B5E029F + .4byte 0x01719900 + .4byte 0x1B5E1B5C + .4byte 0x007B0170 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0A00193E + .4byte 0x193CB179 + .4byte 0x0294017C + .4byte 0x005A1B5E + .4byte 0x029F0184 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01834C00 + .4byte 0x1B5E1B5C + .4byte 0x009B0011 + .4byte 0x009A0024 + .4byte 0x00820240 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x0193005A + .4byte 0x1B5E029F + .4byte 0x019B9900 + .4byte 0x1B5E1B5C + .4byte 0x007B019A + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0AC0193E + .4byte 0x193CB179 + .4byte 0x029401A6 + .4byte 0x005A1B5E + .4byte 0x029F01AE + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01AD4C00 + .4byte 0x1B5E1B5C + .4byte 0x00820264 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x01B9005A + .4byte 0x1B5E029F + .4byte 0x01C19900 + .4byte 0x1B5E1B5C + .4byte 0x007B01C0 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0AE4193E + .4byte 0x193CB179 + .4byte 0x029401CC + .4byte 0x005A1B5E + .4byte 0x029F01D4 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01D34C00 + .4byte 0x1B5E1B5C + .4byte 0x00820288 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x01DF005A + .4byte 0x1B5E029F + .4byte 0x01E79900 + .4byte 0x1B5E1B5C + .4byte 0x007B01E6 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0B08193E + .4byte 0x193CB179 + .4byte 0x029401F2 + .4byte 0x005A1B5E + .4byte 0x029F01FA + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01F94C00 + .4byte 0x1B5E1B5C + .4byte 0x008202AC + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x0205005A + .4byte 0x1B5E029F + .4byte 0x020D9900 + .4byte 0x1B5E1B5C + .4byte 0x007B020C + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x0B2C193E + .4byte 0x193CB179 + .4byte 0x02940218 + .4byte 0x005A1B5E + .4byte 0x029F0220 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x021F4C00 + .4byte 0x1B5E1B5C + .4byte 0x029F006F + .4byte 0x81008970 + .4byte 0x8E602ECE + .4byte 0x2CCF16CD + .4byte 0x0D0816C9 + .4byte 0x000016CB + .4byte 0x01801CC0 + .4byte 0x00800000 + .4byte 0x008300C0 + .4byte 0x00810D08 + .4byte 0x0084FFFF + .4byte 0x1CE402BF + .4byte 0x00848F00 + .4byte 0x80F180C9 + .4byte 0x68004A00 + .4byte 0x191B6994 + .4byte 0x4B23115F + .4byte 0x024980F1 + .4byte 0x80C96838 + .4byte 0x4A28191B + .4byte 0x69944B23 + .4byte 0x1B1F1B1D + .4byte 0x1C06029F + .4byte 0x006F8100 + .4byte 0x89708E60 + .4byte 0x2ECE2CCF + .4byte 0x16CD0D08 + .4byte 0x16C90000 + .4byte 0x16CB0180 + .4byte 0x1CC00080 + .4byte 0x00000083 + .4byte 0x00C00081 + .4byte 0x0D080084 + .4byte 0xFFFF1CE4 + .4byte 0x02BF0084 + .4byte 0x8F0080F1 + .4byte 0x80C96800 + .4byte 0x4A00191B + .4byte 0x69947D00 + .4byte 0x4B23115F + .4byte 0x027880F1 + .4byte 0x80C96838 + .4byte 0x4A28191B + .4byte 0x69947D00 + .4byte 0x4B231B1F + .4byte 0x1B1D1C06 + .4byte 0x029F006F + .4byte 0x81008970 + .4byte 0x8E6000E0 + .4byte 0x0CD22ECE + .4byte 0x2CCF16CD + .4byte 0x02D016C9 + .4byte 0x000016CB + .4byte 0x014002BF + .4byte 0x00848100 + .4byte 0x890000DE + .4byte 0x02D4009F + .4byte 0x0DB54C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0CDF + .4byte 0x00DE02D5 + .4byte 0x009F0DB8 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0CE0009A + .4byte 0x001F00DE + .4byte 0x02D7009F + .4byte 0x0D113400 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0CD300DE + .4byte 0x02D6009F + .4byte 0x0D313400 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0CD400DE + .4byte 0x02D6009F + .4byte 0x0D5114FB + .4byte 0x34004C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0CD5 + .4byte 0x00DE02D6 + .4byte 0x009F0D71 + .4byte 0x14F64C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0CD6 + .4byte 0x810000DE + .4byte 0x033C009A + .4byte 0x0003009B + .4byte 0x0DB11FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CD7 + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CD8 + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CD9 + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CDA + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CDB + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CDC + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CDD + .4byte 0x147E1FFE + .4byte 0x35004700 + .4byte 0x1C7F0313 + .4byte 0x00FF0CDE + .4byte 0x810000DE + .4byte 0x02F2B100 + .4byte 0x02950339 + .4byte 0x890000DF + .4byte 0x02F50300 + .4byte 0x0C4000FF + .4byte 0x0CE200DF + .4byte 0x02F60300 + .4byte 0x0C4000FF + .4byte 0x0CE3009F + .4byte 0x0C6000FF + .4byte 0x0CE100DE + .4byte 0x02F32ECE + .4byte 0x00DE02F4 + .4byte 0x2ECF16CD + .4byte 0x0C4016C9 + .4byte 0x000016CB + .4byte 0x004002BF + .4byte 0x0084029F + .4byte 0x0341009F + .4byte 0x0C6000FF + .4byte 0x0CE200FF + .4byte 0x0CE300FF + .4byte 0x0CE18C00 + .4byte 0x8B008100 + .4byte 0x00DE02D8 + .4byte 0x06010294 + .4byte 0x046A00C3 + .4byte 0x0CDF177F + .4byte 0x8A008100 + .4byte 0x890000DE + .4byte 0x030600DF + .4byte 0x03051F1F + .4byte 0x4D001481 + .4byte 0x8D1E1FD8 + .4byte 0x00988000 + .4byte 0x00800D08 + .4byte 0xA830112F + .4byte 0x0360AC38 + .4byte 0xAD30AC38 + .4byte 0x00FE0305 + .4byte 0x8F000080 + .4byte 0x0D0800C1 + .4byte 0x0CE11C61 + .4byte 0x193A1919 + .4byte 0xB0511919 + .4byte 0x115E0371 + .4byte 0xB6518090 + .4byte 0xB6006E33 + .4byte 0x1B7E00DE + .4byte 0x032DB100 + .4byte 0x02950381 + .4byte 0x00C00CE1 + .4byte 0x1C200083 + .4byte 0x032E02BF + .4byte 0x06A900DE + .4byte 0x0331B100 + .4byte 0x0295038D + .4byte 0x00800332 + .4byte 0x00C10CE1 + .4byte 0x1C4102BF + .4byte 0x06C10080 + .4byte 0x02F98100 + .4byte 0x100C1B1E + .4byte 0x0080034D + .4byte 0x10081B1E + .4byte 0x00C30CD3 + .4byte 0x177F00C3 + .4byte 0x0CD4177F + .4byte 0x00C30CD5 + .4byte 0x177F00C3 + .4byte 0x0CD6177F + .4byte 0x00DE033B + .4byte 0xB1000295 + .4byte 0x044700DE + .4byte 0x035AB100 + .4byte 0x029503C4 + .4byte 0x0A02C100 + .4byte 0x029403BA + .4byte 0x0080035B + .4byte 0x00C10CE1 + .4byte 0x00820D0C + .4byte 0x02BF06C1 + .4byte 0x029F03CC + .4byte 0x00800D0C + .4byte 0x00C10CE1 + .4byte 0x0083035B + .4byte 0x02BF06A9 + .4byte 0x029F03CC + .4byte 0x00800D0C + .4byte 0x00C10CE1 + .4byte 0x116003CB + .4byte 0x193F1B1F + .4byte 0x00820355 + .4byte 0x8C008100 + .4byte 0x195C009B + .4byte 0x00050099 + .4byte 0x55550080 + .4byte 0x0D081104 + .4byte 0x03DA195F + .4byte 0x1B1F0081 + .4byte 0x0CC00084 + .4byte 0x0D080087 + .4byte 0x10001112 + .4byte 0x03F24A00 + .4byte 0x1C1E0010 + .4byte 0x89001FBC + .4byte 0x15771512 + .4byte 0x1C7F001F + .4byte 0x80C390C3 + .4byte 0x97C395C3 + .4byte 0x95004F00 + .4byte 0x1B3F0004 + .4byte 0x0006189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF1ADC + .4byte 0x8D000081 + .4byte 0x033D0082 + .4byte 0x024000C3 + .4byte 0x0CD7177F + .4byte 0x00F8034D + .4byte 0x0081033F + .4byte 0x00820AC0 + .4byte 0x00C30CD8 + .4byte 0x177F00F8 + .4byte 0x03510081 + .4byte 0x03410082 + .4byte 0x026400C3 + .4byte 0x0CD9177F + .4byte 0x00F8034E + .4byte 0x00810343 + .4byte 0x00820AE4 + .4byte 0x00C30CDA + .4byte 0x177F00F8 + .4byte 0x03520081 + .4byte 0x03450082 + .4byte 0x028800C3 + .4byte 0x0CDB177F + .4byte 0x00F8034F + .4byte 0x00810347 + .4byte 0x00820B08 + .4byte 0x00C30CDC + .4byte 0x177F00F8 + .4byte 0x03530081 + .4byte 0x03490082 + .4byte 0x02AC00C3 + .4byte 0x0CDD177F + .4byte 0x00F80350 + .4byte 0x0081034B + .4byte 0x00820B2C + .4byte 0x00C30CDE + .4byte 0x177F00F8 + .4byte 0x035400DE + .4byte 0x02F2B100 + .4byte 0x0295046A + .4byte 0x00DE02F5 + .4byte 0x00DF02F7 + .4byte 0x82000293 + .4byte 0x04567800 + .4byte 0x029F0459 + .4byte 0x02950459 + .4byte 0x740000FE + .4byte 0x02F500DE + .4byte 0x02F600DF + .4byte 0x02F88200 + .4byte 0x02930465 + .4byte 0x7800029F + .4byte 0x04680295 + .4byte 0x04687400 + .4byte 0x00FE02F6 + .4byte 0x8E008100 + .4byte 0x00DE02F2 + .4byte 0xB1000295 + .4byte 0x047F00DE + .4byte 0x02F300DC + .4byte 0x02F42ECE + .4byte 0x2CCF16CD + .4byte 0x0CA016C9 + .4byte 0x000116CB + .4byte 0x004002BF + .4byte 0x00848100 + .4byte 0x890000DE + .4byte 0x02D200DF + .4byte 0x02D32ECE + .4byte 0x2FCF16CD + .4byte 0x02D016C9 + .4byte 0x000116CB + .4byte 0x014002BF + .4byte 0x00848100 + .4byte 0x00DE02D0 + .4byte 0x00DC02D1 + .4byte 0xB1000294 + .4byte 0x028300C0 + .4byte 0x0CD2029F + .4byte 0x006F8E00 + .4byte 0x00C40CE6 + .4byte 0x190500E5 + .4byte 0x0CE60086 + .4byte 0x04008100 + .4byte 0x8970191C + .4byte 0x2ECE2CCF + .4byte 0x1FC62ECD + .4byte 0x16C90001 + .4byte 0x16CB0480 + .4byte 0x02BF0084 + .4byte 0x02BF04E6 + .4byte 0x029F006F + .4byte 0x8E0000C4 + .4byte 0x0CE71905 + .4byte 0x00E50CE7 + .4byte 0x00860640 + .4byte 0x81008970 + .4byte 0x191C2ECE + .4byte 0x2CCF1FC6 + .4byte 0x2ECD16C9 + .4byte 0x000116CB + .4byte 0x048002BF + .4byte 0x008402BF + .4byte 0x04E6029F + .4byte 0x006F8E00 + .4byte 0x00C40CE8 + .4byte 0x190500E5 + .4byte 0x0CE80086 + .4byte 0x08808100 + .4byte 0x8970191C + .4byte 0x2ECE2CCF + .4byte 0x1FC62ECD + .4byte 0x16C90001 + .4byte 0x16CB0480 + .4byte 0x02BF0084 + .4byte 0x02BF04E6 + .4byte 0x029F006F + .4byte 0x8B008100 + .4byte 0x1FC41FE5 + .4byte 0x5D00009A + .4byte 0x02AB009B + .4byte 0x02AA0081 + .4byte 0x0D08D000 + .4byte 0xD400111F + .4byte 0x04F7DC31 + .4byte 0xD431D431 + .4byte 0xDC314E31 + .4byte 0x1B258E00 + .4byte 0x191F191D + .4byte 0x2FCE2DCF + .4byte 0x89001FA6 + .4byte 0x2DCD16C9 + .4byte 0x000016CB + .4byte 0x048002BF + .4byte 0x008400E0 + .4byte 0x0CD28F00 + .4byte 0x8D008A00 + .4byte 0x00800D08 + .4byte 0x00810000 + .4byte 0x1C411C66 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E00 + .4byte 0x4800112F + .4byte 0x052A80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E3A + .4byte 0x482A80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x1B5F1B5D + .4byte 0x00800D08 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E00 + .4byte 0x4800112F + .4byte 0x054C80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E3A + .4byte 0x482A80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x1B5F1B5D + .4byte 0x00800D08 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E00 + .4byte 0x4800112F + .4byte 0x056E80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x80F180C0 + .4byte 0xA000AE00 + .4byte 0x91414E3A + .4byte 0x482A80F1 + .4byte 0x80C0A000 + .4byte 0xAF009941 + .4byte 0x4F324922 + .4byte 0x1B5F1B5D + .4byte 0x00C00CD2 + .4byte 0x02DF8D00 + .4byte 0x8F008A00 + .4byte 0x89008168 + .4byte 0x00980000 + .4byte 0x00990001 + .4byte 0x00810000 + .4byte 0x193E193C + .4byte 0x11600593 + .4byte 0xA1008271 + .4byte 0x02771F19 + .4byte 0x193CA100 + .4byte 0x82710277 + .4byte 0x1F19193C + .4byte 0x1FD8B100 + .4byte 0x029405BE + .4byte 0x00DE0CE4 + .4byte 0xB1000294 + .4byte 0x05A2191C + .4byte 0x191C191C + .4byte 0x029F006F + .4byte 0x8B007800 + .4byte 0x00FE0CE4 + .4byte 0x84000099 + .4byte 0x00C01F1E + .4byte 0xA000191E + .4byte 0x74001F1E + .4byte 0x191E191C + .4byte 0x00E00CD2 + .4byte 0xA4004E00 + .4byte 0x2ECE2CCF + .4byte 0x16CD0D08 + .4byte 0x16C90000 + .4byte 0x16CB00C0 + .4byte 0x029F05D4 + .4byte 0x8B0000D8 + .4byte 0x0CE40099 + .4byte 0x00C0A000 + .4byte 0x191E00FE + .4byte 0x0CE4191E + .4byte 0x191C00E0 + .4byte 0x0CD24E00 + .4byte 0x2ECE2CCF + .4byte 0x16CD0D08 + .4byte 0x16C90000 + .4byte 0x16CB00C0 + .4byte 0x02BF0084 + .4byte 0x8A480083 + .4byte 0x0D080080 + .4byte 0x00000081 + .4byte 0x00001979 + .4byte 0x193AB041 + .4byte 0xA64BF051 + .4byte 0xB4419100 + .4byte 0x113005ED + .4byte 0xA792F151 + .4byte 0xB5209941 + .4byte 0xA693F051 + .4byte 0xB4289141 + .4byte 0x00830D08 + .4byte 0x008000C0 + .4byte 0x008100C0 + .4byte 0x1979193A + .4byte 0xB041A64B + .4byte 0xF051B441 + .4byte 0x91001130 + .4byte 0x0604A792 + .4byte 0xF151B520 + .4byte 0x9941A693 + .4byte 0xF051B428 + .4byte 0x914100C0 + .4byte 0x0CD2029F + .4byte 0x006F8E48 + .4byte 0x8B708960 + .4byte 0x00E00CD2 + .4byte 0x2ECE2CCF + .4byte 0x16CD0180 + .4byte 0x16C90001 + .4byte 0x16CB0180 + .4byte 0x810000DE + .4byte 0x0CE51FF9 + .4byte 0x5D0000F9 + .4byte 0x0CE5009A + .4byte 0x02AB009B + .4byte 0x02AA0081 + .4byte 0x0D08D000 + .4byte 0xD400111F + .4byte 0x0629DC31 + .4byte 0xD431D431 + .4byte 0xDC314E31 + .4byte 0x1B3902BF + .4byte 0x00848F00 + .4byte 0x8D008A00 + .4byte 0x00800D08 + .4byte 0x00810400 + .4byte 0x00830000 + .4byte 0x008200C0 + .4byte 0x1918195B + .4byte 0x1959A000 + .4byte 0xAE009100 + .4byte 0x4E5BF04B + .4byte 0x115F064D + .4byte 0xA031AE00 + .4byte 0x91404E5A + .4byte 0xF04AA031 + .4byte 0xAE009100 + .4byte 0x4E5BF04B + .4byte 0xA031AE00 + .4byte 0x91004E00 + .4byte 0xF0001B3E + .4byte 0x8E0000C0 + .4byte 0x0CD2191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x040016C9 + .4byte 0x000116CB + .4byte 0x018002BF + .4byte 0x008416FC + .4byte 0xDCD116FD + .4byte 0x000416FB + .4byte 0x000126FC + .4byte 0x02A08000 + .4byte 0x029C0669 + .4byte 0x029F006F + .4byte 0x16FCDCD1 + .4byte 0x16FD0002 + .4byte 0x16FB0001 + .4byte 0x029F0F99 + .4byte 0x029F004C + .4byte 0x8C008A00 + .4byte 0x8F000081 + .4byte 0x0AC00082 + .4byte 0x02401FA1 + .4byte 0x11120687 + .4byte 0x195E195C + .4byte 0xF0001B3E + .4byte 0x191E191C + .4byte 0x2ECE2CCF + .4byte 0x2DCD1103 + .4byte 0x06A016C9 + .4byte 0x000116CB + .4byte 0x00241FA1 + .4byte 0x11120699 + .4byte 0x195E195C + .4byte 0xF0001B3E + .4byte 0x02BF0084 + .4byte 0x191E191C + .4byte 0x2ECE2CCF + .4byte 0x2DCD16C9 + .4byte 0x000116CB + .4byte 0x002402BF + .4byte 0x0084029F + .4byte 0x006F0087 + .4byte 0xFFFF1C83 + .4byte 0x197E80E1 + .4byte 0xB04F1F5E + .4byte 0xE2E1B64F + .4byte 0x1F5EE2E1 + .4byte 0x112F06BB + .4byte 0xB79A1F5F + .4byte 0xE2E1B69B + .4byte 0x1F5EE2E1 + .4byte 0x6F301B1F + .4byte 0x1C641B7F + .4byte 0x02DF8C00 + .4byte 0x8B001CA0 + .4byte 0x00830370 + .4byte 0x191A1918 + .4byte 0x1B7A1B78 + .4byte 0x1919191B + .4byte 0x00830D03 + .4byte 0x110506D1 + .4byte 0x191A1B7A + .4byte 0x00800D03 + .4byte 0x00880004 + .4byte 0x00830370 + .4byte 0x008B0001 + .4byte 0x00870000 + .4byte 0x193F191A + .4byte 0xD0C3F2CB + .4byte 0xF2A9E250 + .4byte 0xE3796E50 + .4byte 0x1482FC00 + .4byte 0x1F7E1B5E + .4byte 0x112F06FD + .4byte 0xD0C3F2CB + .4byte 0xF2A9E350 + .4byte 0xE2796E50 + .4byte 0x1482FC00 + .4byte 0x1F3E1B5E + .4byte 0xD0C3F2CB + .4byte 0xF2A9E250 + .4byte 0xE3796E50 + .4byte 0x1482FC00 + .4byte 0x1F7E1B5E + .4byte 0xD0C3F2CB + .4byte 0xF2A9E350 + .4byte 0xE2006E00 + .4byte 0x1482FC00 + .4byte 0x1F3E1B5E + .4byte 0x0088FFFF + .4byte 0x008BFFFF + .4byte 0x1C050083 + .4byte 0x0370197A + .4byte 0x19781B1A + .4byte 0x1B181B19 + .4byte 0x1B1B8D00 + .4byte 0x8A0002DF + .4byte 0x02BF07E4 + .4byte 0x8C008A00 + .4byte 0x8F00195B + .4byte 0x19598100 + .4byte 0x195C0080 + .4byte 0x0D080088 + .4byte 0x0003195F + .4byte 0x1B1F195F + .4byte 0x1B1F195F + .4byte 0x1B1F195F + .4byte 0x1B1F0081 + .4byte 0x0C600082 + .4byte 0xFFDD00C7 + .4byte 0x0CE04A00 + .4byte 0x11600748 + .4byte 0x89121FBC + .4byte 0x15771512 + .4byte 0x1C7F001F + .4byte 0x00780741 + .4byte 0x185A1B1A + .4byte 0x50001F1D + .4byte 0x4AC390C3 + .4byte 0x97C395C3 + .4byte 0x95004F00 + .4byte 0x1B3F5A00 + .4byte 0x00040082 + .4byte 0x0329189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF0088 + .4byte 0xFFFF1ADC + .4byte 0x00820322 + .4byte 0x27DC1ADF + .4byte 0x27DB1ADF + .4byte 0x27DA1ADF + .4byte 0x0082030E + .4byte 0x27D91ADF + .4byte 0x27D81ADF + .4byte 0x8E008B00 + .4byte 0x02DF02BF + .4byte 0x07E48D00 + .4byte 0x8B008F00 + .4byte 0x195B1945 + .4byte 0x8100195C + .4byte 0x00800D08 + .4byte 0x00880003 + .4byte 0x00840003 + .4byte 0x195F1B1F + .4byte 0x195F1B1F + .4byte 0x195F1B1F + .4byte 0x195F1B1F + .4byte 0x00810C60 + .4byte 0x0082FFDD + .4byte 0x1F254A00 + .4byte 0x1160079D + .4byte 0x89120078 + .4byte 0x078E185A + .4byte 0x1B1A5000 + .4byte 0x1F1F7C00 + .4byte 0xB1140294 + .4byte 0x0797191F + .4byte 0x0010029F + .4byte 0x079C7C50 + .4byte 0xB014199A + .4byte 0xB7004F00 + .4byte 0x1F254A39 + .4byte 0x5A000004 + .4byte 0x00820329 + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x0088FFFF + .4byte 0x1ADC0082 + .4byte 0x032227DC + .4byte 0x1ADF27DB + .4byte 0x1ADF27DA + .4byte 0x1ADF0082 + .4byte 0x030E27D9 + .4byte 0x1ADF27D8 + .4byte 0x1ADF8E00 + .4byte 0x8C0002DF + .4byte 0x02BF07E4 + .4byte 0x00800C60 + .4byte 0x0082FFDD + .4byte 0x116007C9 + .4byte 0x18441B04 + .4byte 0 + .4byte 0x00040082 + .4byte 0x0329189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF189F + .4byte 0x1ADF0082 + .4byte 0x032227DC + .4byte 0x1ADF27DB + .4byte 0x1ADF27DA + .4byte 0x1ADF0082 + .4byte 0x030E27D9 + .4byte 0x1ADF27D8 + .4byte 0x1ADF02DF + .4byte 0x00820308 + .4byte 0x195E2ED1 + .4byte 0x195E2ED4 + .4byte 0x195E2ED5 + .4byte 0x195E2ED6 + .4byte 0x195E2ED7 + .4byte 0x195E2ED8 + .4byte 0x195E2ED9 + .4byte 0x195E2EA0 + .4byte 0x195E2EA1 + .4byte 0x195E2EA2 + .4byte 0x195E2EA3 + .4byte 0x195E2EA4 + .4byte 0x195E2EA5 + .4byte 0x195E2EA6 + .4byte 0x195E2EA7 + .4byte 0x195E2EA8 + .4byte 0x195E2EA9 + .4byte 0x195E2EAA + .4byte 0x195E2EAB + .4byte 0x195E2EAC + .4byte 0x195E2EAD + .4byte 0x195E2EAE + .4byte 0x195E2EAF + .4byte 0x195E2EDE + .4byte 0x195E2EDA + .4byte 0x195E2EDB + .4byte 0x195E2EDC + .4byte 0x02DF02DF + .4byte 0x00C00CE2 + .4byte 0x008102DA + .4byte 0x00820000 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02F902DF + .4byte 0x00C00CE3 + .4byte 0x008102DC + .4byte 0x008200C0 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FD02DF + .4byte 0x00C00CE2 + .4byte 0x008102DA + .4byte 0x00820000 + .4byte 0x1C6200C4 + .4byte 0x0CE30085 + .4byte 0x00C002BF + .4byte 0x0BE900F8 + .4byte 0x02F900FB + .4byte 0x02FD02DF + .4byte 0x00C00CE2 + .4byte 0x008102DA + .4byte 0x00820000 + .4byte 0x00830D08 + .4byte 0x00C40CE3 + .4byte 0x008500C0 + .4byte 0x02BF0C4F + .4byte 0x00F802F9 + .4byte 0x00FB02FD + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EA0082 + .4byte 0x01801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80301 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EA0082 + .4byte 0x01801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80301 + .4byte 0x029F081E + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0301029F + .4byte 0x082A00C0 + .4byte 0x0CE10081 + .4byte 0x02EA0082 + .4byte 0x01801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80301 + .4byte 0x029F0836 + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0301029F + .4byte 0x084800C0 + .4byte 0x0CE10081 + .4byte 0x02EA0082 + .4byte 0x01800083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x030102DF + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80301 + .4byte 0x029F081E + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80301 + .4byte 0x029F082A + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80301 + .4byte 0x029F0836 + .4byte 0x00C00CE1 + .4byte 0x008102EA + .4byte 0x00820180 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80301 + .4byte 0x029F0848 + .4byte 0x00C00CE2 + .4byte 0x008102DE + .4byte 0x00820400 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FA02DF + .4byte 0x00C00CE3 + .4byte 0x008102E0 + .4byte 0x008204C0 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FE02DF + .4byte 0x00C00CE2 + .4byte 0x008102DE + .4byte 0x00820400 + .4byte 0x1C6200C4 + .4byte 0x0CE30085 + .4byte 0x04C002BF + .4byte 0x0BE900F8 + .4byte 0x02FA00FB + .4byte 0x02FE02DF + .4byte 0x00C00CE2 + .4byte 0x008102DE + .4byte 0x00820400 + .4byte 0x00830D08 + .4byte 0x00C40CE3 + .4byte 0x008504C0 + .4byte 0x02BF0C4F + .4byte 0x00F802FA + .4byte 0x00FB02FE + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EC0082 + .4byte 0x05801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80302 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EC0082 + .4byte 0x05801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80302 + .4byte 0x029F08E0 + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0302029F + .4byte 0x08EC00C0 + .4byte 0x0CE10081 + .4byte 0x02EC0082 + .4byte 0x05801C62 + .4byte 0x02BF0BCF + .4byte 0x00F80302 + .4byte 0x029F08F8 + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0302029F + .4byte 0x090A00C0 + .4byte 0x0CE10081 + .4byte 0x02EC0082 + .4byte 0x05800083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x030202DF + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80302 + .4byte 0x029F08E0 + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80302 + .4byte 0x029F08EC + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80302 + .4byte 0x029F08F8 + .4byte 0x00C00CE1 + .4byte 0x008102EC + .4byte 0x00820580 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80302 + .4byte 0x029F090A + .4byte 0x00C00CE2 + .4byte 0x008102E2 + .4byte 0x00820640 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FB02DF + .4byte 0x00C00CE3 + .4byte 0x008102E4 + .4byte 0x00820700 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FF02DF + .4byte 0x00C00CE2 + .4byte 0x008102E2 + .4byte 0x00820640 + .4byte 0x1C6200C4 + .4byte 0x0CE30085 + .4byte 0x070002BF + .4byte 0x0BE900F8 + .4byte 0x02FB00FB + .4byte 0x02FF02DF + .4byte 0x00C00CE2 + .4byte 0x008102E2 + .4byte 0x00820640 + .4byte 0x00830D08 + .4byte 0x00C40CE3 + .4byte 0x00850700 + .4byte 0x02BF0C4F + .4byte 0x00F802FB + .4byte 0x00FB02FF + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EE0082 + .4byte 0x07C01C62 + .4byte 0x02BF0BCF + .4byte 0x00F80303 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02EE0082 + .4byte 0x07C01C62 + .4byte 0x02BF0BCF + .4byte 0x00F80303 + .4byte 0x029F09A2 + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0303029F + .4byte 0x09AE00C0 + .4byte 0x0CE10081 + .4byte 0x02EE0082 + .4byte 0x07C01C62 + .4byte 0x02BF0BCF + .4byte 0x00F80303 + .4byte 0x029F09BA + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0303029F + .4byte 0x09CC00C0 + .4byte 0x0CE10081 + .4byte 0x02EE0082 + .4byte 0x07C00083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x030302DF + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80303 + .4byte 0x029F09A2 + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80303 + .4byte 0x029F09AE + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80303 + .4byte 0x029F09BA + .4byte 0x00C00CE1 + .4byte 0x008102EE + .4byte 0x008207C0 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80303 + .4byte 0x029F09CC + .4byte 0x00C00CE2 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FC02DF + .4byte 0x00C00CE3 + .4byte 0x008102E8 + .4byte 0x00820940 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x030002DF + .4byte 0x00C00CE2 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x1C6200C4 + .4byte 0x0CE30085 + .4byte 0x094002BF + .4byte 0x0BE900F8 + .4byte 0x02FC00FB + .4byte 0x030002DF + .4byte 0x00C00CE2 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x00830D08 + .4byte 0x00C40CE3 + .4byte 0x00850940 + .4byte 0x02BF0C4F + .4byte 0x00F802FC + .4byte 0x00FB0300 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A001C62 + .4byte 0x02BF0BCF + .4byte 0x00F80304 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A001C62 + .4byte 0x02BF0BCF + .4byte 0x00F80304 + .4byte 0x029F0A64 + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0304029F + .4byte 0x0A7000C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A001C62 + .4byte 0x02BF0BCF + .4byte 0x00F80304 + .4byte 0x029F0A7C + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0304029F + .4byte 0x0A8E00C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A000083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x030402DF + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80304 + .4byte 0x029F0A64 + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80304 + .4byte 0x029F0A70 + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80304 + .4byte 0x029F0A7C + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x00830D08 + .4byte 0x02BF0C1F + .4byte 0x00F80304 + .4byte 0x029F0A8E + .4byte 0x00C00CE1 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x02FC02DF + .4byte 0x00C00CE1 + .4byte 0x008102E8 + .4byte 0x00820940 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x030002DF + .4byte 0x00C00CE1 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x1C6200C4 + .4byte 0x0CE10085 + .4byte 0x094002BF + .4byte 0x0BE900F8 + .4byte 0x02FC00FB + .4byte 0x030002DF + .4byte 0x00C00CE1 + .4byte 0x008102E6 + .4byte 0x00820880 + .4byte 0x00830D08 + .4byte 0x00C40CE1 + .4byte 0x00850940 + .4byte 0x02BF0C4F + .4byte 0x00F802FC + .4byte 0x00FB0300 + .4byte 0x02DF00C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A001C62 + .4byte 0x02BF0BCF + .4byte 0x00F80304 + .4byte 0x029F0B26 + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0304029F + .4byte 0x0B3200C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A001C62 + .4byte 0x02BF0BCF + .4byte 0x00F80304 + .4byte 0x029F0B3E + .4byte 0x00C00CE1 + .4byte 0x008102F0 + .4byte 0x00820A00 + .4byte 0x1C6202BF + .4byte 0x0BCF00F8 + .4byte 0x0304029F + .4byte 0x0B5000C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A000083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x0304029F + .4byte 0x0B2600C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A000083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x0304029F + .4byte 0x0B3200C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A000083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x0304029F + .4byte 0x0B3E00C0 + .4byte 0x0CE10081 + .4byte 0x02F00082 + .4byte 0x0A000083 + .4byte 0x0D0802BF + .4byte 0x0C1F00F8 + .4byte 0x0304029F + .4byte 0x0B50191A + .4byte 0x1939B072 + .4byte 0x195CF07A + .4byte 0x191AB46A + .4byte 0x9100F1A0 + .4byte 0x112F0BE1 + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x1B7C6E00 + .4byte 0x4F129900 + .4byte 0x1B7F812B + .4byte 0x02DF191A + .4byte 0x1939B072 + .4byte 0x195CF07A + .4byte 0x191AB46A + .4byte 0x9100F1A0 + .4byte 0x112F0BFB + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x1B7C6E00 + .4byte 0x4F129909 + .4byte 0x1B7F1B7D + .4byte 0x1C041C45 + .4byte 0x1C62191A + .4byte 0x1939B072 + .4byte 0x195CF07A + .4byte 0x191AB46A + .4byte 0x9100F1A0 + .4byte 0x112F0C17 + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x1B7C6E00 + .4byte 0x4F1E9900 + .4byte 0x1B7F1B7D + .4byte 0x02DF1CE3 + .4byte 0x8E008100 + .4byte 0x897118BF + .4byte 0x1B7E4C00 + .4byte 0x1B7E112F + .4byte 0x0C2C4C00 + .4byte 0x1B7E4C00 + .4byte 0x1B7E4C00 + .4byte 0x1B3E1C27 + .4byte 0x1C628F50 + .4byte 0x1939B072 + .4byte 0x195CF07A + .4byte 0x191A1939 + .4byte 0xB46A9100 + .4byte 0xF1A01939 + .4byte 0x112F0C47 + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0x1939B42B + .4byte 0x917A195D + .4byte 0xF1A01939 + .4byte 0x1B7C6E00 + .4byte 0x4F129900 + .4byte 0x1B7F1B7D + .4byte 0x02DF1CE3 + .4byte 0x8E008100 + .4byte 0x897118BF + .4byte 0x1B7E4C00 + .4byte 0x1B7E112F + .4byte 0x0C5C4C00 + .4byte 0x1B7E4C00 + .4byte 0x1B7E4C00 + .4byte 0x1B3E0009 + .4byte 0x81008971 + .4byte 0x18BF1B7E + .4byte 0x4C001B7E + .4byte 0x112F0C6B + .4byte 0x4C001B7E + .4byte 0x4C001B7E + .4byte 0x4C001B3E + .4byte 0x1C271C62 + .4byte 0x8F501939 + .4byte 0xB072195C + .4byte 0xF07A191A + .4byte 0x1939B46A + .4byte 0x9100F1A0 + .4byte 0x1939112F + .4byte 0x0C86B523 + .4byte 0x9972195C + .4byte 0xF0A11939 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x19391B7C + .4byte 0x6E004F12 + .4byte 0x99051B7F + .4byte 0x1B7D1C04 + .4byte 0x1C451C62 + .4byte 0x191A1939 + .4byte 0xB072195C + .4byte 0xF07A191A + .4byte 0x1939B46A + .4byte 0x9100F1A0 + .4byte 0x1939112F + .4byte 0x0CA6B523 + .4byte 0x9972195C + .4byte 0xF0A11939 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x19391B7C + .4byte 0x6E004F1E + .4byte 0x99001B7F + .4byte 0x1B7D02DF + .4byte 0x00980000 + .4byte 0x02DF0080 + .4byte 0x0CC01C62 + .4byte 0x1939191A + .4byte 0xB000195E + .4byte 0x195CF050 + .4byte 0xB400917A + .4byte 0x195DF1A0 + .4byte 0x11080CC7 + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0xB42B917A + .4byte 0x195DF1A0 + .4byte 0x4F239900 + .4byte 0x1B7F6E2B + .4byte 0x1F1E02DF + .4byte 0x00800CC0 + .4byte 0x00830D08 + .4byte 0x1CE38E00 + .4byte 0x81008971 + .4byte 0x18BF1B7E + .4byte 0x4C001B7E + .4byte 0x11080CDF + .4byte 0x4C001B7E + .4byte 0x4C001B7E + .4byte 0x4C001B3E + .4byte 0x1C271C62 + .4byte 0x8F501939 + .4byte 0xB000195E + .4byte 0x195CF050 + .4byte 0x1939B400 + .4byte 0x917A195D + .4byte 0xF1A01939 + .4byte 0x11080CFB + .4byte 0xB5239972 + .4byte 0x195CF0A1 + .4byte 0x1939B42B + .4byte 0x917A195D + .4byte 0xF1A01939 + .4byte 0x4F239900 + .4byte 0x1B7F6E2B + .4byte 0x1F1E02DF + .4byte 0x008A0222 + .4byte 0x024F0E81 + .4byte 0x027E049B + .4byte 0x04B404CD + .4byte 0x0DBB0DDD + .4byte 0x057B0609 + .4byte 0x0EC4067A + .4byte 0x0670081D + .4byte 0x081E082A + .4byte 0x08360848 + .4byte 0x08480848 + .4byte 0x0848085B + .4byte 0x08670874 + .4byte 0x0881088E + .4byte 0x088E088E + .4byte 0x088E089B + .4byte 0x08A808B6 + .4byte 0x08C408D2 + .4byte 0x08D208D2 + .4byte 0x08D2089B + .4byte 0x08A808B6 + .4byte 0x08C408D2 + .4byte 0x08D208D2 + .4byte 0x08D2081D + .4byte 0x08E008EC + .4byte 0x08F8090A + .4byte 0x090A090A + .4byte 0x090A091D + .4byte 0x09290936 + .4byte 0x09430950 + .4byte 0x09500950 + .4byte 0x0950095D + .4byte 0x096A0978 + .4byte 0x09860994 + .4byte 0x09940994 + .4byte 0x0994095D + .4byte 0x096A0978 + .4byte 0x09860994 + .4byte 0x09940994 + .4byte 0x0994081D + .4byte 0x09A209AE + .4byte 0x09BA09CC + .4byte 0x09CC09CC + .4byte 0x09CC09DF + .4byte 0x09EB09F8 + .4byte 0x0A050A12 + .4byte 0x0A120A12 + .4byte 0x0A120A1F + .4byte 0x0A2C0A3A + .4byte 0x0A480A56 + .4byte 0x0A560A56 + .4byte 0x0A560A1F + .4byte 0x0A2C0A3A + .4byte 0x0A480A56 + .4byte 0x0A560A56 + .4byte 0x0A56081D + .4byte 0x0A640A70 + .4byte 0x0A7C0A8E + .4byte 0x0A8E0A8E + .4byte 0x0A8E0AA1 + .4byte 0x0AAD0ABA + .4byte 0x0AC70AD4 + .4byte 0x0AD40AD4 + .4byte 0x0AD40AE1 + .4byte 0x0AEE0AFC + .4byte 0x0B0A0B18 + .4byte 0x0B180B18 + .4byte 0x0B180AE1 + .4byte 0x0AEE0AFC + .4byte 0x0B0A0B18 + .4byte 0x0B180B18 + .4byte 0x0B18081D + .4byte 0x0B260B32 + .4byte 0x0B3E0B50 + .4byte 0x0B500B50 + .4byte 0x0B500AA1 + .4byte 0x0B630B70 + .4byte 0x0B7D0B8A + .4byte 0x0B8A0B8A + .4byte 0x0B8A0AE1 + .4byte 0x0B970BA5 + .4byte 0x0BB30BC1 + .4byte 0x0BC10BC1 + .4byte 0x0BC10AE1 + .4byte 0x0B970BA5 + .4byte 0x0BB30BC1 + .4byte 0x0BC10BC1 + .4byte 0x0BC10CAE + .4byte 0x0CB10CCE + .4byte 0x0CCE0718 + .4byte 0x076907BE + .4byte 0x10001200 + .4byte 0x14008E00 + .4byte 0x00C40CE6 + .4byte 0x190500E5 + .4byte 0x0CE60086 + .4byte 0x0400191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x040016C9 + .4byte 0x000116CB + .4byte 0x048002BF + .4byte 0x0084191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x094016C9 + .4byte 0x000116CB + .4byte 0x018002BF + .4byte 0x0084029F + .4byte 0x0DFF8E00 + .4byte 0x00C40CE7 + .4byte 0x190500E5 + .4byte 0x0CE70086 + .4byte 0x0640191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x064016C9 + .4byte 0x000116CB + .4byte 0x048002BF + .4byte 0x0084191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x0A0016C9 + .4byte 0x000116CB + .4byte 0x018002BF + .4byte 0x0084029F + .4byte 0x0DFF8B00 + .4byte 0x81008900 + .4byte 0x1FC41FE5 + .4byte 0x5D00009A + .4byte 0x02AB009B + .4byte 0x02AA0081 + .4byte 0x0D08D000 + .4byte 0xD400111F + .4byte 0x0E11DC31 + .4byte 0xD431D431 + .4byte 0xDC314E31 + .4byte 0x1B25191E + .4byte 0x191C2ECE + .4byte 0x2CCF00E6 + .4byte 0xFFCD16C9 + .4byte 0x000016CB + .4byte 0x01800081 + .4byte 0x00001C41 + .4byte 0x02BF0084 + .4byte 0x02BF0E55 + .4byte 0x191E191C + .4byte 0x2ECE2CCF + .4byte 0x00E6FFCD + .4byte 0x16C90000 + .4byte 0x16CB0180 + .4byte 0x02BF0084 + .4byte 0x02BF0E55 + .4byte 0x191E191C + .4byte 0x2ECE2CCF + .4byte 0x00E6FFCD + .4byte 0x16C90000 + .4byte 0x16CB0180 + .4byte 0x02BF0084 + .4byte 0x02BF0E55 + .4byte 0x191E191C + .4byte 0x2ECE2CCF + .4byte 0x00E6FFCD + .4byte 0x16C90000 + .4byte 0x16CB0180 + .4byte 0x00810880 + .4byte 0x1C4102BF + .4byte 0x008402BF + .4byte 0x0E55029F + .4byte 0x006F8F00 + .4byte 0x8D008A00 + .4byte 0x00E00CD2 + .4byte 0x00800D08 + .4byte 0x1C6680F1 + .4byte 0x80C0A000 + .4byte 0xAE009141 + .4byte 0x4E004800 + .4byte 0x112F0E73 + .4byte 0x80F180C0 + .4byte 0xA000AF00 + .4byte 0x99414F32 + .4byte 0x492280F1 + .4byte 0x80C0A000 + .4byte 0xAE009141 + .4byte 0x4E3A482A + .4byte 0x80F180C0 + .4byte 0xA000AF00 + .4byte 0x99414F32 + .4byte 0x49221B5F + .4byte 0x1B5D00C0 + .4byte 0x0CD28E00 + .4byte 0x02DF8E00 + .4byte 0x191F191D + .4byte 0x2FCE2DCF + .4byte 0x16CD0D08 + .4byte 0x16C90000 + .4byte 0x16CB0300 + .4byte 0x02BF0084 + .4byte 0x1C808F00 + .4byte 0x00800D08 + .4byte 0x00830000 + .4byte 0x1C4380F0 + .4byte 0x80C06A00 + .4byte 0x4800112F + .4byte 0x0EA280F0 + .4byte 0x80C06B32 + .4byte 0x492280F0 + .4byte 0x80C06A3A + .4byte 0x482A80F0 + .4byte 0x80C06B32 + .4byte 0x49221B5F + .4byte 0x1B5D80F0 + .4byte 0x80C06800 + .4byte 0x7C004A00 + .4byte 0x112F0EB9 + .4byte 0x80F080C0 + .4byte 0x69327D00 + .4byte 0x4B2280F0 + .4byte 0x80C0683A + .4byte 0x7C004A2A + .4byte 0x80F080C0 + .4byte 0x69327D00 + .4byte 0x4B221B5F + .4byte 0x1B5D1C04 + .4byte 0x029F006F + .4byte 0x8E488B78 + .4byte 0x816800E0 + .4byte 0x0CD22FCE + .4byte 0x2DCF16CD + .4byte 0x018016C9 + .4byte 0x000116CB + .4byte 0x018002BF + .4byte 0x00848100 + .4byte 0x009C0180 + .4byte 0x4D002FCE + .4byte 0x2DCF16CD + .4byte 0x088016C9 + .4byte 0x000116CB + .4byte 0x01808100 + .4byte 0x890000DE + .4byte 0x0CE51FF9 + .4byte 0x5D0000F9 + .4byte 0x0CE5009A + .4byte 0x02AB009B + .4byte 0x02AA0081 + .4byte 0x0D08D000 + .4byte 0xD400111F + .4byte 0x0EF3DC31 + .4byte 0xD431D431 + .4byte 0xDC314E31 + .4byte 0x1B3902BF + .4byte 0x00848F00 + .4byte 0x8D008A00 + .4byte 0x00800D08 + .4byte 0x00810400 + .4byte 0x00830000 + .4byte 0x008200C0 + .4byte 0x1918195B + .4byte 0x1959A000 + .4byte 0xAE009100 + .4byte 0x4E5BF04B + .4byte 0x115F0F17 + .4byte 0xA031AE00 + .4byte 0x91404E5A + .4byte 0xF04AA031 + .4byte 0xAE009100 + .4byte 0x4E5BF04B + .4byte 0xA031AE00 + .4byte 0x91004E00 + .4byte 0xF0001B3E + .4byte 0x8E0000C0 + .4byte 0x0CD2191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x040016C9 + .4byte 0x000116CB + .4byte 0x018002BF + .4byte 0x008416FC + .4byte 0xDCD116FD + .4byte 0x000416FB + .4byte 0x000126FC + .4byte 0x02A08000 + .4byte 0x029C0F33 + .4byte 0x029F006F + .4byte 0x8E001FCC + .4byte 0x1D9E16FC + .4byte 0xECC02EFD + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x0F4002FF + .4byte 0 + .4byte 0 + .4byte 0x02FF8E00 + .4byte 0x1DBC1DBE + .4byte 0x810000DE + .4byte 0x03070601 + .4byte 0x02950F57 + .4byte 0x0E0000FE + .4byte 0x02D81FCD + .4byte 0x1F8D02FF + .4byte 0 + .4byte 0 + .4byte 0x02FF8E00 + .4byte 0x1DBC1DBE + .4byte 0x810000DE + .4byte 0x03070601 + .4byte 0x02950F70 + .4byte 0x0E0000FE + .4byte 0x02D80082 + .4byte 0x0CE91FCD + .4byte 0x1F8D02FF + .4byte 0x00DE02D9 + .4byte 0x06010295 + .4byte 0x0F8100DE + .4byte 0x032A2EDA + .4byte 0x00DE032B + .4byte 0x2EDB00DE + .4byte 0x032C2EDC + .4byte 0x1FCD1F8D + .4byte 0x02FF00DE + .4byte 0x032A2EDA + .4byte 0x26DB2EDB + .4byte 0x26DC2EDC + .4byte 0x1FCD1F8D + .4byte 0x02FF0000 + .4byte 0 + .4byte 0x000002FF + .4byte 0 + .4byte 0 + .4byte 0x02FF0FA7 + .4byte 0x0FAA0FE2 + .4byte 0x0FE58E00 + .4byte 0x81008900 + .4byte 0x02BF0FE8 + .4byte 0x27FF009E + .4byte 0x0F954C00 + .4byte 0x1C7E0313 + .4byte 0x1C7F176F + .4byte 0x0021029F + .4byte 0x00370021 + .4byte 0x81008900 + .4byte 0x02BF0FE8 + .4byte 0x24FF02BF + .4byte 0x0FEE25FF + .4byte 0x02BF0FEE + .4byte 0x27FF2ECE + .4byte 0x2CCF16C9 + .4byte 0x00012FCD + .4byte 0x2DCB8100 + .4byte 0x890002BF + .4byte 0x0FE824FF + .4byte 0x1C9E1CBC + .4byte 0x02BF0FEE + .4byte 0x25FF02BF + .4byte 0x0FEE27FF + .4byte 0x1CDF1CFD + .4byte 0x810002BF + .4byte 0x0FE826FF + .4byte 0x1C1E8900 + .4byte 0x02BF0FEE + .4byte 0x20FF1F5F + .4byte 0x02BF0FE8 + .4byte 0x21FF02BF + .4byte 0x0FE823FF + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x0FDA029F + .4byte 0x80B50021 + .4byte 0x029F8000 + .4byte 0x0021029F + .4byte 0x004C0021 + .4byte 0x26FE02C0 + .4byte 0x8000029C + .4byte 0x0FE802DF + .4byte 0x27FE03C0 + .4byte 0x8000029C + .4byte 0x0FEE02DF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global axDspInitVector axDspInitVector: - .incbin "baserom.dol", 0x492A00, 0x2 + .byte 0x00, 0x10 .global axDspResumeVector axDspResumeVector: - .incbin "baserom.dol", 0x492A02, 0x2 + .byte 0x00, 0x37 .global axDspSlaveLength axDspSlaveLength: - .incbin "baserom.dol", 0x492A04, 0x4 + .4byte 0x20000000 diff --git a/asm/axfx/AXFXHooks.s b/asm/axfx/AXFXHooks.s index 02065b11..899b5afa 100644 --- a/asm/axfx/AXFXHooks.s +++ b/asm/axfx/AXFXHooks.s @@ -36,7 +36,7 @@ AXFXGetHooks: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXFXAlloc __AXFXAlloc: - .incbin "baserom.dol", 0x492A08, 0x4 + .4byte 0x80047040 ;# ptr .global __AXFXFree __AXFXFree: - .incbin "baserom.dol", 0x492A0C, 0x4 + .4byte 0x80047050 ;# ptr diff --git a/asm/axfx/AXFXReverbHi.s b/asm/axfx/AXFXReverbHi.s index 5300c098..db41510e 100644 --- a/asm/axfx/AXFXReverbHi.s +++ b/asm/axfx/AXFXReverbHi.s @@ -57,7 +57,7 @@ AXFXReverbHiCallback: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22209 $$22209: - .incbin "baserom.dol", 0x499208, 0x4 + .4byte 0 .global $$22210 $$22210: - .incbin "baserom.dol", 0x49920C, 0x4 + .4byte 0x3F800000 diff --git a/asm/axfx/AXFXReverbHiExp.s b/asm/axfx/AXFXReverbHiExp.s index 8aa1ae7e..46ea62ad 100644 --- a/asm/axfx/AXFXReverbHiExp.s +++ b/asm/axfx/AXFXReverbHiExp.s @@ -1006,42 +1006,149 @@ lbl_80047004: .section .data, "wa" # 0x80421040 - 0x80496700 .global __EarlySizeTable __EarlySizeTable: - .incbin "baserom.dol", 0x432120, 0x60 + .4byte 0x0000009D + .4byte 0x000001DF + .4byte 0x0000033D + .4byte 0x0000013D + .4byte 0x00000329 + .4byte 0x0000045D + .4byte 0x000001DF + .4byte 0x000003AD + .4byte 0x000005CF + .4byte 0x00000281 + .4byte 0x000004EB + .4byte 0x0000079D + .4byte 0x0000031D + .4byte 0x00000683 + .4byte 0x00000A13 + .4byte 0x000003C7 + .4byte 0x0000076D + .4byte 0x00000B57 + .4byte 0x00000463 + .4byte 0x00000883 + .4byte 0x00000D55 + .4byte 0x000004FF + .4byte 0x000009AD + .4byte 0x00000F31 .global __EarlyCoefTable __EarlyCoefTable: - .incbin "baserom.dol", 0x432180, 0x60 + .4byte 0x3ECCCCCD + .4byte 0xBF800000 + .4byte 0x3E99999A + .4byte 0x3F000000 + .4byte 0xBF733333 + .4byte 0x3E99999A + .4byte 0x3F19999A + .4byte 0xBF666666 + .4byte 0x3E99999A + .4byte 0x3F400000 + .4byte 0xBF59999A + .4byte 0x3E99999A + .4byte 0xBF666666 + .4byte 0x3F4CCCCD + .4byte 0x3E99999A + .4byte 0xBF800000 + .4byte 0x3F333333 + .4byte 0x3E99999A + .4byte 0xBF800000 + .4byte 0x3F333333 + .4byte 0x3E99999A + .4byte 0xBF800000 + .4byte 0x3F333333 + .4byte 0x3E99999A .global __FilterSizeTable __FilterSizeTable: - .incbin "baserom.dol", 0x4321E0, 0xE0 + .4byte 0x000006FD + .4byte 0x000007CF + .4byte 0x0000091D + .4byte 0x000001B1 + .4byte 0x00000095 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x00000095 + .4byte 0x00000125 + .4byte 0x000001C1 + .4byte 0x000000FB + .4byte 0x00000067 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x000003B3 + .4byte 0x00000551 + .4byte 0x000005FB + .4byte 0x000001B1 + .4byte 0x00000089 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x000004FF + .4byte 0x000005FB + .4byte 0x000007B5 + .4byte 0x000001FD + .4byte 0x00000095 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x000005FB + .4byte 0x00000737 + .4byte 0x000008F9 + .4byte 0x00000233 + .4byte 0x000000B3 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x0000071F + .4byte 0x00000935 + .4byte 0x00000A85 + .4byte 0x0000023B + .4byte 0x00000089 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 + .4byte 0x0000071F + .4byte 0x00000935 + .4byte 0x00000A85 + .4byte 0x0000023B + .4byte 0x000000B3 + .4byte 0x0000002F + .4byte 0x00000049 + .4byte 0x00000043 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23078 $$23078: - .incbin "baserom.dol", 0x499210, 0x4 + .4byte 0x46FA0000 .global $$23123 $$23123: - .incbin "baserom.dol", 0x499214, 0x4 + .4byte 0 .global $$23288 $$23288: - .incbin "baserom.dol", 0x499218, 0x4 + .4byte 0x3F800000 .global $$23289 $$23289: - .incbin "baserom.dol", 0x49921C, 0x4 + .4byte 0x3F19999A .global $$23290 $$23290: - .incbin "baserom.dol", 0x499220, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$23294 $$23294: - .incbin "baserom.dol", 0x499228, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$23484 $$23484: - .incbin "baserom.dol", 0x499230, 0x8 + .4byte 0xC0400000 + .4byte 0 .global $$23485 $$23485: - .incbin "baserom.dol", 0x499238, 0x8 + .4byte 0x40240000 + .4byte 0 .global $$23486 $$23486: - .incbin "baserom.dol", 0x499240, 0x8 + .asciz "?s33" + .balign 4 .global $$23489 $$23489: - .incbin "baserom.dol", 0x499248, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/base/PPCArch.s b/asm/base/PPCArch.s index 3554a29f..1c4b1011 100644 --- a/asm/base/PPCArch.s +++ b/asm/base/PPCArch.s @@ -208,4 +208,5 @@ lbl_8001A2AC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22249 $$22249: - .incbin "baserom.dol", 0x41DEA0, 0x38 + .asciz "H4A should not be cleared because of Broadway errata.\n" + .balign 4 diff --git a/asm/bte/bta_dm_act.s b/asm/bte/bta_dm_act.s index cee9aaae..cae6beba 100644 --- a/asm/bte/bta_dm_act.s +++ b/asm/bte/bta_dm_act.s @@ -2568,44 +2568,92 @@ lbl_8007A9C8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_service_id_to_uuid_lkup_tbl bta_service_id_to_uuid_lkup_tbl: - .incbin "baserom.dol", 0x403FA0, 0x30 + .4byte 0x12001101 + .4byte 0x11031111 + .4byte 0x11021108 + .4byte 0x111E1105 + .4byte 0x11061109 + .4byte 0x11101104 + .4byte 0x1118111B + .4byte 0x11151116 + .4byte 0x1117112D + .4byte 0x110B110E + .4byte 0x11241304 + .4byte 0x112F0000 .global bta_service_id_to_btm_srv_id_lkup_tbl bta_service_id_to_btm_srv_id_lkup_tbl: - .incbin "baserom.dol", 0x403FD0, 0x60 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x0000000B + .4byte 0x00000002 + .4byte 0x0000000C + .4byte 0x0000001D + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0x00000016 + .4byte 0x00000023 + .4byte 0x00000019 + .4byte 0x0000001B + .4byte 0x0000001A + .4byte 0x00000028 + .4byte 0x00000025 + .4byte 0x00000027 + .4byte 0x00000020 + .4byte 0x00000025 + .4byte 0x0000002C + .4byte 0 .global bta_security bta_security: - .incbin "baserom.dol", 0x404030, 0x18 + .4byte 0x80079BCC ;# ptr + .4byte 0x80079D54 ;# ptr + .4byte 0x80079E8C ;# ptr + .4byte 0x80079E84 ;# ptr + .4byte 0x80079F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22277 $$22277: - .incbin "baserom.dol", 0x436B58, 0x20 + .asciz " bta_dm_disable_timer_cback " + .balign 4 .global $$22402 $$22402: - .incbin "baserom.dol", 0x436B78, 0x20 + .asciz " bta_dm_search_timer_cback " + .balign 4 .global $$22488 $$22488: - .incbin "baserom.dol", 0x436B98, 0x40 + .asciz " bta_dm_pin_cback() -> Failed to start Remote Name Request " + .balign 4 .global $$22555 $$22555: - .incbin "baserom.dol", 0x436BD8, 0x14 + .asciz " timer stopped " + .balign 4 .global $$22586 $$22586: - .incbin "baserom.dol", 0x436BEC, 0x30 + .asciz "bta_dm_l2cap_server_compress_cback, BTA ID %d" + .balign 4 .global $$22689 $$22689: - .incbin "baserom.dol", 0x436C1C, 0x3C + .asciz "bta_dm_compress_cback open app_id %d, BTA id %d, state %d" + .balign 4 .global $$22690 $$22690: - .incbin "baserom.dol", 0x436C58, 0x40 + .asciz "bta_dm_compress_cback close app_id %d, BTA id %d, state %d" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21489 $$21489: - .incbin "baserom.dol", 0x499460, 0x2 + .byte 0x00, 0x01 .global lbl_8055E922 lbl_8055E922: - .incbin "baserom.dol", 0x499462, 0x6 + .byte 0x80, 0x01 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_dm_compress_srvcs diff --git a/asm/bte/bta_dm_api.s b/asm/bte/bta_dm_api.s index 0891d659..7c86cd39 100644 --- a/asm/bte/bta_dm_api.s +++ b/asm/bte/bta_dm_api.s @@ -334,7 +334,9 @@ lbl_8007AE40: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_dm_reg bta_dm_reg: - .incbin "baserom.dol", 0x499468, 0x8 + .4byte 0x8007AE50 ;# ptr + .4byte 0 .global bta_dm_search_reg bta_dm_search_reg: - .incbin "baserom.dol", 0x499470, 0x8 + .4byte 0x8007AEE8 ;# ptr + .4byte 0 diff --git a/asm/bte/bta_dm_cfg.s b/asm/bte/bta_dm_cfg.s index 07be5436..d14b2caa 100644 --- a/asm/bte/bta_dm_cfg.s +++ b/asm/bte/bta_dm_cfg.s @@ -3,36 +3,68 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_dm_cfg bta_dm_cfg: - .incbin "baserom.dol", 0x403F00, 0xC + .4byte 0x40020400 + .4byte 0x000F2000 + .4byte 0x13880000 .global bta_dm_rm_cfg bta_dm_rm_cfg: - .incbin "baserom.dol", 0x403F0C, 0xC + .4byte 0x0002010E + .4byte 0x01020E02 + .4byte 0x0212FF01 .global bta_dm_compress_cfg bta_dm_compress_cfg: - .incbin "baserom.dol", 0x403F18, 0x14 + .4byte 0x0005000A + .4byte 0xFF0108FF + .4byte 0x0106FF01 + .4byte 0x07FF0112 + .4byte 0xFF020000 .global bta_dm_pm_spec bta_dm_pm_spec: - .incbin "baserom.dol", 0x403F2C, 0x4C + .4byte 0x03000200 + .4byte 0x13880000 + .4byte 0x00001000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000200 + .4byte 0x13880000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000800 + .4byte 0x13880000 + .4byte 0 .global bta_dm_pm_md bta_dm_pm_md: - .incbin "baserom.dol", 0x403F78, 0x18 + .4byte 0x019000C8 + .4byte 0x00040004 + .4byte 0x02000320 + .4byte 0x01900000 + .4byte 0x00000300 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_dm_rm_cfg p_bta_dm_rm_cfg: - .incbin "baserom.dol", 0x492C90, 0x4 + .4byte 0x80407E0C .global p_bta_dm_compress_cfg p_bta_dm_compress_cfg: - .incbin "baserom.dol", 0x492C94, 0x4 + .4byte 0x80407E18 .global p_bta_dm_pm_cfg p_bta_dm_pm_cfg: - .incbin "baserom.dol", 0x492C98, 0x4 + .4byte 0x805643C0 .global p_bta_dm_pm_spec p_bta_dm_pm_spec: - .incbin "baserom.dol", 0x492C9C, 0x4 + .4byte 0x80407E2C .global p_bta_dm_pm_md p_bta_dm_pm_md: - .incbin "baserom.dol", 0x492CA0, 0x8 + .4byte 0x80407E78 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_dm_pm_cfg diff --git a/asm/bte/bta_dm_main.s b/asm/bte/bta_dm_main.s index 51cafe28..0689ea06 100644 --- a/asm/bte/bta_dm_main.s +++ b/asm/bte/bta_dm_main.s @@ -102,28 +102,94 @@ lbl_8007AF8C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_dm_action bta_dm_action: - .incbin "baserom.dol", 0x404048, 0x34 + .4byte 0x800786C4 ;# ptr + .4byte 0x800787D4 ;# ptr + .4byte 0x80078940 ;# ptr + .4byte 0x80078948 ;# ptr + .4byte 0x80078990 ;# ptr + .4byte 0x80078A00 ;# ptr + .4byte 0x80078A9C ;# ptr + .4byte 0x80079FD4 ;# ptr + .4byte 0x8007A174 ;# ptr + .4byte 0x8007B8A0 ;# ptr + .4byte 0x8007B9C0 ;# ptr + .4byte 0x8007A90C ;# ptr + .4byte 0x8007A994 ;# ptr .global bta_dm_st_table bta_dm_st_table: - .incbin "baserom.dol", 0x40407C, 0x2C + .4byte 0x000D0001 + .4byte 0x0D00020D + .4byte 0x00030D00 + .4byte 0x070D0008 + .4byte 0x0D00040D + .4byte 0x00050D00 + .4byte 0x060D0009 + .4byte 0x0D000A0D + .4byte 0x000B0D00 + .4byte 0x0C0D0000 + .4byte 0 .global bta_dm_search_action bta_dm_search_action: - .incbin "baserom.dol", 0x4040A8, 0x48 + .4byte 0x80078B70 ;# ptr + .4byte 0x80078BD0 ;# ptr + .4byte 0x80078C54 ;# ptr + .4byte 0x80078D68 ;# ptr + .4byte 0x80078F8C ;# ptr + .4byte 0x8007915C ;# ptr + .4byte 0x800793C4 ;# ptr + .4byte 0x80079500 ;# ptr + .4byte 0x800793DC ;# ptr + .4byte 0x8007942C ;# ptr + .4byte 0x80079544 ;# ptr + .4byte 0x8007958C ;# ptr + .4byte 0x800795D4 ;# ptr + .4byte 0x80079618 ;# ptr + .4byte 0x800796B8 ;# ptr + .4byte 0x8007965C ;# ptr + .4byte 0x800790F8 ;# ptr + .4byte 0x80079BC8 ;# ptr .global bta_dm_search_idle_st_table bta_dm_search_idle_st_table: - .incbin "baserom.dol", 0x4040F0, 0x1C + .4byte 0x0012010E + .4byte 0x12000212 + .4byte 0x03121200 + .4byte 0x12120012 + .4byte 0x12000712 + .4byte 0x00121200 + .4byte 0x12120000 .global bta_dm_search_search_active_st_table bta_dm_search_search_active_st_table: - .incbin "baserom.dol", 0x40410C, 0x1C + .4byte 0x12120101 + .4byte 0x12021212 + .4byte 0x01031201 + .4byte 0x04120111 + .4byte 0x12010512 + .4byte 0x01061200 + .4byte 0x09120100 .global bta_dm_search_search_cancelling_st_table bta_dm_search_search_cancelling_st_table: - .incbin "baserom.dol", 0x404128, 0x1C + .4byte 0x0A12020C + .4byte 0x0E020B12 + .4byte 0x020D1200 + .4byte 0x0F0D0012 + .4byte 0x12020F0D + .4byte 0x000D1200 + .4byte 0x0D120000 .global bta_dm_search_disc_active_st_table bta_dm_search_disc_active_st_table: - .incbin "baserom.dol", 0x404144, 0x1C + .4byte 0x1212030E + .4byte 0x12031212 + .4byte 0x03121203 + .4byte 0x10120311 + .4byte 0x12030512 + .4byte 0x03121200 + .4byte 0x08120300 .global bta_dm_search_st_tbl bta_dm_search_st_tbl: - .incbin "baserom.dol", 0x404160, 0x10 + .4byte 0x80407FF0 + .4byte 0x8040800C + .4byte 0x80408028 + .4byte 0x80408044 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_dm_search_cb diff --git a/asm/bte/bta_dm_pm.s b/asm/bte/bta_dm_pm.s index 308615c5..6eb29bb4 100644 --- a/asm/bte/bta_dm_pm.s +++ b/asm/bte/bta_dm_pm.s @@ -733,10 +733,13 @@ bta_dm_pm_timer: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2951 $$2951: - .incbin "baserom.dol", 0x436C98, 0x2C + .asciz "bta_dm_act no more connected service cbs" + .balign 4 .global $$21226 $$21226: - .incbin "baserom.dol", 0x436CC4, 0x24 + .asciz "bta_dm_act no more pm timers" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_dm_conn_srvcs diff --git a/asm/bte/bta_hh_act.s b/asm/bte/bta_hh_act.s index 9bbb249f..132ed072 100644 --- a/asm/bte/bta_hh_act.s +++ b/asm/bte/bta_hh_act.s @@ -1658,120 +1658,202 @@ lbl_8007D0F4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21516 $$21516: - .incbin "baserom.dol", 0x436CE8, 0x58 + .asciz "bta_hh_sdp_cback: p_cb: %d result 0x%02x, attr_mask 0x%02x" + .balign 4 .global $$21527 $$21527: - .incbin "baserom.dol", 0x436D40, 0x30 + .asciz "bta_hh_start_sdp:: skip SDP for known devices" + .balign 4 .global $$21528 $$21528: - .incbin "baserom.dol", 0x436D70, 0x50 + .asciz "bta_hh_start_sdp: HID_HostGetSDPRecord failed: Status 0x%2X" + .balign 4 .global $$21541 $$21541: - .incbin "baserom.dol", 0x436DC0, 0x20 + .asciz "bta_hh_sdp_cmpl: status 0x%2X" + .balign 4 .global $$21542 $$21542: - .incbin "baserom.dol", 0x436DE0, 0x4C + .asciz "bta_hh_sdp_cmpl: HID_HostOpenDev failed: Status 0x%2X" + .balign 4 .global $$21573 $$21573: - .incbin "baserom.dol", 0x436E2C, 0x28 + .asciz "bta_hh_open_act: Device[%d] connected" + .balign 4 .global $$21625 $$21625: - .incbin "baserom.dol", 0x436E54, 0x14 + .asciz "BTA_HH_GET_RPT_EVT" + .balign 4 .global $$21626 $$21626: - .incbin "baserom.dol", 0x436E68, 0x14 + .asciz "BTA_HH_SET_RPT_EVT" + .balign 4 .global $$21627 $$21627: - .incbin "baserom.dol", 0x436E7C, 0x18 + .asciz "BTA_HH_GET_PROTO_EVT" + .balign 4 .global $$21628 $$21628: - .incbin "baserom.dol", 0x436E94, 0x18 + .asciz "BTA_HH_SET_PROTO_EVT" + .balign 4 .global $$21629 $$21629: - .incbin "baserom.dol", 0x436EAC, 0x14 + .asciz "BTA_HH_GET_IDLE_EVT" .global $$21630 $$21630: - .incbin "baserom.dol", 0x436EC0, 0x18 + .asciz "BTA_HH_SET_IDLE_EVT" + .4byte 0 .global $$21631 $$21631: - .incbin "baserom.dol", 0x436ED8, 0x10 + .asciz "BTA_HH_OPEN_EVT" .global $$21632 $$21632: - .incbin "baserom.dol", 0x436EE8, 0x10 + .asciz "Unknown event" + .balign 4 .global $$21633 $$21633: - .incbin "baserom.dol", 0x436EF8, 0x2C + .asciz "HANDSHAKE received for: event = %s data= %d" .global $$21634 $$21634: - .incbin "baserom.dol", 0x436F24, 0x1C + .asciz "unknown transaction type" + .balign 4 .global $$21638 $$21638: - .incbin "baserom.dol", 0x436F40, 0x28 + .4byte 0x8007C5DC ;# ptr + .4byte 0x8007C5DC ;# ptr + .4byte 0x8007C570 ;# ptr + .4byte 0x8007C5DC ;# ptr + .4byte 0x8007C480 ;# ptr + .4byte 0x8007C500 ;# ptr + .4byte 0x8007C480 ;# ptr + .4byte 0x8007C500 ;# ptr + .4byte 0x8007C480 ;# ptr + .4byte 0x8007C500 ;# ptr .global $$21637 $$21637: - .incbin "baserom.dol", 0x436F68, 0x28 + .4byte 0x8007C448 ;# ptr + .4byte 0x8007C448 ;# ptr + .4byte 0x8007C440 ;# ptr + .4byte 0x8007C448 ;# ptr + .4byte 0x8007C410 ;# ptr + .4byte 0x8007C418 ;# ptr + .4byte 0x8007C420 ;# ptr + .4byte 0x8007C428 ;# ptr + .4byte 0x8007C430 ;# ptr + .4byte 0x8007C438 ;# ptr .global $$21673 $$21673: - .incbin "baserom.dol", 0x436F90, 0x24 + .asciz "Ctrl DATA received w4: event[%s]" + .balign 4 .global $$21674 $$21674: - .incbin "baserom.dol", 0x436FB4, 0x38 + .asciz "invalid transaction type for DATA payload: 4_evt[%s]" + .balign 4 .global $$21678 $$21678: - .incbin "baserom.dol", 0x436FEC, 0x28 + .4byte 0x8007C7A0 ;# ptr + .4byte 0x8007C7A0 ;# ptr + .4byte 0x8007C798 ;# ptr + .4byte 0x8007C7A0 ;# ptr + .4byte 0x8007C768 ;# ptr + .4byte 0x8007C770 ;# ptr + .4byte 0x8007C778 ;# ptr + .4byte 0x8007C780 ;# ptr + .4byte 0x8007C788 ;# ptr + .4byte 0x8007C790 ;# ptr .global $$21677 $$21677: - .incbin "baserom.dol", 0x437014, 0x2C + .4byte 0x8007C6BC ;# ptr + .4byte 0x8007C6BC ;# ptr + .4byte 0x8007C6B4 ;# ptr + .4byte 0x8007C6BC ;# ptr + .4byte 0x8007C684 ;# ptr + .4byte 0x8007C68C ;# ptr + .4byte 0x8007C694 ;# ptr + .4byte 0x8007C69C ;# ptr + .4byte 0x8007C6A4 ;# ptr + .4byte 0x8007C6AC ;# ptr + .4byte 0 .global $$21713 $$21713: - .incbin "baserom.dol", 0x437040, 0x10 + .asciz "invalid command" .global $$21760 $$21760: - .incbin "baserom.dol", 0x437050, 0x1C + .asciz "HID_HostWriteDev Error %d" + .balign 4 .global $$21761 $$21761: - .incbin "baserom.dol", 0x43706C, 0x28 + .asciz "bta_hh_write_dev_act:: cmd type = %d" + .balign 4 .global $$21792 $$21792: - .incbin "baserom.dol", 0x437094, 0x14 + .asciz "HID_HDEV_EVT_OPEN" + .balign 4 .global $$21793 $$21793: - .incbin "baserom.dol", 0x4370A8, 0x14 + .asciz "HID_HDEV_EVT_CLOSE" + .balign 4 .global $$21794 $$21794: - .incbin "baserom.dol", 0x4370BC, 0x18 + .asciz "HID_HDEV_EVT_RETRYING" + .balign 4 .global $$21795 $$21795: - .incbin "baserom.dol", 0x4370D4, 0x18 + .asciz "HID_HDEV_EVT_INTR_DATA" + .balign 4 .global $$21796 $$21796: - .incbin "baserom.dol", 0x4370EC, 0x18 + .asciz "HID_HDEV_EVT_INTR_DATC" + .balign 4 .global $$21797 $$21797: - .incbin "baserom.dol", 0x437104, 0x18 + .asciz "HID_HDEV_EVT_CTRL_DATA" + .balign 4 .global $$21798 $$21798: - .incbin "baserom.dol", 0x43711C, 0x18 + .asciz "HID_HDEV_EVT_CTRL_DATC" + .balign 4 .global $$21799 $$21799: - .incbin "baserom.dol", 0x437134, 0x18 + .asciz "HID_HDEV_EVT_HANDSHAKE" + .balign 4 .global $$21800 $$21800: - .incbin "baserom.dol", 0x43714C, 0x18 + .asciz "HID_HDEV_EVT_VC_UNPLUG" + .balign 4 .global $$21801 $$21801: - .incbin "baserom.dol", 0x437164, 0x14 + .asciz "Unknown HID event" + .balign 4 .global $$21802 $$21802: - .incbin "baserom.dol", 0x437178, 0x20 + .asciz "bta_hh_cback::HID_event [%s]" + .balign 4 .global $$21804 $$21804: - .incbin "baserom.dol", 0x437198, 0x24 + .4byte 0x8007CF58 ;# ptr + .4byte 0x8007CF60 ;# ptr + .4byte 0x8007D0C4 ;# ptr + .4byte 0x8007CF68 ;# ptr + .4byte 0x8007CF80 ;# ptr + .4byte 0x8007CF78 ;# ptr + .4byte 0x8007CF80 ;# ptr + .4byte 0x8007CF70 ;# ptr + .4byte 0x8007CF8C ;# ptr .global $$21803 $$21803: - .incbin "baserom.dol", 0x4371BC, 0x24 + .4byte 0x8007CEE0 ;# ptr + .4byte 0x8007CEE8 ;# ptr + .4byte 0x8007CEF0 ;# ptr + .4byte 0x8007CEF8 ;# ptr + .4byte 0x8007CF00 ;# ptr + .4byte 0x8007CF08 ;# ptr + .4byte 0x8007CF10 ;# ptr + .4byte 0x8007CF18 ;# ptr + .4byte 0x8007CF20 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21486 $$21486: - .incbin "baserom.dol", 0x492CD8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/bte/bta_hh_api.s b/asm/bte/bta_hh_api.s index eb43f4f4..535d8d99 100644 --- a/asm/bte/bta_hh_api.s +++ b/asm/bte/bta_hh_api.s @@ -281,9 +281,11 @@ lbl_8007D4D0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2863 $$2863: - .incbin "baserom.dol", 0x4371E0, 0x30 + .asciz "No resource to send HID host Connect request." + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_hh_reg bta_hh_reg: - .incbin "baserom.dol", 0x499478, 0x8 + .4byte 0x8007D838 ;# ptr + .4byte 0x8007D19C ;# ptr diff --git a/asm/bte/bta_hh_cfg.s b/asm/bte/bta_hh_cfg.s index 55423dff..b2d808bb 100644 --- a/asm/bte/bta_hh_cfg.s +++ b/asm/bte/bta_hh_cfg.s @@ -3,12 +3,17 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_hh_cfg bta_hh_cfg: - .incbin "baserom.dol", 0x403F90, 0x10 + .4byte 0x04000000 + .4byte 0x805568C8 + .4byte 0x04000000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_devt_list p_devt_list: - .incbin "baserom.dol", 0x492CA8, 0x8 + .4byte 0x20011002 + .4byte 0x01033102 .global p_bta_hh_cfg p_bta_hh_cfg: - .incbin "baserom.dol", 0x492CB0, 0x8 + .4byte 0x80407E90 + .4byte 0 diff --git a/asm/bte/bta_hh_main.s b/asm/bte/bta_hh_main.s index eec094e0..5c64a443 100644 --- a/asm/bte/bta_hh_main.s +++ b/asm/bte/bta_hh_main.s @@ -403,102 +403,166 @@ lbl_8007DA30: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_hh_action bta_hh_action: - .incbin "baserom.dol", 0x404170, 0x30 + .4byte 0x8007C118 ;# ptr + .4byte 0x8007C2A8 ;# ptr + .4byte 0x8007C818 ;# ptr + .4byte 0x8007C360 ;# ptr + .4byte 0x8007C620 ;# ptr + .4byte 0x8007C3B8 ;# ptr + .4byte 0x8007BE1C ;# ptr + .4byte 0x8007BFB0 ;# ptr + .4byte 0x8007CCB4 ;# ptr + .4byte 0x8007CA18 ;# ptr + .4byte 0x8007CA34 ;# ptr + .4byte 0x8007C180 ;# ptr .global bta_hh_st_idle bta_hh_st_idle: - .incbin "baserom.dol", 0x4041A0, 0x18 + .4byte 0x06020C01 + .4byte 0x01020201 + .4byte 0x0C010C01 + .4byte 0x0C010C01 + .4byte 0x0C010C01 + .4byte 0x0A010C01 .global bta_hh_st_w4_conn bta_hh_st_w4_conn: - .incbin "baserom.dol", 0x4041B8, 0x18 + .4byte 0x0C020C01 + .4byte 0x01020201 + .4byte 0x0C020C02 + .4byte 0x0C020702 + .4byte 0x0C020C02 + .4byte 0x0A010B03 .global bta_hh_st_connected bta_hh_st_connected: - .incbin "baserom.dol", 0x4041D0, 0x18 + .4byte 0x0C030003 + .4byte 0x01030201 + .4byte 0x03030403 + .4byte 0x05030C03 + .4byte 0x08030903 + .4byte 0x0A030C03 .global bta_hh_st_tbl bta_hh_st_tbl: - .incbin "baserom.dol", 0x4041E8, 0x10 + .4byte 0x804080A0 + .4byte 0x804080B8 + .4byte 0x804080D0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2811 $$2811: - .incbin "baserom.dol", 0x437210, 0x1C + .asciz "wrong device handle: [%d]" + .balign 4 .global $$2812 $$2812: - .incbin "baserom.dol", 0x43722C, 0x10 + .asciz "BTA_HH_NULL_ST" + .balign 4 .global $$2813 $$2813: - .incbin "baserom.dol", 0x43723C, 0x10 + .asciz "BTA_HH_IDLE_ST" + .balign 4 .global $$2814 $$2814: - .incbin "baserom.dol", 0x43724C, 0x14 + .asciz "BTA_HH_W4_CONN_ST" + .balign 4 .global $$2815 $$2815: - .incbin "baserom.dol", 0x437260, 0x10 + .asciz "BTA_HH_CONN_ST" + .balign 4 .global $$2816 $$2816: - .incbin "baserom.dol", 0x437270, 0x18 + .asciz "unknown HID Host state" + .balign 4 .global $$2817 $$2817: - .incbin "baserom.dol", 0x437288, 0x34 + .asciz "bta_hh_sm_execute: State 0x%02x [%s], Event [%s]" + .balign 4 .global $$2818 $$2818: - .incbin "baserom.dol", 0x4372BC, 0x30 + .asciz "HH State Change: [%s] -> [%s] after Event [%s]" + .balign 4 .global $$2840 $$2840: - .incbin "baserom.dol", 0x4372EC, 0x2C + .asciz "bta_hh_hdl_event:: handle = %d dev_cb[%d] " + .balign 4 .global $$2860 $$2860: - .incbin "baserom.dol", 0x437318, 0x18 + .asciz "BTA_HH_API_DISABLE_EVT" + .balign 4 .global $$2861 $$2861: - .incbin "baserom.dol", 0x437330, 0x18 + .asciz "BTA_HH_API_ENABLE_EVT" + .balign 4 .global $$2862 $$2862: - .incbin "baserom.dol", 0x437348, 0x14 + .asciz "BTA_HH_API_OPEN_EVT" .global $$2863 $$2863: - .incbin "baserom.dol", 0x43735C, 0x18 + .asciz "BTA_HH_API_CLOSE_EVT" + .balign 4 .global $$2864 $$2864: - .incbin "baserom.dol", 0x437374, 0x14 + .asciz "BTA_HH_INT_OPEN_EVT" .global $$2865 $$2865: - .incbin "baserom.dol", 0x437388, 0x18 + .asciz "BTA_HH_INT_CLOSE_EVT" + .balign 4 .global $$2866 $$2866: - .incbin "baserom.dol", 0x4373A0, 0x18 + .asciz "BTA_HH_INT_HANDSK_EVT" + .balign 4 .global $$2867 $$2867: - .incbin "baserom.dol", 0x4373B8, 0x14 + .asciz "BTA_HH_INT_DATA_EVT" .global $$2868 $$2868: - .incbin "baserom.dol", 0x4373CC, 0x18 + .asciz "BTA_HH_INT_CTRL_DATA" + .balign 4 .global $$2869 $$2869: - .incbin "baserom.dol", 0x4373E4, 0x1C + .asciz "BTA_HH_API_WRITE_DEV_EVT" + .balign 4 .global $$2870 $$2870: - .incbin "baserom.dol", 0x437400, 0x14 + .asciz "BTA_HH_SDP_CMPL_EVT" .global $$2871 $$2871: - .incbin "baserom.dol", 0x437414, 0x18 + .asciz "BTA_HH_DISC_CMPL_EVT" + .balign 4 .global $$2872 $$2872: - .incbin "baserom.dol", 0x43742C, 0x1C + .asciz "BTA_HH_API_MAINT_DEV_EVT" + .balign 4 .global $$2873 $$2873: - .incbin "baserom.dol", 0x437448, 0x18 + .asciz "BTA_HH_API_GET_DSCP_EVT" .global $$2874 $$2874: - .incbin "baserom.dol", 0x437460, 0x18 + .asciz "BTA_HH_OPEN_CMPL_EVT" + .balign 4 .global $$2875 $$2875: - .incbin "baserom.dol", 0x437478, 0x1C + .asciz "BTA_HH_API_GET_ACL_Q_EVT" + .balign 4 .global $$2876 $$2876: - .incbin "baserom.dol", 0x437494, 0x1C + .asciz "unknown HID Host event code" .global $$2877 $$2877: - .incbin "baserom.dol", 0x4374B0, 0x40 + .4byte 0x8007D9C0 ;# ptr + .4byte 0x8007D9C8 ;# ptr + .4byte 0x8007D9D0 ;# ptr + .4byte 0x8007D9D8 ;# ptr + .4byte 0x8007D9E8 ;# ptr + .4byte 0x8007D9F0 ;# ptr + .4byte 0x8007D9E0 ;# ptr + .4byte 0x8007DA00 ;# ptr + .4byte 0x8007D9F8 ;# ptr + .4byte 0x8007DA18 ;# ptr + .4byte 0x8007DA10 ;# ptr + .4byte 0x8007DA20 ;# ptr + .4byte 0x8007D9B8 ;# ptr + .4byte 0x8007D9B0 ;# ptr + .4byte 0x8007DA28 ;# ptr + .4byte 0x8007DA08 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_hh_cb diff --git a/asm/bte/bta_hh_utils.s b/asm/bte/bta_hh_utils.s index d25d22d9..eb5f0a44 100644 --- a/asm/bte/bta_hh_utils.s +++ b/asm/bte/bta_hh_utils.s @@ -274,49 +274,62 @@ lbl_8007DDC8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2865 $$2865: - .incbin "baserom.dol", 0x4374F0, 0x24 + .asciz "found kdev_cb[%d] hid_handle = %d " + .balign 4 .global $$2866 $$2866: - .incbin "baserom.dol", 0x437514, 0x34 + .asciz "in_use ? [%d] kdev[%d].hid_handle = %d state = [%d]" .global $$2867 $$2867: - .incbin "baserom.dol", 0x437548, 0x2C + .asciz "bta_hh_find_cb:: index = %d while max = %d" + .balign 4 .global $$2880 $$2880: - .incbin "baserom.dol", 0x437574, 0x14 + .asciz "subclass = 0x%2x" + .balign 4 .global $$2954 $$2954: - .incbin "baserom.dol", 0x437588, 0x40 + .asciz "bta_hh_parse_keybd_rpt: (report=%p, report_len=%d) called" + .balign 4 + .4byte 0 .global $$2955 $$2955: - .incbin "baserom.dol", 0x4375C8, 0x10 + .asciz "Alt key pressed" .global $$2956 $$2956: - .incbin "baserom.dol", 0x4375D8, 0x14 + .asciz "Alt key not pressed" .global $$2957 $$2957: - .incbin "baserom.dol", 0x4375EC, 0x14 + .asciz "this_char = %02x" + .balign 4 .global $$2958 $$2958: - .incbin "baserom.dol", 0x437600, 0x48 + .asciz "BTA_HhParseKeybdRpt: Cannot interpret scan code 0x%02x" .global $$2970 $$2970: - .incbin "baserom.dol", 0x437648, 0x5C + .asciz "bta_hh_parse_mice_rpt: bta_keybd_rpt_rcvd(report=%p, report_len=%d) called" .global $$2971 $$2971: - .incbin "baserom.dol", 0x4376A4, 0x14 + .asciz "mice button: 0x%2x" + .balign 4 .global $$2972 $$2972: - .incbin "baserom.dol", 0x4376B8, 0x1C + .asciz "mice move: x = %d y = %d" + .balign 4 .global $$2990 $$2990: - .incbin "baserom.dol", 0x4376D4, 0x3C + .asciz "bta_hh_trace_dev_db:: Device DB list********************" + .balign 4 .global $$2991 $$2991: - .incbin "baserom.dol", 0x437710, 0x24 + .asciz "kdev[%d] in_use[%d] handle[%d] " + .balign 4 .global $$2992 $$2992: - .incbin "baserom.dol", 0x437734, 0x3C + .asciz "\t\t\t attr_mask[%04x] state [%d] sub_class[%02x] index = %d" + .balign 4 .global $$2993 $$2993: - .incbin "baserom.dol", 0x437770, 0x40 + .asciz "*********************************************************" + .balign 4 + .4byte 0 diff --git a/asm/bte/bta_sys_cfg.s b/asm/bte/bta_sys_cfg.s index ae06e123..9aa0a2c1 100644 --- a/asm/bte/bta_sys_cfg.s +++ b/asm/bte/bta_sys_cfg.s @@ -3,9 +3,11 @@ .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_sys_cfg p_bta_sys_cfg: - .incbin "baserom.dol", 0x492CB8, 0x8 + .4byte 0x8055E918 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_sys_cfg bta_sys_cfg: - .incbin "baserom.dol", 0x499458, 0x8 + .4byte 0x00040201 + .4byte 0 diff --git a/asm/bte/bta_sys_main.s b/asm/bte/bta_sys_main.s index 771047d3..30ca4ae3 100644 --- a/asm/bte/bta_sys_main.s +++ b/asm/bte/bta_sys_main.s @@ -184,10 +184,12 @@ bta_sys_set_trace_level: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2587 $$2587: - .incbin "baserom.dol", 0x436B20, 0x14 + .asciz "BTA got event 0x%x" + .balign 4 .global $$2588 $$2588: - .incbin "baserom.dol", 0x436B34, 0x24 + .asciz "BTA got unregistered event id %d" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_sys_cb diff --git a/asm/bte/bte_logmsg.s b/asm/bte/bte_logmsg.s index 09a612eb..bb81f732 100644 --- a/asm/bte/bte_logmsg.s +++ b/asm/bte/bte_logmsg.s @@ -67,7 +67,8 @@ LogMsg_0: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22252 $$22252: - .incbin "baserom.dol", 0x492CC0, 0x8 + .4byte 0x25730A00 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2LogMsg__FUlPCce$$2tmp diff --git a/asm/bte/bte_main.s b/asm/bte/bte_main.s index 34ed7105..50b3dec7 100644 --- a/asm/bte/bte_main.s +++ b/asm/bte/bte_main.s @@ -113,7 +113,8 @@ lbl_80077AE0: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global bte_hcisu_h2_cfg bte_hcisu_h2_cfg: - .incbin "baserom.dol", 0x492CC8, 0x8 + .4byte 0x0A5C2101 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __BTUInterruptHandlerStack diff --git a/asm/bte/btm_acl.s b/asm/bte/btm_acl.s index 4d2cac82..22d4fc36 100644 --- a/asm/bte/btm_acl.s +++ b/asm/bte/btm_acl.s @@ -2159,58 +2159,75 @@ lbl_8007FB10: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22591 $$22591: - .incbin "baserom.dol", 0x4377B0, 0x40 + .asciz "Duplicate btm_acl_created: RemBdAddr: %02x%02x%02x%02x%02x%02x" + .balign 4 .global $$22592 $$22592: - .incbin "baserom.dol", 0x4377F0, 0x20 + .asciz "SetPacketType Mask -> 0x%04x" + .balign 4 .global $$22642 $$22642: - .incbin "baserom.dol", 0x437810, 0x5C + .asciz "Role change request declined since the previous request for this device is not completed " + .balign 4 .global $$22685 $$22685: - .incbin "baserom.dol", 0x43786C, 0x3C + .asciz "BTM_SetLinkPolicy switch not supported (settings: 0x%04x)" + .balign 4 .global $$22686 $$22686: - .incbin "baserom.dol", 0x4378A8, 0x38 + .asciz "BTM_SetLinkPolicy hold not supported (settings: 0x%04x)" .global $$22687 $$22687: - .incbin "baserom.dol", 0x4378E0, 0x40 + .asciz "BTM_SetLinkPolicy sniff not supported (settings: 0x%04x)" + .balign 4 + .4byte 0 .global $$22688 $$22688: - .incbin "baserom.dol", 0x437920, 0x38 + .asciz "BTM_SetLinkPolicy park not supported (settings: 0x%04x)" .global $$22701 $$22701: - .incbin "baserom.dol", 0x437958, 0x38 + .asciz "BTM_ReadLinkPolicy: RemBdAddr: %02x%02x%02x%02x%02x%02x" .global $$22800 $$22800: - .incbin "baserom.dol", 0x437990, 0x3C + .asciz "BTM_ReadClockOffset: RemBdAddr: %02x%02x%02x%02x%02x%02x" + .balign 4 .global $$22857 $$22857: - .incbin "baserom.dol", 0x4379CC, 0x38 + .asciz "Role Switch Event: new_role 0x%02x, HCI Status 0x%02x" + .balign 4 .global $$22938 $$22938: - .incbin "baserom.dol", 0x437A04, 0x30 + .asciz "BTM_SetQoS: BdAddr: %02x%02x%02x%02x%02x%02x" + .balign 4 .global $$22946 $$22946: - .incbin "baserom.dol", 0x437A34, 0x28 + .asciz "BTM: p_flow->delay_variation: 0x%02x" + .balign 4 .global $$22957 $$22957: - .incbin "baserom.dol", 0x437A5C, 0x34 + .asciz "BTM_ReadRSSI: RemBdAddr: %02x%02x%02x%02x%02x%02x" + .balign 4 .global $$22969 $$22969: - .incbin "baserom.dol", 0x437A90, 0x3C + .asciz "BTM_ReadLinkQuality: RemBdAddr: %02x%02x%02x%02x%02x%02x" + .balign 4 .global $$22982 $$22982: - .incbin "baserom.dol", 0x437ACC, 0x30 + .asciz "BTM RSSI Complete: rssi %d, hci status 0x%02x" + .balign 4 .global $$22994 $$22994: - .incbin "baserom.dol", 0x437AFC, 0x40 + .asciz "BTM Link Quality Complete: Link Quality %d, hci status 0x%02x" + .balign 4 .global $$23042 $$23042: - .incbin "baserom.dol", 0x437B3C, 0x30 + .asciz "btm BEFORE SCO setting to 1 slot; hci hdl 0x%x" + .balign 4 .global $$23043 $$23043: - .incbin "baserom.dol", 0x437B6C, 0x30 + .asciz "btm last SCO removed; unsniffing hci hdl 0x%x" + .balign 4 .global $$23044 $$23044: - .incbin "baserom.dol", 0x437B9C, 0x34 + .asciz "btm last SCO removed; hci hdl 0x%x, types 0x%02x" + .balign 4 diff --git a/asm/bte/btm_devctl.s b/asm/bte/btm_devctl.s index 691a1ab4..85834fdd 100644 --- a/asm/bte/btm_devctl.s +++ b/asm/bte/btm_devctl.s @@ -1860,51 +1860,65 @@ btm_report_device_status: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22107 $$22107: - .incbin "baserom.dol", 0x437BD0, 0x30 + .asciz "BTM_SetAfhChannels first: %d (%d) last: %d (%d)" .global $$22174 $$22174: - .incbin "baserom.dol", 0x437C00, 0x14 + .asciz "btm_reset_complete" + .balign 4 .global $$22250 $$22250: - .incbin "baserom.dol", 0x437C14, 0x2C + .asciz "Local supported ACL packet types: 0x%04x" + .balign 4 .global $$22251 $$22251: - .incbin "baserom.dol", 0x437C40, 0x2C + .asciz "Local supported SCO packet types: 0x%04x" + .balign 4 .global $$22316 $$22316: - .incbin "baserom.dol", 0x437C6C, 0x40 + .asciz "BTM: BTM_VendorSpecificCommand: Opcode: 0x%04X, ParamLen: %i." + .balign 4 .global $$22317 $$22317: - .incbin "baserom.dol", 0x437CAC, 0x44 + .asciz "BTM: Unable to send vendor specific command (controller is busy)." + .balign 4 .global $$22332 $$22332: - .incbin "baserom.dol", 0x437CF0, 0x40 + .asciz "BTM Event: Received a vendor specific event from controller" + .4byte 0 .global $$22337 $$22337: - .incbin "baserom.dol", 0x437D30, 0x28 + .asciz "BTM: BTM_WritePageTimeout: Timeout: %d." .global $$22341 $$22341: - .incbin "baserom.dol", 0x437D58, 0x30 + .asciz "BTM: BTM_WriteVoiceSettings: Settings: 0x%04x." + .balign 4 .global $$22351 $$22351: - .incbin "baserom.dol", 0x437D88, 0x18 + .asciz "BTM: BTM_EnableTestMode" .global $$22362 $$22362: - .incbin "baserom.dol", 0x437DA0, 0x2C + .asciz "BTM: BTM_ReadStoredLinkKey: Read_All: %s" + .balign 4 .global $$22372 $$22372: - .incbin "baserom.dol", 0x437DCC, 0x2C + .asciz "BTM: BTM_WriteStoredLinkKey: num_keys: %d" + .balign 4 .global $$22385 $$22385: - .incbin "baserom.dol", 0x437DF8, 0x38 + .asciz "BTM: BTM_DeleteStoredLinkKey: delete_all_flag: %s" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22067 $$22067: - .incbin "baserom.dol", 0x492CE0, 0x4 + .4byte 0x001F0000 .global $$22363 $$22363: - .incbin "baserom.dol", 0x492CE4, 0x8 + .asciz "TRUE" + .balign 4 .global $$22364 $$22364: - .incbin "baserom.dol", 0x492CEC, 0xC + .asciz "FALSE" + .balign 4 + .4byte 0 diff --git a/asm/bte/btm_inq.s b/asm/bte/btm_inq.s index 22200bb4..719bf888 100644 --- a/asm/bte/btm_inq.s +++ b/asm/bte/btm_inq.s @@ -1962,36 +1962,46 @@ btm_inq_rmt_name_failed: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22304 $$22304: - .incbin "baserom.dol", 0x437E30, 0x5C + .asciz "BTM_SetDiscoverability: mode %d [NonDisc-0, Lim-1, Gen-2], window 0x%04x, interval 0x%04x" + .balign 4 .global $$22377 $$22377: - .incbin "baserom.dol", 0x437E8C, 0x54 + .asciz "BTM_SetConnectability: mode %d [NonConn-0, Conn-1], window 0x%04x, interval 0x%04x" + .balign 4 .global $$22396 $$22396: - .incbin "baserom.dol", 0x437EE0, 0x1C + .asciz "BTM_CancelInquiry called" + .balign 4 .global $$22415 $$22415: - .incbin "baserom.dol", 0x437EFC, 0x38 + .asciz "BTM_StartInquiry: mode: %d, dur: %d, rsps: %d, flt: %d" + .balign 4 .global $$22426 $$22426: - .incbin "baserom.dol", 0x437F34, 0x40 + .asciz "BTM_ReadRemoteDeviceName: bd addr [%02x%02x%02x%02x%02x%02x]" + .balign 4 .global $$22433 $$22433: - .incbin "baserom.dol", 0x437F74, 0x20 + .asciz "BTM_CancelRemoteDeviceName()" + .balign 4 .global $$22457 $$22457: - .incbin "baserom.dol", 0x437F94, 0x34 + .asciz "BTM_InqDbRead: bd addr [%02x%02x%02x%02x%02x%02x]" + .balign 4 .global $$22602 $$22602: - .incbin "baserom.dol", 0x437FC8, 0x3C + .asciz "BTM Warning: Set Event Filter Failed (HCI returned 0x%x)" + .balign 4 .global $$22672 $$22672: - .incbin "baserom.dol", 0x438004, 0x3C + .asciz "BTM Inq Compl Callback: status 0x%02x, num results %d" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global general_inq_lap general_inq_lap: - .incbin "baserom.dol", 0x499480, 0x4 + .4byte 0x9E8B3300 .global limited_inq_lap limited_inq_lap: - .incbin "baserom.dol", 0x499484, 0x4 + .4byte 0x9E8B0000 diff --git a/asm/bte/btm_pm.s b/asm/bte/btm_pm.s index a1038f9b..46463cf2 100644 --- a/asm/bte/btm_pm.s +++ b/asm/bte/btm_pm.s @@ -921,17 +921,21 @@ lbl_80084418: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global btm_pm_md_comp_matrix btm_pm_md_comp_matrix: - .incbin "baserom.dol", 0x4041F8, 0x10 + .4byte 0x03020201 + .4byte 0x03010102 + .4byte 0x03000000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21775 $$21775: - .incbin "baserom.dol", 0x438040, 0x40 + .asciz "btm mode change AFTER unsniffing; hci hdl 0x%x, types 0x%02x" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global btm_pm_mode_off btm_pm_mode_off: - .incbin "baserom.dol", 0x499488, 0x4 + .4byte 0x00000100 .global btm_pm_mode_msk btm_pm_mode_msk: - .incbin "baserom.dol", 0x49948C, 0x4 + .4byte 0x40800100 diff --git a/asm/bte/btm_sco.s b/asm/bte/btm_sco.s index 0893ec65..d4f100b9 100644 --- a/asm/bte/btm_sco.s +++ b/asm/bte/btm_sco.s @@ -1044,45 +1044,60 @@ lbl_8008524C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global btm_esco_defaults btm_esco_defaults: - .incbin "baserom.dol", 0x404208, 0x10 + .4byte 0x00001F40 + .4byte 0x00001F40 + .4byte 0x000A0060 + .4byte 0x003F0100 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21903 $$21903: - .incbin "baserom.dol", 0x438080, 0x24 + .asciz "btm_esco_conn_rsp -> No Resources" + .balign 4 .global $$21911 $$21911: - .incbin "baserom.dol", 0x4380A4, 0x24 + .asciz "TCS accept SCO: Packet Types 0x%04x" .global $$21973 $$21973: - .incbin "baserom.dol", 0x4380C8, 0x44 + .asciz "BTM_CreateSco -> (e)SCO Link for ACL handle 0x%04x, Desired Type %d" .global $$21974 $$21974: - .incbin "baserom.dol", 0x43810C, 0x50 + .asciz " txbw 0x%x, rxbw 0x%x, lat 0x%x, voice 0x%x, retrans 0x%02x, pkt 0x%04x" + .balign 4 .global $$21995 $$21995: - .incbin "baserom.dol", 0x43815C, 0x50 + .asciz "btm_sco_chk_pend_unpark -> (e)SCO Link for ACL handle 0x%04x, Desired Type %d" + .balign 4 .global $$22023 $$22023: - .incbin "baserom.dol", 0x4381AC, 0x44 + .asciz "btm_sco_conn_req: No one wants this SCO connection; rejecting it" + .balign 4 .global $$22105 $$22105: - .incbin "baserom.dol", 0x4381F0, 0x1C + .asciz "BTM_SetEScoMode -> mode %d" + .balign 4 .global $$22106 $$22106: - .incbin "baserom.dol", 0x43820C, 0x34 + .asciz "BTM_SetEScoMode -> mode SCO (eSCO not supported)" + .balign 4 .global $$22107 $$22107: - .incbin "baserom.dol", 0x438240, 0x60 + .asciz " txbw 0x%08x, rxbw 0x%08x, max_lat 0x%04x, voice 0x%04x, pkt 0x%04x, rtx effort 0x%02x" + .balign 4 + .4byte 0 .global $$22120 $$22120: - .incbin "baserom.dol", 0x4382A0, 0x28 + .asciz "BTM_ReadEScoLinkParms -> sco_inx 0x%04x" .global $$22139 $$22139: - .incbin "baserom.dol", 0x4382C8, 0x44 + .asciz "BTM_ChangeEScoLinkParms -> SCO Link for handle 0x%04x, pkt 0x%04x" + .balign 4 .global $$22140 $$22140: - .incbin "baserom.dol", 0x43830C, 0x38 + .asciz "BTM_ChangeEScoLinkParms -> eSCO Link for handle 0x%04x" + .balign 4 .global $$22157 $$22157: - .incbin "baserom.dol", 0x438344, 0x3C + .asciz "btm_esco_proc_conn_chg -> handle 0x%04x, status 0x%02x" + .balign 4 + .4byte 0 diff --git a/asm/bte/btm_sec.s b/asm/bte/btm_sec.s index 931e7537..0505292f 100644 --- a/asm/bte/btm_sec.s +++ b/asm/bte/btm_sec.s @@ -3425,171 +3425,210 @@ lbl_8008821C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22854 $$22854: - .incbin "baserom.dol", 0x438380, 0x20 + .asciz "BTM_Sec: application registered" .global $$22894 $$22894: - .incbin "baserom.dol", 0x4383A0, 0x20 + .asciz "BTM_SetSecurityMode: mode:%d" + .balign 4 .global $$22895 $$22895: - .incbin "baserom.dol", 0x4383C0, 0x2C + .asciz "BTM_SetSecurityMode: Authen Enable -> FALSE" .global $$22896 $$22896: - .incbin "baserom.dol", 0x4383EC, 0x2C + .asciz "BTM_SetSecurityMode: Authen Enable -> TRUE" + .balign 4 .global $$22900 $$22900: - .incbin "baserom.dol", 0x438418, 0x48 + .asciz "BTM_SetPinType: pin type %d [variable-0, fixed-1], code %s, length %d" + .balign 4 .global $$22920 $$22920: - .incbin "baserom.dol", 0x438460, 0x48 + .asciz "BTM_SEC_REG[%d]: id %d, is_orig %d, psm 0x%04x, proto_id %d, chan_id %d" .global $$22921 $$22921: - .incbin "baserom.dol", 0x4384A8, 0x48 + .asciz " : sec: 0x%x, service name [%s] (up to %d chars saved)" + .balign 4 .global $$22922 $$22922: - .incbin "baserom.dol", 0x4384F0, 0x30 + .asciz "BTM_SEC_REG: Out of Service Records (%d)" + .balign 4 + .4byte 0 .global $$22972 $$22972: - .incbin "baserom.dol", 0x438520, 0x60 + .asciz "Security Manager: Attempting Authorization of Unknown Device Address [%02x%02x%02x%02x%02x%02x]" .global $$22973 $$22973: - .incbin "baserom.dol", 0x438580, 0x30 + .asciz "Security Manager: authorized status:%d State:%d" .global $$23010 $$23010: - .incbin "baserom.dol", 0x4385B0, 0x30 + .asciz "BTM_SecBond BDA: %02x:%02x:%02x:%02x:%02x:%02x" + .balign 4 .global $$23011 $$23011: - .incbin "baserom.dol", 0x4385E0, 0x20 + .asciz "BTM_SecBond: Illegal Pin len:%d" .global $$23012 $$23012: - .incbin "baserom.dol", 0x438600, 0x20 + .asciz "BTM_SecBond: no device block" + .balign 4 .global $$23013 $$23013: - .incbin "baserom.dol", 0x438620, 0x20 + .asciz "BTM_SecBond -> Already Paired" + .balign 4 .global $$23014 $$23014: - .incbin "baserom.dol", 0x438640, 0x24 + .asciz "BTM_SecBond: Authen Enable -> TRUE" + .balign 4 .global $$23015 $$23015: - .incbin "baserom.dol", 0x438664, 0x18 + .asciz "BTM_SecBond: no buffer" + .balign 4 .global $$23016 $$23016: - .incbin "baserom.dol", 0x43867C, 0x28 + .asciz "btm_restore_mode: Authen Enable -> %d" + .balign 4 .global $$23045 $$23045: - .incbin "baserom.dol", 0x4386A4, 0x34 + .asciz "Security Manager: BTM_SetEncryption not connected" + .balign 4 .global $$23046 $$23046: - .incbin "baserom.dol", 0x4386D8, 0x38 + .asciz "Security Manager: BTM_SetEncryption already encrypted" + .balign 4 .global $$23047 $$23047: - .incbin "baserom.dol", 0x438710, 0x30 + .asciz "Security Manager: BTM_SetEncryption busy" + .balign 4 + .4byte 0 .global $$23048 $$23048: - .incbin "baserom.dol", 0x438740, 0x50 + .asciz "Security Manager: BTM_SetEncryption Handle:%d State:%d Flags:0x%x Required:0x%x" .global $$23080 $$23080: - .incbin "baserom.dol", 0x438790, 0x38 + .asciz "Security Manager: l2cap_access_req PSM:%d no resources" + .balign 4 .global $$23081 $$23081: - .incbin "baserom.dol", 0x4387C8, 0x44 + .asciz "Security Manager: l2cap_access_req PSM:%d no application registerd" + .balign 4 .global $$23082 $$23082: - .incbin "baserom.dol", 0x43880C, 0x44 + .asciz "Security Manager: l2cap_access_req PSM:%d postponed for multiplexer" .global $$23083 $$23083: - .incbin "baserom.dol", 0x438850, 0x58 + .asciz "Security Manager: l2cap_access_req PSM:%d Handle:%d State:%d Flags:0x%x Required:0x%x" + .balign 4 .global $$23084 $$23084: - .incbin "baserom.dol", 0x4388A8, 0x30 + .asciz "Security Manager: trusted:0x%04x%04x Flags:0x%x" .global $$23105 $$23105: - .incbin "baserom.dol", 0x4388D8, 0x40 + .asciz "Security Manager: MX service not found PSM:%d Proto:%d SCN:%d" + .balign 4 .global $$23125 $$23125: - .incbin "baserom.dol", 0x438918, 0x3C + .asciz "Security Manager: connect request from not paired device" + .balign 4 .global $$23195 $$23195: - .incbin "baserom.dol", 0x438954, 0x38 + .asciz "Security Manager: rmt_name_complete status:%d State:%d" + .balign 4 .global $$23238 $$23238: - .incbin "baserom.dol", 0x43898C, 0x34 + .asciz "Security Manager: auth_complete status:%d State:%d" + .balign 4 .global $$23250 $$23250: - .incbin "baserom.dol", 0x4389C0, 0x30 + .asciz "Security Manager: mkey comp status:%d State:%d" + .balign 4 .global $$23268 $$23268: - .incbin "baserom.dol", 0x4389F0, 0x34 + .asciz "Security Manager: encrypt_change status:%d State:%d" .global $$23318 $$23318: - .incbin "baserom.dol", 0x438A24, 0x44 + .asciz "Security Manager: btm_sec_connected handle:%d status:%d enc_mode:%d" .global $$23358 $$23358: - .incbin "baserom.dol", 0x438A68, 0x44 + .asciz "btm_sec_link_key_notification() BDA: %02x:%02x:%02x:%02x:%02x:%02x" .global $$23359 $$23359: - .incbin "baserom.dol", 0x438AAC, 0x2C + .asciz " TYPE: %d" + .balign 4 .global $$23373 $$23373: - .incbin "baserom.dol", 0x438AD8, 0x40 + .asciz "btm_sec_link_key_request() BDA: %02x:%02x:%02x:%02x:%02x:%02x" + .balign 4 .global $$23377 $$23377: - .incbin "baserom.dol", 0x438B18, 0x24 + .asciz "btm_sec_pin_code_request_timeout()" + .balign 4 .global $$23404 $$23404: - .incbin "baserom.dol", 0x438B3C, 0x40 + .asciz "btm_sec_pin_code_request() BDA: %02x:%02x:%02x:%02x:%02x:%02x" + .balign 4 .global $$23405 $$23405: - .incbin "baserom.dol", 0x438B7C, 0x30 + .asciz "btm_sec_pin_code_request bonding sending reply" + .balign 4 .global $$23406 $$23406: - .incbin "baserom.dol", 0x438BAC, 0x30 + .asciz "btm_sec_pin_code_request: Authen Enable -> %d" + .balign 4 .global $$23407 $$23407: - .incbin "baserom.dol", 0x438BDC, 0x50 + .asciz "btm_sec_pin_code_request(): Pairing disabled:%d; PIN callback:%x, Dev Rec:%x!" + .balign 4 .global $$23485 $$23485: - .incbin "baserom.dol", 0x438C2C, 0x40 + .asciz "btm_sec_execute_procedure: Required:0x%x Flags:0x%x State:%d" + .balign 4 .global $$23486 $$23486: - .incbin "baserom.dol", 0x438C6C, 0x24 + .asciz "L2CAP - no LCB for L2CA_conn_req" + .balign 4 .global $$23487 $$23487: - .incbin "baserom.dol", 0x438C90, 0x24 + .asciz "Security Manager: Start get name" + .balign 4 .global $$23488 $$23488: - .incbin "baserom.dol", 0x438CB4, 0x28 + .asciz "Security Manager: Start authentication" + .balign 4 .global $$23489 $$23489: - .incbin "baserom.dol", 0x438CDC, 0x24 + .asciz "Security Manager: Start encryption" + .balign 4 .global $$23490 $$23490: - .incbin "baserom.dol", 0x438D00, 0x28 + .asciz "Security Manager: Start authorization" + .balign 4 .global $$23491 $$23491: - .incbin "baserom.dol", 0x438D28, 0x28 + .asciz "Security Manager: trusted:0x%04x%04x" + .balign 4 .global $$23492 $$23492: - .incbin "baserom.dol", 0x438D50, 0x24 + .asciz "Security Manager: access granted" + .balign 4 .global $$23519 $$23519: - .incbin "baserom.dol", 0x438D74, 0x1C + .asciz "btm_sec_collision_timeout()" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21779 $$21779: - .incbin "baserom.dol", 0x499490, 0x1 + .byte 0xFF .global lbl_8055E951 lbl_8055E951: - .incbin "baserom.dol", 0x499491, 0x1 + .byte 0xFF .global lbl_8055E952 lbl_8055E952: - .incbin "baserom.dol", 0x499492, 0x1 + .byte 0xFF .global lbl_8055E953 lbl_8055E953: - .incbin "baserom.dol", 0x499493, 0x1 + .byte 0xFF .global lbl_8055E954 lbl_8055E954: - .incbin "baserom.dol", 0x499494, 0x1 + .byte 0xFF .global lbl_8055E955 lbl_8055E955: - .incbin "baserom.dol", 0x499495, 0x3 + .byte 0xFF, 0x00, 0x00 diff --git a/asm/bte/btu_hcif.s b/asm/bte/btu_hcif.s index ba4e2e53..97884bbb 100644 --- a/asm/bte/btu_hcif.s +++ b/asm/bte/btu_hcif.s @@ -1323,13 +1323,17 @@ btu_hcif_link_key_notification_evt: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22212 $$22212: - .incbin "baserom.dol", 0x438D90, 0x18 + .asciz "Ctlr H/w error event" + .balign 4 .global $$22352 $$22352: - .incbin "baserom.dol", 0x438DA8, 0x28 + .asciz "Event mismatch opcode=%X cmd opcode=%X" + .balign 4 .global $$22368 $$22368: - .incbin "baserom.dol", 0x438DD0, 0x20 + .asciz "Cmd timeout; no cmd in queue" + .balign 4 .global $$22369 $$22369: - .incbin "baserom.dol", 0x438DF0, 0x30 + .asciz "BTU HCI command timeout - cmd opcode = 0x%02x" + .balign 4 diff --git a/asm/bte/btu_init.s b/asm/bte/btu_init.s index 56de2ce6..3782b1ad 100644 --- a/asm/bte/btu_init.s +++ b/asm/bte/btu_init.s @@ -40,4 +40,5 @@ BTE_Init: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global BT_BD_ANY BT_BD_ANY: - .incbin "baserom.dol", 0x499498, 0x8 + .4byte 0xFFFFFFFF + .4byte 0xFFFF0000 diff --git a/asm/bte/btu_task1.s b/asm/bte/btu_task1.s index 50276774..2a5f4b9a 100644 --- a/asm/bte/btu_task1.s +++ b/asm/bte/btu_task1.s @@ -333,10 +333,10 @@ btu_stop_timer: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global btu_count btu_count: - .incbin "baserom.dol", 0x492CD0, 0x4 + .4byte 0x01000000 .global execute_btu execute_btu: - .incbin "baserom.dol", 0x492CD4, 0x4 + .4byte 0x00000001 .section .bss, "wa" # 0x80496700 - 0x805643FC .global btu_cb diff --git a/asm/bte/gap_conn.s b/asm/bte/gap_conn.s index aeabe0fe..e3a8c1c8 100644 --- a/asm/bte/gap_conn.s +++ b/asm/bte/gap_conn.s @@ -830,18 +830,22 @@ lbl_8008A164: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21709 $$21709: - .incbin "baserom.dol", 0x438E20, 0x44 + .asciz "WARNING: GAP Conn Indication for Unexpected Bd Addr...Disconnecting" .global $$21710 $$21710: - .incbin "baserom.dol", 0x438E64, 0x2C + .asciz "GAP_CONN - Rcvd L2CAP conn ind, CID: 0x%x" + .balign 4 .global $$21777 $$21777: - .incbin "baserom.dol", 0x438E90, 0x28 + .asciz "GAP_CONN - Rcvd L2CAP disc, CID: 0x%x" + .balign 4 .global $$21798 $$21798: - .incbin "baserom.dol", 0x438EB8, 0x38 + .asciz "GAP_CONN - Rcvd L2CAP Is Congested (%d), CID: 0x%x" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21708 $$21708: - .incbin "baserom.dol", 0x492CF8, 0x8 + .asciz "*******" diff --git a/asm/bte/gap_utils.s b/asm/bte/gap_utils.s index f17a368d..50fbeb7d 100644 --- a/asm/bte/gap_utils.s +++ b/asm/bte/gap_utils.s @@ -446,49 +446,102 @@ lbl_8008A790: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2882 $$2882: - .incbin "baserom.dol", 0x438EF0, 0x3C + .asciz " GAP Inquiry Complete Event (Status 0x%04x, Result(s) %d)" .global $$2883 $$2883: - .incbin "baserom.dol", 0x438F2C, 0x34 + .asciz " GAP Discovery Complete Event(SDP Result: 0x%04x)" .global $$2884 $$2884: - .incbin "baserom.dol", 0x438F60, 0x28 + .asciz " GAP Discovery Successfully Completed" .global $$2885 $$2885: - .incbin "baserom.dol", 0x438F88, 0x34 + .asciz " GAP Remote Name Complete Event (status 0x%04x)" + .balign 4 .global $$2887 $$2887: - .incbin "baserom.dol", 0x438FBC, 0x24 + .4byte 0x8008A2A8 ;# ptr + .4byte 0x8008A2B0 ;# ptr + .4byte 0x8008A2B8 ;# ptr + .4byte 0x8008A2E0 ;# ptr + .4byte 0x8008A2C0 ;# ptr + .4byte 0x8008A2C0 ;# ptr + .4byte 0x8008A2C8 ;# ptr + .4byte 0x8008A2D0 ;# ptr + .4byte 0x8008A2D8 ;# ptr .global $$2905 $$2905: - .incbin "baserom.dol", 0x438FE0, 0x44 + .asciz "GAP Inquiry Results Callback (bdaddr [%02x%02x%02x%02x%02x%02x])" + .balign 4 .global $$2906 $$2906: - .incbin "baserom.dol", 0x439024, 0x44 + .asciz " (COD [%02x%02x%02x], clkoff 0x%04x)" + .balign 4 .global $$2942 $$2942: - .incbin "baserom.dol", 0x439068, 0x44 + .asciz " GAP: FindAddrByName Rem Name Cmpl Evt (Status 0x%04x, Name [%s])" .global $$2943 $$2943: - .incbin "baserom.dol", 0x4390AC, 0x3C + .asciz " GAP: FindAddrByName Rem Name Cmpl Evt (Status 0x%04x)" + .balign 4 .global $$2946 $$2946: - .incbin "baserom.dol", 0x4390E8, 0x24 + .4byte 0x8008A500 ;# ptr + .4byte 0x8008A508 ;# ptr + .4byte 0x8008A510 ;# ptr + .4byte 0x8008A538 ;# ptr + .4byte 0x8008A518 ;# ptr + .4byte 0x8008A518 ;# ptr + .4byte 0x8008A520 ;# ptr + .4byte 0x8008A528 ;# ptr + .4byte 0x8008A530 ;# ptr .global $$2945 $$2945: - .incbin "baserom.dol", 0x43910C, 0x24 + .4byte 0x8008A468 ;# ptr + .4byte 0x8008A470 ;# ptr + .4byte 0x8008A478 ;# ptr + .4byte 0x8008A4A0 ;# ptr + .4byte 0x8008A480 ;# ptr + .4byte 0x8008A480 ;# ptr + .4byte 0x8008A488 ;# ptr + .4byte 0x8008A490 ;# ptr + .4byte 0x8008A498 ;# ptr .global $$2979 $$2979: - .incbin "baserom.dol", 0x439130, 0x44 + .asciz " GAP: FindAddrByName Inq Cmpl Evt (Status 0x%04x, Result(s) %d)" + .balign 4 .global $$2982 $$2982: - .incbin "baserom.dol", 0x439174, 0x24 + .4byte 0x8008A6B4 ;# ptr + .4byte 0x8008A6BC ;# ptr + .4byte 0x8008A6C4 ;# ptr + .4byte 0x8008A6EC ;# ptr + .4byte 0x8008A6CC ;# ptr + .4byte 0x8008A6CC ;# ptr + .4byte 0x8008A6D4 ;# ptr + .4byte 0x8008A6DC ;# ptr + .4byte 0x8008A6E4 ;# ptr .global $$2981 $$2981: - .incbin "baserom.dol", 0x439198, 0x24 + .4byte 0x8008A644 ;# ptr + .4byte 0x8008A64C ;# ptr + .4byte 0x8008A654 ;# ptr + .4byte 0x8008A67C ;# ptr + .4byte 0x8008A65C ;# ptr + .4byte 0x8008A65C ;# ptr + .4byte 0x8008A664 ;# ptr + .4byte 0x8008A66C ;# ptr + .4byte 0x8008A674 ;# ptr .global $$21009 $$21009: - .incbin "baserom.dol", 0x4391BC, 0x24 + .4byte 0x8008A758 ;# ptr + .4byte 0x8008A760 ;# ptr + .4byte 0x8008A768 ;# ptr + .4byte 0x8008A790 ;# ptr + .4byte 0x8008A770 ;# ptr + .4byte 0x8008A770 ;# ptr + .4byte 0x8008A778 ;# ptr + .4byte 0x8008A780 ;# ptr + .4byte 0x8008A788 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global gap_cb diff --git a/asm/bte/gki_buffer.s b/asm/bte/gki_buffer.s index 4457c84d..723ed29e 100644 --- a/asm/bte/gki_buffer.s +++ b/asm/bte/gki_buffer.s @@ -1492,40 +1492,50 @@ lbl_80075C10: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2749 $$2749: - .incbin "baserom.dol", 0x436968, 0x18 + .asciz "getbuf: Size is zero" + .balign 4 .global $$2750 $$2750: - .incbin "baserom.dol", 0x436980, 0x18 + .asciz "getbuf: Size is too big" .global $$2783 $$2783: - .incbin "baserom.dol", 0x436998, 0x18 + .asciz "Free - Buf Corrupted" + .balign 4 .global $$2784 $$2784: - .incbin "baserom.dol", 0x4369B0, 0x14 + .asciz "Freeing Linked Buf" + .balign 4 .global $$2785 $$2785: - .incbin "baserom.dol", 0x4369C4, 0xC + .asciz "Bad Buf QId" .global $$2831 $$2831: - .incbin "baserom.dol", 0x4369D0, 0x18 + .asciz "Sending to unknown dest" .global $$2832 $$2832: - .incbin "baserom.dol", 0x4369E8, 0x18 + .asciz "Send - Buffer corrupted" .global $$2833 $$2833: - .incbin "baserom.dol", 0x436A00, 0x18 + .asciz "Send - buffer linked" + .balign 4 .global $$2880 $$2880: - .incbin "baserom.dol", 0x436A18, 0x1C + .asciz "Enqueue - Buffer corrupted" + .balign 4 .global $$2881 $$2881: - .incbin "baserom.dol", 0x436A34, 0x20 + .asciz "Eneueue - buf already linked" + .balign 4 .global $$2901 $$2901: - .incbin "baserom.dol", 0x436A54, 0x24 + .asciz "Eneueue head - buf already linked" + .balign 4 .global $$2955 $$2955: - .incbin "baserom.dol", 0x436A78, 0x20 + .asciz "GKI_get_buf_start:: bad addr" + .balign 4 .global $$21054 $$21054: - .incbin "baserom.dol", 0x436A98, 0x18 + .asciz "Deleting bad pool" + .balign 4 + .4byte 0 diff --git a/asm/bte/hcicmds.s b/asm/bte/hcicmds.s index 46e89c03..db7e1f3d 100644 --- a/asm/bte/hcicmds.s +++ b/asm/bte/hcicmds.s @@ -2805,4 +2805,7 @@ lbl_8008CEB0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21618 $$21618: - .incbin "baserom.dol", 0x404218, 0x10 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFF7F0000 + .4byte 0 diff --git a/asm/bte/hcisu_h2.s b/asm/bte/hcisu_h2.s index 51e618a7..00701ec0 100644 --- a/asm/bte/hcisu_h2.s +++ b/asm/bte/hcisu_h2.s @@ -492,23 +492,33 @@ hcisu_h2_handle_event: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global hcisu_h2 hcisu_h2: - .incbin "baserom.dol", 0x403EE8, 0x18 + .4byte 0x800769E0 ;# ptr + .4byte 0x80076A10 ;# ptr + .4byte 0x80076A80 ;# ptr + .4byte 0x80076AC0 ;# ptr + .4byte 0x80076AF0 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2530 $$2530: - .incbin "baserom.dol", 0x436AB0, 0x3C + .asciz "HCIS: Unable to allocate buffer for incoming HCI message." + .balign 4 .global $$2531 $$2531: - .incbin "baserom.dol", 0x436AEC, 0x34 + .asciz "HCIS: Invalid length for incoming HCI message." + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global hcisu_preamble_table hcisu_preamble_table: - .incbin "baserom.dol", 0x499448, 0x8 + .4byte 0x03040302 + .4byte 0 .global hcisu_msg_evt_table hcisu_msg_evt_table: - .incbin "baserom.dol", 0x499450, 0x8 + .4byte 0x13001100 + .4byte 0x12001000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global hcisu_h2_cb diff --git a/asm/bte/hidd_conn.s b/asm/bte/hidd_conn.s index 648fd831..2bff0198 100644 --- a/asm/bte/hidd_conn.s +++ b/asm/bte/hidd_conn.s @@ -59,7 +59,8 @@ lbl_8008CFC0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21275 $$21275: - .incbin "baserom.dol", 0x4391E0, 0x18 + .asciz "HID - Originate started" .global $$21276 $$21276: - .incbin "baserom.dol", 0x4391F8, 0x18 + .asciz "HID - Originate failed" + .balign 4 diff --git a/asm/bte/hidd_mgmt.s b/asm/bte/hidd_mgmt.s index 0dbb097d..68daab24 100644 --- a/asm/bte/hidd_mgmt.s +++ b/asm/bte/hidd_mgmt.s @@ -61,7 +61,9 @@ lbl_8008D090: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2651 $$2651: - .incbin "baserom.dol", 0x439210, 0x20 + .asciz "hidd_proc_repage_timeout" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global hd_cb diff --git a/asm/bte/hidh_api.s b/asm/bte/hidh_api.s index 1d530967..810f3982 100644 --- a/asm/bte/hidh_api.s +++ b/asm/bte/hidh_api.s @@ -983,31 +983,40 @@ lbl_8008E184: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21051 $$21051: - .incbin "baserom.dol", 0x439230, 0x18 + .asciz "HID_ERR_NOT_REGISTERED" + .balign 4 .global $$21052 $$21052: - .incbin "baserom.dol", 0x439248, 0x18 + .asciz "HID_ERR_INVALID_PARAM" + .balign 4 .global $$21053 $$21053: - .incbin "baserom.dol", 0x439260, 0x24 + .asciz "HID_ERR_NO_CONNECTION dev_handle %d" .global $$21083 $$21083: - .incbin "baserom.dol", 0x439284, 0x20 + .asciz "Security Registration 1 failed" + .balign 4 .global $$21084 $$21084: - .incbin "baserom.dol", 0x4392A4, 0x20 + .asciz "Security Registration 2 failed" + .balign 4 .global $$21085 $$21085: - .incbin "baserom.dol", 0x4392C4, 0x20 + .asciz "Security Registration 3 failed" + .balign 4 .global $$21086 $$21086: - .incbin "baserom.dol", 0x4392E4, 0x20 + .asciz "Security Registration 4 failed" + .balign 4 .global $$21087 $$21087: - .incbin "baserom.dol", 0x439304, 0x20 + .asciz "Security Registration 5 failed" + .balign 4 .global $$21088 $$21088: - .incbin "baserom.dol", 0x439324, 0x24 + .asciz "Security Registration 6 failed" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global hh_cb diff --git a/asm/bte/hidh_conn.s b/asm/bte/hidh_conn.s index ce011fc4..1abcac11 100644 --- a/asm/bte/hidh_conn.s +++ b/asm/bte/hidh_conn.s @@ -2311,75 +2311,102 @@ hidh_conn_dereg: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global hst_reg_info hst_reg_info: - .incbin "baserom.dol", 0x404228, 0x28 + .4byte 0x8008E4CC ;# ptr + .4byte 0x8008EA84 ;# ptr + .4byte 0 + .4byte 0x8008EDCC ;# ptr + .4byte 0x8008F074 ;# ptr + .4byte 0x8008F380 ;# ptr + .4byte 0x8008F644 ;# ptr + .4byte 0 + .4byte 0x8008FA84 ;# ptr + .4byte 0x8008F88C ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21580 $$21580: - .incbin "baserom.dol", 0x439348, 0x20 + .asciz "HID Control Registration failed" .global $$21581 $$21581: - .incbin "baserom.dol", 0x439368, 0x24 + .asciz "HID Interrupt Registration failed" + .balign 4 .global $$21592 $$21592: - .incbin "baserom.dol", 0x43938C, 0x14 + .asciz "HID - disconnect" + .balign 4 .global $$21638 $$21638: - .incbin "baserom.dol", 0x4393A0, 0x34 + .asciz "HID - Rcvd L2CAP conn ind, PSM: 0x%04x CID 0x%x" + .balign 4 .global $$21639 $$21639: - .incbin "baserom.dol", 0x4393D4, 0x34 + .asciz "HID - Rcvd INTR L2CAP conn ind, but no CTL channel" + .balign 4 .global $$21640 $$21640: - .incbin "baserom.dol", 0x439408, 0x30 + .asciz "HID - Rcvd INTR L2CAP conn ind, wrong state: %d" .global $$21641 $$21641: - .incbin "baserom.dol", 0x439438, 0x30 + .asciz "HID - Rcvd CTL L2CAP conn ind, wrong state: %d" + .balign 4 .global $$21642 $$21642: - .incbin "baserom.dol", 0x439468, 0x44 + .asciz "HID - Rcvd L2CAP conn ind, sent config req, PSM: 0x%04x CID 0x%x" + .balign 4 .global $$21652 $$21652: - .incbin "baserom.dol", 0x4394AC, 0x1C + .asciz "HID - Originate failed" + .balign 4 + .4byte 0 .global $$21682 $$21682: - .incbin "baserom.dol", 0x4394C8, 0x20 + .asciz "HID - Originator security pass." .global $$21683 $$21683: - .incbin "baserom.dol", 0x4394E8, 0x1C + .asciz "HID - INTR Originate failed" .global $$21724 $$21724: - .incbin "baserom.dol", 0x439504, 0x2C + .asciz "HID - Rcvd unexpected conn cnf, CID 0x%x " + .balign 4 .global $$21725 $$21725: - .incbin "baserom.dol", 0x439530, 0x34 + .asciz "HID - got CTRL conn cnf, sent cfg req, CID: 0x%x" + .balign 4 .global $$21747 $$21747: - .incbin "baserom.dol", 0x439564, 0x2C + .asciz "HID - Rcvd L2CAP cfg ind, unknown CID: 0x%x" .global $$21748 $$21748: - .incbin "baserom.dol", 0x439590, 0x2C + .asciz "HID - Rcvd cfg ind, sent cfg cfm, CID: 0x%x" .global $$21776 $$21776: - .incbin "baserom.dol", 0x4395BC, 0x2C + .asciz "HID - Rcvd cfg cfm, CID: 0x%x Result: %d" + .balign 4 .global $$21798 $$21798: - .incbin "baserom.dol", 0x4395E8, 0x2C + .asciz "HID - Rcvd L2CAP disc, unknown CID: 0x%x" + .balign 4 .global $$21799 $$21799: - .incbin "baserom.dol", 0x439614, 0x24 + .asciz "HID - Rcvd L2CAP disc, CID: 0x%x" + .balign 4 .global $$21816 $$21816: - .incbin "baserom.dol", 0x439638, 0x30 + .asciz "HID - Rcvd L2CAP disc cfm, unknown CID: 0x%x" + .balign 4 .global $$21817 $$21817: - .incbin "baserom.dol", 0x439668, 0x28 + .asciz "HID - Rcvd L2CAP disc cfm, CID: 0x%x" + .balign 4 .global $$21833 $$21833: - .incbin "baserom.dol", 0x439690, 0x38 + .asciz "HID - Rcvd L2CAP congestion status, unknown CID: 0x%x" + .balign 4 .global $$21834 $$21834: - .incbin "baserom.dol", 0x4396C8, 0x38 + .asciz "HID - Rcvd L2CAP congestion status, CID: 0x%x Cong: %d" .global $$21874 $$21874: - .incbin "baserom.dol", 0x439700, 0x30 + .asciz "HID - Rcvd L2CAP data, unknown CID: 0x%x" + .balign 4 + .4byte 0 diff --git a/asm/bte/l2c_api.s b/asm/bte/l2c_api.s index c28a82be..152a10cf 100644 --- a/asm/bte/l2c_api.s +++ b/asm/bte/l2c_api.s @@ -872,127 +872,164 @@ lbl_80090D9C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21653 $$21653: - .incbin "baserom.dol", 0x439730, 0x30 + .asciz "L2CAP - L2CA_Register() called for PSM: 0x%04x" + .balign 4 .global $$21654 $$21654: - .incbin "baserom.dol", 0x439760, 0x28 + .asciz "L2CAP - no cb registering PSM: 0x%04x" + .balign 4 .global $$21655 $$21655: - .incbin "baserom.dol", 0x439788, 0x28 + .asciz "L2CAP - invalid PSM value, PSM: 0x%04x" + .balign 4 .global $$21656 $$21656: - .incbin "baserom.dol", 0x4397B0, 0x28 + .asciz "L2CAP - no RCB available, PSM: 0x%04x" + .balign 4 .global $$21663 $$21663: - .incbin "baserom.dol", 0x4397D8, 0x34 + .asciz "L2CAP - L2CA_Deregister() called for PSM: 0x%04x" + .balign 4 .global $$21664 $$21664: - .incbin "baserom.dol", 0x43980C, 0x34 + .asciz "L2CAP - PSM: 0x%04x not found for deregistration" + .balign 4 .global $$21682 $$21682: - .incbin "baserom.dol", 0x439840, 0x20 + .asciz "L2CA_ConnectReq() PSM: 0x%04x" + .balign 4 .global $$21683 $$21683: - .incbin "baserom.dol", 0x439860, 0x38 + .asciz "L2CA_ConnectReq() BDA: %02x-%02x-%02x-%02x-%02x-%02x" + .balign 4 .global $$21684 $$21684: - .incbin "baserom.dol", 0x439898, 0x24 + .asciz "L2CAP connect req - BTU not ready" + .balign 4 .global $$21685 $$21685: - .incbin "baserom.dol", 0x4398BC, 0x30 + .asciz "L2CAP - no RCB for L2CA_conn_req, PSM: 0x%04x" + .balign 4 .global $$21686 $$21686: - .incbin "baserom.dol", 0x4398EC, 0x24 + .asciz "L2CAP - no LCB for L2CA_conn_req" + .balign 4 .global $$21687 $$21687: - .incbin "baserom.dol", 0x439910, 0x38 + .asciz "L2CAP API - L2CA_conn_req rejected - link disconnecting" .global $$21688 $$21688: - .incbin "baserom.dol", 0x439948, 0x24 + .asciz "L2CAP - no CCB for L2CA_conn_req" + .balign 4 .global $$21689 $$21689: - .incbin "baserom.dol", 0x43996C, 0x30 + .asciz "L2CAP - L2CA_conn_req() returned CID: 0x%04x" + .balign 4 .global $$21706 $$21706: - .incbin "baserom.dol", 0x43999C, 0x38 + .asciz "L2CA_ConnectRsp() CID: 0x%04x Result: %d Status: %d" + .balign 4 .global $$21707 $$21707: - .incbin "baserom.dol", 0x4399D4, 0x38 + .asciz "L2CA_ConnectRsp() BDA: %02x-%02x-%02x-%02x-%02x-%02x" + .balign 4 .global $$21708 $$21708: - .incbin "baserom.dol", 0x439A0C, 0x24 + .asciz "L2CAP - no LCB for L2CA_conn_rsp" + .balign 4 .global $$21709 $$21709: - .incbin "baserom.dol", 0x439A30, 0x24 + .asciz "L2CAP - no CCB for L2CA_conn_rsp" + .balign 4 .global $$21710 $$21710: - .incbin "baserom.dol", 0x439A54, 0x34 + .asciz "L2CAP - bad id in L2CA_conn_rsp. Exp: %d Got: %d" + .balign 4 .global $$21716 $$21716: - .incbin "baserom.dol", 0x439A88, 0x20 + .asciz "L2CA_ConfigReq() CID: 0x%04x" + .balign 4 .global $$21717 $$21717: - .incbin "baserom.dol", 0x439AA8, 0x2C + .asciz "L2CAP - no CCB for L2CA_cfg_req, CID: %d" + .balign 4 .global $$21725 $$21725: - .incbin "baserom.dol", 0x439AD4, 0x2C + .asciz "L2CA_ConfigRsp() CID: 0x%04x Result: %d" + .balign 4 .global $$21726 $$21726: - .incbin "baserom.dol", 0x439B00, 0x2C + .asciz "L2CAP - no CCB for L2CA_cfg_rsp, CID: %d" + .balign 4 .global $$21732 $$21732: - .incbin "baserom.dol", 0x439B2C, 0x24 + .asciz "L2CA_DisconnectReq() CID: 0x%04x" + .balign 4 .global $$21733 $$21733: - .incbin "baserom.dol", 0x439B50, 0x2C + .asciz "L2CAP - no CCB for L2CA_disc_req, CID: %d" + .balign 4 .global $$21738 $$21738: - .incbin "baserom.dol", 0x439B7C, 0x24 + .asciz "L2CA_DisconnectRsp() CID: 0x%04x" + .balign 4 .global $$21739 $$21739: - .incbin "baserom.dol", 0x439BA0, 0x2C + .asciz "L2CAP - no CCB for L2CA_disc_rsp, CID: %d" + .balign 4 .global $$21747 $$21747: - .incbin "baserom.dol", 0x439BCC, 0x28 + .asciz "L2CA_DataWrite() CID: 0x%04x Len: %d" + .balign 4 .global $$21748 $$21748: - .incbin "baserom.dol", 0x439BF4, 0x2C + .asciz "L2CAP - no CCB for L2CA_DataWrite, CID: %d" + .balign 4 .global $$21749 $$21749: - .incbin "baserom.dol", 0x439C20, 0x38 + .asciz "L2CAP - cannot send message bigger than peer's mtu size" .global $$21765 $$21765: - .incbin "baserom.dol", 0x439C58, 0x30 + .asciz "L2CA_Ping() BDA: %02x-%02x-%02x-%02x-%02x-%02x" .global $$21766 $$21766: - .incbin "baserom.dol", 0x439C88, 0x20 + .asciz "L2CAP - no LCB for L2CA_ping" + .balign 4 .global $$21767 $$21767: - .incbin "baserom.dol", 0x439CA8, 0x28 + .asciz "L2CAP - rejected second L2CA_ping" + .balign 4 + .4byte 0 .global $$21768 $$21768: - .incbin "baserom.dol", 0x439CD0, 0x30 + .asciz "L2CAP - L2CA_ping rejected - link disconnecting" .global $$21778 $$21778: - .incbin "baserom.dol", 0x439D00, 0x30 + .asciz "L2CAP - no CCB for L2CA_SetIdleTimeout, CID: %d" .global $$21804 $$21804: - .incbin "baserom.dol", 0x439D30, 0x38 + .asciz "L2CA_SetAclPriority() bdaddr: %02x%02x%02x%02x%02x%02x" .global $$21805 $$21805: - .incbin "baserom.dol", 0x439D68, 0x28 + .asciz "L2CAP - no LCB for L2CA_SetAclPriority" + .balign 4 .global $$21812 $$21812: - .incbin "baserom.dol", 0x439D90, 0x60 + .asciz "L2CA_SetCompression() local cid %d, direction %d, pe_type %d, mem_level %d, wbits %d, enable %d" .global $$21827 $$21827: - .incbin "baserom.dol", 0x439DF0, 0x28 + .asciz "L2CAP - no CCB for L2CA_Flush, CID: %d" + .balign 4 .global $$21828 $$21828: - .incbin "baserom.dol", 0x439E18, 0x30 + .asciz "L2CA_Flush() CID: 0x%04x flushed %d buffers" + .balign 4 .global $$21837 $$21837: - .incbin "baserom.dol", 0x439E48, 0x40 + .asciz "L2CA_GetNumQueuedBufs() CID: 0x%04x abmormally returning 0" + .balign 4 .global $$21838 $$21838: - .incbin "baserom.dol", 0x439E88, 0x38 + .asciz "L2CA_GetNumQueuedBufs() CID: 0x%04x returning %d" + .balign 4 + .4byte 0 diff --git a/asm/bte/l2c_csm.s b/asm/bte/l2c_csm.s index 4fa254a7..abfa6566 100644 --- a/asm/bte/l2c_csm.s +++ b/asm/bte/l2c_csm.s @@ -1434,100 +1434,371 @@ lbl_80092264: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21658 $$21658: - .incbin "baserom.dol", 0x439EC0, 0x24 + .4byte 0x80090DCC ;# ptr + .4byte 0x80090DD0 ;# ptr + .4byte 0x80090DD4 ;# ptr + .4byte 0x80090DD8 ;# ptr + .4byte 0x80090DDC ;# ptr + .4byte 0x80090DE0 ;# ptr + .4byte 0x80090DE4 ;# ptr + .4byte 0x80090DE8 ;# ptr + .4byte 0x80090DEC ;# ptr .global $$21685 $$21685: - .incbin "baserom.dol", 0x439EE4, 0x1C + .asciz "L2CAP - st: CLOSED evt: %d" + .balign 4 .global $$21686 $$21686: - .incbin "baserom.dol", 0x439F00, 0x44 + .asciz "L2CAP - Calling Disconnect_Ind_Cb(), CID: 0x%04x No Conf Needed" + .balign 4 .global $$21687 $$21687: - .incbin "baserom.dol", 0x439F44, 0x3C + .asciz "L2CAP - Calling ConnectCfm_Cb(), CID: 0x%04x Status: %d" + .balign 4 .global $$21690 $$21690: - .incbin "baserom.dol", 0x439F80, 0x7C + .4byte 0x80090EB4 ;# ptr + .4byte 0x80090EE4 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80090E70 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80090F68 ;# ptr + .4byte 0x80090F8C ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80090FD8 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x8009105C ;# ptr + .4byte 0x80090F2C ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091068 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x80091070 ;# ptr + .4byte 0x8009105C ;# ptr + .4byte 0x80091008 ;# ptr .global $$21704 $$21704: - .incbin "baserom.dol", 0x439FFC, 0x28 + .asciz "L2CAP - st: ORIG_W4_SEC_COMP evt: %d" + .balign 4 .global $$21707 $$21707: - .incbin "baserom.dol", 0x43A024, 0x6C + .4byte 0x80091108 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x8009114C ;# ptr + .4byte 0x80091178 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911C0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911CC ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911E0 ;# ptr + .4byte 0x800911C0 ;# ptr .global $$21721 $$21721: - .incbin "baserom.dol", 0x43A090, 0x28 + .asciz "L2CAP - st: TERM_W4_SEC_COMP evt: %d" + .balign 4 .global $$21722 $$21722: - .incbin "baserom.dol", 0x43A0B8, 0x30 + .asciz "L2CAP - Calling Connect_Ind_Cb(), CID: 0x%04x" + .balign 4 .global $$21725 $$21725: - .incbin "baserom.dol", 0x43A0E8, 0x6C + .4byte 0x80091268 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091280 ;# ptr + .4byte 0x800912E8 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x8009131C ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091304 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091310 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091344 ;# ptr + .4byte 0x80091304 ;# ptr .global $$21744 $$21744: - .incbin "baserom.dol", 0x43A154, 0x28 + .asciz "L2CAP - st: W4_L2CAP_CON_RSP evt: %d" + .balign 4 .global $$21745 $$21745: - .incbin "baserom.dol", 0x43A17C, 0x38 + .asciz "L2CAP - Calling Connect_Cfm_Cb(), CID: 0x%04x, Success" + .balign 4 .global $$21746 $$21746: - .incbin "baserom.dol", 0x43A1B4, 0x24 + .asciz "L2CAP - Calling Connect_Pnd_Cb()" + .balign 4 .global $$21747 $$21747: - .incbin "baserom.dol", 0x43A1D8, 0x40 + .asciz "L2CAP - Calling Connect_Cfm_Cb(), CID: 0x%04x, Failure Code: %d" .global $$21748 $$21748: - .incbin "baserom.dol", 0x43A218, 0x38 + .asciz "L2CAP - Calling Connect_Cfm_Cb(), CID: 0x%04x, Timeout" + .balign 4 .global $$21751 $$21751: - .incbin "baserom.dol", 0x43A250, 0x70 + .4byte 0x800913E0 ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009142C ;# ptr + .4byte 0x8009148C ;# ptr + .4byte 0x800914E4 ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x80091584 ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x80091578 ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x8009158C ;# ptr + .4byte 0x80091584 ;# ptr + .4byte 0x8009152C ;# ptr .global $$21770 $$21770: - .incbin "baserom.dol", 0x43A2C0, 0x24 + .asciz "L2CAP - st: W4_L2CA_CON_RSP evt: %d" .global $$21773 $$21773: - .incbin "baserom.dol", 0x43A2E4, 0x70 + .4byte 0x8009161C ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091738 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091664 ;# ptr + .4byte 0x800916C4 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091744 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091764 ;# ptr + .4byte 0x80091738 ;# ptr + .4byte 0x800916E0 ;# ptr .global $$21800 $$21800: - .incbin "baserom.dol", 0x43A354, 0x1C + .asciz "L2CAP - st: CONFIG evt: %d" + .balign 4 .global $$21801 $$21801: - .incbin "baserom.dol", 0x43A370, 0x30 + .asciz "L2CAP - Calling Config_Req_Cb(), CID: 0x%04x" + .balign 4 .global $$21802 $$21802: - .incbin "baserom.dol", 0x43A3A0, 0x30 + .asciz "L2CAP - Calling Config_Rsp_Cb(), CID: 0x%04x" + .balign 4 .global $$21803 $$21803: - .incbin "baserom.dol", 0x43A3D0, 0x3C + .asciz "L2CAP - Calling Config_Rsp_Cb(), CID: 0x%04x, Failure: %d" + .balign 4 .global $$21804 $$21804: - .incbin "baserom.dol", 0x43A40C, 0x40 + .asciz "L2CAP - Calling Disconnect_Ind_Cb(), CID: 0x%04x Conf Needed" + .balign 4 .global $$21805 $$21805: - .incbin "baserom.dol", 0x43A44C, 0x2C + .asciz "L2CAP - Calling DataInd_Cb(), CID: 0x%04x" + .balign 4 .global $$21808 $$21808: - .incbin "baserom.dol", 0x43A478, 0x70 + .4byte 0x800917F8 ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x8009183C ;# ptr + .4byte 0x800918A0 ;# ptr + .4byte 0x8009191C ;# ptr + .4byte 0x80091968 ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091A7C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x800919C0 ;# ptr + .4byte 0x800919EC ;# ptr + .4byte 0x80091A38 ;# ptr + .4byte 0x80091A58 ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091B2C ;# ptr + .4byte 0x80091ABC ;# ptr + .4byte 0x80091AE4 ;# ptr .global $$21829 $$21829: - .incbin "baserom.dol", 0x43A4E8, 0x1C + .asciz "L2CAP - st: OPEN evt: %d" + .balign 4 .global $$21832 $$21832: - .incbin "baserom.dol", 0x43A504, 0x6C + .4byte 0x80091BC0 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091C04 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091C28 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091CA0 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091CF8 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D50 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D14 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D88 ;# ptr + .4byte 0x80091D38 ;# ptr .global $$21848 $$21848: - .incbin "baserom.dol", 0x43A570, 0x28 + .asciz "L2CAP - st: W4_L2CAP_DISC_RSP evt: %d" + .balign 4 .global $$21849 $$21849: - .incbin "baserom.dol", 0x43A598, 0x30 + .asciz "L2CAP - Calling DisconnectCfm_Cb(), CID: 0x%04x" .global $$21852 $$21852: - .incbin "baserom.dol", 0x43A5C8, 0x70 + .4byte 0x80091E20 ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091EB0 ;# ptr + .4byte 0x80091E64 ;# ptr + .4byte 0x80091F64 ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F6C ;# ptr + .4byte 0x80091F64 ;# ptr + .4byte 0x80091F10 ;# ptr .global $$21863 $$21863: - .incbin "baserom.dol", 0x43A638, 0x28 + .asciz "L2CAP - st: W4_L2CA_DISC_RSP evt: %d" + .balign 4 .global $$21866 $$21866: - .incbin "baserom.dol", 0x43A660, 0x70 + .4byte 0x80091FFC ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C0 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920A0 ;# ptr + .4byte 0x800920C8 ;# ptr + .4byte 0x800920C0 ;# ptr + .4byte 0x80092044 ;# ptr .global $$21883 $$21883: - .incbin "baserom.dol", 0x43A6D0, 0x28 + .asciz "L2CAP - cannot send buffer, offset: %d" + .balign 4 diff --git a/asm/bte/l2c_link.s b/asm/bte/l2c_link.s index c29c54c5..bc399eb3 100644 --- a/asm/bte/l2c_link.s +++ b/asm/bte/l2c_link.s @@ -1291,43 +1291,56 @@ lbl_80093400: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21744 $$21744: - .incbin "baserom.dol", 0x43A6F8, 0x20 + .asciz "L2CAP failed to allocate LCB" + .balign 4 .global $$21745 $$21745: - .incbin "baserom.dol", 0x43A718, 0x28 + .asciz "L2CAP got conn_req while connected" + .balign 4 + .4byte 0 .global $$21771 $$21771: - .incbin "baserom.dol", 0x43A740, 0x28 + .asciz "L2CAP got conn_comp for unknown BD_ADDR" .global $$21772 $$21772: - .incbin "baserom.dol", 0x43A768, 0x34 + .asciz "L2CAP got conn_comp in bad state: %d status: 0x%d" + .balign 4 .global $$21783 $$21783: - .incbin "baserom.dol", 0x43A79C, 0x28 + .asciz "L2CAP got sec_comp for unknown BD_ADDR" + .balign 4 .global $$21822 $$21822: - .incbin "baserom.dol", 0x43A7C4, 0x18 + .asciz "L2CAP - ping timeout" + .balign 4 .global $$21869 $$21869: - .incbin "baserom.dol", 0x43A7DC, 0x2C + .asciz "L2CAP - Congested(), CID: 0x%04x, Congested" .global $$21870 $$21870: - .incbin "baserom.dol", 0x43A808, 0x40 + .asciz "L2CAP - Calling CongestionStatus_Cb(), CID: 0x%04x, Congested" + .balign 4 .global $$21871 $$21871: - .incbin "baserom.dol", 0x43A848, 0x20 + .asciz "!!! L2CAP - buffer dropped" + .balign 4 + .4byte 0 .global $$21872 $$21872: - .incbin "baserom.dol", 0x43A868, 0x40 + .asciz "L2CAP - Calling CongestionStatus_Cb(), CID: 0x%04x, Uncongested" .global $$21907 $$21907: - .incbin "baserom.dol", 0x43A8A8, 0x48 + .asciz "LCB %d Priority:%d XmitWindow:%d Congestion Start:%d End:%d Discard:%d" + .balign 4 .global $$21949 $$21949: - .incbin "baserom.dol", 0x43A8F0, 0x20 + .asciz "L2CAP - dropping incomplete pkt" .global $$21950 $$21950: - .incbin "baserom.dol", 0x43A910, 0x20 + .asciz "L2CAP - dropping too long pkt" + .balign 4 .global $$21986 $$21986: - .incbin "baserom.dol", 0x43A930, 0x38 + .asciz "L2CAP - rcvd segment complete, unknown handle: %d" + .balign 4 + .4byte 0 diff --git a/asm/bte/l2c_main.s b/asm/bte/l2c_main.s index c8b49124..1b7d5e2f 100644 --- a/asm/bte/l2c_main.s +++ b/asm/bte/l2c_main.s @@ -1122,61 +1122,86 @@ lbl_80094428: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21563 $$21563: - .incbin "baserom.dol", 0x43A968, 0x24 + .asciz "L2CAP - expected pkt start, got: %d" .global $$21564 $$21564: - .incbin "baserom.dol", 0x43A98C, 0x54 + .asciz "L2CAP - holding ACL for unknown handle:%d ls:%d cid:%d opcode:%d cur count:%d" + .balign 4 + .4byte 0 .global $$21565 $$21565: - .incbin "baserom.dol", 0x43A9E0, 0x18 + .asciz "L2CAP - unknown CID: %d" .global $$21566 $$21566: - .incbin "baserom.dol", 0x43A9F8, 0x24 + .asciz "L2CAP - got incorrect hci header" + .balign 4 .global $$21567 $$21567: - .incbin "baserom.dol", 0x43AA1C, 0x2C + .asciz "L2CAP - bad length in pkt. Exp: %d Act: %d" .global $$21568 $$21568: - .incbin "baserom.dol", 0x43AA48, 0x20 + .asciz "GOT CONNECTIONLESS DATA PSM:%d" + .balign 4 .global $$21662 $$21662: - .incbin "baserom.dol", 0x43AA68, 0x34 + .asciz "Command len bad pkt_len: %d cmd_len: %d code: %d" .global $$21663 $$21663: - .incbin "baserom.dol", 0x43AA9C, 0x24 + .asciz "L2CAP - MTU rej Handle: %d MTU: %d" + .balign 4 .global $$21664 $$21664: - .incbin "baserom.dol", 0x43AAC0, 0x30 + .asciz "L2CAP - rej with CID invalid, LCID: %d RCID: %d" .global $$21665 $$21665: - .incbin "baserom.dol", 0x43AAF0, 0x2C + .asciz "L2CAP - rcvd conn req for unknown PSM: %d" + .balign 4 .global $$21666 $$21666: - .incbin "baserom.dol", 0x43AB1C, 0x20 + .asciz "L2CAP - unable to allocate CCB" + .balign 4 .global $$21667 $$21667: - .incbin "baserom.dol", 0x43AB3C, 0x30 + .asciz "L2CAP - no CCB for conn rsp, LCID: %d RCID: %d" + .balign 4 .global $$21668 $$21668: - .incbin "baserom.dol", 0x43AB6C, 0x2C + .asciz "L2CAP - con rsp - bad ID. Exp: %d Got: %d" + .balign 4 .global $$21669 $$21669: - .incbin "baserom.dol", 0x43AB98, 0x2C + .asciz "L2CAP - cfg rsp - bad ID. Exp: %d Got: %d" + .balign 4 .global $$21670 $$21670: - .incbin "baserom.dol", 0x43ABC4, 0x2C + .asciz "L2CAP - rcvd cfg rsp for unknown CID: %d" + .balign 4 .global $$21671 $$21671: - .incbin "baserom.dol", 0x43ABF0, 0x1C + .asciz "L2CAP - bad cmd code: %d" + .balign 4 .global $$21674 $$21674: - .incbin "baserom.dol", 0x43AC0C, 0x30 + .4byte 0x80094270 ;# ptr + .4byte 0x80093920 ;# ptr + .4byte 0x800939F4 ;# ptr + .4byte 0x80093AC0 ;# ptr + .4byte 0x80093BB8 ;# ptr + .4byte 0x80093E68 ;# ptr + .4byte 0x80094118 ;# ptr + .4byte 0x8009418C ;# ptr + .4byte 0x800941EC ;# ptr + .4byte 0x8009422C ;# ptr + .4byte 0x8009424C ;# ptr + .4byte 0x800938A0 ;# ptr .global $$21693 $$21693: - .incbin "baserom.dol", 0x43AC3C, 0x14 + .asciz "L2CAP HOLD CONTINUE" .global $$21694 $$21694: - .incbin "baserom.dol", 0x43AC50, 0x18 + .asciz "L2CAP HOLD TIMEOUT" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global l2cb diff --git a/asm/bte/l2c_utils.s b/asm/bte/l2c_utils.s index 6555255b..c9d74e2c 100644 --- a/asm/bte/l2c_utils.s +++ b/asm/bte/l2c_utils.s @@ -2213,27 +2213,34 @@ lbl_800962F4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22062 $$22062: - .incbin "baserom.dol", 0x43AC68, 0x1C + .asciz "L2CAP - no buffer cmd_rej" + .balign 4 .global $$22067 $$22067: - .incbin "baserom.dol", 0x43AC84, 0x20 + .asciz "L2CAP - no buffer for conn_req" + .balign 4 .global $$22125 $$22125: - .incbin "baserom.dol", 0x43ACA4, 0x20 + .asciz "L2CAP - no buffer for cfg_rej" + .balign 4 .global $$22159 $$22159: - .incbin "baserom.dol", 0x43ACC4, 0x20 + .asciz "L2CAP - no buffer for echo_req" + .balign 4 .global $$22327 $$22327: - .incbin "baserom.dol", 0x43ACE4, 0x44 + .asciz "l2cu_create_conn - btm_is_sco_active_by_bdaddr() is_sco_active = %s" .global $$22338 $$22338: - .incbin "baserom.dol", 0x43AD28, 0x28 + .asciz "L2CAP - no buffer for l2cu_create_conn" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22328 $$22328: - .incbin "baserom.dol", 0x492D00, 0x8 + .asciz "TRUE" + .balign 4 .global $$22329 $$22329: - .incbin "baserom.dol", 0x492D08, 0x8 + .asciz "FALSE" + .balign 4 diff --git a/asm/bte/port_rfc.s b/asm/bte/port_rfc.s index 415700c3..edd08e55 100644 --- a/asm/bte/port_rfc.s +++ b/asm/bte/port_rfc.s @@ -1451,82 +1451,103 @@ lbl_80097730: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21517 $$21517: - .incbin "baserom.dol", 0x43AD50, 0x14 + .asciz "port_open_continue" + .balign 4 .global $$21518 $$21518: - .incbin "baserom.dol", 0x43AD64, 0x24 + .asciz "port_open_continue no mx channel" + .balign 4 .global $$21560 $$21560: - .incbin "baserom.dol", 0x43AD88, 0x18 + .asciz "PORT_StartCnf result:%d" .global $$21561 $$21561: - .incbin "baserom.dol", 0x43ADA0, 0x20 + .asciz "PORT_StartCnf failed result:%d" + .balign 4 .global $$21573 $$21573: - .incbin "baserom.dol", 0x43ADC0, 0x10 + .asciz "PORT_StartInd" + .balign 4 .global $$21600 $$21600: - .incbin "baserom.dol", 0x43ADD0, 0x20 + .asciz "PORT_ParNegInd dlci:%d mtu:%d" + .balign 4 .global $$21601 $$21601: - .incbin "baserom.dol", 0x43ADF0, 0x20 + .asciz "PORT_ParNegInd: port not found" + .balign 4 .global $$21618 $$21618: - .incbin "baserom.dol", 0x43AE10, 0x2C + .asciz "PORT_ParNegCnf dlci:%d mtu:%d cl: %d k: %d" + .balign 4 .global $$21631 $$21631: - .incbin "baserom.dol", 0x43AE3C, 0x24 + .asciz "PORT_DlcEstablishInd dlci:%d mtu:%d" .global $$21649 $$21649: - .incbin "baserom.dol", 0x43AE60, 0x30 + .asciz "PORT_DlcEstablishCnf dlci:%d mtu:%d result:%d" + .balign 4 .global $$21655 $$21655: - .incbin "baserom.dol", 0x43AE90, 0x10 + .asciz "PORT_PortNegInd" .global $$21666 $$21666: - .incbin "baserom.dol", 0x43AEA0, 0x10 + .asciz "PORT_PortNegCnf" .global $$21667 $$21667: - .incbin "baserom.dol", 0x43AEB0, 0x18 + .asciz "PORT_PortNegCnf no port" .global $$21668 $$21668: - .incbin "baserom.dol", 0x43AEC8, 0x28 + .asciz "PORT_PortNegCnf Control Already sent" + .balign 4 .global $$21702 $$21702: - .incbin "baserom.dol", 0x43AEF0, 0x10 + .asciz "PORT_ControlInd" .global $$21703 $$21703: - .incbin "baserom.dol", 0x43AF00, 0x40 + .asciz "PORT_ControlInd DTR_DSR : %d, RTS_CTS : %d, RI : %d, DCD : %d" + .balign 4 .global $$21717 $$21717: - .incbin "baserom.dol", 0x43AF40, 0x10 + .asciz "PORT_ControlCnf" .global $$21732 $$21732: - .incbin "baserom.dol", 0x43AF50, 0x14 + .asciz "PORT_LineStatusInd" + .balign 4 .global $$21737 $$21737: - .incbin "baserom.dol", 0x43AF64, 0x14 + .asciz "PORT_DlcReleaseInd" + .balign 4 .global $$21746 $$21746: - .incbin "baserom.dol", 0x43AF78, 0x10 + .asciz "PORT_CloseInd" + .balign 4 .global $$21755 $$21755: - .incbin "baserom.dol", 0x43AF88, 0x18 + .asciz "Port_TimeOutCloseMux" + .balign 4 .global $$21780 $$21780: - .incbin "baserom.dol", 0x43AFA0, 0x24 + .asciz "PORT_DataInd with data length %d" + .balign 4 .global $$21781 $$21781: - .incbin "baserom.dol", 0x43AFC4, 0x34 + .asciz "PORT_DataInd. Buffer over run. Dropping the buffer" + .balign 4 .global $$21799 $$21799: - .incbin "baserom.dol", 0x43AFF8, 0x14 + .asciz "PORT_FlowInd fc:%d" + .balign 4 .global $$21812 $$21812: - .incbin "baserom.dol", 0x43B00C, 0x18 + .asciz "Sending RFCOMM_DataReq" + .balign 4 .global $$21829 $$21829: - .incbin "baserom.dol", 0x43B024, 0x2C + .asciz "port_rfc_closed in OPENING state ignored" + .balign 4 .global $$21830 $$21830: - .incbin "baserom.dol", 0x43B050, 0x30 + .asciz "port_rfc_closed state:%d sending events:%x" + .balign 4 + .4byte 0 diff --git a/asm/bte/port_utils.s b/asm/bte/port_utils.s index df0e2779..c406c30a 100644 --- a/asm/bte/port_utils.s +++ b/asm/bte/port_utils.s @@ -435,22 +435,27 @@ lbl_80097D14: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21174 $$21174: - .incbin "baserom.dol", 0x43B080, 0x20 + .asciz "port_select_mtu bad packet size" .global $$21175 $$21175: - .incbin "baserom.dol", 0x43B0A0, 0x38 + .asciz "port_select_mtu selected %d based on connection speed" + .balign 4 .global $$21176 $$21176: - .incbin "baserom.dol", 0x43B0D8, 0x38 + .asciz "port_select_mtu selected %d based on l2cap PDU size" + .4byte 0 .global $$21177 $$21177: - .incbin "baserom.dol", 0x43B110, 0x28 + .asciz "port_select_mtu application selected %d" .global $$21178 $$21178: - .incbin "baserom.dol", 0x43B138, 0x48 + .asciz "port_select_mtu credit_rx_max %d, credit_rx_low %d, rx_buf_critical %d" + .balign 4 .global $$21192 $$21192: - .incbin "baserom.dol", 0x43B180, 0x18 + .asciz "rfc_port_closed DONE" + .balign 4 .global $$21272 $$21272: - .incbin "baserom.dol", 0x43B198, 0x30 + .asciz "PORT_DataInd Data reached HW. Sending FC set." + .balign 4 diff --git a/asm/bte/rfc_l2cap_if.s b/asm/bte/rfc_l2cap_if.s index 0df27dce..8947ea58 100644 --- a/asm/bte/rfc_l2cap_if.s +++ b/asm/bte/rfc_l2cap_if.s @@ -677,28 +677,35 @@ rfc_save_lcid_mcb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2712 $$2712: - .incbin "baserom.dol", 0x43B1C8, 0x1C + .asciz "rfc_find_lcid_mcb LCID:0x%x" .global $$2713 $$2713: - .incbin "baserom.dol", 0x43B1E4, 0x38 + .asciz "rfc_find_lcid_mcb LCID reused LCID:0x%x current:0x%x" + .balign 4 .global $$2714 $$2714: - .incbin "baserom.dol", 0x43B21C, 0x1C + .asciz "RFCOMM_ConnectCnf LCID:0x%x" .global $$2728 $$2728: - .incbin "baserom.dol", 0x43B238, 0x1C + .asciz "RFCOMM_ConfigInd LCID:0x%x" + .balign 4 .global $$2743 $$2743: - .incbin "baserom.dol", 0x43B254, 0x1C + .asciz "RFCOMM_ConfigCnf LCID:0x%x" + .balign 4 .global $$2760 $$2760: - .incbin "baserom.dol", 0x43B270, 0x20 + .asciz "RFCOMM_DisconnectInd LCID:0x%x" + .balign 4 .global $$2796 $$2796: - .incbin "baserom.dol", 0x43B290, 0x1C + .asciz "RFCOMM_BufDataInd LCID:0x%x" .global $$2812 $$2812: - .incbin "baserom.dol", 0x43B2AC, 0x30 + .asciz "RFCOMM_CongestionStatusInd dropped LCID:0x%x" + .balign 4 .global $$2813 $$2813: - .incbin "baserom.dol", 0x43B2DC, 0x2C + .asciz "RFCOMM_CongestionStatusInd LCID:0x%x" + .balign 4 + .4byte 0 diff --git a/asm/bte/rfc_mx_fsm.s b/asm/bte/rfc_mx_fsm.s index ae382f66..883b91d4 100644 --- a/asm/bte/rfc_mx_fsm.s +++ b/asm/bte/rfc_mx_fsm.s @@ -870,55 +870,131 @@ lbl_80099288: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2759 $$2759: - .incbin "baserom.dol", 0x43B308, 0x1C + .4byte 0x80098680 ;# ptr + .4byte 0x80098684 ;# ptr + .4byte 0x80098688 ;# ptr + .4byte 0x8009868C ;# ptr + .4byte 0x80098690 ;# ptr + .4byte 0x80098694 ;# ptr + .4byte 0x80098698 ;# ptr .global $$2778 $$2778: - .incbin "baserom.dol", 0x43B324, 0x20 + .asciz "rfc_mx_sm_state_idle - evt:%d" + .balign 4 .global $$2779 $$2779: - .incbin "baserom.dol", 0x43B344, 0x1C + .asciz "Mx error state %d event %d" + .balign 4 .global $$2780 $$2780: - .incbin "baserom.dol", 0x43B360, 0x18 + .asciz "rfc_mx_send_config_req" + .balign 4 .global $$2781 $$2781: - .incbin "baserom.dol", 0x43B378, 0x28 + .asciz "RFCOMM MX ignored - evt:%d in state:%d" + .balign 4 .global $$2784 $$2784: - .incbin "baserom.dol", 0x43B3A0, 0x34 + .4byte 0x80098868 ;# ptr + .4byte 0x8009883C ;# ptr + .4byte 0x8009883C ;# ptr + .4byte 0x80098840 ;# ptr + .4byte 0x80098854 ;# ptr + .4byte 0x80098868 ;# ptr + .4byte 0x80098718 ;# ptr + .4byte 0x8009875C ;# ptr + .4byte 0x80098868 ;# ptr + .4byte 0x8009875C ;# ptr + .4byte 0x80098788 ;# ptr + .4byte 0x8009875C ;# ptr + .4byte 0x8009875C ;# ptr .global $$2796 $$2796: - .incbin "baserom.dol", 0x43B3D4, 0x28 + .asciz "rfc_mx_sm_state_wait_conn_cnf - evt:%d" + .balign 4 .global $$2809 $$2809: - .incbin "baserom.dol", 0x43B3FC, 0x24 + .asciz "rfc_mx_sm_state_configure - evt:%d" + .balign 4 .global $$2812 $$2812: - .incbin "baserom.dol", 0x43B420, 0x24 + .4byte 0x80098AEC ;# ptr + .4byte 0x80098B4C ;# ptr + .4byte 0x80098B4C ;# ptr + .4byte 0x80098AEC ;# ptr + .4byte 0x80098B4C ;# ptr + .4byte 0x80098B28 ;# ptr + .4byte 0x80098B18 ;# ptr + .4byte 0x80098B4C ;# ptr + .4byte 0x80098B38 ;# ptr .global $$2826 $$2826: - .incbin "baserom.dol", 0x43B444, 0x24 + .asciz "rfc_mx_sm_sabme_wait_ua - evt:%d" + .balign 4 .global $$2829 $$2829: - .incbin "baserom.dol", 0x43B468, 0x3C + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098C70 ;# ptr + .4byte 0x80098C98 ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098CA0 ;# ptr + .4byte 0x80098C10 ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098C10 ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098C4C ;# ptr + .4byte 0x80098C3C ;# ptr + .4byte 0x80098CC0 ;# ptr + .4byte 0x80098C5C ;# ptr .global $$2839 $$2839: - .incbin "baserom.dol", 0x43B4A4, 0x24 + .asciz "rfc_mx_sm_state_wait_sabme - evt:%d" .global $$2851 $$2851: - .incbin "baserom.dol", 0x43B4C8, 0x24 + .asciz "rfc_mx_sm_state_connected - evt:%d" + .balign 4 .global $$2853 $$2853: - .incbin "baserom.dol", 0x43B4EC, 0x30 + .4byte 0x80098ED0 ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098E98 ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098E98 ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EFC ;# ptr + .4byte 0x80098EBC ;# ptr .global $$2868 $$2868: - .incbin "baserom.dol", 0x43B51C, 0x28 + .asciz "rfc_mx_sm_state_disc_wait_ua - evt:%d" + .balign 4 .global $$2871 $$2871: - .incbin "baserom.dol", 0x43B544, 0x3C + .4byte 0x80099070 ;# ptr + .4byte 0x80098FB4 ;# ptr + .4byte 0x80098FB4 ;# ptr + .4byte 0x80099020 ;# ptr + .4byte 0x80099030 ;# ptr + .4byte 0x80098FB4 ;# ptr + .4byte 0x8009904C ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x8009906C ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x80099070 ;# ptr + .4byte 0x80099058 ;# ptr .global $$2885 $$2885: - .incbin "baserom.dol", 0x43B580, 0x24 + .asciz "rfc_mx_conf_cnf p_cfg:%08x res:%d " + .balign 4 .global $$2895 $$2895: - .incbin "baserom.dol", 0x43B5A4, 0x1C + .asciz "rfc_mx_conf_ind p_cfg:%0x" + .balign 4 diff --git a/asm/bte/rfc_port_fsm.s b/asm/bte/rfc_port_fsm.s index 80686057..ca8f9dbe 100644 --- a/asm/bte/rfc_port_fsm.s +++ b/asm/bte/rfc_port_fsm.s @@ -1247,52 +1247,148 @@ lbl_8009A424: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21372 $$21372: - .incbin "baserom.dol", 0x43B5C0, 0x14 + .asciz "NULL port event %d" + .balign 4 .global $$21388 $$21388: - .incbin "baserom.dol", 0x43B5D4, 0x20 + .asciz "Port error state %d event %d" + .balign 4 .global $$21389 $$21389: - .incbin "baserom.dol", 0x43B5F4, 0x24 + .asciz "Port state closed Event ignored %d" + .balign 4 .global $$21392 $$21392: - .incbin "baserom.dol", 0x43B618, 0x3C + .4byte 0x800993B4 ;# ptr + .4byte 0x800993EC ;# ptr + .4byte 0x800993F0 ;# ptr + .4byte 0x80099414 ;# ptr + .4byte 0x800993F8 ;# ptr + .4byte 0x80099428 ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x8009936C ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x80099460 ;# ptr + .4byte 0x800993A4 ;# ptr + .4byte 0x800993A8 ;# ptr .global $$21416 $$21416: - .incbin "baserom.dol", 0x43B654, 0x2C + .asciz "Port state sabme_wait_ua Event ignored %d" + .balign 4 .global $$21419 $$21419: - .incbin "baserom.dol", 0x43B680, 0x3C + .4byte 0x800995BC ;# ptr + .4byte 0x8009954C ;# ptr + .4byte 0x80099570 ;# ptr + .4byte 0x80099590 ;# ptr + .4byte 0x800995CC ;# ptr + .4byte 0x800995D8 ;# ptr + .4byte 0x800995FC ;# ptr + .4byte 0x800995FC ;# ptr + .4byte 0x800995FC ;# ptr + .4byte 0x800994E0 ;# ptr + .4byte 0x800995FC ;# ptr + .4byte 0x800994E0 ;# ptr + .4byte 0x80099510 ;# ptr + .4byte 0x80099538 ;# ptr + .4byte 0x80099540 ;# ptr .global $$21444 $$21444: - .incbin "baserom.dol", 0x43B6BC, 0x2C + .asciz "Port error state Term Wait Sec event Data" + .balign 4 .global $$21445 $$21445: - .incbin "baserom.dol", 0x43B6E8, 0x30 + .asciz "Port state term_wait_sec_check Event ignored %d" .global $$21448 $$21448: - .incbin "baserom.dol", 0x43B718, 0x40 + .4byte 0x8009973C ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x80099740 ;# ptr + .4byte 0x80099770 ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x800996CC ;# ptr + .4byte 0x800997BC ;# ptr + .4byte 0x8009977C ;# ptr + .4byte 0x800996CC ;# ptr + .4byte 0x800996F8 ;# ptr + .4byte 0x80099710 ;# ptr + .4byte 0x80099684 ;# ptr .global $$21461 $$21461: - .incbin "baserom.dol", 0x43B758, 0x30 + .asciz "Port error state Orig Wait Sec event Data" + .balign 4 + .4byte 0 .global $$21462 $$21462: - .incbin "baserom.dol", 0x43B788, 0x30 + .asciz "Port state orig_wait_sec_check Event ignored %d" .global $$21465 $$21465: - .incbin "baserom.dol", 0x43B7B8, 0x40 + .4byte 0x80099890 ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x80099900 ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x80099890 ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x800998BC ;# ptr + .4byte 0x8009990C ;# ptr + .4byte 0x800998D4 ;# ptr + .4byte 0x80099840 ;# ptr .global $$21487 $$21487: - .incbin "baserom.dol", 0x43B7F8, 0x24 + .asciz "Port state opened Event ignored %d" + .balign 4 .global $$21490 $$21490: - .incbin "baserom.dol", 0x43B81C, 0x3C + .4byte 0x80099A60 ;# ptr + .4byte 0x80099A5C ;# ptr + .4byte 0x80099A70 ;# ptr + .4byte 0x80099A88 ;# ptr + .4byte 0x80099AAC ;# ptr + .4byte 0x80099ABC ;# ptr + .4byte 0x80099AF4 ;# ptr + .4byte 0x80099AF4 ;# ptr + .4byte 0x80099AF4 ;# ptr + .4byte 0x80099988 ;# ptr + .4byte 0x80099AF4 ;# ptr + .4byte 0x80099AF4 ;# ptr + .4byte 0x800999B8 ;# ptr + .4byte 0x800999E0 ;# ptr + .4byte 0x800999E8 ;# ptr .global $$21505 $$21505: - .incbin "baserom.dol", 0x43B858, 0x2C + .asciz "Port state disc_wait_ua Event ignored %d" + .balign 4 .global $$21508 $$21508: - .incbin "baserom.dol", 0x43B884, 0x3C + .4byte 0x80099BC8 ;# ptr + .4byte 0x80099BB0 ;# ptr + .4byte 0x80099BBC ;# ptr + .4byte 0x80099BDC ;# ptr + .4byte 0x80099BF0 ;# ptr + .4byte 0x80099C0C ;# ptr + .4byte 0x80099C14 ;# ptr + .4byte 0x80099C14 ;# ptr + .4byte 0x80099C14 ;# ptr + .4byte 0x80099B70 ;# ptr + .4byte 0x80099C14 ;# ptr + .4byte 0x80099B70 ;# ptr + .4byte 0x80099C14 ;# ptr + .4byte 0x80099B9C ;# ptr + .4byte 0x80099BA4 ;# ptr .global $$21516 $$21516: - .incbin "baserom.dol", 0x43B8C0, 0x28 + .asciz "***** MX PN while disconnecting *****" + .balign 4 diff --git a/asm/bte/rfc_ts_frames.s b/asm/bte/rfc_ts_frames.s index 458a3bc3..3d30bf41 100644 --- a/asm/bte/rfc_ts_frames.s +++ b/asm/bte/rfc_ts_frames.s @@ -1591,45 +1591,58 @@ lbl_8009BF90: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21168 $$21168: - .incbin "baserom.dol", 0x43B8E8, 0x10 + .asciz "Bad Length1: %d" .global $$21169 $$21169: - .incbin "baserom.dol", 0x43B8F8, 0x14 + .asciz "Bad Length2 %d %d" + .balign 4 .global $$21170 $$21170: - .incbin "baserom.dol", 0x43B90C, 0xC + .asciz "Bad SABME" + .balign 4 .global $$21173 $$21173: - .incbin "baserom.dol", 0x43B918, 0xC + .asciz "Bad DISC" + .balign 4 .global $$21174 $$21174: - .incbin "baserom.dol", 0x43B924, 0x18 + .asciz "Bad UIH - invalid DLCI" + .balign 4 .global $$21175 $$21175: - .incbin "baserom.dol", 0x43B93C, 0x10 + .asciz "Bad UIH - FCS" + .balign 4 .global $$21176 $$21176: - .incbin "baserom.dol", 0x43B94C, 0x14 + .asciz "Bad UIH - response" + .balign 4 .global $$21233 $$21233: - .incbin "baserom.dol", 0x43B960, 0x20 + .asciz "Illegal MX Frame ea:%d len:%d" + .balign 4 .global $$21234 $$21234: - .incbin "baserom.dol", 0x43B980, 0x10 + .asciz "Bad MX frame" + .balign 4 .global $$21235 $$21235: - .incbin "baserom.dol", 0x43B990, 0x10 + .asciz "Bad PN frame" + .balign 4 .global $$21236 $$21236: - .incbin "baserom.dol", 0x43B9A0, 0x10 + .asciz "Bad MSC frame" + .balign 4 .global $$21237 $$21237: - .incbin "baserom.dol", 0x43B9B0, 0x10 + .asciz "Bad RPN frame" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21171 $$21171: - .incbin "baserom.dol", 0x492D10, 0x8 + .asciz "Bad UA" + .balign 4 .global $$21172 $$21172: - .incbin "baserom.dol", 0x492D18, 0x8 + .asciz "Bad DM" + .balign 4 diff --git a/asm/bte/rfc_utils.s b/asm/bte/rfc_utils.s index 659b4a8a..1a9b9e24 100644 --- a/asm/bte/rfc_utils.s +++ b/asm/bte/rfc_utils.s @@ -591,24 +591,92 @@ lbl_8009C77C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global rfc_crctable rfc_crctable: - .incbin "baserom.dol", 0x404250, 0x100 + .4byte 0x0091E372 + .4byte 0x0796E475 + .4byte 0x0E9FED7C + .4byte 0x0998EA7B + .4byte 0x1C8DFF6E + .4byte 0x1B8AF869 + .4byte 0x1283F160 + .4byte 0x1584F667 + .4byte 0x38A9DB4A + .4byte 0x3FAEDC4D + .4byte 0x36A7D544 + .4byte 0x31A0D243 + .4byte 0x24B5C756 + .4byte 0x23B2C051 + .4byte 0x2ABBC958 + .4byte 0x2DBCCE5F + .4byte 0x70E19302 + .4byte 0x77E69405 + .4byte 0x7EEF9D0C + .4byte 0x79E89A0B + .4byte 0x6CFD8F1E + .4byte 0x6BFA8819 + .4byte 0x62F38110 + .4byte 0x65F48617 + .4byte 0x48D9AB3A + .4byte 0x4FDEAC3D + .4byte 0x46D7A534 + .4byte 0x41D0A233 + .4byte 0x54C5B726 + .4byte 0x53C2B021 + .4byte 0x5ACBB928 + .4byte 0x5DCCBE2F + .4byte 0xE0710392 + .4byte 0xE7760495 + .4byte 0xEE7F0D9C + .4byte 0xE9780A9B + .4byte 0xFC6D1F8E + .4byte 0xFB6A1889 + .4byte 0xF2631180 + .4byte 0xF5641687 + .4byte 0xD8493BAA + .4byte 0xDF4E3CAD + .4byte 0xD64735A4 + .4byte 0xD14032A3 + .4byte 0xC45527B6 + .4byte 0xC35220B1 + .4byte 0xCA5B29B8 + .4byte 0xCD5C2EBF + .4byte 0x900173E2 + .4byte 0x970674E5 + .4byte 0x9E0F7DEC + .4byte 0x99087AEB + .4byte 0x8C1D6FFE + .4byte 0x8B1A68F9 + .4byte 0x821361F0 + .4byte 0x851466F7 + .4byte 0xA8394BDA + .4byte 0xAF3E4CDD + .4byte 0xA63745D4 + .4byte 0xA13042D3 + .4byte 0xB42557C6 + .4byte 0xB32250C1 + .4byte 0xBA2B59C8 + .4byte 0xBD2C5ECF .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2688 $$2688: - .incbin "baserom.dol", 0x43B9C0, 0x10 + .asciz "rfc_timer_stop" + .balign 4 .global $$2689 $$2689: - .incbin "baserom.dol", 0x43B9D0, 0x20 + .asciz "rfc_timer_start - timeout:%d" + .balign 4 .global $$2704 $$2704: - .incbin "baserom.dol", 0x43B9F0, 0x24 + .asciz "rfc_port_timer_start - timeout:%d" + .balign 4 .global $$2708 $$2708: - .incbin "baserom.dol", 0x43BA14, 0x14 + .asciz "rfc_port_timer_stop" .global $$2739 $$2739: - .incbin "baserom.dol", 0x43BA28, 0x10 + .asciz "rfc_port_closed" .global $$2745 $$2745: - .incbin "baserom.dol", 0x43BA38, 0x18 + .asciz "rfc_inc_credit:%d" + .balign 4 + .4byte 0 diff --git a/asm/bte/sdp_api.s b/asm/bte/sdp_api.s index 3f841e0e..38394981 100644 --- a/asm/bte/sdp_api.s +++ b/asm/bte/sdp_api.s @@ -1040,4 +1040,5 @@ lbl_8009D5E8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21415 $$21415: - .incbin "baserom.dol", 0x43BA50, 0x50 + .asciz "SDP_InitDiscoveryDb Illegal param: p_db 0x%x, len %d, num_uuid %d, num_attr %d" + .balign 4 diff --git a/asm/bte/sdp_db.s b/asm/bte/sdp_db.s index 5ec6f65f..7c68bc08 100644 --- a/asm/bte/sdp_db.s +++ b/asm/bte/sdp_db.s @@ -936,10 +936,12 @@ lbl_8009E2AC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21330 $$21330: - .incbin "baserom.dol", 0x43BAA0, 0x3C + .asciz "SDP_AddAttribute: attr_len:%d too long. truncate to (%d)" + .balign 4 .global $$21369 $$21369: - .incbin "baserom.dol", 0x43BADC, 0x34 + .asciz "SDP_AddUuidSequence - too long, add %d uuids of %d" + .balign 4 .global $$21451 $$21451: - .incbin "baserom.dol", 0x43BB10, 0x28 + .asciz "Deleting attr_id 0x%04x for handle 0x%x" diff --git a/asm/bte/sdp_discovery.s b/asm/bte/sdp_discovery.s index 74ce84cb..ff1da55a 100644 --- a/asm/bte/sdp_discovery.s +++ b/asm/bte/sdp_discovery.s @@ -1326,31 +1326,48 @@ lbl_8009F524: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21493 $$21493: - .incbin "baserom.dol", 0x43BB38, 0x28 + .asciz "SDP - Unexp. PDU: %d in state: %d" + .balign 4 + .4byte 0 .global $$21510 $$21510: - .incbin "baserom.dol", 0x43BB60, 0x28 + .asciz "SDP - Rcvd ServiceSearchRsp, no matches" .global $$21585 $$21585: - .incbin "baserom.dol", 0x43BB88, 0x28 + .asciz "SDP - Wrong type: 0x%02x in attr_rsp" + .balign 4 .global $$21610 $$21610: - .incbin "baserom.dol", 0x43BBB0, 0x20 + .asciz "SDP - Bad len in attr_rsp %d" + .balign 4 .global $$21611 $$21611: - .incbin "baserom.dol", 0x43BBD0, 0x10 + .asciz "SDP - DB full" + .balign 4 .global $$21612 $$21612: - .incbin "baserom.dol", 0x43BBE0, 0x30 + .asciz "SDP - Bad type: 0x%02x or len: %d in attr_rsp" + .balign 4 .global $$21716 $$21716: - .incbin "baserom.dol", 0x43BC10, 0x1C + .asciz "SDP - attr nesting too deep" .global $$21717 $$21717: - .incbin "baserom.dol", 0x43BC2C, 0x20 + .asciz "SDP - bad len in UUID attr: %d" + .balign 4 .global $$21718 $$21718: - .incbin "baserom.dol", 0x43BC4C, 0x24 + .asciz "SDP - bad len in boolean attr: %d" + .balign 4 .global $$21723 $$21723: - .incbin "baserom.dol", 0x43BC70, 0x28 + .4byte 0x8009F4A4 ;# ptr + .4byte 0x8009F070 ;# ptr + .4byte 0x8009F120 ;# ptr + .4byte 0x8009F1DC ;# ptr + .4byte 0x8009F424 ;# ptr + .4byte 0x8009F454 ;# ptr + .4byte 0x8009F370 ;# ptr + .4byte 0x8009F370 ;# ptr + .4byte 0x8009F424 ;# ptr + .4byte 0 diff --git a/asm/bte/sdp_main.s b/asm/bte/sdp_main.s index baca5238..88c15572 100644 --- a/asm/bte/sdp_main.s +++ b/asm/bte/sdp_main.s @@ -820,70 +820,84 @@ lbl_800A008C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21261 $$21261: - .incbin "baserom.dol", 0x43BC98, 0x14 + .asciz "Service Discovery" + .balign 4 .global $$21262 $$21262: - .incbin "baserom.dol", 0x43BCAC, 0x24 + .asciz "Security Registration Server failed" .global $$21263 $$21263: - .incbin "baserom.dol", 0x43BCD0, 0x28 + .asciz "Security Registration for Client failed" .global $$21264 $$21264: - .incbin "baserom.dol", 0x43BCF8, 0x18 + .asciz "SDP Registration failed" .global $$21274 $$21274: - .incbin "baserom.dol", 0x43BD10, 0x38 + .asciz "SDP - Rcvd L2CAP conn ind, sent config req, CID 0x%x" + .balign 4 .global $$21290 $$21290: - .incbin "baserom.dol", 0x43BD48, 0x2C + .asciz "SDP - Rcvd conn cnf for unknown CID 0x%x" + .balign 4 .global $$21291 $$21291: - .incbin "baserom.dol", 0x43BD74, 0x2C + .asciz "SDP - got conn cnf, sent cfg req, CID: 0x%x" .global $$21292 $$21292: - .incbin "baserom.dol", 0x43BDA0, 0x30 + .asciz "SDP - Rcvd conn cnf with error: 0x%x CID 0x%x" + .balign 4 .global $$21306 $$21306: - .incbin "baserom.dol", 0x43BDD0, 0x2C + .asciz "SDP - Rcvd L2CAP cfg ind, unknown CID: 0x%x" .global $$21307 $$21307: - .incbin "baserom.dol", 0x43BDFC, 0x2C + .asciz "SDP - Rcvd cfg ind, sent cfg cfm, CID: 0x%x" .global $$21322 $$21322: - .incbin "baserom.dol", 0x43BE28, 0x2C + .asciz "SDP - Rcvd cfg cfm, CID: 0x%x Result: %d" + .balign 4 .global $$21323 $$21323: - .incbin "baserom.dol", 0x43BE54, 0x1C + .asciz "SDP - disconnect CID: 0x%x" .global $$21337 $$21337: - .incbin "baserom.dol", 0x43BE70, 0x2C + .asciz "SDP - Rcvd L2CAP disc, unknown CID: 0x%x" + .balign 4 .global $$21338 $$21338: - .incbin "baserom.dol", 0x43BE9C, 0x24 + .asciz "SDP - Rcvd L2CAP disc, CID: 0x%x" + .balign 4 .global $$21347 $$21347: - .incbin "baserom.dol", 0x43BEC0, 0x38 + .asciz "SDP - Ignored L2CAP data while in state: %d, CID: 0x%x" + .balign 4 .global $$21348 $$21348: - .incbin "baserom.dol", 0x43BEF8, 0x2C + .asciz "SDP - Rcvd L2CAP data, unknown CID: 0x%x" + .balign 4 .global $$21356 $$21356: - .incbin "baserom.dol", 0x43BF24, 0x1C + .asciz "SDP - no spare CCB for orig" .global $$21357 $$21357: - .incbin "baserom.dol", 0x43BF40, 0x18 + .asciz "SDP - Originate started" .global $$21358 $$21358: - .incbin "baserom.dol", 0x43BF58, 0x18 + .asciz "SDP - Originate failed" + .balign 4 .global $$21375 $$21375: - .incbin "baserom.dol", 0x43BF70, 0x30 + .asciz "SDP - Rcvd L2CAP disc cfm, unknown CID: 0x%x" + .balign 4 .global $$21376 $$21376: - .incbin "baserom.dol", 0x43BFA0, 0x28 + .asciz "SDP - Rcvd L2CAP disc cfm, CID: 0x%x" + .balign 4 .global $$21382 $$21382: - .incbin "baserom.dol", 0x43BFC8, 0x30 + .asciz "SDP - CCB timeout in state: %d CID: 0x%x" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sdp_cb diff --git a/asm/bte/sdp_server.s b/asm/bte/sdp_server.s index 7697fc4b..ab66c8b1 100644 --- a/asm/bte/sdp_server.s +++ b/asm/bte/sdp_server.s @@ -925,7 +925,8 @@ lbl_800A0DA0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21040 $$21040: - .incbin "baserom.dol", 0x43BFF8, 0x24 + .asciz "SDP - server got unknown PDU: 0x%x" + .balign 4 .global $$21122 $$21122: - .incbin "baserom.dol", 0x43C01C, 0x1C + .asciz "SDP - no buf for search rsp" diff --git a/asm/bte/sdp_utils.s b/asm/bte/sdp_utils.s index 116389d7..63363466 100644 --- a/asm/bte/sdp_utils.s +++ b/asm/bte/sdp_utils.s @@ -1186,27 +1186,68 @@ lbl_800A1DE8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global sdp_base_uuid sdp_base_uuid: - .incbin "baserom.dol", 0x404350, 0x10 + .4byte 0 + .4byte 0x00001000 + .4byte 0x80000080 + .4byte 0x5F9B34FB .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21109 $$21109: - .incbin "baserom.dol", 0x43C038, 0x44 + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A1170 ;# ptr + .4byte 0x800A1180 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A1194 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11A8 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11D0 ;# ptr + .4byte 0x800A11BC ;# ptr .global $$21118 $$21118: - .incbin "baserom.dol", 0x43C07C, 0x38 + .asciz "SDP - sdpu_build_n_send_error code: 0x%x CID: 0x%x" + .balign 4 .global $$21119 $$21119: - .incbin "baserom.dol", 0x43C0B4, 0x1C + .asciz "SDP - no buf for err msg" + .balign 4 .global $$21173 $$21173: - .incbin "baserom.dol", 0x43C0D0, 0x20 + .4byte 0x800A14E0 ;# ptr + .4byte 0x800A1470 ;# ptr + .4byte 0x800A1478 ;# ptr + .4byte 0x800A14E0 ;# ptr + .4byte 0x800A1480 ;# ptr + .4byte 0x800A1488 ;# ptr + .4byte 0x800A1494 ;# ptr + .4byte 0x800A14B0 ;# ptr .global $$21172 $$21172: - .incbin "baserom.dol", 0x43C0F0, 0x14 + .4byte 0x800A140C ;# ptr + .4byte 0x800A139C ;# ptr + .4byte 0x800A13A4 ;# ptr + .4byte 0x800A140C ;# ptr + .4byte 0x800A13AC ;# ptr .global lbl_80440004 lbl_80440004: - .incbin "baserom.dol", 0x43C104, 0xC + .4byte 0x800A13B4 ;# ptr + .4byte 0x800A13C0 ;# ptr + .4byte 0x800A13DC ;# ptr .global $$21221 $$21221: - .incbin "baserom.dol", 0x43C110, 0x20 + .4byte 0x800A191C ;# ptr + .4byte 0x800A1928 ;# ptr + .4byte 0x800A1934 ;# ptr + .4byte 0x800A1940 ;# ptr + .4byte 0x800A194C ;# ptr + .4byte 0x800A1958 ;# ptr + .4byte 0x800A1968 ;# ptr + .4byte 0x800A1988 ;# ptr diff --git a/asm/bte/uusb_ppc.s b/asm/bte/uusb_ppc.s index 79705d97..38dbeb38 100644 --- a/asm/bte/uusb_ppc.s +++ b/asm/bte/uusb_ppc.s @@ -885,16 +885,16 @@ UUSB_Unregister: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global wait4hci wait4hci: - .incbin "baserom.dol", 0x492C80, 0x4 + .4byte 0x00000001 .global __ntd_ios_file_descriptor __ntd_ios_file_descriptor: - .incbin "baserom.dol", 0x492C84, 0x4 + .4byte 0xFFFFFFFF .global $$23103 $$23103: - .incbin "baserom.dol", 0x492C88, 0x4 + .4byte 0x6F683000 .global $$23104 $$23104: - .incbin "baserom.dol", 0x492C8C, 0x4 + .4byte 0x6F683100 .section .bss, "wa" # 0x80496700 - 0x805643FC .global usb diff --git a/asm/dsp/dsp.s b/asm/dsp/dsp.s index 8bae70f5..ad934377 100644 --- a/asm/dsp/dsp.s +++ b/asm/dsp/dsp.s @@ -186,21 +186,25 @@ lbl_80047534: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x4322C0, 0x48 + .asciz "<< RVL_SDK - DSP \trelease build: Aug 23 2010 17:30:03 (0x4302_145) >>" + .balign 4 .global $$22198 $$22198: - .incbin "baserom.dol", 0x432308, 0x20 + .asciz "DSPInit(): Build Date: %s %s\n" + .balign 4 .global $$22199 $$22199: - .incbin "baserom.dol", 0x432328, 0xC + .asciz "Aug 23 2010" .global $$22200 $$22200: - .incbin "baserom.dol", 0x432334, 0xC + .asciz "17:30:03" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DSPVersion __DSPVersion: - .incbin "baserom.dol", 0x492A10, 0x8 + .4byte 0x804361C0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __DSP_init_flag diff --git a/asm/dsp/dsp_task.s b/asm/dsp/dsp_task.s index 99791c9c..7dfa4b66 100644 --- a/asm/dsp/dsp_task.s +++ b/asm/dsp/dsp_task.s @@ -640,25 +640,33 @@ lbl_80047E18: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22654 $$22654: - .incbin "baserom.dol", 0x432340, 0x20 + .asciz "DSP is booting task: 0x%08X\n" + .balign 4 .global $$22655 $$22655: - .incbin "baserom.dol", 0x432360, 0x30 + .asciz "__DSP_boot_task() : IRAM MMEM ADDR: 0x%08X\n" + .balign 4 .global $$22656 $$22656: - .incbin "baserom.dol", 0x432390, 0x30 + .asciz "__DSP_boot_task() : IRAM DSP ADDR : 0x%08X\n" + .balign 4 .global $$22657 $$22657: - .incbin "baserom.dol", 0x4323C0, 0x30 + .asciz "__DSP_boot_task() : IRAM LENGTH : 0x%08X\n" + .balign 4 .global $$22658 $$22658: - .incbin "baserom.dol", 0x4323F0, 0x30 + .asciz "__DSP_boot_task() : DRAM MMEM ADDR: 0x%08X\n" + .balign 4 .global $$22659 $$22659: - .incbin "baserom.dol", 0x432420, 0x30 + .asciz "__DSP_boot_task() : Start Vector : 0x%08X\n" + .balign 4 .global $$22684 $$22684: - .incbin "baserom.dol", 0x432450, 0x30 + .asciz "__DSP_add_task() : Added task : 0x%08X\n" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __DSP_rude_task_pending diff --git a/asm/dvd/dvd.s b/asm/dvd/dvd.s index e54639d7..7c9520cb 100644 --- a/asm/dvd/dvd.s +++ b/asm/dvd/dvd.s @@ -5640,51 +5640,288 @@ lbl_8003F048: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42D360, 0x48 + .asciz "<< RVL_SDK - DVD \trelease build: Aug 23 2010 17:30:05 (0x4302_145) >>" + .balign 4 .global $$24255 $$24255: - .incbin "baserom.dol", 0x42D3A8, 0x34 + .asciz "DVDChangeDisk(): FST in the new disc is too big. " .global $$24490 $$24490: - .incbin "baserom.dol", 0x42D3DC, 0xAC + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C43C ;# ptr + .4byte 0x8003C43C ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C41C ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C424 ;# ptr + .4byte 0x8003C424 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C424 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C448 ;# ptr + .4byte 0x8003C3E8 ;# ptr + .4byte 0x8003C3E8 ;# ptr .global $$24658 $$24658: - .incbin "baserom.dol", 0x42D488, 0xAC + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D324 ;# ptr + .4byte 0x8003D44C ;# ptr + .4byte 0x8003D468 ;# ptr + .4byte 0x8003D324 ;# ptr + .4byte 0x8003D300 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D498 ;# ptr + .4byte 0x8003D4B8 ;# ptr + .4byte 0x8003D480 ;# ptr + .4byte 0x8003D4DC ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D4FC ;# ptr + .4byte 0x8003D514 ;# ptr + .4byte 0x8003D63C ;# ptr + .4byte 0x8003D668 ;# ptr + .4byte 0x8003D690 ;# ptr + .4byte 0x8003D6A0 ;# ptr + .4byte 0x8003D680 ;# ptr + .4byte 0x8003D790 ;# ptr + .4byte 0x8003D6BC ;# ptr + .4byte 0x8003D6E8 ;# ptr + .4byte 0x8003D75C ;# ptr .global $$24657 $$24657: - .incbin "baserom.dol", 0x42D534, 0xAC + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D2DC ;# ptr + .4byte 0x8003D258 ;# ptr + .4byte 0x8003D258 ;# ptr .global ImmCommand ImmCommand: - .incbin "baserom.dol", 0x42D5E0, 0xC + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF .global $$25033 $$25033: - .incbin "baserom.dol", 0x42D5EC, 0xAC + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E6A4 ;# ptr + .4byte 0x8003E6A4 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E704 ;# ptr + .4byte 0x8003E684 ;# ptr + .4byte 0x8003E684 ;# ptr .global $$25032 $$25032: - .incbin "baserom.dol", 0x42D698, 0x38 + .4byte 0x8003E590 ;# ptr + .4byte 0x8003E590 ;# ptr + .4byte 0x8003E5B0 ;# ptr + .4byte 0x8003E614 ;# ptr + .4byte 0x8003E660 ;# ptr + .4byte 0x8003E730 ;# ptr + .4byte 0x8003E730 ;# ptr + .4byte 0x8003E730 ;# ptr + .4byte 0x8003E730 ;# ptr + .4byte 0x8003E87C ;# ptr + .4byte 0x8003E87C ;# ptr + .4byte 0x8003E590 ;# ptr + .4byte 0x8003E730 ;# ptr + .4byte 0x8003E82C ;# ptr .global $$25040 $$25040: - .incbin "baserom.dol", 0x42D6D0, 0x9C + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E93C ;# ptr + .4byte 0x8003E948 ;# ptr + .4byte 0x8003E948 ;# ptr .global $$25139 $$25139: - .incbin "baserom.dol", 0x42D76C, 0x3C + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBDC ;# ptr + .4byte 0x8003EB7C ;# ptr + .4byte 0x8003EB7C ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBDC ;# ptr + .4byte 0x8003EB7C ;# ptr + .4byte 0x8003EB7C ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0x8003EBAC ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDVersion __DVDVersion: - .incbin "baserom.dol", 0x4929B8, 0x4 + .4byte 0x80431260 .global autoInvalidation autoInvalidation: - .incbin "baserom.dol", 0x4929BC, 0x4 + .4byte 0x00000001 .global checkOptionalCommand checkOptionalCommand: - .incbin "baserom.dol", 0x4929C0, 0x4 + .4byte 0x8003A200 ;# ptr .global $$24254 $$24254: - .incbin "baserom.dol", 0x4929C4, 0x8 + .asciz "dvd.c" + .balign 4 .global DmaCommand DmaCommand: - .incbin "baserom.dol", 0x4929CC, 0x4 + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global __DVDTicketViewBuffer diff --git a/asm/dvd/dvdDeviceError.s b/asm/dvd/dvdDeviceError.s index 948f5eae..58e05586 100644 --- a/asm/dvd/dvdDeviceError.s +++ b/asm/dvd/dvdDeviceError.s @@ -196,40 +196,90 @@ lbl_800401C0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDDeviceErrorMessage __DVDDeviceErrorMessage: - .incbin "baserom.dol", 0x403988, 0x20 + .4byte 0x80431EA0 + .4byte 0x80431EDC + .4byte 0x80431F14 + .4byte 0x80431F54 + .4byte 0x80431F90 + .4byte 0x80431FCC + .4byte 0x80432008 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2835 $$2835: - .incbin "baserom.dol", 0x42DFA0, 0x3C + .4byte 0x0A0A0A83 + .4byte 0x47838981 + .4byte 0x5B835281 + .4byte 0x5B836882 + .4byte 0x4F824F82 + .4byte 0x5081420A + .4byte 0x957396BE + .4byte 0x82C88366 + .4byte 0x836F8343 + .4byte 0x835882AA + .4byte 0x8CA982C2 + .4byte 0x82A982E8 + .4byte 0x82DC82B5 + .4byte 0x82BD8142 + .4byte 0 .global $$2836 $$2836: - .incbin "baserom.dol", 0x42DFDC, 0x38 + .asciz "\n\n\nError #001,\nunauthorized device has been detected." + .balign 4 .global $$2837 $$2837: - .incbin "baserom.dol", 0x42E014, 0x40 + .4byte 0x0A0A0A46 + .4byte 0x65686C65 + .4byte 0x72202330 + .4byte 0x30313A0A + .4byte 0x45732077 + .4byte 0x75726465 + .4byte 0x2065696E + .4byte 0x6520756E + .4byte 0x7A756CE4 + .asciz "ssige Komponente\nentdeckt." + .balign 4 .global $$2838 $$2838: - .incbin "baserom.dol", 0x42E054, 0x3C + .4byte 0x0A0A0A45 + .4byte 0x72726575 + .4byte 0x72203030 + .4byte 0x313A0A75 + .4byte 0x6E206469 + .4byte 0x73706F73 + .4byte 0x69746966 + .4byte 0x206E6F6E + .4byte 0x20617574 + .4byte 0x6F726973 + .4byte 0xE9206120 + .4byte 0xE974E920 + .4byte 0x64E97465 + .4byte 0x6374E92E + .4byte 0 .global $$2839 $$2839: - .incbin "baserom.dol", 0x42E090, 0x3C + .asciz "\n\n\nError 001:\nSe ha detectado un dispositivo no\nautorizado." .global $$2840 $$2840: - .incbin "baserom.dol", 0x42E0CC, 0x3C + .asciz "\n\n\nErrore #001:\nrilevato un dispositivo non autorizzato." + .balign 4 .global $$2841 $$2841: - .incbin "baserom.dol", 0x42E108, 0x30 + .asciz "\n\n\nFout #001:\nongeoorloofd onderdeel gevonden." + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global lowDone lowDone: - .incbin "baserom.dol", 0x4929D8, 0x8 + .4byte 0x00000001 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2850 $$2850: - .incbin "baserom.dol", 0x4991E0, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global CheckBuffer diff --git a/asm/dvd/dvdFatal.s b/asm/dvd/dvdFatal.s index 3518e180..bd1859a1 100644 --- a/asm/dvd/dvdFatal.s +++ b/asm/dvd/dvdFatal.s @@ -116,58 +116,326 @@ __DVDPrintFatalMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDErrorMessageDefault __DVDErrorMessageDefault: - .incbin "baserom.dol", 0x403950, 0x1C + .4byte 0x804316D8 + .4byte 0x80431768 + .4byte 0x80431818 + .4byte 0x804318D0 + .4byte 0x80431980 + .4byte 0x80431A20 + .4byte 0x80431ACC .global __DVDErrorMessageEurope __DVDErrorMessageEurope: - .incbin "baserom.dol", 0x40396C, 0x1C + .4byte 0x804316D8 + .4byte 0x80431B60 + .4byte 0x80431818 + .4byte 0x80431C04 + .4byte 0x80431CA8 + .4byte 0x80431A20 + .4byte 0x80431ACC .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21462 $$21462: - .incbin "baserom.dol", 0x42D7D8, 0x90 + .4byte 0x0A0A0A83 + .4byte 0x47838981 + .4byte 0x5B82AA94 + .4byte 0xAD90B682 + .4byte 0xB582DC82 + .4byte 0xB582BD81 + .4byte 0x420A0A83 + .4byte 0x43835783 + .4byte 0x46834E83 + .4byte 0x67837B83 + .4byte 0x5E839382 + .4byte 0xF0899F82 + .4byte 0xB582C483 + .4byte 0x66834283 + .4byte 0x58834E82 + .4byte 0xF08EE682 + .4byte 0xE88F6F82 + .4byte 0xB582C482 + .4byte 0xA90A82E7 + .4byte 0x8141967B + .4byte 0x91CC82CC + .4byte 0x93648CB9 + .4byte 0x82F04F46 + .4byte 0x4682C982 + .4byte 0xB582C481 + .4byte 0x41967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182CC0A + .4byte 0x8E778EA6 + .4byte 0x82C98F5D + .4byte 0x82C182C4 + .4byte 0x82AD82BE + .4byte 0x82B382A2 + .4byte 0x81420000 .global $$21463 $$21463: - .incbin "baserom.dol", 0x42D868, 0xB0 + .asciz "\n\n\nAn error has occurred.\nPress the Eject Button, remove the\nGame Disc, and turn off the power to the\nconsole. Please read the Wii Operations\nManual for further instructions." + .balign 4 .global $$21464 $$21464: - .incbin "baserom.dol", 0x42D918, 0xB8 + .4byte 0x0A0A0A45 + .4byte 0x696E2046 + .4byte 0x65686C65 + .4byte 0x72206973 + .4byte 0x74206175 + .4byte 0x66676574 + .4byte 0x72657465 + .4byte 0x6E2E0A44 + .4byte 0x72FC636B + .asciz "e den Ausgabeknopf, entnimm die\nDisc und schalte die Wii-Konsole aus.\nBitte lies die Wii-Bedienungsanleitung,\num weitere Informationen zu erhalten." .global $$21465 $$21465: - .incbin "baserom.dol", 0x42D9D0, 0xB0 + .4byte 0x0A0A0A55 + .4byte 0x6E652065 + .4byte 0x72726575 + .4byte 0x72206573 + .4byte 0x74207375 + .4byte 0x7276656E + .4byte 0x75652E0A + .4byte 0x41707075 + .4byte 0x79657A20 + .4byte 0x73757220 + .4byte 0x6C652062 + .4byte 0x6F75746F + .4byte 0x6E20454A + .4byte 0x4543542C + .4byte 0x20726574 + .4byte 0x6972657A + .4byte 0x0A6C6520 + .4byte 0x64697371 + .4byte 0x75652065 + .4byte 0x7420E974 + .4byte 0x6569676E + .4byte 0x657A206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x652E0A56 + .4byte 0x6575696C + .4byte 0x6C657A20 + .4byte 0x766F7573 + .4byte 0x2072E966 + .4byte 0xE9726572 + .4byte 0x20617520 + .4byte 0x4D6F6465 + .4byte 0x20642765 + .4byte 0x6D706C6F + .4byte 0x690A6465 + .4byte 0x206C6120 + .4byte 0x57696920 + .4byte 0x706F7572 + .4byte 0x20706C75 + .4byte 0x73206465 + .4byte 0x2064E974 + .asciz "ails." + .balign 4 + .4byte 0 .global $$21466 $$21466: - .incbin "baserom.dol", 0x42DA80, 0xA0 + .4byte 0x0A0A0A4F + .4byte 0x63757272 + .4byte 0x69F32075 + .4byte 0x6E204572 + .4byte 0x726F722E + .4byte 0x0A4F7072 + .4byte 0x696D6520 + .4byte 0x656C2042 + .4byte 0x6F74F36E + .4byte 0x20454A45 + .4byte 0x43542C20 + .4byte 0x73616361 + .4byte 0x20656C20 + .4byte 0x64697363 + .4byte 0x6F0A7920 + .4byte 0x61706167 + .4byte 0x61206C61 + .4byte 0x20636F6E + .4byte 0x736F6C61 + .4byte 0x2E20436F + .4byte 0x6E73756C + .4byte 0x74612065 + .4byte 0x6C206D61 + .4byte 0x6E75616C + .4byte 0x0A646520 + .4byte 0x6F706572 + .4byte 0x6163696F + .4byte 0x6E657320 + .4byte 0x6465206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x69207061 + .4byte 0x72610A6F + .4byte 0x6274656E + .4byte 0x6572206D + .4byte 0xE1732069 + .4byte 0x6E666F72 + .4byte 0x6D616369 + .4byte 0xF36E2E00 .global $$21467 $$21467: - .incbin "baserom.dol", 0x42DB20, 0xAC + .4byte 0x0A0A0A53 + .4byte 0x6920E820 + .asciz "verificato un errore.\nPremi il pulsante EJECT, estrai il disco\ne spegni la console. Per maggiori\ninformazioni, consulta il manuale di\nistruzioni della console Wii." .global $$21468 $$21468: - .incbin "baserom.dol", 0x42DBCC, 0x94 + .asciz "\n\n\nEr is een fout opgetreden.\nDruk op de EJECT-knop, verwijder de\ndisk en zet het Wii-systeem uit. Lees\nde Wii-handleiding voor meer informatie." + .balign 4 .global $$21469 $$21469: - .incbin "baserom.dol", 0x42DC60, 0xA4 + .asciz "\n\n\nAn error has occurred.\nPress the EJECT Button, remove the Disc,\nand turn off the power to the console.\nPlease refer to the Wii Operations Manual\nfor details." + .balign 4 .global $$21470 $$21470: - .incbin "baserom.dol", 0x42DD04, 0xA4 + .4byte 0x0A0A0A55 + .4byte 0x6E652065 + .4byte 0x72726575 + .4byte 0x72206573 + .4byte 0x74207375 + .4byte 0x7276656E + .4byte 0x75652E0A + .4byte 0x41707075 + .4byte 0x79657A20 + .4byte 0x73757220 + .4byte 0x6C652062 + .4byte 0x6F75746F + .4byte 0x6E20454A + .4byte 0x4543542C + .4byte 0x20726574 + .4byte 0x6972657A + .4byte 0x0A6C6520 + .4byte 0x64697371 + .4byte 0x75652065 + .4byte 0x7420E974 + .4byte 0x6569676E + .4byte 0x657A206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x652E0A56 + .4byte 0x6575696C + .4byte 0x6C657A20 + .4byte 0x766F7573 + .4byte 0x2072E966 + .4byte 0xE9726572 + .4byte 0x20617520 + .4byte 0x6D6F6465 + .4byte 0x20642765 + .4byte 0x6D706C6F + .4byte 0x690A5769 + .4byte 0x6920706F + .4byte 0x75722070 + .4byte 0x6C757320 + .4byte 0x64652064 + .4byte 0xE9746169 + .4byte 0x6C732E00 .global $$21471 $$21471: - .incbin "baserom.dol", 0x42DDA8, 0xAC + .4byte 0x0A0A0A53 + .4byte 0x65206861 + .4byte 0x2070726F + .4byte 0x64756369 + .4byte 0x646F2075 + .4byte 0x6E206572 + .4byte 0x726F722E + .4byte 0x0A50756C + .4byte 0x73612065 + .4byte 0x6C20426F + .4byte 0x74F36E20 + .4byte 0x454A4543 + .4byte 0x542C2065 + .4byte 0x78747261 + .4byte 0x6520656C + .4byte 0x20646973 + .4byte 0x636F2079 + .4byte 0x0A617061 + .4byte 0x6761206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x612E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C206465 + .4byte 0x0A696E73 + .4byte 0x74727563 + .4byte 0x63696F6E + .4byte 0x65732064 + .4byte 0x65206C61 + .4byte 0x20636F6E + .4byte 0x736F6C61 + .4byte 0x20576969 + .4byte 0x20706172 + .4byte 0x610A6F62 + .4byte 0x74656E65 + .4byte 0x72206DE1 + .4byte 0x7320696E + .4byte 0x666F726D + .4byte 0x616369F3 + .4byte 0x6E2E0000 .global $$21472 $$21472: - .incbin "baserom.dol", 0x42DE54, 0xA4 + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688250 + .4byte 0x824F8253 + .4byte 0x81420A83 + .4byte 0x47838981 + .4byte 0x5B82AA94 + .4byte 0xAD90B682 + .4byte 0xB582DC82 + .4byte 0xB582BD81 + .4byte 0x420A0A83 + .4byte 0x43835783 + .4byte 0x46834E83 + .4byte 0x67837B83 + .4byte 0x5E839382 + .4byte 0xF0899F82 + .4byte 0xB582C483 + .4byte 0x66834283 + .4byte 0x58834E82 + .4byte 0xF08EE682 + .4byte 0xE88F6F82 + .4byte 0xB582C482 + .4byte 0xA90A82E7 + .4byte 0x8141967B + .4byte 0x91CC82CC + .4byte 0x93648CB9 + .4byte 0x82F04F46 + .4byte 0x4682C982 + .4byte 0xB582C481 + .4byte 0x41967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182CC0A + .4byte 0x8E778EA6 + .4byte 0x82C98F5D + .4byte 0x82C182C4 + .4byte 0x82AD82BE + .4byte 0x82B382A2 + .4byte 0x81420000 .global $$21473 $$21473: - .incbin "baserom.dol", 0x42DEF8, 0xA8 + .asciz "\n\nError #104,\nAn error has occurred.\nPress the EJECT Button, remove the\nGame Disc, and turn the power off.\nPlease read the Wii Operations Manual\nfor more information." + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDErrorMessageChinaKorea __DVDErrorMessageChinaKorea: - .incbin "baserom.dol", 0x4929D0, 0x8 + .4byte 0x80431D54 + .4byte 0x80431DF8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21482 $$21482: - .incbin "baserom.dol", 0x4991D8, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global FatalFunc diff --git a/asm/dvd/dvd_broadway.s b/asm/dvd/dvd_broadway.s index 7e7ef7be..18122fed 100644 --- a/asm/dvd/dvd_broadway.s +++ b/asm/dvd/dvd_broadway.s @@ -2765,222 +2765,283 @@ lbl_80042840: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23815 $$23815: - .incbin "baserom.dol", 0x42E138, 0x34 + .asciz "(doTransactionCallback) Error - context mangled!\n" + .balign 4 .global $$23822 $$23822: - .incbin "baserom.dol", 0x42E16C, 0x2C + .asciz "(doCoverCallback) Error - context mangled!\n" .global $$23832 $$23832: - .incbin "baserom.dol", 0x42E198, 0x28 + .asciz "(DVDLowFinish) Error: IOS_Close failed\n" .global $$23852 $$23852: - .incbin "baserom.dol", 0x42E1C0, 0x20 + .asciz "IPCCltInit returned error: %d\n" + .balign 4 .global $$23853 $$23853: - .incbin "baserom.dol", 0x42E1E0, 0x3C + .asciz "(ddrAllocAligned32) Not enough space to allocate %d bytes\n" + .balign 4 .global $$23854 $$23854: - .incbin "baserom.dol", 0x42E21C, 0x28 + .asciz "Allocation of diCommand blocks failed\n" + .balign 4 .global $$23855 $$23855: - .incbin "baserom.dol", 0x42E244, 0x20 + .asciz "Allocation of pathBuf failed\n" + .balign 4 .global $$23857 $$23857: - .incbin "baserom.dol", 0x42E264, 0x4C + .asciz "(DVDLowInit) Error: IOS_Open failed - pathname '/dev/di' does not exist\n" + .balign 4 .global $$23858 $$23858: - .incbin "baserom.dol", 0x42E2B0, 0x48 + .asciz "(DVDLowInit) Error: IOS_Open failed - calling thread lacks permission\n" + .balign 4 .global $$23859 $$23859: - .incbin "baserom.dol", 0x42E2F8, 0x4C + .asciz "(DVDLowInit) Error: IOS_Open failed - connection limit has been reached\n" + .balign 4 .global $$23860 $$23860: - .incbin "baserom.dol", 0x42E344, 0x34 + .asciz "(DVDLowInit) IOS_Open failed, errorcode = %d\n" + .balign 4 + .4byte 0 .global $$23870 $$23870: - .incbin "baserom.dol", 0x42E378, 0x38 + .asciz "(newContext) ERROR: freeDvdContext.inUse (#%d) is true\n" .global $$23871 $$23871: - .incbin "baserom.dol", 0x42E3B0, 0x30 + .asciz "(newContext) Now spinning in infinite loop\n" + .4byte 0 .global $$23872 $$23872: - .incbin "baserom.dol", 0x42E3E0, 0x40 + .asciz "(newContext) Something overwrote the context magic - spinning \n" .global $$23873 $$23873: - .incbin "baserom.dol", 0x42E420, 0x3C + .asciz "@@@@@@ WARNING - Calling DVDLowReadDiskId with NULL ptr\n" + .balign 4 .global $$23874 $$23874: - .incbin "baserom.dol", 0x42E45C, 0x3C + .asciz "@@@ (DVDLowReadDiskID) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$23892 $$23892: - .incbin "baserom.dol", 0x42E498, 0x38 + .asciz "(DVDLowOpenPartition) eTicket memory is unaligned\n" + .balign 4 + .4byte 0 .global $$23893 $$23893: - .incbin "baserom.dol", 0x42E4D0, 0x38 + .asciz "(DVDLowOpenPartition) certificates memory is unaligned\n" .global $$23894 $$23894: - .incbin "baserom.dol", 0x42E508, 0x40 + .asciz "@@@ (DVDLowOpenPartition) IOS_IoctlvAsync returned error: %d\n" + .balign 4 .global __FUNCTION__$2461 __FUNCTION__$2461: - .incbin "baserom.dol", 0x42E548, 0x24 + .asciz "DVDLowOpenPartitionWithTmdAndTicket" .global $$23915 $$23915: - .incbin "baserom.dol", 0x42E56C, 0x24 + .asciz "(%s) eTicket memory is unaligned\n" + .balign 4 .global $$23916 $$23916: - .incbin "baserom.dol", 0x42E590, 0x24 + .asciz "(%s) tmd parameter cannot be NULL\n" + .balign 4 .global $$23917 $$23917: - .incbin "baserom.dol", 0x42E5B4, 0x20 + .asciz "(%s) tmd memory is unaligned\n" + .balign 4 .global $$23918 $$23918: - .incbin "baserom.dol", 0x42E5D4, 0x2C + .asciz "(%s) eTicket parameter cannot be NULL\n" + .balign 4 + .4byte 0 .global __FUNCTION__$2494 __FUNCTION__$2494: - .incbin "baserom.dol", 0x42E600, 0x28 + .asciz "DVDLowOpenPartitionWithTmdAndTicketView" .global $$23938 $$23938: - .incbin "baserom.dol", 0x42E628, 0x2C + .asciz "(%s) eTicketView parameter cannot be NULL\n" + .balign 4 .global $$23939 $$23939: - .incbin "baserom.dol", 0x42E654, 0x28 + .asciz "(%s) eTicketView memory is unaligned\n" + .balign 4 .global __FUNCTION__$2521 __FUNCTION__$2521: - .incbin "baserom.dol", 0x42E67C, 0x1C + .asciz "DVDLowGetNoDiscBufferSizes" + .balign 4 .global $$23956 $$23956: - .incbin "baserom.dol", 0x42E698, 0x24 + .asciz "(%s) Error: NULL pointer argument\n" + .balign 4 .global $$23957 $$23957: - .incbin "baserom.dol", 0x42E6BC, 0x28 + .asciz "(%s) numTmdBytes memory is unaligned\n" + .balign 4 .global $$23958 $$23958: - .incbin "baserom.dol", 0x42E6E4, 0x28 + .asciz "(%s) certificates memory is unaligned\n" + .balign 4 .global $$23959 $$23959: - .incbin "baserom.dol", 0x42E70C, 0x30 + .asciz "@@@ (%s) IOS_IoctlvAsync returned error: %d\n" + .balign 4 .global __FUNCTION__$2544 __FUNCTION__$2544: - .incbin "baserom.dol", 0x42E73C, 0x24 + .asciz "DVDLowGetNoDiscOpenPartitionParams" + .balign 4 .global $$23975 $$23975: - .incbin "baserom.dol", 0x42E760, 0x24 + .asciz "(%s) pointer argument is unaligned\n" .global __FUNCTION__$2575 __FUNCTION__$2575: - .incbin "baserom.dol", 0x42E784, 0x1C + .asciz "DVDLowNoDiscOpenPartition" + .balign 4 .global $$24008 $$24008: - .incbin "baserom.dol", 0x42E7A0, 0x40 + .asciz "@@@ (DVDLowClosePartition) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24018 $$24018: - .incbin "baserom.dol", 0x42E7E0, 0x40 + .asciz "@@@ (DVDLowUnencryptedRead) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24029 $$24029: - .incbin "baserom.dol", 0x42E820, 0x3C + .asciz "@@@ (DVDLowStopMotor) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24039 $$24039: - .incbin "baserom.dol", 0x42E85C, 0x44 + .asciz "@@@ (DVDLowWaitForCoverClose) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24049 $$24049: - .incbin "baserom.dol", 0x42E8A0, 0x38 + .asciz "@@@ (DVDLowInquiry) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24060 $$24060: - .incbin "baserom.dol", 0x42E8D8, 0x3C + .asciz "@@@ (DVDLowRequestError) IOS_IoctlAsync returned error: %d\n" .global $$24067 $$24067: - .incbin "baserom.dol", 0x42E914, 0x48 + .asciz "(DVDLowSetSpinupFlag): Synch functions can't be called in callbacks\n" + .balign 4 .global $$24068 $$24068: - .incbin "baserom.dol", 0x42E95C, 0x3C + .asciz "@@@ (DVDLowNotifyReset) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24077 $$24077: - .incbin "baserom.dol", 0x42E998, 0x38 + .asciz "@@@ (DVDLowReset) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24087 $$24087: - .incbin "baserom.dol", 0x42E9D0, 0x44 + .asciz "@@@ (DVDLowAudioBufferConfig) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24101 $$24101: - .incbin "baserom.dol", 0x42EA14, 0x48 + .asciz "(DVDLowGetCoverStatus): Synch functions can't be called in callbacks\n" + .balign 4 .global $$24102 $$24102: - .incbin "baserom.dol", 0x42EA5C, 0x3C + .asciz "@@@ (DVDLowGetCoverStatus) IOS_Ioctl returned error: %d\n" + .balign 4 .global $$24115 $$24115: - .incbin "baserom.dol", 0x42EA98, 0x38 + .asciz "@@@ (DVDLowReadDVD) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24126 $$24126: - .incbin "baserom.dol", 0x42EAD0, 0x40 + .asciz "@@@ (DVDLowReadDVDConfig) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24136 $$24136: - .incbin "baserom.dol", 0x42EB10, 0x40 + .asciz "@@@ (DVDLowReadDvdCopyright) IOS_IoctlAsync returned error: %d\n" .global $$24146 $$24146: - .incbin "baserom.dol", 0x42EB50, 0x40 + .asciz "@@@ (DVDLowReadDvdPhysical) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24157 $$24157: - .incbin "baserom.dol", 0x42EB90, 0x40 + .asciz "@@@ (DVDLowReadDvdDiscKey) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24168 $$24168: - .incbin "baserom.dol", 0x42EBD0, 0x3C + .asciz "@@@ (DVDLowReportKey) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24181 $$24181: - .incbin "baserom.dol", 0x42EC0C, 0x38 + .asciz "@@@ (DVDLowOffset) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24191 $$24191: - .incbin "baserom.dol", 0x42EC44, 0x3C + .asciz "@@@ (DVDLowStopLaser) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24201 $$24201: - .incbin "baserom.dol", 0x42EC80, 0x3C + .asciz "@@@ (DVDLowReadDiskBca) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24212 $$24212: - .incbin "baserom.dol", 0x42ECBC, 0x40 + .asciz "@@@ (DVDLowSerMeasControl) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24223 $$24223: - .incbin "baserom.dol", 0x42ECFC, 0x44 + .asciz "@@@ (DVDLowRequestDiscStatus) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24233 $$24233: - .incbin "baserom.dol", 0x42ED40, 0x44 + .asciz "@@@ (DVDLowRequestRetryNumber) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24243 $$24243: - .incbin "baserom.dol", 0x42ED84, 0x40 + .asciz "@@@ (DVDLowSetMaxRotation) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24254 $$24254: - .incbin "baserom.dol", 0x42EDC4, 0x40 + .asciz "(DVDLowRead): ERROR - destAddr buffer is not 32 byte aligned\n" + .balign 4 .global $$24255 $$24255: - .incbin "baserom.dol", 0x42EE04, 0x34 + .asciz "@@@ (DVDLowRead) IOS_IoctlAsync returned error: %d\n" .global $$24266 $$24266: - .incbin "baserom.dol", 0x42EE38, 0x34 + .asciz "@@@ (DVDLowSeek) IOS_IoctlAsync returned error: %d\n" .global $$24272 $$24272: - .incbin "baserom.dol", 0x42EE6C, 0x44 + .asciz "(DVDLowGetCoverReg): Synch functions can't be called in callbacks\n" + .balign 4 .global $$24273 $$24273: - .incbin "baserom.dol", 0x42EEB0, 0x38 + .asciz "@@@ (DVDLowGetCoverReg) IOS_Ioctl returned error: %d\n" + .balign 4 .global $$24285 $$24285: - .incbin "baserom.dol", 0x42EEE8, 0x44 + .asciz "@@@ (DVDLowPrepareCoverRegsiter) IOS_IoctlAsync returned error: %d\n" .global $$24295 $$24295: - .incbin "baserom.dol", 0x42EF2C, 0x48 + .asciz "@@@ (DVDLowPrepareStatusRegsiter) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24305 $$24305: - .incbin "baserom.dol", 0x42EF74, 0x48 + .asciz "@@@ (DVDLowPrepareControlRegister) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24320 $$24320: - .incbin "baserom.dol", 0x42EFBC, 0x44 + .asciz "@@@ (DVDLowClearCoverInterrupt) IOS_IoctlAsync returned error: %d\n" + .balign 4 .global $$24332 $$24332: - .incbin "baserom.dol", 0x42F000, 0x40 + .asciz "@@@ (DVDLowEnableDvdVideo) IOS_IoctlAsync returned error: %d\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global DiFD DiFD: - .incbin "baserom.dol", 0x4929E0, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .global $$23856 $$23856: - .incbin "baserom.dol", 0x4929E8, 0x8 + .asciz "/dev/di" .section .bss, "wa" # 0x80496700 - 0x805643FC .global dvdContexts diff --git a/asm/dvd/dvderror.s b/asm/dvd/dvderror.s index a7c41f7a..d93f54d4 100644 --- a/asm/dvd/dvderror.s +++ b/asm/dvd/dvderror.s @@ -725,10 +725,12 @@ __DVDStoreErrorCode: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21459 $$21459: - .incbin "baserom.dol", 0x42D7A8, 0x1C + .asciz "/shared2/test2/dvderror.dat" .global $$21478 $$21478: - .incbin "baserom.dol", 0x42D7C4, 0x14 + .asciz "/shared2/test2" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global NandInfo diff --git a/asm/dvd/dvdfs.s b/asm/dvd/dvdfs.s index 77a9c954..7c43f42b 100644 --- a/asm/dvd/dvdfs.s +++ b/asm/dvd/dvdfs.s @@ -638,24 +638,28 @@ cbForReadSync: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21638 $$21638: - .incbin "baserom.dol", 0x42D1F8, 0xC8 + .asciz "DVDConvertEntrynumToPath(possibly DVDOpen or DVDChangeDir or DVDOpenDir): specified directory or file (%s) doesn't match standard 8.3 format. This is a temporary restriction and will be removed soon\n" .global $$21688 $$21688: - .incbin "baserom.dol", 0x42D2C0, 0x38 + .asciz "Warning: DVDOpen(): file '%s' was not found under %s.\n" + .balign 4 .global $$21762 $$21762: - .incbin "baserom.dol", 0x42D2F8, 0x34 + .asciz "DVDReadAsync(): specified area is out of the file " .global $$21787 $$21787: - .incbin "baserom.dol", 0x42D32C, 0x34 + .asciz "DVDRead(): specified area is out of the file " + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDLongFileNameFlag __DVDLongFileNameFlag: - .incbin "baserom.dol", 0x4929A8, 0x8 + .4byte 0x00000001 + .4byte 0 .global $$21637 $$21637: - .incbin "baserom.dol", 0x4929B0, 0x8 + .asciz "dvdfs.c" .section .bss, "wa" # 0x80496700 - 0x805643FC .global currentDirectory diff --git a/asm/enc/encutility.s b/asm/enc/encutility.s index cb1b9af5..94fb1168 100644 --- a/asm/enc/encutility.s +++ b/asm/enc/encutility.s @@ -177,12 +177,14 @@ lbl_8004D974: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2669 $$2669: - .incbin "baserom.dol", 0x434550, 0x48 + .asciz "<< RVL_SDK - ENC \trelease build: Aug 23 2010 17:34:07 (0x4302_145) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __ENCVersion __ENCVersion: - .incbin "baserom.dol", 0x492B78, 0x8 + .4byte 0x80438450 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global encRegistered diff --git a/asm/esp/esp.s b/asm/esp/esp.s index 22a64306..98a0e866 100644 --- a/asm/esp/esp.s +++ b/asm/esp/esp.s @@ -459,7 +459,8 @@ lbl_800A2628: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __esFd __esFd: - .incbin "baserom.dol", 0x492D28, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .global $$21766 $$21766: - .incbin "baserom.dol", 0x492D30, 0x8 + .asciz "/dev/es" diff --git a/asm/exi/EXIBios.s b/asm/exi/EXIBios.s index 9ed900ab..05ec1bd6 100644 --- a/asm/exi/EXIBios.s +++ b/asm/exi/EXIBios.s @@ -1781,12 +1781,14 @@ lbl_80029ED0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42BC40, 0x48 + .asciz "<< RVL_SDK - EXI \trelease build: Aug 23 2010 17:30:08 (0x4302_145) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __EXIVersion __EXIVersion: - .incbin "baserom.dol", 0x4928F8, 0x8 + .4byte 0x8042FB40 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global Ecb diff --git a/asm/exi/EXICommon.s b/asm/exi/EXICommon.s index 0e1c5bf1..fe604697 100644 --- a/asm/exi/EXICommon.s +++ b/asm/exi/EXICommon.s @@ -114,4 +114,5 @@ lbl_8002A39C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __EXIFreq __EXIFreq: - .incbin "baserom.dol", 0x499068, 0x8 + .4byte 0x00000004 + .4byte 0 diff --git a/asm/fs/fs.s b/asm/fs/fs.s index bdc39c65..b7113caa 100644 --- a/asm/fs/fs.s +++ b/asm/fs/fs.s @@ -1658,15 +1658,18 @@ lbl_80052288: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21709 $$21709: - .incbin "baserom.dol", 0x434608, 0x28 + .asciz "APP ERROR: Not enough IPC arena\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __fsFd __fsFd: - .incbin "baserom.dol", 0x492B90, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .global $$21710 $$21710: - .incbin "baserom.dol", 0x492B98, 0x8 + .asciz "/dev/fs" .section .bss, "wa" # 0x80496700 - 0x805643FC .global __fsInitialized diff --git a/asm/gx/GXAttr.s b/asm/gx/GXAttr.s index 7c09af37..c964c772 100644 --- a/asm/gx/GXAttr.s +++ b/asm/gx/GXAttr.s @@ -1077,30 +1077,149 @@ GXSetNumTexGens: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23194 $$23194: - .incbin "baserom.dol", 0x42CB70, 0x68 + .4byte 0x800337C0 ;# ptr + .4byte 0x800337D4 ;# ptr + .4byte 0x800337E8 ;# ptr + .4byte 0x800337FC ;# ptr + .4byte 0x80033810 ;# ptr + .4byte 0x80033824 ;# ptr + .4byte 0x80033838 ;# ptr + .4byte 0x8003384C ;# ptr + .4byte 0x80033860 ;# ptr + .4byte 0x80033874 ;# ptr + .4byte 0x80033888 ;# ptr + .4byte 0x800338F0 ;# ptr + .4byte 0x80033904 ;# ptr + .4byte 0x80033918 ;# ptr + .4byte 0x8003392C ;# ptr + .4byte 0x80033940 ;# ptr + .4byte 0x80033954 ;# ptr + .4byte 0x80033968 ;# ptr + .4byte 0x8003397C ;# ptr + .4byte 0x80033990 ;# ptr + .4byte 0x800339A4 ;# ptr + .4byte 0x800339B4 ;# ptr + .4byte 0x800339B4 ;# ptr + .4byte 0x800339B4 ;# ptr + .4byte 0x800339B4 ;# ptr + .4byte 0x800338BC ;# ptr .global $$23337 $$23337: - .incbin "baserom.dol", 0x42CBD8, 0x68 + .4byte 0x80033C10 ;# ptr + .4byte 0x80033C20 ;# ptr + .4byte 0x80033C30 ;# ptr + .4byte 0x80033C40 ;# ptr + .4byte 0x80033C50 ;# ptr + .4byte 0x80033C60 ;# ptr + .4byte 0x80033C70 ;# ptr + .4byte 0x80033C80 ;# ptr + .4byte 0x80033C90 ;# ptr + .4byte 0x80033CA0 ;# ptr + .4byte 0x80033CB0 ;# ptr + .4byte 0x80033CF8 ;# ptr + .4byte 0x80033D08 ;# ptr + .4byte 0x80033D18 ;# ptr + .4byte 0x80033D28 ;# ptr + .4byte 0x80033D38 ;# ptr + .4byte 0x80033D48 ;# ptr + .4byte 0x80033D58 ;# ptr + .4byte 0x80033D68 ;# ptr + .4byte 0x80033D78 ;# ptr + .4byte 0x80033D88 ;# ptr + .4byte 0x80033D98 ;# ptr + .4byte 0x80033D98 ;# ptr + .4byte 0x80033D98 ;# ptr + .4byte 0x80033D98 ;# ptr + .4byte 0x80033CD4 ;# ptr .global $$23383 $$23383: - .incbin "baserom.dol", 0x42CC40, 0x44 + .4byte 0x80033E20 ;# ptr + .4byte 0x80033E38 ;# ptr + .4byte 0x80033E74 ;# ptr + .4byte 0x80033E88 ;# ptr + .4byte 0x80033E9C ;# ptr + .4byte 0x80033EB4 ;# ptr + .4byte 0x80033ECC ;# ptr + .4byte 0x80033EE4 ;# ptr + .4byte 0x80033EFC ;# ptr + .4byte 0x80033F1C ;# ptr + .4byte 0x80033F34 ;# ptr + .4byte 0x80033F4C ;# ptr + .4byte 0x80033F60 ;# ptr + .4byte 0x80033F60 ;# ptr + .4byte 0x80033F60 ;# ptr + .4byte 0x80033F60 ;# ptr + .4byte 0x80033E38 ;# ptr .global $$23413 $$23413: - .incbin "baserom.dol", 0x42CC84, 0x44 + .4byte 0x80033FD8 ;# ptr + .4byte 0x80033FF0 ;# ptr + .4byte 0x8003402C ;# ptr + .4byte 0x80034040 ;# ptr + .4byte 0x80034054 ;# ptr + .4byte 0x8003406C ;# ptr + .4byte 0x80034084 ;# ptr + .4byte 0x8003409C ;# ptr + .4byte 0x800340B4 ;# ptr + .4byte 0x800340D4 ;# ptr + .4byte 0x800340EC ;# ptr + .4byte 0x80034104 ;# ptr + .4byte 0x80034118 ;# ptr + .4byte 0x80034118 ;# ptr + .4byte 0x80034118 ;# ptr + .4byte 0x80034118 ;# ptr + .4byte 0x80033FF0 ;# ptr .global $$23456 $$23456: - .incbin "baserom.dol", 0x42CCC8, 0x44 + .4byte 0x80034210 ;# ptr + .4byte 0x80034238 ;# ptr + .4byte 0x8003429C ;# ptr + .4byte 0x800342C0 ;# ptr + .4byte 0x800342E4 ;# ptr + .4byte 0x8003430C ;# ptr + .4byte 0x80034334 ;# ptr + .4byte 0x8003435C ;# ptr + .4byte 0x80034384 ;# ptr + .4byte 0x800343AC ;# ptr + .4byte 0x800343D4 ;# ptr + .4byte 0x800343FC ;# ptr + .4byte 0x80034424 ;# ptr + .4byte 0x80034424 ;# ptr + .4byte 0x80034424 ;# ptr + .4byte 0x80034424 ;# ptr + .4byte 0x80034238 ;# ptr .global $$23589 $$23589: - .incbin "baserom.dol", 0x42CD0C, 0x54 + .4byte 0x800344BC ;# ptr + .4byte 0x800344C8 ;# ptr + .4byte 0x800344D4 ;# ptr + .4byte 0x800344E0 ;# ptr + .4byte 0x800344FC ;# ptr + .4byte 0x80034504 ;# ptr + .4byte 0x8003450C ;# ptr + .4byte 0x80034514 ;# ptr + .4byte 0x8003451C ;# ptr + .4byte 0x80034524 ;# ptr + .4byte 0x8003452C ;# ptr + .4byte 0x80034534 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x80034538 ;# ptr + .4byte 0x800344EC ;# ptr + .4byte 0x800344F4 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl1 $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl1: - .incbin "baserom.dol", 0x492950, 0x4 + .4byte 0x00040102 .global $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl2$$20 $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl2$$20: - .incbin "baserom.dol", 0x492954, 0x4 + .4byte 0x00080102 .global $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl3$$21 $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl3$$21: - .incbin "baserom.dol", 0x492958, 0x8 + .4byte 0x000C0102 + .4byte 0 diff --git a/asm/gx/GXBump.s b/asm/gx/GXBump.s index 5b3130b0..c4bb3a1b 100644 --- a/asm/gx/GXBump.s +++ b/asm/gx/GXBump.s @@ -318,4 +318,5 @@ __GXFlushTextureState: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22555 $$22555: - .incbin "baserom.dol", 0x499168, 0x8 + .4byte 0x44800000 + .4byte 0 diff --git a/asm/gx/GXFifo.s b/asm/gx/GXFifo.s index 3c277fab..912edc19 100644 --- a/asm/gx/GXFifo.s +++ b/asm/gx/GXFifo.s @@ -695,10 +695,12 @@ GXResetOverflowCount: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21961 $$21961: - .incbin "baserom.dol", 0x42CB40, 0x18 + .asciz "CPUFifo: %08X - %08X\n" + .balign 4 .global $$21962 $$21962: - .incbin "baserom.dol", 0x42CB58, 0x18 + .asciz "GP Fifo: %08X - %08X\n" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global GPFifo diff --git a/asm/gx/GXFrameBuf.s b/asm/gx/GXFrameBuf.s index 4fb6b00b..5b20ca42 100644 --- a/asm/gx/GXFrameBuf.s +++ b/asm/gx/GXFrameBuf.s @@ -599,18 +599,75 @@ GXClearBoundingBox: .section .data, "wa" # 0x80421040 - 0x80496700 .global GXNtsc480IntDf GXNtsc480IntDf: - .incbin "baserom.dol", 0x42CD60, 0x3C + .4byte 0 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 .global GXMpal480IntDf GXMpal480IntDf: - .incbin "baserom.dol", 0x42CD9C, 0x3C + .4byte 0x00000008 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 .global GXPal528IntDf GXPal528IntDf: - .incbin "baserom.dol", 0x42CDD8, 0x3C + .4byte 0x00000004 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 .global GXEurgb60Hz480IntDf GXEurgb60Hz480IntDf: - .incbin "baserom.dol", 0x42CE14, 0x3C + .4byte 0x00000014 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22195 $$22195: - .incbin "baserom.dol", 0x4990F0, 0x8 + .4byte 0x43800000 + .4byte 0 diff --git a/asm/gx/GXInit.s b/asm/gx/GXInit.s index 5e28dc7f..9ffc876c 100644 --- a/asm/gx/GXInit.s +++ b/asm/gx/GXInit.s @@ -1179,53 +1179,178 @@ lbl_80032CA8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42C900, 0x60 + .asciz "<< RVL_SDK - GX \trelease build: Aug 23 2010 17:32:50 (0x4302_145) >>" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global DefaultTexData DefaultTexData: - .incbin "baserom.dol", 0x42C960, 0x20 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF .global GXDefaultVATList GXDefaultVATList: - .incbin "baserom.dol", 0x42C980, 0xD0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000A + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000011 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000013 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0 .global GXDefaultProjData GXDefaultProjData: - .incbin "baserom.dol", 0x42CA50, 0x20 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xC0000000 + .4byte 0 + .4byte 0 .global GXTexRegionAddrTable GXTexRegionAddrTable: - .incbin "baserom.dol", 0x42CA70, 0xC0 + .4byte 0 + .4byte 0x00010000 + .4byte 0x00020000 + .4byte 0x00030000 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00008000 + .4byte 0x00018000 + .4byte 0x00028000 + .4byte 0x00038000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0 + .4byte 0x00090000 + .4byte 0x00020000 + .4byte 0x000B0000 + .4byte 0x00040000 + .4byte 0x00098000 + .4byte 0x00060000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00010000 + .4byte 0x000A0000 + .4byte 0x00030000 + .4byte 0x00088000 + .4byte 0x00050000 + .4byte 0x000A8000 + .4byte 0x00070000 + .4byte 0 + .4byte 0x00090000 + .4byte 0x00020000 + .4byte 0x000B0000 + .4byte 0x00040000 + .4byte 0x00090000 + .4byte 0x00060000 + .4byte 0x000B0000 + .4byte 0x00080000 + .4byte 0x00010000 + .4byte 0x000A0000 + .4byte 0x00030000 + .4byte 0x00080000 + .4byte 0x00050000 + .4byte 0x000A0000 + .4byte 0x00070000 .global GXShutdownFuncInfo GXShutdownFuncInfo: - .incbin "baserom.dol", 0x42CB30, 0x10 + .4byte 0x80031D40 ;# ptr + .4byte 0x0000007F + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __GXVersion __GXVersion: - .incbin "baserom.dol", 0x492948, 0x8 + .4byte 0x80430800 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __GXData __GXData: - .incbin "baserom.dol", 0x4990C8, 0x4 + .4byte 0x8049A780 .global $$22712 $$22712: - .incbin "baserom.dol", 0x4990CC, 0x4 + .4byte 0x4B800000 .global $$22713 $$22713: - .incbin "baserom.dol", 0x4990D0, 0x4 + .4byte 0 .global $$22366 $$22366: - .incbin "baserom.dol", 0x4990D4, 0x4 + .4byte 0x404040FF .global $$22370 $$22370: - .incbin "baserom.dol", 0x4990D8, 0x4 + .4byte 0xFFFFFFFF .global $$22746 $$22746: - .incbin "baserom.dol", 0x4990DC, 0x4 + .4byte 0x3F800000 .global $$22747 $$22747: - .incbin "baserom.dol", 0x4990E0, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .global $$22750 $$22750: - .incbin "baserom.dol", 0x4990E8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global FifoObj diff --git a/asm/gx/GXLight.s b/asm/gx/GXLight.s index 1995f21f..8904d06f 100644 --- a/asm/gx/GXLight.s +++ b/asm/gx/GXLight.s @@ -563,40 +563,41 @@ lbl_80036598: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22975 $$22975: - .incbin "baserom.dol", 0x4990F8, 0x4 + .4byte 0 .global $$22976 $$22976: - .incbin "baserom.dol", 0x4990FC, 0x4 + .4byte 0x42B40000 .global $$22977 $$22977: - .incbin "baserom.dol", 0x499100, 0x4 + .4byte 0x40490FDB .global $$22978 $$22978: - .incbin "baserom.dol", 0x499104, 0x4 + .4byte 0x43340000 .global $$22979 $$22979: - .incbin "baserom.dol", 0x499108, 0x4 + .4byte 0xC47A0000 .global $$22980 $$22980: - .incbin "baserom.dol", 0x49910C, 0x4 + .4byte 0x447A0000 .global $$22981 $$22981: - .incbin "baserom.dol", 0x499110, 0x4 + .4byte 0x3F800000 .global $$22982 $$22982: - .incbin "baserom.dol", 0x499114, 0x4 + .4byte 0x40000000 .global $$22983 $$22983: - .incbin "baserom.dol", 0x499118, 0x4 + .4byte 0xC0800000 .global $$22984 $$22984: - .incbin "baserom.dol", 0x49911C, 0x4 + .4byte 0x40800000 .global $$22985 $$22985: - .incbin "baserom.dol", 0x499120, 0x4 + .4byte 0xC0000000 .global $$22997 $$22997: - .incbin "baserom.dol", 0x499124, 0x4 + .4byte 0x3F000000 .global $$23017 $$23017: - .incbin "baserom.dol", 0x499128, 0x8 + .4byte 0xDD5E0B6B + .4byte 0 diff --git a/asm/gx/GXPerf.s b/asm/gx/GXPerf.s index 650e7bdd..5cb3ef7d 100644 --- a/asm/gx/GXPerf.s +++ b/asm/gx/GXPerf.s @@ -544,7 +544,63 @@ GXClearGPMetric: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23023 $$23023: - .incbin "baserom.dol", 0x42D110, 0x58 + .4byte 0x80039600 ;# ptr + .4byte 0x8003961C ;# ptr + .4byte 0x80039638 ;# ptr + .4byte 0x80039654 ;# ptr + .4byte 0x800396A8 ;# ptr + .4byte 0x800396C4 ;# ptr + .4byte 0x800396E0 ;# ptr + .4byte 0x800396FC ;# ptr + .4byte 0x80039670 ;# ptr + .4byte 0x80039718 ;# ptr + .4byte 0x80039748 ;# ptr + .4byte 0x80039778 ;# ptr + .4byte 0x800397A8 ;# ptr + .4byte 0x800397D8 ;# ptr + .4byte 0x80039808 ;# ptr + .4byte 0x80039838 ;# ptr + .4byte 0x80039868 ;# ptr + .4byte 0x80039894 ;# ptr + .4byte 0x800398A4 ;# ptr + .4byte 0x800398B4 ;# ptr + .4byte 0x800398C4 ;# ptr + .4byte 0x8003968C ;# ptr .global $$23022 $$23022: - .incbin "baserom.dol", 0x42D168, 0x90 + .4byte 0x800391DC ;# ptr + .4byte 0x800391FC ;# ptr + .4byte 0x8003921C ;# ptr + .4byte 0x8003923C ;# ptr + .4byte 0x8003925C ;# ptr + .4byte 0x8003927C ;# ptr + .4byte 0x8003929C ;# ptr + .4byte 0x800392BC ;# ptr + .4byte 0x800392DC ;# ptr + .4byte 0x800392FC ;# ptr + .4byte 0x8003933C ;# ptr + .4byte 0x8003935C ;# ptr + .4byte 0x80039378 ;# ptr + .4byte 0x80039394 ;# ptr + .4byte 0x800393B0 ;# ptr + .4byte 0x800393CC ;# ptr + .4byte 0x800393E8 ;# ptr + .4byte 0x80039404 ;# ptr + .4byte 0x80039420 ;# ptr + .4byte 0x8003943C ;# ptr + .4byte 0x80039458 ;# ptr + .4byte 0x80039474 ;# ptr + .4byte 0x80039490 ;# ptr + .4byte 0x800394AC ;# ptr + .4byte 0x800394C8 ;# ptr + .4byte 0x800394E4 ;# ptr + .4byte 0x80039500 ;# ptr + .4byte 0x8003951C ;# ptr + .4byte 0x80039538 ;# ptr + .4byte 0x80039554 ;# ptr + .4byte 0x80039570 ;# ptr + .4byte 0x8003958C ;# ptr + .4byte 0x800395A8 ;# ptr + .4byte 0x800395C4 ;# ptr + .4byte 0x8003931C ;# ptr + .4byte 0 diff --git a/asm/gx/GXPixel.s b/asm/gx/GXPixel.s index 370a7fb8..d169d382 100644 --- a/asm/gx/GXPixel.s +++ b/asm/gx/GXPixel.s @@ -563,42 +563,57 @@ GXSetFieldMode: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16$$2p2f $$2LOCAL$$2GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16$$2p2f: - .incbin "baserom.dol", 0x42D0F0, 0x20 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22990 $$22990: - .incbin "baserom.dol", 0x499170, 0x4 + .4byte 0 .global $$22991 $$22991: - .incbin "baserom.dol", 0x499174, 0x4 + .4byte 0x3F800000 .global $$22992 $$22992: - .incbin "baserom.dol", 0x499178, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$22993 $$22993: - .incbin "baserom.dol", 0x499180, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$22994 $$22994: - .incbin "baserom.dol", 0x499188, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$22995 $$22995: - .incbin "baserom.dol", 0x499190, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$22996 $$22996: - .incbin "baserom.dol", 0x499198, 0x8 + .4byte 0x4B00001E + .4byte 0 .global $$22999 $$22999: - .incbin "baserom.dol", 0x4991A0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$23011 $$23011: - .incbin "baserom.dol", 0x4991A8, 0x8 + .4byte 0 + .4byte 0 .global $$23012 $$23012: - .incbin "baserom.dol", 0x4991B0, 0x4 + .4byte 0x3FDDB3D0 .global $$23013 $$23013: - .incbin "baserom.dol", 0x4991B4, 0x4 + .4byte 0x43800000 .global $$23017 $$23017: - .incbin "baserom.dol", 0x4991B8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/gx/GXTev.s b/asm/gx/GXTev.s index 32073d7b..a2114c5c 100644 --- a/asm/gx/GXTev.s +++ b/asm/gx/GXTev.s @@ -513,16 +513,41 @@ GXSetNumTevStages: .section .data, "wa" # 0x80421040 - 0x80496700 .global TEVCOpTableST0 TEVCOpTableST0: - .incbin "baserom.dol", 0x42D078, 0x14 + .4byte 0xC008F8AF + .4byte 0xC008A89F + .4byte 0xC008AC8F + .4byte 0xC008FFF8 + .4byte 0xC008FFFA .global TEVCOpTableST1 TEVCOpTableST1: - .incbin "baserom.dol", 0x42D08C, 0x14 + .4byte 0xC008F80F + .4byte 0xC008089F + .4byte 0xC0080C8F + .4byte 0xC008FFF8 + .4byte 0xC008FFF0 .global TEVAOpTableST0 TEVAOpTableST0: - .incbin "baserom.dol", 0x42D0A0, 0x14 + .4byte 0xC108F2F0 + .4byte 0xC108FFD0 + .4byte 0xC108F2F0 + .4byte 0xC108FFC0 + .4byte 0xC108FFD0 .global TEVAOpTableST1 TEVAOpTableST1: - .incbin "baserom.dol", 0x42D0B4, 0x14 + .4byte 0xC108F070 + .4byte 0xC108FF80 + .4byte 0xC108F070 + .4byte 0xC108FFC0 + .4byte 0xC108FF80 .global $$2LOCAL$$2GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r $$2LOCAL$$2GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r: - .incbin "baserom.dol", 0x42D0C8, 0x28 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0 diff --git a/asm/gx/GXTexture.s b/asm/gx/GXTexture.s index a5529bce..1f23a29e 100644 --- a/asm/gx/GXTexture.s +++ b/asm/gx/GXTexture.s @@ -1285,74 +1285,221 @@ lbl_80037760: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22689 $$22689: - .incbin "baserom.dol", 0x42CE50, 0xF4 + .4byte 0x800365E0 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365E0 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365E0 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365E0 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x800365F8 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365E0 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x800365EC ;# ptr + .4byte 0x80036604 ;# ptr + .4byte 0x800365F8 ;# ptr .global $$22732 $$22732: - .incbin "baserom.dol", 0x42CF44, 0xF4 + .4byte 0x80036710 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036710 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036710 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036710 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036728 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036710 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x8003671C ;# ptr + .4byte 0x80036734 ;# ptr + .4byte 0x80036728 ;# ptr .global $$22762 $$22762: - .incbin "baserom.dol", 0x42D038, 0x40 + .4byte 0x800368F4 ;# ptr + .4byte 0x80036908 ;# ptr + .4byte 0x80036908 ;# ptr + .4byte 0x8003691C ;# ptr + .4byte 0x8003691C ;# ptr + .4byte 0x8003691C ;# ptr + .4byte 0x80036930 ;# ptr + .4byte 0x80036958 ;# ptr + .4byte 0x800368F4 ;# ptr + .4byte 0x80036908 ;# ptr + .4byte 0x8003691C ;# ptr + .4byte 0x80036958 ;# ptr + .4byte 0x80036958 ;# ptr + .4byte 0x80036958 ;# ptr + .4byte 0x80036944 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global GXTexMode0Ids GXTexMode0Ids: - .incbin "baserom.dol", 0x492960, 0x8 + .4byte 0x80818283 + .4byte 0xA0A1A2A3 .global GXTexMode1Ids GXTexMode1Ids: - .incbin "baserom.dol", 0x492968, 0x8 + .4byte 0x84858687 + .4byte 0xA4A5A6A7 .global GXTexImage0Ids GXTexImage0Ids: - .incbin "baserom.dol", 0x492970, 0x8 + .4byte 0x88898A8B + .4byte 0xA8A9AAAB .global GXTexImage1Ids GXTexImage1Ids: - .incbin "baserom.dol", 0x492978, 0x8 + .4byte 0x8C8D8E8F + .4byte 0xACADAEAF .global GXTexImage2Ids GXTexImage2Ids: - .incbin "baserom.dol", 0x492980, 0x8 + .4byte 0x90919293 + .4byte 0xB0B1B2B3 .global GXTexImage3Ids GXTexImage3Ids: - .incbin "baserom.dol", 0x492988, 0x8 + .4byte 0x94959697 + .4byte 0xB4B5B6B7 .global GXTexTlutIds GXTexTlutIds: - .incbin "baserom.dol", 0x492990, 0x8 + .4byte 0x98999A9B + .4byte 0xB8B9BABB .global GX2HWFiltConv GX2HWFiltConv: - .incbin "baserom.dol", 0x492998, 0x8 + .4byte 0x00040105 + .4byte 0x02060000 .global HW2GXFiltConv HW2GXFiltConv: - .incbin "baserom.dol", 0x4929A0, 0x8 + .4byte 0x00020400 + .4byte 0x01030500 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22756 $$22756: - .incbin "baserom.dol", 0x499130, 0x8 + .4byte 0x41800000 + .4byte 0 .global $$22760 $$22760: - .incbin "baserom.dol", 0x499138, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$22784 $$22784: - .incbin "baserom.dol", 0x499140, 0x4 + .4byte 0xC0800000 .global $$22785 $$22785: - .incbin "baserom.dol", 0x499144, 0x4 + .4byte 0x407F5C29 .global $$22786 $$22786: - .incbin "baserom.dol", 0x499148, 0x4 + .4byte 0x40800000 .global $$22787 $$22787: - .incbin "baserom.dol", 0x49914C, 0x4 + .4byte 0x42000000 .global $$22788 $$22788: - .incbin "baserom.dol", 0x499150, 0x4 + .4byte 0 .global $$22789 $$22789: - .incbin "baserom.dol", 0x499154, 0x4 + .4byte 0x41200000 .global $$22862 $$22862: - .incbin "baserom.dol", 0x499158, 0x4 + .4byte 0x3D800000 .global $$22863 $$22863: - .incbin "baserom.dol", 0x49915C, 0x4 + .4byte 0x3D000000 .global $$22875 $$22875: - .incbin "baserom.dol", 0x499160, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/gx/GXTransform.s b/asm/gx/GXTransform.s index 459f08aa..59ff7dc4 100644 --- a/asm/gx/GXTransform.s +++ b/asm/gx/GXTransform.s @@ -452,16 +452,17 @@ lbl_800390AC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22517 $$22517: - .incbin "baserom.dol", 0x4991C0, 0x4 + .4byte 0 .global $$22518 $$22518: - .incbin "baserom.dol", 0x4991C4, 0x4 + .4byte 0x3F800000 .global $$22519 $$22519: - .incbin "baserom.dol", 0x4991C8, 0x4 + .4byte 0x3F000000 .global $$22610 $$22610: - .incbin "baserom.dol", 0x4991CC, 0x4 + .4byte 0x43AB0000 .global $$22629 $$22629: - .incbin "baserom.dol", 0x4991D0, 0x8 + .4byte 0x4B7FFFFF + .4byte 0 diff --git a/asm/homebuttonLib/HBMAnmController.s b/asm/homebuttonLib/HBMAnmController.s index 0cafdf92..61233eec 100644 --- a/asm/homebuttonLib/HBMAnmController.s +++ b/asm/homebuttonLib/HBMAnmController.s @@ -73,13 +73,21 @@ lbl_80128838: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton18GroupAnmController __vt__Q210homebutton18GroupAnmController: - .incbin "baserom.dol", 0x43EAE0, 0x10 + .4byte 0x80442A20 + .4byte 0 + .4byte 0x801287A0 ;# ptr + .4byte 0x80128630 ;# ptr .global $$28022 $$28022: - .incbin "baserom.dol", 0x43EAF0, 0x20 + .asciz "homebutton::GroupAnmController" + .balign 4 .global $$28023 $$28023: - .incbin "baserom.dol", 0x43EB10, 0x10 + .4byte 0x804429D8 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q210homebutton18GroupAnmController __RTTI__Q210homebutton18GroupAnmController: - .incbin "baserom.dol", 0x43EB20, 0x8 + .4byte 0x804429F0 + .4byte 0x80442A10 diff --git a/asm/homebuttonLib/HBMAxSound.s b/asm/homebuttonLib/HBMAxSound.s index 7e29e5e7..8b5d46ba 100644 --- a/asm/homebuttonLib/HBMAxSound.s +++ b/asm/homebuttonLib/HBMAxSound.s @@ -821,108 +821,160 @@ SetSoundMode__10homebuttonFUl: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global WT_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2 WT_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2: - .incbin "baserom.dol", 0x409F08, 0x14 + .asciz "wt\\HomeButtonSe.wt" + .balign 4 .global PCM_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2 PCM_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2: - .incbin "baserom.dol", 0x409F1C, 0x14 + .asciz "wt\\HomeButtonSe.pcm" .global $$27517 $$27517: - .incbin "baserom.dol", 0x409F30, 0x4 + .4byte 0 .global $$27518 $$27518: - .incbin "baserom.dol", 0x409F34, 0x4 + .4byte 0x41200000 .global $$27519 $$27519: - .incbin "baserom.dol", 0x409F38, 0x8 + .4byte 0x41A00000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$26775 $$26775: - .incbin "baserom.dol", 0x43EDC8, 0x18 + .asciz "midi\\00_home_button.mid" .global $$26776 $$26776: - .incbin "baserom.dol", 0x43EDE0, 0x18 + .asciz "midi\\01_return_app.mid" + .balign 4 .global $$26777 $$26777: - .incbin "baserom.dol", 0x43EDF8, 0x18 + .asciz "midi\\02_goto_menu.mid" + .balign 4 .global $$26778 $$26778: - .incbin "baserom.dol", 0x43EE10, 0x18 + .asciz "midi\\03_reset_app.mid" + .balign 4 .global $$26779 $$26779: - .incbin "baserom.dol", 0x43EE28, 0x14 + .asciz "midi\\04_focus.mid" + .balign 4 .global $$26780 $$26780: - .incbin "baserom.dol", 0x43EE3C, 0x14 + .asciz "midi\\05_select.mid" + .balign 4 .global $$26781 $$26781: - .incbin "baserom.dol", 0x43EE50, 0x14 + .asciz "midi\\06_cancel.mid" + .balign 4 .global $$26782 $$26782: - .incbin "baserom.dol", 0x43EE64, 0x1C + .asciz "midi\\07_open_controller.mid" .global $$26783 $$26783: - .incbin "baserom.dol", 0x43EE80, 0x20 + .asciz "midi\\08_close_controller.mid" + .balign 4 .global $$26784 $$26784: - .incbin "baserom.dol", 0x43EEA0, 0x18 + .asciz "midi\\09_volume_plus.mid" .global $$26785 $$26785: - .incbin "baserom.dol", 0x43EEB8, 0x1C + .asciz "midi\\10_volume_minus.mid" + .balign 4 .global $$26786 $$26786: - .incbin "baserom.dol", 0x43EED4, 0x20 + .asciz "midi\\11_volume_plus_limit.mid" + .balign 4 .global $$26787 $$26787: - .incbin "baserom.dol", 0x43EEF4, 0x20 + .asciz "midi\\12_volume_minus_limit.mid" + .balign 4 .global $$26788 $$26788: - .incbin "baserom.dol", 0x43EF14, 0x1C + .asciz "midi\\13_nothing_done.mid" + .balign 4 .global $$26789 $$26789: - .incbin "baserom.dol", 0x43EF30, 0x14 + .asciz "midi\\14_vibe_on.mid" .global $$26790 $$26790: - .incbin "baserom.dol", 0x43EF44, 0x18 + .asciz "midi\\15_vibe_off.mid" + .balign 4 .global $$26791 $$26791: - .incbin "baserom.dol", 0x43EF5C, 0x24 + .asciz "midi\\16_start_connect_window.mid" + .balign 4 .global $$26792 $$26792: - .incbin "baserom.dol", 0x43EF80, 0x18 + .asciz "midi\\17_connected1.mid" + .balign 4 .global $$26793 $$26793: - .incbin "baserom.dol", 0x43EF98, 0x18 + .asciz "midi\\18_connected2.mid" + .balign 4 .global $$26794 $$26794: - .incbin "baserom.dol", 0x43EFB0, 0x18 + .asciz "midi\\19_connected3.mid" + .balign 4 .global $$26795 $$26795: - .incbin "baserom.dol", 0x43EFC8, 0x18 + .asciz "midi\\20_connected4.mid" + .balign 4 .global $$26796 $$26796: - .incbin "baserom.dol", 0x43EFE0, 0x20 + .asciz "midi\\21_end_connect_window.mid" + .balign 4 .global $$26797 $$26797: - .incbin "baserom.dol", 0x43F000, 0x18 + .asciz "midi\\22_manual_open.mid" .global $$26798 $$26798: - .incbin "baserom.dol", 0x43F018, 0x1C + .asciz "midi\\23_manual_focus.mid" + .balign 4 .global $$26799 $$26799: - .incbin "baserom.dol", 0x43F034, 0x1C + .asciz "midi\\24_manual_select.mid" + .balign 4 .global $$26800 $$26800: - .incbin "baserom.dol", 0x43F050, 0x1C + .asciz "midi\\25_manual_scroll.mid" + .balign 4 .global $$26801 $$26801: - .incbin "baserom.dol", 0x43F06C, 0x1C + .asciz "midi\\26_manual_cancel.mid" + .balign 4 .global $$26802 $$26802: - .incbin "baserom.dol", 0x43F088, 0x20 + .asciz "midi\\27_manual_return_app.mid" + .balign 4 .global $$2LOCAL$$2GetMidiDataFromArc__24$$2unnamed$$2HBMAxSound_cpp$$2Fi$$2SOUND_FILENAME $$2LOCAL$$2GetMidiDataFromArc__24$$2unnamed$$2HBMAxSound_cpp$$2Fi$$2SOUND_FILENAME: - .incbin "baserom.dol", 0x43F0A8, 0x70 + .4byte 0x80442CC8 + .4byte 0x80442CE0 + .4byte 0x80442CF8 + .4byte 0x80442D10 + .4byte 0x80442D28 + .4byte 0x80442D3C + .4byte 0x80442D50 + .4byte 0x80442D64 + .4byte 0x80442D80 + .4byte 0x80442DA0 + .4byte 0x80442DB8 + .4byte 0x80442DD4 + .4byte 0x80442DF4 + .4byte 0x80442E14 + .4byte 0x80442E30 + .4byte 0x80442E44 + .4byte 0x80442E5C + .4byte 0x80442E80 + .4byte 0x80442E98 + .4byte 0x80442EB0 + .4byte 0x80442EC8 + .4byte 0x80442EE0 + .4byte 0x80442F00 + .4byte 0x80442F18 + .4byte 0x80442F34 + .4byte 0x80442F50 + .4byte 0x80442F6C + .4byte 0x80442F88 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sWork__24$$2unnamed$$2HBMAxSound_cpp$$2 diff --git a/asm/homebuttonLib/HBMBase.s b/asm/homebuttonLib/HBMBase.s index 095770e5..f33be904 100644 --- a/asm/homebuttonLib/HBMBase.s +++ b/asm/homebuttonLib/HBMBase.s @@ -9692,702 +9692,1203 @@ lbl_80134CE0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29436 $$29436: - .incbin "baserom.dol", 0x409F40, 0x8 + .4byte 0x000000FF + .4byte 0 .global scAnmTable__10homebutton scAnmTable__10homebutton: - .incbin "baserom.dol", 0x409F48, 0x60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000005 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000006 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000007 + .4byte 0x00000001 .global scGroupAnmTable__10homebutton scGroupAnmTable__10homebutton: - .incbin "baserom.dol", 0x409FA8, 0x250 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000013 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000014 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0x00000009 + .4byte 0x00000007 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0x0000000A + .4byte 0x00000007 + .4byte 0x0000000B + .4byte 0x00000005 + .4byte 0x0000000C + .4byte 0x00000005 + .4byte 0x0000000D + .4byte 0x00000006 + .4byte 0x0000000D + .4byte 0x00000008 + .4byte 0x0000000E + .4byte 0x0000000E + .4byte 0x0000000E + .4byte 0x00000006 + .4byte 0x0000000E + .4byte 0x00000008 + .4byte 0x0000000F + .4byte 0x00000005 + .4byte 0x00000010 + .4byte 0x00000006 + .4byte 0x00000010 + .4byte 0x0000000E + .4byte 0x00000011 + .4byte 0x0000000B + .4byte 0x00000011 + .4byte 0x0000000C + .4byte 0x00000012 + .4byte 0x0000000B + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0x00000013 + .4byte 0x0000000D + .4byte 0x00000014 + .4byte 0x0000000D + .4byte 0x00000015 + .4byte 0x00000009 + .4byte 0x00000015 + .4byte 0x0000000A + .4byte 0x00000016 + .4byte 0x00000009 + .4byte 0x00000016 + .4byte 0x0000000A + .4byte 0x00000017 + .4byte 0x00000009 + .4byte 0x00000017 + .4byte 0x0000000A + .4byte 0x00000018 + .4byte 0x00000009 + .4byte 0x00000018 + .4byte 0x0000000A + .4byte 0x00000019 + .4byte 0x00000009 + .4byte 0x00000019 + .4byte 0x0000000A + .4byte 0x0000001A + .4byte 0x00000009 + .4byte 0x0000001A + .4byte 0x0000000A + .4byte 0x0000001B + .4byte 0x00000009 + .4byte 0x0000001B + .4byte 0x0000000A + .4byte 0x0000001C + .4byte 0x00000009 + .4byte 0x0000001C + .4byte 0x0000000A + .4byte 0x0000001D + .4byte 0x00000009 + .4byte 0x0000001D + .4byte 0x0000000A + .4byte 0x0000001E + .4byte 0x00000009 + .4byte 0x0000001E + .4byte 0x0000000A + .4byte 0x0000001F + .4byte 0x0000000F + .4byte 0x0000001F + .4byte 0x00000010 + .4byte 0x0000001F + .4byte 0x00000011 + .4byte 0x0000001F + .4byte 0x00000012 + .4byte 0x0000001F + .4byte 0x00000015 + .4byte 0x00000020 + .4byte 0x0000000F + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0x00000020 + .4byte 0x00000011 + .4byte 0x00000020 + .4byte 0x00000012 + .4byte 0x00000020 + .4byte 0x00000015 + .4byte 0x00000021 + .4byte 0x0000000F + .4byte 0x00000021 + .4byte 0x00000010 + .4byte 0x00000021 + .4byte 0x00000011 + .4byte 0x00000021 + .4byte 0x00000012 + .4byte 0x00000021 + .4byte 0x00000015 + .4byte 0x00000022 + .4byte 0x0000000F + .4byte 0x00000022 + .4byte 0x00000010 + .4byte 0x00000022 + .4byte 0x00000011 + .4byte 0x00000022 + .4byte 0x00000012 + .4byte 0x00000022 + .4byte 0x00000015 .global scReConnectTime__Q210homebutton10HomeButton scReConnectTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A1F8, 0x4 + .4byte 0x00000E10 .global scReConnectTime2__Q210homebutton10HomeButton scReConnectTime2__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A1FC, 0x4 + .4byte 0x00000DF2 .global scPadDrawWaitTime__Q210homebutton10HomeButton scPadDrawWaitTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A200, 0x4 + .4byte 0x00000005 .global scGetPadInfoTime__Q210homebutton10HomeButton scGetPadInfoTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A204, 0x4 + .4byte 0x00000064 .global scForcusSEWaitTime__Q210homebutton10HomeButton scForcusSEWaitTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A208, 0x4 + .4byte 0x00000002 .global scOnPaneVibTime__Q210homebutton10HomeButton scOnPaneVibTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A20C, 0x4 + .4byte 0x40400000 .global scOnPaneVibWaitTime__Q210homebutton10HomeButton scOnPaneVibWaitTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A210, 0x4 + .4byte 0x41100000 .global scWaitStopMotorTime__Q210homebutton10HomeButton scWaitStopMotorTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A214, 0x4 + .4byte 0x0000001E .global scWaitDisConnectTime__Q210homebutton10HomeButton scWaitDisConnectTime__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A218, 0x4 + .4byte 0x000000B4 .global $$216080 $$216080: - .incbin "baserom.dol", 0x40A21C, 0x4 + .4byte 0x3FC00000 .global $$216081 $$216081: - .incbin "baserom.dol", 0x40A220, 0x4 + .4byte 0x3F800000 .global $$216084 $$216084: - .incbin "baserom.dol", 0x40A224, 0x4 + .4byte 0 .global $$216087 $$216087: - .incbin "baserom.dol", 0x40A228, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$216249 $$216249: - .incbin "baserom.dol", 0x40A230, 0x4 + .4byte 0x45610000 .global $$216250 $$216250: - .incbin "baserom.dol", 0x40A234, 0x4 + .4byte 0x455F2000 .global $$216251 $$216251: - .incbin "baserom.dol", 0x40A238, 0x4 + .4byte 0xC47A0000 .global $$216252 $$216252: - .incbin "baserom.dol", 0x40A23C, 0x4 + .4byte 0xC61C4000 .global $$216256 $$216256: - .incbin "baserom.dol", 0x40A240, 0x4 + .4byte 0x41F00000 .global $$216331 $$216331: - .incbin "baserom.dol", 0x40A244, 0x4 + .4byte 0x3F666666 .global $$216332 $$216332: - .incbin "baserom.dol", 0x40A248, 0x4 + .4byte 0x3DA14285 .global $$216333 $$216333: - .incbin "baserom.dol", 0x40A24C, 0x4 + .4byte 0x41200000 .global $$216337 $$216337: - .incbin "baserom.dol", 0x40A250, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$216383 $$216383: - .incbin "baserom.dol", 0x40A258, 0x4 + .4byte 0x40200000 .global $$216384 $$216384: - .incbin "baserom.dol", 0x40A25C, 0x4 + .4byte 0x3F000000 .global $$216995 $$216995: - .incbin "baserom.dol", 0x40A260, 0x4 + .4byte 0x41100000 .global $$216996 $$216996: - .incbin "baserom.dol", 0x40A264, 0x4 + .4byte 0x43340000 .global $$216997 $$216997: - .incbin "baserom.dol", 0x40A268, 0x4 + .4byte 0x47000000 .global $$216998 $$216998: - .incbin "baserom.dol", 0x40A26C, 0x4 + .4byte 0x414B3333 .global $$217102 $$217102: - .incbin "baserom.dol", 0x40A270, 0x4 + .4byte 0x000000FF .global $$217105 $$217105: - .incbin "baserom.dol", 0x40A274, 0x4 + .4byte 0x000000FF .global $$217108 $$217108: - .incbin "baserom.dol", 0x40A278, 0x4 + .4byte 0x000000FF .global $$217135 $$217135: - .incbin "baserom.dol", 0x40A27C, 0x4 + .4byte 0xC3FA0000 .global $$217136 $$217136: - .incbin "baserom.dol", 0x40A280, 0x4 + .4byte 0x43640000 .global $$217137 $$217137: - .incbin "baserom.dol", 0x40A284, 0x4 + .4byte 0x43FA0000 .global $$217138 $$217138: - .incbin "baserom.dol", 0x40A288, 0x4 + .4byte 0xC3640000 .global $$217139 $$217139: - .incbin "baserom.dol", 0x40A28C, 0x4 + .4byte 0x447A0000 .global $$217381 $$217381: - .incbin "baserom.dol", 0x40A290, 0x4 + .4byte 0x40A00000 .global $$217382 $$217382: - .incbin "baserom.dol", 0x40A294, 0x4 + .4byte 0x41700000 .global $$217383 $$217383: - .incbin "baserom.dol", 0x40A298, 0x4 + .4byte 0x3FB40000 .global $$217566 $$217566: - .incbin "baserom.dol", 0x40A29C, 0x4 + .4byte 0x44180000 .global $$217567 $$217567: - .incbin "baserom.dol", 0x40A2A0, 0x4 + .4byte 0x43E40000 .global $$217568 $$217568: - .incbin "baserom.dol", 0x40A2A4, 0x4 + .4byte 0xC3340000 .global $$217948 $$217948: - .incbin "baserom.dol", 0x40A2A8, 0x4 + .4byte 0x40400000 .global scSoundHeapSize_but2__Q210homebutton10HomeButton scSoundHeapSize_but2__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A2AC, 0x4 + .4byte 0x00060000 .global scSoundHeapSize_but3__Q210homebutton10HomeButton scSoundHeapSize_but3__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A2B0, 0x4 + .4byte 0x0006F800 .global scSoundThreadPrio__Q210homebutton10HomeButton scSoundThreadPrio__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A2B4, 0x4 + .4byte 0x00000004 .global scDvdThreadPrio__Q210homebutton10HomeButton scDvdThreadPrio__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x40A2B8, 0x8 + .4byte 0x00000003 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$29521 $$29521: - .incbin "baserom.dol", 0x43F168, 0x10 + .asciz "P1_Def.brlyt" + .balign 4 .global $$29522 $$29522: - .incbin "baserom.dol", 0x43F178, 0x10 + .asciz "P2_Def.brlyt" + .balign 4 .global $$29523 $$29523: - .incbin "baserom.dol", 0x43F188, 0x10 + .asciz "P3_Def.brlyt" + .balign 4 .global $$29524 $$29524: - .incbin "baserom.dol", 0x43F198, 0x10 + .asciz "P4_Def.brlyt" + .balign 4 .global scCursorLytName__Q210homebutton10HomeButton scCursorLytName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F1A8, 0x10 + .4byte 0x80443068 + .4byte 0x80443078 + .4byte 0x80443088 + .4byte 0x80443098 .global $$29525 $$29525: - .incbin "baserom.dol", 0x43F1B8, 0x8 + .asciz "N_Trans" .global scCursorPaneName__Q210homebutton10HomeButton scCursorPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F1C0, 0x4 + .4byte 0x804430B8 .global $$29526 $$29526: - .incbin "baserom.dol", 0x43F1C4, 0x8 + .asciz "N_Rot" + .balign 4 .global scCursorRotPaneName__Q210homebutton10HomeButton scCursorRotPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F1CC, 0x4 + .4byte 0x804430C4 .global $$29527 $$29527: - .incbin "baserom.dol", 0x43F1D0, 0x8 + .asciz "N_SRot" + .balign 4 .global scCursorSRotPaneName__Q210homebutton10HomeButton scCursorSRotPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F1D8, 0x4 + .4byte 0x804430D0 .global $$29528 $$29528: - .incbin "baserom.dol", 0x43F1DC, 0xC + .asciz "B_btnL_00" + .balign 4 .global $$29529 $$29529: - .incbin "baserom.dol", 0x43F1E8, 0xC + .asciz "B_btnL_01" + .balign 4 .global $$29530 $$29530: - .incbin "baserom.dol", 0x43F1F4, 0xC + .asciz "B_btnL_10" + .balign 4 .global scBtnName__Q210homebutton10HomeButton scBtnName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F200, 0x10 + .4byte 0x804430DC + .4byte 0x804430E8 + .4byte 0x804430F4 + .4byte 0 .global $$29531 $$29531: - .incbin "baserom.dol", 0x43F210, 0xC + .asciz "T_btnL_00" + .balign 4 .global $$29532 $$29532: - .incbin "baserom.dol", 0x43F21C, 0xC + .asciz "T_btnL_01" + .balign 4 .global $$29533 $$29533: - .incbin "baserom.dol", 0x43F228, 0x10 + .asciz "T_btnL_10" + .balign 4 + .4byte 0 .global scTxtName__Q210homebutton10HomeButton scTxtName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F238, 0x10 + .4byte 0x80443110 + .4byte 0x8044311C + .4byte 0x80443128 + .4byte 0 .global $$29534 $$29534: - .incbin "baserom.dol", 0x43F248, 0x10 + .asciz "btnL_00_inOut" + .balign 4 .global $$29535 $$29535: - .incbin "baserom.dol", 0x43F258, 0x10 + .asciz "btnL_01_inOut" + .balign 4 .global $$29536 $$29536: - .incbin "baserom.dol", 0x43F268, 0x10 + .asciz "btnL_10_inOut" + .balign 4 .global $$29537 $$29537: - .incbin "baserom.dol", 0x43F278, 0x10 + .asciz "btnL_11_inOut" + .balign 4 .global $$29538 $$29538: - .incbin "baserom.dol", 0x43F288, 0xC + .asciz "btnL_00_psh" .global $$29539 $$29539: - .incbin "baserom.dol", 0x43F294, 0xC + .asciz "btnL_01_psh" .global $$29540 $$29540: - .incbin "baserom.dol", 0x43F2A0, 0xC + .asciz "btnL_10_psh" .global $$29541 $$29541: - .incbin "baserom.dol", 0x43F2AC, 0xC + .asciz "btnL_11_psh" .global scGrName__Q210homebutton10HomeButton scGrName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F2B8, 0x20 + .4byte 0x80443148 + .4byte 0x80443158 + .4byte 0x80443168 + .4byte 0x80443178 + .4byte 0x80443188 + .4byte 0x80443194 + .4byte 0x804431A0 + .4byte 0x804431AC .global $$29542 $$29542: - .incbin "baserom.dol", 0x43F2D8, 0x14 + .asciz "_cntBtn_in.brlan" + .balign 4 .global $$29543 $$29543: - .incbin "baserom.dol", 0x43F2EC, 0x14 + .asciz "_cntBtn_psh.brlan" + .balign 4 .global $$29544 $$29544: - .incbin "baserom.dol", 0x43F300, 0x14 + .asciz "_cntBtn_out.brlan" + .balign 4 .global scAnimName__Q210homebutton10HomeButton scAnimName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F314, 0xC + .4byte 0x804431D8 + .4byte 0x804431EC + .4byte 0x80443200 .global $$29545 $$29545: - .incbin "baserom.dol", 0x43F320, 0x14 + .asciz "_ltrIcn_on.brlan" + .balign 4 .global $$29546 $$29546: - .incbin "baserom.dol", 0x43F334, 0x14 + .asciz "_optn_bar_psh.brlan" .global $$29547 $$29547: - .incbin "baserom.dol", 0x43F348, 0x18 + .asciz "_close_bar_psh.brlan" + .balign 4 .global $$29548 $$29548: - .incbin "baserom.dol", 0x43F360, 0x18 + .asciz "_hmMenu_bar_in.brlan" + .balign 4 .global $$29549 $$29549: - .incbin "baserom.dol", 0x43F378, 0x18 + .asciz "_hmMenu_bar_psh.brlan" + .balign 4 .global $$29550 $$29550: - .incbin "baserom.dol", 0x43F390, 0x14 + .asciz "_link_msg_in.brlan" + .balign 4 .global $$29551 $$29551: - .incbin "baserom.dol", 0x43F3A4, 0x14 + .asciz "_link_msg_out.brlan" .global $$29552 $$29552: - .incbin "baserom.dol", 0x43F3B8, 0x14 + .asciz "_cmn_msg_in.brlan" + .balign 4 .global $$29553 $$29553: - .incbin "baserom.dol", 0x43F3CC, 0x14 + .asciz "_cmn_msg_out.brlan" + .balign 4 .global $$29554 $$29554: - .incbin "baserom.dol", 0x43F3E0, 0x10 + .asciz "_cntrl_up.brlan" .global $$29555 $$29555: - .incbin "baserom.dol", 0x43F3F0, 0x18 + .asciz "_cntrl_wndw_opn.brlan" + .balign 4 .global $$29556 $$29556: - .incbin "baserom.dol", 0x43F408, 0x14 + .asciz "_cntrl_dwn.brlan" + .balign 4 .global $$29557 $$29557: - .incbin "baserom.dol", 0x43F41C, 0x18 + .asciz "_hmMenu_bar_out.brlan" + .balign 4 .global $$29558 $$29558: - .incbin "baserom.dol", 0x43F434, 0x14 + .asciz "_cmn_msg_rtrn.brlan" .global $$29559 $$29559: - .incbin "baserom.dol", 0x43F448, 0x10 + .asciz "_12btn_on.brlan" .global scPairGroupAnimName__Q210homebutton10HomeButton scPairGroupAnimName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F458, 0x3C + .4byte 0x80443220 + .4byte 0x80443234 + .4byte 0x80443248 + .4byte 0x80443260 + .4byte 0x80443278 + .4byte 0x80443290 + .4byte 0x804432A4 + .4byte 0x804432B8 + .4byte 0x804432CC + .4byte 0x804432E0 + .4byte 0x804432F0 + .4byte 0x80443308 + .4byte 0x8044331C + .4byte 0x80443334 + .4byte 0x80443348 .global $$29560 $$29560: - .incbin "baserom.dol", 0x43F494, 0xC + .asciz "ltrIcn_on" + .balign 4 .global $$29561 $$29561: - .incbin "baserom.dol", 0x43F4A0, 0x10 + .asciz "optn_bar_psh" + .balign 4 .global $$29562 $$29562: - .incbin "baserom.dol", 0x43F4B0, 0x10 + .asciz "close_bar_psh" + .balign 4 .global $$29563 $$29563: - .incbin "baserom.dol", 0x43F4C0, 0x10 + .asciz "hmMenu_bar_in" + .balign 4 .global $$29564 $$29564: - .incbin "baserom.dol", 0x43F4D0, 0x10 + .asciz "hmMenu_bar_psh" + .balign 4 .global $$29565 $$29565: - .incbin "baserom.dol", 0x43F4E0, 0xC + .asciz "link_msg_in" .global $$29566 $$29566: - .incbin "baserom.dol", 0x43F4EC, 0x10 + .asciz "link_msg_out" + .balign 4 .global $$29567 $$29567: - .incbin "baserom.dol", 0x43F4FC, 0xC + .asciz "cmn_msg_in" + .balign 4 .global $$29568 $$29568: - .incbin "baserom.dol", 0x43F508, 0xC + .asciz "cmn_msg_out" .global $$29569 $$29569: - .incbin "baserom.dol", 0x43F514, 0xC + .asciz "cntrl_up" + .balign 4 .global $$29570 $$29570: - .incbin "baserom.dol", 0x43F520, 0x10 + .asciz "cntrl_wndw_opn" + .balign 4 .global $$29571 $$29571: - .incbin "baserom.dol", 0x43F530, 0xC + .asciz "cntrl_dwn" + .balign 4 .global $$29572 $$29572: - .incbin "baserom.dol", 0x43F53C, 0x10 + .asciz "hmMenu_bar_out" + .balign 4 .global $$29573 $$29573: - .incbin "baserom.dol", 0x43F54C, 0x10 + .asciz "cmn_msg_rtrn" + .balign 4 .global $$29574 $$29574: - .incbin "baserom.dol", 0x43F55C, 0xC + .asciz "12btn_on" + .balign 4 .global scPairGroupName__Q210homebutton10HomeButton scPairGroupName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F568, 0x3C + .4byte 0x80443394 + .4byte 0x804433A0 + .4byte 0x804433B0 + .4byte 0x804433C0 + .4byte 0x804433D0 + .4byte 0x804433E0 + .4byte 0x804433EC + .4byte 0x804433FC + .4byte 0x80443408 + .4byte 0x80443414 + .4byte 0x80443420 + .4byte 0x80443430 + .4byte 0x8044343C + .4byte 0x8044344C + .4byte 0x8044345C .global $$29575 $$29575: - .incbin "baserom.dol", 0x43F5A4, 0x14 + .asciz "_hmMenu_strt.brlan" + .balign 4 .global $$29576 $$29576: - .incbin "baserom.dol", 0x43F5B8, 0x14 + .asciz "_hmMenu_fnsh.brlan" + .balign 4 .global $$29577 $$29577: - .incbin "baserom.dol", 0x43F5CC, 0x14 + .asciz "_optn_bar_in.brlan" + .balign 4 .global $$29578 $$29578: - .incbin "baserom.dol", 0x43F5E0, 0x14 + .asciz "_optn_bar_out.brlan" .global $$29579 $$29579: - .incbin "baserom.dol", 0x43F5F4, 0x14 + .asciz "_optn_btn_in.brlan" + .balign 4 .global $$29580 $$29580: - .incbin "baserom.dol", 0x43F608, 0x14 + .asciz "_optn_btn_psh.brlan" .global $$29581 $$29581: - .incbin "baserom.dol", 0x43F61C, 0x18 + .asciz "_vb_btn_wht_psh.brlan" + .balign 4 .global $$29582 $$29582: - .incbin "baserom.dol", 0x43F634, 0x14 + .asciz "_optn_btn_out.brlan" .global $$29583 $$29583: - .incbin "baserom.dol", 0x43F648, 0x18 + .asciz "_vb_btn_ylw_psh.brlan" + .balign 4 .global $$29584 $$29584: - .incbin "baserom.dol", 0x43F660, 0x14 + .asciz "_sound_gry.brlan" + .balign 4 .global $$29585 $$29585: - .incbin "baserom.dol", 0x43F674, 0x14 + .asciz "_sound_ylw.brlan" + .balign 4 .global $$29586 $$29586: - .incbin "baserom.dol", 0x43F688, 0x18 + .asciz "_cmn_msg_btn_in.brlan" + .balign 4 .global $$29587 $$29587: - .incbin "baserom.dol", 0x43F6A0, 0x18 + .asciz "_cmn_msg_btn_out.brlan" + .balign 4 .global $$29588 $$29588: - .incbin "baserom.dol", 0x43F6B8, 0x18 + .asciz "_cmn_msg_btn_psh.brlan" + .balign 4 .global $$29589 $$29589: - .incbin "baserom.dol", 0x43F6D0, 0x18 + .asciz "_vb_btn_ylw_ylw.brlan" + .balign 4 .global $$29590 $$29590: - .incbin "baserom.dol", 0x43F6E8, 0x18 + .asciz "_btry_wink.brlan" + .balign 4 + .4byte 0 .global $$29591 $$29591: - .incbin "baserom.dol", 0x43F700, 0x10 + .asciz "_btry_gry.brlan" .global $$29592 $$29592: - .incbin "baserom.dol", 0x43F710, 0x10 + .asciz "_btry_wht.brlan" .global $$29593 $$29593: - .incbin "baserom.dol", 0x43F720, 0x18 + .asciz "_btry_wink_gry.brlan" + .balign 4 .global $$29594 $$29594: - .incbin "baserom.dol", 0x43F738, 0x14 + .asciz "_close_bar_in.brlan" .global $$29595 $$29595: - .incbin "baserom.dol", 0x43F74C, 0x1C + .asciz "_close_bar_out.brlan" + .balign 4 + .4byte 0 .global $$29596 $$29596: - .incbin "baserom.dol", 0x43F768, 0x10 + .asciz "_btry_red.brlan" .global scGroupAnimName__Q210homebutton10HomeButton scGroupAnimName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F778, 0x58 + .4byte 0x804434A4 + .4byte 0x804434B8 + .4byte 0x804434CC + .4byte 0x804434E0 + .4byte 0x804434F4 + .4byte 0x80443508 + .4byte 0x8044351C + .4byte 0x80443534 + .4byte 0x80443548 + .4byte 0x80443560 + .4byte 0x80443574 + .4byte 0x80443588 + .4byte 0x804435A0 + .4byte 0x804435B8 + .4byte 0x804435D0 + .4byte 0x804435E8 + .4byte 0x80443600 + .4byte 0x80443610 + .4byte 0x80443620 + .4byte 0x80443638 + .4byte 0x8044364C + .4byte 0x80443668 .global $$29597 $$29597: - .incbin "baserom.dol", 0x43F7D0, 0xC + .asciz "hmMenu_strt" .global $$29598 $$29598: - .incbin "baserom.dol", 0x43F7DC, 0xC + .asciz "hmMenu_fnsh" .global $$29599 $$29599: - .incbin "baserom.dol", 0x43F7E8, 0x10 + .asciz "hmMenuBck_strt" + .balign 4 .global $$29600 $$29600: - .incbin "baserom.dol", 0x43F7F8, 0x10 + .asciz "hmMenuBck_fnsh" + .balign 4 .global $$29601 $$29601: - .incbin "baserom.dol", 0x43F808, 0xC + .asciz "optn_bar_in" .global $$29602 $$29602: - .incbin "baserom.dol", 0x43F814, 0x10 + .asciz "optn_bar_out" + .balign 4 .global $$29603 $$29603: - .incbin "baserom.dol", 0x43F824, 0x14 + .asciz "optnBtn_00_inOut" + .balign 4 .global $$29604 $$29604: - .incbin "baserom.dol", 0x43F838, 0x14 + .asciz "optnBtn_01_inOut" + .balign 4 .global $$29605 $$29605: - .incbin "baserom.dol", 0x43F84C, 0x14 + .asciz "optnBtn_10_inOut" + .balign 4 .global $$29606 $$29606: - .incbin "baserom.dol", 0x43F860, 0x14 + .asciz "optnBtn_11_inOut" + .balign 4 .global $$29607 $$29607: - .incbin "baserom.dol", 0x43F874, 0x14 + .asciz "optnBtn_20_inOut" + .balign 4 .global $$29608 $$29608: - .incbin "baserom.dol", 0x43F888, 0x10 + .asciz "optnBtn_00_psh" + .balign 4 .global $$29609 $$29609: - .incbin "baserom.dol", 0x43F898, 0x10 + .asciz "optnBtn_01_psh" + .balign 4 .global $$29610 $$29610: - .incbin "baserom.dol", 0x43F8A8, 0x10 + .asciz "optnBtn_10_psh" + .balign 4 .global $$29611 $$29611: - .incbin "baserom.dol", 0x43F8B8, 0x10 + .asciz "optnBtn_11_psh" + .balign 4 .global $$29612 $$29612: - .incbin "baserom.dol", 0x43F8C8, 0x10 + .asciz "optnBtn_20_psh" + .balign 4 .global $$29613 $$29613: - .incbin "baserom.dol", 0x43F8D8, 0x18 + .asciz "optnBtn_10_cntrl" + .balign 4 + .4byte 0 .global $$29614 $$29614: - .incbin "baserom.dol", 0x43F8F0, 0x10 + .asciz "msgBtn_00_inOut" .global $$29615 $$29615: - .incbin "baserom.dol", 0x43F900, 0x10 + .asciz "msgBtn_01_inOut" .global $$29616 $$29616: - .incbin "baserom.dol", 0x43F910, 0x10 + .asciz "msgBtn_00_psh" + .balign 4 .global $$29617 $$29617: - .incbin "baserom.dol", 0x43F920, 0x10 + .asciz "msgBtn_01_psh" + .balign 4 .global $$29618 $$29618: - .incbin "baserom.dol", 0x43F930, 0x8 + .asciz "vol_00" + .balign 4 .global $$29619 $$29619: - .incbin "baserom.dol", 0x43F938, 0x8 + .asciz "vol_01" + .balign 4 .global $$29620 $$29620: - .incbin "baserom.dol", 0x43F940, 0x8 + .asciz "vol_02" + .balign 4 .global $$29621 $$29621: - .incbin "baserom.dol", 0x43F948, 0x8 + .asciz "vol_03" + .balign 4 .global $$29622 $$29622: - .incbin "baserom.dol", 0x43F950, 0x8 + .asciz "vol_04" + .balign 4 .global $$29623 $$29623: - .incbin "baserom.dol", 0x43F958, 0x8 + .asciz "vol_05" + .balign 4 .global $$29624 $$29624: - .incbin "baserom.dol", 0x43F960, 0x8 + .asciz "vol_06" + .balign 4 .global $$29625 $$29625: - .incbin "baserom.dol", 0x43F968, 0x8 + .asciz "vol_07" + .balign 4 .global $$29626 $$29626: - .incbin "baserom.dol", 0x43F970, 0x8 + .asciz "vol_08" + .balign 4 .global $$29627 $$29627: - .incbin "baserom.dol", 0x43F978, 0x8 + .asciz "vol_09" + .balign 4 .global $$29628 $$29628: - .incbin "baserom.dol", 0x43F980, 0x8 + .asciz "plyr_00" .global $$29629 $$29629: - .incbin "baserom.dol", 0x43F988, 0x8 + .asciz "plyr_01" .global $$29630 $$29630: - .incbin "baserom.dol", 0x43F990, 0x8 + .asciz "plyr_02" .global $$29631 $$29631: - .incbin "baserom.dol", 0x43F998, 0x8 + .asciz "plyr_03" .global scGroupName__Q210homebutton10HomeButton scGroupName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43F9A0, 0x8C + .4byte 0x804436D0 + .4byte 0x804436DC + .4byte 0x804436E8 + .4byte 0x804436F8 + .4byte 0x80443708 + .4byte 0x80443714 + .4byte 0x80443724 + .4byte 0x80443738 + .4byte 0x8044374C + .4byte 0x80443760 + .4byte 0x80443774 + .4byte 0x80443788 + .4byte 0x80443798 + .4byte 0x804437A8 + .4byte 0x804437B8 + .4byte 0x804437C8 + .4byte 0x804437D8 + .4byte 0x804437F0 + .4byte 0x80443800 + .4byte 0x80443810 + .4byte 0x80443820 + .4byte 0x80443830 + .4byte 0x80443838 + .4byte 0x80443840 + .4byte 0x80443848 + .4byte 0x80443850 + .4byte 0x80443858 + .4byte 0x80443860 + .4byte 0x80443868 + .4byte 0x80443870 + .4byte 0x80443878 + .4byte 0x80443880 + .4byte 0x80443888 + .4byte 0x80443890 + .4byte 0x80443898 .global $$29632 $$29632: - .incbin "baserom.dol", 0x43FA2C, 0xC + .asciz "let_icn_00" + .balign 4 .global $$29633 $$29633: - .incbin "baserom.dol", 0x43FA38, 0xC + .asciz "N_plyr_00" + .balign 4 .global $$29634 $$29634: - .incbin "baserom.dol", 0x43FA44, 0xC + .asciz "N_plyr_01" + .balign 4 .global $$29635 $$29635: - .incbin "baserom.dol", 0x43FA50, 0xC + .asciz "N_plyr_02" + .balign 4 .global $$29636 $$29636: - .incbin "baserom.dol", 0x43FA5C, 0xC + .asciz "N_plyr_03" + .balign 4 .global scFuncPaneName__Q210homebutton10HomeButton scFuncPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43FA68, 0x14 + .4byte 0x8044392C + .4byte 0x80443938 + .4byte 0x80443944 + .4byte 0x80443950 + .4byte 0x8044395C .global $$29637 $$29637: - .incbin "baserom.dol", 0x43FA7C, 0xC + .asciz "B_btn_00" + .balign 4 .global $$29638 $$29638: - .incbin "baserom.dol", 0x43FA88, 0xC + .asciz "B_bar_10" + .balign 4 .global $$29639 $$29639: - .incbin "baserom.dol", 0x43FA94, 0x10 + .asciz "B_optnBtn_00" + .balign 4 .global $$29640 $$29640: - .incbin "baserom.dol", 0x43FAA4, 0x10 + .asciz "B_optnBtn_01" + .balign 4 .global $$29641 $$29641: - .incbin "baserom.dol", 0x43FAB4, 0x10 + .asciz "B_optnBtn_10" + .balign 4 .global $$29642 $$29642: - .incbin "baserom.dol", 0x43FAC4, 0x10 + .asciz "B_optnBtn_11" + .balign 4 .global $$29643 $$29643: - .incbin "baserom.dol", 0x43FAD4, 0x10 + .asciz "B_optnBtn_20" + .balign 4 .global $$29644 $$29644: - .incbin "baserom.dol", 0x43FAE4, 0x8 + .asciz "B_BtnA" + .balign 4 .global $$29645 $$29645: - .incbin "baserom.dol", 0x43FAEC, 0x8 + .asciz "B_BtnB" + .balign 4 .global $$29646 $$29646: - .incbin "baserom.dol", 0x43FAF4, 0xC + .asciz "cntrl_00" + .balign 4 .global scFuncTouchPaneName__Q210homebutton10HomeButton scFuncTouchPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43FB00, 0x28 + .4byte 0x8044397C + .4byte 0x80443988 + .4byte 0x80443994 + .4byte 0x804439A4 + .4byte 0x804439B4 + .4byte 0x804439C4 + .4byte 0x804439D4 + .4byte 0x804439E4 + .4byte 0x804439EC + .4byte 0x804439F4 .global $$29647 $$29647: - .incbin "baserom.dol", 0x43FB28, 0xC + .asciz "T_msg_00" + .balign 4 .global $$29648 $$29648: - .incbin "baserom.dol", 0x43FB34, 0xC + .asciz "T_msg_01" + .balign 4 .global $$29649 $$29649: - .incbin "baserom.dol", 0x43FB40, 0xC + .asciz "T_Dialog" + .balign 4 .global scFuncTextPaneName__Q210homebutton10HomeButton scFuncTextPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43FB4C, 0xC + .4byte 0x80443A28 + .4byte 0x80443A34 + .4byte 0x80443A40 .global $$29650 $$29650: - .incbin "baserom.dol", 0x43FB58, 0x10 + .asciz "btryPwr_00_0" + .balign 4 .global $$29651 $$29651: - .incbin "baserom.dol", 0x43FB68, 0x10 + .asciz "btryPwr_00_1" + .balign 4 .global $$29652 $$29652: - .incbin "baserom.dol", 0x43FB78, 0x10 + .asciz "btryPwr_00_2" + .balign 4 .global $$29653 $$29653: - .incbin "baserom.dol", 0x43FB88, 0x10 + .asciz "btryPwr_00_3" + .balign 4 .global $$29654 $$29654: - .incbin "baserom.dol", 0x43FB98, 0x10 + .asciz "btryPwr_01_0" + .balign 4 .global $$29655 $$29655: - .incbin "baserom.dol", 0x43FBA8, 0x10 + .asciz "btryPwr_01_1" + .balign 4 .global $$29656 $$29656: - .incbin "baserom.dol", 0x43FBB8, 0x10 + .asciz "btryPwr_01_2" + .balign 4 .global $$29657 $$29657: - .incbin "baserom.dol", 0x43FBC8, 0x10 + .asciz "btryPwr_01_3" + .balign 4 .global $$29658 $$29658: - .incbin "baserom.dol", 0x43FBD8, 0x10 + .asciz "btryPwr_02_0" + .balign 4 .global $$29659 $$29659: - .incbin "baserom.dol", 0x43FBE8, 0x10 + .asciz "btryPwr_02_1" + .balign 4 .global $$29660 $$29660: - .incbin "baserom.dol", 0x43FBF8, 0x10 + .asciz "btryPwr_02_2" + .balign 4 .global $$29661 $$29661: - .incbin "baserom.dol", 0x43FC08, 0x10 + .asciz "btryPwr_02_3" + .balign 4 .global $$29662 $$29662: - .incbin "baserom.dol", 0x43FC18, 0x10 + .asciz "btryPwr_03_0" + .balign 4 .global $$29663 $$29663: - .incbin "baserom.dol", 0x43FC28, 0x10 + .asciz "btryPwr_03_1" + .balign 4 .global $$29664 $$29664: - .incbin "baserom.dol", 0x43FC38, 0x10 + .asciz "btryPwr_03_2" + .balign 4 .global $$29665 $$29665: - .incbin "baserom.dol", 0x43FC48, 0x10 + .asciz "btryPwr_03_3" + .balign 4 .global scBatteryPaneName__Q210homebutton10HomeButton scBatteryPaneName__Q210homebutton10HomeButton: - .incbin "baserom.dol", 0x43FC58, 0x40 + .4byte 0x80443A58 + .4byte 0x80443A68 + .4byte 0x80443A78 + .4byte 0x80443A88 + .4byte 0x80443A98 + .4byte 0x80443AA8 + .4byte 0x80443AB8 + .4byte 0x80443AC8 + .4byte 0x80443AD8 + .4byte 0x80443AE8 + .4byte 0x80443AF8 + .4byte 0x80443B08 + .4byte 0x80443B18 + .4byte 0x80443B28 + .4byte 0x80443B38 + .4byte 0x80443B48 .global $$216076 $$216076: - .incbin "baserom.dol", 0x43FC98, 0x8 + .4byte 0x61726300 + .4byte 0 .global $$216077 $$216077: - .incbin "baserom.dol", 0x43FCA0, 0x8 + .asciz "back_00" .global $$216078 $$216078: - .incbin "baserom.dol", 0x43FCA8, 0x8 + .asciz "back_01" .global $$216079 $$216079: - .incbin "baserom.dol", 0x43FCB0, 0x8 + .asciz "back_02" .global $$216082 $$216082: - .incbin "baserom.dol", 0x43FCB8, 0xC + .asciz "bar_line_00" .global $$216083 $$216083: - .incbin "baserom.dol", 0x43FCC4, 0xC + .asciz "bar_line_10" .global $$216253 $$216253: - .incbin "baserom.dol", 0x43FCD0, 0xC + .asciz "N_cntrl_01" + .balign 4 .global $$216254 $$216254: - .incbin "baserom.dol", 0x43FCDC, 0x8 + .asciz "bar_00" + .balign 4 .global $$216255 $$216255: - .incbin "baserom.dol", 0x43FCE4, 0x8 + .asciz "bar_10" + .balign 4 .global $$217003 $$217003: - .incbin "baserom.dol", 0x43FCEC, 0x50 + .4byte 0x8012E23C ;# ptr + .4byte 0x8012E420 ;# ptr + .4byte 0x8012FA44 ;# ptr + .4byte 0x8012E690 ;# ptr + .4byte 0x8012E788 ;# ptr + .4byte 0x8012E8A4 ;# ptr + .4byte 0x8012E8A4 ;# ptr + .4byte 0x8012EB70 ;# ptr + .4byte 0x8012EC34 ;# ptr + .4byte 0x8012EDEC ;# ptr + .4byte 0x8012EE40 ;# ptr + .4byte 0x8012EF64 ;# ptr + .4byte 0x8012EFA8 ;# ptr + .4byte 0x8012EFE0 ;# ptr + .4byte 0x8012F0D8 ;# ptr + .4byte 0x8012F26C ;# ptr + .4byte 0x8012F2F0 ;# ptr + .4byte 0x8012F3A8 ;# ptr + .4byte 0x8012F62C ;# ptr + .4byte 0x8012F638 ;# ptr .global $$217952 $$217952: - .incbin "baserom.dol", 0x43FD3C, 0x28 + .4byte 0x80131B54 ;# ptr + .4byte 0x80131C14 ;# ptr + .4byte 0x801321C8 ;# ptr + .4byte 0x80132298 ;# ptr + .4byte 0x80132368 ;# ptr + .4byte 0x80132438 ;# ptr + .4byte 0x80132508 ;# ptr + .4byte 0x801325D8 ;# ptr + .4byte 0x801326A8 ;# ptr + .4byte 0x80131C14 ;# ptr .global $$218150 $$218150: - .incbin "baserom.dol", 0x43FD64, 0x28 + .4byte 0x801329A4 ;# ptr + .4byte 0x80132A18 ;# ptr + .4byte 0x80132F4C ;# ptr + .4byte 0x80132FD4 ;# ptr + .4byte 0x8013305C ;# ptr + .4byte 0x801330E4 ;# ptr + .4byte 0x8013316C ;# ptr + .4byte 0x801331F4 ;# ptr + .4byte 0x8013327C ;# ptr + .4byte 0x80132A18 ;# ptr .global $$218596 $$218596: - .incbin "baserom.dol", 0x43FD8C, 0x2C + .4byte 0x80133610 ;# ptr + .4byte 0x801336A4 ;# ptr + .4byte 0x80133828 ;# ptr + .4byte 0x80133AF4 ;# ptr + .4byte 0x80133DC4 ;# ptr + .4byte 0x80133FF8 ;# ptr + .4byte 0x80134184 ;# ptr + .4byte 0x80134344 ;# ptr + .4byte 0x801344B0 ;# ptr + .4byte 0x801336A4 ;# ptr + .4byte 0 .global __vt__Q210homebutton22HomeButtonEventHandler __vt__Q210homebutton22HomeButtonEventHandler: - .incbin "baserom.dol", 0x43FDB8, 0x10 + .4byte 0x80443CF8 + .4byte 0 + .4byte 0x80134A10 ;# ptr + .4byte 0x80129FF0 ;# ptr .global $$211453 $$211453: - .incbin "baserom.dol", 0x43FDC8, 0x24 + .asciz "homebutton::HomeButtonEventHandler" + .balign 4 .global $$211454 $$211454: - .incbin "baserom.dol", 0x43FDEC, 0xC + .4byte 0x80443D30 + .4byte 0 + .4byte 0 .global __RTTI__Q210homebutton22HomeButtonEventHandler __RTTI__Q210homebutton22HomeButtonEventHandler: - .incbin "baserom.dol", 0x43FDF8, 0x8 + .4byte 0x80443CC8 + .4byte 0x80443CEC .global __vt__Q310homebutton3gui12EventHandler __vt__Q310homebutton3gui12EventHandler: - .incbin "baserom.dol", 0x43FE00, 0x10 + .4byte 0x80443D30 + .4byte 0 + .4byte 0x80128C90 ;# ptr + .4byte 0x80129FF0 ;# ptr .global $$211456 $$211456: - .incbin "baserom.dol", 0x43FE10, 0x20 + .asciz "homebutton::gui::EventHandler" + .balign 4 .global __RTTI__Q310homebutton3gui12EventHandler __RTTI__Q310homebutton3gui12EventHandler: - .incbin "baserom.dol", 0x43FE30, 0x28 + .4byte 0x80443D10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$211457 $$211457: - .incbin "baserom.dol", 0x43FE58, 0x28 + .asciz "homebutton::gui::Interface" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global spHomeButtonObj__Q210homebutton10HomeButton diff --git a/asm/homebuttonLib/HBMCommon.s b/asm/homebuttonLib/HBMCommon.s index ae7a211d..8c0dc614 100644 --- a/asm/homebuttonLib/HBMCommon.s +++ b/asm/homebuttonLib/HBMCommon.s @@ -283,13 +283,14 @@ HBMUpdateSound: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$29367 $$29367: - .incbin "baserom.dol", 0x43F118, 0x48 + .asciz "<< RVL_SDK - HBM \trelease build: Jul 30 2010 15:28:44 (0x4302_145) >>" + .balign 4 .global __HBMVersion __HBMVersion: - .incbin "baserom.dol", 0x43F160, 0x4 + .4byte 0x80443018 .global spAllocator spAllocator: - .incbin "baserom.dol", 0x43F164, 0x4 + .4byte 0x805436B0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sAllocator diff --git a/asm/homebuttonLib/HBMController.s b/asm/homebuttonLib/HBMController.s index 73ea9fc8..0e9c75e8 100644 --- a/asm/homebuttonLib/HBMController.s +++ b/asm/homebuttonLib/HBMController.s @@ -895,16 +895,16 @@ clrBatteryFlag__Q210homebutton10ControllerFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29283 $$29283: - .incbin "baserom.dol", 0x409EF8, 0x4 + .4byte 0x3F800000 .global $$29341 $$29341: - .incbin "baserom.dol", 0x409EFC, 0x4 + .4byte 0xC61C4000 .global $$29342 $$29342: - .incbin "baserom.dol", 0x409F00, 0x4 + .4byte 0xC66A6000 .global $$29369 $$29369: - .incbin "baserom.dol", 0x409F04, 0x4 + .4byte 0x41200000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sBatteryFlag__Q210homebutton10Controller diff --git a/asm/homebuttonLib/HBMFrameController.s b/asm/homebuttonLib/HBMFrameController.s index 989db86d..4b3cc622 100644 --- a/asm/homebuttonLib/HBMFrameController.s +++ b/asm/homebuttonLib/HBMFrameController.s @@ -130,12 +130,15 @@ lbl_8012874C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$22246 $$22246: - .incbin "baserom.dol", 0x409EE0, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22206 $$22206: - .incbin "baserom.dol", 0x43EAB8, 0x20 + .asciz "homebutton::FrameController" + .4byte 0 .global __RTTI__Q210homebutton15FrameController __RTTI__Q210homebutton15FrameController: - .incbin "baserom.dol", 0x43EAD8, 0x8 + .4byte 0x804429B8 + .4byte 0 diff --git a/asm/homebuttonLib/HBMGUIManager.s b/asm/homebuttonLib/HBMGUIManager.s index 9e541cb0..a1456c66 100644 --- a/asm/homebuttonLib/HBMGUIManager.s +++ b/asm/homebuttonLib/HBMGUIManager.s @@ -1804,72 +1804,183 @@ setDrawInfo__Q310homebutton3gui11PaneManagerFPCQ36nw4hbm3lyt8DrawInfo: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29996 $$29996: - .incbin "baserom.dol", 0x409EE8, 0x4 + .4byte 0 .global $$29409 $$29409: - .incbin "baserom.dol", 0x409EEC, 0x4 + .4byte 0xFF0000FF .global $$210512 $$210512: - .incbin "baserom.dol", 0x409EF0, 0x4 + .4byte 0x3F000000 .global $$2LOCAL$$2drawLine___Q210homebutton3guiFfffffUcR8_GXColor$$2cubeScale $$2LOCAL$$2drawLine___Q210homebutton3guiFfffffUcR8_GXColor$$2cubeScale: - .incbin "baserom.dol", 0x409EF4, 0x4 + .4byte 0x3F800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q310homebutton3gui13PaneComponent __vt__Q310homebutton3gui13PaneComponent: - .incbin "baserom.dol", 0x43EB28, 0x68 + .4byte 0x80442AC8 + .4byte 0 + .4byte 0x80129F70 ;# ptr + .4byte 0x80128E10 ;# ptr + .4byte 0x80129250 ;# ptr + .4byte 0x80129F60 ;# ptr + .4byte 0x80129BD0 ;# ptr + .4byte 0x801294D0 ;# ptr + .4byte 0x80128CA0 ;# ptr + .4byte 0x80128C50 ;# ptr + .4byte 0x80128CB0 ;# ptr + .4byte 0x80128CC0 ;# ptr + .4byte 0x80128CD0 ;# ptr + .4byte 0x80129FA0 ;# ptr + .4byte 0x80128C60 ;# ptr + .4byte 0x801291B0 ;# ptr + .4byte 0x80129F90 ;# ptr + .4byte 0x80129F80 ;# ptr + .4byte 0x80128A30 ;# ptr + .4byte 0x801291A0 ;# ptr + .4byte 0x80129360 ;# ptr + .4byte 0x80128F10 ;# ptr + .4byte 0x80129E80 ;# ptr + .4byte 0x80129A90 ;# ptr + .4byte 0x801297E0 ;# ptr + .4byte 0x80129FB0 ;# ptr .global $$29429 $$29429: - .incbin "baserom.dol", 0x43EB90, 0x20 + .asciz "homebutton::gui::PaneComponent" + .balign 4 .global $$29430 $$29430: - .incbin "baserom.dol", 0x43EBB0, 0x18 + .4byte 0x80442C90 + .4byte 0 + .4byte 0x80442C68 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q310homebutton3gui13PaneComponent __RTTI__Q310homebutton3gui13PaneComponent: - .incbin "baserom.dol", 0x43EBC8, 0x8 + .4byte 0x80442A90 + .4byte 0x80442AB0 .global __vt__Q310homebutton3gui11PaneManager __vt__Q310homebutton3gui11PaneManager: - .incbin "baserom.dol", 0x43EBD0, 0x64 + .4byte 0x80442B68 + .4byte 0 + .4byte 0x80129F70 ;# ptr + .4byte 0x80128DA0 ;# ptr + .4byte 0x801291E0 ;# ptr + .4byte 0x80129F60 ;# ptr + .4byte 0x80129260 ;# ptr + .4byte 0x80129370 ;# ptr + .4byte 0x80128E40 ;# ptr + .4byte 0x80128F20 ;# ptr + .4byte 0x80128FC0 ;# ptr + .4byte 0x8012A000 ;# ptr + .4byte 0x80128FF0 ;# ptr + .4byte 0x80128C70 ;# ptr + .4byte 0x801292E0 ;# ptr + .4byte 0x80129FC0 ;# ptr + .4byte 0x801294F0 ;# ptr + .4byte 0x80129520 ;# ptr + .4byte 0x80129800 ;# ptr + .4byte 0x80129940 ;# ptr + .4byte 0x80129BC0 ;# ptr + .4byte 0x8012A010 ;# ptr + .4byte 0x801299C0 ;# ptr + .4byte 0x80129540 ;# ptr + .4byte 0x80129820 ;# ptr .global $$29431 $$29431: - .incbin "baserom.dol", 0x43EC34, 0x20 + .asciz "homebutton::gui::PaneManager" + .balign 4 .global $$29432 $$29432: - .incbin "baserom.dol", 0x43EC54, 0x14 + .4byte 0x80442C90 + .4byte 0 + .4byte 0x80442BD8 + .4byte 0 + .4byte 0 .global __RTTI__Q310homebutton3gui11PaneManager __RTTI__Q310homebutton3gui11PaneManager: - .incbin "baserom.dol", 0x43EC68, 0x8 + .4byte 0x80442B34 + .4byte 0x80442B54 .global __vt__Q310homebutton3gui7Manager __vt__Q310homebutton3gui7Manager: - .incbin "baserom.dol", 0x43EC70, 0x40 + .4byte 0x80442BD8 + .4byte 0 + .4byte 0x80129F70 ;# ptr + .4byte 0x80128DA0 ;# ptr + .4byte 0x801291E0 ;# ptr + .4byte 0x80129F60 ;# ptr + .4byte 0x80129260 ;# ptr + .4byte 0x80128CE0 ;# ptr + .4byte 0x80128E40 ;# ptr + .4byte 0x80128F20 ;# ptr + .4byte 0x80128FC0 ;# ptr + .4byte 0x8012A000 ;# ptr + .4byte 0x80128FF0 ;# ptr + .4byte 0x80128C70 ;# ptr + .4byte 0x801292E0 ;# ptr + .4byte 0x80129FC0 ;# ptr .global $$29433 $$29433: - .incbin "baserom.dol", 0x43ECB0, 0x1C + .asciz "homebutton::gui::Manager" + .balign 4 .global $$29434 $$29434: - .incbin "baserom.dol", 0x43ECCC, 0xC + .4byte 0x80442C90 + .4byte 0 + .4byte 0 .global __RTTI__Q310homebutton3gui7Manager __RTTI__Q310homebutton3gui7Manager: - .incbin "baserom.dol", 0x43ECD8, 0x8 + .4byte 0x80442BB0 + .4byte 0x80442BCC .global __vt__Q310homebutton3gui9Component __vt__Q310homebutton3gui9Component: - .incbin "baserom.dol", 0x43ECE0, 0x60 + .4byte 0x80442C68 + .4byte 0 + .4byte 0x80129F70 ;# ptr + .4byte 0x80128E10 ;# ptr + .4byte 0x80129250 ;# ptr + .4byte 0x80129F60 ;# ptr + .4byte 0x801292D0 ;# ptr + .4byte 0x801294E0 ;# ptr + .4byte 0x80128CA0 ;# ptr + .4byte 0x80128C50 ;# ptr + .4byte 0x80128CB0 ;# ptr + .4byte 0x80128CC0 ;# ptr + .4byte 0x80128CD0 ;# ptr + .4byte 0x80129FA0 ;# ptr + .4byte 0x80128C60 ;# ptr + .4byte 0x801291B0 ;# ptr + .4byte 0x80129F90 ;# ptr + .4byte 0x80129F80 ;# ptr + .4byte 0x80128A30 ;# ptr + .4byte 0x801291A0 ;# ptr + .4byte 0x80129360 ;# ptr + .4byte 0x80128F10 ;# ptr + .4byte 0x80128C40 ;# ptr + .4byte 0 .global $$29435 $$29435: - .incbin "baserom.dol", 0x43ED40, 0x1C + .asciz "homebutton::gui::Component" + .balign 4 .global $$29436 $$29436: - .incbin "baserom.dol", 0x43ED5C, 0xC + .4byte 0x80442C90 + .4byte 0 + .4byte 0 .global __RTTI__Q310homebutton3gui9Component __RTTI__Q310homebutton3gui9Component: - .incbin "baserom.dol", 0x43ED68, 0x8 + .4byte 0x80442C40 + .4byte 0x80442C5C .global $$29437 $$29437: - .incbin "baserom.dol", 0x43ED70, 0x20 + .asciz "homebutton::gui::Interface" + .balign 4 + .4byte 0 .global __RTTI__Q310homebutton3gui9Interface __RTTI__Q310homebutton3gui9Interface: - .incbin "baserom.dol", 0x43ED90, 0x8 + .4byte 0x80442C70 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global suIDCounter__Q310homebutton3gui11PaneManager diff --git a/asm/homebuttonLib/HBMRemoteSpk.s b/asm/homebuttonLib/HBMRemoteSpk.s index 8fc5295a..4dc06900 100644 --- a/asm/homebuttonLib/HBMRemoteSpk.s +++ b/asm/homebuttonLib/HBMRemoteSpk.s @@ -667,13 +667,18 @@ isPlayReady__Q210homebutton9RemoteSpkCFl: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton9RemoteSpk __vt__Q210homebutton9RemoteSpk: - .incbin "baserom.dol", 0x43ED98, 0xC + .4byte 0x80442CC0 + .4byte 0 + .4byte 0x8012AFA0 ;# ptr .global $$26598 $$26598: - .incbin "baserom.dol", 0x43EDA4, 0x1C + .asciz "homebutton::RemoteSpk" + .balign 4 + .4byte 0 .global __RTTI__Q210homebutton9RemoteSpk __RTTI__Q210homebutton9RemoteSpk: - .incbin "baserom.dol", 0x43EDC0, 0x8 + .4byte 0x80442CA4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global spInstance__Q210homebutton9RemoteSpk diff --git a/asm/homebuttonLib/lyt_animation.s b/asm/homebuttonLib/lyt_animation.s index f907f750..33cebf50 100644 --- a/asm/homebuttonLib/lyt_animation.s +++ b/asm/homebuttonLib/lyt_animation.s @@ -828,45 +828,59 @@ lbl_8013582C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$28495 $$28495: - .incbin "baserom.dol", 0x40A2C0, 0x4 + .4byte 0xBA83126F .global $$28496 $$28496: - .incbin "baserom.dol", 0x40A2C4, 0x4 + .4byte 0x3A83126F .global $$28520 $$28520: - .incbin "baserom.dol", 0x40A2C8, 0x4 + .4byte 0x3F800000 .global $$28521 $$28521: - .incbin "baserom.dol", 0x40A2CC, 0x4 + .4byte 0x40000000 .global $$28522 $$28522: - .incbin "baserom.dol", 0x40A2D0, 0x4 + .4byte 0x40400000 .global $$28523 $$28523: - .incbin "baserom.dol", 0x40A2D4, 0x4 + .4byte 0xC0000000 .global $$28528 $$28528: - .incbin "baserom.dol", 0x40A2D8, 0x4 + .4byte 0 .global $$28717 $$28717: - .incbin "baserom.dol", 0x40A2DC, 0x4 + .4byte 0x3F000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt18AnimTransformBasic __vt__Q36nw4hbm3lyt18AnimTransformBasic: - .incbin "baserom.dol", 0x43FE80, 0x20 + .4byte 0x80443DD0 + .4byte 0 + .4byte 0x80135010 ;# ptr + .4byte 0x801350A0 ;# ptr + .4byte 0x801351F0 ;# ptr + .4byte 0x801352F0 ;# ptr + .4byte 0x801353B0 ;# ptr + .4byte 0x80135590 ;# ptr .global $$28016 $$28016: - .incbin "baserom.dol", 0x43FEA0, 0x20 + .asciz "nw4hbm::lyt::AnimTransformBasic" .global $$28017 $$28017: - .incbin "baserom.dol", 0x43FEC0, 0x10 + .4byte 0x80443DF8 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt18AnimTransformBasic __RTTI__Q36nw4hbm3lyt18AnimTransformBasic: - .incbin "baserom.dol", 0x43FED0, 0x8 + .4byte 0x80443DA0 + .4byte 0x80443DC0 .global $$28018 $$28018: - .incbin "baserom.dol", 0x43FED8, 0x20 + .asciz "nw4hbm::lyt::AnimTransform" + .balign 4 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt13AnimTransform __RTTI__Q36nw4hbm3lyt13AnimTransform: - .incbin "baserom.dol", 0x43FEF8, 0x8 + .4byte 0x80443DD8 + .4byte 0 diff --git a/asm/homebuttonLib/lyt_arcResourceAccessor.s b/asm/homebuttonLib/lyt_arcResourceAccessor.s index 74a7055e..3d3a4d2f 100644 --- a/asm/homebuttonLib/lyt_arcResourceAccessor.s +++ b/asm/homebuttonLib/lyt_arcResourceAccessor.s @@ -205,25 +205,36 @@ GetFont__Q36nw4hbm3lyt19ArcResourceAccessorFPCc: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23471 $$23471: - .incbin "baserom.dol", 0x43FF00, 0x4 + .4byte 0x2E000000 .global $$23472 $$23472: - .incbin "baserom.dol", 0x43FF04, 0x4 + .4byte 0x2E2E0000 .global __vt__Q36nw4hbm3lyt19ArcResourceAccessor __vt__Q36nw4hbm3lyt19ArcResourceAccessor: - .incbin "baserom.dol", 0x43FF08, 0x14 + .4byte 0x80443E50 + .4byte 0 + .4byte 0x8012C9A0 ;# ptr + .4byte 0x80135B00 ;# ptr + .4byte 0x80135B20 ;# ptr .global $$23154 $$23154: - .incbin "baserom.dol", 0x43FF1C, 0x24 + .asciz "nw4hbm::lyt::ArcResourceAccessor" + .balign 4 .global $$23155 $$23155: - .incbin "baserom.dol", 0x43FF40, 0x10 + .4byte 0x80443E78 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor: - .incbin "baserom.dol", 0x43FF50, 0x8 + .4byte 0x80443E1C + .4byte 0x80443E40 .global $$23156 $$23156: - .incbin "baserom.dol", 0x43FF58, 0x20 + .asciz "nw4hbm::lyt::ResourceAccessor" + .balign 4 .global __RTTI__Q36nw4hbm3lyt16ResourceAccessor __RTTI__Q36nw4hbm3lyt16ResourceAccessor: - .incbin "baserom.dol", 0x43FF78, 0x8 + .4byte 0x80443E58 + .4byte 0 diff --git a/asm/homebuttonLib/lyt_bounding.s b/asm/homebuttonLib/lyt_bounding.s index 5d0db30e..d64d1f73 100644 --- a/asm/homebuttonLib/lyt_bounding.s +++ b/asm/homebuttonLib/lyt_bounding.s @@ -106,36 +106,72 @@ __sinit_$$3lyt_bounding_cpp: /* 80135C7C 00131ABC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023C4, 0x4 + .4byte 0x80135C60 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8Bounding __vt__Q36nw4hbm3lyt8Bounding: - .incbin "baserom.dol", 0x43FF80, 0x64 + .4byte 0x80443F10 + .4byte 0 + .4byte 0x80135B70 ;# ptr + .4byte 0x80135C50 ;# ptr + .4byte 0x8013B0A0 ;# ptr + .4byte 0x8013B3A0 ;# ptr + .4byte 0x80135BD0 ;# ptr + .4byte 0x8013B580 ;# ptr + .4byte 0x8013B610 ;# ptr + .4byte 0x8013AE90 ;# ptr + .4byte 0x8013AEA0 ;# ptr + .4byte 0x8013AEB0 ;# ptr + .4byte 0x8013AEE0 ;# ptr + .4byte 0x8013AF10 ;# ptr + .4byte 0x8013AF20 ;# ptr + .4byte 0x8013AF30 ;# ptr + .4byte 0x8013AFE0 ;# ptr + .4byte 0x8013B6D0 ;# ptr + .4byte 0x8013B6F0 ;# ptr + .4byte 0x8013B700 ;# ptr + .4byte 0x8013B710 ;# ptr + .4byte 0x8013B7F0 ;# ptr + .4byte 0x8013B870 ;# ptr + .4byte 0x8013BB20 ;# ptr + .4byte 0x8013B930 ;# ptr .global $$27465 $$27465: - .incbin "baserom.dol", 0x43FFE4, 0x18 + .asciz "nw4hbm::lyt::Bounding" + .balign 4 .global $$27466 $$27466: - .incbin "baserom.dol", 0x43FFFC, 0x14 + .4byte 0x80443F60 + .4byte 0 + .4byte 0x80443F38 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt8Bounding __RTTI__Q36nw4hbm3lyt8Bounding: - .incbin "baserom.dol", 0x440010, 0x8 + .4byte 0x80443EE4 + .4byte 0x80443EFC .global $$27467 $$27467: - .incbin "baserom.dol", 0x440018, 0x14 + .asciz "nw4hbm::lyt::Pane" + .balign 4 .global $$27468 $$27468: - .incbin "baserom.dol", 0x44002C, 0xC + .4byte 0x80443F60 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt4Pane __RTTI__Q36nw4hbm3lyt4Pane: - .incbin "baserom.dol", 0x440038, 0x8 + .4byte 0x80443F18 + .4byte 0x80443F2C .global $$27469 $$27469: - .incbin "baserom.dol", 0x440040, 0x20 + .asciz "nw4hbm::lyt::detail::PaneBase" + .balign 4 .global __RTTI__Q46nw4hbm3lyt6detail8PaneBase __RTTI__Q46nw4hbm3lyt6detail8PaneBase: - .incbin "baserom.dol", 0x440060, 0x8 + .4byte 0x80443F40 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt8Bounding diff --git a/asm/homebuttonLib/lyt_common.s b/asm/homebuttonLib/lyt_common.s index d1fe25a8..7483870e 100644 --- a/asm/homebuttonLib/lyt_common.s +++ b/asm/homebuttonLib/lyt_common.s @@ -823,13 +823,14 @@ lbl_801367CC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27898 $$27898: - .incbin "baserom.dol", 0x40A2E0, 0x4 + .4byte 0 .global $$27899 $$27899: - .incbin "baserom.dol", 0x40A2E4, 0x4 + .4byte 0x3F800000 .global $$28392 $$28392: - .incbin "baserom.dol", 0x40A2E8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2SetSize__Q46nw4hbm3lyt6detail11TexCoordAryFUc$$2texCoords diff --git a/asm/homebuttonLib/lyt_drawInfo.s b/asm/homebuttonLib/lyt_drawInfo.s index 74509593..38202c86 100644 --- a/asm/homebuttonLib/lyt_drawInfo.s +++ b/asm/homebuttonLib/lyt_drawInfo.s @@ -46,18 +46,23 @@ __dt__Q36nw4hbm3lyt8DrawInfoFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$25011 $$25011: - .incbin "baserom.dol", 0x40A2F0, 0x4 + .4byte 0 .global $$25012 $$25012: - .incbin "baserom.dol", 0x40A2F4, 0x4 + .4byte 0x3F800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8DrawInfo __vt__Q36nw4hbm3lyt8DrawInfo: - .incbin "baserom.dol", 0x440068, 0xC + .4byte 0x80443F90 + .4byte 0 + .4byte 0x801368C0 ;# ptr .global $$24994 $$24994: - .incbin "baserom.dol", 0x440074, 0x1C + .asciz "nw4hbm::lyt::DrawInfo" + .balign 4 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt8DrawInfo __RTTI__Q36nw4hbm3lyt8DrawInfo: - .incbin "baserom.dol", 0x440090, 0x8 + .4byte 0x80443F74 + .4byte 0 diff --git a/asm/homebuttonLib/lyt_group.s b/asm/homebuttonLib/lyt_group.s index b5d8b4e3..b4aa6d5e 100644 --- a/asm/homebuttonLib/lyt_group.s +++ b/asm/homebuttonLib/lyt_group.s @@ -247,10 +247,14 @@ lbl_80136BFC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt5Group __vt__Q36nw4hbm3lyt5Group: - .incbin "baserom.dol", 0x440098, 0xC + .4byte 0x80443FB8 + .4byte 0 + .4byte 0x801369E0 ;# ptr .global $$27939 $$27939: - .incbin "baserom.dol", 0x4400A4, 0x14 + .asciz "nw4hbm::lyt::Group" + .balign 4 .global __RTTI__Q36nw4hbm3lyt5Group __RTTI__Q36nw4hbm3lyt5Group: - .incbin "baserom.dol", 0x4400B8, 0x8 + .4byte 0x80443FA4 + .4byte 0 diff --git a/asm/homebuttonLib/lyt_layout.s b/asm/homebuttonLib/lyt_layout.s index 3d41c511..4d9e6026 100644 --- a/asm/homebuttonLib/lyt_layout.s +++ b/asm/homebuttonLib/lyt_layout.s @@ -947,21 +947,34 @@ lbl_80137858: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29387 $$29387: - .incbin "baserom.dol", 0x40A2F8, 0x4 + .4byte 0 .global $$29664 $$29664: - .incbin "baserom.dol", 0x40A2FC, 0x4 + .4byte 0x3F000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt6Layout __vt__Q36nw4hbm3lyt6Layout: - .incbin "baserom.dol", 0x4400C0, 0x34 + .4byte 0x80444008 + .4byte 0 + .4byte 0x80136E00 ;# ptr + .4byte 0x80136F30 ;# ptr + .4byte 0x80137240 ;# ptr + .4byte 0x80137390 ;# ptr + .4byte 0x801373C0 ;# ptr + .4byte 0x801373D0 ;# ptr + .4byte 0x801373F0 ;# ptr + .4byte 0x80137420 ;# ptr + .4byte 0x80137430 ;# ptr + .4byte 0x80137440 ;# ptr + .4byte 0x801374C0 ;# ptr .global $$28461 $$28461: - .incbin "baserom.dol", 0x4400F4, 0x14 + .asciz "nw4hbm::lyt::Layout" .global __RTTI__Q36nw4hbm3lyt6Layout __RTTI__Q36nw4hbm3lyt6Layout: - .incbin "baserom.dol", 0x440108, 0x8 + .4byte 0x80443FF4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mspAllocator__Q36nw4hbm3lyt6Layout diff --git a/asm/homebuttonLib/lyt_material.s b/asm/homebuttonLib/lyt_material.s index 03d79ad8..f544e40d 100644 --- a/asm/homebuttonLib/lyt_material.s +++ b/asm/homebuttonLib/lyt_material.s @@ -3436,42 +3436,71 @@ lbl_8013AA5C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global DefaultBlackColor DefaultBlackColor: - .incbin "baserom.dol", 0x40A300, 0x8 + .4byte 0 + .4byte 0 .global DefaultWhiteColor DefaultWhiteColor: - .incbin "baserom.dol", 0x40A308, 0x8 + .4byte 0x00FF00FF + .4byte 0x00FF00FF .global $$29520 $$29520: - .incbin "baserom.dol", 0x40A310, 0x4 + .4byte 0x3F000000 .global $$29521 $$29521: - .incbin "baserom.dol", 0x40A314, 0x4 + .4byte 0x3F360B61 .global $$29522 $$29522: - .incbin "baserom.dol", 0x40A318, 0x4 + .4byte 0 .global $$29523 $$29523: - .incbin "baserom.dol", 0x40A31C, 0x4 + .4byte 0x3F800000 .global $$29536 $$29536: - .incbin "baserom.dol", 0x40A320, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$211974 $$211974: - .incbin "baserom.dol", 0x40A328, 0x8 + .4byte 0x43300000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kColSels $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kColSels: - .incbin "baserom.dol", 0x440110, 0x20 + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 .global $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kAlpSels$$20 $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kAlpSels$$20: - .incbin "baserom.dol", 0x440130, 0x20 + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 .global __vt__Q36nw4hbm3lyt8Material __vt__Q36nw4hbm3lyt8Material: - .incbin "baserom.dol", 0x440150, 0x28 + .4byte 0x80444090 + .4byte 0 + .4byte 0x80138D40 ;# ptr + .4byte 0x801399D0 ;# ptr + .4byte 0x8013A7F0 ;# ptr + .4byte 0x8013A800 ;# ptr + .4byte 0x8013A880 ;# ptr + .4byte 0x8013A890 ;# ptr + .4byte 0x8013A950 ;# ptr + .4byte 0x8013A960 ;# ptr .global $$28504 $$28504: - .incbin "baserom.dol", 0x440178, 0x18 + .asciz "nw4hbm::lyt::Material" + .balign 4 .global __RTTI__Q36nw4hbm3lyt8Material __RTTI__Q36nw4hbm3lyt8Material: - .incbin "baserom.dol", 0x440190, 0x8 + .4byte 0x80444078 + .4byte 0 diff --git a/asm/homebuttonLib/lyt_pane.s b/asm/homebuttonLib/lyt_pane.s index 92a93365..c6c68157 100644 --- a/asm/homebuttonLib/lyt_pane.s +++ b/asm/homebuttonLib/lyt_pane.s @@ -1238,35 +1238,61 @@ __sinit_$$3lyt_pane_cpp: /* 8013BB3C 0013797C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023C8, 0x4 + .4byte 0x8013BB30 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29169 $$29169: - .incbin "baserom.dol", 0x40A330, 0x4 + .4byte 0 .global $$29170 $$29170: - .incbin "baserom.dol", 0x40A334, 0x4 + .4byte 0x3F800000 .global $$29469 $$29469: - .incbin "baserom.dol", 0x40A338, 0x4 + .4byte 0x3F000000 .global $$2LOCAL$$2CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo$$2invAlpha $$2LOCAL$$2CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo$$2invAlpha: - .incbin "baserom.dol", 0x40A33C, 0x4 + .4byte 0x3B808081 .global $$29728 $$29728: - .incbin "baserom.dol", 0x40A340, 0x4 + .4byte 0x3C8EFA35 .global $$29729 $$29729: - .incbin "baserom.dol", 0x40A344, 0x4 + .4byte 0x3B808081 .global $$29733 $$29733: - .incbin "baserom.dol", 0x40A348, 0x8 + .4byte 0x43300000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt4Pane __vt__Q36nw4hbm3lyt4Pane: - .incbin "baserom.dol", 0x440198, 0x68 + .4byte 0x80443F38 + .4byte 0 + .4byte 0x8013ABA0 ;# ptr + .4byte 0x801297F0 ;# ptr + .4byte 0x8013B0A0 ;# ptr + .4byte 0x8013B3A0 ;# ptr + .4byte 0x8013B430 ;# ptr + .4byte 0x8013B580 ;# ptr + .4byte 0x8013B610 ;# ptr + .4byte 0x8013AE90 ;# ptr + .4byte 0x8013AEA0 ;# ptr + .4byte 0x8013AEB0 ;# ptr + .4byte 0x8013AEE0 ;# ptr + .4byte 0x8013AF10 ;# ptr + .4byte 0x8013AF20 ;# ptr + .4byte 0x8013AF30 ;# ptr + .4byte 0x8013AFE0 ;# ptr + .4byte 0x8013B6D0 ;# ptr + .4byte 0x8013B6F0 ;# ptr + .4byte 0x8013B700 ;# ptr + .4byte 0x8013B710 ;# ptr + .4byte 0x8013B7F0 ;# ptr + .4byte 0x8013B870 ;# ptr + .4byte 0x8013BB20 ;# ptr + .4byte 0x8013B930 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt4Pane diff --git a/asm/homebuttonLib/lyt_picture.s b/asm/homebuttonLib/lyt_picture.s index f725d1c2..8e9dfad8 100644 --- a/asm/homebuttonLib/lyt_picture.s +++ b/asm/homebuttonLib/lyt_picture.s @@ -392,26 +392,59 @@ __sinit_$$3lyt_picture_cpp: /* 8013C09C 00137EDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023CC, 0x4 + .4byte 0x8013C080 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$28171 $$28171: - .incbin "baserom.dol", 0x40A350, 0x8 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt7Picture __vt__Q36nw4hbm3lyt7Picture: - .incbin "baserom.dol", 0x440200, 0x6C + .4byte 0x80444198 + .4byte 0 + .4byte 0x8013BC70 ;# ptr + .4byte 0x8013C070 ;# ptr + .4byte 0x8013B0A0 ;# ptr + .4byte 0x8013B3A0 ;# ptr + .4byte 0x8013BF90 ;# ptr + .4byte 0x8013B580 ;# ptr + .4byte 0x8013B610 ;# ptr + .4byte 0x8013BF00 ;# ptr + .4byte 0x8013BF20 ;# ptr + .4byte 0x8013AEB0 ;# ptr + .4byte 0x8013AEE0 ;# ptr + .4byte 0x8013BF50 ;# ptr + .4byte 0x8013BF70 ;# ptr + .4byte 0x8013AF30 ;# ptr + .4byte 0x8013AFE0 ;# ptr + .4byte 0x8013B6D0 ;# ptr + .4byte 0x8013B6F0 ;# ptr + .4byte 0x8013B700 ;# ptr + .4byte 0x8013B710 ;# ptr + .4byte 0x8013B7F0 ;# ptr + .4byte 0x8013B870 ;# ptr + .4byte 0x8013BB20 ;# ptr + .4byte 0x8013B930 ;# ptr + .4byte 0x8013BD40 ;# ptr + .4byte 0x8013BD90 ;# ptr .global $$27912 $$27912: - .incbin "baserom.dol", 0x44026C, 0x18 + .asciz "nw4hbm::lyt::Picture" + .balign 4 .global $$27913 $$27913: - .incbin "baserom.dol", 0x440284, 0x14 + .4byte 0x80443F60 + .4byte 0 + .4byte 0x80443F38 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt7Picture __RTTI__Q36nw4hbm3lyt7Picture: - .incbin "baserom.dol", 0x440298, 0x8 + .4byte 0x8044416C + .4byte 0x80444184 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7Picture diff --git a/asm/homebuttonLib/lyt_resourceAccessor.s b/asm/homebuttonLib/lyt_resourceAccessor.s index c9c8ef4e..652aacdd 100644 --- a/asm/homebuttonLib/lyt_resourceAccessor.s +++ b/asm/homebuttonLib/lyt_resourceAccessor.s @@ -25,4 +25,9 @@ GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt16ResourceAccessor __vt__Q36nw4hbm3lyt16ResourceAccessor: - .incbin "baserom.dol", 0x4402A0, 0x18 + .4byte 0x80443E78 + .4byte 0 + .4byte 0x8013C0A0 ;# ptr + .4byte 0 + .4byte 0x8013C0C0 ;# ptr + .4byte 0 diff --git a/asm/homebuttonLib/lyt_textBox.s b/asm/homebuttonLib/lyt_textBox.s index b17168d8..ff0ab9ae 100644 --- a/asm/homebuttonLib/lyt_textBox.s +++ b/asm/homebuttonLib/lyt_textBox.s @@ -1428,38 +1428,75 @@ __sinit_$$3lyt_textBox_cpp: /* 8013D4EC 0013932C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023D0, 0x4 + .4byte 0x8013D4D0 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29376 $$29376: - .incbin "baserom.dol", 0x40A358, 0x8 + .4byte 0 + .4byte 0 .global $$29414 $$29414: - .incbin "baserom.dol", 0x40A360, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29671 $$29671: - .incbin "baserom.dol", 0x40A368, 0x4 + .4byte 0x3F000000 .global $$29672 $$29672: - .incbin "baserom.dol", 0x40A36C, 0x4 + .4byte 0x3F800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$29987 $$29987: - .incbin "baserom.dol", 0x4402B8, 0x4 + .4byte 0x000A0000 .global __vt__Q36nw4hbm3lyt7TextBox __vt__Q36nw4hbm3lyt7TextBox: - .incbin "baserom.dol", 0x4402BC, 0x74 + .4byte 0x80444260 + .4byte 0 + .4byte 0x8013C390 ;# ptr + .4byte 0x8013D4C0 ;# ptr + .4byte 0x8013B0A0 ;# ptr + .4byte 0x8013B3A0 ;# ptr + .4byte 0x8013C5C0 ;# ptr + .4byte 0x8013B580 ;# ptr + .4byte 0x8013B610 ;# ptr + .4byte 0x8013C520 ;# ptr + .4byte 0x8013C540 ;# ptr + .4byte 0x8013AEB0 ;# ptr + .4byte 0x8013AEE0 ;# ptr + .4byte 0x8013C580 ;# ptr + .4byte 0x8013C5A0 ;# ptr + .4byte 0x8013AF30 ;# ptr + .4byte 0x8013AFE0 ;# ptr + .4byte 0x8013B6D0 ;# ptr + .4byte 0x8013B6F0 ;# ptr + .4byte 0x8013B700 ;# ptr + .4byte 0x8013B710 ;# ptr + .4byte 0x8013B7F0 ;# ptr + .4byte 0x8013B870 ;# ptr + .4byte 0x8013BB20 ;# ptr + .4byte 0x8013B930 ;# ptr + .4byte 0x8013D130 ;# ptr + .4byte 0x8013D1B0 ;# ptr + .4byte 0x8013D200 ;# ptr + .4byte 0x8013D270 ;# ptr .global $$28641 $$28641: - .incbin "baserom.dol", 0x440330, 0x18 + .asciz "nw4hbm::lyt::TextBox" + .balign 4 .global $$28642 $$28642: - .incbin "baserom.dol", 0x440348, 0x18 + .4byte 0x80443F60 + .4byte 0 + .4byte 0x80443F38 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt7TextBox __RTTI__Q36nw4hbm3lyt7TextBox: - .incbin "baserom.dol", 0x440360, 0x8 + .4byte 0x80444230 + .4byte 0x80444248 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7TextBox diff --git a/asm/homebuttonLib/lyt_window.s b/asm/homebuttonLib/lyt_window.s index 6449ce92..676e22e5 100644 --- a/asm/homebuttonLib/lyt_window.s +++ b/asm/homebuttonLib/lyt_window.s @@ -2569,35 +2569,87 @@ __sinit_$$3lyt_window_cpp: /* 8013FB1C 0013B95C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023D4, 0x4 + .4byte 0x8013FB00 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29107 $$29107: - .incbin "baserom.dol", 0x40A370, 0x8 + .4byte 0 + .4byte 0 .global $$29114 $$29114: - .incbin "baserom.dol", 0x40A378, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$29115 $$29115: - .incbin "baserom.dol", 0x40A380, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GetTexutreFlipInfo__24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos $$2LOCAL$$2GetTexutreFlipInfo__24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos: - .incbin "baserom.dol", 0x440368, 0x3C + .4byte 0x00000100 + .4byte 0x00010101 + .4byte 0x00010100 + .4byte 0x00000101 + .4byte 0x00010001 + .4byte 0x00010101 + .4byte 0x00000100 + .4byte 0x00010001 + .4byte 0x00000101 + .4byte 0x01000100 + .4byte 0x01010001 + .4byte 0x01000000 + .4byte 0x00010100 + .4byte 0x01010000 + .4byte 0x00010100 .global __vt__Q36nw4hbm3lyt6Window __vt__Q36nw4hbm3lyt6Window: - .incbin "baserom.dol", 0x4403A4, 0x7C + .4byte 0x80444348 + .4byte 0 + .4byte 0x8013D700 ;# ptr + .4byte 0x8013FAF0 ;# ptr + .4byte 0x8013B0A0 ;# ptr + .4byte 0x8013B3A0 ;# ptr + .4byte 0x8013DB30 ;# ptr + .4byte 0x8013B580 ;# ptr + .4byte 0x8013DD10 ;# ptr + .4byte 0x8013DAA0 ;# ptr + .4byte 0x8013DAC0 ;# ptr + .4byte 0x8013AEB0 ;# ptr + .4byte 0x8013AEE0 ;# ptr + .4byte 0x8013DAF0 ;# ptr + .4byte 0x8013DB10 ;# ptr + .4byte 0x8013AF30 ;# ptr + .4byte 0x8013D850 ;# ptr + .4byte 0x8013B6D0 ;# ptr + .4byte 0x8013B6F0 ;# ptr + .4byte 0x8013B700 ;# ptr + .4byte 0x8013DDA0 ;# ptr + .4byte 0x8013D950 ;# ptr + .4byte 0x8013DA00 ;# ptr + .4byte 0x8013BB20 ;# ptr + .4byte 0x8013B930 ;# ptr + .4byte 0x8013FAE0 ;# ptr + .4byte 0x8013FAB0 ;# ptr + .4byte 0x8013DE30 ;# ptr + .4byte 0x8013DF40 ;# ptr + .4byte 0x8013E570 ;# ptr + .4byte 0x8013ECA0 ;# ptr .global $$28272 $$28272: - .incbin "baserom.dol", 0x440420, 0x14 + .asciz "nw4hbm::lyt::Window" .global $$28273 $$28273: - .incbin "baserom.dol", 0x440434, 0x14 + .4byte 0x80443F60 + .4byte 0 + .4byte 0x80443F38 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm3lyt6Window __RTTI__Q36nw4hbm3lyt6Window: - .incbin "baserom.dol", 0x440448, 0x8 + .4byte 0x80444320 + .4byte 0x80444334 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt6Window diff --git a/asm/homebuttonLib/math_triangular.s b/asm/homebuttonLib/math_triangular.s index d4a5717f..e763119b 100644 --- a/asm/homebuttonLib/math_triangular.s +++ b/asm/homebuttonLib/math_triangular.s @@ -201,36 +201,1129 @@ lbl_8013FDC8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$22723 $$22723: - .incbin "baserom.dol", 0x40A388, 0x4 + .4byte 0x47800000 .global $$22724 $$22724: - .incbin "baserom.dol", 0x40A38C, 0x4 + .4byte 0 .global $$22753 $$22753: - .incbin "baserom.dol", 0x40A390, 0x4 + .4byte 0x3F800000 .global $$22754 $$22754: - .incbin "baserom.dol", 0x40A394, 0x4 + .4byte 0x42000000 .global $$22755 $$22755: - .incbin "baserom.dol", 0x40A398, 0x4 + .4byte 0x42800000 .global $$22756 $$22756: - .incbin "baserom.dol", 0x40A39C, 0x4 + .4byte 0xBF800000 .global $$22757 $$22757: - .incbin "baserom.dol", 0x40A3A0, 0x4 + .4byte 0xC2800000 .global $$22776 $$22776: - .incbin "baserom.dol", 0x40A3A4, 0x4 + .4byte 0x43000000 .global $$22777 $$22777: - .incbin "baserom.dol", 0x40A3A8, 0x8 + .4byte 0xC3000000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global sSinCosTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2 sSinCosTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2: - .incbin "baserom.dol", 0x440450, 0x1010 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3CC90A35 + .4byte 0xB99DCF89 + .4byte 0x3CC90A35 + .4byte 0x3F7FEC46 + .4byte 0x3CC8EAC0 + .4byte 0xBA6CB74E + .4byte 0x3D48FB87 + .4byte 0x3F7FB107 + .4byte 0x3CC8ADEF + .4byte 0xBAC5436C + .4byte 0x3D96A93F + .4byte 0x3F7F4E66 + .4byte 0x3CC851A8 + .4byte 0xBB0A04D1 + .4byte 0x3DC8BD23 + .4byte 0x3F7EC472 + .4byte 0x3CC7D5ED + .4byte 0xBB31465F + .4byte 0x3DFAB29E + .4byte 0x3F7E132B + .4byte 0x3CC73ABD + .4byte 0xBB587725 + .4byte 0x3E164064 + .4byte 0x3F7D3AB4 + .4byte 0x3CC68017 + .4byte 0xBB7F865D + .4byte 0x3E2F10AA + .4byte 0x3F7C3B2E + .4byte 0x3CC5A815 + .4byte 0xBB9331A1 + .4byte 0x3E47C5AC + .4byte 0x3F7B14BA + .4byte 0x3CC4B2B7 + .4byte 0xBBA68F4B + .4byte 0x3E605C03 + .4byte 0x3F79C79B + .4byte 0x3CC39DE5 + .4byte 0xBBB9D3CC + .4byte 0x3E78CFC0 + .4byte 0x3F7853F4 + .4byte 0x3CC26BB5 + .4byte 0xBBCCF6BE + .4byte 0x3E888E9B + .4byte 0x3F76BA06 + .4byte 0x3CC11A11 + .4byte 0xBBE00086 + .4byte 0x3E94A03C + .4byte 0x3F74FA05 + .4byte 0x3CBFAB11 + .4byte 0xBBF2E05D + .4byte 0x3EA09AED + .4byte 0x3F731444 + .4byte 0x3CBE1EB4 + .4byte 0xBC02CF53 + .4byte 0x3EAC7CD9 + .4byte 0x3F710907 + .4byte 0x3CBC74FB + .4byte 0xBC0C197E + .4byte 0x3EB84428 + .4byte 0x3F6ED8A1 + .4byte 0x3CBAADE6 + .4byte 0xBC154EB1 + .4byte 0x3EC3EF07 + .4byte 0x3F6C8366 + .4byte 0x3CB8CB8E + .4byte 0xBC1E6EEB + .4byte 0x3ECF7BC0 + .4byte 0x3F6A09AB + .4byte 0x3CB6CBDA + .4byte 0xBC2771C9 + .4byte 0x3EDAE87D + .4byte 0x3F676BD3 + .4byte 0x3CB4AEC9 + .4byte 0xBC305FAF + .4byte 0x3EE6336A + .4byte 0x3F64AA54 + .4byte 0x3CB27675 + .4byte 0xBC393038 + .4byte 0x3EF15AF3 + .4byte 0x3F61C593 + .4byte 0x3CB022DD + .4byte 0xBC41E365 + .4byte 0x3EFC5D20 + .4byte 0x3F5EBE06 + .4byte 0x3CADB61C + .4byte 0xBC4A7935 + .4byte 0x3F039C41 + .4byte 0x3F5B9421 + .4byte 0x3CAB2BFE + .4byte 0xBC52F1AA + .4byte 0x3F08F5A1 + .4byte 0x3F58485A + .4byte 0x3CA888B5 + .4byte 0xBC5B4891 + .4byte 0x3F0E39D6 + .4byte 0x3F54DB38 + .4byte 0x3CA5CA2A + .4byte 0xBC637DE9 + .4byte 0x3F136827 + .4byte 0x3F514D40 + .4byte 0x3CA2F273 + .4byte 0xBC6B8D82 + .4byte 0x3F187FBB + .4byte 0x3F4D9F0A + .4byte 0x3CA00193 + .4byte 0xBC737B8D + .4byte 0x3F1D7FD8 + .4byte 0x3F49D10B + .4byte 0x3C9CF9A0 + .4byte 0xBC7B43D9 + .4byte 0x3F226794 + .4byte 0x3F45E3FC + .4byte 0x3C99D884 + .4byte 0xBC817332 + .4byte 0x3F273659 + .4byte 0x3F41D873 + .4byte 0x3C969E3D + .4byte 0xBC852F7F + .4byte 0x3F2BEB4A + .4byte 0x3F3DAEF7 + .4byte 0x3C934EFD + .4byte 0xBC88D6D4 + .4byte 0x3F3085C2 + .4byte 0x3F396840 + .4byte 0x3C8FE692 + .4byte 0xBC8C692F + .4byte 0x3F3504F7 + .4byte 0x3F3504F7 + .4byte 0x3C8C692F + .4byte 0xBC8FE692 + .4byte 0x3F396840 + .4byte 0x3F3085C2 + .4byte 0x3C88D6D4 + .4byte 0xBC934EFD + .4byte 0x3F3DAEF7 + .4byte 0x3F2BEB4A + .4byte 0x3C852F7F + .4byte 0xBC969E3D + .4byte 0x3F41D873 + .4byte 0x3F273659 + .4byte 0x3C817332 + .4byte 0xBC99D884 + .4byte 0x3F45E3FC + .4byte 0x3F226794 + .4byte 0x3C7B43D9 + .4byte 0xBC9CF9A0 + .4byte 0x3F49D10B + .4byte 0x3F1D7FD8 + .4byte 0x3C737B8D + .4byte 0xBCA00193 + .4byte 0x3F4D9F0A + .4byte 0x3F187FBB + .4byte 0x3C6B8D82 + .4byte 0xBCA2F273 + .4byte 0x3F514D40 + .4byte 0x3F136827 + .4byte 0x3C637DE9 + .4byte 0xBCA5CA2A + .4byte 0x3F54DB38 + .4byte 0x3F0E39D6 + .4byte 0x3C5B4891 + .4byte 0xBCA888B5 + .4byte 0x3F58485A + .4byte 0x3F08F5A1 + .4byte 0x3C52F1AA + .4byte 0xBCAB2BFE + .4byte 0x3F5B9421 + .4byte 0x3F039C41 + .4byte 0x3C4A7935 + .4byte 0xBCADB61C + .4byte 0x3F5EBE06 + .4byte 0x3EFC5D20 + .4byte 0x3C41E365 + .4byte 0xBCB022DD + .4byte 0x3F61C593 + .4byte 0x3EF15AF3 + .4byte 0x3C393038 + .4byte 0xBCB27675 + .4byte 0x3F64AA54 + .4byte 0x3EE6336A + .4byte 0x3C305FAF + .4byte 0xBCB4AEC9 + .4byte 0x3F676BD3 + .4byte 0x3EDAE87D + .4byte 0x3C2771C9 + .4byte 0xBCB6CBDA + .4byte 0x3F6A09AB + .4byte 0x3ECF7BC0 + .4byte 0x3C1E6EEB + .4byte 0xBCB8CB8E + .4byte 0x3F6C8366 + .4byte 0x3EC3EF07 + .4byte 0x3C154EB1 + .4byte 0xBCBAADE6 + .4byte 0x3F6ED8A1 + .4byte 0x3EB84428 + .4byte 0x3C0C197E + .4byte 0xBCBC74FB + .4byte 0x3F710907 + .4byte 0x3EAC7CD9 + .4byte 0x3C02CF53 + .4byte 0xBCBE1EB4 + .4byte 0x3F731444 + .4byte 0x3EA09AED + .4byte 0x3BF2E05D + .4byte 0xBCBFAB11 + .4byte 0x3F74FA05 + .4byte 0x3E94A03C + .4byte 0x3BE00086 + .4byte 0xBCC11A11 + .4byte 0x3F76BA06 + .4byte 0x3E888E9B + .4byte 0x3BCCF6BE + .4byte 0xBCC26BB5 + .4byte 0x3F7853F4 + .4byte 0x3E78CFC0 + .4byte 0x3BB9D3CC + .4byte 0xBCC39DE5 + .4byte 0x3F79C79B + .4byte 0x3E605C03 + .4byte 0x3BA68F4B + .4byte 0xBCC4B2B7 + .4byte 0x3F7B14BA + .4byte 0x3E47C5AC + .4byte 0x3B9331A1 + .4byte 0xBCC5A815 + .4byte 0x3F7C3B2E + .4byte 0x3E2F10AA + .4byte 0x3B7F865D + .4byte 0xBCC68017 + .4byte 0x3F7D3AB4 + .4byte 0x3E164064 + .4byte 0x3B587725 + .4byte 0xBCC73ABD + .4byte 0x3F7E132B + .4byte 0x3DFAB29E + .4byte 0x3B31465F + .4byte 0xBCC7D5ED + .4byte 0x3F7EC472 + .4byte 0x3DC8BD23 + .4byte 0x3B0A04D1 + .4byte 0xBCC851A8 + .4byte 0x3F7F4E66 + .4byte 0x3D96A93F + .4byte 0x3AC5436C + .4byte 0xBCC8ADEF + .4byte 0x3F7FB107 + .4byte 0x3D48FB87 + .4byte 0x3A6CB74E + .4byte 0xBCC8EAC0 + .4byte 0x3F7FEC46 + .4byte 0x3CC90A35 + .4byte 0x399DCF89 + .4byte 0xBCC90A35 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xB99DCF89 + .4byte 0xBCC90A35 + .4byte 0x3F7FEC46 + .4byte 0xBCC90A35 + .4byte 0xBA6CB74E + .4byte 0xBCC8EAC0 + .4byte 0x3F7FB107 + .4byte 0xBD48FB87 + .4byte 0xBAC5436C + .4byte 0xBCC8ADEF + .4byte 0x3F7F4E66 + .4byte 0xBD96A93F + .4byte 0xBB0A04D1 + .4byte 0xBCC851A8 + .4byte 0x3F7EC472 + .4byte 0xBDC8BD23 + .4byte 0xBB31465F + .4byte 0xBCC7D5ED + .4byte 0x3F7E132B + .4byte 0xBDFAB29E + .4byte 0xBB587725 + .4byte 0xBCC73ABD + .4byte 0x3F7D3AB4 + .4byte 0xBE164064 + .4byte 0xBB7F865D + .4byte 0xBCC68017 + .4byte 0x3F7C3B2E + .4byte 0xBE2F10AA + .4byte 0xBB9331A1 + .4byte 0xBCC5A815 + .4byte 0x3F7B14BA + .4byte 0xBE47C5AC + .4byte 0xBBA68F4B + .4byte 0xBCC4B2B7 + .4byte 0x3F79C79B + .4byte 0xBE605C03 + .4byte 0xBBB9D3CC + .4byte 0xBCC39DE5 + .4byte 0x3F7853F4 + .4byte 0xBE78CFC0 + .4byte 0xBBCCF6BE + .4byte 0xBCC26BB5 + .4byte 0x3F76BA06 + .4byte 0xBE888E9B + .4byte 0xBBE00086 + .4byte 0xBCC11A11 + .4byte 0x3F74FA05 + .4byte 0xBE94A03C + .4byte 0xBBF2E05D + .4byte 0xBCBFAB11 + .4byte 0x3F731444 + .4byte 0xBEA09AED + .4byte 0xBC02CF53 + .4byte 0xBCBE1EB4 + .4byte 0x3F710907 + .4byte 0xBEAC7CD9 + .4byte 0xBC0C197E + .4byte 0xBCBC74FB + .4byte 0x3F6ED8A1 + .4byte 0xBEB84428 + .4byte 0xBC154EB1 + .4byte 0xBCBAADE6 + .4byte 0x3F6C8366 + .4byte 0xBEC3EF07 + .4byte 0xBC1E6EEB + .4byte 0xBCB8CB8E + .4byte 0x3F6A09AB + .4byte 0xBECF7BC0 + .4byte 0xBC2771C9 + .4byte 0xBCB6CBDA + .4byte 0x3F676BD3 + .4byte 0xBEDAE87D + .4byte 0xBC305FAF + .4byte 0xBCB4AEC9 + .4byte 0x3F64AA54 + .4byte 0xBEE6336A + .4byte 0xBC393038 + .4byte 0xBCB27675 + .4byte 0x3F61C593 + .4byte 0xBEF15AF3 + .4byte 0xBC41E365 + .4byte 0xBCB022DD + .4byte 0x3F5EBE06 + .4byte 0xBEFC5D20 + .4byte 0xBC4A7935 + .4byte 0xBCADB61C + .4byte 0x3F5B9421 + .4byte 0xBF039C41 + .4byte 0xBC52F1AA + .4byte 0xBCAB2BFE + .4byte 0x3F58485A + .4byte 0xBF08F5A1 + .4byte 0xBC5B4891 + .4byte 0xBCA888B5 + .4byte 0x3F54DB38 + .4byte 0xBF0E39D6 + .4byte 0xBC637DE9 + .4byte 0xBCA5CA2A + .4byte 0x3F514D40 + .4byte 0xBF136827 + .4byte 0xBC6B8D82 + .4byte 0xBCA2F273 + .4byte 0x3F4D9F0A + .4byte 0xBF187FBB + .4byte 0xBC737B8D + .4byte 0xBCA00193 + .4byte 0x3F49D10B + .4byte 0xBF1D7FD8 + .4byte 0xBC7B43D9 + .4byte 0xBC9CF9A0 + .4byte 0x3F45E3FC + .4byte 0xBF226794 + .4byte 0xBC817332 + .4byte 0xBC99D884 + .4byte 0x3F41D873 + .4byte 0xBF273659 + .4byte 0xBC852F7F + .4byte 0xBC969E3D + .4byte 0x3F3DAEF7 + .4byte 0xBF2BEB4A + .4byte 0xBC88D6D4 + .4byte 0xBC934EFD + .4byte 0x3F396840 + .4byte 0xBF3085C2 + .4byte 0xBC8C692F + .4byte 0xBC8FE692 + .4byte 0x3F3504F7 + .4byte 0xBF3504F7 + .4byte 0xBC8FE692 + .4byte 0xBC8C692F + .4byte 0x3F3085C2 + .4byte 0xBF396840 + .4byte 0xBC934EFD + .4byte 0xBC88D6D4 + .4byte 0x3F2BEB4A + .4byte 0xBF3DAEF7 + .4byte 0xBC969E3D + .4byte 0xBC852F7F + .4byte 0x3F273659 + .4byte 0xBF41D873 + .4byte 0xBC99D884 + .4byte 0xBC817332 + .4byte 0x3F226794 + .4byte 0xBF45E3FC + .4byte 0xBC9CF9A0 + .4byte 0xBC7B43D9 + .4byte 0x3F1D7FD8 + .4byte 0xBF49D10B + .4byte 0xBCA00193 + .4byte 0xBC737B8D + .4byte 0x3F187FBB + .4byte 0xBF4D9F0A + .4byte 0xBCA2F273 + .4byte 0xBC6B8D82 + .4byte 0x3F136827 + .4byte 0xBF514D40 + .4byte 0xBCA5CA2A + .4byte 0xBC637DE9 + .4byte 0x3F0E39D6 + .4byte 0xBF54DB38 + .4byte 0xBCA888B5 + .4byte 0xBC5B4891 + .4byte 0x3F08F5A1 + .4byte 0xBF58485A + .4byte 0xBCAB2BFE + .4byte 0xBC52F1AA + .4byte 0x3F039C41 + .4byte 0xBF5B9421 + .4byte 0xBCADB61C + .4byte 0xBC4A7935 + .4byte 0x3EFC5D20 + .4byte 0xBF5EBE06 + .4byte 0xBCB022DD + .4byte 0xBC41E365 + .4byte 0x3EF15AF3 + .4byte 0xBF61C593 + .4byte 0xBCB27675 + .4byte 0xBC393038 + .4byte 0x3EE6336A + .4byte 0xBF64AA54 + .4byte 0xBCB4AEC9 + .4byte 0xBC305FAF + .4byte 0x3EDAE87D + .4byte 0xBF676BD3 + .4byte 0xBCB6CBDA + .4byte 0xBC2771C9 + .4byte 0x3ECF7BC0 + .4byte 0xBF6A09AB + .4byte 0xBCB8CB8E + .4byte 0xBC1E6EEB + .4byte 0x3EC3EF07 + .4byte 0xBF6C8366 + .4byte 0xBCBAADE6 + .4byte 0xBC154EB1 + .4byte 0x3EB84428 + .4byte 0xBF6ED8A1 + .4byte 0xBCBC74FB + .4byte 0xBC0C197E + .4byte 0x3EAC7CD9 + .4byte 0xBF710907 + .4byte 0xBCBE1EB4 + .4byte 0xBC02CF53 + .4byte 0x3EA09AED + .4byte 0xBF731444 + .4byte 0xBCBFAB11 + .4byte 0xBBF2E05D + .4byte 0x3E94A03C + .4byte 0xBF74FA05 + .4byte 0xBCC11A11 + .4byte 0xBBE00086 + .4byte 0x3E888E9B + .4byte 0xBF76BA06 + .4byte 0xBCC26BB5 + .4byte 0xBBCCF6BE + .4byte 0x3E78CFC0 + .4byte 0xBF7853F4 + .4byte 0xBCC39DE5 + .4byte 0xBBB9D3CC + .4byte 0x3E605C03 + .4byte 0xBF79C79B + .4byte 0xBCC4B2B7 + .4byte 0xBBA68F4B + .4byte 0x3E47C5AC + .4byte 0xBF7B14BA + .4byte 0xBCC5A815 + .4byte 0xBB9331A1 + .4byte 0x3E2F10AA + .4byte 0xBF7C3B2E + .4byte 0xBCC68017 + .4byte 0xBB7F865D + .4byte 0x3E164064 + .4byte 0xBF7D3AB4 + .4byte 0xBCC73ABD + .4byte 0xBB587725 + .4byte 0x3DFAB29E + .4byte 0xBF7E132B + .4byte 0xBCC7D5ED + .4byte 0xBB31465F + .4byte 0x3DC8BD23 + .4byte 0xBF7EC472 + .4byte 0xBCC851A8 + .4byte 0xBB0A04D1 + .4byte 0x3D96A93F + .4byte 0xBF7F4E66 + .4byte 0xBCC8ADEF + .4byte 0xBAC5436C + .4byte 0x3D48FB87 + .4byte 0xBF7FB107 + .4byte 0xBCC8EAC0 + .4byte 0xBA6CB74E + .4byte 0x3CC90A35 + .4byte 0xBF7FEC46 + .4byte 0xBCC90A35 + .4byte 0xB99DCF89 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBCC90A35 + .4byte 0x399DCF89 + .4byte 0xBCC90A35 + .4byte 0xBF7FEC46 + .4byte 0xBCC8EAC0 + .4byte 0x3A6CB74E + .4byte 0xBD48FB87 + .4byte 0xBF7FB107 + .4byte 0xBCC8ADEF + .4byte 0x3AC5436C + .4byte 0xBD96A93F + .4byte 0xBF7F4E66 + .4byte 0xBCC851A8 + .4byte 0x3B0A04D1 + .4byte 0xBDC8BD23 + .4byte 0xBF7EC472 + .4byte 0xBCC7D5ED + .4byte 0x3B31465F + .4byte 0xBDFAB29E + .4byte 0xBF7E132B + .4byte 0xBCC73ABD + .4byte 0x3B587725 + .4byte 0xBE164064 + .4byte 0xBF7D3AB4 + .4byte 0xBCC68017 + .4byte 0x3B7F865D + .4byte 0xBE2F10AA + .4byte 0xBF7C3B2E + .4byte 0xBCC5A815 + .4byte 0x3B9331A1 + .4byte 0xBE47C5AC + .4byte 0xBF7B14BA + .4byte 0xBCC4B2B7 + .4byte 0x3BA68F4B + .4byte 0xBE605C03 + .4byte 0xBF79C79B + .4byte 0xBCC39DE5 + .4byte 0x3BB9D3CC + .4byte 0xBE78CFC0 + .4byte 0xBF7853F4 + .4byte 0xBCC26BB5 + .4byte 0x3BCCF6BE + .4byte 0xBE888E9B + .4byte 0xBF76BA06 + .4byte 0xBCC11A11 + .4byte 0x3BE00086 + .4byte 0xBE94A03C + .4byte 0xBF74FA05 + .4byte 0xBCBFAB11 + .4byte 0x3BF2E05D + .4byte 0xBEA09AED + .4byte 0xBF731444 + .4byte 0xBCBE1EB4 + .4byte 0x3C02CF53 + .4byte 0xBEAC7CD9 + .4byte 0xBF710907 + .4byte 0xBCBC74FB + .4byte 0x3C0C197E + .4byte 0xBEB84428 + .4byte 0xBF6ED8A1 + .4byte 0xBCBAADE6 + .4byte 0x3C154EB1 + .4byte 0xBEC3EF07 + .4byte 0xBF6C8366 + .4byte 0xBCB8CB8E + .4byte 0x3C1E6EEB + .4byte 0xBECF7BC0 + .4byte 0xBF6A09AB + .4byte 0xBCB6CBDA + .4byte 0x3C2771C9 + .4byte 0xBEDAE87D + .4byte 0xBF676BD3 + .4byte 0xBCB4AEC9 + .4byte 0x3C305FAF + .4byte 0xBEE6336A + .4byte 0xBF64AA54 + .4byte 0xBCB27675 + .4byte 0x3C393038 + .4byte 0xBEF15AF3 + .4byte 0xBF61C593 + .4byte 0xBCB022DD + .4byte 0x3C41E365 + .4byte 0xBEFC5D20 + .4byte 0xBF5EBE06 + .4byte 0xBCADB61C + .4byte 0x3C4A7935 + .4byte 0xBF039C41 + .4byte 0xBF5B9421 + .4byte 0xBCAB2BFE + .4byte 0x3C52F1AA + .4byte 0xBF08F5A1 + .4byte 0xBF58485A + .4byte 0xBCA888B5 + .4byte 0x3C5B4891 + .4byte 0xBF0E39D6 + .4byte 0xBF54DB38 + .4byte 0xBCA5CA2A + .4byte 0x3C637DE9 + .4byte 0xBF136827 + .4byte 0xBF514D40 + .4byte 0xBCA2F273 + .4byte 0x3C6B8D82 + .4byte 0xBF187FBB + .4byte 0xBF4D9F0A + .4byte 0xBCA00193 + .4byte 0x3C737B8D + .4byte 0xBF1D7FD8 + .4byte 0xBF49D10B + .4byte 0xBC9CF9A0 + .4byte 0x3C7B43D9 + .4byte 0xBF226794 + .4byte 0xBF45E3FC + .4byte 0xBC99D884 + .4byte 0x3C817332 + .4byte 0xBF273659 + .4byte 0xBF41D873 + .4byte 0xBC969E3D + .4byte 0x3C852F7F + .4byte 0xBF2BEB4A + .4byte 0xBF3DAEF7 + .4byte 0xBC934EFD + .4byte 0x3C88D6D4 + .4byte 0xBF3085C2 + .4byte 0xBF396840 + .4byte 0xBC8FE692 + .4byte 0x3C8C692F + .4byte 0xBF3504F7 + .4byte 0xBF3504F7 + .4byte 0xBC8C692F + .4byte 0x3C8FE692 + .4byte 0xBF396840 + .4byte 0xBF3085C2 + .4byte 0xBC88D6D4 + .4byte 0x3C934EFD + .4byte 0xBF3DAEF7 + .4byte 0xBF2BEB4A + .4byte 0xBC852F7F + .4byte 0x3C969E3D + .4byte 0xBF41D873 + .4byte 0xBF273659 + .4byte 0xBC817332 + .4byte 0x3C99D884 + .4byte 0xBF45E3FC + .4byte 0xBF226794 + .4byte 0xBC7B43D9 + .4byte 0x3C9CF9A0 + .4byte 0xBF49D10B + .4byte 0xBF1D7FD8 + .4byte 0xBC737B8D + .4byte 0x3CA00193 + .4byte 0xBF4D9F0A + .4byte 0xBF187FBB + .4byte 0xBC6B8D82 + .4byte 0x3CA2F273 + .4byte 0xBF514D40 + .4byte 0xBF136827 + .4byte 0xBC637DE9 + .4byte 0x3CA5CA2A + .4byte 0xBF54DB38 + .4byte 0xBF0E39D6 + .4byte 0xBC5B4891 + .4byte 0x3CA888B5 + .4byte 0xBF58485A + .4byte 0xBF08F5A1 + .4byte 0xBC52F1AA + .4byte 0x3CAB2BFE + .4byte 0xBF5B9421 + .4byte 0xBF039C41 + .4byte 0xBC4A7935 + .4byte 0x3CADB61C + .4byte 0xBF5EBE06 + .4byte 0xBEFC5D20 + .4byte 0xBC41E365 + .4byte 0x3CB022DD + .4byte 0xBF61C593 + .4byte 0xBEF15AF3 + .4byte 0xBC393038 + .4byte 0x3CB27675 + .4byte 0xBF64AA54 + .4byte 0xBEE6336A + .4byte 0xBC305FAF + .4byte 0x3CB4AEC9 + .4byte 0xBF676BD3 + .4byte 0xBEDAE87D + .4byte 0xBC2771C9 + .4byte 0x3CB6CBDA + .4byte 0xBF6A09AB + .4byte 0xBECF7BC0 + .4byte 0xBC1E6EEB + .4byte 0x3CB8CB8E + .4byte 0xBF6C8366 + .4byte 0xBEC3EF07 + .4byte 0xBC154EB1 + .4byte 0x3CBAADE6 + .4byte 0xBF6ED8A1 + .4byte 0xBEB84428 + .4byte 0xBC0C197E + .4byte 0x3CBC74FB + .4byte 0xBF710907 + .4byte 0xBEAC7CD9 + .4byte 0xBC02CF53 + .4byte 0x3CBE1EB4 + .4byte 0xBF731444 + .4byte 0xBEA09AED + .4byte 0xBBF2E05D + .4byte 0x3CBFAB11 + .4byte 0xBF74FA05 + .4byte 0xBE94A03C + .4byte 0xBBE00086 + .4byte 0x3CC11A11 + .4byte 0xBF76BA06 + .4byte 0xBE888E9B + .4byte 0xBBCCF6BE + .4byte 0x3CC26BB5 + .4byte 0xBF7853F4 + .4byte 0xBE78CFC0 + .4byte 0xBBB9D3CC + .4byte 0x3CC39DE5 + .4byte 0xBF79C79B + .4byte 0xBE605C03 + .4byte 0xBBA68F4B + .4byte 0x3CC4B2B7 + .4byte 0xBF7B14BA + .4byte 0xBE47C5AC + .4byte 0xBB9331A1 + .4byte 0x3CC5A815 + .4byte 0xBF7C3B2E + .4byte 0xBE2F10AA + .4byte 0xBB7F865D + .4byte 0x3CC68017 + .4byte 0xBF7D3AB4 + .4byte 0xBE164064 + .4byte 0xBB587725 + .4byte 0x3CC73ABD + .4byte 0xBF7E132B + .4byte 0xBDFAB29E + .4byte 0xBB31465F + .4byte 0x3CC7D5ED + .4byte 0xBF7EC472 + .4byte 0xBDC8BD23 + .4byte 0xBB0A04D1 + .4byte 0x3CC851A8 + .4byte 0xBF7F4E66 + .4byte 0xBD96A93F + .4byte 0xBAC5436C + .4byte 0x3CC8ADEF + .4byte 0xBF7FB107 + .4byte 0xBD48FB87 + .4byte 0xBA6CB74E + .4byte 0x3CC8EAC0 + .4byte 0xBF7FEC46 + .4byte 0xBCC90A35 + .4byte 0xB99DCF89 + .4byte 0x3CC90A35 + .4byte 0xBF800000 + .4byte 0x80000000 + .4byte 0x399DCF89 + .4byte 0x3CC90A35 + .4byte 0xBF7FEC46 + .4byte 0x3CC90A35 + .4byte 0x3A6CB74E + .4byte 0x3CC8EAC0 + .4byte 0xBF7FB107 + .4byte 0x3D48FB87 + .4byte 0x3AC5436C + .4byte 0x3CC8ADEF + .4byte 0xBF7F4E66 + .4byte 0x3D96A93F + .4byte 0x3B0A04D1 + .4byte 0x3CC851A8 + .4byte 0xBF7EC472 + .4byte 0x3DC8BD23 + .4byte 0x3B31465F + .4byte 0x3CC7D5ED + .4byte 0xBF7E132B + .4byte 0x3DFAB29E + .4byte 0x3B587725 + .4byte 0x3CC73ABD + .4byte 0xBF7D3AB4 + .4byte 0x3E164064 + .4byte 0x3B7F865D + .4byte 0x3CC68017 + .4byte 0xBF7C3B2E + .4byte 0x3E2F10AA + .4byte 0x3B9331A1 + .4byte 0x3CC5A815 + .4byte 0xBF7B14BA + .4byte 0x3E47C5AC + .4byte 0x3BA68F4B + .4byte 0x3CC4B2B7 + .4byte 0xBF79C79B + .4byte 0x3E605C03 + .4byte 0x3BB9D3CC + .4byte 0x3CC39DE5 + .4byte 0xBF7853F4 + .4byte 0x3E78CFC0 + .4byte 0x3BCCF6BE + .4byte 0x3CC26BB5 + .4byte 0xBF76BA06 + .4byte 0x3E888E9B + .4byte 0x3BE00086 + .4byte 0x3CC11A11 + .4byte 0xBF74FA05 + .4byte 0x3E94A03C + .4byte 0x3BF2E05D + .4byte 0x3CBFAB11 + .4byte 0xBF731444 + .4byte 0x3EA09AED + .4byte 0x3C02CF53 + .4byte 0x3CBE1EB4 + .4byte 0xBF710907 + .4byte 0x3EAC7CD9 + .4byte 0x3C0C197E + .4byte 0x3CBC74FB + .4byte 0xBF6ED8A1 + .4byte 0x3EB84428 + .4byte 0x3C154EB1 + .4byte 0x3CBAADE6 + .4byte 0xBF6C8366 + .4byte 0x3EC3EF07 + .4byte 0x3C1E6EEB + .4byte 0x3CB8CB8E + .4byte 0xBF6A09AB + .4byte 0x3ECF7BC0 + .4byte 0x3C2771C9 + .4byte 0x3CB6CBDA + .4byte 0xBF676BD3 + .4byte 0x3EDAE87D + .4byte 0x3C305FAF + .4byte 0x3CB4AEC9 + .4byte 0xBF64AA54 + .4byte 0x3EE6336A + .4byte 0x3C393038 + .4byte 0x3CB27675 + .4byte 0xBF61C593 + .4byte 0x3EF15AF3 + .4byte 0x3C41E365 + .4byte 0x3CB022DD + .4byte 0xBF5EBE06 + .4byte 0x3EFC5D20 + .4byte 0x3C4A7935 + .4byte 0x3CADB61C + .4byte 0xBF5B9421 + .4byte 0x3F039C41 + .4byte 0x3C52F1AA + .4byte 0x3CAB2BFE + .4byte 0xBF58485A + .4byte 0x3F08F5A1 + .4byte 0x3C5B4891 + .4byte 0x3CA888B5 + .4byte 0xBF54DB38 + .4byte 0x3F0E39D6 + .4byte 0x3C637DE9 + .4byte 0x3CA5CA2A + .4byte 0xBF514D40 + .4byte 0x3F136827 + .4byte 0x3C6B8D82 + .4byte 0x3CA2F273 + .4byte 0xBF4D9F0A + .4byte 0x3F187FBB + .4byte 0x3C737B8D + .4byte 0x3CA00193 + .4byte 0xBF49D10B + .4byte 0x3F1D7FD8 + .4byte 0x3C7B43D9 + .4byte 0x3C9CF9A0 + .4byte 0xBF45E3FC + .4byte 0x3F226794 + .4byte 0x3C817332 + .4byte 0x3C99D884 + .4byte 0xBF41D873 + .4byte 0x3F273659 + .4byte 0x3C852F7F + .4byte 0x3C969E3D + .4byte 0xBF3DAEF7 + .4byte 0x3F2BEB4A + .4byte 0x3C88D6D4 + .4byte 0x3C934EFD + .4byte 0xBF396840 + .4byte 0x3F3085C2 + .4byte 0x3C8C692F + .4byte 0x3C8FE692 + .4byte 0xBF3504F7 + .4byte 0x3F3504F7 + .4byte 0x3C8FE692 + .4byte 0x3C8C692F + .4byte 0xBF3085C2 + .4byte 0x3F396840 + .4byte 0x3C934EFD + .4byte 0x3C88D6D4 + .4byte 0xBF2BEB4A + .4byte 0x3F3DAEF7 + .4byte 0x3C969E3D + .4byte 0x3C852F7F + .4byte 0xBF273659 + .4byte 0x3F41D873 + .4byte 0x3C99D884 + .4byte 0x3C817332 + .4byte 0xBF226794 + .4byte 0x3F45E3FC + .4byte 0x3C9CF9A0 + .4byte 0x3C7B43D9 + .4byte 0xBF1D7FD8 + .4byte 0x3F49D10B + .4byte 0x3CA00193 + .4byte 0x3C737B8D + .4byte 0xBF187FBB + .4byte 0x3F4D9F0A + .4byte 0x3CA2F273 + .4byte 0x3C6B8D82 + .4byte 0xBF136827 + .4byte 0x3F514D40 + .4byte 0x3CA5CA2A + .4byte 0x3C637DE9 + .4byte 0xBF0E39D6 + .4byte 0x3F54DB38 + .4byte 0x3CA888B5 + .4byte 0x3C5B4891 + .4byte 0xBF08F5A1 + .4byte 0x3F58485A + .4byte 0x3CAB2BFE + .4byte 0x3C52F1AA + .4byte 0xBF039C41 + .4byte 0x3F5B9421 + .4byte 0x3CADB61C + .4byte 0x3C4A7935 + .4byte 0xBEFC5D20 + .4byte 0x3F5EBE06 + .4byte 0x3CB022DD + .4byte 0x3C41E365 + .4byte 0xBEF15AF3 + .4byte 0x3F61C593 + .4byte 0x3CB27675 + .4byte 0x3C393038 + .4byte 0xBEE6336A + .4byte 0x3F64AA54 + .4byte 0x3CB4AEC9 + .4byte 0x3C305FAF + .4byte 0xBEDAE87D + .4byte 0x3F676BD3 + .4byte 0x3CB6CBDA + .4byte 0x3C2771C9 + .4byte 0xBECF7BC0 + .4byte 0x3F6A09AB + .4byte 0x3CB8CB8E + .4byte 0x3C1E6EEB + .4byte 0xBEC3EF07 + .4byte 0x3F6C8366 + .4byte 0x3CBAADE6 + .4byte 0x3C154EB1 + .4byte 0xBEB84428 + .4byte 0x3F6ED8A1 + .4byte 0x3CBC74FB + .4byte 0x3C0C197E + .4byte 0xBEAC7CD9 + .4byte 0x3F710907 + .4byte 0x3CBE1EB4 + .4byte 0x3C02CF53 + .4byte 0xBEA09AED + .4byte 0x3F731444 + .4byte 0x3CBFAB11 + .4byte 0x3BF2E05D + .4byte 0xBE94A03C + .4byte 0x3F74FA05 + .4byte 0x3CC11A11 + .4byte 0x3BE00086 + .4byte 0xBE888E9B + .4byte 0x3F76BA06 + .4byte 0x3CC26BB5 + .4byte 0x3BCCF6BE + .4byte 0xBE78CFC0 + .4byte 0x3F7853F4 + .4byte 0x3CC39DE5 + .4byte 0x3BB9D3CC + .4byte 0xBE605C03 + .4byte 0x3F79C79B + .4byte 0x3CC4B2B7 + .4byte 0x3BA68F4B + .4byte 0xBE47C5AC + .4byte 0x3F7B14BA + .4byte 0x3CC5A815 + .4byte 0x3B9331A1 + .4byte 0xBE2F10AA + .4byte 0x3F7C3B2E + .4byte 0x3CC68017 + .4byte 0x3B7F865D + .4byte 0xBE164064 + .4byte 0x3F7D3AB4 + .4byte 0x3CC73ABD + .4byte 0x3B587725 + .4byte 0xBDFAB29E + .4byte 0x3F7E132B + .4byte 0x3CC7D5ED + .4byte 0x3B31465F + .4byte 0xBDC8BD23 + .4byte 0x3F7EC472 + .4byte 0x3CC851A8 + .4byte 0x3B0A04D1 + .4byte 0xBD96A93F + .4byte 0x3F7F4E66 + .4byte 0x3CC8ADEF + .4byte 0x3AC5436C + .4byte 0xBD48FB87 + .4byte 0x3F7FB107 + .4byte 0x3CC8EAC0 + .4byte 0x3A6CB74E + .4byte 0xBCC90A35 + .4byte 0x3F7FEC46 + .4byte 0x3CC90A35 + .4byte 0x399DCF89 + .4byte 0x80000000 + .4byte 0x3F800000 + .4byte 0x3CC90A35 + .4byte 0xB99DCF89 .global sArcTanTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2 sArcTanTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2: - .incbin "baserom.dol", 0x441460, 0x108 + .4byte 0 + .4byte 0x3FA2EBF1 + .4byte 0x3FA2EBF1 + .4byte 0x3FA29AB1 + .4byte 0x4022C351 + .4byte 0x3FA1F923 + .4byte 0x4073BFE2 + .4byte 0x3FA10925 + .4byte 0x40A2223B + .4byte 0x3F9FCD71 + .4byte 0x40CA1597 + .4byte 0x3F9E498C + .4byte 0x40F1A7FA + .4byte 0x3F9C81AB + .4byte 0x410C6432 + .4byte 0x3F9A7A9B + .4byte 0x411FB386 + .4byte 0x3F98399D + .4byte 0x4132BAB9 + .4byte 0x3F95C44B + .4byte 0x41457343 + .4byte 0x3F932075 + .4byte 0x4157D751 + .4byte 0x3F905408 + .4byte 0x4169E1D2 + .4byte 0x3F8D64EB + .4byte 0x417B8E70 + .4byte 0x3F8A58EC + .4byte 0x41866CC7 + .4byte 0x3F8735A9 + .4byte 0x418EE021 + .4byte 0x3F84007D + .4byte 0x41972029 + .4byte 0x3F80BE73 + .4byte 0x419F2C10 + .4byte 0x3F7AE877 + .4byte 0x41A70354 + .4byte 0x3F744C4A + .4byte 0x41AEA5B6 + .4byte 0x3F6DB032 + .4byte 0x41B61338 + .4byte 0x3F671B36 + .4byte 0x41BD4C11 + .4byte 0x3F60938F + .4byte 0x41C450AE + .4byte 0x3F5A1EB2 + .4byte 0x41CB21A3 + .4byte 0x3F53C157 + .4byte 0x41D1BFAE + .4byte 0x3F4D7F84 + .4byte 0x41D82BAA + .4byte 0x3F475C97 + .4byte 0x41DE668F + .4byte 0x3F415B59 + .4byte 0x41E4716A + .4byte 0x3F3B7E02 + .4byte 0x41EA4D5A + .4byte 0x3F35C652 + .4byte 0x41EFFB8C + .4byte 0x3F303593 + .4byte 0x41F57D39 + .4byte 0x3F2ACCAE + .4byte 0x41FAD39E + .4byte 0x3F258C33 + .4byte 0x42000000 + .4byte 0x3F207467 diff --git a/asm/homebuttonLib/mix.s b/asm/homebuttonLib/mix.s index ecbbe408..b39f80c1 100644 --- a/asm/homebuttonLib/mix.s +++ b/asm/homebuttonLib/mix.s @@ -1863,16 +1863,752 @@ HBMFreeIndexByKey: .section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMMIXVolumeTable __HBMMIXVolumeTable: - .incbin "baserom.dol", 0x4417C8, 0x790 + .4byte 0x00000001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040004 + .4byte 0x00040005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050005 + .4byte 0x00050006 + .4byte 0x00060006 + .4byte 0x00060006 + .4byte 0x00060006 + .4byte 0x00060006 + .4byte 0x00060006 + .4byte 0x00060006 + .4byte 0x00070007 + .4byte 0x00070007 + .4byte 0x00070007 + .4byte 0x00070007 + .4byte 0x00070007 + .4byte 0x00070007 + .4byte 0x00080008 + .4byte 0x00080008 + .4byte 0x00080008 + .4byte 0x00080008 + .4byte 0x00080008 + .4byte 0x00090009 + .4byte 0x00090009 + .4byte 0x00090009 + .4byte 0x00090009 + .4byte 0x0009000A + .4byte 0x000A000A + .4byte 0x000A000A + .4byte 0x000A000A + .4byte 0x000A000A + .4byte 0x000B000B + .4byte 0x000B000B + .4byte 0x000B000B + .4byte 0x000B000C + .4byte 0x000C000C + .4byte 0x000C000C + .4byte 0x000C000C + .4byte 0x000D000D + .4byte 0x000D000D + .4byte 0x000D000D + .4byte 0x000D000E + .4byte 0x000E000E + .4byte 0x000E000E + .4byte 0x000E000F + .4byte 0x000F000F + .4byte 0x000F000F + .4byte 0x00100010 + .4byte 0x00100010 + .4byte 0x00100011 + .4byte 0x00110011 + .4byte 0x00110011 + .4byte 0x00120012 + .4byte 0x00120012 + .4byte 0x00120013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00140014 + .4byte 0x00140014 + .4byte 0x00150015 + .4byte 0x00150015 + .4byte 0x00160016 + .4byte 0x00160016 + .4byte 0x00170017 + .4byte 0x00170018 + .4byte 0x00180018 + .4byte 0x00180019 + .4byte 0x00190019 + .4byte 0x001A001A + .4byte 0x001A001A + .4byte 0x001B001B + .4byte 0x001B001C + .4byte 0x001C001C + .4byte 0x001D001D + .4byte 0x001D001E + .4byte 0x001E001E + .4byte 0x001F001F + .4byte 0x00200020 + .4byte 0x00200021 + .4byte 0x00210021 + .4byte 0x00220022 + .4byte 0x00230023 + .4byte 0x00230024 + .4byte 0x00240025 + .4byte 0x00250026 + .4byte 0x00260026 + .4byte 0x00270027 + .4byte 0x00280028 + .4byte 0x00290029 + .4byte 0x002A002A + .4byte 0x002B002B + .4byte 0x002C002C + .4byte 0x002D002D + .4byte 0x002E002E + .4byte 0x002F002F + .4byte 0x00300031 + .4byte 0x00310032 + .4byte 0x00320033 + .4byte 0x00330034 + .4byte 0x00350035 + .4byte 0x00360037 + .4byte 0x00370038 + .4byte 0x00380039 + .4byte 0x003A003A + .4byte 0x003B003C + .4byte 0x003D003D + .4byte 0x003E003F + .4byte 0x003F0040 + .4byte 0x00410042 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460046 + .4byte 0x00470048 + .4byte 0x0049004A + .4byte 0x004B004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620064 + .4byte 0x00650066 + .4byte 0x00670068 + .4byte 0x006A006B + .4byte 0x006C006D + .4byte 0x006F0070 + .4byte 0x00710072 + .4byte 0x00740075 + .4byte 0x00760078 + .4byte 0x0079007B + .4byte 0x007C007E + .4byte 0x007F0080 + .4byte 0x00820083 + .4byte 0x00850087 + .4byte 0x0088008A + .4byte 0x008B008D + .4byte 0x008F0090 + .4byte 0x00920094 + .4byte 0x00950097 + .4byte 0x0099009B + .4byte 0x009C009E + .4byte 0x00A000A2 + .4byte 0x00A400A6 + .4byte 0x00A800AA + .4byte 0x00AB00AD + .4byte 0x00AF00B2 + .4byte 0x00B400B6 + .4byte 0x00B800BA + .4byte 0x00BC00BE + .4byte 0x00C000C3 + .4byte 0x00C500C7 + .4byte 0x00CA00CC + .4byte 0x00CE00D1 + .4byte 0x00D300D6 + .4byte 0x00D800DB + .4byte 0x00DD00E0 + .4byte 0x00E200E5 + .4byte 0x00E700EA + .4byte 0x00ED00F0 + .4byte 0x00F200F5 + .4byte 0x00F800FB + .4byte 0x00FE0101 + .4byte 0x01040107 + .4byte 0x010A010D + .4byte 0x01100113 + .4byte 0x0116011A + .4byte 0x011D0120 + .4byte 0x01240127 + .4byte 0x012A012E + .4byte 0x01310135 + .4byte 0x0138013C + .4byte 0x01400143 + .4byte 0x0147014B + .4byte 0x014F0153 + .4byte 0x0157015B + .4byte 0x015F0163 + .4byte 0x0167016B + .4byte 0x016F0173 + .4byte 0x0178017C + .4byte 0x01800185 + .4byte 0x0189018E + .4byte 0x01930197 + .4byte 0x019C01A1 + .4byte 0x01A601AB + .4byte 0x01AF01B4 + .4byte 0x01BA01BF + .4byte 0x01C401C9 + .4byte 0x01CE01D4 + .4byte 0x01D901DF + .4byte 0x01E401EA + .4byte 0x01EF01F5 + .4byte 0x01FB0201 + .4byte 0x0207020D + .4byte 0x02130219 + .4byte 0x021F0226 + .4byte 0x022C0232 + .4byte 0x02390240 + .4byte 0x0246024D + .4byte 0x0254025B + .4byte 0x02620269 + .4byte 0x02700277 + .4byte 0x027E0286 + .4byte 0x028D0295 + .4byte 0x029D02A4 + .4byte 0x02AC02B4 + .4byte 0x02BC02C4 + .4byte 0x02CC02D5 + .4byte 0x02DD02E6 + .4byte 0x02EE02F7 + .4byte 0x03000309 + .4byte 0x0312031B + .4byte 0x0324032D + .4byte 0x03370340 + .4byte 0x034A0354 + .4byte 0x035D0367 + .4byte 0x0371037C + .4byte 0x03860390 + .4byte 0x039B03A6 + .4byte 0x03B103BB + .4byte 0x03C703D2 + .4byte 0x03DD03E9 + .4byte 0x03F40400 + .4byte 0x040C0418 + .4byte 0x04240430 + .4byte 0x043D0449 + .4byte 0x04560463 + .4byte 0x0470047D + .4byte 0x048A0498 + .4byte 0x04A504B3 + .4byte 0x04C104CF + .4byte 0x04DD04EC + .4byte 0x04FA0509 + .4byte 0x05180527 + .4byte 0x05360546 + .4byte 0x05550565 + .4byte 0x05750586 + .4byte 0x059605A6 + .4byte 0x05B705C8 + .4byte 0x05D905EB + .4byte 0x05FC060E + .4byte 0x06200632 + .4byte 0x06440657 + .4byte 0x066A067D + .4byte 0x069006A4 + .4byte 0x06B706CB + .4byte 0x06DF06F4 + .4byte 0x0708071D + .4byte 0x07320748 + .4byte 0x075D0773 + .4byte 0x0789079F + .4byte 0x07B607CD + .4byte 0x07E407FB + .4byte 0x0813082B + .4byte 0x0843085C + .4byte 0x0874088E + .4byte 0x08A708C1 + .4byte 0x08DA08F5 + .4byte 0x090F092A + .4byte 0x09450961 + .4byte 0x097D0999 + .4byte 0x09B509D2 + .4byte 0x09EF0A0D + .4byte 0x0A2A0A48 + .4byte 0x0A670A86 + .4byte 0x0AA50AC5 + .4byte 0x0AE50B05 + .4byte 0x0B250B47 + .4byte 0x0B680B8A + .4byte 0x0BAC0BCF + .4byte 0x0BF20C15 + .4byte 0x0C390C5D + .4byte 0x0C820CA7 + .4byte 0x0CCC0CF2 + .4byte 0x0D190D3F + .4byte 0x0D670D8E + .4byte 0x0DB70DDF + .4byte 0x0E080E32 + .4byte 0x0E5C0E87 + .4byte 0x0EB20EDD + .4byte 0x0F090F36 + .4byte 0x0F630F91 + .4byte 0x0FBF0FEE + .4byte 0x101D104D + .4byte 0x107D10AE + .4byte 0x10DF1111 + .4byte 0x11441177 + .4byte 0x11AB11DF + .4byte 0x1214124A + .4byte 0x128012B7 + .4byte 0x12EE1326 + .4byte 0x135F1399 + .4byte 0x13D3140D + .4byte 0x14491485 + .4byte 0x14C214FF + .4byte 0x153E157D + .4byte 0x15BC15FD + .4byte 0x163E1680 + .4byte 0x16C31706 + .4byte 0x174A178F + .4byte 0x17D5181C + .4byte 0x186318AC + .4byte 0x18F5193F + .4byte 0x198A19D5 + .4byte 0x1A221A6F + .4byte 0x1ABE1B0D + .4byte 0x1B5D1BAE + .4byte 0x1C001C53 + .4byte 0x1CA71CFC + .4byte 0x1D521DA9 + .4byte 0x1E011E5A + .4byte 0x1EB41F0F + .4byte 0x1F6B1FC8 + .4byte 0x20262086 + .4byte 0x20E62148 + .4byte 0x21AA220E + .4byte 0x227322D9 + .4byte 0x234123A9 + .4byte 0x2413247E + .4byte 0x24EA2557 + .4byte 0x25C62636 + .4byte 0x26A7271A + .4byte 0x278E2803 + .4byte 0x287A28F2 + .4byte 0x296B29E6 + .4byte 0x2A622AE0 + .4byte 0x2B5F2BDF + .4byte 0x2C612CE5 + .4byte 0x2D6A2DF1 + .4byte 0x2E792F03 + .4byte 0x2F8E301B + .4byte 0x30AA313A + .4byte 0x31CC325F + .4byte 0x32F5338C + .4byte 0x342534BF + .4byte 0x355B35FA + .4byte 0x369A373C + .4byte 0x37DF3885 + .4byte 0x392C39D6 + .4byte 0x3A813B2F + .4byte 0x3BDE3C90 + .4byte 0x3D433DF9 + .4byte 0x3EB13F6A + .4byte 0x402640E5 + .4byte 0x41A54268 + .4byte 0x432C43F4 + .4byte 0x44BD4589 + .4byte 0x46574727 + .4byte 0x47FA48D0 + .4byte 0x49A84A82 + .4byte 0x4B5F4C3E + .4byte 0x4D204E05 + .4byte 0x4EEC4FD6 + .4byte 0x50C351B2 + .4byte 0x52A45399 + .4byte 0x5491558C + .4byte 0x5689578A + .4byte 0x588D5994 + .4byte 0x5A9D5BAA + .4byte 0x5CBA5DCD + .4byte 0x5EE35FFC + .4byte 0x61196238 + .4byte 0x635C6482 + .4byte 0x65AC66D9 + .4byte 0x680A693F + .4byte 0x6A776BB2 + .4byte 0x6CF26E35 + .4byte 0x6F7B70C6 + .4byte 0x72147366 + .4byte 0x74BC7616 + .4byte 0x777478D6 + .4byte 0x7A3D7BA7 + .4byte 0x7D167E88 + .4byte 0x7FFF817B + .4byte 0x82FB847F + .4byte 0x86088795 + .4byte 0x89278ABE + .4byte 0x8C598DF9 + .4byte 0x8F9E9148 + .4byte 0x92F694AA + .4byte 0x96639820 + .4byte 0x99E39BAB + .4byte 0x9D799F4C + .4byte 0xA124A302 + .4byte 0xA4E5A6CE + .4byte 0xA8BCAAB0 + .4byte 0xACAAAEAA + .4byte 0xB0B0B2BC + .4byte 0xB4CEB6E5 + .4byte 0xB904BB28 + .4byte 0xBD53BF84 + .4byte 0xC1BCC3FA + .4byte 0xC63FC88B + .4byte 0xCADDCD37 + .4byte 0xCF97D1FE + .4byte 0xD46DD6E3 + .4byte 0xD960DBE4 + .4byte 0xDE70E103 + .4byte 0xE39EE641 + .4byte 0xE8EBEB9E + .4byte 0xEE58F11B + .4byte 0xF3E6F6B9 + .4byte 0xF994FC78 + .4byte 0xFF640000 + .4byte 0 .global __HBMMIXPanTable __HBMMIXPanTable: - .incbin "baserom.dol", 0x441F58, 0x200 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFB + .4byte 0xFFFFFFFB + .4byte 0xFFFFFFFB + .4byte 0xFFFFFFFA + .4byte 0xFFFFFFFA + .4byte 0xFFFFFFF9 + .4byte 0xFFFFFFF9 + .4byte 0xFFFFFFF9 + .4byte 0xFFFFFFF8 + .4byte 0xFFFFFFF8 + .4byte 0xFFFFFFF7 + .4byte 0xFFFFFFF7 + .4byte 0xFFFFFFF6 + .4byte 0xFFFFFFF6 + .4byte 0xFFFFFFF6 + .4byte 0xFFFFFFF5 + .4byte 0xFFFFFFF5 + .4byte 0xFFFFFFF4 + .4byte 0xFFFFFFF4 + .4byte 0xFFFFFFF3 + .4byte 0xFFFFFFF3 + .4byte 0xFFFFFFF2 + .4byte 0xFFFFFFF2 + .4byte 0xFFFFFFF2 + .4byte 0xFFFFFFF1 + .4byte 0xFFFFFFF1 + .4byte 0xFFFFFFF0 + .4byte 0xFFFFFFF0 + .4byte 0xFFFFFFEF + .4byte 0xFFFFFFEF + .4byte 0xFFFFFFEE + .4byte 0xFFFFFFEE + .4byte 0xFFFFFFED + .4byte 0xFFFFFFEC + .4byte 0xFFFFFFEC + .4byte 0xFFFFFFEB + .4byte 0xFFFFFFEB + .4byte 0xFFFFFFEA + .4byte 0xFFFFFFEA + .4byte 0xFFFFFFE9 + .4byte 0xFFFFFFE9 + .4byte 0xFFFFFFE8 + .4byte 0xFFFFFFE7 + .4byte 0xFFFFFFE7 + .4byte 0xFFFFFFE6 + .4byte 0xFFFFFFE6 + .4byte 0xFFFFFFE5 + .4byte 0xFFFFFFE4 + .4byte 0xFFFFFFE4 + .4byte 0xFFFFFFE3 + .4byte 0xFFFFFFE2 + .4byte 0xFFFFFFE2 + .4byte 0xFFFFFFE1 + .4byte 0xFFFFFFE0 + .4byte 0xFFFFFFDF + .4byte 0xFFFFFFDF + .4byte 0xFFFFFFDE + .4byte 0xFFFFFFDD + .4byte 0xFFFFFFDC + .4byte 0xFFFFFFDC + .4byte 0xFFFFFFDB + .4byte 0xFFFFFFDA + .4byte 0xFFFFFFD9 + .4byte 0xFFFFFFD8 + .4byte 0xFFFFFFD8 + .4byte 0xFFFFFFD7 + .4byte 0xFFFFFFD6 + .4byte 0xFFFFFFD5 + .4byte 0xFFFFFFD4 + .4byte 0xFFFFFFD3 + .4byte 0xFFFFFFD2 + .4byte 0xFFFFFFD1 + .4byte 0xFFFFFFD0 + .4byte 0xFFFFFFCF + .4byte 0xFFFFFFCE + .4byte 0xFFFFFFCD + .4byte 0xFFFFFFCC + .4byte 0xFFFFFFCA + .4byte 0xFFFFFFC9 + .4byte 0xFFFFFFC8 + .4byte 0xFFFFFFC7 + .4byte 0xFFFFFFC5 + .4byte 0xFFFFFFC4 + .4byte 0xFFFFFFC3 + .4byte 0xFFFFFFC1 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFBE + .4byte 0xFFFFFFBD + .4byte 0xFFFFFFBB + .4byte 0xFFFFFFB9 + .4byte 0xFFFFFFB8 + .4byte 0xFFFFFFB6 + .4byte 0xFFFFFFB4 + .4byte 0xFFFFFFB2 + .4byte 0xFFFFFFB0 + .4byte 0xFFFFFFAD + .4byte 0xFFFFFFAB + .4byte 0xFFFFFFA9 + .4byte 0xFFFFFFA6 + .4byte 0xFFFFFFA3 + .4byte 0xFFFFFFA0 + .4byte 0xFFFFFF9D + .4byte 0xFFFFFF9A + .4byte 0xFFFFFF96 + .4byte 0xFFFFFF92 + .4byte 0xFFFFFF8D + .4byte 0xFFFFFF88 + .4byte 0xFFFFFF82 + .4byte 0xFFFFFF7B + .4byte 0xFFFFFF74 + .4byte 0xFFFFFF6A + .4byte 0xFFFFFF5D + .4byte 0xFFFFFF4C + .4byte 0xFFFFFF2E + .4byte 0xFFFFFC78 .global __HBMMIX_DPL2_front __HBMMIX_DPL2_front: - .incbin "baserom.dol", 0x442158, 0x100 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000FFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFEFFFE + .4byte 0xFFFEFFFE + .4byte 0xFFFDFFFD + .4byte 0xFFFDFFFC + .4byte 0xFFFCFFFC + .4byte 0xFFFBFFFB + .4byte 0xFFFAFFFA + .4byte 0xFFFAFFF9 + .4byte 0xFFF9FFF8 + .4byte 0xFFF8FFF7 + .4byte 0xFFF7FFF6 + .4byte 0xFFF5FFF5 + .4byte 0xFFF4FFF4 + .4byte 0xFFF3FFF2 + .4byte 0xFFF2FFF1 + .4byte 0xFFF0FFEF + .4byte 0xFFEFFFEE + .4byte 0xFFEDFFEC + .4byte 0xFFEBFFEB + .4byte 0xFFEAFFE9 + .4byte 0xFFE8FFE7 + .4byte 0xFFE6FFE5 + .4byte 0xFFE4FFE3 + .4byte 0xFFE2FFE1 + .4byte 0xFFE0FFDE + .4byte 0xFFDDFFDC + .4byte 0xFFDBFFDA + .4byte 0xFFD8FFD7 + .4byte 0xFFD6FFD4 + .4byte 0xFFD3FFD1 + .4byte 0xFFD0FFCE + .4byte 0xFFCCFFCB + .4byte 0xFFC9FFC7 + .4byte 0xFFC6FFC4 + .4byte 0xFFC2FFC0 + .4byte 0xFFBEFFBC + .4byte 0xFFBAFFB7 + .4byte 0xFFB5FFB3 + .4byte 0xFFB0FFAE + .4byte 0xFFABFFA8 + .4byte 0xFFA6FFA3 + .4byte 0xFFA0FF9C + .4byte 0xFF99FF96 + .4byte 0xFF92FF8E + .4byte 0xFF8AFF86 + .4byte 0xFF82FF7D + .4byte 0xFF78FF73 + .4byte 0xFF6EFF68 + .4byte 0xFF61FF5A + .4byte 0xFF53FF4B + .4byte 0xFF42FF37 + .4byte 0xFF2CFF1F + .4byte 0xFF0FFEFB + .4byte 0xFEE2FEBF + .4byte 0xFE83FC40 .global __HBMMIX_DPL2_rear __HBMMIX_DPL2_rear: - .incbin "baserom.dol", 0x442258, 0x100 + .4byte 0xFFC3FFC3 + .4byte 0xFFC4FFC5 + .4byte 0xFFC5FFC6 + .4byte 0xFFC6FFC7 + .4byte 0xFFC8FFC8 + .4byte 0xFFC9FFC9 + .4byte 0xFFCAFFCB + .4byte 0xFFCBFFCC + .4byte 0xFFCCFFCD + .4byte 0xFFCEFFCE + .4byte 0xFFCFFFCF + .4byte 0xFFD0FFD0 + .4byte 0xFFD1FFD1 + .4byte 0xFFD2FFD2 + .4byte 0xFFD3FFD3 + .4byte 0xFFD4FFD4 + .4byte 0xFFD5FFD5 + .4byte 0xFFD6FFD6 + .4byte 0xFFD7FFD7 + .4byte 0xFFD8FFD8 + .4byte 0xFFD9FFD9 + .4byte 0xFFDAFFDA + .4byte 0xFFDAFFDB + .4byte 0xFFDBFFDC + .4byte 0xFFDCFFDD + .4byte 0xFFDDFFDD + .4byte 0xFFDEFFDE + .4byte 0xFFDFFFDF + .4byte 0xFFE0FFE0 + .4byte 0xFFE0FFE1 + .4byte 0xFFE1FFE1 + .4byte 0xFFE2FFE2 + .4byte 0xFFE3FFE3 + .4byte 0xFFE3FFE4 + .4byte 0xFFE4FFE4 + .4byte 0xFFE5FFE5 + .4byte 0xFFE5FFE6 + .4byte 0xFFE6FFE6 + .4byte 0xFFE7FFE7 + .4byte 0xFFE7FFE8 + .4byte 0xFFE8FFE8 + .4byte 0xFFE9FFE9 + .4byte 0xFFE9FFEA + .4byte 0xFFEAFFEA + .4byte 0xFFEBFFEB + .4byte 0xFFEBFFEC + .4byte 0xFFECFFEC + .4byte 0xFFECFFED + .4byte 0xFFEDFFED + .4byte 0xFFEEFFEE + .4byte 0xFFEEFFEE + .4byte 0xFFEFFFEF + .4byte 0xFFEFFFEF + .4byte 0xFFF0FFF0 + .4byte 0xFFF0FFF0 + .4byte 0xFFF1FFF1 + .4byte 0xFFF1FFF1 + .4byte 0xFFF2FFF2 + .4byte 0xFFF2FFF2 + .4byte 0xFFF3FFF3 + .4byte 0xFFF3FFF3 + .4byte 0xFFF3FFF4 + .4byte 0xFFF4FFF4 + .4byte 0xFFF4FFF5 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sIndex2IdTable diff --git a/asm/homebuttonLib/seq.s b/asm/homebuttonLib/seq.s index 139a7795..8245a6e6 100644 --- a/asm/homebuttonLib/seq.s +++ b/asm/homebuttonLib/seq.s @@ -669,30 +669,64 @@ HBMSEQSetVolume: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21048 $$21048: - .incbin "baserom.dol", 0x40A428, 0x4 + .4byte 0x47800000 .global $$21049 $$21049: - .incbin "baserom.dol", 0x40A42C, 0x4 + .4byte 0x42C00000 .global $$21050 $$21050: - .incbin "baserom.dol", 0x40A430, 0x8 + .4byte 0x467A0000 + .4byte 0 .global $$21054 $$21054: - .incbin "baserom.dol", 0x40A438, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$21185 $$21185: - .incbin "baserom.dol", 0x40A440, 0x4 + .4byte 0x49742400 .global $$21186 $$21186: - .incbin "baserom.dol", 0x40A444, 0x4 + .4byte 0x46FA0000 .global $$21188 $$21188: - .incbin "baserom.dol", 0x40A448, 0x8 + .4byte 0x43300000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSEQMidiEventLength __HBMSEQMidiEventLength: - .incbin "baserom.dol", 0x442CD8, 0x80 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x00000201 + .4byte 0 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __HBMSEQSequenceList diff --git a/asm/homebuttonLib/synctrl.s b/asm/homebuttonLib/synctrl.s index a54c734b..fcc23606 100644 --- a/asm/homebuttonLib/synctrl.s +++ b/asm/homebuttonLib/synctrl.s @@ -330,4 +330,131 @@ lbl_8014A12C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNn128 __HBMSYNn128: - .incbin "baserom.dol", 0x442358, 0x200 + .4byte 0 + .4byte 0x3C000219 + .4byte 0x3C800000 + .4byte 0x3CC0010C + .4byte 0x3D000000 + .4byte 0x3D200086 + .4byte 0x3D400000 + .4byte 0x3D600086 + .4byte 0x3D800000 + .4byte 0x3D900043 + .4byte 0x3DA00000 + .4byte 0x3DB00043 + .4byte 0x3DC00000 + .4byte 0x3DD00043 + .4byte 0x3DE00000 + .4byte 0x3DF00043 + .4byte 0x3E000000 + .4byte 0x3E080022 + .4byte 0x3E100000 + .4byte 0x3E180022 + .4byte 0x3E200000 + .4byte 0x3E280022 + .4byte 0x3E300000 + .4byte 0x3E380022 + .4byte 0x3E400000 + .4byte 0x3E480022 + .4byte 0x3E500000 + .4byte 0x3E580022 + .4byte 0x3E600000 + .4byte 0x3E680022 + .4byte 0x3E700000 + .4byte 0x3E780022 + .4byte 0x3E800000 + .4byte 0x3E840011 + .4byte 0x3E880000 + .4byte 0x3E8C0011 + .4byte 0x3E900000 + .4byte 0x3E940011 + .4byte 0x3E980000 + .4byte 0x3E9C0011 + .4byte 0x3EA00000 + .4byte 0x3EA40011 + .4byte 0x3EA80000 + .4byte 0x3EAC0011 + .4byte 0x3EB00000 + .4byte 0x3EB40011 + .4byte 0x3EB80000 + .4byte 0x3EBC0011 + .4byte 0x3EC00000 + .4byte 0x3EC40011 + .4byte 0x3EC80000 + .4byte 0x3ECC0011 + .4byte 0x3ED00000 + .4byte 0x3ED40011 + .4byte 0x3ED80000 + .4byte 0x3EDC0011 + .4byte 0x3EE00000 + .4byte 0x3EE40011 + .4byte 0x3EE80000 + .4byte 0x3EEC0011 + .4byte 0x3EF00000 + .4byte 0x3EF40011 + .4byte 0x3EF80000 + .4byte 0x3EFC0011 + .4byte 0x3F000000 + .4byte 0x3F020008 + .4byte 0x3F040000 + .4byte 0x3F060008 + .4byte 0x3F080000 + .4byte 0x3F0A0008 + .4byte 0x3F0C0000 + .4byte 0x3F0E0008 + .4byte 0x3F100000 + .4byte 0x3F120008 + .4byte 0x3F140000 + .4byte 0x3F160008 + .4byte 0x3F180000 + .4byte 0x3F1A0008 + .4byte 0x3F1C0000 + .4byte 0x3F1E0008 + .4byte 0x3F200000 + .4byte 0x3F220008 + .4byte 0x3F240000 + .4byte 0x3F260008 + .4byte 0x3F280000 + .4byte 0x3F2A0008 + .4byte 0x3F2C0000 + .4byte 0x3F2E0008 + .4byte 0x3F300000 + .4byte 0x3F320008 + .4byte 0x3F340000 + .4byte 0x3F360008 + .4byte 0x3F380000 + .4byte 0x3F3A0008 + .4byte 0x3F3C0000 + .4byte 0x3F3E0008 + .4byte 0x3F400000 + .4byte 0x3F420008 + .4byte 0x3F440000 + .4byte 0x3F460008 + .4byte 0x3F480000 + .4byte 0x3F4A0008 + .4byte 0x3F4C0000 + .4byte 0x3F4E0008 + .4byte 0x3F500000 + .4byte 0x3F520008 + .4byte 0x3F540000 + .4byte 0x3F560008 + .4byte 0x3F580000 + .4byte 0x3F5A0008 + .4byte 0x3F5C0000 + .4byte 0x3F5E0008 + .4byte 0x3F600000 + .4byte 0x3F620008 + .4byte 0x3F640000 + .4byte 0x3F660008 + .4byte 0x3F680000 + .4byte 0x3F6A0008 + .4byte 0x3F6C0000 + .4byte 0x3F6E0008 + .4byte 0x3F700000 + .4byte 0x3F720008 + .4byte 0x3F740000 + .4byte 0x3F760008 + .4byte 0x3F780000 + .4byte 0x3F7A0008 + .4byte 0x3F7C0000 + .4byte 0x3F7E0008 diff --git a/asm/homebuttonLib/synenv.s b/asm/homebuttonLib/synenv.s index c29bda8b..ab641baa 100644 --- a/asm/homebuttonLib/synenv.s +++ b/asm/homebuttonLib/synenv.s @@ -276,16 +276,19 @@ lbl_8014A52C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21811 $$21811: - .incbin "baserom.dol", 0x40A3F0, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$21812 $$21812: - .incbin "baserom.dol", 0x40A3F8, 0x4 + .4byte 0x4C960000 .global $$21813 $$21813: - .incbin "baserom.dol", 0x40A3FC, 0x4 + .4byte 0x447A0000 .global $$21814 $$21814: - .incbin "baserom.dol", 0x40A400, 0x8 + .4byte 0x4C95FF6A + .4byte 0 .global $$21816 $$21816: - .incbin "baserom.dol", 0x40A408, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/homebuttonLib/synmix.s b/asm/homebuttonLib/synmix.s index 54b3528a..2d655566 100644 --- a/asm/homebuttonLib/synmix.s +++ b/asm/homebuttonLib/synmix.s @@ -99,7 +99,233 @@ __HBMSYNUpdateMix: .section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNVolumeAttenuation __HBMSYNVolumeAttenuation: - .incbin "baserom.dol", 0x442558, 0x200 + .4byte 0xFC400000 + .4byte 0xFCB67A80 + .4byte 0xFD2EE3F9 + .4byte 0xFD7553B8 + .4byte 0xFDA74D72 + .4byte 0xFDCE1108 + .4byte 0xFDEDBD30 + .4byte 0xFE08848A + .4byte 0xFE1FB6EA + .4byte 0xFE342CEF + .4byte 0xFE467A80 + .4byte 0xFE57091D + .4byte 0xFE6626A9 + .4byte 0xFE740E4D + .4byte 0xFE80EE03 + .4byte 0xFE8CEA3F + .4byte 0xFE982063 + .4byte 0xFEA2A878 + .4byte 0xFEAC9668 + .4byte 0xFEB5FADF + .4byte 0xFEBEE3F9 + .4byte 0xFEC75DC2 + .4byte 0xFECF7295 + .4byte 0xFED72B6E + .4byte 0xFEDE9022 + .4byte 0xFEE5A78F + .4byte 0xFEEC77C6 + .4byte 0xFEF30626 + .4byte 0xFEF9577C + .4byte 0xFEFF700E + .4byte 0xFF0553B8 + .4byte 0xFF0B05F0 + .4byte 0xFF1089DC + .4byte 0xFF15E254 + .4byte 0xFF1B11F1 + .4byte 0xFF201B12 + .4byte 0xFF24FFE1 + .4byte 0xFF29C25C + .4byte 0xFF2E6457 + .4byte 0xFF32E784 + .4byte 0xFF374D72 + .4byte 0xFF3B9791 + .4byte 0xFF3FC73A + .4byte 0xFF43DDAC + .4byte 0xFF47DC0E + .4byte 0xFF4BC376 + .4byte 0xFF4F94E7 + .4byte 0xFF535152 + .4byte 0xFF56F99B + .4byte 0xFF5A8E94 + .4byte 0xFF5E1108 + .4byte 0xFF6181B0 + .4byte 0xFF64E13E + .4byte 0xFF68305A + .4byte 0xFF6B6F9F + .4byte 0xFF6E9FA4 + .4byte 0xFF71C0F4 + .4byte 0xFF74D416 + .4byte 0xFF77D987 + .4byte 0xFF7AD1BF + .4byte 0xFF7DBD30 + .4byte 0xFF809C47 + .4byte 0xFF836F69 + .4byte 0xFF8636F9 + .4byte 0xFF88F355 + .4byte 0xFF8BA4D4 + .4byte 0xFF8E4BCD + .4byte 0xFF90E890 + .4byte 0xFF937B6A + .4byte 0xFF9604A6 + .4byte 0xFF98848A + .4byte 0xFF9AFB5B + .4byte 0xFF9D6959 + .4byte 0xFF9FCEC3 + .4byte 0xFFA22BD4 + .4byte 0xFFA480C6 + .4byte 0xFFA6CDD0 + .4byte 0xFFA91327 + .4byte 0xFFAB50FD + .4byte 0xFFAD8784 + .4byte 0xFFAFB6EA + .4byte 0xFFB1DF5E + .4byte 0xFFB4010A + .4byte 0xFFB61C19 + .4byte 0xFFB830B3 + .4byte 0xFFBA3F00 + .4byte 0xFFBC4724 + .4byte 0xFFBE4946 + .4byte 0xFFC04587 + .4byte 0xFFC23C0A + .4byte 0xFFC42CEF + .4byte 0xFFC61857 + .4byte 0xFFC7FE60 + .4byte 0xFFC9DF28 + .4byte 0xFFCBBACB + .4byte 0xFFCD9166 + .4byte 0xFFCF6313 + .4byte 0xFFD12FED + .4byte 0xFFD2F80D + .4byte 0xFFD4BB8B + .4byte 0xFFD67A80 + .4byte 0xFFD83502 + .4byte 0xFFD9EB29 + .4byte 0xFFDB9D08 + .4byte 0xFFDD4AB7 + .4byte 0xFFDEF449 + .4byte 0xFFE099D2 + .4byte 0xFFE23B66 + .4byte 0xFFE3D918 + .4byte 0xFFE572F9 + .4byte 0xFFE7091D + .4byte 0xFFE89B93 + .4byte 0xFFEA2A6D + .4byte 0xFFEBB5BC + .4byte 0xFFED3D8F + .4byte 0xFFEEC1F6 + .4byte 0xFFF04300 + .4byte 0xFFF1C0BC + .4byte 0xFFF33B38 + .4byte 0xFFF4B283 + .4byte 0xFFF626A9 + .4byte 0xFFF797B9 + .4byte 0xFFF905BF + .4byte 0xFFFA70C9 + .4byte 0xFFFBD8E2 + .4byte 0xFFFD3E16 + .4byte 0xFFFEA072 + .4byte 0 .global __HBMSYNAttackAttnTable __HBMSYNAttackAttnTable: - .incbin "baserom.dol", 0x442758, 0x190 + .4byte 0xFC400000 + .4byte 0xFE70DF7B + .4byte 0xFEAD1437 + .4byte 0xFED04C17 + .4byte 0xFEE948F4 + .4byte 0xFEFCAABF + .4byte 0xFF0C80D3 + .4byte 0xFF19E480 + .4byte 0xFF257DB0 + .4byte 0xFF2FB8B2 + .4byte 0xFF38DF7B + .4byte 0xFF4126C9 + .4byte 0xFF48B58F + .4byte 0xFF4FA961 + .4byte 0xFF56193C + .4byte 0xFF5C175A + .4byte 0xFF61B26C + .4byte 0xFF66F677 + .4byte 0xFF6BED6F + .4byte 0xFF709FAA + .4byte 0xFF751437 + .4byte 0xFF79511C + .4byte 0xFF7D5B85 + .4byte 0xFF8137F2 + .4byte 0xFF84EA4C + .4byte 0xFF887602 + .4byte 0xFF8BDE1E + .4byte 0xFF8F254E + .4byte 0xFF924DF9 + .4byte 0xFF955A42 + .4byte 0xFF984C17 + .4byte 0xFF9B2533 + .4byte 0xFF9DE729 + .4byte 0xFFA09365 + .4byte 0xFFA32B33 + .4byte 0xFFA5AFC4 + .4byte 0xFFA8222B + .4byte 0xFFAA8369 + .4byte 0xFFACD466 + .4byte 0xFFAF15FD + .4byte 0xFFB148F4 + .4byte 0xFFB36E03 + .4byte 0xFFB585D8 + .4byte 0xFFB79111 + .4byte 0xFFB99042 + .4byte 0xFFBB83F6 + .4byte 0xFFBD6CAE + .4byte 0xFFBF4AE4 + .4byte 0xFFC11F08 + .4byte 0xFFC2E985 + .4byte 0xFFC4AABF + .4byte 0xFFC66313 + .4byte 0xFFC812DA + .4byte 0xFFC9BA68 + .4byte 0xFFCB5A0A + .4byte 0xFFCCF20D + .4byte 0xFFCE82B5 + .4byte 0xFFD00C46 + .4byte 0xFFD18EFE + .4byte 0xFFD30B1A + .4byte 0xFFD480D3 + .4byte 0xFFD5F05E + .4byte 0xFFD759EF + .4byte 0xFFD8BDB7 + .4byte 0xFFDA1BE5 + .4byte 0xFFDB74A5 + .4byte 0xFFDCC821 + .4byte 0xFFDE1683 + .4byte 0xFFDF5FF0 + .4byte 0xFFE0A48E + .4byte 0xFFE1E480 + .4byte 0xFFE31FE8 + .4byte 0xFFE456E7 + .4byte 0xFFE5899C + .4byte 0xFFE6B825 + .4byte 0xFFE7E29E + .4byte 0xFFE90923 + .4byte 0xFFEA2BCE + .4byte 0xFFEB4AB9 + .4byte 0xFFEC65FD + .4byte 0xFFED7DB0 + .4byte 0xFFEE91EA + .4byte 0xFFEFA2C0 + .4byte 0xFFF0B047 + .4byte 0xFFF1BA94 + .4byte 0xFFF2C1BB + .4byte 0xFFF3C5CD + .4byte 0xFFF4C6DE + .4byte 0xFFF5C4FE + .4byte 0xFFF6C040 + .4byte 0xFFF7B8B2 + .4byte 0xFFF8AE66 + .4byte 0xFFF9A16B + .4byte 0xFFFA91CF + .4byte 0xFFFB7FA0 + .4byte 0xFFFC6AEE + .4byte 0xFFFD53C4 + .4byte 0xFFFE3A31 + .4byte 0xFFFF1E41 + .4byte 0 diff --git a/asm/homebuttonLib/synpitch.s b/asm/homebuttonLib/synpitch.s index a0e2a43b..6a71c3d9 100644 --- a/asm/homebuttonLib/synpitch.s +++ b/asm/homebuttonLib/synpitch.s @@ -179,27 +179,277 @@ __HBMSYNUpdateSrc: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21762 $$21762: - .incbin "baserom.dol", 0x40A410, 0x4 + .4byte 0x3F800000 .global $$21765 $$21765: - .incbin "baserom.dol", 0x40A414, 0x4 + .4byte 0x46FA0000 .global $$21768 $$21768: - .incbin "baserom.dol", 0x40A418, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$21770 $$21770: - .incbin "baserom.dol", 0x40A420, 0x8 + .4byte 0x47800000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNCentsTable __HBMSYNCentsTable: - .incbin "baserom.dol", 0x4428E8, 0x190 + .4byte 0x3F800000 + .4byte 0x3F8012F1 + .4byte 0x3F8025E1 + .4byte 0x3F8038D2 + .4byte 0x3F804BCB + .4byte 0x3F805EC4 + .4byte 0x3F8071C5 + .4byte 0x3F8084C7 + .4byte 0x3F8097C8 + .4byte 0x3F80AAC9 + .4byte 0x3F80BDD3 + .4byte 0x3F80D0DD + .4byte 0x3F80E3EF + .4byte 0x3F80F6F9 + .4byte 0x3F810A13 + .4byte 0x3F811D26 + .4byte 0x3F813040 + .4byte 0x3F81435B + .4byte 0x3F815675 + .4byte 0x3F816998 + .4byte 0x3F817CBB + .4byte 0x3F818FE7 + .4byte 0x3F81A312 + .4byte 0x3F81B63D + .4byte 0x3F81C969 + .4byte 0x3F81DC9C + .4byte 0x3F81EFD8 + .4byte 0x3F82030C + .4byte 0x3F821648 + .4byte 0x3F822984 + .4byte 0x3F823CC9 + .4byte 0x3F82500D + .4byte 0x3F826352 + .4byte 0x3F827696 + .4byte 0x3F8289E3 + .4byte 0x3F829D39 + .4byte 0x3F82B085 + .4byte 0x3F82C3DB + .4byte 0x3F82D730 + .4byte 0x3F82EA8E + .4byte 0x3F82FDEB + .4byte 0x3F831149 + .4byte 0x3F8324AF + .4byte 0x3F833815 + .4byte 0x3F834B7B + .4byte 0x3F835EEA + .4byte 0x3F837258 + .4byte 0x3F8385C6 + .4byte 0x3F83993D + .4byte 0x3F83ACB4 + .4byte 0x3F83C02B + .4byte 0x3F83D3AA + .4byte 0x3F83E729 + .4byte 0x3F83FAA9 + .4byte 0x3F840E30 + .4byte 0x3F8421B8 + .4byte 0x3F843548 + .4byte 0x3F8448CF + .4byte 0x3F845C68 + .4byte 0x3F846FF8 + .4byte 0x3F848390 + .4byte 0x3F849729 + .4byte 0x3F84AAC9 + .4byte 0x3F84BE62 + .4byte 0x3F84D20B + .4byte 0x3F84E5AC + .4byte 0x3F84F955 + .4byte 0x3F850CFE + .4byte 0x3F8520B0 + .4byte 0x3F853461 + .4byte 0x3F854813 + .4byte 0x3F855BCD + .4byte 0x3F856F87 + .4byte 0x3F858341 + .4byte 0x3F859703 + .4byte 0x3F85AAC5 + .4byte 0x3F85BE88 + .4byte 0x3F85D252 + .4byte 0x3F85E61D + .4byte 0x3F85F9E8 + .4byte 0x3F860DBB + .4byte 0x3F86218E + .4byte 0x3F863569 + .4byte 0x3F864945 + .4byte 0x3F865D20 + .4byte 0x3F8670FC + .4byte 0x3F8684E0 + .4byte 0x3F8698C4 + .4byte 0x3F86ACB0 + .4byte 0x3F86C09C + .4byte 0x3F86D489 + .4byte 0x3F86E87D + .4byte 0x3F86FC72 + .4byte 0x3F871066 + .4byte 0x3F872464 + .4byte 0x3F873861 + .4byte 0x3F874C5E + .4byte 0x3F876063 + .4byte 0x3F877469 + .4byte 0x3F87886E .global __HBMSYNOctavesTableUp __HBMSYNOctavesTableUp: - .incbin "baserom.dol", 0x442A78, 0x30 + .4byte 0x3F800000 + .4byte 0x40000000 + .4byte 0x40800000 + .4byte 0x41000000 + .4byte 0x41800000 + .4byte 0x42000000 + .4byte 0x42800000 + .4byte 0x43000000 + .4byte 0x43800000 + .4byte 0x44000000 + .4byte 0x44800000 + .4byte 0x45000000 .global __HBMSYNSemitonesTableUp __HBMSYNSemitonesTableUp: - .incbin "baserom.dol", 0x442AA8, 0x30 + .4byte 0x3F800000 + .4byte 0x3F879C7C + .4byte 0x3F8FACD6 + .4byte 0x3F9837EF + .4byte 0x3FA14517 + .4byte 0x3FAADC0A + .4byte 0x3FB504F7 + .4byte 0x3FBFC886 + .4byte 0x3FCB2FF5 + .4byte 0x3FD744FE + .4byte 0x3FE411ED + .4byte 0x3FF1A1C2 .global __HBMSYNSemitonesTableDown __HBMSYNSemitonesTableDown: - .incbin "baserom.dol", 0x442AD8, 0x200 + .4byte 0x3F800000 + .4byte 0x3F71A1BA + .4byte 0x3F6411F5 + .4byte 0x3F5744F6 + .4byte 0x3F4B2FFD + .4byte 0x3F3FC88E + .4byte 0x3F3504F7 + .4byte 0x3F2ADC0A + .4byte 0x3F214520 + .4byte 0x3F1837F8 + .4byte 0x3F0FACD6 + .4byte 0x3F079C84 + .4byte 0x3F000000 + .4byte 0x3EF1A1BA + .4byte 0x3EE411E4 + .4byte 0x3ED744F6 + .4byte 0x3ECB2FEC + .4byte 0x3EBFC88E + .4byte 0x3EB504E6 + .4byte 0x3EAADC0A + .4byte 0x3EA1450F + .4byte 0x3E9837F8 + .4byte 0x3E8FACE6 + .4byte 0x3E879C84 + .4byte 0x3E800000 + .4byte 0x3E71A1DC + .4byte 0x3E641206 + .4byte 0x3E5744F6 + .4byte 0x3E4B2FEC + .4byte 0x3E3FC86D + .4byte 0x3E350508 + .4byte 0x3E2ADC0A + .4byte 0x3E21450F + .4byte 0x3E1837F8 + .4byte 0x3E0FACE6 + .4byte 0x3E079C84 + .4byte 0x3E000000 + .4byte 0x3DF1A198 + .4byte 0x3DE411C3 + .4byte 0x3DD744F6 + .4byte 0x3DCB302F + .4byte 0x3DBFC86D + .4byte 0x3DB504C5 + .4byte 0x3DAADBC6 + .4byte 0x3DA1450F + .4byte 0x3D9837B5 + .4byte 0x3D8FACE6 + .4byte 0x3D879C41 + .4byte 0x3D800000 + .4byte 0x3D71A198 + .4byte 0x3D6411C3 + .4byte 0x3D5744F6 + .4byte 0x3D4B2FA9 + .4byte 0x3D3FC86D + .4byte 0x3D3504C5 + .4byte 0x3D2ADC4D + .4byte 0x3D214595 + .4byte 0x3D18383B + .4byte 0x3D0FACE6 + .4byte 0x3D079C41 + .4byte 0x3D000000 + .4byte 0x3CF1A198 + .4byte 0x3CE412CF + .4byte 0x3CD744F6 + .4byte 0x3CCB2FA9 + .4byte 0x3CBFC86D + .4byte 0x3CB504C5 + .4byte 0x3CAADC4D + .4byte 0x3CA14489 + .4byte 0x3C98372E + .4byte 0x3C8FABDA + .4byte 0x3C879C41 + .4byte 0x3C800000 + .4byte 0x3C71A198 + .4byte 0x3C6410B6 + .4byte 0x3C5744F6 + .4byte 0x3C4B31C2 + .4byte 0x3C3FCA86 + .4byte 0x3C3506DD + .4byte 0x3C2ADA34 + .4byte 0x3C214489 + .4byte 0x3C183947 + .4byte 0x3C0FABDA + .4byte 0x3C079C41 + .4byte 0x3C000219 + .4byte 0x3BF1A198 + .4byte 0x3BE410B6 + .4byte 0x3BD74928 + .4byte 0x3BCB31C2 + .4byte 0x3BBFCA86 + .4byte 0x3BB502AC + .4byte 0x3BAADA34 + .4byte 0x3BA148BB + .4byte 0x3B983516 + .4byte 0x3B8FB00C + .4byte 0x3B87A073 + .4byte 0x3B7FFBCE + .4byte 0x3B71A198 + .4byte 0x3B6410B6 + .4byte 0x3B574928 + .4byte 0x3B4B295F + .4byte 0x3B3FC222 + .4byte 0x3B3502AC + .4byte 0x3B2ADA34 + .4byte 0x3B2148BB + .4byte 0x3B183D79 + .4byte 0x3B0FA7A8 + .4byte 0x3B07980F + .4byte 0x3AFFFBCE + .4byte 0x3AF1B25F + .4byte 0x3AE410B6 + .4byte 0x3AD73861 + .4byte 0x3ACB295F + .4byte 0x3ABFC222 + .4byte 0x3AB502AC + .4byte 0x3AAAEAFB + .4byte 0x3AA137F4 + .4byte 0x3A982CB2 + .4byte 0x3A8FA7A8 + .4byte 0x3A87A8D6 + .4byte 0x3A800EAE + .4byte 0x3A71B25F + .4byte 0x3A6410B6 + .4byte 0x3A573861 + .4byte 0x3A4B295F + .4byte 0x3A3FE3B0 + .4byte 0x3A35243A + .4byte 0x3A2AEAFB diff --git a/asm/homebuttonLib/ut_CharWriter.s b/asm/homebuttonLib/ut_CharWriter.s index b414ca25..4c02a973 100644 --- a/asm/homebuttonLib/ut_CharWriter.s +++ b/asm/homebuttonLib/ut_CharWriter.s @@ -1768,19 +1768,22 @@ lbl_80141510: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$26157 $$26157: - .incbin "baserom.dol", 0x40A3B0, 0x4 + .4byte 0 .global $$26158 $$26158: - .incbin "baserom.dol", 0x40A3B4, 0x4 + .4byte 0x3F800000 .global $$26464 $$26464: - .incbin "baserom.dol", 0x40A3B8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$26506 $$26506: - .incbin "baserom.dol", 0x40A3C0, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$26514 $$26514: - .incbin "baserom.dol", 0x40A3C8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2SetupGXCommon__6nw4hbmFv$$2fog diff --git a/asm/homebuttonLib/ut_Font.s b/asm/homebuttonLib/ut_Font.s index 9ba870c8..21673fe0 100644 --- a/asm/homebuttonLib/ut_Font.s +++ b/asm/homebuttonLib/ut_Font.s @@ -55,13 +55,21 @@ lbl_80141854: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$298 $$298: - .incbin "baserom.dol", 0x441568, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8013FDD0 ;# ptr .global $$299 $$299: - .incbin "baserom.dol", 0x441574, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8013FDE0 ;# ptr .global $$2100 $$2100: - .incbin "baserom.dol", 0x441580, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8013FE00 ;# ptr .global $$2101 $$2101: - .incbin "baserom.dol", 0x44158C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8013FDF0 ;# ptr diff --git a/asm/homebuttonLib/ut_ResFont.s b/asm/homebuttonLib/ut_ResFont.s index 44382f43..52daa0af 100644 --- a/asm/homebuttonLib/ut_ResFont.s +++ b/asm/homebuttonLib/ut_ResFont.s @@ -147,28 +147,61 @@ lbl_80141AA0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut7ResFont __vt__Q36nw4hbm2ut7ResFont: - .incbin "baserom.dol", 0x441598, 0x58 + .4byte 0x80445518 + .4byte 0 + .4byte 0x80141910 ;# ptr + .4byte 0x80141B20 ;# ptr + .4byte 0x80141B30 ;# ptr + .4byte 0x80141B40 ;# ptr + .4byte 0x80141B50 ;# ptr + .4byte 0x80141B60 ;# ptr + .4byte 0x80141B70 ;# ptr + .4byte 0x80141B80 ;# ptr + .4byte 0x80141B90 ;# ptr + .4byte 0x80141BA0 ;# ptr + .4byte 0x80141BB0 ;# ptr + .4byte 0x80141BC0 ;# ptr + .4byte 0x80141BD0 ;# ptr + .4byte 0x80141BE0 ;# ptr + .4byte 0x80141BF0 ;# ptr + .4byte 0x80141C90 ;# ptr + .4byte 0x80141CA0 ;# ptr + .4byte 0x80141CB0 ;# ptr + .4byte 0x80141DB0 ;# ptr + .4byte 0x80141E60 ;# ptr .global $$2355 $$2355: - .incbin "baserom.dol", 0x4415F0, 0x14 + .asciz "nw4hbm::ut::ResFont" .global $$2356 $$2356: - .incbin "baserom.dol", 0x441604, 0x14 + .4byte 0x80445570 + .4byte 0 + .4byte 0x80445550 + .4byte 0 + .4byte 0 .global __RTTI__Q36nw4hbm2ut7ResFont __RTTI__Q36nw4hbm2ut7ResFont: - .incbin "baserom.dol", 0x441618, 0x8 + .4byte 0x804454F0 + .4byte 0x80445504 .global $$2357 $$2357: - .incbin "baserom.dol", 0x441620, 0x20 + .asciz "nw4hbm::ut::detail::ResFontBase" .global $$2358 $$2358: - .incbin "baserom.dol", 0x441640, 0x10 + .4byte 0x80445570 + .4byte 0 + .4byte 0 + .4byte 0 .global __RTTI__Q46nw4hbm2ut6detail11ResFontBase __RTTI__Q46nw4hbm2ut6detail11ResFontBase: - .incbin "baserom.dol", 0x441650, 0x8 + .4byte 0x80445520 + .4byte 0x80445540 .global $$2359 $$2359: - .incbin "baserom.dol", 0x441658, 0x18 + .asciz "nw4hbm::ut::Font" + .balign 4 + .4byte 0 .global __RTTI__Q36nw4hbm2ut4Font __RTTI__Q36nw4hbm2ut4Font: - .incbin "baserom.dol", 0x441670, 0x8 + .4byte 0x80445558 + .4byte 0 diff --git a/asm/homebuttonLib/ut_ResFontBase.s b/asm/homebuttonLib/ut_ResFontBase.s index 1c45b695..3f9e571b 100644 --- a/asm/homebuttonLib/ut_ResFontBase.s +++ b/asm/homebuttonLib/ut_ResFontBase.s @@ -400,10 +400,55 @@ lbl_80141F20: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2549 $$2549: - .incbin "baserom.dol", 0x441678, 0x10 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8013FDF0 ;# ptr + .4byte 0 .global __vt__Q46nw4hbm2ut6detail11ResFontBase __vt__Q46nw4hbm2ut6detail11ResFontBase: - .incbin "baserom.dol", 0x441688, 0x58 + .4byte 0x80445550 + .4byte 0 + .4byte 0x80141B10 ;# ptr + .4byte 0x80141B20 ;# ptr + .4byte 0x80141B30 ;# ptr + .4byte 0x80141B40 ;# ptr + .4byte 0x80141B50 ;# ptr + .4byte 0x80141B60 ;# ptr + .4byte 0x80141B70 ;# ptr + .4byte 0x80141B80 ;# ptr + .4byte 0x80141B90 ;# ptr + .4byte 0x80141BA0 ;# ptr + .4byte 0x80141BB0 ;# ptr + .4byte 0x80141BC0 ;# ptr + .4byte 0x80141BD0 ;# ptr + .4byte 0x80141BE0 ;# ptr + .4byte 0x80141BF0 ;# ptr + .4byte 0x80141C90 ;# ptr + .4byte 0x80141CA0 ;# ptr + .4byte 0x80141CB0 ;# ptr + .4byte 0x80141DB0 ;# ptr + .4byte 0x80141E60 ;# ptr .global __vt__Q36nw4hbm2ut4Font __vt__Q36nw4hbm2ut4Font: - .incbin "baserom.dol", 0x4416E0, 0x58 + .4byte 0x80445570 + .4byte 0 + .4byte 0x8013D340 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/homebuttonLib/ut_TagProcessorBase.s b/asm/homebuttonLib/ut_TagProcessorBase.s index 30cf0ca3..b206db70 100644 --- a/asm/homebuttonLib/ut_TagProcessorBase.s +++ b/asm/homebuttonLib/ut_TagProcessorBase.s @@ -764,24 +764,38 @@ lbl_80142A14: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$24655 $$24655: - .incbin "baserom.dol", 0x40A3D0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1: - .incbin "baserom.dol", 0x441738, 0x14 + .4byte 0x80445678 + .4byte 0 + .4byte 0x801424F0 ;# ptr + .4byte 0x80142530 ;# ptr + .4byte 0x80142690 ;# ptr .global $$24426 $$24426: - .incbin "baserom.dol", 0x44174C, 0x2C + .asciz "nw4hbm::ut::TagProcessorBase" + .balign 4 + .4byte 0 .global __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1: - .incbin "baserom.dol", 0x441778, 0x8 + .4byte 0x8044564C + .4byte 0 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .incbin "baserom.dol", 0x441780, 0x14 + .4byte 0x804456B8 + .4byte 0 + .4byte 0x80141F90 ;# ptr + .4byte 0x80141FD0 ;# ptr + .4byte 0x80142130 ;# ptr .global $$24427 $$24427: - .incbin "baserom.dol", 0x441794, 0x24 + .asciz "nw4hbm::ut::TagProcessorBase" + .balign 4 .global __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .incbin "baserom.dol", 0x4417B8, 0x8 + .4byte 0x80445694 + .4byte 0 diff --git a/asm/homebuttonLib/ut_TextWriterBase.s b/asm/homebuttonLib/ut_TextWriterBase.s index 093269e6..d5c13f96 100644 --- a/asm/homebuttonLib/ut_TextWriterBase.s +++ b/asm/homebuttonLib/ut_TextWriterBase.s @@ -5831,26 +5831,29 @@ lbl_80147E8C: /* 80147EAC 00143CEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023D8, 0x4 + .4byte 0x80147E00 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27999 $$27999: - .incbin "baserom.dol", 0x40A3D8, 0x8 + .4byte 0 + .4byte 0 .global $$28011 $$28011: - .incbin "baserom.dol", 0x40A3E0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29160 $$29160: - .incbin "baserom.dol", 0x40A3E8, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0c$$1 mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0c$$1: - .incbin "baserom.dol", 0x4417C0, 0x4 + .4byte 0x00000100 .global mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0w$$1 mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0w$$1: - .incbin "baserom.dol", 0x4417C4, 0x4 + .4byte 0x00000100 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$25889 diff --git a/asm/ipc/ipcclt.s b/asm/ipc/ipcclt.s index 4a69c5af..8eb1bdc8 100644 --- a/asm/ipc/ipcclt.s +++ b/asm/ipc/ipcclt.s @@ -1929,10 +1929,10 @@ lbl_80050258: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __mailboxAck __mailboxAck: - .incbin "baserom.dol", 0x492B88, 0x4 + .4byte 0x00000001 .global hid hid: - .incbin "baserom.dol", 0x492B8C, 0x4 + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global __responses diff --git a/asm/kpad/KMPLS.s b/asm/kpad/KMPLS.s index 54806c56..970e73e7 100644 --- a/asm/kpad/KMPLS.s +++ b/asm/kpad/KMPLS.s @@ -2310,84 +2310,110 @@ KMPLSSetSamplingCallback: .section .data, "wa" # 0x80421040 - 0x80496700 .global mpls_assign_deg mpls_assign_deg: - .incbin "baserom.dol", 0x4360C8, 0x24 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 + .4byte 0x00000640 .global mpls_assign_ct mpls_assign_ct: - .incbin "baserom.dol", 0x4360EC, 0x24 + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF + .4byte 0x007FFFFF .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22647 $$22647: - .incbin "baserom.dol", 0x4993B0, 0x4 + .4byte 0 .global $$22648 $$22648: - .incbin "baserom.dol", 0x4993B4, 0x4 + .4byte 0x3F800000 .global $$22649 $$22649: - .incbin "baserom.dol", 0x4993B8, 0x8 + .4byte 0x3C23D70A + .4byte 0 .global $$22679 $$22679: - .incbin "baserom.dol", 0x4993C0, 0x8 + .4byte 0 + .4byte 0 .global $$22680 $$22680: - .incbin "baserom.dol", 0x4993C8, 0x8 + .4byte 0x3FF00000 + .4byte 0 .global $$22681 $$22681: - .incbin "baserom.dol", 0x4993D0, 0x8 + .4byte 0x40768000 + .4byte 0 .global $$22685 $$22685: - .incbin "baserom.dol", 0x4993D8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$22757 $$22757: - .incbin "baserom.dol", 0x4993E0, 0x4 + .4byte 0x3F000000 .global $$22758 $$22758: - .incbin "baserom.dol", 0x4993E4, 0x4 + .4byte 0x3CF5C28F .global $$22817 $$22817: - .incbin "baserom.dol", 0x4993E8, 0x4 + .4byte 0xBF800000 .global $$23075 $$23075: - .incbin "baserom.dol", 0x4993EC, 0x4 + .4byte 0xBE4CCCCD .global $$23076 $$23076: - .incbin "baserom.dol", 0x4993F0, 0x4 + .4byte 0x3E4CCCCD .global $$23077 $$23077: - .incbin "baserom.dol", 0x4993F4, 0x4 + .4byte 0x3F400000 .global $$23168 $$23168: - .incbin "baserom.dol", 0x4993F8, 0x4 + .4byte 0x3A83126F .global $$23197 $$23197: - .incbin "baserom.dol", 0x4993FC, 0x4 + .4byte 0x403FEF9E .global $$23230 $$23230: - .incbin "baserom.dol", 0x499400, 0x4 + .4byte 0x3EC489D2 .global $$23248 $$23248: - .incbin "baserom.dol", 0x499404, 0x4 + .4byte 0x38D1B717 .global $$23259 $$23259: - .incbin "baserom.dol", 0x499408, 0x8 + .4byte 0x40490000 + .4byte 0 .global $$23260 $$23260: - .incbin "baserom.dol", 0x499410, 0x8 + .4byte 0x3FB99999 + .4byte 0x9999999A .global $$23261 $$23261: - .incbin "baserom.dol", 0x499418, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$23463 $$23463: - .incbin "baserom.dol", 0x499420, 0x4 + .4byte 0x44BB8000 .global $$23464 $$23464: - .incbin "baserom.dol", 0x499424, 0x4 + .4byte 0x3F666666 .global $$23492 $$23492: - .incbin "baserom.dol", 0x499428, 0x8 + .4byte 0x40B47AE1 + .4byte 0x1EB851EC .global $$23563 $$23563: - .incbin "baserom.dol", 0x499430, 0x8 + .4byte 0x401921FB + .4byte 0x54442D18 .section .bss, "wa" # 0x80496700 - 0x805643FC .global kmpls diff --git a/asm/kpad/KPAD.s b/asm/kpad/KPAD.s index 9d05e9cf..f6bd8149 100644 --- a/asm/kpad/KPAD.s +++ b/asm/kpad/KPAD.s @@ -5734,200 +5734,244 @@ lbl_80070368: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21614 $$21614: - .incbin "baserom.dol", 0x436000, 0x48 + .asciz "<< RVL_SDK - KPAD \trelease build: Aug 23 2010 19:48:23 (0x4302_145) >>" + .balign 4 .global $$24805 $$24805: - .incbin "baserom.dol", 0x436048, 0x54 + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBDC ;# ptr + .4byte 0x8006BBE0 ;# ptr + .4byte 0x8006BBE0 ;# ptr .global $$2LOCAL$$2KPADiSamplingCallback__Fl$$2table $$2LOCAL$$2KPADiSamplingCallback__Fl$$2table: - .incbin "baserom.dol", 0x43609C, 0x2C + .4byte 0x00010302 + .4byte 0x00040105 + .4byte 0x00070108 + .4byte 0x000B010B + .4byte 0x000F010F + .4byte 0x000C000C + .4byte 0x000A000A + .4byte 0x00110111 + .4byte 0x00100110 + .4byte 0x00130013 + .4byte 0x00140014 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __KPADVersion __KPADVersion: - .incbin "baserom.dol", 0x492BE8, 0x4 + .4byte 0x80439F00 .global idist_org idist_org: - .incbin "baserom.dol", 0x492BEC, 0x4 + .4byte 0x3F800000 .global iaccXY_nrm_hori iaccXY_nrm_hori: - .incbin "baserom.dol", 0x492BF0, 0x4 + .4byte 0 .global lbl_80556814 lbl_80556814: - .incbin "baserom.dol", 0x492BF4, 0x4 + .4byte 0xBF800000 .global isec_nrm_hori isec_nrm_hori: - .incbin "baserom.dol", 0x492BF8, 0x4 + .4byte 0x3F800000 .global lbl_8055681C lbl_8055681C: - .incbin "baserom.dol", 0x492BFC, 0x4 + .4byte 0 .global kp_obj_interval kp_obj_interval: - .incbin "baserom.dol", 0x492C00, 0x4 + .4byte 0x3E4CCCCD .global kp_acc_horizon_pw kp_acc_horizon_pw: - .incbin "baserom.dol", 0x492C04, 0x4 + .4byte 0x3D4CCCCD .global kp_ah_circle_radius kp_ah_circle_radius: - .incbin "baserom.dol", 0x492C08, 0x4 + .4byte 0x3D8F5C29 .global kp_ah_circle_pw kp_ah_circle_pw: - .incbin "baserom.dol", 0x492C0C, 0x4 + .4byte 0x3D75C28F .global kp_ah_circle_ct kp_ah_circle_ct: - .incbin "baserom.dol", 0x492C10, 0x4 + .4byte 0x00640000 .global kp_err_outside_frame kp_err_outside_frame: - .incbin "baserom.dol", 0x492C14, 0x4 + .4byte 0x3D4CCCCD .global kp_err_dist_max kp_err_dist_max: - .incbin "baserom.dol", 0x492C18, 0x4 + .4byte 0x40400000 .global kp_err_dist_speed kp_err_dist_speed: - .incbin "baserom.dol", 0x492C1C, 0x4 + .4byte 0x3D23D70A .global kp_err_first_inpr kp_err_first_inpr: - .incbin "baserom.dol", 0x492C20, 0x4 + .4byte 0x3F666666 .global kp_err_next_inpr kp_err_next_inpr: - .incbin "baserom.dol", 0x492C24, 0x4 + .4byte 0x3F666666 .global kp_err_acc_inpr kp_err_acc_inpr: - .incbin "baserom.dol", 0x492C28, 0x4 + .4byte 0x3F666666 .global kp_err_up_inpr kp_err_up_inpr: - .incbin "baserom.dol", 0x492C2C, 0x4 + .4byte 0x3F333333 .global kp_err_near_pos kp_err_near_pos: - .incbin "baserom.dol", 0x492C30, 0x4 + .4byte 0x3DCCCCCD .global kp_fs_fstick_min kp_fs_fstick_min: - .incbin "baserom.dol", 0x492C34, 0x4 + .4byte 0x0000000F .global kp_fs_fstick_max kp_fs_fstick_max: - .incbin "baserom.dol", 0x492C38, 0x4 + .4byte 0x00000047 .global kp_cl_stick_min kp_cl_stick_min: - .incbin "baserom.dol", 0x492C3C, 0x4 + .4byte 0x0000003C .global kp_cl_stick_max kp_cl_stick_max: - .incbin "baserom.dol", 0x492C40, 0x4 + .4byte 0x00000134 .global kp_cl_trigger_min kp_cl_trigger_min: - .incbin "baserom.dol", 0x492C44, 0x4 + .4byte 0x0000001E .global kp_cl_trigger_max kp_cl_trigger_max: - .incbin "baserom.dol", 0x492C48, 0x4 + .4byte 0x000000B4 .global kp_rm_acc_max kp_rm_acc_max: - .incbin "baserom.dol", 0x492C4C, 0x4 + .4byte 0x4059999A .global kp_fs_acc_max kp_fs_acc_max: - .incbin "baserom.dol", 0x492C50, 0x4 + .4byte 0x40066666 .global kp_ex_trigger_max kp_ex_trigger_max: - .incbin "baserom.dol", 0x492C54, 0x4 + .4byte 0x00000100 .global kp_ex_analog_max kp_ex_analog_max: - .incbin "baserom.dol", 0x492C58, 0x4 + .4byte 0x00000400 .global kp_wbc_ave_count kp_wbc_ave_count: - .incbin "baserom.dol", 0x492C5C, 0x4 + .4byte 0x43C80000 .global kp_wbc_calib_count kp_wbc_calib_count: - .incbin "baserom.dol", 0x492C60, 0x4 + .4byte 0xC8000000 .global kp_wbc_stable_count kp_wbc_stable_count: - .incbin "baserom.dol", 0x492C64, 0x8 + .4byte 0x02020305 + .4byte 0x05050000 .global kp_fs_revise_deg kp_fs_revise_deg: - .incbin "baserom.dol", 0x492C6C, 0x4 + .4byte 0x41C00000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24535 $$24535: - .incbin "baserom.dol", 0x499310, 0x4 + .4byte 0 .global $$24536 $$24536: - .incbin "baserom.dol", 0x499314, 0x4 + .4byte 0x3F000000 .global $$24537 $$24537: - .incbin "baserom.dol", 0x499318, 0x4 + .4byte 0x43480000 .global $$24580 $$24580: - .incbin "baserom.dol", 0x49931C, 0x4 + .4byte 0xBF800000 .global $$24581 $$24581: - .incbin "baserom.dol", 0x499320, 0x4 + .4byte 0x3F800000 .global $$24582 $$24582: - .incbin "baserom.dol", 0x499324, 0x4 + .4byte 0xBF400000 .global $$24583 $$24583: - .incbin "baserom.dol", 0x499328, 0x4 + .4byte 0x3F400000 .global $$24712 $$24712: - .incbin "baserom.dol", 0x49932C, 0x4 + .4byte 0x40000000 .global $$24806 $$24806: - .incbin "baserom.dol", 0x499330, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$25024 $$25024: - .incbin "baserom.dol", 0x499338, 0x4 + .4byte 0x3B000000 .global $$25025 $$25025: - .incbin "baserom.dol", 0x49933C, 0x4 + .4byte 0x3F7FC000 .global $$25026 $$25026: - .incbin "baserom.dol", 0x499340, 0x8 + .4byte 0x3F3FC000 + .4byte 0 .global $$25391 $$25391: - .incbin "baserom.dol", 0x499348, 0x8 + .4byte 0x4062C000 + .4byte 0 .global $$25392 $$25392: - .incbin "baserom.dol", 0x499350, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 .global $$25393 $$25393: - .incbin "baserom.dol", 0x499358, 0x8 + .4byte 0x40410000 + .4byte 0 .global $$25394 $$25394: - .incbin "baserom.dol", 0x499360, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$25395 $$25395: - .incbin "baserom.dol", 0x499368, 0x8 + .4byte 0 + .4byte 0 .global $$25396 $$25396: - .incbin "baserom.dol", 0x499370, 0x8 + .4byte 0xBFF00000 + .4byte 0 .global $$25397 $$25397: - .incbin "baserom.dol", 0x499378, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$25403 $$25403: - .incbin "baserom.dol", 0x499380, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$25550 $$25550: - .incbin "baserom.dol", 0x499388, 0x8 + .4byte 0x3FD33333 + .4byte 0x33333333 .global $$25613 $$25613: - .incbin "baserom.dol", 0x499390, 0x4 + .4byte 0x3EC489D2 .global $$25614 $$25614: - .incbin "baserom.dol", 0x499394, 0x4 + .4byte 0x3C8EFA35 .global $$25799 $$25799: - .incbin "baserom.dol", 0x499398, 0x4 + .4byte 0x3BA3D70A .global $$25800 $$25800: - .incbin "baserom.dol", 0x49939C, 0x4 + .4byte 0x3C23D70A .global $$23159 $$23159: - .incbin "baserom.dol", 0x4993A0, 0x4 + .4byte 0x00010001 .global lbl_8055E864 lbl_8055E864: - .incbin "baserom.dol", 0x4993A4, 0x4 + .4byte 0x00010000 .global $$26007 $$26007: - .incbin "baserom.dol", 0x4993A8, 0x8 + .4byte 0xBE4CCCCD + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global inside_kpads diff --git a/asm/kpad/KZMplsTestSub.s b/asm/kpad/KZMplsTestSub.s index 27a9f58f..70578197 100644 --- a/asm/kpad/KZMplsTestSub.s +++ b/asm/kpad/KZMplsTestSub.s @@ -672,18 +672,27 @@ __KMPLS_linear_Direction: .section .data, "wa" # 0x80421040 - 0x80496700 .global e_dir e_dir: - .incbin "baserom.dol", 0x436110, 0x28 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22972 $$22972: - .incbin "baserom.dol", 0x499438, 0x4 + .4byte 0x3F000000 .global $$22973 $$22973: - .incbin "baserom.dol", 0x49943C, 0x4 + .4byte 0 .global $$22982 $$22982: - .incbin "baserom.dol", 0x499440, 0x4 + .4byte 0x3F800000 .global $$23054 $$23054: - .incbin "baserom.dol", 0x499444, 0x4 + .4byte 0x403FEF9E diff --git a/asm/libMobiclip/Bignum.s b/asm/libMobiclip/Bignum.s index d6729581..fdb93048 100644 --- a/asm/libMobiclip/Bignum.s +++ b/asm/libMobiclip/Bignum.s @@ -1056,4 +1056,67 @@ lbl_8014E078: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2BitsUsed__FUi$$2bits $$2LOCAL$$2BitsUsed__FUi$$2bits: - .incbin "baserom.dol", 0x40A450, 0x100 + .4byte 0x00010202 + .4byte 0x03030303 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 diff --git a/asm/libMobiclip/CodecFast.s b/asm/libMobiclip/CodecFast.s index 63189dc2..5c98777b 100644 --- a/asm/libMobiclip/CodecFast.s +++ b/asm/libMobiclip/CodecFast.s @@ -532,25 +532,361 @@ lbl_8014E830: .section .data, "wa" # 0x80421040 - 0x80496700 .global Apcm Apcm: - .incbin "baserom.dol", 0x443728, 0x400 + .4byte 0xFFE4FFEC + .4byte 0xFFF4FFFC + .4byte 0x0004000C + .4byte 0x0014001C + .4byte 0xFFC8FFD8 + .4byte 0xFFE8FFF8 + .4byte 0x00080018 + .4byte 0x00280038 + .4byte 0xFFACFFC4 + .4byte 0xFFDCFFF4 + .4byte 0x000C0024 + .4byte 0x003C0054 + .4byte 0xFF90FFB0 + .4byte 0xFFD0FFF0 + .4byte 0x00100030 + .4byte 0x00500070 + .4byte 0xFF74FF9C + .4byte 0xFFC4FFEC + .4byte 0x0014003C + .4byte 0x0064008C + .4byte 0xFF58FF88 + .4byte 0xFFB8FFE8 + .4byte 0x00180048 + .4byte 0x007800A8 + .4byte 0xFF3CFF74 + .4byte 0xFFACFFE4 + .4byte 0x001C0054 + .4byte 0x008C00C4 + .4byte 0xFF20FF60 + .4byte 0xFFA0FFE0 + .4byte 0x00200060 + .4byte 0x00A000E0 + .4byte 0xFF04FF4C + .4byte 0xFF94FFDC + .4byte 0x0024006C + .4byte 0x00B400FC + .4byte 0xFEE8FF38 + .4byte 0xFF88FFD8 + .4byte 0x00280078 + .4byte 0x00C80118 + .4byte 0xFECCFF24 + .4byte 0xFF7CFFD4 + .4byte 0x002C0084 + .4byte 0x00DC0134 + .4byte 0xFEB0FF10 + .4byte 0xFF70FFD0 + .4byte 0x00300090 + .4byte 0x00F00150 + .4byte 0xFE94FEFC + .4byte 0xFF64FFCC + .4byte 0x0034009C + .4byte 0x0104016C + .4byte 0xFE78FEE8 + .4byte 0xFF58FFC8 + .4byte 0x003800A8 + .4byte 0x01180188 + .4byte 0xFE5CFED4 + .4byte 0xFF4CFFC4 + .4byte 0x003C00B4 + .4byte 0x012C01A4 + .4byte 0xFE40FEC0 + .4byte 0xFF40FFC0 + .4byte 0x004000C0 + .4byte 0x014001C0 + .4byte 0xFE08FE98 + .4byte 0xFF28FFB8 + .4byte 0x004800D8 + .4byte 0x016801F8 + .4byte 0xFDD0FE70 + .4byte 0xFF10FFB0 + .4byte 0x005000F0 + .4byte 0x01900230 + .4byte 0xFD98FE48 + .4byte 0xFEF8FFA8 + .4byte 0x00580108 + .4byte 0x01B80268 + .4byte 0xFD60FE20 + .4byte 0xFEE0FFA0 + .4byte 0x00600120 + .4byte 0x01E002A0 + .4byte 0xFD28FDF8 + .4byte 0xFEC8FF98 + .4byte 0x00680138 + .4byte 0x020802D8 + .4byte 0xFCF0FDD0 + .4byte 0xFEB0FF90 + .4byte 0x00700150 + .4byte 0x02300310 + .4byte 0xFCB8FDA8 + .4byte 0xFE98FF88 + .4byte 0x00780168 + .4byte 0x02580348 + .4byte 0xFC80FD80 + .4byte 0xFE80FF80 + .4byte 0x00800180 + .4byte 0x02800380 + .4byte 0xFC10FD30 + .4byte 0xFE50FF70 + .4byte 0x009001B0 + .4byte 0x02D003F0 + .4byte 0xFBA0FCE0 + .4byte 0xFE20FF60 + .4byte 0x00A001E0 + .4byte 0x03200460 + .4byte 0xFB30FC90 + .4byte 0xFDF0FF50 + .4byte 0x00B00210 + .4byte 0x037004D0 + .4byte 0xFAC0FC40 + .4byte 0xFDC0FF40 + .4byte 0x00C00240 + .4byte 0x03C00540 + .4byte 0xFA50FBF0 + .4byte 0xFD90FF30 + .4byte 0x00D00270 + .4byte 0x041005B0 + .4byte 0xF9E0FBA0 + .4byte 0xFD60FF20 + .4byte 0x00E002A0 + .4byte 0x04600620 + .4byte 0xF970FB50 + .4byte 0xFD30FF10 + .4byte 0x00F002D0 + .4byte 0x04B00690 + .4byte 0xF900FB00 + .4byte 0xFD00FF00 + .4byte 0x01000300 + .4byte 0x05000700 + .4byte 0xF820FA60 + .4byte 0xFCA0FEE0 + .4byte 0x01200360 + .4byte 0x05A007E0 + .4byte 0xF740F9C0 + .4byte 0xFC40FEC0 + .4byte 0x014003C0 + .4byte 0x064008C0 + .4byte 0xF660F920 + .4byte 0xFBE0FEA0 + .4byte 0x01600420 + .4byte 0x06E009A0 + .4byte 0xF580F880 + .4byte 0xFB80FE80 + .4byte 0x01800480 + .4byte 0x07800A80 + .4byte 0xF4A0F7E0 + .4byte 0xFB20FE60 + .4byte 0x01A004E0 + .4byte 0x08200B60 + .4byte 0xF3C0F740 + .4byte 0xFAC0FE40 + .4byte 0x01C00540 + .4byte 0x08C00C40 + .4byte 0xF2E0F6A0 + .4byte 0xFA60FE20 + .4byte 0x01E005A0 + .4byte 0x09600D20 + .4byte 0xF200F600 + .4byte 0xFA00FE00 + .4byte 0x02000600 + .4byte 0x0A000E00 + .4byte 0xF040F4C0 + .4byte 0xF940FDC0 + .4byte 0x024006C0 + .4byte 0x0B400FC0 + .4byte 0xEE80F380 + .4byte 0xF880FD80 + .4byte 0x02800780 + .4byte 0x0C801180 + .4byte 0xECC0F240 + .4byte 0xF7C0FD40 + .4byte 0x02C00840 + .4byte 0x0DC01340 + .4byte 0xEB00F100 + .4byte 0xF700FD00 + .4byte 0x03000900 + .4byte 0x0F001500 + .4byte 0xE940EFC0 + .4byte 0xF640FCC0 + .4byte 0x034009C0 + .4byte 0x104016C0 + .4byte 0xE780EE80 + .4byte 0xF580FC80 + .4byte 0x03800A80 + .4byte 0x11801880 + .4byte 0xE5C0ED40 + .4byte 0xF4C0FC40 + .4byte 0x03C00B40 + .4byte 0x12C01A40 + .4byte 0xE400EC00 + .4byte 0xF400FC00 + .4byte 0x04000C00 + .4byte 0x14001C00 + .4byte 0xE081E981 + .4byte 0xF280FB80 + .4byte 0x04800D80 + .4byte 0x16801F80 + .4byte 0xDD01E701 + .4byte 0xF100FB00 + .4byte 0x05000F00 + .4byte 0x19002300 + .4byte 0xD981E481 + .4byte 0xEF80FA80 + .4byte 0x05801080 + .4byte 0x1B802680 + .4byte 0xD601E201 + .4byte 0xEE00FA00 + .4byte 0x06001200 + .4byte 0x1E002A00 + .4byte 0xD281DF81 + .4byte 0xEC80F980 + .4byte 0x06801380 + .4byte 0x20802D80 + .4byte 0xCF01DD01 + .4byte 0xEB00F900 + .4byte 0x07001500 + .4byte 0x23003100 + .4byte 0xCB81DA81 + .4byte 0xE980F880 + .4byte 0x07801680 + .4byte 0x25803480 + .4byte 0xC801D801 + .4byte 0xE800F800 + .4byte 0x08001800 + .4byte 0x28003800 + .4byte 0xC101D301 + .4byte 0xE500F700 + .4byte 0x09001B00 + .4byte 0x2CFF3EFF + .4byte 0xBA01CE01 + .4byte 0xE200F600 + .4byte 0x0A001E00 + .4byte 0x31FF45FF + .4byte 0xB301C901 + .4byte 0xDF00F500 + .4byte 0x0B002100 + .4byte 0x36FF4CFF + .4byte 0xAC01C401 + .4byte 0xDC00F400 + .4byte 0x0C002400 + .4byte 0x3BFF53FF + .4byte 0xA501BF01 + .4byte 0xD900F300 + .4byte 0x0D002700 + .4byte 0x40FF5AFF + .4byte 0x9E01BA01 + .4byte 0xD600F200 + .4byte 0x0E002A00 + .4byte 0x45FF61FF + .4byte 0x9701B501 + .4byte 0xD300F100 + .4byte 0x0F002D00 + .4byte 0x4AFF68FF + .4byte 0x9001B001 + .4byte 0xD000F000 + .4byte 0x10003000 + .4byte 0x4FFF6FFF .global Lar0 Lar0: - .incbin "baserom.dol", 0x443B28, 0x80 + .4byte 0x80678134 + .4byte 0x820082CD + .4byte 0x839A8467 + .4byte 0x85348600 + .4byte 0x88018B33 + .4byte 0x8E67919B + .4byte 0x94CD9801 + .4byte 0x9B339E67 + .4byte 0xA19BA4CD + .4byte 0xA801ACCC + .4byte 0xB334B998 + .4byte 0xC000C668 + .4byte 0xCCCCD334 + .4byte 0xD998E000 + .4byte 0xE668ECCC + .4byte 0xF334F998 + .4byte 0x00000668 + .4byte 0x0CCC1334 + .4byte 0x19982000 + .4byte 0x26682CCC + .4byte 0x33343998 + .4byte 0x40004668 + .4byte 0x4CCC5334 + .4byte 0x57FF5B33 + .4byte 0x5E676199 + .4byte 0x64CD67FF + .4byte 0x6B336E65 + .4byte 0x719974CD + .4byte 0x77FF7A00 + .4byte 0x7ACC7B99 + .asciz "|f}3~" + .byte 0x7E, 0xCC .global Lar2 Lar2: - .incbin "baserom.dol", 0x443BA8, 0x40 + .4byte 0x94CD9801 + .4byte 0x9B339E67 + .4byte 0xA19BA4CD + .4byte 0xA801ACCC + .4byte 0xB334B998 + .4byte 0xC000C668 + .4byte 0xCCCCD334 + .4byte 0xD998E000 + .4byte 0xE668ECCC + .4byte 0xF334F998 + .4byte 0x00000668 + .4byte 0x0CCC1334 + .4byte 0x19982000 + .4byte 0x26682CCC + .4byte 0x33343998 + .4byte 0x40004668 .global Lar3 Lar3: - .incbin "baserom.dol", 0x443BE8, 0x40 + .4byte 0xB998C000 + .4byte 0xC668CCCC + .4byte 0xD334D998 + .4byte 0xE000E668 + .4byte 0xECCCF334 + .4byte 0xF9980000 + .4byte 0x06680CCC + .4byte 0x13341998 + .4byte 0x20002668 + .4byte 0x2CCC3334 + .4byte 0x39984000 + .4byte 0x46684CCC + .4byte 0x533457FF + .4byte 0x5B335E67 + .4byte 0x619964CD + .4byte 0x67FF6B33 .global Lar4 Lar4: - .incbin "baserom.dol", 0x443C28, 0x20 + .4byte 0xB330BC94 + .4byte 0xC5F4CF58 + .4byte 0xD8BCE220 + .4byte 0xEB80F4E4 + .4byte 0xFE4807A8 + .4byte 0x110C1A70 + .4byte 0x23D42D34 + .4byte 0x36983FFC .global Lar5 Lar5: - .incbin "baserom.dol", 0x443C48, 0x20 + .4byte 0xD998E224 + .4byte 0xEAACF334 + .4byte 0xFBBC0444 + .4byte 0x0CCC1554 + .4byte 0x1DDC2668 + .4byte 0x2EF03778 + .4byte 0x40004888 + .4byte 0x511057FF .global Lar6 Lar6: - .incbin "baserom.dol", 0x443C68, 0x10 + .4byte 0xCCCCDC28 + .4byte 0xEB84FAE0 + .4byte 0x0A3C1998 + .4byte 0x28F4384C .global Lar7 Lar7: - .incbin "baserom.dol", 0x443C78, 0x10 + .4byte 0xE664F4E4 + .4byte 0x036811E8 + .4byte 0x20682EEC + .4byte 0x3D6C4BEC diff --git a/asm/libMobiclip/ImaAdpcm.s b/asm/libMobiclip/ImaAdpcm.s index a19c0f42..10ecd09e 100644 --- a/asm/libMobiclip/ImaAdpcm.s +++ b/asm/libMobiclip/ImaAdpcm.s @@ -165,7 +165,55 @@ lbl_8014ECF8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global g_Ima_Adpcm_StepTable g_Ima_Adpcm_StepTable: - .incbin "baserom.dol", 0x40A550, 0xB8 + .4byte 0x00070008 + .4byte 0x0009000A + .4byte 0x000B000C + .4byte 0x000D000E + .4byte 0x00100011 + .4byte 0x00130015 + .4byte 0x00170019 + .4byte 0x001C001F + .4byte 0x00220025 + .4byte 0x0029002D + .4byte 0x00320037 + .4byte 0x003C0042 + .4byte 0x00490050 + .4byte 0x00580061 + .4byte 0x006B0076 + .4byte 0x0082008F + .4byte 0x009D00AD + .4byte 0x00BE00D1 + .4byte 0x00E600FD + .4byte 0x01170133 + .4byte 0x01510173 + .4byte 0x019801C1 + .4byte 0x01EE0220 + .4byte 0x02560292 + .4byte 0x02D4031C + .4byte 0x036C03C3 + .4byte 0x0424048E + .4byte 0x05020583 + .4byte 0x061006AB + .4byte 0x07560812 + .4byte 0x08E009C3 + .4byte 0x0ABD0BD0 + .4byte 0x0CFF0E4C + .4byte 0x0FBA114C + .4byte 0x130714EE + .4byte 0x17061954 + .4byte 0x1BDC1EA5 + .4byte 0x21B62515 + .4byte 0x28CA2CDF + .4byte 0x315B364B + .4byte 0x3BB941B2 + .4byte 0x48444F7E + .4byte 0x5771602F + .4byte 0x69CE7462 + .4byte 0x7FFF0000 + .4byte 0 .global g_Ima_Adpcm_IndexTable g_Ima_Adpcm_IndexTable: - .incbin "baserom.dol", 0x40A608, 0x10 + .4byte 0xFFFFFFFF + .4byte 0x02040608 + .4byte 0xFFFFFFFF + .4byte 0x02040608 diff --git a/asm/libMobiclip/MoApi.s b/asm/libMobiclip/MoApi.s index e42a9945..752703c5 100644 --- a/asm/libMobiclip/MoApi.s +++ b/asm/libMobiclip/MoApi.s @@ -1089,69 +1089,95 @@ lbl_8014FAEC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22662 $$22662: - .incbin "baserom.dol", 0x443C88, 0x50 + .asciz "<< RVL_MWM - MOBICLIP_MO \trelease build: Dec 8 2011 09:50:37 (0x4302_188) >>" + .balign 4 .global $$23383 $$23383: - .incbin "baserom.dol", 0x443CD8, 0x20 + .asciz "[MOOpen] Null movie pointer\n" + .balign 4 .global $$23384 $$23384: - .incbin "baserom.dol", 0x443CF8, 0x1C + .asciz "[MOOpen] already opened\n" + .balign 4 .global $$23385 $$23385: - .incbin "baserom.dol", 0x443D14, 0x14 + .asciz "[MOOpen] failed\n" + .balign 4 .global $$23402 $$23402: - .incbin "baserom.dol", 0x443D28, 0x24 + .4byte 0x8014EF74 ;# ptr + .4byte 0x8014EF7C ;# ptr + .4byte 0x8014EF84 ;# ptr + .4byte 0x8014EF8C ;# ptr + .4byte 0x8014EF94 ;# ptr + .4byte 0x8014EF9C ;# ptr + .4byte 0x8014EFA4 ;# ptr + .4byte 0x8014EFB4 ;# ptr + .4byte 0x8014EFAC ;# ptr .global $$23409 $$23409: - .incbin "baserom.dol", 0x443D4C, 0x1C + .asciz "[MORun] movie not opened\n" + .balign 4 .global $$23410 $$23410: - .incbin "baserom.dol", 0x443D68, 0x18 + .asciz "[MORun] fatal error\n" + .balign 4 .global $$23417 $$23417: - .incbin "baserom.dol", 0x443D80, 0x20 + .asciz "[MOClose] movie was not opened\n" .global $$23425 $$23425: - .incbin "baserom.dol", 0x443DA0, 0x2C + .asciz "[MODestroyInstance] movie was not closed\n" + .balign 4 .global $$23509 $$23509: - .incbin "baserom.dol", 0x443DCC, 0x28 + .asciz "[MOGetYUVImage] movie was not opened\n" + .balign 4 .global $$23533 $$23533: - .incbin "baserom.dol", 0x443DF4, 0x28 + .asciz "[MOGetRGBImage] movie was not opened\n" + .balign 4 .global $$23546 $$23546: - .incbin "baserom.dol", 0x443E1C, 0x24 + .asciz "[MOSkipImage] movie was not opened\n" .global $$23582 $$23582: - .incbin "baserom.dol", 0x443E40, 0x2C + .asciz "[MOGetAudioPacket] movie was not opened\n" + .balign 4 .global $$23583 $$23583: - .incbin "baserom.dol", 0x443E6C, 0x30 + .asciz "[MOGetAudioPacket] failed, audio queue empty\n" + .balign 4 .global $$23584 $$23584: - .incbin "baserom.dol", 0x443E9C, 0x30 + .asciz "[MOGetAudioPacket] Given buffer is too small\n" + .balign 4 .global $$23585 $$23585: - .incbin "baserom.dol", 0x443ECC, 0x30 + .asciz "[MOGetAudioPacket] failed, audio queue empty\n" + .balign 4 .global $$23600 $$23600: - .incbin "baserom.dol", 0x443EFC, 0x2C + .asciz "[MOSkipAudioPacket] movie was not opened\n" + .balign 4 .global $$23601 $$23601: - .incbin "baserom.dol", 0x443F28, 0x30 + .asciz "[MOSkipAudioPacket] failed, audio queue empty\n" .global $$23614 $$23614: - .incbin "baserom.dol", 0x443F58, 0x34 + .asciz "[MOGetNextAudioPacketSize] movie was not opened\n" + .balign 4 .global $$23615 $$23615: - .incbin "baserom.dol", 0x443F8C, 0x3C + .asciz "[MOGetNextAudioPacketSize] failed, audio queue empty\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __MOBICLIP_MOVersion __MOBICLIP_MOVersion: - .incbin "baserom.dol", 0x492E90, 0x8 + .4byte 0x80447B88 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global MOiNbCreatedInstances diff --git a/asm/libMobiclip/MoDeblockWii.s b/asm/libMobiclip/MoDeblockWii.s index 7f094959..45f37dce 100644 --- a/asm/libMobiclip/MoDeblockWii.s +++ b/asm/libMobiclip/MoDeblockWii.s @@ -1365,15 +1365,183 @@ lbl_80150F10: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global clipTable clipTable: - .incbin "baserom.dol", 0x40A618, 0x180 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x08090A0B + .4byte 0x0C0D0E0F + .4byte 0x10111213 + .4byte 0x14151617 + .4byte 0x18191A1B + .4byte 0x1C1D1E1F + .4byte 0x20212223 + .4byte 0x24252627 + .4byte 0x28292A2B + .4byte 0x2C2D2E2F + .4byte 0x30313233 + .4byte 0x34353637 + .4byte 0x38393A3B + .4byte 0x3C3D3E3F + .4byte 0x40414243 + .4byte 0x44454647 + .4byte 0x48494A4B + .4byte 0x4C4D4E4F + .4byte 0x50515253 + .4byte 0x54555657 + .4byte 0x58595A5B + .4byte 0x5C5D5E5F + .4byte 0x60616263 + .4byte 0x64656667 + .4byte 0x68696A6B + .4byte 0x6C6D6E6F + .4byte 0x70717273 + .4byte 0x74757677 + .4byte 0x78797A7B + .4byte 0x7C7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959697 + .4byte 0x98999A9B + .4byte 0x9C9D9E9F + .4byte 0xA0A1A2A3 + .4byte 0xA4A5A6A7 + .4byte 0xA8A9AAAB + .4byte 0xACADAEAF + .4byte 0xB0B1B2B3 + .4byte 0xB4B5B6B7 + .4byte 0xB8B9BABB + .4byte 0xBCBDBEBF + .4byte 0xC0C1C2C3 + .4byte 0xC4C5C6C7 + .4byte 0xC8C9CACB + .4byte 0xCCCDCECF + .4byte 0xD0D1D2D3 + .4byte 0xD4D5D6D7 + .4byte 0xD8D9DADB + .4byte 0xDCDDDEDF + .4byte 0xE0E1E2E3 + .4byte 0xE4E5E6E7 + .4byte 0xE8E9EAEB + .4byte 0xECEDEEEF + .4byte 0xF0F1F2F3 + .4byte 0xF4F5F6F7 + .4byte 0xF8F9FAFB + .4byte 0xFCFDFEFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF .global Alpha Alpha: - .incbin "baserom.dol", 0x40A798, 0x94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000F + .4byte 0x00000011 + .4byte 0x00000013 + .4byte 0x00000016 + .4byte 0x00000019 + .4byte 0x0000001D + .4byte 0x00000021 + .4byte 0x00000026 + .4byte 0x0000002C + .4byte 0x00000032 + .4byte 0x00000039 + .4byte 0x00000042 + .4byte 0x0000004B + .4byte 0x00000056 + .4byte 0x00000062 + .4byte 0x00000070 + .4byte 0x00000080 + .4byte 0x00000093 + .4byte 0x000000A8 + .4byte 0x000000C0 + .4byte 0x000000DB + .4byte 0x000000FB + .4byte 0x000000FF .global Beta Beta: - .incbin "baserom.dol", 0x40A82C, 0x94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000E + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0x00000011 + .4byte 0x00000011 + .4byte 0x00000012 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global clip clip: - .incbin "baserom.dol", 0x492E98, 0x8 + .4byte 0x8040E558 + .4byte 0 diff --git a/asm/libMobiclip/MoSdk.s b/asm/libMobiclip/MoSdk.s index 89c598d8..445e76ca 100644 --- a/asm/libMobiclip/MoSdk.s +++ b/asm/libMobiclip/MoSdk.s @@ -850,84 +850,182 @@ lbl_80151AE8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23186 $$23186: - .incbin "baserom.dol", 0x443FC8, 0x1C + .asciz "[Sdk Open] Movie not found\n" .global $$23187 $$23187: - .incbin "baserom.dol", 0x443FE4, 0xC + .asciz "SDK_CLOSED" + .balign 4 .global $$23188 $$23188: - .incbin "baserom.dol", 0x443FF0, 0xC + .asciz "SDK_OPENING" .global $$23189 $$23189: - .incbin "baserom.dol", 0x443FFC, 0xC + .asciz "SDK_OPENED" + .balign 4 .global $$23190 $$23190: - .incbin "baserom.dol", 0x444008, 0x14 + .asciz "SDK_READING_HEADERS" .global $$23191 $$23191: - .incbin "baserom.dol", 0x44401C, 0xC + .asciz "SDK_READY" + .balign 4 .global $$23192 $$23192: - .incbin "baserom.dol", 0x444028, 0xC + .asciz "SDK_SEEKING" .global $$23193 $$23193: - .incbin "baserom.dol", 0x444034, 0x10 + .asciz "SDK_COMPLETE" + .balign 4 .global $$23194 $$23194: - .incbin "baserom.dol", 0x444044, 0xC + .asciz "SDK_ERROR" + .balign 4 .global $$23195 $$23195: - .incbin "baserom.dol", 0x444050, 0x10 + .asciz "unknown state" + .balign 4 .global $$23197 $$23197: - .incbin "baserom.dol", 0x444060, 0x10 + .asciz "[SDK] %s -> %s\n" .global $$23198 $$23198: - .incbin "baserom.dol", 0x444070, 0x30 + .asciz "[Sdk Open] Bad State after opening, cancelling\n" .global $$23199 $$23199: - .incbin "baserom.dol", 0x4440A0, 0x20 + .asciz "[Sdk Open] Not enough memory\n" + .balign 4 .global $$23200 $$23200: - .incbin "baserom.dol", 0x4440C0, 0x18 + .asciz "[Sdk Open] Fatal error\n" .global $$23205 $$23205: - .incbin "baserom.dol", 0x4440D8, 0x24 + .4byte 0x801512B4 ;# ptr + .4byte 0x801512BC ;# ptr + .4byte 0x801512C4 ;# ptr + .4byte 0x801512CC ;# ptr + .4byte 0x801512D4 ;# ptr + .4byte 0x801512DC ;# ptr + .4byte 0x801512E4 ;# ptr + .4byte 0x801512F4 ;# ptr + .4byte 0x801512EC ;# ptr .global $$23204 $$23204: - .incbin "baserom.dol", 0x4440FC, 0x24 + .4byte 0x80151154 ;# ptr + .4byte 0x8015115C ;# ptr + .4byte 0x80151164 ;# ptr + .4byte 0x8015116C ;# ptr + .4byte 0x80151174 ;# ptr + .4byte 0x8015117C ;# ptr + .4byte 0x80151184 ;# ptr + .4byte 0x80151194 ;# ptr + .4byte 0x8015118C ;# ptr .global $$23203 $$23203: - .incbin "baserom.dol", 0x444120, 0x24 + .4byte 0x801510BC ;# ptr + .4byte 0x801510C4 ;# ptr + .4byte 0x801510CC ;# ptr + .4byte 0x801510D4 ;# ptr + .4byte 0x801510DC ;# ptr + .4byte 0x801510E4 ;# ptr + .4byte 0x801510EC ;# ptr + .4byte 0x801510FC ;# ptr + .4byte 0x801510F4 ;# ptr .global $$23242 $$23242: - .incbin "baserom.dol", 0x444144, 0x24 + .4byte 0x801514E0 ;# ptr + .4byte 0x801514E8 ;# ptr + .4byte 0x801514F0 ;# ptr + .4byte 0x801514F8 ;# ptr + .4byte 0x80151500 ;# ptr + .4byte 0x80151508 ;# ptr + .4byte 0x80151510 ;# ptr + .4byte 0x80151520 ;# ptr + .4byte 0x80151518 ;# ptr .global $$23241 $$23241: - .incbin "baserom.dol", 0x444168, 0x24 + .4byte 0x8015143C ;# ptr + .4byte 0x80151444 ;# ptr + .4byte 0x8015144C ;# ptr + .4byte 0x80151454 ;# ptr + .4byte 0x8015145C ;# ptr + .4byte 0x80151464 ;# ptr + .4byte 0x8015146C ;# ptr + .4byte 0x8015147C ;# ptr + .4byte 0x80151474 ;# ptr .global $$23271 $$23271: - .incbin "baserom.dol", 0x44418C, 0x24 + .4byte 0x801516A0 ;# ptr + .4byte 0x801516A8 ;# ptr + .4byte 0x801516B0 ;# ptr + .4byte 0x801516B8 ;# ptr + .4byte 0x801516C0 ;# ptr + .4byte 0x801516C8 ;# ptr + .4byte 0x801516D0 ;# ptr + .4byte 0x801516E0 ;# ptr + .4byte 0x801516D8 ;# ptr .global $$23270 $$23270: - .incbin "baserom.dol", 0x4441B0, 0x24 + .4byte 0x801515FC ;# ptr + .4byte 0x80151604 ;# ptr + .4byte 0x8015160C ;# ptr + .4byte 0x80151614 ;# ptr + .4byte 0x8015161C ;# ptr + .4byte 0x80151624 ;# ptr + .4byte 0x8015162C ;# ptr + .4byte 0x8015163C ;# ptr + .4byte 0x80151634 ;# ptr .global $$23315 $$23315: - .incbin "baserom.dol", 0x4441D4, 0x18 + .asciz "[Sdk Close] Closing\n" + .balign 4 .global $$23317 $$23317: - .incbin "baserom.dol", 0x4441EC, 0x24 + .4byte 0x8015189C ;# ptr + .4byte 0x801518A4 ;# ptr + .4byte 0x801518AC ;# ptr + .4byte 0x801518B4 ;# ptr + .4byte 0x801518BC ;# ptr + .4byte 0x801518C4 ;# ptr + .4byte 0x801518CC ;# ptr + .4byte 0x801518DC ;# ptr + .4byte 0x801518D4 ;# ptr .global $$23329 $$23329: - .incbin "baserom.dol", 0x444210, 0x24 + .4byte 0x80151964 ;# ptr + .4byte 0x8015196C ;# ptr + .4byte 0x80151974 ;# ptr + .4byte 0x8015197C ;# ptr + .4byte 0x80151984 ;# ptr + .4byte 0x8015198C ;# ptr + .4byte 0x80151994 ;# ptr + .4byte 0x801519A4 ;# ptr + .4byte 0x8015199C ;# ptr .global $$23353 $$23353: - .incbin "baserom.dol", 0x444234, 0x24 + .4byte 0x80151A94 ;# ptr + .4byte 0x80151A9C ;# ptr + .4byte 0x80151AA4 ;# ptr + .4byte 0x80151AAC ;# ptr + .4byte 0x80151AB4 ;# ptr + .4byte 0x80151ABC ;# ptr + .4byte 0x80151AC4 ;# ptr + .4byte 0x80151AD4 ;# ptr + .4byte 0x80151ACC ;# ptr .global $$23352 $$23352: - .incbin "baserom.dol", 0x444258, 0x28 + .4byte 0x80151A20 ;# ptr + .4byte 0x80151A28 ;# ptr + .4byte 0x80151A30 ;# ptr + .4byte 0x80151A38 ;# ptr + .4byte 0x80151A40 ;# ptr + .4byte 0x80151A48 ;# ptr + .4byte 0x80151A50 ;# ptr + .4byte 0x80151A60 ;# ptr + .4byte 0x80151A58 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23196 $$23196: - .incbin "baserom.dol", 0x492EA0, 0x8 + .asciz "????" + .balign 4 diff --git a/asm/libMobiclip/MoSdkAdpcmDecoder.s b/asm/libMobiclip/MoSdkAdpcmDecoder.s index d2cc99e9..7cb2c4bf 100644 --- a/asm/libMobiclip/MoSdkAdpcmDecoder.s +++ b/asm/libMobiclip/MoSdkAdpcmDecoder.s @@ -237,24 +237,38 @@ lbl_80151E50: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22535 $$22535: - .incbin "baserom.dol", 0x444280, 0x24 + .asciz "[AudioDecoder] Wrong packet size!\n" + .balign 4 .global __vt__17MoSdkAdpcmDecoder __vt__17MoSdkAdpcmDecoder: - .incbin "baserom.dol", 0x4442A4, 0x1C + .4byte 0x80556AC8 + .4byte 0 + .4byte 0x80151C40 ;# ptr + .4byte 0x80151BE0 ;# ptr + .4byte 0x80151B70 ;# ptr + .4byte 0x801520C0 ;# ptr + .4byte 0x8014F970 ;# ptr .global $$22510 $$22510: - .incbin "baserom.dol", 0x4442C0, 0x14 + .asciz "MoSdkAdpcmDecoder" + .balign 4 .global $$22511 $$22511: - .incbin "baserom.dol", 0x4442D4, 0xC + .4byte 0x80556AD0 + .4byte 0 + .4byte 0 .global $$22512 $$22512: - .incbin "baserom.dol", 0x4442E0, 0x18 + .asciz "MoSdkAudioDecoder" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__17MoSdkAdpcmDecoder __RTTI__17MoSdkAdpcmDecoder: - .incbin "baserom.dol", 0x492EA8, 0x8 + .4byte 0x804481C0 + .4byte 0x804481D4 .global __RTTI__17MoSdkAudioDecoder __RTTI__17MoSdkAudioDecoder: - .incbin "baserom.dol", 0x492EB0, 0x8 + .4byte 0x804481E0 + .4byte 0 diff --git a/asm/libMobiclip/MoSdkAudioDecoder.s b/asm/libMobiclip/MoSdkAudioDecoder.s index 71c2ea55..4b138be8 100644 --- a/asm/libMobiclip/MoSdkAudioDecoder.s +++ b/asm/libMobiclip/MoSdkAudioDecoder.s @@ -269,13 +269,21 @@ lbl_801521CC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22532 $$22532: - .incbin "baserom.dol", 0x4442F8, 0x1C + .asciz "[AudioDecoder] Destroying\n" + .balign 4 .global $$22549 $$22549: - .incbin "baserom.dol", 0x444314, 0x1C + .asciz "[AudioDecoder] Decode error" .global $$22550 $$22550: - .incbin "baserom.dol", 0x444330, 0x24 + .asciz "[audioDecoder] Inconsistent size" + .balign 4 .global __vt__17MoSdkAudioDecoder __vt__17MoSdkAudioDecoder: - .incbin "baserom.dol", 0x444354, 0x1C + .4byte 0x80556AD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80152050 ;# ptr + .4byte 0x801520C0 ;# ptr + .4byte 0x8014F970 ;# ptr diff --git a/asm/libMobiclip/MoSdkFastAudioDecoder.s b/asm/libMobiclip/MoSdkFastAudioDecoder.s index d18ebb1f..22f6bda3 100644 --- a/asm/libMobiclip/MoSdkFastAudioDecoder.s +++ b/asm/libMobiclip/MoSdkFastAudioDecoder.s @@ -261,18 +261,30 @@ lbl_80152780: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22578 $$22578: - .incbin "baserom.dol", 0x444370, 0x24 + .asciz "[AudioDecoder] Wrong packet size!\n" + .balign 4 .global __vt__21MoSdkFastAudioDecoder __vt__21MoSdkFastAudioDecoder: - .incbin "baserom.dol", 0x444394, 0x1C + .4byte 0x80556AD8 + .4byte 0 + .4byte 0x801525A0 ;# ptr + .4byte 0x80152540 ;# ptr + .4byte 0x801524E0 ;# ptr + .4byte 0x801520C0 ;# ptr + .4byte 0x8014F970 ;# ptr .global $$22542 $$22542: - .incbin "baserom.dol", 0x4443B0, 0x18 + .asciz "MoSdkFastAudioDecoder" + .balign 4 .global $$22543 $$22543: - .incbin "baserom.dol", 0x4443C8, 0x10 + .4byte 0x80556AD0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__21MoSdkFastAudioDecoder __RTTI__21MoSdkFastAudioDecoder: - .incbin "baserom.dol", 0x492EB8, 0x8 + .4byte 0x804482B0 + .4byte 0x804482C8 diff --git a/asm/libMobiclip/MoSdkHeaders.s b/asm/libMobiclip/MoSdkHeaders.s index 59bde8bd..73246320 100644 --- a/asm/libMobiclip/MoSdkHeaders.s +++ b/asm/libMobiclip/MoSdkHeaders.s @@ -759,46 +759,137 @@ lbl_80153218: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global RootPublicKey RootPublicKey: - .incbin "baserom.dol", 0x40A8C0, 0xA0 + .4byte 0xAC0EE159 + .4byte 0xA92BAD58 + .4byte 0x8B526679 + .4byte 0x82D16C0B + .4byte 0x548F8CF3 + .4byte 0xC4846645 + .4byte 0x434331C4 + .4byte 0x364A7B72 + .4byte 0xDCF653C7 + .4byte 0x71DF947A + .4byte 0x605DB987 + .4byte 0x83D07BFA + .4byte 0x10E0F918 + .4byte 0xDD93AC02 + .4byte 0x0949E433 + .4byte 0x09C6FD66 + .4byte 0x7AF46541 + .4byte 0xA9C4D139 + .4byte 0xD430CB85 + .4byte 0x8106F337 + .4byte 0xD52ADCF3 + .4byte 0xA7775F8F + .4byte 0x778B4935 + .4byte 0xE8F6A998 + .4byte 0x07D15F10 + .4byte 0x329681C6 + .4byte 0xC1888910 + .4byte 0x38A5D79A + .4byte 0x1B9B99C5 + .4byte 0x09F2E97E + .4byte 0x336F2AD6 + .4byte 0x267E4322 + .4byte 0xDAA8CB93 + .4byte 0x2E5F60BF + .4byte 0x09566D2A + .4byte 0x0334F52E + .4byte 0xAF94ED2E + .4byte 0x50D1666C + .4byte 0x3D474255 + .4byte 0x8DD4051F .global RootPublicBarrett RootPublicBarrett: - .incbin "baserom.dol", 0x40A960, 0xA8 + .4byte 0x017CE500 + .4byte 0x466A8D6E + .4byte 0xFDD7DBB5 + .4byte 0x4AA6C060 + .4byte 0xE1C5F70D + .4byte 0x795AABE7 + .4byte 0x93B736B7 + .4byte 0xB4AF9558 + .4byte 0x86E4797C + .4byte 0x51F7BE38 + .4byte 0x09D20377 + .4byte 0x267A3FF7 + .4byte 0x57E97115 + .4byte 0x14561533 + .4byte 0xBD26A890 + .4byte 0x176AA3E4 + .4byte 0x62A17E64 + .4byte 0x14DBE0C8 + .4byte 0x2764AD44 + .4byte 0x5C6405BC + .4byte 0x1034F27D + .4byte 0x00D10C84 + .4byte 0x8BB92E90 + .4byte 0xBC449419 + .4byte 0xA9126E78 + .4byte 0x318DBAA3 + .4byte 0x04095D48 + .4byte 0x4ECE1DB2 + .4byte 0xD8563A9A + .4byte 0x9CCB41F6 + .4byte 0xB449A733 + .4byte 0xCACEABA5 + .4byte 0x606D7141 + .4byte 0x2E0D2AD6 + .4byte 0x1CA8CF60 + .4byte 0x9615B036 + .4byte 0x6D3A5919 + .4byte 0xE183A735 + .4byte 0x67F04D73 + .4byte 0x96177BB5 + .4byte 0xD3000000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23024 $$23024: - .incbin "baserom.dol", 0x4443D8, 0x30 + .asciz "[SDK] ReadingHeaderLoop need %d bytes, got %d\n" + .balign 4 .global $$23025 $$23025: - .incbin "baserom.dol", 0x444408, 0x2C + .asciz "[SDK] readingHeaderLoop, unhandled case\n" + .balign 4 .global $$23099 $$23099: - .incbin "baserom.dol", 0x444434, 0x24 + .asciz "[SDK] fps %f, total frame %d \n" + .balign 4 + .4byte 0 .global $$23101 $$23101: - .incbin "baserom.dol", 0x444458, 0x10 + .asciz "[SDK] %d x %d \n" .global $$23102 $$23102: - .incbin "baserom.dol", 0x444468, 0x1C + .asciz "[SDK] Found %d keyframes\n" + .balign 4 .global $$23136 $$23136: - .incbin "baserom.dol", 0x444484, 0x2C + .asciz "[SDK] FastAudio found %d Hz, %d Channels\n" + .balign 4 .global $$23137 $$23137: - .incbin "baserom.dol", 0x4444B0, 0x28 + .asciz "[SDK] ADPCM found %d Hz, %d Channels\n" + .balign 4 .global $$23138 $$23138: - .incbin "baserom.dol", 0x4444D8, 0x28 + .asciz "[SDK] PCM found %d Hz, %d Channels\n" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23098 $$23098: - .incbin "baserom.dol", 0x492EC0, 0x8 + .asciz "MOC5" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23100 $$23100: - .incbin "baserom.dol", 0x49A0D0, 0x8 + .4byte 0x3F700000 + .4byte 0 .global $$23105 $$23105: - .incbin "baserom.dol", 0x49A0D8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libMobiclip/MoSdkInput.s b/asm/libMobiclip/MoSdkInput.s index e12eb3ef..9d6f9175 100644 --- a/asm/libMobiclip/MoSdkInput.s +++ b/asm/libMobiclip/MoSdkInput.s @@ -359,19 +359,24 @@ jumpTo__10MoSdkInputFUl: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22549 $$22549: - .incbin "baserom.dol", 0x444500, 0x1C + .asciz "%s line %d : %s failed!\n" + .balign 4 .global $$22550 $$22550: - .incbin "baserom.dol", 0x44451C, 0x14 + .asciz "MoSdkInput.cpp" + .balign 4 + .4byte 0 .global $$22551 $$22551: - .incbin "baserom.dol", 0x444530, 0x18 + .asciz "indexWrite-indexRead>=4" .global $$22555 $$22555: - .incbin "baserom.dol", 0x444548, 0x18 + .asciz "indexWrite-indexRead>=2" .global $$22559 $$22559: - .incbin "baserom.dol", 0x444560, 0x18 + .asciz "indexWrite-indexRead>=1" .global $$22563 $$22563: - .incbin "baserom.dol", 0x444578, 0x20 + .asciz "indexWrite-indexRead>=len" + .balign 4 + .4byte 0 diff --git a/asm/libMobiclip/MoSdkMem.s b/asm/libMobiclip/MoSdkMem.s index a632da21..401ab289 100644 --- a/asm/libMobiclip/MoSdkMem.s +++ b/asm/libMobiclip/MoSdkMem.s @@ -97,7 +97,8 @@ lbl_801537F4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22435 $$22435: - .incbin "baserom.dol", 0x444598, 0x18 + .asciz "Heap not initialized\n" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global MOiAllocator diff --git a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s index 236ca4c7..f92bb7bd 100644 --- a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s +++ b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s @@ -108,15 +108,26 @@ lbl_80153980: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__26MoSdkPcmPassthroughDecoder __vt__26MoSdkPcmPassthroughDecoder: - .incbin "baserom.dol", 0x4445B0, 0x1C + .4byte 0x80556AE8 + .4byte 0 + .4byte 0x80153890 ;# ptr + .4byte 0x80153880 ;# ptr + .4byte 0x80153870 ;# ptr + .4byte 0x801520C0 ;# ptr + .4byte 0x8014F970 ;# ptr .global $$22523 $$22523: - .incbin "baserom.dol", 0x4445CC, 0x1C + .asciz "MoSdkPcmPassthroughDecoder" + .balign 4 .global $$22524 $$22524: - .incbin "baserom.dol", 0x4445E8, 0x10 + .4byte 0x80556AD0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__26MoSdkPcmPassthroughDecoder __RTTI__26MoSdkPcmPassthroughDecoder: - .incbin "baserom.dol", 0x492EC8, 0x8 + .4byte 0x804484CC + .4byte 0x804484E8 diff --git a/asm/libMobiclip/MoSdkVideoDecoder.s b/asm/libMobiclip/MoSdkVideoDecoder.s index 38cfb57b..b10f5668 100644 --- a/asm/libMobiclip/MoSdkVideoDecoder.s +++ b/asm/libMobiclip/MoSdkVideoDecoder.s @@ -364,22 +364,27 @@ VX2_Free__FPv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22798 $$22798: - .incbin "baserom.dol", 0x4445F8, 0x1C + .asciz "[VideoDecoder] Destroying\n" + .balign 4 .global $$22814 $$22814: - .incbin "baserom.dol", 0x444614, 0x1C + .asciz "[Decoder] Queue too small\n" + .balign 4 .global $$22815 $$22815: - .incbin "baserom.dol", 0x444630, 0x28 + .asciz "[VideoDecoder] Cannot initialize codec" + .balign 4 .global $$22824 $$22824: - .incbin "baserom.dol", 0x444658, 0x24 + .asciz "[decodeImage] Output queue full\n" + .balign 4 .global $$22825 $$22825: - .incbin "baserom.dol", 0x44467C, 0x1C + .asciz "[decodeImage] decode error\n" .global $$22834 $$22834: - .incbin "baserom.dol", 0x444698, 0x1C + .asciz "[VideoDecoder] Queue empty\n" .global $$22842 $$22842: - .incbin "baserom.dol", 0x4446B4, 0x24 + .asciz "[VideoDecoder] Skip:Queue empty\n" + .balign 4 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x16.s b/asm/libMobiclip/VX2_DecodeBlock16x16.s index e104e6e3..bd6b5b29 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x16.s @@ -898,10 +898,91 @@ lbl_801551A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x16 VX2CommandTable16x16: - .incbin "baserom.dol", 0x40AA08, 0x28 + .4byte 0x80154460 ;# ptr + .4byte 0x801545A0 ;# ptr + .4byte 0x801547C0 ;# ptr + .4byte 0x801549E0 ;# ptr + .4byte 0x80154C00 ;# ptr + .4byte 0x80154E20 ;# ptr + .4byte 0x80162610 ;# ptr + .4byte 0x80161CD0 ;# ptr + .4byte 0x80155040 ;# ptr + .4byte 0x801550D0 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AA30, 0x100 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AB30, 0x28 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x2.s b/asm/libMobiclip/VX2_DecodeBlock16x2.s index fe351d90..95eab22a 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x2.s @@ -855,10 +855,43 @@ lbl_80155E68: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x2 VX2CommandTable16x2: - .incbin "baserom.dol", 0x40AB58, 0x28 + .4byte 0x801551C0 ;# ptr + .4byte 0x801552F0 ;# ptr + .4byte 0x80155510 ;# ptr + .4byte 0x80155730 ;# ptr + .4byte 0x80155950 ;# ptr + .4byte 0x80155B70 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80155D90 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AB80, 0x40 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000003 .global $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40ABC0, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x4.s b/asm/libMobiclip/VX2_DecodeBlock16x4.s index 2ab1f450..3a29fd3f 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x4.s @@ -890,10 +890,43 @@ lbl_80156BA8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x4 VX2CommandTable16x4: - .incbin "baserom.dol", 0x40ABE8, 0x28 + .4byte 0x80155E80 ;# ptr + .4byte 0x80155FB0 ;# ptr + .4byte 0x801561D0 ;# ptr + .4byte 0x801563F0 ;# ptr + .4byte 0x80156610 ;# ptr + .4byte 0x80156830 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80156A50 ;# ptr + .4byte 0x80156AD0 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AC10, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AC50, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000003 + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x8.s b/asm/libMobiclip/VX2_DecodeBlock16x8.s index 284504d1..4de154c5 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x8.s @@ -890,10 +890,59 @@ lbl_801578E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x8 VX2CommandTable16x8: - .incbin "baserom.dol", 0x40AC78, 0x28 + .4byte 0x80156BC0 ;# ptr + .4byte 0x80156CF0 ;# ptr + .4byte 0x80156F10 ;# ptr + .4byte 0x80157130 ;# ptr + .4byte 0x80157350 ;# ptr + .4byte 0x80157570 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80157790 ;# ptr + .4byte 0x80157810 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40ACA0, 0x80 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AD20, 0x28 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0x00000003 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x16.s b/asm/libMobiclip/VX2_DecodeBlock2x16.s index a9ee342c..d126dbb8 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x16.s @@ -859,10 +859,43 @@ lbl_801585B8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x16 VX2CommandTable2x16: - .incbin "baserom.dol", 0x40AD48, 0x28 + .4byte 0x80157900 ;# ptr + .4byte 0x80157A30 ;# ptr + .4byte 0x80157C50 ;# ptr + .4byte 0x80157E70 ;# ptr + .4byte 0x80158090 ;# ptr + .4byte 0x801582B0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x801584D0 ;# ptr + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AD70, 0x40 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0 + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40ADB0, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0xFFFFFFFF diff --git a/asm/libMobiclip/VX2_DecodeBlock2x2.s b/asm/libMobiclip/VX2_DecodeBlock2x2.s index bf34bdb1..7bdfd256 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x2.s @@ -824,10 +824,35 @@ lbl_80159208: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x2 VX2CommandTable2x2: - .incbin "baserom.dol", 0x40ADD8, 0x28 + .4byte 0x801585D0 ;# ptr + .4byte 0x80158700 ;# ptr + .4byte 0x80158920 ;# ptr + .4byte 0x80158B40 ;# ptr + .4byte 0x80158D60 ;# ptr + .4byte 0x80158F80 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x2__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AE00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter2x2__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter2x2__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AE20, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF diff --git a/asm/libMobiclip/VX2_DecodeBlock2x4.s b/asm/libMobiclip/VX2_DecodeBlock2x4.s index fee32a3a..4972d5e3 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x4.s @@ -859,10 +859,43 @@ lbl_80159ED8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x4 VX2CommandTable2x4: - .incbin "baserom.dol", 0x40AE48, 0x28 + .4byte 0x80159220 ;# ptr + .4byte 0x80159350 ;# ptr + .4byte 0x80159570 ;# ptr + .4byte 0x80159790 ;# ptr + .4byte 0x801599B0 ;# ptr + .4byte 0x80159BD0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80159DF0 ;# ptr + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AE70, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AEB0, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0xFFFFFFFF diff --git a/asm/libMobiclip/VX2_DecodeBlock2x8.s b/asm/libMobiclip/VX2_DecodeBlock2x8.s index 30905f06..631a0ae0 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x8.s @@ -859,10 +859,43 @@ lbl_8015ABA8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x8 VX2CommandTable2x8: - .incbin "baserom.dol", 0x40AED8, 0x28 + .4byte 0x80159EF0 ;# ptr + .4byte 0x8015A020 ;# ptr + .4byte 0x8015A240 ;# ptr + .4byte 0x8015A460 ;# ptr + .4byte 0x8015A680 ;# ptr + .4byte 0x8015A8A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8015AAC0 ;# ptr + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AF00, 0x40 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000003 .global $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AF40, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0xFFFFFFFF diff --git a/asm/libMobiclip/VX2_DecodeBlock4x16.s b/asm/libMobiclip/VX2_DecodeBlock4x16.s index 6a742c03..e5271c6c 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x16.s @@ -890,10 +890,43 @@ lbl_8015B8E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x16 VX2CommandTable4x16: - .incbin "baserom.dol", 0x40AF68, 0x28 + .4byte 0x8015ABC0 ;# ptr + .4byte 0x8015ACF0 ;# ptr + .4byte 0x8015AF10 ;# ptr + .4byte 0x8015B130 ;# ptr + .4byte 0x8015B350 ;# ptr + .4byte 0x8015B570 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8015B790 ;# ptr + .4byte 0x8015B810 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40AF90, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40AFD0, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0x00000003 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x2.s b/asm/libMobiclip/VX2_DecodeBlock4x2.s index 0d8b3b11..cfd9e585 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x2.s @@ -855,10 +855,43 @@ lbl_8015C5A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x2 VX2CommandTable4x2: - .incbin "baserom.dol", 0x40AFF8, 0x28 + .4byte 0x8015B900 ;# ptr + .4byte 0x8015BA30 ;# ptr + .4byte 0x8015BC50 ;# ptr + .4byte 0x8015BE70 ;# ptr + .4byte 0x8015C090 ;# ptr + .4byte 0x8015C2B0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8015C4D0 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B020, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B060, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x4.s b/asm/libMobiclip/VX2_DecodeBlock4x4.s index e18ad74b..125f44df 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x4.s @@ -890,10 +890,43 @@ lbl_8015D2E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x4 VX2CommandTable4x4: - .incbin "baserom.dol", 0x40B088, 0x28 + .4byte 0x8015C5C0 ;# ptr + .4byte 0x8015C6F0 ;# ptr + .4byte 0x8015C910 ;# ptr + .4byte 0x8015CB30 ;# ptr + .4byte 0x8015CD50 ;# ptr + .4byte 0x8015CF70 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8015D190 ;# ptr + .4byte 0x8015D210 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B0B0, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B0F0, 0x28 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x8.s b/asm/libMobiclip/VX2_DecodeBlock4x8.s index bf8099e6..63776342 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x8.s @@ -890,10 +890,59 @@ lbl_8015E028: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x8 VX2CommandTable4x8: - .incbin "baserom.dol", 0x40B118, 0x28 + .4byte 0x8015D300 ;# ptr + .4byte 0x8015D430 ;# ptr + .4byte 0x8015D650 ;# ptr + .4byte 0x8015D870 ;# ptr + .4byte 0x8015DA90 ;# ptr + .4byte 0x8015DCB0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8015DED0 ;# ptr + .4byte 0x8015DF50 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B140, 0x80 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000004 .global $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B1C0, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x16.s b/asm/libMobiclip/VX2_DecodeBlock8x16.s index 565f2304..7d3b3b20 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x16.s @@ -890,10 +890,59 @@ lbl_8015ED68: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x16 VX2CommandTable8x16: - .incbin "baserom.dol", 0x40B1E8, 0x28 + .4byte 0x8015E040 ;# ptr + .4byte 0x8015E170 ;# ptr + .4byte 0x8015E390 ;# ptr + .4byte 0x8015E5B0 ;# ptr + .4byte 0x8015E7D0 ;# ptr + .4byte 0x8015E9F0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8015EC10 ;# ptr + .4byte 0x8015EC90 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B210, 0x80 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B290, 0x28 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000003 + .4byte 0x00000002 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x2.s b/asm/libMobiclip/VX2_DecodeBlock8x2.s index bcaf368a..10c39368 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x2.s @@ -855,10 +855,43 @@ lbl_8015FA28: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x2 VX2CommandTable8x2: - .incbin "baserom.dol", 0x40B2B8, 0x28 + .4byte 0x8015ED80 ;# ptr + .4byte 0x8015EEB0 ;# ptr + .4byte 0x8015F0D0 ;# ptr + .4byte 0x8015F2F0 ;# ptr + .4byte 0x8015F510 ;# ptr + .4byte 0x8015F730 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8015F950 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B2E0, 0x40 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000009 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000003 .global $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B320, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x4.s b/asm/libMobiclip/VX2_DecodeBlock8x4.s index d42f975b..38ffcf1a 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x4.s @@ -890,10 +890,59 @@ lbl_80160768: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x4 VX2CommandTable8x4: - .incbin "baserom.dol", 0x40B348, 0x28 + .4byte 0x8015FA40 ;# ptr + .4byte 0x8015FB70 ;# ptr + .4byte 0x8015FD90 ;# ptr + .4byte 0x8015FFB0 ;# ptr + .4byte 0x801601D0 ;# ptr + .4byte 0x801603F0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80160610 ;# ptr + .4byte 0x80160690 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B370, 0x80 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000004 .global $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B3F0, 0x28 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0x00000004 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x8.s b/asm/libMobiclip/VX2_DecodeBlock8x8.s index 524194f5..1183a3bb 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x8.s @@ -890,10 +890,43 @@ lbl_801614A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x8 VX2CommandTable8x8: - .incbin "baserom.dol", 0x40B418, 0x28 + .4byte 0x80160780 ;# ptr + .4byte 0x801608B0 ;# ptr + .4byte 0x80160AD0 ;# ptr + .4byte 0x80160CF0 ;# ptr + .4byte 0x80160F10 ;# ptr + .4byte 0x80161130 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80161350 ;# ptr + .4byte 0x801613D0 ;# ptr .global $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2command: - .incbin "baserom.dol", 0x40B440, 0x40 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 .global $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2size$$20 $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2size$$20: - .incbin "baserom.dol", 0x40B480, 0x28 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000003 + .4byte 0x00000003 diff --git a/asm/libMobiclip/VX2_DecodeIntra.s b/asm/libMobiclip/VX2_DecodeIntra.s index d6633b39..7c01d818 100644 --- a/asm/libMobiclip/VX2_DecodeIntra.s +++ b/asm/libMobiclip/VX2_DecodeIntra.s @@ -2087,10 +2087,170 @@ VX2InitIntra__FR14VX2DecoderData: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvCbpTable InvCbpTable: - .incbin "baserom.dol", 0x40B4A8, 0x200 + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003F + .4byte 0x0000000F + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000001B + .4byte 0x0000000D + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x0000000C + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x0000000A + .4byte 0x0000001E + .4byte 0x00000005 + .4byte 0x00000010 + .4byte 0x0000002F + .4byte 0x00000037 + .4byte 0x0000003B + .4byte 0x00000013 + .4byte 0x0000003D + .4byte 0x0000003E + .4byte 0x00000009 + .4byte 0x0000001C + .4byte 0x00000006 + .4byte 0x00000015 + .4byte 0x0000001A + .4byte 0x00000033 + .4byte 0x00000011 + .4byte 0x00000012 + .4byte 0x00000014 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x0000003C + .4byte 0x00000035 + .4byte 0x00000019 + .4byte 0x00000016 + .4byte 0x0000003A + .4byte 0x00000030 + .4byte 0x00000031 + .4byte 0x00000032 + .4byte 0x00000027 + .4byte 0x00000034 + .4byte 0x0000002B + .4byte 0x0000002D + .4byte 0x00000039 + .4byte 0x00000038 + .4byte 0x00000023 + .4byte 0x00000036 + .4byte 0x0000002E + .4byte 0x00000021 + .4byte 0x00000025 + .4byte 0x00000022 + .4byte 0x00000024 + .4byte 0x0000002C + .4byte 0x0000002A + .4byte 0x00000028 + .4byte 0x00000029 + .4byte 0x00000026 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x0000000C + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x00000007 + .4byte 0x0000000E + .4byte 0x0000000B + .4byte 0x0000001F + .4byte 0x00000009 + .4byte 0x00000006 + .4byte 0x00000010 + .4byte 0x0000003F + .4byte 0x0000001E + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x0000001B + .4byte 0x0000001C + .4byte 0x00000013 + .4byte 0x00000018 + .4byte 0x0000001A + .4byte 0x00000012 + .4byte 0x00000011 + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000020 + .4byte 0x0000002F + .4byte 0x00000016 + .4byte 0x00000019 + .4byte 0x00000037 + .4byte 0x0000003D + .4byte 0x0000003E + .4byte 0x0000003B + .4byte 0x0000003C + .4byte 0x00000033 + .4byte 0x00000035 + .4byte 0x00000021 + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x00000028 + .4byte 0x00000023 + .4byte 0x0000002C + .4byte 0x00000030 + .4byte 0x00000027 + .4byte 0x0000002D + .4byte 0x00000025 + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x0000002E + .4byte 0x0000002A + .4byte 0x00000031 + .4byte 0x00000034 + .4byte 0x00000038 + .4byte 0x00000032 + .4byte 0x00000029 + .4byte 0x00000026 + .4byte 0x00000039 + .4byte 0x00000036 .global InvSbpTable InvSbpTable: - .incbin "baserom.dol", 0x40B6A8, 0x88 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000010 + .4byte 0x00000018 + .4byte 0x00000006 + .4byte 0x00000016 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000000E + .4byte 0x00000014 + .4byte 0x0000000A + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x00000010 + .4byte 0x00000004 + .4byte 0x00000018 + .4byte 0x00000006 + .4byte 0x0000000A + .4byte 0x00000014 + .4byte 0x0000001E + .4byte 0x0000000E + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x00000016 + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global Intra8ModeTable diff --git a/asm/libMobiclip/VX2_Decoder.s b/asm/libMobiclip/VX2_Decoder.s index 068940d2..79238990 100644 --- a/asm/libMobiclip/VX2_Decoder.s +++ b/asm/libMobiclip/VX2_Decoder.s @@ -824,27 +824,14805 @@ VX2DecoderGetQuantizer__FR14VX2DecoderData: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvVlc InvVlc: - .incbin "baserom.dol", 0x40B730, 0x9D4 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x822C822C + .4byte 0x803C803C + .4byte 0x00BC00BC + .4byte 0x00AC00AC + .4byte 0xB81BB81B + .4byte 0xB81BB81B + .4byte 0xB61BB61B + .4byte 0xB61BB61B + .4byte 0xB41BB41B + .4byte 0xB41BB41B + .4byte 0xB21BB21B + .4byte 0xB21BB21B + .4byte 0x122B122B + .4byte 0x122B122B + .4byte 0x102B102B + .4byte 0x102B102B + .4byte 0x0E2B0E2B + .4byte 0x0E2B0E2B + .4byte 0x0C2B0C2B + .4byte 0x0C2B0C2B + .4byte 0x0A2B0A2B + .4byte 0x0A2B0A2B + .4byte 0x063B063B + .4byte 0x063B063B + .4byte 0x043B043B + .4byte 0x043B043B + .4byte 0x024B024B + .4byte 0x024B024B + .4byte 0x00CC00CC + .4byte 0x025C025C + .4byte 0x2E1C2E1C + .4byte 0x301C301C + .4byte 0xBA1CBA1C + .4byte 0xBC1CBC1C + .4byte 0xBE1CBE1C + .4byte 0xC01CC01C + .4byte 0x026D044D + .4byte 0x083D0A3D + .4byte 0x0C3D142D + .4byte 0x321D341D + .4byte 0xC21DC41D + .4byte 0xC61DC81D + .4byte 0xCA1DCC1D + .4byte 0xCE1DD01D + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x009B009B + .4byte 0x009B009B + .4byte 0x008B008B + .4byte 0x008B008B + .4byte 0xB01AB01A + .4byte 0xB01AB01A + .4byte 0xB01AB01A + .4byte 0xB01AB01A + .4byte 0xAE1AAE1A + .4byte 0xAE1AAE1A + .4byte 0xAE1AAE1A + .4byte 0xAE1AAE1A + .4byte 0xAC1AAC1A + .4byte 0xAC1AAC1A + .4byte 0xAC1AAC1A + .4byte 0xAC1AAC1A + .4byte 0xAA1AAA1A + .4byte 0xAA1AAA1A + .4byte 0xAA1AAA1A + .4byte 0xAA1AAA1A + .4byte 0xA81AA81A + .4byte 0xA81AA81A + .4byte 0xA81AA81A + .4byte 0xA81AA81A + .4byte 0xA61AA61A + .4byte 0xA61AA61A + .4byte 0xA61AA61A + .4byte 0xA61AA61A + .4byte 0xA41AA41A + .4byte 0xA41AA41A + .4byte 0xA41AA41A + .4byte 0xA41AA41A + .4byte 0xA21AA21A + .4byte 0xA21AA21A + .4byte 0xA21AA21A + .4byte 0xA21AA21A + .4byte 0x802A802A ;# ptr + .4byte 0x802A802A ;# ptr + .4byte 0x802A802A ;# ptr + .4byte 0x802A802A ;# ptr + .4byte 0x2C1A2C1A + .4byte 0x2C1A2C1A + .4byte 0x2C1A2C1A + .4byte 0x2C1A2C1A + .4byte 0x2A1A2A1A + .4byte 0x2A1A2A1A + .4byte 0x2A1A2A1A + .4byte 0x2A1A2A1A + .4byte 0x281A281A + .4byte 0x281A281A + .4byte 0x281A281A + .4byte 0x281A281A + .4byte 0x261A261A + .4byte 0x261A261A + .4byte 0x261A261A + .4byte 0x261A261A + .4byte 0x241A241A + .4byte 0x241A241A + .4byte 0x241A241A + .4byte 0x241A241A + .4byte 0x221A221A + .4byte 0x221A221A + .4byte 0x221A221A + .4byte 0x221A221A + .4byte 0x201A201A + .4byte 0x201A201A + .4byte 0x201A201A + .4byte 0x201A201A + .4byte 0x1E1A1E1A + .4byte 0x1E1A1E1A + .4byte 0x1E1A1E1A + .4byte 0x1E1A1E1A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x062A062A + .4byte 0x062A062A + .4byte 0x062A062A + .4byte 0x062A062A + .4byte 0x007A007A + .4byte 0x007A007A + .4byte 0x007A007A + .4byte 0x007A007A + .4byte 0x006A006A + .4byte 0x006A006A + .4byte 0x006A006A + .4byte 0x006A006A + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0xA019A019 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9E199E19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9C199C19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x9A199A19 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x98199819 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x96199619 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x94199419 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1C191C19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x1A191A19 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x04290429 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x02390239 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x00590059 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x90189018 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8E188E18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8C188C18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x16181618 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x14181418 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x00480048 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x88178817 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x86178617 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x12171217 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x10171017 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0E170E17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 .global lbl_80410004 lbl_80410004: - .incbin "baserom.dol", 0x40C104, 0x362C + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x0C170C17 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x00370037 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x0A160A16 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x08160816 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x06160616 + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x02140214 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x04150415 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00250025 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x807C807C + .4byte 0x806C806C + .4byte 0x016C016C + .4byte 0x015C015C + .4byte 0x842B842B + .4byte 0x842B842B + .4byte 0x823B823B + .4byte 0x823B823B + .4byte 0x805B805B + .4byte 0x805B805B + .4byte 0x1A1B1A1B + .4byte 0x1A1B1A1B + .4byte 0x0A3B0A3B + .4byte 0x0A3B0A3B + .4byte 0x102B102B + .4byte 0x102B102B + .4byte 0x083B083B + .4byte 0x083B083B + .4byte 0x064B064B + .4byte 0x064B064B + .4byte 0x044B044B + .4byte 0x044B044B + .4byte 0x027B027B + .4byte 0x027B027B + .4byte 0x014B014B + .4byte 0x014B014B + .4byte 0x013B013B + .4byte 0x013B013B + .4byte 0x017C017C + .4byte 0x018C018C + .4byte 0x028C028C + .4byte 0x122C122C + .4byte 0x862C862C + .4byte 0x882C882C + .4byte 0x9E1C9E1C + .4byte 0xA01CA01C + .4byte 0x019D01AD + .4byte 0x01BD029D + .4byte 0x0C3D02AD + .4byte 0x045D0E3D + .4byte 0x1C1D808D + .4byte 0x8A2D8C2D + .4byte 0xA21DA41D + .4byte 0xA61DA81D + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x012B012B + .4byte 0x012B012B + .4byte 0x011B011B + .4byte 0x011B011B + .4byte 0x9C1A9C1A + .4byte 0x9C1A9C1A + .4byte 0x9C1A9C1A + .4byte 0x9C1A9C1A + .4byte 0x9A1A9A1A + .4byte 0x9A1A9A1A + .4byte 0x9A1A9A1A + .4byte 0x9A1A9A1A + .4byte 0x981A981A + .4byte 0x981A981A + .4byte 0x981A981A + .4byte 0x981A981A + .4byte 0x961A961A + .4byte 0x961A961A + .4byte 0x961A961A + .4byte 0x961A961A + .4byte 0x941A941A + .4byte 0x941A941A + .4byte 0x941A941A + .4byte 0x941A941A + .4byte 0x822A822A + .4byte 0x822A822A + .4byte 0x822A822A + .4byte 0x822A822A + .4byte 0x804A804A + .4byte 0x804A804A + .4byte 0x804A804A + .4byte 0x804A804A + .4byte 0x181A181A + .4byte 0x181A181A + .4byte 0x181A181A + .4byte 0x181A181A + .4byte 0x161A161A + .4byte 0x161A161A + .4byte 0x161A161A + .4byte 0x161A161A + .4byte 0x0E2A0E2A + .4byte 0x0E2A0E2A + .4byte 0x0E2A0E2A + .4byte 0x0E2A0E2A + .4byte 0x0C2A0C2A + .4byte 0x0C2A0C2A + .4byte 0x0C2A0C2A + .4byte 0x0C2A0C2A + .4byte 0x0A2A0A2A + .4byte 0x0A2A0A2A + .4byte 0x0A2A0A2A + .4byte 0x0A2A0A2A + .4byte 0x063A063A + .4byte 0x063A063A + .4byte 0x063A063A + .4byte 0x063A063A + .4byte 0x043A043A + .4byte 0x043A043A + .4byte 0x043A043A + .4byte 0x043A043A + .4byte 0x026A026A + .4byte 0x026A026A + .4byte 0x026A026A + .4byte 0x026A026A + .4byte 0x025A025A + .4byte 0x025A025A + .4byte 0x025A025A + .4byte 0x025A025A + .4byte 0x010A010A + .4byte 0x010A010A + .4byte 0x010A010A + .4byte 0x010A010A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x082A082A + .4byte 0x00FA00FA + .4byte 0x00FA00FA + .4byte 0x00FA00FA + .4byte 0x00FA00FA + .4byte 0x00EA00EA + .4byte 0x00EA00EA + .4byte 0x00EA00EA + .4byte 0x00EA00EA + .4byte 0x00DA00DA + .4byte 0x00DA00DA + .4byte 0x00DA00DA + .4byte 0x00DA00DA + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x90199019 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8E198E19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x8C198C19 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x80398039 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x14191419 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x12191219 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x10191019 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x92199219 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x06290629 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x02490249 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00C900C9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00B900B9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x00A900A9 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x88188818 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x86188618 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x0C180C18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x8A188A18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x0E180E18 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x04280428 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x02380238 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x00980098 + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x80278027 ;# ptr + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x0A170A17 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x84178417 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x82178217 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x08170817 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x06170617 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00870087 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x00770077 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x02270227 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x00670067 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x04160416 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00560056 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x00460046 + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x80158015 ;# ptr + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00130013 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x00240024 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x02150215 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 + .4byte 0x00350035 .global MaxLevel MaxLevel: - .incbin "baserom.dol", 0x40F730, 0x100 + .4byte 0x0C060403 + .4byte 0x03030302 + .4byte 0x02020201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010100 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x03020101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x1B0A0504 + .4byte 0x03030303 + .4byte 0x02020101 + .4byte 0x01010100 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x08030202 + .4byte 0x02020201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global MaxRun MaxRun: - .incbin "baserom.dol", 0x40F830, 0x100 + .4byte 0x011B0B07 + .4byte 0x03020201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01290201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x010F0A08 + .4byte 0x04030202 + .4byte 0x02020201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01150702 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 .section .data, "wa" # 0x80421040 - 0x80496700 .global VX2GolombCodeSigned VX2GolombCodeSigned: - .incbin "baserom.dol", 0x4446D8, 0x8000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x40C041BF + .4byte 0x42BE43BD + .4byte 0x44BC45BB + .4byte 0x46BA47B9 + .4byte 0x48B849B7 + .4byte 0x4AB64BB5 + .4byte 0x4CB44DB3 + .4byte 0x4EB24FB1 + .4byte 0x50B051AF + .4byte 0x52AE53AD + .4byte 0x54AC55AB + .4byte 0x56AA57A9 + .4byte 0x58A859A7 + .4byte 0x5AA65BA5 + .4byte 0x5CA45DA3 + .4byte 0x5EA25FA1 + .4byte 0x60A0619F + .4byte 0x629E639D + .4byte 0x649C659B + .4byte 0x669A6799 + .4byte 0x68986997 + .4byte 0x6A966B95 + .4byte 0x6C946D93 + .4byte 0x6E926F91 + .4byte 0x7090718F + .4byte 0x728E738D + .4byte 0x748C758B + .4byte 0x768A7789 + .4byte 0x78887987 + .4byte 0x7A867B85 + .4byte 0x7C847D83 + .4byte 0x7E827F81 + .4byte 0x20202020 + .4byte 0xE0E0E0E0 + .4byte 0x21212121 + .4byte 0xDFDFDFDF + .4byte 0x22222222 + .4byte 0xDEDEDEDE + .4byte 0x23232323 + .4byte 0xDDDDDDDD + .4byte 0x24242424 + .4byte 0xDCDCDCDC + .4byte 0x25252525 + .4byte 0xDBDBDBDB + .4byte 0x26262626 + .4byte 0xDADADADA + .4byte 0x27272727 + .4byte 0xD9D9D9D9 + .4byte 0x28282828 + .4byte 0xD8D8D8D8 + .4byte 0x29292929 + .4byte 0xD7D7D7D7 + .4byte 0x2A2A2A2A + .4byte 0xD6D6D6D6 + .4byte 0x2B2B2B2B + .4byte 0xD5D5D5D5 + .4byte 0x2C2C2C2C + .4byte 0xD4D4D4D4 + .4byte 0x2D2D2D2D + .4byte 0xD3D3D3D3 + .4byte 0x2E2E2E2E + .4byte 0xD2D2D2D2 + .4byte 0x2F2F2F2F + .4byte 0xD1D1D1D1 + .4byte 0x30303030 + .4byte 0xD0D0D0D0 + .4byte 0x31313131 + .4byte 0xCFCFCFCF + .4byte 0x32323232 + .4byte 0xCECECECE + .4byte 0x33333333 + .4byte 0xCDCDCDCD + .4byte 0x34343434 + .4byte 0xCCCCCCCC + .4byte 0x35353535 + .4byte 0xCBCBCBCB + .4byte 0x36363636 + .4byte 0xCACACACA + .4byte 0x37373737 + .4byte 0xC9C9C9C9 + .4byte 0x38383838 + .4byte 0xC8C8C8C8 + .4byte 0x39393939 + .4byte 0xC7C7C7C7 + .4byte 0x3A3A3A3A + .4byte 0xC6C6C6C6 + .4byte 0x3B3B3B3B + .4byte 0xC5C5C5C5 + .4byte 0x3C3C3C3C + .4byte 0xC4C4C4C4 + .4byte 0x3D3D3D3D + .4byte 0xC3C3C3C3 + .4byte 0x3E3E3E3E + .4byte 0xC2C2C2C2 + .4byte 0x3F3F3F3F + .4byte 0xC1C1C1C1 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0xF0F0F0F0 + .4byte 0xF0F0F0F0 + .4byte 0xF0F0F0F0 + .4byte 0xF0F0F0F0 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0xEFEFEFEF + .4byte 0xEFEFEFEF + .4byte 0xEFEFEFEF + .4byte 0xEFEFEFEF + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0xEEEEEEEE + .4byte 0xEEEEEEEE + .4byte 0xEEEEEEEE + .4byte 0xEEEEEEEE + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0xEDEDEDED + .4byte 0xEDEDEDED + .4byte 0xEDEDEDED + .4byte 0xEDEDEDED + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0xECECECEC + .4byte 0xECECECEC + .4byte 0xECECECEC + .4byte 0xECECECEC + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0xEBEBEBEB + .4byte 0xEBEBEBEB + .4byte 0xEBEBEBEB + .4byte 0xEBEBEBEB + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0xEAEAEAEA + .4byte 0xEAEAEAEA + .4byte 0xEAEAEAEA + .4byte 0xEAEAEAEA + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0xE9E9E9E9 + .4byte 0xE9E9E9E9 + .4byte 0xE9E9E9E9 + .4byte 0xE9E9E9E9 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0xE8E8E8E8 + .4byte 0xE8E8E8E8 + .4byte 0xE8E8E8E8 + .4byte 0xE8E8E8E8 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0xE7E7E7E7 + .4byte 0xE7E7E7E7 + .4byte 0xE7E7E7E7 + .4byte 0xE7E7E7E7 + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0xE6E6E6E6 + .4byte 0xE6E6E6E6 + .4byte 0xE6E6E6E6 + .4byte 0xE6E6E6E6 + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0xE5E5E5E5 + .4byte 0xE5E5E5E5 + .4byte 0xE5E5E5E5 + .4byte 0xE5E5E5E5 + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0xE4E4E4E4 + .4byte 0xE4E4E4E4 + .4byte 0xE4E4E4E4 + .4byte 0xE4E4E4E4 + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0xE3E3E3E3 + .4byte 0xE3E3E3E3 + .4byte 0xE3E3E3E3 + .4byte 0xE3E3E3E3 + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0xE2E2E2E2 + .4byte 0xE2E2E2E2 + .4byte 0xE2E2E2E2 + .4byte 0xE2E2E2E2 + .4byte 0x1F1F1F1F + .4byte 0x1F1F1F1F + .4byte 0x1F1F1F1F + .4byte 0x1F1F1F1F + .4byte 0xE1E1E1E1 + .4byte 0xE1E1E1E1 + .4byte 0xE1E1E1E1 + .4byte 0xE1E1E1E1 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0xF8F8F8F8 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0xF7F7F7F7 + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0xF6F6F6F6 + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0xF5F5F5F5 + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0xF4F4F4F4 + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0xF3F3F3F3 + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0xF2F2F2F2 + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0xF1F1F1F1 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0xFCFCFCFC + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0xFBFBFBFB + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0xFAFAFAFA + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0xF9F9F9F9 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0xFEFEFEFE + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0xFDFDFDFD + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global VX2GolombCodeSignedSize VX2GolombCodeSignedSize: - .incbin "baserom.dol", 0x44C6D8, 0x400 + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0 .global VX2GolombCode VX2GolombCode: - .incbin "baserom.dol", 0x44CAD8, 0x2000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F400000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x1F1F1F1F + .4byte 0x20202020 + .4byte 0x21212121 + .4byte 0x22222222 + .4byte 0x23232323 + .4byte 0x24242424 + .4byte 0x25252525 + .4byte 0x26262626 + .4byte 0x27272727 + .4byte 0x28282828 + .4byte 0x29292929 + .4byte 0x2A2A2A2A + .4byte 0x2B2B2B2B + .4byte 0x2C2C2C2C + .4byte 0x2D2D2D2D + .4byte 0x2E2E2E2E + .4byte 0x2F2F2F2F + .4byte 0x30303030 + .4byte 0x31313131 + .4byte 0x32323232 + .4byte 0x33333333 + .4byte 0x34343434 + .4byte 0x35353535 + .4byte 0x36363636 + .4byte 0x37373737 + .4byte 0x38383838 + .4byte 0x39393939 + .4byte 0x3A3A3A3A + .4byte 0x3B3B3B3B + .4byte 0x3C3C3C3C + .4byte 0x3D3D3D3D + .4byte 0x3E3E3E3E + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global VX2GolombCodeSize VX2GolombCodeSize: - .incbin "baserom.dol", 0x44EAD8, 0x108 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0 diff --git a/asm/libMobiclip/VX2_InverseQuantization.s b/asm/libMobiclip/VX2_InverseQuantization.s index 2b285918..d3c3a272 100644 --- a/asm/libMobiclip/VX2_InverseQuantization.s +++ b/asm/libMobiclip/VX2_InverseQuantization.s @@ -145,13 +145,569 @@ lbl_80170DB8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2InverseQuantizer4x4 VX2InverseQuantizer4x4: - .incbin "baserom.dol", 0x40F930, 0x180 + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x0000000D + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x0000000E + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000014 + .4byte 0x00000019 + .4byte 0x00000014 + .4byte 0x00000019 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000014 + .4byte 0x00000019 + .4byte 0x00000014 + .4byte 0x00000019 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x00000017 + .4byte 0x0000001D .global VX2InverseQuantizer8x8 VX2InverseQuantizer8x8: - .incbin "baserom.dol", 0x40FAB0, 0x600 + .4byte 0x00000014 + .4byte 0x00000013 + .4byte 0x00000019 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0x00000013 + .4byte 0x00000019 + .4byte 0x00000013 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000019 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000019 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000014 + .4byte 0x00000013 + .4byte 0x00000019 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0x00000013 + .4byte 0x00000019 + .4byte 0x00000013 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000019 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000019 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x00000018 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000012 + .4byte 0x00000018 + .4byte 0x00000012 + .4byte 0x00000016 + .4byte 0x00000015 + .4byte 0x0000001C + .4byte 0x00000015 + .4byte 0x00000016 + .4byte 0x00000015 + .4byte 0x0000001C + .4byte 0x00000015 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x00000016 + .4byte 0x00000015 + .4byte 0x0000001C + .4byte 0x00000015 + .4byte 0x00000016 + .4byte 0x00000015 + .4byte 0x0000001C + .4byte 0x00000015 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x00000018 + .4byte 0x00000021 + .4byte 0x00000018 + .4byte 0x0000001A + .4byte 0x00000018 + .4byte 0x00000021 + .4byte 0x00000018 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000021 + .4byte 0x0000001F + .4byte 0x0000002A + .4byte 0x0000001F + .4byte 0x00000021 + .4byte 0x0000001F + .4byte 0x0000002A + .4byte 0x0000001F + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x0000001A + .4byte 0x00000018 + .4byte 0x00000021 + .4byte 0x00000018 + .4byte 0x0000001A + .4byte 0x00000018 + .4byte 0x00000021 + .4byte 0x00000018 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000021 + .4byte 0x0000001F + .4byte 0x0000002A + .4byte 0x0000001F + .4byte 0x00000021 + .4byte 0x0000001F + .4byte 0x0000002A + .4byte 0x0000001F + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x00000018 + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000017 + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x00000023 + .4byte 0x00000021 + .4byte 0x0000002D + .4byte 0x00000021 + .4byte 0x00000023 + .4byte 0x00000021 + .4byte 0x0000002D + .4byte 0x00000021 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000001A + .4byte 0x00000023 + .4byte 0x0000001A + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x00000023 + .4byte 0x00000021 + .4byte 0x0000002D + .4byte 0x00000021 + .4byte 0x00000023 + .4byte 0x00000021 + .4byte 0x0000002D + .4byte 0x00000021 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x0000001A + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000019 + .4byte 0x00000020 + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x0000001E + .4byte 0x00000020 + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x00000028 + .4byte 0x00000026 + .4byte 0x00000033 + .4byte 0x00000026 + .4byte 0x00000028 + .4byte 0x00000026 + .4byte 0x00000033 + .4byte 0x00000026 + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x00000020 + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x0000001E + .4byte 0x00000020 + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x00000028 + .4byte 0x00000026 + .4byte 0x00000033 + .4byte 0x00000026 + .4byte 0x00000028 + .4byte 0x00000026 + .4byte 0x00000033 + .4byte 0x00000026 + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x0000001E + .4byte 0x0000001C + .4byte 0x00000026 + .4byte 0x0000001C + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x0000002E + .4byte 0x00000022 + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x0000002E + .4byte 0x00000022 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x0000002E + .4byte 0x0000002B + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x0000002E + .4byte 0x0000002B + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x0000002E + .4byte 0x00000022 + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x0000002E + .4byte 0x00000022 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x0000002E + .4byte 0x0000002B + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x0000002E + .4byte 0x0000002B + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 + .4byte 0x00000022 + .4byte 0x00000020 + .4byte 0x0000002B + .4byte 0x00000020 .global VX2InverseZigZag8x8 VX2InverseZigZag8x8: - .incbin "baserom.dol", 0x4100B0, 0x100 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000023 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x0000000B + .4byte 0x00000013 + .4byte 0x00000016 + .4byte 0x00000022 + .4byte 0x00000024 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x0000000C + .4byte 0x00000012 + .4byte 0x00000017 + .4byte 0x00000021 + .4byte 0x00000025 + .4byte 0x00000030 + .4byte 0x00000006 + .4byte 0x0000000D + .4byte 0x00000011 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x00000026 + .4byte 0x0000002F + .4byte 0x00000031 + .4byte 0x0000000E + .4byte 0x00000010 + .4byte 0x00000019 + .4byte 0x0000001F + .4byte 0x00000027 + .4byte 0x0000002E + .4byte 0x00000032 + .4byte 0x00000039 + .4byte 0x0000000F + .4byte 0x0000001A + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x0000002D + .4byte 0x00000033 + .4byte 0x00000038 + .4byte 0x0000003A + .4byte 0x0000001B + .4byte 0x0000001D + .4byte 0x00000029 + .4byte 0x0000002C + .4byte 0x00000034 + .4byte 0x00000037 + .4byte 0x0000003B + .4byte 0x0000003E + .4byte 0x0000001C + .4byte 0x0000002A + .4byte 0x0000002B + .4byte 0x00000035 + .4byte 0x00000036 + .4byte 0x0000003C + .4byte 0x0000003D + .4byte 0x0000003F .global VX2InverseZigZag4x4 VX2InverseZigZag4x4: - .incbin "baserom.dol", 0x4101B0, 0x40 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0x0000000C + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000E + .4byte 0x0000000F diff --git a/asm/libMobiclip/VX2_MotionCompensation.s b/asm/libMobiclip/VX2_MotionCompensation.s index 0b1441e3..4cd7e8fc 100644 --- a/asm/libMobiclip/VX2_MotionCompensation.s +++ b/asm/libMobiclip/VX2_MotionCompensation.s @@ -735,19 +735,260 @@ lbl_80171910: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvCbpTable InvCbpTable: - .incbin "baserom.dol", 0x4101F0, 0x200 + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003F + .4byte 0x0000000F + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000001B + .4byte 0x0000000D + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x0000000C + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x0000000A + .4byte 0x0000001E + .4byte 0x00000005 + .4byte 0x00000010 + .4byte 0x0000002F + .4byte 0x00000037 + .4byte 0x0000003B + .4byte 0x00000013 + .4byte 0x0000003D + .4byte 0x0000003E + .4byte 0x00000009 + .4byte 0x0000001C + .4byte 0x00000006 + .4byte 0x00000015 + .4byte 0x0000001A + .4byte 0x00000033 + .4byte 0x00000011 + .4byte 0x00000012 + .4byte 0x00000014 + .4byte 0x00000018 + .4byte 0x00000020 + .4byte 0x0000003C + .4byte 0x00000035 + .4byte 0x00000019 + .4byte 0x00000016 + .4byte 0x0000003A + .4byte 0x00000030 + .4byte 0x00000031 + .4byte 0x00000032 + .4byte 0x00000027 + .4byte 0x00000034 + .4byte 0x0000002B + .4byte 0x0000002D + .4byte 0x00000039 + .4byte 0x00000038 + .4byte 0x00000023 + .4byte 0x00000036 + .4byte 0x0000002E + .4byte 0x00000021 + .4byte 0x00000025 + .4byte 0x00000022 + .4byte 0x00000024 + .4byte 0x0000002C + .4byte 0x0000002A + .4byte 0x00000028 + .4byte 0x00000029 + .4byte 0x00000026 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x0000000C + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x00000007 + .4byte 0x0000000E + .4byte 0x0000000B + .4byte 0x0000001F + .4byte 0x00000009 + .4byte 0x00000006 + .4byte 0x00000010 + .4byte 0x0000003F + .4byte 0x0000001E + .4byte 0x00000017 + .4byte 0x0000001D + .4byte 0x0000001B + .4byte 0x0000001C + .4byte 0x00000013 + .4byte 0x00000018 + .4byte 0x0000001A + .4byte 0x00000012 + .4byte 0x00000011 + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000020 + .4byte 0x0000002F + .4byte 0x00000016 + .4byte 0x00000019 + .4byte 0x00000037 + .4byte 0x0000003D + .4byte 0x0000003E + .4byte 0x0000003B + .4byte 0x0000003C + .4byte 0x00000033 + .4byte 0x00000035 + .4byte 0x00000021 + .4byte 0x00000024 + .4byte 0x00000022 + .4byte 0x00000028 + .4byte 0x00000023 + .4byte 0x0000002C + .4byte 0x00000030 + .4byte 0x00000027 + .4byte 0x0000002D + .4byte 0x00000025 + .4byte 0x0000003A + .4byte 0x0000002B + .4byte 0x0000002E + .4byte 0x0000002A + .4byte 0x00000031 + .4byte 0x00000034 + .4byte 0x00000038 + .4byte 0x00000032 + .4byte 0x00000029 + .4byte 0x00000026 + .4byte 0x00000039 + .4byte 0x00000036 .global InvSbpTable InvSbpTable: - .incbin "baserom.dol", 0x4103F0, 0x88 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000010 + .4byte 0x00000018 + .4byte 0x00000006 + .4byte 0x00000016 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x0000000E + .4byte 0x00000014 + .4byte 0x0000000A + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x00000010 + .4byte 0x00000004 + .4byte 0x00000018 + .4byte 0x00000006 + .4byte 0x0000000A + .4byte 0x00000014 + .4byte 0x0000001E + .4byte 0x0000000E + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x00000016 + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0xFFFFFFFF .global DecodeEscapeTable DecodeEscapeTable: - .incbin "baserom.dol", 0x410478, 0x10 + .4byte 0x80170EA0 ;# ptr + .4byte 0x80170EA0 ;# ptr + .4byte 0x80170FB0 ;# ptr + .4byte 0x801710C0 ;# ptr .global ZigZag8x8 ZigZag8x8: - .incbin "baserom.dol", 0x410488, 0x100 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000009 + .4byte 0x00000010 + .4byte 0x00000018 + .4byte 0x00000011 + .4byte 0x0000000A + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x0000000B + .4byte 0x00000012 + .4byte 0x00000019 + .4byte 0x00000020 + .4byte 0x00000028 + .4byte 0x00000021 + .4byte 0x0000001A + .4byte 0x00000013 + .4byte 0x0000000C + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x0000000D + .4byte 0x00000014 + .4byte 0x0000001B + .4byte 0x00000022 + .4byte 0x00000029 + .4byte 0x00000030 + .4byte 0x00000038 + .4byte 0x00000031 + .4byte 0x0000002A + .4byte 0x00000023 + .4byte 0x0000001C + .4byte 0x00000015 + .4byte 0x0000000E + .4byte 0x00000007 + .4byte 0x0000000F + .4byte 0x00000016 + .4byte 0x0000001D + .4byte 0x00000024 + .4byte 0x0000002B + .4byte 0x00000032 + .4byte 0x00000039 + .4byte 0x0000003A + .4byte 0x00000033 + .4byte 0x0000002C + .4byte 0x00000025 + .4byte 0x0000001E + .4byte 0x00000017 + .4byte 0x0000001F + .4byte 0x00000026 + .4byte 0x0000002D + .4byte 0x00000034 + .4byte 0x0000003B + .4byte 0x0000003C + .4byte 0x00000035 + .4byte 0x0000002E + .4byte 0x00000027 + .4byte 0x0000002F + .4byte 0x00000036 + .4byte 0x0000003D + .4byte 0x0000003E + .4byte 0x00000037 + .4byte 0x0000003F .global ZigZag4x4 ZigZag4x4: - .incbin "baserom.dol", 0x410588, 0x40 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0x00000009 + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x0000000A + .4byte 0x00000007 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000000F .section .bss, "wa" # 0x80496700 - 0x805643FC .global InvMc8x8Table diff --git a/asm/libms/msgfile.s b/asm/libms/msgfile.s index 67ad98db..4864cf6b 100644 --- a/asm/libms/msgfile.s +++ b/asm/libms/msgfile.s @@ -181,18 +181,24 @@ lbl_80174454: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22545 $$22545: - .incbin "baserom.dol", 0x44EBE0, 0x10 + .asciz "MsgStdBn" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22546 $$22546: - .incbin "baserom.dol", 0x492ED0, 0x8 + .asciz "LBL1" + .balign 4 .global $$22547 $$22547: - .incbin "baserom.dol", 0x492ED8, 0x8 + .asciz "TXT2" + .balign 4 .global $$22548 $$22548: - .incbin "baserom.dol", 0x492EE0, 0x8 + .asciz "ATR1" + .balign 4 .global $$22549 $$22549: - .incbin "baserom.dol", 0x492EE8, 0x8 + .asciz "TSY1" + .balign 4 diff --git a/asm/libms/projfile.s b/asm/libms/projfile.s index e16f518a..a0b84f44 100644 --- a/asm/libms/projfile.s +++ b/asm/libms/projfile.s @@ -319,42 +319,56 @@ lbl_80174AB4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23242 $$23242: - .incbin "baserom.dol", 0x44EBF0, 0x10 + .asciz "MsgPrjBn" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23243 $$23243: - .incbin "baserom.dol", 0x492EF0, 0x8 + .asciz "CLR1" + .balign 4 .global $$23244 $$23244: - .incbin "baserom.dol", 0x492EF8, 0x8 + .asciz "CLB1" + .balign 4 .global $$23245 $$23245: - .incbin "baserom.dol", 0x492F00, 0x8 + .asciz "ATI2" + .balign 4 .global $$23246 $$23246: - .incbin "baserom.dol", 0x492F08, 0x8 + .asciz "ALB1" + .balign 4 .global $$23247 $$23247: - .incbin "baserom.dol", 0x492F10, 0x8 + .asciz "ALI2" + .balign 4 .global $$23248 $$23248: - .incbin "baserom.dol", 0x492F18, 0x8 + .asciz "TGG2" + .balign 4 .global $$23249 $$23249: - .incbin "baserom.dol", 0x492F20, 0x8 + .asciz "TAG2" + .balign 4 .global $$23250 $$23250: - .incbin "baserom.dol", 0x492F28, 0x8 + .asciz "TGP2" + .balign 4 .global $$23251 $$23251: - .incbin "baserom.dol", 0x492F30, 0x8 + .asciz "TGL2" + .balign 4 .global $$23252 $$23252: - .incbin "baserom.dol", 0x492F38, 0x8 + .asciz "SYL3" + .balign 4 .global $$23253 $$23253: - .incbin "baserom.dol", 0x492F40, 0x8 + .asciz "SLB1" + .balign 4 .global $$23254 $$23254: - .incbin "baserom.dol", 0x492F48, 0x8 + .asciz "CTI1" + .balign 4 diff --git a/asm/libnw4r_db/db_assert.s b/asm/libnw4r_db/db_assert.s index d9a1add3..a5237138 100644 --- a/asm/libnw4r_db/db_assert.s +++ b/asm/libnw4r_db/db_assert.s @@ -182,15 +182,16 @@ WarningAlarmFunc___Q24nw4r2dbFP7OSAlarmP9OSContext: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$26682 $$26682: - .incbin "baserom.dol", 0x43EAA8, 0x10 + .asciz "%s:%d Warning:" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global sDispWarningAuto__Q24nw4r2db sDispWarningAuto__Q24nw4r2db: - .incbin "baserom.dol", 0x492E70, 0x4 + .4byte 0x01000000 .global $$26647 $$26647: - .incbin "baserom.dol", 0x492E74, 0x4 + .4byte 0x0A000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2GetWarningAlarm___Q24nw4r2dbFv$$2sWarningAlarm$$20 diff --git a/asm/libnw4r_db/db_console.s b/asm/libnw4r_db/db_console.s index a9fb8e70..01036db6 100644 --- a/asm/libnw4r_db/db_console.s +++ b/asm/libnw4r_db/db_console.s @@ -805,10 +805,10 @@ lbl_80128328: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$28595 $$28595: - .incbin "baserom.dol", 0x492E68, 0x4 + .4byte 0x25730A00 .global $$28712 $$28712: - .incbin "baserom.dol", 0x492E6C, 0x4 + .4byte 0x25730000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sMutex__Q24nw4r2db diff --git a/asm/libnw4r_db/db_directPrint.s b/asm/libnw4r_db/db_directPrint.s index 814d265c..9542a2eb 100644 --- a/asm/libnw4r_db/db_directPrint.s +++ b/asm/libnw4r_db/db_directPrint.s @@ -825,53 +825,226 @@ lbl_80127808: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global sAsciiTable__Q24nw4r2db sAsciiTable__Q24nw4r2db: - .incbin "baserom.dol", 0x409C28, 0x80 + .4byte 0x7A7A7A7A + .4byte 0x7A7A7A7A + .4byte 0x7AFDFE7A + .4byte 0x7A7A7A7A + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFF296465 + .asciz "f+gh%&i*j',k" + .byte 0x01, 0x02, 0x03 + .4byte 0x04050607 + .4byte 0x0809246C + .4byte 0x6D6E6F28 + .4byte 0x700A0B0C + .4byte 0x0D0E0F10 + .4byte 0x11121314 + .4byte 0x15161718 + .4byte 0x191A1B1C + .4byte 0x1D1E1F20 + .4byte 0x21222371 + .4byte 0x72737475 + .4byte 0xFF7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959676 + .4byte 0x7778797A .global sFontData__Q24nw4r2db sFontData__Q24nw4r2db: - .incbin "baserom.dol", 0x409CA8, 0x100 + .4byte 0x70871C30 + .4byte 0x8988A250 + .4byte 0x88808290 + .4byte 0x88830C90 + .4byte 0x888402F8 + .4byte 0x88882210 + .4byte 0x71CF9C10 + .4byte 0xF9CF9C70 + .4byte 0x8208A288 + .4byte 0xF200A288 + .4byte 0x0BC11C78 + .4byte 0x0A222208 + .4byte 0x8A222208 + .4byte 0x71C21C70 + .4byte 0x23C738F8 + .4byte 0x5228A480 + .4byte 0x8A282280 + .4byte 0x8BC822F0 + .4byte 0xFA282280 + .4byte 0x8A28A480 + .4byte 0x8BC738F8 + .4byte 0xF9C89C08 + .4byte 0x82288808 + .4byte 0x82088808 + .4byte 0xF2EF8808 + .4byte 0x82288888 + .4byte 0x82288888 + .4byte 0x81C89C70 + .4byte 0x8A08A270 + .4byte 0x920DA288 + .4byte 0xA20AB288 + .4byte 0xC20AAA88 + .4byte 0xA208A688 + .4byte 0x9208A288 + .4byte 0x8BE8A270 + .4byte 0xF1CF1CF8 + .4byte 0x8A28A220 + .4byte 0x8A28A020 + .4byte 0xF22F1C20 + .4byte 0x82AA0220 + .4byte 0x82492220 + .4byte 0x81A89C20 + .4byte 0x8A28A288 + .4byte 0x8A28A288 + .4byte 0x8A289488 + .4byte 0x8A2A8850 + .4byte 0x894A9420 + .4byte 0x894AA220 + .4byte 0x70852220 + .4byte 0xF8011000 + .4byte 0x08020800 + .4byte 0x10840400 + .4byte 0x20040470 + .4byte 0x40840400 + .4byte 0x80020800 ;# ptr + .4byte 0xF8011000 + .4byte 0x70800000 + .4byte 0x88822200 + .4byte 0x08820400 + .4byte 0x108F8800 + .4byte 0x20821000 + .4byte 0x00022200 + .4byte 0x20800020 + .4byte 0 .global sFontData2__Q24nw4r2db sFontData2__Q24nw4r2db: - .incbin "baserom.dol", 0x409DA8, 0x138 + .4byte 0x51421820 + .4byte 0x53E7A420 + .4byte 0x014A2C40 + .4byte 0x01471000 + .4byte 0x0142AA00 + .4byte 0x03EAA400 + .4byte 0x01471A78 + .4byte 0 + .4byte 0x50008010 + .4byte 0x20010820 + .4byte 0xF8020040 + .4byte 0x20420820 + .4byte 0x50441010 + .4byte 0x00880000 + .4byte 0x00070E00 + .4byte 0x01088840 + .4byte 0x78898820 + .4byte 0x004A8810 + .4byte 0x788A8810 + .4byte 0x01098808 + .4byte 0x00040E04 + .4byte 0x70800620 + .4byte 0x11400820 + .4byte 0x12200820 + .4byte 0x10001020 + .4byte 0x10000820 + .4byte 0x100F8820 + .4byte 0x70000620 + .4byte 0x60070000 + .4byte 0x110F82A0 + .4byte 0x12AA8AE0 + .4byte 0x084F92A0 + .4byte 0x100FBE1C + .4byte 0x10089008 + .4byte 0x60070808 + .4byte 0 + .4byte 0x02000200 + .4byte 0x7A078270 + .4byte 0x8BC81E88 + .4byte 0x8A2822F8 + .4byte 0x9A282280 + .4byte 0x6BC79E78 + .4byte 0x30000000 + .4byte 0x48080810 + .4byte 0x41E80000 + .4byte 0x422F1830 + .4byte 0xFBE88810 + .4byte 0x40288890 + .4byte 0x43C89C60 + .4byte 0x81000000 + .4byte 0x81000000 + .4byte 0x990F3C70 + .4byte 0xA10AA288 + .4byte 0xE10AA288 + .4byte 0xA10AA288 + .4byte 0x98CAA270 + .4byte 0 + .4byte 0x00000020 + .4byte 0xF1EF1E20 + .4byte 0x8A28A0F8 + .4byte 0x8A281C20 + .4byte 0xF1E80220 + .4byte 0x80283C38 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8A28B688 + .4byte 0x8A2A8888 + .4byte 0x8A2A8878 + .4byte 0x894A8808 + .4byte 0x788536F0 + .4byte 0 + .4byte 0 + .4byte 0xF8000000 + .4byte 0x10000000 + .4byte 0x20000000 + .4byte 0x40000000 + .4byte 0xF8000000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2DrawCharToXfb___Q24nw4r2dbFiii$$2twiceBit $$2LOCAL$$2DrawCharToXfb___Q24nw4r2dbFiii$$2twiceBit: - .incbin "baserom.dol", 0x43EA98, 0x10 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0x0000000F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22741 $$22741: - .incbin "baserom.dol", 0x49A060, 0x4 + .4byte 0x41800000 .global $$22742 $$22742: - .incbin "baserom.dol", 0x49A064, 0x4 + .4byte 0x3DC8B439 .global $$22743 $$22743: - .incbin "baserom.dol", 0x49A068, 0x4 + .4byte 0x3E839581 .global $$22744 $$22744: - .incbin "baserom.dol", 0x49A06C, 0x4 + .4byte 0x3F010625 .global $$22745 $$22745: - .incbin "baserom.dol", 0x49A070, 0x4 + .4byte 0x43000000 .global $$22746 $$22746: - .incbin "baserom.dol", 0x49A074, 0x4 + .4byte 0x3EE0C49C .global $$22747 $$22747: - .incbin "baserom.dol", 0x49A078, 0x4 + .4byte 0xBE178D50 .global $$22748 $$22748: - .incbin "baserom.dol", 0x49A07C, 0x4 + .4byte 0x3E94FDF4 .global $$22749 $$22749: - .incbin "baserom.dol", 0x49A080, 0x4 + .4byte 0x3EBC6A7F .global $$22750 $$22750: - .incbin "baserom.dol", 0x49A084, 0x4 + .4byte 0x3D916873 .global $$22754 $$22754: - .incbin "baserom.dol", 0x49A088, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sFrameBufferInfo__Q24nw4r2db diff --git a/asm/libnw4r_ef/ef_animcurve.s b/asm/libnw4r_ef/ef_animcurve.s index 420913a2..fb3c8dd6 100644 --- a/asm/libnw4r_ef/ef_animcurve.s +++ b/asm/libnw4r_ef/ef_animcurve.s @@ -5670,42 +5670,171 @@ lbl_800ABDDC: .section .data, "wa" # 0x80421040 - 0x80496700 .global gCountStandBit__Q24nw4r2ef gCountStandBit__Q24nw4r2ef: - .incbin "baserom.dol", 0x43C208, 0x100 + .4byte 0x00010102 + .4byte 0x01020203 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x05060607 + .4byte 0x06070708 .global gMSB__Q24nw4r2ef gMSB__Q24nw4r2ef: - .incbin "baserom.dol", 0x43C308, 0x100 + .4byte 0x00010202 + .4byte 0x04040404 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211024 $$211024: - .incbin "baserom.dol", 0x4994F8, 0x8 + .4byte 0 + .4byte 0 .global $$211031 $$211031: - .incbin "baserom.dol", 0x499500, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$211032 $$211032: - .incbin "baserom.dol", 0x499508, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$211089 $$211089: - .incbin "baserom.dol", 0x499510, 0x4 + .4byte 0x3F800000 .global $$211364 $$211364: - .incbin "baserom.dol", 0x499514, 0x4 + .4byte 0x34000000 .global $$211365 $$211365: - .incbin "baserom.dol", 0x499518, 0x4 + .4byte 0x47800000 .global $$211366 $$211366: - .incbin "baserom.dol", 0x49951C, 0x4 + .4byte 0x40400000 .global $$211367 $$211367: - .incbin "baserom.dol", 0x499520, 0x4 + .4byte 0x40000000 .global $$211368 $$211368: - .incbin "baserom.dol", 0x499524, 0x4 + .4byte 0x3FC00000 .global $$211369 $$211369: - .incbin "baserom.dol", 0x499528, 0x4 + .4byte 0xC0000000 .global $$211370 $$211370: - .incbin "baserom.dol", 0x49952C, 0x4 + .4byte 0x437F0000 diff --git a/asm/libnw4r_ef/ef_cube.s b/asm/libnw4r_ef/ef_cube.s index 4a43fb23..c3731841 100644 --- a/asm/libnw4r_ef/ef_cube.s +++ b/asm/libnw4r_ef/ef_cube.s @@ -1949,42 +1949,47 @@ lbl_800B8904: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormCube __vt__Q34nw4r2ef15EmitterFormCube: - .incbin "baserom.dol", 0x43C4D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B7100 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28286 $$28286: - .incbin "baserom.dol", 0x4997F0, 0x4 + .4byte 0x00800000 .global $$28287 $$28287: - .incbin "baserom.dol", 0x4997F4, 0x4 + .4byte 0x47800000 .global $$28288 $$28288: - .incbin "baserom.dol", 0x4997F8, 0x4 + .4byte 0x40000000 .global $$28289 $$28289: - .incbin "baserom.dol", 0x4997FC, 0x4 + .4byte 0x3F800000 .global $$28290 $$28290: - .incbin "baserom.dol", 0x499800, 0x4 + .4byte 0 .global $$28291 $$28291: - .incbin "baserom.dol", 0x499804, 0x4 + .4byte 0x3C23D70A .global $$28300 $$28300: - .incbin "baserom.dol", 0x499808, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$28301 $$28301: - .incbin "baserom.dol", 0x499810, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29190 $$29190: - .incbin "baserom.dol", 0x499818, 0x4 + .4byte 0x3727C5AC .global $$29191 $$29191: - .incbin "baserom.dol", 0x49981C, 0x4 + .4byte 0x40490FDB .global $$29192 $$29192: - .incbin "baserom.dol", 0x499820, 0x4 + .4byte 0x34C90FDB .global $$29193 $$29193: - .incbin "baserom.dol", 0x499824, 0x4 + .4byte 0xBF800000 diff --git a/asm/libnw4r_ef/ef_cylinder.s b/asm/libnw4r_ef/ef_cylinder.s index 3a0ef0f3..922de577 100644 --- a/asm/libnw4r_ef/ef_cylinder.s +++ b/asm/libnw4r_ef/ef_cylinder.s @@ -529,48 +529,55 @@ lbl_800B6728: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef19EmitterFormCylinder __vt__Q34nw4r2ef19EmitterFormCylinder: - .incbin "baserom.dol", 0x43C4B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B6440 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27773 $$27773: - .incbin "baserom.dol", 0x499760, 0x4 + .4byte 0x47800000 .global $$27774 $$27774: - .incbin "baserom.dol", 0x499764, 0x4 + .4byte 0x42C80000 .global $$27775 $$27775: - .incbin "baserom.dol", 0x499768, 0x4 + .4byte 0 .global $$27776 $$27776: - .incbin "baserom.dol", 0x49976C, 0x4 + .4byte 0x3F800000 .global $$27777 $$27777: - .incbin "baserom.dol", 0x499770, 0x4 + .4byte 0x40000000 .global $$27778 $$27778: - .incbin "baserom.dol", 0x499774, 0x4 + .4byte 0x3C23D70A .global $$27786 $$27786: - .incbin "baserom.dol", 0x499778, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27787 $$27787: - .incbin "baserom.dol", 0x499780, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$27845 $$27845: - .incbin "baserom.dol", 0x499788, 0x4 + .4byte 0x34000000 .global $$27846 $$27846: - .incbin "baserom.dol", 0x49978C, 0x4 + .4byte 0x40490FDB .global $$27847 $$27847: - .incbin "baserom.dol", 0x499790, 0x8 + .4byte 0x401921FB + .4byte 0x60000000 .global $$27848 $$27848: - .incbin "baserom.dol", 0x499798, 0x4 + .4byte 0x39490FDB .global $$27849 $$27849: - .incbin "baserom.dol", 0x49979C, 0x4 + .4byte 0x40C90E49 .global $$27850 $$27850: - .incbin "baserom.dol", 0x4997A0, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_disc.s b/asm/libnw4r_ef/ef_disc.s index 872f9cde..de654c80 100644 --- a/asm/libnw4r_ef/ef_disc.s +++ b/asm/libnw4r_ef/ef_disc.s @@ -363,45 +363,53 @@ lbl_800B56E4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormDisc __vt__Q34nw4r2ef15EmitterFormDisc: - .incbin "baserom.dol", 0x43C498, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B5240 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27752 $$27752: - .incbin "baserom.dol", 0x4996C8, 0x4 + .4byte 0x34000000 .global $$27753 $$27753: - .incbin "baserom.dol", 0x4996CC, 0x4 + .4byte 0 .global $$27754 $$27754: - .incbin "baserom.dol", 0x4996D0, 0x4 + .4byte 0x47800000 .global $$27755 $$27755: - .incbin "baserom.dol", 0x4996D4, 0x4 + .4byte 0x40000000 .global $$27756 $$27756: - .incbin "baserom.dol", 0x4996D8, 0x8 + .4byte 0x40490FDB + .4byte 0 .global $$27757 $$27757: - .incbin "baserom.dol", 0x4996E0, 0x8 + .4byte 0x401921FB + .4byte 0x60000000 .global $$27758 $$27758: - .incbin "baserom.dol", 0x4996E8, 0x4 + .4byte 0x39490FDB .global $$27759 $$27759: - .incbin "baserom.dol", 0x4996EC, 0x4 + .4byte 0x40C90E49 .global $$27760 $$27760: - .incbin "baserom.dol", 0x4996F0, 0x4 + .4byte 0x42C80000 .global $$27761 $$27761: - .incbin "baserom.dol", 0x4996F4, 0x4 + .4byte 0x3F800000 .global $$27762 $$27762: - .incbin "baserom.dol", 0x4996F8, 0x8 + .4byte 0x3C23D70A + .4byte 0 .global $$27770 $$27770: - .incbin "baserom.dol", 0x499700, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27771 $$27771: - .incbin "baserom.dol", 0x499708, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy.s b/asm/libnw4r_ef/ef_drawbillboardstrategy.s index ef4af96d..03f7b1f1 100644 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy.s +++ b/asm/libnw4r_ef/ef_drawbillboardstrategy.s @@ -2295,35 +2295,53 @@ __dt__Q34nw4r2ef21DrawBillboardStrategyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef21DrawBillboardStrategy __vt__Q34nw4r2ef21DrawBillboardStrategy: - .incbin "baserom.dol", 0x43C510, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800BCCB0 ;# ptr + .4byte 0x800BAB90 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr + .4byte 0x800BC6D0 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global billboard_tex0_u8__Q24nw4r2ef billboard_tex0_u8__Q24nw4r2ef: - .incbin "baserom.dol", 0x492D60, 0x20 + .4byte 0x00010000 + .4byte 0x01000101 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213380 $$213380: - .incbin "baserom.dol", 0x499858, 0x4 + .4byte 0 .global $$213381 $$213381: - .incbin "baserom.dol", 0x49985C, 0x4 + .4byte 0x42C80000 .global $$213382 $$213382: - .incbin "baserom.dol", 0x499860, 0x4 + .4byte 0x3F800000 .global $$213383 $$213383: - .incbin "baserom.dol", 0x499864, 0x4 + .4byte 0x34000000 .global $$213384 $$213384: - .incbin "baserom.dol", 0x499868, 0x8 + .4byte 0x3CC90FDB + .4byte 0 .global $$213391 $$213391: - .incbin "baserom.dol", 0x499870, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$213392 $$213392: - .incbin "baserom.dol", 0x499878, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$213654 $$213654: - .incbin "baserom.dol", 0x499880, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s index 97b009ab..4a00382c 100644 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s +++ b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s @@ -2489,43 +2489,81 @@ __dt__Q34nw4r2ef23DrawDirectionalStrategyFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p: - .incbin "baserom.dol", 0x404360, 0x30 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 .global $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20 $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20: - .incbin "baserom.dol", 0x404390, 0x30 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef23DrawDirectionalStrategy __vt__Q34nw4r2ef23DrawDirectionalStrategy: - .incbin "baserom.dol", 0x43C530, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800BF090 ;# ptr + .4byte 0x800BD020 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr + .4byte 0x800BEFC0 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global directional_tex0_u8__Q24nw4r2ef directional_tex0_u8__Q24nw4r2ef: - .incbin "baserom.dol", 0x492D80, 0x20 + .4byte 0x00010000 + .4byte 0x01000101 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213563 $$213563: - .incbin "baserom.dol", 0x499888, 0x4 + .4byte 0 .global $$213564 $$213564: - .incbin "baserom.dol", 0x49988C, 0x4 + .4byte 0x34000000 .global $$213565 $$213565: - .incbin "baserom.dol", 0x499890, 0x4 + .4byte 0x3F800000 .global $$213566 $$213566: - .incbin "baserom.dol", 0x499894, 0x4 + .4byte 0x42C80000 .global $$213567 $$213567: - .incbin "baserom.dol", 0x499898, 0x4 + .4byte 0x3F000000 .global $$213568 $$213568: - .incbin "baserom.dol", 0x49989C, 0x4 + .4byte 0x3CC90FDB .global $$213575 $$213575: - .incbin "baserom.dol", 0x4998A0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$213576 $$213576: - .incbin "baserom.dol", 0x4998A8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy.s b/asm/libnw4r_ef/ef_drawfreestrategy.s index a10a3dd8..155de770 100644 --- a/asm/libnw4r_ef/ef_drawfreestrategy.s +++ b/asm/libnw4r_ef/ef_drawfreestrategy.s @@ -597,40 +597,71 @@ __dt__Q34nw4r2ef16DrawFreeStrategyFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p: - .incbin "baserom.dol", 0x4043C0, 0x30 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 .global $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20 $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20: - .incbin "baserom.dol", 0x4043F0, 0x30 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawFreeStrategy __vt__Q34nw4r2ef16DrawFreeStrategy: - .incbin "baserom.dol", 0x43C550, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800BF950 ;# ptr + .4byte 0x800BF0E0 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global free_tex0_u8__Q24nw4r2ef free_tex0_u8__Q24nw4r2ef: - .incbin "baserom.dol", 0x492DA0, 0x8 + .4byte 0x00010000 + .4byte 0x01000101 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29026 $$29026: - .incbin "baserom.dol", 0x4998B0, 0x4 + .4byte 0 .global $$29027 $$29027: - .incbin "baserom.dol", 0x4998B4, 0x4 + .4byte 0x42C80000 .global $$29028 $$29028: - .incbin "baserom.dol", 0x4998B8, 0x4 + .4byte 0x34000000 .global $$29029 $$29029: - .incbin "baserom.dol", 0x4998BC, 0x4 + .4byte 0x3CC90FDB .global $$29030 $$29030: - .incbin "baserom.dol", 0x4998C0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$29037 $$29037: - .incbin "baserom.dol", 0x4998C8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29038 $$29038: - .incbin "baserom.dol", 0x4998D0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawlinestrategy.s b/asm/libnw4r_ef/ef_drawlinestrategy.s index 982a8857..04226a66 100644 --- a/asm/libnw4r_ef/ef_drawlinestrategy.s +++ b/asm/libnw4r_ef/ef_drawlinestrategy.s @@ -418,23 +418,29 @@ __dt__Q34nw4r2ef16DrawLineStrategyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawLineStrategy __vt__Q34nw4r2ef16DrawLineStrategy: - .incbin "baserom.dol", 0x43C568, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800BFF50 ;# ptr + .4byte 0x800BF9A0 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211461 $$211461: - .incbin "baserom.dol", 0x492DA8, 0x8 + .4byte 0x422A0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211851 $$211851: - .incbin "baserom.dol", 0x4998D8, 0x4 + .4byte 0 .global $$211852 $$211852: - .incbin "baserom.dol", 0x4998DC, 0x4 + .4byte 0x34000000 .global $$211853 $$211853: - .incbin "baserom.dol", 0x4998E0, 0x4 + .4byte 0x40C00000 .global $$211854 $$211854: - .incbin "baserom.dol", 0x4998E4, 0x4 + .4byte 0x3F800000 diff --git a/asm/libnw4r_ef/ef_draworder.s b/asm/libnw4r_ef/ef_draworder.s index a5a40029..ae6bed3d 100644 --- a/asm/libnw4r_ef/ef_draworder.s +++ b/asm/libnw4r_ef/ef_draworder.s @@ -90,4 +90,9 @@ Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef9DrawOrder __vt__Q34nw4r2ef9DrawOrder: - .incbin "baserom.dol", 0x43C160, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800A39E0 ;# ptr + .4byte 0x800A3A60 ;# ptr + .4byte 0x800A3950 ;# ptr + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy.s b/asm/libnw4r_ef/ef_drawpointstrategy.s index 6bb22ae5..1e9d1266 100644 --- a/asm/libnw4r_ef/ef_drawpointstrategy.s +++ b/asm/libnw4r_ef/ef_drawpointstrategy.s @@ -310,20 +310,27 @@ __dt__Q34nw4r2ef17DrawPointStrategyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef17DrawPointStrategy __vt__Q34nw4r2ef17DrawPointStrategy: - .incbin "baserom.dol", 0x43C580, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800C03C0 ;# ptr + .4byte 0x800BFFA0 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211451 $$211451: - .incbin "baserom.dol", 0x492DB0, 0x8 + .4byte 0x422A0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211644 $$211644: - .incbin "baserom.dol", 0x4998E8, 0x4 + .4byte 0 .global $$211645 $$211645: - .incbin "baserom.dol", 0x4998EC, 0x4 + .4byte 0x34000000 .global $$211646 $$211646: - .incbin "baserom.dol", 0x4998F0, 0x8 + .4byte 0x40C00000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s index e77e1a6f..09956753 100644 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s @@ -5476,42 +5476,54 @@ __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef24DrawSmoothStripeStrategy __vt__Q34nw4r2ef24DrawSmoothStripeStrategy: - .incbin "baserom.dol", 0x43C5B8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x800C8AD0 ;# ptr + .4byte 0x800C7480 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr + .4byte 0x800C8150 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$215287 $$215287: - .incbin "baserom.dol", 0x499930, 0x4 + .4byte 0x34000000 .global $$215288 $$215288: - .incbin "baserom.dol", 0x499934, 0x4 + .4byte 0x3CC90FDB .global $$215289 $$215289: - .incbin "baserom.dol", 0x499938, 0x4 + .4byte 0 .global $$215290 $$215290: - .incbin "baserom.dol", 0x49993C, 0x4 + .4byte 0x3F800000 .global $$215299 $$215299: - .incbin "baserom.dol", 0x499940, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$215425 $$215425: - .incbin "baserom.dol", 0x499948, 0x4 + .4byte 0x3F000000 .global $$215426 $$215426: - .incbin "baserom.dol", 0x49994C, 0x4 + .4byte 0xBF800000 .global $$215501 $$215501: - .incbin "baserom.dol", 0x499950, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$215880 $$215880: - .incbin "baserom.dol", 0x499958, 0x4 + .4byte 0x3C23D70A .global $$216421 $$216421: - .incbin "baserom.dol", 0x49995C, 0x4 + .4byte 0x43B40000 .global $$216422 $$216422: - .incbin "baserom.dol", 0x499960, 0x8 + .4byte 0x3F360B61 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2v0 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder.s b/asm/libnw4r_ef/ef_drawstrategybuilder.s index 8b318fa7..ded7a06f 100644 --- a/asm/libnw4r_ef/ef_drawstrategybuilder.s +++ b/asm/libnw4r_ef/ef_drawstrategybuilder.s @@ -127,7 +127,10 @@ lbl_800B8B3C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef19DrawStrategyBuilder __vt__Q34nw4r2ef19DrawStrategyBuilder: - .incbin "baserom.dol", 0x43C4E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B89B0 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Create__Q34nw4r2ef19DrawStrategyBuilderFUl$$2billboardStrategy diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl.s b/asm/libnw4r_ef/ef_drawstrategyimpl.s index 9203e9d8..a4874569 100644 --- a/asm/libnw4r_ef/ef_drawstrategyimpl.s +++ b/asm/libnw4r_ef/ef_drawstrategyimpl.s @@ -2308,38 +2308,47 @@ __sinit_$$3ef_drawstrategyimpl_cpp: /* 800BAB4C 000B698C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402378, 0x4 + .4byte 0x800BAAC0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawStrategyImpl __vt__Q34nw4r2ef16DrawStrategyImpl: - .incbin "baserom.dol", 0x43C4F8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800BAAB0 ;# ptr + .4byte 0 + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29915 $$29915: - .incbin "baserom.dol", 0x499828, 0x4 + .4byte 0x3F800000 .global $$29916 $$29916: - .incbin "baserom.dol", 0x49982C, 0x4 + .4byte 0 .global $$29989 $$29989: - .incbin "baserom.dol", 0x499830, 0x4 + .4byte 0x42C80000 .global $$210502 $$210502: - .incbin "baserom.dol", 0x499834, 0x4 + .4byte 0xBF800000 .global $$210503 $$210503: - .incbin "baserom.dol", 0x499838, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$210510 $$210510: - .incbin "baserom.dol", 0x499840, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$210511 $$210511: - .incbin "baserom.dol", 0x499848, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$210650 $$210650: - .incbin "baserom.dol", 0x499850, 0x8 + .4byte 0x34000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mXUnitVec__Q34nw4r2ef16DrawStrategyImpl diff --git a/asm/libnw4r_ef/ef_drawstripestrategy.s b/asm/libnw4r_ef/ef_drawstripestrategy.s index c146f8bf..d3e15986 100644 --- a/asm/libnw4r_ef/ef_drawstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawstripestrategy.s @@ -3792,36 +3792,47 @@ __dt__Q34nw4r2ef18DrawStripeStrategyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef18DrawStripeStrategy __vt__Q34nw4r2ef18DrawStripeStrategy: - .incbin "baserom.dol", 0x43C598, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800C3A80 ;# ptr + .4byte 0x800C25A0 ;# ptr + .4byte 0x800BA740 ;# ptr + .4byte 0x800BA760 ;# ptr + .4byte 0x800C3100 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211761 $$211761: - .incbin "baserom.dol", 0x4998F8, 0x4 + .4byte 0x3C23D70A .global $$211762 $$211762: - .incbin "baserom.dol", 0x4998FC, 0x4 + .4byte 0x3F800000 .global $$211769 $$211769: - .incbin "baserom.dol", 0x499900, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$211929 $$211929: - .incbin "baserom.dol", 0x499908, 0x4 + .4byte 0x34000000 .global $$211930 $$211930: - .incbin "baserom.dol", 0x49990C, 0x4 + .4byte 0x3CC90FDB .global $$211931 $$211931: - .incbin "baserom.dol", 0x499910, 0x8 + .4byte 0 + .4byte 0 .global $$211940 $$211940: - .incbin "baserom.dol", 0x499918, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$212421 $$212421: - .incbin "baserom.dol", 0x499920, 0x4 + .4byte 0x43B40000 .global $$212422 $$212422: - .incbin "baserom.dol", 0x499924, 0x4 + .4byte 0x3F360B61 .global $$212628 $$212628: - .incbin "baserom.dol", 0x499928, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_effect.s b/asm/libnw4r_ef/ef_effect.s index baad6f4b..8ec0a96b 100644 --- a/asm/libnw4r_ef/ef_effect.s +++ b/asm/libnw4r_ef/ef_effect.s @@ -879,9 +879,17 @@ lbl_800A4648: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef6Effect __vt__Q34nw4r2ef6Effect: - .incbin "baserom.dol", 0x43C178, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800A3C80 ;# ptr + .4byte 0x800A3C90 ;# ptr + .4byte 0x800A3B40 ;# ptr + .4byte 0x800A4570 ;# ptr + .4byte 0x800A40A0 ;# ptr + .4byte 0x800A44D0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28467 $$28467: - .incbin "baserom.dol", 0x4994B0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_effectsystem.s b/asm/libnw4r_ef/ef_effectsystem.s index d514cd0d..dec802a2 100644 --- a/asm/libnw4r_ef/ef_effectsystem.s +++ b/asm/libnw4r_ef/ef_effectsystem.s @@ -489,25 +489,27 @@ lbl_800A4D04: /* 800A4D4C 000A0B8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402368, 0x4 + .4byte 0x800A4C20 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$27903 $$27903: - .incbin "baserom.dol", 0x43C198, 0x48 + .asciz "<< NW4R - EF \tfinal build: Mar 1 2011 13:31:37 (0x4302_188) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2 NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2: - .incbin "baserom.dol", 0x492D38, 0x8 + .4byte 0x80440098 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28588 $$28588: - .incbin "baserom.dol", 0x4994B8, 0x4 + .4byte 0 .global $$28613 $$28613: - .incbin "baserom.dol", 0x4994BC, 0x4 + .4byte 0x3F800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mSortEffectOperatorZDrawInfo__Q34nw4r2ef12EffectSystem diff --git a/asm/libnw4r_ef/ef_emform.s b/asm/libnw4r_ef/ef_emform.s index 11caa7ae..b2ce0efa 100644 --- a/asm/libnw4r_ef/ef_emform.s +++ b/asm/libnw4r_ef/ef_emform.s @@ -72,12 +72,15 @@ __sinit_$$3ef_emform_cpp: /* 800B4BAC 000B09EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402374, 0x4 + .4byte 0x800B4B50 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitFormBuilder __vt__Q34nw4r2ef15EmitFormBuilder: - .incbin "baserom.dol", 0x43C468, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B4AD0 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gEmitterFormDisc__Q24nw4r2ef diff --git a/asm/libnw4r_ef/ef_emitter.s b/asm/libnw4r_ef/ef_emitter.s index ea6ef674..ca3098eb 100644 --- a/asm/libnw4r_ef/ef_emitter.s +++ b/asm/libnw4r_ef/ef_emitter.s @@ -2351,36 +2351,49 @@ lbl_800A6ED8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef7Emitter __vt__Q34nw4r2ef7Emitter: - .incbin "baserom.dol", 0x43C1E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x800A4E80 ;# ptr + .4byte 0x800A4E90 ;# ptr + .4byte 0x800A53E0 ;# ptr + .4byte 0x800A5550 ;# ptr + .4byte 0x800A6500 ;# ptr + .4byte 0x800A66C0 ;# ptr + .4byte 0x800A6750 ;# ptr + .4byte 0x800A6870 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29108 $$29108: - .incbin "baserom.dol", 0x4994C0, 0x4 + .4byte 0x42C80000 .global $$29109 $$29109: - .incbin "baserom.dol", 0x4994C4, 0x4 + .4byte 0 .global $$29110 $$29110: - .incbin "baserom.dol", 0x4994C8, 0x8 + .4byte 0x7FC00000 + .4byte 0 .global $$29116 $$29116: - .incbin "baserom.dol", 0x4994D0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$29117 $$29117: - .incbin "baserom.dol", 0x4994D8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29451 $$29451: - .incbin "baserom.dol", 0x4994E0, 0x4 + .4byte 0xBF800000 .global $$29488 $$29488: - .incbin "baserom.dol", 0x4994E4, 0x4 + .4byte 0x3F800000 .global $$29546 $$29546: - .incbin "baserom.dol", 0x4994E8, 0x4 + .4byte 0x47800000 .global $$29547 $$29547: - .incbin "baserom.dol", 0x4994EC, 0x4 + .4byte 0x40000000 .global $$29717 $$29717: - .incbin "baserom.dol", 0x4994F0, 0x8 + .4byte 0x3FC90FDB + .4byte 0 diff --git a/asm/libnw4r_ef/ef_emitterform.s b/asm/libnw4r_ef/ef_emitterform.s index 7fb5b8bc..00c36e80 100644 --- a/asm/libnw4r_ef/ef_emitterform.s +++ b/asm/libnw4r_ef/ef_emitterform.s @@ -381,28 +381,31 @@ lbl_800B4678: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27729 $$27729: - .incbin "baserom.dol", 0x499640, 0x4 + .4byte 0 .global $$27730 $$27730: - .incbin "baserom.dol", 0x499644, 0x4 + .4byte 0x47800000 .global $$27731 $$27731: - .incbin "baserom.dol", 0x499648, 0x4 + .4byte 0x40000000 .global $$27732 $$27732: - .incbin "baserom.dol", 0x49964C, 0x4 + .4byte 0x40490FDB .global $$27733 $$27733: - .incbin "baserom.dol", 0x499650, 0x4 + .4byte 0x3F800000 .global $$27734 $$27734: - .incbin "baserom.dol", 0x499654, 0x4 + .4byte 0x3C23D70A .global $$27742 $$27742: - .incbin "baserom.dol", 0x499658, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27743 $$27743: - .incbin "baserom.dol", 0x499660, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$27754 $$27754: - .incbin "baserom.dol", 0x499668, 0x8 + .4byte 0x477FFF00 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_line.s b/asm/libnw4r_ef/ef_line.s index 78740221..43725b35 100644 --- a/asm/libnw4r_ef/ef_line.s +++ b/asm/libnw4r_ef/ef_line.s @@ -222,27 +222,33 @@ lbl_800B51D8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormLine __vt__Q34nw4r2ef15EmitterFormLine: - .incbin "baserom.dol", 0x43C488, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B4F00 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27653 $$27653: - .incbin "baserom.dol", 0x4996A0, 0x4 + .4byte 0x47800000 .global $$27654 $$27654: - .incbin "baserom.dol", 0x4996A4, 0x4 + .4byte 0 .global $$27655 $$27655: - .incbin "baserom.dol", 0x4996A8, 0x4 + .4byte 0x3F000000 .global $$27656 $$27656: - .incbin "baserom.dol", 0x4996AC, 0x4 + .4byte 0x3F800000 .global $$27657 $$27657: - .incbin "baserom.dol", 0x4996B0, 0x8 + .4byte 0x3C23D70A + .4byte 0 .global $$27665 $$27665: - .incbin "baserom.dol", 0x4996B8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27666 $$27666: - .incbin "baserom.dol", 0x4996C0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_particle.s b/asm/libnw4r_ef/ef_particle.s index 36e02671..dd7ff127 100644 --- a/asm/libnw4r_ef/ef_particle.s +++ b/asm/libnw4r_ef/ef_particle.s @@ -948,54 +948,63 @@ lbl_800B023C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef8Particle __vt__Q34nw4r2ef8Particle: - .incbin "baserom.dol", 0x43C408, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800AF4B0 ;# ptr + .4byte 0x800AF4C0 ;# ptr + .4byte 0x800AF7F0 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28602 $$28602: - .incbin "baserom.dol", 0x499568, 0x4 + .4byte 0x47800000 .global $$28603 $$28603: - .incbin "baserom.dol", 0x49956C, 0x4 + .4byte 0x40000000 .global $$28604 $$28604: - .incbin "baserom.dol", 0x499570, 0x4 + .4byte 0x3F800000 .global $$28605 $$28605: - .incbin "baserom.dol", 0x499574, 0x4 + .4byte 0x42C80000 .global $$28606 $$28606: - .incbin "baserom.dol", 0x499578, 0x4 + .4byte 0x43000000 .global $$28607 $$28607: - .incbin "baserom.dol", 0x49957C, 0x4 + .4byte 0x40490FDB .global $$28608 $$28608: - .incbin "baserom.dol", 0x499580, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$28613 $$28613: - .incbin "baserom.dol", 0x499588, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$28192 $$28192: - .incbin "baserom.dol", 0x499590, 0x4 + .4byte 0xFFFFFFFF .global $$28194 $$28194: - .incbin "baserom.dol", 0x499594, 0x4 + .4byte 0xFFFFFFFF .global $$28839 $$28839: - .incbin "baserom.dol", 0x499598, 0x4 + .4byte 0 .global $$28840 $$28840: - .incbin "baserom.dol", 0x49959C, 0x4 + .4byte 0x3C23D70A .global $$28841 $$28841: - .incbin "baserom.dol", 0x4995A0, 0x8 + .4byte 0x3CC90FDB + .4byte 0 .global $$28851 $$28851: - .incbin "baserom.dol", 0x4995A8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$28888 $$28888: - .incbin "baserom.dol", 0x4995B0, 0x4 + .4byte 0x4222F983 .global $$28889 $$28889: - .incbin "baserom.dol", 0x4995B4, 0x4 + .4byte 0x40C90FDB diff --git a/asm/libnw4r_ef/ef_particlemanager.s b/asm/libnw4r_ef/ef_particlemanager.s index fa857ca4..d6fc7893 100644 --- a/asm/libnw4r_ef/ef_particlemanager.s +++ b/asm/libnw4r_ef/ef_particlemanager.s @@ -2380,59 +2380,79 @@ __sinit_$$3ef_particlemanager_cpp: /* 800B253C 000AE37C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40236C, 0x4 + .4byte 0x800B2530 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$211043 $$211043: - .incbin "baserom.dol", 0x43C420, 0x28 + .4byte 0x800B0E90 ;# ptr + .4byte 0x800B0E68 ;# ptr + .4byte 0x800B1394 ;# ptr + .4byte 0x800B13E8 ;# ptr + .4byte 0x800B1478 ;# ptr + .4byte 0x800B15E8 ;# ptr + .4byte 0x800B1328 ;# ptr + .4byte 0x800B0ED4 ;# ptr + .4byte 0x800B1578 ;# ptr + .4byte 0 .global __vt__Q34nw4r2ef15ParticleManager __vt__Q34nw4r2ef15ParticleManager: - .incbin "baserom.dol", 0x43C448, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800B02C0 ;# ptr + .4byte 0x800B02D0 ;# ptr + .4byte 0x800B0440 ;# ptr + .4byte 0x800B05A0 ;# ptr + .4byte 0x800B06D0 ;# ptr + .4byte 0x800B1C20 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210377 $$210377: - .incbin "baserom.dol", 0x4995B8, 0x4 + .4byte 0x3F800000 .global $$210378 $$210378: - .incbin "baserom.dol", 0x4995BC, 0x4 + .4byte 0 .global $$211032 $$211032: - .incbin "baserom.dol", 0x4995C0, 0x4 + .4byte 0x3F13CD3A .global $$211033 $$211033: - .incbin "baserom.dol", 0x4995C4, 0x4 + .4byte 0x47000000 .global $$211034 $$211034: - .incbin "baserom.dol", 0x4995C8, 0x4 + .4byte 0x477FFF00 .global $$211035 $$211035: - .incbin "baserom.dol", 0x4995CC, 0x4 + .4byte 0x40000000 .global $$211036 $$211036: - .incbin "baserom.dol", 0x4995D0, 0x4 + .4byte 0x40490FDB .global $$211037 $$211037: - .incbin "baserom.dol", 0x4995D4, 0x4 + .4byte 0x4222F983 .global $$211038 $$211038: - .incbin "baserom.dol", 0x4995D8, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$211039 $$211039: - .incbin "baserom.dol", 0x4995E0, 0x8 + .4byte 0xBF800000 + .4byte 0 .global $$211044 $$211044: - .incbin "baserom.dol", 0x4995E8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$211045 $$211045: - .incbin "baserom.dol", 0x4995F0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$211202 $$211202: - .incbin "baserom.dol", 0x4995F8, 0x4 + .4byte 0x34000000 .global $$211203 $$211203: - .incbin "baserom.dol", 0x4995FC, 0x4 + .4byte 0x43800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global smDrawMtxPMtoEM__Q34nw4r2ef15ParticleManager diff --git a/asm/libnw4r_ef/ef_point.s b/asm/libnw4r_ef/ef_point.s index 0259c41a..bd450f08 100644 --- a/asm/libnw4r_ef/ef_point.s +++ b/asm/libnw4r_ef/ef_point.s @@ -226,36 +226,41 @@ lbl_800B4E80: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16EmitterFormPoint __vt__Q34nw4r2ef16EmitterFormPoint: - .incbin "baserom.dol", 0x43C478, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B4BB0 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27645 $$27645: - .incbin "baserom.dol", 0x499670, 0x4 + .4byte 0 .global $$27646 $$27646: - .incbin "baserom.dol", 0x499674, 0x4 + .4byte 0x47800000 .global $$27647 $$27647: - .incbin "baserom.dol", 0x499678, 0x4 + .4byte 0x40000000 .global $$27648 $$27648: - .incbin "baserom.dol", 0x49967C, 0x4 + .4byte 0x3F800000 .global $$27649 $$27649: - .incbin "baserom.dol", 0x499680, 0x4 + .4byte 0x3F28F5C3 .global $$27650 $$27650: - .incbin "baserom.dol", 0x499684, 0x4 + .4byte 0x3EAE147B .global $$27651 $$27651: - .incbin "baserom.dol", 0x499688, 0x4 + .4byte 0x40490FDB .global $$27652 $$27652: - .incbin "baserom.dol", 0x49968C, 0x4 + .4byte 0x3C23D70A .global $$27659 $$27659: - .incbin "baserom.dol", 0x499690, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27660 $$27660: - .incbin "baserom.dol", 0x499698, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_postfield.s b/asm/libnw4r_ef/ef_postfield.s index dc223a6e..170114fe 100644 --- a/asm/libnw4r_ef/ef_postfield.s +++ b/asm/libnw4r_ef/ef_postfield.s @@ -3804,43 +3804,43 @@ lbl_800AF468: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210295 $$210295: - .incbin "baserom.dol", 0x499530, 0x4 + .4byte 0xBF800000 .global $$210296 $$210296: - .incbin "baserom.dol", 0x499534, 0x4 + .4byte 0x3F800000 .global $$210297 $$210297: - .incbin "baserom.dol", 0x499538, 0x4 + .4byte 0 .global $$210450 $$210450: - .incbin "baserom.dol", 0x49953C, 0x4 + .4byte 0x40000000 .global $$210451 $$210451: - .incbin "baserom.dol", 0x499540, 0x4 + .4byte 0x34000000 .global $$210548 $$210548: - .incbin "baserom.dol", 0x499544, 0x4 + .4byte 0x3F800001 .global $$210645 $$210645: - .incbin "baserom.dol", 0x499548, 0x4 + .4byte 0x3F800002 .global $$210769 $$210769: - .incbin "baserom.dol", 0x49954C, 0x4 + .4byte 0x40800000 .global $$210770 $$210770: - .incbin "baserom.dol", 0x499550, 0x4 + .4byte 0xC0000000 .global $$210771 $$210771: - .incbin "baserom.dol", 0x499554, 0x4 + .4byte 0xB4000000 .global $$210772 $$210772: - .incbin "baserom.dol", 0x499558, 0x4 + .4byte 0x3F800054 .global $$210773 $$210773: - .incbin "baserom.dol", 0x49955C, 0x4 + .4byte 0x3F7FFF58 .global $$211049 $$211049: - .incbin "baserom.dol", 0x499560, 0x4 + .4byte 0x3FC00000 .global $$211203 $$211203: - .incbin "baserom.dol", 0x499564, 0x4 + .4byte 0x28800000 diff --git a/asm/libnw4r_ef/ef_resource.s b/asm/libnw4r_ef/ef_resource.s index e968ece7..0030dd1f 100644 --- a/asm/libnw4r_ef/ef_resource.s +++ b/asm/libnw4r_ef/ef_resource.s @@ -852,7 +852,7 @@ __sinit_$$3ef_resource_cpp: /* 800B30AC 000AEEEC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402370, 0x4 + .4byte 0x800B3060 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global mResource__Q34nw4r2ef8Resource diff --git a/asm/libnw4r_ef/ef_sphere.s b/asm/libnw4r_ef/ef_sphere.s index d62c9986..605accd7 100644 --- a/asm/libnw4r_ef/ef_sphere.s +++ b/asm/libnw4r_ef/ef_sphere.s @@ -570,51 +570,59 @@ lbl_800B5F2C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef17EmitterFormSphere __vt__Q34nw4r2ef17EmitterFormSphere: - .incbin "baserom.dol", 0x43C4A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B5780 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27843 $$27843: - .incbin "baserom.dol", 0x499710, 0x4 + .4byte 0x42C80000 .global $$27844 $$27844: - .incbin "baserom.dol", 0x499714, 0x4 + .4byte 0x34000000 .global $$27845 $$27845: - .incbin "baserom.dol", 0x499718, 0x4 + .4byte 0x47800000 .global $$27846 $$27846: - .incbin "baserom.dol", 0x49971C, 0x4 + .4byte 0x40000000 .global $$27847 $$27847: - .incbin "baserom.dol", 0x499720, 0x8 + .4byte 0x40490FDB + .4byte 0 .global $$27848 $$27848: - .incbin "baserom.dol", 0x499728, 0x8 + .4byte 0x401921FB + .4byte 0x60000000 .global $$27849 $$27849: - .incbin "baserom.dol", 0x499730, 0x4 + .4byte 0x39490FDB .global $$27850 $$27850: - .incbin "baserom.dol", 0x499734, 0x4 + .4byte 0x40C90E49 .global $$27851 $$27851: - .incbin "baserom.dol", 0x499738, 0x4 + .4byte 0x3FC90FDB .global $$27852 $$27852: - .incbin "baserom.dol", 0x49973C, 0x4 + .4byte 0x3F800000 .global $$27853 $$27853: - .incbin "baserom.dol", 0x499740, 0x4 + .4byte 0 .global $$27854 $$27854: - .incbin "baserom.dol", 0x499744, 0x4 + .4byte 0xBF800000 .global $$27855 $$27855: - .incbin "baserom.dol", 0x499748, 0x8 + .4byte 0x3C23D70A + .4byte 0 .global $$27863 $$27863: - .incbin "baserom.dol", 0x499750, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27864 $$27864: - .incbin "baserom.dol", 0x499758, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_torus.s b/asm/libnw4r_ef/ef_torus.s index dc39459a..5ef5bf24 100644 --- a/asm/libnw4r_ef/ef_torus.s +++ b/asm/libnw4r_ef/ef_torus.s @@ -428,48 +428,55 @@ lbl_800B6D24: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16EmitterFormTorus __vt__Q34nw4r2ef16EmitterFormTorus: - .incbin "baserom.dol", 0x43C4C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800B6790 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27765 $$27765: - .incbin "baserom.dol", 0x4997A8, 0x4 + .4byte 0x34000000 .global $$27766 $$27766: - .incbin "baserom.dol", 0x4997AC, 0x4 + .4byte 0 .global $$27767 $$27767: - .incbin "baserom.dol", 0x4997B0, 0x4 + .4byte 0x47800000 .global $$27768 $$27768: - .incbin "baserom.dol", 0x4997B4, 0x4 + .4byte 0x40000000 .global $$27769 $$27769: - .incbin "baserom.dol", 0x4997B8, 0x8 + .4byte 0x40490FDB + .4byte 0 .global $$27770 $$27770: - .incbin "baserom.dol", 0x4997C0, 0x8 + .4byte 0x401921FB + .4byte 0x60000000 .global $$27771 $$27771: - .incbin "baserom.dol", 0x4997C8, 0x4 + .4byte 0x39490FDB .global $$27772 $$27772: - .incbin "baserom.dol", 0x4997CC, 0x4 + .4byte 0x40C90E49 .global $$27773 $$27773: - .incbin "baserom.dol", 0x4997D0, 0x4 + .4byte 0x42C80000 .global $$27774 $$27774: - .incbin "baserom.dol", 0x4997D4, 0x4 + .4byte 0x3F800000 .global $$27775 $$27775: - .incbin "baserom.dol", 0x4997D8, 0x4 + .4byte 0x3C23D70A .global $$27776 $$27776: - .incbin "baserom.dol", 0x4997DC, 0x4 + .4byte 0x40C90FDB .global $$27784 $$27784: - .incbin "baserom.dol", 0x4997E0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$27785 $$27785: - .incbin "baserom.dol", 0x4997E8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_util.s b/asm/libnw4r_ef/ef_util.s index a550e8db..4682a678 100644 --- a/asm/libnw4r_ef/ef_util.s +++ b/asm/libnw4r_ef/ef_util.s @@ -1102,48 +1102,57 @@ MTXColLen__Q24nw4r2efFPCQ34nw4r4math5MTX34i: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global sPS_Three_Half__Q24nw4r2ef sPS_Three_Half__Q24nw4r2ef: - .incbin "baserom.dol", 0x492D40, 0x20 + .4byte 0x40400000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26727 $$26727: - .incbin "baserom.dol", 0x499600, 0x8 + .4byte 0x47800000 + .4byte 0x47800000 .global $$26728 $$26728: - .incbin "baserom.dol", 0x499608, 0x4 + .4byte 0x4222F983 .global $$26743 $$26743: - .incbin "baserom.dol", 0x49960C, 0x4 + .4byte 0x3F800000 .global $$26744 $$26744: - .incbin "baserom.dol", 0x499610, 0x4 + .4byte 0x34000000 .global $$26745 $$26745: - .incbin "baserom.dol", 0x499614, 0x4 + .4byte 0 .global $$26793 $$26793: - .incbin "baserom.dol", 0x499618, 0x4 + .4byte 0x00800000 .global $$26794 $$26794: - .incbin "baserom.dol", 0x49961C, 0x4 + .4byte 0xBF800000 .global $$26866 $$26866: - .incbin "baserom.dol", 0x499620, 0x8 + .4byte 0xBFF00000 + .4byte 0 .global $$26871 $$26871: - .incbin "baserom.dol", 0x499628, 0x4 + .4byte 0x3F000000 .global $$26872 $$26872: - .incbin "baserom.dol", 0x49962C, 0x4 + .4byte 0x40400000 .global $$26879 $$26879: - .incbin "baserom.dol", 0x499630, 0x4 + .4byte 0x47800000 .global $$26916 $$26916: - .incbin "baserom.dol", 0x499634, 0x4 + .4byte 0x3727C5AC .global $$26934 $$26934: - .incbin "baserom.dol", 0x499638, 0x4 + .4byte 0x47C35000 .global EMITTER_ZERO_SCALE__Q24nw4r2ef EMITTER_ZERO_SCALE__Q24nw4r2ef: - .incbin "baserom.dol", 0x49963C, 0x4 + .4byte 0x3727C5AC diff --git a/asm/libnw4r_g3d/g3d_3dsmax.s b/asm/libnw4r_g3d/g3d_3dsmax.s index f9712338..581b25f4 100644 --- a/asm/libnw4r_g3d/g3d_3dsmax.s +++ b/asm/libnw4r_g3d/g3d_3dsmax.s @@ -757,24 +757,37 @@ lbl_800E90F8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .incbin "baserom.dol", 0x404F58, 0x1C + .4byte 0x800E8940 ;# ptr + .4byte 0x800E8810 ;# ptr + .4byte 0x800E88E0 ;# ptr + .4byte 0x800E8710 ;# ptr + .4byte 0x800E8750 ;# ptr + .4byte 0x800E8660 ;# ptr + .4byte 0x800E8610 ;# ptr .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .incbin "baserom.dol", 0x404F74, 0x1C + .4byte 0x800E8F00 ;# ptr + .4byte 0x800E8D20 ;# ptr + .4byte 0x800E8E60 ;# ptr + .4byte 0x800E8BC0 ;# ptr + .4byte 0x800E8BD0 ;# ptr + .4byte 0x800E8A90 ;# ptr + .4byte 0x800E8A10 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26188 $$26188: - .incbin "baserom.dol", 0x499BE8, 0x4 + .4byte 0 .global $$26189 $$26189: - .incbin "baserom.dol", 0x499BEC, 0x4 + .4byte 0x3F000000 .global $$26190 $$26190: - .incbin "baserom.dol", 0x499BF0, 0x4 + .4byte 0x3F800000 .global $$26194 $$26194: - .incbin "baserom.dol", 0x499BF4, 0x4 + .4byte 0x3F360B61 .global $$26195 $$26195: - .incbin "baserom.dol", 0x499BF8, 0x8 + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmchr.s b/asm/libnw4r_g3d/g3d_anmchr.s index 676aca2a..cb01ae46 100644 --- a/asm/libnw4r_g3d/g3d_anmchr.s +++ b/asm/libnw4r_g3d/g3d_anmchr.s @@ -1923,41 +1923,136 @@ GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjChr TYPE_NAME__Q34nw4r3g3d9AnmObjChr: - .incbin "baserom.dol", 0x404628, 0x10 + .4byte 0x0000000A + .asciz "AnmObjChr" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode: - .incbin "baserom.dol", 0x404638, 0x14 + .4byte 0x0000000E + .asciz "AnmObjChrNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend: - .incbin "baserom.dol", 0x40464C, 0x14 + .4byte 0x0000000F + .asciz "AnmObjChrBlend" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes: - .incbin "baserom.dol", 0x404660, 0x18 + .4byte 0x0000000D + .asciz "AnmObjChrRes" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjChrRes __vt__Q34nw4r3g3d12AnmObjChrRes: - .incbin "baserom.dol", 0x43CC70, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x800D9490 ;# ptr + .4byte 0x800D9480 ;# ptr + .4byte 0x800D9570 ;# ptr + .4byte 0x800D9560 ;# ptr + .4byte 0x800D9550 ;# ptr + .4byte 0x800D8D60 ;# ptr + .4byte 0x800D8E20 ;# ptr + .4byte 0x800D8F00 ;# ptr + .4byte 0x800D8E30 ;# ptr + .4byte 0x800D8EF0 ;# ptr + .4byte 0x800D8FE0 ;# ptr + .4byte 0x800D7E40 ;# ptr + .4byte 0x800D9400 ;# ptr + .4byte 0x800D7E50 ;# ptr + .4byte 0x800D7E60 ;# ptr + .4byte 0x800D7E90 ;# ptr + .4byte 0x800D7E70 ;# ptr + .4byte 0x800D7E80 ;# ptr + .4byte 0x800D8FF0 ;# ptr + .4byte 0x800D91F0 ;# ptr .global __vt__Q34nw4r3g3d14AnmObjChrBlend __vt__Q34nw4r3g3d14AnmObjChrBlend: - .incbin "baserom.dol", 0x43CCC8, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x800D9580 ;# ptr + .4byte 0x800D8380 ;# ptr + .4byte 0x800D9690 ;# ptr + .4byte 0x800D9680 ;# ptr + .4byte 0x800D9670 ;# ptr + .4byte 0x800D8020 ;# ptr + .4byte 0x800D8030 ;# ptr + .4byte 0x800D8010 ;# ptr + .4byte 0x800D8090 ;# ptr + .4byte 0x800D80A0 ;# ptr + .4byte 0x800D8100 ;# ptr + .4byte 0x800D8220 ;# ptr + .4byte 0x800D8510 ;# ptr + .4byte 0x800D7FE0 ;# ptr + .4byte 0x800D7FF0 ;# ptr + .4byte 0x800D8000 ;# ptr + .4byte 0x800D8B50 ;# ptr + .4byte 0x800D8B60 ;# ptr + .4byte 0x800D8110 ;# ptr + .4byte 0x800D8230 ;# ptr .global __vt__Q34nw4r3g3d13AnmObjChrNode __vt__Q34nw4r3g3d13AnmObjChrNode: - .incbin "baserom.dol", 0x43CD20, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x800D9600 ;# ptr + .4byte 0x800D8380 ;# ptr + .4byte 0x800D7F70 ;# ptr + .4byte 0x800D9710 ;# ptr + .4byte 0x800D9700 ;# ptr + .4byte 0x800D8020 ;# ptr + .4byte 0x800D8030 ;# ptr + .4byte 0x800D8010 ;# ptr + .4byte 0x800D8090 ;# ptr + .4byte 0x800D80A0 ;# ptr + .4byte 0x800D8100 ;# ptr + .4byte 0x800D8220 ;# ptr + .4byte 0 + .4byte 0x800D7FE0 ;# ptr + .4byte 0x800D7FF0 ;# ptr + .4byte 0x800D8000 ;# ptr + .4byte 0x800D7E70 ;# ptr + .4byte 0x800D7E80 ;# ptr + .4byte 0x800D8110 ;# ptr + .4byte 0x800D8230 ;# ptr .global __vt__Q34nw4r3g3d9AnmObjChr __vt__Q34nw4r3g3d9AnmObjChr: - .incbin "baserom.dol", 0x43CD78, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x800D9500 ;# ptr + .4byte 0 + .4byte 0x800D7F60 ;# ptr + .4byte 0x800D9730 ;# ptr + .4byte 0x800D9720 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D7E40 ;# ptr + .4byte 0 + .4byte 0x800D7E50 ;# ptr + .4byte 0x800D7E60 ;# ptr + .4byte 0x800D7E90 ;# ptr + .4byte 0x800D7E70 ;# ptr + .4byte 0x800D7E80 ;# ptr + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28469 $$28469: - .incbin "baserom.dol", 0x499AA0, 0x4 + .4byte 0 .global $$28582 $$28582: - .incbin "baserom.dol", 0x499AA4, 0x4 + .4byte 0x3F800000 .global $$28854 $$28854: - .incbin "baserom.dol", 0x499AA8, 0x8 + .4byte 0x7FC00000 + .4byte 0 .global $$28928 $$28928: - .incbin "baserom.dol", 0x499AB0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmclr.s b/asm/libnw4r_g3d/g3d_anmclr.s index cb414dbc..24d17f53 100644 --- a/asm/libnw4r_g3d/g3d_anmclr.s +++ b/asm/libnw4r_g3d/g3d_anmclr.s @@ -1717,38 +1717,117 @@ GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr: - .incbin "baserom.dol", 0x4044F0, 0x18 + .4byte 0x0000000D + .asciz "AnmObjMatClr" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode: - .incbin "baserom.dol", 0x404508, 0x18 + .4byte 0x00000011 + .asciz "AnmObjMatClrNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride: - .incbin "baserom.dol", 0x404520, 0x20 + .4byte 0x00000015 + .asciz "AnmObjMatClrOverride" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes: - .incbin "baserom.dol", 0x404540, 0x18 + .4byte 0x00000010 + .asciz "AnmObjMatClrRes" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjMatClrRes __vt__Q34nw4r3g3d15AnmObjMatClrRes: - .incbin "baserom.dol", 0x43C910, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D5E90 ;# ptr + .4byte 0x800D5A60 ;# ptr + .4byte 0x800D5F70 ;# ptr + .4byte 0x800D5F60 ;# ptr + .4byte 0x800D5F50 ;# ptr + .4byte 0x800D5660 ;# ptr + .4byte 0x800D5720 ;# ptr + .4byte 0x800D5800 ;# ptr + .4byte 0x800D5730 ;# ptr + .4byte 0x800D57F0 ;# ptr + .4byte 0x800D58E0 ;# ptr + .4byte 0x800D4AB0 ;# ptr + .4byte 0x800D59E0 ;# ptr + .4byte 0x800D4AC0 ;# ptr + .4byte 0x800D4AD0 ;# ptr + .4byte 0x800D4AE0 ;# ptr .global __vt__Q34nw4r3g3d20AnmObjMatClrOverride __vt__Q34nw4r3g3d20AnmObjMatClrOverride: - .incbin "baserom.dol", 0x43C958, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D5F80 ;# ptr + .4byte 0x800D5200 ;# ptr + .4byte 0x800D6090 ;# ptr + .4byte 0x800D6080 ;# ptr + .4byte 0x800D6070 ;# ptr + .4byte 0x800D4E60 ;# ptr + .4byte 0x800D4EF0 ;# ptr + .4byte 0x800D4DE0 ;# ptr + .4byte 0x800D4F50 ;# ptr + .4byte 0x800D4FE0 ;# ptr + .4byte 0x800D5040 ;# ptr + .4byte 0x800D5140 ;# ptr + .4byte 0x800D53C0 ;# ptr + .4byte 0x800D4B70 ;# ptr + .4byte 0x800D4C60 ;# ptr + .4byte 0x800D4D80 ;# ptr .global __vt__Q34nw4r3g3d16AnmObjMatClrNode __vt__Q34nw4r3g3d16AnmObjMatClrNode: - .incbin "baserom.dol", 0x43C9A0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D6000 ;# ptr + .4byte 0x800D5200 ;# ptr + .4byte 0x800D4B00 ;# ptr + .4byte 0x800D6110 ;# ptr + .4byte 0x800D6100 ;# ptr + .4byte 0x800D4E60 ;# ptr + .4byte 0x800D4EF0 ;# ptr + .4byte 0x800D4DE0 ;# ptr + .4byte 0x800D4F50 ;# ptr + .4byte 0x800D4FE0 ;# ptr + .4byte 0x800D5040 ;# ptr + .4byte 0x800D5140 ;# ptr + .4byte 0 + .4byte 0x800D4B70 ;# ptr + .4byte 0x800D4C60 ;# ptr + .4byte 0x800D4D80 ;# ptr .global __vt__Q34nw4r3g3d12AnmObjMatClr __vt__Q34nw4r3g3d12AnmObjMatClr: - .incbin "baserom.dol", 0x43C9E8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D5F00 ;# ptr + .4byte 0 + .4byte 0x800D4AF0 ;# ptr + .4byte 0x800D6130 ;# ptr + .4byte 0x800D6120 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D4AB0 ;# ptr + .4byte 0 + .4byte 0x800D4AC0 ;# ptr + .4byte 0x800D4AD0 ;# ptr + .4byte 0x800D4AE0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28993 $$28993: - .incbin "baserom.dol", 0x499A60, 0x4 + .4byte 0 .global $$29016 $$29016: - .incbin "baserom.dol", 0x499A64, 0x4 + .4byte 0x3F800000 .global $$29168 $$29168: - .incbin "baserom.dol", 0x499A68, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmobj.s b/asm/libnw4r_g3d/g3d_anmobj.s index 1c4a5624..94278b35 100644 --- a/asm/libnw4r_g3d/g3d_anmobj.s +++ b/asm/libnw4r_g3d/g3d_anmobj.s @@ -71,14 +71,19 @@ TestAnmFlag__Q34nw4r3g3d6AnmObjCFQ44nw4r3g3d6AnmObj7AnmFlag: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6AnmObj TYPE_NAME__Q34nw4r3g3d6AnmObj: - .incbin "baserom.dol", 0x4046F8, 0x10 + .4byte 0x00000007 + .asciz "AnmObj" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl: - .incbin "baserom.dol", 0x492DD0, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25234 $$25234: - .incbin "baserom.dol", 0x499AE8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmscn.s b/asm/libnw4r_g3d/g3d_anmscn.s index e0669bf2..6d2ddf09 100644 --- a/asm/libnw4r_g3d/g3d_anmscn.s +++ b/asm/libnw4r_g3d/g3d_anmscn.s @@ -1598,32 +1598,110 @@ GetTypeObj__Q34nw4r3g3d6AnmScnCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6AnmScn TYPE_NAME__Q34nw4r3g3d6AnmScn: - .incbin "baserom.dol", 0x4046C8, 0x10 + .4byte 0x00000007 + .asciz "AnmScn" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d9AnmScnRes TYPE_NAME__Q34nw4r3g3d9AnmScnRes: - .incbin "baserom.dol", 0x4046D8, 0x10 + .4byte 0x0000000A + .asciz "AnmScnRes" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d9AnmScnRes __vt__Q34nw4r3g3d9AnmScnRes: - .incbin "baserom.dol", 0x43CF10, 0x90 + .4byte 0 + .4byte 0 + .4byte 0x800DBC40 ;# ptr + .4byte 0x800DB250 ;# ptr + .4byte 0x800DB110 ;# ptr + .4byte 0x800DBCE0 ;# ptr + .4byte 0x800DBCD0 ;# ptr + .4byte 0x800DB120 ;# ptr + .4byte 0x800DB180 ;# ptr + .4byte 0x800DB190 ;# ptr + .4byte 0x800DB1C0 ;# ptr + .4byte 0x800DB1D0 ;# ptr + .4byte 0x800DAD60 ;# ptr + .4byte 0x800DAD70 ;# ptr + .4byte 0x800DADC0 ;# ptr + .4byte 0x800DADD0 ;# ptr + .4byte 0x800DADE0 ;# ptr + .4byte 0x800DADF0 ;# ptr + .4byte 0x800DAE00 ;# ptr + .4byte 0x800DAE10 ;# ptr + .4byte 0x800DAE20 ;# ptr + .4byte 0x800DAE30 ;# ptr + .4byte 0x800DAE40 ;# ptr + .4byte 0x800DAE50 ;# ptr + .4byte 0x800DAE60 ;# ptr + .4byte 0x800DB2A0 ;# ptr + .4byte 0x800DB3E0 ;# ptr + .4byte 0x800DB450 ;# ptr + .4byte 0x800DB5D0 ;# ptr + .4byte 0x800DB680 ;# ptr + .4byte 0x800DBA30 ;# ptr + .4byte 0x800DBA70 ;# ptr + .4byte 0x800DB7E0 ;# ptr + .4byte 0x800DB880 ;# ptr + .4byte 0x800DB910 ;# ptr + .4byte 0x800DB9A0 ;# ptr .global __vt__Q34nw4r3g3d6AnmScn __vt__Q34nw4r3g3d6AnmScn: - .incbin "baserom.dol", 0x43CFA0, 0x90 + .4byte 0 + .4byte 0 + .4byte 0x800DBC90 ;# ptr + .4byte 0 + .4byte 0x800DAD80 ;# ptr + .4byte 0x800DBD00 ;# ptr + .4byte 0x800DBCF0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800DAD60 ;# ptr + .4byte 0x800DAD70 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213876 $$213876: - .incbin "baserom.dol", 0x499AC8, 0x4 + .4byte 0 .global $$213877 $$213877: - .incbin "baserom.dol", 0x499ACC, 0x4 + .4byte 0xD01502F9 .global $$213878 $$213878: - .incbin "baserom.dol", 0x499AD0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$214573 $$214573: - .incbin "baserom.dol", 0x499AD8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$214811 $$214811: - .incbin "baserom.dol", 0x499AE0, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmshp.s b/asm/libnw4r_g3d/g3d_anmshp.s index a0546fb2..2d6f9322 100644 --- a/asm/libnw4r_g3d/g3d_anmshp.s +++ b/asm/libnw4r_g3d/g3d_anmshp.s @@ -1303,38 +1303,124 @@ GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjShp TYPE_NAME__Q34nw4r3g3d9AnmObjShp: - .incbin "baserom.dol", 0x404678, 0x10 + .4byte 0x0000000A + .asciz "AnmObjShp" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode: - .incbin "baserom.dol", 0x404688, 0x14 + .4byte 0x0000000E + .asciz "AnmObjShpNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend: - .incbin "baserom.dol", 0x40469C, 0x14 + .4byte 0x0000000F + .asciz "AnmObjShpBlend" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes: - .incbin "baserom.dol", 0x4046B0, 0x18 + .4byte 0x0000000D + .asciz "AnmObjShpRes" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjShpRes __vt__Q34nw4r3g3d12AnmObjShpRes: - .incbin "baserom.dol", 0x43CDD0, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x800DA540 ;# ptr + .4byte 0x800DA530 ;# ptr + .4byte 0x800DA620 ;# ptr + .4byte 0x800DA610 ;# ptr + .4byte 0x800DA600 ;# ptr + .4byte 0x800DA050 ;# ptr + .4byte 0x800DA120 ;# ptr + .4byte 0x800DA200 ;# ptr + .4byte 0x800DA130 ;# ptr + .4byte 0x800DA1F0 ;# ptr + .4byte 0x800DA2F0 ;# ptr + .4byte 0x800D9740 ;# ptr + .4byte 0x800DA4B0 ;# ptr + .4byte 0x800D9750 ;# ptr + .4byte 0x800D9760 ;# ptr + .4byte 0x800D9790 ;# ptr + .4byte 0x800D9770 ;# ptr + .4byte 0x800D9780 ;# ptr .global __vt__Q34nw4r3g3d14AnmObjShpBlend __vt__Q34nw4r3g3d14AnmObjShpBlend: - .incbin "baserom.dol", 0x43CE20, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x800DA630 ;# ptr + .4byte 0x800D9960 ;# ptr + .4byte 0x800DA740 ;# ptr + .4byte 0x800DA730 ;# ptr + .4byte 0x800DA720 ;# ptr + .4byte 0x800D9860 ;# ptr + .4byte 0x800D9870 ;# ptr + .4byte 0x800D9850 ;# ptr + .4byte 0x800D98D0 ;# ptr + .4byte 0x800D98E0 ;# ptr + .4byte 0x800D9940 ;# ptr + .4byte 0x800D9950 ;# ptr + .4byte 0x800D9AF0 ;# ptr + .4byte 0x800D9820 ;# ptr + .4byte 0x800D9830 ;# ptr + .4byte 0x800D9840 ;# ptr + .4byte 0x800D9DF0 ;# ptr + .4byte 0x800D9E00 ;# ptr .global __vt__Q34nw4r3g3d13AnmObjShpNode __vt__Q34nw4r3g3d13AnmObjShpNode: - .incbin "baserom.dol", 0x43CE70, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x800DA6B0 ;# ptr + .4byte 0x800D9960 ;# ptr + .4byte 0x800D97B0 ;# ptr + .4byte 0x800DA7C0 ;# ptr + .4byte 0x800DA7B0 ;# ptr + .4byte 0x800D9860 ;# ptr + .4byte 0x800D9870 ;# ptr + .4byte 0x800D9850 ;# ptr + .4byte 0x800D98D0 ;# ptr + .4byte 0x800D98E0 ;# ptr + .4byte 0x800D9940 ;# ptr + .4byte 0x800D9950 ;# ptr + .4byte 0 + .4byte 0x800D9820 ;# ptr + .4byte 0x800D9830 ;# ptr + .4byte 0x800D9840 ;# ptr + .4byte 0x800D9770 ;# ptr + .4byte 0x800D9780 ;# ptr .global __vt__Q34nw4r3g3d9AnmObjShp __vt__Q34nw4r3g3d9AnmObjShp: - .incbin "baserom.dol", 0x43CEC0, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x800DA5B0 ;# ptr + .4byte 0 + .4byte 0x800D97A0 ;# ptr + .4byte 0x800DA7E0 ;# ptr + .4byte 0x800DA7D0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D9740 ;# ptr + .4byte 0 + .4byte 0x800D9750 ;# ptr + .4byte 0x800D9760 ;# ptr + .4byte 0x800D9790 ;# ptr + .4byte 0x800D9770 ;# ptr + .4byte 0x800D9780 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28380 $$28380: - .incbin "baserom.dol", 0x499AB8, 0x4 + .4byte 0 .global $$28493 $$28493: - .incbin "baserom.dol", 0x499ABC, 0x4 + .4byte 0x3F800000 .global $$28769 $$28769: - .incbin "baserom.dol", 0x499AC0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat.s b/asm/libnw4r_g3d/g3d_anmtexpat.s index eaa55e29..daccb214 100644 --- a/asm/libnw4r_g3d/g3d_anmtexpat.s +++ b/asm/libnw4r_g3d/g3d_anmtexpat.s @@ -1155,38 +1155,117 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat: - .incbin "baserom.dol", 0x404558, 0x18 + .4byte 0x0000000D + .asciz "AnmObjTexPat" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode: - .incbin "baserom.dol", 0x404570, 0x18 + .4byte 0x00000011 + .asciz "AnmObjTexPatNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride: - .incbin "baserom.dol", 0x404588, 0x20 + .4byte 0x00000015 + .asciz "AnmObjTexPatOverride" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes: - .incbin "baserom.dol", 0x4045A8, 0x18 + .4byte 0x00000010 + .asciz "AnmObjTexPatRes" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjTexPatRes __vt__Q34nw4r3g3d15AnmObjTexPatRes: - .incbin "baserom.dol", 0x43CA30, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D6D50 ;# ptr + .4byte 0x800D6B40 ;# ptr + .4byte 0x800D6E30 ;# ptr + .4byte 0x800D6E20 ;# ptr + .4byte 0x800D6E10 ;# ptr + .4byte 0x800D6740 ;# ptr + .4byte 0x800D6800 ;# ptr + .4byte 0x800D68E0 ;# ptr + .4byte 0x800D6810 ;# ptr + .4byte 0x800D68D0 ;# ptr + .4byte 0x800D69C0 ;# ptr + .4byte 0x800D6140 ;# ptr + .4byte 0x800D6AC0 ;# ptr + .4byte 0x800D6150 ;# ptr + .4byte 0x800D6160 ;# ptr + .4byte 0x800D6170 ;# ptr .global __vt__Q34nw4r3g3d20AnmObjTexPatOverride __vt__Q34nw4r3g3d20AnmObjTexPatOverride: - .incbin "baserom.dol", 0x43CA78, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D6E40 ;# ptr + .4byte 0x800D6340 ;# ptr + .4byte 0x800D6F50 ;# ptr + .4byte 0x800D6F40 ;# ptr + .4byte 0x800D6F30 ;# ptr + .4byte 0x800D6240 ;# ptr + .4byte 0x800D6250 ;# ptr + .4byte 0x800D6230 ;# ptr + .4byte 0x800D62B0 ;# ptr + .4byte 0x800D62C0 ;# ptr + .4byte 0x800D6320 ;# ptr + .4byte 0x800D6330 ;# ptr + .4byte 0x800D6490 ;# ptr + .4byte 0x800D6200 ;# ptr + .4byte 0x800D6210 ;# ptr + .4byte 0x800D6220 ;# ptr .global __vt__Q34nw4r3g3d16AnmObjTexPatNode __vt__Q34nw4r3g3d16AnmObjTexPatNode: - .incbin "baserom.dol", 0x43CAC0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D6EC0 ;# ptr + .4byte 0x800D6340 ;# ptr + .4byte 0x800D6190 ;# ptr + .4byte 0x800D6FD0 ;# ptr + .4byte 0x800D6FC0 ;# ptr + .4byte 0x800D6240 ;# ptr + .4byte 0x800D6250 ;# ptr + .4byte 0x800D6230 ;# ptr + .4byte 0x800D62B0 ;# ptr + .4byte 0x800D62C0 ;# ptr + .4byte 0x800D6320 ;# ptr + .4byte 0x800D6330 ;# ptr + .4byte 0 + .4byte 0x800D6200 ;# ptr + .4byte 0x800D6210 ;# ptr + .4byte 0x800D6220 ;# ptr .global __vt__Q34nw4r3g3d12AnmObjTexPat __vt__Q34nw4r3g3d12AnmObjTexPat: - .incbin "baserom.dol", 0x43CB08, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D6DC0 ;# ptr + .4byte 0 + .4byte 0x800D6180 ;# ptr + .4byte 0x800D6FF0 ;# ptr + .4byte 0x800D6FE0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D6140 ;# ptr + .4byte 0 + .4byte 0x800D6150 ;# ptr + .4byte 0x800D6160 ;# ptr + .4byte 0x800D6170 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210745 $$210745: - .incbin "baserom.dol", 0x499A70, 0x4 + .4byte 0 .global $$210768 $$210768: - .incbin "baserom.dol", 0x499A74, 0x4 + .4byte 0x3F800000 .global $$210921 $$210921: - .incbin "baserom.dol", 0x499A78, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt.s b/asm/libnw4r_g3d/g3d_anmtexsrt.s index 0185e159..6430d531 100644 --- a/asm/libnw4r_g3d/g3d_anmtexsrt.s +++ b/asm/libnw4r_g3d/g3d_anmtexsrt.s @@ -1117,44 +1117,125 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt: - .incbin "baserom.dol", 0x4045C0, 0x18 + .4byte 0x0000000D + .asciz "AnmObjTexSrt" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode: - .incbin "baserom.dol", 0x4045D8, 0x18 + .4byte 0x00000011 + .asciz "AnmObjTexSrtNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride: - .incbin "baserom.dol", 0x4045F0, 0x20 + .4byte 0x00000015 + .asciz "AnmObjTexSrtOverride" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes: - .incbin "baserom.dol", 0x404610, 0x18 + .4byte 0x00000010 + .asciz "AnmObjTexSrtRes" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjTexSrtRes __vt__Q34nw4r3g3d15AnmObjTexSrtRes: - .incbin "baserom.dol", 0x43CB50, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D7B70 ;# ptr + .4byte 0x800D7910 ;# ptr + .4byte 0x800D7C50 ;# ptr + .4byte 0x800D7C40 ;# ptr + .4byte 0x800D7C30 ;# ptr + .4byte 0x800D7600 ;# ptr + .4byte 0x800D76C0 ;# ptr + .4byte 0x800D77A0 ;# ptr + .4byte 0x800D76D0 ;# ptr + .4byte 0x800D7790 ;# ptr + .4byte 0x800D7880 ;# ptr + .4byte 0x800D7000 ;# ptr + .4byte 0x800D7890 ;# ptr + .4byte 0x800D7010 ;# ptr + .4byte 0x800D7020 ;# ptr + .4byte 0x800D7030 ;# ptr .global __vt__Q34nw4r3g3d20AnmObjTexSrtOverride __vt__Q34nw4r3g3d20AnmObjTexSrtOverride: - .incbin "baserom.dol", 0x43CB98, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D7C60 ;# ptr + .4byte 0x800D7200 ;# ptr + .4byte 0x800D7D70 ;# ptr + .4byte 0x800D7D60 ;# ptr + .4byte 0x800D7D50 ;# ptr + .4byte 0x800D7100 ;# ptr + .4byte 0x800D7110 ;# ptr + .4byte 0x800D70F0 ;# ptr + .4byte 0x800D7170 ;# ptr + .4byte 0x800D7180 ;# ptr + .4byte 0x800D71E0 ;# ptr + .4byte 0x800D71F0 ;# ptr + .4byte 0x800D7350 ;# ptr + .4byte 0x800D70C0 ;# ptr + .4byte 0x800D70D0 ;# ptr + .4byte 0x800D70E0 ;# ptr .global __vt__Q34nw4r3g3d16AnmObjTexSrtNode __vt__Q34nw4r3g3d16AnmObjTexSrtNode: - .incbin "baserom.dol", 0x43CBE0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D7CE0 ;# ptr + .4byte 0x800D7200 ;# ptr + .4byte 0x800D7050 ;# ptr + .4byte 0x800D7DF0 ;# ptr + .4byte 0x800D7DE0 ;# ptr + .4byte 0x800D7100 ;# ptr + .4byte 0x800D7110 ;# ptr + .4byte 0x800D70F0 ;# ptr + .4byte 0x800D7170 ;# ptr + .4byte 0x800D7180 ;# ptr + .4byte 0x800D71E0 ;# ptr + .4byte 0x800D71F0 ;# ptr + .4byte 0 + .4byte 0x800D70C0 ;# ptr + .4byte 0x800D70D0 ;# ptr + .4byte 0x800D70E0 ;# ptr .global __vt__Q34nw4r3g3d12AnmObjTexSrt __vt__Q34nw4r3g3d12AnmObjTexSrt: - .incbin "baserom.dol", 0x43CC28, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800D7BE0 ;# ptr + .4byte 0 + .4byte 0x800D7040 ;# ptr + .4byte 0x800D7E10 ;# ptr + .4byte 0x800D7E00 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D7000 ;# ptr + .4byte 0 + .4byte 0x800D7010 ;# ptr + .4byte 0x800D7020 ;# ptr + .4byte 0x800D7030 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29106 $$29106: - .incbin "baserom.dol", 0x499A80, 0x4 + .4byte 0 .global $$29129 $$29129: - .incbin "baserom.dol", 0x499A84, 0x4 + .4byte 0x3F800000 .global $$29282 $$29282: - .incbin "baserom.dol", 0x499A88, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29563 $$29563: - .incbin "baserom.dol", 0x499A90, 0x8 + .4byte 0x219392EF + .4byte 0 .global $$29564 $$29564: - .incbin "baserom.dol", 0x499A98, 0x8 + .4byte 0x3FF00000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmvis.s b/asm/libnw4r_g3d/g3d_anmvis.s index e68c7cc2..b1f60cfb 100644 --- a/asm/libnw4r_g3d/g3d_anmvis.s +++ b/asm/libnw4r_g3d/g3d_anmvis.s @@ -1387,43 +1387,118 @@ GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjVis TYPE_NAME__Q34nw4r3g3d9AnmObjVis: - .incbin "baserom.dol", 0x4044A0, 0x10 + .4byte 0x0000000A + .asciz "AnmObjVis" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode: - .incbin "baserom.dol", 0x4044B0, 0x14 + .4byte 0x0000000E + .asciz "AnmObjVisNode" + .balign 4 .global TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR: - .incbin "baserom.dol", 0x4044C4, 0x14 + .4byte 0x0000000C + .asciz "AnmObjVisOR" + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes: - .incbin "baserom.dol", 0x4044D8, 0x18 + .4byte 0x0000000D + .asciz "AnmObjVisRes" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjVisRes __vt__Q34nw4r3g3d12AnmObjVisRes: - .incbin "baserom.dol", 0x43C800, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x800D4760 ;# ptr + .4byte 0x800D3940 ;# ptr + .4byte 0x800D4860 ;# ptr + .4byte 0x800D4850 ;# ptr + .4byte 0x800D4820 ;# ptr + .4byte 0x800D4390 ;# ptr + .4byte 0x800D4400 ;# ptr + .4byte 0x800D4430 ;# ptr + .4byte 0x800D4410 ;# ptr + .4byte 0x800D4420 ;# ptr + .4byte 0x800D44C0 ;# ptr + .4byte 0x800D3880 ;# ptr + .4byte 0x800D45D0 ;# ptr + .4byte 0x800D38C0 ;# ptr + .4byte 0x800D38D0 ;# ptr .global __vt__Q34nw4r3g3d11AnmObjVisOR __vt__Q34nw4r3g3d11AnmObjVisOR: - .incbin "baserom.dol", 0x43C844, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x800D48B0 ;# ptr + .4byte 0x800D4030 ;# ptr + .4byte 0x800D49C0 ;# ptr + .4byte 0x800D49B0 ;# ptr + .4byte 0x800D49A0 ;# ptr + .4byte 0x800D3D10 ;# ptr + .4byte 0x800D3D80 ;# ptr + .4byte 0x800D3CB0 ;# ptr + .4byte 0x800D3DD0 ;# ptr + .4byte 0x800D3E40 ;# ptr + .4byte 0x800D3E90 ;# ptr + .4byte 0x800D3F80 ;# ptr + .4byte 0x800D41A0 ;# ptr + .4byte 0x800D3A50 ;# ptr + .4byte 0x800D3B40 ;# ptr .global __vt__Q34nw4r3g3d13AnmObjVisNode __vt__Q34nw4r3g3d13AnmObjVisNode: - .incbin "baserom.dol", 0x43C888, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x800D4930 ;# ptr + .4byte 0x800D4030 ;# ptr + .4byte 0x800D39C0 ;# ptr + .4byte 0x800D4A60 ;# ptr + .4byte 0x800D4A50 ;# ptr + .4byte 0x800D3D10 ;# ptr + .4byte 0x800D3D80 ;# ptr + .4byte 0x800D3CB0 ;# ptr + .4byte 0x800D3DD0 ;# ptr + .4byte 0x800D3E40 ;# ptr + .4byte 0x800D3E90 ;# ptr + .4byte 0x800D3F80 ;# ptr + .4byte 0 + .4byte 0x800D3A50 ;# ptr + .4byte 0x800D3B40 ;# ptr .global __vt__Q34nw4r3g3d9AnmObjVis __vt__Q34nw4r3g3d9AnmObjVis: - .incbin "baserom.dol", 0x43C8CC, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x800D47D0 ;# ptr + .4byte 0x800D3940 ;# ptr + .4byte 0x800D3980 ;# ptr + .4byte 0x800D4A80 ;# ptr + .4byte 0x800D4A70 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x800D3880 ;# ptr + .4byte 0 + .4byte 0x800D38C0 ;# ptr + .4byte 0x800D38D0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable: - .incbin "baserom.dol", 0x492DC8, 0x8 + .4byte 0x800DBE80 ;# ptr + .4byte 0x800DBE90 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27650 $$27650: - .incbin "baserom.dol", 0x499A50, 0x4 + .4byte 0 .global $$27667 $$27667: - .incbin "baserom.dol", 0x499A54, 0x4 + .4byte 0x3F800000 .global $$27797 $$27797: - .incbin "baserom.dol", 0x499A58, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_basic.s b/asm/libnw4r_g3d/g3d_basic.s index 8fe4a6c4..17d37b4f 100644 --- a/asm/libnw4r_g3d/g3d_basic.s +++ b/asm/libnw4r_g3d/g3d_basic.s @@ -204,10 +204,11 @@ lbl_800E6CC0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27058 $$27058: - .incbin "baserom.dol", 0x499BB0, 0x4 + .4byte 0x3F360B61 .global $$27059 $$27059: - .incbin "baserom.dol", 0x499BB4, 0x4 + .4byte 0 .global $$27060 $$27060: - .incbin "baserom.dol", 0x499BB8, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcview.s b/asm/libnw4r_g3d/g3d_calcview.s index 7816bd41..2db718c0 100644 --- a/asm/libnw4r_g3d/g3d_calcview.s +++ b/asm/libnw4r_g3d/g3d_calcview.s @@ -2421,15 +2421,23 @@ lbl_800E303C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2 bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2: - .incbin "baserom.dol", 0x404EC8, 0x20 + .4byte 0 + .4byte 0x800E0F60 ;# ptr + .4byte 0x800E11C0 ;# ptr + .4byte 0x800E1530 ;# ptr + .4byte 0x800E1840 ;# ptr + .4byte 0x800E1C50 ;# ptr + .4byte 0x800E1F60 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212856 $$212856: - .incbin "baserom.dol", 0x499B58, 0x4 + .4byte 0 .global $$212857 $$212857: - .incbin "baserom.dol", 0x499B5C, 0x4 + .4byte 0x219392EF .global norm_epsilon__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2 norm_epsilon__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2: - .incbin "baserom.dol", 0x499B60, 0x8 + .4byte 0x219392EF + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcvtx.s b/asm/libnw4r_g3d/g3d_calcvtx.s index 26b11613..6dfd7733 100644 --- a/asm/libnw4r_g3d/g3d_calcvtx.s +++ b/asm/libnw4r_g3d/g3d_calcvtx.s @@ -539,4 +539,5 @@ lbl_800F2B70: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27801 $$27801: - .incbin "baserom.dol", 0x499C50, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcworld.s b/asm/libnw4r_g3d/g3d_calcworld.s index 26a6c5d7..595fe24c 100644 --- a/asm/libnw4r_g3d/g3d_calcworld.s +++ b/asm/libnw4r_g3d/g3d_calcworld.s @@ -755,17 +755,19 @@ lbl_800E3C34: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$29581 $$29581: - .incbin "baserom.dol", 0x43D068, 0x10 + .asciz "NodeTree" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$29736 $$29736: - .incbin "baserom.dol", 0x492DE0, 0x8 + .asciz "NodeMix" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29400 $$29400: - .incbin "baserom.dol", 0x499B68, 0x4 + .4byte 0x3F800000 .global $$29737 $$29737: - .incbin "baserom.dol", 0x499B6C, 0x4 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_camera.s b/asm/libnw4r_g3d/g3d_camera.s index 17c3687b..c673b332 100644 --- a/asm/libnw4r_g3d/g3d_camera.s +++ b/asm/libnw4r_g3d/g3d_camera.s @@ -1085,34 +1085,35 @@ lbl_800E69E4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28736 $$28736: - .incbin "baserom.dol", 0x499B80, 0x4 + .4byte 0 .global $$28737 $$28737: - .incbin "baserom.dol", 0x499B84, 0x4 + .4byte 0x41700000 .global $$28738 $$28738: - .incbin "baserom.dol", 0x499B88, 0x4 + .4byte 0x3F800000 .global $$28739 $$28739: - .incbin "baserom.dol", 0x499B8C, 0x4 + .4byte 0x42700000 .global $$28740 $$28740: - .incbin "baserom.dol", 0x499B90, 0x4 + .4byte 0x3FAAAAAB .global $$28741 $$28741: - .incbin "baserom.dol", 0x499B94, 0x4 + .4byte 0x3DCCCCCD .global $$28742 $$28742: - .incbin "baserom.dol", 0x499B98, 0x4 + .4byte 0x447A0000 .global $$28743 $$28743: - .incbin "baserom.dol", 0x499B9C, 0x4 + .4byte 0x3F000000 .global $$28747 $$28747: - .incbin "baserom.dol", 0x499BA0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$29341 $$29341: - .incbin "baserom.dol", 0x499BA8, 0x4 + .4byte 0xBF800000 .global $$29342 $$29342: - .incbin "baserom.dol", 0x499BAC, 0x4 + .4byte 0x3F360B61 diff --git a/asm/libnw4r_g3d/g3d_cpu.s b/asm/libnw4r_g3d/g3d_cpu.s index cd592c08..4f931897 100644 --- a/asm/libnw4r_g3d/g3d_cpu.s +++ b/asm/libnw4r_g3d/g3d_cpu.s @@ -166,4 +166,5 @@ lbl_800DC9F0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21129 $$21129: - .incbin "baserom.dol", 0x499B08, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_draw.s b/asm/libnw4r_g3d/g3d_draw.s index a571fcdf..54126f23 100644 --- a/asm/libnw4r_g3d/g3d_draw.s +++ b/asm/libnw4r_g3d/g3d_draw.s @@ -2167,18 +2167,19 @@ lbl_800E5AD8: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4PFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4PFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20: - .incbin "baserom.dol", 0x492DE8, 0x4 + .4byte 0xFFFFFFFC .global $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4RPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4RPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20: - .incbin "baserom.dol", 0x492DEC, 0x4 + .4byte 0xFFFFFFFC .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214861 $$214861: - .incbin "baserom.dol", 0x499B70, 0x4 + .4byte 0 .global $$214862 $$214862: - .incbin "baserom.dol", 0x499B74, 0x4 + .4byte 0xC0000000 .global $$214863 $$214863: - .incbin "baserom.dol", 0x499B78, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_draw1mat1shp.s b/asm/libnw4r_g3d/g3d_draw1mat1shp.s index 6303ea22..de70fe22 100644 --- a/asm/libnw4r_g3d/g3d_draw1mat1shp.s +++ b/asm/libnw4r_g3d/g3d_draw1mat1shp.s @@ -955,18 +955,25 @@ lbl_800E0D54: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$210241 $$210241: - .incbin "baserom.dol", 0x404EB8, 0x10 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000003 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211256 $$211256: - .incbin "baserom.dol", 0x499B38, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$211257 $$211257: - .incbin "baserom.dol", 0x499B40, 0x8 + .4byte 0x40100000 + .4byte 0 .global $$211258 $$211258: - .incbin "baserom.dol", 0x499B48, 0x8 + .4byte 0x437F0000 + .4byte 0 .global $$211268 $$211268: - .incbin "baserom.dol", 0x499B50, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_fog.s b/asm/libnw4r_g3d/g3d_fog.s index 6c62ebc6..b5b22d91 100644 --- a/asm/libnw4r_g3d/g3d_fog.s +++ b/asm/libnw4r_g3d/g3d_fog.s @@ -107,4 +107,5 @@ lbl_800F18EC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26809 $$26809: - .incbin "baserom.dol", 0x499C18, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_gpu.s b/asm/libnw4r_g3d/g3d_gpu.s index 8b924068..abf2a40e 100644 --- a/asm/libnw4r_g3d/g3d_gpu.s +++ b/asm/libnw4r_g3d/g3d_gpu.s @@ -358,19 +358,19 @@ GDLoadTexMtxImm3x3__Q34nw4r3g3d4fifoFRCQ34nw4r4math5MTX33Ul: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global cm2hw__Q34nw4r3g3d4fifo cm2hw__Q34nw4r3g3d4fifo: - .incbin "baserom.dol", 0x499AF0, 0x4 + .4byte 0x00020103 .global $$26418 $$26418: - .incbin "baserom.dol", 0x499AF4, 0x4 + .4byte 0x3F800000 .global $$26419 $$26419: - .incbin "baserom.dol", 0x499AF8, 0x4 + .4byte 0x3F000000 .global $$26420 $$26420: - .incbin "baserom.dol", 0x499AFC, 0x4 + .4byte 0x40000000 .global $$26421 $$26421: - .incbin "baserom.dol", 0x499B00, 0x4 + .4byte 0x44800000 .global $$26433 $$26433: - .incbin "baserom.dol", 0x499B04, 0x4 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_init.s b/asm/libnw4r_g3d/g3d_init.s index 0e5c6b33..f77ae089 100644 --- a/asm/libnw4r_g3d/g3d_init.s +++ b/asm/libnw4r_g3d/g3d_init.s @@ -75,9 +75,11 @@ lbl_800F1788: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$28056 $$28056: - .incbin "baserom.dol", 0x43D290, 0x48 + .asciz "<< NW4R - G3D \tfinal build: Apr 28 2011 11:05:58 (0x4302_188) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2 NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2: - .incbin "baserom.dol", 0x492E20, 0x8 + .4byte 0x80441190 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_light.s b/asm/libnw4r_g3d/g3d_light.s index 5430f6cb..a21e3a24 100644 --- a/asm/libnw4r_g3d/g3d_light.s +++ b/asm/libnw4r_g3d/g3d_light.s @@ -808,34 +808,35 @@ lbl_800F2400: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212220 $$212220: - .incbin "baserom.dol", 0x499C20, 0x4 + .4byte 0 .global $$212221 $$212221: - .incbin "baserom.dol", 0x499C24, 0x4 + .4byte 0x3F800000 .global $$212222 $$212222: - .incbin "baserom.dol", 0x499C28, 0x4 + .4byte 0x3F000000 .global $$211839 $$211839: - .incbin "baserom.dol", 0x499C2C, 0x4 + .4byte 0xFFFFFFFF .global $$211841 $$211841: - .incbin "baserom.dol", 0x499C30, 0x4 + .4byte 0xFFFFFFFF .global $$212371 $$212371: - .incbin "baserom.dol", 0x499C34, 0x4 + .4byte 0x4A742400 .global $$212372 $$212372: - .incbin "baserom.dol", 0x499C38, 0x4 + .4byte 0xBF800000 .global $$212373 $$212373: - .incbin "baserom.dol", 0x499C3C, 0x4 + .4byte 0x42B40000 .global $$212374 $$212374: - .incbin "baserom.dol", 0x499C40, 0x4 + .4byte 0x41200000 .global $$212375 $$212375: - .incbin "baserom.dol", 0x499C44, 0x4 + .4byte 0x41000000 .global $$212376 $$212376: - .incbin "baserom.dol", 0x499C48, 0x8 + .4byte 0xC0E00000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_maya.s b/asm/libnw4r_g3d/g3d_maya.s index e1fccc3e..34ba6091 100644 --- a/asm/libnw4r_g3d/g3d_maya.s +++ b/asm/libnw4r_g3d/g3d_maya.s @@ -901,24 +901,37 @@ lbl_800E79CC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .incbin "baserom.dol", 0x404EE8, 0x1C + .4byte 0x800E6FC0 ;# ptr + .4byte 0x800E6EC0 ;# ptr + .4byte 0x800E6F70 ;# ptr + .4byte 0x800E6DC0 ;# ptr + .4byte 0x800E6E00 ;# ptr + .4byte 0x800E6D20 ;# ptr + .4byte 0x800E6CE0 ;# ptr .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .incbin "baserom.dol", 0x404F04, 0x1C + .4byte 0x800E7600 ;# ptr + .4byte 0x800E7420 ;# ptr + .4byte 0x800E7570 ;# ptr + .4byte 0x800E7250 ;# ptr + .4byte 0x800E7280 ;# ptr + .4byte 0x800E7120 ;# ptr + .4byte 0x800E70A0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27167 $$27167: - .incbin "baserom.dol", 0x499BC0, 0x4 + .4byte 0 .global $$27168 $$27168: - .incbin "baserom.dol", 0x499BC4, 0x4 + .4byte 0x3F800000 .global $$27172 $$27172: - .incbin "baserom.dol", 0x499BC8, 0x4 + .4byte 0x3F360B61 .global $$27173 $$27173: - .incbin "baserom.dol", 0x499BCC, 0x4 + .4byte 0x3F000000 .global $$27180 $$27180: - .incbin "baserom.dol", 0x499BD0, 0x8 + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_obj.s b/asm/libnw4r_g3d/g3d_obj.s index 72ba1bf9..eaefc874 100644 --- a/asm/libnw4r_g3d/g3d_obj.s +++ b/asm/libnw4r_g3d/g3d_obj.s @@ -118,9 +118,19 @@ GetTypeObj__Q34nw4r3g3d6G3dObjCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6G3dObj TYPE_NAME__Q34nw4r3g3d6G3dObj: - .incbin "baserom.dol", 0x4046E8, 0x10 + .4byte 0x00000007 + .asciz "G3dObj" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d6G3dObj __vt__Q34nw4r3g3d6G3dObj: - .incbin "baserom.dol", 0x43D030, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x800DBE40 ;# ptr + .4byte 0 + .4byte 0x800DBD10 ;# ptr + .4byte 0x800DBE70 ;# ptr + .4byte 0x800DBE60 ;# ptr + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanm.s b/asm/libnw4r_g3d/g3d_resanm.s index 86f24dbb..8004ae37 100644 --- a/asm/libnw4r_g3d/g3d_resanm.s +++ b/asm/libnw4r_g3d/g3d_resanm.s @@ -178,16 +178,17 @@ lbl_800CF694: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25115 $$25115: - .incbin "baserom.dol", 0x4999B0, 0x4 + .4byte 0x3F800000 .global $$25116 $$25116: - .incbin "baserom.dol", 0x4999B4, 0x4 + .4byte 0x40000000 .global $$25117 $$25117: - .incbin "baserom.dol", 0x4999B8, 0x4 + .4byte 0x40400000 .global $$25180 $$25180: - .incbin "baserom.dol", 0x4999BC, 0x4 + .4byte 0 .global $$25181 $$25181: - .incbin "baserom.dol", 0x4999C0, 0x8 + .4byte 0x47000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmamblight.s b/asm/libnw4r_g3d/g3d_resanmamblight.s index 8c31ebeb..2c7020c4 100644 --- a/asm/libnw4r_g3d/g3d_resanmamblight.s +++ b/asm/libnw4r_g3d/g3d_resanmamblight.s @@ -66,7 +66,9 @@ lbl_800D2168: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210893 $$210893: - .incbin "baserom.dol", 0x499A10, 0x8 + .4byte 0 + .4byte 0 .global $$210897 $$210897: - .incbin "baserom.dol", 0x499A18, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmchr.s b/asm/libnw4r_g3d/g3d_resanmchr.s index cf9d99e5..076f2375 100644 --- a/asm/libnw4r_g3d/g3d_resanmchr.s +++ b/asm/libnw4r_g3d/g3d_resanmchr.s @@ -2037,24 +2037,33 @@ lbl_800D1F10: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2 gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2: - .incbin "baserom.dol", 0x404480, 0x20 + .4byte 0x800D1790 ;# ptr + .4byte 0x800D18B0 ;# ptr + .4byte 0x800D1840 ;# ptr + .4byte 0x800D19A0 ;# ptr + .4byte 0x800D17B0 ;# ptr + .4byte 0x800D1A40 ;# ptr + .4byte 0x800D18F0 ;# ptr + .4byte 0x800D1AE0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28848 $$28848: - .incbin "baserom.dol", 0x4999F0, 0x4 + .4byte 0 .global $$28950 $$28950: - .incbin "baserom.dol", 0x4999F4, 0x4 + .4byte 0x3F800000 .global $$28951 $$28951: - .incbin "baserom.dol", 0x4999F8, 0x4 + .4byte 0x40000000 .global $$28952 $$28952: - .incbin "baserom.dol", 0x4999FC, 0x4 + .4byte 0x40400000 .global $$29482 $$29482: - .incbin "baserom.dol", 0x499A00, 0x8 + .4byte 0x3F360B61 + .4byte 0 .global $$29490 $$29490: - .incbin "baserom.dol", 0x499A08, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmclr.s b/asm/libnw4r_g3d/g3d_resanmclr.s index 6a6de022..866ad68d 100644 --- a/asm/libnw4r_g3d/g3d_resanmclr.s +++ b/asm/libnw4r_g3d/g3d_resanmclr.s @@ -112,7 +112,9 @@ lbl_800CF91C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25911 $$25911: - .incbin "baserom.dol", 0x4999D8, 0x8 + .4byte 0 + .4byte 0 .global $$25915 $$25915: - .incbin "baserom.dol", 0x4999E0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmfog.s b/asm/libnw4r_g3d/g3d_resanmfog.s index f03643d9..02e2c969 100644 --- a/asm/libnw4r_g3d/g3d_resanmfog.s +++ b/asm/libnw4r_g3d/g3d_resanmfog.s @@ -106,7 +106,9 @@ lbl_800D269C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210922 $$210922: - .incbin "baserom.dol", 0x499A30, 0x8 + .4byte 0 + .4byte 0 .global $$210926 $$210926: - .incbin "baserom.dol", 0x499A38, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmlight.s b/asm/libnw4r_g3d/g3d_resanmlight.s index 07f1a68f..5a0dd4e8 100644 --- a/asm/libnw4r_g3d/g3d_resanmlight.s +++ b/asm/libnw4r_g3d/g3d_resanmlight.s @@ -299,7 +299,9 @@ lbl_800D2540: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211230 $$211230: - .incbin "baserom.dol", 0x499A20, 0x8 + .4byte 0 + .4byte 0 .global $$211234 $$211234: - .incbin "baserom.dol", 0x499A28, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmscn.s b/asm/libnw4r_g3d/g3d_resanmscn.s index f4798f58..bf7ae178 100644 --- a/asm/libnw4r_g3d/g3d_resanmscn.s +++ b/asm/libnw4r_g3d/g3d_resanmscn.s @@ -799,16 +799,41 @@ lbl_800D33D8: .section .data, "wa" # 0x80421040 - 0x80496700 .global ResNameData_LightSet__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_LightSet__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: - .incbin "baserom.dol", 0x43C760, 0x20 + .4byte 0x0000000E + .asciz "LightSet(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AmbLights__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_AmbLights__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: - .incbin "baserom.dol", 0x43C780, 0x20 + .4byte 0x0000000F + .asciz "AmbLights(NW4R)" + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Lights__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_Lights__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: - .incbin "baserom.dol", 0x43C7A0, 0x20 + .4byte 0x0000000C + .asciz "Lights(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Fogs__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_Fogs__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: - .incbin "baserom.dol", 0x43C7C0, 0x20 + .4byte 0x0000000A + .asciz "Fogs(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Cameras__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_Cameras__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: - .incbin "baserom.dol", 0x43C7E0, 0x20 + .4byte 0x0000000D + .asciz "Cameras(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmshp.s b/asm/libnw4r_g3d/g3d_resanmshp.s index 04a6cd86..68025fbf 100644 --- a/asm/libnw4r_g3d/g3d_resanmshp.s +++ b/asm/libnw4r_g3d/g3d_resanmshp.s @@ -108,4 +108,5 @@ lbl_800D353C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27163 $$27163: - .incbin "baserom.dol", 0x499A40, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmtexsrt.s b/asm/libnw4r_g3d/g3d_resanmtexsrt.s index 7c30f35a..fb071212 100644 --- a/asm/libnw4r_g3d/g3d_resanmtexsrt.s +++ b/asm/libnw4r_g3d/g3d_resanmtexsrt.s @@ -316,7 +316,7 @@ lbl_800D028C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26218 $$26218: - .incbin "baserom.dol", 0x4999E8, 0x4 + .4byte 0x3F800000 .global $$26219 $$26219: - .incbin "baserom.dol", 0x4999EC, 0x4 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmvis.s b/asm/libnw4r_g3d/g3d_resanmvis.s index 9056fabe..07380fe4 100644 --- a/asm/libnw4r_g3d/g3d_resanmvis.s +++ b/asm/libnw4r_g3d/g3d_resanmvis.s @@ -89,7 +89,9 @@ lbl_800CF7BC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25876 $$25876: - .incbin "baserom.dol", 0x4999C8, 0x8 + .4byte 0 + .4byte 0 .global $$25879 $$25879: - .incbin "baserom.dol", 0x4999D0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resfile.s b/asm/libnw4r_g3d/g3d_resfile.s index c2d77e43..53283238 100644 --- a/asm/libnw4r_g3d/g3d_resfile.s +++ b/asm/libnw4r_g3d/g3d_resfile.s @@ -1765,34 +1765,88 @@ lbl_800CA6D4: .section .data, "wa" # 0x80421040 - 0x80496700 .global ResNameData_Models__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_Models__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C5E0, 0x20 + .4byte 0x0000000E + .asciz "3DModels(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Pltts__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_Pltts__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C600, 0x20 + .4byte 0x0000000E + .asciz "Palettes(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Textures__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_Textures__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C620, 0x20 + .4byte 0x0000000E + .asciz "Textures(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmChr__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmChr__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C640, 0x20 + .4byte 0x0000000C + .asciz "AnmChr(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmVis__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmVis__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C660, 0x20 + .4byte 0x0000000C + .asciz "AnmVis(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmClr__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmClr__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C680, 0x20 + .4byte 0x0000000C + .asciz "AnmClr(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmTexPat__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmTexPat__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C6A0, 0x20 + .4byte 0x0000000F + .asciz "AnmTexPat(NW4R)" + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmTexSrt__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmTexSrt__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C6C0, 0x20 + .4byte 0x0000000F + .asciz "AnmTexSrt(NW4R)" + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmShp__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmShp__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C6E0, 0x20 + .4byte 0x0000000C + .asciz "AnmShp(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_AnmScn__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_AnmScn__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C700, 0x20 + .4byte 0x0000000C + .asciz "AnmScn(NW4R)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 .global ResNameData_Ext__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_Ext__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: - .incbin "baserom.dol", 0x43C720, 0x20 + .4byte 0x00000008 + .asciz "External" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resmat.s b/asm/libnw4r_g3d/g3d_resmat.s index 3a973151..c39749aa 100644 --- a/asm/libnw4r_g3d/g3d_resmat.s +++ b/asm/libnw4r_g3d/g3d_resmat.s @@ -1716,28 +1716,33 @@ lbl_800CE3D0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213919 $$213919: - .incbin "baserom.dol", 0x499968, 0x4 + .4byte 0 .global $$213982 $$213982: - .incbin "baserom.dol", 0x49996C, 0x4 + .4byte 0x3F800000 .global $$214090 $$214090: - .incbin "baserom.dol", 0x499970, 0x8 + .4byte 0x3FE33333 + .4byte 0x40000000 .global $$214094 $$214094: - .incbin "baserom.dol", 0x499978, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$214587 $$214587: - .incbin "baserom.dol", 0x499980, 0x4 + .4byte 0x40000000 .global $$214588 $$214588: - .incbin "baserom.dol", 0x499984, 0x4 + .4byte 0x3F000000 .global $$214589 $$214589: - .incbin "baserom.dol", 0x499988, 0x8 + .4byte 0x3A800000 + .4byte 0 .global $$214594 $$214594: - .incbin "baserom.dol", 0x499990, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$214686 $$214686: - .incbin "baserom.dol", 0x499998, 0x8 + .4byte 0x44800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resmdl.s b/asm/libnw4r_g3d/g3d_resmdl.s index f8ef6bec..cae1ff31 100644 --- a/asm/libnw4r_g3d/g3d_resmdl.s +++ b/asm/libnw4r_g3d/g3d_resmdl.s @@ -1396,7 +1396,7 @@ lbl_800CB7E0: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv$$20 $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv$$20: - .incbin "baserom.dol", 0x492DB8, 0x8 + .asciz "DrawXlu" .global $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv: - .incbin "baserom.dol", 0x492DC0, 0x8 + .asciz "DrawOpa" diff --git a/asm/libnw4r_g3d/g3d_resnode.s b/asm/libnw4r_g3d/g3d_resnode.s index 43c570eb..28895369 100644 --- a/asm/libnw4r_g3d/g3d_resnode.s +++ b/asm/libnw4r_g3d/g3d_resnode.s @@ -948,10 +948,11 @@ lbl_800CF41C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27550 $$27550: - .incbin "baserom.dol", 0x4999A0, 0x4 + .4byte 0x3F800000 .global $$27551 $$27551: - .incbin "baserom.dol", 0x4999A4, 0x4 + .4byte 0x3F360B61 .global $$27552 $$27552: - .incbin "baserom.dol", 0x4999A8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_restev.s b/asm/libnw4r_g3d/g3d_restev.s index 59bbb3dd..45718c6a 100644 --- a/asm/libnw4r_g3d/g3d_restev.s +++ b/asm/libnw4r_g3d/g3d_restev.s @@ -900,12 +900,41 @@ lbl_800CCD04: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID$$2r2c $$2LOCAL$$2GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID$$2r2c: - .incbin "baserom.dol", 0x404420, 0x20 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000006 .global $$2LOCAL$$2CallDisplayList__Q34nw4r3g3d6ResTevCFb$$2dlsize $$2LOCAL$$2CallDisplayList__Q34nw4r3g3d6ResTevCFb$$2dlsize: - .incbin "baserom.dol", 0x404440, 0x40 + .4byte 0x000000A0 + .4byte 0x000000A0 + .4byte 0x000000C0 + .4byte 0x000000C0 + .4byte 0x00000100 + .4byte 0x00000100 + .4byte 0x00000120 + .4byte 0x00000120 + .4byte 0x00000160 + .4byte 0x00000160 + .4byte 0x00000180 + .4byte 0x00000180 + .4byte 0x000001C0 + .4byte 0x000001C0 + .4byte 0x000001E0 + .4byte 0x000001E0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r $$2LOCAL$$2GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r: - .incbin "baserom.dol", 0x43C740, 0x20 + .4byte 0x00010001 + .4byte 0x00010705 + .4byte 0x06000000 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdl.s b/asm/libnw4r_g3d/g3d_scnmdl.s index e0d170a8..53f9072b 100644 --- a/asm/libnw4r_g3d/g3d_scnmdl.s +++ b/asm/libnw4r_g3d/g3d_scnmdl.s @@ -2981,9 +2981,29 @@ GetTypeObj__Q34nw4r3g3d6ScnMdlCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6ScnMdl TYPE_NAME__Q34nw4r3g3d6ScnMdl: - .incbin "baserom.dol", 0x404FE8, 0x10 + .4byte 0x00000007 + .asciz "ScnMdl" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d6ScnMdl __vt__Q34nw4r3g3d6ScnMdl: - .incbin "baserom.dol", 0x43D208, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800F0A10 ;# ptr + .4byte 0x800EF990 ;# ptr + .4byte 0x800F09A0 ;# ptr + .4byte 0x800F0AA0 ;# ptr + .4byte 0x800F0A90 ;# ptr + .4byte 0x800E9830 ;# ptr + .4byte 0x800EFE40 ;# ptr + .4byte 0x800EFE80 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9900 ;# ptr + .4byte 0x800F05A0 ;# ptr + .4byte 0x800F0710 ;# ptr + .4byte 0x800F0910 ;# ptr + .4byte 0x800F0960 ;# ptr + .4byte 0x800F0980 ;# ptr diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand.s b/asm/libnw4r_g3d/g3d_scnmdlexpand.s index 823631db..43993bbb 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand.s +++ b/asm/libnw4r_g3d/g3d_scnmdlexpand.s @@ -708,14 +708,33 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand: - .incbin "baserom.dol", 0x404FF8, 0x18 + .4byte 0x0000000D + .asciz "ScnMdlExpand" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12ScnMdlExpand __vt__Q34nw4r3g3d12ScnMdlExpand: - .incbin "baserom.dol", 0x43D250, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x800F13E0 ;# ptr + .4byte 0x800F1080 ;# ptr + .4byte 0x800F1360 ;# ptr + .4byte 0x800F1460 ;# ptr + .4byte 0x800F1450 ;# ptr + .4byte 0x800E9D40 ;# ptr + .4byte 0x800E9350 ;# ptr + .4byte 0x800E94F0 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9110 ;# ptr + .4byte 0x800F0D60 ;# ptr + .4byte 0x800F0EB0 ;# ptr + .4byte 0x800F0FF0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global INVALID_NODE_ID__Q34nw4r3g3d30$$2unnamed$$2g3d_scnmdlexpand_cpp$$2 INVALID_NODE_ID__Q34nw4r3g3d30$$2unnamed$$2g3d_scnmdlexpand_cpp$$2: - .incbin "baserom.dol", 0x492E18, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s index 8b75471e..f9fb9f87 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s +++ b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s @@ -2238,28 +2238,51 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple: - .incbin "baserom.dol", 0x404FD0, 0x18 + .4byte 0x0000000D + .asciz "ScnMdlSimple" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$214160 $$214160: - .incbin "baserom.dol", 0x43D1B0, 0x10 + .asciz "NodeTree" + .balign 4 + .4byte 0 .global __vt__Q34nw4r3g3d12ScnMdlSimple __vt__Q34nw4r3g3d12ScnMdlSimple: - .incbin "baserom.dol", 0x43D1C0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x800EE1B0 ;# ptr + .4byte 0x800EC9B0 ;# ptr + .4byte 0x800EE090 ;# ptr + .4byte 0x800EE230 ;# ptr + .4byte 0x800EE220 ;# ptr + .4byte 0x800E9830 ;# ptr + .4byte 0x800ED240 ;# ptr + .4byte 0x800ED280 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9900 ;# ptr + .4byte 0x800ED3A0 ;# ptr + .4byte 0x800ED9B0 ;# ptr + .4byte 0x800EDB30 ;# ptr + .4byte 0x800EDC10 ;# ptr + .4byte 0x800EDC70 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$214161 $$214161: - .incbin "baserom.dol", 0x492E00, 0x8 + .asciz "NodeMix" .global $$214162 $$214162: - .incbin "baserom.dol", 0x492E08, 0x8 + .asciz "DrawOpa" .global $$214163 $$214163: - .incbin "baserom.dol", 0x492E10, 0x8 + .asciz "DrawXlu" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214252 $$214252: - .incbin "baserom.dol", 0x499C10, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnobj.s b/asm/libnw4r_g3d/g3d_scnobj.s index 16d04320..1865a05a 100644 --- a/asm/libnw4r_g3d/g3d_scnobj.s +++ b/asm/libnw4r_g3d/g3d_scnobj.s @@ -1787,35 +1787,88 @@ GetTypeObj__Q34nw4r3g3d6ScnObjCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6ScnObj TYPE_NAME__Q34nw4r3g3d6ScnObj: - .incbin "baserom.dol", 0x404F90, 0x10 + .4byte 0x00000007 + .asciz "ScnObj" + .balign 4 + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d7ScnLeaf TYPE_NAME__Q34nw4r3g3d7ScnLeaf: - .incbin "baserom.dol", 0x404FA0, 0x10 + .4byte 0x00000008 + .asciz "ScnLeaf" + .4byte 0 .global TYPE_NAME__Q34nw4r3g3d8ScnGroup TYPE_NAME__Q34nw4r3g3d8ScnGroup: - .incbin "baserom.dol", 0x404FB0, 0x10 + .4byte 0x00000009 + .asciz "ScnGroup" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$211622 $$211622: - .incbin "baserom.dol", 0x43D078, 0x28 + .4byte 0x800E94D8 ;# ptr + .4byte 0x800E9370 ;# ptr + .4byte 0x800E9398 ;# ptr + .4byte 0x800E93C0 ;# ptr + .4byte 0x800E93E8 ;# ptr + .4byte 0x800E9410 ;# ptr + .4byte 0x800E9438 ;# ptr + .4byte 0x800E9460 ;# ptr + .4byte 0x800E9488 ;# ptr + .4byte 0x800E94B0 ;# ptr .global $$211656 $$211656: - .incbin "baserom.dol", 0x43D0A0, 0x28 + .4byte 0x800E95B0 ;# ptr + .4byte 0x800E9520 ;# ptr + .4byte 0x800E9530 ;# ptr + .4byte 0x800E9540 ;# ptr + .4byte 0x800E9550 ;# ptr + .4byte 0x800E9560 ;# ptr + .4byte 0x800E9570 ;# ptr + .4byte 0x800E9580 ;# ptr + .4byte 0x800E9590 ;# ptr + .4byte 0x800E95A0 ;# ptr .global __vt__Q34nw4r3g3d8ScnGroup __vt__Q34nw4r3g3d8ScnGroup: - .incbin "baserom.dol", 0x43D0C8, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x800EA860 ;# ptr + .4byte 0x800E9FA0 ;# ptr + .4byte 0x800EA7A0 ;# ptr + .4byte 0x800EA900 ;# ptr + .4byte 0x800EA8F0 ;# ptr + .4byte 0x800E9D40 ;# ptr + .4byte 0x800E9350 ;# ptr + .4byte 0x800E94F0 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9110 ;# ptr + .4byte 0x800EA450 ;# ptr + .4byte 0x800EA5E0 ;# ptr + .4byte 0x800EA6A0 ;# ptr .global __vt__Q34nw4r3g3d6ScnObj __vt__Q34nw4r3g3d6ScnObj: - .incbin "baserom.dol", 0x43D108, 0x38 + .4byte 0 + .4byte 0 + .4byte 0x800EA8B0 ;# ptr + .4byte 0 + .4byte 0x800E92D0 ;# ptr + .4byte 0x800EA920 ;# ptr + .4byte 0x800EA910 ;# ptr + .4byte 0 + .4byte 0x800E9350 ;# ptr + .4byte 0x800E94F0 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9110 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211583 $$211583: - .incbin "baserom.dol", 0x499C00, 0x4 + .4byte 0 .global $$211803 $$211803: - .incbin "baserom.dol", 0x499C04, 0x4 + .4byte 0x3F800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global gpCullingFrustum__Q24nw4r3g3d diff --git a/asm/libnw4r_g3d/g3d_scnroot.s b/asm/libnw4r_g3d/g3d_scnroot.s index 340b6e7d..817faef6 100644 --- a/asm/libnw4r_g3d/g3d_scnroot.s +++ b/asm/libnw4r_g3d/g3d_scnroot.s @@ -1935,31 +1935,60 @@ GetTypeObj__Q34nw4r3g3d7ScnRootCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d7ScnRoot TYPE_NAME__Q34nw4r3g3d7ScnRoot: - .incbin "baserom.dol", 0x404FC0, 0x10 + .4byte 0x00000008 + .asciz "ScnRoot" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12ScnObjGather __vt__Q34nw4r3g3d12ScnObjGather: - .incbin "baserom.dol", 0x43D140, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x800EC300 ;# ptr + .4byte 0x800EB5D0 ;# ptr + .4byte 0x800EC2F0 ;# ptr + .4byte 0x800EB6F0 ;# ptr + .4byte 0x800EBFD0 ;# ptr + .4byte 0x800EC150 ;# ptr + .4byte 0x800EC1C0 ;# ptr + .4byte 0x800EC250 ;# ptr + .4byte 0x800EC2E0 ;# ptr + .4byte 0 .global __vt__Q34nw4r3g3d7ScnRoot __vt__Q34nw4r3g3d7ScnRoot: - .incbin "baserom.dol", 0x43D170, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x800EC310 ;# ptr + .4byte 0x800EAA70 ;# ptr + .4byte 0x800EB550 ;# ptr + .4byte 0x800EC390 ;# ptr + .4byte 0x800EC380 ;# ptr + .4byte 0x800E9D40 ;# ptr + .4byte 0x800E9350 ;# ptr + .4byte 0x800E94F0 ;# ptr + .4byte 0x800E96A0 ;# ptr + .4byte 0x800E96B0 ;# ptr + .4byte 0x800E9110 ;# ptr + .4byte 0x800EA450 ;# ptr + .4byte 0x800EA5E0 ;# ptr + .4byte 0x800EA6A0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213447 $$213447: - .incbin "baserom.dol", 0x492DF0, 0x4 + .4byte 0x00000020 .global $$213459 $$213459: - .incbin "baserom.dol", 0x492DF4, 0x4 + .4byte 0x00000020 .global $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4PFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b$$1__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4PFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b$$1__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v$$2shuffle$$20: - .incbin "baserom.dol", 0x492DF8, 0x4 + .4byte 0xFFFFFFFC .global $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4RPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b$$1__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4RPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b$$1__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v$$2shuffle$$20: - .incbin "baserom.dol", 0x492DFC, 0x4 + .4byte 0xFFFFFFFC .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214739 $$214739: - .incbin "baserom.dol", 0x499C08, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_state.s b/asm/libnw4r_g3d/g3d_state.s index 7a9deb09..efd4d506 100644 --- a/asm/libnw4r_g3d/g3d_state.s +++ b/asm/libnw4r_g3d/g3d_state.s @@ -3882,51 +3882,69 @@ lbl_800E0018: /* 800E006C 000DBEAC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40237C, 0x4 + .4byte 0x800DFE00 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc$$2envMtx $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc$$2envMtx: - .incbin "baserom.dol", 0x404E88, 0x30 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0xBF000000 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd: - .incbin "baserom.dol", 0x43D050, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800DFC90 ;# ptr + .4byte 0x800DF520 ;# ptr + .4byte 0x800DFC40 ;# ptr + .4byte 0x800DFAE0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213345 $$213345: - .incbin "baserom.dol", 0x492DD8, 0x4 + .4byte 0xFFFFFFFF .global pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2 pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2: - .incbin "baserom.dol", 0x492DDC, 0x4 + .4byte 0x805103C8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global cm2hw__Q34nw4r3g3d4fifo cm2hw__Q34nw4r3g3d4fifo: - .incbin "baserom.dol", 0x499B10, 0x4 + .4byte 0x00020103 .global $$215665 $$215665: - .incbin "baserom.dol", 0x499B14, 0x4 + .4byte 0 .global $$215666 $$215666: - .incbin "baserom.dol", 0x499B18, 0x4 + .4byte 0xBF800000 .global $$215667 $$215667: - .incbin "baserom.dol", 0x499B1C, 0x4 + .4byte 0x358637BD .global $$215668 $$215668: - .incbin "baserom.dol", 0x499B20, 0x4 + .4byte 0x3F800000 .global $$216488 $$216488: - .incbin "baserom.dol", 0x499B24, 0x4 + .4byte 0x3F000000 .global $$216489 $$216489: - .incbin "baserom.dol", 0x499B28, 0x8 + .4byte 0x3B808081 + .4byte 0 .global $$216494 $$216494: - .incbin "baserom.dol", 0x499B30, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sGenMode2__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2 diff --git a/asm/libnw4r_g3d/g3d_tmem.s b/asm/libnw4r_g3d/g3d_tmem.s index f69bcdc7..dda57b0b 100644 --- a/asm/libnw4r_g3d/g3d_tmem.s +++ b/asm/libnw4r_g3d/g3d_tmem.s @@ -244,10 +244,488 @@ lbl_800DC7B8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global scaaaTexRegionAddr scaaaTexRegionAddr: - .incbin "baserom.dol", 0x404708, 0x3C0 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0x00020000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0x00038000 + .4byte 0x00028000 + .4byte 0x00018000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D8000 + .4byte 0x00068000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00070000 + .4byte 0x00060000 + .4byte 0x00050000 + .4byte 0x00020000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D8000 + .4byte 0x00068000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000E8000 + .4byte 0x00078000 + .4byte 0x000C8000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000B0000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000C8000 + .4byte 0x000D0000 + .4byte 0x000D0000 + .4byte 0x000C8000 + .4byte 0x000C0000 + .4byte 0x000B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000C8000 + .4byte 0x000D0000 + .4byte 0x000D0000 + .4byte 0x000C8000 + .4byte 0x000C0000 + .4byte 0x000B0000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000D0000 + .4byte 0x000E0000 + .4byte 0x000E0000 + .4byte 0x000D0000 + .4byte 0x000C0000 + .4byte 0x000B0000 .global scaaaTexRegionSize scaaaTexRegionSize: - .incbin "baserom.dol", 0x404AC8, 0x3C0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global saaTexRegion diff --git a/asm/libnw4r_g3d/g3d_transform.s b/asm/libnw4r_g3d/g3d_transform.s index 3056fec4..6776df2e 100644 --- a/asm/libnw4r_g3d/g3d_transform.s +++ b/asm/libnw4r_g3d/g3d_transform.s @@ -213,4 +213,5 @@ lbl_800D37E8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global det_epsilon__Q34nw4r3g3d6detail det_epsilon__Q34nw4r3g3d6detail: - .incbin "baserom.dol", 0x499A48, 0x8 + .4byte 0x03AA2425 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_xsi.s b/asm/libnw4r_g3d/g3d_xsi.s index d6f829e1..aff7ae33 100644 --- a/asm/libnw4r_g3d/g3d_xsi.s +++ b/asm/libnw4r_g3d/g3d_xsi.s @@ -841,18 +841,31 @@ lbl_800E85EC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .incbin "baserom.dol", 0x404F20, 0x1C + .4byte 0x800E7CC0 ;# ptr + .4byte 0x800E7BA0 ;# ptr + .4byte 0x800E7C70 ;# ptr + .4byte 0x800E7AC0 ;# ptr + .4byte 0x800E7B00 ;# ptr + .4byte 0x800E7A30 ;# ptr + .4byte 0x800E79F0 ;# ptr .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .incbin "baserom.dol", 0x404F3C, 0x1C + .4byte 0x800E8250 ;# ptr + .4byte 0x800E8090 ;# ptr + .4byte 0x800E81C0 ;# ptr + .4byte 0x800E7F20 ;# ptr + .4byte 0x800E7F50 ;# ptr + .4byte 0x800E7E10 ;# ptr + .4byte 0x800E7D90 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27161 $$27161: - .incbin "baserom.dol", 0x499BD8, 0x4 + .4byte 0 .global $$27162 $$27162: - .incbin "baserom.dol", 0x499BDC, 0x4 + .4byte 0x3F800000 .global $$27166 $$27166: - .incbin "baserom.dol", 0x499BE0, 0x8 + .4byte 0x3F360B61 + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_animation.s b/asm/libnw4r_lyt/lyt_animation.s index a30ff742..7f9431eb 100644 --- a/asm/libnw4r_lyt/lyt_animation.s +++ b/asm/libnw4r_lyt/lyt_animation.s @@ -1658,30 +1658,39 @@ lbl_800FD854: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt18AnimTransformBasic __vt__Q34nw4r3lyt18AnimTransformBasic: - .incbin "baserom.dol", 0x43D668, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x800FC590 ;# ptr + .4byte 0x800FC660 ;# ptr + .4byte 0x800FC680 ;# ptr + .4byte 0x800FC800 ;# ptr + .4byte 0x800FC9D0 ;# ptr + .4byte 0x800FCAF0 ;# ptr + .4byte 0x800FCCD0 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210121 $$210121: - .incbin "baserom.dol", 0x499CF0, 0x4 + .4byte 0xBA83126F .global $$210122 $$210122: - .incbin "baserom.dol", 0x499CF4, 0x4 + .4byte 0x3A83126F .global $$210146 $$210146: - .incbin "baserom.dol", 0x499CF8, 0x4 + .4byte 0x3F800000 .global $$210147 $$210147: - .incbin "baserom.dol", 0x499CFC, 0x4 + .4byte 0x40000000 .global $$210148 $$210148: - .incbin "baserom.dol", 0x499D00, 0x4 + .4byte 0x40400000 .global $$210149 $$210149: - .incbin "baserom.dol", 0x499D04, 0x4 + .4byte 0xC0000000 .global $$210154 $$210154: - .incbin "baserom.dol", 0x499D08, 0x4 + .4byte 0 .global $$210434 $$210434: - .incbin "baserom.dol", 0x499D0C, 0x4 + .4byte 0x3F000000 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s index 885cc6c5..2543f752 100644 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s @@ -344,12 +344,17 @@ lbl_800FDD20: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt19ArcResourceAccessor __vt__Q34nw4r3lyt19ArcResourceAccessor: - .incbin "baserom.dol", 0x43D6A8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800FDCD0 ;# ptr + .4byte 0x800FDC00 ;# ptr + .4byte 0x800FDC60 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23486 $$23486: - .incbin "baserom.dol", 0x492E30, 0x4 + .4byte 0x2E000000 .global $$23487 $$23487: - .incbin "baserom.dol", 0x492E34, 0x4 + .4byte 0x2E2E0000 diff --git a/asm/libnw4r_lyt/lyt_bounding.s b/asm/libnw4r_lyt/lyt_bounding.s index f2f764ee..ab5a38b8 100644 --- a/asm/libnw4r_lyt/lyt_bounding.s +++ b/asm/libnw4r_lyt/lyt_bounding.s @@ -70,12 +70,41 @@ __sinit_$$3lyt_bounding_cpp: /* 800F911C 000F4F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402390, 0x4 + .4byte 0x800F9110 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8Bounding __vt__Q34nw4r3lyt8Bounding: - .incbin "baserom.dol", 0x43D570, 0x78 + .4byte 0 + .4byte 0 + .4byte 0x800F9090 ;# ptr + .4byte 0x800F9100 ;# ptr + .4byte 0x800F30D0 ;# ptr + .4byte 0x800F33D0 ;# ptr + .4byte 0x800F90F0 ;# ptr + .4byte 0x800F3470 ;# ptr + .4byte 0x800F3500 ;# ptr + .4byte 0x800F2EA0 ;# ptr + .4byte 0x800F2EB0 ;# ptr + .4byte 0x800F2EC0 ;# ptr + .4byte 0x800F2EF0 ;# ptr + .4byte 0x800F2F20 ;# ptr + .4byte 0x800F2F30 ;# ptr + .4byte 0x800F2F40 ;# ptr + .4byte 0x800F3000 ;# ptr + .4byte 0x800F35C0 ;# ptr + .4byte 0x800F35E0 ;# ptr + .4byte 0x800F3670 ;# ptr + .4byte 0x800F3690 ;# ptr + .4byte 0x800F3730 ;# ptr + .4byte 0x800F3740 ;# ptr + .4byte 0x800F3750 ;# ptr + .4byte 0x800F3850 ;# ptr + .4byte 0x800F3A80 ;# ptr + .4byte 0x800F3AA0 ;# ptr + .4byte 0x800F3AB0 ;# ptr + .4byte 0x800F3950 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r3lyt8Bounding diff --git a/asm/libnw4r_lyt/lyt_common.s b/asm/libnw4r_lyt/lyt_common.s index e1cef011..72d190b4 100644 --- a/asm/libnw4r_lyt/lyt_common.s +++ b/asm/libnw4r_lyt/lyt_common.s @@ -822,10 +822,10 @@ lbl_800FE888: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28721 $$28721: - .incbin "baserom.dol", 0x499D10, 0x4 + .4byte 0 .global $$28722 $$28722: - .incbin "baserom.dol", 0x499D14, 0x4 + .4byte 0x3F800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc$$2texCoords diff --git a/asm/libnw4r_lyt/lyt_drawInfo.s b/asm/libnw4r_lyt/lyt_drawInfo.s index 78d3c543..d95b88a9 100644 --- a/asm/libnw4r_lyt/lyt_drawInfo.s +++ b/asm/libnw4r_lyt/lyt_drawInfo.s @@ -46,12 +46,15 @@ __dt__Q34nw4r3lyt8DrawInfoFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8DrawInfo __vt__Q34nw4r3lyt8DrawInfo: - .incbin "baserom.dol", 0x43D658, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800FC260 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25034 $$25034: - .incbin "baserom.dol", 0x499CE8, 0x4 + .4byte 0 .global $$25035 $$25035: - .incbin "baserom.dol", 0x499CEC, 0x4 + .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_group.s b/asm/libnw4r_lyt/lyt_group.s index 787e53ba..c82fcf4a 100644 --- a/asm/libnw4r_lyt/lyt_group.s +++ b/asm/libnw4r_lyt/lyt_group.s @@ -252,4 +252,7 @@ lbl_800F3E2C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt5Group __vt__Q34nw4r3lyt5Group: - .incbin "baserom.dol", 0x43D358, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x800F3C10 ;# ptr + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_layout.s b/asm/libnw4r_lyt/lyt_layout.s index 8ab98764..679d6bf7 100644 --- a/asm/libnw4r_lyt/lyt_layout.s +++ b/asm/libnw4r_lyt/lyt_layout.s @@ -1165,15 +1165,30 @@ lbl_800F4D94: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt6Layout __vt__Q34nw4r3lyt6Layout: - .incbin "baserom.dol", 0x43D368, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x800F40A0 ;# ptr + .4byte 0x800F41D0 ;# ptr + .4byte 0x800F4520 ;# ptr + .4byte 0x800F45A0 ;# ptr + .4byte 0x800F4600 ;# ptr + .4byte 0x800F4690 ;# ptr + .4byte 0x800F46C0 ;# ptr + .4byte 0x800F46F0 ;# ptr + .4byte 0x800F4710 ;# ptr + .4byte 0x800F49B0 ;# ptr + .4byte 0x800F49E0 ;# ptr + .4byte 0x800F4A00 ;# ptr + .4byte 0x800F4A20 ;# ptr + .4byte 0x800F4A80 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210260 $$210260: - .incbin "baserom.dol", 0x499C78, 0x4 + .4byte 0 .global $$210651 $$210651: - .incbin "baserom.dol", 0x499C7C, 0x4 + .4byte 0x3F000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mspAllocator__Q34nw4r3lyt6Layout diff --git a/asm/libnw4r_lyt/lyt_material.s b/asm/libnw4r_lyt/lyt_material.s index 88fc5275..a6ef1149 100644 --- a/asm/libnw4r_lyt/lyt_material.s +++ b/asm/libnw4r_lyt/lyt_material.s @@ -3233,33 +3233,60 @@ lbl_800FBFF8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kColSels $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kColSels: - .incbin "baserom.dol", 0x43D5E8, 0x20 + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 .global $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kAlpSels$$20 $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kAlpSels$$20: - .incbin "baserom.dol", 0x43D608, 0x20 + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 .global __vt__Q34nw4r3lyt8Material __vt__Q34nw4r3lyt8Material: - .incbin "baserom.dol", 0x43D628, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x800FA490 ;# ptr + .4byte 0x800FAFB0 ;# ptr + .4byte 0x800FBDC0 ;# ptr + .4byte 0x800FBDE0 ;# ptr + .4byte 0x800FBDF0 ;# ptr + .4byte 0x800FBE10 ;# ptr + .4byte 0x800FBED0 ;# ptr + .4byte 0x800FBEE0 ;# ptr + .4byte 0x800FBEF0 ;# ptr + .4byte 0x800FBF40 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210055 $$210055: - .incbin "baserom.dol", 0x499CB8, 0x4 + .4byte 0x3F000000 .global $$210056 $$210056: - .incbin "baserom.dol", 0x499CBC, 0x4 + .4byte 0x3F360B61 .global $$210057 $$210057: - .incbin "baserom.dol", 0x499CC0, 0x4 + .4byte 0 .global $$210058 $$210058: - .incbin "baserom.dol", 0x499CC4, 0x4 + .4byte 0x3F800000 .global $$210071 $$210071: - .incbin "baserom.dol", 0x499CC8, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$212398 $$212398: - .incbin "baserom.dol", 0x499CD0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global DefaultBlackColor diff --git a/asm/libnw4r_lyt/lyt_pane.s b/asm/libnw4r_lyt/lyt_pane.s index bde1aa77..77a4fed0 100644 --- a/asm/libnw4r_lyt/lyt_pane.s +++ b/asm/libnw4r_lyt/lyt_pane.s @@ -1150,35 +1150,66 @@ __sinit_$$3lyt_pane_cpp: /* 800F3AEC 000EF92C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402380, 0x4 + .4byte 0x800F3AE0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$210224 $$210224: - .incbin "baserom.dol", 0x43D2D8, 0xC + .asciz "RootPane" + .balign 4 .global __vt__Q34nw4r3lyt4Pane __vt__Q34nw4r3lyt4Pane: - .incbin "baserom.dol", 0x43D2E4, 0x74 + .4byte 0 + .4byte 0 + .4byte 0x800F2CD0 ;# ptr + .4byte 0x800F3AD0 ;# ptr + .4byte 0x800F30D0 ;# ptr + .4byte 0x800F33D0 ;# ptr + .4byte 0x800F3460 ;# ptr + .4byte 0x800F3470 ;# ptr + .4byte 0x800F3500 ;# ptr + .4byte 0x800F2EA0 ;# ptr + .4byte 0x800F2EB0 ;# ptr + .4byte 0x800F2EC0 ;# ptr + .4byte 0x800F2EF0 ;# ptr + .4byte 0x800F2F20 ;# ptr + .4byte 0x800F2F30 ;# ptr + .4byte 0x800F2F40 ;# ptr + .4byte 0x800F3000 ;# ptr + .4byte 0x800F35C0 ;# ptr + .4byte 0x800F35E0 ;# ptr + .4byte 0x800F3670 ;# ptr + .4byte 0x800F3690 ;# ptr + .4byte 0x800F3730 ;# ptr + .4byte 0x800F3740 ;# ptr + .4byte 0x800F3750 ;# ptr + .4byte 0x800F3850 ;# ptr + .4byte 0x800F3A80 ;# ptr + .4byte 0x800F3AA0 ;# ptr + .4byte 0x800F3AB0 ;# ptr + .4byte 0x800F3950 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29820 $$29820: - .incbin "baserom.dol", 0x499C58, 0x4 + .4byte 0 .global $$29821 $$29821: - .incbin "baserom.dol", 0x499C5C, 0x4 + .4byte 0x3F800000 .global $$210109 $$210109: - .incbin "baserom.dol", 0x499C60, 0x4 + .4byte 0x3F000000 .global $$210419 $$210419: - .incbin "baserom.dol", 0x499C64, 0x4 + .4byte 0x3C8EFA35 .global $$210420 $$210420: - .incbin "baserom.dol", 0x499C68, 0x8 + .4byte 0x3B808081 + .4byte 0 .global $$210424 $$210424: - .incbin "baserom.dol", 0x499C70, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r3lyt4Pane diff --git a/asm/libnw4r_lyt/lyt_picture.s b/asm/libnw4r_lyt/lyt_picture.s index 75c17189..0bc1a282 100644 --- a/asm/libnw4r_lyt/lyt_picture.s +++ b/asm/libnw4r_lyt/lyt_picture.s @@ -405,17 +405,47 @@ __sinit_$$3lyt_picture_cpp: /* 800F533C 000F117C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402384, 0x4 + .4byte 0x800F5330 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7Picture __vt__Q34nw4r3lyt7Picture: - .incbin "baserom.dol", 0x43D3A8, 0x78 + .4byte 0 + .4byte 0 + .4byte 0x800F4F10 ;# ptr + .4byte 0x800F5320 ;# ptr + .4byte 0x800F30D0 ;# ptr + .4byte 0x800F33D0 ;# ptr + .4byte 0x800F5240 ;# ptr + .4byte 0x800F3470 ;# ptr + .4byte 0x800F3500 ;# ptr + .4byte 0x800F51B0 ;# ptr + .4byte 0x800F51D0 ;# ptr + .4byte 0x800F2EC0 ;# ptr + .4byte 0x800F2EF0 ;# ptr + .4byte 0x800F5200 ;# ptr + .4byte 0x800F5220 ;# ptr + .4byte 0x800F2F40 ;# ptr + .4byte 0x800F3000 ;# ptr + .4byte 0x800F35C0 ;# ptr + .4byte 0x800F35E0 ;# ptr + .4byte 0x800F3670 ;# ptr + .4byte 0x800F3690 ;# ptr + .4byte 0x800F3730 ;# ptr + .4byte 0x800F3740 ;# ptr + .4byte 0x800F3750 ;# ptr + .4byte 0x800F3850 ;# ptr + .4byte 0x800F3A80 ;# ptr + .4byte 0x800F3AA0 ;# ptr + .4byte 0x800F3AB0 ;# ptr + .4byte 0x800F3950 ;# ptr + .4byte 0x800F4FF0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28804 $$28804: - .incbin "baserom.dol", 0x499C80, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r3lyt7Picture diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor.s b/asm/libnw4r_lyt/lyt_resourceAccessor.s index 73a43333..ceae178a 100644 --- a/asm/libnw4r_lyt/lyt_resourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_resourceAccessor.s @@ -25,4 +25,9 @@ GetFont__Q34nw4r3lyt16ResourceAccessorFPCc: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt16ResourceAccessor __vt__Q34nw4r3lyt16ResourceAccessor: - .incbin "baserom.dol", 0x43D690, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x800FD880 ;# ptr + .4byte 0 + .4byte 0x800FD8A0 ;# ptr + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_texMap.s b/asm/libnw4r_lyt/lyt_texMap.s index b4bc87eb..9d6fd3cb 100644 --- a/asm/libnw4r_lyt/lyt_texMap.s +++ b/asm/libnw4r_lyt/lyt_texMap.s @@ -138,7 +138,9 @@ lbl_800FC1C4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27564 $$27564: - .incbin "baserom.dol", 0x499CD8, 0x8 + .4byte 0x3B800000 + .4byte 0 .global $$27568 $$27568: - .incbin "baserom.dol", 0x499CE0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox.s b/asm/libnw4r_lyt/lyt_textBox.s index 24e11590..f8aa8ff7 100644 --- a/asm/libnw4r_lyt/lyt_textBox.s +++ b/asm/libnw4r_lyt/lyt_textBox.s @@ -1680,31 +1680,67 @@ __sinit_$$3lyt_textBox_cpp: /* 800F6AAC 000F28EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402388, 0x4 + .4byte 0x800F6AA0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7TextBox __vt__Q34nw4r3lyt7TextBox: - .incbin "baserom.dol", 0x43D420, 0x88 + .4byte 0 + .4byte 0 + .4byte 0x800F5630 ;# ptr + .4byte 0x800F6A90 ;# ptr + .4byte 0x800F30D0 ;# ptr + .4byte 0x800F33D0 ;# ptr + .4byte 0x800F58D0 ;# ptr + .4byte 0x800F3470 ;# ptr + .4byte 0x800F3500 ;# ptr + .4byte 0x800F57D0 ;# ptr + .4byte 0x800F57F0 ;# ptr + .4byte 0x800F2EC0 ;# ptr + .4byte 0x800F2EF0 ;# ptr + .4byte 0x800F5830 ;# ptr + .4byte 0x800F5850 ;# ptr + .4byte 0x800F2F40 ;# ptr + .4byte 0x800F3000 ;# ptr + .4byte 0x800F35C0 ;# ptr + .4byte 0x800F35E0 ;# ptr + .4byte 0x800F3670 ;# ptr + .4byte 0x800F3690 ;# ptr + .4byte 0x800F3730 ;# ptr + .4byte 0x800F3740 ;# ptr + .4byte 0x800F3750 ;# ptr + .4byte 0x800F3850 ;# ptr + .4byte 0x800F3A80 ;# ptr + .4byte 0x800F3AA0 ;# ptr + .4byte 0x800F3AB0 ;# ptr + .4byte 0x800F6570 ;# ptr + .4byte 0x800F6280 ;# ptr + .4byte 0x800F6350 ;# ptr + .4byte 0x800F63A0 ;# ptr + .4byte 0x800F6480 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$210917 $$210917: - .incbin "baserom.dol", 0x492E28, 0x8 + .4byte 0x000A0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210401 $$210401: - .incbin "baserom.dol", 0x499C88, 0x8 + .4byte 0 + .4byte 0 .global $$210454 $$210454: - .incbin "baserom.dol", 0x499C90, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$210915 $$210915: - .incbin "baserom.dol", 0x499C98, 0x4 + .4byte 0x3F000000 .global $$210916 $$210916: - .incbin "baserom.dol", 0x499C9C, 0x4 + .4byte 0x3F800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r3lyt7TextBox diff --git a/asm/libnw4r_lyt/lyt_window.s b/asm/libnw4r_lyt/lyt_window.s index 1ac87a45..e04de446 100644 --- a/asm/libnw4r_lyt/lyt_window.s +++ b/asm/libnw4r_lyt/lyt_window.s @@ -2548,26 +2548,77 @@ __sinit_$$3lyt_window_cpp: /* 800F904C 000F4E8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40238C, 0x4 + .4byte 0x800F9040 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos: - .incbin "baserom.dol", 0x43D4A8, 0x3C + .4byte 0x00000100 + .4byte 0x00010101 + .4byte 0x00010100 + .4byte 0x00000101 + .4byte 0x00010001 + .4byte 0x00010101 + .4byte 0x00000100 + .4byte 0x00010001 + .4byte 0x00000101 + .4byte 0x01000100 + .4byte 0x01010001 + .4byte 0x01000000 + .4byte 0x00010100 + .4byte 0x01010000 + .4byte 0x00010100 .global __vt__Q34nw4r3lyt6Window __vt__Q34nw4r3lyt6Window: - .incbin "baserom.dol", 0x43D4E4, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x800F6D40 ;# ptr + .4byte 0x800F9030 ;# ptr + .4byte 0x800F30D0 ;# ptr + .4byte 0x800F33D0 ;# ptr + .4byte 0x800F7020 ;# ptr + .4byte 0x800F3470 ;# ptr + .4byte 0x800F7200 ;# ptr + .4byte 0x800F6F90 ;# ptr + .4byte 0x800F6FB0 ;# ptr + .4byte 0x800F2EC0 ;# ptr + .4byte 0x800F2EF0 ;# ptr + .4byte 0x800F6FE0 ;# ptr + .4byte 0x800F7000 ;# ptr + .4byte 0x800F2F40 ;# ptr + .4byte 0x800F6E90 ;# ptr + .4byte 0x800F35C0 ;# ptr + .4byte 0x800F35E0 ;# ptr + .4byte 0x800F3670 ;# ptr + .4byte 0x800F7290 ;# ptr + .4byte 0x800F3730 ;# ptr + .4byte 0x800F3740 ;# ptr + .4byte 0x800F3750 ;# ptr + .4byte 0x800F3850 ;# ptr + .4byte 0x800F8FB0 ;# ptr + .4byte 0x800F3AA0 ;# ptr + .4byte 0x800F8FC0 ;# ptr + .4byte 0x800F3950 ;# ptr + .4byte 0x800F9020 ;# ptr + .4byte 0x800F8FF0 ;# ptr + .4byte 0x800F7320 ;# ptr + .4byte 0x800F7430 ;# ptr + .4byte 0x800F7A40 ;# ptr + .4byte 0x800F8180 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29836 $$29836: - .incbin "baserom.dol", 0x499CA0, 0x8 + .4byte 0 + .4byte 0 .global $$210228 $$210228: - .incbin "baserom.dol", 0x499CA8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$210229 $$210229: - .incbin "baserom.dol", 0x499CB0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r3lyt6Window diff --git a/asm/libnw4r_math/math_arithmetic.s b/asm/libnw4r_math/math_arithmetic.s index 8e3c5b9e..8bcb9873 100644 --- a/asm/libnw4r_math/math_arithmetic.s +++ b/asm/libnw4r_math/math_arithmetic.s @@ -113,30 +113,609 @@ FrSqrt__Q24nw4r4mathFf: .section .data, "wa" # 0x80421040 - 0x80496700 .global sExpTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2 sExpTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2: - .incbin "baserom.dol", 0x43D6C0, 0x108 + .4byte 0x3F000000 + .4byte 0x3CB5586D + .4byte 0x3F05AAC3 + .4byte 0x3CBD5FCF + .4byte 0x3F0B95C2 + .4byte 0x3CC5C232 + .4byte 0x3F11C3D3 + .4byte 0x3CCE839C + .4byte 0x3F1837F0 + .4byte 0x3CD7A842 + .4byte 0x3F1EF532 + .4byte 0x3CE13489 + .4byte 0x3F25FED7 + .4byte 0x3CEB2D08 + .4byte 0x3F2D583F + .4byte 0x3CF59689 + .4byte 0x3F3504F3 + .4byte 0x3D003B07 + .4byte 0x3F3D08A4 + .4byte 0x3D05E867 + .4byte 0x3F45672A + .4byte 0x3D0BD620 + .4byte 0x3F4E248C + .4byte 0x3D12070B + .4byte 0x3F5744FD + .4byte 0x3D187E22 + .4byte 0x3F60CCDF + .4byte 0x3D1F3E80 + .4byte 0x3F6AC0C7 + .4byte 0x3D264B63 + .4byte 0x3F75257D + .4byte 0x3D2DA82F + .4byte 0x3F800000 + .4byte 0x3D35586D + .4byte 0x3F85AAC3 + .4byte 0x3D3D5FCF + .4byte 0x3F8B95C2 + .4byte 0x3D45C232 + .4byte 0x3F91C3D3 + .4byte 0x3D4E839C + .4byte 0x3F9837F0 + .4byte 0x3D57A842 + .4byte 0x3F9EF532 + .4byte 0x3D613489 + .4byte 0x3FA5FED7 + .4byte 0x3D6B2D08 + .4byte 0x3FAD583F + .4byte 0x3D759689 + .4byte 0x3FB504F3 + .4byte 0x3D803B07 + .4byte 0x3FBD08A4 + .4byte 0x3D85E867 + .4byte 0x3FC5672A + .4byte 0x3D8BD620 + .4byte 0x3FCE248C + .4byte 0x3D92070B + .4byte 0x3FD744FD + .4byte 0x3D987E22 + .4byte 0x3FE0CCDF + .4byte 0x3D9F3E80 + .4byte 0x3FEAC0C7 + .4byte 0x3DA64B63 + .4byte 0x3FF5257D + .4byte 0x3DADA82F + .4byte 0x40000000 + .4byte 0x3DB5586D .global sLogTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2 sLogTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2: - .incbin "baserom.dol", 0x43D7C8, 0x808 + .4byte 0 + .4byte 0x3B7F8053 + .4byte 0x3B7F8053 + .4byte 0x3B7E8251 + .4byte 0x3BFF0152 + .4byte 0x3B7D8646 + .4byte 0x3C3EE23B + .4byte 0x3B7C8C29 + .4byte 0x3C7E0546 + .4byte 0x3B7B93F9 + .4byte 0x3C9E7522 + .4byte 0x3B7A9DAF + .4byte 0x3CBDC8D8 + .4byte 0x3B79A946 + .4byte 0x3CDCFE01 + .4byte 0x3B78B6BA + .4byte 0x3CFC14D9 + .4byte 0x3B77C602 + .4byte 0x3D0D86CC + .4byte 0x3B76D719 + .4byte 0x3D1CF43E + .4byte 0x3B75E9FD + .4byte 0x3D2C52DE + .4byte 0x3B74FEA3 + .4byte 0x3D3BA2C8 + .4byte 0x3B74150C + .4byte 0x3D4AE418 + .4byte 0x3B732D2F + .4byte 0x3D5A16EC + .4byte 0x3B72470D + .4byte 0x3D693B5C + .4byte 0x3B716299 + .4byte 0x3D785186 + .4byte 0x3B707FD6 + .4byte 0x3D83ACC2 + .4byte 0x3B6F9EB8 + .4byte 0x3D8B29B7 + .4byte 0x3B6EBF3F + .4byte 0x3D929FB1 + .4byte 0x3B6DE167 + .4byte 0x3D9A0EBD + .4byte 0x3B6D0527 + .4byte 0x3DA176E6 + .4byte 0x3B6C2A83 + .4byte 0x3DA8D83A + .4byte 0x3B6B516A + .4byte 0x3DB032C5 + .4byte 0x3B6A79E0 + .4byte 0x3DB78694 + .4byte 0x3B69A3E2 + .4byte 0x3DBED3B3 + .4byte 0x3B68CF6A + .4byte 0x3DC61A2F + .4byte 0x3B67FC71 + .4byte 0x3DCD5A12 + .4byte 0x3B672AF6 + .4byte 0x3DD4936A + .4byte 0x3B665AF1 + .4byte 0x3DDBC641 + .4byte 0x3B658C66 + .4byte 0x3DE2F2A4 + .4byte 0x3B64BF47 + .4byte 0x3DEA189F + .4byte 0x3B63F396 + .4byte 0x3DF1383B + .4byte 0x3B632952 + .4byte 0x3DF85186 + .4byte 0x3B626072 + .4byte 0x3DFF648A + .4byte 0x3B6198F3 + .4byte 0x3E0338A9 + .4byte 0x3B60D2D4 + .4byte 0x3E06BBF4 + .4byte 0x3B600E10 + .4byte 0x3E0A3C2C + .4byte 0x3B5F4AA0 + .4byte 0x3E0DB957 + .4byte 0x3B5E8888 + .4byte 0x3E113379 + .4byte 0x3B5DC7BE + .4byte 0x3E14AA98 + .4byte 0x3B5D083F + .4byte 0x3E181EB9 + .4byte 0x3B5C4A10 + .4byte 0x3E1B8FE1 + .4byte 0x3B5B8D22 + .4byte 0x3E1EFE16 + .4byte 0x3B5AD177 + .4byte 0x3E22695B + .4byte 0x3B5A170D + .4byte 0x3E25D1B8 + .4byte 0x3B595DE2 + .4byte 0x3E29372F + .4byte 0x3B58A5EB + .4byte 0x3E2C99C7 + .4byte 0x3B57EF2F + .4byte 0x3E2FF984 + .4byte 0x3B5739A3 + .4byte 0x3E33566A + .4byte 0x3B568548 + .4byte 0x3E36B07F + .4byte 0x3B55D21E + .4byte 0x3E3A07C8 + .4byte 0x3B552018 + .4byte 0x3E3D5C48 + .4byte 0x3B546F3F + .4byte 0x3E40AE05 + .4byte 0x3B53BF8A + .4byte 0x3E43FD03 + .4byte 0x3B5310F4 + .4byte 0x3E474947 + .4byte 0x3B52637E + .4byte 0x3E4A92D5 + .4byte 0x3B51B724 + .4byte 0x3E4DD9B1 + .4byte 0x3B510BE1 + .4byte 0x3E511DE1 + .4byte 0x3B5061BA + .4byte 0x3E545F68 + .4byte 0x3B4FB8A5 + .4byte 0x3E579E4A + .4byte 0x3B4F109F + .4byte 0x3E5ADA8D + .4byte 0x3B4E69AC + .4byte 0x3E5E1434 + .4byte 0x3B4DC3C3 + .4byte 0x3E614B43 + .4byte 0x3B4D1EE4 + .4byte 0x3E647FBE + .4byte 0x3B4C7B0B + .4byte 0x3E67B1AA + .4byte 0x3B4BD839 + .4byte 0x3E6AE10B + .4byte 0x3B4B366C + .4byte 0x3E6E0DE5 + .4byte 0x3B4A959D + .4byte 0x3E71383B + .4byte 0x3B49F5CB + .4byte 0x3E746013 + .4byte 0x3B4956F2 + .4byte 0x3E77856E + .4byte 0x3B48B917 + .4byte 0x3E7AA853 + .4byte 0x3B481C2C + .4byte 0x3E7DC8C3 + .4byte 0x3B47803A + .4byte 0x3E807362 + .4byte 0x3B46E53D + .4byte 0x3E82012D + .4byte 0x3B464B2D + .4byte 0x3E838DC3 + .4byte 0x3B45B20D + .4byte 0x3E851927 + .4byte 0x3B4519D4 + .4byte 0x3E86A35B + .4byte 0x3B448288 + .4byte 0x3E882C60 + .4byte 0x3B43EC24 + .4byte 0x3E89B438 + .4byte 0x3B4356A4 + .4byte 0x3E8B3AE5 + .4byte 0x3B42C207 + .4byte 0x3E8CC069 + .4byte 0x3B422E4E + .4byte 0x3E8E44C6 + .4byte 0x3B419B74 + .4byte 0x3E8FC7FD + .4byte 0x3B410975 + .4byte 0x3E914A10 + .4byte 0x3B407856 + .4byte 0x3E92CB01 + .4byte 0x3B3FE80D + .4byte 0x3E944AD1 + .4byte 0x3B3F589B + .4byte 0x3E95C982 + .4byte 0x3B3ECA00 + .4byte 0x3E974716 + .4byte 0x3B3E3C3B + .4byte 0x3E98C38E + .4byte 0x3B3DAF45 + .4byte 0x3E9A3EED + .4byte 0x3B3D2321 + .4byte 0x3E9BB933 + .4byte 0x3B3C97CB + .4byte 0x3E9D3263 + .4byte 0x3B3C0D40 + .4byte 0x3E9EAA7D + .4byte 0x3B3B8382 + .4byte 0x3EA02184 + .4byte 0x3B3AFA8E + .4byte 0x3EA19779 + .4byte 0x3B3A7260 + .4byte 0x3EA30C5E + .4byte 0x3B39EAF7 + .4byte 0x3EA48034 + .4byte 0x3B396454 + .4byte 0x3EA5F2FD + .4byte 0x3B38DE72 + .4byte 0x3EA764BA + .4byte 0x3B385952 + .4byte 0x3EA8D56C + .4byte 0x3B37D4F2 + .4byte 0x3EAA4516 + .4byte 0x3B375150 + .4byte 0x3EABB3B9 + .4byte 0x3B36CE66 + .4byte 0x3EAD2156 + .4byte 0x3B364C3A + .4byte 0x3EAE8DEE + .4byte 0x3B35CAC6 + .4byte 0x3EAFF984 + .4byte 0x3B354A06 + .4byte 0x3EB16418 + .4byte 0x3B34C9FF + .4byte 0x3EB2CDAC + .4byte 0x3B344AAD + .4byte 0x3EB43641 + .4byte 0x3B33CC0F + .4byte 0x3EB59DD9 + .4byte 0x3B334E21 + .4byte 0x3EB70475 + .4byte 0x3B32D0E3 + .4byte 0x3EB86A17 + .4byte 0x3B325451 + .4byte 0x3EB9CEC0 + .4byte 0x3B31D86F + .4byte 0x3EBB3271 + .4byte 0x3B315D38 + .4byte 0x3EBC952B + .4byte 0x3B30E2AA + .4byte 0x3EBDF6F0 + .4byte 0x3B3068C7 + .4byte 0x3EBF57C2 + .4byte 0x3B2FEF87 + .4byte 0x3EC0B7A1 + .4byte 0x3B2F76F3 + .4byte 0x3EC2168F + .4byte 0x3B2EFF02 + .4byte 0x3EC3748D + .4byte 0x3B2E87B0 + .4byte 0x3EC4D19C + .4byte 0x3B2E1106 + .4byte 0x3EC62DBE + .4byte 0x3B2D9AFB + .4byte 0x3EC788F4 + .4byte 0x3B2D258E + .4byte 0x3EC8E33F + .4byte 0x3B2CB0C5 + .4byte 0x3ECA3CA1 + .4byte 0x3B2C3C92 + .4byte 0x3ECB951A + .4byte 0x3B2BC8FE + .4byte 0x3ECCECAC + .4byte 0x3B2B5609 + .4byte 0x3ECE4358 + .4byte 0x3B2AE3A6 + .4byte 0x3ECF991F + .4byte 0x3B2A71E2 + .4byte 0x3ED0EE03 + .4byte 0x3B2A00AF + .4byte 0x3ED24205 + .4byte 0x3B299018 + .4byte 0x3ED39525 + .4byte 0x3B292012 + .4byte 0x3ED4E765 + .4byte 0x3B28B09F + .4byte 0x3ED638C6 + .4byte 0x3B2841C2 + .4byte 0x3ED7894A + .4byte 0x3B27D372 + .4byte 0x3ED8D8F0 + .4byte 0x3B2765B5 + .4byte 0x3EDA27BC + .4byte 0x3B26F885 + .4byte 0x3EDB75AD + .4byte 0x3B268BE4 + .4byte 0x3EDCC2C5 + .4byte 0x3B261FD4 + .4byte 0x3EDE0F04 + .4byte 0x3B25B449 + .4byte 0x3EDF5A6D + .4byte 0x3B25494C + .4byte 0x3EE0A500 + .4byte 0x3B24DEDD + .4byte 0x3EE1EEBD + .4byte 0x3B2474F2 + .4byte 0x3EE337A7 + .4byte 0x3B240B8D + .4byte 0x3EE47FBE + .4byte 0x3B23A2B2 + .4byte 0x3EE5C704 + .4byte 0x3B233A5C + .4byte 0x3EE70D78 + .4byte 0x3B22D28A + .4byte 0x3EE8531D + .4byte 0x3B226B3E + .4byte 0x3EE997F4 + .4byte 0x3B220473 + .4byte 0x3EEADBFD + .4byte 0x3B219E28 + .4byte 0x3EEC1F39 + .4byte 0x3B213863 + .4byte 0x3EED61AA + .4byte 0x3B20D31A + .4byte 0x3EEEA350 + .4byte 0x3B206E53 + .4byte 0x3EEFE42D + .4byte 0x3B200A07 + .4byte 0x3EF12441 + .4byte 0x3B1FA639 + .4byte 0x3EF2638D + .4byte 0x3B1F42E6 + .4byte 0x3EF3A213 + .4byte 0x3B1EE011 + .4byte 0x3EF4DFD3 + .4byte 0x3B1E7DB3 + .4byte 0x3EF61CCF + .4byte 0x3B1E1BCE + .4byte 0x3EF75906 + .4byte 0x3B1DBA66 + .4byte 0x3EF8947B + .4byte 0x3B1D5975 + .4byte 0x3EF9CF2E + .4byte 0x3B1CF8F9 + .4byte 0x3EFB0920 + .4byte 0x3B1C98F1 + .4byte 0x3EFC4252 + .4byte 0x3B1C3960 + .4byte 0x3EFD7AC4 + .4byte 0x3B1BDA44 + .4byte 0x3EFEB279 + .4byte 0x3B1B7B9C + .4byte 0x3EFFE970 + .4byte 0x3B1B1D68 + .4byte 0x3F008FD6 + .4byte 0x3B1ABFA3 + .4byte 0x3F012A95 + .4byte 0x3B1A6253 + .4byte 0x3F01C4F7 + .4byte 0x3B1A056D + .4byte 0x3F025EFD + .4byte 0x3B19A8FC + .4byte 0x3F02F8A6 + .4byte 0x3B194CF6 + .4byte 0x3F0391F3 + .4byte 0x3B18F160 + .4byte 0x3F042AE4 + .4byte 0x3B189639 + .4byte 0x3F04C37A + .4byte 0x3B183B7A + .4byte 0x3F055BB6 + .4byte 0x3B17E12A + .4byte 0x3F05F397 + .4byte 0x3B178746 + .4byte 0x3F068B1E + .4byte 0x3B172DC8 + .4byte 0x3F07224C + .4byte 0x3B16D4B6 + .4byte 0x3F07B921 + .4byte 0x3B167C0B + .4byte 0x3F084F9D + .4byte 0x3B1623CC + .4byte 0x3F08E5C1 + .4byte 0x3B15CBEF + .4byte 0x3F097B8D + .4byte 0x3B15747E + .4byte 0x3F0A1101 + .4byte 0x3B151D6F + .4byte 0x3F0AA61F + .4byte 0x3B14C6C8 + .4byte 0x3F0B3AE5 + .4byte 0x3B147083 + .4byte 0x3F0BCF56 + .4byte 0x3B141AA1 + .4byte 0x3F0C6371 + .4byte 0x3B13C522 + .4byte 0x3F0CF736 + .4byte 0x3B13700A + .4byte 0x3F0D8AA6 + .4byte 0x3B131B50 + .4byte 0x3F0E1DC1 + .4byte 0x3B12C6F9 + .4byte 0x3F0EB088 + .4byte 0x3B127301 + .4byte 0x3F0F42FB + .4byte 0x3B121F67 + .4byte 0x3F0FD51A + .4byte 0x3B11CC30 + .4byte 0x3F1066E7 + .4byte 0x3B117958 + .4byte 0x3F10F860 + .4byte 0x3B1126D9 + .4byte 0x3F118987 + .4byte 0x3B10D4BE + .4byte 0x3F121A5B + .4byte 0x3B1082FC + .4byte 0x3F12AADE + .4byte 0x3B103195 + .4byte 0x3F133B10 + .4byte 0x3B0FE08D + .4byte 0x3F13CAF1 + .4byte 0x3B0F8FDA + .4byte 0x3F145A80 + .4byte 0x3B0F3F85 + .4byte 0x3F14E9C0 + .4byte 0x3B0EEF8B + .4byte 0x3F1578B0 + .4byte 0x3B0E9FE7 + .4byte 0x3F16074F + .4byte 0x3B0E50A1 + .4byte 0x3F1695A0 + .4byte 0x3B0E01AD + .4byte 0x3F1723A2 + .4byte 0x3B0DB313 + .4byte 0x3F17B155 + .4byte 0x3B0D64CF + .4byte 0x3F183EBA + .4byte 0x3B0D16E1 + .4byte 0x3F18CBD0 + .4byte 0x3B0CC94D + .4byte 0x3F19589A + .4byte 0x3B0C7C0B + .4byte 0x3F19E516 + .4byte 0x3B0C2F1A + .4byte 0x3F1A7145 + .4byte 0x3B0BE284 + .4byte 0x3F1AFD27 + .4byte 0x3B0B963B + .4byte 0x3F1B88BE + .4byte 0x3B0B4A47 + .4byte 0x3F1C1408 + .4byte 0x3B0AFEAA + .4byte 0x3F1C9F07 + .4byte 0x3B0AB35A + .4byte 0x3F1D29BA + .4byte 0x3B0A685B + .4byte 0x3F1DB422 + .4byte 0x3B0A1DAE + .4byte 0x3F1E3E40 + .4byte 0x3B09D353 + .4byte 0x3F1EC813 + .4byte 0x3B098949 + .4byte 0x3F1F519D + .4byte 0x3B093F8D + .4byte 0x3F1FDADC + .4byte 0x3B08F61E + .4byte 0x3F2063D2 + .4byte 0x3B08ACFC + .4byte 0x3F20EC7F + .4byte 0x3B08642C + .4byte 0x3F2174E3 + .4byte 0x3B081BA9 + .4byte 0x3F21FCFF + .4byte 0x3B07D374 + .4byte 0x3F2284D3 + .4byte 0x3B078B87 + .4byte 0x3F230C5E + .4byte 0x3B0743E8 + .4byte 0x3F2393A2 + .4byte 0x3B06FC96 + .4byte 0x3F241A9F + .4byte 0x3B06B58D + .4byte 0x3F24A154 + .4byte 0x3B066ED1 + .4byte 0x3F2527C3 + .4byte 0x3B06285F + .4byte 0x3F25ADEB + .4byte 0x3B05E235 + .4byte 0x3F2633CE + .4byte 0x3B059C55 + .4byte 0x3F26B96A + .4byte 0x3B0556BD + .4byte 0x3F273EC1 + .4byte 0x3B05116F + .4byte 0x3F27C3D2 + .4byte 0x3B04CC65 + .4byte 0x3F28489E + .4byte 0x3B0487A4 + .4byte 0x3F28CD26 + .4byte 0x3B04432C + .4byte 0x3F295169 + .4byte 0x3B03FEF9 + .4byte 0x3F29D568 + .4byte 0x3B03BB0F + .4byte 0x3F2A5923 + .4byte 0x3B03776A + .4byte 0x3F2ADC9B + .4byte 0x3B033409 + .4byte 0x3F2B5FCF + .4byte 0x3B02F0EE + .4byte 0x3F2BE2C0 + .4byte 0x3B02AE16 + .4byte 0x3F2C656E + .4byte 0x3B026B80 + .4byte 0x3F2CE7D9 + .4byte 0x3B022932 + .4byte 0x3F2D6A02 + .4byte 0x3B01E725 + .4byte 0x3F2DEBEA + .4byte 0x3B01A55C + .4byte 0x3F2E6D8F + .4byte 0x3B0163D4 + .4byte 0x3F2EEEF3 + .4byte 0x3B012291 + .4byte 0x3F2F7015 + .4byte 0x3B00E18E + .4byte 0x3F2FF0F7 + .4byte 0x3B00A0CB + .4byte 0x3F307198 + .4byte 0x3B006049 + .4byte 0x3F30F1F8 + .4byte 0x3B00200B + .4byte 0x3F317218 + .4byte 0x3AFFC014 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22456 $$22456: - .incbin "baserom.dol", 0x499D18, 0x4 + .4byte 0x3FB8AA3B .global $$22457 $$22457: - .incbin "baserom.dol", 0x499D1C, 0x4 + .4byte 0x3F317218 .global $$22458 $$22458: - .incbin "baserom.dol", 0x499D20, 0x4 + .4byte 0x41B8AA3B .global $$22494 $$22494: - .incbin "baserom.dol", 0x499D24, 0x4 + .4byte 0x43800000 .global $$22495 $$22495: - .incbin "baserom.dol", 0x499D28, 0x4 + .4byte 0x3F800000 .global $$22497 $$22497: - .incbin "baserom.dol", 0x499D2C, 0x4 + .4byte 0x3F000000 .global $$22498 $$22498: - .incbin "baserom.dol", 0x499D30, 0x8 + .4byte 0x40400000 + .4byte 0 diff --git a/asm/libnw4r_math/math_geometry.s b/asm/libnw4r_math/math_geometry.s index db072952..7d3f7578 100644 --- a/asm/libnw4r_math/math_geometry.s +++ b/asm/libnw4r_math/math_geometry.s @@ -820,13 +820,13 @@ lbl_800FFDD4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210654 $$210654: - .incbin "baserom.dol", 0x499D70, 0x4 + .4byte 0x3F000000 .global $$210655 $$210655: - .incbin "baserom.dol", 0x499D74, 0x4 + .4byte 0 .global $$210661 $$210661: - .incbin "baserom.dol", 0x499D78, 0x4 + .4byte 0x3CC90FDB .global $$210662 $$210662: - .incbin "baserom.dol", 0x499D7C, 0x4 + .4byte 0x3F360B61 diff --git a/asm/libnw4r_math/math_triangular.s b/asm/libnw4r_math/math_triangular.s index 234ee289..7b59fb59 100644 --- a/asm/libnw4r_math/math_triangular.s +++ b/asm/libnw4r_math/math_triangular.s @@ -235,32 +235,1125 @@ lbl_800FEDB8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global gSinCosTbl__Q34nw4r4math6detail gSinCosTbl__Q34nw4r4math6detail: - .incbin "baserom.dol", 0x405010, 0x1010 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3CC90A35 + .4byte 0xB99DCF89 + .4byte 0x3CC90A35 + .4byte 0x3F7FEC46 + .4byte 0x3CC8EAC0 + .4byte 0xBA6CB74E + .4byte 0x3D48FB87 + .4byte 0x3F7FB107 + .4byte 0x3CC8ADEF + .4byte 0xBAC5436C + .4byte 0x3D96A93F + .4byte 0x3F7F4E66 + .4byte 0x3CC851A8 + .4byte 0xBB0A04D1 + .4byte 0x3DC8BD23 + .4byte 0x3F7EC472 + .4byte 0x3CC7D5ED + .4byte 0xBB31465F + .4byte 0x3DFAB29E + .4byte 0x3F7E132B + .4byte 0x3CC73ABD + .4byte 0xBB587725 + .4byte 0x3E164064 + .4byte 0x3F7D3AB4 + .4byte 0x3CC68017 + .4byte 0xBB7F865D + .4byte 0x3E2F10AA + .4byte 0x3F7C3B2E + .4byte 0x3CC5A815 + .4byte 0xBB9331A1 + .4byte 0x3E47C5AC + .4byte 0x3F7B14BA + .4byte 0x3CC4B2B7 + .4byte 0xBBA68F4B + .4byte 0x3E605C03 + .4byte 0x3F79C79B + .4byte 0x3CC39DE5 + .4byte 0xBBB9D3CC + .4byte 0x3E78CFC0 + .4byte 0x3F7853F4 + .4byte 0x3CC26BB5 + .4byte 0xBBCCF6BE + .4byte 0x3E888E9B + .4byte 0x3F76BA06 + .4byte 0x3CC11A11 + .4byte 0xBBE00086 + .4byte 0x3E94A03C + .4byte 0x3F74FA05 + .4byte 0x3CBFAB11 + .4byte 0xBBF2E05D + .4byte 0x3EA09AED + .4byte 0x3F731444 + .4byte 0x3CBE1EB4 + .4byte 0xBC02CF53 + .4byte 0x3EAC7CD9 + .4byte 0x3F710907 + .4byte 0x3CBC74FB + .4byte 0xBC0C197E + .4byte 0x3EB84428 + .4byte 0x3F6ED8A1 + .4byte 0x3CBAADE6 + .4byte 0xBC154EB1 + .4byte 0x3EC3EF07 + .4byte 0x3F6C8366 + .4byte 0x3CB8CB8E + .4byte 0xBC1E6EEB + .4byte 0x3ECF7BC0 + .4byte 0x3F6A09AB + .4byte 0x3CB6CBDA + .4byte 0xBC2771C9 + .4byte 0x3EDAE87D + .4byte 0x3F676BD3 + .4byte 0x3CB4AEC9 + .4byte 0xBC305FAF + .4byte 0x3EE6336A + .4byte 0x3F64AA54 + .4byte 0x3CB27675 + .4byte 0xBC393038 + .4byte 0x3EF15AF3 + .4byte 0x3F61C593 + .4byte 0x3CB022DD + .4byte 0xBC41E365 + .4byte 0x3EFC5D20 + .4byte 0x3F5EBE06 + .4byte 0x3CADB61C + .4byte 0xBC4A7935 + .4byte 0x3F039C41 + .4byte 0x3F5B9421 + .4byte 0x3CAB2BFE + .4byte 0xBC52F1AA + .4byte 0x3F08F5A1 + .4byte 0x3F58485A + .4byte 0x3CA888B5 + .4byte 0xBC5B4891 + .4byte 0x3F0E39D6 + .4byte 0x3F54DB38 + .4byte 0x3CA5CA2A + .4byte 0xBC637DE9 + .4byte 0x3F136827 + .4byte 0x3F514D40 + .4byte 0x3CA2F273 + .4byte 0xBC6B8D82 + .4byte 0x3F187FBB + .4byte 0x3F4D9F0A + .4byte 0x3CA00193 + .4byte 0xBC737B8D + .4byte 0x3F1D7FD8 + .4byte 0x3F49D10B + .4byte 0x3C9CF9A0 + .4byte 0xBC7B43D9 + .4byte 0x3F226794 + .4byte 0x3F45E3FC + .4byte 0x3C99D884 + .4byte 0xBC817332 + .4byte 0x3F273659 + .4byte 0x3F41D873 + .4byte 0x3C969E3D + .4byte 0xBC852F7F + .4byte 0x3F2BEB4A + .4byte 0x3F3DAEF7 + .4byte 0x3C934EFD + .4byte 0xBC88D6D4 + .4byte 0x3F3085C2 + .4byte 0x3F396840 + .4byte 0x3C8FE692 + .4byte 0xBC8C692F + .4byte 0x3F3504F7 + .4byte 0x3F3504F7 + .4byte 0x3C8C692F + .4byte 0xBC8FE692 + .4byte 0x3F396840 + .4byte 0x3F3085C2 + .4byte 0x3C88D6D4 + .4byte 0xBC934EFD + .4byte 0x3F3DAEF7 + .4byte 0x3F2BEB4A + .4byte 0x3C852F7F + .4byte 0xBC969E3D + .4byte 0x3F41D873 + .4byte 0x3F273659 + .4byte 0x3C817332 + .4byte 0xBC99D884 + .4byte 0x3F45E3FC + .4byte 0x3F226794 + .4byte 0x3C7B43D9 + .4byte 0xBC9CF9A0 + .4byte 0x3F49D10B + .4byte 0x3F1D7FD8 + .4byte 0x3C737B8D + .4byte 0xBCA00193 + .4byte 0x3F4D9F0A + .4byte 0x3F187FBB + .4byte 0x3C6B8D82 + .4byte 0xBCA2F273 + .4byte 0x3F514D40 + .4byte 0x3F136827 + .4byte 0x3C637DE9 + .4byte 0xBCA5CA2A + .4byte 0x3F54DB38 + .4byte 0x3F0E39D6 + .4byte 0x3C5B4891 + .4byte 0xBCA888B5 + .4byte 0x3F58485A + .4byte 0x3F08F5A1 + .4byte 0x3C52F1AA + .4byte 0xBCAB2BFE + .4byte 0x3F5B9421 + .4byte 0x3F039C41 + .4byte 0x3C4A7935 + .4byte 0xBCADB61C + .4byte 0x3F5EBE06 + .4byte 0x3EFC5D20 + .4byte 0x3C41E365 + .4byte 0xBCB022DD + .4byte 0x3F61C593 + .4byte 0x3EF15AF3 + .4byte 0x3C393038 + .4byte 0xBCB27675 + .4byte 0x3F64AA54 + .4byte 0x3EE6336A + .4byte 0x3C305FAF + .4byte 0xBCB4AEC9 + .4byte 0x3F676BD3 + .4byte 0x3EDAE87D + .4byte 0x3C2771C9 + .4byte 0xBCB6CBDA + .4byte 0x3F6A09AB + .4byte 0x3ECF7BC0 + .4byte 0x3C1E6EEB + .4byte 0xBCB8CB8E + .4byte 0x3F6C8366 + .4byte 0x3EC3EF07 + .4byte 0x3C154EB1 + .4byte 0xBCBAADE6 + .4byte 0x3F6ED8A1 + .4byte 0x3EB84428 + .4byte 0x3C0C197E + .4byte 0xBCBC74FB + .4byte 0x3F710907 + .4byte 0x3EAC7CD9 + .4byte 0x3C02CF53 + .4byte 0xBCBE1EB4 + .4byte 0x3F731444 + .4byte 0x3EA09AED + .4byte 0x3BF2E05D + .4byte 0xBCBFAB11 + .4byte 0x3F74FA05 + .4byte 0x3E94A03C + .4byte 0x3BE00086 + .4byte 0xBCC11A11 + .4byte 0x3F76BA06 + .4byte 0x3E888E9B + .4byte 0x3BCCF6BE + .4byte 0xBCC26BB5 + .4byte 0x3F7853F4 + .4byte 0x3E78CFC0 + .4byte 0x3BB9D3CC + .4byte 0xBCC39DE5 + .4byte 0x3F79C79B + .4byte 0x3E605C03 + .4byte 0x3BA68F4B + .4byte 0xBCC4B2B7 + .4byte 0x3F7B14BA + .4byte 0x3E47C5AC + .4byte 0x3B9331A1 + .4byte 0xBCC5A815 + .4byte 0x3F7C3B2E + .4byte 0x3E2F10AA + .4byte 0x3B7F865D + .4byte 0xBCC68017 + .4byte 0x3F7D3AB4 + .4byte 0x3E164064 + .4byte 0x3B587725 + .4byte 0xBCC73ABD + .4byte 0x3F7E132B + .4byte 0x3DFAB29E + .4byte 0x3B31465F + .4byte 0xBCC7D5ED + .4byte 0x3F7EC472 + .4byte 0x3DC8BD23 + .4byte 0x3B0A04D1 + .4byte 0xBCC851A8 + .4byte 0x3F7F4E66 + .4byte 0x3D96A93F + .4byte 0x3AC5436C + .4byte 0xBCC8ADEF + .4byte 0x3F7FB107 + .4byte 0x3D48FB87 + .4byte 0x3A6CB74E + .4byte 0xBCC8EAC0 + .4byte 0x3F7FEC46 + .4byte 0x3CC90A35 + .4byte 0x399DCF89 + .4byte 0xBCC90A35 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xB99DCF89 + .4byte 0xBCC90A35 + .4byte 0x3F7FEC46 + .4byte 0xBCC90A35 + .4byte 0xBA6CB74E + .4byte 0xBCC8EAC0 + .4byte 0x3F7FB107 + .4byte 0xBD48FB87 + .4byte 0xBAC5436C + .4byte 0xBCC8ADEF + .4byte 0x3F7F4E66 + .4byte 0xBD96A93F + .4byte 0xBB0A04D1 + .4byte 0xBCC851A8 + .4byte 0x3F7EC472 + .4byte 0xBDC8BD23 + .4byte 0xBB31465F + .4byte 0xBCC7D5ED + .4byte 0x3F7E132B + .4byte 0xBDFAB29E + .4byte 0xBB587725 + .4byte 0xBCC73ABD + .4byte 0x3F7D3AB4 + .4byte 0xBE164064 + .4byte 0xBB7F865D + .4byte 0xBCC68017 + .4byte 0x3F7C3B2E + .4byte 0xBE2F10AA + .4byte 0xBB9331A1 + .4byte 0xBCC5A815 + .4byte 0x3F7B14BA + .4byte 0xBE47C5AC + .4byte 0xBBA68F4B + .4byte 0xBCC4B2B7 + .4byte 0x3F79C79B + .4byte 0xBE605C03 + .4byte 0xBBB9D3CC + .4byte 0xBCC39DE5 + .4byte 0x3F7853F4 + .4byte 0xBE78CFC0 + .4byte 0xBBCCF6BE + .4byte 0xBCC26BB5 + .4byte 0x3F76BA06 + .4byte 0xBE888E9B + .4byte 0xBBE00086 + .4byte 0xBCC11A11 + .4byte 0x3F74FA05 + .4byte 0xBE94A03C + .4byte 0xBBF2E05D + .4byte 0xBCBFAB11 + .4byte 0x3F731444 + .4byte 0xBEA09AED + .4byte 0xBC02CF53 + .4byte 0xBCBE1EB4 + .4byte 0x3F710907 + .4byte 0xBEAC7CD9 + .4byte 0xBC0C197E + .4byte 0xBCBC74FB + .4byte 0x3F6ED8A1 + .4byte 0xBEB84428 + .4byte 0xBC154EB1 + .4byte 0xBCBAADE6 + .4byte 0x3F6C8366 + .4byte 0xBEC3EF07 + .4byte 0xBC1E6EEB + .4byte 0xBCB8CB8E + .4byte 0x3F6A09AB + .4byte 0xBECF7BC0 + .4byte 0xBC2771C9 + .4byte 0xBCB6CBDA + .4byte 0x3F676BD3 + .4byte 0xBEDAE87D + .4byte 0xBC305FAF + .4byte 0xBCB4AEC9 + .4byte 0x3F64AA54 + .4byte 0xBEE6336A + .4byte 0xBC393038 + .4byte 0xBCB27675 + .4byte 0x3F61C593 + .4byte 0xBEF15AF3 + .4byte 0xBC41E365 + .4byte 0xBCB022DD + .4byte 0x3F5EBE06 + .4byte 0xBEFC5D20 + .4byte 0xBC4A7935 + .4byte 0xBCADB61C + .4byte 0x3F5B9421 + .4byte 0xBF039C41 + .4byte 0xBC52F1AA + .4byte 0xBCAB2BFE + .4byte 0x3F58485A + .4byte 0xBF08F5A1 + .4byte 0xBC5B4891 + .4byte 0xBCA888B5 + .4byte 0x3F54DB38 + .4byte 0xBF0E39D6 + .4byte 0xBC637DE9 + .4byte 0xBCA5CA2A + .4byte 0x3F514D40 + .4byte 0xBF136827 + .4byte 0xBC6B8D82 + .4byte 0xBCA2F273 + .4byte 0x3F4D9F0A + .4byte 0xBF187FBB + .4byte 0xBC737B8D + .4byte 0xBCA00193 + .4byte 0x3F49D10B + .4byte 0xBF1D7FD8 + .4byte 0xBC7B43D9 + .4byte 0xBC9CF9A0 + .4byte 0x3F45E3FC + .4byte 0xBF226794 + .4byte 0xBC817332 + .4byte 0xBC99D884 + .4byte 0x3F41D873 + .4byte 0xBF273659 + .4byte 0xBC852F7F + .4byte 0xBC969E3D + .4byte 0x3F3DAEF7 + .4byte 0xBF2BEB4A + .4byte 0xBC88D6D4 + .4byte 0xBC934EFD + .4byte 0x3F396840 + .4byte 0xBF3085C2 + .4byte 0xBC8C692F + .4byte 0xBC8FE692 + .4byte 0x3F3504F7 + .4byte 0xBF3504F7 + .4byte 0xBC8FE692 + .4byte 0xBC8C692F + .4byte 0x3F3085C2 + .4byte 0xBF396840 + .4byte 0xBC934EFD + .4byte 0xBC88D6D4 + .4byte 0x3F2BEB4A + .4byte 0xBF3DAEF7 + .4byte 0xBC969E3D + .4byte 0xBC852F7F + .4byte 0x3F273659 + .4byte 0xBF41D873 + .4byte 0xBC99D884 + .4byte 0xBC817332 + .4byte 0x3F226794 + .4byte 0xBF45E3FC + .4byte 0xBC9CF9A0 + .4byte 0xBC7B43D9 + .4byte 0x3F1D7FD8 + .4byte 0xBF49D10B + .4byte 0xBCA00193 + .4byte 0xBC737B8D + .4byte 0x3F187FBB + .4byte 0xBF4D9F0A + .4byte 0xBCA2F273 + .4byte 0xBC6B8D82 + .4byte 0x3F136827 + .4byte 0xBF514D40 + .4byte 0xBCA5CA2A + .4byte 0xBC637DE9 + .4byte 0x3F0E39D6 + .4byte 0xBF54DB38 + .4byte 0xBCA888B5 + .4byte 0xBC5B4891 + .4byte 0x3F08F5A1 + .4byte 0xBF58485A + .4byte 0xBCAB2BFE + .4byte 0xBC52F1AA + .4byte 0x3F039C41 + .4byte 0xBF5B9421 + .4byte 0xBCADB61C + .4byte 0xBC4A7935 + .4byte 0x3EFC5D20 + .4byte 0xBF5EBE06 + .4byte 0xBCB022DD + .4byte 0xBC41E365 + .4byte 0x3EF15AF3 + .4byte 0xBF61C593 + .4byte 0xBCB27675 + .4byte 0xBC393038 + .4byte 0x3EE6336A + .4byte 0xBF64AA54 + .4byte 0xBCB4AEC9 + .4byte 0xBC305FAF + .4byte 0x3EDAE87D + .4byte 0xBF676BD3 + .4byte 0xBCB6CBDA + .4byte 0xBC2771C9 + .4byte 0x3ECF7BC0 + .4byte 0xBF6A09AB + .4byte 0xBCB8CB8E + .4byte 0xBC1E6EEB + .4byte 0x3EC3EF07 + .4byte 0xBF6C8366 + .4byte 0xBCBAADE6 + .4byte 0xBC154EB1 + .4byte 0x3EB84428 + .4byte 0xBF6ED8A1 + .4byte 0xBCBC74FB + .4byte 0xBC0C197E + .4byte 0x3EAC7CD9 + .4byte 0xBF710907 + .4byte 0xBCBE1EB4 + .4byte 0xBC02CF53 + .4byte 0x3EA09AED + .4byte 0xBF731444 + .4byte 0xBCBFAB11 + .4byte 0xBBF2E05D + .4byte 0x3E94A03C + .4byte 0xBF74FA05 + .4byte 0xBCC11A11 + .4byte 0xBBE00086 + .4byte 0x3E888E9B + .4byte 0xBF76BA06 + .4byte 0xBCC26BB5 + .4byte 0xBBCCF6BE + .4byte 0x3E78CFC0 + .4byte 0xBF7853F4 + .4byte 0xBCC39DE5 + .4byte 0xBBB9D3CC + .4byte 0x3E605C03 + .4byte 0xBF79C79B + .4byte 0xBCC4B2B7 + .4byte 0xBBA68F4B + .4byte 0x3E47C5AC + .4byte 0xBF7B14BA + .4byte 0xBCC5A815 + .4byte 0xBB9331A1 + .4byte 0x3E2F10AA + .4byte 0xBF7C3B2E + .4byte 0xBCC68017 + .4byte 0xBB7F865D + .4byte 0x3E164064 + .4byte 0xBF7D3AB4 + .4byte 0xBCC73ABD + .4byte 0xBB587725 + .4byte 0x3DFAB29E + .4byte 0xBF7E132B + .4byte 0xBCC7D5ED + .4byte 0xBB31465F + .4byte 0x3DC8BD23 + .4byte 0xBF7EC472 + .4byte 0xBCC851A8 + .4byte 0xBB0A04D1 + .4byte 0x3D96A93F + .4byte 0xBF7F4E66 + .4byte 0xBCC8ADEF + .4byte 0xBAC5436C + .4byte 0x3D48FB87 + .4byte 0xBF7FB107 + .4byte 0xBCC8EAC0 + .4byte 0xBA6CB74E + .4byte 0x3CC90A35 + .4byte 0xBF7FEC46 + .4byte 0xBCC90A35 + .4byte 0xB99DCF89 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBCC90A35 + .4byte 0x399DCF89 + .4byte 0xBCC90A35 + .4byte 0xBF7FEC46 + .4byte 0xBCC8EAC0 + .4byte 0x3A6CB74E + .4byte 0xBD48FB87 + .4byte 0xBF7FB107 + .4byte 0xBCC8ADEF + .4byte 0x3AC5436C + .4byte 0xBD96A93F + .4byte 0xBF7F4E66 + .4byte 0xBCC851A8 + .4byte 0x3B0A04D1 + .4byte 0xBDC8BD23 + .4byte 0xBF7EC472 + .4byte 0xBCC7D5ED + .4byte 0x3B31465F + .4byte 0xBDFAB29E + .4byte 0xBF7E132B + .4byte 0xBCC73ABD + .4byte 0x3B587725 + .4byte 0xBE164064 + .4byte 0xBF7D3AB4 + .4byte 0xBCC68017 + .4byte 0x3B7F865D + .4byte 0xBE2F10AA + .4byte 0xBF7C3B2E + .4byte 0xBCC5A815 + .4byte 0x3B9331A1 + .4byte 0xBE47C5AC + .4byte 0xBF7B14BA + .4byte 0xBCC4B2B7 + .4byte 0x3BA68F4B + .4byte 0xBE605C03 + .4byte 0xBF79C79B + .4byte 0xBCC39DE5 + .4byte 0x3BB9D3CC + .4byte 0xBE78CFC0 + .4byte 0xBF7853F4 + .4byte 0xBCC26BB5 + .4byte 0x3BCCF6BE + .4byte 0xBE888E9B + .4byte 0xBF76BA06 + .4byte 0xBCC11A11 + .4byte 0x3BE00086 + .4byte 0xBE94A03C + .4byte 0xBF74FA05 + .4byte 0xBCBFAB11 + .4byte 0x3BF2E05D + .4byte 0xBEA09AED + .4byte 0xBF731444 + .4byte 0xBCBE1EB4 + .4byte 0x3C02CF53 + .4byte 0xBEAC7CD9 + .4byte 0xBF710907 + .4byte 0xBCBC74FB + .4byte 0x3C0C197E + .4byte 0xBEB84428 + .4byte 0xBF6ED8A1 + .4byte 0xBCBAADE6 + .4byte 0x3C154EB1 + .4byte 0xBEC3EF07 + .4byte 0xBF6C8366 + .4byte 0xBCB8CB8E + .4byte 0x3C1E6EEB + .4byte 0xBECF7BC0 + .4byte 0xBF6A09AB + .4byte 0xBCB6CBDA + .4byte 0x3C2771C9 + .4byte 0xBEDAE87D + .4byte 0xBF676BD3 + .4byte 0xBCB4AEC9 + .4byte 0x3C305FAF + .4byte 0xBEE6336A + .4byte 0xBF64AA54 + .4byte 0xBCB27675 + .4byte 0x3C393038 + .4byte 0xBEF15AF3 + .4byte 0xBF61C593 + .4byte 0xBCB022DD + .4byte 0x3C41E365 + .4byte 0xBEFC5D20 + .4byte 0xBF5EBE06 + .4byte 0xBCADB61C + .4byte 0x3C4A7935 + .4byte 0xBF039C41 + .4byte 0xBF5B9421 + .4byte 0xBCAB2BFE + .4byte 0x3C52F1AA + .4byte 0xBF08F5A1 + .4byte 0xBF58485A + .4byte 0xBCA888B5 + .4byte 0x3C5B4891 + .4byte 0xBF0E39D6 + .4byte 0xBF54DB38 + .4byte 0xBCA5CA2A + .4byte 0x3C637DE9 + .4byte 0xBF136827 + .4byte 0xBF514D40 + .4byte 0xBCA2F273 + .4byte 0x3C6B8D82 + .4byte 0xBF187FBB + .4byte 0xBF4D9F0A + .4byte 0xBCA00193 + .4byte 0x3C737B8D + .4byte 0xBF1D7FD8 + .4byte 0xBF49D10B + .4byte 0xBC9CF9A0 + .4byte 0x3C7B43D9 + .4byte 0xBF226794 + .4byte 0xBF45E3FC + .4byte 0xBC99D884 + .4byte 0x3C817332 + .4byte 0xBF273659 + .4byte 0xBF41D873 + .4byte 0xBC969E3D + .4byte 0x3C852F7F + .4byte 0xBF2BEB4A + .4byte 0xBF3DAEF7 + .4byte 0xBC934EFD + .4byte 0x3C88D6D4 + .4byte 0xBF3085C2 + .4byte 0xBF396840 + .4byte 0xBC8FE692 + .4byte 0x3C8C692F + .4byte 0xBF3504F7 + .4byte 0xBF3504F7 + .4byte 0xBC8C692F + .4byte 0x3C8FE692 + .4byte 0xBF396840 + .4byte 0xBF3085C2 + .4byte 0xBC88D6D4 + .4byte 0x3C934EFD + .4byte 0xBF3DAEF7 + .4byte 0xBF2BEB4A + .4byte 0xBC852F7F + .4byte 0x3C969E3D + .4byte 0xBF41D873 + .4byte 0xBF273659 + .4byte 0xBC817332 + .4byte 0x3C99D884 + .4byte 0xBF45E3FC + .4byte 0xBF226794 + .4byte 0xBC7B43D9 + .4byte 0x3C9CF9A0 + .4byte 0xBF49D10B + .4byte 0xBF1D7FD8 + .4byte 0xBC737B8D + .4byte 0x3CA00193 + .4byte 0xBF4D9F0A + .4byte 0xBF187FBB + .4byte 0xBC6B8D82 + .4byte 0x3CA2F273 + .4byte 0xBF514D40 + .4byte 0xBF136827 + .4byte 0xBC637DE9 + .4byte 0x3CA5CA2A + .4byte 0xBF54DB38 + .4byte 0xBF0E39D6 + .4byte 0xBC5B4891 + .4byte 0x3CA888B5 + .4byte 0xBF58485A + .4byte 0xBF08F5A1 + .4byte 0xBC52F1AA + .4byte 0x3CAB2BFE + .4byte 0xBF5B9421 + .4byte 0xBF039C41 + .4byte 0xBC4A7935 + .4byte 0x3CADB61C + .4byte 0xBF5EBE06 + .4byte 0xBEFC5D20 + .4byte 0xBC41E365 + .4byte 0x3CB022DD + .4byte 0xBF61C593 + .4byte 0xBEF15AF3 + .4byte 0xBC393038 + .4byte 0x3CB27675 + .4byte 0xBF64AA54 + .4byte 0xBEE6336A + .4byte 0xBC305FAF + .4byte 0x3CB4AEC9 + .4byte 0xBF676BD3 + .4byte 0xBEDAE87D + .4byte 0xBC2771C9 + .4byte 0x3CB6CBDA + .4byte 0xBF6A09AB + .4byte 0xBECF7BC0 + .4byte 0xBC1E6EEB + .4byte 0x3CB8CB8E + .4byte 0xBF6C8366 + .4byte 0xBEC3EF07 + .4byte 0xBC154EB1 + .4byte 0x3CBAADE6 + .4byte 0xBF6ED8A1 + .4byte 0xBEB84428 + .4byte 0xBC0C197E + .4byte 0x3CBC74FB + .4byte 0xBF710907 + .4byte 0xBEAC7CD9 + .4byte 0xBC02CF53 + .4byte 0x3CBE1EB4 + .4byte 0xBF731444 + .4byte 0xBEA09AED + .4byte 0xBBF2E05D + .4byte 0x3CBFAB11 + .4byte 0xBF74FA05 + .4byte 0xBE94A03C + .4byte 0xBBE00086 + .4byte 0x3CC11A11 + .4byte 0xBF76BA06 + .4byte 0xBE888E9B + .4byte 0xBBCCF6BE + .4byte 0x3CC26BB5 + .4byte 0xBF7853F4 + .4byte 0xBE78CFC0 + .4byte 0xBBB9D3CC + .4byte 0x3CC39DE5 + .4byte 0xBF79C79B + .4byte 0xBE605C03 + .4byte 0xBBA68F4B + .4byte 0x3CC4B2B7 + .4byte 0xBF7B14BA + .4byte 0xBE47C5AC + .4byte 0xBB9331A1 + .4byte 0x3CC5A815 + .4byte 0xBF7C3B2E + .4byte 0xBE2F10AA + .4byte 0xBB7F865D + .4byte 0x3CC68017 + .4byte 0xBF7D3AB4 + .4byte 0xBE164064 + .4byte 0xBB587725 + .4byte 0x3CC73ABD + .4byte 0xBF7E132B + .4byte 0xBDFAB29E + .4byte 0xBB31465F + .4byte 0x3CC7D5ED + .4byte 0xBF7EC472 + .4byte 0xBDC8BD23 + .4byte 0xBB0A04D1 + .4byte 0x3CC851A8 + .4byte 0xBF7F4E66 + .4byte 0xBD96A93F + .4byte 0xBAC5436C + .4byte 0x3CC8ADEF + .4byte 0xBF7FB107 + .4byte 0xBD48FB87 + .4byte 0xBA6CB74E + .4byte 0x3CC8EAC0 + .4byte 0xBF7FEC46 + .4byte 0xBCC90A35 + .4byte 0xB99DCF89 + .4byte 0x3CC90A35 + .4byte 0xBF800000 + .4byte 0x80000000 + .4byte 0x399DCF89 + .4byte 0x3CC90A35 + .4byte 0xBF7FEC46 + .4byte 0x3CC90A35 + .4byte 0x3A6CB74E + .4byte 0x3CC8EAC0 + .4byte 0xBF7FB107 + .4byte 0x3D48FB87 + .4byte 0x3AC5436C + .4byte 0x3CC8ADEF + .4byte 0xBF7F4E66 + .4byte 0x3D96A93F + .4byte 0x3B0A04D1 + .4byte 0x3CC851A8 + .4byte 0xBF7EC472 + .4byte 0x3DC8BD23 + .4byte 0x3B31465F + .4byte 0x3CC7D5ED + .4byte 0xBF7E132B + .4byte 0x3DFAB29E + .4byte 0x3B587725 + .4byte 0x3CC73ABD + .4byte 0xBF7D3AB4 + .4byte 0x3E164064 + .4byte 0x3B7F865D + .4byte 0x3CC68017 + .4byte 0xBF7C3B2E + .4byte 0x3E2F10AA + .4byte 0x3B9331A1 + .4byte 0x3CC5A815 + .4byte 0xBF7B14BA + .4byte 0x3E47C5AC + .4byte 0x3BA68F4B + .4byte 0x3CC4B2B7 + .4byte 0xBF79C79B + .4byte 0x3E605C03 + .4byte 0x3BB9D3CC + .4byte 0x3CC39DE5 + .4byte 0xBF7853F4 + .4byte 0x3E78CFC0 + .4byte 0x3BCCF6BE + .4byte 0x3CC26BB5 + .4byte 0xBF76BA06 + .4byte 0x3E888E9B + .4byte 0x3BE00086 + .4byte 0x3CC11A11 + .4byte 0xBF74FA05 + .4byte 0x3E94A03C + .4byte 0x3BF2E05D + .4byte 0x3CBFAB11 + .4byte 0xBF731444 + .4byte 0x3EA09AED + .4byte 0x3C02CF53 + .4byte 0x3CBE1EB4 + .4byte 0xBF710907 + .4byte 0x3EAC7CD9 + .4byte 0x3C0C197E + .4byte 0x3CBC74FB + .4byte 0xBF6ED8A1 + .4byte 0x3EB84428 + .4byte 0x3C154EB1 + .4byte 0x3CBAADE6 + .4byte 0xBF6C8366 + .4byte 0x3EC3EF07 + .4byte 0x3C1E6EEB + .4byte 0x3CB8CB8E + .4byte 0xBF6A09AB + .4byte 0x3ECF7BC0 + .4byte 0x3C2771C9 + .4byte 0x3CB6CBDA + .4byte 0xBF676BD3 + .4byte 0x3EDAE87D + .4byte 0x3C305FAF + .4byte 0x3CB4AEC9 + .4byte 0xBF64AA54 + .4byte 0x3EE6336A + .4byte 0x3C393038 + .4byte 0x3CB27675 + .4byte 0xBF61C593 + .4byte 0x3EF15AF3 + .4byte 0x3C41E365 + .4byte 0x3CB022DD + .4byte 0xBF5EBE06 + .4byte 0x3EFC5D20 + .4byte 0x3C4A7935 + .4byte 0x3CADB61C + .4byte 0xBF5B9421 + .4byte 0x3F039C41 + .4byte 0x3C52F1AA + .4byte 0x3CAB2BFE + .4byte 0xBF58485A + .4byte 0x3F08F5A1 + .4byte 0x3C5B4891 + .4byte 0x3CA888B5 + .4byte 0xBF54DB38 + .4byte 0x3F0E39D6 + .4byte 0x3C637DE9 + .4byte 0x3CA5CA2A + .4byte 0xBF514D40 + .4byte 0x3F136827 + .4byte 0x3C6B8D82 + .4byte 0x3CA2F273 + .4byte 0xBF4D9F0A + .4byte 0x3F187FBB + .4byte 0x3C737B8D + .4byte 0x3CA00193 + .4byte 0xBF49D10B + .4byte 0x3F1D7FD8 + .4byte 0x3C7B43D9 + .4byte 0x3C9CF9A0 + .4byte 0xBF45E3FC + .4byte 0x3F226794 + .4byte 0x3C817332 + .4byte 0x3C99D884 + .4byte 0xBF41D873 + .4byte 0x3F273659 + .4byte 0x3C852F7F + .4byte 0x3C969E3D + .4byte 0xBF3DAEF7 + .4byte 0x3F2BEB4A + .4byte 0x3C88D6D4 + .4byte 0x3C934EFD + .4byte 0xBF396840 + .4byte 0x3F3085C2 + .4byte 0x3C8C692F + .4byte 0x3C8FE692 + .4byte 0xBF3504F7 + .4byte 0x3F3504F7 + .4byte 0x3C8FE692 + .4byte 0x3C8C692F + .4byte 0xBF3085C2 + .4byte 0x3F396840 + .4byte 0x3C934EFD + .4byte 0x3C88D6D4 + .4byte 0xBF2BEB4A + .4byte 0x3F3DAEF7 + .4byte 0x3C969E3D + .4byte 0x3C852F7F + .4byte 0xBF273659 + .4byte 0x3F41D873 + .4byte 0x3C99D884 + .4byte 0x3C817332 + .4byte 0xBF226794 + .4byte 0x3F45E3FC + .4byte 0x3C9CF9A0 + .4byte 0x3C7B43D9 + .4byte 0xBF1D7FD8 + .4byte 0x3F49D10B + .4byte 0x3CA00193 + .4byte 0x3C737B8D + .4byte 0xBF187FBB + .4byte 0x3F4D9F0A + .4byte 0x3CA2F273 + .4byte 0x3C6B8D82 + .4byte 0xBF136827 + .4byte 0x3F514D40 + .4byte 0x3CA5CA2A + .4byte 0x3C637DE9 + .4byte 0xBF0E39D6 + .4byte 0x3F54DB38 + .4byte 0x3CA888B5 + .4byte 0x3C5B4891 + .4byte 0xBF08F5A1 + .4byte 0x3F58485A + .4byte 0x3CAB2BFE + .4byte 0x3C52F1AA + .4byte 0xBF039C41 + .4byte 0x3F5B9421 + .4byte 0x3CADB61C + .4byte 0x3C4A7935 + .4byte 0xBEFC5D20 + .4byte 0x3F5EBE06 + .4byte 0x3CB022DD + .4byte 0x3C41E365 + .4byte 0xBEF15AF3 + .4byte 0x3F61C593 + .4byte 0x3CB27675 + .4byte 0x3C393038 + .4byte 0xBEE6336A + .4byte 0x3F64AA54 + .4byte 0x3CB4AEC9 + .4byte 0x3C305FAF + .4byte 0xBEDAE87D + .4byte 0x3F676BD3 + .4byte 0x3CB6CBDA + .4byte 0x3C2771C9 + .4byte 0xBECF7BC0 + .4byte 0x3F6A09AB + .4byte 0x3CB8CB8E + .4byte 0x3C1E6EEB + .4byte 0xBEC3EF07 + .4byte 0x3F6C8366 + .4byte 0x3CBAADE6 + .4byte 0x3C154EB1 + .4byte 0xBEB84428 + .4byte 0x3F6ED8A1 + .4byte 0x3CBC74FB + .4byte 0x3C0C197E + .4byte 0xBEAC7CD9 + .4byte 0x3F710907 + .4byte 0x3CBE1EB4 + .4byte 0x3C02CF53 + .4byte 0xBEA09AED + .4byte 0x3F731444 + .4byte 0x3CBFAB11 + .4byte 0x3BF2E05D + .4byte 0xBE94A03C + .4byte 0x3F74FA05 + .4byte 0x3CC11A11 + .4byte 0x3BE00086 + .4byte 0xBE888E9B + .4byte 0x3F76BA06 + .4byte 0x3CC26BB5 + .4byte 0x3BCCF6BE + .4byte 0xBE78CFC0 + .4byte 0x3F7853F4 + .4byte 0x3CC39DE5 + .4byte 0x3BB9D3CC + .4byte 0xBE605C03 + .4byte 0x3F79C79B + .4byte 0x3CC4B2B7 + .4byte 0x3BA68F4B + .4byte 0xBE47C5AC + .4byte 0x3F7B14BA + .4byte 0x3CC5A815 + .4byte 0x3B9331A1 + .4byte 0xBE2F10AA + .4byte 0x3F7C3B2E + .4byte 0x3CC68017 + .4byte 0x3B7F865D + .4byte 0xBE164064 + .4byte 0x3F7D3AB4 + .4byte 0x3CC73ABD + .4byte 0x3B587725 + .4byte 0xBDFAB29E + .4byte 0x3F7E132B + .4byte 0x3CC7D5ED + .4byte 0x3B31465F + .4byte 0xBDC8BD23 + .4byte 0x3F7EC472 + .4byte 0x3CC851A8 + .4byte 0x3B0A04D1 + .4byte 0xBD96A93F + .4byte 0x3F7F4E66 + .4byte 0x3CC8ADEF + .4byte 0x3AC5436C + .4byte 0xBD48FB87 + .4byte 0x3F7FB107 + .4byte 0x3CC8EAC0 + .4byte 0x3A6CB74E + .4byte 0xBCC90A35 + .4byte 0x3F7FEC46 + .4byte 0x3CC90A35 + .4byte 0x399DCF89 + .4byte 0x80000000 + .4byte 0x3F800000 + .4byte 0x3CC90A35 + .4byte 0xB99DCF89 .section .data, "wa" # 0x80421040 - 0x80496700 .global sArcTanTbl__Q34nw4r4math29$$2unnamed$$2math_triangular_cpp$$2 sArcTanTbl__Q34nw4r4math29$$2unnamed$$2math_triangular_cpp$$2: - .incbin "baserom.dol", 0x43DFD0, 0x108 + .4byte 0 + .4byte 0x3FA2EBF1 + .4byte 0x3FA2EBF1 + .4byte 0x3FA29AB1 + .4byte 0x4022C351 + .4byte 0x3FA1F923 + .4byte 0x4073BFE2 + .4byte 0x3FA10925 + .4byte 0x40A2223B + .4byte 0x3F9FCD71 + .4byte 0x40CA1597 + .4byte 0x3F9E498C + .4byte 0x40F1A7FA + .4byte 0x3F9C81AB + .4byte 0x410C6432 + .4byte 0x3F9A7A9B + .4byte 0x411FB386 + .4byte 0x3F98399D + .4byte 0x4132BAB9 + .4byte 0x3F95C44B + .4byte 0x41457343 + .4byte 0x3F932075 + .4byte 0x4157D751 + .4byte 0x3F905408 + .4byte 0x4169E1D2 + .4byte 0x3F8D64EB + .4byte 0x417B8E70 + .4byte 0x3F8A58EC + .4byte 0x41866CC7 + .4byte 0x3F8735A9 + .4byte 0x418EE021 + .4byte 0x3F84007D + .4byte 0x41972029 + .4byte 0x3F80BE73 + .4byte 0x419F2C10 + .4byte 0x3F7AE877 + .4byte 0x41A70354 + .4byte 0x3F744C4A + .4byte 0x41AEA5B6 + .4byte 0x3F6DB032 + .4byte 0x41B61338 + .4byte 0x3F671B36 + .4byte 0x41BD4C11 + .4byte 0x3F60938F + .4byte 0x41C450AE + .4byte 0x3F5A1EB2 + .4byte 0x41CB21A3 + .4byte 0x3F53C157 + .4byte 0x41D1BFAE + .4byte 0x3F4D7F84 + .4byte 0x41D82BAA + .4byte 0x3F475C97 + .4byte 0x41DE668F + .4byte 0x3F415B59 + .4byte 0x41E4716A + .4byte 0x3F3B7E02 + .4byte 0x41EA4D5A + .4byte 0x3F35C652 + .4byte 0x41EFFB8C + .4byte 0x3F303593 + .4byte 0x41F57D39 + .4byte 0x3F2ACCAE + .4byte 0x41FAD39E + .4byte 0x3F258C33 + .4byte 0x42000000 + .4byte 0x3F207467 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22956 $$22956: - .incbin "baserom.dol", 0x499D38, 0x4 + .4byte 0x47800000 .global $$22957 $$22957: - .incbin "baserom.dol", 0x499D3C, 0x4 + .4byte 0 .global $$23002 $$23002: - .incbin "baserom.dol", 0x499D40, 0x4 + .4byte 0x42000000 .global $$23003 $$23003: - .incbin "baserom.dol", 0x499D44, 0x4 + .4byte 0x42800000 .global $$23005 $$23005: - .incbin "baserom.dol", 0x499D48, 0x4 + .4byte 0xC2800000 .global $$23032 $$23032: - .incbin "baserom.dol", 0x499D4C, 0x4 + .4byte 0x43000000 .global $$23033 $$23033: - .incbin "baserom.dol", 0x499D50, 0x8 + .4byte 0xC3000000 + .4byte 0 diff --git a/asm/libnw4r_math/math_types.s b/asm/libnw4r_math/math_types.s index 9ef0b34e..46027a80 100644 --- a/asm/libnw4r_math/math_types.s +++ b/asm/libnw4r_math/math_types.s @@ -311,13 +311,15 @@ MTX44Copy__Q24nw4r4mathFPQ34nw4r4math5MTX44PCQ34nw4r4math5MTX44: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24187 $$24187: - .incbin "baserom.dol", 0x499D58, 0x4 + .4byte 0 .global $$24190 $$24190: - .incbin "baserom.dol", 0x499D5C, 0x4 + .4byte 0x3F800000 .global $$24265 $$24265: - .incbin "baserom.dol", 0x499D60, 0x8 + .4byte 0x3CC90FDB + .4byte 0 .global $$24279 $$24279: - .incbin "baserom.dol", 0x499D68, 0x8 + .4byte 0x47800000 + .4byte 0x47800000 diff --git a/asm/libnw4r_snd/snd_AxManager.s b/asm/libnw4r_snd/snd_AxManager.s index f70cc601..4cf83b57 100644 --- a/asm/libnw4r_snd/snd_AxManager.s +++ b/asm/libnw4r_snd/snd_AxManager.s @@ -1264,21 +1264,23 @@ __sinit_$$3snd_AxManager_cpp: /* 80100FCC 000FCE0C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402394, 0x4 + .4byte 0x80100F90 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24786 $$24786: - .incbin "baserom.dol", 0x499D80, 0x4 + .4byte 0 .global $$24787 $$24787: - .incbin "baserom.dol", 0x499D84, 0x4 + .4byte 0x3F800000 .global $$24852 $$24852: - .incbin "baserom.dol", 0x499D88, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$24955 $$24955: - .incbin "baserom.dol", 0x499D90, 0x8 + .4byte 0x47000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sZeroBuffer__Q44nw4r3snd6detail9AxManager diff --git a/asm/libnw4r_snd/snd_AxVoice.s b/asm/libnw4r_snd/snd_AxVoice.s index 665f5f6e..c697391e 100644 --- a/asm/libnw4r_snd/snd_AxVoice.s +++ b/asm/libnw4r_snd/snd_AxVoice.s @@ -3544,25 +3544,27 @@ lbl_80103F4C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212107 $$212107: - .incbin "baserom.dol", 0x499D98, 0x4 + .4byte 0x46FA0000 .global $$212108 $$212108: - .incbin "baserom.dol", 0x499D9C, 0x4 + .4byte 0x3FAAAAAB .global $$212109 $$212109: - .incbin "baserom.dol", 0x499DA0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$212112 $$212112: - .incbin "baserom.dol", 0x499DA8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$212334 $$212334: - .incbin "baserom.dol", 0x499DB0, 0x4 + .4byte 0x477FFF00 .global $$212335 $$212335: - .incbin "baserom.dol", 0x499DB4, 0x4 + .4byte 0 .global $$212336 $$212336: - .incbin "baserom.dol", 0x499DB8, 0x4 + .4byte 0x47800000 .global $$212376 $$212376: - .incbin "baserom.dol", 0x499DBC, 0x4 + .4byte 0x46FFFE00 diff --git a/asm/libnw4r_snd/snd_Bank.s b/asm/libnw4r_snd/snd_Bank.s index 5b964371..db802d44 100644 --- a/asm/libnw4r_snd/snd_Bank.s +++ b/asm/libnw4r_snd/snd_Bank.s @@ -160,16 +160,19 @@ lbl_80104BC0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28712 $$28712: - .incbin "baserom.dol", 0x499DC0, 0x4 + .4byte 0x42FE0000 .global $$28713 $$28713: - .incbin "baserom.dol", 0x499DC4, 0x4 + .4byte 0x427C0000 .global $$28714 $$28714: - .incbin "baserom.dol", 0x499DC8, 0x8 + .4byte 0 + .4byte 0 .global $$28719 $$28719: - .incbin "baserom.dol", 0x499DD0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$28720 $$28720: - .incbin "baserom.dol", 0x499DD8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_BankFile.s b/asm/libnw4r_snd/snd_BankFile.s index 61fc56b1..e932dde5 100644 --- a/asm/libnw4r_snd/snd_BankFile.s +++ b/asm/libnw4r_snd/snd_BankFile.s @@ -507,4 +507,5 @@ lbl_80105280: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29016 $$29016: - .incbin "baserom.dol", 0x499DE0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_BasicPlayer.s b/asm/libnw4r_snd/snd_BasicPlayer.s index bfb65026..0cc21bf4 100644 --- a/asm/libnw4r_snd/snd_BasicPlayer.s +++ b/asm/libnw4r_snd/snd_BasicPlayer.s @@ -168,12 +168,21 @@ __dt__Q44nw4r3snd6detail11BasicPlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail11BasicPlayer __vt__Q44nw4r3snd6detail11BasicPlayer: - .incbin "baserom.dol", 0x43E0D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x801054A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22618 $$22618: - .incbin "baserom.dol", 0x499DE8, 0x4 + .4byte 0x3F800000 .global $$22619 $$22619: - .incbin "baserom.dol", 0x499DEC, 0x4 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_BasicSound.s b/asm/libnw4r_snd/snd_BasicSound.s index c0535b5d..088bac67 100644 --- a/asm/libnw4r_snd/snd_BasicSound.s +++ b/asm/libnw4r_snd/snd_BasicSound.s @@ -1644,23 +1644,37 @@ __sinit_$$3snd_BasicSound_cpp: /* 80106B7C 001029BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402398, 0x4 + .4byte 0x80106B70 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10BasicSound __vt__Q44nw4r3snd6detail10BasicSound: - .incbin "baserom.dol", 0x43E100, 0x38 + .4byte 0 + .4byte 0 + .4byte 0x80106B60 ;# ptr + .4byte 0x80106B50 ;# ptr + .4byte 0x80106610 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80105590 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80106840 ;# ptr + .4byte 0x80106200 ;# ptr + .4byte 0x80106240 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212466 $$212466: - .incbin "baserom.dol", 0x499DF0, 0x4 + .4byte 0x3F800000 .global $$212467 $$212467: - .incbin "baserom.dol", 0x499DF4, 0x4 + .4byte 0 .global $$212524 $$212524: - .incbin "baserom.dol", 0x499DF8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail10BasicSound diff --git a/asm/libnw4r_snd/snd_BiquadFilterPreset.s b/asm/libnw4r_snd/snd_BiquadFilterPreset.s index b92cf12a..48df4c4d 100644 --- a/asm/libnw4r_snd/snd_BiquadFilterPreset.s +++ b/asm/libnw4r_snd/snd_BiquadFilterPreset.s @@ -256,41 +256,1347 @@ __dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global coefTable__Q44nw4r3snd6detail15BiquadFilterLpf coefTable__Q44nw4r3snd6detail15BiquadFilterLpf: - .incbin "baserom.dol", 0x406020, 0x460 + .4byte 0x3AB37566 + .4byte 0x3AB383B8 + .4byte 0xC391371B + .4byte 0x6E36371B + .4byte 0x8BF8CA8C + .4byte 0x33C7678D + .4byte 0x33C79428 + .4byte 0xD07830B0 + .4byte 0x616130B0 + .4byte 0x9C32D582 + .4byte 0x2DD25BA5 + .4byte 0x2DD2A40C + .4byte 0xD9CF2B27 + .4byte 0x564E2B27 + .4byte 0xABAEDD7D + .4byte 0x28A95152 + .4byte 0x28A9B316 + .4byte 0xE0A32654 + .4byte 0x4CA82654 + .4byte 0xBA45E355 + .4byte 0x24254849 + .4byte 0x2425C13A + .4byte 0xE5A22217 + .4byte 0x442F2217 + .4byte 0xC7F8E797 + .4byte 0x20294051 + .4byte 0x2029CE7F + .4byte 0xE93E1E57 + .4byte 0x3CAD1E57 + .4byte 0xD4D3EAA2 + .4byte 0x1C9F393D + .4byte 0x1C9FDAF5 + .4byte 0xEBC81AFF + .4byte 0x35FD1AFF + .4byte 0xE0E6ECB9 + .4byte 0x197532EB + .4byte 0x1975E6AA + .4byte 0xED781801 + .4byte 0x30021801 + .4byte 0xEC40EE0B + .4byte 0x16A02D40 + .4byte 0x16A0F1AB + .4byte 0xEE771552 + .4byte 0x2AA41552 + .4byte 0xF6EDEEBE + .4byte 0x1415282A + .4byte 0x1415FC05 + .4byte 0xEEE512E8 + .4byte 0x25D012E8 + .4byte 0x00F6EEEE + .4byte 0x11CB2396 + .4byte 0x11CB05C1 + .4byte 0xEEDB10BD + .4byte 0x217A10BD + .4byte 0x0A65EEB0 + .4byte 0x0FBD1F79 + .4byte 0x0FBD0EE5 + .4byte 0xEE6D0ECA + .4byte 0x1D930ECA + .4byte 0x1341EE17 + .4byte 0x0DE31BC7 + .4byte 0x0DE3177A + .4byte 0xEDAD0D09 + .4byte 0x1A130D09 + .4byte 0x1B90ED33 + .4byte 0x0C3B1876 + .4byte 0x0C3B1F85 + .4byte 0xECA90B78 + .4byte 0x16EF0B78 + .4byte 0x2358EC12 + .4byte 0x0ABF157E + .4byte 0x0ABF270B + .4byte 0xEB6E0A10 + .4byte 0x14210A10 + .4byte 0x2A9DEABF + .4byte 0x096B12D7 + .4byte 0x096B2E11 + .4byte 0xEA0608D0 + .4byte 0x119F08D0 + .4byte 0x3166E945 + .4byte 0x083D107A + .4byte 0x083D349D + .4byte 0xE87C07B2 + .4byte 0x0F6507B2 + .4byte 0x37B7E7AD + .4byte 0x07300E60 + .4byte 0x07303AB4 + .4byte 0xE6D806B5 + .4byte 0x0D6A06B5 + .4byte 0x3D95E5FF + .4byte 0x06420C83 + .4byte 0x0642405B + .4byte 0xE52205D5 + .4byte 0x0BAA05D5 + .4byte 0x4306E443 + .4byte 0x056F0ADF + .4byte 0x056F4598 + .4byte 0xE3610510 + .4byte 0x0A1F0510 + .4byte 0x4810E27E + .4byte 0x04B6096C + .4byte 0x04B64A70 + .4byte 0xE19B0462 + .4byte 0x08C40462 + .4byte 0x4CB8E0B7 + .4byte 0x04130826 + .4byte 0x04134EE9 + .4byte 0xDFD303C9 + .4byte 0x079303C9 + .4byte 0x5104DEF1 + .4byte 0x03840709 + .4byte 0x03845309 + .4byte 0xDE100344 + .4byte 0x06880344 + .4byte 0x54F8DD31 + .4byte 0x03080610 + .4byte 0x030856D4 + .4byte 0xDC5402D0 + .4byte 0x059F02D0 + .4byte 0x589CDB7A + .4byte 0x029B0537 + .4byte 0x029B5A51 + .4byte 0xDAA3026B + .4byte 0x04D5026B + .4byte 0x5BF4D9CF + .4byte 0x023D047A + .4byte 0x023D5D85 + .4byte 0xD8FE0213 + .4byte 0x04260213 + .4byte 0x5F06D831 + .4byte 0x01EB03D7 + .4byte 0x01EB6076 + .4byte 0xD76801C7 + .4byte 0x038D01C7 + .4byte 0x61D6D6A3 + .4byte 0x01A50349 + .4byte 0x01A56327 + .4byte 0xD5E20185 + .4byte 0x030A0185 + .4byte 0x646AD526 + .4byte 0x016802CF + .4byte 0x0168659F + .4byte 0xD46D014C + .4byte 0x0299014C + .4byte 0x66C6D3BA + .4byte 0x01330266 + .4byte 0x013367E1 + .4byte 0xD30A011C + .4byte 0x0237011C + .4byte 0x68EFD25F + .4byte 0x0106020C + .4byte 0x010669F1 + .4byte 0xD1B900F2 + .4byte 0x01E400F2 + .4byte 0x6AE9D117 + .4byte 0x00DF01BE + .4byte 0x00DF6BD5 + .4byte 0xD07A00CE + .4byte 0x019C00CE + .4byte 0x6CB7CFE1 + .4byte 0x00BE017C + .4byte 0x00BE6D8F + .4byte 0xCF4D00AF + .4byte 0x015E00AF + .4byte 0x6E5DCEBD + .4byte 0x00A10143 + .4byte 0x00A16F23 + .4byte 0xCE310095 + .4byte 0x012A0095 + .4byte 0x6FE0CDAA + .4byte 0x00890112 + .4byte 0x00897094 + .4byte 0xCD27007E + .4byte 0x00FD007E + .4byte 0x7140CCA8 + .4byte 0x007400E9 + .4byte 0x007471E5 + .4byte 0xCC2E006B + .4byte 0x00D6006B + .4byte 0x7283CBB7 + .4byte 0x006300C5 + .4byte 0x00637319 + .4byte 0xCB44005B + .4byte 0x00B6005B + .4byte 0x73A9CAD5 + .4byte 0x005400A7 + .4byte 0x00547433 + .4byte 0xCA6A004D + .4byte 0x009A004D + .4byte 0x74B7CA03 + .4byte 0x0047008E + .4byte 0x00477534 + .4byte 0xC99F0041 + .4byte 0x00820041 + .4byte 0x75ACC93F + .4byte 0x003C0078 + .4byte 0x003C761F + .4byte 0xC8E20037 + .4byte 0x006E0037 + .4byte 0x768DC889 + .4byte 0x00330066 + .4byte 0x003376F6 + .4byte 0xC833002F + .4byte 0x005D002F + .4byte 0x775AC7E0 + .4byte 0x002B0056 + .4byte 0x002B77BA + .4byte 0xC7900027 + .4byte 0x004F0027 + .4byte 0x7816C743 + .4byte 0x00240049 + .4byte 0x0024786E + .4byte 0xC6F80021 + .4byte 0x00430021 + .4byte 0x78C2C6B1 + .4byte 0x001F003D + .4byte 0x001F7912 + .4byte 0xC66C001C + .4byte 0x0038001C + .4byte 0x795FC62A + .4byte 0x001A0034 + .4byte 0x001A79A8 + .4byte 0xC5EA0018 + .4byte 0x00300018 + .4byte 0x79EEC5AD + .4byte 0x0016002C + .4byte 0x00167A31 + .4byte 0xC5720014 + .4byte 0x00280014 + .4byte 0x7A71C53A + .4byte 0x00120025 + .4byte 0x00127AAE + .4byte 0xC5030011 + .4byte 0x00220011 + .4byte 0x7AE9C4CF + .4byte 0x0010001F + .4byte 0x00107B21 + .4byte 0xC49D000E + .4byte 0x001D000E + .4byte 0x7B57C46D + .4byte 0x000D001A + .4byte 0x000D7B8A + .4byte 0xC43E000C + .4byte 0x0018000C + .4byte 0x7BBBC412 + .4byte 0x000B0016 + .4byte 0x000B7BEA + .4byte 0xC3E7000A + .4byte 0x0014000A + .4byte 0x7C17C3BE + .4byte 0x00090013 + .4byte 0x00097C42 + .4byte 0xC3960009 + .4byte 0x00110009 + .4byte 0x7C6BC371 + .4byte 0x00080010 + .4byte 0x00087C92 + .4byte 0xC34C0007 + .4byte 0x000E0007 + .4byte 0x7CB8C329 + .4byte 0x0007000D + .4byte 0x00077CDC + .4byte 0xC3080006 + .4byte 0x000C0006 + .4byte 0x7CFEC2E8 + .4byte 0x0006000B + .4byte 0x00067D1F + .4byte 0xC2C90005 + .4byte 0x000A0005 + .4byte 0x7D3FC2AB + .4byte 0x00050009 + .4byte 0x00057D5D + .4byte 0xC28F0004 + .4byte 0x00090004 + .4byte 0x7D7AC274 + .4byte 0x00040008 + .4byte 0x00047D96 + .4byte 0xC25A0004 + .4byte 0x00070004 + .4byte 0x7DB0C241 .global coefTable__Q44nw4r3snd6detail15BiquadFilterHpf coefTable__Q44nw4r3snd6detail15BiquadFilterHpf: - .incbin "baserom.dol", 0x406480, 0x3CC + .4byte 0x3BB58895 + .4byte 0x3BB57E7B + .4byte 0xC17F3BAD + .4byte 0x88A63BAD + .4byte 0x7E69C18F + .4byte 0x3BA588B6 + .4byte 0x3BA57E57 + .4byte 0xC1A13B9C + .4byte 0x88C83B9C + .4byte 0x7E44C1B3 + .4byte 0x3B9388DA + .4byte 0x3B937E30 + .4byte 0xC1C63B89 + .4byte 0x88ED3B89 + .4byte 0x7E1CC1DA + .4byte 0x3B7F8901 + .4byte 0x3B7F7E06 + .4byte 0xC1EE3B75 + .4byte 0x89163B75 + .4byte 0x7DF0C204 + .4byte 0x3B6A892C + .4byte 0x3B6A7DD8 + .4byte 0xC21A3B5F + .4byte 0x89423B5F + .4byte 0x7DBFC232 + .4byte 0x3B53895A + .4byte 0x3B537DA6 + .4byte 0xC24A3B47 + .4byte 0x89733B47 + .4byte 0x7D8BC264 + .4byte 0x3B3A898D + .4byte 0x3B3A7D6F + .4byte 0xC27E3B2C + .4byte 0x89A83B2C + .4byte 0x7D51C29A + .4byte 0x3B1E89C4 + .4byte 0x3B1E7D33 + .4byte 0xC2B73B10 + .4byte 0x89E13B10 + .4byte 0x7D13C2D5 + .4byte 0x3B008A00 + .4byte 0x3B007CF1 + .4byte 0xC2F43AF0 + .4byte 0x8A203AF0 + .4byte 0x7CCEC315 + .4byte 0x3AE08A41 + .4byte 0x3AE07CA9 + .4byte 0xC3373ACE + .4byte 0x8A643ACE + .4byte 0x7C83C35A + .4byte 0x3ABC8A88 + .4byte 0x3ABC7C5B + .4byte 0xC37F3AA9 + .4byte 0x8AAE3AA9 + .4byte 0x7C31C3A6 + .4byte 0x3A958AD6 + .4byte 0x3A957C05 + .4byte 0xC3CE3A81 + .4byte 0x8AFF3A81 + .4byte 0x7BD8C3F8 + .4byte 0x3A6B8B2A + .4byte 0x3A6B7BA8 + .4byte 0xC4233A55 + .4byte 0x8B573A55 + .4byte 0x7B76C451 + .4byte 0x3A3D8B86 + .4byte 0x3A3D7B42 + .4byte 0xC4803A25 + .4byte 0x8BB73A25 + .4byte 0x7B0BC4B1 + .4byte 0x3A0B8BEA + .4byte 0x3A0B7AD2 + .4byte 0xC4E439F0 + .4byte 0x8C1F39F0 + .4byte 0x7A96C519 + .4byte 0x39D58C57 + .4byte 0x39D57A58 + .4byte 0xC55039B8 + .4byte 0x8C9139B8 + .4byte 0x7A16C58A + .4byte 0x39998CCD + .4byte 0x399979D2 + .4byte 0xC5C6397A + .4byte 0x8D0C397A + .4byte 0x798BC604 + .4byte 0x39598D4E + .4byte 0x39597940 + .4byte 0xC6453937 + .4byte 0x8D933937 + .4byte 0x78F2C688 + .4byte 0x39138DDA + .4byte 0x391378A0 + .4byte 0xC6CE38ED + .4byte 0x8E2538ED + .4byte 0x784AC716 + .4byte 0x38C78E73 + .4byte 0x38C777F1 + .4byte 0xC762389E + .4byte 0x8EC4389E + .4byte 0x7793C7B0 + .4byte 0x38748F19 + .4byte 0x38747731 + .4byte 0xC8023847 + .4byte 0x8F713847 + .4byte 0x76CBC856 + .4byte 0x38198FCD + .4byte 0x38197660 + .4byte 0xC8AE37E9 + .4byte 0x902D37E9 + .4byte 0x75F0C909 + .4byte 0x37B79091 + .4byte 0x37B7757A + .4byte 0xC9683783 + .4byte 0x90F93783 + .4byte 0x74FFC9CA + .4byte 0x374D9166 + .4byte 0x374D747F + .4byte 0xCA2F3714 + .4byte 0x91D73714 + .4byte 0x73F8CA98 + .4byte 0x36D9924D + .4byte 0x36D9736B + .4byte 0xCB05369C + .4byte 0x92C8369C + .4byte 0x72D8CB76 + .4byte 0x365C9348 + .4byte 0x365C723E + .4byte 0xCBEB3619 + .4byte 0x93CD3619 + .4byte 0x719CCC64 + .4byte 0x35D49458 + .4byte 0x35D470F3 + .4byte 0xCCE1358C + .4byte 0x94E9358C + .4byte 0x7042CD63 + .4byte 0x3540957F + .4byte 0x35406F89 + .4byte 0xCDE834F2 + .4byte 0x961C34F2 + .4byte 0x6EC7CE73 + .4byte 0x34A096BF + .4byte 0x34A06DFB + .4byte 0xCF01344B + .4byte 0x9769344B + .4byte 0x6D27CF94 + .4byte 0x33F3981A + .4byte 0x33F36C48 + .4byte 0xD02C3397 + .4byte 0x98D23397 + .4byte 0x6B5FD0C9 + .4byte 0x33379992 + .4byte 0x33376A6A + .4byte 0xD16A32D4 + .4byte 0x9A5932D4 + .4byte 0x696AD210 + .4byte 0x326C9B28 + .4byte 0x326C685E + .4byte 0xD2BB3200 + .4byte 0x9BFF3200 + .4byte 0x6746D36B + .4byte 0x31909CDF + .4byte 0x31906620 + .4byte 0xD41F311C + .4byte 0x9DC8311C + .4byte 0x64ECD4D9 + .4byte 0x30A39EBA + .4byte 0x30A363A9 + .4byte 0xD5973025 + .4byte 0x9FB63025 + .4byte 0x6258D65A + .4byte 0x2FA3A0BB + .4byte 0x2FA360F6 + .4byte 0xD7212F1B + .4byte 0xA1CA2F1B + .4byte 0x5F83D7EE + .4byte 0x2E8EA2E4 + .4byte 0x2E8E5DFF + .4byte 0xD8BE2DFC + .4byte 0xA4092DFC + .4byte 0x5C68D993 + .4byte 0x2D64A539 + .4byte 0x2D645ABE + .4byte 0xDA6D2CC6 + .4byte 0xA6742CC6 + .4byte 0x58FFDB4A + .4byte 0x2C22A7BB + .4byte 0x2C22572B + .4byte 0xDC2B2B79 + .4byte 0xA90E2B79 + .4byte 0x5541DD10 + .4byte 0x2AC9AA6E + .4byte 0x2AC9533F + .4byte 0xDDF82A12 + .4byte 0xABDC2A12 + .4byte 0x5125DEE3 + .4byte 0x2955AD56 + .4byte 0x29554EF0 + .4byte 0xDFD12891 + .4byte 0xAEDF2891 + .4byte 0x4CA1E0C0 + .4byte 0x27C5B075 + .4byte 0x27C54A34 + .4byte 0xE1B126F3 + .4byte 0xB21B26F3 + .4byte 0x47AAE2A4 + .4byte 0x2618B3CF + .4byte 0x26184500 + .4byte 0xE3962536 + .4byte 0xB5932536 + .4byte 0x4234E489 + .4byte 0x244CB768 + .4byte 0x244C3F45 + .4byte 0xE57A235A + .4byte 0xB94D235A + .4byte 0x3C31E669 + .4byte 0x225FBB43 + .4byte 0x225F38F6 + .4byte 0xE756215B + .4byte 0xBD4A215B + .4byte 0x3591E83E + .4byte 0x204EBF64 + .4byte 0x204E3200 + .4byte 0xE9201F38 + .4byte 0xC1911F38 + .4byte 0x2E40E9FC + .4byte 0x1E17C3D1 + .4byte 0x1E172A4E + .4byte 0xEACF1CED + .4byte 0xC6251CED + .4byte 0x2628EB97 + .4byte 0x1BB9C88E + .4byte 0x1BB921C8 + .4byte 0xEC521A7A + .4byte 0xCB0B1A7A + .4byte 0x1D2DECFD + .4byte 0x1930CD9F + .4byte 0x19301850 + .4byte 0xED9617DC + .4byte 0xD04917DC + .4byte 0x132EEE18 + .4byte 0x167BD30A + .4byte 0x167B0DC1 + .4byte 0xEE800000 .global coefTable__Q44nw4r3snd6detail18BiquadFilterBpf512 coefTable__Q44nw4r3snd6detail18BiquadFilterBpf512: - .incbin "baserom.dol", 0x40684C, 0x4C4 + .4byte 0x2EFA0000 + .4byte 0xD10621D7 + .4byte 0x1DF42E8F + .4byte 0x0000D171 + .4byte 0x22AD1D1E + .4byte 0x2E240000 + .4byte 0xD1DC2381 + .4byte 0x1C492DBA + .4byte 0x0000D246 + .4byte 0x24551B74 + .4byte 0x2D500000 + .4byte 0xD2B02527 + .4byte 0x1AA12CE7 + .4byte 0x0000D319 + .4byte 0x25F919CE + .4byte 0x2C7E0000 + .4byte 0xD38226CB + .4byte 0x18FC2C15 + .4byte 0x0000D3EB + .4byte 0x279C182A + .4byte 0x2BAD0000 + .4byte 0xD453286C + .4byte 0x17592B44 + .4byte 0x0000D4BC + .4byte 0x293C1689 + .4byte 0x2ADD0000 + .4byte 0xD5232A0B + .4byte 0x15B92A75 + .4byte 0x0000D58B + .4byte 0x2ADA14EA + .4byte 0x2A0D0000 + .4byte 0xD5F32BA8 + .4byte 0x141A29A6 + .4byte 0x0000D65A + .4byte 0x2C76134C + .4byte 0x293F0000 + .4byte 0xD6C12D43 + .4byte 0x127D28D8 + .4byte 0x0000D728 + .4byte 0x2E1111AF + .4byte 0x28710000 + .4byte 0xD78F2EDE + .4byte 0x10E2280A + .4byte 0x0000D7F6 + .4byte 0x2FAA1014 + .4byte 0x27A40000 + .4byte 0xD85C3076 + .4byte 0x0F47273D + .4byte 0x0000D8C3 + .4byte 0x31420E7A + .4byte 0x26D70000 + .4byte 0xD929320E + .4byte 0x0DAE2671 + .4byte 0x0000D98F + .4byte 0x32DA0CE2 + .4byte 0x260B0000 + .4byte 0xD9F533A5 + .4byte 0x0C1625A5 + .4byte 0x0000DA5B + .4byte 0x34700B4A + .4byte 0x253F0000 + .4byte 0xDAC1353A + .4byte 0x0A7E24DA + .4byte 0x0000DB26 + .4byte 0x360509B3 + .4byte 0x24740000 + .4byte 0xDB8C36CF + .4byte 0x08E8240F + .4byte 0x0000DBF1 + .4byte 0x3799081D + .4byte 0x23A90000 + .4byte 0xDC573863 + .4byte 0x07532344 + .4byte 0x0000DCBC + .4byte 0x392C0689 + .4byte 0x22DF0000 + .4byte 0xDD2139F5 + .4byte 0x05BF227B + .4byte 0x0000DD85 + .4byte 0x3ABE04F5 + .4byte 0x22160000 + .4byte 0xDDEA3B86 + .4byte 0x042C21B1 + .4byte 0x0000DE4F + .4byte 0x3C4F0363 + .4byte 0x214D0000 + .4byte 0xDEB33D17 + .4byte 0x029A20E9 + .4byte 0x0000DF17 + .4byte 0x3DDE01D1 + .4byte 0x20850000 + .4byte 0xDF7B3EA6 + .4byte 0x01092021 + .4byte 0x0000DFDF + .4byte 0x3F6D0041 + .4byte 0x1FBD0000 + .4byte 0xE0434033 + .4byte 0xFF7A1F59 + .4byte 0x0000E0A7 + .4byte 0x40FAFEB3 + .4byte 0x1EF60000 + .4byte 0xE10A41C0 + .4byte 0xFDEC1E93 + .4byte 0x0000E16D + .4byte 0x4285FD25 + .4byte 0x1E300000 + .4byte 0xE1D0434A + .4byte 0xFC5F1DCD + .4byte 0x0000E233 + .4byte 0x440FFB9A + .4byte 0x1D6A0000 + .4byte 0xE29644D4 + .4byte 0xFAD41D08 + .4byte 0x0000E2F8 + .4byte 0x4597FA10 + .4byte 0x1CA60000 + .4byte 0xE35A465B + .4byte 0xF94B1C44 + .4byte 0x0000E3BC + .4byte 0x471EF887 + .4byte 0x1BE20000 + .4byte 0xE41E47E1 + .4byte 0xF7C41B80 + .4byte 0x0000E480 + .4byte 0x48A3F701 + .4byte 0x1B1F0000 + .4byte 0xE4E14964 + .4byte 0xF63F1ABE + .4byte 0x0000E542 + .4byte 0x4A25F57D + .4byte 0x1A5E0000 + .4byte 0xE5A24AE6 + .4byte 0xF4BB19FD + .4byte 0x0000E603 + .4byte 0x4BA6F3FA + .4byte 0x199D0000 + .4byte 0xE6634C65 + .4byte 0xF33A193D + .4byte 0x0000E6C3 + .4byte 0x4D24F27A + .4byte 0x18DD0000 + .4byte 0xE7234DE3 + .4byte 0xF1BB187E + .4byte 0x0000E782 + .4byte 0x4EA0F0FC + .4byte 0x181F0000 + .4byte 0xE7E14F5E + .4byte 0xF03E17C0 + .4byte 0x0000E840 + .4byte 0x501AEF81 + .4byte 0x17620000 + .4byte 0xE89E50D6 + .4byte 0xEEC41704 + .4byte 0x0000E8FC + .4byte 0x5192EE07 + .4byte 0x16A60000 + .4byte 0xE95A524D + .4byte 0xED4C1648 + .4byte 0x0000E9B8 + .4byte 0x5307EC91 + .4byte 0x15EB0000 + .4byte 0xEA1553C0 + .4byte 0xEBD6158E + .4byte 0x0000EA72 + .4byte 0x5479EB1C + .4byte 0x15320000 + .4byte 0xEACE5532 + .4byte 0xEA6314D5 + .4byte 0x0000EB2B + .4byte 0x55EAE9AB + .4byte 0x14790000 + .4byte 0xEB8756A1 + .4byte 0xE8F3141E + .4byte 0x0000EBE2 + .4byte 0x5757E83B + .4byte 0x13C20000 + .4byte 0xEC3E580D + .4byte 0xE7851367 + .4byte 0x0000EC99 + .4byte 0x58C2E6CE + .4byte 0x130D0000 + .4byte 0xECF35977 + .4byte 0xE61912B2 + .4byte 0x0000ED4E + .4byte 0x5A2BE564 + .4byte 0x12580000 + .4byte 0xEDA85ADE + .4byte 0xE4B011FE + .4byte 0x0000EE02 + .4byte 0x5B91E3FC + .4byte 0x11A50000 + .4byte 0xEE5B5C43 + .4byte 0xE349114B + .4byte 0x0000EEB5 + .4byte 0x5CF5E297 + .4byte 0x10F20000 + .4byte 0xEF0E5DA6 + .4byte 0xE1E5109A + .4byte 0x0000EF66 + .4byte 0x5E56E134 + .4byte 0x10410000 + .4byte 0xEFBF5F06 + .4byte 0xE0830FE9 + .4byte 0x0000F017 + .4byte 0x5FB6DFD3 + .4byte 0x0F910000 + .4byte 0xF06F6065 + .4byte 0xDF230F3A + .4byte 0x0000F0C6 + .4byte 0x6113DE74 + .4byte 0x0EE20000 + .4byte 0xF11E61C1 + .4byte 0xDDC50E8B + .4byte 0x0000F175 + .4byte 0x626FDD16 + .4byte 0x0E340000 + .4byte 0xF1CC631C + .4byte 0xDC690DDE + .4byte 0x0000F222 + .4byte 0x63C8DBBB + .4byte 0x0D870000 + .4byte 0xF2796475 + .4byte 0xDB0E0D31 + .4byte 0x0000F2CF + .4byte 0x6520DA61 + .4byte 0x0CDA0000 + .4byte 0xF32665CC + .4byte 0xD9B50C84 + .4byte 0x0000F37C + .4byte 0x6677D909 + .4byte 0x0C2F0000 + .4byte 0xF3D16722 + .4byte 0xD85D0BD9 + .4byte 0x0000F427 + .4byte 0x67CDD7B2 + .4byte 0x0B830000 + .4byte 0xF47D6878 + .4byte 0xD7060B2D + .4byte 0x0000F4D3 + .4byte 0x6922D65B + .4byte 0x0AD80000 + .4byte 0xF52869CC + .4byte 0xD5B00A82 + .4byte 0x0000F57E + .4byte 0x6A77D505 + .4byte 0x0A2D0000 + .4byte 0xF5D36B21 + .4byte 0xD45A09D7 + .4byte 0x0000F629 + .4byte 0x6BCBD3AF + .4byte 0x09820000 + .4byte 0xF67E6C75 + .4byte 0xD304092C + .4byte 0x0000F6D4 + .4byte 0x6D1FD259 + .4byte 0x08D70000 + .4byte 0xF7296DCA + .4byte 0xD1AE0881 + .4byte 0x0000F77F + .4byte 0x6E74D102 + .4byte 0x082B0000 + .4byte 0xF7D56F1F + .4byte 0xD05607D5 + .4byte 0x0000F82B + .4byte 0x6FCACFAA + .4byte 0x077F0000 + .4byte 0xF8817076 + .4byte 0xCEFE0729 + .4byte 0x0000F8D7 + .4byte 0x7122CE51 + .4byte 0x06D20000 + .4byte 0xF92E71CE + .4byte 0xCDA4067B + .4byte 0x0000F985 + .4byte 0x727BCCF6 + .4byte 0x06240000 + .4byte 0xF9DC7329 + .4byte 0xCC4805CC + .4byte 0x0000FA34 + .4byte 0x73D7CB98 + .4byte 0x05740000 + .4byte 0xFA8C7487 + .4byte 0xCAE8051C + .4byte 0x0000FAE4 + .4byte 0x7537CA38 + .4byte 0x04C30000 + .4byte 0xFB3D75E7 + .4byte 0xC986046A + .4byte 0x0000FB96 + .4byte 0x7699C8D3 + .4byte 0x04100000 + .4byte 0xFBF0774C + .4byte 0xC81F03B5 + .4byte 0x0000FC4B + .4byte 0x7800C76A + .4byte 0x035A0000 + .4byte 0xFCA678B6 + .4byte 0xC6B402FE + .4byte 0x0000FD02 + .4byte 0x796DC5FC + .4byte 0x02A20000 + .4byte 0xFD5E7A25 + .4byte 0xC5430244 + .4byte 0x0000FDBC + .4byte 0x7ADFC488 .global coefTable__Q44nw4r3snd6detail19BiquadFilterBpf1024 coefTable__Q44nw4r3snd6detail19BiquadFilterBpf1024: - .incbin "baserom.dol", 0x406D10, 0x3A4 + .4byte 0x2F040000 + .4byte 0xD0FC21DE + .4byte 0x1E082E99 + .4byte 0x0000D167 + .4byte 0x22B31D32 + .4byte 0x2E2F0000 + .4byte 0xD1D12386 + .4byte 0x1C5D2DC5 + .4byte 0x0000D23B + .4byte 0x24591B89 + .4byte 0x2D5B0000 + .4byte 0xD2A5252B + .4byte 0x1AB62CF2 + .4byte 0x0000D30E + .4byte 0x25FD19E4 + .4byte 0x2C890000 + .4byte 0xD37726CE + .4byte 0x19122C20 + .4byte 0x0000D3E0 + .4byte 0x279E1841 + .4byte 0x2BB80000 + .4byte 0xD448286D + .4byte 0x17702B50 + .4byte 0x0000D4B0 + .4byte 0x293C16A0 + .4byte 0x2AE80000 + .4byte 0xD5182A0B + .4byte 0x15D02A80 + .4byte 0x0000D580 + .4byte 0x2AD91500 + .4byte 0x2A190000 + .4byte 0xD5E72BA7 + .4byte 0x143129B1 + .4byte 0x0000D64F + .4byte 0x2C741363 + .4byte 0x294A0000 + .4byte 0xD6B62D41 + .4byte 0x129428E3 + .4byte 0x0000D71D + .4byte 0x2E0E11C6 + .4byte 0x287C0000 + .4byte 0xD7842EDA + .4byte 0x10F82815 + .4byte 0x0000D7EB + .4byte 0x2FA6102A + .4byte 0x27AF0000 + .4byte 0xD8513072 + .4byte 0x0F5D2748 + .4byte 0x0000D8B8 + .4byte 0x313E0E90 + .4byte 0x26E10000 + .4byte 0xD91F3209 + .4byte 0x0DC3267B + .4byte 0x0000D985 + .4byte 0x32D40CF6 + .4byte 0x26140000 + .4byte 0xD9EC339F + .4byte 0x0C2925AE + .4byte 0x0000DA52 + .4byte 0x346A0B5C + .4byte 0x25480000 + .4byte 0xDAB83535 + .4byte 0x0A8F24E1 + .4byte 0x0000DB1F + .4byte 0x35FF09C3 + .4byte 0x247B0000 + .4byte 0xDB8536CA + .4byte 0x08F62415 + .4byte 0x0000DBEB + .4byte 0x3794082A + .4byte 0x23AF0000 + .4byte 0xDC51385E + .4byte 0x075D2349 + .4byte 0x0000DCB7 + .4byte 0x39280691 + .4byte 0x22E20000 + .4byte 0xDD1E39F3 + .4byte 0x05C5227C + .4byte 0x0000DD84 + .4byte 0x3ABD04F8 + .4byte 0x22160000 + .4byte 0xDDEA3B86 + .4byte 0x042C21B0 + .4byte 0x0000DE50 + .4byte 0x3C50035F + .4byte 0x21490000 + .4byte 0xDEB73D1A + .4byte 0x029320E3 + .4byte 0x0000DF1D + .4byte 0x3DE401C6 + .4byte 0x207D0000 + .4byte 0xDF833EAE + .4byte 0x00F92016 + .4byte 0x0000DFEA + .4byte 0x3F78002C + .4byte 0x1FB00000 + .4byte 0xE0504042 + .4byte 0xFF5F1F49 + .4byte 0x0000E0B7 + .4byte 0x410CFE92 + .4byte 0x1EE20000 + .4byte 0xE11E41D7 + .4byte 0xFDC41E7B + .4byte 0x0000E185 + .4byte 0x42A1FCF7 + .4byte 0x1E140000 + .4byte 0xE1EC436C + .4byte 0xFC291DAD + .4byte 0x0000E253 + .4byte 0x4436FB5B + .4byte 0x1D460000 + .4byte 0xE2BA4501 + .4byte 0xFA8C1CDF + .4byte 0x0000E321 + .4byte 0x45CDF9BD + .4byte 0x1C770000 + .4byte 0xE3894698 + .4byte 0xF8EE1C0F + .4byte 0x0000E3F1 + .4byte 0x4764F81E + .4byte 0x1BA70000 + .4byte 0xE4594831 + .4byte 0xF74D1B3E + .4byte 0x0000E4C2 + .4byte 0x48FDF67C + .4byte 0x1AD50000 + .4byte 0xE52B49CB + .4byte 0xF5AB1A6C + .4byte 0x0000E594 + .4byte 0x4A99F4D8 + .4byte 0x1A030000 + .4byte 0xE5FD4B67 + .4byte 0xF4051998 + .4byte 0x0000E668 + .4byte 0x4C37F331 + .4byte 0x192E0000 + .4byte 0xE6D24D07 + .4byte 0xF25C18C3 + .4byte 0x0000E73D + .4byte 0x4DD8F186 + .4byte 0x18570000 + .4byte 0xE7A94EAA + .4byte 0xF0AF17EB + .4byte 0x0000E815 + .4byte 0x4F7DEFD6 + .4byte 0x177E0000 + .4byte 0xE8825051 + .4byte 0xEEFC1710 + .4byte 0x0000E8F0 + .4byte 0x5127EE21 + .4byte 0x16A20000 + .4byte 0xE95E51FE + .4byte 0xED441632 + .4byte 0x0000E9CE + .4byte 0x52D7EC65 + .4byte 0x15C20000 + .4byte 0xEA3E53B2 + .4byte 0xEB841550 + .4byte 0x0000EAB0 + .4byte 0x548EEAA1 + .4byte 0x14DE0000 + .4byte 0xEB22556D + .4byte 0xE9BC146A + .4byte 0x0000EB96 + .4byte 0x564EE8D4 + .4byte 0x13F50000 + .4byte 0xEC0B5731 + .4byte 0xE7E9137E + .4byte 0x0000EC82 + .4byte 0x5817E6FC + .4byte 0x13060000 + .4byte 0xECFA5900 + .4byte 0xE60B128C + .4byte 0x0000ED74 + .4byte 0x59EDE517 + .4byte 0x12100000 + .4byte 0xEDF05ADC + .4byte 0xE41F1192 + .4byte 0x0000EE6E + .4byte 0x5BD0E323 + .4byte 0x11110000 + .4byte 0xEEEF5CC8 + .4byte 0xE223108F + .4byte 0x0000EF71 + .4byte 0x5DC4E11E + .4byte 0x100A0000 + .4byte 0xEFF65EC5 + .4byte 0xE0130F82 + .4byte 0x0000F07E + .4byte 0x5FCBDF04 + .4byte 0x0EF70000 + .4byte 0xF10960D7 + .4byte 0xDDEE0E69 + .4byte 0x0000F197 + .4byte 0x61E9DCD1 + .4byte 0x0DD70000 + .4byte 0xF2296301 + .4byte 0xDBAE0D41 + .4byte 0x0000F2BF + .4byte 0x6421DA83 + .4byte 0x0CA80000 + .4byte 0xF3586549 + .4byte 0xD94F0C09 + .4byte 0x0000F3F7 + .4byte 0x6679D813 + .4byte 0x0B660000 + .4byte 0xF49A67B3 + .4byte 0xD6CD0ABE + .4byte 0x0000F542 + .4byte 0x68F6D57C + .4byte 0x0A100000 + .4byte 0xF5F06A45 + .4byte 0xD420095B + .4byte 0x0000F6A5 + .4byte 0x6B9FD2B7 + .4byte 0x08A00000 + .4byte 0xF7606D06 + .4byte 0xD14107DE + .4byte 0x0000F822 + .4byte 0x6E7BCFBC + .4byte 0x07140000 + .4byte 0xF8EC6FFF + .4byte 0xCE270640 + .4byte 0x0000F9C0 + .4byte 0x7195CC81 + .4byte 0x05640000 + .4byte 0xFA9C733C + .4byte 0xCAC7047D + .4byte 0x0000FB83 + .4byte 0x74F7C8F9 + .4byte 0x038A0000 + .4byte 0xFC7676C8 + .4byte 0xC7140000 .global coefTable__Q44nw4r3snd6detail19BiquadFilterBpf2048 coefTable__Q44nw4r3snd6detail19BiquadFilterBpf2048: - .incbin "baserom.dol", 0x4070B4, 0x3A4 + .4byte 0x3F420000 + .4byte 0xC0BE0136 + .4byte 0x3E833E8A + .4byte 0x0000C176 + .4byte 0x02A33D14 + .4byte 0x3DD90000 + .4byte 0xC2270401 + .4byte 0x3BB33D2F + .4byte 0x0000C2D1 + .4byte 0x05533A5E + .4byte 0x3C8B0000 + .4byte 0xC3750699 + .4byte 0x39163BEC + .4byte 0x0000C414 + .4byte 0x07D537D7 + .4byte 0x3B510000 + .4byte 0xC4AF0907 + .4byte 0x36A23ABB + .4byte 0x0000C545 + .asciz "\n15v:(" + .balign 4 + .4byte 0xC5D80B53 + .4byte 0x3451399A + .4byte 0x0000C666 + .4byte 0x0C6D3333 + .4byte 0x390E0000 + .4byte 0xC6F20D81 + .4byte 0x321C3885 + .4byte 0x0000C77B + .4byte 0x0E8F310B + .4byte 0x37FF0000 + .4byte 0xC8010F97 + .4byte 0x2FFF377C + .4byte 0x0000C884 + .4byte 0x109B2EF7 + .4byte 0x36FA0000 + .4byte 0xC906119A + .4byte 0x2DF5367B + .4byte 0x0000C985 + .4byte 0x12942CF6 + .4byte 0x35FE0000 + .4byte 0xCA02138B + .4byte 0x2BFB3582 + .4byte 0x0000CA7E + .4byte 0x147E2B04 + .4byte 0x35080000 + .4byte 0xCAF8156E + .4byte 0x2A0F348F + .4byte 0x0000CB71 + .4byte 0x165B291E + .4byte 0x34170000 + .4byte 0xCBE91745 + .4byte 0x282F33A1 + .4byte 0x0000CC5F + .4byte 0x182D2742 + .4byte 0x332C0000 + .4byte 0xCCD41913 + .4byte 0x265732B7 + .4byte 0x0000CD49 + .4byte 0x19F6256F + .4byte 0x32440000 + .4byte 0xCDBC1AD7 + .4byte 0x248831D1 + .4byte 0x0000CE2F + .4byte 0x1BB723A2 + .4byte 0x315F0000 + .4byte 0xCEA11C95 + .4byte 0x22BE30EE + .4byte 0x0000CF12 + .4byte 0x1D7221DC + .4byte 0x307D0000 + .4byte 0xCF831E4D + .4byte 0x20FA300C + .4byte 0x0000CFF4 + .4byte 0x1F282019 + .4byte 0x2F9C0000 + .4byte 0xD0642001 + .4byte 0x1F392F2D + .4byte 0x0000D0D3 + .4byte 0x20D91E59 + .4byte 0x2EBD0000 + .4byte 0xD14321B1 + .4byte 0x1D7A2E4E + .4byte 0x0000D1B2 + .4byte 0x22881C9C + .4byte 0x2DDF0000 + .4byte 0xD221235E + .4byte 0x1BBE2D70 + .4byte 0x0000D290 + .4byte 0x24341AE0 + .4byte 0x2D010000 + .4byte 0xD2FF250A + .4byte 0x1A022C92 + .4byte 0x0000D36E + .4byte 0x25DF1923 + .4byte 0x2C230000 + .4byte 0xD3DD26B4 + .4byte 0x18452BB3 + .4byte 0x0000D44D + .4byte 0x27891767 + .4byte 0x2B440000 + .4byte 0xD4BC285E + .4byte 0x16882AD4 + .4byte 0x0000D52C + .4byte 0x293415A8 + .4byte 0x2A640000 + .4byte 0xD59C2A09 + .4byte 0x14C829F4 + .4byte 0x0000D60C + .4byte 0x2ADF13E8 + .4byte 0x29830000 + .4byte 0xD67D2BB6 + .4byte 0x13062912 + .4byte 0x0000D6EE + .4byte 0x2C8D1224 + .4byte 0x28A00000 + .4byte 0xD7602D64 + .4byte 0x1140282E + .4byte 0x0000D7D2 + .4byte 0x2E3C105C + .4byte 0x27BB0000 + .4byte 0xD8452F15 + .4byte 0x0F762747 + .4byte 0x0000D8B9 + .4byte 0x2FF00E8E + .4byte 0x26D30000 + .4byte 0xD92D30CB + .4byte 0x0DA5265D + .4byte 0x0000D9A3 + .4byte 0x31A70CBB + .4byte 0x25E70000 + .4byte 0xDA193285 + .4byte 0x0BCE2570 + .4byte 0x0000DA90 + .4byte 0x33640AE0 + .4byte 0x24F70000 + .4byte 0xDB093445 + .4byte 0x09EF247E + .4byte 0x0000DB82 + .4byte 0x352808FC + .4byte 0x24030000 + .4byte 0xDBFD360C + .4byte 0x08062387 + .4byte 0x0000DC79 + .4byte 0x36F3070D + .4byte 0x23090000 + .4byte 0xDCF737DC + .4byte 0x0612228A + .4byte 0x0000DD76 + .4byte 0x38C80513 + .4byte 0x22080000 + .4byte 0xDDF839B6 + .4byte 0x04112185 + .4byte 0x0000DE7B + .4byte 0x3AA8030B + .4byte 0x21000000 + .4byte 0xDF003B9D + .4byte 0x02012079 + .4byte 0x0000DF87 + .4byte 0x3C9500F2 + .4byte 0x1FF00000 + .4byte 0xE0103D91 + .4byte 0xFFDF1F63 + .4byte 0x0000E09D + .4byte 0x3E91FEC7 + .4byte 0x1ED50000 + .4byte 0xE12B3F96 + .4byte 0xFDA91E43 + .4byte 0x0000E1BD + .4byte 0x409FFC85 + .4byte 0x1DAE0000 + .4byte 0xE25241AE + .4byte 0xFB5B1D15 + .4byte 0x0000E2EB + .4byte 0x42C3FA2A + .4byte 0x1C790000 + .4byte 0xE38743DE + .4byte 0xF8F21BD9 + .4byte 0x0000E427 + .4byte 0x44FFF7B1 + .4byte 0x1B340000 + .4byte 0xE4CC4628 + .4byte 0xF6681A8B + .4byte 0x0000E575 + .4byte 0x4759F515 + .4byte 0x19DC0000 + .4byte 0xE6244893 + .4byte 0xF3B81928 + .4byte 0x0000E6D8 + .4byte 0x49D6F250 + .4byte 0x186E0000 + .4byte 0xE7924B24 + .4byte 0xF0DC17AD + .4byte 0x0000E853 + .4byte 0x4C7DEF5A + .4byte 0x16E50000 + .4byte 0xE91B4DE3 + .4byte 0xEDCA1615 + .4byte 0x0000E9EB + .4byte 0x4F56EC2A + .4byte 0x153D0000 + .4byte 0xEAC350D7 + .4byte 0xEA79145A + .4byte 0x0000EBA6 + .4byte 0x526AE8B5 + .4byte 0x136E0000 + .4byte 0xEC92540E + .4byte 0xE6DC1276 + .4byte 0x0000ED8A + .4byte 0x55C6E4EC + .4byte 0x11720000 + .4byte 0xEE8E5794 + .4byte 0xE2E3105F + .4byte 0x0000EFA1 + .4byte 0x597AE0BE + .4byte 0x0F3D0000 + .4byte 0xF0C35B7B + .4byte 0xDE7A0E0A + .4byte 0x0000F1F6 + .4byte 0x5D9BDC14 + .4byte 0x0CC30000 + .4byte 0xF33D5FDC + .4byte 0xD9870B67 + .4byte 0x0000F499 + .4byte 0x6242D6CF + .4byte 0x09F30000 + .4byte 0xF60D64D3 + .4byte 0xD3E70864 + .4byte 0x0000F79C + .4byte 0x6793D0C8 + .4byte 0x06B60000 + .4byte 0xF94A6A89 + .4byte 0xCD6C0000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail19BiquadFilterBpf2048 __vt__Q44nw4r3snd6detail19BiquadFilterBpf2048: - .incbin "baserom.dol", 0x43E138, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80106EC0 ;# ptr + .4byte 0x80106DE0 ;# ptr .global __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024 __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024: - .incbin "baserom.dol", 0x43E148, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80106EB0 ;# ptr + .4byte 0x80106D40 ;# ptr .global __vt__Q44nw4r3snd6detail18BiquadFilterBpf512 __vt__Q44nw4r3snd6detail18BiquadFilterBpf512: - .incbin "baserom.dol", 0x43E158, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80106EA0 ;# ptr + .4byte 0x80106CA0 ;# ptr .global __vt__Q44nw4r3snd6detail15BiquadFilterHpf __vt__Q44nw4r3snd6detail15BiquadFilterHpf: - .incbin "baserom.dol", 0x43E168, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80106E90 ;# ptr + .4byte 0x80106C10 ;# ptr .global __vt__Q44nw4r3snd6detail15BiquadFilterLpf __vt__Q44nw4r3snd6detail15BiquadFilterLpf: - .incbin "baserom.dol", 0x43E178, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80106E80 ;# ptr + .4byte 0x80106B80 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2752 $$2752: - .incbin "baserom.dol", 0x499E00, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$2787 $$2787: - .incbin "baserom.dol", 0x499E08, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_Channel.s b/asm/libnw4r_snd/snd_Channel.s index 78041ba6..45ef69f0 100644 --- a/asm/libnw4r_snd/snd_Channel.s +++ b/asm/libnw4r_snd/snd_Channel.s @@ -1250,25 +1250,28 @@ FreeChannel__Q44nw4r3snd6detail7ChannelFPQ44nw4r3snd6detail7Channel: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210013 $$210013: - .incbin "baserom.dol", 0x499E10, 0x4 + .4byte 0 .global $$210140 $$210140: - .incbin "baserom.dol", 0x499E14, 0x4 + .4byte 0x3F800000 .global $$210293 $$210293: - .incbin "baserom.dol", 0x499E18, 0x4 + .4byte 0x437F0000 .global $$210294 $$210294: - .incbin "baserom.dol", 0x499E1C, 0x4 + .4byte 0x40C00000 .global $$210295 $$210295: - .incbin "baserom.dol", 0x499E20, 0x8 + .4byte 0x43800000 + .4byte 0 .global $$210299 $$210299: - .incbin "baserom.dol", 0x499E28, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$210300 $$210300: - .incbin "baserom.dol", 0x499E30, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$28748 diff --git a/asm/libnw4r_snd/snd_DvdSoundArchive.s b/asm/libnw4r_snd/snd_DvdSoundArchive.s index c7485ff5..d7fc07b6 100644 --- a/asm/libnw4r_snd/snd_DvdSoundArchive.s +++ b/asm/libnw4r_snd/snd_DvdSoundArchive.s @@ -585,7 +585,39 @@ lbl_80108B0C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd15DvdSoundArchive13DvdFileStream __vt__Q44nw4r3snd15DvdSoundArchive13DvdFileStream: - .incbin "baserom.dol", 0x43E188, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80108A80 ;# ptr + .4byte 0x80108AD0 ;# ptr + .4byte 0x80121020 ;# ptr + .4byte 0x80108920 ;# ptr + .4byte 0x80108A70 ;# ptr + .4byte 0x80120630 ;# ptr + .4byte 0x80120640 ;# ptr + .4byte 0x80108A40 ;# ptr + .4byte 0x80108A50 ;# ptr + .4byte 0x80108A20 ;# ptr + .4byte 0x80108A10 ;# ptr + .4byte 0x801089F0 ;# ptr + .4byte 0x801089E0 ;# ptr + .4byte 0x801089D0 ;# ptr + .4byte 0x80108A90 ;# ptr + .4byte 0x80108950 ;# ptr + .4byte 0x80121220 ;# ptr + .4byte 0x80120DF0 ;# ptr + .4byte 0x80108A30 ;# ptr + .4byte 0x80108A00 ;# ptr + .4byte 0x80108AA0 ;# ptr + .4byte 0x80121140 ;# ptr + .4byte 0x80108A60 ;# ptr + .4byte 0 .global __vt__Q34nw4r3snd15DvdSoundArchive __vt__Q34nw4r3snd15DvdSoundArchive: - .incbin "baserom.dol", 0x43E1F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80108450 ;# ptr + .4byte 0x80108AC0 ;# ptr + .4byte 0x80108AB0 ;# ptr + .4byte 0x801087F0 ;# ptr + .4byte 0x80108680 ;# ptr + .4byte 0x80108730 ;# ptr diff --git a/asm/libnw4r_snd/snd_EnvGenerator.s b/asm/libnw4r_snd/snd_EnvGenerator.s index b36dc6b7..c0781561 100644 --- a/asm/libnw4r_snd/snd_EnvGenerator.s +++ b/asm/libnw4r_snd/snd_EnvGenerator.s @@ -296,39 +296,231 @@ lbl_80108EF4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator: - .incbin "baserom.dol", 0x407458, 0x100 + .4byte 0xFD2DFD2E + .4byte 0xFD2FFD75 + .4byte 0xFDA7FDCE + .4byte 0xFDEEFE09 + .4byte 0xFE20FE34 + .4byte 0xFE46FE57 + .4byte 0xFE66FE74 + .4byte 0xFE81FE8D + .4byte 0xFE98FEA3 + .4byte 0xFEADFEB6 + .4byte 0xFEBFFEC7 + .4byte 0xFECFFED7 + .4byte 0xFEDFFEE6 + .4byte 0xFEECFEF3 + .4byte 0xFEF9FEFF + .4byte 0xFF05FF0B + .4byte 0xFF11FF16 + .4byte 0xFF1BFF20 + .4byte 0xFF25FF2A + .4byte 0xFF2EFF33 + .4byte 0xFF37FF3C + .4byte 0xFF40FF44 + .4byte 0xFF48FF4C + .4byte 0xFF50FF53 + .4byte 0xFF57FF5B + .4byte 0xFF5EFF62 + .4byte 0xFF65FF68 + .4byte 0xFF6BFF6F + .4byte 0xFF72FF75 + .4byte 0xFF78FF7B + .4byte 0xFF7EFF81 + .4byte 0xFF83FF86 + .4byte 0xFF89FF8C + .4byte 0xFF8EFF91 + .4byte 0xFF93FF96 + .4byte 0xFF99FF9B + .4byte 0xFF9DFFA0 + .4byte 0xFFA2FFA5 + .4byte 0xFFA7FFA9 + .4byte 0xFFABFFAE + .4byte 0xFFB0FFB2 + .4byte 0xFFB4FFB6 + .4byte 0xFFB8FFBA + .4byte 0xFFBCFFBE + .4byte 0xFFC0FFC2 + .4byte 0xFFC4FFC6 + .4byte 0xFFC8FFCA + .4byte 0xFFCCFFCE + .4byte 0xFFCFFFD1 + .4byte 0xFFD3FFD5 + .4byte 0xFFD6FFD8 + .4byte 0xFFDAFFDC + .4byte 0xFFDDFFDF + .4byte 0xFFE1FFE2 + .4byte 0xFFE4FFE5 + .4byte 0xFFE7FFE9 + .4byte 0xFFEAFFEC + .4byte 0xFFEDFFEF + .4byte 0xFFF0FFF2 + .4byte 0xFFF3FFF5 + .4byte 0xFFF6FFF8 + .4byte 0xFFF9FFFA + .4byte 0xFFFCFFFD + .4byte 0xFFFF0000 .global $$2LOCAL$$2SetAttack__Q44nw4r3snd6detail12EnvGeneratorFi$$2attackTable $$2LOCAL$$2SetAttack__Q44nw4r3snd6detail12EnvGeneratorFi$$2attackTable: - .incbin "baserom.dol", 0x407558, 0x200 + .4byte 0x3F7FCCB8 + .4byte 0x3F7F9947 + .4byte 0x3F7F65AD + .4byte 0x3F7F31E9 + .4byte 0x3F7EFDFA + .4byte 0x3F7EC9E1 + .4byte 0x3F7E959D + .4byte 0x3F7E612F + .4byte 0x3F7E2C94 + .4byte 0x3F7DF7CF + .4byte 0x3F7DC2DD + .4byte 0x3F7D8DBF + .4byte 0x3F7D5873 + .4byte 0x3F7D22FD + .4byte 0x3F7CED57 + .4byte 0x3F7CB784 + .4byte 0x3F7C8183 + .4byte 0x3F7C4B54 + .4byte 0x3F7C14F7 + .4byte 0x3F7BDE6A + .4byte 0x3F7BA7AD + .4byte 0x3F7B70C2 + .4byte 0x3F7B39A4 + .4byte 0x3F7B0258 + .4byte 0x3F7ACADB + .4byte 0x3F7A932B + .4byte 0x3F7A5B4B + .4byte 0x3F7A2338 + .4byte 0x3F79EAF3 + .4byte 0x3F79B27C + .4byte 0x3F7979D1 + .4byte 0x3F7940F1 + .4byte 0x3F7907DE + .4byte 0x3F78CE97 + .4byte 0x3F78951A + .4byte 0x3F785B69 + .4byte 0x3F782181 + .4byte 0x3F77E762 + .4byte 0x3F77AD0F + .4byte 0x3F777282 + .4byte 0x3F7737C0 + .4byte 0x3F76FCC4 + .4byte 0x3F76C190 + .4byte 0x3F768622 + .4byte 0x3F764A7B + .4byte 0x3F760E9C + .4byte 0x3F75D281 + .4byte 0x3F75962A + .4byte 0x3F755999 + .4byte 0x3F751CCB + .4byte 0x3F74DFC1 + .4byte 0x3F74A27A + .4byte 0x3F7464F5 + .4byte 0x3F742732 + .4byte 0x3F73E930 + .4byte 0x3F73AAEF + .4byte 0x3F736C6D + .4byte 0x3F732DAD + .4byte 0x3F72EEAA + .4byte 0x3F72AF65 + .4byte 0x3F726FDF + .4byte 0x3F723015 + .4byte 0x3F71F009 + .4byte 0x3F71AFB8 + .4byte 0x3F716F22 + .4byte 0x3F712E47 + .4byte 0x3F70ED26 + .4byte 0x3F70ABBE + .4byte 0x3F706A10 + .4byte 0x3F702818 + .4byte 0x3F6FE5D8 + .4byte 0x3F6FA34E + .4byte 0x3F6F607B + .4byte 0x3F6F1D5B + .4byte 0x3F6ED9F2 + .4byte 0x3F6E963A + .4byte 0x3F6E5237 + .4byte 0x3F6E0DE5 + .4byte 0x3F6DC944 + .4byte 0x3F6D8454 + .4byte 0x3F6D3F12 + .4byte 0x3F6CF981 + .4byte 0x3F6CB39C + .4byte 0x3F6C6D65 + .4byte 0x3F6C26DA + .4byte 0x3F6BDFFB + .4byte 0x3F6B98C5 + .4byte 0x3F6B5139 + .4byte 0x3F6B0956 + .4byte 0x3F6AC11C + .4byte 0x3F6A7887 + .4byte 0x3F6A2F98 + .4byte 0x3F69E64C + .4byte 0x3F699CA6 + .4byte 0x3F6952A2 + .4byte 0x3F69083F + .4byte 0x3F68BD7E + .4byte 0x3F68725B + .4byte 0x3F6826D8 + .4byte 0x3F67DAF0 + .4byte 0x3F678EA6 + .4byte 0x3F6741F5 + .4byte 0x3F66F4E0 + .4byte 0x3F66A763 + .4byte 0x3F66597C + .4byte 0x3F660B2D + .4byte 0x3F65BC70 + .4byte 0x3F656D49 + .4byte 0x3F651DB3 + .4byte 0x3F63DAF7 + .4byte 0x3F61E90B + .4byte 0x3F603C9A + .4byte 0x3F5E82FB + .4byte 0x3F5D178D + .4byte 0x3F5A8424 + .4byte 0x3F57D016 + .4byte 0x3F542004 + .4byte 0x3F509DEF + .4byte 0x3F4CDB09 + .4byte 0x3F472F5A + .4byte 0x3F4166CF + .4byte 0x3F3965FE + .4byte 0x3F2ECD8C + .4byte 0x3F2206D8 + .4byte 0x3F0F289E + .4byte 0x3EE90841 + .4byte 0x3EA8E5A3 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator: - .incbin "baserom.dol", 0x499E38, 0x4 + .4byte 0xC2B4CCCD .global $$23470 $$23470: - .incbin "baserom.dol", 0x499E3C, 0x4 + .4byte 0x477FFF00 .global $$23471 $$23471: - .incbin "baserom.dol", 0x499E40, 0x4 + .4byte 0x41200000 .global $$23479 $$23479: - .incbin "baserom.dol", 0x499E44, 0x4 + .4byte 0 .global $$23500 $$23500: - .incbin "baserom.dol", 0x499E48, 0x8 + .4byte 0xBD000000 + .4byte 0 .global $$23503 $$23503: - .incbin "baserom.dol", 0x499E50, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$23514 $$23514: - .incbin "baserom.dol", 0x499E58, 0x4 + .4byte 0x41C00000 .global $$23515 $$23515: - .incbin "baserom.dol", 0x499E5C, 0x4 + .4byte 0x3C000000 .global $$23516 $$23516: - .incbin "baserom.dol", 0x499E60, 0x4 + .4byte 0x40A00000 .global $$23517 $$23517: - .incbin "baserom.dol", 0x499E64, 0x4 + .4byte 0x42700000 diff --git a/asm/libnw4r_snd/snd_Lfo.s b/asm/libnw4r_snd/snd_Lfo.s index c43d8c84..ccdbe688 100644 --- a/asm/libnw4r_snd/snd_Lfo.s +++ b/asm/libnw4r_snd/snd_Lfo.s @@ -158,30 +158,43 @@ lbl_80109DE0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2GetSinIdx__Q44nw4r3snd6detail3LfoFi$$2sinTable $$2LOCAL$$2GetSinIdx__Q44nw4r3snd6detail3LfoFi$$2sinTable: - .incbin "baserom.dol", 0x407758, 0x28 + .4byte 0x00060C13 + .4byte 0x191F252B + .4byte 0x31363C41 + .4byte 0x474C5155 + .4byte 0x5A5E6266 + .4byte 0x6A6D7073 + .4byte 0x75787A7B + .4byte 0x7D7E7E7F + .4byte 0x7F000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27641 $$27641: - .incbin "baserom.dol", 0x499E68, 0x4 + .4byte 0 .global $$27642 $$27642: - .incbin "baserom.dol", 0x499E6C, 0x4 + .4byte 0x40C80000 .global $$27657 $$27657: - .incbin "baserom.dol", 0x499E70, 0x8 + .4byte 0x447A0000 + .4byte 0 .global $$27660 $$27660: - .incbin "baserom.dol", 0x499E78, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$27670 $$27670: - .incbin "baserom.dol", 0x499E80, 0x4 + .4byte 0x40800000 .global $$27671 $$27671: - .incbin "baserom.dol", 0x499E84, 0x4 + .4byte 0x42000000 .global $$27672 $$27672: - .incbin "baserom.dol", 0x499E88, 0x8 + .4byte 0x42FE0000 + .4byte 0 .global $$27676 $$27676: - .incbin "baserom.dol", 0x499E90, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_MmlParser.s b/asm/libnw4r_snd/snd_MmlParser.s index 6a89ac69..560ecfde 100644 --- a/asm/libnw4r_snd/snd_MmlParser.s +++ b/asm/libnw4r_snd/snd_MmlParser.s @@ -1271,44 +1271,176 @@ lbl_8010B060: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$210410 $$210410: - .incbin "baserom.dol", 0x43E210, 0x28 + .asciz "#%08x[%d]: printvar %sVAR_%d(%d) = %d\n" + .balign 4 .global $$210414 $$210414: - .incbin "baserom.dol", 0x43E238, 0x1F8 + .4byte 0x8010A5B8 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AA28 ;# ptr + .4byte 0x8010AA68 ;# ptr + .4byte 0x8010AA78 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010A5B0 ;# ptr + .4byte 0x8010A83C ;# ptr + .4byte 0x8010A8B0 ;# ptr + .4byte 0x8010A634 ;# ptr + .4byte 0x8010A930 ;# ptr + .4byte 0x8010A938 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010A6AC ;# ptr + .4byte 0x8010A5E0 ;# ptr + .4byte 0x8010A63C ;# ptr + .4byte 0x8010A644 ;# ptr + .4byte 0x8010A64C ;# ptr + .4byte 0x8010A6A4 ;# ptr + .4byte 0x8010A76C ;# ptr + .4byte 0x8010A774 ;# ptr + .4byte 0x8010A888 ;# ptr + .4byte 0x8010A8DC ;# ptr + .4byte 0x8010A790 ;# ptr + .4byte 0x8010A7B4 ;# ptr + .4byte 0x8010A7D8 ;# ptr + .4byte 0x8010A7E0 ;# ptr + .4byte 0x8010A8F4 ;# ptr + .4byte 0x8010A788 ;# ptr + .4byte 0x8010A81C ;# ptr + .4byte 0x8010A824 ;# ptr + .4byte 0x8010A82C ;# ptr + .4byte 0x8010A834 ;# ptr + .4byte 0x8010AB08 ;# ptr + .4byte 0x8010A62C ;# ptr + .4byte 0x8010A97C ;# ptr + .4byte 0x8010A714 ;# ptr + .4byte 0x8010A908 ;# ptr + .4byte 0x8010A95C ;# ptr + .4byte 0x8010A964 ;# ptr + .4byte 0x8010A974 ;# ptr + .4byte 0x8010A708 ;# ptr + .4byte 0x8010A5D0 ;# ptr + .4byte 0x8010A96C ;# ptr + .4byte 0x8010A864 ;# ptr + .4byte 0x8010A7E8 ;# ptr + .4byte 0x8010A590 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010A7F8 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010AE94 ;# ptr + .4byte 0x8010A848 ;# ptr + .4byte 0x8010AB40 ;# ptr + .4byte 0x8010AAB8 ;# ptr + .4byte 0 .global __vt__Q44nw4r3snd6detail9MmlParser __vt__Q44nw4r3snd6detail9MmlParser: - .incbin "baserom.dol", 0x43E430, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8010A530 ;# ptr + .4byte 0x8010AEB0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$210407 $$210407: - .incbin "baserom.dol", 0x492E38, 0x4 + .4byte 0x54000000 .global $$210408 $$210408: - .incbin "baserom.dol", 0x492E3C, 0x4 + .4byte 0x47000000 .global $$210409 $$210409: - .incbin "baserom.dol", 0x492E40, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210403 $$210403: - .incbin "baserom.dol", 0x499E98, 0x4 + .4byte 0x3C000000 .global $$210404 $$210404: - .incbin "baserom.dol", 0x499E9C, 0x4 + .4byte 0x3EC80000 .global $$210405 $$210405: - .incbin "baserom.dol", 0x499EA0, 0x4 + .4byte 0x3C800000 .global $$210406 $$210406: - .incbin "baserom.dol", 0x499EA4, 0x4 + .4byte 0x42FE0000 .global $$210415 $$210415: - .incbin "baserom.dol", 0x499EA8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$210416 $$210416: - .incbin "baserom.dol", 0x499EB0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mPrintVarEnabledFlag__Q44nw4r3snd6detail9MmlParser diff --git a/asm/libnw4r_snd/snd_MmlSeqTrack.s b/asm/libnw4r_snd/snd_MmlSeqTrack.s index d759bab9..cd4ab784 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrack.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrack.s @@ -62,4 +62,7 @@ lbl_8010B11C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail11MmlSeqTrack __vt__Q44nw4r3snd6detail11MmlSeqTrack: - .incbin "baserom.dol", 0x43E440, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8010B0E0 ;# ptr + .4byte 0x8010B0C0 ;# ptr diff --git a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s index f72509a9..9ba4c943 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s @@ -98,4 +98,9 @@ __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator __vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator: - .incbin "baserom.dol", 0x43E450, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8010B250 ;# ptr + .4byte 0x8010B140 ;# ptr + .4byte 0x8010B1B0 ;# ptr + .4byte 0x8010B240 ;# ptr diff --git a/asm/libnw4r_snd/snd_PlayerHeap.s b/asm/libnw4r_snd/snd_PlayerHeap.s index 8f9f5890..0d8f7732 100644 --- a/asm/libnw4r_snd/snd_PlayerHeap.s +++ b/asm/libnw4r_snd/snd_PlayerHeap.s @@ -153,4 +153,7 @@ GetFreeSize__Q44nw4r3snd6detail10PlayerHeapCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10PlayerHeap __vt__Q44nw4r3snd6detail10PlayerHeap: - .incbin "baserom.dol", 0x43E468, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8010B290 ;# ptr + .4byte 0x8010B390 ;# ptr diff --git a/asm/libnw4r_snd/snd_SeqPlayer.s b/asm/libnw4r_snd/snd_SeqPlayer.s index ffaf16b0..24fa1b4a 100644 --- a/asm/libnw4r_snd/snd_SeqPlayer.s +++ b/asm/libnw4r_snd/snd_SeqPlayer.s @@ -1541,21 +1541,48 @@ $$2192$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9SeqPlayer __vt__Q44nw4r3snd6detail9SeqPlayer: - .incbin "baserom.dol", 0x43E478, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x8010C390 ;# ptr + .4byte 0x8010C960 ;# ptr + .4byte 0x8010C9D0 ;# ptr + .4byte 0x8010CB20 ;# ptr + .4byte 0x80109E50 ;# ptr + .4byte 0x80109E40 ;# ptr + .4byte 0x80109E30 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8010D6F0 ;# ptr + .4byte 0x80109E70 ;# ptr + .4byte 0x80109E60 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8010D700 ;# ptr + .4byte 0x80109E90 ;# ptr + .4byte 0x80109E20 ;# ptr + .4byte 0x80109E80 ;# ptr + .4byte 0x8010CD40 ;# ptr + .4byte 0x80109E10 ;# ptr + .4byte 0x8010D6E0 ;# ptr + .4byte 0x80109DF0 ;# ptr + .4byte 0x80109E00 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211283 $$211283: - .incbin "baserom.dol", 0x499EB8, 0x4 + .4byte 0x3F800000 .global $$211284 $$211284: - .incbin "baserom.dol", 0x499EBC, 0x4 + .4byte 0 .global $$211523 $$211523: - .incbin "baserom.dol", 0x499EC0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$211919 $$211919: - .incbin "baserom.dol", 0x499EC8, 0x8 + .4byte 0x476A6000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mGlobalVariable__Q44nw4r3snd6detail9SeqPlayer diff --git a/asm/libnw4r_snd/snd_SeqSound.s b/asm/libnw4r_snd/snd_SeqSound.s index 820aaa21..d4a73f4e 100644 --- a/asm/libnw4r_snd/snd_SeqSound.s +++ b/asm/libnw4r_snd/snd_SeqSound.s @@ -608,15 +608,33 @@ __sinit_$$3snd_SeqSound_cpp: /* 8010DF0C 00109D4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40239C, 0x4 + .4byte 0x8010DF00 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqSound __vt__Q44nw4r3snd6detail8SeqSound: - .incbin "baserom.dol", 0x43E4E0, 0x38 + .4byte 0 + .4byte 0 + .4byte 0x8010DEF0 ;# ptr + .4byte 0x8010DBA0 ;# ptr + .4byte 0x8010DAC0 ;# ptr + .4byte 0x8010DEE0 ;# ptr + .4byte 0x8010DD30 ;# ptr + .4byte 0x8010DD50 ;# ptr + .4byte 0x8010D810 ;# ptr + .4byte 0x8010DEC0 ;# ptr + .4byte 0x8010DED0 ;# ptr + .4byte 0x8010DC40 ;# ptr + .4byte 0x80106200 ;# ptr + .4byte 0x80106240 ;# ptr .global __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask: - .incbin "baserom.dol", 0x43E518, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8010D7B0 ;# ptr + .4byte 0x8010DD60 ;# ptr + .4byte 0x8010DE60 ;# ptr + .4byte 0x8010DE90 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail8SeqSound diff --git a/asm/libnw4r_snd/snd_SeqTrack.s b/asm/libnw4r_snd/snd_SeqTrack.s index acbdff39..45315357 100644 --- a/asm/libnw4r_snd/snd_SeqTrack.s +++ b/asm/libnw4r_snd/snd_SeqTrack.s @@ -1465,38 +1465,53 @@ lbl_8010F390: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29834 $$29834: - .incbin "baserom.dol", 0x407780, 0x28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8010ED20 ;# ptr + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqTrack __vt__Q44nw4r3snd6detail8SeqTrack: - .incbin "baserom.dol", 0x43E530, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8010E000 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210623 $$210623: - .incbin "baserom.dol", 0x499ED0, 0x4 + .4byte 0x3F800000 .global $$210624 $$210624: - .incbin "baserom.dol", 0x499ED4, 0x4 + .4byte 0 .global $$210956 $$210956: - .incbin "baserom.dol", 0x499ED8, 0x4 + .4byte 0x42FE0000 .global $$210957 $$210957: - .incbin "baserom.dol", 0x499EDC, 0x4 + .4byte 0x3C000000 .global $$210958 $$210958: - .incbin "baserom.dol", 0x499EE0, 0x4 + .4byte 0x427C0000 .global $$210959 $$210959: - .incbin "baserom.dol", 0x499EE4, 0x4 + .4byte 0xBF800000 .global $$210960 $$210960: - .incbin "baserom.dol", 0x499EE8, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$210964 $$210964: - .incbin "baserom.dol", 0x499EF0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$210965 $$210965: - .incbin "baserom.dol", 0x499EF8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_snd/snd_SoundActor.s b/asm/libnw4r_snd/snd_SoundActor.s index cae01b90..a4636edd 100644 --- a/asm/libnw4r_snd/snd_SoundActor.s +++ b/asm/libnw4r_snd/snd_SoundActor.s @@ -225,12 +225,19 @@ detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd10SoundActor __vt__Q34nw4r3snd10SoundActor: - .incbin "baserom.dol", 0x43E540, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8010F470 ;# ptr + .4byte 0x8010F630 ;# ptr + .4byte 0x8010F670 ;# ptr + .4byte 0x8010F5F0 ;# ptr + .4byte 0x8010F610 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211717 $$211717: - .incbin "baserom.dol", 0x499F00, 0x4 + .4byte 0x3F800000 .global $$211718 $$211718: - .incbin "baserom.dol", 0x499F04, 0x4 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_SoundArchive.s b/asm/libnw4r_snd/snd_SoundArchive.s index 8e792312..36ab04ee 100644 --- a/asm/libnw4r_snd/snd_SoundArchive.s +++ b/asm/libnw4r_snd/snd_SoundArchive.s @@ -514,4 +514,11 @@ lbl_8010FCD8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd12SoundArchive __vt__Q34nw4r3snd12SoundArchive: - .incbin "baserom.dol", 0x43E560, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8010F6D0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_SoundArchivePlayer.s b/asm/libnw4r_snd/snd_SoundArchivePlayer.s index 4561ac56..c0934729 100644 --- a/asm/libnw4r_snd/snd_SoundArchivePlayer.s +++ b/asm/libnw4r_snd/snd_SoundArchivePlayer.s @@ -2989,18 +2989,37 @@ $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd18SoundArchivePlayer __vt__Q34nw4r3snd18SoundArchivePlayer: - .incbin "baserom.dol", 0x43E580, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x80111500 ;# ptr + .4byte 0x801137F0 ;# ptr + .4byte 0x801138A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80113BA0 ;# ptr + .4byte 0x80113B90 ;# ptr + .4byte 0x80113B80 ;# ptr + .4byte 0x8010F690 ;# ptr + .4byte 0x801125C0 ;# ptr .global __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback: - .incbin "baserom.dol", 0x43E5B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80111490 ;# ptr + .4byte 0x80113A80 ;# ptr .global __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback: - .incbin "baserom.dol", 0x43E5C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80111480 ;# ptr + .4byte 0x80113950 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$218172 $$218172: - .incbin "baserom.dol", 0x499F08, 0x8 + .4byte 0x42FE0000 + .4byte 0 .global $$218180 $$218180: - .incbin "baserom.dol", 0x499F10, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_snd/snd_SoundHeap.s b/asm/libnw4r_snd/snd_SoundHeap.s index f1f8db66..65efc8a7 100644 --- a/asm/libnw4r_snd/snd_SoundHeap.s +++ b/asm/libnw4r_snd/snd_SoundHeap.s @@ -135,4 +135,7 @@ DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd9SoundHeap __vt__Q34nw4r3snd9SoundHeap: - .incbin "baserom.dol", 0x43E5D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80113CA0 ;# ptr + .4byte 0x80113D30 ;# ptr diff --git a/asm/libnw4r_snd/snd_SoundPlayer.s b/asm/libnw4r_snd/snd_SoundPlayer.s index 9d59d590..a131beb0 100644 --- a/asm/libnw4r_snd/snd_SoundPlayer.s +++ b/asm/libnw4r_snd/snd_SoundPlayer.s @@ -825,10 +825,10 @@ lbl_80114904: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25348 $$25348: - .incbin "baserom.dol", 0x499F18, 0x4 + .4byte 0x3F800000 .global $$25349 $$25349: - .incbin "baserom.dol", 0x499F1C, 0x4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$24229 diff --git a/asm/libnw4r_snd/snd_SoundSystem.s b/asm/libnw4r_snd/snd_SoundSystem.s index 0b3b8914..73bdb281 100644 --- a/asm/libnw4r_snd/snd_SoundSystem.s +++ b/asm/libnw4r_snd/snd_SoundSystem.s @@ -247,17 +247,19 @@ __sinit_$$3snd_SoundSystem_cpp: /* 80114CDC 00110B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023A0, 0x4 + .4byte 0x80114C90 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$24759 $$24759: - .incbin "baserom.dol", 0x43E5E0, 0x48 + .asciz "<< NW4R - SND \tfinal build: Mar 1 2011 13:31:44 (0x4302_188) >>" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_SND_Version_ NW4R_SND_Version_: - .incbin "baserom.dol", 0x492E48, 0x8 + .4byte 0x804424E0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$24760 diff --git a/asm/libnw4r_snd/snd_StrmPlayer.s b/asm/libnw4r_snd/snd_StrmPlayer.s index 55ce32c0..9c465906 100644 --- a/asm/libnw4r_snd/snd_StrmPlayer.s +++ b/asm/libnw4r_snd/snd_StrmPlayer.s @@ -3151,33 +3151,64 @@ $$2180$$2__dt__Q44nw4r3snd6detail10StrmPlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10StrmPlayer __vt__Q44nw4r3snd6detail10StrmPlayer: - .incbin "baserom.dol", 0x43E628, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x801160B0 ;# ptr + .4byte 0x80116540 ;# ptr + .4byte 0x801168A0 ;# ptr + .4byte 0x80116A70 ;# ptr + .4byte 0x80118A20 ;# ptr + .4byte 0x80118A10 ;# ptr + .4byte 0x80118A00 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80118A60 ;# ptr + .4byte 0x80118A50 ;# ptr + .4byte 0x80118A40 ;# ptr + .4byte 0x80118A30 ;# ptr + .4byte 0x801189D0 ;# ptr + .4byte 0x801189E0 ;# ptr + .4byte 0x801189F0 ;# ptr .global __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask: - .incbin "baserom.dol", 0x43E670, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801160A0 ;# ptr + .4byte 0x80118860 ;# ptr + .4byte 0x80118930 ;# ptr + .4byte 0x801189C0 ;# ptr .global __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask: - .incbin "baserom.dol", 0x43E688, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80116090 ;# ptr + .4byte 0x80118700 ;# ptr + .4byte 0x80118750 ;# ptr + .4byte 0x80118760 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211788 $$211788: - .incbin "baserom.dol", 0x499F20, 0x8 + .4byte 0 + .4byte 0 .global $$211793 $$211793: - .incbin "baserom.dol", 0x499F28, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$211794 $$211794: - .incbin "baserom.dol", 0x499F30, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$211836 $$211836: - .incbin "baserom.dol", 0x499F38, 0x4 + .4byte 0x3F800000 .global $$212109 $$212109: - .incbin "baserom.dol", 0x499F3C, 0x4 + .4byte 0x42FE0000 .global $$212110 $$212110: - .incbin "baserom.dol", 0x499F40, 0x8 + .4byte 0x427C0000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sLoadBuffer__Q44nw4r3snd6detail10StrmPlayer diff --git a/asm/libnw4r_snd/snd_StrmSound.s b/asm/libnw4r_snd/snd_StrmSound.s index de8bbdba..a5c7320d 100644 --- a/asm/libnw4r_snd/snd_StrmSound.s +++ b/asm/libnw4r_snd/snd_StrmSound.s @@ -503,23 +503,37 @@ __sinit_$$3snd_StrmSound_cpp: /* 8011911C 00114F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023A4, 0x4 + .4byte 0x80119110 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9StrmSound __vt__Q44nw4r3snd6detail9StrmSound: - .incbin "baserom.dol", 0x43E6A0, 0x38 + .4byte 0 + .4byte 0 + .4byte 0x80119100 ;# ptr + .4byte 0x80118F50 ;# ptr + .4byte 0x80118EB0 ;# ptr + .4byte 0x801190F0 ;# ptr + .4byte 0x801190A0 ;# ptr + .4byte 0x801190C0 ;# ptr + .4byte 0x80118B30 ;# ptr + .4byte 0x801190D0 ;# ptr + .4byte 0x801190E0 ;# ptr + .4byte 0x80118FB0 ;# ptr + .4byte 0x80118D50 ;# ptr + .4byte 0x80118DD0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210414 $$210414: - .incbin "baserom.dol", 0x499F48, 0x4 + .4byte 0 .global $$210443 $$210443: - .incbin "baserom.dol", 0x499F4C, 0x4 + .4byte 0x3F800000 .global $$210446 $$210446: - .incbin "baserom.dol", 0x499F50, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail9StrmSound diff --git a/asm/libnw4r_snd/snd_Util.s b/asm/libnw4r_snd/snd_Util.s index e6fe8957..c26924a8 100644 --- a/asm/libnw4r_snd/snd_Util.s +++ b/asm/libnw4r_snd/snd_Util.s @@ -388,73 +388,2405 @@ lbl_8011D140: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global NoteTable__Q44nw4r3snd6detail4Util NoteTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x4077A8, 0x30 + .4byte 0x3F800000 + .4byte 0x3F879C7D + .4byte 0x3F8FACD6 + .4byte 0x3F9837F0 + .4byte 0x3FA14518 + .4byte 0x3FAADC08 + .4byte 0x3FB504F3 + .4byte 0x3FBFC887 + .4byte 0x3FCB2FF5 + .4byte 0x3FD744FD + .4byte 0x3FE411F0 + .4byte 0x3FF1A1BF .global PitchTable__Q44nw4r3snd6detail4Util PitchTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x4077D8, 0x400 + .4byte 0x3F800000 + .4byte 0x3F800765 + .4byte 0x3F800ECA + .4byte 0x3F801630 + .4byte 0x3F801D96 + .4byte 0x3F8024FD + .4byte 0x3F802C64 + .4byte 0x3F8033CC + .4byte 0x3F803B34 + .4byte 0x3F80429C + .4byte 0x3F804A05 + .4byte 0x3F80516E + .4byte 0x3F8058D8 + .4byte 0x3F806042 + .4byte 0x3F8067AC + .4byte 0x3F806F17 + .4byte 0x3F807683 + .4byte 0x3F807DEF + .4byte 0x3F80855B + .4byte 0x3F808CC8 + .4byte 0x3F809435 + .4byte 0x3F809BA2 + .4byte 0x3F80A310 + .4byte 0x3F80AA7E + .4byte 0x3F80B1ED + .4byte 0x3F80B95D + .4byte 0x3F80C0CC + .4byte 0x3F80C83C + .4byte 0x3F80CFAD + .4byte 0x3F80D71E + .4byte 0x3F80DE8F + .4byte 0x3F80E601 + .4byte 0x3F80ED73 + .4byte 0x3F80F4E6 + .4byte 0x3F80FC59 + .4byte 0x3F8103CD + .4byte 0x3F810B41 + .4byte 0x3F8112B5 + .4byte 0x3F811A2A + .4byte 0x3F81219F + .4byte 0x3F812915 + .4byte 0x3F81308B + .4byte 0x3F813802 + .4byte 0x3F813F79 + .4byte 0x3F8146F0 + .4byte 0x3F814E68 + .4byte 0x3F8155E0 + .4byte 0x3F815D59 + .4byte 0x3F8164D2 + .4byte 0x3F816C4C + .4byte 0x3F8173C6 + .4byte 0x3F817B40 + .4byte 0x3F8182BB + .4byte 0x3F818A36 + .4byte 0x3F8191B2 + .4byte 0x3F81992E + .4byte 0x3F81A0AB + .4byte 0x3F81A828 + .4byte 0x3F81AFA5 + .4byte 0x3F81B723 + .4byte 0x3F81BEA1 + .4byte 0x3F81C620 + .4byte 0x3F81CD9F + .4byte 0x3F81D51F + .4byte 0x3F81DC9F + .4byte 0x3F81E420 + .4byte 0x3F81EBA1 + .4byte 0x3F81F322 + .4byte 0x3F81FAA4 + .4byte 0x3F820226 + .4byte 0x3F8209A9 + .4byte 0x3F82112C + .4byte 0x3F8218AF + .4byte 0x3F822033 + .4byte 0x3F8227B8 + .4byte 0x3F822F3C + .4byte 0x3F8236C2 + .4byte 0x3F823E47 + .4byte 0x3F8245CE + .4byte 0x3F824D54 + .4byte 0x3F8254DB + .4byte 0x3F825C63 + .4byte 0x3F8263EB + .4byte 0x3F826B73 + .4byte 0x3F8272FC + .4byte 0x3F827A85 + .4byte 0x3F82820E + .4byte 0x3F828998 + .4byte 0x3F829123 + .4byte 0x3F8298AE + .4byte 0x3F82A039 + .4byte 0x3F82A7C5 + .4byte 0x3F82AF51 + .4byte 0x3F82B6DE + .4byte 0x3F82BE6B + .4byte 0x3F82C5F9 + .4byte 0x3F82CD87 + .4byte 0x3F82D515 + .4byte 0x3F82DCA4 + .4byte 0x3F82E433 + .4byte 0x3F82EBC3 + .4byte 0x3F82F353 + .4byte 0x3F82FAE4 + .4byte 0x3F830275 + .4byte 0x3F830A06 + .4byte 0x3F831198 + .4byte 0x3F83192A + .4byte 0x3F8320BD + .4byte 0x3F832850 + .4byte 0x3F832FE4 + .4byte 0x3F833778 + .4byte 0x3F833F0D + .4byte 0x3F8346A2 + .4byte 0x3F834E37 + .4byte 0x3F8355CD + .4byte 0x3F835D63 + .4byte 0x3F8364FA + .4byte 0x3F836C91 + .4byte 0x3F837429 + .4byte 0x3F837BC1 + .4byte 0x3F838359 + .4byte 0x3F838AF2 + .4byte 0x3F83928C + .4byte 0x3F839A25 + .4byte 0x3F83A1C0 + .4byte 0x3F83A95A + .4byte 0x3F83B0F5 + .4byte 0x3F83B891 + .4byte 0x3F83C02D + .4byte 0x3F83C7C9 + .4byte 0x3F83CF66 + .4byte 0x3F83D704 + .4byte 0x3F83DEA1 + .4byte 0x3F83E640 + .4byte 0x3F83EDDE + .4byte 0x3F83F57D + .4byte 0x3F83FD1D + .4byte 0x3F8404BD + .4byte 0x3F840C5D + .4byte 0x3F8413FE + .4byte 0x3F841B9F + .4byte 0x3F842341 + .4byte 0x3F842AE3 + .4byte 0x3F843286 + .4byte 0x3F843A29 + .4byte 0x3F8441CC + .4byte 0x3F844970 + .4byte 0x3F845115 + .4byte 0x3F8458B9 + .4byte 0x3F84605F + .4byte 0x3F846804 + .4byte 0x3F846FAA + .4byte 0x3F847751 + .4byte 0x3F847EF8 + .4byte 0x3F84869F + .4byte 0x3F848E47 + .4byte 0x3F8495F0 + .4byte 0x3F849D98 + .4byte 0x3F84A542 + .4byte 0x3F84ACEB + .4byte 0x3F84B495 + .4byte 0x3F84BC40 + .4byte 0x3F84C3EB + .4byte 0x3F84CB96 + .4byte 0x3F84D342 + .4byte 0x3F84DAEF + .4byte 0x3F84E29B + .4byte 0x3F84EA49 + .4byte 0x3F84F1F6 + .4byte 0x3F84F9A4 + .4byte 0x3F850153 + .4byte 0x3F850902 + .4byte 0x3F8510B1 + .4byte 0x3F851861 + .4byte 0x3F852012 + .4byte 0x3F8527C2 + .4byte 0x3F852F74 + .4byte 0x3F853725 + .4byte 0x3F853ED7 + .4byte 0x3F85468A + .4byte 0x3F854E3D + .4byte 0x3F8555F0 + .4byte 0x3F855DA4 + .4byte 0x3F856558 + .4byte 0x3F856D0D + .4byte 0x3F8574C2 + .4byte 0x3F857C78 + .4byte 0x3F85842E + .4byte 0x3F858BE5 + .4byte 0x3F85939C + .4byte 0x3F859B53 + .4byte 0x3F85A30B + .4byte 0x3F85AAC3 + .4byte 0x3F85B27C + .4byte 0x3F85BA35 + .4byte 0x3F85C1EF + .4byte 0x3F85C9A9 + .4byte 0x3F85D164 + .4byte 0x3F85D91F + .4byte 0x3F85E0DA + .4byte 0x3F85E896 + .4byte 0x3F85F052 + .4byte 0x3F85F80F + .4byte 0x3F85FFCC + .4byte 0x3F86078A + .4byte 0x3F860F48 + .4byte 0x3F861707 + .4byte 0x3F861EC6 + .4byte 0x3F862685 + .4byte 0x3F862E45 + .4byte 0x3F863606 + .4byte 0x3F863DC7 + .4byte 0x3F864588 + .4byte 0x3F864D4A + .4byte 0x3F86550C + .4byte 0x3F865CCE + .4byte 0x3F866491 + .4byte 0x3F866C55 + .4byte 0x3F867419 + .4byte 0x3F867BDD + .4byte 0x3F8683A2 + .4byte 0x3F868B67 + .4byte 0x3F86932D + .4byte 0x3F869AF3 + .4byte 0x3F86A2BA + .4byte 0x3F86AA81 + .4byte 0x3F86B249 + .4byte 0x3F86BA11 + .4byte 0x3F86C1D9 + .4byte 0x3F86C9A2 + .4byte 0x3F86D16B + .4byte 0x3F86D935 + .4byte 0x3F86E0FF + .4byte 0x3F86E8CA + .4byte 0x3F86F095 + .4byte 0x3F86F861 + .4byte 0x3F87002D + .4byte 0x3F8707F9 + .4byte 0x3F870FC6 + .4byte 0x3F871794 + .4byte 0x3F871F62 + .4byte 0x3F872730 + .4byte 0x3F872EFF + .4byte 0x3F8736CE + .4byte 0x3F873E9E + .4byte 0x3F87466E + .4byte 0x3F874E3E + .4byte 0x3F87560F + .4byte 0x3F875DE1 + .4byte 0x3F8765B3 + .4byte 0x3F876D85 + .4byte 0x3F877558 + .4byte 0x3F877D2B + .4byte 0x3F8784FF + .4byte 0x3F878CD3 + .4byte 0x3F8794A8 .global Decibel2RatioTable__Q44nw4r3snd6detail4Util Decibel2RatioTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x407BD8, 0xF14 + .4byte 0 + .4byte 0x380021F4 + .4byte 0x38019DD8 + .4byte 0x38031E07 + .4byte 0x3804A2B9 + .4byte 0x38062BED + .4byte 0x3807B9A4 + .4byte 0x38094BF9 + .4byte 0x380AE2EC + .4byte 0x380C7E98 + .4byte 0x380E1F19 + .4byte 0x380FC46F + .4byte 0x38116E9A + .4byte 0x38131DB6 + .4byte 0x3814D1C1 + .4byte 0x38168AF5 + .4byte 0x38184934 + .4byte 0x381A0C9B + .4byte 0x381BD544 + .4byte 0x381DA331 + .4byte 0x381F767C + .4byte 0x38214F40 + .4byte 0x38232D64 + .4byte 0x3825111C + .4byte 0x3826FA6A + .4byte 0x3828E969 + .4byte 0x382ADE18 + .4byte 0x382CD8B0 + .4byte 0x382ED8F8 + .4byte 0x3830DF5F + .4byte 0x3832EBAE + .4byte 0x3834FE00 + .4byte 0x3837168C + .4byte 0x38393538 + .4byte 0x383B5A54 + .4byte 0x383D85AB + .4byte 0x383FB773 + .4byte 0x3841EFC8 + .4byte 0x38442EAA + .4byte 0x38467434 + .4byte 0x3848C081 + .4byte 0x384B1393 + .4byte 0x384D6D9F + .4byte 0x384FCE8A + .4byte 0x3852368B + .4byte 0x3854A5BE + .4byte 0x38571C08 + .4byte 0x385999BA + .4byte 0x385C1EB9 + .4byte 0x385EAB3C + .4byte 0x38613F5F + .4byte 0x3863DB06 + .4byte 0x38667E84 + .4byte 0x386929BD + .4byte 0x386BDCE8 + .4byte 0x386E9820 + .4byte 0x38715B66 + .4byte 0x387426D5 + .4byte 0x3876FAA5 + .4byte 0x3879D6B8 + .4byte 0x387CBB63 + .4byte 0x387FA889 + .4byte 0x38814F31 + .4byte 0x3882CE85 + .4byte 0x3884523F + .4byte 0x3885DA7C + .4byte 0x38876749 + .4byte 0x3888F8B4 + .4byte 0x388A8EAF + .4byte 0x388C2972 + .4byte 0x388DC8EE + .4byte 0x388F6D3F + .4byte 0x38911665 + .4byte 0x3892C47B + .4byte 0x38947790 + .4byte 0x38962FA2 + .4byte 0x3897ECDD + .4byte 0x3899AF3E + .4byte 0x389B76C7 + .4byte 0x389D43A1 + .4byte 0x389F15D9 + .4byte 0x38A0ED61 + .4byte 0x38A2CA72 + .4byte 0x38A4AD09 + .4byte 0x38A69529 + .4byte 0x38A882F9 + .4byte 0x38AA7688 + .4byte 0x38AC6FD6 + .4byte 0x38AE6EFD + .4byte 0x38B0740D + .4byte 0x38B27F20 + .4byte 0x38B49043 + .4byte 0x38B6A786 + .4byte 0x38B8C4F5 + .4byte 0x38BAE8AC + .4byte 0x38BD12B9 + .4byte 0x38BF4338 + .4byte 0x38C17A27 + .4byte 0x38C3B7B1 + .4byte 0x38C5FBE4 + .4byte 0x38C846CC + .4byte 0x38CA9878 + .4byte 0x38CCF103 + .4byte 0x38CF5089 + .4byte 0x38D1B717 + .4byte 0x38D424CA + .4byte 0x38D69977 + .4byte 0x38D915A8 + .4byte 0x38DB995D + .4byte 0x38DE240D + .4byte 0x38E0B6CB + .4byte 0x38E3510C + .4byte 0x38E5F2D2 + .4byte 0x38E89C1C + .4byte 0x38EB4DFD + .4byte 0x38EE0763 + .4byte 0x38F0C8D5 + .4byte 0x38F392DF + .4byte 0x38F664F7 + .4byte 0x38F93F1C + .4byte 0x38FC21D8 + .4byte 0x38FF0DB4 + .4byte 0x390100CF + .4byte 0x39027F10 + .4byte 0x39040225 + .4byte 0x39058941 + .4byte 0x39071533 + .4byte 0x3908A5B4 + .4byte 0x390A3AC6 + .4byte 0x390BD468 + .4byte 0x390D72DF + .4byte 0x390F162A + .4byte 0x3910BE4B + .4byte 0x39126B86 + .4byte 0x39141D95 + .4byte 0x3915D479 + .4byte 0x391790BC + .4byte 0x39195218 + .4byte 0x391B188F + .4byte 0x391CE463 + .4byte 0x391EB551 + .4byte 0x39208BE2 + .4byte 0x392267D2 + .4byte 0x39244920 + .4byte 0x39263011 + .4byte 0x39281CEA + .4byte 0x392A0F21 + .4byte 0x392C0741 + .4byte 0x392E0548 + .4byte 0x393008F2 + .4byte 0x393212C8 + .4byte 0x393422CC + .4byte 0x393638B7 + .4byte 0x393854CE + .4byte 0x393A7757 + .4byte 0x393CA00D + .4byte 0x393ECF33 + .4byte 0x394104CB + .4byte 0x39434119 + .4byte 0x394583D8 + .4byte 0x3947CD4D + .4byte 0x394A1D79 + .4byte 0x394C749E + .4byte 0x394ED2BF + .4byte 0x395137DA + .4byte 0x3953A435 + .4byte 0x3956178A + .4byte 0x3958921F + .4byte 0x395B1438 + .4byte 0x395D9D91 + .4byte 0x39602E6D + .4byte 0x3962C713 + .4byte 0x3965673C + .4byte 0x39680F2F + .4byte 0x396ABF2F + .4byte 0x396D76F8 + .4byte 0x39703713 + .4byte 0x3972FEF7 + .4byte 0x3975CF72 + .4byte 0x3978A7FB + .4byte 0x397B891A + .4byte 0x397E72D1 + .4byte 0x3980B28F + .4byte 0x39823002 + .4byte 0x3983B204 + .4byte 0x39853852 + .4byte 0x3986C353 + .4byte 0x398852C2 + .4byte 0x3989E6E3 + .4byte 0x398B7FB7 + .4byte 0x398D1D1B + .4byte 0x398EBF76 + .4byte 0x399066A6 + .4byte 0x399212AB + .4byte 0x3993C3A8 + .4byte 0x399579BE + .4byte 0x399734CC + .4byte 0x3998F515 + .4byte 0x399ABA78 + .4byte 0x399C8518 + .4byte 0x399E5515 + .4byte 0x39A02A71 + .4byte 0x39A2054E + .4byte 0x39A3E589 + .4byte 0x39A5CB67 + .4byte 0x39A7B6E9 + .4byte 0x39A9A80D + .4byte 0x39AB9EF7 + .4byte 0x39AD9BA7 + .4byte 0x39AF9E3E + .4byte 0x39B1A6DF + .4byte 0x39B3B58B + .4byte 0x39B5CA41 + .4byte 0x39B7E523 + .4byte 0x39BA0632 + .4byte 0x39BC2DB2 + .4byte 0x39BE5B81 + .4byte 0x39C08FC1 + .4byte 0x39C2CA95 + .4byte 0x39C50BFD + .4byte 0x39C7541B + .4byte 0x39C9A310 + .4byte 0x39CBF8BC + .4byte 0x39CE5563 + .4byte 0x39D0B904 + .4byte 0x39D323C3 + .4byte 0x39D5959E + .4byte 0x39D80EDB + .4byte 0x39DA8F36 + .4byte 0x39DD1737 + .4byte 0x39DFA699 + .4byte 0x39E23D80 + .4byte 0x39E4DC30 + .4byte 0x39E78286 + .4byte 0x39EA30E9 + .4byte 0x39ECE716 + .4byte 0x39EFA550 + .4byte 0x39F26BBA + .4byte 0x39F53A54 + .4byte 0x39F81141 + .4byte 0x39FAF0A2 + .4byte 0x39FDD877 + .4byte 0x3A006483 + .4byte 0x3A01E116 + .4byte 0x3A036217 + .4byte 0x3A04E797 + .4byte 0x3A067185 + .4byte 0x3A080014 + .4byte 0x3A099334 + .4byte 0x3A0B2B06 + .4byte 0x3A0CC79C + .4byte 0x3A0E68E4 + .4byte 0x3A100F12 + .4byte 0x3A11BA16 + .4byte 0x3A136A11 + .4byte 0x3A151F14 + .4byte 0x3A16D920 + .4byte 0x3A189845 + .4byte 0x3A1A5CA7 + .4byte 0x3A1C2633 + .4byte 0x3A1DF51E + .4byte 0x3A1FC956 + .4byte 0x3A21A2FD + .4byte 0x3A238226 + .4byte 0x3A2566CF + .4byte 0x3A27511B + .4byte 0x3A29411B + .4byte 0x3A2B36E1 + .4byte 0x3A2D325B + .4byte 0x3A2F33CE + .4byte 0x3A313B29 + .4byte 0x3A33488F + .4byte 0x3A355BFE + .4byte 0x3A37759A + .4byte 0x3A399574 + .4byte 0x3A3BBB8B + .4byte 0x3A3DE814 + .4byte 0x3A401B0E + .4byte 0x3A425479 + .4byte 0x3A449489 + .4byte 0x3A46DB4F + .4byte 0x3A4928BA + .4byte 0x3A4B7D0E + .4byte 0x3A4DD84C + .4byte 0x3A503A73 + .4byte 0x3A52A3B8 + .4byte 0x3A55142A + .4byte 0x3A578BCB + .4byte 0x3A5A0ABD + .4byte 0x3A5C9110 + .4byte 0x3A5F1EE7 + .4byte 0x3A61B454 + .4byte 0x3A645168 + .4byte 0x3A66F633 + .4byte 0x3A69A2D8 + .4byte 0x3A6C5768 + .4byte 0x3A6F1406 + .4byte 0x3A71D8B1 + .4byte 0x3A74A59E + .4byte 0x3A777ADC + .4byte 0x3A7A587F + .4byte 0x3A7D3E96 + .4byte 0x3A8016A2 + .4byte 0x3A819256 + .4byte 0x3A83126F + .4byte 0x3A8496F5 + .4byte 0x3A862004 + .4byte 0x3A87AD9A + .4byte 0x3A893FD2 + .4byte 0x3A8AD6AB + .4byte 0x3A8C7236 + .4byte 0x3A8E128E + .4byte 0x3A8FB7B2 + .4byte 0x3A9161BD + .4byte 0x3A9310AD + .4byte 0x3A94C4A6 + .4byte 0x3A967DA8 + .4byte 0x3A983BC3 + .4byte 0x3A99FF09 + .4byte 0x3A9BC782 + .4byte 0x3A9D9549 + .4byte 0x3A9F686E + .4byte 0x3AA140FA + .4byte 0x3AA31EFE + .4byte 0x3AA50283 + .4byte 0x3AA6EBAB + .4byte 0x3AA8DA7F + .4byte 0x3AAACF07 + .4byte 0x3AACC95D + .4byte 0x3AAEC98A + .4byte 0x3AB0CFB0 + .4byte 0x3AB2DBCF + .4byte 0x3AB4EE00 + .4byte 0x3AB70656 + .4byte 0x3AB924E9 + .4byte 0x3ABB49BA + .4byte 0x3ABD74EB + .4byte 0x3ABFA685 + .4byte 0x3AC1DEA1 + .4byte 0x3AC41D59 + .4byte 0x3AC662AE + .4byte 0x3AC8AEC1 + .4byte 0x3ACB01AD + .4byte 0x3ACD5B71 + .4byte 0x3ACFBC2F + .4byte 0x3AD223FA + .4byte 0x3AD492EA + .4byte 0x3AD70911 + .4byte 0x3AD98680 + .4byte 0x3ADC0B51 + .4byte 0x3ADE979D + .4byte 0x3AE12B6D + .4byte 0x3AE3C6ED + .4byte 0x3AE66A24 + .4byte 0x3AE91524 + .4byte 0x3AEBC818 + .4byte 0x3AEE8309 + .4byte 0x3AF1460F + .4byte 0x3AF41146 + .4byte 0x3AF6E4C6 + .4byte 0x3AF9C0A9 + .4byte 0x3AFCA502 + .4byte 0x3AFF91F1 + .4byte 0x3B0143C4 + .4byte 0x3B02C2F1 + .4byte 0x3B044690 + .4byte 0x3B05CEAE + .4byte 0x3B075B54 + .4byte 0x3B08EC92 + .4byte 0x3B0A8276 + .4byte 0x3B0C1D0D + .4byte 0x3B0DBC67 + .4byte 0x3B0F608E + .4byte 0x3B110993 + .4byte 0x3B12B781 + .4byte 0x3B146A6C + .4byte 0x3B162263 + .4byte 0x3B17DF70 + .4byte 0x3B19A1A3 + .4byte 0x3B1B690E + .4byte 0x3B1D35BD + .4byte 0x3B1F07C3 + .4byte 0x3B20DF2F + .4byte 0x3B22BC0F + .4byte 0x3B249E74 + .4byte 0x3B268674 + .4byte 0x3B287417 + .4byte 0x3B2A6772 + .4byte 0x3B2C6093 + .4byte 0x3B2E5F8F + .4byte 0x3B306477 + .4byte 0x3B326F58 + .4byte 0x3B34804B + .4byte 0x3B36975B + .4byte 0x3B38B49F + .4byte 0x3B3AD825 + .4byte 0x3B3D0207 + .4byte 0x3B3F324E + .4byte 0x3B416912 + .4byte 0x3B43A66A + .4byte 0x3B45EA63 + .4byte 0x3B483512 + .4byte 0x3B4A868C + .4byte 0x3B4CDEE7 + .4byte 0x3B4F3E39 + .4byte 0x3B51A48D + .4byte 0x3B541204 + .4byte 0x3B5686A8 + .4byte 0x3B590294 + .4byte 0x3B5B85DE + .4byte 0x3B5E10A0 + .4byte 0x3B60A2E5 + .4byte 0x3B633CCC + .4byte 0x3B65DE67 + .4byte 0x3B6887CF + .4byte 0x3B6B391A + .4byte 0x3B6DF266 + .4byte 0x3B70B3BF + .4byte 0x3B737D43 + .4byte 0x3B764F0D + .4byte 0x3B792932 + .4byte 0x3B7C0BCC + .4byte 0x3B7EF6F0 + .4byte 0x3B80F560 + .4byte 0x3B8273A7 + .4byte 0x3B83F65A + .4byte 0x3B857D89 + .4byte 0x3B87093E + .4byte 0x3B88998A + .4byte 0x3B8A2E77 + .4byte 0x3B8BC815 + .4byte 0x3B8D6672 + .4byte 0x3B8F0999 + .4byte 0x3B90B19C + .4byte 0x3B925E89 + .4byte 0x3B94106C + .4byte 0x3B95C756 + .4byte 0x3B978354 + .4byte 0x3B994477 + .4byte 0x3B9B0ACF + .4byte 0x3B9CD667 + .4byte 0x3B9EA753 + .4byte 0x3BA07DA0 + .4byte 0x3BA25960 + .4byte 0x3BA43AA1 + .4byte 0x3BA62176 + .4byte 0x3BA80DEF + .4byte 0x3BAA0019 + .4byte 0x3BABF80B + .4byte 0x3BADF5D0 + .4byte 0x3BAFF97E + .4byte 0x3BB20323 + .4byte 0x3BB412D5 + .4byte 0x3BB628A2 + .4byte 0x3BB8449B + .4byte 0x3BBA66D7 + .4byte 0x3BBC8F66 + .4byte 0x3BBEBE5B + .4byte 0x3BC0F3CA + .4byte 0x3BC32FC2 + .4byte 0x3BC5725D + .4byte 0x3BC7BBA9 + .4byte 0x3BCA0BBD + .4byte 0x3BCC62AB + .4byte 0x3BCEC089 + .4byte 0x3BD1256C + .4byte 0x3BD39166 + .4byte 0x3BD60491 + .4byte 0x3BD87EFB + .4byte 0x3BDB00C0 + .4byte 0x3BDD89F4 + .4byte 0x3BE01AAA + .4byte 0x3BE2B2FE + .4byte 0x3BE55301 + .4byte 0x3BE7FACC + .4byte 0x3BEAAA76 + .4byte 0x3BED6219 + .4byte 0x3BF021C6 + .4byte 0x3BF2E99B + .4byte 0x3BF5B9AF + .4byte 0x3BF8921A + .4byte 0x3BFB72F3 + .4byte 0x3BFE5C54 + .4byte 0x3C00A72B + .4byte 0x3C02248A + .4byte 0x3C03A654 + .4byte 0x3C052C95 + .4byte 0x3C06B75B + .4byte 0x3C0846B4 + .4byte 0x3C09DAAB + .4byte 0x3C0B7351 + .4byte 0x3C0D10B3 + .4byte 0x3C0EB2DC + .4byte 0x3C1059DF + .4byte 0x3C1205C6 + .4byte 0x3C13B6A2 + .4byte 0x3C156C81 + .4byte 0x3C172773 + .4byte 0x3C18E786 + .4byte 0x3C1AACC9 + .4byte 0x3C1C774B + .4byte 0x3C1E471D + .4byte 0x3C201C4D + .4byte 0x3C21F6EC + .4byte 0x3C23D70A + .4byte 0x3C25BCB8 + .4byte 0x3C27A805 + .4byte 0x3C299903 + .4byte 0x3C2B8FC1 + .4byte 0x3C2D8C52 + .4byte 0x3C2F8EC7 + .4byte 0x3C319730 + .4byte 0x3C33A5A1 + .4byte 0x3C35BA2A + .4byte 0x3C37D4DE + .4byte 0x3C39F5CE + .4byte 0x3C3C1D0D + .4byte 0x3C3E4AAF + .4byte 0x3C407EC7 + .4byte 0x3C42B965 + .4byte 0x3C44FAA0 + .4byte 0x3C47428A + .4byte 0x3C499137 + .4byte 0x3C4BE6BA + .4byte 0x3C4E4329 + .4byte 0x3C50A697 + .4byte 0x3C53111B + .4byte 0x3C5582C7 + .4byte 0x3C57FBB2 + .4byte 0x3C5A7BF1 + .4byte 0x3C5D039B + .4byte 0x3C5F92C3 + .4byte 0x3C622984 + .4byte 0x3C64C7F0 + .4byte 0x3C676E1E + .4byte 0x3C6A1C28 + .4byte 0x3C6CD224 + .4byte 0x3C6F9028 + .4byte 0x3C72564E + .4byte 0x3C7524AC + .4byte 0x3C77FB5C + .4byte 0x3C7ADA77 + .4byte 0x3C7DC214 + .4byte 0x3C805927 + .4byte 0x3C81D59F + .4byte 0x3C83567E + .4byte 0x3C84DBD3 + .4byte 0x3C8665A9 + .4byte 0x3C87F40F + .4byte 0x3C898712 + .4byte 0x3C8B1EC0 + .4byte 0x3C8CBB26 + .4byte 0x3C8E5C53 + .4byte 0x3C900254 + .4byte 0x3C91AD39 + .4byte 0x3C935D0F + .4byte 0x3C9511E5 + .4byte 0x3C96CBC9 + .4byte 0x3C988ACC + .4byte 0x3C9A4EFC + .4byte 0x3C9C1868 + .4byte 0x3C9DE721 + .4byte 0x3C9FBB34 + .4byte 0x3CA194B4 + .4byte 0x3CA373AF + .4byte 0x3CA55836 + .4byte 0x3CA74259 + .4byte 0x3CA9322A + .4byte 0x3CAB27B7 + .4byte 0x3CAD2314 + .4byte 0x3CAF2451 + .4byte 0x3CB12B7F + .4byte 0x3CB338B0 + .4byte 0x3CB54BF6 + .4byte 0x3CB76562 + .4byte 0x3CB98509 + .4byte 0x3CBBAAFA + .4byte 0x3CBDD74A + .4byte 0x3CC00A0B + .4byte 0x3CC24350 + .4byte 0x3CC4832C + .4byte 0x3CC6C9B4 + .4byte 0x3CC916FA + .4byte 0x3CCB6B13 + .4byte 0x3CCDC613 + .4byte 0x3CD0280F + .4byte 0x3CD2911B + .4byte 0x3CD5014D + .4byte 0x3CD778B8 + .4byte 0x3CD9F773 + .4byte 0x3CDC7D93 + .4byte 0x3CDF0B2F + .4byte 0x3CE1A05D + .4byte 0x3CE43D32 + .4byte 0x3CE6E1C6 + .4byte 0x3CE98E30 + .4byte 0x3CEC4286 + .4byte 0x3CEEFEE1 + .4byte 0x3CF1C358 + .4byte 0x3CF49003 + .4byte 0x3CF764FA + .4byte 0x3CFA4257 + .4byte 0x3CFD2831 + .4byte 0x3D000B51 + .4byte 0x3D0186E3 + .4byte 0x3D0306D9 + .4byte 0x3D048B41 + .4byte 0x3D061429 + .4byte 0x3D07A19D + .4byte 0x3D0933AC + .4byte 0x3D0ACA63 + .4byte 0x3D0C65CF + .4byte 0x3D0E05FE + .4byte 0x3D0FAB00 + .4byte 0x3D1154E1 + .4byte 0x3D1303B1 + .4byte 0x3D14B77E + .4byte 0x3D167057 + .4byte 0x3D182E4B + .4byte 0x3D19F168 + .4byte 0x3D1BB9BF + .4byte 0x3D1D875F + .4byte 0x3D1F5A57 + .4byte 0x3D2132B8 + .4byte 0x3D231090 + .4byte 0x3D24F3F1 + .4byte 0x3D26DCEB + .4byte 0x3D28CB8F + .4byte 0x3D2ABFEC + .4byte 0x3D2CBA15 + .4byte 0x3D2EBA1B + .4byte 0x3D30C00E + .4byte 0x3D32CC01 + .4byte 0x3D34DE05 + .4byte 0x3D36F62B + .4byte 0x3D391488 + .4byte 0x3D3B392C + .4byte 0x3D3D642A + .4byte 0x3D3F9596 + .4byte 0x3D41CD81 + .4byte 0x3D440C01 + .4byte 0x3D465127 + .4byte 0x3D489D08 + .4byte 0x3D4AEFB8 + .4byte 0x3D4D494A + .4byte 0x3D4FA9D4 + .4byte 0x3D52116A + .4byte 0x3D548021 + .4byte 0x3D56F60D + .4byte 0x3D597345 + .4byte 0x3D5BF7DE + .4byte 0x3D5E83ED + .4byte 0x3D611789 + .4byte 0x3D63B2C9 + .4byte 0x3D6655C3 + .4byte 0x3D69008E + .4byte 0x3D6BB340 + .4byte 0x3D6E6DF2 + .4byte 0x3D7130BC + .4byte 0x3D73FBB4 + .4byte 0x3D76CEF4 + .4byte 0x3D79AA94 + .4byte 0x3D7C8EAC + .4byte 0x3D7F7B57 + .4byte 0x3D813856 + .4byte 0x3D82B764 + .4byte 0x3D843AE0 + .4byte 0x3D85C2DA + .4byte 0x3D874F5D + .4byte 0x3D88E078 + .4byte 0x3D8A7638 + .4byte 0x3D8C10AB + .4byte 0x3D8DAFDE + .4byte 0x3D8F53E0 + .4byte 0x3D90FCBF + .4byte 0x3D92AA8A + .4byte 0x3D945D4F + .4byte 0x3D96151C + .4byte 0x3D97D202 + .4byte 0x3D99940E + .4byte 0x3D9B5B50 + .4byte 0x3D9D27D8 + .4byte 0x3D9EF9B4 + .4byte 0x3DA0D0F6 + .4byte 0x3DA2ADAD + .4byte 0x3DA48FE9 + .4byte 0x3DA677BB + .4byte 0x3DA86532 + .4byte 0x3DAA5860 + .4byte 0x3DAC5156 + .4byte 0x3DAE5025 + .4byte 0x3DB054DE + .4byte 0x3DB25F93 + .4byte 0x3DB47056 + .4byte 0x3DB68738 + .4byte 0x3DB8A44B + .4byte 0x3DBAC7A2 + .4byte 0x3DBCF150 + .4byte 0x3DBF2167 + .4byte 0x3DC157FB + .4byte 0x3DC3951E + .4byte 0x3DC5D8E3 + .4byte 0x3DC82360 + .4byte 0x3DCA74A7 + .4byte 0x3DCCCCCD + .4byte 0x3DCF2BE6 + .4byte 0x3DD19206 + .4byte 0x3DD3FF43 + .4byte 0x3DD673B1 + .4byte 0x3DD8EF67 + .4byte 0x3DDB7279 + .4byte 0x3DDDFCFD + .4byte 0x3DE08F09 + .4byte 0x3DE328B4 + .4byte 0x3DE5CA15 + .4byte 0x3DE87341 + .4byte 0x3DEB2451 + .4byte 0x3DEDDD5B + .4byte 0x3DF09E78 + .4byte 0x3DF367BF + .4byte 0x3DF63948 + .4byte 0x3DF9132C + .4byte 0x3DFBF584 + .4byte 0x3DFEE068 + .4byte 0x3E00E9F9 + .4byte 0x3E02681E + .4byte 0x3E03EAB0 + .4byte 0x3E0571BC + .4byte 0x3E06FD4F + .4byte 0x3E088D77 + .4byte 0x3E0A2241 + .4byte 0x3E0BBBBA + .4byte 0x3E0D59F2 + .4byte 0x3E0EFCF5 + .4byte 0x3E10A4D3 + .4byte 0x3E125199 + .4byte 0x3E140356 + .4byte 0x3E15BA19 + .4byte 0x3E1775F0 + .4byte 0x3E1936EC + .4byte 0x3E1AFD1A + .4byte 0x3E1CC88A + .4byte 0x3E1E994C + .4byte 0x3E206F70 + .4byte 0x3E224B06 + .4byte 0x3E242C1E + .4byte 0x3E2612C7 + .4byte 0x3E27FF14 + .4byte 0x3E29F113 + .4byte 0x3E2BE8D7 + .4byte 0x3E2DE670 + .4byte 0x3E2FE9F0 + .4byte 0x3E31F368 + .4byte 0x3E3402EA + .4byte 0x3E361887 + .4byte 0x3E383452 + .4byte 0x3E3A565E + .4byte 0x3E3C7EBC + .4byte 0x3E3EAD7F + .4byte 0x3E40E2BB + .4byte 0x3E431E82 + .4byte 0x3E4560E9 + .4byte 0x3E47AA02 + .4byte 0x3E49F9E1 + .4byte 0x3E4C509B + .4byte 0x3E4EAE43 + .4byte 0x3E5112EF + .4byte 0x3E537EB4 + .4byte 0x3E55F1A5 + .4byte 0x3E586BD9 + .4byte 0x3E5AED65 + .4byte 0x3E5D765E + .4byte 0x3E6006DC + .4byte 0x3E629EF3 + .4byte 0x3E653EBB + .4byte 0x3E67E64B + .4byte 0x3E6A95B9 + .4byte 0x3E6D4D1C + .4byte 0x3E700C8D + .4byte 0x3E72D424 + .4byte 0x3E75A3F7 + .4byte 0x3E787C21 + .4byte 0x3E7B5CB9 + .4byte 0x3E7E45D8 + .4byte 0x3E809BCC + .4byte 0x3E82190A + .4byte 0x3E839AB1 + .4byte 0x3E8520D0 + .4byte 0x3E86AB73 + .4byte 0x3E883AA8 + .4byte 0x3E89CE7C + .4byte 0x3E8B66FE + .4byte 0x3E8D043A + .4byte 0x3E8EA63F + .4byte 0x3E904D1C + .4byte 0x3E91F8DE + .4byte 0x3E93A994 + .4byte 0x3E955F4D + .4byte 0x3E971A17 + .4byte 0x3E98DA02 + .4byte 0x3E9A9F1C + .4byte 0x3E9C6976 + .4byte 0x3E9E391F + .4byte 0x3EA00E26 + .4byte 0x3EA1E89B + .4byte 0x3EA3C88F + .4byte 0x3EA5AE11 + .4byte 0x3EA79933 + .4byte 0x3EA98A05 + .4byte 0x3EAB8097 + .4byte 0x3EAD7CFB + .4byte 0x3EAF7F42 + .4byte 0x3EB1877E + .4byte 0x3EB395C0 + .4byte 0x3EB5AA1A + .4byte 0x3EB7C49E + .4byte 0x3EB9E55E + .4byte 0x3EBC0C6D + .4byte 0x3EBE39DE + .4byte 0x3EC06DC3 + .4byte 0x3EC2A82F + .4byte 0x3EC4E937 + .4byte 0x3EC730ED + .4byte 0x3EC97F65 + .4byte 0x3ECBD4B4 + .4byte 0x3ECE30ED + .4byte 0x3ED09426 + .4byte 0x3ED2FE72 + .4byte 0x3ED56FE7 + .4byte 0x3ED7E89B + .4byte 0x3EDA68A1 + .4byte 0x3EDCF012 + .4byte 0x3EDF7F01 + .4byte 0x3EE21586 + .4byte 0x3EE4B3B6 + .4byte 0x3EE759AA + .4byte 0x3EEA0777 + .4byte 0x3EECBD35 + .4byte 0x3EEF7AFB + .4byte 0x3EF240E2 + .4byte 0x3EF50F01 + .4byte 0x3EF7E571 + .4byte 0x3EFAC44A + .4byte 0x3EFDABA6 + .4byte 0x3F004DCE + .4byte 0x3F01CA25 + .4byte 0x3F034AE2 + .4byte 0x3F04D014 + .4byte 0x3F0659C8 + .4byte 0x3F07E80B + .4byte 0x3F097AEA + .4byte 0x3F0B1274 + .4byte 0x3F0CAEB6 + .4byte 0x3F0E4FBE + .4byte 0x3F0FF59A + .4byte 0x3F11A058 + .4byte 0x3F135008 + .4byte 0x3F1504B7 + .4byte 0x3F16BE75 + .4byte 0x3F187D50 + .4byte 0x3F1A4158 + .4byte 0x3F1C0A9C + .4byte 0x3F1DD92C + .4byte 0x3F1FAD16 + .4byte 0x3F21866C + .4byte 0x3F23653C + .4byte 0x3F254998 + .4byte 0x3F273390 + .4byte 0x3F292335 + .4byte 0x3F2B1896 + .4byte 0x3F2D13C6 + .4byte 0x3F2F14D5 + .4byte 0x3F311BD6 + .4byte 0x3F3328D8 + .4byte 0x3F353BEF + .4byte 0x3F37552D + .4byte 0x3F3974A3 + .4byte 0x3F3B9A63 + .4byte 0x3F3DC682 + .4byte 0x3F3FF911 + .4byte 0x3F423224 + .4byte 0x3F4471CD + .4byte 0x3F46B822 + .4byte 0x3F490534 + .4byte 0x3F4B5918 + .4byte 0x3F4DB3E3 + .4byte 0x3F5015A9 + .4byte 0x3F527E7F + .4byte 0x3F54EE78 + .4byte 0x3F5765AC + .4byte 0x3F59E42F + .4byte 0x3F5C6A16 + .4byte 0x3F5EF778 + .4byte 0x3F618C6B + .4byte 0x3F642905 + .4byte 0x3F66CD5E + .4byte 0x3F69798B + .4byte 0x3F6C2DA4 + .4byte 0x3F6EE9C1 + .4byte 0x3F71ADF9 + .4byte 0x3F747A65 + .4byte 0x3F774F1C + .4byte 0x3F7A2C38 + .4byte 0x3F7D11D1 + .4byte 0x3F800000 + .4byte 0x3F817B70 + .4byte 0x3F82FB44 + .4byte 0x3F847F8A + .4byte 0x3F86084F + .4byte 0x3F8795A0 + .4byte 0x3F89278B + .4byte 0x3F8ABE1E + .4byte 0x3F8C5966 + .4byte 0x3F8DF971 + .4byte 0x3F8F9E4D + .4byte 0x3F914809 + .4byte 0x3F92F6B3 + .4byte 0x3F94AA59 + .4byte 0x3F96630B + .4byte 0x3F9820D7 + .4byte 0x3F99E3CD + .4byte 0x3F9BABFC + .4byte 0x3F9D7972 + .4byte 0x3F9F4C41 + .4byte 0x3FA12478 + .4byte 0x3FA30226 + .4byte 0x3FA4E55C + .4byte 0x3FA6CE2B + .4byte 0x3FA8BCA3 + .4byte 0x3FAAB0D5 + .4byte 0x3FACAAD1 + .4byte 0x3FAEAAA9 + .4byte 0x3FB0B06E + .4byte 0x3FB2BC33 + .4byte 0x3FB4CE08 + .4byte 0x3FB6E5FF + .4byte 0x3FB9042C + .4byte 0x3FBB289F + .4byte 0x3FBD536C + .4byte 0x3FBF84A6 + .4byte 0x3FC1BC60 + .4byte 0x3FC3FAAD + .4byte 0x3FC63F9F + .4byte 0x3FC88B4D + .4byte 0x3FCADDC8 + .4byte 0x3FCD3725 + .4byte 0x3FCF9779 + .4byte 0x3FD1FED8 + .4byte 0x3FD46D58 + .4byte 0x3FD6E30D + .4byte 0x3FD9600C + .4byte 0x3FDBE46C + .4byte 0x3FDE7042 + .4byte 0x3FE103A4 + .4byte 0x3FE39EA9 + .4byte 0x3FE64167 + .4byte 0x3FE8EBF5 + .4byte 0x3FEB9E6B + .4byte 0x3FEE58DF + .4byte 0x3FF11B6A + .4byte 0x3FF3E623 + .4byte 0x3FF6B923 + .4byte 0x3FF99482 + .4byte 0x3FFC7859 + .4byte 0x3FFF64C1 .global Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x408AEC, 0x404 + .4byte 0x3F800000 + .4byte 0x3F7F7FE0 + .4byte 0x3F7EFF80 + .4byte 0x3F7E7EDE + .4byte 0x3F7DFDFC + .4byte 0x3F7D7CD8 + .4byte 0x3F7CFB72 + .4byte 0x3F7C79CA + .4byte 0x3F7BF7DF + .4byte 0x3F7B75B1 + .4byte 0x3F7AF340 + .4byte 0x3F7A708B + .4byte 0x3F79ED91 + .4byte 0x3F796A52 + .4byte 0x3F78E6CE + .4byte 0x3F786305 + .4byte 0x3F77DEF6 + .4byte 0x3F775AA0 + .4byte 0x3F76D603 + .4byte 0x3F76511E + .4byte 0x3F75CBF2 + .4byte 0x3F75467E + .4byte 0x3F74C0C0 + .4byte 0x3F743ABA + .4byte 0x3F73B46A + .4byte 0x3F732DCF + .4byte 0x3F72A6EA + .4byte 0x3F721FBA + .4byte 0x3F71983E + .4byte 0x3F711076 + .4byte 0x3F708862 + .4byte 0x3F700000 + .4byte 0x3F6F7751 + .4byte 0x3F6EEE53 + .4byte 0x3F6E6507 + .4byte 0x3F6DDB6B + .4byte 0x3F6D517F + .4byte 0x3F6CC744 + .4byte 0x3F6C3CB7 + .4byte 0x3F6BB1D9 + .4byte 0x3F6B26A9 + .4byte 0x3F6A9B26 + .4byte 0x3F6A0F50 + .4byte 0x3F698327 + .4byte 0x3F68F6A9 + .4byte 0x3F6869D6 + .4byte 0x3F67DCAE + .4byte 0x3F674F2F + .4byte 0x3F66C15A + .4byte 0x3F66332E + .4byte 0x3F65A4A9 + .4byte 0x3F6515CC + .4byte 0x3F648695 + .4byte 0x3F63F704 + .4byte 0x3F636719 + .4byte 0x3F62D6D3 + .4byte 0x3F624630 + .4byte 0x3F61B531 + .4byte 0x3F6123D4 + .4byte 0x3F609219 + .4byte 0x3F600000 + .4byte 0x3F5F6D87 + .4byte 0x3F5EDAAE + .4byte 0x3F5E4773 + .4byte 0x3F5DB3D7 + .4byte 0x3F5D1FD9 + .4byte 0x3F5C8B77 + .4byte 0x3F5BF6B1 + .4byte 0x3F5B6186 + .4byte 0x3F5ACBF5 + .4byte 0x3F5A35FE + .4byte 0x3F599FA0 + .4byte 0x3F5908D9 + .4byte 0x3F5871A9 + .4byte 0x3F57DA10 + .4byte 0x3F57420B + .4byte 0x3F56A99B + .4byte 0x3F5610BF + .4byte 0x3F557775 + .4byte 0x3F54DDBC + .4byte 0x3F544395 + .4byte 0x3F53A8FD + .4byte 0x3F530DF3 + .4byte 0x3F527278 + .4byte 0x3F51D689 + .4byte 0x3F513A26 + .4byte 0x3F509D4E + .4byte 0x3F500000 + .4byte 0x3F4F623A + .4byte 0x3F4EC3FC + .4byte 0x3F4E2545 + .4byte 0x3F4D8613 + .4byte 0x3F4CE665 + .4byte 0x3F4C463A + .4byte 0x3F4BA592 + .4byte 0x3F4B046A + .4byte 0x3F4A62C2 + .4byte 0x3F49C098 + .4byte 0x3F491DEC + .4byte 0x3F487ABC + .4byte 0x3F47D706 + .4byte 0x3F4732CA + .4byte 0x3F468E06 + .4byte 0x3F45E8B9 + .4byte 0x3F4542E1 + .4byte 0x3F449C7E + .4byte 0x3F43F58D + .4byte 0x3F434E0D + .4byte 0x3F42A5FE + .4byte 0x3F41FD5C + .4byte 0x3F415428 + .4byte 0x3F40AA5F + .4byte 0x3F400000 + .4byte 0x3F3F5509 + .4byte 0x3F3EA979 + .4byte 0x3F3DFD4E + .4byte 0x3F3D5087 + .4byte 0x3F3CA321 + .4byte 0x3F3BF51B + .4byte 0x3F3B4673 + .4byte 0x3F3A9728 + .4byte 0x3F39E738 + .4byte 0x3F3936A1 + .4byte 0x3F388560 + .4byte 0x3F37D375 + .4byte 0x3F3720DD + .4byte 0x3F366D96 + .4byte 0x3F35B99E + .4byte 0x3F3504F3 + .4byte 0x3F344F93 + .4byte 0x3F33997C + .4byte 0x3F32E2AC + .4byte 0x3F322B20 + .4byte 0x3F3172D6 + .4byte 0x3F30B9CC + .4byte 0x3F300000 + .4byte 0x3F2F456F + .4byte 0x3F2E8A16 + .4byte 0x3F2DCDF3 + .4byte 0x3F2D1104 + .4byte 0x3F2C5345 + .4byte 0x3F2B94B5 + .4byte 0x3F2AD550 + .4byte 0x3F2A1514 + .4byte 0x3F2953FD + .4byte 0x3F28920A + .4byte 0x3F27CF36 + .4byte 0x3F270B7F + .4byte 0x3F2646E1 + .4byte 0x3F25815A + .4byte 0x3F24BAE7 + .4byte 0x3F23F383 + .4byte 0x3F232B2B + .4byte 0x3F2261DC + .4byte 0x3F219792 + .4byte 0x3F20CC4A + .4byte 0x3F200000 + .4byte 0x3F1F32AF + .4byte 0x3F1E6455 + .4byte 0x3F1D94EC + .4byte 0x3F1CC471 + .4byte 0x3F1BF2DF + .4byte 0x3F1B2032 + .4byte 0x3F1A4C65 + .4byte 0x3F197774 + .4byte 0x3F18A15A + .4byte 0x3F17CA11 + .4byte 0x3F16F196 + .4byte 0x3F1617E3 + .4byte 0x3F153CF2 + .4byte 0x3F1460BE + .4byte 0x3F138341 + .4byte 0x3F12A476 + .4byte 0x3F11C456 + .4byte 0x3F10E2DC + .4byte 0x3F100000 + .4byte 0x3F0F1BBD + .4byte 0x3F0E360B + .4byte 0x3F0D4EE4 + .4byte 0x3F0C6641 + .4byte 0x3F0B7C1A + .4byte 0x3F0A9067 + .4byte 0x3F09A320 + .4byte 0x3F08B43D + .4byte 0x3F07C3B6 + .4byte 0x3F06D182 + .4byte 0x3F05DD98 + .4byte 0x3F04E7EE + .4byte 0x3F03F07B + .4byte 0x3F02F734 + .4byte 0x3F01FC10 + .4byte 0x3F00FF02 + .4byte 0x3F000000 + .4byte 0x3EFDFDFC + .4byte 0x3EFBF7DF + .4byte 0x3EF9ED91 + .4byte 0x3EF7DEF6 + .4byte 0x3EF5CBF2 + .4byte 0x3EF3B46A + .4byte 0x3EF1983E + .4byte 0x3EEF7751 + .4byte 0x3EED517F + .4byte 0x3EEB26A9 + .4byte 0x3EE8F6A9 + .4byte 0x3EE6C15A + .4byte 0x3EE48695 + .4byte 0x3EE24630 + .4byte 0x3EE00000 + .4byte 0x3EDDB3D7 + .4byte 0x3EDB6186 + .4byte 0x3ED908D9 + .4byte 0x3ED6A99B + .4byte 0x3ED44395 + .4byte 0x3ED1D689 + .4byte 0x3ECF623A + .4byte 0x3ECCE665 + .4byte 0x3ECA62C2 + .4byte 0x3EC7D706 + .4byte 0x3EC542E1 + .4byte 0x3EC2A5FE + .4byte 0x3EC00000 + .4byte 0x3EBD5087 + .4byte 0x3EBA9728 + .4byte 0x3EB7D375 + .4byte 0x3EB504F3 + .4byte 0x3EB22B20 + .4byte 0x3EAF456F + .4byte 0x3EAC5345 + .4byte 0x3EA953FD + .4byte 0x3EA646E1 + .4byte 0x3EA32B2B + .4byte 0x3EA00000 + .4byte 0x3E9CC471 + .4byte 0x3E997774 + .4byte 0x3E9617E3 + .4byte 0x3E92A476 + .4byte 0x3E8F1BBD + .4byte 0x3E8B7C1A + .4byte 0x3E87C3B6 + .4byte 0x3E83F07B + .4byte 0x3E800000 + .4byte 0x3E77DEF6 + .4byte 0x3E6F7751 + .4byte 0x3E66C15A + .4byte 0x3E5DB3D7 + .4byte 0x3E544395 + .4byte 0x3E4A62C2 + .4byte 0x3E400000 + .4byte 0x3E3504F3 + .4byte 0x3E2953FD + .4byte 0x3E1CC471 + .4byte 0x3E0F1BBD + .4byte 0x3E000000 + .4byte 0x3DDDB3D7 + .4byte 0x3DB504F3 + .4byte 0x3D800000 + .4byte 0 .global Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x408EF0, 0x404 + .4byte 0x3F800000 + .4byte 0x3F7FFEC4 + .4byte 0x3F7FFB11 + .4byte 0x3F7FF4E6 + .4byte 0x3F7FEC43 + .4byte 0x3F7FE129 + .4byte 0x3F7FD398 + .4byte 0x3F7FC38F + .4byte 0x3F7FB10F + .4byte 0x3F7F9C18 + .4byte 0x3F7F84AB + .4byte 0x3F7F6AC7 + .4byte 0x3F7F4E6D + .4byte 0x3F7F2F9D + .4byte 0x3F7F0E58 + .4byte 0x3F7EEA9D + .4byte 0x3F7EC46D + .4byte 0x3F7E9BC9 + .4byte 0x3F7E70B0 + .4byte 0x3F7E4323 + .4byte 0x3F7E1324 + .4byte 0x3F7DE0B1 + .4byte 0x3F7DABCC + .4byte 0x3F7D7474 + .4byte 0x3F7D3AAC + .4byte 0x3F7CFE73 + .4byte 0x3F7CBFC9 + .4byte 0x3F7C7EB0 + .4byte 0x3F7C3B28 + .4byte 0x3F7BF531 + .4byte 0x3F7BACCD + .4byte 0x3F7B61FC + .4byte 0x3F7B14BE + .4byte 0x3F7AC516 + .4byte 0x3F7A7302 + .4byte 0x3F7A1E84 + .4byte 0x3F79C79D + .4byte 0x3F796E4E + .4byte 0x3F791298 + .4byte 0x3F78B47B + .4byte 0x3F7853F8 + .4byte 0x3F77F110 + .4byte 0x3F778BC5 + .4byte 0x3F772417 + .4byte 0x3F76BA07 + .4byte 0x3F764D97 + .4byte 0x3F75DEC6 + .4byte 0x3F756D97 + .4byte 0x3F74FA0B + .4byte 0x3F748422 + .4byte 0x3F740BDD + .4byte 0x3F73913F + .4byte 0x3F731447 + .4byte 0x3F7294F8 + .4byte 0x3F721352 + .4byte 0x3F718F57 + .4byte 0x3F710908 + .4byte 0x3F708066 + .4byte 0x3F6FF573 + .4byte 0x3F6F6830 + .4byte 0x3F6ED89E + .4byte 0x3F6E46BE + .4byte 0x3F6DB293 + .4byte 0x3F6D1C1D + .4byte 0x3F6C835E + .4byte 0x3F6BE858 + .4byte 0x3F6B4B0C + .4byte 0x3F6AAB7B + .4byte 0x3F6A09A7 + .4byte 0x3F696591 + .4byte 0x3F68BF3C + .4byte 0x3F6816A8 + .4byte 0x3F676BD8 + .4byte 0x3F66BECC + .4byte 0x3F660F88 + .4byte 0x3F655E0B + .4byte 0x3F64AA59 + .4byte 0x3F63F473 + .4byte 0x3F633C5A + .4byte 0x3F628210 + .4byte 0x3F61C598 + .4byte 0x3F6106F2 + .4byte 0x3F604621 + .4byte 0x3F5F8327 + .4byte 0x3F5EBE05 + .4byte 0x3F5DF6BE + .4byte 0x3F5D2D53 + .4byte 0x3F5C61C7 + .4byte 0x3F5B941A + .4byte 0x3F5AC450 + .4byte 0x3F59F26A + .4byte 0x3F591E6A + .4byte 0x3F584853 + .4byte 0x3F577026 + .4byte 0x3F5695E5 + .4byte 0x3F55B993 + .4byte 0x3F54DB31 + .4byte 0x3F53FAC3 + .4byte 0x3F531849 + .4byte 0x3F5233C6 + .4byte 0x3F514D3D + .4byte 0x3F5064AF + .4byte 0x3F4F7A1F + .4byte 0x3F4E8D90 + .4byte 0x3F4D9F02 + .4byte 0x3F4CAE79 + .4byte 0x3F4BBBF8 + .4byte 0x3F4AC77F + .4byte 0x3F49D112 + .4byte 0x3F48D8B3 + .4byte 0x3F47DE65 + .4byte 0x3F46E22A + .4byte 0x3F45E403 + .4byte 0x3F44E3F5 + .4byte 0x3F43E200 + .4byte 0x3F42DE29 + .4byte 0x3F41D870 + .4byte 0x3F40D0DA + .4byte 0x3F3FC767 + .4byte 0x3F3EBC1B + .4byte 0x3F3DAEF9 + .4byte 0x3F3CA003 + .4byte 0x3F3B8F3B + .4byte 0x3F3A7CA4 + .4byte 0x3F396842 + .4byte 0x3F385216 + .4byte 0x3F373A23 + .4byte 0x3F36206C + .4byte 0x3F3504F3 + .4byte 0x3F33E7BC + .4byte 0x3F32C8C9 + .4byte 0x3F31A81D + .4byte 0x3F3085BB + .4byte 0x3F2F61A5 + .4byte 0x3F2E3BDE + .4byte 0x3F2D1469 + .4byte 0x3F2BEB4A + .4byte 0x3F2AC082 + .4byte 0x3F299415 + .4byte 0x3F286605 + .4byte 0x3F273656 + .4byte 0x3F26050A + .4byte 0x3F24D225 + .4byte 0x3F239DA9 + .4byte 0x3F226799 + .4byte 0x3F212FF9 + .4byte 0x3F1FF6CB + .4byte 0x3F1EBC12 + .4byte 0x3F1D7FD1 + .4byte 0x3F1C420C + .4byte 0x3F1B02C6 + .4byte 0x3F19C200 + .4byte 0x3F187FC0 + .4byte 0x3F173C07 + .4byte 0x3F15F6D9 + .4byte 0x3F14B039 + .4byte 0x3F13682A + .4byte 0x3F121EB0 + .4byte 0x3F10D3CD + .4byte 0x3F0F8784 + .4byte 0x3F0E39DA + .4byte 0x3F0CEAD0 + .4byte 0x3F0B9A6B + .4byte 0x3F0A48AD + .4byte 0x3F08F59B + .4byte 0x3F07A136 + .4byte 0x3F064B82 + .4byte 0x3F04F484 + .4byte 0x3F039C3D + .4byte 0x3F0242B1 + .4byte 0x3F00E7E4 + .4byte 0x3EFF17B2 + .4byte 0x3EFC5D27 + .4byte 0x3EF9A02D + .4byte 0x3EF6E0CB + .4byte 0x3EF41F07 + .4byte 0x3EF15AEA + .4byte 0x3EEE9479 + .4byte 0x3EEBCBBB + .4byte 0x3EE900B7 + .4byte 0x3EE63375 + .4byte 0x3EE363FA + .4byte 0x3EE0924F + .4byte 0x3EDDBE79 + .4byte 0x3EDAE880 + .4byte 0x3ED8106B + .4byte 0x3ED53641 + .4byte 0x3ED25A09 + .4byte 0x3ECF7BCA + .4byte 0x3ECC9B8B + .4byte 0x3EC9B953 + .4byte 0x3EC6D529 + .4byte 0x3EC3EF15 + .4byte 0x3EC1071E + .4byte 0x3EBE1D4A + .4byte 0x3EBB31A0 + .4byte 0x3EB8442A + .4byte 0x3EB554EC + .4byte 0x3EB263EF + .4byte 0x3EAF713A + .4byte 0x3EAC7CD4 + .4byte 0x3EA986C4 + .4byte 0x3EA68F12 + .4byte 0x3EA395C5 + .4byte 0x3EA09AE5 + .4byte 0x3E9D9E78 + .4byte 0x3E9AA086 + .4byte 0x3E97A117 + .4byte 0x3E94A031 + .4byte 0x3E919DDD + .4byte 0x3E8E9A22 + .4byte 0x3E8B9507 + .4byte 0x3E888E93 + .4byte 0x3E8586CE + .4byte 0x3E827DC0 + .4byte 0x3E7EE6E1 + .4byte 0x3E78CFCC + .4byte 0x3E72B651 + .4byte 0x3E6C9A7F + .4byte 0x3E667C66 + .4byte 0x3E605C13 + .4byte 0x3E5A3997 + .4byte 0x3E541501 + .4byte 0x3E4DEE60 + .4byte 0x3E47C5C2 + .4byte 0x3E419B37 + .4byte 0x3E3B6ECF + .4byte 0x3E354098 + .4byte 0x3E2F10A2 + .4byte 0x3E28DEFC + .4byte 0x3E22ABB6 + .4byte 0x3E1C76DE + .4byte 0x3E164083 + .4byte 0x3E1008B7 + .4byte 0x3E09CF86 + .4byte 0x3E039502 + .4byte 0x3DFAB273 + .4byte 0x3DEE3876 + .4byte 0x3DE1BC2E + .4byte 0x3DD53DB9 + .4byte 0x3DC8BD36 + .4byte 0x3DBC3AC3 + .4byte 0x3DAFB680 + .4byte 0x3DA3308C + .4byte 0x3D96A905 + .4byte 0x3D8A200A + .4byte 0x3D7B2B74 + .4byte 0x3D621468 + .4byte 0x3D48FB2F + .4byte 0x3D2FE007 + .4byte 0x3D16C32C + .4byte 0x3CFB49B9 + .4byte 0x3CC90AB0 + .4byte 0x3C96C9B6 + .4byte 0x3C490E90 + .4byte 0x3BC90F89 + .4byte 0 .global Pan2RatioTableLinear__Q44nw4r3snd6detail4Util Pan2RatioTableLinear__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x4092F4, 0x404 + .4byte 0x3F800000 + .4byte 0x3F7F0000 + .4byte 0x3F7E0000 + .4byte 0x3F7D0000 + .4byte 0x3F7C0000 + .4byte 0x3F7B0000 + .4byte 0x3F7A0000 + .4byte 0x3F790000 + .4byte 0x3F780000 + .4byte 0x3F770000 + .4byte 0x3F760000 + .4byte 0x3F750000 + .4byte 0x3F740000 + .4byte 0x3F730000 + .4byte 0x3F720000 + .4byte 0x3F710000 + .4byte 0x3F700000 + .4byte 0x3F6F0000 + .4byte 0x3F6E0000 + .4byte 0x3F6D0000 + .4byte 0x3F6C0000 + .4byte 0x3F6B0000 + .4byte 0x3F6A0000 + .4byte 0x3F690000 + .4byte 0x3F680000 + .4byte 0x3F670000 + .4byte 0x3F660000 + .4byte 0x3F650000 + .4byte 0x3F640000 + .4byte 0x3F630000 + .4byte 0x3F620000 + .4byte 0x3F610000 + .4byte 0x3F600000 + .4byte 0x3F5F0000 + .4byte 0x3F5E0000 + .4byte 0x3F5D0000 + .4byte 0x3F5C0000 + .4byte 0x3F5B0000 + .4byte 0x3F5A0000 + .4byte 0x3F590000 + .4byte 0x3F580000 + .4byte 0x3F570000 + .4byte 0x3F560000 + .4byte 0x3F550000 + .4byte 0x3F540000 + .4byte 0x3F530000 + .4byte 0x3F520000 + .4byte 0x3F510000 + .4byte 0x3F500000 + .4byte 0x3F4F0000 + .4byte 0x3F4E0000 + .4byte 0x3F4D0000 + .4byte 0x3F4C0000 + .4byte 0x3F4B0000 + .4byte 0x3F4A0000 + .4byte 0x3F490000 + .4byte 0x3F480000 + .4byte 0x3F470000 + .4byte 0x3F460000 + .4byte 0x3F450000 + .4byte 0x3F440000 + .4byte 0x3F430000 + .4byte 0x3F420000 + .4byte 0x3F410000 + .4byte 0x3F400000 + .4byte 0x3F3F0000 + .4byte 0x3F3E0000 + .4byte 0x3F3D0000 + .4byte 0x3F3C0000 + .4byte 0x3F3B0000 + .4byte 0x3F3A0000 + .4byte 0x3F390000 + .4byte 0x3F380000 + .4byte 0x3F370000 + .4byte 0x3F360000 + .4byte 0x3F350000 + .4byte 0x3F340000 + .4byte 0x3F330000 + .4byte 0x3F320000 + .4byte 0x3F310000 + .4byte 0x3F300000 + .4byte 0x3F2F0000 + .4byte 0x3F2E0000 + .4byte 0x3F2D0000 + .4byte 0x3F2C0000 + .4byte 0x3F2B0000 + .4byte 0x3F2A0000 + .4byte 0x3F290000 + .4byte 0x3F280000 + .4byte 0x3F270000 + .4byte 0x3F260000 + .4byte 0x3F250000 + .4byte 0x3F240000 + .4byte 0x3F230000 + .4byte 0x3F220000 + .4byte 0x3F210000 + .4byte 0x3F200000 + .4byte 0x3F1F0000 + .4byte 0x3F1E0000 + .4byte 0x3F1D0000 + .4byte 0x3F1C0000 + .4byte 0x3F1B0000 + .4byte 0x3F1A0000 + .4byte 0x3F190000 + .4byte 0x3F180000 + .4byte 0x3F170000 + .4byte 0x3F160000 + .4byte 0x3F150000 + .4byte 0x3F140000 + .4byte 0x3F130000 + .4byte 0x3F120000 + .4byte 0x3F110000 + .4byte 0x3F100000 + .4byte 0x3F0F0000 + .4byte 0x3F0E0000 + .4byte 0x3F0D0000 + .4byte 0x3F0C0000 + .4byte 0x3F0B0000 + .4byte 0x3F0A0000 + .4byte 0x3F090000 + .4byte 0x3F080000 + .4byte 0x3F070000 + .4byte 0x3F060000 + .4byte 0x3F050000 + .4byte 0x3F040000 + .4byte 0x3F030000 + .4byte 0x3F020000 + .4byte 0x3F010000 + .4byte 0x3F000000 + .4byte 0x3EFE0000 + .4byte 0x3EFC0000 + .4byte 0x3EFA0000 + .4byte 0x3EF80000 + .4byte 0x3EF60000 + .4byte 0x3EF40000 + .4byte 0x3EF20000 + .4byte 0x3EF00000 + .4byte 0x3EEE0000 + .4byte 0x3EEC0000 + .4byte 0x3EEA0000 + .4byte 0x3EE80000 + .4byte 0x3EE60000 + .4byte 0x3EE40000 + .4byte 0x3EE20000 + .4byte 0x3EE00000 + .4byte 0x3EDE0000 + .4byte 0x3EDC0000 + .4byte 0x3EDA0000 + .4byte 0x3ED80000 + .4byte 0x3ED60000 + .4byte 0x3ED40000 + .4byte 0x3ED20000 + .4byte 0x3ED00000 + .4byte 0x3ECE0000 + .4byte 0x3ECC0000 + .4byte 0x3ECA0000 + .4byte 0x3EC80000 + .4byte 0x3EC60000 + .4byte 0x3EC40000 + .4byte 0x3EC20000 + .4byte 0x3EC00000 + .4byte 0x3EBE0000 + .4byte 0x3EBC0000 + .4byte 0x3EBA0000 + .4byte 0x3EB80000 + .4byte 0x3EB60000 + .4byte 0x3EB40000 + .4byte 0x3EB20000 + .4byte 0x3EB00000 + .4byte 0x3EAE0000 + .4byte 0x3EAC0000 + .4byte 0x3EAA0000 + .4byte 0x3EA80000 + .4byte 0x3EA60000 + .4byte 0x3EA40000 + .4byte 0x3EA20000 + .4byte 0x3EA00000 + .4byte 0x3E9E0000 + .4byte 0x3E9C0000 + .4byte 0x3E9A0000 + .4byte 0x3E980000 + .4byte 0x3E960000 + .4byte 0x3E940000 + .4byte 0x3E920000 + .4byte 0x3E900000 + .4byte 0x3E8E0000 + .4byte 0x3E8C0000 + .4byte 0x3E8A0000 + .4byte 0x3E880000 + .4byte 0x3E860000 + .4byte 0x3E840000 + .4byte 0x3E820000 + .4byte 0x3E800000 + .4byte 0x3E7C0000 + .4byte 0x3E780000 + .4byte 0x3E740000 + .4byte 0x3E700000 + .4byte 0x3E6C0000 + .4byte 0x3E680000 + .4byte 0x3E640000 + .4byte 0x3E600000 + .4byte 0x3E5C0000 + .4byte 0x3E580000 + .4byte 0x3E540000 + .4byte 0x3E500000 + .4byte 0x3E4C0000 + .4byte 0x3E480000 + .4byte 0x3E440000 + .4byte 0x3E400000 + .4byte 0x3E3C0000 + .4byte 0x3E380000 + .4byte 0x3E340000 + .4byte 0x3E300000 + .4byte 0x3E2C0000 + .4byte 0x3E280000 + .4byte 0x3E240000 + .4byte 0x3E200000 + .4byte 0x3E1C0000 + .4byte 0x3E180000 + .4byte 0x3E140000 + .4byte 0x3E100000 + .4byte 0x3E0C0000 + .4byte 0x3E080000 + .4byte 0x3E040000 + .4byte 0x3E000000 + .4byte 0x3DF80000 + .4byte 0x3DF00000 + .4byte 0x3DE80000 + .4byte 0x3DE00000 + .4byte 0x3DD80000 + .4byte 0x3DD00000 + .4byte 0x3DC80000 + .4byte 0x3DC00000 + .4byte 0x3DB80000 + .4byte 0x3DB00000 + .4byte 0x3DA80000 + .4byte 0x3DA00000 + .4byte 0x3D980000 + .4byte 0x3D900000 + .4byte 0x3D880000 + .4byte 0x3D800000 + .4byte 0x3D700000 + .4byte 0x3D600000 + .4byte 0x3D500000 + .4byte 0x3D400000 + .4byte 0x3D300000 + .4byte 0x3D200000 + .4byte 0x3D100000 + .4byte 0x3D000000 + .4byte 0x3CE00000 + .4byte 0x3CC00000 + .4byte 0x3CA00000 + .4byte 0x3C800000 + .4byte 0x3C400000 + .4byte 0x3C000000 + .4byte 0x3B800000 + .4byte 0 .global RemoteFilterCoefTable__Q44nw4r3snd6detail4Util RemoteFilterCoefTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x4096F8, 0x500 + .4byte 0x387C70F7 + .4byte 0x387C8144 + .4byte 0xC13E3549 + .4byte 0x6A933549 + .4byte 0x88E9C7F2 + .4byte 0x31C46389 + .4byte 0x31C49211 + .4byte 0xCE952E7C + .4byte 0x5CF92E7C + .4byte 0x9B3ED422 + .4byte 0x2B6F56DE + .4byte 0x2B6FA44C + .4byte 0xD8C72899 + .4byte 0x51332899 + .4byte 0xAD24DCA7 + .4byte 0x25F74BEE + .4byte 0x25F7B5BA + .4byte 0xDFE42384 + .4byte 0x47092384 + .4byte 0xBE07E294 + .4byte 0x213D427A + .4byte 0x213DC608 + .4byte 0xE4CE1F1D + .4byte 0x3E3A1F1D + .4byte 0xCDBCE6A2 + .4byte 0x1D223A44 + .4byte 0x1D22D525 + .4byte 0xE81D1B48 + .4byte 0x36901B48 + .4byte 0xDC45E94C + .4byte 0x198D331A + .4byte 0x198DE31D + .4byte 0xEA3917EE + .4byte 0x2FDC17EE + .4byte 0xE9B0EAEC + .4byte 0x16692CD2 + .4byte 0x1669F001 + .4byte 0xEB6C14FD + .4byte 0x29F914FD + .4byte 0xF613EBBE + .4byte 0x13A7274D + .4byte 0x13A7FBE7 + .4byte 0xEBE91265 + .4byte 0x24CB1265 + .4byte 0x0180EBF1 + .4byte 0x11382270 + .4byte 0x113806E2 + .4byte 0xEBD9101C + .4byte 0x2039101C + .4byte 0x0C0DEBA6 + .4byte 0x0F121E24 + .4byte 0x0F121104 + .4byte 0xEB5A0E18 + .4byte 0x1C300E18 + .4byte 0x15C9EAF8 + .4byte 0x0D2D1A59 + .4byte 0x0D2D1A5D + .4byte 0xEA840C50 + .4byte 0x189F0C50 + .4byte 0x1EC3E9FE + .4byte 0x0B801700 + .4byte 0x0B8022FC + .4byte 0xE9690ABD + .4byte 0x15790ABD + .4byte 0x270AE8C7 + .4byte 0x0A05140B + .4byte 0x0A052AED + .4byte 0xE81A0959 + .4byte 0x12B30959 + .4byte 0x2EA9E763 + .4byte 0x08B81170 + .4byte 0x08B8323D + .4byte 0xE6A30820 + .4byte 0x10410820 + .4byte 0x35ACE5DD + .4byte 0x07920F25 + .4byte 0x079238F6 + .4byte 0xE510070D + .4byte 0x0E1A070D + .4byte 0x3C1DE43E + .4byte 0x06900D21 + .4byte 0x06903F23 + .4byte 0xE369061B + .4byte 0x0C37061B + .4byte 0x4208E290 + .4byte 0x05AE0B5C + .4byte 0x05AE44CD + .4byte 0xE1B60548 + .4byte 0x0A900548 + .4byte 0x4774E0DA + .4byte 0x04E809D0 + .4byte 0x04E849FE + .4byte 0xDFFD048F + .4byte 0x091E048F + .4byte 0x4C6CDF20 + .4byte 0x043B0877 + .4byte 0x043B4EBF + .4byte 0xDE4403ED + .4byte 0x07DB03ED + .4byte 0x50F8DD69 + .4byte 0x03A50749 + .4byte 0x03A55317 + .4byte 0xDC900361 + .4byte 0x06C20361 + .4byte 0x551FDBB8 + .4byte 0x03220643 + .4byte 0x03225710 + .4byte 0xDAE302E7 + .4byte 0x05CE02E7 + .4byte 0x58EADA11 + .4byte 0x02B00560 + .4byte 0x02B05AAF + .4byte 0xD941027D + .4byte 0x04FA027D + .4byte 0x5C60D875 + .4byte 0x024E049B + .4byte 0x024E5DFE + .4byte 0xD7AD0222 + .4byte 0x04430222 + .4byte 0x5F88D6E8 + .4byte 0x01F903F1 + .4byte 0x01F96101 + .4byte 0xD62701D3 + .4byte 0x03A501D3 + .4byte 0x6269D56A + .4byte 0x01AF035F + .4byte 0x01AF63C0 + .4byte 0xD4B1018F + .4byte 0x031D018F + .4byte 0x6507D3FC + .4byte 0x017002E1 + .4byte 0x01706640 + .4byte 0xD34C0154 + .4byte 0x02A80154 + .4byte 0x676AD2A0 + .4byte 0x013A0274 + .4byte 0x013A6887 + .4byte 0xD1F90122 + .4byte 0x02440122 + .4byte 0x6996D156 + .4byte 0x010C0217 + .4byte 0x010C6A99 + .4byte 0xD0B700F7 + .4byte 0x01EE00F7 + .4byte 0x6B90D01D + .4byte 0x00E401C7 + .4byte 0x00E46C7C + .4byte 0xCF8700D2 + .4byte 0x01A400D2 + .4byte 0x6D5DCEF6 + .4byte 0x00C20183 + .4byte 0x00C26E33 + .4byte 0xCE6900B2 + .4byte 0x016500B2 + .4byte 0x6F00CDE0 + .4byte 0x00A40149 + .4byte 0x00A46FC3 + .4byte 0xCD5C0098 + .4byte 0x012F0098 + .4byte 0x707DCCDC + .4byte 0x008C0117 + .4byte 0x008C712F + .4byte 0xCC600081 + .4byte 0x01010081 + .4byte 0x71D9CBE7 + .4byte 0x007600ED + .4byte 0x0076727A + .4byte 0xCB73006D + .4byte 0x00DA006D + .4byte 0x7315CB03 + .4byte 0x006400C9 + .4byte 0x006473A8 + .4byte 0xCA97005C + .4byte 0x00B9005C + .4byte 0x7434CA2E + .4byte 0x005500AA + .4byte 0x005574BB + .4byte 0xC9C9004E + .4byte 0x009C004E + .4byte 0x753BC967 + .4byte 0x00480090 + .4byte 0x004875B5 + .4byte 0xC9090042 + .4byte 0x00840042 + .4byte 0x7629C8AF + .4byte 0x003D007A + .4byte 0x003D7699 + .4byte 0xC8570038 + .4byte 0x00700038 + .4byte 0x7703C803 + .4byte 0x00330067 + .4byte 0x00337768 + .4byte 0xC7B1002F + .4byte 0x005F002F + .4byte 0x77C9C763 + .4byte 0x002C0057 + .4byte 0x002C7826 + .4byte 0xC7180028 + .4byte 0x00500028 + .4byte 0x787EC6CF + .4byte 0x0025004A + .4byte 0x002578D2 + .4byte 0xC6890022 + .4byte 0x00440022 + .4byte 0x7923C646 + .4byte 0x001F003E + .4byte 0x001F7970 + .4byte 0xC606001D + .4byte 0x0039001D + .4byte 0x79B9C5C7 + .4byte 0x001A0034 + .4byte 0x001A7A00 + .4byte 0xC58C0018 + .4byte 0x00300018 + .4byte 0x7A43C552 + .4byte 0x0016002C + .4byte 0x00167A83 + .4byte 0xC51B0014 + .4byte 0x00290014 + .4byte 0x7AC0C4E6 + .4byte 0x00130025 + .4byte 0x00137AFB + .4byte 0xC4B30011 + .4byte 0x00220011 + .4byte 0x7B32C482 + .4byte 0x00100020 + .4byte 0x00107B68 + .4byte 0xC452000E + .4byte 0x001D000E + .4byte 0x7B9BC425 + .4byte 0x000D001B + .4byte 0x000D7BCC + .4byte 0xC3FA000C + .4byte 0x0018000C + .4byte 0x7BFAC3D0 + .4byte 0x000B0016 + .4byte 0x000B7C27 + .4byte 0xC3A8000A + .4byte 0x0015000A + .4byte 0x7C52C381 + .4byte 0x00090013 + .4byte 0x00097C7A + .4byte 0xC35C0009 + .4byte 0x00110009 + .4byte 0x7CA1C339 + .4byte 0x00080010 + .4byte 0x00087CC7 + .4byte 0xC3170007 + .4byte 0x000F0007 + .4byte 0x7CEAC2F6 + .4byte 0x0007000D + .4byte 0x00077D0C + .4byte 0xC2D70006 + .4byte 0x000C0006 + .4byte 0x7D2DC2B9 + .4byte 0x0006000B + .4byte 0x00067D4C + .4byte 0xC29C0005 + .4byte 0x000A0005 + .4byte 0x7D6AC280 + .4byte 0x0005000A + .4byte 0x00057D86 + .4byte 0xC2650004 + .4byte 0x00090004 + .4byte 0x7DA1C24C + .4byte 0x00040008 + .4byte 0x00047DBB + .4byte 0xC2340004 + .4byte 0x00070004 + .4byte 0x7DD4C21C + .4byte 0x00030007 + .4byte 0x00037DEC + .4byte 0xC2060003 + .4byte 0x00060003 + .4byte 0x7E03C1F0 + .4byte 0x00030006 + .4byte 0x00037E19 + .4byte 0xC1DB0003 + .4byte 0x00050003 + .4byte 0x7E2EC1C8 + .4byte 0x00020005 + .4byte 0x00027E42 + .4byte 0xC1B50002 + .4byte 0x00040002 + .4byte 0x7E55C1A2 + .4byte 0x00020004 + .4byte 0x00027E67 + .4byte 0xC1910002 + .4byte 0x00040002 + .4byte 0x7E79C180 + .4byte 0x00020003 + .4byte 0x00027E89 + .4byte 0xC1700002 + .4byte 0x00030002 + .4byte 0x7E99C161 + .4byte 0x00010003 + .4byte 0x00017EA9 + .4byte 0xC1520001 + .4byte 0x00030001 + .4byte 0x7EB7C144 + .4byte 0x00010002 + .4byte 0x00017EC5 + .4byte 0xC1360001 + .4byte 0x00020001 + .4byte 0x7ED3C129 + .4byte 0x00010002 + .4byte 0x00017EE0 + .4byte 0xC11D0001 + .4byte 0x00020001 + .4byte 0x7EECC111 + .4byte 0x00010002 + .4byte 0x00017EF8 + .4byte 0xC1050001 + .4byte 0x00020001 + .4byte 0x7F03C0FA + .4byte 0x00010001 + .4byte 0x00017F0E + .4byte 0xC0F00001 + .4byte 0x00010001 + .4byte 0x7F18C0E6 .global CalcLpfFreqTable__Q44nw4r3snd6detail4Util CalcLpfFreqTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x409BF8, 0x30 + .4byte 0x00500064 + .4byte 0x008000A0 + .4byte 0x00C80100 + .4byte 0x01400190 + .4byte 0x01F40280 + .4byte 0x032003E8 + .4byte 0x05000640 + .4byte 0x07D00A00 + .4byte 0x0C800FA0 + .4byte 0x14001900 + .4byte 0x1F402800 + .4byte 0x32003E80 .section .data, "wa" # 0x80421040 - 0x80496700 .global PanTableTable__Q44nw4r3snd6detail4Util PanTableTable__Q44nw4r3snd6detail4Util: - .incbin "baserom.dol", 0x43E710, 0x10 + .4byte 0x8040C9EC + .4byte 0x8040CDF0 + .4byte 0x8040D1F4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2CalcRandom__Q44nw4r3snd6detail4UtilFv$$2u $$2LOCAL$$2CalcRandom__Q44nw4r3snd6detail4UtilFv$$2u: - .incbin "baserom.dol", 0x492E50, 0x8 + .4byte 0x12345678 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27697 $$27697: - .incbin "baserom.dol", 0x499F90, 0x4 + .4byte 0x3F800000 .global $$27698 $$27698: - .incbin "baserom.dol", 0x499F94, 0x4 + .4byte 0x40000000 .global $$27699 $$27699: - .incbin "baserom.dol", 0x499F98, 0x4 + .4byte 0x3F000000 .global $$27711 $$27711: - .incbin "baserom.dol", 0x499F9C, 0x4 + .4byte 0x40C00000 .global $$27712 $$27712: - .incbin "baserom.dol", 0x499FA0, 0x4 + .4byte 0xC2B4CCCD .global $$27713 $$27713: - .incbin "baserom.dol", 0x499FA4, 0x4 + .4byte 0x41200000 .global $$27751 $$27751: - .incbin "baserom.dol", 0x499FA8, 0x4 + .4byte 0xBF800000 .global $$27752 $$27752: - .incbin "baserom.dol", 0x499FAC, 0x4 + .4byte 0x43800000 .global $$27753 $$27753: - .incbin "baserom.dol", 0x499FB0, 0x4 + .4byte 0 .global $$27796 $$27796: - .incbin "baserom.dol", 0x499FB4, 0x4 + .4byte 0x3E0ADE7F .global $$27797 $$27797: - .incbin "baserom.dol", 0x499FB8, 0x4 + .4byte 0x3F666666 .global $$27798 $$27798: - .incbin "baserom.dol", 0x499FBC, 0x4 + .4byte 0x3D088889 diff --git a/asm/libnw4r_snd/snd_Voice.s b/asm/libnw4r_snd/snd_Voice.s index 091510b0..6429feb5 100644 --- a/asm/libnw4r_snd/snd_Voice.s +++ b/asm/libnw4r_snd/snd_Voice.s @@ -3092,48 +3092,61 @@ InvalidateData__Q44nw4r3snd6detail5VoiceFPCvPCv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$211607 $$211607: - .incbin "baserom.dol", 0x43E6D8, 0x24 + .4byte 0x8011BA28 ;# ptr + .4byte 0x8011BA30 ;# ptr + .4byte 0x8011BA40 ;# ptr + .4byte 0x8011BA54 ;# ptr + .4byte 0x8011BA60 ;# ptr + .4byte 0x8011BA70 ;# ptr + .4byte 0x8011BA84 ;# ptr + .4byte 0x8011BA90 ;# ptr + .4byte 0x8011BAA4 ;# ptr .global __vt__Q44nw4r3snd6detail5Voice __vt__Q44nw4r3snd6detail5Voice: - .incbin "baserom.dol", 0x43E6FC, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x80119CB0 ;# ptr + .4byte 0x8011C4D0 ;# ptr + .4byte 0x8011C380 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210576 $$210576: - .incbin "baserom.dol", 0x499F58, 0x4 + .4byte 0x3F800000 .global $$210577 $$210577: - .incbin "baserom.dol", 0x499F5C, 0x4 + .4byte 0 .global $$211354 $$211354: - .incbin "baserom.dol", 0x499F60, 0x4 + .4byte 0xBDF5C28F .global $$211355 $$211355: - .incbin "baserom.dol", 0x499F64, 0x4 + .4byte 0x3F6147AE .global $$211356 $$211356: - .incbin "baserom.dol", 0x499F68, 0x4 + .4byte 0x3F000000 .global $$211357 $$211357: - .incbin "baserom.dol", 0x499F6C, 0x4 + .4byte 0x3F8F5C29 .global $$211358 $$211358: - .incbin "baserom.dol", 0x499F70, 0x4 + .4byte 0x3F59999A .global $$211359 $$211359: - .incbin "baserom.dol", 0x499F74, 0x4 + .4byte 0x3E199998 .global $$211360 $$211360: - .incbin "baserom.dol", 0x499F78, 0x4 + .4byte 0x40000000 .global $$211361 $$211361: - .incbin "baserom.dol", 0x499F7C, 0x4 + .4byte 0x3EB33334 .global $$211601 $$211601: - .incbin "baserom.dol", 0x499F80, 0x4 + .4byte 0xBF800000 .global $$211602 $$211602: - .incbin "baserom.dol", 0x499F84, 0x4 + .4byte 0xC0400000 .global $$211603 $$211603: - .incbin "baserom.dol", 0x499F88, 0x8 + .4byte 0x47000000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_WavePlayer.s b/asm/libnw4r_snd/snd_WavePlayer.s index 5376952a..74794224 100644 --- a/asm/libnw4r_snd/snd_WavePlayer.s +++ b/asm/libnw4r_snd/snd_WavePlayer.s @@ -1075,33 +1075,45 @@ __dt__Q44nw4r3snd10WavePlayer10WavePacketFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd10WavePlayer __vt__Q34nw4r3snd10WavePlayer: - .incbin "baserom.dol", 0x43E720, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8011D550 ;# ptr + .4byte 0x8011E390 ;# ptr + .4byte 0x8011E2A0 ;# ptr + .4byte 0x8011E290 ;# ptr .global __vt__Q44nw4r3snd10WavePlayer10WavePacket __vt__Q44nw4r3snd10WavePlayer10WavePacket: - .incbin "baserom.dol", 0x43E738, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8011E3A0 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29744 $$29744: - .incbin "baserom.dol", 0x499FC0, 0x4 + .4byte 0x3F800000 .global $$29745 $$29745: - .incbin "baserom.dol", 0x499FC4, 0x4 + .4byte 0 .global $$29803 $$29803: - .incbin "baserom.dol", 0x499FC8, 0x4 + .4byte 0x40000000 .global $$29804 $$29804: - .incbin "baserom.dol", 0x499FCC, 0x4 + .4byte 0x40400000 .global $$29805 $$29805: - .incbin "baserom.dol", 0x499FD0, 0x8 + .4byte 0x447A0000 + .4byte 0 .global $$29808 $$29808: - .incbin "baserom.dol", 0x499FD8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29857 $$29857: - .incbin "baserom.dol", 0x499FE0, 0x8 + .4byte 0x40C00000 + .4byte 0 .global $$29861 $$29861: - .incbin "baserom.dol", 0x499FE8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_WaveSound.s b/asm/libnw4r_snd/snd_WaveSound.s index f42e4a39..9bf8083d 100644 --- a/asm/libnw4r_snd/snd_WaveSound.s +++ b/asm/libnw4r_snd/snd_WaveSound.s @@ -274,12 +274,25 @@ __sinit_$$3snd_WaveSound_cpp: /* 8011E70C 0011A54C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023A8, 0x4 + .4byte 0x8011E700 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WaveSound __vt__Q44nw4r3snd6detail9WaveSound: - .incbin "baserom.dol", 0x43E748, 0x38 + .4byte 0 + .4byte 0 + .4byte 0x8011E6F0 ;# ptr + .4byte 0x8011E570 ;# ptr + .4byte 0x8011E4D0 ;# ptr + .4byte 0x8011E6E0 ;# ptr + .4byte 0x8011E690 ;# ptr + .4byte 0x8011E6B0 ;# ptr + .4byte 0x80105590 ;# ptr + .4byte 0x8011E6C0 ;# ptr + .4byte 0x8011E6D0 ;# ptr + .4byte 0x8011E5A0 ;# ptr + .4byte 0x80106200 ;# ptr + .4byte 0x80106240 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail9WaveSound diff --git a/asm/libnw4r_snd/snd_WsdFile.s b/asm/libnw4r_snd/snd_WsdFile.s index c23f8bda..cf264de5 100644 --- a/asm/libnw4r_snd/snd_WsdFile.s +++ b/asm/libnw4r_snd/snd_WsdFile.s @@ -275,4 +275,5 @@ lbl_8011EAF8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27814 $$27814: - .incbin "baserom.dol", 0x499FF0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_snd/snd_WsdPlayer.s b/asm/libnw4r_snd/snd_WsdPlayer.s index a2fb2b50..2e4a6538 100644 --- a/asm/libnw4r_snd/snd_WsdPlayer.s +++ b/asm/libnw4r_snd/snd_WsdPlayer.s @@ -1174,27 +1174,53 @@ $$2192$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WsdPlayer __vt__Q44nw4r3snd6detail9WsdPlayer: - .incbin "baserom.dol", 0x43E780, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x8011E420 ;# ptr + .4byte 0x8011EDE0 ;# ptr + .4byte 0x8011EDF0 ;# ptr + .4byte 0x8011EF20 ;# ptr + .4byte 0x8011FAC0 ;# ptr + .4byte 0x8011FAA0 ;# ptr + .4byte 0x8011FA80 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8011FB00 ;# ptr + .4byte 0x8011FAF0 ;# ptr + .4byte 0x8011FAE0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x8011FB30 ;# ptr + .4byte 0x8011FB20 ;# ptr + .4byte 0x80109E20 ;# ptr + .4byte 0x8011FB10 ;# ptr + .4byte 0x8011F000 ;# ptr + .4byte 0x8011FA70 ;# ptr + .4byte 0x8011FA50 ;# ptr + .4byte 0x8011FA60 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210015 $$210015: - .incbin "baserom.dol", 0x499FF8, 0x4 + .4byte 0x3F800000 .global $$210428 $$210428: - .incbin "baserom.dol", 0x499FFC, 0x4 + .4byte 0 .global $$210429 $$210429: - .incbin "baserom.dol", 0x49A000, 0x4 + .4byte 0x427C0000 .global $$210430 $$210430: - .incbin "baserom.dol", 0x49A004, 0x4 + .4byte 0x3C800000 .global $$210431 $$210431: - .incbin "baserom.dol", 0x49A008, 0x8 + .4byte 0x42FE0000 + .4byte 0 .global $$210435 $$210435: - .incbin "baserom.dol", 0x49A010, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$210436 $$210436: - .incbin "baserom.dol", 0x49A018, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ut/ut_CharWriter.s b/asm/libnw4r_ut/ut_CharWriter.s index d06d8169..2e79d73a 100644 --- a/asm/libnw4r_ut/ut_CharWriter.s +++ b/asm/libnw4r_ut/ut_CharWriter.s @@ -1540,19 +1540,22 @@ lbl_80123A48: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26180 $$26180: - .incbin "baserom.dol", 0x49A028, 0x4 + .4byte 0 .global $$26181 $$26181: - .incbin "baserom.dol", 0x49A02C, 0x4 + .4byte 0x3F800000 .global $$26269 $$26269: - .incbin "baserom.dol", 0x49A030, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$26299 $$26299: - .incbin "baserom.dol", 0x49A038, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$26307 $$26307: - .incbin "baserom.dol", 0x49A040, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global mLoadingTexture__Q34nw4r2ut10CharWriter diff --git a/asm/libnw4r_ut/ut_DvdFileStream.s b/asm/libnw4r_ut/ut_DvdFileStream.s index f5196a85..c8f90950 100644 --- a/asm/libnw4r_ut/ut_DvdFileStream.s +++ b/asm/libnw4r_ut/ut_DvdFileStream.s @@ -540,12 +540,37 @@ __sinit_$$3ut_DvdFileStream_cpp: /* 80120E9C 0011CCDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023B4, 0x4 + .4byte 0x80120E90 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut13DvdFileStream __vt__Q34nw4r2ut13DvdFileStream: - .incbin "baserom.dol", 0x43E808, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80120E80 ;# ptr + .4byte 0x80120A10 ;# ptr + .4byte 0x80120B30 ;# ptr + .4byte 0x80120B80 ;# ptr + .4byte 0x80120C10 ;# ptr + .4byte 0x80120630 ;# ptr + .4byte 0x80120640 ;# ptr + .4byte 0x80108A40 ;# ptr + .4byte 0x80120E50 ;# ptr + .4byte 0x80108A20 ;# ptr + .4byte 0x80108A10 ;# ptr + .4byte 0x801089F0 ;# ptr + .4byte 0x801089E0 ;# ptr + .4byte 0x801089D0 ;# ptr + .4byte 0x80120E60 ;# ptr + .4byte 0x80120DD0 ;# ptr + .4byte 0x80120DE0 ;# ptr + .4byte 0x80120DF0 ;# ptr + .4byte 0x80108A30 ;# ptr + .4byte 0x80108A00 ;# ptr + .4byte 0x80120E70 ;# ptr + .4byte 0x80120D10 ;# ptr + .4byte 0x80120D50 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r2ut13DvdFileStream diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream.s b/asm/libnw4r_ut/ut_DvdLockedFileStream.s index 58ab1925..3daffe39 100644 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream.s +++ b/asm/libnw4r_ut/ut_DvdLockedFileStream.s @@ -291,12 +291,37 @@ __sinit_$$3ut_DvdLockedFileStream_cpp: /* 8012128C 0011D0CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023B8, 0x4 + .4byte 0x80121280 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19DvdLockedFileStream __vt__Q34nw4r2ut19DvdLockedFileStream: - .incbin "baserom.dol", 0x43E870, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80108A80 ;# ptr + .4byte 0x80120FC0 ;# ptr + .4byte 0x80121020 ;# ptr + .4byte 0x80121060 ;# ptr + .4byte 0x80108A70 ;# ptr + .4byte 0x80120630 ;# ptr + .4byte 0x80120640 ;# ptr + .4byte 0x80108A40 ;# ptr + .4byte 0x80108A50 ;# ptr + .4byte 0x80108A20 ;# ptr + .4byte 0x80108A10 ;# ptr + .4byte 0x801089F0 ;# ptr + .4byte 0x801089E0 ;# ptr + .4byte 0x801089D0 ;# ptr + .4byte 0x80120E60 ;# ptr + .4byte 0x80120DD0 ;# ptr + .4byte 0x80121220 ;# ptr + .4byte 0x80120DF0 ;# ptr + .4byte 0x80108A30 ;# ptr + .4byte 0x80108A00 ;# ptr + .4byte 0x80120E70 ;# ptr + .4byte 0x80121140 ;# ptr + .4byte 0x80108A60 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sMutex__Q34nw4r2ut19DvdLockedFileStream diff --git a/asm/libnw4r_ut/ut_FileStream.s b/asm/libnw4r_ut/ut_FileStream.s index 017baf12..100a8f7f 100644 --- a/asm/libnw4r_ut/ut_FileStream.s +++ b/asm/libnw4r_ut/ut_FileStream.s @@ -89,7 +89,7 @@ __sinit_$$3ut_FileStream_cpp: /* 8012076C 0011C5AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023B0, 0x4 + .4byte 0x80120760 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r2ut10FileStream diff --git a/asm/libnw4r_ut/ut_Font.s b/asm/libnw4r_ut/ut_Font.s index 20c1662d..9ccbb64f 100644 --- a/asm/libnw4r_ut/ut_Font.s +++ b/asm/libnw4r_ut/ut_Font.s @@ -55,13 +55,21 @@ lbl_801214F4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2560 $$2560: - .incbin "baserom.dol", 0x43E8D8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FE90 ;# ptr .global $$2561 $$2561: - .incbin "baserom.dol", 0x43E8E4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FF10 ;# ptr .global $$2562 $$2562: - .incbin "baserom.dol", 0x43E8F0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FF50 ;# ptr .global $$2563 $$2563: - .incbin "baserom.dol", 0x43E8FC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FF30 ;# ptr diff --git a/asm/libnw4r_ut/ut_IOStream.s b/asm/libnw4r_ut/ut_IOStream.s index 601c4ef4..2639709f 100644 --- a/asm/libnw4r_ut/ut_IOStream.s +++ b/asm/libnw4r_ut/ut_IOStream.s @@ -23,7 +23,7 @@ __sinit_$$3ut_IOStream_cpp: /* 8012065C 0011C49C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023AC, 0x4 + .4byte 0x80120650 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r2ut8IOStream diff --git a/asm/libnw4r_ut/ut_LockedCache.s b/asm/libnw4r_ut/ut_LockedCache.s index 9e07c539..d8ceb1a1 100644 --- a/asm/libnw4r_ut/ut_LockedCache.s +++ b/asm/libnw4r_ut/ut_LockedCache.s @@ -156,7 +156,7 @@ __sinit_$$3ut_LockedCache_cpp: /* 8012146C 0011D2AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023BC, 0x4 + .4byte 0x80121450 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global sLCImpl__Q34nw4r2ut28$$2unnamed$$2ut_LockedCache_cpp$$2 diff --git a/asm/libnw4r_ut/ut_ResFont.s b/asm/libnw4r_ut/ut_ResFont.s index 1e701ac4..feac12fd 100644 --- a/asm/libnw4r_ut/ut_ResFont.s +++ b/asm/libnw4r_ut/ut_ResFont.s @@ -234,4 +234,27 @@ lbl_801225EC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut7ResFont __vt__Q34nw4r2ut7ResFont: - .incbin "baserom.dol", 0x43EA38, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x80122340 ;# ptr + .4byte 0x80121C30 ;# ptr + .4byte 0x80121C40 ;# ptr + .4byte 0x80121C50 ;# ptr + .4byte 0x80121C60 ;# ptr + .4byte 0x80121C80 ;# ptr + .4byte 0x80121CA0 ;# ptr + .4byte 0x80121CB0 ;# ptr + .4byte 0x80121CC0 ;# ptr + .4byte 0x80121CD0 ;# ptr + .4byte 0x80121CE0 ;# ptr + .4byte 0x80121CF0 ;# ptr + .4byte 0x80121D00 ;# ptr + .4byte 0x80121D20 ;# ptr + .4byte 0x80121D40 ;# ptr + .4byte 0x80121E00 ;# ptr + .4byte 0x80121E10 ;# ptr + .4byte 0x80121E60 ;# ptr + .4byte 0x80121F80 ;# ptr + .4byte 0x80122050 ;# ptr + .4byte 0x80122110 ;# ptr + .4byte 0 diff --git a/asm/libnw4r_ut/ut_ResFontBase.s b/asm/libnw4r_ut/ut_ResFontBase.s index 59282df6..3e297861 100644 --- a/asm/libnw4r_ut/ut_ResFontBase.s +++ b/asm/libnw4r_ut/ut_ResFontBase.s @@ -599,7 +599,31 @@ lbl_801222A0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21039 $$21039: - .incbin "baserom.dol", 0x43E9D0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FF30 ;# ptr .global __vt__Q44nw4r2ut6detail11ResFontBase __vt__Q44nw4r2ut6detail11ResFontBase: - .incbin "baserom.dol", 0x43E9DC, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x80121BF0 ;# ptr + .4byte 0x80121C30 ;# ptr + .4byte 0x80121C40 ;# ptr + .4byte 0x80121C50 ;# ptr + .4byte 0x80121C60 ;# ptr + .4byte 0x80121C80 ;# ptr + .4byte 0x80121CA0 ;# ptr + .4byte 0x80121CB0 ;# ptr + .4byte 0x80121CC0 ;# ptr + .4byte 0x80121CD0 ;# ptr + .4byte 0x80121CE0 ;# ptr + .4byte 0x80121CF0 ;# ptr + .4byte 0x80121D00 ;# ptr + .4byte 0x80121D20 ;# ptr + .4byte 0x80121D40 ;# ptr + .4byte 0x80121E00 ;# ptr + .4byte 0x80121E10 ;# ptr + .4byte 0x80121E60 ;# ptr + .4byte 0x80121F80 ;# ptr + .4byte 0x80122050 ;# ptr + .4byte 0x80122110 ;# ptr diff --git a/asm/libnw4r_ut/ut_RomFont.s b/asm/libnw4r_ut/ut_RomFont.s index ab744c8a..082314c9 100644 --- a/asm/libnw4r_ut/ut_RomFont.s +++ b/asm/libnw4r_ut/ut_RomFont.s @@ -521,15 +521,63 @@ lbl_80121B88: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2943 $$2943: - .incbin "baserom.dol", 0x43E908, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8011FF30 ;# ptr .global __vt__Q34nw4r2ut7RomFont __vt__Q34nw4r2ut7RomFont: - .incbin "baserom.dol", 0x43E914, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x80121580 ;# ptr + .4byte 0x801216E0 ;# ptr + .4byte 0x801216F0 ;# ptr + .4byte 0x80121750 ;# ptr + .4byte 0x80121760 ;# ptr + .4byte 0x80121770 ;# ptr + .4byte 0x80121780 ;# ptr + .4byte 0x80121790 ;# ptr + .4byte 0x801217A0 ;# ptr + .4byte 0x801217B0 ;# ptr + .4byte 0x801217C0 ;# ptr + .4byte 0x801217D0 ;# ptr + .4byte 0x801217E0 ;# ptr + .4byte 0x80121800 ;# ptr + .4byte 0x80121820 ;# ptr + .4byte 0x801218B0 ;# ptr + .4byte 0x801218C0 ;# ptr + .4byte 0x80121950 ;# ptr + .4byte 0x801219A0 ;# ptr + .4byte 0x80121AA0 ;# ptr + .4byte 0x80121B60 ;# ptr .global __vt__Q34nw4r2ut4Font __vt__Q34nw4r2ut4Font: - .incbin "baserom.dol", 0x43E970, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x800F6560 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global mFontEncode__Q34nw4r2ut7RomFont mFontEncode__Q34nw4r2ut7RomFont: - .incbin "baserom.dol", 0x492E58, 0x8 + .4byte 0xFFFF0000 + .4byte 0 diff --git a/asm/libnw4r_ut/ut_TagProcessorBase.s b/asm/libnw4r_ut/ut_TagProcessorBase.s index c4ad6996..58adf978 100644 --- a/asm/libnw4r_ut/ut_TagProcessorBase.s +++ b/asm/libnw4r_ut/ut_TagProcessorBase.s @@ -472,12 +472,21 @@ lbl_801205FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1 __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1: - .incbin "baserom.dol", 0x43E7E0, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x80120300 ;# ptr + .4byte 0x80120310 ;# ptr + .4byte 0x80120440 ;# ptr .global __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1 __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1: - .incbin "baserom.dol", 0x43E7F4, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x8011FFC0 ;# ptr + .4byte 0x8011FFD0 ;# ptr + .4byte 0x80120100 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24919 $$24919: - .incbin "baserom.dol", 0x49A020, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ut/ut_TextWriterBase.s b/asm/libnw4r_ut/ut_TextWriterBase.s index afa07a35..f530183d 100644 --- a/asm/libnw4r_ut/ut_TextWriterBase.s +++ b/asm/libnw4r_ut/ut_TextWriterBase.s @@ -3295,26 +3295,29 @@ lbl_80126CC4: /* 80126CDC 00122B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023C0, 0x4 + .4byte 0x80126C50 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global mFormatBufferSize__Q34nw4r2ut17TextWriterBase$$0c$$1 mFormatBufferSize__Q34nw4r2ut17TextWriterBase$$0c$$1: - .incbin "baserom.dol", 0x492E60, 0x8 + .4byte 0x00000100 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28480 $$28480: - .incbin "baserom.dol", 0x49A048, 0x4 + .4byte 0x7F7FFFFF .global $$28481 $$28481: - .incbin "baserom.dol", 0x49A04C, 0x4 + .4byte 0 .global $$28501 $$28501: - .incbin "baserom.dol", 0x49A050, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$29845 $$29845: - .incbin "baserom.dol", 0x49A058, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$26159 diff --git a/asm/mem/mem_allocator.s b/asm/mem/mem_allocator.s index e02c2b3e..0625eab1 100644 --- a/asm/mem/mem_allocator.s +++ b/asm/mem/mem_allocator.s @@ -43,4 +43,5 @@ MEMInitAllocatorForExpHeap: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc: - .incbin "baserom.dol", 0x4994A8, 0x8 + .4byte 0x800A37D0 ;# ptr + .4byte 0x800A37E0 ;# ptr diff --git a/asm/mtx/mtx.s b/asm/mtx/mtx.s index 14f95b26..de94eb78 100644 --- a/asm/mtx/mtx.s +++ b/asm/mtx/mtx.s @@ -838,27 +838,29 @@ C_MTXLightOrtho: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global Unit01 Unit01: - .incbin "baserom.dol", 0x492940, 0x8 + .4byte 0 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21635 $$21635: - .incbin "baserom.dol", 0x499070, 0x4 + .4byte 0x3F800000 .global $$21636 $$21636: - .incbin "baserom.dol", 0x499074, 0x4 + .4byte 0 .global $$21729 $$21729: - .incbin "baserom.dol", 0x499078, 0x4 + .4byte 0x3F000000 .global $$21730 $$21730: - .incbin "baserom.dol", 0x49907C, 0x4 + .4byte 0x40400000 .global $$21756 $$21756: - .incbin "baserom.dol", 0x499080, 0x4 + .4byte 0x40000000 .global $$21779 $$21779: - .incbin "baserom.dol", 0x499084, 0x4 + .4byte 0xBF800000 .global $$21786 $$21786: - .incbin "baserom.dol", 0x499088, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 diff --git a/asm/mtx/mtx44.s b/asm/mtx/mtx44.s index 68a6525a..d23c64f1 100644 --- a/asm/mtx/mtx44.s +++ b/asm/mtx/mtx44.s @@ -224,19 +224,19 @@ PSMTX44Concat: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21671 $$21671: - .incbin "baserom.dol", 0x499090, 0x4 + .4byte 0x3F800000 .global $$21672 $$21672: - .incbin "baserom.dol", 0x499094, 0x4 + .4byte 0x40000000 .global $$21673 $$21673: - .incbin "baserom.dol", 0x499098, 0x4 + .4byte 0 .global $$21674 $$21674: - .incbin "baserom.dol", 0x49909C, 0x4 + .4byte 0xBF800000 .global $$21681 $$21681: - .incbin "baserom.dol", 0x4990A0, 0x4 + .4byte 0x3F000000 .global $$21682 $$21682: - .incbin "baserom.dol", 0x4990A4, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/mtx/quat.s b/asm/mtx/quat.s index cac3ff8b..bb56ef26 100644 --- a/asm/mtx/quat.s +++ b/asm/mtx/quat.s @@ -308,18 +308,21 @@ lbl_80031B80: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21420 $$21420: - .incbin "baserom.dol", 0x403940, 0x10 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21598 $$21598: - .incbin "baserom.dol", 0x4990B8, 0x4 + .4byte 0x3F800000 .global $$21599 $$21599: - .incbin "baserom.dol", 0x4990BC, 0x4 + .4byte 0 .global $$21603 $$21603: - .incbin "baserom.dol", 0x4990C0, 0x4 + .4byte 0x3F000000 .global $$21754 $$21754: - .incbin "baserom.dol", 0x4990C4, 0x4 + .4byte 0x3F7FFF58 diff --git a/asm/mtx/vec.s b/asm/mtx/vec.s index b00201e4..60d5b549 100644 --- a/asm/mtx/vec.s +++ b/asm/mtx/vec.s @@ -171,10 +171,11 @@ PSVECSquareDistance: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21414 $$21414: - .incbin "baserom.dol", 0x4990A8, 0x4 + .4byte 0x3F000000 .global $$21415 $$21415: - .incbin "baserom.dol", 0x4990AC, 0x4 + .4byte 0x40400000 .global $$21443 $$21443: - .incbin "baserom.dol", 0x4990B0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/nand/NANDCheck.s b/asm/nand/NANDCheck.s index d9bba53f..fece58e1 100644 --- a/asm/nand/NANDCheck.s +++ b/asm/nand/NANDCheck.s @@ -139,36 +139,49 @@ lbl_8004AABC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22294 $$22294: - .incbin "baserom.dol", 0x4325D0, 0x10 + .asciz "/title/00010000" .global $$22295 $$22295: - .incbin "baserom.dol", 0x4325E0, 0x10 + .asciz "/title/00010001" .global $$22296 $$22296: - .incbin "baserom.dol", 0x4325F0, 0x10 + .asciz "/title/00010003" .global $$22297 $$22297: - .incbin "baserom.dol", 0x432600, 0x10 + .asciz "/title/00010004" .global $$22298 $$22298: - .incbin "baserom.dol", 0x432610, 0x10 + .asciz "/title/00010005" .global $$22299 $$22299: - .incbin "baserom.dol", 0x432620, 0x10 + .asciz "/title/00010006" .global $$22300 $$22300: - .incbin "baserom.dol", 0x432630, 0x10 + .asciz "/title/00010007" .global $$22301 $$22301: - .incbin "baserom.dol", 0x432640, 0x10 + .asciz "/shared2/title" + .balign 4 .global USER_DIR_LIST USER_DIR_LIST: - .incbin "baserom.dol", 0x432650, 0x30 + .4byte 0x80556660 + .4byte 0x80556668 + .4byte 0x804364D0 + .4byte 0x804364E0 + .4byte 0x804364F0 + .4byte 0x80436500 + .4byte 0x80436510 + .4byte 0x80436520 + .4byte 0x80436530 + .4byte 0x80436540 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22292 $$22292: - .incbin "baserom.dol", 0x492A40, 0x8 + .asciz "/meta" + .balign 4 .global $$22293 $$22293: - .incbin "baserom.dol", 0x492A48, 0x8 + .asciz "/ticket" diff --git a/asm/nand/NANDCore.s b/asm/nand/NANDCore.s index 63abea6c..2aa502b1 100644 --- a/asm/nand/NANDCore.s +++ b/asm/nand/NANDCore.s @@ -1296,59 +1296,171 @@ nandGetHomeDir: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$23073 $$23073: - .incbin "baserom.dol", 0x4039F0, 0x148 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFF9A + .4byte 0xFFFFFFFF + .4byte 0xFFFFFF99 + .4byte 0xFFFFFFFC + .4byte 0xFFFFFF8E + .4byte 0xFFFFFFFB + .4byte 0xFFFFFF97 + .4byte 0xFFFFFFFA + .4byte 0xFFFFFF8C + .4byte 0xFFFFFFF1 + .4byte 0xFFFFFF9B + .4byte 0xFFFFFFF8 + .4byte 0xFFFFFF94 + .4byte 0xFFFFFFF7 + .4byte 0xFFFFFF93 + .4byte 0xFFFFFFF6 + .4byte 0xFFFFFF95 + .4byte 0xFFFFFFF5 + .4byte 0xFFFFFF92 + .4byte 0xFFFFFFF0 + .4byte 0xFFFFFF96 + .4byte 0xFFFFFFF4 + .4byte 0xFFFFFF8D + .4byte 0xFFFFFFF3 + .4byte 0xFFFFFF98 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFF91 + .4byte 0xFFFFFFF2 + .4byte 0xFFFFFF8B + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFF8A + .4byte 0xFFFFFFFD + .4byte 0xFFFFFF89 + .4byte 0xFFFFFF80 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFA + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFF8 + .4byte 0xFFFFFFFB + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFFA + .4byte 0xFFFFFFF4 + .4byte 0xFFFFFFF9 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF8 + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFF7 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF6 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF5 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF4 + .4byte 0xFFFFFFFB + .4byte 0xFFFFFFF3 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF2 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF1 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFF0 + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFEF + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFEE + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFED + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFEC + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFEB + .4byte 0xFFFFFFC0 + .4byte 0xFFFFFFEA + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFE9 + .4byte 0xFFFFFFC0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22807 $$22807: - .incbin "baserom.dol", 0x432480, 0x60 + .asciz "<< RVL_SDK - NAND \trelease build: Aug 23 2010 17:33:46 (0x4302_145) >>" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global s_currentDir s_currentDir: - .incbin "baserom.dol", 0x4324E0, 0x40 + .4byte 0x2F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global s_shutdownFuncInfo s_shutdownFuncInfo: - .incbin "baserom.dol", 0x432520, 0x10 + .4byte 0x8004A010 ;# ptr + .4byte 0x000000FF + .4byte 0 + .4byte 0 .global $$23814 $$23814: - .incbin "baserom.dol", 0x432530, 0xC + .asciz "/shared2" + .balign 4 .global $$23818 $$23818: - .incbin "baserom.dol", 0x43253C, 0xC + .asciz "/shared2/" + .balign 4 .global $$23849 $$23849: - .incbin "baserom.dol", 0x432548, 0x14 + .asciz "ISFS error code: %d" .global $$23850 $$23850: - .incbin "baserom.dol", 0x43255C, 0x34 + .asciz "CAUTION! Unexpected error code [%d] was found.\n" + .balign 4 .global $$23851 $$23851: - .incbin "baserom.dol", 0x432590, 0x20 + .asciz "ISFS unexpected error code: %d" + .balign 4 .global $$23880 $$23880: - .incbin "baserom.dol", 0x4325B0, 0x20 + .asciz "Failed to set home directory.\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __NANDVersion __NANDVersion: - .incbin "baserom.dol", 0x492A20, 0x4 + .4byte 0x80436380 .global $$23783 $$23783: - .incbin "baserom.dol", 0x492A24, 0x4 + .4byte 0x2F000000 .global $$23784 $$23784: - .incbin "baserom.dol", 0x492A28, 0x4 + .4byte 0 .global $$23797 $$23797: - .incbin "baserom.dol", 0x492A2C, 0x4 + .4byte 0x2E000000 .global $$23798 $$23798: - .incbin "baserom.dol", 0x492A30, 0x4 + .4byte 0x2E2E0000 .global $$23799 $$23799: - .incbin "baserom.dol", 0x492A34, 0x4 + .4byte 0x2F257300 .global $$23800 $$23800: - .incbin "baserom.dol", 0x492A38, 0x8 + .asciz "%s/%s" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global s_homeDir diff --git a/asm/nand/NANDErrorMessage.s b/asm/nand/NANDErrorMessage.s index 23f8853f..a6eedb4e 100644 --- a/asm/nand/NANDErrorMessage.s +++ b/asm/nand/NANDErrorMessage.s @@ -228,227 +228,1297 @@ __NANDPrintErrorMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __NANDMaxBlocksErrorMessageDefault __NANDMaxBlocksErrorMessageDefault: - .incbin "baserom.dol", 0x403B38, 0x1C + .4byte 0x804365C8 + .4byte 0x80436624 + .4byte 0x80436690 + .4byte 0x8043670C + .4byte 0x8043679C + .4byte 0x8043682C + .4byte 0x804368BC .global __NANDMaxBlocksErrorMessageEurope __NANDMaxBlocksErrorMessageEurope: - .incbin "baserom.dol", 0x403B54, 0x1C + .4byte 0x804365C8 + .4byte 0x80436934 + .4byte 0x80436690 + .4byte 0x804369AC + .4byte 0x80436A38 + .4byte 0x8043682C + .4byte 0x804368BC .global __NANDMaxFilesErrorMessageDefault __NANDMaxFilesErrorMessageDefault: - .incbin "baserom.dol", 0x403B70, 0x1C + .4byte 0x80436BB4 + .4byte 0x80436624 + .4byte 0x80436690 + .4byte 0x80436C18 + .4byte 0x80436CA8 + .4byte 0x80436D38 + .4byte 0x80436DCC .global __NANDMaxFilesErrorMessageEurope __NANDMaxFilesErrorMessageEurope: - .incbin "baserom.dol", 0x403B8C, 0x1C + .4byte 0x80436BB4 + .4byte 0x80436934 + .4byte 0x80436690 + .4byte 0x804369AC + .4byte 0x80436A38 + .4byte 0x80436D38 + .4byte 0x80436DCC .global __NANDCorruptErrorMessageDefault __NANDCorruptErrorMessageDefault: - .incbin "baserom.dol", 0x403BA8, 0x1C + .4byte 0x80436F3C + .4byte 0x80436F90 + .4byte 0x80436FEC + .4byte 0x8043706C + .4byte 0x804370E8 + .4byte 0x80437168 + .4byte 0x804371E8 .global __NANDCorruptErrorMessageEurope __NANDCorruptErrorMessageEurope: - .incbin "baserom.dol", 0x403BC4, 0x1C + .4byte 0x80436F3C + .4byte 0x80437254 + .4byte 0x804372B8 + .4byte 0x80437338 + .4byte 0x804373AC + .4byte 0x80437168 + .4byte 0x804371E8 .global __NANDBusyErrorMessageDefault __NANDBusyErrorMessageDefault: - .incbin "baserom.dol", 0x403BE0, 0x1C + .4byte 0x80437504 + .4byte 0x80437574 + .4byte 0x804375CC + .4byte 0x80437660 + .4byte 0x804376E0 + .4byte 0x80437770 + .4byte 0x804377F8 .global __NANDBusyErrorMessageEurope __NANDBusyErrorMessageEurope: - .incbin "baserom.dol", 0x403BFC, 0x1C + .4byte 0x80437504 + .4byte 0x8043787C + .4byte 0x804375CC + .4byte 0x804378E0 + .4byte 0x8043795C + .4byte 0x80437770 + .4byte 0x804377F8 .global __NANDUnknownErrorMessageDefault __NANDUnknownErrorMessageDefault: - .incbin "baserom.dol", 0x403C18, 0x1C + .4byte 0x80437AD4 + .4byte 0x80437B48 + .4byte 0x80437BB0 + .4byte 0x80437C4C + .4byte 0x80437D00 + .4byte 0x80437DA4 + .4byte 0x80437E68 .global __NANDUnknownErrorMessageEurope __NANDUnknownErrorMessageEurope: - .incbin "baserom.dol", 0x403C34, 0x1C + .4byte 0x80437AD4 + .4byte 0x80437F04 + .4byte 0x80437BB0 + .4byte 0x80437F98 + .4byte 0x80438048 + .4byte 0x80437DA4 + .4byte 0x80437E68 .global $$21868 $$21868: - .incbin "baserom.dol", 0x403C50, 0x100 + .4byte 0xFFFFFF94 + .4byte 0 + .4byte 0x80407A38 + .4byte 0xFFFFFF95 + .4byte 0 + .4byte 0x80407A70 + .4byte 0xFFFFFF99 + .4byte 0 + .4byte 0x80407AA8 + .4byte 0xFFFFFF8A + .4byte 0 + .4byte 0x80407AE0 + .4byte 0xFFFFFFEA + .4byte 0 + .4byte 0x80407AE0 + .4byte 0xFFFFFF8B + .4byte 0 + .4byte 0x80407B18 + .4byte 0xFFFFFFF7 + .4byte 0 + .4byte 0x80407B18 + .4byte 0xFFFFFF94 + .4byte 0x00000001 + .4byte 0x80407A54 + .4byte 0xFFFFFF95 + .4byte 0x00000001 + .4byte 0x80407A8C + .4byte 0xFFFFFF99 + .4byte 0x00000001 + .4byte 0x80407AC4 + .4byte 0xFFFFFF8A + .4byte 0x00000001 + .4byte 0x80407AFC + .4byte 0xFFFFFFEA + .4byte 0x00000001 + .4byte 0x80407AFC + .4byte 0xFFFFFF8B + .4byte 0x00000001 + .4byte 0x80407B34 + .4byte 0xFFFFFFF7 + .4byte 0x00000001 + .4byte 0x80407B34 + .4byte 0xFFFFFF94 + .4byte 0x00000002 + .4byte 0x8055E710 + .4byte 0xFFFFFF95 + .4byte 0x00000002 + .4byte 0x8055E718 + .4byte 0xFFFFFF99 + .4byte 0x00000002 + .4byte 0x8055E720 + .4byte 0xFFFFFF8A + .4byte 0x00000002 + .4byte 0x8055E728 + .4byte 0xFFFFFFEA + .4byte 0x00000002 + .4byte 0x8055E728 + .4byte 0xFFFFFF8B + .4byte 0x00000002 + .4byte 0x8055E730 + .4byte 0xFFFFFFF7 + .4byte 0x00000002 + .4byte 0x8055E730 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21805 $$21805: - .incbin "baserom.dol", 0x4326C8, 0x5C + .4byte 0x0A0A0A57 + .4byte 0x6969967B + .4byte 0x91CC95DB + .4byte 0x91B68381 + .4byte 0x8382838A + .4byte 0x82CC8BF3 + .4byte 0x82AB9765 + .4byte 0x97CA82AA + .4byte 0x88D98FED + .4byte 0x82C582B7 + .4byte 0x81420A82 + .4byte 0xAD82ED82 + .4byte 0xB582AD82 + .4byte 0xCD576969 + .4byte 0x967B91CC + .4byte 0x82CC8EE6 + .4byte 0x88B590E0 + .4byte 0x96BE8F91 + .4byte 0x82F082A8 + .4byte 0x93C782DD + .4byte 0x0A82AD82 + .4byte 0xBE82B382 + .4byte 0xA2814200 .global $$21806 $$21806: - .incbin "baserom.dol", 0x432724, 0x6C + .asciz "\n\n\nThere is no more available space in\nWii system memory. Refer to the Wii\nOperations Manual for details." + .balign 4 .global $$21807 $$21807: - .incbin "baserom.dol", 0x432790, 0x7C + .asciz "\n\n\nDer Speicher der Wii-Konsole ist belegt.\nBitte lies die Wii-Bedienungsanleitung,\num weitere Informationen zu erhalten." + .balign 4 .global $$21808 $$21808: - .incbin "baserom.dol", 0x43280C, 0x90 + .4byte 0x0A0A0A49 + .4byte 0x6C206E27 + .4byte 0x79206120 + .4byte 0x70617320 + .4byte 0x61737365 + .4byte 0x7A206427 + .4byte 0x65737061 + .4byte 0x6365206C + .4byte 0x69627265 + .4byte 0x0A64616E + .4byte 0x73206C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E0A + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x204D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F690A64 + .4byte 0x65206C61 + .4byte 0x20576969 + .4byte 0x20706F75 + .4byte 0x7220706C + .4byte 0x75732064 + .4byte 0x652064E9 + .asciz "tails." + .balign 4 .global $$21809 $$21809: - .incbin "baserom.dol", 0x43289C, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F207175 + .4byte 0x65646120 + .4byte 0x65737061 + .4byte 0x63696F20 + .4byte 0x6C696272 + .4byte 0x6520656E + .4byte 0x206C6120 + .4byte 0x6D656D6F + .4byte 0x7269610A + .4byte 0x6465206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x692E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C0A6465 + .4byte 0x206F7065 + .4byte 0x72616369 + .4byte 0x6F6E6573 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692070 + .4byte 0x6172610A + .4byte 0x6F627465 + .4byte 0x6E657220 + .4byte 0x6DE17320 + .4byte 0x696E666F + .4byte 0x726D6163 + .4byte 0x69F36E2E + .4byte 0 .global $$21810 $$21810: - .incbin "baserom.dol", 0x43292C, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F6E2063 + .4byte 0x27E82070 + .4byte 0x69F92073 + .asciz "pazio libero nella memoria\ndella console Wii. Per maggiori\ninformazioni, consulta il manuale di\nistruzioni della console Wii." + .balign 4 .global $$21811 $$21811: - .incbin "baserom.dol", 0x4329BC, 0x78 + .asciz "\n\n\nEr is geen vrije ruimte meer in het\ninterne geheugen van het Wii-systeem.\nLees de handleiding voor meer informatie." + .balign 4 .global $$21812 $$21812: - .incbin "baserom.dol", 0x432A34, 0x78 + .asciz "\n\n\nThere is no more available space in\nthe Wii System Memory. Please refer to\nthe Wii Operations Manual for details." + .balign 4 .global $$21813 $$21813: - .incbin "baserom.dol", 0x432AAC, 0x8C + .4byte 0x0A0A0A49 + .4byte 0x6C206E27 + .4byte 0x79206120 + .4byte 0x70617320 + .4byte 0x61737365 + .4byte 0x7A206427 + .4byte 0x65737061 + .4byte 0x6365206C + .4byte 0x69627265 + .4byte 0x2064616E + .4byte 0x730A6C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x0A766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x206D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692057 + .4byte 0x69692070 + .4byte 0x6F75720A + .4byte 0x706C7573 + .4byte 0x20646520 + .4byte 0x64E97461 + .asciz "ils." + .balign 4 .global $$21814 $$21814: - .incbin "baserom.dol", 0x432B38, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F207175 + .4byte 0x65646120 + .4byte 0x65737061 + .4byte 0x63696F20 + .4byte 0x6C696272 + .4byte 0x6520656E + .4byte 0x206C6120 + .4byte 0x6D656D6F + .4byte 0x72696120 + .4byte 0x64650A6C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x692E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C206465 + .4byte 0x0A696E73 + .4byte 0x74727563 + .4byte 0x63696F6E + .4byte 0x65732064 + .4byte 0x65206C61 + .4byte 0x20636F6E + .4byte 0x736F6C61 + .4byte 0x20576969 + .4byte 0x20706172 + .4byte 0x610A6F62 + .4byte 0x74656E65 + .4byte 0x72206DE1 + .4byte 0x7320696E + .4byte 0x666F726D + .4byte 0x616369F3 + .4byte 0x6E2E0000 .global $$21815 $$21815: - .incbin "baserom.dol", 0x432BC8, 0x74 + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688253 + .4byte 0x824F8254 + .4byte 0x81420A0A + .4byte 0x57696996 + .4byte 0x7B91CC95 + .4byte 0xDB91B683 + .4byte 0x81838283 + .4byte 0x8A82CC8B + .4byte 0xF382AB97 + .4byte 0x6597CA82 + .4byte 0xAA88D98F + .4byte 0xED82C582 + .4byte 0xB781420A + .4byte 0x82AD82ED + .4byte 0x82B582AD + .4byte 0x82CD5769 + .4byte 0x69967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182F082 + .4byte 0xA893C782 + .4byte 0xDD0A82AD + .4byte 0x82BE82B3 + .4byte 0x82A28142 + .4byte 0 .global $$21816 $$21816: - .incbin "baserom.dol", 0x432C3C, 0x78 + .asciz "\n\nError #405,\n\nThere is no more available space in\nWii system memory. Refer to the Wii\nOperations Manual for details." + .balign 4 .global $$21817 $$21817: - .incbin "baserom.dol", 0x432CB4, 0x64 + .4byte 0x0A0A0A57 + .4byte 0x6969967B + .4byte 0x91CC95DB + .4byte 0x91B68381 + .4byte 0x8382838A + .4byte 0x82CC8BF3 + .4byte 0x82AB8374 + .4byte 0x83408343 + .4byte 0x838B9094 + .4byte 0x82AA88D9 + .4byte 0x8FED82C5 + .4byte 0x82B78142 + .4byte 0x0A82AD82 + .4byte 0xED82B582 + .4byte 0xAD82CD57 + .4byte 0x6969967B + .4byte 0x91CC82CC + .4byte 0x8EE688B5 + .4byte 0x90E096BE + .4byte 0x8F9182F0 + .4byte 0x82A893C7 + .4byte 0x82DD0A82 + .4byte 0xAD82BE82 + .4byte 0xB382A281 + .4byte 0x42000000 .global $$21818 $$21818: - .incbin "baserom.dol", 0x432D18, 0x90 + .4byte 0x0A0A0A49 + .4byte 0x6C206E27 + .4byte 0x79206120 + .4byte 0x70617320 + .4byte 0x61737365 + .4byte 0x7A206427 + .4byte 0x65737061 + .4byte 0x6365206C + .4byte 0x69627265 + .4byte 0x2064616E + .4byte 0x730A6C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x0A766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x204D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692064 + .4byte 0x65206C61 + .4byte 0x20576969 + .4byte 0x0A706F75 + .4byte 0x7220706C + .4byte 0x75732064 + .4byte 0x652064E9 + .asciz "tails." + .balign 4 .global $$21819 $$21819: - .incbin "baserom.dol", 0x432DA8, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F207175 + .4byte 0x65646120 + .4byte 0x65737061 + .4byte 0x63696F20 + .4byte 0x6C696272 + .4byte 0x6520656E + .4byte 0x206C6120 + .4byte 0x6D656D6F + .4byte 0x72696120 + .4byte 0x64650A6C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x692E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C206465 + .4byte 0x0A6F7065 + .4byte 0x72616369 + .4byte 0x6F6E6573 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692070 + .4byte 0x6172610A + .4byte 0x6F627465 + .4byte 0x6E657220 + .4byte 0x6DE17320 + .4byte 0x696E666F + .4byte 0x726D6163 + .4byte 0x69F36E2E + .4byte 0 .global $$21820 $$21820: - .incbin "baserom.dol", 0x432E38, 0x94 + .asciz "\n\n\nImpossibile salvare altri dati nella\nmemoria della console Wii. Per maggiori\ninformazioni, consulta il manuale di\nistruzioni della console Wii." + .balign 4 .global $$21821 $$21821: - .incbin "baserom.dol", 0x432ECC, 0x80 + .asciz "\n\n\nEr is geen ruimte meer beschikbaar\nin het interne geheugen van het\nWii-systeem. Lees de handleiding voor\nmeer informatie." + .balign 4 .global $$21822 $$21822: - .incbin "baserom.dol", 0x432F4C, 0x78 + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688253 + .4byte 0x824F8255 + .4byte 0x81420A0A + .4byte 0x57696996 + .4byte 0x7B91CC95 + .4byte 0xDB91B683 + .4byte 0x81838283 + .4byte 0x8A82CC8B + .4byte 0xF382AB83 + .4byte 0x74834083 + .4byte 0x43838B90 + .4byte 0x9482AA88 + .4byte 0xD98FED82 + .4byte 0xC582B781 + .4byte 0x420A82AD + .4byte 0x82ED82B5 + .4byte 0x82AD82CD + .4byte 0x57696996 + .4byte 0x7B91CC82 + .4byte 0xCC8EE688 + .4byte 0xB590E096 + .4byte 0xBE8F9182 + .4byte 0xF082A893 + .4byte 0xC782DD0A + .4byte 0x82AD82BE + .4byte 0x82B382A2 + .4byte 0x81420000 .global $$21823 $$21823: - .incbin "baserom.dol", 0x432FC4, 0x78 + .asciz "\n\nError #406,\n\nThere is no more available space in\nWii system memory. Refer to the Wii\nOperations Manual for details." + .balign 4 .global $$21824 $$21824: - .incbin "baserom.dol", 0x43303C, 0x54 + .4byte 0x0A0A0A57 + .4byte 0x6969967B + .4byte 0x91CC95DB + .4byte 0x91B68381 + .4byte 0x8382838A + .4byte 0x82AA89F3 + .4byte 0x82EA82DC + .4byte 0x82B582BD + .4byte 0x81420A82 + .4byte 0xAD82ED82 + .4byte 0xB582AD82 + .4byte 0xCD576969 + .4byte 0x967B91CC + .4byte 0x82CC8EE6 + .4byte 0x88B590E0 + .4byte 0x96BE8F91 + .4byte 0x82F082A8 + .4byte 0x93C782DD + .4byte 0x0A82AD82 + .4byte 0xBE82B382 + .4byte 0xA2814200 .global $$21825 $$21825: - .incbin "baserom.dol", 0x433090, 0x5C + .asciz "\n\n\nThe Wii system memory has been damaged.\nRefer to the Wii Operations Manual for\ndetails." + .balign 4 .global $$21826 $$21826: - .incbin "baserom.dol", 0x4330EC, 0x80 + .4byte 0x0A0A0A44 + .4byte 0x65722053 + .4byte 0x70656963 + .4byte 0x68657220 + .4byte 0x64657220 + .4byte 0x5769692D + .4byte 0x4B6F6E73 + .4byte 0x6F6C650A + .4byte 0x69737420 + .4byte 0x62657363 + .4byte 0x68E46469 + .asciz "gt. Bitte lies die\nWii-Bedienungsanleitung, um weitere\nInformationen zu erhalten." + .balign 4 .global $$21827 $$21827: - .incbin "baserom.dol", 0x43316C, 0x7C + .4byte 0x0A0A0A4C + .4byte 0x61206DE9 + .4byte 0x6D6F6972 + .4byte 0x65206465 + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6520 + .4byte 0x57696920 + .4byte 0x6120E974 + .4byte 0xE9200A65 + .4byte 0x6E646F6D + .4byte 0x6D6167E9 + .4byte 0x652E2056 + .4byte 0x6575696C + .4byte 0x6C657A20 + .4byte 0x766F7573 + .4byte 0x2072E966 + .4byte 0xE9726572 + .4byte 0x2061750A + .4byte 0x4D6F6465 + .4byte 0x20642765 + .4byte 0x6D706C6F + .4byte 0x69206465 + .4byte 0x206C6120 + .4byte 0x57696920 + .4byte 0x706F7572 + .4byte 0x20706C75 + .4byte 0x73206465 + .4byte 0x0A64E974 + .asciz "ails." + .balign 4 .global $$21828 $$21828: - .incbin "baserom.dol", 0x4331E8, 0x80 + .4byte 0x0A0A0A4C + .4byte 0x61206D65 + .4byte 0x6D6F7269 + .4byte 0x61206465 + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6120 + .4byte 0x5769690A + .4byte 0x657374E1 + .4byte 0x206461F1 + .4byte 0x6164612E + .4byte 0x20436F6E + .4byte 0x73756C74 + .4byte 0x6120656C + .4byte 0x206D616E + .4byte 0x75616C20 + .4byte 0x64650A6F + .4byte 0x70657261 + .4byte 0x63696F6E + .4byte 0x65732064 + .4byte 0x65206C61 + .4byte 0x20636F6E + .4byte 0x736F6C61 + .4byte 0x20576969 + .4byte 0x20706172 + .4byte 0x610A6F62 + .4byte 0x74656E65 + .4byte 0x72206DE1 + .4byte 0x7320696E + .4byte 0x666F726D + .4byte 0x616369F3 + .4byte 0x6E2E0000 .global $$21829 $$21829: - .incbin "baserom.dol", 0x433268, 0x80 + .asciz "\n\n\nLa memoria della console Wii e\ndanneggiata. Per maggiori informazioni,\nconsulta il manuale di istruzioni della\nconsole Wii." + .balign 4 .global $$21830 $$21830: - .incbin "baserom.dol", 0x4332E8, 0x6C + .asciz "\n\n\nHet interne geheugen van het\nWii-systeem is beschadigd. Lees de\nWii-handleiding voor meer informatie." + .balign 4 .global $$21831 $$21831: - .incbin "baserom.dol", 0x433354, 0x64 + .asciz "\n\n\nThe Wii System Memory has been damaged.\nPlease refer to the Wii Operations Manual\nfor details." + .balign 4 .global $$21832 $$21832: - .incbin "baserom.dol", 0x4333B8, 0x80 + .asciz "\n\n\nDer Speicher der Wii-Konsole\nist beschadigt. Bitte lies die\nWii-Bedienungsanleitung, um weitere\nInformationen zu erhalten." + .balign 4 .global $$21833 $$21833: - .incbin "baserom.dol", 0x433438, 0x74 + .4byte 0x0A0A0A4C + .4byte 0x61206DE9 + .4byte 0x6D6F6972 + .4byte 0x65206465 + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6520 + .4byte 0x57696920 + .4byte 0x6573740A + .4byte 0x656E646F + .4byte 0x6D6D6167 + .4byte 0xE9652E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x0A6D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692057 + .4byte 0x69692070 + .4byte 0x6F757220 + .4byte 0x706C7573 + .4byte 0x20646520 + .4byte 0x64E97461 + .asciz "ils.\n" + .balign 4 .global $$21834 $$21834: - .incbin "baserom.dol", 0x4334AC, 0x84 + .4byte 0x0A0A0A4C + .4byte 0x61206D65 + .4byte 0x6D6F7269 + .4byte 0x61206465 + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6120 + .4byte 0x57696920 + .4byte 0x657374E1 + .4byte 0x206461F1 + .4byte 0x6164612E + .4byte 0x0A436F6E + .4byte 0x73756C74 + .4byte 0x6120656C + .4byte 0x206D616E + .4byte 0x75616C20 + .4byte 0x64652069 + .4byte 0x6E737472 + .4byte 0x75636369 + .4byte 0x6F6E6573 + .4byte 0x20646520 + .4byte 0x6C610A63 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692070 + .4byte 0x61726120 + .4byte 0x6F627465 + .4byte 0x6E657220 + .4byte 0x6DE17320 + .4byte 0x696E666F + .4byte 0x726D6163 + .4byte 0x69F36E2E + .4byte 0 .global $$21835 $$21835: - .incbin "baserom.dol", 0x433530, 0x6C + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688253 + .4byte 0x824F8257 + .4byte 0x81420A0A + .4byte 0x57696996 + .4byte 0x7B91CC95 + .4byte 0xDB91B683 + .4byte 0x81838283 + .4byte 0x8A82AA89 + .4byte 0xF382EA82 + .4byte 0xDC82B582 + .4byte 0xBD81420A + .4byte 0x82AD82ED + .4byte 0x82B582AD + .4byte 0x82CD5769 + .4byte 0x69967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182F082 + .4byte 0xA893C782 + .4byte 0xDD0A82AD + .4byte 0x82BE82B3 + .4byte 0x82A28142 + .4byte 0 .global $$21836 $$21836: - .incbin "baserom.dol", 0x43359C, 0x68 + .asciz "\n\nError #408,\n\nThe Wii system memory has been damaged.\nRefer to the Wii Operations Manual for\ndetails." + .balign 4 .global $$21837 $$21837: - .incbin "baserom.dol", 0x433604, 0x70 + .4byte 0x0A0A0A57 + .4byte 0x6969967B + .4byte 0x91CC95DB + .4byte 0x91B68381 + .4byte 0x8382838A + .4byte 0x82CC8F91 + .4byte 0x82AB8D9E + .4byte 0x82DD2F93 + .4byte 0xC782DD8F + .4byte 0x6F82B582 + .4byte 0xAA0A82C5 + .4byte 0x82AB82DC + .4byte 0x82B982F1 + .4byte 0x82C582B5 + .4byte 0x82BD8142 + .4byte 0x0A82AD82 + .4byte 0xED82B582 + .4byte 0xAD82CD57 + .4byte 0x6969967B + .4byte 0x91CC82CC + .4byte 0x8EE688B5 + .4byte 0x90E096BE + .4byte 0x8F9182F0 + .4byte 0x82A893C7 + .4byte 0x82DD0A82 + .4byte 0xAD82BE82 + .4byte 0xB382A281 + .4byte 0x42000000 .global $$21838 $$21838: - .incbin "baserom.dol", 0x433674, 0x58 + .asciz "\n\n\nCould not access Wii system memory.\nRefer to the Wii Operations Manual for\ndetails." + .balign 4 .global $$21839 $$21839: - .incbin "baserom.dol", 0x4336CC, 0x94 + .asciz "\n\n\nAuf den Speicher der Wii-Konsole konnte\nnicht zugegriffen werden. Bitte lies die\nWii-Bedienungsanleitung, um weitere\nInformationen zu erhalten." + .balign 4 .global $$21840 $$21840: - .incbin "baserom.dol", 0x433760, 0x80 + .4byte 0x0A0A0A49 + .4byte 0x6D706F73 + .4byte 0x7369626C + .4byte 0x65206427 + .4byte 0x616363E9 + .4byte 0x64657220 + .4byte 0xE0206C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x2064650A + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x720A6175 + .4byte 0x204D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692064 + .4byte 0x65206C61 + .4byte 0x20576969 + .4byte 0x20706F75 + .4byte 0x7220706C + .4byte 0x75730A64 + .4byte 0x652064E9 + .asciz "tails." + .balign 4 .global $$21841 $$21841: - .incbin "baserom.dol", 0x4337E0, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F207365 + .4byte 0x20686120 + .4byte 0x706F6469 + .4byte 0x646F2061 + .4byte 0x63636564 + .4byte 0x65722061 + .4byte 0x206C6120 + .4byte 0x6D656D6F + .4byte 0x72696120 + .4byte 0x64650A6C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x692E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C206465 + .4byte 0x0A6F7065 + .4byte 0x72616369 + .4byte 0x6F6E6573 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692070 + .4byte 0x6172610A + .4byte 0x6F627465 + .4byte 0x6E657220 + .4byte 0x6DE17320 + .4byte 0x696E666F + .4byte 0x726D6163 + .4byte 0x69F36E2E + .4byte 0 .global $$21842 $$21842: - .incbin "baserom.dol", 0x433870, 0x88 + .asciz "\n\n\nImpossibile accedere alla memoria della\nconsole Wii. Per maggiori informazioni,\nconsulta il manuale di istruzioni della\nconsole Wii." .global $$21843 $$21843: - .incbin "baserom.dol", 0x4338F8, 0x84 + .asciz "\n\n\nHet interne geheugen van het Wii-systeem\nkan niet worden gelezen of beschreven.\nLees de Wii-handleiding voor meer\ninformatie." + .balign 4 .global $$21844 $$21844: - .incbin "baserom.dol", 0x43397C, 0x64 + .asciz "\n\n\nCould not access the Wii System Memory.Please refer to the Wii Operations Manual\nfor details." + .balign 4 .global $$21845 $$21845: - .incbin "baserom.dol", 0x4339E0, 0x7C + .4byte 0x0A0A0A49 + .4byte 0x6D706F73 + .4byte 0x7369626C + .4byte 0x65206427 + .4byte 0x616363E9 + .4byte 0x64657220 + .4byte 0xE0206C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x20646520 + .4byte 0x6C610A63 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x0A6D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692057 + .4byte 0x69692070 + .4byte 0x6F757220 + .4byte 0x706C7573 + .4byte 0x20646520 + .4byte 0x64E97461 + .asciz "ils." + .balign 4 .global $$21846 $$21846: - .incbin "baserom.dol", 0x433A5C, 0x90 + .4byte 0x0A0A0A4E + .4byte 0x6F207365 + .4byte 0x20686120 + .4byte 0x706F6469 + .4byte 0x646F2061 + .4byte 0x63636564 + .4byte 0x65722061 + .4byte 0x206C6120 + .4byte 0x6D656D6F + .4byte 0x72696120 + .4byte 0x64650A6C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x692E2043 + .4byte 0x6F6E7375 + .4byte 0x6C746120 + .4byte 0x656C206D + .4byte 0x616E7561 + .4byte 0x6C206465 + .4byte 0x0A696E73 + .4byte 0x74727563 + .4byte 0x63696F6E + .4byte 0x65732064 + .4byte 0x65206C61 + .4byte 0x20636F6E + .4byte 0x736F6C61 + .4byte 0x20576969 + .4byte 0x20706172 + .4byte 0x610A6F62 + .4byte 0x74656E65 + .4byte 0x72206DE1 + .4byte 0x7320696E + .4byte 0x666F726D + .4byte 0x616369F3 + .4byte 0x6E2E0000 .global $$21847 $$21847: - .incbin "baserom.dol", 0x433AEC, 0x84 + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688253 + .4byte 0x82508250 + .4byte 0x81420A0A + .4byte 0x57696996 + .4byte 0x7B91CC95 + .4byte 0xDB91B683 + .4byte 0x81838283 + .4byte 0x8A82CC8F + .4byte 0x9182AB8D + .4byte 0x9E82DD2F + .4byte 0x93C782DD + .4byte 0x8F6F82B5 + .4byte 0x82AA0A82 + .4byte 0xC582AB82 + .4byte 0xDC82B982 + .4byte 0xF182C582 + .4byte 0xB582BD81 + .4byte 0x420A82AD + .4byte 0x82ED82B5 + .4byte 0x82AD82CD + .4byte 0x57696996 + .4byte 0x7B91CC82 + .4byte 0xCC8EE688 + .4byte 0xB590E096 + .4byte 0xBE8F9182 + .4byte 0xF082A893 + .4byte 0xC782DD0A + .4byte 0x82AD82BE + .4byte 0x82B382A2 + .4byte 0x81420000 .global $$21848 $$21848: - .incbin "baserom.dol", 0x433B70, 0x64 + .asciz "\n\nError #411,\n\nCould not access Wii system memory.\nRefer to the Wii Operations Manual for\ndetails." + .balign 4 .global $$21849 $$21849: - .incbin "baserom.dol", 0x433BD4, 0x74 + .4byte 0x0A0A0A57 + .4byte 0x6969967B + .4byte 0x91CC95DB + .4byte 0x91B68381 + .4byte 0x8382838A + .4byte 0x82CC8F91 + .4byte 0x82AB8D9E + .4byte 0x82DD2F93 + .4byte 0xC782DD8F + .4byte 0x6F82B592 + .4byte 0x8682C90A + .4byte 0x83478389 + .4byte 0x815B82AA + .4byte 0x94AD90B6 + .4byte 0x82B582DC + .4byte 0x82B582BD + .4byte 0x81420A82 + .4byte 0xAD82ED82 + .4byte 0xB582AD82 + .4byte 0xCD576969 + .4byte 0x967B91CC + .4byte 0x82CC8EE6 + .4byte 0x88B590E0 + .4byte 0x96BE8F91 + .4byte 0x82F082A8 + .4byte 0x93C782DD + .4byte 0x0A82AD82 + .4byte 0xBE82B382 + .4byte 0xA2814200 .global $$21850 $$21850: - .incbin "baserom.dol", 0x433C48, 0x68 + .asciz "\n\n\nAn error occurred while accessing Wii\nsystem memory. Refer to the Wii\nOperations Manual for details." .global $$21851 $$21851: - .incbin "baserom.dol", 0x433CB0, 0x9C + .asciz "\n\n\nBeim Zugriff auf den Speicher der\nWii-Konsole ist ein Fehler aufgetreten.\nBitte lies die Wii-Bedienungsanleitung,\num weitere Informationen zu erhalten." + .balign 4 .global $$21852 $$21852: - .incbin "baserom.dol", 0x433D4C, 0xB4 + .4byte 0x0A0A0A55 + .4byte 0x6E652065 + .4byte 0x72726575 + .4byte 0x72206573 + .4byte 0x74207375 + .4byte 0x7276656E + .4byte 0x75652070 + .4byte 0x656E6461 + .4byte 0x6E74206C + .4byte 0x650A7072 + .4byte 0x6F636573 + .4byte 0x73757320 + .4byte 0x6465206C + .4byte 0x65637475 + .4byte 0x7265206F + .4byte 0x75206427 + .4byte 0xE9637269 + .4byte 0x74757265 + .4byte 0x0A64616E + .4byte 0x73206C61 + .4byte 0x206DE96D + .4byte 0x6F697265 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C652057 + .4byte 0x69692E0A + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x732072E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x204D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F690A64 + .4byte 0x65206C61 + .4byte 0x20576969 + .4byte 0x20706F75 + .4byte 0x7220706C + .4byte 0x75732064 + .4byte 0x652064E9 + .asciz "tails." + .balign 4 .global $$21853 $$21853: - .incbin "baserom.dol", 0x433E00, 0xA4 + .4byte 0x0A0A0A53 + .4byte 0x65206861 + .4byte 0x2070726F + .4byte 0x64756369 + .4byte 0x646F2075 + .4byte 0x6E206572 + .4byte 0x726F7220 + .4byte 0x616C2069 + .4byte 0x6E74656E + .4byte 0x7461720A + .4byte 0x61636365 + .4byte 0x64657220 + .4byte 0x61206C61 + .4byte 0x206D656D + .4byte 0x6F726961 + .4byte 0x20646520 + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692E0A + .4byte 0x436F6E73 + .4byte 0x756C7461 + .4byte 0x20656C20 + .4byte 0x6D616E75 + .4byte 0x616C2064 + .4byte 0x65206F70 + .4byte 0x65726163 + .4byte 0x696F6E65 + .4byte 0x730A6465 + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6120 + .4byte 0x57696920 + .4byte 0x70617261 + .4byte 0x206F6274 + .4byte 0x656E6572 + .4byte 0x206DE173 + .4byte 0x0A696E66 + .4byte 0x6F726D61 + .4byte 0x6369F36E + .4byte 0x2E000000 .global $$21854 $$21854: - .incbin "baserom.dol", 0x433EA4, 0xC4 + .4byte 0x0A0A0A53 + .4byte 0x6920E820 + .asciz "verificato un errore durante la\nlettura o la modifica dei dati\nall'interno della memoria della\nconsole Wii. Per maggiori informazioni,\nconsulta il manuale di istruzioni della\nconsole Wii." .global $$21855 $$21855: - .incbin "baserom.dol", 0x433F68, 0x9C + .asciz "\n\n\nEr is een fout opgetreden tijdens het\nlezen of beschrijven van het interne\ngeheugen van het Wii-systeem. Lees de\nWii-handleiding voor meer informatie." + .balign 4 .global $$21856 $$21856: - .incbin "baserom.dol", 0x434004, 0x94 + .asciz "\n\n\nAn error occurred during the process of\nreading from or writing to the Wii System\nMemory. Please refer to the Wii Operations\nManual for details." .global $$21857 $$21857: - .incbin "baserom.dol", 0x434098, 0xB0 + .4byte 0x0A0A0A55 + .4byte 0x6E652065 + .4byte 0x72726575 + .4byte 0x72206573 + .4byte 0x74207375 + .4byte 0x7276656E + .4byte 0x75652061 + .4byte 0x76656320 + .4byte 0x6C61206D + .4byte 0xE96D6F69 + .4byte 0x72650A64 + .4byte 0x65206C61 + .4byte 0x20636F6E + .4byte 0x736F6C65 + .4byte 0x20576969 + .4byte 0x2070656E + .4byte 0x64616E74 + .4byte 0x206C6520 + .4byte 0x70726F63 + .4byte 0x65737375 + .4byte 0x730A6465 + .4byte 0x206C6563 + .4byte 0x74757265 + .4byte 0x206F7520 + .4byte 0x6427E963 + .4byte 0x72697475 + .4byte 0x72652E20 + .4byte 0x56657569 + .4byte 0x6C6C657A + .4byte 0x20766F75 + .4byte 0x730A72E9 + .4byte 0x66E97265 + .4byte 0x72206175 + .4byte 0x206D6F64 + .4byte 0x65206427 + .4byte 0x656D706C + .4byte 0x6F692057 + .4byte 0x69692070 + .4byte 0x6F757220 + .4byte 0x706C7573 + .4byte 0x0A646520 + .4byte 0x64E87461 + .asciz "ils." + .balign 4 .global $$21858 $$21858: - .incbin "baserom.dol", 0x434148, 0xB0 + .4byte 0x0A0A0A53 + .4byte 0x65206861 + .4byte 0x2070726F + .4byte 0x64756369 + .4byte 0x646F2075 + .4byte 0x6E206572 + .4byte 0x726F7220 + .4byte 0x64757261 + .4byte 0x6E746520 + .4byte 0x6C610A6C + .4byte 0x65637475 + .4byte 0x7261206F + .4byte 0x20657363 + .4byte 0x72697475 + .4byte 0x72612064 + .4byte 0x65206C61 + .4byte 0x206D656D + .4byte 0x6F726961 + .4byte 0x2064650A + .4byte 0x6C612063 + .4byte 0x6F6E736F + .4byte 0x6C612057 + .4byte 0x69692E20 + .4byte 0x436F6E73 + .4byte 0x756C7461 + .4byte 0x20656C20 + .4byte 0x6D616E75 + .4byte 0x616C2064 + .4byte 0x650A696E + .4byte 0x73747275 + .4byte 0x6363696F + .4byte 0x6E657320 + .4byte 0x6465206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61205769 + .4byte 0x69207061 + .4byte 0x72610A6F + .4byte 0x6274656E + .4byte 0x6572206D + .4byte 0xE1732069 + .4byte 0x6E666F72 + .4byte 0x6D616369 + .4byte 0xF36E2E00 .global $$21859 $$21859: - .incbin "baserom.dol", 0x4341F8, 0x8C + .4byte 0x0A0A8347 + .4byte 0x8389815B + .4byte 0x8352815B + .4byte 0x83688253 + .4byte 0x82508251 + .4byte 0x81420A0A + .4byte 0x57696996 + .4byte 0x7B91CC95 + .4byte 0xDB91B683 + .4byte 0x81838283 + .4byte 0x8A82CC8F + .4byte 0x9182AB8D + .4byte 0x9E82DD2F + .4byte 0x93C782DD + .4byte 0x8F6F82B5 + .4byte 0x928682C9 + .4byte 0x0A834783 + .4byte 0x89815B82 + .4byte 0xAA94AD90 + .4byte 0xB682B582 + .4byte 0xDC82B582 + .4byte 0xBD81420A + .4byte 0x82AD82ED + .4byte 0x82B582AD + .4byte 0x82CD5769 + .4byte 0x69967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182F082 + .4byte 0xA893C782 + .4byte 0xDD0A82AD + .4byte 0x82BE82B3 + .4byte 0x82A28142 + .4byte 0 .global $$21860 $$21860: - .incbin "baserom.dol", 0x434284, 0x74 + .asciz "\n\nError #412,\n\nAn error occurred while accessing Wii\nsystem memory. Refer to the Wii\nOperations Manual for details." .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __NANDMaxBlocksErrorMessageChinaKorea __NANDMaxBlocksErrorMessageChinaKorea: - .incbin "baserom.dol", 0x499250, 0x8 + .4byte 0x80436AC8 + .4byte 0x80436B3C .global __NANDMaxFilesErrorMessageChinaKorea __NANDMaxFilesErrorMessageChinaKorea: - .incbin "baserom.dol", 0x499258, 0x8 + .4byte 0x80436E4C + .4byte 0x80436EC4 .global __NANDCorruptErrorMessageChinaKorea __NANDCorruptErrorMessageChinaKorea: - .incbin "baserom.dol", 0x499260, 0x8 + .4byte 0x80437430 + .4byte 0x8043749C .global __NANDBusyErrorMessageChinaKorea __NANDBusyErrorMessageChinaKorea: - .incbin "baserom.dol", 0x499268, 0x8 + .4byte 0x804379EC + .4byte 0x80437A70 .global __NANDUnknownErrorMessageChinaKorea __NANDUnknownErrorMessageChinaKorea: - .incbin "baserom.dol", 0x499270, 0x8 + .4byte 0x804380F8 + .4byte 0x80438184 .global $$21888 $$21888: - .incbin "baserom.dol", 0x499278, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global NANDErrorFunc diff --git a/asm/nand/NANDLogging.s b/asm/nand/NANDLogging.s index 305c7769..cd584082 100644 --- a/asm/nand/NANDLogging.s +++ b/asm/nand/NANDLogging.s @@ -442,18 +442,21 @@ lbl_8004B10C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21150 $$21150: - .incbin "baserom.dol", 0x432680, 0x1C + .asciz "/shared2/test2/nanderr.log" + .balign 4 .global $$21155 $$21155: - .incbin "baserom.dol", 0x43269C, 0x2C + .asciz "%d %04d/%02d/%02d %02d:%02d:%02d %s %s" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global s_fd s_fd: - .incbin "baserom.dol", 0x492A50, 0x4 + .4byte 0xFFFFFF01 .global s_err s_err: - .incbin "baserom.dol", 0x492A54, 0x4 + .4byte 0xFFFFFF8B .section .bss, "wa" # 0x80496700 - 0x805643FC .global s_message diff --git a/asm/nand/nand.s b/asm/nand/nand.s index 1096e9e1..c455cd90 100644 --- a/asm/nand/nand.s +++ b/asm/nand/nand.s @@ -1498,12 +1498,14 @@ lbl_8004927C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$23188 $$23188: - .incbin "baserom.dol", 0x4039A8, 0x48 + .asciz "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_./" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23665 $$23665: - .incbin "baserom.dol", 0x492A18, 0x4 + .4byte 0x2F000000 .global $$23666 $$23666: - .incbin "baserom.dol", 0x492A1C, 0x4 + .4byte 0x2F257300 diff --git a/asm/nrel/Alert.s b/asm/nrel/Alert.s index ab2ff9df..44992192 100644 --- a/asm/nrel/Alert.s +++ b/asm/nrel/Alert.s @@ -70,4 +70,5 @@ __msl_error__3stdFPCc: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$221840 $$221840: - .incbin "baserom.dol", 0x49A090, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/nrel/Block.s b/asm/nrel/Block.s index 41d58f19..3aaa8153 100644 --- a/asm/nrel/Block.s +++ b/asm/nrel/Block.s @@ -31,7 +31,10 @@ lbl_8014C71C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2515 $$2515: - .incbin "baserom.dol", 0x4430C8, 0xC + .asciz "Block.cpp" + .balign 4 .global $$2516 $$2516: - .incbin "baserom.dol", 0x4430D4, 0x2C + .asciz "NW4R:Failed assertion aStart <= aEnd" + .balign 4 + .4byte 0 diff --git a/asm/nrel/ExpHeapAccessor.s b/asm/nrel/ExpHeapAccessor.s index 3916c3cc..749213d6 100644 --- a/asm/nrel/ExpHeapAccessor.s +++ b/asm/nrel/ExpHeapAccessor.s @@ -681,122 +681,156 @@ headerPtr__Q34nrel3mem5BlockCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2882 $$2882: - .incbin "baserom.dol", 0x443100, 0x14 + .asciz "ExpHeapAccessor.cpp" .global $$2883 $$2883: - .incbin "baserom.dol", 0x443114, 0x38 + .asciz "NW4R:Failed assertion MEMIsExpHeap( aHandle ) == TRUE" + .balign 4 .global $$21037 $$21037: - .incbin "baserom.dol", 0x44314C, 0x4C + .asciz "NW4R:Failed assertion DumpStyle_Begin <= aStyle && aStyle < DumpStyle_End" + .balign 4 .global $$21038 $$21038: - .incbin "baserom.dol", 0x443198, 0x1C + .asciz "[debug::memory HeapDump]\n" + .balign 4 .global $$21039 $$21039: - .incbin "baserom.dol", 0x4431B4, 0xC + .asciz "\n" .global $$21040 $$21040: - .incbin "baserom.dol", 0x4431C0, 0x1C + .asciz " Heap Range : %8x - %8x\n" .global $$21041 $$21041: - .incbin "baserom.dol", 0x4431DC, 0x1C + .asciz " Usable Range : %8x - %8x\n" .global $$21042 $$21042: - .incbin "baserom.dol", 0x4431F8, 0x1C + .asciz " Total Size : %9d bytes\n" .global $$21043 $$21043: - .incbin "baserom.dol", 0x443214, 0x24 + .asciz " Used Size : %9d bytes (%f%)\n" + .balign 4 .global $$21045 $$21045: - .incbin "baserom.dol", 0x443238, 0x24 + .asciz " Free Size : %9d bytes (%f%)\n" + .balign 4 .global $$21046 $$21046: - .incbin "baserom.dol", 0x44325C, 0x18 + .asciz " Used Blocks : %d\n" + .balign 4 .global $$21047 $$21047: - .incbin "baserom.dol", 0x443274, 0x18 + .asciz " Free Blocks : %d\n" + .balign 4 .global $$21048 $$21048: - .incbin "baserom.dol", 0x44328C, 0x10 + .asciz "\n" + .balign 4 .global $$21049 $$21049: - .incbin "baserom.dol", 0x44329C, 0x54 + .asciz " BeginAddr EndAddr Group Align HeadAddr DataAddr DataSize PrevAddr NextAddr\n" .global $$21050 $$21050: - .incbin "baserom.dol", 0x4432F0, 0x50 + .asciz "BeginAddr,EndAddr,Group,Align,HeadAddr,DataAddr,DataSize,PrevAddr,NextAddr,\n" + .balign 4 .global $$21051 $$21051: - .incbin "baserom.dol", 0x443340, 0x3C + .asciz " %08x %08x 0x%02x 0x%02x %08x %08x %8d %08x %08x\n" + .balign 4 .global $$21052 $$21052: - .incbin "baserom.dol", 0x44337C, 0x34 + .asciz "%08x,%08x,0x%02x,0x%02x,%08x,%08x,%d,%08x,%08x,\n" + .balign 4 .global $$21053 $$21053: - .incbin "baserom.dol", 0x4433B0, 0xC + .asciz " Nothing\n" + .balign 4 .global $$21054 $$21054: - .incbin "baserom.dol", 0x4433BC, 0x10 + .asciz "\n" + .balign 4 .global $$21055 $$21055: - .incbin "baserom.dol", 0x4433CC, 0x1C + .asciz " BeginAddr EndAddr Size\n" .global $$21056 $$21056: - .incbin "baserom.dol", 0x4433E8, 0x1C + .asciz "BeginAddr,EndAddr,Size,\n" + .balign 4 .global $$21057 $$21057: - .incbin "baserom.dol", 0x443404, 0x10 + .asciz " %x %x %8d\n" + .balign 4 .global $$21058 $$21058: - .incbin "baserom.dol", 0x443414, 0xC + .asciz "%x,%x,%d,\n" + .balign 4 .global $$21104 $$21104: - .incbin "baserom.dol", 0x443420, 0x38 + .asciz "NW4R:Pointer Error\nhandle_(=%p) is not valid pointer." + .balign 4 .global $$21216 $$21216: - .incbin "baserom.dol", 0x443458, 0x30 + .asciz "NW4R:Failed assertion head->pMBHeadPrev == 0" + .balign 4 .global $$21217 $$21217: - .incbin "baserom.dol", 0x443488, 0x1C + .asciz "NW4R:Failed assertion head" + .balign 4 .global $$21218 $$21218: - .incbin "baserom.dol", 0x4434A4, 0x34 + .asciz "Invalid Signature As Used MemBlock At %08X (%X)\n" + .balign 4 .global $$21219 $$21219: - .incbin "baserom.dol", 0x4434D8, 0x38 + .asciz "Invalid Signature As Free MemBlock At %08X (%X)\n" + .balign 4 + .4byte 0 .global $$21220 $$21220: - .incbin "baserom.dol", 0x443510, 0x40 + .asciz "NW4R:Pointer Error\nhead->pMBHeadNext(=%p) is not valid pointer." .global $$21221 $$21221: - .incbin "baserom.dol", 0x443550, 0x40 + .asciz "NW4R:Failed assertion head->pMBHeadNext->pMBHeadPrev == head" + .balign 4 .global $$21222 $$21222: - .incbin "baserom.dol", 0x443590, 0x40 + .asciz "NW4R:Pointer Error\nhead->pMBHeadPrev(=%p) is not valid pointer." .global $$21223 $$21223: - .incbin "baserom.dol", 0x4435D0, 0x7C + .asciz "NW4R:Failed assertion head->pMBHeadPrev->pMBHeadNext == head" + .balign 4 + .asciz "NW4R:Failed assertion hasNext()" + .asciz "ExpHeapBlockIterator.hpp" + .balign 4 .global $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$22 $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$22: - .incbin "baserom.dol", 0x44364C, 0x2C + .asciz "NW4R:Failed assertion ptr->pMBHeadPrev == 0" .global $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$21 $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$21: - .incbin "baserom.dol", 0x443678, 0x1C + .asciz "ExpHeapBlockIterator.hpp" + .balign 4 .global $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$20 $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$20: - .incbin "baserom.dol", 0x443694, 0x34 + .asciz "NW4R:Pointer Error\nptr(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead: - .incbin "baserom.dol", 0x4436C8, 0x20 + .asciz "ExpHeapBlockIterator.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21059 $$21059: - .incbin "baserom.dol", 0x492E88, 0x8 + .4byte 0x0A000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21044 $$21044: - .incbin "baserom.dol", 0x49A0C0, 0x8 + .4byte 0x42C80000 + .4byte 0 .global $$21063 $$21063: - .incbin "baserom.dol", 0x49A0C8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/nrel/ExpHeapMapUser.s b/asm/nrel/ExpHeapMapUser.s index e47b8ec9..2da9f9c5 100644 --- a/asm/nrel/ExpHeapMapUser.s +++ b/asm/nrel/ExpHeapMapUser.s @@ -242,30 +242,61 @@ lbl_8014BC50: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser: - .incbin "baserom.dol", 0x442D58, 0x30 + .4byte 0x80556A98 + .4byte 0 + .4byte 0x8014BC00 ;# ptr + .4byte 0x8014B9E8 ;# ptr + .4byte 0x8014B9EC ;# ptr + .4byte 0x8014B9F4 ;# ptr + .4byte 0x8014B9FC ;# ptr + .4byte 0x8014BA04 ;# ptr + .4byte 0x8014BA0C ;# ptr + .4byte 0x8014BA14 ;# ptr + .4byte 0x8014BA1C ;# ptr + .4byte 0x8014BB34 ;# ptr .global $$22500 $$22500: - .incbin "baserom.dol", 0x442D88, 0x28 + .asciz "nrel::devkit::heapmap::ExpHeapMapUser" + .balign 4 .global $$22501 $$22501: - .incbin "baserom.dol", 0x442DB0, 0x10 + .4byte 0x80556AA0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q44nrel6devkit7heapmap12IHeapMapUser __vt__Q44nrel6devkit7heapmap12IHeapMapUser: - .incbin "baserom.dol", 0x442DC0, 0x30 + .4byte 0x80556AA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$22502 $$22502: - .incbin "baserom.dol", 0x442DF0, 0x28 + .asciz "nrel::devkit::heapmap::IHeapMapUser" + .4byte 0 .global $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv$$20 $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv$$20: - .incbin "baserom.dol", 0x442E18, 0x20 + .asciz "NW4R:Failed assertion hasNext()" .global $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv: - .incbin "baserom.dol", 0x442E38, 0x20 + .asciz "ExpHeapBlockIterator.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser: - .incbin "baserom.dol", 0x492E78, 0x8 + .4byte 0x80446C88 + .4byte 0x80446CB0 .global __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser: - .incbin "baserom.dol", 0x492E80, 0x8 + .4byte 0x80446CF0 + .4byte 0 diff --git a/asm/nrel/ExpHeapSupport.s b/asm/nrel/ExpHeapSupport.s index 6e62aa62..a66560fc 100644 --- a/asm/nrel/ExpHeapSupport.s +++ b/asm/nrel/ExpHeapSupport.s @@ -129,7 +129,9 @@ lbl_8014D1E4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2789 $$2789: - .incbin "baserom.dol", 0x4436E8, 0x14 + .asciz "ExpHeapSupport.cpp" + .balign 4 .global $$2790 $$2790: - .incbin "baserom.dol", 0x4436FC, 0x2C + .asciz "NW4R:Failed assertion hasMutex( aHandle )" + .balign 4 diff --git a/asm/nrel/GXSettingFor2D.s b/asm/nrel/GXSettingFor2D.s index 3aadf5db..d0102ff3 100644 --- a/asm/nrel/GXSettingFor2D.s +++ b/asm/nrel/GXSettingFor2D.s @@ -107,13 +107,13 @@ setViewportSetting__Q34nrel8ezrender14GXSettingFor2DFRCQ34nrel8ezrender15Viewpor .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2795 $$2795: - .incbin "baserom.dol", 0x49A0A8, 0x4 + .4byte 0 .global $$2796 $$2796: - .incbin "baserom.dol", 0x49A0AC, 0x4 + .4byte 0x44200000 .global $$2797 $$2797: - .incbin "baserom.dol", 0x49A0B0, 0x4 + .4byte 0x43F00000 .global $$2798 $$2798: - .incbin "baserom.dol", 0x49A0B4, 0x4 + .4byte 0x3F800000 diff --git a/asm/nrel/HeapMapBlockDrawer.s b/asm/nrel/HeapMapBlockDrawer.s index f236de50..61d953ea 100644 --- a/asm/nrel/HeapMapBlockDrawer.s +++ b/asm/nrel/HeapMapBlockDrawer.s @@ -272,24 +272,30 @@ lbl_8014C038: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$214354 $$214354: - .incbin "baserom.dol", 0x442E58, 0x18 + .asciz "HeapMapBlockDrawer.cpp" + .balign 4 .global $$214355 $$214355: - .incbin "baserom.dol", 0x442E70, 0x2C + .asciz "NW4R:Failed assertion aStartAddr < aEndAddr" .global $$214356 $$214356: - .incbin "baserom.dol", 0x442E9C, 0x4C + .asciz "NW4R:Failed assertion aTargetAddr >= aStartAddr && aTargetAddr <= aEndAddr" + .balign 4 .global $$214463 $$214463: - .incbin "baserom.dol", 0x442EE8, 0x30 + .asciz "NW4R:Failed assertion rect.top <= rect.bottom" + .balign 4 .global $$214516 $$214516: - .incbin "baserom.dol", 0x442F18, 0x50 + .asciz "NW4R:Failed assertion aCurrentAddr >= aStartAddr && aCurrentAddr <= aEndAddr" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214358 $$214358: - .incbin "baserom.dol", 0x49A098, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$214464 $$214464: - .incbin "baserom.dol", 0x49A0A0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/nrel/Render2D.s b/asm/nrel/Render2D.s index 34fd188d..c1e66676 100644 --- a/asm/nrel/Render2D.s +++ b/asm/nrel/Render2D.s @@ -146,4 +146,5 @@ renderRect__Q34nrel8ezrender8Render2DFRCQ34nw4r2ut4RectRC8_GXColor: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24710 $$24710: - .incbin "baserom.dol", 0x49A0B8, 0x8 + .4byte 0x808080FF + .4byte 0 diff --git a/asm/nrel/TextWriter.s b/asm/nrel/TextWriter.s index 9f813416..9d3663cc 100644 --- a/asm/nrel/TextWriter.s +++ b/asm/nrel/TextWriter.s @@ -153,31 +153,41 @@ lbl_8014C2E0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$22 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$22: - .incbin "baserom.dol", 0x442F68, 0x34 + .asciz "NW4R:Pointer Error\nstr(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$21 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$21: - .incbin "baserom.dol", 0x442F9C, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$20 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$20: - .incbin "baserom.dol", 0x442FB0, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc: - .incbin "baserom.dol", 0x442FE4, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$22 $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$22: - .incbin "baserom.dol", 0x442FF8, 0x38 + .asciz "NW4R:Pointer Error\n& font(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$21 $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$21: - .incbin "baserom.dol", 0x443030, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$20 $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font$$20: - .incbin "baserom.dol", 0x443040, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font $$2STRING$$2SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font: - .incbin "baserom.dol", 0x443074, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color$$20 $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color$$20: - .incbin "baserom.dol", 0x443084, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color: - .incbin "baserom.dol", 0x4430B8, 0x10 + .asciz "CharWriter.h" + .balign 4 diff --git a/asm/os/OS.s b/asm/os/OS.s index 6e552ed2..2ec7053b 100644 --- a/asm/os/OS.s +++ b/asm/os/OS.s @@ -1523,122 +1523,164 @@ lbl_8001B794: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x41DED8, 0x48 + .asciz "<< RVL_SDK - OS \trelease build: Aug 23 2010 17:33:06 (0x4302_145) >>" + .balign 4 .global $$21776 $$21776: - .incbin "baserom.dol", 0x41DF20, 0x10 + .asciz "\nRevolution OS\n" .global $$21777 $$21777: - .incbin "baserom.dol", 0x41DF30, 0x18 + .asciz "Kernel built : %s %s\n" + .balign 4 .global $$21778 $$21778: - .incbin "baserom.dol", 0x41DF48, 0xC + .asciz "Aug 23 2010" .global $$21779 $$21779: - .incbin "baserom.dol", 0x41DF54, 0xC + .asciz "17:33:06" + .balign 4 .global $$21780 $$21780: - .incbin "baserom.dol", 0x41DF60, 0x10 + .asciz "Console Type : " .global $$21781 $$21781: - .incbin "baserom.dol", 0x41DF70, 0x18 + .asciz "Pre-production board 1\n" .global $$21782 $$21782: - .incbin "baserom.dol", 0x41DF88, 0x1C + .asciz "Pre-production board 2-1\n" + .balign 4 .global $$21783 $$21783: - .incbin "baserom.dol", 0x41DFA4, 0x1C + .asciz "Pre-production board 2-2\n" + .balign 4 .global $$21785 $$21785: - .incbin "baserom.dol", 0x41DFC0, 0xC + .asciz "Retail %d\n" + .balign 4 .global $$21786 $$21786: - .incbin "baserom.dol", 0x41DFCC, 0xC + .asciz "NDEV 2.1\n" + .balign 4 .global $$21787 $$21787: - .incbin "baserom.dol", 0x41DFD8, 0xC + .asciz "NDEV 2.0\n" + .balign 4 .global $$21788 $$21788: - .incbin "baserom.dol", 0x41DFE4, 0xC + .asciz "NDEV 1.2\n" + .balign 4 .global $$21789 $$21789: - .incbin "baserom.dol", 0x41DFF0, 0xC + .asciz "NDEV 1.1\n" + .balign 4 .global $$21790 $$21790: - .incbin "baserom.dol", 0x41DFFC, 0xC + .asciz "NDEV 1.0\n" + .balign 4 .global $$21791 $$21791: - .incbin "baserom.dol", 0x41E008, 0x18 + .asciz "Revolution Emulator\n" + .balign 4 .global $$21792 $$21792: - .incbin "baserom.dol", 0x41E020, 0x1C + .asciz "Emulation platform (%08x)\n" + .balign 4 .global $$21793 $$21793: - .incbin "baserom.dol", 0x41E03C, 0x1C + .asciz "TDEV-based emulation HW%d\n" + .balign 4 .global $$21795 $$21795: - .incbin "baserom.dol", 0x41E058, 0x1C + .asciz "Firmware : %d.%d.%d " + .balign 4 .global $$21796 $$21796: - .incbin "baserom.dol", 0x41E074, 0xC + .asciz "(%d/%d/%d)\n" .global $$21797 $$21797: - .incbin "baserom.dol", 0x41E080, 0x10 + .asciz "Memory %d MB\n" + .balign 4 .global $$21798 $$21798: - .incbin "baserom.dol", 0x41E090, 0x1C + .asciz "MEM1 Arena : 0x%x - 0x%x\n" + .balign 4 .global $$21799 $$21799: - .incbin "baserom.dol", 0x41E0AC, 0x1C + .asciz "MEM2 Arena : 0x%x - 0x%x\n" + .balign 4 .global $$21848 $$21848: - .incbin "baserom.dol", 0x41E0C8, 0x50 + .asciz "OS ERROR: boot program is not for RVL target. Please use correct boot program.\n" .global $$21850 $$21850: - .incbin "baserom.dol", 0x41E118, 0x18 + .asciz "Failed to run app" + .balign 4 + .4byte 0 .global $$21851 $$21851: - .incbin "baserom.dol", 0x41E130, 0x58 + .asciz "OS ERROR: apploader[D].img is not for RVL target. Please use correct apploader[D].img.\n" .global $$21852 $$21852: - .incbin "baserom.dol", 0x41E188, 0x60 + .asciz "OS ERROR: This firmware is an improper version for this SDK. Please use a correct Firmware.\n" + .balign 4 .global $$21853 $$21853: - .incbin "baserom.dol", 0x41E1E8, 0xC0 + .asciz "\n\nERROR #002\nAn error has occurred.\nPress the Eject Button, remove the\nGame Disc, and turn off the power to \nthe console. \nPlease read the Wii Operations Manual \nfor further instructions.\n" + .balign 4 .global __OSExceptionLocations __OSExceptionLocations: - .incbin "baserom.dol", 0x41E2A8, 0x40 + .4byte 0x00000100 + .4byte 0x00000200 + .4byte 0x00000300 + .4byte 0x00000400 + .4byte 0x00000500 + .4byte 0x00000600 + .4byte 0x00000700 + .4byte 0x00000800 + .4byte 0x00000900 + .4byte 0x00000C00 + .4byte 0x00000D00 + .4byte 0x00000F00 + .4byte 0x00001300 + .4byte 0x00001400 + .4byte 0x00001700 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSVersion __OSVersion: - .incbin "baserom.dol", 0x492868, 0x4 + .4byte 0x80421DD8 .global $$21784 $$21784: - .incbin "baserom.dol", 0x49286C, 0x8 + .asciz "RVA 1\n" + .balign 4 .global $$21794 $$21794: - .incbin "baserom.dol", 0x492874, 0x8 + .asciz "%08x\n" + .balign 4 .global $$21847 $$21847: - .incbin "baserom.dol", 0x49287C, 0x4 + .4byte 0x25730A00 .global $$21849 $$21849: - .incbin "baserom.dol", 0x492880, 0x8 + .asciz "OS.c" + .balign 4 .global $$21187 $$21187: - .incbin "baserom.dol", 0x492888, 0x8 + .asciz "HAEA" + .balign 4 .global AppGameNameForSysMenu AppGameNameForSysMenu: - .incbin "baserom.dol", 0x492890, 0x8 + .4byte 0x805564A8 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21010 $$21010: - .incbin "baserom.dol", 0x499008, 0x4 + .4byte 0x0000FF00 .global $$21012 $$21012: - .incbin "baserom.dol", 0x49900C, 0x4 + .4byte 0xFFFFFF00 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __OSRebootParams diff --git a/asm/os/OSAlarm.s b/asm/os/OSAlarm.s index 38eba279..89bf32ea 100644 --- a/asm/os/OSAlarm.s +++ b/asm/os/OSAlarm.s @@ -635,7 +635,10 @@ lbl_8001C01C: .section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .incbin "baserom.dol", 0x41E2E8, 0x10 + .4byte 0x8001BF00 ;# ptr + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global AlarmQueue diff --git a/asm/os/OSAlloc.s b/asm/os/OSAlloc.s index 17ead55e..d50496bd 100644 --- a/asm/os/OSAlloc.s +++ b/asm/os/OSAlloc.s @@ -247,7 +247,8 @@ lbl_8001C368: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSCurrHeap __OSCurrHeap: - .incbin "baserom.dol", 0x492898, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global ArenaEnd diff --git a/asm/os/OSArena.s b/asm/os/OSArena.s index 3338c5cb..d42b1f25 100644 --- a/asm/os/OSArena.s +++ b/asm/os/OSArena.s @@ -98,10 +98,10 @@ OSAllocFromMEM2ArenaLo: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSArenaLo __OSArenaLo: - .incbin "baserom.dol", 0x4928A0, 0x4 + .4byte 0xFFFFFFFF .global s_mem2ArenaLo s_mem2ArenaLo: - .incbin "baserom.dol", 0x4928A4, 0x4 + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global __OSArenaHi diff --git a/asm/os/OSAudioSystem.s b/asm/os/OSAudioSystem.s index 05d63ba1..34227b0d 100644 --- a/asm/os/OSAudioSystem.s +++ b/asm/os/OSAudioSystem.s @@ -344,4 +344,35 @@ lbl_8001C914: .section .data, "wa" # 0x80421040 - 0x80496700 .global DSPInitCode DSPInitCode: - .incbin "baserom.dol", 0x41E2F8, 0x80 + .4byte 0x029F0010 + .4byte 0x029F0033 + .4byte 0x029F0034 + .4byte 0x029F0035 + .4byte 0x029F0036 + .4byte 0x029F0037 + .4byte 0x029F0038 + .4byte 0x029F0039 + .4byte 0x12061203 + .4byte 0x12041205 + .4byte 0x00808000 + .4byte 0x0088FFFF + .4byte 0x00841000 + .4byte 0x0064001D + .4byte 0x02180000 + .4byte 0x81001C1E + .4byte 0x00441B1E + .4byte 0x00840800 + .4byte 0x00640027 + .4byte 0x191E0000 + .4byte 0x00DEFFFC + .4byte 0x02A08000 + .4byte 0x029C0028 + .4byte 0x16FC0054 + .4byte 0x16FD4348 + .4byte 0x002102FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/os/OSCache.s b/asm/os/OSCache.s index 81f5dbd1..d62cb385 100644 --- a/asm/os/OSCache.s +++ b/asm/os/OSCache.s @@ -497,28 +497,36 @@ lbl_8001CF64: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2909 $$2909: - .incbin "baserom.dol", 0x41E378, 0x18 + .asciz "Machine check received\n" .global $$2910 $$2910: - .incbin "baserom.dol", 0x41E390, 0x20 + .asciz "HID2 = 0x%x SRR1 = 0x%x\n" + .balign 4 + .4byte 0 .global $$2911 $$2911: - .incbin "baserom.dol", 0x41E3B0, 0x30 + .asciz "Machine check was not DMA/locked cache related\n" .global $$2912 $$2912: - .incbin "baserom.dol", 0x41E3E0, 0x3C + .asciz "DMAErrorHandler(): An error occurred while processing DMA.\n" .global $$2913 $$2913: - .incbin "baserom.dol", 0x41E41C, 0x38 + .asciz "The following errors have been detected and cleared :\n" + .balign 4 .global $$2914 $$2914: - .incbin "baserom.dol", 0x41E454, 0x40 + .asciz "\t- Requested a locked cache tag that was already in the cache\n" + .balign 4 .global $$2915 $$2915: - .incbin "baserom.dol", 0x41E494, 0x2C + .asciz "\t- DMA attempted to access normal cache\n" + .balign 4 .global $$2916 $$2916: - .incbin "baserom.dol", 0x41E4C0, 0x20 + .asciz "\t- DMA missed in data cache\n" + .balign 4 .global $$2917 $$2917: - .incbin "baserom.dol", 0x41E4E0, 0x20 + .asciz "\t- DMA queue overflowed\n" + .balign 4 + .4byte 0 diff --git a/asm/os/OSContext.s b/asm/os/OSContext.s index 4f544416..84cd34fe 100644 --- a/asm/os/OSContext.s +++ b/asm/os/OSContext.s @@ -712,37 +712,47 @@ lbl_8001D988: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2715 $$2715: - .incbin "baserom.dol", 0x41E500, 0x48 + .asciz "------------------------- Context 0x%08x -------------------------\n" + .4byte 0 .global $$2716 $$2716: - .incbin "baserom.dol", 0x41E548, 0x30 + .asciz "r%-2d = 0x%08x (%14d) r%-2d = 0x%08x (%14d)\n" .global $$2717 $$2717: - .incbin "baserom.dol", 0x41E578, 0x30 + .asciz "LR = 0x%08x CR = 0x%08x\n" + .balign 4 .global $$2718 $$2718: - .incbin "baserom.dol", 0x41E5A8, 0x30 + .asciz "SRR0 = 0x%08x SRR1 = 0x%08x\n" + .balign 4 .global $$2719 $$2719: - .incbin "baserom.dol", 0x41E5D8, 0x14 + .asciz "\nGQRs----------\n" + .balign 4 .global $$2720 $$2720: - .incbin "baserom.dol", 0x41E5EC, 0x24 + .asciz "gqr%d = 0x%08x \t gqr%d = 0x%08x\n" + .balign 4 .global $$2721 $$2721: - .incbin "baserom.dol", 0x41E610, 0x14 + .asciz "\n\nFPRs----------\n" + .balign 4 .global $$2722 $$2722: - .incbin "baserom.dol", 0x41E624, 0x1C + .asciz "fr%d \t= %d \t fr%d \t= %d\n" + .balign 4 .global $$2723 $$2723: - .incbin "baserom.dol", 0x41E640, 0x14 + .asciz "\n\nPSFs----------\n" + .balign 4 .global $$2724 $$2724: - .incbin "baserom.dol", 0x41E654, 0x20 + .asciz "ps%d \t= 0x%x \t ps%d \t= 0x%x\n" + .balign 4 .global $$2725 $$2725: - .incbin "baserom.dol", 0x41E674, 0x28 + .asciz "\nAddress: Back Chain LR Save\n" + .balign 4 .global $$2726 $$2726: - .incbin "baserom.dol", 0x41E69C, 0x1C + .asciz "0x%08x: 0x%08x 0x%08x\n" diff --git a/asm/os/OSCrc.s b/asm/os/OSCrc.s index 51915324..37445467 100644 --- a/asm/os/OSCrc.s +++ b/asm/os/OSCrc.s @@ -91,4 +91,19 @@ lbl_8002830C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2OSCalcCRC32__FPCvUl$$2crc32_table $$2LOCAL$$2OSCalcCRC32__FPCvUl$$2crc32_table: - .incbin "baserom.dol", 0x403900, 0x40 + .4byte 0 + .4byte 0x1DB71064 + .4byte 0x3B6E20C8 + .4byte 0x26D930AC + .4byte 0x76DC4190 + .4byte 0x6B6B51F4 + .4byte 0x4DB26158 + .4byte 0x5005713C + .4byte 0xEDB88320 + .4byte 0xF00F9344 + .4byte 0xD6D6A3E8 + .4byte 0xCB61B38C + .4byte 0x9B64C2B0 + .4byte 0x86D3D2D4 + .4byte 0xA00AE278 + .4byte 0xBDBDF21C diff --git a/asm/os/OSError.s b/asm/os/OSError.s index 0e3ecaf8..457cc499 100644 --- a/asm/os/OSError.s +++ b/asm/os/OSError.s @@ -432,57 +432,68 @@ lbl_8001DF74: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2641 $$2641: - .incbin "baserom.dol", 0x41E6B8, 0x18 + .asciz " in \"%s\" on line %d.\n" + .balign 4 .global $$2642 $$2642: - .incbin "baserom.dol", 0x41E6D0, 0x28 + .asciz "\nAddress: Back Chain LR Save\n" + .balign 4 .global $$2643 $$2643: - .incbin "baserom.dol", 0x41E6F8, 0x1C + .asciz "0x%08x: 0x%08x 0x%08x\n" .global $$2701 $$2701: - .incbin "baserom.dol", 0x41E714, 0x20 + .asciz "Non-recoverable Exception %d" + .balign 4 .global $$2702 $$2702: - .incbin "baserom.dol", 0x41E734, 0x18 + .asciz "Unhandled Exception %d" + .balign 4 .global $$2704 $$2704: - .incbin "baserom.dol", 0x41E74C, 0x34 + .asciz "\nDSISR = 0x%08x DAR = 0x%08x\n" + .balign 4 .global $$2705 $$2705: - .incbin "baserom.dol", 0x41E780, 0x10 + .asciz "TB = 0x%016llx\n" .global $$2706 $$2706: - .incbin "baserom.dol", 0x41E790, 0x60 + .asciz "\nInstruction at 0x%x (read from SRR0) attempted to access invalid address 0x%x (read from DAR)\n" .global $$2707 $$2707: - .incbin "baserom.dol", 0x41E7F0, 0x4C + .asciz "\nAttempted to fetch instruction from invalid address 0x%x (read from SRR0)\n" .global $$2708 $$2708: - .incbin "baserom.dol", 0x41E83C, 0x64 + .asciz "\nInstruction at 0x%x (read from SRR0) attempted to access unaligned address 0x%x (read from DAR)\n" + .balign 4 .global $$2709 $$2709: - .incbin "baserom.dol", 0x41E8A0, 0x60 + .asciz "\nProgram exception : Possible illegal instruction/operation at or around 0x%x (read from SRR0)\n" .global $$2710 $$2710: - .incbin "baserom.dol", 0x41E900, 0x20 + .asciz "AI DMA Address = 0x%04x%04x\n" + .balign 4 .global $$2711 $$2711: - .incbin "baserom.dol", 0x41E920, 0x20 + .asciz "ARAM DMA Address = 0x%04x%04x\n" + .balign 4 .global $$2712 $$2712: - .incbin "baserom.dol", 0x41E940, 0x1C + .asciz "DI DMA Address = 0x%08x\n" + .balign 4 .global $$2713 $$2713: - .incbin "baserom.dol", 0x41E95C, 0x3C + .asciz "\nLast interrupt (%d): SRR0 = 0x%08x TB = 0x%016llx\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSFpscrEnableBits __OSFpscrEnableBits: - .incbin "baserom.dol", 0x4928A8, 0x4 + .4byte 0x000000F8 .global $$2703 $$2703: - .incbin "baserom.dol", 0x4928AC, 0x4 + .4byte 0x0A000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __OSErrorTable diff --git a/asm/os/OSExec.s b/asm/os/OSExec.s index 1d3a7268..fb3686a2 100644 --- a/asm/os/OSExec.s +++ b/asm/os/OSExec.s @@ -1785,66 +1785,84 @@ lbl_8001F838: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$23219 $$23219: - .incbin "baserom.dol", 0x41E998, 0x18 + .asciz "\nDisc error occurred!\n" + .balign 4 .global $$23220 $$23220: - .incbin "baserom.dol", 0x41E9B0, 0x1C + .asciz "\nTimeout error occurred!\n" + .balign 4 .global $$23221 $$23221: - .incbin "baserom.dol", 0x41E9CC, 0x20 + .asciz "\nUnexpected error occurred!\n" + .balign 4 .global $$23222 $$23222: - .incbin "baserom.dol", 0x41E9EC, 0x30 + .asciz "\nThe specified game doesn't exist in the disc\n" + .balign 4 .global $$23223 $$23223: - .incbin "baserom.dol", 0x41EA1C, 0x24 + .asciz "\nOSExec(): Failed to exec %d in %d\n" .global $$23295 $$23295: - .incbin "baserom.dol", 0x41EA40, 0x44 + .asciz "OSLaunchDisk(): You can't call this API from DVD application. \n" + .balign 4 .global $$23296 $$23296: - .incbin "baserom.dol", 0x41EA84, 0xC + .asciz "OSExec.c" + .balign 4 .global $$23298 $$23298: - .incbin "baserom.dol", 0x41EA90, 0x48 + .asciz "OSLaunchDisk(): You must call DVDPrepareDisk before launching disc.\n" + .balign 4 .global $$23299 $$23299: - .incbin "baserom.dol", 0x41EAD8, 0x54 + .asciz "OSLaunchDisk(): Specified id is different from one specified to DVDPrepareDisk.\n" + .balign 4 .global $$23300 $$23300: - .incbin "baserom.dol", 0x41EB2C, 0x14 + .asciz "0000000000000000" + .balign 4 .global $$23378 $$23378: - .incbin "baserom.dol", 0x41EB40, 0xC + .asciz "2004/02/01" + .balign 4 .global $$23432 $$23432: - .incbin "baserom.dol", 0x41EB4C, 0x38 + .asciz "Warning: OSExec(): The specified file doesn't exist. \n" + .balign 4 .global $$23516 $$23516: - .incbin "baserom.dol", 0x41EB84, 0x48 + .asciz "OSLaunchPartition(): You can't call this API from NAND application. \n" + .balign 4 .global $$23517 $$23517: - .incbin "baserom.dol", 0x41EBCC, 0x44 + .asciz "OSLaunchPartition(): Specified title ID is not DISC application. \n" .global $$23518 $$23518: - .incbin "baserom.dol", 0x41EC10, 0x14 + .asciz "/title/%08x/%08x" + .balign 4 .global $$23519 $$23519: - .incbin "baserom.dol", 0x41EC24, 0x3C + .asciz "\nOSLaunchPartition(): Failed to get free i-nodes number\n" + .balign 4 .global $$23520 $$23520: - .incbin "baserom.dol", 0x41EC60, 0x50 + .asciz "\nOSLaunchPartition(): There are not enough i-nodes to launch next partition\n" + .balign 4 .global $$23521 $$23521: - .incbin "baserom.dol", 0x41ECB0, 0x38 + .asciz "\nOSLaunchPartition(): Failed to get nand status\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23377 $$23377: - .incbin "baserom.dol", 0x4928B0, 0x8 + .asciz "%016llx" .global $$23424 $$23424: - .incbin "baserom.dol", 0x4928B8, 0x8 + .4byte 0x25640000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global id diff --git a/asm/os/OSFatal.s b/asm/os/OSFatal.s index 3942d068..513ea855 100644 --- a/asm/os/OSFatal.s +++ b/asm/os/OSFatal.s @@ -845,51 +845,54 @@ lbl_80020440: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22599 $$22599: - .incbin "baserom.dol", 0x4928C0, 0x8 + .4byte 0x25730A00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22586 $$22586: - .incbin "baserom.dol", 0x499010, 0x4 + .4byte 0x3F000000 .global $$22587 $$22587: - .incbin "baserom.dol", 0x499014, 0x4 + .4byte 0x41800000 .global $$22588 $$22588: - .incbin "baserom.dol", 0x499018, 0x4 + .4byte 0x3DC8B439 .global $$22589 $$22589: - .incbin "baserom.dol", 0x49901C, 0x4 + .4byte 0x3E839581 .global $$22590 $$22590: - .incbin "baserom.dol", 0x499020, 0x4 + .4byte 0x3F010625 .global $$22591 $$22591: - .incbin "baserom.dol", 0x499024, 0x4 + .4byte 0x43000000 .global $$22592 $$22592: - .incbin "baserom.dol", 0x499028, 0x4 + .4byte 0x3EE0C49C .global $$22593 $$22593: - .incbin "baserom.dol", 0x49902C, 0x4 + .4byte 0xBE178D50 .global $$22594 $$22594: - .incbin "baserom.dol", 0x499030, 0x4 + .4byte 0x3E94FDF4 .global $$22595 $$22595: - .incbin "baserom.dol", 0x499034, 0x4 + .4byte 0x3EBC6A7F .global $$22596 $$22596: - .incbin "baserom.dol", 0x499038, 0x4 + .4byte 0x3D916873 .global $$22597 $$22597: - .incbin "baserom.dol", 0x49903C, 0x4 + .4byte 0x436B0000 .global $$22598 $$22598: - .incbin "baserom.dol", 0x499040, 0x8 + .4byte 0x43700000 + .4byte 0 .global $$22602 $$22602: - .incbin "baserom.dol", 0x499048, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global FatalContext diff --git a/asm/os/OSFont.s b/asm/os/OSFont.s index 72272307..a282aca4 100644 --- a/asm/os/OSFont.s +++ b/asm/os/OSFont.s @@ -1406,23 +1406,730 @@ lbl_8002180C: .section .data, "wa" # 0x80421040 - 0x80496700 .global HankakuToCode HankakuToCode: - .incbin "baserom.dol", 0x41ECE8, 0x180 + .4byte 0x020C020D + .4byte 0x020E020F + .4byte 0x02100211 + .4byte 0x02120213 + .4byte 0x02140215 + .4byte 0x02160217 + .4byte 0x02180219 + .4byte 0x021A021B + .4byte 0x021C021D + .4byte 0x021E021F + .4byte 0x02200221 + .4byte 0x02220223 + .4byte 0x02240225 + .4byte 0x02260227 + .4byte 0x02280229 + .4byte 0x022A022B + .4byte 0x022C022D + .4byte 0x022E022F + .4byte 0x02300231 + .4byte 0x02320233 + .4byte 0x02340235 + .4byte 0x02360237 + .4byte 0x02380239 + .4byte 0x023A023B + .4byte 0x023C023D + .4byte 0x023E023F + .4byte 0x02400241 + .4byte 0x02420243 + .4byte 0x02440245 + .4byte 0x02460247 + .4byte 0x02480249 + .4byte 0x024A024B + .4byte 0x024C024D + .4byte 0x024E024F + .4byte 0x02500251 + .4byte 0x02520253 + .4byte 0x02540255 + .4byte 0x02560257 + .4byte 0x02580259 + .4byte 0x025A025B + .4byte 0x025C025D + .4byte 0x025E025F + .4byte 0x02600261 + .4byte 0x02620263 + .4byte 0x02640265 + .4byte 0x02660267 + .4byte 0x02680269 + .4byte 0x026A020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C026B + .4byte 0x026C026D + .4byte 0x026E026F + .4byte 0x02700271 + .4byte 0x02720273 + .4byte 0x02740275 + .4byte 0x02760277 + .4byte 0x02780279 + .4byte 0x027A027B + .4byte 0x027C027D + .4byte 0x027E027F + .4byte 0x02800281 + .4byte 0x02820283 + .4byte 0x02840285 + .4byte 0x02860287 + .4byte 0x02880289 + .4byte 0x028A028B + .4byte 0x028C028D + .4byte 0x028E028F + .4byte 0x02900291 + .4byte 0x02920293 + .4byte 0x02940295 + .4byte 0x02960297 + .4byte 0x02980299 + .4byte 0x029A029B + .4byte 0x029C029D + .4byte 0x029E029F + .4byte 0x02A002A1 + .4byte 0x02A202A3 + .4byte 0x02A402A5 + .4byte 0x02A602A7 + .4byte 0x02A802A9 .global Zenkaku2Code Zenkaku2Code: - .incbin "baserom.dol", 0x41EE68, 0x990 + .4byte 0x00000001 + .4byte 0x00020003 + .4byte 0x00040005 + .4byte 0x00060007 + .4byte 0x00080009 + .4byte 0x000A000B + .4byte 0x000C000D + .4byte 0x000E000F + .4byte 0x00100011 + .4byte 0x00120013 + .4byte 0x00140015 + .4byte 0x00160017 + .4byte 0x00180019 + .4byte 0x001A001B + .4byte 0x001C001D + .4byte 0x001E001F + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000006C + .4byte 0x006D006E + .4byte 0x006F0070 + .4byte 0x00710072 + .4byte 0x00730000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000074 + .4byte 0x00750076 + .4byte 0x00770078 + .4byte 0x0079007A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000007B + .4byte 0x007C007D + .4byte 0x007E007F + .4byte 0x00800081 + .4byte 0x00820083 + .4byte 0x00840085 + .4byte 0x00860087 + .4byte 0x00880089 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000008A + .4byte 0x008B008C + .4byte 0x008D008E + .4byte 0x008F0090 + .4byte 0x00910000 + .4byte 0 + .4byte 0x00000092 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000093 + .4byte 0x00940095 + .4byte 0x00960097 + .4byte 0x00980099 + .4byte 0x009A009B + .4byte 0x009C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x009D009E + .4byte 0x009F00A0 + .4byte 0x00A100A2 + .4byte 0x00A300A4 + .4byte 0x00A500A6 + .4byte 0x00A700A8 + .4byte 0x00A900AA + .4byte 0x00AB00AC + .4byte 0x00AD00AE + .4byte 0x00AF00B0 + .4byte 0x00B100B2 + .4byte 0x00B300B4 + .4byte 0x00B500B6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00B700B8 + .4byte 0x00B900BA + .4byte 0x00BB00BC + .4byte 0x00BD00BE + .4byte 0x00BF00C0 + .4byte 0x00C100C2 + .4byte 0x00C300C4 + .4byte 0x00C500C6 + .4byte 0x00C700C8 + .4byte 0x00C900CA + .4byte 0x00CB00CC + .4byte 0x00CD00CE + .4byte 0x00CF00D0 + .4byte 0 + .4byte 0 + .4byte 0x00D100D2 + .4byte 0x00D300D4 + .4byte 0x00D500D6 + .4byte 0x00D700D8 + .4byte 0x00D900DA + .4byte 0x00DB00DC + .4byte 0x00DD00DE + .4byte 0x00DF00E0 + .4byte 0x00E100E2 + .4byte 0x00E300E4 + .4byte 0x00E500E6 + .4byte 0x00E700E8 + .4byte 0x00E900EA + .4byte 0x00EB00EC + .4byte 0x00ED00EE + .4byte 0x00EF00F0 + .4byte 0x00F100F2 + .4byte 0x00F300F4 + .4byte 0x00F500F6 + .4byte 0x00F700F8 + .4byte 0x00F900FA + .4byte 0x00FB00FC + .4byte 0x00FD00FE + .4byte 0x00FF0100 + .4byte 0x01010102 + .4byte 0x01030104 + .4byte 0x01050106 + .4byte 0x01070108 + .4byte 0x0109010A + .4byte 0x010B010C + .4byte 0x010D010E + .4byte 0x010F0110 + .4byte 0x01110112 + .4byte 0x01130114 + .4byte 0x01150116 + .4byte 0x01170118 + .4byte 0x0119011A + .4byte 0x011B011C + .4byte 0x011D011E + .4byte 0x011F0120 + .4byte 0x01210122 + .4byte 0x01230000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01240125 + .4byte 0x01260127 + .4byte 0x01280129 + .4byte 0x012A012B + .4byte 0x012C012D + .4byte 0x012E012F + .4byte 0x01300131 + .4byte 0x01320133 + .4byte 0x01340135 + .4byte 0x01360137 + .4byte 0x01380139 + .4byte 0x013A013B + .4byte 0x013C013D + .4byte 0x013E013F + .4byte 0x01400141 + .4byte 0x01420143 + .4byte 0x01440145 + .4byte 0x01460147 + .4byte 0x01480149 + .4byte 0x014A014B + .4byte 0x014C014D + .4byte 0x014E014F + .4byte 0x01500151 + .4byte 0x01520153 + .4byte 0x01540155 + .4byte 0x01560157 + .4byte 0x01580159 + .4byte 0x015A015B + .4byte 0x015C015D + .4byte 0x015E015F + .4byte 0x01600161 + .4byte 0x01620163 + .4byte 0x01640165 + .4byte 0x01660167 + .4byte 0x01680169 + .4byte 0x016A016B + .4byte 0x016C016D + .4byte 0x016E016F + .4byte 0x01700171 + .4byte 0x01720173 + .4byte 0x01740175 + .4byte 0x01760177 + .4byte 0x01780179 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x017A017B + .4byte 0x017C017D + .4byte 0x017E017F + .4byte 0x01800181 + .4byte 0x01820183 + .4byte 0x01840185 + .4byte 0x01860187 + .4byte 0x01880189 + .4byte 0x018A018B + .4byte 0x018C018D + .4byte 0x018E018F + .4byte 0x01900191 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01920193 + .4byte 0x01940195 + .4byte 0x01960197 + .4byte 0x01980199 + .4byte 0x019A019B + .4byte 0x019C019D + .4byte 0x019E019F + .4byte 0x01A001A1 + .4byte 0x01A201A3 + .4byte 0x01A401A5 + .4byte 0x01A601A7 + .4byte 0x01A801A9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01AA01AB + .4byte 0x01AC01AD + .4byte 0x01AE01AF + .4byte 0x01B001B1 + .4byte 0x01B201B3 + .4byte 0x01B401B5 + .4byte 0x01B601B7 + .4byte 0x01B801B9 + .4byte 0x01BA01BB + .4byte 0x01BC01BD + .4byte 0x01BE01BF + .4byte 0x01C001C1 + .4byte 0x01C201C3 + .4byte 0x01C401C5 + .4byte 0x01C601C7 + .4byte 0x01C801C9 + .4byte 0x01CA0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01CB01CC + .4byte 0x01CD01CE + .4byte 0x01CF01D0 + .4byte 0x01D101D2 + .4byte 0x01D301D4 + .4byte 0x01D501D6 + .4byte 0x01D701D8 + .4byte 0x01D901DA + .4byte 0x01DB01DC + .4byte 0x01DD01DE + .4byte 0x01DF01E0 + .4byte 0x01E101E2 + .4byte 0x01E301E4 + .4byte 0x01E501E6 + .4byte 0x01E701E8 + .4byte 0x01E901EA + .4byte 0x01EB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01EC01ED + .4byte 0x01EE01EF + .4byte 0x01F001F1 + .4byte 0x01F201F3 + .4byte 0x01F401F5 + .4byte 0x01F601F7 + .4byte 0x01F801F9 + .4byte 0x01FA01FB + .4byte 0x01FC01FD + .4byte 0x01FE01FF + .4byte 0x02000201 + .4byte 0x02020203 + .4byte 0x02040205 + .4byte 0x02060207 + .4byte 0x02080209 + .4byte 0x020A020B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000020C + .4byte 0x020D020E + .4byte 0x020F0210 + .4byte 0x02110212 + .4byte 0x02130214 + .4byte 0x02150216 + .4byte 0x02170218 + .4byte 0x0219021A + .4byte 0x021B021C + .4byte 0x021D021E + .4byte 0x021F0220 + .4byte 0x02210222 + .4byte 0x02230224 + .4byte 0x02250226 + .4byte 0x02270228 + .4byte 0x0229022A + .4byte 0x022B022C + .4byte 0x022D022E + .4byte 0x022F0230 + .4byte 0x02310232 + .4byte 0x02330234 + .4byte 0x02350236 + .4byte 0x02370238 + .4byte 0x0239023A + .4byte 0x023B023C + .4byte 0x023D023E + .4byte 0x023F0240 + .4byte 0x02410242 + .4byte 0x02430244 + .4byte 0x02450246 + .4byte 0x02470248 + .4byte 0x0249024A + .4byte 0x024B024C + .4byte 0x024D024E + .4byte 0x024F0250 + .4byte 0x02510252 + .4byte 0x02530254 + .4byte 0x02550256 + .4byte 0x02570258 + .4byte 0x0259025A + .4byte 0x025B025C + .4byte 0x025D025E + .4byte 0x025F0260 + .4byte 0x02610262 + .4byte 0x02630264 + .4byte 0x02650266 + .4byte 0x02670268 + .4byte 0x0269026A + .4byte 0x026B026C + .4byte 0x026D026E + .4byte 0x026F0270 + .4byte 0x02710272 + .4byte 0x02730274 + .4byte 0x02750276 + .4byte 0x02770278 + .4byte 0x0279027A + .4byte 0x027B027C + .4byte 0x027D027E + .4byte 0x027F0280 + .4byte 0x02810282 + .4byte 0x02830284 + .4byte 0x02850286 + .4byte 0x02870288 + .4byte 0x0289028A + .4byte 0x028B028C + .4byte 0x028D028E + .4byte 0x028F0290 + .4byte 0x02910292 + .4byte 0x02930294 + .4byte 0x02950296 + .4byte 0x02970298 + .4byte 0x0299029A + .4byte 0x029B029C + .4byte 0x029D029E + .4byte 0x029F02A0 + .4byte 0x02A102A2 + .4byte 0x02A302A4 + .4byte 0x02A502A6 + .4byte 0x02A702A8 + .4byte 0x02A902AA + .4byte 0x02AB02AC + .4byte 0x02AD02AE + .4byte 0x02AF02B0 + .4byte 0x02B102B2 + .4byte 0x02B302B4 + .4byte 0x02B502B6 + .4byte 0x02B702B8 + .4byte 0x02B902BA + .4byte 0x02BB02BC + .4byte 0x02BD02BE + .4byte 0x02BF02C0 + .4byte 0x02C102C2 + .4byte 0x02C302C4 + .4byte 0x02C502C6 + .4byte 0x02C702C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x02C902CA + .4byte 0x02CB02CC + .4byte 0x02CD02CE + .4byte 0x02CF02D0 + .4byte 0x02D102D2 + .4byte 0x02D302D4 + .4byte 0x02D502D6 + .4byte 0x02D702D8 + .4byte 0x02D902DA + .4byte 0x02DB02DC + .4byte 0x02DD02DE + .4byte 0x02DF02E0 + .4byte 0x02E102E2 + .4byte 0x02E302E4 + .4byte 0x02E502E6 + .4byte 0x000002E7 + .4byte 0x02E802E9 + .4byte 0x02EA02EB + .4byte 0x02EC02ED + .4byte 0x02EE02EF + .4byte 0x02F002F1 + .4byte 0x02F202F3 + .4byte 0x02F402F5 + .4byte 0x02F602F7 + .4byte 0x02F802F9 + .4byte 0x02FA02FB + .4byte 0x02FC02FD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x02FE02FF + .4byte 0x03000301 + .4byte 0x03020303 + .4byte 0x03040305 + .4byte 0x03060307 + .4byte 0x03080309 + .4byte 0x030A030B + .4byte 0x030C030D + .4byte 0x030E030F + .4byte 0x03100311 + .4byte 0x03120313 + .4byte 0x03140315 + .4byte 0x03160317 + .4byte 0x03180319 + .4byte 0x031A031B + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global FontEncode FontEncode: - .incbin "baserom.dol", 0x4928C8, 0x8 + .4byte 0xFFFF0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21601 $$21601: - .incbin "baserom.dol", 0x499050, 0x4 + .4byte 0x2ABE003D .global lbl_8055E514 lbl_8055E514: - .incbin "baserom.dol", 0x499054, 0x4 + .4byte 0x003D003D .section .bss, "wa" # 0x80496700 - 0x805643FC .global ParseString diff --git a/asm/os/OSInterrupt.s b/asm/os/OSInterrupt.s index 8eec07ad..0031f82a 100644 --- a/asm/os/OSInterrupt.s +++ b/asm/os/OSInterrupt.s @@ -618,7 +618,18 @@ ExternalInterruptHandler: .section .data, "wa" # 0x80421040 - 0x80496700 .global InterruptPrioTable InterruptPrioTable: - .incbin "baserom.dol", 0x41F7F8, 0x30 + .4byte 0x00000100 + .4byte 0x00000040 + .4byte 0xF8000000 + .4byte 0x00000200 + .4byte 0x00000080 + .4byte 0x00000010 + .4byte 0x00003000 + .4byte 0x00000020 + .4byte 0x03FF8C00 + .4byte 0x04000000 + .4byte 0x00004000 + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global __OSLastInterruptSrr0 diff --git a/asm/os/OSIpc.s b/asm/os/OSIpc.s index c549979d..6744f2c1 100644 --- a/asm/os/OSIpc.s +++ b/asm/os/OSIpc.s @@ -29,7 +29,8 @@ __OSInitIPCBuffer: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global IpcBufferLo IpcBufferLo: - .incbin "baserom.dol", 0x4928D8, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global IpcBufferHi diff --git a/asm/os/OSMemory.s b/asm/os/OSMemory.s index 3ccb3acf..dc14296f 100644 --- a/asm/os/OSMemory.s +++ b/asm/os/OSMemory.s @@ -606,7 +606,10 @@ lbl_80022B44: .section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .incbin "baserom.dol", 0x41F828, 0x10 + .4byte 0x80022320 ;# ptr + .4byte 0x0000007F + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2__OSInitMemoryProtection__Fv$$2initialized diff --git a/asm/os/OSNandbootInfo.s b/asm/os/OSNandbootInfo.s index 7fde2dfb..f54342fb 100644 --- a/asm/os/OSNandbootInfo.s +++ b/asm/os/OSNandbootInfo.s @@ -151,4 +151,6 @@ lbl_800279E4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21058 $$21058: - .incbin "baserom.dol", 0x42BBE0, 0x20 + .asciz "/shared2/sys/NANDBOOTINFO" + .balign 4 + .4byte 0 diff --git a/asm/os/OSNet.s b/asm/os/OSNet.s index feb7a8e3..2b56e705 100644 --- a/asm/os/OSNet.s +++ b/asm/os/OSNet.s @@ -438,42 +438,54 @@ lbl_800277DC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21053 $$21053: - .incbin "baserom.dol", 0x42BA78, 0x34 + .asciz "Failed to register network shutdown function. %d\n" + .balign 4 .global $$21054 $$21054: - .incbin "baserom.dol", 0x42BAAC, 0x34 + .asciz "Failed to suspend the WiiConnect24 scheduler. %d\n" + .balign 4 .global $$21055 $$21055: - .incbin "baserom.dol", 0x42BAE0, 0x40 + .asciz "Failed to synchronize time with network resource managers. %d\n" + .balign 4 .global __FUNCTION__$681 __FUNCTION__$681: - .incbin "baserom.dol", 0x42BB20, 0x18 + .asciz "NWC24iPrepareShutdown" + .balign 4 .global $$21069 $$21069: - .incbin "baserom.dol", 0x42BB38, 0x14 + .asciz "/dev/net/kd/request" .global __FUNCTION__$697 __FUNCTION__$697: - .incbin "baserom.dol", 0x42BB4C, 0x18 + .asciz "NWC24SuspendScheduler" + .balign 4 .global __FUNCTION__$711 __FUNCTION__$711: - .incbin "baserom.dol", 0x42BB64, 0x18 + .asciz "NWC24ResumeScheduler" + .balign 4 .global __FUNCTION__$727 __FUNCTION__$727: - .incbin "baserom.dol", 0x42BB7C, 0x18 + .asciz "NWC24iRequestShutdown" + .balign 4 .global $$21122 $$21122: - .incbin "baserom.dol", 0x42BB94, 0x1C + .asciz "NWC24Shutdown_: Give up!\n" + .balign 4 .global __FUNCTION__$756 __FUNCTION__$756: - .incbin "baserom.dol", 0x42BBB0, 0x18 + .asciz "NWC24iSetRtcCounter_" + .balign 4 .global $$21137 $$21137: - .incbin "baserom.dol", 0x42BBC8, 0x18 + .asciz "/dev/net/kd/time" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global nwc24ShtFd nwc24ShtFd: - .incbin "baserom.dol", 0x4928E8, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global ShutdownFuncInfo diff --git a/asm/os/OSPlayRecord.s b/asm/os/OSPlayRecord.s index 41b5a8ef..27daf107 100644 --- a/asm/os/OSPlayRecord.s +++ b/asm/os/OSPlayRecord.s @@ -513,15 +513,23 @@ lbl_80027014: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2933 $$2933: - .incbin "baserom.dol", 0x42BA08, 0x2C + .asciz "/title/00000001/00000002/data/play_rec.dat" + .balign 4 .global $$2983 $$2983: - .incbin "baserom.dol", 0x42BA34, 0x1C + .4byte 0x80026990 ;# ptr + .4byte 0x8002699C ;# ptr + .4byte 0x80026A18 ;# ptr + .4byte 0x80026A5C ;# ptr + .4byte 0x80026A84 ;# ptr + .4byte 0x80026A90 ;# ptr + .4byte 0x80026B18 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global PlayRecordState PlayRecordState: - .incbin "baserom.dol", 0x4928E0, 0x8 + .4byte 0x00000009 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global PlayRecord diff --git a/asm/os/OSPlayTime.s b/asm/os/OSPlayTime.s index 0c37c15e..e8739e42 100644 --- a/asm/os/OSPlayTime.s +++ b/asm/os/OSPlayTime.s @@ -570,26 +570,31 @@ lbl_800281BC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21461 $$21461: - .incbin "baserom.dol", 0x42BC00, 0x14 + .asciz "/shared2/expired" + .balign 4 .global $$21519 $$21519: - .incbin "baserom.dol", 0x42BC14, 0x10 + .asciz "OSPlayTime.c" + .balign 4 .global $$21521 $$21521: - .incbin "baserom.dol", 0x42BC24, 0x1C + .asciz "PlayTime: %d seconds left\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21520 $$21520: - .incbin "baserom.dol", 0x4928F0, 0x8 + .asciz "Expired" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21446 $$21446: - .incbin "baserom.dol", 0x499058, 0x8 + .4byte 0x3F7EB852 + .4byte 0 .global $$21448 $$21448: - .incbin "baserom.dol", 0x499060, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __OSExpireAlarm diff --git a/asm/os/OSReset.s b/asm/os/OSReset.s index 4c6bb49c..3ebec20c 100644 --- a/asm/os/OSReset.s +++ b/asm/os/OSReset.s @@ -686,49 +686,65 @@ OSResetSystem: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22083 $$22083: - .incbin "baserom.dol", 0x41F838, 0xC + .asciz "OSReset.c" + .balign 4 .global $$22084 $$22084: - .incbin "baserom.dol", 0x41F844, 0x2C + .asciz "__OSHotReset(): Falied to reset system.\n" + .balign 4 .global $$22129 $$22129: - .incbin "baserom.dol", 0x41F870, 0x34 + .asciz "__OSReturnToMenu(): Falied to boot system menu.\n" + .balign 4 .global $$22131 $$22131: - .incbin "baserom.dol", 0x41F8A4, 0x30 + .asciz "OSReturnToMenu(): Falied to boot system menu.\n" + .balign 4 .global $$22133 $$22133: - .incbin "baserom.dol", 0x41F8D4, 0x38 + .asciz "OSReturnToDataManager(): Falied to boot system menu.\n" + .balign 4 .global $$22144 $$22144: - .incbin "baserom.dol", 0x41F90C, 0x20 + .asciz "Calendar/Calendar_index.html" + .balign 4 .global $$22145 $$22145: - .incbin "baserom.dol", 0x41F92C, 0x1C + .asciz "Display/Display_index.html" + .balign 4 .global $$22146 $$22146: - .incbin "baserom.dol", 0x41F948, 0x18 + .asciz "Sound/Sound_index.html" + .balign 4 .global $$22147 $$22147: - .incbin "baserom.dol", 0x41F960, 0x30 + .asciz "Parental_Control/Parental_Control_index.html" + .balign 4 .global $$22148 $$22148: - .incbin "baserom.dol", 0x41F990, 0x20 + .asciz "Internet/Internet_index.html" + .balign 4 .global $$22149 $$22149: - .incbin "baserom.dol", 0x41F9B0, 0x28 + .asciz "WiiConnect24/Wiiconnect24_index.html" + .balign 4 .global $$22150 $$22150: - .incbin "baserom.dol", 0x41F9D8, 0x1C + .asciz "Update/Update_index.html" + .balign 4 .global $$22151 $$22151: - .incbin "baserom.dol", 0x41F9F4, 0x30 + .asciz "OSReturnToSetting(): You can't specify %d. \n" + .balign 4 .global $$22163 $$22163: - .incbin "baserom.dol", 0x41FA24, 0x3C + .asciz "OSResetSystem() is obsoleted. It doesn't work any longer.\n" + .balign 4 .global $$22165 $$22165: - .incbin "baserom.dol", 0x41FA60, 0x40 + .asciz "OSSetBootDol() is obsoleted. It doesn't work any longer.\n" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global bootThisDol diff --git a/asm/os/OSStateFlags.s b/asm/os/OSStateFlags.s index 09eee878..f15224b2 100644 --- a/asm/os/OSStateFlags.s +++ b/asm/os/OSStateFlags.s @@ -154,7 +154,7 @@ lbl_80027228: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2709 $$2709: - .incbin "baserom.dol", 0x42BA50, 0x28 + .asciz "/title/00000001/00000002/data/state.dat" .section .bss, "wa" # 0x80496700 - 0x805643FC .global StateFlags diff --git a/asm/os/OSStateTM.s b/asm/os/OSStateTM.s index dc3008e5..01b938cd 100644 --- a/asm/os/OSStateTM.s +++ b/asm/os/OSStateTM.s @@ -528,22 +528,27 @@ lbl_800268EC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2980 $$2980: - .incbin "baserom.dol", 0x42B940, 0x14 + .asciz "/dev/stm/immediate" + .balign 4 .global $$2981 $$2981: - .incbin "baserom.dol", 0x42B954, 0x14 + .asciz "/dev/stm/eventhook" + .balign 4 .global $$2990 $$2990: - .incbin "baserom.dol", 0x42B968, 0xC + .asciz "OSStateTM.c" .global $$2991 $$2991: - .incbin "baserom.dol", 0x42B974, 0x38 + .asciz "Error: The firmware doesn't support shutdown feature.\n" + .balign 4 .global $$21001 $$21001: - .incbin "baserom.dol", 0x42B9AC, 0x38 + .asciz "Error: The firmware doesn't support reboot feature.\n" + .balign 4 .global $$21045 $$21045: - .incbin "baserom.dol", 0x42B9E4, 0x24 + .asciz "Error on STM state event handler\n" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global StmEhInBuf diff --git a/asm/os/OSThread.s b/asm/os/OSThread.s index c9a6e366..40a665df 100644 --- a/asm/os/OSThread.s +++ b/asm/os/OSThread.s @@ -1695,7 +1695,8 @@ lbl_80025B18: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SwitchThreadCallback SwitchThreadCallback: - .incbin "baserom.dol", 0x4928D0, 0x8 + .4byte 0x800244A0 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global DefaultThread diff --git a/asm/os/OSTime.s b/asm/os/OSTime.s index 974a65f2..64aa37d7 100644 --- a/asm/os/OSTime.s +++ b/asm/os/OSTime.s @@ -298,7 +298,29 @@ lbl_80025EC8: .section .data, "wa" # 0x80421040 - 0x80496700 .global YearDays YearDays: - .incbin "baserom.dol", 0x41FAA0, 0x30 + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003B + .4byte 0x0000005A + .4byte 0x00000078 + .4byte 0x00000097 + .4byte 0x000000B5 + .4byte 0x000000D4 + .4byte 0x000000F3 + .4byte 0x00000111 + .4byte 0x00000130 + .4byte 0x0000014E .global LeapYearDays LeapYearDays: - .incbin "baserom.dol", 0x41FAD0, 0x30 + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003C + .4byte 0x0000005B + .4byte 0x00000079 + .4byte 0x00000098 + .4byte 0x000000B6 + .4byte 0x000000D5 + .4byte 0x000000F4 + .4byte 0x00000112 + .4byte 0x00000131 + .4byte 0x0000014F diff --git a/asm/os/OSUtf.s b/asm/os/OSUtf.s index 38a90657..de5cbc5c 100644 --- a/asm/os/OSUtf.s +++ b/asm/os/OSUtf.s @@ -191,286 +191,12367 @@ lbl_800261B8: .section .data, "wa" # 0x80421040 - 0x80496700 .global UcsAnsiTable UcsAnsiTable: - .incbin "baserom.dol", 0x41FB00, 0x40 + .4byte 0x20AC0000 + .4byte 0x201A0192 + .4byte 0x201E2026 + .4byte 0x20202021 + .4byte 0x02C62030 + .4byte 0x01602039 + .4byte 0x01520000 + .4byte 0x017D0000 + .4byte 0x00002018 + .4byte 0x2019201C + .4byte 0x201D2022 + .4byte 0x20132014 + .4byte 0x02DC2122 + .4byte 0x0161203A + .4byte 0x01530000 + .4byte 0x017E0178 .global Ucs00 Ucs00: - .incbin "baserom.dol", 0x41FB40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x815F005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0x006C006D + .4byte 0x006E006F + .4byte 0x00700071 + .4byte 0x00720073 + .4byte 0x00740075 + .4byte 0x00760077 + .4byte 0x00780079 + .4byte 0x007A007B + .4byte 0x007C007D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81918192 + .4byte 0x0000005C + .4byte 0x00008198 + .4byte 0x814E0000 + .4byte 0 + .4byte 0x81CA0000 + .4byte 0 + .4byte 0x818B817D + .4byte 0 + .4byte 0x814C0000 + .4byte 0x81F70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000817E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008180 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs03 Ucs03: - .incbin "baserom.dol", 0x41FD40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000839F + .4byte 0x83A083A1 + .4byte 0x83A283A3 + .4byte 0x83A483A5 + .4byte 0x83A683A7 + .4byte 0x83A883A9 + .4byte 0x83AA83AB + .4byte 0x83AC83AD + .4byte 0x83AE83AF + .4byte 0x000083B0 + .4byte 0x83B183B2 + .4byte 0x83B383B4 + .4byte 0x83B583B6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000083BF + .4byte 0x83C083C1 + .4byte 0x83C283C3 + .4byte 0x83C483C5 + .4byte 0x83C683C7 + .4byte 0x83C883C9 + .4byte 0x83CA83CB + .4byte 0x83CC83CD + .4byte 0x83CE83CF + .4byte 0x000083D0 + .4byte 0x83D183D2 + .4byte 0x83D383D4 + .4byte 0x83D583D6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs04 Ucs04: - .incbin "baserom.dol", 0x41FF40, 0x200 + .4byte 0x00008446 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x84408441 + .4byte 0x84428443 + .4byte 0x84448445 + .4byte 0x84478448 + .4byte 0x8449844A + .4byte 0x844B844C + .4byte 0x844D844E + .4byte 0x844F8450 + .4byte 0x84518452 + .4byte 0x84538454 + .4byte 0x84558456 + .4byte 0x84578458 + .4byte 0x8459845A + .4byte 0x845B845C + .4byte 0x845D845E + .4byte 0x845F8460 + .4byte 0x84708471 + .4byte 0x84728473 + .4byte 0x84748475 + .4byte 0x84778478 + .4byte 0x8479847A + .4byte 0x847B847C + .4byte 0x847D847E + .4byte 0x84808481 + .4byte 0x84828483 + .4byte 0x84848485 + .4byte 0x84868487 + .4byte 0x84888489 + .4byte 0x848A848B + .4byte 0x848C848D + .4byte 0x848E848F + .4byte 0x84908491 + .4byte 0x00008476 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs20 Ucs20: - .incbin "baserom.dol", 0x420140, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x815D0000 + .4byte 0 + .4byte 0x0000815C + .4byte 0x81610000 + .4byte 0x81658166 + .4byte 0 + .4byte 0x81678168 + .4byte 0 + .4byte 0x81F581F6 + .4byte 0 + .4byte 0x00008164 + .4byte 0x81630000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81F10000 + .4byte 0x818C818D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000081A6 + .4byte 0 + .4byte 0x007E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs21 Ucs21: - .incbin "baserom.dol", 0x420340, 0x200 + .4byte 0 + .4byte 0x0000818E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000081F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81A981AA + .4byte 0x81A881AB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81CB0000 + .4byte 0x81CC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs22 Ucs22: - .incbin "baserom.dol", 0x420540, 0x200 + .4byte 0x81CD0000 + .4byte 0x81DD81CE + .4byte 0 + .4byte 0x000081DE + .4byte 0x81B80000 + .4byte 0x000081B9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x817C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81E30000 + .4byte 0x000081E5 + .4byte 0x81870000 + .4byte 0x81DA0000 + .4byte 0 + .4byte 0 + .4byte 0x000081C8 + .4byte 0x81C981BF + .4byte 0x81BE81E7 + .4byte 0x81E80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x818881E6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000081E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81E00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x818281DF + .4byte 0 + .4byte 0 + .4byte 0x81858186 + .4byte 0 + .4byte 0x81E181E2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81BC81BD + .4byte 0 + .4byte 0x81BA81BB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000081DB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs23 Ucs23: - .incbin "baserom.dol", 0x420740, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81DC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs25 Ucs25: - .incbin "baserom.dol", 0x420940, 0x200 + .4byte 0x849F84AA + .4byte 0x84A084AB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x84A10000 + .4byte 0x000084AC + .4byte 0x84A20000 + .4byte 0x000084AD + .4byte 0x84A40000 + .4byte 0x000084AF + .4byte 0x84A30000 + .4byte 0x000084AE + .4byte 0x84A584BA + .4byte 0 + .4byte 0x84B50000 + .4byte 0x000084B0 + .4byte 0x84A784BC + .4byte 0 + .4byte 0x84B70000 + .4byte 0x000084B2 + .4byte 0x84A60000 + .4byte 0x000084B6 + .4byte 0x84BB0000 + .4byte 0x000084B1 + .4byte 0x84A80000 + .4byte 0x000084B8 + .4byte 0x84BD0000 + .4byte 0x000084B3 + .4byte 0x84A90000 + .4byte 0x000084B9 + .4byte 0 + .4byte 0x84BE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000084B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81A181A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81A381A2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81A581A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x819F819E + .4byte 0 + .4byte 0x0000819B + .4byte 0 + .4byte 0x819D819C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000081FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs26 Ucs26: - .incbin "baserom.dol", 0x420B40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x0000819A + .4byte 0x81990000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x818A0000 + .4byte 0x81890000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81F40000 + .4byte 0x000081F3 + .4byte 0x000081F2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs30 Ucs30: - .incbin "baserom.dol", 0x420D40, 0x200 + .4byte 0x81408141 + .4byte 0x81428156 + .4byte 0x00008158 + .4byte 0x8159815A + .4byte 0x81718172 + .4byte 0x81738174 + .4byte 0x81758176 + .4byte 0x81778178 + .4byte 0x8179817A + .4byte 0x81A781AC + .4byte 0x816B816C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x81600000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000829F + .4byte 0x82A082A1 + .4byte 0x82A282A3 + .4byte 0x82A482A5 + .4byte 0x82A682A7 + .4byte 0x82A882A9 + .4byte 0x82AA82AB + .4byte 0x82AC82AD + .4byte 0x82AE82AF + .4byte 0x82B082B1 + .4byte 0x82B282B3 + .4byte 0x82B482B5 + .4byte 0x82B682B7 + .4byte 0x82B882B9 + .4byte 0x82BA82BB + .4byte 0x82BC82BD + .4byte 0x82BE82BF + .4byte 0x82C082C1 + .4byte 0x82C282C3 + .4byte 0x82C482C5 + .4byte 0x82C682C7 + .4byte 0x82C882C9 + .4byte 0x82CA82CB + .4byte 0x82CC82CD + .4byte 0x82CE82CF + .4byte 0x82D082D1 + .4byte 0x82D282D3 + .4byte 0x82D482D5 + .4byte 0x82D682D7 + .4byte 0x82D882D9 + .4byte 0x82DA82DB + .4byte 0x82DC82DD + .4byte 0x82DE82DF + .4byte 0x82E082E1 + .4byte 0x82E282E3 + .4byte 0x82E482E5 + .4byte 0x82E682E7 + .4byte 0x82E882E9 + .4byte 0x82EA82EB + .4byte 0x82EC82ED + .4byte 0x82EE82EF + .4byte 0x82F082F1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000814A + .4byte 0x814B8154 + .4byte 0x81550000 + .4byte 0x00008340 + .4byte 0x83418342 + .4byte 0x83438344 + .4byte 0x83458346 + .4byte 0x83478348 + .4byte 0x8349834A + .4byte 0x834B834C + .4byte 0x834D834E + .4byte 0x834F8350 + .4byte 0x83518352 + .4byte 0x83538354 + .4byte 0x83558356 + .4byte 0x83578358 + .4byte 0x8359835A + .4byte 0x835B835C + .4byte 0x835D835E + .4byte 0x835F8360 + .4byte 0x83618362 + .4byte 0x83638364 + .4byte 0x83658366 + .4byte 0x83678368 + .4byte 0x8369836A + .4byte 0x836B836C + .4byte 0x836D836E + .4byte 0x836F8370 + .4byte 0x83718372 + .4byte 0x83738374 + .4byte 0x83758376 + .4byte 0x83778378 + .4byte 0x8379837A + .4byte 0x837B837C + .4byte 0x837D837E + .4byte 0x83808381 + .4byte 0x83828383 + .4byte 0x83848385 + .4byte 0x83868387 + .4byte 0x83888389 + .4byte 0x838A838B + .4byte 0x838C838D + .4byte 0x838E838F + .4byte 0x83908391 + .4byte 0x83928393 + .4byte 0x83948395 + .4byte 0x83960000 + .4byte 0 + .4byte 0x00008145 + .4byte 0x815B8152 + .4byte 0x81530000 .global Ucs4E Ucs4E: - .incbin "baserom.dol", 0x420F40, 0x200 + .4byte 0x88EA929A + .4byte 0x00008EB5 + .4byte 0 + .4byte 0x0000969C + .4byte 0x8FE48E4F + .4byte 0x8FE389BA + .4byte 0x00009573 + .4byte 0x975E0000 + .4byte 0x98A0894E + .4byte 0 + .4byte 0x8A8E98A1 + .4byte 0x90A299C0 + .4byte 0x8B7595B8 + .4byte 0 + .4byte 0 + .4byte 0x8FE50000 + .4byte 0x000097BC + .4byte 0 + .4byte 0 + .4byte 0x95C00000 + .4byte 0 + .4byte 0x98A20000 + .4byte 0x00009286 + .4byte 0 + .4byte 0x000098A3 + .4byte 0x8BF80000 + .4byte 0 + .4byte 0x98A40000 + .4byte 0x8ADB924F + .4byte 0x00008EE5 + .4byte 0x98A50000 + .4byte 0x000098A6 + .4byte 0 + .4byte 0x98A79454 + .4byte 0x00008B76 + .4byte 0 + .4byte 0 + .4byte 0x00009456 + .4byte 0x000093E1 + .4byte 0x8CC19652 + .4byte 0 + .4byte 0 + .4byte 0x0000E568 + .4byte 0x98A88FE6 + .4byte 0x98A989B3 + .4byte 0 + .4byte 0x00008BE3 + .4byte 0x8CEE96E7 + .4byte 0 + .4byte 0x9BA40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009790 + .4byte 0x000093FB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AA30000 + .4byte 0x8B540000 + .4byte 0x98AA0000 + .4byte 0x000098AB + .4byte 0x97B90000 + .4byte 0x975C9188 + .4byte 0x98AD8E96 + .4byte 0x93F10000 + .4byte 0x98B00000 + .4byte 0x0000895D + .4byte 0x8CDD0000 + .4byte 0x8CDC88E4 + .4byte 0 + .4byte 0x986A9869 + .4byte 0x00008DB1 + .4byte 0x889F0000 + .4byte 0x98B198B2 + .4byte 0x98B39653 + .4byte 0x98B40000 + .4byte 0x8CF088E5 + .4byte 0x96920000 + .4byte 0x8B9C0000 + .4byte 0x00008B9D + .4byte 0x8B9E92E0 + .4byte 0x97BA0000 + .4byte 0x98B50000 + .4byte 0x000098B6 + .4byte 0 + .4byte 0x98B70000 + .4byte 0 + .4byte 0x906C0000 + .4byte 0 + .4byte 0 + .4byte 0x8F59906D + .4byte 0x98BC0000 + .4byte 0x98BA0000 + .4byte 0x98BB8B77 + .4byte 0 + .4byte 0x8DA189EE + .4byte 0x000098B9 + .4byte 0x98B895A7 + .4byte 0 + .4byte 0 + .4byte 0x8E658E64 + .4byte 0x91BC98BD + .4byte 0x957490E5 + .4byte 0 + .4byte 0x00008157 + .4byte 0x98BE98C0 + .4byte 0 + .4byte 0x000091E3 + .4byte 0x97DF88C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000098BF + .4byte 0x89BC0000 + .4byte 0x8BC20000 + .4byte 0x92870000 + .4byte 0 + .4byte 0x8C8F98C1 + .4byte 0 + .4byte 0x00009443 + .4byte 0 + .4byte 0 .global Ucs4F Ucs4F: - .incbin "baserom.dol", 0x421140, 0x200 + .4byte 0x00008AE9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000098C2 + .4byte 0x88C90000 + .4byte 0x00008CDE + .4byte 0x8AEA959A + .4byte 0x94B08B78 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89EF0000 + .4byte 0x98E59360 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000948C + .4byte 0x98C40000 + .4byte 0 + .4byte 0x94BA0000 + .4byte 0x97E00000 + .4byte 0x904C0000 + .4byte 0x8E660000 + .4byte 0x8E9789BE + .4byte 0 + .4byte 0 + .4byte 0x000092CF + .4byte 0 + .4byte 0x924198C8 + .4byte 0 + .4byte 0 + .4byte 0x000088CA + .4byte 0x92E18F5A + .4byte 0x8DB29743 + .4byte 0x000091CC + .4byte 0x000089BD + .4byte 0x000098C7 + .4byte 0x0000975D + .4byte 0x98C398C5 + .4byte 0x8DEC98C6 + .4byte 0x9B430000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000098CE + .4byte 0 + .4byte 0 + .4byte 0x000098D1 + .4byte 0x98CF0000 + .4byte 0x000089C0 + .4byte 0x000095B9 + .4byte 0x98C90000 + .4byte 0 + .4byte 0x000098CD + .4byte 0x8CF10000 + .4byte 0x00008E67 + .4byte 0 + .4byte 0x00008AA4 + .4byte 0 + .4byte 0x98D20000 + .4byte 0x98CA0000 + .4byte 0x000097E1 + .4byte 0x00008E98 + .4byte 0x000098CB + .4byte 0x000098D0 + .4byte 0 + .4byte 0 + .4byte 0x98D30000 + .4byte 0x98CC0000 + .4byte 0x00008B9F + .4byte 0x000088CB + .4byte 0 + .4byte 0x8BA089BF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009B44 + .4byte 0x00009699 + .4byte 0x958E8CF2 + .4byte 0 + .4byte 0 + .4byte 0x0000904E + .4byte 0x97B50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095D6 + .4byte 0 + .4byte 0x8C5791A3 + .4byte 0x89E20000 + .4byte 0 + .4byte 0 + .4byte 0x8F720000 + .4byte 0 + .4byte 0x98D70000 + .4byte 0x98DC98DA + .4byte 0 + .4byte 0x98D50000 + .4byte 0x000091AD + .4byte 0x98D80000 + .4byte 0x98DB98D9 + .4byte 0x000095DB + .4byte 0x000098D6 + .4byte 0x0000904D + .4byte 0x00009693 + .4byte 0x98DD98DE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8F4398EB + .4byte 0 + .4byte 0x0000946F + .4byte 0x00009555 + .4byte 0x98E60000 + .4byte 0x95EE0000 + .4byte 0x89B40000 + .4byte 0 + .4byte 0x98EA0000 .global Ucs50 Ucs50: - .incbin "baserom.dol", 0x421340, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x000098E4 + .4byte 0x98ED0000 + .4byte 0x00009171 + .4byte 0x00008CC2 + .4byte 0x0000947B + .4byte 0x0000E0C5 + .4byte 0x000098EC + .4byte 0x937C0000 + .4byte 0x98E10000 + .4byte 0x8CF40000 + .4byte 0x00008CF3 + .4byte 0x98DF0000 + .4byte 0 + .4byte 0x00008ED8 + .4byte 0x000098E7 + .4byte 0x000095ED + .4byte 0x926C98E3 + .4byte 0x8C910000 + .4byte 0x98E098E8 + .4byte 0x98E297CF + .4byte 0x98E99860 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8BE40000 + .4byte 0x00008C90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000098EE + .4byte 0 + .4byte 0x000098EF + .4byte 0x98F388CC + .4byte 0 + .4byte 0 + .4byte 0x000095CE + .4byte 0x98F20000 + .4byte 0 + .4byte 0x000098F1 + .4byte 0x98F50000 + .4byte 0 + .4byte 0x98F40000 + .4byte 0x92E20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008C92 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x98F60000 + .4byte 0 + .4byte 0 + .4byte 0x8EC30000 + .4byte 0x91A492E3 + .4byte 0x8BF40000 + .4byte 0x98F70000 + .4byte 0 + .4byte 0x00008B55 + .4byte 0 + .4byte 0x98F80000 + .4byte 0 + .4byte 0x000098FA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009654 + .4byte 0 + .4byte 0x00008C86 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E5094F5 + .4byte 0x98F90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8DC39762 + .4byte 0 + .4byte 0 + .4byte 0x98FC9942 + .4byte 0x98FB8DC2 + .4byte 0x00008F9D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C580000 + .4byte 0 + .4byte 0x99430000 + .4byte 0x00008BCD + .4byte 0 + .4byte 0x00009940 + .4byte 0x99410000 + .4byte 0x000093AD + .4byte 0x0000919C + .4byte 0x00008BA1 + .4byte 0 + .4byte 0x0000966C + .4byte 0x99440000 + .4byte 0 + .4byte 0x97BB0000 + .4byte 0 + .4byte 0x99450000 + .4byte 0 + .4byte 0x00009948 + .4byte 0x00009946 + .4byte 0x0000916D + .4byte 0 + .4byte 0 + .4byte 0x00009947 + .4byte 0x99490000 + .4byte 0 + .4byte 0 + .4byte 0x0000994B + .4byte 0 + .4byte 0x0000994A + .4byte 0x000095C6 + .4byte 0 + .4byte 0 .global Ucs51 Ucs51: - .incbin "baserom.dol", 0x421540, 0x200 + .4byte 0x8B56994D + .4byte 0x994E0000 + .4byte 0x89AD0000 + .4byte 0 + .4byte 0x0000994C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EF20000 + .4byte 0x99519950 + .4byte 0x994F0000 + .4byte 0x98D40000 + .4byte 0x99520000 + .4byte 0 + .4byte 0x00008F9E + .4byte 0x00009953 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97440000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96D70000 + .4byte 0 + .4byte 0x00009955 + .4byte 0 + .4byte 0x99549957 + .4byte 0x99560000 + .4byte 0x00009958 + .4byte 0x995988F2 + .4byte 0x00008CB3 + .4byte 0x8C5A8F5B + .4byte 0x929B8BA2 + .4byte 0x90E68CF5 + .4byte 0x00008D8E + .4byte 0x995B96C6 + .4byte 0x93650000 + .4byte 0x8E990000 + .4byte 0x995A0000 + .4byte 0x995C0000 + .4byte 0 + .4byte 0 + .4byte 0x937D0000 + .4byte 0x8A950000 + .4byte 0 + .4byte 0 + .4byte 0x995D0000 + .4byte 0x000093FC + .4byte 0 + .4byte 0x9153995F + .4byte 0x996094AA + .4byte 0x8CF6985A + .4byte 0x99610000 + .4byte 0x00008BA4 + .4byte 0 + .4byte 0x000095BA + .4byte 0x91B48BEF + .4byte 0x93540000 + .4byte 0 + .4byte 0x8C930000 + .4byte 0 + .4byte 0x99620000 + .4byte 0x99630000 + .4byte 0x000093E0 + .4byte 0x897E0000 + .4byte 0x00009966 + .4byte 0x8DFB0000 + .4byte 0x99658DC4 + .4byte 0x00009967 + .4byte 0xE3EC9968 + .4byte 0x96609969 + .4byte 0x0000996A + .4byte 0x996B8FE7 + .4byte 0x00008ECA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AA50000 + .4byte 0x996E0000 + .4byte 0x996C96BB + .4byte 0x996D0000 + .4byte 0x9579996F + .4byte 0x99709971 + .4byte 0x937E0000 + .4byte 0 + .4byte 0x99759973 + .4byte 0x99749972 + .4byte 0x8DE19976 + .4byte 0x96E897E2 + .4byte 0 + .4byte 0 + .4byte 0x00009977 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90A69978 + .4byte 0x8F790000 + .4byte 0x00009979 + .4byte 0x0000929C + .4byte 0x97BD9380 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x99C30000 + .4byte 0 + .4byte 0x0000997A + .4byte 0xEAA38BC3 + .4byte 0 + .4byte 0x997B967D + .4byte 0 + .4byte 0 + .4byte 0x8F8891FA + .4byte 0x0000997D + .4byte 0x93E20000 + .4byte 0x0000997E + .4byte 0 + .4byte 0x99808A4D + .4byte 0 + .4byte 0x00009981 + .4byte 0x8BA50000 + .4byte 0x93CA899A + .4byte 0x8F6F0000 + .4byte 0x0000949F + .4byte 0x99820000 .global Ucs52 Ucs52: - .incbin "baserom.dol", 0x421740, 0x200 + .4byte 0x93810000 + .4byte 0x0000906E + .4byte 0x99830000 + .4byte 0x95AA90D8 + .4byte 0x8AA00000 + .4byte 0x8AA79984 + .4byte 0 + .4byte 0x99860000 + .4byte 0x00008C59 + .4byte 0 + .4byte 0x99850000 + .4byte 0x000097F1 + .4byte 0 + .4byte 0 + .4byte 0x00008F89 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94BB95CA + .4byte 0x00009987 + .4byte 0x00009798 + .4byte 0x99880000 + .4byte 0 + .4byte 0x99890000 + .4byte 0x939E0000 + .4byte 0x0000998A + .4byte 0 + .4byte 0x90A78DFC + .4byte 0x8C94998B + .4byte 0x8E688D8F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000092E4 + .4byte 0x998D0000 + .4byte 0x000091A5 + .4byte 0 + .4byte 0x8DED998E + .4byte 0x998F914F + .4byte 0x0000998C + .4byte 0 + .4byte 0 + .4byte 0x99910000 + .4byte 0x96550000 + .4byte 0 + .4byte 0x00008D84 + .4byte 0 + .4byte 0x99900000 + .4byte 0 + .4byte 0x00008C95 + .4byte 0x8DDC948D + .4byte 0 + .4byte 0x00009994 + .4byte 0x99920000 + .4byte 0 + .4byte 0x0000959B + .4byte 0x8FE8999B + .4byte 0x8A849995 + .4byte 0x9993916E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009997 + .4byte 0x00009996 + .4byte 0 + .4byte 0x00008A63 + .4byte 0 + .4byte 0x00008C80 + .4byte 0x999C97AB + .4byte 0 + .4byte 0x00009998 + .4byte 0 + .4byte 0x0000999D + .4byte 0x999A0000 + .4byte 0x99990000 + .4byte 0 + .4byte 0 + .4byte 0x000097CD + .4byte 0 + .4byte 0x00008CF7 + .4byte 0x89C10000 + .4byte 0x000097F2 + .4byte 0 + .4byte 0 + .4byte 0x00008F95 + .4byte 0x93778D85 + .4byte 0x99A099A1 + .4byte 0 + .4byte 0x000097E3 + .4byte 0 + .4byte 0x984A99A3 + .4byte 0 + .4byte 0x00008CF8 + .4byte 0 + .4byte 0x99A20000 + .4byte 0x8A4E0000 + .4byte 0x000099A4 + .4byte 0x00009675 + .4byte 0x000092BA + .4byte 0x00009745 + .4byte 0x000095D7 + .4byte 0 + .4byte 0x000099A5 + .4byte 0 + .4byte 0 + .4byte 0xE8D30000 + .4byte 0x000093AE + .4byte 0x000099A6 + .4byte 0x8AA896B1 + .4byte 0 + .4byte 0x00008F9F + .4byte 0x99A795E5 + .4byte 0x99AB0000 + .4byte 0x90A899A8 + .4byte 0x8BCE0000 + .4byte 0x99A98AA9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C4D99AC + .4byte 0x000099AD + .4byte 0 + .4byte 0x99AE99AF + .4byte 0x8ED90000 + .4byte 0 + .4byte 0x8CF996DC .global Ucs53 Ucs53: - .incbin "baserom.dol", 0x421940, 0x200 + .4byte 0x000096E6 + .4byte 0x93F50000 + .4byte 0x000095EF + .4byte 0x99B00000 + .4byte 0x99B10000 + .4byte 0 + .4byte 0x000099B3 + .4byte 0x000099B5 + .4byte 0x99B40000 + .4byte 0 + .4byte 0x000099B6 + .4byte 0x89BB966B + .4byte 0x00008DFA + .4byte 0x99B70000 + .4byte 0x00009178 + .4byte 0 + .4byte 0x8FA08BA7 + .4byte 0x000099B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94D90000 + .4byte 0 + .4byte 0x000099B9 + .4byte 0x000099BA + .4byte 0x000099BB + .4byte 0 + .4byte 0 + .4byte 0x99BC9543 + .4byte 0x8BE688E3 + .4byte 0 + .4byte 0x000093BD + .4byte 0x99BD8F5C + .4byte 0x000090E7 + .4byte 0x000099BF + .4byte 0x99BE8FA1 + .4byte 0x8CDF99C1 + .4byte 0x94BC0000 + .4byte 0x000099C2 + .4byte 0 + .4byte 0x000094DA + .4byte 0x91B291EC + .4byte 0x8BA60000 + .4byte 0x000093EC + .4byte 0x92500000 + .4byte 0x948E0000 + .4byte 0x966D0000 + .4byte 0x99C40000 + .4byte 0x90E80000 + .4byte 0 + .4byte 0 + .4byte 0x8C540000 + .4byte 0x000099C5 + .4byte 0 + .4byte 0 + .4byte 0x99C6894B + .4byte 0x88F38AEB + .4byte 0x000091A6 + .4byte 0x8B709791 + .4byte 0x000099C9 + .4byte 0x89B50000 + .4byte 0x000099C8 + .4byte 0 + .4byte 0x00008BA8 + .4byte 0 + .4byte 0x99CA0000 + .4byte 0x96EF0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x99CB0000 + .4byte 0x97D00000 + .4byte 0x8CFA0000 + .4byte 0 + .4byte 0x00008CB4 + .4byte 0x99CC0000 + .4byte 0 + .4byte 0x000099CE + .4byte 0x99CD0000 + .4byte 0x907E8958 + .4byte 0 + .4byte 0x0000897D + .4byte 0x99CF0000 + .4byte 0x99D00000 + .4byte 0x00008CB5 + .4byte 0 + .4byte 0x99D10000 + .4byte 0 + .4byte 0x00008B8E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E5199D2 + .4byte 0 + .4byte 0 + .4byte 0x96948DB3 + .4byte 0x8B799746 + .4byte 0x916F94BD + .4byte 0x8EFB0000 + .4byte 0 + .4byte 0 + .4byte 0x8F660000 + .4byte 0x8EE68EF3 + .4byte 0x00008F96 + .4byte 0x000094BE + .4byte 0 + .4byte 0x000099D5 + .4byte 0x00008962 + .4byte 0x91708CFB + .4byte 0x8CC38BE5 + .4byte 0 + .4byte 0x99D99240 + .4byte 0x91FC8BA9 + .4byte 0x8FA299DA + .4byte 0x99D889C2 + .4byte 0x91E48EB6 + .4byte 0x8E6A8945 + .4byte 0 + .4byte 0x8A908D86 + .4byte 0x8E690000 + .4byte 0x99DB0000 + .4byte 0 + .4byte 0 .global Ucs54 Ucs54: - .incbin "baserom.dol", 0x421B40, 0x200 + .4byte 0x000099DC + .4byte 0x00008B68 + .4byte 0x8A650000 + .4byte 0 + .4byte 0x8D878B67 + .4byte 0x92DD8944 + .4byte 0x93AF96BC + .4byte 0x8D409799 + .4byte 0x93668CFC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008C4E + .4byte 0x000099E5 + .4byte 0x00008BE1 + .4byte 0x96690000 + .4byte 0 + .4byte 0 + .4byte 0x94DB0000 + .4byte 0x000099E4 + .4byte 0x00008ADC + .4byte 0x99DF99E0 + .4byte 0x99E20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x99E30000 + .4byte 0x8B7A9081 + .4byte 0x000095AB + .4byte 0x99E199DD + .4byte 0x8CE10000 + .4byte 0x99DE0000 + .4byte 0x98430000 + .4byte 0 + .4byte 0x95F00000 + .4byte 0x92E68CE0 + .4byte 0x8D900000 + .4byte 0 + .4byte 0x99E60000 + .4byte 0x000093DB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000099EA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EFC0000 + .4byte 0x8EF40000 + .4byte 0 + .4byte 0 + .4byte 0x99ED99EB + .4byte 0x000096A1 + .4byte 0x000099E8 + .4byte 0x99F199EC + .4byte 0 + .4byte 0x000099EF + .4byte 0x8CC496BD + .4byte 0 + .4byte 0x99F00000 + .4byte 0 + .4byte 0x99F20000 + .4byte 0x99F40000 + .4byte 0 + .4byte 0x00008DEE + .4byte 0x98610000 + .4byte 0x99E999E7 + .4byte 0x99F30000 + .4byte 0x99EE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x99F60000 + .4byte 0x9A4299F8 + .4byte 0 + .4byte 0x99FC0000 + .4byte 0x00009A40 + .4byte 0x99F90000 + .4byte 0x00009A5D + .4byte 0 + .4byte 0x8DE78A50 + .4byte 0 + .4byte 0 + .4byte 0x99F70000 + .4byte 0 + .4byte 0x9A4488F4 + .4byte 0x9A430000 + .4byte 0x88A39569 + .4byte 0x9A410000 + .4byte 0x99FA0000 + .4byte 0x000099F5 + .4byte 0x99FB8DC6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A450000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088F5 + .4byte 0x9A4E0000 + .4byte 0x00009A46 + .4byte 0x9A470000 + .4byte 0x8FA39689 + .4byte 0 + .4byte 0x00009A4C + .4byte 0x9A4B0000 + .4byte 0 + .4byte 0x934E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A4D0000 + .4byte 0x00009A4A + .4byte 0 .global Ucs55 Ucs55: - .incbin "baserom.dol", 0x421D40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x89530000 + .4byte 0x8DB4904F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009A48 + .4byte 0x93820000 + .4byte 0 + .4byte 0x9A490000 + .4byte 0x88A00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A539742 + .4byte 0x00008FA5 + .4byte 0x00009A59 + .4byte 0 + .4byte 0 + .4byte 0x9A589A4F + .4byte 0 + .4byte 0 + .4byte 0x91C10000 + .4byte 0x9A500000 + .4byte 0 + .4byte 0x91ED9A55 + .4byte 0x8FA40000 + .4byte 0 + .4byte 0 + .4byte 0x9A520000 + .4byte 0x000096E2 + .4byte 0 + .4byte 0x00008C5B + .4byte 0 + .4byte 0x9A569A57 + .4byte 0 + .4byte 0 + .4byte 0x9A549A5A + .4byte 0 + .4byte 0 + .4byte 0x00009A51 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009A60 + .4byte 0x9A650000 + .4byte 0x9A610000 + .4byte 0x9A5C0000 + .4byte 0x00009A66 + .4byte 0x91500000 + .4byte 0x00009A68 + .4byte 0x00008D41 + .4byte 0x9A5E929D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A629A5B + .4byte 0x8AAB0000 + .4byte 0x8AEC8A85 + .4byte 0x9A639A5F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008C96 + .4byte 0x9A699A67 + .4byte 0x91728B69 + .4byte 0x8BAA0000 + .4byte 0x9A640000 + .4byte 0x8BF20000 + .4byte 0 + .4byte 0 + .4byte 0x89630000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A6D9A6B + .4byte 0x00009AA5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A700000 + .4byte 0 + .4byte 0 + .4byte 0x9A6A0000 + .4byte 0x9A6E0000 + .4byte 0x00009A6C + .4byte 0 + .4byte 0x00008E6B + .4byte 0x9A6F0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009A72 + .4byte 0x00009A77 + .4byte 0 + .4byte 0x00009A75 + .4byte 0x9A740000 .global Ucs56 Ucs56: - .incbin "baserom.dol", 0x421F40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x92510000 + .4byte 0x000089C3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A710000 + .4byte 0x9A738FA6 + .4byte 0x89520000 + .4byte 0x00009A76 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000089DC + .4byte 0 + .4byte 0 + .4byte 0x00009A82 + .4byte 0x00008FFA + .4byte 0x9A7D0000 + .4byte 0x9A7B0000 + .4byte 0x9A7C0000 + .4byte 0x9A7E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x895C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91580000 + .4byte 0x9A780000 + .4byte 0x9A790000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008A9A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A810000 + .4byte 0 + .4byte 0x8AED0000 + .4byte 0x9A849A80 + .4byte 0x9A830000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x95AC0000 + .4byte 0 + .4byte 0x93D30000 + .4byte 0x94B60000 + .4byte 0 + .4byte 0 + .4byte 0x9A860000 + .4byte 0 + .4byte 0 + .4byte 0x9A858A64 + .4byte 0 + .4byte 0x9A870000 + .4byte 0 + .4byte 0x00009A8A + .4byte 0 + .4byte 0 + .4byte 0x9A890000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A880000 + .4byte 0x94580000 + .4byte 0x00009A8B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A8C0000 + .4byte 0 + .4byte 0 + .4byte 0x9A8E0000 + .4byte 0x9A8D0000 + .4byte 0 + .4byte 0 + .4byte 0x9A900000 + .4byte 0 + .4byte 0x9A939A91 + .4byte 0x9A8F9A92 + .4byte 0 + .4byte 0 + .4byte 0x9A940000 + .4byte 0 + .4byte 0 + .4byte 0x9A950000 + .4byte 0x00009A96 + .4byte 0x00009A97 + .4byte 0 + .4byte 0x00009A98 + .4byte 0x99640000 + .4byte 0x8EFA8E6C + .4byte 0 + .4byte 0x89F10000 + .4byte 0x88F60000 + .4byte 0x00009263 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9A990000 + .4byte 0x8DA20000 + .4byte 0x88CD907D + .4byte 0 + .4byte 0 + .4byte 0x00009A9A + .4byte 0x8CC50000 + .4byte 0x00008D91 + .4byte 0x00009A9C .global Ucs57 Ucs57: - .incbin "baserom.dol", 0x422140, 0x200 + .4byte 0x9A9B0000 + .4byte 0x000095DE + .4byte 0x9A9D0000 + .4byte 0 + .4byte 0x9A9F9A9E + .4byte 0x00009AA0 + .4byte 0x00009AA1 + .4byte 0x00008C97 + .4byte 0 + .4byte 0x89809AA2 + .4byte 0 + .4byte 0x9AA40000 + .4byte 0x9AA30000 + .4byte 0 + .4byte 0x9AA60000 + .4byte 0x00009379 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9AA788B3 + .4byte 0x8DDD0000 + .4byte 0 + .4byte 0x00008C5C + .4byte 0 + .4byte 0x926E0000 + .4byte 0 + .4byte 0 + .4byte 0x00009AA8 + .4byte 0x9AA90000 + .4byte 0x00009AAB + .4byte 0 + .4byte 0 + .4byte 0x9AAC0000 + .4byte 0x8DE20000 + .4byte 0 + .4byte 0x00008BCF + .4byte 0 + .4byte 0x96560000 + .4byte 0 + .4byte 0x9AAA9AAD + .4byte 0x8DBF8D42 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009AB1 + .4byte 0 + .4byte 0x8DA30000 + .4byte 0x92520000 + .4byte 0x00009AAE + .4byte 0x92D80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009AB2 + .4byte 0 + .4byte 0x90820000 + .4byte 0 + .4byte 0 + .4byte 0x9AB09AB3 + .4byte 0x00008C5E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009AB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9AB50000 + .4byte 0x8D438A5F + .4byte 0x9AB70000 + .4byte 0 + .4byte 0 + .4byte 0x9AB80000 + .4byte 0 + .4byte 0 + .4byte 0x9AB90000 + .4byte 0x00009AB6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9AAF0000 + .4byte 0x00009ABA + .4byte 0 + .4byte 0x9ABB0000 + .4byte 0 + .4byte 0x00009684 + .4byte 0 + .4byte 0x8FE90000 + .4byte 0 + .4byte 0x9ABD9ABE + .4byte 0x9ABC0000 + .4byte 0x9AC00000 + .4byte 0 + .4byte 0 + .4byte 0x94570000 + .4byte 0x000088E6 + .4byte 0x95750000 + .4byte 0x00009AC1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8FFB0000 + .4byte 0x00008EB7 + .4byte 0x0000947C + .4byte 0x8AEE0000 + .4byte 0x8DE90000 + .4byte 0 .global Ucs58 Ucs58: - .incbin "baserom.dol", 0x422340, 0x200 + .4byte 0x96780000 + .4byte 0x93B00000 + .4byte 0x00008C98 + .4byte 0x91CD0000 + .4byte 0 + .4byte 0x9ABF9AC2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091C2 + .4byte 0 + .4byte 0x00009AC3 + .4byte 0 + .4byte 0x00009AC4 + .4byte 0 + .4byte 0x00009AC6 + .4byte 0 + .4byte 0x92E70000 + .4byte 0 + .4byte 0 + .4byte 0x8AAC0000 + .4byte 0 + .4byte 0x0000EA9F + .4byte 0x898195F1 + .4byte 0 + .4byte 0x8FEA9367 + .4byte 0 + .4byte 0 + .4byte 0x8DE40000 + .4byte 0x00009ACC + .4byte 0 + .4byte 0x95BB97DB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89F29AC8 + .4byte 0 + .4byte 0 + .4byte 0x00009159 + .4byte 0x9ACB0000 + .4byte 0x93830000 + .4byte 0x00009368 + .4byte 0x938494B7 + .4byte 0x92CB0000 + .4byte 0 + .4byte 0x8DC70000 + .4byte 0 + .4byte 0x9AC70000 + .4byte 0 + .4byte 0 + .4byte 0x00008996 + .4byte 0x00009355 + .4byte 0 + .4byte 0 + .4byte 0x9AC90000 + .4byte 0x9AC50000 + .4byte 0x0000906F + .4byte 0 + .4byte 0x00009ACD + .4byte 0 + .4byte 0 + .4byte 0x8F6D0000 + .4byte 0 + .4byte 0x00008BAB + .4byte 0x00009ACE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095E6 + .4byte 0 + .4byte 0x0000919D + .4byte 0 + .4byte 0 + .4byte 0x92C40000 + .4byte 0x00009AD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x966E0000 + .4byte 0x00009AD1 + .4byte 0 + .4byte 0x9AD60000 + .4byte 0 + .4byte 0x000095AD + .4byte 0 + .4byte 0 + .4byte 0x9AD59ACF + .4byte 0x9AD29AD4 + .4byte 0 + .4byte 0x8DA40000 + .4byte 0x000095C7 + .4byte 0 + .4byte 0x00009AD7 + .4byte 0x00009264 + .4byte 0 + .4byte 0x89F30000 + .4byte 0x8FEB0000 + .4byte 0 + .4byte 0x00009AD9 + .4byte 0x00009AD8 + .4byte 0x00008D88 + .4byte 0x00009ADA + .4byte 0x9ADC9ADB + .4byte 0 + .4byte 0x9ADE0000 + .4byte 0x9AD39AE0 + .4byte 0 + .4byte 0 + .4byte 0x9ADF9ADD + .4byte 0 + .4byte 0 + .4byte 0x00008E6D + .4byte 0x90700000 + .4byte 0x91739AE1 + .4byte 0x90BA88EB + .4byte 0x94840000 + .4byte 0 + .4byte 0x000092D9 + .4byte 0x00009AE3 + .4byte 0x9AE29AE4 + .4byte 0x9AE59AE6 + .4byte 0 .global Ucs59 Ucs59: - .incbin "baserom.dol", 0x422540, 0x200 + .4byte 0 + .4byte 0x9AE70000 + .4byte 0 + .4byte 0 + .4byte 0x000095CF + .4byte 0x9AE80000 + .4byte 0 + .4byte 0x000089C4 + .4byte 0x9AE90000 + .4byte 0 + .4byte 0x0000975B + .4byte 0x8A4F0000 + .4byte 0x99C78F67 + .4byte 0x91BD9AEA + .4byte 0x96E90000 + .4byte 0 + .4byte 0 + .4byte 0x96B20000 + .4byte 0x00009AEC + .4byte 0x000091E5 + .4byte 0x00009356 + .4byte 0x91BE9576 + .4byte 0x9AED9AEE + .4byte 0x899B0000 + .4byte 0x00008EB8 + .4byte 0x9AEF0000 + .4byte 0 + .4byte 0x000088CE + .4byte 0x9AF00000 + .4byte 0 + .4byte 0 + .4byte 0x9AF10000 + .4byte 0 + .4byte 0 + .4byte 0x89820000 + .4byte 0x00008AEF + .4byte 0x93DE95F2 + .4byte 0 + .4byte 0 + .4byte 0x9AF59174 + .4byte 0x9AF48C5F + .4byte 0 + .4byte 0x967A9AF3 + .4byte 0x00009385 + .4byte 0x9AF70000 + .4byte 0x9AF60000 + .4byte 0 + .4byte 0 + .4byte 0x9AF90000 + .4byte 0x9AF80000 + .4byte 0x0000899C + .4byte 0x00009AFA + .4byte 0x8FA79AFC + .4byte 0x92440000 + .4byte 0x9AFB0000 + .4byte 0x95B10000 + .4byte 0 + .4byte 0x00008F97 + .4byte 0x937A0000 + .4byte 0 + .4byte 0x9B400000 + .4byte 0 + .4byte 0x00008D44 + .4byte 0 + .4byte 0x00009B41 + .4byte 0x944094DC + .4byte 0x96CF0000 + .4byte 0 + .4byte 0 + .4byte 0x94440000 + .4byte 0x00009B4A + .4byte 0 + .4byte 0 + .4byte 0x00008B57 + .4byte 0 + .4byte 0x97640000 + .4byte 0x000096AD + .4byte 0x00009BAA + .4byte 0x00009B42 + .4byte 0 + .4byte 0 + .4byte 0x00009B45 + .4byte 0x000091C3 + .4byte 0 + .4byte 0x96570000 + .4byte 0 + .4byte 0x93690000 + .4byte 0 + .4byte 0 + .4byte 0x9B460000 + .4byte 0 + .4byte 0 + .4byte 0x00009685 + .4byte 0x00008DC8 + .4byte 0 + .4byte 0x8FA80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B470000 + .4byte 0x00008E6F + .4byte 0x00008E6E + .4byte 0 + .4byte 0 + .4byte 0x88B78CC6 + .4byte 0x000090A9 + .4byte 0x88CF0000 + .4byte 0 + .4byte 0x00009B4B + .4byte 0x9B4C0000 + .4byte 0x9B490000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008957 + .4byte 0x8AAD0000 + .4byte 0x9B480000 + .4byte 0x96C39550 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x88A60000 + .4byte 0 + .4byte 0x000088F7 + .4byte 0 + .4byte 0x00008E70 .global Ucs5A Ucs5A: - .incbin "baserom.dol", 0x422740, 0x200 + .4byte 0x000088D0 + .4byte 0x000088A1 + .4byte 0 + .4byte 0 + .4byte 0x00009B51 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009B4F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96BA0000 + .4byte 0x9B520000 + .4byte 0x9B500000 + .4byte 0x00009B4E + .4byte 0x90500000 + .4byte 0 + .4byte 0x00009B4D + .4byte 0 + .4byte 0x000095D8 + .4byte 0 + .4byte 0 + .4byte 0x00008CE2 + .4byte 0 + .4byte 0 + .4byte 0x00009B56 + .4byte 0x9B570000 + .4byte 0 + .4byte 0 + .4byte 0x8FA90000 + .4byte 0 + .4byte 0x9B53984B + .4byte 0 + .4byte 0 + .4byte 0x946B0000 + .4byte 0x00009B55 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8DA50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B580000 + .4byte 0 + .4byte 0x95770000 + .4byte 0 + .4byte 0x9B590000 + .4byte 0x9B540000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000096B9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x947D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B5A9551 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B5B9B5F + .4byte 0x9B5C0000 + .4byte 0x000089C5 + .4byte 0x9B5E0000 + .4byte 0 + .4byte 0 + .4byte 0x00008EB9 + .4byte 0x00009B5D + .4byte 0x8C990000 + .4byte 0 + .4byte 0x9B6B0000 + .4byte 0 + .4byte 0 + .4byte 0x9B649B61 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009284 + .4byte 0x00009B60 + .4byte 0 + .4byte 0x9B620000 + .4byte 0x00009B63 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B659B66 + .4byte 0 + .4byte 0 .global Ucs5B Ucs5B: - .incbin "baserom.dol", 0x422940, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008AF0 + .4byte 0x00009B68 + .4byte 0x9B670000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B690000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8FEC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B6C0000 + .4byte 0x92DA0000 + .4byte 0 + .4byte 0x89640000 + .4byte 0x9B6A0000 + .4byte 0 + .4byte 0x9B6D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B6E0000 + .4byte 0x9B710000 + .4byte 0x00009B6F + .4byte 0x00009B70 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E719B72 + .4byte 0 + .4byte 0x8D459B73 + .4byte 0x00008E9A + .4byte 0x91B60000 + .4byte 0x9B749B75 + .4byte 0x8E798D46 + .4byte 0x000096D0 + .4byte 0 + .4byte 0x00008B47 + .4byte 0x8CC79B76 + .4byte 0x8A770000 + .4byte 0x00009B77 + .4byte 0x000091B7 + .4byte 0 + .4byte 0 + .4byte 0x9B789BA1 + .4byte 0x00009B79 + .4byte 0x00009B7A + .4byte 0 + .4byte 0x9B7B0000 + .4byte 0x9B7D0000 + .4byte 0 + .4byte 0 + .4byte 0x9B7E0000 + .4byte 0x00009B80 + .4byte 0x000091EE + .4byte 0x00008946 + .4byte 0x8EE788C0 + .4byte 0x00009176 + .4byte 0x8AAE8EB3 + .4byte 0x00008D47 + .4byte 0 + .4byte 0 + .4byte 0x00009386 + .4byte 0x00008F40 + .4byte 0x8AAF9288 + .4byte 0x92E888B6 + .4byte 0x8B5895F3 + .4byte 0x00008EC0 + .4byte 0 + .4byte 0x8B7190E9 + .4byte 0x8EBA9747 + .4byte 0x9B810000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B7B0000 + .4byte 0x8DC90000 + .4byte 0x00008A51 + .4byte 0x89838FAA + .4byte 0x89C60000 + .4byte 0x9B829765 + .4byte 0 + .4byte 0 + .4byte 0x00008F68 + .4byte 0 + .4byte 0x8EE29B83 + .4byte 0x8AF193D0 + .4byte 0x96A79B84 + .4byte 0x00009B85 + .4byte 0 + .4byte 0x95780000 + .4byte 0 + .4byte 0x9B870000 + .4byte 0x8AA68BF5 + .4byte 0x9B860000 + .4byte 0 + .4byte 0 + .4byte 0x00008AB0 + .4byte 0x00009051 + .4byte 0x9B8B8E40 + .4byte 0x000089C7 + .4byte 0x9B8A0000 + .4byte 0x9B889B8C + .4byte 0x9B89944A + .4byte 0x9ECB9052 + .4byte 0x00009B8D + .4byte 0 + .4byte 0x97BE0000 + .4byte 0x9B8E0000 + .4byte 0x00009B90 + .4byte 0x0000929E + .4byte 0x9B8F0000 + .4byte 0x90A10000 + .4byte 0x8E9B0000 + .4byte 0 + .4byte 0x91CE8EF5 .global Ucs5C Ucs5C: - .incbin "baserom.dol", 0x422B40, 0x200 + .4byte 0x00009595 + .4byte 0x90EA0000 + .4byte 0x8ECB9B91 + .4byte 0x8FAB9B92 + .4byte 0x9B9388D1 + .4byte 0x91B89071 + .4byte 0x00009B94 + .4byte 0x93B18FAC + .4byte 0x00008FAD + .4byte 0x00009B95 + .4byte 0 + .4byte 0x90EB0000 + .4byte 0 + .4byte 0x8FAE0000 + .4byte 0 + .4byte 0 + .4byte 0x9B960000 + .4byte 0x9B970000 + .4byte 0x96DE0000 + .4byte 0 + .4byte 0x9B980000 + .4byte 0 + .4byte 0x00008BC4 + .4byte 0 + .4byte 0x00008F41 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9B999B9A + .4byte 0x8EDA904B + .4byte 0x93F29073 + .4byte 0x94F69441 + .4byte 0x8BC79B9B + .4byte 0 + .4byte 0x00008B8F + .4byte 0x9B9C0000 + .4byte 0x8BFC0000 + .4byte 0x93CD89AE + .4byte 0x00008E72 + .4byte 0x9B9D9BA0 + .4byte 0x9B9F8BFB + .4byte 0x00009B9E + .4byte 0x00009357 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91AE0000 + .4byte 0x936A8EC6 + .4byte 0 + .4byte 0x9177979A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9BA20000 + .4byte 0x9BA393D4 + .4byte 0x00008E52 + .4byte 0 + .4byte 0 + .4byte 0x9BA50000 + .4byte 0x00009BA6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9BA70000 + .4byte 0 + .4byte 0x8AF29BA8 + .4byte 0 + .4byte 0x9BA90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000089AA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x915A8AE2 + .4byte 0x00009BAB + .4byte 0x96A60000 + .4byte 0 + .4byte 0x000091D0 + .4byte 0x00008A78 + .4byte 0 + .4byte 0x9BAD9BAF + .4byte 0x8ADD0000 + .4byte 0x00009BAC + .4byte 0x9BAE0000 + .4byte 0x9BB10000 + .4byte 0 + .4byte 0 + .4byte 0x00009BB0 + .4byte 0x00009BB2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BB3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x93BB8BAC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89E39BB4 + .4byte 0x9BB90000 + .4byte 0x00009BB7 + .4byte 0x000095F5 + .4byte 0x95F40000 + .4byte 0 + .4byte 0 + .4byte 0x93870000 + .4byte 0 + .4byte 0x9BB68F73 + .4byte 0x00009BB5 + .4byte 0 .global Ucs5D Ucs5D: - .incbin "baserom.dol", 0x422D40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009092 + .4byte 0 + .4byte 0x00009BBA + .4byte 0 + .4byte 0x8DE80000 + .4byte 0x00009BC0 + .4byte 0 + .4byte 0x9BC19BBB + .4byte 0x8A529BBC + .4byte 0x9BC59BC4 + .4byte 0x9BC39BBF + .4byte 0 + .4byte 0x00009BBE + .4byte 0 + .4byte 0x9BC20000 + .4byte 0 + .4byte 0 + .4byte 0x000095F6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BC9 + .4byte 0x9BC60000 + .4byte 0x9BC80000 + .4byte 0x97920000 + .4byte 0x9BC70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9BBD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009093 + .4byte 0 + .4byte 0x9BCA0000 + .4byte 0x00008DB5 + .4byte 0 + .4byte 0x00009BCB + .4byte 0 + .4byte 0x9BCC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9BCF0000 + .4byte 0x9BCE0000 + .4byte 0x00009BCD + .4byte 0 + .4byte 0x00009388 + .4byte 0x9BB80000 + .4byte 0 + .4byte 0x9BD50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BD1 + .4byte 0 + .4byte 0 + .4byte 0x9BD00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9BD20000 + .4byte 0x9BD30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BD6 + .4byte 0 + .4byte 0x97E40000 + .4byte 0x9BD79BD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BD8 + .4byte 0 + .4byte 0x8ADE9BD9 + .4byte 0 + .4byte 0 + .4byte 0x9BDB9BDA + .4byte 0 + .4byte 0x9BDC0000 + .4byte 0 + .4byte 0x00009BDD + .4byte 0x000090EC + .4byte 0x8F420000 + .4byte 0x00008F84 + .4byte 0x00009183 + .4byte 0x00008D48 + .4byte 0x8DB68D49 + .4byte 0x8B900000 + .4byte 0x00009BDE + .4byte 0 + .4byte 0x8DB70000 + .4byte 0x00008CC8 + .4byte 0x9BDF96A4 + .4byte 0x94629BE0 + .4byte 0x00008D4A + .4byte 0 + .4byte 0x00008AAA + .4byte 0x00009246 + .4byte 0x8BD00000 .global Ucs5E Ucs5E: - .incbin "baserom.dol", 0x422F40, 0x200 + .4byte 0 + .4byte 0x8E73957A + .4byte 0 + .4byte 0x94BF0000 + .4byte 0 + .4byte 0x00009BE1 + .4byte 0x8AF30000 + .4byte 0 + .4byte 0x00009BE4 + .4byte 0 + .4byte 0 + .4byte 0x929F0000 + .4byte 0x00009BE3 + .4byte 0x9BE29BE5 + .4byte 0x000092E9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009083 + .4byte 0 + .4byte 0 + .4byte 0x00008E74 + .4byte 0x000090C8 + .4byte 0x000091D1 + .4byte 0x8B410000 + .4byte 0x000092A0 + .4byte 0 + .4byte 0x9BE69BE7 + .4byte 0x8FED0000 + .4byte 0 + .4byte 0x00009658 + .4byte 0 + .4byte 0x9BEA0000 + .4byte 0x00009BE9 + .4byte 0x9BE8959D + .4byte 0x00009BF1 + .4byte 0 + .4byte 0 + .4byte 0x96790000 + .4byte 0x9BEB0000 + .4byte 0 + .4byte 0 + .4byte 0x9BED968B + .4byte 0x00009BEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BEE + .4byte 0x000094A6 + .4byte 0x9BEF95BC + .4byte 0x9BF00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AB195BD + .4byte 0x944E9BF2 + .4byte 0x9BF30000 + .4byte 0x8D4B8AB2 + .4byte 0x9BF48CB6 + .4byte 0x97639748 + .4byte 0x8AF49BF6 + .4byte 0x000092A1 + .4byte 0x00008D4C + .4byte 0x8FAF0000 + .4byte 0x000094DD + .4byte 0 + .4byte 0x8FB00000 + .4byte 0 + .4byte 0x00008F98 + .4byte 0 + .4byte 0 + .4byte 0x000092EA + .4byte 0x95F79358 + .4byte 0 + .4byte 0x8D4D0000 + .4byte 0x957B0000 + .4byte 0 + .4byte 0x9BF70000 + .4byte 0 + .4byte 0 + .4byte 0x93788DC0 + .4byte 0 + .4byte 0x00008CC9 + .4byte 0x000092EB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088C1 + .4byte 0x8F8E8D4E + .4byte 0x97660000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009BF8 + .4byte 0x9BF99470 + .4byte 0 + .4byte 0 + .4byte 0x9BFA97F5 + .4byte 0x984C0000 + .4byte 0 + .4byte 0x00009BFC + .4byte 0x9BFB0000 + .4byte 0x00008A66 + .4byte 0 + .4byte 0x9C400000 + .4byte 0 + .4byte 0x9C439C44 + .4byte 0x00009C42 + .4byte 0x0000955F + .4byte 0x8FB19C46 + .4byte 0x9C459C41 + .4byte 0 + .4byte 0 + .4byte 0x9C479C48 + .4byte 0 + .4byte 0x9C490000 + .4byte 0 + .4byte 0x9C4C9C4A + .4byte 0x00009C4B + .4byte 0x9C4D0000 + .4byte 0x898492EC + .4byte 0x9C4E0000 + .4byte 0x8C9A89F4 + .4byte 0x94550000 + .4byte 0x9C4F93F9 .global Ucs5F Ucs5F: - .incbin "baserom.dol", 0x423140, 0x200 + .4byte 0x000095D9 + .4byte 0x00009C50 + .4byte 0x984D0000 + .4byte 0 + .4byte 0x00009C51 + .4byte 0x95BE9C54 + .4byte 0x989F98AF + .4byte 0x00008EAE + .4byte 0x93F39C55 + .4byte 0x00008B7C + .4byte 0x92A288F8 + .4byte 0x9C5695A4 + .4byte 0x8D4F0000 + .4byte 0x0000926F + .4byte 0 + .4byte 0x000092ED + .4byte 0 + .4byte 0 + .4byte 0x000096ED + .4byte 0x8CB78CCA + .4byte 0x00009C57 + .4byte 0 + .4byte 0x00009C58 + .4byte 0x00009C5E + .4byte 0x00008EE3 + .4byte 0 + .4byte 0x000092A3 + .4byte 0x00008BAD + .4byte 0x9C590000 + .4byte 0 + .4byte 0x954A0000 + .4byte 0x92650000 + .4byte 0x00009C5A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9C5B0000 + .4byte 0x8BAE0000 + .4byte 0x9C5C0000 + .4byte 0x9C5D0000 + .4byte 0x00009C5F + .4byte 0x00009396 + .4byte 0 + .4byte 0x9C609C61 + .4byte 0x00009C62 + .4byte 0 + .4byte 0x9C539C52 + .4byte 0 + .4byte 0x00009C63 + .4byte 0x8C600000 + .4byte 0 + .4byte 0x95460000 + .4byte 0x00008DCA + .4byte 0x955692A4 + .4byte 0x956A9C64 + .4byte 0 + .4byte 0x8FB28965 + .4byte 0x00009C65 + .4byte 0 + .4byte 0x00009C66 + .4byte 0x000096F0 + .4byte 0 + .4byte 0x94DE0000 + .4byte 0x00009C69 + .4byte 0x899D90AA + .4byte 0x9C689C67 + .4byte 0x8C6191D2 + .4byte 0x00009C6D + .4byte 0x9C6B0000 + .4byte 0x9C6A97A5 + .4byte 0x8CE30000 + .4byte 0 + .4byte 0x8F999C6C + .4byte 0x936B8F5D + .4byte 0 + .4byte 0x000093BE + .4byte 0x9C709C6F + .4byte 0 + .4byte 0 + .4byte 0x9C6E0000 + .4byte 0x9C718CE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9C72959C + .4byte 0x8F7A0000 + .4byte 0x00009C73 + .4byte 0x94F70000 + .4byte 0 + .4byte 0x000093BF + .4byte 0x92A50000 + .4byte 0 + .4byte 0x0000934F + .4byte 0 + .4byte 0x9C748B4A + .4byte 0 + .4byte 0 + .4byte 0x00009053 + .4byte 0x0000954B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AF59445 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9C758E75 + .4byte 0x9659965A + .4byte 0 + .4byte 0x899E9C7A + .4byte 0 + .4byte 0x92890000 + .4byte 0 + .4byte 0x9C770000 + .4byte 0 + .4byte 0 + .4byte 0x000089F5 + .4byte 0 + .4byte 0 + .4byte 0x9CAB9C79 + .4byte 0 + .4byte 0x0000944F + .4byte 0 + .4byte 0x9C780000 + .4byte 0x00009C76 + .4byte 0x00008D9A + .4byte 0x00009C7C .global Ucs60 Ucs60: - .incbin "baserom.dol", 0x423340, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9C839C89 + .4byte 0x9C810000 + .4byte 0x937B0000 + .4byte 0x00009C86 + .4byte 0x957C0000 + .4byte 0x00009C80 + .4byte 0x00009C85 + .4byte 0x97E58E76 + .4byte 0 + .4byte 0x91D39C7D + .4byte 0 + .4byte 0x00008B7D + .4byte 0x9C8890AB + .4byte 0x89859C82 + .4byte 0x89F69C87 + .4byte 0 + .4byte 0x00008BAF + .4byte 0x00009C84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9C8A0000 + .4byte 0 + .4byte 0 + .4byte 0x00009C8C + .4byte 0x9C969C94 + .4byte 0 + .4byte 0x9C910000 + .4byte 0 + .4byte 0x9C9097F6 + .4byte 0x00009C92 + .4byte 0 + .4byte 0x8BB00000 + .4byte 0x8D500000 + .4byte 0x00008F9A + .4byte 0 + .4byte 0x00009C99 + .4byte 0x9C8B0000 + .4byte 0 + .4byte 0x00009C8F + .4byte 0x9C7E0000 + .4byte 0x89F89C93 + .4byte 0x9C959270 + .4byte 0 + .4byte 0x8DA689B6 + .4byte 0x9C8D9C98 + .4byte 0x9C978BB1 + .4byte 0x000091A7 + .4byte 0x8A860000 + .4byte 0 + .4byte 0x00008C62 + .4byte 0x00009C8E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009C9A + .4byte 0x00009C9D + .4byte 0x9C9F0000 + .4byte 0 + .4byte 0x00008EBB + .4byte 0x00009CA5 + .4byte 0x92EE9C9B + .4byte 0 + .4byte 0 + .4byte 0x9CA30000 + .4byte 0x89F70000 + .4byte 0x9CA19CA2 + .4byte 0 + .4byte 0x9C9E9CA0 + .4byte 0 + .4byte 0x00008CE5 + .4byte 0x97490000 + .4byte 0x00008AB3 + .4byte 0 + .4byte 0x89789CA4 + .4byte 0x00009459 + .4byte 0x88AB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94DF9C7B + .4byte 0x9CAA9CAE + .4byte 0x96E30000 + .4byte 0x9CA70000 + .4byte 0 + .4byte 0x93899CAC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008FEE + .4byte 0x9CAD93D5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009866 + .4byte 0x00009CA9 + .4byte 0 + .4byte 0 + .4byte 0x9CAF0000 + .4byte 0x8D9B0000 + .4byte 0x90C90000 + .4byte 0x000088D2 + .4byte 0x9CA89CA6 + .4byte 0x00009179 + .4byte 0 + .4byte 0x00009C9C + .4byte 0x8E530000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91C49CBB + .4byte 0x0000917A + .4byte 0x9CB60000 + .4byte 0x9CB39CB4 + .4byte 0x00008EE4 + .4byte 0x9CB79CBA + .4byte 0 + .4byte 0 .global Ucs61 Ucs61: - .incbin "baserom.dol", 0x423540, 0x200 + .4byte 0x9CB58F44 + .4byte 0x00009CB8 + .4byte 0 + .4byte 0x9CB20000 + .4byte 0x96FA96F9 + .4byte 0 + .4byte 0x00009CBC + .4byte 0x9CBD88D3 + .4byte 0 + .4byte 0 + .4byte 0x00009CB1 + .4byte 0 + .4byte 0 + .4byte 0x8BF088A4 + .4byte 0 + .4byte 0x00008AB4 + .4byte 0x00009CB9 + .4byte 0 + .4byte 0 + .4byte 0x00009CC1 + .4byte 0x9CC00000 + .4byte 0 + .4byte 0x9CC50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9CC60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9CC49CC7 + .4byte 0x9CBF9CC3 + .4byte 0 + .4byte 0x9CC80000 + .4byte 0x9CC90000 + .4byte 0x00009CBE + .4byte 0x8E9C0000 + .4byte 0x9CC291D4 + .4byte 0x8D519CB0 + .4byte 0x90540000 + .4byte 0 + .4byte 0x00009CD6 + .4byte 0x000095E7 + .4byte 0 + .4byte 0x9CCC9CCD + .4byte 0x9CCE0000 + .4byte 0x00009CD5 + .4byte 0x00009CD4 + .4byte 0 + .4byte 0x969D8AB5 + .4byte 0x00009CD2 + .4byte 0x00008C64 + .4byte 0x8A530000 + .4byte 0x00009CCF + .4byte 0 + .4byte 0x97B69CD1 + .4byte 0x88D49CD3 + .4byte 0x00009CCA + .4byte 0x9CD09CD7 + .4byte 0x8C639CCB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x977C0000 + .4byte 0 + .4byte 0x974A0000 + .4byte 0 + .4byte 0x00009CDA + .4byte 0 + .4byte 0x9CDE0000 + .4byte 0 + .4byte 0x919E0000 + .4byte 0x97F79CDF + .4byte 0 + .4byte 0x9CDC0000 + .4byte 0x9CD90000 + .4byte 0x00009CD8 + .4byte 0x9CDD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x95AE0000 + .4byte 0x000093B2 + .4byte 0x00008C65 + .4byte 0x00009CE0 + .4byte 0x9CDB0000 + .4byte 0x9CE10000 + .4byte 0 + .4byte 0x8C9B0000 + .4byte 0 + .4byte 0x89AF0000 + .4byte 0 + .4byte 0x9CE90000 + .4byte 0 + .4byte 0x8AB60000 + .4byte 0 + .4byte 0x00009CE7 + .4byte 0 + .4byte 0x9CE88DA7 + .4byte 0x9CE69CE4 + .4byte 0x9CE39CEA + .4byte 0x9CE29CEC + .4byte 0 + .4byte 0x89F90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009CEE + .4byte 0 + .4byte 0x9CED0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x92A60000 + .4byte 0x9CF10000 + .4byte 0x9CEF9CE5 + .4byte 0x8C9C0000 + .4byte 0x9CF00000 + .4byte 0x9CF49CF3 + .4byte 0x9CF59CF2 .global Ucs62 Ucs62: - .incbin "baserom.dol", 0x423740, 0x200 + .4byte 0x9CF60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9CF79CF8 + .4byte 0x95E80000 + .4byte 0x9CFA9CF9 + .4byte 0x8F5E0000 + .4byte 0x90AC89E4 + .4byte 0x89FA0000 + .4byte 0x9CFB0000 + .4byte 0x88BD0000 + .4byte 0 + .4byte 0x90CA9CFC + .4byte 0x0000E6C1 + .4byte 0x9D408C81 + .4byte 0x00009D41 + .4byte 0 + .4byte 0 + .4byte 0x90ED0000 + .4byte 0 + .4byte 0x9D420000 + .4byte 0 + .4byte 0x9D438B59 + .4byte 0x9D440000 + .4byte 0x9D459D46 + .4byte 0x91D50000 + .4byte 0 + .4byte 0x8CCB0000 + .4byte 0x000096DF + .4byte 0 + .4byte 0x0000965B + .4byte 0x8F8A9D47 + .4byte 0 + .4byte 0 + .4byte 0x000090EE + .4byte 0xE7BB94E0 + .4byte 0x00008EE8 + .4byte 0x00008DCB + .4byte 0x9D480000 + .4byte 0 + .4byte 0x000091C5 + .4byte 0x000095A5 + .4byte 0 + .4byte 0x91EF0000 + .4byte 0x00009D4B + .4byte 0 + .4byte 0x9D490000 + .4byte 0x9D4C0000 + .4byte 0x00009D4A + .4byte 0 + .4byte 0 + .4byte 0x9D4D0000 + .4byte 0 + .4byte 0 + .4byte 0x95AF0000 + .4byte 0x000088B5 + .4byte 0 + .4byte 0 + .4byte 0x957D0000 + .4byte 0x000094E1 + .4byte 0 + .4byte 0x9D4E0000 + .4byte 0x9D518FB3 + .4byte 0x8B5A0000 + .4byte 0x9D4F9D56 + .4byte 0x8FB40000 + .4byte 0 + .4byte 0x00009D50 + .4byte 0x94630000 + .4byte 0 + .4byte 0 + .4byte 0x0000977D + .4byte 0x9D529D53 + .4byte 0x9D57938A + .4byte 0x9D548D52 + .4byte 0x90DC0000 + .4byte 0x00009D65 + .4byte 0x94B20000 + .4byte 0x91F00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000094E2 + .4byte 0x9DAB0000 + .4byte 0 + .4byte 0x000095F8 + .4byte 0 + .4byte 0x000092EF + .4byte 0 + .4byte 0x00009695 + .4byte 0x00009D5A + .4byte 0x899F928A + .4byte 0 + .4byte 0 + .4byte 0x9D630000 + .4byte 0x00009253 + .4byte 0x9D5D9D64 + .4byte 0x9D5F9D66 + .4byte 0x9D620000 + .4byte 0x9D61948F + .4byte 0x00009D5B + .4byte 0x89FB9D59 + .4byte 0x8B9191F1 + .4byte 0x9D550000 + .4byte 0x00009D58 + .4byte 0x8D5390D9 + .4byte 0x00008FB5 + .4byte 0x9D609471 + .4byte 0 + .4byte 0x8B928A67 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8A879040 + .4byte 0x9D689D6D + .4byte 0x00009D69 + .4byte 0x00008C9D + .4byte 0x00009D6E + .4byte 0x8E418D89 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8F459D5C .global Ucs63 Ucs63: - .incbin "baserom.dol", 0x423940, 0x200 + .4byte 0x00008E9D + .4byte 0x9D6B0000 + .4byte 0 + .4byte 0x00008E77 + .4byte 0x9D6C88C2 + .4byte 0 + .4byte 0x9D670000 + .4byte 0 + .4byte 0x000092A7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008B93 + .4byte 0 + .4byte 0 + .4byte 0x00008BB2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009D6A + .4byte 0x88A50000 + .4byte 0x00008DC1 + .4byte 0 + .4byte 0x00009055 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x92F00000 + .4byte 0x000094D2 + .4byte 0x9D70917D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091A8 + .4byte 0 + .4byte 0x8E4A9D71 + .4byte 0x00009D73 + .4byte 0x9D6F0000 + .4byte 0 + .4byte 0x000095DF + .4byte 0x000092BB + .4byte 0 + .4byte 0 + .4byte 0x917B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095F9 + .4byte 0x8ECC9D80 + .4byte 0x00009D7E + .4byte 0 + .4byte 0x90980000 + .4byte 0 + .4byte 0x8C9E0000 + .4byte 0 + .4byte 0x9D788FB7 + .4byte 0 + .4byte 0x93E69450 + .4byte 0 + .4byte 0 + .4byte 0x9D760000 + .4byte 0x0000917C + .4byte 0 + .4byte 0 + .4byte 0x8EF69D7B + .4byte 0 + .4byte 0x8FB60000 + .4byte 0x9D759D7A + .4byte 0 + .4byte 0x94720000 + .4byte 0 + .4byte 0x9D740000 + .4byte 0x8C400000 + .4byte 0x00008A7C + .4byte 0 + .4byte 0x00009D7C + .4byte 0x97A98DCC + .4byte 0x92549D79 + .4byte 0x000090DA + .4byte 0x00008D54 + .4byte 0x90848986 + .4byte 0x915B9D77 + .4byte 0x8B640000 + .4byte 0 + .4byte 0 + .4byte 0x8C660000 + .4byte 0x92CD9D7D + .4byte 0 + .4byte 0 + .4byte 0x0000917E + .4byte 0 + .4byte 0x9D810000 + .4byte 0x9D830000 + .4byte 0x000091B5 + .4byte 0x9D890000 + .4byte 0x9D840000 + .4byte 0x00009D86 + .4byte 0 + .4byte 0 + .4byte 0x00009560 + .4byte 0x92F10000 + .4byte 0x9D870000 + .4byte 0 + .4byte 0x974B0000 + .4byte 0 + .4byte 0x97678AB7 + .4byte 0 + .4byte 0 + .4byte 0x000088AC + .4byte 0x00009D85 + .4byte 0 + .4byte 0 + .4byte 0x00009D82 + .4byte 0 + .4byte 0 + .4byte 0x8AF60000 + .4byte 0 + .4byte 0 + .4byte 0x89870000 + .4byte 0x9D880000 + .4byte 0 + .4byte 0x97680000 + .4byte 0 + .4byte 0 .global Ucs64 Ucs64: - .incbin "baserom.dol", 0x423B40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9D8C0000 + .4byte 0 + .4byte 0 + .4byte 0x000091B9 + .4byte 0x00009D93 + .4byte 0 + .4byte 0x00009D8D + .4byte 0 + .4byte 0x9D8A9D91 + .4byte 0 + .4byte 0 + .4byte 0x9D720000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9D8E0000 + .4byte 0x9D920000 + .4byte 0 + .4byte 0x94C0938B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9D8B0000 + .4byte 0x9D8F0000 + .4byte 0 + .4byte 0x8C670000 + .4byte 0 + .4byte 0x8DEF0000 + .4byte 0 + .4byte 0x90DB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9D970000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x93450000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009D94 + .4byte 0x00009680 + .4byte 0 + .4byte 0 + .4byte 0x00009D95 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9D960000 + .4byte 0x96CC0000 + .4byte 0x90A00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008C82 + .4byte 0 + .4byte 0 + .4byte 0x9D9D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E549D9A + .4byte 0x00009D99 + .4byte 0 + .4byte 0 + .4byte 0x94510000 + .4byte 0 + .4byte 0x93B30000 + .4byte 0 + .4byte 0 + .4byte 0x93509D9B + .4byte 0 + .4byte 0x00009D9C + .4byte 0x0000958F + .4byte 0x00009464 + .4byte 0x8E420000 + .4byte 0x90EF0000 + .4byte 0x966F0000 + .4byte 0 + .4byte 0 + .4byte 0x00008A68 + .4byte 0x00009DA3 + .4byte 0x9D9E0000 + .4byte 0 + .4byte 0x00009769 + .4byte 0x9DA50000 + .4byte 0x00009DA1 + .4byte 0x00009DA2 + .4byte 0 + .4byte 0 + .4byte 0x00009180 + .4byte 0 + .4byte 0 + .4byte 0x9DA00000 + .4byte 0x9D5E0000 + .4byte 0 + .4byte 0x9DA40000 + .4byte 0x9D9F0000 + .4byte 0 + .4byte 0 + .4byte 0x9DA99DAA + .4byte 0x93469DAC + .4byte 0 + .4byte 0x8E439DA7 + .4byte 0 + .4byte 0 + .4byte 0x8B5B0000 + .4byte 0x00009DAD + .4byte 0x00009DA6 + .4byte 0x9DB10000 + .4byte 0x9DB00000 + .4byte 0x9DAF0000 + .4byte 0 + .4byte 0x9DB20000 + .4byte 0x00009DB4 + .4byte 0x8FEF0000 .global Ucs65 Ucs65: - .incbin "baserom.dol", 0x423D40, 0x200 + .4byte 0x9DB30000 + .4byte 0 + .4byte 0x00009DB7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9DB50000 + .4byte 0 + .4byte 0x9DB69D90 + .4byte 0 + .4byte 0 + .4byte 0x00009DB9 + .4byte 0x9DB80000 + .4byte 0 + .4byte 0 + .4byte 0x9D989DBA + .4byte 0x9DAE0000 + .4byte 0x00008E78 + .4byte 0 + .4byte 0 + .4byte 0x9DBB9DBC + .4byte 0x9DBE9DBD + .4byte 0x9DBF89FC + .4byte 0x00008D55 + .4byte 0 + .4byte 0x95FA90AD + .4byte 0 + .4byte 0 + .4byte 0x00008CCC + .4byte 0 + .4byte 0x9DC10000 + .4byte 0 + .4byte 0x00009DC4 + .4byte 0x00009571 + .4byte 0x00008B7E + .4byte 0 + .4byte 0x00009DC3 + .4byte 0x9DC29473 + .4byte 0x9DC58BB3 + .4byte 0 + .4byte 0x00009DC7 + .4byte 0x9DC60000 + .4byte 0 + .4byte 0x8AB88E55 + .4byte 0 + .4byte 0x93D60000 + .4byte 0 + .4byte 0 + .4byte 0x8C680000 + .4byte 0 + .4byte 0x90940000 + .4byte 0x9DC80000 + .4byte 0x90AE9347 + .4byte 0x0000957E + .4byte 0x9DC90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9DCA9DCB + .4byte 0 + .4byte 0x000095B6 + .4byte 0x9B7C90C4 + .4byte 0 + .4byte 0x956B0000 + .4byte 0x8DD60000 + .4byte 0x94E394C1 + .4byte 0 + .4byte 0 + .4byte 0x0000936C + .4byte 0x000097BF + .4byte 0x00009DCD + .4byte 0x8ECE0000 + .4byte 0x00009DCE + .4byte 0x000088B4 + .4byte 0 + .4byte 0x8BD290CB + .4byte 0x00009580 + .4byte 0 + .4byte 0x00009DCF + .4byte 0x8E619266 + .4byte 0x00008E7A + .4byte 0x90560000 + .4byte 0 + .4byte 0 + .4byte 0x00009DD0 + .4byte 0x000095FB + .4byte 0 + .4byte 0x89978E7B + .4byte 0 + .4byte 0x00009DD3 + .4byte 0x00009DD1 + .4byte 0x9DD497B7 + .4byte 0x9DD20000 + .4byte 0 + .4byte 0x000090F9 + .4byte 0x9DD50000 + .4byte 0x000091B0 + .4byte 0 + .4byte 0x9DD60000 + .4byte 0 + .4byte 0x00008AF8 + .4byte 0x00009DD8 + .4byte 0x00009DD7 + .4byte 0 + .4byte 0 + .4byte 0x9DD99DDA + .4byte 0x8AF90000 + .4byte 0x000093FA + .4byte 0x92558B8C + .4byte 0x8E7C9181 + .4byte 0 + .4byte 0x8F7B88AE + .4byte 0 + .4byte 0x00009DDB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89A09DDF + .4byte 0 + .4byte 0 .global Ucs66 Ucs66: - .incbin "baserom.dol", 0x423F40, 0x200 + .4byte 0 + .4byte 0x8D569DDE + .4byte 0 + .4byte 0x8DA98FB8 + .4byte 0 + .4byte 0x9DDD0000 + .4byte 0x8FB90000 + .4byte 0x96BE8DA8 + .4byte 0 + .4byte 0x000088D5 + .4byte 0x90CC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9DE40000 + .4byte 0x000090AF + .4byte 0x89660000 + .4byte 0 + .4byte 0x00008F74 + .4byte 0x00009686 + .4byte 0x8DF00000 + .4byte 0 + .4byte 0x00008FBA + .4byte 0x000090A5 + .4byte 0 + .4byte 0 + .4byte 0x9DE39DE1 + .4byte 0x9DE20000 + .4byte 0 + .4byte 0 + .4byte 0x928B0000 + .4byte 0x00009E45 + .4byte 0x00009DE8 + .4byte 0x8E9E8D57 + .4byte 0x9DE60000 + .4byte 0 + .4byte 0x00009DE7 + .4byte 0x00009057 + .4byte 0 + .4byte 0x00009DE5 + .4byte 0 + .4byte 0x8E4E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009DEA + .4byte 0x9DE99DEE + .4byte 0 + .4byte 0x9DEF0000 + .4byte 0x9DEB0000 + .4byte 0x8A419DEC + .4byte 0x9DED94D3 + .4byte 0 + .4byte 0 + .4byte 0x95818C69 + .4byte 0x9DF00000 + .4byte 0 + .4byte 0x90B00000 + .4byte 0x8FBB0000 + .4byte 0 + .4byte 0x92710000 + .4byte 0 + .4byte 0 + .4byte 0x00008BC5 + .4byte 0x00009DF1 + .4byte 0x9DF50000 + .4byte 0x000089C9 + .4byte 0x9DF29DF4 + .4byte 0 + .4byte 0 + .4byte 0x9DF30000 + .4byte 0x00008F8B + .4byte 0 + .4byte 0 + .4byte 0x926788C3 + .4byte 0x9DF60000 + .4byte 0 + .4byte 0x00009DF7 + .4byte 0 + .4byte 0 + .4byte 0x92A80000 + .4byte 0 + .4byte 0x97EF0000 + .4byte 0 + .4byte 0x00008E62 + .4byte 0 + .4byte 0x95E90000 + .4byte 0 + .4byte 0 + .4byte 0x965C0000 + .4byte 0 + .4byte 0x9E419DF9 + .4byte 0 + .4byte 0x9DFC0000 + .4byte 0x9DFB0000 + .4byte 0x00009DF8 + .4byte 0 + .4byte 0x9E400000 + .4byte 0x000093DC + .4byte 0x00009DFA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E420000 + .4byte 0x00008F8C + .4byte 0x9E430000 + .4byte 0x976A9498 + .4byte 0 + .4byte 0x9E440000 + .4byte 0 + .4byte 0 + .4byte 0x9E460000 + .4byte 0x00009E47 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E480000 + .4byte 0x8BC88967 + .4byte 0x8D589E49 + .4byte 0x00009E4A + .4byte 0x8F919182 + .4byte 0 + .4byte 0x99D6915D + .4byte 0x915C91D6 .global Ucs67 Ucs67: - .incbin "baserom.dol", 0x424140, 0x200 + .4byte 0x8DC50000 + .4byte 0x000098F0 + .4byte 0 + .4byte 0 + .4byte 0x8C8E974C + .4byte 0x000095FC + .4byte 0x0000959E + .4byte 0x00009E4B + .4byte 0 + .4byte 0 + .4byte 0x8DF192BD + .4byte 0x9E4C984E + .4byte 0 + .4byte 0x0000965D + .4byte 0x000092A9 + .4byte 0x9E4D8AFA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E4E9E4F + .4byte 0x96D80000 + .4byte 0x96A29696 + .4byte 0x967B8E44 + .4byte 0x9E510000 + .4byte 0x00008EE9 + .4byte 0 + .4byte 0x96700000 + .4byte 0x9E539E56 + .4byte 0x9E550000 + .4byte 0x8AF70000 + .4byte 0x00008B80 + .4byte 0x00009E52 + .4byte 0x00009E54 + .4byte 0 + .4byte 0 + .4byte 0x9E570000 + .4byte 0x00009099 + .4byte 0 + .4byte 0 + .4byte 0x979B88C7 + .4byte 0x8DDE91BA + .4byte 0x00008EDB + .4byte 0 + .4byte 0x8FF10000 + .4byte 0x00009E5A + .4byte 0 + .4byte 0x936D0000 + .4byte 0x9E5891A9 + .4byte 0x9E598FF0 + .4byte 0x96DB9E5B + .4byte 0x9E5C9788 + .4byte 0 + .4byte 0 + .4byte 0x9E610000 + .4byte 0x00008D59 + .4byte 0x00009474 + .4byte 0x9E5E938C + .4byte 0x9DDC9DE0 + .4byte 0x00008B6E + .4byte 0x00009466 + .4byte 0 + .4byte 0 + .4byte 0x9E600000 + .4byte 0x8FBC94C2 + .4byte 0 + .4byte 0 + .4byte 0x00009E66 + .4byte 0x000094F8 + .4byte 0x00009E5D + .4byte 0x00009E63 + .4byte 0x9E620000 + .4byte 0 + .4byte 0x90CD0000 + .4byte 0 + .4byte 0x0000968D + .4byte 0x000097D1 + .4byte 0 + .4byte 0x96870000 + .4byte 0x89CA8E7D + .4byte 0 + .4byte 0x98679E65 + .4byte 0x90950000 + .4byte 0 + .4byte 0x9E640000 + .4byte 0x00009E5F + .4byte 0 + .4byte 0 + .4byte 0x00008CCD + .4byte 0 + .4byte 0x00009E6B + .4byte 0x9E690000 + .4byte 0x89CB9E67 + .4byte 0x9E6D9E73 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091C6 + .4byte 0 + .4byte 0x95BF0000 + .4byte 0x9E750000 + .4byte 0 + .4byte 0x95410000 + .4byte 0 + .4byte 0x9E749490 + .4byte 0x965E8AB9 + .4byte 0x000090F5 + .4byte 0x8F5F0000 + .4byte 0 + .4byte 0x92D10000 + .4byte 0x974D0000 + .4byte 0x00009E70 + .4byte 0x9E6F0000 + .4byte 0 + .4byte 0x9E710000 + .4byte 0x9E6E0000 + .4byte 0x00009E76 + .4byte 0x00009E6C + .4byte 0 + .4byte 0x9E6A0000 + .4byte 0x9E729E68 + .4byte 0x0000928C + .4byte 0x000096F6 + .4byte 0x8EC48DF2 + .4byte 0 + .4byte 0 + .4byte 0x00008DB8 + .4byte 0 + .4byte 0x968F8A60 .global Ucs68 Ucs68: - .incbin "baserom.dol", 0x424340, 0x200 + .4byte 0 + .4byte 0x92CC93C8 + .4byte 0x89680000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000090F0 + .4byte 0 + .4byte 0x90B28C49 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E780000 + .4byte 0x00008D5A + .4byte 0x8A9C0000 + .4byte 0 + .4byte 0 + .4byte 0x00009E7A + .4byte 0x8A949E81 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E7D0000 + .4byte 0x90F10000 + .4byte 0 + .4byte 0x8A6A8DAA + .4byte 0 + .4byte 0x8A698DCD + .4byte 0 + .4byte 0x9E7B8C85 + .4byte 0x8C6A938D + .4byte 0 + .4byte 0x9E790000 + .4byte 0x88C40000 + .4byte 0 + .4byte 0x00009E7C + .4byte 0x9E7E0000 + .4byte 0x8BCB8C4B + .4byte 0x00008ABA + .4byte 0x8B6A0000 + .4byte 0 + .4byte 0x00009E82 + .4byte 0 + .4byte 0x8DF79691 + .4byte 0x00008E56 + .4byte 0 + .4byte 0x00009E83 + .4byte 0 + .4byte 0x0000954F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E8F0000 + .4byte 0x89B19E84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9E959E85 + .4byte 0x000097C0 + .4byte 0x00009E8C + .4byte 0x0000947E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009E94 + .4byte 0x00009E87 + .4byte 0 + .4byte 0x000088B2 + .4byte 0x9E890000 + .4byte 0x00008D5B + .4byte 0 + .4byte 0x00009E8B + .4byte 0x00009E8A + .4byte 0x00009E86 + .4byte 0x9E910000 + .4byte 0x8FBD0000 + .4byte 0 + .4byte 0x9AEB8CE6 + .4byte 0x979C0000 + .4byte 0 + .4byte 0x00009E88 + .4byte 0x000092F2 + .4byte 0x8A428DAB + .4byte 0x00009E80 + .4byte 0x00009E90 + .4byte 0x8A810000 + .4byte 0x00009E8E + .4byte 0x9E920000 + .4byte 0x938E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AFC0000 + .4byte 0x9EB00000 + .4byte 0x000096C7 + .4byte 0x9E978AFB + .4byte 0x00009E9E + .4byte 0 + .4byte 0 + .4byte 0x965F0000 + .4byte 0x9E9F9EA1 + .4byte 0x00009EA5 + .4byte 0x9E990000 + .4byte 0x92490000 + .4byte 0 + .4byte 0x0000938F + .4byte 0x9EA99E9C + .4byte 0x00009EA6 + .4byte 0 + .4byte 0x00009EA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90589EAA + .4byte 0 + .4byte 0x90B10000 + .4byte 0 + .4byte 0 + .4byte 0x00009EA8 + .4byte 0x8ABB0000 + .4byte 0 + .4byte 0 .global Ucs69 Ucs69: - .incbin "baserom.dol", 0x424540, 0x200 + .4byte 0x986F9E96 + .4byte 0 + .4byte 0x9EA488D6 + .4byte 0 + .4byte 0x9E980000 + .4byte 0x000096B8 + .4byte 0x9E9D9041 + .4byte 0x92C59E93 + .4byte 0 + .4byte 0x9EA30000 + .4byte 0 + .4byte 0 + .4byte 0x0000909A + .4byte 0x9EAD8A91 + .4byte 0x8C9F0000 + .4byte 0 + .4byte 0x00009EAF + .4byte 0x9E9A9EAE + .4byte 0x00009EA7 + .4byte 0x9E9B0000 + .4byte 0x9EAB0000 + .4byte 0x9EAC0000 + .4byte 0 + .4byte 0 + .4byte 0x9EBD0000 + .4byte 0 + .4byte 0x93CC0000 + .4byte 0x9EA20000 + .4byte 0x00009EB9 + .4byte 0 + .4byte 0x00009EBB + .4byte 0x000092D6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x976B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009596 + .4byte 0x9EB691C8 + .4byte 0 + .4byte 0x00009EBC + .4byte 0x915E0000 + .4byte 0x9EB39EC0 + .4byte 0x9EBF0000 + .4byte 0x93ED9EBE + .4byte 0x93E80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9EC29EB5 + .4byte 0x00008BC6 + .4byte 0x9EB88F7C + .4byte 0 + .4byte 0x00009480 + .4byte 0x9EBA8BC9 + .4byte 0x00009EB2 + .4byte 0x9EB49EB1 + .4byte 0 + .4byte 0x984F8A79 + .4byte 0x9EB70000 + .4byte 0x00009EC1 + .4byte 0x8A540000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8DE50000 + .4byte 0 + .4byte 0x897C0000 + .4byte 0x00009ED2 + .4byte 0 + .4byte 0x98509ED5 + .4byte 0 + .4byte 0 + .4byte 0x00009059 + .4byte 0x9ED40000 + .4byte 0 + .4byte 0x9ED30000 + .4byte 0 + .4byte 0 + .4byte 0x00009ED0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9EC40000 + .4byte 0x00009EE1 + .4byte 0x9EC30000 + .4byte 0x9ED60000 + .4byte 0 + .4byte 0 + .4byte 0x00009ECE + .4byte 0 + .4byte 0x9EC99EC6 + .4byte 0x00009EC7 + .4byte 0x00009ECF + .4byte 0 + .4byte 0x0000EAA0 + .4byte 0 + .4byte 0x9ECC8D5C + .4byte 0x92C69184 + .4byte 0x9ECA0000 + .4byte 0x9EC50000 + .4byte 0x00009EC8 + .4byte 0 + .4byte 0 + .4byte 0x976C968A + .4byte 0 + .4byte 0x00009ECD + .4byte 0x9ED70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009EDF + .4byte 0x9ED80000 + .4byte 0x00009EE5 + .4byte 0x00009EE3 + .4byte 0 + .4byte 0 + .4byte 0x9EDE0000 + .4byte 0 + .4byte 0 + .4byte 0x00009EDD + .4byte 0x000092CE + .4byte 0x00009185 + .4byte 0x00009EDB .global Ucs6A Ucs6A: - .incbin "baserom.dol", 0x424740, 0x200 + .4byte 0 + .4byte 0x9ED90000 + .4byte 0x00009EE0 + .4byte 0 + .4byte 0 + .4byte 0x9EE694F3 + .4byte 0x9EEC0000 + .4byte 0 + .4byte 0 + .4byte 0x9EE79EEA + .4byte 0x9EE40000 + .4byte 0x00009294 + .4byte 0x00009557 + .4byte 0x00009EDA + .4byte 0 + .4byte 0x9EE28FBE + .4byte 0x000096CD + .4byte 0x9EF69EE9 + .4byte 0 + .4byte 0 + .4byte 0x00008CA0 + .4byte 0x89A18A7E + .4byte 0 + .4byte 0x9ED10000 + .4byte 0 + .4byte 0 + .4byte 0x00008FBF + .4byte 0x9EEE0000 + .4byte 0x9EF58EF7 + .4byte 0x8A920000 + .4byte 0x0000924D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9EEB0000 + .4byte 0x00009EF0 + .4byte 0x9EF40000 + .4byte 0x00008BB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B6B9EF2 + .4byte 0 + .4byte 0 + .4byte 0x00008B40 + .4byte 0x000093C9 + .4byte 0x9EF10000 + .4byte 0 + .4byte 0x9EF30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9EED0000 + .4byte 0 + .4byte 0 + .4byte 0x9EEF0000 + .4byte 0 + .4byte 0 + .4byte 0x00008A80 + .4byte 0x92680000 + .4byte 0 + .4byte 0x9EFA0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009EF8 + .4byte 0x8CE70000 + .4byte 0x9EF70000 + .4byte 0 + .4byte 0 + .4byte 0x00009F40 + .4byte 0 + .4byte 0 + .4byte 0x9E770000 + .4byte 0 + .4byte 0x9EF90000 + .4byte 0x9EFB9EFC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9F4B0000 + .4byte 0x9F470000 + .4byte 0x9E8D0000 + .4byte 0 + .4byte 0x00009F46 + .4byte 0 + .4byte 0 + .4byte 0x9F450000 + .4byte 0x00009F42 + .4byte 0 + .4byte 0 + .4byte 0x00009EE8 + .4byte 0x9F449F43 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009F49 + .4byte 0x00009845 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9F4C8BF9 + .4byte 0 + .4byte 0x9F489F4A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94A50000 + .4byte 0x9F4D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9F519F4E + .4byte 0 + .4byte 0 .global Ucs6B Ucs6B: - .incbin "baserom.dol", 0x424940, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x97939F4F + .4byte 0 + .4byte 0 + .4byte 0x9EDC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9F520000 + .4byte 0 + .4byte 0x9F530000 + .4byte 0 + .4byte 0 + .4byte 0x00008954 + .4byte 0x00009F55 + .4byte 0x8C878E9F + .4byte 0x00008BD3 + .4byte 0 + .4byte 0x000089A2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x977E0000 + .4byte 0 + .4byte 0x00009F57 + .4byte 0x9F569F59 + .4byte 0x8B5C0000 + .4byte 0x00008BD4 + .4byte 0x8ABC0000 + .4byte 0 + .4byte 0x00009F5C + .4byte 0 + .4byte 0x00009F5B + .4byte 0x00009F5D + .4byte 0 + .4byte 0x89CC0000 + .4byte 0x92560000 + .4byte 0x9F5E0000 + .4byte 0x00008ABD + .4byte 0x9F600000 + .4byte 0 + .4byte 0x00009F5F + .4byte 0x00009F61 + .4byte 0 + .4byte 0x00009F62 + .4byte 0x00009F63 + .4byte 0x8E7E90B3 + .4byte 0x8D9F0000 + .4byte 0x95900000 + .4byte 0x000095E0 + .4byte 0x98630000 + .4byte 0 + .4byte 0x00008E95 + .4byte 0 + .4byte 0x00008DCE + .4byte 0x97F00000 + .4byte 0 + .4byte 0x9F649F65 + .4byte 0x00008E80 + .4byte 0 + .4byte 0x00009F66 + .4byte 0x9F670000 + .4byte 0x00009F69 + .4byte 0x9F680000 + .4byte 0x96770000 + .4byte 0x00008F7D + .4byte 0x8EEA8E63 + .4byte 0x00009F6A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009F6C + .4byte 0x90420000 + .4byte 0x9F6B0000 + .4byte 0 + .4byte 0 + .4byte 0x9F6D0000 + .4byte 0 + .4byte 0 + .4byte 0x9F6E0000 + .4byte 0 + .4byte 0 + .4byte 0x9F6F9F70 + .4byte 0 + .4byte 0x00009F71 + .4byte 0x00009F73 + .4byte 0x9F729F74 + .4byte 0x89A39269 + .4byte 0x00009F75 + .4byte 0 + .4byte 0x8E458A6B + .4byte 0x9F760000 + .4byte 0x00009361 + .4byte 0x9ACA0000 + .4byte 0 + .4byte 0x00008B42 + .4byte 0x9F770000 + .4byte 0 + .4byte 0x00009F78 + .4byte 0x000095EA + .4byte 0x96880000 + .4byte 0 + .4byte 0x93C59F79 + .4byte 0x94E40000 + .4byte 0 + .4byte 0x94F90000 + .4byte 0x000096D1 + .4byte 0 + .4byte 0x00009F7A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009F7C + .4byte 0x9F7B0000 + .4byte 0x00009F7E + .4byte 0 + .4byte 0x00009F7D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs6C Ucs6C: - .incbin "baserom.dol", 0x424B40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9F810000 + .4byte 0 + .4byte 0 + .4byte 0x00008E81 + .4byte 0x000096AF + .4byte 0x00009F82 + .4byte 0x9F830000 + .4byte 0x00008B43 + .4byte 0 + .4byte 0x00009F84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009F86 + .4byte 0x9F850000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90850000 + .4byte 0x00009558 + .4byte 0x89690000 + .4byte 0 + .4byte 0 + .4byte 0x94C30000 + .4byte 0x92F38F60 + .4byte 0x8B810000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94C40000 + .4byte 0x8EAC0000 + .4byte 0 + .4byte 0x00009F88 + .4byte 0x00008ABE + .4byte 0 + .4byte 0x89980000 + .4byte 0x000093F0 + .4byte 0x9F878D5D + .4byte 0x92720000 + .4byte 0x9F890000 + .4byte 0 + .4byte 0 + .4byte 0x9F910000 + .4byte 0x9F8A0000 + .4byte 0 + .4byte 0 + .4byte 0x91BF0000 + .4byte 0x8B829F92 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C880000 + .4byte 0x00008B44 + .4byte 0x9F900000 + .4byte 0x00009F8E + .4byte 0x9F8B9780 + .4byte 0 + .4byte 0 + .4byte 0x92BE0000 + .4byte 0 + .4byte 0x93D79F8C + .4byte 0 + .4byte 0x9F940000 + .4byte 0x9F938C42 + .4byte 0 + .4byte 0x89AB0000 + .4byte 0x00008DB9 + .4byte 0x9F8D9F8F + .4byte 0 + .4byte 0 + .4byte 0x00009676 + .4byte 0x91F20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009697 + .4byte 0 + .4byte 0x9F9C0000 + .4byte 0x00009F9D + .4byte 0x000089CD + .4byte 0 + .4byte 0 + .4byte 0x95A696FB + .4byte 0x9F9F8EA1 + .4byte 0x8FC09F98 + .4byte 0x9F9E8988 + .4byte 0x00008BB5 + .4byte 0 + .4byte 0x9F959F9A + .4byte 0 + .4byte 0x000090F2 + .4byte 0x94910000 + .4byte 0x94E50000 + .4byte 0 + .4byte 0 + .4byte 0x00009F97 + .4byte 0x00009640 + .4byte 0x00009F99 + .4byte 0x00009FA2 + .4byte 0x00009FA0 + .4byte 0x00009F9B + .4byte 0 + .4byte 0x00009641 + .4byte 0x94678B83 + .4byte 0x00009344 + .4byte 0 + .4byte 0x928D0000 + .4byte 0x9FA30000 + .4byte 0 + .4byte 0x00009FA1 + .4byte 0x91D79F96 + .4byte 0x0000896A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs6D Ucs6D: - .incbin "baserom.dol", 0x424D40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000976D + .4byte 0x9FAE0000 + .4byte 0 + .4byte 0 + .4byte 0x9FAD0000 + .4byte 0 + .4byte 0x000090F4 + .4byte 0x00009FAA + .4byte 0x0000978C + .4byte 0 + .4byte 0x93B49FA4 + .4byte 0 + .4byte 0 + .4byte 0x000092C3 + .4byte 0 + .4byte 0x0000896B + .4byte 0x8D5E9FA7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8F469FAC + .4byte 0x00009FAB + .4byte 0x9FA60000 + .4byte 0x9FA90000 + .4byte 0x00008A88 + .4byte 0x00009FA8 + .4byte 0x94680000 + .4byte 0x000097AC + .4byte 0 + .4byte 0x8FF290F3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009FB4 + .4byte 0x9FB20000 + .4byte 0x956C0000 + .4byte 0 + .4byte 0 + .4byte 0x00009FAF + .4byte 0x9FB10000 + .4byte 0x89590000 + .4byte 0x00008D5F + .4byte 0x98510000 + .4byte 0x8A5C0000 + .4byte 0x95820000 + .4byte 0 + .4byte 0 + .4byte 0x97810000 + .4byte 0x00008A43 + .4byte 0x905A9FB3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009FB8 + .4byte 0 + .4byte 0x8FC10000 + .4byte 0 + .4byte 0x974F0000 + .4byte 0x9FB50000 + .4byte 0 + .4byte 0x00009FB0 + .4byte 0x00009FB6 + .4byte 0 + .4byte 0x000097DC + .4byte 0x00009393 + .4byte 0x93C00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008A55 + .4byte 0 + .4byte 0x89740000 + .4byte 0x00009FBC + .4byte 0 + .4byte 0x9FBF0000 + .4byte 0 + .4byte 0x97C10000 + .4byte 0 + .4byte 0x97840000 + .4byte 0 + .4byte 0x00009FC6 + .4byte 0x9FC09FBD + .4byte 0 + .4byte 0x000097D2 + .4byte 0x9FC30000 + .4byte 0 + .4byte 0x00008F69 + .4byte 0x9FC50000 + .4byte 0x00009FCA + .4byte 0 + .4byte 0x93919FC8 + .4byte 0 + .4byte 0 + .4byte 0x9FC20000 + .4byte 0x00009257 + .4byte 0 + .4byte 0x9FC90000 + .4byte 0x9FBE0000 + .4byte 0x9FC40000 + .4byte 0x9FCB88FA + .4byte 0x9FC10000 + .4byte 0x9FCC0000 + .4byte 0x0000905B + .4byte 0x00008F7E + .4byte 0x000095A3 + .4byte 0x00008DAC + .4byte 0x00009FB9 + .4byte 0x9FC79359 + .4byte 0 + .4byte 0 .global Ucs6E Ucs6E: - .incbin "baserom.dol", 0x424F40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x000090B4 + .4byte 0x00008A89 + .4byte 0x8DCF8FC2 + .4byte 0x9FBB8F61 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008C6B + .4byte 0x00009FBA + .4byte 0 + .4byte 0x00009FD0 + .4byte 0x8F8D8CB8 + .4byte 0x00009FDF + .4byte 0x00009FD9 + .4byte 0x8B94936E + .4byte 0x00009FD4 + .4byte 0x9FDD88AD + .4byte 0x89510000 + .4byte 0x000089B7 + .4byte 0x00009FD6 + .4byte 0x91AA9FCD + .4byte 0x9FCF8D60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9FE00000 + .4byte 0x9FDB0000 + .4byte 0 + .4byte 0x9FD30000 + .4byte 0 + .4byte 0x00009FDA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96A90000 + .4byte 0x00009FD8 + .4byte 0x9FDC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8CCE0000 + .4byte 0x8FC30000 + .4byte 0x00009258 + .4byte 0 + .4byte 0x00009FD2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000974E + .4byte 0 + .4byte 0x00009FD5 + .4byte 0 + .4byte 0x9FCE9392 + .4byte 0 + .4byte 0x9FD10000 + .4byte 0 + .4byte 0x9FD70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x98708EBC + .4byte 0x969E0000 + .4byte 0x9FE10000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94AC0000 + .4byte 0x00009FED + .4byte 0x8CB90000 + .4byte 0 + .4byte 0 + .4byte 0x8F800000 + .4byte 0x9FE30000 + .4byte 0 + .4byte 0x97AD8D61 + .4byte 0x00009FF0 + .4byte 0 + .4byte 0x88EC0000 + .4byte 0x00009FEE + .4byte 0 + .4byte 0 + .4byte 0x9FE20000 + .4byte 0 + .4byte 0x00009FE8 + .4byte 0 + .4byte 0x9FEA0000 + .4byte 0 + .4byte 0x976E9FE5 + .4byte 0 + .4byte 0x934D0000 + .4byte 0x00009FE7 + .4byte 0 + .4byte 0 + .4byte 0x9FEF0000 + .4byte 0x9FE996C5 + .4byte 0 + .4byte 0x00009FE4 + .4byte 0x00008EA0 + .4byte 0x9FFC0000 + .4byte 0 + .4byte 0x00008A8A + .4byte 0x00009FE6 + .4byte 0x9FEB9FEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091EA + .4byte 0x91D80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9FF40000 + .4byte 0x00009FFA + .4byte 0 + .4byte 0x9FF80000 + .4byte 0x93480000 + .4byte 0x0000E042 + .4byte 0x9FF50000 + .4byte 0 + .4byte 0 + .4byte 0x9FF69FDE .global Ucs6F Ucs6F: - .incbin "baserom.dol", 0x425140, 0x200 + .4byte 0x00008B99 + .4byte 0x95590000 + .4byte 0 + .4byte 0x8EBD0000 + .4byte 0x00008D97 + .4byte 0 + .4byte 0 + .4byte 0x00009852 + .4byte 0x00009FF2 + .4byte 0x0000E041 + .4byte 0x89899186 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94990000 + .4byte 0x8ABF97F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000969F + .4byte 0x92D00000 + .4byte 0 + .4byte 0x00009FF9 + .4byte 0x9FFB0000 + .4byte 0 + .4byte 0 + .4byte 0x91510000 + .4byte 0 + .4byte 0 + .4byte 0xE0409FF7 + .4byte 0x00009FF1 + .4byte 0 + .4byte 0x00008AC1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C890000 + .4byte 0 + .4byte 0xE04E0000 + .4byte 0x0000E049 + .4byte 0x90F60000 + .4byte 0x00008A83 + .4byte 0 + .4byte 0 + .4byte 0x8F810000 + .4byte 0xE0520000 + .4byte 0 + .4byte 0 + .4byte 0x0000E04B + .4byte 0x92AAE048 + .4byte 0x92D70000 + .4byte 0 + .4byte 0xE06B0000 + .4byte 0 + .4byte 0xE0450000 + .4byte 0xE0440000 + .4byte 0xE04D0000 + .4byte 0 + .4byte 0xE047E046 + .4byte 0xE04C0000 + .4byte 0x909F0000 + .4byte 0xE0430000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE04F0000 + .4byte 0x0000E050 + .4byte 0 + .4byte 0 + .4byte 0x00008AC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E055 + .4byte 0x0000E054 + .4byte 0xE0560000 + .4byte 0 + .4byte 0 + .4byte 0xE0590000 + .4byte 0 + .4byte 0 + .4byte 0x00009362 + .4byte 0x0000E053 + .4byte 0 + .4byte 0 + .4byte 0x0000E057 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C8391F7 + .4byte 0xE051945A + .4byte 0 + .4byte 0xE0580000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE05DE05B + .4byte 0 + .4byte 0xE05E0000 + .4byte 0x0000E061 + .4byte 0 + .4byte 0x0000E05A + .4byte 0x8D8A9447 + .4byte 0 + .4byte 0x9FB70000 + .4byte 0 + .4byte 0 + .4byte 0x00009794 + .4byte 0xE05C0000 + .4byte 0xE06091F3 + .4byte 0x0000E05F + .4byte 0x0000E04A + .4byte 0 + .4byte 0xE8890000 + .4byte 0 + .4byte 0xE0640000 + .4byte 0 + .4byte 0xE0680000 .global Ucs70 Ucs70: - .incbin "baserom.dol", 0x425340, 0x200 + .4byte 0x0000E066 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E062 + .4byte 0x0000E063 + .4byte 0 + .4byte 0x0000E067 + .4byte 0x0000E065 + .4byte 0 + .4byte 0x0000956D + .4byte 0 + .4byte 0xE06D0000 + .4byte 0xE06AE069 + .4byte 0x0000E06C + .4byte 0x93D2E06E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x929591EB + .4byte 0 + .4byte 0 + .4byte 0x90A30000 + .4byte 0 + .4byte 0xE06F0000 + .4byte 0xE0710000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0700000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9FF30000 + .4byte 0 + .4byte 0x0000E072 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x93E50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E073 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000089CE + .4byte 0 + .4byte 0x00009394 + .4byte 0x8A440000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B840000 + .4byte 0 + .4byte 0x8EDC8DD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009846 + .4byte 0x90860000 + .4byte 0 + .4byte 0x898A0000 + .4byte 0 + .4byte 0xE0750000 + .4byte 0 + .4byte 0 + .4byte 0x0000E074 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0789259 + .4byte 0xE07BE076 + .4byte 0 + .4byte 0x0000E07A + .4byte 0 + .4byte 0 + .4byte 0xE079935F + .4byte 0x88D70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97F30000 + .4byte 0x0000E07D + .4byte 0 + .4byte 0x00008947 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E080 + .4byte 0 + .4byte 0x0000E07E + .4byte 0x0000E07C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E077 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009642 + .4byte 0 + .4byte 0x0000E082 + .4byte 0 .global Ucs71 Ucs71: - .incbin "baserom.dol", 0x425540, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E081 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x898B0000 + .4byte 0 + .4byte 0x0000E084 + .4byte 0x95B00000 + .4byte 0xE0830000 + .4byte 0 + .4byte 0x000096B3 + .4byte 0 + .4byte 0 + .4byte 0x8FC50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91520000 + .4byte 0 + .4byte 0 + .4byte 0x8FC40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000097F9 + .4byte 0 + .4byte 0xE08A0000 + .4byte 0x90F70000 + .4byte 0 + .4byte 0 + .4byte 0x0000E086 + .4byte 0xE08B0000 + .4byte 0x0000898C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0890000 + .4byte 0x9481E085 + .4byte 0xE0888FC6 + .4byte 0x000094CF + .4byte 0 + .4byte 0xE08C0000 + .4byte 0x8ECF0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000090F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE08F0000 + .4byte 0 + .4byte 0xE0870000 + .4byte 0x8C460000 + .4byte 0 + .4byte 0x0000E08D + .4byte 0 + .4byte 0 + .4byte 0x976FE090 + .4byte 0 + .4byte 0x0000EAA4 + .4byte 0 + .4byte 0 + .4byte 0x00008F6E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0910000 + .4byte 0 + .4byte 0xE0920000 + .4byte 0 + .4byte 0x0000944D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E094 + .4byte 0 + .4byte 0 + .4byte 0xE0950000 + .4byte 0 + .4byte 0x00009452 + .4byte 0 + .4byte 0 + .4byte 0x9395E097 + .4byte 0 + .4byte 0 + .4byte 0xE0990000 + .4byte 0x97D30000 + .4byte 0xE0960000 + .4byte 0xE098898D + .4byte 0x0000E093 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009A7A + .4byte 0xE09A0000 + .4byte 0 + .4byte 0x00009187 + .4byte 0x8E57E09C + .4byte 0 + .4byte 0 + .4byte 0xE09B9043 + .4byte 0x99D70000 + .4byte 0 + .4byte 0 + .4byte 0x0000E09D + .4byte 0 + .4byte 0x0000E09F + .4byte 0x0000E08E + .4byte 0xE09E0000 + .4byte 0x0000E0A0 .global Ucs72 Ucs72: - .incbin "baserom.dol", 0x425740, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x949A0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E0A1 + .4byte 0 + .4byte 0xE0A20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0A3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0A40000 + .4byte 0x92DC0000 + .4byte 0xE0A6E0A5 + .4byte 0 + .4byte 0xE0A70000 + .4byte 0xE0A80000 + .4byte 0x00008EDD + .4byte 0x95830000 + .4byte 0 + .4byte 0x96EAE0A9 + .4byte 0xE0AA9175 + .4byte 0x8EA2E0AB + .4byte 0xE0AC0000 + .4byte 0 + .4byte 0 + .4byte 0xE0AD95D0 + .4byte 0x94C50000 + .4byte 0x0000E0AE + .4byte 0x94760000 + .4byte 0 + .4byte 0 + .4byte 0x92AB0000 + .4byte 0 + .4byte 0 + .4byte 0xE0AF89E5 + .4byte 0x00008B8D + .4byte 0x000096C4 + .4byte 0x000096B4 + .4byte 0x000089B2 + .4byte 0x98530000 + .4byte 0 + .4byte 0x00009671 + .4byte 0x000095A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90B50000 + .4byte 0xE0B00000 + .4byte 0 + .4byte 0x000093C1 + .4byte 0 + .4byte 0x00008CA1 + .4byte 0xE0B10000 + .4byte 0x8DD2E0B3 + .4byte 0xE0B20000 + .4byte 0 + .4byte 0x0000E0B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0B50000 + .4byte 0 + .4byte 0xE0B60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B5D0000 + .4byte 0xE0B70000 + .4byte 0 + .4byte 0x0000E0B8 + .4byte 0 + .4byte 0 + .4byte 0x8CA20000 + .4byte 0x000094C6 + .4byte 0 + .4byte 0xE0BA0000 + .4byte 0 + .4byte 0x8FF30000 + .4byte 0x0000E0B9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8BB6E0BB + .4byte 0xE0BD0000 + .4byte 0xE0BC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0BE0000 + .4byte 0x8CCF0000 + .4byte 0xE0BF0000 + .4byte 0 + .4byte 0x00008BE7 + .4byte 0x0000915F + .4byte 0x00008D9D + .4byte 0 + .4byte 0 + .4byte 0xE0C1E0C2 + .4byte 0xE0C00000 + .4byte 0 + .4byte 0 + .4byte 0x00008EEB + .4byte 0 + .4byte 0x93C68BB7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0C4 + .4byte 0x924BE0C3 + .4byte 0 + .4byte 0x98549482 + .4byte 0 .global Ucs73 Ucs73: - .incbin "baserom.dol", 0x425940, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0C70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0C9E0C6 + .4byte 0 + .4byte 0x000096D2 + .4byte 0xE0C8E0CA + .4byte 0x000097C2 + .4byte 0 + .4byte 0 + .4byte 0x0000E0CE + .4byte 0 + .4byte 0x0000E0CD + .4byte 0x9296944C + .4byte 0 + .4byte 0x8CA3E0CC + .4byte 0 + .4byte 0 + .4byte 0xE0CB0000 + .4byte 0x97509751 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0CF898E + .4byte 0 + .4byte 0 + .4byte 0x8D968E82 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0D0E0D1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0D3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008F62 + .4byte 0 + .4byte 0 + .4byte 0xE0D50000 + .4byte 0xE0D40000 + .4byte 0 + .4byte 0 + .4byte 0xE0D60000 + .4byte 0x8A6C0000 + .4byte 0x0000E0D8 + .4byte 0 + .4byte 0xE0D70000 + .4byte 0xE0DAE0D9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8CBA0000 + .4byte 0x000097A6 + .4byte 0x00008BCA + .4byte 0x000089A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8BE80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008ADF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97E6E0DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0DE + .4byte 0 + .4byte 0 + .4byte 0xE0DF0000 + .4byte 0x89CF0000 + .4byte 0 + .4byte 0 + .4byte 0xE0DB0000 + .4byte 0x8E580000 + .4byte 0x000092BF + .4byte 0xE0DD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0E20000 + .4byte 0x8EEC0000 + .4byte 0 + .4byte 0x0000E0E0 + .4byte 0 + .4byte 0 + .4byte 0x8C5D0000 + .4byte 0x000094C7 + .4byte 0xE0E10000 + .4byte 0x0000E0FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0E70000 + .4byte 0 + .4byte 0 + .4byte 0x8CBB0000 .global Ucs74 Ucs74: - .incbin "baserom.dol", 0x425B40, 0x200 + .4byte 0 + .4byte 0x00008B85 + .4byte 0x0000E0E4 + .4byte 0x979D0000 + .4byte 0x000097AE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91F40000 + .4byte 0x0000E0E6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0E897D4 + .4byte 0x8BD594FA + .4byte 0x94690000 + .4byte 0 + .4byte 0xE0E90000 + .4byte 0 + .4byte 0x0000E0EB + .4byte 0x0000E0EE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0EA + .4byte 0 + .4byte 0x0000E0ED + .4byte 0x8CE8896C + .4byte 0xE0EF0000 + .4byte 0x9090E0EC + .4byte 0x97DA0000 + .4byte 0x0000E0F2 + .4byte 0xEAA20000 + .4byte 0 + .4byte 0x0000E0F0 + .4byte 0xE0F30000 + .4byte 0 + .4byte 0x0000E0E5 + .4byte 0xE0F10000 + .4byte 0x00008DBA + .4byte 0 + .4byte 0xE0F40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0F50000 + .4byte 0 + .4byte 0x0000979E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E0F6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0F70000 + .4byte 0 + .4byte 0xE0E30000 + .4byte 0 + .4byte 0x0000E0F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8AC20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008EA3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE0F90000 + .4byte 0 + .4byte 0x0000E0FA + .4byte 0 + .4byte 0 + .4byte 0xE0FB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x895A0000 + .4byte 0 + .4byte 0xE1400000 + .4byte 0x955AE141 + .4byte 0 + .4byte 0x8AA2E142 + .4byte 0x0000E143 + .4byte 0 + .4byte 0 + .4byte 0xE1440000 + .4byte 0xE146E147 + .4byte 0xE1450000 + .4byte 0 + .4byte 0x9572E149 + .4byte 0xE1480000 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs75 Ucs75: - .incbin "baserom.dol", 0x425D40, 0x200 + .4byte 0 + .4byte 0x0000E14B + .4byte 0xE14AE14C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE14DE14F + .4byte 0xE14E0000 + .4byte 0x00008D99 + .4byte 0x0000E151 + .4byte 0x0000E150 + .4byte 0 + .4byte 0x8AC30000 + .4byte 0x90720000 + .4byte 0x935B0000 + .4byte 0xE15290B6 + .4byte 0 + .4byte 0x00008E59 + .4byte 0x00008999 + .4byte 0xE1530000 + .4byte 0x97700000 + .4byte 0x000095E1 + .4byte 0xE1540000 + .4byte 0 + .4byte 0x93639752 + .4byte 0x8D62905C + .4byte 0 + .4byte 0x0000926A + .4byte 0x99B20000 + .4byte 0x92AC89E6 + .4byte 0xE1550000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1560000 + .4byte 0xE15B0000 + .4byte 0x0000E159 + .4byte 0xE1589DC0 + .4byte 0x8A45E157 + .4byte 0x000088D8 + .4byte 0x000094A8 + .4byte 0 + .4byte 0x94C80000 + .4byte 0 + .4byte 0x000097AF + .4byte 0xE15CE15A + .4byte 0x927B90A4 + .4byte 0 + .4byte 0x94A90000 + .4byte 0x954C0000 + .4byte 0xE15E97AA + .4byte 0x8C6CE15F + .4byte 0x0000E15D + .4byte 0x94D4E160 + .4byte 0x0000E161 + .4byte 0 + .4byte 0x88D90000 + .4byte 0x00008FF4 + .4byte 0xE1660000 + .4byte 0xE16393EB + .4byte 0xE1620000 + .4byte 0 + .4byte 0 + .4byte 0x00008B45 + .4byte 0 + .4byte 0xE1690000 + .4byte 0 + .4byte 0xE164E165 + .4byte 0x0000E168 + .4byte 0xE1679544 + .4byte 0 + .4byte 0x91619160 + .4byte 0x00008B5E + .4byte 0 + .4byte 0xE16A0000 + .4byte 0 + .4byte 0 + .4byte 0xE16B0000 + .4byte 0x0000E16C + .4byte 0 + .4byte 0 + .4byte 0x0000E16E + .4byte 0x0000E16D + .4byte 0 + .4byte 0 + .4byte 0x00008975 + .4byte 0 + .4byte 0 + .4byte 0x0000E176 + .4byte 0x94E6E170 + .4byte 0x0000E172 + .4byte 0 + .4byte 0xE174905D + .4byte 0 + .4byte 0xE175E173 + .4byte 0x8EBE0000 + .4byte 0 + .4byte 0xE16FE171 + .4byte 0x00009561 + .4byte 0x00008FC7 + .4byte 0 + .4byte 0xE1780000 + .4byte 0x0000E177 + .4byte 0 + .4byte 0 + .4byte 0xE1790000 + .4byte 0x8EA48DAD + .4byte 0 + .4byte 0x9397E17A + .4byte 0x000092C9 + .4byte 0 + .4byte 0xE17C0000 + .4byte 0 + .4byte 0x979FE17B + .4byte 0 + .4byte 0 + .4byte 0x00009189 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1820000 + .4byte 0xE184E185 + .4byte 0x92730000 + .4byte 0 + .4byte 0 + .4byte 0xE1830000 + .4byte 0xE1800000 + .4byte 0xE17DE17E .global Ucs76 Ucs76: - .incbin "baserom.dol", 0x425F40, 0x200 + .4byte 0x0000E181 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E188 + .4byte 0x0000E186 + .4byte 0x0000E187 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E189 + .4byte 0xE18BE18C + .4byte 0xE18D0000 + .4byte 0xE18E0000 + .4byte 0x0000E18A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1900000 + .4byte 0 + .4byte 0xE18F0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E191 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97C30000 + .4byte 0 + .4byte 0xE194E192 + .4byte 0xE1930000 + .4byte 0 + .4byte 0x8AE00000 + .4byte 0 + .4byte 0 + .4byte 0x96FC0000 + .4byte 0 + .4byte 0x95C80000 + .4byte 0xE1960000 + .4byte 0 + .4byte 0xE1950000 + .4byte 0 + .4byte 0x0000E197 + .4byte 0xE1980000 + .4byte 0 + .4byte 0x0000E19C + .4byte 0xE199E19A + .4byte 0xE19B0000 + .4byte 0xE19D0000 + .4byte 0 + .4byte 0xE19E0000 + .4byte 0xE19F0000 + .4byte 0 + .4byte 0xE1A00000 + .4byte 0xE1A10000 + .4byte 0x94AD936F + .4byte 0xE1A29492 + .4byte 0x95530000 + .4byte 0xE1A30000 + .4byte 0x0000E1A4 + .4byte 0x93490000 + .4byte 0x8A468D63 + .4byte 0xE1A50000 + .4byte 0x0000E1A6 + .4byte 0 + .4byte 0xE1A70000 + .4byte 0x8E480000 + .4byte 0x0000E1A9 + .4byte 0 + .4byte 0xE1A80000 + .4byte 0x0000E1AA + .4byte 0xE1AB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x94E70000 + .4byte 0xE1AC0000 + .4byte 0 + .4byte 0xE1AD0000 + .4byte 0x0000EA89 + .4byte 0xE1AEE1AF + .4byte 0xE1B00000 + .4byte 0 + .4byte 0x00008E4D + .4byte 0 + .4byte 0xE1B19475 + .4byte 0 + .4byte 0x967E0000 + .4byte 0x896D0000 + .4byte 0x89760000 + .4byte 0x0000E1B2 + .4byte 0 + .4byte 0 + .4byte 0xE1B40000 + .4byte 0 + .4byte 0xE1B39390 + .4byte 0 + .4byte 0x000090B7 + .4byte 0x9F580000 + .4byte 0xE1B596BF + .4byte 0x0000E1B6 + .4byte 0x00008AC4 + .4byte 0x94D5E1B7 + .4byte 0x0000E1B8 + .4byte 0 + .4byte 0xE1B90000 + .4byte 0 + .4byte 0x96DA0000 + .4byte 0 + .4byte 0x96D30000 + .4byte 0x92BC0000 + .4byte 0 + .4byte 0x918A0000 + .4byte 0x0000E1BB + .4byte 0 + .4byte 0x8F820000 .global Ucs77 Ucs77: - .incbin "baserom.dol", 0x426140, 0x200 + .4byte 0x00008FC8 + .4byte 0 + .4byte 0xE1BE0000 + .4byte 0x0000E1BD + .4byte 0xE1BC94FB + .4byte 0x00008AC5 + .4byte 0x8CA70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1C4 + .4byte 0 + .4byte 0xE1C1905E + .4byte 0x96B00000 + .4byte 0 + .4byte 0xE1C0E1C2 + .4byte 0xE1C30000 + .4byte 0x0000E1BF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1C5 + .4byte 0xE1C60000 + .4byte 0x92AD0000 + .4byte 0x8AE10000 + .4byte 0 + .4byte 0x92850000 + .4byte 0 + .4byte 0 + .4byte 0x0000E1C7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1C8E1CB + .4byte 0 + .4byte 0 + .4byte 0x00009087 + .4byte 0x000093C2 + .4byte 0x0000E1CC + .4byte 0x96720000 + .4byte 0xE1C90000 + .4byte 0x0000E1CA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1CF + .4byte 0 + .4byte 0 + .4byte 0xE1CEE1CD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1D1 + .4byte 0 + .4byte 0xE1D00000 + .4byte 0x0000E1D2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1D40000 + .4byte 0xE1D30000 + .4byte 0 + .4byte 0x000095CB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8F7597C4 + .4byte 0 + .4byte 0xE1D50000 + .4byte 0x000093B5 + .4byte 0 + .4byte 0xE1D60000 + .4byte 0x0000E1D7 + .4byte 0x0000E1DB + .4byte 0xE1D9E1DA + .4byte 0x0000E1D8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1DC + .4byte 0 + .4byte 0 + .4byte 0x0000E1DD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1DE + .4byte 0 + .4byte 0xE1DF96B5 + .4byte 0xE1E00000 + .4byte 0 + .4byte 0 + .4byte 0x96EEE1E1 + .4byte 0x0000926D + .4byte 0x0000948A + .4byte 0x00008BE9 + .4byte 0 + .4byte 0x0000925A + .4byte 0xE1E28BB8 + .4byte 0 + .4byte 0x000090CE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1E30000 + .4byte 0 .global Ucs78 Ucs78: - .incbin "baserom.dol", 0x426340, 0x200 + .4byte 0 + .4byte 0x8DBB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1E40000 + .4byte 0 + .4byte 0 + .4byte 0xE1E50000 + .4byte 0x8CA48DD3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1E70000 + .4byte 0 + .4byte 0x00009375 + .4byte 0x8DD48B6D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96430000 + .4byte 0x946A0000 + .4byte 0 + .4byte 0 + .4byte 0x93760000 + .4byte 0 + .4byte 0x00008D7B + .4byte 0 + .4byte 0 + .4byte 0x0000E1E9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008FC9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000097B0 + .4byte 0x8D640000 + .4byte 0x00008CA5 + .4byte 0 + .4byte 0x94A10000 + .4byte 0xE1EB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1ED0000 + .4byte 0 + .4byte 0x00008CE9 + .4byte 0 + .4byte 0 + .4byte 0xE1EC92F4 + .4byte 0 + .4byte 0 + .4byte 0xE1EF8A56 + .4byte 0xE1EA0000 + .4byte 0x000094E8 + .4byte 0x0000894F + .4byte 0x00008DEA + .4byte 0x00009871 + .4byte 0 + .4byte 0xE1EE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E1F0 + .4byte 0 + .4byte 0x000095C9 + .4byte 0x000090D7 + .4byte 0xE1F20000 + .4byte 0 + .4byte 0x0000E1F3 + .4byte 0 + .4byte 0 + .4byte 0x0000E1F1 + .4byte 0 + .4byte 0 + .4byte 0x8A6D0000 + .4byte 0xE1F90000 + .4byte 0xE1F80000 + .4byte 0x00008EA5 + .4byte 0 + .4byte 0x0000E1FA + .4byte 0xE1F50000 + .4byte 0 + .4byte 0xE1FBE1F6 + .4byte 0 + .4byte 0 + .4byte 0x94D6E1F4 + .4byte 0 + .4byte 0xE1F70000 + .4byte 0 + .4byte 0 + .4byte 0xE2410000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E240 + .4byte 0x96810000 + .4byte 0 + .4byte 0xE1FC0000 + .4byte 0x000088E9 + .4byte 0 + .4byte 0 + .4byte 0xE2430000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E242 + .4byte 0 .global Ucs79 Ucs79: - .incbin "baserom.dol", 0x426540, 0x200 + .4byte 0x00008FCA + .4byte 0 + .4byte 0 + .4byte 0x0000E244 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91620000 + .4byte 0x0000E246 + .4byte 0xE2450000 + .4byte 0 + .4byte 0 + .4byte 0x0000E247 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE1E60000 + .4byte 0 + .4byte 0xE1E8E249 + .4byte 0xE2480000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EA60000 + .4byte 0x97E70000 + .4byte 0x8ED00000 + .4byte 0xE24A8C56 + .4byte 0 + .4byte 0 + .4byte 0x00008B5F + .4byte 0x8B468E83 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97530000 + .4byte 0x0000E250 + .4byte 0x0000E24F + .4byte 0x9163E24C + .4byte 0 + .4byte 0xE24E0000 + .4byte 0x00008F6A + .4byte 0x905FE24D + .4byte 0xE24B0000 + .4byte 0x94490000 + .4byte 0x00008FCB + .4byte 0 + .4byte 0x955B0000 + .4byte 0 + .4byte 0x00008DD5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009398 + .4byte 0 + .4byte 0xE2510000 + .4byte 0 + .4byte 0x0000E252 + .4byte 0xE2688BD6 + .4byte 0 + .4byte 0x985C9154 + .4byte 0 + .4byte 0 + .4byte 0xE2530000 + .4byte 0x000089D0 + .4byte 0x92F5959F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E254 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B9AE255 + .4byte 0 + .4byte 0xE2570000 + .4byte 0 + .4byte 0xE2580000 + .4byte 0x94480000 + .4byte 0x0000E259 + .4byte 0 + .4byte 0 + .4byte 0x0000E25A + .4byte 0xE25B0000 + .4byte 0x00008BD7 + .4byte 0x89D193C3 + .4byte 0x8F478E84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E25C + .4byte 0x00008F48 + .4byte 0 + .4byte 0 + .4byte 0x000089C8 + .4byte 0x95620000 + .4byte 0x0000E25D + .4byte 0 + .4byte 0x94E90000 + .4byte 0 + .4byte 0 + .4byte 0x00009164 + .4byte 0x0000E260 + .4byte 0x0000E261 + .4byte 0x94890000 + .4byte 0x9060E25E + .4byte 0x00009281 + .4byte 0 + .4byte 0xE25F0000 + .4byte 0 + .4byte 0x8FCC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088DA + .4byte 0 + .4byte 0 .global Ucs7A Ucs7A: - .incbin "baserom.dol", 0x426740, 0x200 + .4byte 0x8B480000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE2620000 + .4byte 0x000092F6 + .4byte 0x0000E263 + .4byte 0x90C50000 + .4byte 0 + .4byte 0 + .4byte 0x96AB0000 + .4byte 0x00009542 + .4byte 0xE264E265 + .4byte 0x92740000 + .4byte 0x97C50000 + .4byte 0x0000E267 + .4byte 0xE2660000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EED0000 + .4byte 0x0000E269 + .4byte 0x88EE0000 + .4byte 0 + .4byte 0x0000E26C + .4byte 0 + .4byte 0x0000E26A + .4byte 0x89D28C6D + .4byte 0xE26B8D65 + .4byte 0x8D920000 + .4byte 0x95E4E26D + .4byte 0 + .4byte 0x96730000 + .4byte 0x0000E26F + .4byte 0 + .4byte 0x000090CF + .4byte 0x896E89B8 + .4byte 0x88AA0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E26E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E270 + .4byte 0xE2718FF5 + .4byte 0 + .4byte 0 + .4byte 0x0000E272 + .4byte 0x00008A6E + .4byte 0 + .4byte 0 + .4byte 0xE2740000 + .4byte 0 + .4byte 0x8C8A0000 + .4byte 0x8B860000 + .4byte 0x0000E275 + .4byte 0x8BF30000 + .4byte 0x0000E276 + .4byte 0x000090FA + .4byte 0x000093CB + .4byte 0x000090DE + .4byte 0x8DF30000 + .4byte 0 + .4byte 0xE2770000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9282918B + .4byte 0x0000E279 + .4byte 0xE27BE278 + .4byte 0xE27A0000 + .4byte 0 + .4byte 0 + .4byte 0x00008C41 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E27C + .4byte 0x8C450000 + .4byte 0 + .4byte 0x8B879771 + .4byte 0xE27E0000 + .4byte 0 + .4byte 0 + .4byte 0xE2800000 + .4byte 0 + .4byte 0x894D0000 + .4byte 0 + .4byte 0x0000E283 + .4byte 0 + .4byte 0x00008A96 + .4byte 0xE282E281 + .4byte 0x0000E285 + .4byte 0xE27D0000 + .4byte 0xE28697A7 + .4byte 0x0000E287 + .4byte 0x0000E288 + .4byte 0 + .4byte 0x9AF2E28A + .4byte 0x0000E289 + .4byte 0 + .4byte 0x0000E28B + .4byte 0xE28C0000 + .4byte 0x97B3E28D + .4byte 0x0000E8ED + .4byte 0x8FCDE28E + .4byte 0xE28F8F76 + .4byte 0x000093B6 + .4byte 0xE2900000 + .4byte 0 + .4byte 0x92470000 + .4byte 0x0000E291 + .4byte 0x0000925B + .4byte 0xE2920000 + .4byte 0 + .4byte 0 + .4byte 0x8BA30000 + .4byte 0x995E927C + .4byte 0x8EB10000 + .4byte 0 + .4byte 0x00008AC6 .global Ucs7B Ucs7B: - .incbin "baserom.dol", 0x426940, 0x200 + .4byte 0 + .4byte 0xE2930000 + .4byte 0xE2A00000 + .4byte 0xE2960000 + .4byte 0x8B880000 + .4byte 0xE295E2A2 + .4byte 0 + .4byte 0x0000E294 + .4byte 0x00008FCE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE298E299 + .4byte 0x0000934A + .4byte 0 + .4byte 0xE29A0000 + .4byte 0x8A7D0000 + .4byte 0 + .4byte 0x00009079 + .4byte 0x95840000 + .4byte 0xE29C0000 + .4byte 0 + .4byte 0x91E60000 + .4byte 0 + .4byte 0 + .4byte 0x0000E297 + .4byte 0x0000E29B + .4byte 0xE29D0000 + .4byte 0x00008DF9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2A4 + .4byte 0x954D0000 + .4byte 0x94A49399 + .4byte 0x00008BD8 + .4byte 0xE2A3E2A1 + .4byte 0x000094B3 + .4byte 0xE29E927D + .4byte 0x939B0000 + .4byte 0x939A0000 + .4byte 0x8DF40000 + .4byte 0 + .4byte 0 + .4byte 0x0000E2B6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2A6 + .4byte 0x0000E2A8 + .4byte 0 + .4byte 0 + .4byte 0xE2AB0000 + .4byte 0xE2AC0000 + .4byte 0xE2A9E2AA + .4byte 0 + .4byte 0xE2A7E2A5 + .4byte 0 + .4byte 0 + .4byte 0xE29F0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x95CD89D3 + .4byte 0 + .4byte 0x0000E2B3 + .4byte 0x0000E2B0 + .4byte 0x0000E2B5 + .4byte 0 + .4byte 0xE2B40000 + .4byte 0x949396A5 + .4byte 0x00008E5A + .4byte 0xE2AEE2B7 + .4byte 0xE2B20000 + .4byte 0xE2B1E2AD + .4byte 0x0000E2AF + .4byte 0x00008AC7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x925C0000 + .4byte 0x000090FB + .4byte 0 + .4byte 0x000094A0 + .4byte 0 + .4byte 0xE2BC0000 + .4byte 0 + .4byte 0x94A20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90DFE2B9 + .4byte 0 + .4byte 0x94CD0000 + .4byte 0xE2BD95D1 + .4byte 0x0000927A + .4byte 0x0000E2B8 + .4byte 0xE2BA0000 + .4byte 0x0000E2BB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2BE + .4byte 0 + .4byte 0x8EC20000 + .4byte 0 + .4byte 0x93C4E2C3 + .4byte 0xE2C20000 + .4byte 0x0000E2BF + .4byte 0 + .4byte 0x00009855 + .4byte 0 + .4byte 0 + .4byte 0x0000E2C8 + .4byte 0 + .4byte 0xE2CCE2C9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs7C Ucs7C: - .incbin "baserom.dol", 0x426B40, 0x200 + .4byte 0xE2C50000 + .4byte 0 + .4byte 0 + .4byte 0x0000E2C6 + .4byte 0 + .4byte 0 + .4byte 0x0000E2CB + .4byte 0 + .4byte 0x0000E2C0 + .4byte 0x99D3E2C7 + .4byte 0xE2C10000 + .4byte 0x0000E2CA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2D0 + .4byte 0x00008AC8 + .4byte 0x0000E2CD + .4byte 0 + .4byte 0x0000E2CE + .4byte 0 + .4byte 0xE2CFE2D2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2D1 + .4byte 0x94F40000 + .4byte 0 + .4byte 0x0000E2D3 + .4byte 0x97FA95EB + .4byte 0xE2D80000 + .4byte 0x0000E2D5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE2D490D0 + .4byte 0x0000E2D7 + .4byte 0xE2D90000 + .4byte 0 + .4byte 0xE2D60000 + .4byte 0xE2DD0000 + .4byte 0xE2DA0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E2DB + .4byte 0xE2C40000 + .4byte 0 + .4byte 0xE2DCE2DE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE2DF0000 + .4byte 0 + .4byte 0 + .4byte 0x000095C4 + .4byte 0x0000E2E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96E00000 + .4byte 0x00008BCC + .4byte 0x8C48E2E1 + .4byte 0 + .4byte 0 + .4byte 0x000095B2 + .4byte 0x00009088 + .4byte 0x000096AE + .4byte 0 + .4byte 0xE2E20000 + .4byte 0x97B10000 + .4byte 0x00009494 + .4byte 0x00009165 + .4byte 0x94530000 + .4byte 0x00008F6C + .4byte 0 + .4byte 0x000088BE + .4byte 0x0000E2E7 + .4byte 0xE2E50000 + .4byte 0xE2E38A9F + .4byte 0x00008FCF + .4byte 0xE2E80000 + .4byte 0x0000E2E6 + .4byte 0x0000E2E4 + .4byte 0xE2EC0000 + .4byte 0x0000E2EB + .4byte 0xE2EAE2E9 + .4byte 0 + .4byte 0 + .4byte 0x0000E2ED + .4byte 0 + .4byte 0x0000E2EE + .4byte 0x90B80000 + .4byte 0xE2EF0000 + .4byte 0xE2F10000 + .4byte 0x0000E2F0 + .4byte 0 + .4byte 0 + .4byte 0x8CD00000 + .4byte 0 + .4byte 0x91570000 + .4byte 0 + .4byte 0xE2F30000 + .4byte 0 + .4byte 0x939C0000 + .4byte 0xE2F20000 + .4byte 0 + .4byte 0xE2F40000 + .4byte 0x95B3918C + .4byte 0x8D660000 + .4byte 0xE2F50000 + .4byte 0 + .4byte 0x000097C6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2F7 + .4byte 0 + .4byte 0xE2F80000 + .4byte 0xE2F90000 + .4byte 0xE2FA0000 + .4byte 0x8E850000 + .4byte 0xE2FB8C6E + .4byte 0 + .4byte 0x8B8A0000 .global Ucs7D Ucs7D: - .incbin "baserom.dol", 0x426D40, 0x200 + .4byte 0x8B490000 + .4byte 0xE3400000 + .4byte 0x96F18D67 + .4byte 0xE2FC0000 + .4byte 0 + .4byte 0xE34396E4 + .4byte 0x0000945B + .4byte 0 + .4byte 0x95520000 + .4byte 0 + .4byte 0x8F83E342 + .4byte 0x00008ED1 + .4byte 0x8D688E86 + .4byte 0x8B8995B4 + .4byte 0xE3410000 + .4byte 0 + .4byte 0x91669661 + .4byte 0x8DF50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008E87 + .4byte 0x92DB0000 + .4byte 0xE34697DD + .4byte 0x8DD70000 + .4byte 0xE3479061 + .4byte 0x0000E349 + .4byte 0 + .4byte 0x00008FD0 + .4byte 0x8DAE0000 + .4byte 0 + .4byte 0x0000E348 + .4byte 0 + .4byte 0x8F498CBC + .4byte 0x9167E344 + .4byte 0xE34A0000 + .4byte 0 + .4byte 0x0000E345 + .4byte 0x8C6F0000 + .4byte 0xE34DE351 + .4byte 0x8C8B0000 + .4byte 0 + .4byte 0 + .4byte 0xE34C0000 + .4byte 0 + .4byte 0x0000E355 + .4byte 0 + .4byte 0x8D690000 + .4byte 0x0000978D + .4byte 0x88BAE352 + .4byte 0 + .4byte 0x8B8B0000 + .4byte 0xE34F0000 + .4byte 0 + .4byte 0 + .4byte 0xE3500000 + .4byte 0x0000939D + .4byte 0xE34EE34B + .4byte 0x00008A47 + .4byte 0x90E20000 + .4byte 0x00008CA6 + .4byte 0 + .4byte 0x0000E357 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E354 + .4byte 0 + .4byte 0 + .4byte 0x0000E356 + .4byte 0 + .4byte 0x0000E353 + .4byte 0 + .4byte 0 + .4byte 0x00008C70 + .4byte 0x91B1E358 + .4byte 0x918E0000 + .4byte 0x0000E365 + .4byte 0 + .4byte 0xE361E35B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E35F + .4byte 0x8EF888DB + .4byte 0xE35AE362 + .4byte 0xE3668D6A + .4byte 0x96D40000 + .4byte 0x92D4E35C + .4byte 0 + .4byte 0xE3640000 + .4byte 0xE359925D + .4byte 0x0000E35E + .4byte 0x88BB96C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E35D + .4byte 0 + .4byte 0x8BD994EA + .4byte 0 + .4byte 0x0000918D + .4byte 0x000097CE + .4byte 0x8F8F0000 + .4byte 0x0000E38E + .4byte 0 + .4byte 0xE3670000 + .4byte 0x90FC0000 + .4byte 0xE363E368 + .4byte 0xE36A0000 + .4byte 0x92F7E36D + .4byte 0 + .4byte 0xE3690000 + .4byte 0 + .4byte 0x95D28AC9 + .4byte 0 + .4byte 0x96C90000 + .4byte 0x000088DC + .4byte 0 + .4byte 0xE36C0000 + .4byte 0x97FB0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E36B + .4byte 0 + .4byte 0 .global Ucs7E Ucs7E: - .incbin "baserom.dol", 0x426F40, 0x200 + .4byte 0x0000898F + .4byte 0 + .4byte 0x93EAE36E + .4byte 0 + .4byte 0x0000E375 + .4byte 0xE36FE376 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3720000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000949B + .4byte 0 + .4byte 0x8EC8E374 + .4byte 0x0000E371 + .4byte 0xE377E370 + .4byte 0 + .4byte 0x8F630000 + .4byte 0 + .4byte 0x00009644 + .4byte 0 + .4byte 0x8F6B0000 + .4byte 0x0000E373 + .4byte 0xE3800000 + .4byte 0x0000E37B + .4byte 0x0000E37E + .4byte 0x0000E37C + .4byte 0xE381E37A + .4byte 0x0000E360 + .4byte 0x90D10000 + .4byte 0x000094C9 + .4byte 0x0000E37D + .4byte 0 + .4byte 0xE3780000 + .4byte 0 + .4byte 0x91408C71 + .4byte 0x00008F4A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90449155 + .4byte 0xE3840000 + .4byte 0x0000E386 + .4byte 0xE3870000 + .4byte 0x0000E383 + .4byte 0xE3850000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE379E382 + .4byte 0x0000E38A + .4byte 0xE3890000 + .4byte 0x0000969A + .4byte 0 + .4byte 0x8C4A0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E388 + .4byte 0x0000E38C + .4byte 0xE38BE38F + .4byte 0x0000E391 + .4byte 0 + .4byte 0x8E5BE38D + .4byte 0 + .4byte 0 + .4byte 0xE392E393 + .4byte 0 + .4byte 0xE3940000 + .4byte 0xE39A935A + .4byte 0xE3960000 + .4byte 0xE395E397 + .4byte 0xE3980000 + .4byte 0xE3990000 + .4byte 0 + .4byte 0x0000E39B + .4byte 0xE39C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs7F Ucs7F: - .incbin "baserom.dol", 0x427140, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8ACA0000 + .4byte 0xE39D0000 + .4byte 0xE39E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E39F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3A0E3A1 + .4byte 0xE3A20000 + .4byte 0xE3A3E3A4 + .4byte 0 + .4byte 0xE3A6E3A5 + .4byte 0 + .4byte 0xE3A70000 + .4byte 0 + .4byte 0 + .4byte 0x0000E3A8 + .4byte 0xE3A90000 + .4byte 0 + .4byte 0 + .4byte 0x0000E3AC + .4byte 0xE3AAE3AB + .4byte 0x8DDF8C72 + .4byte 0 + .4byte 0x92750000 + .4byte 0x94B10000 + .4byte 0x8F900000 + .4byte 0x0000946C + .4byte 0x000094EB + .4byte 0xE3AD9CEB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3AEE3B0 + .4byte 0x00009785 + .4byte 0xE3AFE3B2 + .4byte 0xE3B10000 + .4byte 0x97720000 + .4byte 0xE3B30000 + .4byte 0x94FC0000 + .4byte 0 + .4byte 0 + .4byte 0xE3B40000 + .4byte 0 + .4byte 0 + .4byte 0xE3B70000 + .4byte 0x0000E3B6 + .4byte 0xE3B50000 + .4byte 0 + .4byte 0x0000E3B8 + .4byte 0x8C510000 + .4byte 0 + .4byte 0x91418B60 + .4byte 0 + .4byte 0 + .4byte 0xE3BCE3B9 + .4byte 0 + .4byte 0xE3BA0000 + .4byte 0 + .4byte 0xE3BD0000 + .4byte 0xE3BEE3BB + .4byte 0 + .4byte 0x00008948 + .4byte 0 + .4byte 0x000089A5 + .4byte 0 + .4byte 0x0000E3C0 + .4byte 0xE3C10000 + .4byte 0 + .4byte 0xE3C20000 + .4byte 0x97820000 + .4byte 0 + .4byte 0 + .4byte 0x8F4B0000 + .4byte 0xE3C4E3C3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9089E3C5 + .4byte 0 + .4byte 0 + .4byte 0xE3C60000 + .4byte 0x0000E3C7 + .4byte 0x00008AE3 + .4byte 0 + .4byte 0 + .4byte 0x8ACB0000 + .4byte 0x0000E3C8 + .4byte 0 + .4byte 0 + .4byte 0x0000E3C9 + .4byte 0x0000967C + .4byte 0x97830000 + .4byte 0 .global Ucs80 Ucs80: - .incbin "baserom.dol", 0x427340, 0x200 + .4byte 0x97739856 + .4byte 0x00008D6C + .4byte 0xE3CC8ED2 + .4byte 0xE3CB0000 + .4byte 0 + .4byte 0x0000E3CD + .4byte 0x8EA70000 + .4byte 0 + .4byte 0x91CF0000 + .4byte 0xE3CE0000 + .4byte 0x00008D6B + .4byte 0x000096D5 + .4byte 0xE3CFE3D0 + .4byte 0 + .4byte 0xE3D10000 + .4byte 0 + .4byte 0x0000E3D2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3D30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008EA8 + .4byte 0 + .4byte 0x96EB0000 + .4byte 0 + .4byte 0x0000E3D5 + .4byte 0x0000925E + .4byte 0x0000E3D4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3D70000 + .4byte 0 + .4byte 0xE3D60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3D80000 + .4byte 0 + .4byte 0x90B90000 + .4byte 0xE3D90000 + .4byte 0xE3DA0000 + .4byte 0 + .4byte 0x95B7E3DB + .4byte 0x0000918F + .4byte 0xE3DC0000 + .4byte 0 + .4byte 0 + .4byte 0xE3DD0000 + .4byte 0 + .4byte 0 + .4byte 0x000097FC + .4byte 0xE3E00000 + .4byte 0xE3DFE3DE + .4byte 0x92AE0000 + .4byte 0xE3E19045 + .4byte 0x0000E3E2 + .4byte 0 + .4byte 0x0000E3E3 + .4byte 0x9857E3E4 + .4byte 0 + .4byte 0 + .4byte 0xE3E5E3E7 + .4byte 0xE3E694A3 + .4byte 0x000093F7 + .4byte 0x0000985D + .4byte 0x94A70000 + .4byte 0 + .4byte 0 + .4byte 0x0000E3E9 + .4byte 0 + .4byte 0x8FD10000 + .4byte 0x95490000 + .4byte 0xE3EAE3E8 + .4byte 0x00008ACC + .4byte 0 + .4byte 0x00008CD2 + .4byte 0x8E880000 + .4byte 0x000094EC + .4byte 0 + .4byte 0x00008CA8 + .4byte 0x96620000 + .4byte 0xE3EDE3EB + .4byte 0x00008D6D + .4byte 0x00008D6E + .4byte 0x88E70000 + .4byte 0x8DE60000 + .4byte 0 + .4byte 0 + .4byte 0x94780000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088DD + .4byte 0xE3F20000 + .4byte 0x925F0000 + .4byte 0 + .4byte 0 + .4byte 0x94770000 + .4byte 0x91D90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE3F40000 + .4byte 0x0000E3F0 + .4byte 0xE3F3E3EE + .4byte 0x0000E3F1 + .4byte 0x96450000 + .4byte 0x00008CD3 + .4byte 0 + .4byte 0x88FBE3EF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E3F6 + .4byte 0x0000E3F7 + .4byte 0 + .4byte 0x93B70000 + .4byte 0 + .4byte 0x8BB90000 + .4byte 0 + .4byte 0xE445945C + .4byte 0 .global Ucs81 Ucs81: - .incbin "baserom.dol", 0x427540, 0x200 + .4byte 0 + .4byte 0x8E890000 + .4byte 0x00008BBA + .4byte 0x90C69865 + .4byte 0x96ACE3F5 + .4byte 0x90D20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B72E3F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E3FA + .4byte 0 + .4byte 0 + .4byte 0x0000E3F9 + .4byte 0 + .4byte 0 + .4byte 0x0000E3FB + .4byte 0x00009245 + .4byte 0x0000945D + .4byte 0 + .4byte 0 + .4byte 0x000092AF + .4byte 0 + .4byte 0 + .4byte 0xE4420000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4410000 + .4byte 0 + .4byte 0x0000E3FC + .4byte 0 + .4byte 0x90740000 + .4byte 0x9585E444 + .4byte 0x0000E443 + .4byte 0x8D6F9872 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E454 + .4byte 0 + .4byte 0 + .4byte 0x0000E448 + .4byte 0xE4490000 + .4byte 0 + .4byte 0x00008EEE + .4byte 0 + .4byte 0xE4470000 + .4byte 0x8D98E446 + .4byte 0 + .4byte 0xE44A0000 + .4byte 0 + .4byte 0x92B095A0 + .4byte 0x91420000 + .4byte 0 + .4byte 0x000091DA + .4byte 0xE44E0000 + .4byte 0xE44FE44B + .4byte 0 + .4byte 0 + .4byte 0xE44C0000 + .4byte 0xE44D0000 + .4byte 0 + .4byte 0x00008D70 + .4byte 0 + .4byte 0x0000E455 + .4byte 0x0000E451 + .4byte 0 + .4byte 0 + .4byte 0x95860000 + .4byte 0x968C9547 + .4byte 0 + .4byte 0xE4500000 + .4byte 0x0000E453 + .4byte 0xE4520000 + .4byte 0 + .4byte 0x9663E456 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4570000 + .4byte 0x00009156 + .4byte 0x0000E458 + .4byte 0 + .4byte 0xE45A0000 + .4byte 0xE45E0000 + .4byte 0x0000E45B + .4byte 0xE459945E + .4byte 0xE45C0000 + .4byte 0xE45D0000 + .4byte 0 + .4byte 0x89B00000 + .4byte 0xE464E45F + .4byte 0 + .4byte 0x0000E460 + .4byte 0 + .4byte 0x0000E461 + .4byte 0x0000919F + .4byte 0 + .4byte 0 + .4byte 0xE463E462 + .4byte 0xE4650000 + .4byte 0 + .4byte 0x0000E466 + .4byte 0xE4670000 + .4byte 0x00009062 + .4byte 0x000089E7 + .4byte 0x0000E468 + .4byte 0x97D50000 + .4byte 0x8EA90000 + .4byte 0x00008F4C + .4byte 0 + .4byte 0 + .4byte 0x00008E8A + .4byte 0x92760000 + .4byte 0 + .4byte 0 + .4byte 0xE469E46A + .4byte 0x89500000 + .4byte 0xE46B0000 .global Ucs82 Ucs82: - .incbin "baserom.dol", 0x427740, 0x200 + .4byte 0x0000E46C + .4byte 0xE46D0000 + .4byte 0x0000E46E + .4byte 0x0000E46F + .4byte 0x8BBB9DA8 + .4byte 0xE4700000 + .4byte 0x90E3E471 + .4byte 0x8EC90000 + .4byte 0xE4720000 + .4byte 0x98AE0000 + .4byte 0 + .4byte 0xE47395DC + .4byte 0x8ADA0000 + .4byte 0x00009143 + .4byte 0x8F770000 + .4byte 0x95918F4D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E474 + .4byte 0x8D71E475 + .4byte 0x94CA0000 + .4byte 0xE4840000 + .4byte 0 + .4byte 0x0000E477 + .4byte 0x000091C7 + .4byte 0x94958CBD + .4byte 0xE4769144 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4780000 + .4byte 0 + .4byte 0 + .4byte 0x000092F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE47AE479 + .4byte 0xE47C0000 + .4byte 0x0000E47B + .4byte 0x0000E47D + .4byte 0 + .4byte 0xE4800000 + .4byte 0xE47E0000 + .4byte 0x8ACD0000 + .4byte 0xE4810000 + .4byte 0xE482E483 + .4byte 0 + .4byte 0x8DAF97C7 + .4byte 0x0000E485 + .4byte 0x90460000 + .4byte 0 + .4byte 0x8990E486 + .4byte 0xE4870000 + .4byte 0 + .4byte 0 + .4byte 0xE4880000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088F0 + .4byte 0x0000E489 + .4byte 0 + .4byte 0 + .4byte 0xE48A0000 + .4byte 0 + .4byte 0 + .4byte 0x00009587 + .4byte 0 + .4byte 0x00008EC5 + .4byte 0x0000E48C + .4byte 0 + .4byte 0 + .4byte 0x00008A48 + .4byte 0x88B00000 + .4byte 0 + .4byte 0x0000E48B + .4byte 0xE48E946D + .4byte 0x00009063 + .4byte 0x000089D4 + .4byte 0x00009646 + .4byte 0 + .4byte 0 + .4byte 0x8C7C8BDA + .4byte 0x0000E48D + .4byte 0x000089E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008AA1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008991 + .4byte 0xE49297E8 + .4byte 0x91DB0000 + .4byte 0x00009563 + .4byte 0x0000E49E + .4byte 0x000089D5 + .4byte 0xE49C0000 + .4byte 0xE49AE491 + .4byte 0x0000E48F + .4byte 0x0000E490 + .4byte 0x00008EE1 + .4byte 0x8BEA9297 + .4byte 0 + .4byte 0x000093CF + .4byte 0 + .4byte 0 + .4byte 0x00008970 + .4byte 0x0000E494 + .4byte 0xE4930000 + .4byte 0 + .4byte 0x0000E499 + .4byte 0xE495E498 + .4byte 0 + .4byte 0 .global Ucs83 Ucs83: - .incbin "baserom.dol", 0x427940, 0x200 + .4byte 0 + .4byte 0x96CEE497 + .4byte 0x89D68A9D + .4byte 0xE49B0000 + .4byte 0x0000E49D + .4byte 0 + .4byte 0 + .4byte 0x8C730000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4A1E4AA + .4byte 0xE4AB0000 + .4byte 0 + .4byte 0x88A90000 + .4byte 0 + .4byte 0 + .4byte 0x0000E4B2 + .4byte 0 + .4byte 0 + .4byte 0x88EF0000 + .4byte 0x0000E4A9 + .4byte 0 + .4byte 0x0000E4A8 + .4byte 0x0000E4A3 + .4byte 0xE4A20000 + .4byte 0xE4A0E49F + .4byte 0x92830000 + .4byte 0x91F9E4A5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4A40000 + .4byte 0 + .4byte 0x0000E4A7 + .4byte 0 + .4byte 0x00009190 + .4byte 0x8C740000 + .4byte 0 + .4byte 0x00008960 + .4byte 0xE4A60000 + .4byte 0x8D720000 + .4byte 0 + .4byte 0 + .4byte 0x91910000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E4B8 + .4byte 0x0000E4B9 + .4byte 0x000089D7 + .4byte 0 + .4byte 0x000089AC + .4byte 0xE4B60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E4AC + .4byte 0x0000E4B4 + .4byte 0x0000E4BB + .4byte 0xE4B50000 + .4byte 0 + .4byte 0xE4B30000 + .4byte 0 + .4byte 0x0000E496 + .4byte 0 + .4byte 0xE4B10000 + .4byte 0 + .4byte 0xE4AD0000 + .4byte 0 + .4byte 0x8ACEE4AF + .4byte 0xE4BA0000 + .4byte 0xE4B00000 + .4byte 0 + .4byte 0 + .4byte 0xE4BC0000 + .4byte 0xE4AE949C + .4byte 0 + .4byte 0 + .4byte 0x00009789 + .4byte 0 + .4byte 0x0000E4B7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E4CD + .4byte 0 + .4byte 0x0000E4C5 + .4byte 0 + .4byte 0x0000909B + .4byte 0 + .4byte 0 + .4byte 0x8B650000 + .4byte 0x8BDB0000 + .4byte 0xE4C00000 + .4byte 0 + .4byte 0x000089D9 + .4byte 0 + .4byte 0x8FD20000 + .4byte 0xE4C30000 + .4byte 0 + .4byte 0x8DD80000 + .4byte 0x00009370 + .4byte 0xE4C80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095EC + .4byte 0x0000E4BF + .4byte 0 + .4byte 0x000089D8 + .4byte 0x8CD49548 + .4byte 0xE4C90000 + .4byte 0xE4BD0000 + .4byte 0x0000E4C6 + .4byte 0 + .4byte 0x0000E4D0 + .4byte 0x0000E4C1 + .4byte 0 .global Ucs84 Ucs84: - .incbin "baserom.dol", 0x427B40, 0x200 + .4byte 0 + .4byte 0x0000E4C2 + .4byte 0x93B80000 + .4byte 0x0000E4C7 + .4byte 0 + .4byte 0x0000E4C4 + .4byte 0x9647E4CA + .4byte 0x88DE0000 + .4byte 0 + .4byte 0x0000E4BE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4CC0000 + .4byte 0xE4CB0000 + .4byte 0 + .4byte 0 + .4byte 0x0000948B + .4byte 0xE4D20000 + .4byte 0xE4DD0000 + .4byte 0 + .4byte 0x00008A9E + .4byte 0 + .4byte 0x0000E4E0 + .4byte 0 + .4byte 0xE4CE0000 + .4byte 0 + .4byte 0xE4D3978E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4DC0000 + .4byte 0x00009774 + .4byte 0 + .4byte 0 + .4byte 0x97A80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009298 + .4byte 0 + .4byte 0x00008A8B + .4byte 0 + .4byte 0 + .4byte 0x00009592 + .4byte 0xE4E2939F + .4byte 0 + .4byte 0x88AF0000 + .4byte 0x0000E4DB + .4byte 0x0000E4D7 + .4byte 0x9192E4D1 + .4byte 0xE4D9E4DE + .4byte 0x0000944B + .4byte 0 + .4byte 0x000088A8 + .4byte 0x0000E4D6 + .4byte 0x0000E4DF + .4byte 0x95980000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4DA0000 + .4byte 0xE4D50000 + .4byte 0 + .4byte 0 + .4byte 0x00008FD3 + .4byte 0 + .4byte 0 + .4byte 0x8F4E0000 + .4byte 0 + .4byte 0x8EAA0000 + .4byte 0 + .4byte 0x000096D6 + .4byte 0 + .4byte 0x95660000 + .4byte 0x0000E4E5 + .4byte 0x0000E4EE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E4D8 + .4byte 0 + .4byte 0 + .4byte 0x8A970000 + .4byte 0 + .4byte 0 + .4byte 0x8FF6E4E3 + .4byte 0x0000E4E8 + .4byte 0x91930000 + .4byte 0x0000E4E4 + .4byte 0x0000E4EB + .4byte 0 + .4byte 0x927E0000 + .4byte 0xE4EC0000 + .4byte 0x00009775 + .4byte 0xE4E18A57 + .4byte 0x0000E4E7 + .4byte 0 + .4byte 0xE4EA96AA + .4byte 0 + .4byte 0 + .4byte 0xE4ED0000 + .4byte 0x0000E4E6 + .4byte 0xE4E90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96480000 + .4byte 0x98400000 + .4byte 0 + .4byte 0 + .4byte 0xE4F10000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE4F80000 + .4byte 0x0000E4F0 .global Ucs85 Ucs85: - .incbin "baserom.dol", 0x427D40, 0x200 + .4byte 0x8EC10000 + .4byte 0 + .4byte 0 + .4byte 0xE4CF0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095CC + .4byte 0x000096A0 + .4byte 0xE4F7E4F6 + .4byte 0x0000E4F2 + .4byte 0xE4F30000 + .4byte 0x89550000 + .4byte 0 + .4byte 0x0000E4F5 + .4byte 0x0000E4EF + .4byte 0 + .4byte 0 + .4byte 0x92D30000 + .4byte 0 + .4byte 0 + .4byte 0xE4F488FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095C1 + .4byte 0 + .4byte 0xE4F9E540 + .4byte 0x000094D7 + .4byte 0 + .4byte 0 + .4byte 0xE4FC8FD4 + .4byte 0x8EC7E542 + .4byte 0 + .4byte 0x8BBC0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E543 + .4byte 0x00009599 + .4byte 0xE4FB0000 + .4byte 0xE4D40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E4FA + .4byte 0 + .4byte 0 + .4byte 0x986E93A0 + .4byte 0x95930000 + .4byte 0x0000E54A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E550 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5510000 + .4byte 0xE5440000 + .4byte 0 + .4byte 0x94960000 + .4byte 0x0000E54E + .4byte 0xE5460000 + .4byte 0xE5480000 + .4byte 0 + .4byte 0 + .4byte 0xE552E547 + .4byte 0 + .4byte 0xE54B0000 + .4byte 0x00008992 + .4byte 0x000093E3 + .4byte 0x0000E54C + .4byte 0xE54F0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5450000 + .4byte 0x91450000 + .4byte 0xE5498E46 + .4byte 0x90648C4F + .4byte 0x96F20000 + .4byte 0x96F78F92 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E556 + .4byte 0xE5540000 + .4byte 0 + .4byte 0 + .4byte 0x0000986D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E553 + .4byte 0 + .4byte 0x00009795 + .4byte 0x0000E555 + .4byte 0xE5570000 + .4byte 0 + .4byte 0x0000E558 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE55BE559 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x93A1E55A + .4byte 0 + .4byte 0x000094CB + .4byte 0xE54D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008F93 + .4byte 0x0000E55C + .4byte 0xE5619194 + .4byte 0 + .4byte 0xE5600000 .global Ucs86 Ucs86: - .incbin "baserom.dol", 0x427F40, 0x200 + .4byte 0 + .4byte 0xE5410000 + .4byte 0 + .4byte 0xE5629168 + .4byte 0 + .4byte 0xE55DE55F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E55E + .4byte 0 + .4byte 0x9F509F41 + .4byte 0 + .4byte 0xE5640000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5630000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009796 + .4byte 0x0000E1BA + .4byte 0xE5650000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E566 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E567 + .4byte 0x8CD50000 + .4byte 0x8B730000 + .4byte 0 + .4byte 0xE569997C + .4byte 0 + .4byte 0 + .4byte 0x8B950000 + .4byte 0x97B80000 + .4byte 0x8BF1E56A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E56B + .4byte 0 + .4byte 0x0000928E + .4byte 0 + .4byte 0 + .4byte 0x0000E56C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000093F8 + .4byte 0x000088B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89E1E571 + .4byte 0xE5720000 + .4byte 0 + .4byte 0 + .4byte 0x0000E56D + .4byte 0x00008E5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E56E + .4byte 0x94610000 + .4byte 0 + .4byte 0x0000E56F + .4byte 0xE570E57A + .4byte 0 + .4byte 0x0000E574 + .4byte 0xE5770000 + .4byte 0 + .4byte 0 + .4byte 0xE5730000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5750000 + .4byte 0xE5768ED6 + .4byte 0x0000E578 + .4byte 0x00009260 + .4byte 0x00008C75 + .4byte 0x8A610000 + .4byte 0 + .4byte 0 + .4byte 0xE57B0000 + .4byte 0 + .4byte 0x00008A5E + .4byte 0x0000E581 + .4byte 0 + .4byte 0xE57CE580 + .4byte 0 + .4byte 0 + .4byte 0x94B80000 + .4byte 0 + .4byte 0x0000E57D + .4byte 0 + .4byte 0xE57E9567 + .4byte 0x94D8E582 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91FBE58C + .4byte 0x0000E588 + .4byte 0 + .4byte 0x89E90000 .global Ucs87 Ucs87: - .incbin "baserom.dol", 0x428140, 0x200 + .4byte 0xE5860000 + .4byte 0x9649E587 + .4byte 0 + .4byte 0xE5840000 + .4byte 0xE585E58A + .4byte 0xE58D0000 + .4byte 0x0000E58B + .4byte 0 + .4byte 0x0000E589 + .4byte 0xE5830000 + .4byte 0 + .4byte 0 + .4byte 0x92770000 + .4byte 0xE5940000 + .4byte 0x96A80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E592 + .4byte 0 + .4byte 0x0000E593 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE58E0000 + .4byte 0x0000E590 + .4byte 0 + .4byte 0x0000E591 + .4byte 0 + .4byte 0x0000E58F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000090E4 + .4byte 0x00009858 + .4byte 0xE5980000 + .4byte 0xE5990000 + .4byte 0 + .4byte 0x0000E59F + .4byte 0x00009049 + .4byte 0x0000E59B + .4byte 0x0000E59E + .4byte 0 + .4byte 0 + .4byte 0x0000E596 + .4byte 0xE5950000 + .4byte 0x0000E5A0 + .4byte 0 + .4byte 0x89DA0000 + .4byte 0xE59C0000 + .4byte 0xE5A10000 + .4byte 0 + .4byte 0xE59D0000 + .4byte 0 + .4byte 0 + .4byte 0xE59A0000 + .4byte 0x92B10000 + .4byte 0xE5970000 + .4byte 0 + .4byte 0 + .4byte 0x00009488 + .4byte 0 + .4byte 0xE5A50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000975A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5A4 + .4byte 0 + .4byte 0xE5A30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5AC + .4byte 0 + .4byte 0x0000E5A6 + .4byte 0 + .4byte 0x0000E5AE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9786E5B1 + .4byte 0x0000E5A8 + .4byte 0 + .4byte 0xE5A90000 + .4byte 0 + .4byte 0xE5AD0000 + .4byte 0xE5B0E5AF + .4byte 0 + .4byte 0x0000E5A7 + .4byte 0 + .4byte 0 + .4byte 0xE5AA0000 + .4byte 0xE5BB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5B40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5B2 + .4byte 0 + .4byte 0xE5B30000 + .4byte 0 + .4byte 0xE5B8E5B9 + .4byte 0x00008A49 + .4byte 0x00008B61 + .4byte 0 + .4byte 0xE5B70000 .global Ucs88 Ucs88: - .incbin "baserom.dol", 0x428340, 0x200 + .4byte 0 + .4byte 0 + .4byte 0x0000E5A2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5B6 + .4byte 0xE5BAE5B5 + .4byte 0x0000E5BC + .4byte 0 + .4byte 0x0000E5BE + .4byte 0xE5BD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5C0 + .4byte 0xE5BFE579 + .4byte 0 + .4byte 0x0000E5C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5C1 + .4byte 0 + .4byte 0 + .4byte 0xE5C20000 + .4byte 0x0000E5C3 + .4byte 0x0000E5C5 + .4byte 0 + .4byte 0 + .4byte 0x8C8C0000 + .4byte 0xE5C70000 + .4byte 0xE5C60000 + .4byte 0x8F4F0000 + .4byte 0 + .4byte 0 + .4byte 0x8D739FA5 + .4byte 0 + .4byte 0 + .4byte 0xE5C88F70 + .4byte 0 + .4byte 0x00008A58 + .4byte 0x0000E5C9 + .4byte 0x00008971 + .4byte 0x00008FD5 + .4byte 0xE5CA0000 + .4byte 0x00008D74 + .4byte 0xE5CB88DF + .4byte 0 + .4byte 0 + .4byte 0x955C0000 + .4byte 0x0000E5CC + .4byte 0 + .4byte 0 + .4byte 0x908A0000 + .4byte 0xE5D30000 + .4byte 0x0000E5D0 + .4byte 0x0000928F + .4byte 0 + .4byte 0 + .4byte 0x0000E5D1 + .4byte 0xE5CE8BDC + .4byte 0x0000E5CD + .4byte 0xE5D40000 + .4byte 0 + .4byte 0 + .4byte 0x8C550000 + .4byte 0x000091DC + .4byte 0x0000E5DA + .4byte 0 + .4byte 0 + .4byte 0xE5D60000 + .4byte 0 + .4byte 0x91B3E5D5 + .4byte 0x0000E5D8 + .4byte 0 + .4byte 0 + .4byte 0xE5CF0000 + .4byte 0 + .4byte 0xE5D90000 + .4byte 0xE5DB0000 + .4byte 0 + .4byte 0 + .4byte 0x000094ED + .4byte 0 + .4byte 0xE5D70000 + .4byte 0xE5DCE5DE + .4byte 0 + .4byte 0x8CD1E5D2 + .4byte 0x000088BF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5DD + .4byte 0x00008DD9 + .4byte 0x97F4E5DF + .4byte 0xE5E09195 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000097A0 + .4byte 0 + .4byte 0 + .4byte 0xE5E19754 + .4byte 0 + .4byte 0xE5E2E5E3 + .4byte 0 + .4byte 0x95E2E5E4 + .4byte 0x00008DBE + .4byte 0x000097A1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5E90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5EA8FD6 + .4byte 0xE5E80000 + .4byte 0 + .4byte 0x9787E5E5 + .4byte 0 + .4byte 0xE5E790BB + .4byte 0x909E0000 .global Ucs89 Ucs89: - .incbin "baserom.dol", 0x428540, 0x200 + .4byte 0 + .4byte 0xE5E60000 + .4byte 0xE5EB0000 + .4byte 0x000095A1 + .4byte 0 + .4byte 0xE5ED0000 + .4byte 0xE5EC0000 + .4byte 0 + .4byte 0x8A8C0000 + .4byte 0x964AE5EE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E5FA + .4byte 0xE5F00000 + .4byte 0 + .4byte 0 + .4byte 0x0000E5F1 + .4byte 0 + .4byte 0 + .4byte 0xE5F2E5F3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5F70000 + .4byte 0xE5F80000 + .4byte 0x0000E5F6 + .4byte 0 + .4byte 0 + .4byte 0x0000E5F4 + .4byte 0x0000E5EF + .4byte 0xE5F50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5F9E8B5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x89A60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE5FC8BDD + .4byte 0xE5FB0000 + .4byte 0 + .4byte 0xE6410000 + .4byte 0xE6400000 + .4byte 0 + .4byte 0xE6430000 + .4byte 0x0000E642 + .4byte 0x0000E644 + .4byte 0 + .4byte 0x8F500000 + .4byte 0xE6450000 + .4byte 0x0000E646 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE64790BC + .4byte 0x00009776 + .4byte 0x0000E648 + .4byte 0 + .4byte 0x95A29465 + .4byte 0xE6490000 + .4byte 0xE64A8CA9 + .4byte 0 + .4byte 0x00008B4B + .4byte 0 + .4byte 0x0000E64B + .4byte 0 + .4byte 0x8E8B9460 + .4byte 0xE64C0000 + .4byte 0x8A6F0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E64D + .4byte 0 + .4byte 0 + .4byte 0xE64F9797 + .4byte 0x0000E64E + .4byte 0x90650000 + .4byte 0xE6500000 + .4byte 0x0000E651 + .4byte 0 + .4byte 0xE6528ACF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6530000 + .4byte 0x0000E654 + .4byte 0x0000E655 + .4byte 0xE6560000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8A700000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6570000 + .4byte 0xE658E659 + .4byte 0 + .4byte 0 + .4byte 0x000089F0 + .4byte 0 + .4byte 0x9047E65A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE65B0000 + .4byte 0 + .4byte 0xE65C0000 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs8A Ucs8A: - .incbin "baserom.dol", 0x428740, 0x200 + .4byte 0x8CBE0000 + .4byte 0x92F9E65D + .4byte 0 + .4byte 0 + .4byte 0x8C760000 + .4byte 0x90750000 + .4byte 0xE6600000 + .4byte 0x93A20000 + .4byte 0xE65F0000 + .4byte 0x00008C50 + .4byte 0 + .4byte 0xE65E91F5 + .4byte 0x8B4C0000 + .4byte 0x0000E661 + .4byte 0x0000E662 + .4byte 0x00008FD7 + .4byte 0 + .4byte 0x00008C8D + .4byte 0x0000E663 + .4byte 0 + .4byte 0 + .4byte 0x964B0000 + .4byte 0x000090DD + .4byte 0 + .4byte 0x00008B96 + .4byte 0x000096F3 + .4byte 0x91690000 + .4byte 0xE6640000 + .4byte 0 + .4byte 0x90669290 + .4byte 0x8FD80000 + .4byte 0 + .4byte 0x0000E665 + .4byte 0 + .4byte 0 + .4byte 0xE6680000 + .4byte 0xE6690000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8DBC91C0 + .4byte 0xE6670000 + .4byte 0x8FD9955D + .4byte 0 + .4byte 0 + .4byte 0x0000E666 + .4byte 0 + .4byte 0x8E8C0000 + .4byte 0x89720000 + .4byte 0xE66D8C77 + .4byte 0 + .4byte 0x8E8E0000 + .4byte 0x00008E8D + .4byte 0x0000986C + .4byte 0xE66CE66B + .4byte 0x91460000 + .4byte 0x8B6C9862 + .4byte 0x8A598FDA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE66A0000 + .4byte 0 + .4byte 0 + .4byte 0xE66F0000 + .4byte 0xE670E66E + .4byte 0x00008CD6 + .4byte 0x0000975F + .4byte 0 + .4byte 0x8E8F9446 + .4byte 0 + .4byte 0x0000E673 + .4byte 0x000090BE + .4byte 0x00009261 + .4byte 0 + .4byte 0x97550000 + .4byte 0xE6760000 + .4byte 0 + .4byte 0x8CEA0000 + .4byte 0x90BDE672 + .4byte 0x0000E677 + .4byte 0x8CEBE674 + .4byte 0xE6750000 + .4byte 0xE6710000 + .4byte 0 + .4byte 0x90E093C7 + .4byte 0 + .4byte 0x924E0000 + .4byte 0x89DB0000 + .4byte 0 + .4byte 0 + .4byte 0x000094EE + .4byte 0 + .4byte 0x8B620000 + .4byte 0x000092B2 + .4byte 0 + .4byte 0xE67A0000 + .4byte 0xE6780000 + .4byte 0x0000926B + .4byte 0 + .4byte 0x000090BF + .4byte 0x8AD0E679 + .4byte 0x0000907A + .4byte 0 + .4byte 0x97C80000 + .4byte 0 + .4byte 0x985F0000 + .4byte 0 + .4byte 0xE67BE687 + .4byte 0x92B30000 + .4byte 0xE6860000 + .4byte 0xE683E68B + .4byte 0xE6840000 + .4byte 0xE6800000 + .4byte 0x92FAE67E + .4byte 0 + .4byte 0x0000E67C + .4byte 0x00009740 + .4byte 0x8E900000 + .4byte 0x0000E681 + .4byte 0x0000E67D + .4byte 0 + .4byte 0x0000E685 + .4byte 0x8F940000 + .4byte 0x8CBF0000 + .4byte 0 + .4byte 0x91F80000 .global Ucs8B Ucs8B: - .incbin "baserom.dol", 0x428940, 0x200 + .4byte 0x96648979 + .4byte 0x88E00000 + .4byte 0x93A30000 + .4byte 0x0000E689 + .4byte 0 + .4byte 0 + .4byte 0xE6880000 + .4byte 0x93E40000 + .4byte 0xE68D0000 + .4byte 0 + .4byte 0xE6820000 + .4byte 0xE68CE68E + .4byte 0x00008CAA + .4byte 0xE68A8D75 + .4byte 0x00008ED3 + .4byte 0 + .4byte 0xE68F9777 + .4byte 0 + .4byte 0 + .4byte 0xE6920000 + .4byte 0xE6950000 + .4byte 0x0000E693 + .4byte 0x95540000 + .4byte 0 + .4byte 0 + .4byte 0x0000E690 + .4byte 0 + .4byte 0 + .4byte 0x00008BDE + .4byte 0 + .4byte 0 + .4byte 0xE6940000 + .4byte 0x0000E696 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E69A + .4byte 0 + .4byte 0xE6970000 + .4byte 0xE699E698 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE69B0000 + .4byte 0x8EAF0000 + .4byte 0xE69DE69C + .4byte 0x95880000 + .4byte 0x0000E69F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C780000 + .4byte 0 + .4byte 0x0000E69E + .4byte 0xE6A00000 + .4byte 0x0000E6A1 + .4byte 0x8B63E3BF + .4byte 0x8FF70000 + .4byte 0xE6A20000 + .4byte 0x00008CEC + .4byte 0 + .4byte 0 + .4byte 0x0000E6A3 + .4byte 0 + .4byte 0xE6A40000 + .4byte 0x00008E5D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9DCC0000 + .4byte 0xE6A50000 + .4byte 0xE6A60000 + .4byte 0x8F510000 + .4byte 0xE6A7E6A8 + .4byte 0 + .4byte 0xE6A90000 + .4byte 0x0000E6AA + .4byte 0xE6AB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs8C Ucs8C: - .incbin "baserom.dol", 0x428B40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000924A + .4byte 0 + .4byte 0xE6AC0000 + .4byte 0 + .4byte 0x0000E6AE + .4byte 0x0000E6AD + .4byte 0 + .4byte 0 + .4byte 0x93A40000 + .4byte 0xE6AF0000 + .4byte 0x964C0000 + .4byte 0xE6B00000 + .4byte 0xE6B10000 + .4byte 0xE6B20000 + .4byte 0 + .4byte 0x0000E6B3 + .4byte 0 + .4byte 0 + .4byte 0x93D80000 + .4byte 0 + .4byte 0 + .4byte 0x00008FDB + .4byte 0xE6B40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8D8B98AC + .4byte 0xE6B50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6B6955E + .4byte 0xE6B70000 + .4byte 0xE6BF0000 + .4byte 0 + .4byte 0 + .4byte 0xE6B80000 + .4byte 0x0000E6BA + .4byte 0 + .4byte 0x0000E6B9 + .4byte 0xE6BB0000 + .4byte 0x9665E6BC + .4byte 0xE6BD0000 + .4byte 0 + .4byte 0 + .4byte 0xE6BE0000 + .4byte 0 + .4byte 0xE6C00000 + .4byte 0 + .4byte 0x00008A4C + .4byte 0x92E50000 + .4byte 0x95898DE0 + .4byte 0x8D760000 + .4byte 0 + .4byte 0x0000956E + .4byte 0x89DD94CC + .4byte 0xE6C38AD1 + .4byte 0x90D3E6C2 + .4byte 0xE6C79299 + .4byte 0x96E10000 + .4byte 0xE6C5E6C6 + .4byte 0x8B4D0000 + .4byte 0xE6C89483 + .4byte 0x91DD0000 + .4byte 0x000094EF + .4byte 0x935CE6C4 + .4byte 0x00009666 + .4byte 0x89EAE6CA + .4byte 0x984792C0 + .4byte 0x98640000 + .4byte 0x00008E91 + .4byte 0xE6C90000 + .4byte 0x91AF0000 + .4byte 0x0000E6DA + .4byte 0x91470000 + .4byte 0x000093F6 + .4byte 0x0000956F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6CD8E5E + .4byte 0x8E920000 + .4byte 0x8FDC0000 + .4byte 0x94850000 + .4byte 0x8CABE6CC + .4byte 0xE6CB0000 + .4byte 0x958A0000 + .4byte 0 + .4byte 0x8EBF0000 + .4byte 0x00009371 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6CFE6D0 + .4byte 0x8D77E6CE + .4byte 0 .global Ucs8D Ucs8D: - .incbin "baserom.dol", 0x428D40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0xE6D1E6D2 + .4byte 0x0000E6D4 + .4byte 0x91A10000 + .4byte 0xE6D38AE4 + .4byte 0x0000E6D6 + .4byte 0x0000E6D5 + .4byte 0xE6D70000 + .4byte 0x0000E6D9 + .4byte 0xE6DB0000 + .4byte 0xE6DC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90D40000 + .4byte 0x8ECDE6DD + .4byte 0 + .4byte 0x00008A71 + .4byte 0x0000E6DE + .4byte 0 + .4byte 0x9196E6DF + .4byte 0x0000E6E0 + .4byte 0x958B0000 + .4byte 0x00008B4E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E6E1 + .4byte 0 + .4byte 0x000092B4 + .4byte 0 + .4byte 0 + .4byte 0x897A0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E6E2 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008EEF + .4byte 0 + .4byte 0 + .4byte 0x90960000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000091AB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6E50000 + .4byte 0 + .4byte 0xE6E40000 + .4byte 0 + .4byte 0xE6E30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E6EB + .4byte 0xE6E90000 + .4byte 0x0000E6E6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6E80000 + .4byte 0 + .4byte 0xE6E7E6EA + .4byte 0x00008B97 + .4byte 0x0000E6EE + .4byte 0x000090D5 + .4byte 0x0000E6EF + .4byte 0 + .4byte 0 + .4byte 0x8CD70000 + .4byte 0xE6ECE6ED + .4byte 0 + .4byte 0x00009848 + .4byte 0 + .4byte 0x000092B5 + .4byte 0x00009148 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6F00000 + .4byte 0x0000E6F3 .global Ucs8E Ucs8E: - .incbin "baserom.dol", 0x428F40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6F1E6F2 + .4byte 0x97780000 + .4byte 0 + .4byte 0x000093A5 + .4byte 0xE6F60000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E6F4 + .4byte 0xE6F5E6F7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7480000 + .4byte 0 + .4byte 0 + .4byte 0xE6FA0000 + .4byte 0 + .4byte 0xE6FBE6F9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE6F80000 + .4byte 0x92FB0000 + .4byte 0x0000E740 + .4byte 0xE744E741 + .4byte 0xE6FC0000 + .4byte 0xE7420000 + .4byte 0 + .4byte 0xE7430000 + .4byte 0 + .4byte 0x0000E74A + .4byte 0 + .4byte 0x0000E745 + .4byte 0 + .4byte 0 + .4byte 0x000090D6 + .4byte 0xE7470000 + .4byte 0x0000E749 + .4byte 0xE7460000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE74C0000 + .4byte 0x8F520000 + .4byte 0xE74B0000 + .4byte 0 + .4byte 0 + .4byte 0xE74D0000 + .4byte 0 + .4byte 0x0000E74E + .4byte 0 + .4byte 0xE751E750 + .4byte 0x0000E74F + .4byte 0 + .4byte 0xE753E752 + .4byte 0x000096F4 + .4byte 0 + .4byte 0x0000E755 + .4byte 0x0000E754 + .4byte 0xE7560000 + .4byte 0 + .4byte 0x0000E757 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E759 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7589067 + .4byte 0xE75A0000 + .4byte 0x00008BEB + .4byte 0xE75BE75D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE75E0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E75F + .4byte 0xE75C0000 + .4byte 0xE7600000 + .4byte 0x8ED4E761 + .4byte 0x8B4F8C52 + .4byte 0 + .4byte 0 + .4byte 0x8CAC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E762 + .4byte 0 + .4byte 0x000093EE + .4byte 0 + .4byte 0x935DE763 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E766 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EB20000 + .4byte 0x0000E765 + .4byte 0xE7648C79 + .4byte 0xE7670000 .global Ucs8F Ucs8F: - .incbin "baserom.dol", 0x429140, 0x200 + .4byte 0 + .4byte 0x00008A72 + .4byte 0x0000E769 + .4byte 0 + .4byte 0x00008DDA + .4byte 0xE7680000 + .4byte 0xE7710000 + .4byte 0 + .4byte 0 + .4byte 0xE76BE76D + .4byte 0x95E3E76A + .4byte 0 + .4byte 0x0000E76C + .4byte 0x0000E770 + .4byte 0xE76E8B50 + .4byte 0x0000E76F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7720000 + .4byte 0x00009479 + .4byte 0x97D60000 + .4byte 0 + .4byte 0x00008F53 + .4byte 0 + .4byte 0x0000E773 + .4byte 0 + .4byte 0 + .4byte 0x9741E775 + .4byte 0x0000E774 + .4byte 0 + .4byte 0xE7789760 + .4byte 0 + .4byte 0xE7770000 + .4byte 0x8A8DE776 + .4byte 0xE77B0000 + .4byte 0x0000E77A + .4byte 0 + .4byte 0xE7799351 + .4byte 0xE77C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E77D + .4byte 0 + .4byte 0 + .4byte 0xE77E0000 + .4byte 0x00008D8C + .4byte 0x00008C44 + .4byte 0xE780E781 + .4byte 0xE7820000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009068 + .4byte 0xE7830000 + .4byte 0x8EABE784 + .4byte 0 + .4byte 0x0000E785 + .4byte 0 + .4byte 0x0000999F + .4byte 0x999E0000 + .4byte 0 + .4byte 0x0000E786 + .4byte 0xE390E787 + .4byte 0x9243904A + .4byte 0x945F0000 + .4byte 0 + .4byte 0x0000E788 + .4byte 0 + .4byte 0x95D392D2 + .4byte 0x8D9E0000 + .4byte 0x00009248 + .4byte 0 + .4byte 0x89490000 + .4byte 0x96989076 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C7D0000 + .4byte 0x00008BDF + .4byte 0 + .4byte 0x95D40000 + .4byte 0 + .4byte 0 + .4byte 0xE7890000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE78B0000 + .4byte 0x0000E78A + .4byte 0x89DE0000 + .4byte 0x000093F4 + .4byte 0xE78C9497 + .4byte 0x00009352 + .4byte 0x0000E78D + .4byte 0x8F710000 + .4byte 0 + .4byte 0xE78F0000 + .4byte 0x000096C0 + .4byte 0xE79EE791 + .4byte 0xE7920000 + .4byte 0x000092C7 + .4byte 0 .global Ucs90 Ucs90: - .incbin "baserom.dol", 0x429340, 0x200 + .4byte 0x91DE9197 + .4byte 0x000093A6 + .4byte 0x0000E790 + .4byte 0x8B740000 + .4byte 0 + .4byte 0x0000E799 + .4byte 0x0000E796 + .4byte 0xE7A393A7 + .4byte 0x9280E793 + .4byte 0x000092FC + .4byte 0x9372E794 + .4byte 0xE7989080 + .4byte 0x00009487 + .4byte 0x92CA0000 + .4byte 0x000090C0 + .4byte 0xE79791AC + .4byte 0x91A2E795 + .4byte 0x88A79841 + .4byte 0 + .4byte 0x0000E79A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91DF0000 + .4byte 0x00008F54 + .4byte 0x90690000 + .4byte 0x0000E79C + .4byte 0xE79B0000 + .4byte 0x88EDE79D + .4byte 0 + .4byte 0x954E0000 + .4byte 0xE7A50000 + .4byte 0x000093D9 + .4byte 0x908B0000 + .4byte 0x00009278 + .4byte 0x00008BF6 + .4byte 0x0000E7A4 + .4byte 0x9756895E + .4byte 0x000095D5 + .4byte 0x89DFE79F + .4byte 0xE7A0E7A1 + .4byte 0xE7A293B9 + .4byte 0x924288E1 + .4byte 0xE7A60000 + .4byte 0xE7A7EAA1 + .4byte 0 + .4byte 0x91BB0000 + .4byte 0xE7A80000 + .4byte 0x8993916B + .4byte 0x00008CAD + .4byte 0x00009779 + .4byte 0 + .4byte 0xE7A9934B + .4byte 0 + .4byte 0x00009198 + .4byte 0x8ED5E7AA + .4byte 0 + .4byte 0xE7AD0000 + .4byte 0x00008F85 + .4byte 0xE7AB914A + .4byte 0x91490000 + .4byte 0x88E20000 + .4byte 0x97C9E7AF + .4byte 0x000094F0 + .4byte 0xE7B1E7B0 + .4byte 0xE7AEE284 + .4byte 0x8AD20000 + .4byte 0x0000E78E + .4byte 0x0000E7B3 + .4byte 0xE7B20000 + .4byte 0 + .4byte 0x0000E7B4 + .4byte 0x00009757 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000093DF + .4byte 0 + .4byte 0x964D0000 + .4byte 0xE7B50000 + .4byte 0x8ED70000 + .4byte 0 + .4byte 0x0000E7B6 + .4byte 0x0000E7B7 + .4byte 0 + .4byte 0x0000E7B8 + .4byte 0 + .4byte 0x93400000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000088E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8D780000 + .4byte 0 + .4byte 0x98590000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7BC + .4byte 0 + .4byte 0 + .4byte 0x00008C53 + .4byte 0xE7B90000 + .4byte 0xE7BA0000 + .4byte 0 + .4byte 0x95940000 + .4byte 0 + .4byte 0x00008A73 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009758 + .4byte 0x00008BBD + .4byte 0 + .4byte 0 + .4byte 0x00009373 + .4byte 0 .global Ucs91 Ucs91: - .incbin "baserom.dol", 0x429540, 0x200 + .4byte 0 + .4byte 0xE7BD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7BE0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E7BF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009341 + .4byte 0 + .4byte 0xE7C10000 + .4byte 0xE7C00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000093D1 + .4byte 0xE7C28F55 + .4byte 0x8EDE947A + .4byte 0x92910000 + .4byte 0 + .4byte 0x8EF00000 + .4byte 0x908C0000 + .4byte 0xE7C30000 + .4byte 0xE7C40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x907CE7C5 + .4byte 0x0000E7C6 + .4byte 0 + .4byte 0x0000E7C7 + .4byte 0x978F0000 + .4byte 0x8F560000 + .4byte 0 + .4byte 0 + .4byte 0xE7C9E7C8 + .4byte 0x00008D79 + .4byte 0x00008D93 + .4byte 0x8E5F0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7CC0000 + .4byte 0 + .4byte 0x00008F86 + .4byte 0x0000E7CB + .4byte 0x0000E7CA + .4byte 0x000091E7 + .4byte 0 + .4byte 0x8CED0000 + .4byte 0x90C10000 + .4byte 0 + .4byte 0x000094AE + .4byte 0 + .4byte 0 + .4byte 0x8F580000 + .4byte 0 + .4byte 0 + .4byte 0xE7CD0000 + .4byte 0x8FDD0000 + .4byte 0 + .4byte 0 + .4byte 0xE7D0E7CE + .4byte 0 + .4byte 0x0000E7CF + .4byte 0 + .4byte 0 + .4byte 0xE7D2E7D1 + .4byte 0 + .4byte 0x8FF80000 + .4byte 0xE7D30000 + .4byte 0 + .4byte 0 + .4byte 0xE7D4E7D5 + .4byte 0 + .4byte 0 + .4byte 0x94CE8DD1 + .4byte 0x8EDFE7D6 + .4byte 0x0000E7D7 + .4byte 0x97A28F64 + .4byte 0x96EC97CA + .4byte 0xE7D88BE0 + .4byte 0 + .4byte 0 + .4byte 0xE7D90000 + .4byte 0x93420000 + .4byte 0x0000E7DC + .4byte 0x8A98906A + .4byte 0x0000E7DA + .4byte 0x0000E7DB + .4byte 0x000092DE + .4byte 0 + .4byte 0x96748BFA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7DE + .4byte 0xE7DF0000 + .4byte 0 + .4byte 0 + .4byte 0xE7DD0000 + .4byte 0x0000E7E1 .global Ucs92 Ucs92: - .incbin "baserom.dol", 0x429740, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000093DD + .4byte 0x8A620000 + .4byte 0x0000E7E5 + .4byte 0 + .4byte 0xE7E2E7E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7E00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E86E + .4byte 0 + .4byte 0xE7E30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x97E90000 + .4byte 0x00008CD8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7ED + .4byte 0 + .4byte 0 + .4byte 0x9353E7E8 + .4byte 0 + .4byte 0xE7EBE7E9 + .4byte 0x0000E7EE + .4byte 0 + .4byte 0 + .4byte 0xE7EF0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E7E7 + .4byte 0 + .4byte 0xE7F48994 + .4byte 0 + .4byte 0xE7E60000 + .4byte 0 + .4byte 0x94AB0000 + .4byte 0xE7EA0000 + .4byte 0x8FDE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008D7A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96670000 + .4byte 0x8BE20000 + .4byte 0x00008F65 + .4byte 0x000093BA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000914C + .4byte 0x0000E7F2 + .4byte 0x0000E7EC + .4byte 0xE7F10000 + .4byte 0x96C10000 + .4byte 0x92B6E7F3 + .4byte 0xE7F00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000914B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7F7 + .4byte 0x0000E7F6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7F5 + .4byte 0 + .4byte 0x964E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8F9B0000 + .4byte 0 + .4byte 0x0000E7F8 + .4byte 0x95DD0000 + .4byte 0x00008973 + .4byte 0 + .4byte 0 + .4byte 0x95659292 + .4byte 0 + .4byte 0 + .4byte 0x8B980000 + .4byte 0xE7FA0000 + .4byte 0x8D7C0000 + .4byte 0 .global Ucs93 Ucs93: - .incbin "baserom.dol", 0x429940, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E4B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E7F9 + .4byte 0x908D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x908EE840 + .4byte 0xE8420000 + .4byte 0 + .4byte 0 + .4byte 0x8FF90000 + .4byte 0xE841E843 + .4byte 0 + .4byte 0x8BD10000 + .4byte 0x95640000 + .4byte 0x00008EE0 + .4byte 0x98420000 + .4byte 0xE7FC8DF6 + .4byte 0 + .4byte 0x985E0000 + .4byte 0x0000E845 + .4byte 0 + .4byte 0 + .4byte 0xE844E846 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE7FB0000 + .4byte 0 + .4byte 0 + .4byte 0x000093E7 + .4byte 0x00009374 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x92D50000 + .4byte 0xE84B0000 + .4byte 0 + .4byte 0x00009262 + .4byte 0xE8470000 + .4byte 0 + .4byte 0xE8480000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8C4C0000 + .4byte 0xE84A0000 + .4byte 0 + .4byte 0 + .4byte 0x00008CAE + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8490000 + .4byte 0x8FDF0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8A990000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE84F0000 + .4byte 0x8DBD9199 + .4byte 0 + .4byte 0x92C80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008A5A + .4byte 0 + .4byte 0 + .4byte 0xE84DE84E + .4byte 0x92C10000 + .4byte 0xE84C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E850 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E856 + .4byte 0 + .4byte 0 + .4byte 0xE8590000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE858934C + .4byte 0 + .4byte 0 + .4byte 0xE851E852 + .4byte 0xE8550000 + .4byte 0 + .4byte 0x0000E857 + .4byte 0 + .4byte 0x00008BBE + .4byte 0 + .4byte 0xE85AE854 + .4byte 0 + .4byte 0xE8530000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs94 Ucs94: - .incbin "baserom.dol", 0x429B40, 0x200 + .4byte 0 + .4byte 0x0000E85E + .4byte 0 + .4byte 0x0000E85F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8600000 + .4byte 0x0000E85D + .4byte 0xE85C0000 + .4byte 0 + .4byte 0x8FE093A8 + .4byte 0xE85B0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E864 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E862 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E863 + .4byte 0xE8610000 + .4byte 0x91F60000 + .4byte 0xE8650000 + .4byte 0 + .4byte 0 + .4byte 0x0000E866 + .4byte 0 + .4byte 0xE8680000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008AD3 + .4byte 0xE86796F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE873E869 + .4byte 0 + .4byte 0xE86C0000 + .4byte 0xE86A0000 + .4byte 0xE86B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE86D0000 + .4byte 0 + .4byte 0 + .4byte 0xE86F0000 + .4byte 0 + .4byte 0x0000E870 + .4byte 0x0000E871 + .4byte 0 + .4byte 0 + .4byte 0xE874E872 + .4byte 0xE875E877 + .4byte 0x0000E876 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs95 Ucs95: - .incbin "baserom.dol", 0x429D40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000092B7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96E50000 + .4byte 0xE878914D + .4byte 0 + .4byte 0x0000E879 + .4byte 0x000095C2 + .4byte 0xE87A8A4A + .4byte 0 + .4byte 0x0000895B + .4byte 0x00008AD5 + .4byte 0x00008AD4 + .4byte 0xE87B0000 + .4byte 0xE87C0000 + .4byte 0xE87DE87E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8800000 + .4byte 0x8AD68A74 + .4byte 0x8D7D94B4 + .4byte 0x0000E882 + .4byte 0xE8810000 + .4byte 0 + .4byte 0x0000E883 + .4byte 0 + .4byte 0 + .4byte 0x897B0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E886 + .4byte 0x0000E885 + .4byte 0xE8840000 + .4byte 0xE8870000 + .4byte 0 + .4byte 0x0000E88A + .4byte 0 + .4byte 0x000088C5 + .4byte 0 + .4byte 0xE8880000 + .4byte 0xE88CE88B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE88EE88D + .4byte 0xE88F0000 + .4byte 0x93AC0000 + .4byte 0 + .4byte 0xE8900000 + .4byte 0 + .4byte 0x0000E891 + .4byte 0xE8930000 + .4byte 0x0000E892 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs96 Ucs96: - .incbin "baserom.dol", 0x429F40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x958C0000 + .4byte 0 + .4byte 0x0000E894 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8950000 + .4byte 0x8DE30000 + .4byte 0 + .4byte 0xE896E897 + .4byte 0 + .4byte 0x96680000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000916A + .4byte 0 + .4byte 0x000088A2 + .4byte 0x91C90000 + .4byte 0xE8980000 + .4byte 0x958D0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E89B + .4byte 0xE8998D7E + .4byte 0x0000E89A + .4byte 0x8CC00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000095C3 + .4byte 0xE89DE89F + .4byte 0xE89EE8A0 + .4byte 0 + .4byte 0x89409077 + .4byte 0x8F9C8AD7 + .4byte 0xE8A10000 + .4byte 0 + .4byte 0x94860000 + .4byte 0xE8A30000 + .4byte 0 + .4byte 0x89410000 + .4byte 0xE8A292C2 + .4byte 0x000097CB + .4byte 0x93A9E89C + .4byte 0x97A40000 + .4byte 0x8CAF0000 + .4byte 0x0000977A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008BF7 + .4byte 0x97B20000 + .4byte 0x8C470000 + .4byte 0x91E0E440 + .4byte 0x0000E8A4 + .4byte 0x8A4B908F + .4byte 0 + .4byte 0 + .4byte 0x8A75E8A6 + .4byte 0x0000E8A7 + .4byte 0xE8A58C84 + .4byte 0x00008DDB + .4byte 0x8FE10000 + .4byte 0 + .4byte 0x89420000 + .4byte 0x000097D7 + .4byte 0 + .4byte 0x0000E8A9 + .4byte 0xE7AC0000 + .4byte 0xE8A80000 + .4byte 0 + .4byte 0 + .4byte 0xE8ACE8AA + .4byte 0xE8AB0000 + .4byte 0xE8AD0000 + .4byte 0xE8AE97EA + .4byte 0xE8AFE8B0 + .4byte 0x000090C7 + .4byte 0x94B90000 + .4byte 0 + .4byte 0x909D8AE5 + .4byte 0 + .4byte 0x975989EB + .4byte 0x8F578CD9 + .4byte 0x0000E8B3 + .4byte 0x0000E8B2 + .4byte 0x8E93E8B4 + .4byte 0xE8B10000 + .4byte 0x00008E47 + .4byte 0 + .4byte 0x0000E8B8 + .4byte 0xE5AB0000 + .4byte 0x000099D4 + .4byte 0x00009097 + .4byte 0xE8B60000 + .4byte 0 + .4byte 0 + .4byte 0x97A393EF + .4byte 0 + .4byte 0 + .4byte 0x894A0000 + .4byte 0x90E18EB4 + .4byte 0 + .4byte 0 + .4byte 0x95B50000 + .4byte 0x895F0000 + .4byte 0 + .4byte 0x97EB978B + .4byte 0x0000E8B9 + .4byte 0x00009364 + .4byte 0 + .4byte 0 .global Ucs97 Ucs97: - .incbin "baserom.dol", 0x42A140, 0x200 + .4byte 0x8EF90000 + .4byte 0 + .4byte 0xE8BA0000 + .4byte 0xE8BB906B + .4byte 0xE8BC0000 + .4byte 0x97EC0000 + .4byte 0x0000E8B7 + .4byte 0xE8BEE8C0 + .4byte 0x0000E8BF + .4byte 0x0000E8BD + .4byte 0 + .4byte 0xE8C10000 + .4byte 0x0000E8C2 + .4byte 0 + .4byte 0x919A0000 + .4byte 0x89E00000 + .4byte 0 + .4byte 0 + .4byte 0xE8C30000 + .4byte 0x000096B6 + .4byte 0 + .4byte 0xE8C40000 + .4byte 0 + .4byte 0 + .4byte 0xE8C50000 + .4byte 0x98490000 + .4byte 0 + .4byte 0 + .4byte 0x9E50E8C6 + .4byte 0 + .4byte 0x0000E8C7 + .4byte 0xE8C80000 + .4byte 0 + .4byte 0xE8CC0000 + .4byte 0xE8C90000 + .4byte 0xE8CA0000 + .4byte 0xE8CBE8CD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x90C20000 + .4byte 0 + .4byte 0x96F50000 + .4byte 0x000090C3 + .4byte 0 + .4byte 0xE8CE0000 + .4byte 0x94F10000 + .4byte 0xE8CFEA72 + .4byte 0x96CA0000 + .4byte 0xE8D00000 + .4byte 0xE8D10000 + .4byte 0xE8D28A76 + .4byte 0x0000E8D4 + .4byte 0x00009078 + .4byte 0 + .4byte 0x0000E8D5 + .4byte 0 + .4byte 0x8C430000 + .4byte 0 + .4byte 0x0000E8D6 + .4byte 0xE8DA0000 + .4byte 0xE8D80000 + .4byte 0 + .4byte 0x0000E8D9 + .4byte 0 + .4byte 0x8A93E8D7 + .4byte 0xE8DB0000 + .4byte 0 + .4byte 0x0000E8DC + .4byte 0x000088C6 + .4byte 0x0000E8DD + .4byte 0xE8DE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8FE20000 + .4byte 0 + .4byte 0xE8DF0000 + .4byte 0 + .4byte 0x8B660000 + .4byte 0x0000E8E2 + .4byte 0 + .4byte 0xE8E10000 + .4byte 0xE8E00000 + .4byte 0x0000E691 + .4byte 0x000095DA + .4byte 0 + .4byte 0 + .4byte 0x0000E8E3 + .4byte 0xE8E40000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E8E5 + .4byte 0 + .4byte 0xE8E60000 + .4byte 0xE8E70000 + .4byte 0x0000E8E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008AD8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8E90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E8EA + .4byte 0x94420000 + .4byte 0 + .4byte 0xE8EC89B9 + .4byte 0x0000E8EF + .4byte 0xE8EE0000 + .4byte 0 + .4byte 0x00008943 + .4byte 0 + .4byte 0x00008BBF .global Ucs98 Ucs98: - .incbin "baserom.dol", 0x42A340, 0x200 + .4byte 0x000095C5 + .4byte 0x92B88DA0 + .4byte 0x00008D80 + .4byte 0x8F870000 + .4byte 0x907B0000 + .4byte 0 + .4byte 0xE8F10000 + .4byte 0x0000E8F0 + .4byte 0x97618AE6 + .4byte 0x94D093DA + .4byte 0 + .4byte 0x0000909C + .4byte 0x97CC0000 + .4byte 0x8C7A0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E8F4 + .4byte 0 + .4byte 0xE8F30000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x966A93AA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x896F0000 + .4byte 0x0000E8F5 + .4byte 0xE8F20000 + .4byte 0x00009570 + .4byte 0x978AE8F6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE8F70000 + .4byte 0 + .4byte 0x0000E8F9 + .4byte 0x91E88A7A + .4byte 0x8A7BE8F8 + .4byte 0 + .4byte 0 + .4byte 0x8AE78CB0 + .4byte 0 + .4byte 0x8AE80000 + .4byte 0x0000935E + .4byte 0 + .4byte 0x97DE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008CDA + .4byte 0 + .4byte 0x0000E8FA + .4byte 0 + .4byte 0x0000E8FB + .4byte 0xE8FCE940 + .4byte 0x0000E942 + .4byte 0xE9410000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x95970000 + .4byte 0xE9430000 + .4byte 0 + .4byte 0x0000E944 + .4byte 0x0000E945 + .4byte 0 + .4byte 0 + .4byte 0xE9460000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E948 + .4byte 0xE9470000 + .4byte 0xE9490000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000094F2 + .4byte 0xE3CA0000 + .4byte 0x00009048 + .4byte 0 + .4byte 0x8B510000 + .4byte 0 + .4byte 0 + .4byte 0x0000E94A + .4byte 0x0000E94B + .4byte 0x000099AA + .4byte 0x9F5A94D1 + .4byte 0 + .4byte 0x88F90000 + .4byte 0x88B90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8E94964F + .4byte 0x8FFC0000 .global Ucs99 Ucs99: - .incbin "baserom.dol", 0x42A540, 0x200 + .4byte 0 + .4byte 0x0000E94C + .4byte 0x000096DD + .4byte 0 + .4byte 0x0000E94D + .4byte 0x977B0000 + .4byte 0x89610000 + .4byte 0 + .4byte 0x8E600000 + .4byte 0xE94E89EC + .4byte 0xE94F0000 + .4byte 0 + .4byte 0xE9500000 + .4byte 0 + .4byte 0x0000E952 + .4byte 0xE9530000 + .4byte 0xE955E951 + .4byte 0 + .4byte 0xE9540000 + .4byte 0 + .4byte 0x8AD90000 + .4byte 0 + .4byte 0xE9560000 + .4byte 0xE9570000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E958 + .4byte 0xE9590000 + .4byte 0 + .4byte 0xE95A0000 + .4byte 0x0000E95C + .4byte 0 + .4byte 0x0000E95B + .4byte 0x0000E95E + .4byte 0xE9610000 + .4byte 0 + .4byte 0xE95DE95F + .4byte 0xE9600000 + .4byte 0x0000E962 + .4byte 0x00008BC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8EF1E963 + .4byte 0xE9648D81 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E965 + .4byte 0 + .4byte 0x8A5D0000 + .4byte 0 + .4byte 0x946EE966 + .4byte 0xE9670000 + .4byte 0 + .4byte 0x00009279 + .4byte 0x93E90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9680000 + .4byte 0 + .4byte 0x0000949D + .4byte 0 + .4byte 0x91CA8977 + .4byte 0x8BEC0000 + .4byte 0x8BED0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x9293E96D + .4byte 0x8BEE0000 + .4byte 0x000089ED + .4byte 0 + .4byte 0xE96C0000 + .4byte 0x0000E96A + .4byte 0x0000E96B + .4byte 0x0000E969 + .4byte 0 + .4byte 0xE9770000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E96E + .4byte 0xE96F0000 + .4byte 0x0000E970 + .4byte 0xE9710000 + .4byte 0 + .4byte 0 + .4byte 0xE9730000 + .4byte 0x0000E972 + .4byte 0 + .4byte 0x00008F78 .global Ucs9A Ucs9A: - .incbin "baserom.dol", 0x42A740, 0x200 + .4byte 0x0000E974 + .4byte 0 + .4byte 0x0000E976 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8B52E975 + .4byte 0 + .4byte 0x919B8CB1 + .4byte 0 + .4byte 0 + .4byte 0x0000E978 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x91CB0000 + .4byte 0x0000E979 + .4byte 0 + .4byte 0 + .4byte 0x93AB0000 + .4byte 0 + .4byte 0 + .4byte 0x0000E97A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9800000 + .4byte 0xE97D0000 + .4byte 0xE97CE97E + .4byte 0x0000E97B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E982 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E981 + .4byte 0x0000E984 + .4byte 0 + .4byte 0x8BC1E983 + .4byte 0 + .4byte 0x0000E985 + .4byte 0 + .4byte 0xE9860000 + .4byte 0xE988E987 + .4byte 0 + .4byte 0x0000E989 + .4byte 0xE98BE98A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8D9C0000 + .4byte 0 + .4byte 0x0000E98C + .4byte 0 + .4byte 0xE98D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8A5B0000 + .4byte 0 + .4byte 0xE98E0000 + .4byte 0 + .4byte 0xE98F0000 + .4byte 0 + .4byte 0x90910000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E990 + .4byte 0x0000E991 + .4byte 0x0000E992 + .4byte 0xE9930000 + .4byte 0 + .4byte 0x8D820000 + .4byte 0 + .4byte 0 + .4byte 0xE994E995 + .4byte 0 + .4byte 0xE996E997 + .4byte 0 + .4byte 0xE9980000 + .4byte 0 + .4byte 0x94AFE99A + .4byte 0x00009545 + .4byte 0xE99BE999 + .4byte 0x0000E99D + .4byte 0 + .4byte 0xE99C0000 + .4byte 0x0000E99E + .4byte 0 + .4byte 0x0000E99F + .4byte 0 + .4byte 0 .global Ucs9B Ucs9B: - .incbin "baserom.dol", 0x42A940, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9A00000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9A10000 + .4byte 0xE9A20000 + .4byte 0 + .4byte 0x0000E9A3 + .4byte 0 + .4byte 0xE9A4E9A5 + .4byte 0x0000E9A6 + .4byte 0x0000E9A7 + .4byte 0xE9A8E9A9 + .4byte 0xE9AA0000 + .4byte 0 + .4byte 0xE9ABE9AC + .4byte 0x00009F54 + .4byte 0xE9AD0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E2F6 + .4byte 0x8B530000 + .4byte 0 + .4byte 0x00008A40 + .4byte 0x8DB0E9AF + .4byte 0xE9AE96A3 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E9B1 + .4byte 0xE9B2E9B0 + .4byte 0x0000E9B3 + .4byte 0 + .4byte 0x96820000 + .4byte 0 + .4byte 0xE9B40000 + .4byte 0x8B9B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009844 + .4byte 0 + .4byte 0 + .4byte 0xE9B50000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E9B7 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x88BC0000 + .4byte 0x0000E9B8 + .4byte 0x95A9E9B6 + .4byte 0 + .4byte 0xE9B9E9BA + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000E9BB + .4byte 0xE9BC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9BD0000 + .4byte 0x968E8E4C + .4byte 0x00008DF8 + .4byte 0x914E0000 + .4byte 0 + .4byte 0 + .4byte 0xE9BE0000 + .4byte 0 + .4byte 0x0000E9C1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9BF0000 + .4byte 0 + .4byte 0 + .4byte 0xE9C20000 + .4byte 0x00008CEF + .4byte 0xE9C00000 + .4byte 0 + .4byte 0x0000E9C3 + .4byte 0x0000E9C4 + .4byte 0xE9C50000 + .4byte 0xE9C90000 + .4byte 0x8E490000 + .4byte 0 + .4byte 0x000091E2 + .4byte 0 + .4byte 0 + .4byte 0x0000E9CA + .4byte 0xE9C7E9C6 + .4byte 0xE9C80000 + .4byte 0 + .4byte 0x8C7E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9CEE9CD + .4byte 0xE9CC0000 + .4byte 0x000088B1 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs9C Ucs9C: - .incbin "baserom.dol", 0x42AB40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0xE9D80000 + .4byte 0xE9D40000 + .4byte 0xE9D5E9D1 + .4byte 0xE9D70000 + .4byte 0xE9D38A82 + .4byte 0 + .4byte 0x986B0000 + .4byte 0xE9D6E9D2 + .4byte 0xE9D0E9CF + .4byte 0 + .4byte 0 + .4byte 0x0000E9DA + .4byte 0 + .4byte 0 + .4byte 0x0000E9DD + .4byte 0 + .4byte 0xE9DCE9DB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009568 + .4byte 0xE9D988F1 + .4byte 0xE9DE0000 + .4byte 0xE9E00000 + .4byte 0 + .4byte 0 + .4byte 0x00008A8F + .4byte 0xE9CB8956 + .4byte 0 + .4byte 0xE9E20000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9E1E9DF + .4byte 0x924C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96900000 + .4byte 0 + .4byte 0x000097D8 + .4byte 0 + .4byte 0xE9E30000 + .4byte 0 + .4byte 0 + .4byte 0xE9E40000 + .4byte 0 + .4byte 0 + .4byte 0x0000E9E5 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xE9E60000 + .4byte 0xE9E70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000092B9 + .4byte 0x0000E9E8 + .4byte 0x000094B5 + .4byte 0x0000E9ED + .4byte 0xE9E90000 + .4byte 0 + .4byte 0xE9EA0000 + .4byte 0x00009650 + .4byte 0x96C20000 + .4byte 0x93CE0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Ucs9D Ucs9D: - .incbin "baserom.dol", 0x42AD40, 0x200 + .4byte 0 + .4byte 0x0000E9EE + .4byte 0 + .4byte 0xE9EF93BC + .4byte 0xE9ECE9EB + .4byte 0 + .4byte 0 + .4byte 0x89A80000 + .4byte 0 + .4byte 0xE9F70000 + .4byte 0x0000E9F6 + .4byte 0 + .4byte 0 + .4byte 0x00008995 + .4byte 0 + .4byte 0x0000E9F4 + .4byte 0 + .4byte 0x0000E9F3 + .4byte 0 + .4byte 0xE9F10000 + .4byte 0x8A9B0000 + .4byte 0xE9F08EB0 + .4byte 0x89A70000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008D83 + .4byte 0 + .4byte 0xE9FAE9F9 + .4byte 0x0000E9F8 + .4byte 0 + .4byte 0xE9F50000 + .4byte 0xE9FB0000 + .4byte 0xE9FC0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA44EA43 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA45 + .4byte 0 + .4byte 0x894CEA40 + .4byte 0xEA410000 + .4byte 0x8D9496B7 + .4byte 0 + .4byte 0xEA420000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x96510000 + .4byte 0x0000EA4A + .4byte 0 + .4byte 0xEA460000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA4B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA48 + .4byte 0x0000EA47 + .4byte 0 + .4byte 0 + .4byte 0x00008C7B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA4C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA4D0000 + .4byte 0 + .4byte 0x0000EA4E + .4byte 0x0000EA49 + .4byte 0 + .4byte 0x0000E9F2 + .4byte 0 + .4byte 0xEA4F0000 + .4byte 0x92DF0000 + .4byte 0 + .4byte 0xEA530000 + .4byte 0xEA54EA52 + .4byte 0 + .4byte 0 + .4byte 0x0000EA51 + .4byte 0xEA570000 + .4byte 0xEA500000 + .4byte 0xEA550000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA56 + .4byte 0 + .4byte 0x0000EA59 + .4byte 0 + .4byte 0 + .4byte 0x0000EA58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA5B0000 + .4byte 0 + .4byte 0 + .4byte 0x0000EA5C + .4byte 0x0000EA5D + .4byte 0 + .4byte 0x98680000 + .4byte 0 + .4byte 0 + .4byte 0xEA5A91E9 + .4byte 0x8DEB0000 + .4byte 0x0000EA5E + .4byte 0 .global Ucs9E Ucs9E: - .incbin "baserom.dol", 0x42AF40, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA5FEA60 + .4byte 0 + .4byte 0xEA610000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA62 + .4byte 0 + .4byte 0x8CB2EA63 + .4byte 0 + .4byte 0x0000EA64 + .4byte 0x00008EAD + .4byte 0x0000EA65 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA660000 + .4byte 0x0000EA67 + .4byte 0xEA680000 + .4byte 0 + .4byte 0x0000EA6B + .4byte 0xEA69985B + .4byte 0x0000EA6A + .4byte 0x000097ED + .4byte 0 + .4byte 0 + .4byte 0x0000EA6C + .4byte 0x000097D9 + .4byte 0 + .4byte 0 + .4byte 0x0000EA6D + .4byte 0x949E0000 + .4byte 0x0000EA6E + .4byte 0xEA700000 + .4byte 0x0000EA71 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA6F8D8D + .4byte 0x96CB9683 + .4byte 0x9BF50000 + .4byte 0x9F80969B + .4byte 0 + .4byte 0 + .4byte 0x89A90000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA738B6F + .4byte 0xEA74EA75 + .4byte 0xEA760000 + .4byte 0x8D950000 + .4byte 0xEA770000 + .4byte 0 + .4byte 0xE0D296D9 + .4byte 0x000091E1 + .4byte 0xEA78EA7A + .4byte 0xEA790000 + .4byte 0xEA7B0000 + .4byte 0 + .4byte 0x0000EA7C + .4byte 0 + .4byte 0xEA7D0000 + .4byte 0 + .4byte 0 + .4byte 0x0000EA7E + .4byte 0 + .4byte 0 + .4byte 0xEA800000 + .4byte 0xEA81EA82 + .4byte 0x0000EA83 + .4byte 0x0000EA84 + .4byte 0xEA85EA86 + .4byte 0 .global Ucs9F Ucs9F: - .incbin "baserom.dol", 0x42B140, 0x200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA87 + .4byte 0xEA880000 + .4byte 0 + .4byte 0 + .4byte 0x93430000 + .4byte 0 + .4byte 0x00008CDB + .4byte 0x0000EA8A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x916CEA8B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA8C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00009540 + .4byte 0 + .4byte 0xEA8D0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA8EE256 + .4byte 0 + .4byte 0xE6D8E8EB + .4byte 0 + .4byte 0xEA8F0000 + .4byte 0xEA900000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA92 + .4byte 0xEA93EA94 + .4byte 0x97EEEA91 + .4byte 0 + .4byte 0xEA95EA96 + .4byte 0 + .4byte 0xEA980000 + .4byte 0xEA970000 + .4byte 0 + .4byte 0 + .4byte 0xEA9A0000 + .4byte 0 + .4byte 0xEA9BEA99 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x000097B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000EA9C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xEA9DE273 + .4byte 0 + .4byte 0xEA9E0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global UcsFF UcsFF: - .incbin "baserom.dol", 0x42B340, 0x200 + .4byte 0x00008149 + .4byte 0x00008194 + .4byte 0x81908193 + .4byte 0x81950000 + .4byte 0x8169816A + .4byte 0x8196817B + .4byte 0x81430000 + .4byte 0x8144815E + .4byte 0x824F8250 + .4byte 0x82518252 + .4byte 0x82538254 + .4byte 0x82558256 + .4byte 0x82578258 + .4byte 0x81468147 + .4byte 0x81838181 + .4byte 0x81848148 + .4byte 0x81978260 + .4byte 0x82618262 + .4byte 0x82638264 + .4byte 0x82658266 + .4byte 0x82678268 + .4byte 0x8269826A + .4byte 0x826B826C + .4byte 0x826D826E + .4byte 0x826F8270 + .4byte 0x82718272 + .4byte 0x82738274 + .4byte 0x82758276 + .4byte 0x82778278 + .4byte 0x8279816D + .4byte 0x0000816E + .4byte 0x814F8151 + .4byte 0x814D8281 + .4byte 0x82828283 + .4byte 0x82848285 + .4byte 0x82868287 + .4byte 0x82888289 + .4byte 0x828A828B + .4byte 0x828C828D + .4byte 0x828E828F + .4byte 0x82908291 + .4byte 0x82928293 + .4byte 0x82948295 + .4byte 0x82968297 + .4byte 0x82988299 + .4byte 0x829A816F + .4byte 0x81628170 + .4byte 0 + .4byte 0x000000A1 + .4byte 0x00A200A3 + .4byte 0x00A400A5 + .4byte 0x00A600A7 + .4byte 0x00A800A9 + .4byte 0x00AA00AB + .4byte 0x00AC00AD + .4byte 0x00AE00AF + .4byte 0x00B000B1 + .4byte 0x00B200B3 + .4byte 0x00B400B5 + .4byte 0x00B600B7 + .4byte 0x00B800B9 + .4byte 0x00BA00BB + .4byte 0x00BC00BD + .4byte 0x00BE00BF + .4byte 0x00C000C1 + .4byte 0x00C200C3 + .4byte 0x00C400C5 + .4byte 0x00C600C7 + .4byte 0x00C800C9 + .4byte 0x00CA00CB + .4byte 0x00CC00CD + .4byte 0x00CE00CF + .4byte 0x00D000D1 + .4byte 0x00D200D3 + .4byte 0x00D400D5 + .4byte 0x00D600D7 + .4byte 0x00D800D9 + .4byte 0x00DA00DB + .4byte 0x00DC00DD + .4byte 0x00DE00DF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00008150 + .4byte 0x0000818F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global UcsSjisTable UcsSjisTable: - .incbin "baserom.dol", 0x42B540, 0x400 + .4byte 0x80423A40 + .4byte 0 + .4byte 0 + .4byte 0x80423C40 + .4byte 0x80423E40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80424040 + .4byte 0x80424240 + .4byte 0x80424440 + .4byte 0x80424640 + .4byte 0 + .4byte 0x80424840 + .4byte 0x80424A40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80424C40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80424E40 + .4byte 0x80425040 + .4byte 0x80425240 + .4byte 0x80425440 + .4byte 0x80425640 + .4byte 0x80425840 + .4byte 0x80425A40 + .4byte 0x80425C40 + .4byte 0x80425E40 + .4byte 0x80426040 + .4byte 0x80426240 + .4byte 0x80426440 + .4byte 0x80426640 + .4byte 0x80426840 + .4byte 0x80426A40 + .4byte 0x80426C40 + .4byte 0x80426E40 + .4byte 0x80427040 + .4byte 0x80427240 + .4byte 0x80427440 + .4byte 0x80427640 + .4byte 0x80427840 + .4byte 0x80427A40 + .4byte 0x80427C40 + .4byte 0x80427E40 + .4byte 0x80428040 + .4byte 0x80428240 + .4byte 0x80428440 + .4byte 0x80428640 + .4byte 0x80428840 + .4byte 0x80428A40 + .4byte 0x80428C40 + .4byte 0x80428E40 + .4byte 0x80429040 + .4byte 0x80429240 + .4byte 0x80429440 + .4byte 0x80429640 + .4byte 0x80429840 + .4byte 0x80429A40 + .4byte 0x80429C40 + .4byte 0x80429E40 + .4byte 0x8042A040 + .4byte 0x8042A240 + .4byte 0x8042A440 + .4byte 0x8042A640 + .4byte 0x8042A840 + .4byte 0x8042AA40 + .4byte 0x8042AC40 + .4byte 0x8042AE40 + .4byte 0x8042B040 + .4byte 0x8042B240 + .4byte 0x8042B440 + .4byte 0x8042B640 + .4byte 0x8042B840 + .4byte 0x8042BA40 + .4byte 0x8042BC40 + .4byte 0x8042BE40 + .4byte 0x8042C040 + .4byte 0x8042C240 + .4byte 0x8042C440 + .4byte 0x8042C640 + .4byte 0x8042C840 + .4byte 0x8042CA40 + .4byte 0x8042CC40 + .4byte 0x8042CE40 + .4byte 0x8042D040 + .4byte 0x8042D240 + .4byte 0x8042D440 + .4byte 0x8042D640 + .4byte 0x8042D840 + .4byte 0x8042DA40 + .4byte 0x8042DC40 + .4byte 0x8042DE40 + .4byte 0x8042E040 + .4byte 0x8042E240 + .4byte 0x8042E440 + .4byte 0x8042E640 + .4byte 0x8042E840 + .4byte 0x8042EA40 + .4byte 0x8042EC40 + .4byte 0x8042EE40 + .4byte 0x8042F040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8042F240 diff --git a/asm/pad/Pad.s b/asm/pad/Pad.s index 98821b4c..817200bf 100644 --- a/asm/pad/Pad.s +++ b/asm/pad/Pad.s @@ -1754,36 +1754,40 @@ lbl_80053DD0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x434630, 0x48 + .asciz "<< RVL_SDK - PAD \trelease build: Aug 23 2010 17:33:17 (0x4302_145) >>" + .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .incbin "baserom.dol", 0x434678, 0x10 + .4byte 0x80053C60 ;# ptr + .4byte 0x0000007F + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __PADVersion __PADVersion: - .incbin "baserom.dol", 0x492BA0, 0x4 + .4byte 0x80438530 .global ResettingChan ResettingChan: - .incbin "baserom.dol", 0x492BA4, 0x4 + .4byte 0x00000020 .global XPatchBits XPatchBits: - .incbin "baserom.dol", 0x492BA8, 0x4 + .4byte 0xF0000000 .global AnalogMode AnalogMode: - .incbin "baserom.dol", 0x492BAC, 0x4 + .4byte 0x00000300 .global Spec Spec: - .incbin "baserom.dol", 0x492BB0, 0x4 + .4byte 0x00000005 .global MakeStatus MakeStatus: - .incbin "baserom.dol", 0x492BB4, 0x4 + .4byte 0x80053850 ;# ptr .global CmdReadOrigin CmdReadOrigin: - .incbin "baserom.dol", 0x492BB8, 0x4 + .4byte 0x41000000 .global CmdCalibrate CmdCalibrate: - .incbin "baserom.dol", 0x492BBC, 0x4 + .4byte 0x42000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global Origin diff --git a/asm/sc/scapi_prdinfo.s b/asm/sc/scapi_prdinfo.s index 014bbc70..4b243715 100644 --- a/asm/sc/scapi_prdinfo.s +++ b/asm/sc/scapi_prdinfo.s @@ -196,15 +196,39 @@ lbl_8004D45C: .section .data, "wa" # 0x80421040 - 0x80496700 .global ProductAreaAndStringTbl ProductAreaAndStringTbl: - .incbin "baserom.dol", 0x4344F0, 0x48 + .4byte 0x004A504E + .4byte 0x00015553 + .4byte 0x41000245 + .4byte 0x55520003 + .4byte 0x41555300 + .4byte 0x04425241 + .4byte 0x00055457 + .4byte 0x4E000552 + .4byte 0x4F430006 + .4byte 0x4B4F5200 + .4byte 0x07484B47 + .4byte 0x00084153 + .4byte 0x4900094C + .4byte 0x544E000A + .4byte 0x53414600 + .4byte 0x0B43484E + .4byte 0x00FF0000 + .4byte 0 .global ProductGameRegionAndStringTbl ProductGameRegionAndStringTbl: - .incbin "baserom.dol", 0x434538, 0x18 + .4byte 0x004A5000 + .4byte 0x01555300 + .4byte 0x02455500 + .4byte 0x044B5200 + .4byte 0x05434E00 + .4byte 0xFF000000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21016 $$21016: - .incbin "baserom.dol", 0x492B68, 0x8 + .asciz "AREA" + .balign 4 .global $$21065 $$21065: - .incbin "baserom.dol", 0x492B70, 0x8 + .asciz "GAME" + .balign 4 diff --git a/asm/sc/scsystem.s b/asm/sc/scsystem.s index b411afba..291d7440 100644 --- a/asm/sc/scsystem.s +++ b/asm/sc/scsystem.s @@ -1772,149 +1772,256 @@ lbl_8004CCC0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ConfDirName ConfDirName: - .incbin "baserom.dol", 0x403D50, 0x10 + .asciz "/shared2/sys" + .balign 4 .global ConfFileName ConfFileName: - .incbin "baserom.dol", 0x403D60, 0x18 + .asciz "/shared2/sys/SYSCONF" + .balign 4 .global ProductInfoFileName ProductInfoFileName: - .incbin "baserom.dol", 0x403D78, 0x30 + .asciz "/title/00000001/00000002/data/setting.txt" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x4342F8, 0x48 + .asciz "<< RVL_SDK - SC \trelease build: Aug 23 2010 17:33:48 (0x4302_145) >>" + .balign 4 .global $$2842 $$2842: - .incbin "baserom.dol", 0x434340, 0xC + .asciz "IPL.EULA" + .balign 4 .global $$2851 $$2851: - .incbin "baserom.dol", 0x43434C, 0xC + .asciz "IPL.SADR" + .balign 4 .global $$2855 $$2855: - .incbin "baserom.dol", 0x434358, 0xC + .asciz "NET.CTPC" + .balign 4 .global $$2856 $$2856: - .incbin "baserom.dol", 0x434364, 0xC + .asciz "NET.PROF" + .balign 4 .global $$2857 $$2857: - .incbin "baserom.dol", 0x434370, 0xC + .asciz "NET.WCPC" + .balign 4 .global $$2858 $$2858: - .incbin "baserom.dol", 0x43437C, 0xC + .asciz "NET.WCFG" + .balign 4 .global $$2871 $$2871: - .incbin "baserom.dol", 0x434388, 0x10 + .asciz "MPLS.MOVIE" + .balign 4 + .4byte 0 .global NameAndIDTbl NameAndIDTbl: - .incbin "baserom.dol", 0x434398, 0x130 + .4byte 0x8055667C + .4byte 0 + .4byte 0x80556684 + .4byte 0x00000001 + .4byte 0x80556690 + .4byte 0x00000002 + .4byte 0x80556698 + .4byte 0x00000003 + .4byte 0x805566A0 + .4byte 0x00000004 + .4byte 0x805566A8 + .4byte 0x00000005 + .4byte 0x805566B0 + .4byte 0x00000006 + .4byte 0x80438240 + .4byte 0x00000007 + .4byte 0x805566B8 + .4byte 0x00000008 + .4byte 0x805566C0 + .4byte 0x00000009 + .4byte 0x805566C8 + .4byte 0x0000000A + .4byte 0x805566D0 + .4byte 0x0000000B + .4byte 0x805566D8 + .4byte 0x0000000C + .4byte 0x805566E0 + .4byte 0x0000000D + .4byte 0x805566E8 + .4byte 0x0000000E + .4byte 0x805566F0 + .4byte 0x0000000F + .4byte 0x8043824C + .4byte 0x00000010 + .4byte 0x805566F8 + .4byte 0x00000011 + .4byte 0x80556700 + .4byte 0x00000012 + .4byte 0x80556708 + .4byte 0x00000013 + .4byte 0x80438258 + .4byte 0x00000014 + .4byte 0x80438264 + .4byte 0x00000015 + .4byte 0x80438270 + .4byte 0x00000016 + .4byte 0x8043827C + .4byte 0x00000017 + .4byte 0x80556710 + .4byte 0x00000018 + .4byte 0x80556718 + .4byte 0x00000019 + .4byte 0x80556720 + .4byte 0x0000001A + .4byte 0x80556728 + .4byte 0x0000001B + .4byte 0x80556730 + .4byte 0x0000001C + .4byte 0x80556738 + .4byte 0x0000001D + .4byte 0x80556740 + .4byte 0x0000001E + .4byte 0x80556748 + .4byte 0x0000001F + .4byte 0x80556750 + .4byte 0x00000020 + .4byte 0x80556758 + .4byte 0x00000021 + .4byte 0x80556760 + .4byte 0x00000022 + .4byte 0x80556768 + .4byte 0x00000023 + .4byte 0x80438288 + .4byte 0x00000024 + .4byte 0x80556770 + .4byte 0x00000025 .global $$22788 $$22788: - .incbin "baserom.dol", 0x4344C8, 0x28 + .4byte 0x8004C9E0 ;# ptr + .4byte 0x8004CA24 ;# ptr + .4byte 0x8004CA64 ;# ptr + .4byte 0x8004CA94 ;# ptr + .4byte 0x8004CADC ;# ptr + .4byte 0x8004CB10 ;# ptr + .4byte 0x8004CB44 ;# ptr + .4byte 0x8004CB88 ;# ptr + .4byte 0x8004CBC4 ;# ptr + .4byte 0x8004CBCC ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SCVersion __SCVersion: - .incbin "baserom.dol", 0x492A58, 0x4 + .4byte 0x804381F8 .global $$2835 $$2835: - .incbin "baserom.dol", 0x492A5C, 0x8 + .asciz "IPL.CB" + .balign 4 .global $$2836 $$2836: - .incbin "baserom.dol", 0x492A64, 0xC + .asciz "IPL.AR" + .balign 4 + .4byte 0 .global $$2837 $$2837: - .incbin "baserom.dol", 0x492A70, 0x8 + .asciz "IPL.ARN" .global $$2838 $$2838: - .incbin "baserom.dol", 0x492A78, 0x8 + .asciz "IPL.CD" + .balign 4 .global $$2839 $$2839: - .incbin "baserom.dol", 0x492A80, 0x8 + .asciz "IPL.CD2" .global $$2840 $$2840: - .incbin "baserom.dol", 0x492A88, 0x8 + .asciz "IPL.DH" + .balign 4 .global $$2841 $$2841: - .incbin "baserom.dol", 0x492A90, 0x8 + .asciz "IPL.E60" .global $$2843 $$2843: - .incbin "baserom.dol", 0x492A98, 0x8 + .asciz "IPL.FRC" .global $$2844 $$2844: - .incbin "baserom.dol", 0x492AA0, 0x8 + .asciz "IPL.IDL" .global $$2845 $$2845: - .incbin "baserom.dol", 0x492AA8, 0x8 + .asciz "IPL.INC" .global $$2846 $$2846: - .incbin "baserom.dol", 0x492AB0, 0x8 + .asciz "IPL.LNG" .global $$2847 $$2847: - .incbin "baserom.dol", 0x492AB8, 0x8 + .asciz "IPL.NIK" .global $$2848 $$2848: - .incbin "baserom.dol", 0x492AC0, 0x8 + .asciz "IPL.PC" + .balign 4 .global $$2849 $$2849: - .incbin "baserom.dol", 0x492AC8, 0x8 + .asciz "IPL.PGS" .global $$2850 $$2850: - .incbin "baserom.dol", 0x492AD0, 0x8 + .asciz "IPL.SSV" .global $$2852 $$2852: - .incbin "baserom.dol", 0x492AD8, 0x8 + .asciz "IPL.SND" .global $$2853 $$2853: - .incbin "baserom.dol", 0x492AE0, 0x8 + .asciz "IPL.UPT" .global $$2854 $$2854: - .incbin "baserom.dol", 0x492AE8, 0x8 + .asciz "NET.CNF" .global $$2859 $$2859: - .incbin "baserom.dol", 0x492AF0, 0x8 + .asciz "DEV.BTM" .global $$2860 $$2860: - .incbin "baserom.dol", 0x492AF8, 0x8 + .asciz "DEV.VIM" .global $$2861 $$2861: - .incbin "baserom.dol", 0x492B00, 0x8 + .asciz "DEV.CTC" .global $$2862 $$2862: - .incbin "baserom.dol", 0x492B08, 0x8 + .asciz "DEV.DSM" .global $$2863 $$2863: - .incbin "baserom.dol", 0x492B10, 0x8 + .asciz "BT.DINF" .global $$2864 $$2864: - .incbin "baserom.dol", 0x492B18, 0x8 + .asciz "BT.CDIF" .global $$2865 $$2865: - .incbin "baserom.dol", 0x492B20, 0x8 + .asciz "BT.SENS" .global $$2866 $$2866: - .incbin "baserom.dol", 0x492B28, 0x8 + .asciz "BT.SPKV" .global $$2867 $$2867: - .incbin "baserom.dol", 0x492B30, 0x8 + .asciz "BT.MOT" + .balign 4 .global $$2868 $$2868: - .incbin "baserom.dol", 0x492B38, 0x8 + .asciz "BT.BAR" + .balign 4 .global $$2869 $$2869: - .incbin "baserom.dol", 0x492B40, 0x8 + .asciz "DVD.CNF" .global $$2870 $$2870: - .incbin "baserom.dol", 0x492B48, 0x8 + .asciz "WWW.RST" .global $$2872 $$2872: - .incbin "baserom.dol", 0x492B50, 0x8 + .asciz "IPL.TID" .global $$22434 $$22434: - .incbin "baserom.dol", 0x492B58, 0x8 + .asciz "SCv0" + .balign 4 .global $$22435 $$22435: - .incbin "baserom.dol", 0x492B60, 0x8 + .asciz "SCed" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global Control diff --git a/asm/si/SIBios.s b/asm/si/SIBios.s index a88ad62f..c4a794c3 100644 --- a/asm/si/SIBios.s +++ b/asm/si/SIBios.s @@ -1559,18 +1559,28 @@ lbl_8002B994: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42BC88, 0x48 + .asciz "<< RVL_SDK - SI \trelease build: Aug 23 2010 17:33:18 (0x4302_145) >>" + .balign 4 .global Si Si: - .incbin "baserom.dol", 0x42BCD0, 0x18 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global Type Type: - .incbin "baserom.dol", 0x42BCE8, 0x10 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SIVersion __SIVersion: - .incbin "baserom.dol", 0x492900, 0x8 + .4byte 0x8042FB88 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global Packet diff --git a/asm/si/SISamplingRate.s b/asm/si/SISamplingRate.s index d398b316..9b639895 100644 --- a/asm/si/SISamplingRate.s +++ b/asm/si/SISamplingRate.s @@ -75,13 +75,37 @@ SIRefreshSamplingRate: .section .data, "wa" # 0x80421040 - 0x80496700 .global XYNTSC XYNTSC: - .incbin "baserom.dol", 0x42BCF8, 0x30 + .4byte 0x00F60200 + .4byte 0x000E1300 + .4byte 0x001E0900 + .4byte 0x002C0600 + .4byte 0x00340500 + .4byte 0x00410400 + .4byte 0x00570300 + .4byte 0x00570300 + .4byte 0x00570300 + .4byte 0x00830200 + .4byte 0x00830200 + .4byte 0x00830200 .global XYPAL XYPAL: - .incbin "baserom.dol", 0x42BD28, 0x30 + .4byte 0x01280200 + .4byte 0x000F1500 + .4byte 0x001D0B00 + .4byte 0x002D0700 + .4byte 0x00340600 + .4byte 0x003F0500 + .4byte 0x004E0400 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x009C0200 .global $$2536 $$2536: - .incbin "baserom.dol", 0x42BD58, 0x38 + .asciz "SISetSamplingRate: unknown TV format. Use default." + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global SamplingRate diff --git a/asm/src/AABBox.s b/asm/src/AABBox.s index 7afcff35..2acc9fd8 100644 --- a/asm/src/AABBox.s +++ b/asm/src/AABBox.s @@ -9,4 +9,5 @@ __mi__Q33hel4math7Vector3CFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252182 $$252182: - .incbin "baserom.dol", 0x49A3E0, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/AbilityBase.s b/asm/src/AbilityBase.s index 1dbcda50..417ed174 100644 --- a/asm/src/AbilityBase.s +++ b/asm/src/AbilityBase.s @@ -97,4 +97,27 @@ isDepleted__Q43scn4step4hero11AbilityBaseCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero11AbilityBase __vt__Q43scn4step4hero11AbilityBase: - .incbin "baserom.dol", 0x47E810, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x8032B798 + .4byte 0x8032B79C + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x8032B7AC + .4byte 0x8032B7B0 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8032B7DC + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 + .4byte 0 diff --git a/asm/src/AbilityCursor.s b/asm/src/AbilityCursor.s index 3ef2dd05..270035ee 100644 --- a/asm/src/AbilityCursor.s +++ b/asm/src/AbilityCursor.s @@ -447,35 +447,45 @@ lbl_801F765C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252276 $$252276: - .incbin "baserom.dol", 0x45BAB0, 0x18 + .asciz "challengeability/Main" + .balign 4 .global $$252277 $$252277: - .incbin "baserom.dol", 0x45BAC8, 0x10 + .asciz "CursorBase" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252278 $$252278: - .incbin "baserom.dol", 0x4943E0, 0x8 + .asciz "Cursor" + .balign 4 .global $$252279 $$252279: - .incbin "baserom.dol", 0x4943E8, 0x8 + .asciz "CursorN" .global $$252280 $$252280: - .incbin "baserom.dol", 0x4943F0, 0x8 + .asciz "Wait" + .balign 4 .global $$252282 $$252282: - .incbin "baserom.dol", 0x4943F8, 0x8 + .asciz "Focus" + .balign 4 .global $$252323 $$252323: - .incbin "baserom.dol", 0x494400, 0x8 + .asciz "MoveL" + .balign 4 .global $$252326 $$252326: - .incbin "baserom.dol", 0x494408, 0x8 + .asciz "MoveR" + .balign 4 .global $$252329 $$252329: - .incbin "baserom.dol", 0x494410, 0x8 + .asciz "Decide" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252281 $$252281: - .incbin "baserom.dol", 0x49AA00, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/AbilityCustomBase.s b/asm/src/AbilityCustomBase.s index 49ced960..03b2bc79 100644 --- a/asm/src/AbilityCustomBase.s +++ b/asm/src/AbilityCustomBase.s @@ -20,4 +20,7 @@ GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero17AbilityCustomBase __vt__Q43scn4step4hero17AbilityCustomBase: - .incbin "baserom.dol", 0x47E870, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8032B804 + .4byte 0x8032B800 diff --git a/asm/src/AbilityGetFade.s b/asm/src/AbilityGetFade.s index c9b9f3f6..311e1409 100644 --- a/asm/src/AbilityGetFade.s +++ b/asm/src/AbilityGetFade.s @@ -265,39 +265,43 @@ lbl_803CCA98: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251579 $$251579: - .incbin "baserom.dol", 0x49AA48, 0x4 + .4byte 0x000000B0 .global $$251582 $$251582: - .incbin "baserom.dol", 0x49AA4C, 0x4 + .4byte 0x000000B0 .global $$251592 $$251592: - .incbin "baserom.dol", 0x49AA50, 0x4 + .4byte 0 .global $$251602 $$251602: - .incbin "baserom.dol", 0x49AA54, 0x4 + .4byte 0x3F800000 .global $$251603 $$251603: - .incbin "baserom.dol", 0x49AA58, 0x8 + .4byte 0x3E800000 + .4byte 0 .global $$251606 $$251606: - .incbin "baserom.dol", 0x49AA60, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252679 $$252679: - .incbin "baserom.dol", 0x49E6A0, 0x4 + .4byte 0x000000B0 .global $$252682 $$252682: - .incbin "baserom.dol", 0x49E6A4, 0x4 + .4byte 0x000000B0 .global $$252692 $$252692: - .incbin "baserom.dol", 0x49E6A8, 0x4 + .4byte 0 .global $$252705 $$252705: - .incbin "baserom.dol", 0x49E6AC, 0x4 + .4byte 0x3F800000 .global $$252706 $$252706: - .incbin "baserom.dol", 0x49E6B0, 0x8 + .4byte 0x3E800000 + .4byte 0 .global $$252709 $$252709: - .incbin "baserom.dol", 0x49E6B8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/AbilityKindUtil.s b/asm/src/AbilityKindUtil.s index 790f0efd..5e31fb25 100644 --- a/asm/src/AbilityKindUtil.s +++ b/asm/src/AbilityKindUtil.s @@ -362,99 +362,193 @@ lbl_8032B844: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_MANUAL_KIND_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2 T_MANUAL_KIND_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2: - .incbin "baserom.dol", 0x415CC0, 0x90 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249295 $$249295: - .incbin "baserom.dol", 0x45AA98, 0x28 + .asciz "step/chara/hero/kirby/sword/Sword" + .balign 4 + .4byte 0 .global $$249296 $$249296: - .incbin "baserom.dol", 0x45AAC0, 0x20 + .asciz "step/chara/hero/kirby/whip/Whip" .global $$249297 $$249297: - .incbin "baserom.dol", 0x45AAE0, 0x28 + .asciz "step/chara/hero/kirby/parasol/Parasol" + .balign 4 .global $$249321 $$249321: - .incbin "baserom.dol", 0x45AB08, 0x20 + .asciz "step/chara/hero/kirby/sword/Hat" .global $$249322 $$249322: - .incbin "baserom.dol", 0x45AB28, 0x20 + .asciz "step/chara/hero/kirby/whip/Hat" + .balign 4 .global $$249323 $$249323: - .incbin "baserom.dol", 0x45AB48, 0x20 + .asciz "step/chara/hero/kirby/spark/Hat" .global $$249324 $$249324: - .incbin "baserom.dol", 0x45AB68, 0x20 + .asciz "step/chara/hero/kirby/wing/Hat" + .balign 4 .global $$249325 $$249325: - .incbin "baserom.dol", 0x45AB88, 0x28 + .asciz "step/chara/hero/kirby/fighter/Hat" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248725 $$248725: - .incbin "baserom.dol", 0x47E880, 0x18 + .asciz "StepHrAbKirbyNormal.dn" + .balign 4 .global $$248726 $$248726: - .incbin "baserom.dol", 0x47E898, 0x18 + .asciz "StepHrAbKirbySword.dn" + .balign 4 .global $$248727 $$248727: - .incbin "baserom.dol", 0x47E8B0, 0x18 + .asciz "StepHrAbKirbyCutter.dn" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x47E8C8, 0x18 + .asciz "StepHrAbKirbyWhip.dn" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x47E8E0, 0x18 + .asciz "StepHrAbKirbyFire.dn" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x47E8F8, 0x18 + .asciz "StepHrAbKirbySpark.dn" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x47E910, 0x18 + .asciz "StepHrAbKirbyStone.dn" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x47E928, 0x18 + .asciz "StepHrAbKirbyParasol.dn" .global $$248733 $$248733: - .incbin "baserom.dol", 0x47E940, 0x18 + .asciz "StepHrAbKirbyHammer.dn" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x47E958, 0x18 + .asciz "StepHrAbKirbyWing.dn" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x47E970, 0x18 + .asciz "StepHrAbKirbyFighter.dn" .global $$248736 $$248736: - .incbin "baserom.dol", 0x47E988, 0x18 + .asciz "StepHrAbKirbySmash.dn" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x47E9A0, 0x10 + .asciz "StepHrAbMeta.dn" .global $$248738 $$248738: - .incbin "baserom.dol", 0x47E9B0, 0x14 + .asciz "StepHrAbDedede.dn" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x47E9C4, 0x14 + .asciz "StepHrAbDee.dn" + .balign 4 + .4byte 0 .global T_FDN_NAME_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2 T_FDN_NAME_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2: - .incbin "baserom.dol", 0x47E9D8, 0x90 + .4byte 0x80482780 + .4byte 0x80482798 + .4byte 0x804827B0 + .4byte 0x80482780 + .4byte 0x804827C8 + .4byte 0x804827E0 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x804827F8 + .4byte 0x80482810 + .4byte 0x80482780 + .4byte 0x80482828 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482840 + .4byte 0x80482780 + .4byte 0x80482858 + .4byte 0x80482780 + .4byte 0x80482870 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482888 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x80482780 + .4byte 0x804828A0 + .4byte 0x804828B0 + .4byte 0x804828C4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249304 $$249304: - .incbin "baserom.dol", 0x494078, 0x4 + .4byte 0 .global $$249305 $$249305: - .incbin "baserom.dol", 0x49407C, 0x8 + .asciz "EdgeL" + .balign 4 .global $$249306 $$249306: - .incbin "baserom.dol", 0x494084, 0xC + .asciz "AllL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249353 $$249353: - .incbin "baserom.dol", 0x49A8E0, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Dyna__Q33scn14challengetitle15AbilityKindUtilFQ33scn14challengetitle11AbilityKind$$2dynaDesc$$21 diff --git a/asm/src/AbilityManager.s b/asm/src/AbilityManager.s index e36f25b5..d0ad9b0f 100644 --- a/asm/src/AbilityManager.s +++ b/asm/src/AbilityManager.s @@ -1452,7 +1452,32 @@ lbl_8032CB2C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$261578 $$261578: - .incbin "baserom.dol", 0x47EA68, 0x68 + .4byte 0x8032C850 + .4byte 0x8032C634 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C680 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C6CC + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C718 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C764 + .4byte 0x8032C848 + .4byte 0x8032C7B0 + .4byte 0x8032C848 + .4byte 0x8032C848 + .4byte 0x8032C7FC + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step4hero5spark6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/AbilityPanel.s b/asm/src/AbilityPanel.s index 198fbc7d..2ba5e7c6 100644 --- a/asm/src/AbilityPanel.s +++ b/asm/src/AbilityPanel.s @@ -463,140 +463,202 @@ lbl_801F7CF8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251791 $$251791: - .incbin "baserom.dol", 0x4119F0, 0x20 + .4byte 0x00000018 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000024 .global $$251826 $$251826: - .incbin "baserom.dol", 0x411A10, 0x38 + .4byte 0x80558058 + .4byte 0x80558060 + .4byte 0x80558068 + .4byte 0x80558070 + .4byte 0x8045FAB8 + .4byte 0x8045FAC4 + .4byte 0x80558078 + .4byte 0x80558080 + .4byte 0x80558088 + .4byte 0x80558090 + .4byte 0x80558098 + .4byte 0x805580A0 + .4byte 0x8045FAD0 + .4byte 0x8045FADC .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251574 $$251574: - .incbin "baserom.dol", 0x45BAD8, 0x14 + .asciz "AbilitySelect_Smash" .global $$251575 $$251575: - .incbin "baserom.dol", 0x45BAEC, 0x14 + .asciz "AbilitySelect_Sword" .global $$251576 $$251576: - .incbin "baserom.dol", 0x45BB00, 0x18 + .asciz "AbilitySelect_Parasol" + .balign 4 .global $$251577 $$251577: - .incbin "baserom.dol", 0x45BB18, 0x14 + .asciz "AbilitySelect_Spark" .global $$251578 $$251578: - .incbin "baserom.dol", 0x45BB2C, 0x14 + .asciz "AbilitySelect_Whip" + .balign 4 .global $$251579 $$251579: - .incbin "baserom.dol", 0x45BB40, 0x14 + .asciz "AbilitySelect_Wing" + .balign 4 .global $$251580 $$251580: - .incbin "baserom.dol", 0x45BB54, 0x18 + .asciz "AbilitySelect_Fighter" + .balign 4 .global abilityName__Q43scn17challengetutorial4info26$$2unnamed$$2AbilityPanel_cpp$$2 abilityName__Q43scn17challengetutorial4info26$$2unnamed$$2AbilityPanel_cpp$$2: - .incbin "baserom.dol", 0x45BB6C, 0x1C + .4byte 0x8045F9D8 + .4byte 0x8045F9EC + .4byte 0x8045FA00 + .4byte 0x8045FA18 + .4byte 0x8045FA2C + .4byte 0x8045FA40 + .4byte 0x8045FA54 .global $$252687 $$252687: - .incbin "baserom.dol", 0x45BB88, 0x18 + .asciz "challengeability/Main" + .balign 4 .global $$252689 $$252689: - .incbin "baserom.dol", 0x45BBA0, 0xC + .asciz "PanelIcon" + .balign 4 .global $$252691 $$252691: - .incbin "baserom.dol", 0x45BBAC, 0xC + .asciz "PanelIconN" + .balign 4 .global $$251816 $$251816: - .incbin "baserom.dol", 0x45BBB8, 0xC + .asciz "ParasolN" + .balign 4 .global $$251817 $$251817: - .incbin "baserom.dol", 0x45BBC4, 0xC + .asciz "ParasolUN" + .balign 4 .global $$251824 $$251824: - .incbin "baserom.dol", 0x45BBD0, 0xC + .asciz "FighterN" + .balign 4 .global $$251825 $$251825: - .incbin "baserom.dol", 0x45BBDC, 0xC + .asciz "FighterUN" + .balign 4 .global $$252775 $$252775: - .incbin "baserom.dol", 0x45BBE8, 0xC + .asciz "UnFocusN" + .balign 4 .global $$252779 $$252779: - .incbin "baserom.dol", 0x45BBF4, 0xC + .asciz "NormalUN" + .balign 4 .global $$252782 $$252782: - .incbin "baserom.dol", 0x45BC00, 0xC + .asciz "FocusText" + .balign 4 .global $$252783 $$252783: - .incbin "baserom.dol", 0x45BC0C, 0xC + .asciz "UnFocusText" .global $$252784 $$252784: - .incbin "baserom.dol", 0x45BC18, 0x40 + .asciz "PlatinumN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252688 $$252688: - .incbin "baserom.dol", 0x494418, 0x8 + .asciz "Panel" + .balign 4 .global $$252690 $$252690: - .incbin "baserom.dol", 0x494420, 0x8 + .asciz "Medal" + .balign 4 .global $$252692 $$252692: - .incbin "baserom.dol", 0x494428, 0x8 + .asciz "MedalN" + .balign 4 .global $$252693 $$252693: - .incbin "baserom.dol", 0x494430, 0x8 + .asciz "Wait" + .balign 4 .global $$251812 $$251812: - .incbin "baserom.dol", 0x494438, 0x8 + .asciz "SmashN" + .balign 4 .global $$251813 $$251813: - .incbin "baserom.dol", 0x494440, 0x8 + .asciz "SmashUN" .global $$251814 $$251814: - .incbin "baserom.dol", 0x494448, 0x8 + .asciz "SwordN" + .balign 4 .global $$251815 $$251815: - .incbin "baserom.dol", 0x494450, 0x8 + .asciz "SwordUN" .global $$251818 $$251818: - .incbin "baserom.dol", 0x494458, 0x8 + .asciz "SparkN" + .balign 4 .global $$251819 $$251819: - .incbin "baserom.dol", 0x494460, 0x8 + .asciz "SparkUN" .global $$251820 $$251820: - .incbin "baserom.dol", 0x494468, 0x8 + .asciz "WhipN" + .balign 4 .global $$251821 $$251821: - .incbin "baserom.dol", 0x494470, 0x8 + .asciz "WhipUN" + .balign 4 .global $$251822 $$251822: - .incbin "baserom.dol", 0x494478, 0x8 + .asciz "WingN" + .balign 4 .global $$251823 $$251823: - .incbin "baserom.dol", 0x494480, 0x8 + .asciz "WingUN" + .balign 4 .global $$252774 $$252774: - .incbin "baserom.dol", 0x494488, 0x8 + .asciz "UnFocus" .global $$252776 $$252776: - .incbin "baserom.dol", 0x494490, 0x8 + .asciz "FocusN" + .balign 4 .global $$252777 $$252777: - .incbin "baserom.dol", 0x494498, 0x8 + .asciz "Focus" + .balign 4 .global $$252778 $$252778: - .incbin "baserom.dol", 0x4944A0, 0x8 + .asciz "NormalN" .global $$252780 $$252780: - .incbin "baserom.dol", 0x4944A8, 0x8 + .asciz "FireN" + .balign 4 .global $$252781 $$252781: - .incbin "baserom.dol", 0x4944B0, 0x8 + .asciz "FireUN" + .balign 4 .global $$252785 $$252785: - .incbin "baserom.dol", 0x4944B8, 0x8 + .asciz "GoldN" + .balign 4 .global $$252786 $$252786: - .incbin "baserom.dol", 0x4944C0, 0x8 + .asciz "SilverN" .global $$252787 $$252787: - .incbin "baserom.dol", 0x4944C8, 0x8 + .asciz "BronzeN" diff --git a/asm/src/AbilitySelect.s b/asm/src/AbilitySelect.s index 3de2264d..ffef76e2 100644 --- a/asm/src/AbilitySelect.s +++ b/asm/src/AbilitySelect.s @@ -1693,112 +1693,198 @@ lbl_801F94E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x411A48, 0x38 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x0000000B + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 .global area2Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 area2Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x411A80, 0x38 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x00000015 + .4byte 0x00000005 + .4byte 0x00000013 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 + .4byte 0x00000007 + .4byte 0x00000024 .global area3Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 area3Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x411AB8, 0x38 + .4byte 0 + .4byte 0x00000018 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x0000000B + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x00000015 + .4byte 0x00000005 + .4byte 0x00000013 .global abilityNumTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 abilityNumTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x411AF0, 0xC + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000007 .global panelOffsTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 panelOffsTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x411AFC, 0x1C + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 .section .data, "wa" # 0x80421040 - 0x80496700 .global panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x45BC58, 0x1C + .4byte 0x805580F0 + .4byte 0x805580F8 + .4byte 0x80558100 + .4byte 0x80558108 + .4byte 0x80558110 + .4byte 0x80558118 + .4byte 0x80558120 .global $$251757 $$251757: - .incbin "baserom.dol", 0x45BC74, 0x10 + .asciz "CursorBase1N" + .balign 4 .global $$251758 $$251758: - .incbin "baserom.dol", 0x45BC84, 0x10 + .asciz "CursorBase2N" + .balign 4 .global $$251759 $$251759: - .incbin "baserom.dol", 0x45BC94, 0x10 + .asciz "CursorBase3N" + .balign 4 .global cursorPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 cursorPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x45BCA4, 0xC + .4byte 0x8045FB74 + .4byte 0x8045FB84 + .4byte 0x8045FB94 .global areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .incbin "baserom.dol", 0x45BCB0, 0xC + .4byte 0x80415948 + .4byte 0x80415980 + .4byte 0x804159B8 .global $$253883 $$253883: - .incbin "baserom.dol", 0x45BCBC, 0x18 + .asciz "challengeability/Main" + .balign 4 .global $$253884 $$253884: - .incbin "baserom.dol", 0x45BCD4, 0xC + .asciz "PanelBase" + .balign 4 .global $$253885 $$253885: - .incbin "baserom.dol", 0x45BCE0, 0x10 + .asciz "pause/Main" + .balign 4 + .4byte 0 .global $$253886 $$253886: - .incbin "baserom.dol", 0x45BCF0, 0x10 + .asciz "PauseCursorBase" .global $$253887 $$253887: - .incbin "baserom.dol", 0x45BD00, 0xC + .asciz "CursorLN" + .balign 4 .global $$253888 $$253888: - .incbin "baserom.dol", 0x45BD0C, 0x10 + .asciz "PauseCursorL" + .balign 4 .global $$253889 $$253889: - .incbin "baserom.dol", 0x45BD1C, 0xC + .asciz "CursorRN" + .balign 4 .global $$253890 $$253890: - .incbin "baserom.dol", 0x45BD28, 0x10 + .asciz "PauseCursorR" + .balign 4 .global $$253891 $$253891: - .incbin "baserom.dol", 0x45BD38, 0xC + .asciz "PanelBaseN" + .balign 4 .global $$254084 $$254084: - .incbin "baserom.dol", 0x45BD44, 0x54 + .4byte 0x801F86E4 ;# ptr + .4byte 0x801F8688 ;# ptr + .4byte 0x801F8694 ;# ptr + .4byte 0x801F86A0 ;# ptr + .4byte 0x801F86AC ;# ptr + .4byte 0x801F86B8 ;# ptr + .4byte 0x801F86C4 ;# ptr + .4byte 0x801F86D0 ;# ptr + .4byte 0x801F86DC ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251749 $$251749: - .incbin "baserom.dol", 0x4944D0, 0x8 + .asciz "Panel1N" .global $$251750 $$251750: - .incbin "baserom.dol", 0x4944D8, 0x8 + .asciz "Panel2N" .global $$251751 $$251751: - .incbin "baserom.dol", 0x4944E0, 0x8 + .asciz "Panel3N" .global $$251752 $$251752: - .incbin "baserom.dol", 0x4944E8, 0x8 + .asciz "Panel4N" .global $$251753 $$251753: - .incbin "baserom.dol", 0x4944F0, 0x8 + .asciz "Panel5N" .global $$251754 $$251754: - .incbin "baserom.dol", 0x4944F8, 0x8 + .asciz "Panel6N" .global $$251755 $$251755: - .incbin "baserom.dol", 0x494500, 0x8 + .asciz "Panel7N" .global $$253892 $$253892: - .incbin "baserom.dol", 0x494508, 0x8 + .asciz "Wait" + .balign 4 .global $$254013 $$254013: - .incbin "baserom.dol", 0x494510, 0x8 + .asciz "Start" + .balign 4 .global $$254082 $$254082: - .incbin "baserom.dol", 0x494518, 0x4 + .4byte 0x456E6400 .global $$254128 $$254128: - .incbin "baserom.dol", 0x49451C, 0x8 + .asciz "MoveR" + .balign 4 .global $$254157 $$254157: - .incbin "baserom.dol", 0x494524, 0xC + .asciz "MoveL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254129 $$254129: - .incbin "baserom.dol", 0x49AA08, 0x4 + .4byte 0x3F000000 .global $$254130 $$254130: - .incbin "baserom.dol", 0x49AA0C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/Accessor.s b/asm/src/Accessor.s index 016e7e2f..c6213409 100644 --- a/asm/src/Accessor.s +++ b/asm/src/Accessor.s @@ -308,10 +308,12 @@ isValid__Q43scn4step5enemy8AccessorCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x45FEC8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x45FEEC, 0xC + .asciz "LinkList.h" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q43scn4step4boss7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/ActionAttack.s b/asm/src/ActionAttack.s index e1db9bcd..9c5dc1eb 100644 --- a/asm/src/ActionAttack.s +++ b/asm/src/ActionAttack.s @@ -281,20 +281,40 @@ isInitState__Q53scn4step7gimmick10guideboard6ActionCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252816 $$252816: - .incbin "baserom.dol", 0x47D428, 0xC + .asciz "GChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard12ActionAttack __vt__Q53scn4step7gimmick10guideboard12ActionAttack: - .incbin "baserom.dol", 0x47D434, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x8031027C + .4byte 0x80310284 + .4byte 0x80310294 + .4byte 0x80310318 + .4byte 0x80310340 + .4byte 0x80310570 + .4byte 0x8031056C + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80310550 + .4byte 0x803103C8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 $$252801: - .incbin "baserom.dol", 0x496AF8, 0x8 + .asciz "GTopL" + .balign 4 .global $$252805 $$252805: - .incbin "baserom.dol", 0x496B00, 0x8 + .asciz "GWait1" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252848 $$252848: - .incbin "baserom.dol", 0x49D408, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ActionDrink.s b/asm/src/ActionDrink.s index 8a99b118..b19819b8 100644 --- a/asm/src/ActionDrink.s +++ b/asm/src/ActionDrink.s @@ -326,21 +326,43 @@ lbl_803109C0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252912 $$252912: - .incbin "baserom.dol", 0x47D478, 0xC + .asciz "BChange2" + .balign 4 .global $$252932 $$252932: - .incbin "baserom.dol", 0x47D484, 0xC + .asciz "BChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard11ActionDrink __vt__Q53scn4step7gimmick10guideboard11ActionDrink: - .incbin "baserom.dol", 0x47D490, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x803105C8 + .4byte 0x803105D0 + .4byte 0x803105D4 + .4byte 0x80310624 + .4byte 0x80310698 + .4byte 0x80310720 + .4byte 0x8031056C + .4byte 0x80310894 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80310550 + .4byte 0x80310574 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252894 $$252894: - .incbin "baserom.dol", 0x496B08, 0x8 + .asciz "BTopL" + .balign 4 .global $$252898 $$252898: - .incbin "baserom.dol", 0x496B10, 0x8 + .asciz "BWait1" + .balign 4 .global $$252907 $$252907: - .incbin "baserom.dol", 0x496B18, 0x8 + .asciz "BWait2" + .balign 4 diff --git a/asm/src/ActionHover.s b/asm/src/ActionHover.s index e9e0fac6..9ce812bd 100644 --- a/asm/src/ActionHover.s +++ b/asm/src/ActionHover.s @@ -201,20 +201,40 @@ lbl_80310C68: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252816 $$252816: - .incbin "baserom.dol", 0x47D4D8, 0xC + .asciz "DChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard11ActionHover __vt__Q53scn4step7gimmick10guideboard11ActionHover: - .incbin "baserom.dol", 0x47D4E4, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x80310A48 + .4byte 0x80310A50 + .4byte 0x80310A54 + .4byte 0x80310AA4 + .4byte 0x80310AA8 + .4byte 0x80310570 + .4byte 0x8031056C + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310B30 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80310550 + .4byte 0x80310574 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 $$252801: - .incbin "baserom.dol", 0x496B20, 0x8 + .asciz "DTopL" + .balign 4 .global $$252805 $$252805: - .incbin "baserom.dol", 0x496B28, 0x8 + .asciz "DWait1" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252848 $$252848: - .incbin "baserom.dol", 0x49D410, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ActionRun.s b/asm/src/ActionRun.s index 2e3fdd8e..957d4fbc 100644 --- a/asm/src/ActionRun.s +++ b/asm/src/ActionRun.s @@ -302,20 +302,40 @@ lbl_80311084: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253279 $$253279: - .incbin "baserom.dol", 0x47D528, 0xC + .asciz "CChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard9ActionRun __vt__Q53scn4step7gimmick10guideboard9ActionRun: - .incbin "baserom.dol", 0x47D534, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x80310CF0 + .4byte 0x80310CF8 + .4byte 0x80310CFC + .4byte 0x80310D4C + .4byte 0x80310D50 + .4byte 0x80310570 + .4byte 0x8031056C + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80310550 + .4byte 0x80310574 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253250 $$253250: - .incbin "baserom.dol", 0x496B30, 0x8 + .asciz "CTopL" + .balign 4 .global $$253254 $$253254: - .incbin "baserom.dol", 0x496B38, 0x8 + .asciz "CWait1" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253344 $$253344: - .incbin "baserom.dol", 0x49D418, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ActionThroughLand.s b/asm/src/ActionThroughLand.s index 957b86ba..b1ae2559 100644 --- a/asm/src/ActionThroughLand.s +++ b/asm/src/ActionThroughLand.s @@ -307,20 +307,40 @@ lbl_803114B0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253269 $$253269: - .incbin "baserom.dol", 0x47D578, 0xC + .asciz "FChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard17ActionThroughLand __vt__Q53scn4step7gimmick10guideboard17ActionThroughLand: - .incbin "baserom.dol", 0x47D584, 0x44 + .4byte 0 + .4byte 0 + .4byte 0x80311108 + .4byte 0x80311110 + .4byte 0x80311134 + .4byte 0x803111D8 + .4byte 0x803111DC + .4byte 0x80310570 + .4byte 0x8031056C + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80311378 + .4byte 0x80310574 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253223 $$253223: - .incbin "baserom.dol", 0x496B40, 0x8 + .asciz "FTopL" + .balign 4 .global $$253236 $$253236: - .incbin "baserom.dol", 0x496B48, 0x8 + .asciz "FWait1" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253318 $$253318: - .incbin "baserom.dol", 0x49D420, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ActionVacuumSuper.s b/asm/src/ActionVacuumSuper.s index e28c3413..06a5dea5 100644 --- a/asm/src/ActionVacuumSuper.s +++ b/asm/src/ActionVacuumSuper.s @@ -301,29 +301,51 @@ lbl_803118CC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252897 $$252897: - .incbin "baserom.dol", 0x47D5C8, 0xC + .asciz "EChange2" + .balign 4 .global $$252901 $$252901: - .incbin "baserom.dol", 0x47D5D4, 0xC + .asciz "EChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard17ActionVacuumSuper __vt__Q53scn4step7gimmick10guideboard17ActionVacuumSuper: - .incbin "baserom.dol", 0x47D5E0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80311538 + .4byte 0x80310578 + .4byte 0x80311540 + .4byte 0x80311590 + .4byte 0x80311630 + .4byte 0x80310570 + .4byte 0x8031056C + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x803116B8 + .4byte 0x80311734 + .4byte 0x80311794 + .4byte 0x80310550 + .4byte 0x80310574 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252880 $$252880: - .incbin "baserom.dol", 0x496B50, 0x8 + .asciz "ETopL" + .balign 4 .global $$252882 $$252882: - .incbin "baserom.dol", 0x496B58, 0x8 + .asciz "EWait2" + .balign 4 .global $$252892 $$252892: - .incbin "baserom.dol", 0x496B60, 0x8 + .asciz "EWait1" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252902 $$252902: - .incbin "baserom.dol", 0x49D428, 0x4 + .4byte 0xBF800000 .global $$252937 $$252937: - .incbin "baserom.dol", 0x49D42C, 0x4 + .4byte 0 diff --git a/asm/src/ActionVomit.s b/asm/src/ActionVomit.s index 7584c6a2..f5eb6655 100644 --- a/asm/src/ActionVomit.s +++ b/asm/src/ActionVomit.s @@ -326,21 +326,43 @@ lbl_80311D4C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252912 $$252912: - .incbin "baserom.dol", 0x47D628, 0xC + .asciz "AChange2" + .balign 4 .global $$252932 $$252932: - .incbin "baserom.dol", 0x47D634, 0xC + .asciz "AChange1" + .balign 4 .global __vt__Q53scn4step7gimmick10guideboard11ActionVomit __vt__Q53scn4step7gimmick10guideboard11ActionVomit: - .incbin "baserom.dol", 0x47D640, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80311954 + .4byte 0x8031195C + .4byte 0x80311960 + .4byte 0x803119B0 + .4byte 0x80311A24 + .4byte 0x80311AAC + .4byte 0x80311C20 + .4byte 0x80310568 + .4byte 0x80310564 + .4byte 0x80310560 + .4byte 0x8031055C + .4byte 0x80310558 + .4byte 0x80310554 + .4byte 0x80310550 + .4byte 0x80310574 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252894 $$252894: - .incbin "baserom.dol", 0x496B68, 0x8 + .asciz "ATopL" + .balign 4 .global $$252898 $$252898: - .incbin "baserom.dol", 0x496B70, 0x8 + .asciz "AWait1" + .balign 4 .global $$252907 $$252907: - .incbin "baserom.dol", 0x496B78, 0x8 + .asciz "AWait2" + .balign 4 diff --git a/asm/src/ActorDiamond.s b/asm/src/ActorDiamond.s index 84d8ec29..02d081e6 100644 --- a/asm/src/ActorDiamond.s +++ b/asm/src/ActorDiamond.s @@ -4238,136 +4238,150 @@ isSpine__Q35mcoll6detail12LandGridDataCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BELTCONVEYOR_SPEED__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2 T_BELTCONVEYOR_SPEED__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2: - .incbin "baserom.dol", 0x410D30, 0x18 + .4byte 0 + .4byte 0x3D0F5C29 + .4byte 0x3D4CCCCD + .4byte 0x3D8F5C29 + .4byte 0x3E800000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q35mcoll6detail12ActorDiamond __vt__Q35mcoll6detail12ActorDiamond: - .incbin "baserom.dol", 0x454178, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x801B141C ;# ptr + .4byte 0x801B312C ;# ptr + .4byte 0x801B3124 ;# ptr + .4byte 0x801B3134 ;# ptr + .4byte 0x801B3184 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253991 $$253991: - .incbin "baserom.dol", 0x4935E0, 0x4 + .4byte 0x00000002 .global $$253994 $$253994: - .incbin "baserom.dol", 0x4935E4, 0x4 + .4byte 0x00000003 .global $$253995 $$253995: - .incbin "baserom.dol", 0x4935E8, 0x4 + .4byte 0x00000001 .global $$253997 $$253997: - .incbin "baserom.dol", 0x4935EC, 0x4 + .4byte 0x00000001 .global $$253998 $$253998: - .incbin "baserom.dol", 0x4935F0, 0x4 + .4byte 0x00000003 .global $$253999 $$253999: - .incbin "baserom.dol", 0x4935F4, 0x4 + .4byte 0 .global $$254001 $$254001: - .incbin "baserom.dol", 0x4935F8, 0x4 + .4byte 0x00000001 .global $$254004 $$254004: - .incbin "baserom.dol", 0x4935FC, 0x4 + .4byte 0 .global $$254005 $$254005: - .incbin "baserom.dol", 0x493600, 0x4 + .4byte 0x00000002 .global $$254007 $$254007: - .incbin "baserom.dol", 0x493604, 0x4 + .4byte 0x00000002 .global $$254008 $$254008: - .incbin "baserom.dol", 0x493608, 0x4 + .4byte 0 .global $$254009 $$254009: - .incbin "baserom.dol", 0x49360C, 0x4 + .4byte 0x00000003 .global $$254013 $$254013: - .incbin "baserom.dol", 0x493610, 0x4 + .4byte 0x00000003 .global $$254016 $$254016: - .incbin "baserom.dol", 0x493614, 0x4 + .4byte 0x00000002 .global $$254017 $$254017: - .incbin "baserom.dol", 0x493618, 0x4 + .4byte 0 .global $$254019 $$254019: - .incbin "baserom.dol", 0x49361C, 0x4 + .4byte 0 .global $$254020 $$254020: - .incbin "baserom.dol", 0x493620, 0x4 + .4byte 0x00000002 .global $$254021 $$254021: - .incbin "baserom.dol", 0x493624, 0x4 + .4byte 0x00000001 .global $$254023 $$254023: - .incbin "baserom.dol", 0x493628, 0x4 + .4byte 0 .global $$254026 $$254026: - .incbin "baserom.dol", 0x49362C, 0x4 + .4byte 0x00000001 .global $$254027 $$254027: - .incbin "baserom.dol", 0x493630, 0x4 + .4byte 0x00000003 .global $$254029 $$254029: - .incbin "baserom.dol", 0x493634, 0x4 + .4byte 0x00000003 .global $$254030 $$254030: - .incbin "baserom.dol", 0x493638, 0x4 + .4byte 0x00000001 .global $$254031 $$254031: - .incbin "baserom.dol", 0x49363C, 0x4 + .4byte 0x00000002 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259613 $$259613: - .incbin "baserom.dol", 0x49A530, 0x4 + .4byte 0 .global $$259746 $$259746: - .incbin "baserom.dol", 0x49A534, 0x4 + .4byte 0x358637BD .global $$2LOCAL$$2exec__Q45mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$24WorkFv$$2distMin $$2LOCAL$$2exec__Q45mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$24WorkFv$$2distMin: - .incbin "baserom.dol", 0x49A538, 0x4 + .4byte 0 .global $$2LOCAL$$2collide__Q45mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$24WorkFv$$2STATIC_ARGS $$2LOCAL$$2collide__Q45mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$24WorkFv$$2STATIC_ARGS: - .incbin "baserom.dol", 0x49A53C, 0x4 + .4byte 0x00000101 .global $$259758 $$259758: - .incbin "baserom.dol", 0x49A540, 0x4 + .4byte 0x3F800000 .global $$254672 $$254672: - .incbin "baserom.dol", 0x49A544, 0x4 + .4byte 0xFF8040FF .global $$254674 $$254674: - .incbin "baserom.dol", 0x49A548, 0x4 + .4byte 0xFFFF80FF .global $$259916 $$259916: - .incbin "baserom.dol", 0x49A54C, 0x4 + .4byte 0x3DCCCCCD .global $$259917 $$259917: - .incbin "baserom.dol", 0x49A550, 0x4 + .4byte 0xBF800000 .global $$259918 $$259918: - .incbin "baserom.dol", 0x49A554, 0x4 + .4byte 0x3727C5AC .global $$259919 $$259919: - .incbin "baserom.dol", 0x49A558, 0x4 + .4byte 0x3F000000 .global $$260302 $$260302: - .incbin "baserom.dol", 0x49A55C, 0x4 + .4byte 0xBF35C28F .global $$260305 $$260305: - .incbin "baserom.dol", 0x49A560, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$260531 $$260531: - .incbin "baserom.dol", 0x49A568, 0x4 + .4byte 0xB727C5AC .global $$260603 $$260603: - .incbin "baserom.dol", 0x49A56C, 0x4 + .4byte 0x3F8CCCCD .global $$260610 $$260610: - .incbin "baserom.dol", 0x49A570, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global object___Q33hel6common57ExplicitSingleton$$0Q35mcoll6detail21CollideTargetReposSet$$1 diff --git a/asm/src/AddOnCast.s b/asm/src/AddOnCast.s index 79ed8645..e0cf896a 100644 --- a/asm/src/AddOnCast.s +++ b/asm/src/AddOnCast.s @@ -110,15 +110,28 @@ lbl_801A0EE8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252192 $$252192: - .incbin "baserom.dol", 0x452AE0, 0xC + .asciz "HEL.Cast" + .balign 4 .global $$252193 $$252193: - .incbin "baserom.dol", 0x452AEC, 0x10 + .asciz "float I2F(int)" + .balign 4 .global $$252194 $$252194: - .incbin "baserom.dol", 0x452AFC, 0x64 + .asciz "int F2I(float)" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252188 $$252188: - .incbin "baserom.dol", 0x49A420, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/AddOnMathDirection3.s b/asm/src/AddOnMathDirection3.s index 2ad1a596..ec07f0c6 100644 --- a/asm/src/AddOnMathDirection3.s +++ b/asm/src/AddOnMathDirection3.s @@ -963,114 +963,164 @@ Create__Q33hel4mint19AddOnMathDirection3FRCQ33hel4math7Vector3RCQ33hel4math7Vect .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254658 $$254658: - .incbin "baserom.dol", 0x452B60, 0x14 + .asciz "HEL.Math.Direction3" .global $$254662 $$254662: - .incbin "baserom.dol", 0x452B74, 0x5C + .asciz "void this(const ref HEL.Math.Vector3,const ref HEL.Math.Vector3,const ref HEL.Math.Vector3)" .global $$254663 $$254663: - .incbin "baserom.dol", 0x452BD0, 0x18 + .asciz "void restructFrontUp()" + .balign 4 .global $$254664 $$254664: - .incbin "baserom.dol", 0x452BE8, 0x1C + .asciz "void restructFrontLeft()" + .balign 4 .global $$254665 $$254665: - .incbin "baserom.dol", 0x452C04, 0x18 + .asciz "void restructUpFront()" + .balign 4 .global $$254666 $$254666: - .incbin "baserom.dol", 0x452C1C, 0x18 + .asciz "void restructUpLeft()" + .balign 4 .global $$254667 $$254667: - .incbin "baserom.dol", 0x452C34, 0x1C + .asciz "void restructLeftFront()" + .balign 4 .global $$254668 $$254668: - .incbin "baserom.dol", 0x452C50, 0x18 + .asciz "void restructLeftUp()" + .balign 4 .global $$254669 $$254669: - .incbin "baserom.dol", 0x452C68, 0x10 + .asciz "void LoadLeft()" .global $$254670 $$254670: - .incbin "baserom.dol", 0x452C78, 0x10 + .asciz "void LoadUp()" + .balign 4 .global $$254671 $$254671: - .incbin "baserom.dol", 0x452C88, 0x14 + .asciz "void LoadFront()" + .balign 4 .global $$254672 $$254672: - .incbin "baserom.dol", 0x452C9C, 0x14 + .asciz "void StoreLeft()" + .balign 4 .global $$254673 $$254673: - .incbin "baserom.dol", 0x452CB0, 0x10 + .asciz "void StoreUp()" + .balign 4 .global $$254674 $$254674: - .incbin "baserom.dol", 0x452CC0, 0x18 + .asciz "void StoreFront()" + .balign 4 + .4byte 0 .global $$254675 $$254675: - .incbin "baserom.dol", 0x452CD8, 0x10 + .asciz "void SetBasis()" .global $$254676 $$254676: - .incbin "baserom.dol", 0x452CE8, 0x18 + .asciz "void SetFrontToRight()" + .balign 4 .global $$254677 $$254677: - .incbin "baserom.dol", 0x452D00, 0x18 + .asciz "void SetFrontToLeft()" + .balign 4 .global $$254678 $$254678: - .incbin "baserom.dol", 0x452D18, 0x18 + .asciz "void RestructFrontUp()" + .balign 4 .global $$254679 $$254679: - .incbin "baserom.dol", 0x452D30, 0x1C + .asciz "void RestructFrontLeft()" + .balign 4 .global $$254680 $$254680: - .incbin "baserom.dol", 0x452D4C, 0x18 + .asciz "void RestructUpFront()" + .balign 4 .global $$254681 $$254681: - .incbin "baserom.dol", 0x452D64, 0x18 + .asciz "void RestructUpLeft()" + .balign 4 .global $$254682 $$254682: - .incbin "baserom.dol", 0x452D7C, 0x1C + .asciz "void RestructLeftFront()" + .balign 4 .global $$254683 $$254683: - .incbin "baserom.dol", 0x452D98, 0x18 + .asciz "void RestructLeftUp()" + .balign 4 .global $$254684 $$254684: - .incbin "baserom.dol", 0x452DB0, 0x1C + .asciz "HEL.Math.Direction3 Get()" + .balign 4 .global $$254685 $$254685: - .incbin "baserom.dol", 0x452DCC, 0x20 + .asciz "void Set(HEL.Math.Direction3)" + .balign 4 .global $$254686 $$254686: - .incbin "baserom.dol", 0x452DEC, 0x1C + .asciz "HEL.Math.Direction3 Basis()" .global $$254687 $$254687: - .incbin "baserom.dol", 0x452E08, 0x70 + .asciz "HEL.Math.Direction3 Create(const ref HEL.Math.Vector3,const ref HEL.Math.Vector3,const ref HEL.Math.Vector3)" + .balign 4 .global $$254769 $$254769: - .incbin "baserom.dol", 0x452E78, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A1468 ;# ptr .global $$254815 $$254815: - .incbin "baserom.dol", 0x452E84, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A155C ;# ptr .global $$254827 $$254827: - .incbin "baserom.dol", 0x452E90, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A15F4 ;# ptr .global $$254840 $$254840: - .incbin "baserom.dol", 0x452E9C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A168C ;# ptr .global $$254854 $$254854: - .incbin "baserom.dol", 0x452EA8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A1724 ;# ptr .global $$254863 $$254863: - .incbin "baserom.dol", 0x452EB4, 0x84 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A17BC ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254659 $$254659: - .incbin "baserom.dol", 0x493268, 0x8 + .asciz "left" + .balign 4 .global $$254660 $$254660: - .incbin "baserom.dol", 0x493270, 0x4 + .4byte 0x75700000 .global $$254661 $$254661: - .incbin "baserom.dol", 0x493274, 0xC + .asciz "front" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2t_obj__Q33hel4mint33$$2unnamed$$2AddOnMathDirection3_cpp$$2Fv$$2obj diff --git a/asm/src/AddOnMathMath.s b/asm/src/AddOnMathMath.s index 281b321f..b70ca876 100644 --- a/asm/src/AddOnMathMath.s +++ b/asm/src/AddOnMathMath.s @@ -224,42 +224,60 @@ Func__Q43hel4mint13AddOnMathMath37Mint_SinRadF_0$52440AddOnMathMath_cppFRQ26mint .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252822 $$252822: - .incbin "baserom.dol", 0x452F38, 0x10 + .asciz "HEL.Math.Math" + .balign 4 .global $$252823 $$252823: - .incbin "baserom.dol", 0x452F48, 0x18 + .asciz "float SinRadF(float)" + .balign 4 .global $$252824 $$252824: - .incbin "baserom.dol", 0x452F60, 0x18 + .asciz "float CosRadF(float)" + .balign 4 .global $$252825 $$252825: - .incbin "baserom.dol", 0x452F78, 0x18 + .asciz "float TanRadF(float)" + .balign 4 .global $$252826 $$252826: - .incbin "baserom.dol", 0x452F90, 0x18 + .asciz "float SinDegF(float)" + .balign 4 .global $$252827 $$252827: - .incbin "baserom.dol", 0x452FA8, 0x18 + .asciz "float CosDegF(float)" + .balign 4 .global $$252828 $$252828: - .incbin "baserom.dol", 0x452FC0, 0x18 + .asciz "float TanDegF(float)" + .balign 4 .global $$252829 $$252829: - .incbin "baserom.dol", 0x452FD8, 0x68 + .asciz "bool EqZero(float)" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252792 $$252792: - .incbin "baserom.dol", 0x49A428, 0x4 + .4byte 0x4222F983 .global $$252805 $$252805: - .incbin "baserom.dol", 0x49A42C, 0x4 + .4byte 0x3CC90FDB .global $$252809 $$252809: - .incbin "baserom.dol", 0x49A430, 0x4 + .4byte 0x3C8EFA35 .global $$252819 $$252819: - .incbin "baserom.dol", 0x49A434, 0x4 + .4byte 0x3727C5AC .global $$252820 $$252820: - .incbin "baserom.dol", 0x49A438, 0x8 + .4byte 0xB727C5AC + .4byte 0 diff --git a/asm/src/AddOnMathVector3.s b/asm/src/AddOnMathVector3.s index 48287cc8..db64c766 100644 --- a/asm/src/AddOnMathVector3.s +++ b/asm/src/AddOnMathVector3.s @@ -332,7 +332,8 @@ SlotSub__Q33hel4mint16AddOnMathVector3FUl: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253590 $$253590: - .incbin "baserom.dol", 0x49A440, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2t_obj__Q33hel4mint30$$2unnamed$$2AddOnMathVector3_cpp$$2Fv$$2obj diff --git a/asm/src/AddOnMint.s b/asm/src/AddOnMint.s index 48bd9adf..0c56c502 100644 --- a/asm/src/AddOnMint.s +++ b/asm/src/AddOnMint.s @@ -31373,3594 +31373,5494 @@ lbl_8040262C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252191 $$252191: - .incbin "baserom.dol", 0x450148, 0x14 + .asciz "G3D.NodeAccessor" + .balign 4 .global $$252192 $$252192: - .incbin "baserom.dol", 0x45015C, 0x18 + .asciz "void LoadWorldTrans()" + .balign 4 .global $$252193 $$252193: - .incbin "baserom.dol", 0x450174, 0x18 + .asciz "void LoadWorldRotate()" + .balign 4 .global $$252194 $$252194: - .incbin "baserom.dol", 0x45018C, 0x18 + .asciz "void LoadWorldScale()" + .balign 4 .global $$252195 $$252195: - .incbin "baserom.dol", 0x4501A4, 0x14 + .asciz "bool IsVisible()" + .balign 4 .global $$252196 $$252196: - .incbin "baserom.dol", 0x4501B8, 0x1C + .asciz "void SetVisibility(bool)" + .balign 4 .global $$252197 $$252197: - .incbin "baserom.dol", 0x4501D4, 0x20 + .asciz "void SetVisibilityBelow(bool)" + .balign 4 .global $$252198 $$252198: - .incbin "baserom.dol", 0x4501F4, 0x14 + .asciz "G3D.ModelAccessor" + .balign 4 .global $$2STRING$$2internal_getRet_addr__Q26mintvm13MintFuncProxyCFv$$20 $$2STRING$$2internal_getRet_addr__Q26mintvm13MintFuncProxyCFv$$20: - .incbin "baserom.dol", 0x450208, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2internal_getRet_addr__Q26mintvm13MintFuncProxyCFv $$2STRING$$2internal_getRet_addr__Q26mintvm13MintFuncProxyCFv: - .incbin "baserom.dol", 0x45021C, 0x14 + .asciz "MintFuncProxy.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl$$20 $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl$$20: - .incbin "baserom.dol", 0x450230, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl: - .incbin "baserom.dol", 0x450248, 0x10 + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255014 $$255014: - .incbin "baserom.dol", 0x450AE0, 0x10 + .asciz "GObj.Anim" + .balign 4 + .4byte 0 .global $$255015 $$255015: - .incbin "baserom.dol", 0x450AF0, 0x10 + .asciz "void Start(int)" .global $$255016 $$255016: - .incbin "baserom.dol", 0x450B00, 0x18 + .asciz "void Start(int,bool)" + .balign 4 .global $$255017 $$255017: - .incbin "baserom.dol", 0x450B18, 0x1C + .asciz "void Start(int,bool,float)" + .balign 4 .global $$255018 $$255018: - .incbin "baserom.dol", 0x450B34, 0x10 + .asciz "float Frame()" + .balign 4 .global $$255019 $$255019: - .incbin "baserom.dol", 0x450B44, 0x14 + .asciz "int TotalFrame()" + .balign 4 .global $$255020 $$255020: - .incbin "baserom.dol", 0x450B58, 0x18 + .asciz "void SetFrame(float)" + .balign 4 .global $$255021 $$255021: - .incbin "baserom.dol", 0x450B70, 0x18 + .asciz "void SetFrameToHead()" + .balign 4 .global $$255022 $$255022: - .incbin "baserom.dol", 0x450B88, 0x18 + .asciz "void SetFrameToTail()" + .balign 4 .global $$255023 $$255023: - .incbin "baserom.dol", 0x450BA0, 0x18 + .asciz "bool IsAnimEnd()" + .balign 4 + .4byte 0 .global $$255024 $$255024: - .incbin "baserom.dol", 0x450BB8, 0x10 + .asciz "bool IsLooped()" .global $$255025 $$255025: - .incbin "baserom.dol", 0x450BC8, 0x14 + .asciz "float FrameRate()" + .balign 4 .global $$255026 $$255026: - .incbin "baserom.dol", 0x450BDC, 0x1C + .asciz "void SetFrameRate(float)" + .balign 4 .global $$255027 $$255027: - .incbin "baserom.dol", 0x450BF8, 0x20 + .asciz "int CurrentG3DAnimIndex()" + .balign 4 + .4byte 0 .global $$255028 $$255028: - .incbin "baserom.dol", 0x450C18, 0x20 + .asciz "void CheckIsReachableFrame(int)" .global $$255029 $$255029: - .incbin "baserom.dol", 0x450C38, 0x10 + .asciz "GObj.FootState" + .balign 4 .global $$255030 $$255030: - .incbin "baserom.dol", 0x450C48, 0x10 + .asciz "bool IsGround()" .global $$255031 $$255031: - .incbin "baserom.dol", 0x450C58, 0x10 + .asciz "bool IsAir()" + .balign 4 .global $$255032 $$255032: - .incbin "baserom.dol", 0x450C68, 0x10 + .asciz "GObj.GearAnim" + .balign 4 .global $$255033 $$255033: - .incbin "baserom.dol", 0x450C78, 0x18 + .asciz "void start(int)const" + .balign 4 .global $$255034 $$255034: - .incbin "baserom.dol", 0x450C90, 0x1C + .asciz "void start(int,bool)const" + .balign 4 .global $$255035 $$255035: - .incbin "baserom.dol", 0x450CAC, 0x20 + .asciz "void start(int,bool,uint)const" + .balign 4 .global $$255036 $$255036: - .incbin "baserom.dol", 0x450CCC, 0x14 + .asciz "float frame()const" + .balign 4 .global $$255037 $$255037: - .incbin "baserom.dol", 0x450CE0, 0x18 + .asciz "float totalFrame()const" .global $$255038 $$255038: - .incbin "baserom.dol", 0x450CF8, 0x18 + .asciz "void setFrame(float)" + .balign 4 .global $$255039 $$255039: - .incbin "baserom.dol", 0x450D10, 0x18 + .asciz "bool isAnimEnd()const" + .balign 4 .global $$255040 $$255040: - .incbin "baserom.dol", 0x450D28, 0x18 + .asciz "bool isLooped()const" + .balign 4 .global $$255041 $$255041: - .incbin "baserom.dol", 0x450D40, 0x18 + .asciz "float frameRate()const" + .balign 4 .global $$255042 $$255042: - .incbin "baserom.dol", 0x450D58, 0x20 + .asciz "void setFrameRate(float)const" + .balign 4 .global $$255043 $$255043: - .incbin "baserom.dol", 0x450D78, 0x20 + .asciz "int currentG3DAnimIndex()const" + .balign 4 .global $$255044 $$255044: - .incbin "baserom.dol", 0x450D98, 0x14 + .asciz "GObj.GearAnim Obj()" .global $$255045 $$255045: - .incbin "baserom.dol", 0x450DAC, 0x1C + .asciz "void Start(int,bool,int)" + .balign 4 .global $$255046 $$255046: - .incbin "baserom.dol", 0x450DC8, 0x10 + .asciz "GObj.Location" + .balign 4 .global $$255047 $$255047: - .incbin "baserom.dol", 0x450DD8, 0x10 + .asciz "void LoadPos()" + .balign 4 .global $$255048 $$255048: - .incbin "baserom.dol", 0x450DE8, 0x14 + .asciz "void LoadPrevPos()" + .balign 4 .global $$255049 $$255049: - .incbin "baserom.dol", 0x450DFC, 0x20 + .asciz "const HEL.Math.Vector3 Pos()" + .balign 4 .global $$255050 $$255050: - .incbin "baserom.dol", 0x450E1C, 0x24 + .asciz "const HEL.Math.Vector3 PrevPos()" + .balign 4 .global $$255051 $$255051: - .incbin "baserom.dol", 0x450E40, 0x10 + .asciz "GObj.MeshFlip" + .balign 4 .global $$255052 $$255052: - .incbin "baserom.dol", 0x450E50, 0x10 + .asciz "void Flip(int)" + .balign 4 .global $$255053 $$255053: - .incbin "baserom.dol", 0x450E60, 0xC + .asciz "GObj.Model" + .balign 4 .global $$255054 $$255054: - .incbin "baserom.dol", 0x450E6C, 0x14 + .asciz "void LoadNode(int)" + .balign 4 .global $$255055 $$255055: - .incbin "baserom.dol", 0x450E80, 0x24 + .asciz "void SetScale(float,float,float)" + .balign 4 .global $$255056 $$255056: - .incbin "baserom.dol", 0x450EA4, 0xC + .asciz "GObj.Move" + .balign 4 .global $$255057 $$255057: - .incbin "baserom.dol", 0x450EB0, 0x14 + .asciz "float GetSpeedH()" + .balign 4 .global $$255058 $$255058: - .incbin "baserom.dol", 0x450EC4, 0x14 + .asciz "float GetSpeedV()" + .balign 4 .global $$255059 $$255059: - .incbin "baserom.dol", 0x450ED8, 0x14 + .asciz "float GetSpeedD()" + .balign 4 .global $$255060 $$255060: - .incbin "baserom.dol", 0x450EEC, 0x18 + .asciz "void SetSpeedH(float)" + .balign 4 .global $$255061 $$255061: - .incbin "baserom.dol", 0x450F04, 0x18 + .asciz "void SetSpeedV(float)" + .balign 4 .global $$255062 $$255062: - .incbin "baserom.dol", 0x450F1C, 0x18 + .asciz "void SetSpeedD(float)" + .balign 4 .global $$255063 $$255063: - .incbin "baserom.dol", 0x450F34, 0xC + .asciz "GObj.Script" .global $$255064 $$255064: - .incbin "baserom.dol", 0x450F40, 0x18 + .asciz "int PrevScriptIndex()" + .balign 4 .global $$255065 $$255065: - .incbin "baserom.dol", 0x450F58, 0xC + .asciz "GObj.Target" .global $$255066 $$255066: - .incbin "baserom.dol", 0x450F64, 0x14 + .asciz "bool IsRightDir()" + .balign 4 .global $$255067 $$255067: - .incbin "baserom.dol", 0x450F78, 0x20 + .asciz "void SetIsRightDir(bool)" + .balign 4 + .4byte 0 .global $$255068 $$255068: - .incbin "baserom.dol", 0x450F98, 0x10 + .asciz "float GetSign()" .global $$255069 $$255069: - .incbin "baserom.dol", 0x450FA8, 0x10 + .asciz "void Invert()" + .balign 4 .global $$255070 $$255070: - .incbin "baserom.dol", 0x450FB8, 0x18 + .asciz "void LoadDirection3()" + .balign 4 .global $$255246 $$255246: - .incbin "baserom.dol", 0x450FD0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198B8C ;# ptr .global $$255273 $$255273: - .incbin "baserom.dol", 0x450FDC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198C58 ;# ptr .global $$255285 $$255285: - .incbin "baserom.dol", 0x450FE8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198D64 ;# ptr .global $$255299 $$255299: - .incbin "baserom.dol", 0x450FF4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198DB4 ;# ptr .global $$255318 $$255318: - .incbin "baserom.dol", 0x451000, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198E90 ;# ptr .global $$255327 $$255327: - .incbin "baserom.dol", 0x45100C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198EE0 ;# ptr .global $$255336 $$255336: - .incbin "baserom.dol", 0x451018, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80198F30 ;# ptr .global $$255350 $$255350: - .incbin "baserom.dol", 0x451024, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80199014 ;# ptr .global $$255359 $$255359: - .incbin "baserom.dol", 0x451030, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801990C0 ;# ptr .global $$255366 $$255366: - .incbin "baserom.dol", 0x45103C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80199158 ;# ptr .global $$255373 $$255373: - .incbin "baserom.dol", 0x451048, 0x38 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801991DC ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 .global $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl$$20 $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl$$20: - .incbin "baserom.dol", 0x451080, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl: - .incbin "baserom.dol", 0x451098, 0x38 + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257683 $$257683: - .incbin "baserom.dol", 0x45FEF8, 0x18 + .asciz "Scn.Step.Boss.Effect" + .balign 4 .global $$257684 $$257684: - .incbin "baserom.dol", 0x45FF10, 0x14 + .asciz "void BindSuper()" + .balign 4 .global $$257685 $$257685: - .incbin "baserom.dol", 0x45FF24, 0x14 + .asciz "void BindNormal()" + .balign 4 .global $$257686 $$257686: - .incbin "baserom.dol", 0x45FF38, 0x18 + .asciz "void BindNormalWarp()" + .balign 4 .global $$257687 $$257687: - .incbin "baserom.dol", 0x45FF50, 0x14 + .asciz "void BindState()" + .balign 4 .global $$257688 $$257688: - .incbin "baserom.dol", 0x45FF64, 0x1C + .asciz "void BindStateWarp()" + .balign 4 + .4byte 0 .global $$257689 $$257689: - .incbin "baserom.dol", 0x45FF80, 0x10 + .asciz "void BindBack()" .global $$257690 $$257690: - .incbin "baserom.dol", 0x45FF90, 0x10 + .asciz "void BindFore()" .global $$257691 $$257691: - .incbin "baserom.dol", 0x45FFA0, 0x18 + .asciz "Scn.Step.Boss.SoundSE" + .balign 4 .global $$257692 $$257692: - .incbin "baserom.dol", 0x45FFB8, 0x10 + .asciz "void BindLoop()" .global $$257693 $$257693: - .incbin "baserom.dol", 0x45FFC8, 0x14 + .asciz "Scn.Step.Boss.Gear" + .balign 4 .global $$257694 $$257694: - .incbin "baserom.dol", 0x45FFDC, 0x10 + .asciz "void Bind(int)" + .balign 4 .global $$257695 $$257695: - .incbin "baserom.dol", 0x45FFEC, 0x1C + .asciz "Scn.Step.Boss.AttackFlash" + .balign 4 .global $$257696 $$257696: - .incbin "baserom.dol", 0x460008, 0x20 + .asciz "void SetStart(int,int,int,int)" + .balign 4 .global $$257697 $$257697: - .incbin "baserom.dol", 0x460028, 0x14 + .asciz "void SetContinue()" + .balign 4 .global $$257698 $$257698: - .incbin "baserom.dol", 0x46003C, 0x20 + .asciz "void SetEnd(int,int,int,int)" + .balign 4 .global $$257699 $$257699: - .incbin "baserom.dol", 0x46005C, 0x10 + .asciz "void Cancel()" + .balign 4 .global $$257700 $$257700: - .incbin "baserom.dol", 0x46006C, 0x1C + .asciz "void SetAlphaIncRate(float)" .global $$257701 $$257701: - .incbin "baserom.dol", 0x460088, 0x1C + .asciz "Scn.Step.Boss.GuardFlash" + .balign 4 .global $$257702 $$257702: - .incbin "baserom.dol", 0x4600A4, 0x18 + .asciz "void SetIsValid(bool)" + .balign 4 .global $$257703 $$257703: - .incbin "baserom.dol", 0x4600BC, 0x1C + .asciz "Scn.Step.Boss.CustomFlash" + .balign 4 .global $$257704 $$257704: - .incbin "baserom.dol", 0x4600D8, 0x20 + .asciz "void SetColor(int,int,int,int)" + .balign 4 .global $$257705 $$257705: - .incbin "baserom.dol", 0x4600F8, 0x18 + .asciz "void SetOperation(int)" + .balign 4 .global $$257706 $$257706: - .incbin "baserom.dol", 0x460110, 0x14 + .asciz "Scn.Step.Boss.Angry" .global $$257707 $$257707: - .incbin "baserom.dol", 0x460124, 0x10 + .asciz "bool Check()" + .balign 4 .global $$257708 $$257708: - .incbin "baserom.dol", 0x460134, 0x10 + .asciz "bool IsAngry()" + .balign 4 .global $$257709 $$257709: - .incbin "baserom.dol", 0x460144, 0x18 + .asciz "Scn.Step.Boss.Utility" + .balign 4 .global $$257710 $$257710: - .incbin "baserom.dol", 0x46015C, 0x2C + .asciz "bool IsHeroInRange(float,float,float,float)" .global $$257711 $$257711: - .incbin "baserom.dol", 0x460188, 0x38 + .asciz "bool IsHatedHeroInRange(float,float,float,float)" + .balign 4 + .4byte 0 .global $$257712 $$257712: - .incbin "baserom.dol", 0x4601C0, 0x18 + .asciz "bool IsHeroUpper(float)" .global $$257713 $$257713: - .incbin "baserom.dol", 0x4601D8, 0x14 + .asciz "bool IsHeroSuper()" + .balign 4 .global $$257714 $$257714: - .incbin "baserom.dol", 0x4601EC, 0x18 + .asciz "bool IsHitWallFront()" + .balign 4 .global $$257715 $$257715: - .incbin "baserom.dol", 0x460204, 0x18 + .asciz "bool IsHitWallBack()" + .balign 4 .global $$257716 $$257716: - .incbin "baserom.dol", 0x46021C, 0x1C + .asciz "bool IsFootStateGround()" + .balign 4 .global $$257717 $$257717: - .incbin "baserom.dol", 0x460238, 0x20 + .asciz "bool IsExistSuperElement()" + .balign 4 + .4byte 0 .global $$257718 $$257718: - .incbin "baserom.dol", 0x460258, 0x18 + .asciz "float GetHitPointRate()" .global $$257719 $$257719: - .incbin "baserom.dol", 0x460270, 0x10 + .asciz "int GetLevel()" + .balign 4 .global $$257720 $$257720: - .incbin "baserom.dol", 0x460280, 0x18 + .asciz "bool IsVariationExtra()" .global $$257721 $$257721: - .incbin "baserom.dol", 0x460298, 0x1C + .asciz "bool IsVariationBossRush()" + .balign 4 .global $$257722 $$257722: - .incbin "baserom.dol", 0x4602B4, 0x3C + .asciz "void GenerateStarEffectPuff(float,float,float,float,int)" + .balign 4 .global $$257723 $$257723: - .incbin "baserom.dol", 0x4602F0, 0x3C + .asciz "void GenerateStarEffectBound(float,float,float,float,int)" + .balign 4 .global $$257724 $$257724: - .incbin "baserom.dol", 0x46032C, 0x14 + .asciz "void LoadBasePos()" + .balign 4 .global $$257725 $$257725: - .incbin "baserom.dol", 0x460340, 0x20 + .asciz "void LoadNearestHeroPos()" + .balign 4 + .4byte 0 .global $$257726 $$257726: - .incbin "baserom.dol", 0x460360, 0x18 + .asciz "void LoadHatedHeroPos()" .global $$257727 $$257727: - .incbin "baserom.dol", 0x460378, 0x20 + .asciz "void SendBossDemoSignal(int)" + .balign 4 .global $$257728 $$257728: - .incbin "baserom.dol", 0x460398, 0x10 + .asciz "bool IsArena()" + .balign 4 .global $$257729 $$257729: - .incbin "baserom.dol", 0x4603A8, 0x14 + .asciz "int GetRetryCount()" .global $$257730 $$257730: - .incbin "baserom.dol", 0x4603BC, 0x1C + .asciz "Scn.Step.Boss.StagingCtrl" + .balign 4 .global $$257731 $$257731: - .incbin "baserom.dol", 0x4603D8, 0x28 + .asciz "void InitZoom(float,float,float)" + .balign 4 + .4byte 0 .global $$257732 $$257732: - .incbin "baserom.dol", 0x460400, 0x20 + .asciz "void SetZoom(float,float,float)" .global $$257733 $$257733: - .incbin "baserom.dol", 0x460420, 0x14 + .asciz "void SetZoom(float)" .global $$257734 $$257734: - .incbin "baserom.dol", 0x460434, 0x14 + .asciz "void UnsetZoom()" + .balign 4 .global $$257735 $$257735: - .incbin "baserom.dol", 0x460448, 0x80 + .asciz "void ChangeZoomIntpRate(float)" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255586 $$255586: - .incbin "baserom.dol", 0x460A88, 0x24 + .asciz "Scn.Step.Boss.Bonkers.SetNextState" + .balign 4 .global $$255587 $$255587: - .incbin "baserom.dol", 0x460AAC, 0x14 + .asciz "void AttackHammer()" .global $$255588 $$255588: - .incbin "baserom.dol", 0x460AC0, 0x18 + .asciz "void AttackFireHammer()" .global $$255589 $$255589: - .incbin "baserom.dol", 0x460AD8, 0x14 + .asciz "void MoveForward()" + .balign 4 .global $$255590 $$255590: - .incbin "baserom.dol", 0x460AEC, 0x1C + .asciz "void StampFoot(float,float)" .global $$255591 $$255591: - .incbin "baserom.dol", 0x460B08, 0x10 + .asciz "void JumpBig()" + .balign 4 .global $$255592 $$255592: - .incbin "baserom.dol", 0x460B18, 0x10 + .asciz "void Swing()" + .balign 4 .global $$255593 $$255593: - .incbin "baserom.dol", 0x460B28, 0x14 + .asciz "void SwingPursuit()" .global $$255594 $$255594: - .incbin "baserom.dol", 0x460B3C, 0x14 + .asciz "void BombStart()" + .balign 4 .global $$255595 $$255595: - .incbin "baserom.dol", 0x460B50, 0x24 + .asciz "void Bomb(float,float,bool,bool)" + .balign 4 .global $$255596 $$255596: - .incbin "baserom.dol", 0x460B74, 0x14 + .asciz "void RainBomb(bool)" .global __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1 __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1: - .incbin "baserom.dol", 0x460B88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802373A0 ;# ptr + .4byte 0x80237264 ;# ptr .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1: - .incbin "baserom.dol", 0x460B98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023739C ;# ptr + .4byte 0x802372B0 ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460BA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80237398 ;# ptr + .4byte 0x80237310 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460BB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80237394 ;# ptr + .4byte 0x8023732C ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460BC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80237390 ;# ptr + .4byte 0x80237348 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460BD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023738C ;# ptr + .4byte 0x80237364 ;# ptr .global __vt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: - .incbin "baserom.dol", 0x460BE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80237388 ;# ptr + .4byte 0x802371BC ;# ptr .global __vt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: - .incbin "baserom.dol", 0x460BF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80237384 ;# ptr + .4byte 0x802371E0 ;# ptr .global __vt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: - .incbin "baserom.dol", 0x460C08, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80237380 ;# ptr + .4byte 0x80237240 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254522 $$254522: - .incbin "baserom.dol", 0x4613F0, 0x2C + .asciz "Scn.Step.Boss.ChallengeMaster.SetNextState" + .balign 4 .global $$254523 $$254523: - .incbin "baserom.dol", 0x46141C, 0x10 + .asciz "void Summon()" + .balign 4 .global $$254524 $$254524: - .incbin "baserom.dol", 0x46142C, 0x14 + .asciz "bool TryToShot()" + .balign 4 .global $$254525 $$254525: - .incbin "baserom.dol", 0x461440, 0x28 + .asciz "Scn.Step.Boss.ChallengeMaster.Custom" + .balign 4 .global $$254526 $$254526: - .incbin "baserom.dol", 0x461468, 0x18 + .asciz "bool IsInferior()" + .balign 4 + .4byte 0 .global $$254527 $$254527: - .incbin "baserom.dol", 0x461480, 0x10 + .asciz "bool IsLosing()" .global $$254528 $$254528: - .incbin "baserom.dol", 0x461490, 0x18 + .asciz "bool IsExistFrontLand()" .global $$254529 $$254529: - .incbin "baserom.dol", 0x4614A8, 0x20 + .asciz "bool IsExistSummonWaitEnemy()" + .balign 4 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4614C8, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x80239E2C ;# ptr + .4byte 0x80239E10 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255073 $$255073: - .incbin "baserom.dol", 0x463338, 0x24 + .asciz "Scn.Step.Boss.Dubior.SetNextState" + .balign 4 .global $$255074 $$255074: - .incbin "baserom.dol", 0x46335C, 0x10 + .asciz "void Call(int)" + .balign 4 .global $$255075 $$255075: - .incbin "baserom.dol", 0x46336C, 0x18 + .asciz "void MoveToOtherSide()" + .balign 4 .global $$255076 $$255076: - .incbin "baserom.dol", 0x463384, 0x14 + .asciz "void HeightAdjust()" .global $$255077 $$255077: - .incbin "baserom.dol", 0x463398, 0xC + .asciz "void Dash()" .global $$255078 $$255078: - .incbin "baserom.dol", 0x4633A4, 0x10 + .asciz "void Glide()" + .balign 4 .global $$255079 $$255079: - .incbin "baserom.dol", 0x4633B4, 0x10 + .asciz "void Thunder()" + .balign 4 .global $$255080 $$255080: - .incbin "baserom.dol", 0x4633C4, 0x14 + .asciz "void MoveThunder()" + .balign 4 .global $$255081 $$255081: - .incbin "baserom.dol", 0x4633D8, 0x18 + .asciz "void Shot(float)" + .balign 4 + .4byte 0 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1: - .incbin "baserom.dol", 0x4633F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C990 ;# ptr + .4byte 0x8024C88C ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463400, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C98C ;# ptr + .4byte 0x8024C8CC ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463410, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C988 ;# ptr + .4byte 0x8024C8E8 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463420, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C984 ;# ptr + .4byte 0x8024C904 ;# ptr .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463430, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C980 ;# ptr + .4byte 0x8024C920 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463440, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C97C ;# ptr + .4byte 0x8024C93C ;# ptr .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463450, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C978 ;# ptr + .4byte 0x8024C958 ;# ptr .global __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1 __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1: - .incbin "baserom.dol", 0x463460, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8024C974 ;# ptr + .4byte 0x8024C8AC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254625 $$254625: - .incbin "baserom.dol", 0x463A10, 0x28 + .asciz "Scn.Step.Boss.GigantEdge.SetNextState" + .balign 4 .global $$254626 $$254626: - .incbin "baserom.dol", 0x463A38, 0x10 + .asciz "void Attack1()" + .balign 4 .global $$254627 $$254627: - .incbin "baserom.dol", 0x463A48, 0x14 + .asciz "void Attack2(int)" + .balign 4 .global $$254628 $$254628: - .incbin "baserom.dol", 0x463A5C, 0x14 + .asciz "void MoveForward()" + .balign 4 .global $$254629 $$254629: - .incbin "baserom.dol", 0x463A70, 0x10 + .asciz "void MoveBack()" .global $$254630 $$254630: - .incbin "baserom.dol", 0x463A80, 0x10 + .asciz "void Dash(bool)" .global $$254631 $$254631: - .incbin "baserom.dol", 0x463A90, 0x10 + .asciz "void Guard()" + .balign 4 .global $$254632 $$254632: - .incbin "baserom.dol", 0x463AA0, 0x10 + .asciz "void Shot(bool)" .global $$254633 $$254633: - .incbin "baserom.dol", 0x463AB0, 0x18 + .asciz "void JumpAttack()" + .balign 4 + .4byte 0 .global __vt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: - .incbin "baserom.dol", 0x463AC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B40 ;# ptr + .4byte 0x80251A30 ;# ptr .global __vt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1 __vt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1: - .incbin "baserom.dol", 0x463AD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B3C ;# ptr + .4byte 0x80251AC0 ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463AE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B38 ;# ptr + .4byte 0x80251B0C ;# ptr .global __vt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: - .incbin "baserom.dol", 0x463AF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B34 ;# ptr + .4byte 0x80251A04 ;# ptr .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: - .incbin "baserom.dol", 0x463B08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B30 ;# ptr + .4byte 0x80251A58 ;# ptr .global __vt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: - .incbin "baserom.dol", 0x463B18, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80251B2C ;# ptr + .4byte 0x80251AB8 ;# ptr .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: - .incbin "baserom.dol", 0x463B28, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80251B28 ;# ptr + .4byte 0x80251ABC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255274 $$255274: - .incbin "baserom.dol", 0x464150, 0x24 + .asciz "Scn.Step.Boss.KingsDoo.SetNextState" .global $$255275 $$255275: - .incbin "baserom.dol", 0x464174, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255276 $$255276: - .incbin "baserom.dol", 0x464184, 0x14 + .asciz "void MoveForward()" + .balign 4 .global $$255277 $$255277: - .incbin "baserom.dol", 0x464198, 0x10 + .asciz "void Dash()" + .4byte 0 .global $$255278 $$255278: - .incbin "baserom.dol", 0x4641A8, 0x10 + .asciz "void JumpBack()" .global $$255279 $$255279: - .incbin "baserom.dol", 0x4641B8, 0x18 + .asciz "void JumpAttack()" + .balign 4 + .4byte 0 .global $$255280 $$255280: - .incbin "baserom.dol", 0x4641D0, 0x18 + .asciz "void JumpCenterAttack()" .global $$255281 $$255281: - .incbin "baserom.dol", 0x4641E8, 0x18 + .asciz "void JumpMachinegun()" + .balign 4 .global $$255282 $$255282: - .incbin "baserom.dol", 0x464200, 0x20 + .asciz "void ChargeAttackStart()" + .balign 4 + .4byte 0 .global $$255283 $$255283: - .incbin "baserom.dol", 0x464220, 0x18 + .asciz "void ChargeAttack(bool)" .global $$255284 $$255284: - .incbin "baserom.dol", 0x464238, 0x20 + .asciz "void ChargeAttackPursuit()" + .balign 4 + .4byte 0 .global __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1 __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1: - .incbin "baserom.dol", 0x464258, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534E0 ;# ptr + .4byte 0x80253420 ;# ptr .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464268, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534DC ;# ptr + .4byte 0x8025346C ;# ptr .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464278, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534D8 ;# ptr + .4byte 0x80253488 ;# ptr .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464288, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534D4 ;# ptr + .4byte 0x802534A4 ;# ptr .global __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: - .incbin "baserom.dol", 0x464298, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534D0 ;# ptr + .4byte 0x802533EC ;# ptr .global __vt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: - .incbin "baserom.dol", 0x4642A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534CC ;# ptr + .4byte 0x802533F0 ;# ptr .global __vt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: - .incbin "baserom.dol", 0x4642B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534C8 ;# ptr + .4byte 0x802533E8 ;# ptr .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: - .incbin "baserom.dol", 0x4642C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802534C4 ;# ptr + .4byte 0x80253418 ;# ptr .global __vt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: - .incbin "baserom.dol", 0x4642D8, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x802534C0 ;# ptr + .4byte 0x8025341C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254406 $$254406: - .incbin "baserom.dol", 0x4648E8, 0x28 + .asciz "Scn.Step.Boss.Moundeath.SetNextState" + .balign 4 .global $$254407 $$254407: - .incbin "baserom.dol", 0x464910, 0x14 + .asciz "void MoveStart()" + .balign 4 .global $$254408 $$254408: - .incbin "baserom.dol", 0x464924, 0x14 + .asciz "void MoveForward()" + .balign 4 .global $$254409 $$254409: - .incbin "baserom.dol", 0x464938, 0x10 + .asciz "void MoveEnd()" + .balign 4 .global $$254410 $$254410: - .incbin "baserom.dol", 0x464948, 0x10 + .asciz "void Jump()" + .4byte 0 .global $$254411 $$254411: - .incbin "baserom.dol", 0x464958, 0x10 + .asciz "void JumpBack()" .global $$254412 $$254412: - .incbin "baserom.dol", 0x464968, 0x10 + .asciz "void Press()" + .balign 4 .global $$254413 $$254413: - .incbin "baserom.dol", 0x464978, 0x10 + .asciz "void PressBig()" .global $$254414 $$254414: - .incbin "baserom.dol", 0x464988, 0x14 + .asciz "void GiantJump()" + .balign 4 .global $$254415 $$254415: - .incbin "baserom.dol", 0x46499C, 0x18 + .asciz "void RollJumpStart()" + .balign 4 .global $$254416 $$254416: - .incbin "baserom.dol", 0x4649B4, 0x18 + .asciz "void RollJumpRestart()" + .balign 4 .global $$254417 $$254417: - .incbin "baserom.dol", 0x4649CC, 0x18 + .asciz "void RollJumpLanding()" + .balign 4 .global $$254418 $$254418: - .incbin "baserom.dol", 0x4649E4, 0xC + .asciz "void Dash()" .global $$254419 $$254419: - .incbin "baserom.dol", 0x4649F0, 0x10 + .asciz "void Rolling()" + .balign 4 .global $$254420 $$254420: - .incbin "baserom.dol", 0x464A00, 0x10 + .asciz "void Tornado()" + .balign 4 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464A10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255638 ;# ptr + .4byte 0x802555A4 ;# ptr .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464A20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255634 ;# ptr + .4byte 0x802555C0 ;# ptr .global __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1: - .incbin "baserom.dol", 0x464A30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255630 ;# ptr + .4byte 0x802554DC ;# ptr .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1: - .incbin "baserom.dol", 0x464A40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025562C ;# ptr + .4byte 0x80255534 ;# ptr .global __vt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1 __vt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1: - .incbin "baserom.dol", 0x464A50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255628 ;# ptr + .4byte 0x80255538 ;# ptr .global __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: - .incbin "baserom.dol", 0x464A60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255624 ;# ptr + .4byte 0x80255584 ;# ptr .global __vt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1: - .incbin "baserom.dol", 0x464A70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255620 ;# ptr + .4byte 0x802554E0 ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464A80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025561C ;# ptr + .4byte 0x802555DC ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x464A90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80255618 ;# ptr + .4byte 0x802555F8 ;# ptr .global __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1: - .incbin "baserom.dol", 0x464AA0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x80255614 ;# ptr + .4byte 0x802554E4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254862 $$254862: - .incbin "baserom.dol", 0x465360, 0x2C + .asciz "Scn.Step.Boss.WaterGalboros.SetNextState" + .balign 4 .global $$254863 $$254863: - .incbin "baserom.dol", 0x46538C, 0x14 + .asciz "void JumpSmall()" + .balign 4 .global $$254864 $$254864: - .incbin "baserom.dol", 0x4653A0, 0xC + .asciz "void Jump()" .global $$254865 $$254865: - .incbin "baserom.dol", 0x4653AC, 0x10 + .asciz "void JumpBig()" + .balign 4 .global $$254866 $$254866: - .incbin "baserom.dol", 0x4653BC, 0x14 + .asciz "void AttackStart()" + .balign 4 .global $$254867 $$254867: - .incbin "baserom.dol", 0x4653D0, 0x14 + .asciz "void AttackWater()" + .balign 4 .global $$254868 $$254868: - .incbin "baserom.dol", 0x4653E4, 0x14 + .asciz "void AttackWave()" + .balign 4 .global $$254869 $$254869: - .incbin "baserom.dol", 0x4653F8, 0x18 + .asciz "void Quivery(int,int)" + .balign 4 .global $$254870 $$254870: - .incbin "baserom.dol", 0x465410, 0xC + .asciz "void Dash()" .global $$254871 $$254871: - .incbin "baserom.dol", 0x46541C, 0x10 + .asciz "void Capture()" + .balign 4 .global $$254872 $$254872: - .incbin "baserom.dol", 0x46542C, 0x28 + .asciz "Scn.Step.Boss.WaterGalboros.WeaponCtrl" + .balign 4 .global $$254873 $$254873: - .incbin "baserom.dol", 0x465454, 0x24 + .asciz "void AddReqData(int,float,float)" + .balign 4 .global $$254874 $$254874: - .incbin "baserom.dol", 0x465478, 0x18 + .asciz "void ClearReqBuff()" + .4byte 0 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465490, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80259630 ;# ptr + .4byte 0x80259600 ;# ptr .global __vt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: - .incbin "baserom.dol", 0x4654A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025962C ;# ptr + .4byte 0x80259564 ;# ptr .global __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1 __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1: - .incbin "baserom.dol", 0x4654B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80259628 ;# ptr + .4byte 0x8025956C ;# ptr .global __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: - .incbin "baserom.dol", 0x4654C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80259624 ;# ptr + .4byte 0x802595C0 ;# ptr .global __vt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: - .incbin "baserom.dol", 0x4654D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80259620 ;# ptr + .4byte 0x802595E0 ;# ptr .global __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: - .incbin "baserom.dol", 0x4654E0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8025961C ;# ptr + .4byte 0x80259568 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254699 $$254699: - .incbin "baserom.dol", 0x465C00, 0x24 + .asciz "Scn.Step.Boss.Whispy.SetNextState" + .balign 4 .global $$254700 $$254700: - .incbin "baserom.dol", 0x465C24, 0x20 + .asciz "void ShotAirBall(int,int,int)" + .balign 4 .global $$254701 $$254701: - .incbin "baserom.dol", 0x465C44, 0x24 + .asciz "void ShotAirBallBig(int,int,int)" + .balign 4 .global $$254702 $$254702: - .incbin "baserom.dol", 0x465C68, 0x28 + .asciz "void ShotAirBallTornado(int,int,int)" + .balign 4 .global $$254703 $$254703: - .incbin "baserom.dol", 0x465C90, 0x14 + .asciz "void FallApple(int)" .global $$254704 $$254704: - .incbin "baserom.dol", 0x465CA4, 0x14 + .asciz "void FallEnemy(int)" .global $$254705 $$254705: - .incbin "baserom.dol", 0x465CB8, 0x18 + .asciz "void FallEnemy2(int)" + .balign 4 .global $$254706 $$254706: - .incbin "baserom.dol", 0x465CD0, 0x10 + .asciz "void Vacuum()" + .balign 4 .global $$254707 $$254707: - .incbin "baserom.dol", 0x465CE0, 0x14 + .asciz "void RootAttack()" + .balign 4 .global $$254708 $$254708: - .incbin "baserom.dol", 0x465CF4, 0x24 + .asciz "Scn.Step.Boss.Whispy.EnemyReqBuff" + .balign 4 .global $$254709 $$254709: - .incbin "baserom.dol", 0x465D18, 0x18 + .asciz "void Add(int,int,int)" + .balign 4 .global $$254710 $$254710: - .incbin "baserom.dol", 0x465D30, 0x28 + .asciz "Scn.Step.Boss.Whispy.FaceRotCtrl" + .balign 4 + .4byte 0 .global $$254711 $$254711: - .incbin "baserom.dol", 0x465D58, 0x10 + .asciz "void Set(float)" .global $$254712 $$254712: - .incbin "baserom.dol", 0x465D68, 0x10 + .asciz "void Reset()" + .balign 4 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465D78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025B8EC ;# ptr + .4byte 0x8025B8A0 ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465D88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025B8E8 ;# ptr + .4byte 0x8025B8BC ;# ptr .global __vt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1 __vt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1: - .incbin "baserom.dol", 0x465D98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025B8E4 ;# ptr + .4byte 0x8025B87C ;# ptr .global __vt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: - .incbin "baserom.dol", 0x465DA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025B8E0 ;# ptr + .4byte 0x8025B804 ;# ptr .global __vt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: - .incbin "baserom.dol", 0x465DB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025B8DC ;# ptr + .4byte 0x8025B82C ;# ptr .global __vt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: - .incbin "baserom.dol", 0x465DC8, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8025B8D8 ;# ptr + .4byte 0x8025B854 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256474 $$256474: - .incbin "baserom.dol", 0x4668E8, 0x28 + .asciz "Scn.Step.Boss.Zankibble.SetNextState" + .balign 4 .global $$256475 $$256475: - .incbin "baserom.dol", 0x466910, 0x14 + .asciz "void MoveStart()" + .balign 4 .global $$256476 $$256476: - .incbin "baserom.dol", 0x466924, 0x18 + .asciz "void MoveStartCenter()" + .balign 4 .global $$256477 $$256477: - .incbin "baserom.dol", 0x46693C, 0x14 + .asciz "void MoveForward()" + .balign 4 .global $$256478 $$256478: - .incbin "baserom.dol", 0x466950, 0x10 + .asciz "void MoveEnd()" + .balign 4 .global $$256479 $$256479: - .incbin "baserom.dol", 0x466960, 0x10 + .asciz "void Dash(bool)" .global $$256480 $$256480: - .incbin "baserom.dol", 0x466970, 0x1C + .asciz "void AttackStraight(float)" + .balign 4 .global $$256481 $$256481: - .incbin "baserom.dol", 0x46698C, 0x24 + .asciz "void AttackCircle(float,float,bool)" .global $$256482 $$256482: - .incbin "baserom.dol", 0x4669B0, 0x24 + .asciz "void AttackBackCircle(float,float)" + .balign 4 .global $$256483 $$256483: - .incbin "baserom.dol", 0x4669D4, 0x1C + .asciz "void JumpAttack(bool)" + .balign 4 + .4byte 0 .global $$256484 $$256484: - .incbin "baserom.dol", 0x4669F0, 0x10 + .asciz "void JumpBack()" .global __vt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1: - .incbin "baserom.dol", 0x466A00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260384 ;# ptr + .4byte 0x802602B8 ;# ptr .global __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1 __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1: - .incbin "baserom.dol", 0x466A10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260380 ;# ptr + .4byte 0x802602C4 ;# ptr .global __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1 __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1: - .incbin "baserom.dol", 0x466A20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8026037C ;# ptr + .4byte 0x80260310 ;# ptr .global __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1: - .incbin "baserom.dol", 0x466A30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260378 ;# ptr + .4byte 0x802602B4 ;# ptr .global __vt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1: - .incbin "baserom.dol", 0x466A40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260374 ;# ptr + .4byte 0x802602BC ;# ptr .global __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1: - .incbin "baserom.dol", 0x466A50, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80260370 ;# ptr + .4byte 0x802602C0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253242 $$253242: - .incbin "baserom.dol", 0x467140, 0x24 + .asciz "Scn.Step.Camera.CameraController" + .balign 4 .global $$253243 $$253243: - .incbin "baserom.dol", 0x467164, 0x14 + .asciz "void ReqQuake(int)" + .balign 4 .global $$253244 $$253244: - .incbin "baserom.dol", 0x467178, 0x18 + .asciz "void ReqZoomQuake(int)" + .balign 4 .global $$253245 $$253245: - .incbin "baserom.dol", 0x467190, 0x24 + .asciz "Scn.Step.Camera.ZoomQuake.Method" + .balign 4 .global $$253246 $$253246: - .incbin "baserom.dol", 0x4671B4, 0x3C + .asciz "void SetOffs(float)" + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258827 $$258827: - .incbin "baserom.dol", 0x467498, 0x18 + .asciz "Scn.Step.Chara.Effect" + .balign 4 .global $$258828 $$258828: - .incbin "baserom.dol", 0x4674B0, 0x34 + .asciz "void requestP(int,const ref HEL.Math.Vector3)const" + .balign 4 .global $$258829 $$258829: - .incbin "baserom.dol", 0x4674E4, 0x3C + .asciz "void requestP(int,const ref HEL.Math.Vector3,float)const" + .balign 4 .global $$258830 $$258830: - .incbin "baserom.dol", 0x467520, 0x48 + .asciz "void requestPD(int,const ref HEL.Math.Vector3,HEL.Math.Direction3)const" .global $$258831 $$258831: - .incbin "baserom.dol", 0x467568, 0x50 + .asciz "void requestPD(int,const ref HEL.Math.Vector3,HEL.Math.Direction3,float)const" + .balign 4 .global $$258832 $$258832: - .incbin "baserom.dol", 0x4675B8, 0x1C + .asciz "void requestN(int,int)const" .global $$258833 $$258833: - .incbin "baserom.dol", 0x4675D4, 0x24 + .asciz "void requestN(int,int,float)const" + .balign 4 .global $$258834 $$258834: - .incbin "baserom.dol", 0x4675F8, 0x38 + .asciz "void requestN(int,int,const ref HEL.Math.Vector3)const" + .balign 4 .global $$258835 $$258835: - .incbin "baserom.dol", 0x467630, 0x40 + .asciz "void requestN(int,int,const ref HEL.Math.Vector3const,float)" + .balign 4 .global $$258836 $$258836: - .incbin "baserom.dol", 0x467670, 0x3C + .asciz "void requestND(int,int,const ref HEL.Math.Direction3)const" + .balign 4 .global $$258837 $$258837: - .incbin "baserom.dol", 0x4676AC, 0x44 + .asciz "void requestND(int,int,const ref HEL.Math.Direction3,float)const" + .balign 4 .global $$258838 $$258838: - .incbin "baserom.dol", 0x4676F0, 0x58 + .asciz "void requestND(int,int,const ref HEL.Math.Direction3,const ref HEL.Math.Vector3)const" + .balign 4 .global $$258839 $$258839: - .incbin "baserom.dol", 0x467748, 0x5C + .asciz "void requestND(int,int,const ref HEL.Math.Direction3,const ref HEL.Math.Vector3,float)const" .global $$258840 $$258840: - .incbin "baserom.dol", 0x4677A4, 0x14 + .asciz "void release()const" .global $$258841 $$258841: - .incbin "baserom.dol", 0x4677B8, 0x18 + .asciz "void releaseAndVanish()" .global $$258842 $$258842: - .incbin "baserom.dol", 0x4677D0, 0x14 + .asciz "void RequestP(int)" + .balign 4 .global $$258843 $$258843: - .incbin "baserom.dol", 0x4677E4, 0x1C + .asciz "void RequestPS(int,float)" + .balign 4 .global $$258844 $$258844: - .incbin "baserom.dol", 0x467800, 0x14 + .asciz "void RequestPD(int)" .global $$258845 $$258845: - .incbin "baserom.dol", 0x467814, 0x1C + .asciz "void RequestPDS(int,float)" + .balign 4 .global $$258846 $$258846: - .incbin "baserom.dol", 0x467830, 0x18 + .asciz "void RequestN(int,int)" + .balign 4 .global $$258847 $$258847: - .incbin "baserom.dol", 0x467848, 0x20 + .asciz "void RequestNS(int,int,float)" + .balign 4 .global $$258848 $$258848: - .incbin "baserom.dol", 0x467868, 0x18 + .asciz "void RequestNO(int,int)" .global $$258849 $$258849: - .incbin "baserom.dol", 0x467880, 0x20 + .asciz "void RequestNOS(int,int,float)" + .balign 4 .global $$258850 $$258850: - .incbin "baserom.dol", 0x4678A0, 0x18 + .asciz "void RequestND(int,int)" .global $$258851 $$258851: - .incbin "baserom.dol", 0x4678B8, 0x20 + .asciz "void RequestNDS(int,int,float)" + .balign 4 .global $$258852 $$258852: - .incbin "baserom.dol", 0x4678D8, 0x20 + .asciz "void RequestNDO(int,int)" + .balign 4 + .4byte 0 .global $$258853 $$258853: - .incbin "baserom.dol", 0x4678F8, 0x20 + .asciz "void RequestNDOS(int,int,float)" .global $$258854 $$258854: - .incbin "baserom.dol", 0x467918, 0x10 + .asciz "void Release()" + .balign 4 .global $$258855 $$258855: - .incbin "baserom.dol", 0x467928, 0x18 + .asciz "void ReleaseAndVanish()" .global $$258856 $$258856: - .incbin "baserom.dol", 0x467940, 0x30 + .asciz "void RequestP(int,const ref HEL.Math.Vector3)" + .balign 4 .global $$258857 $$258857: - .incbin "baserom.dol", 0x467970, 0x34 + .asciz "void RequestP(int,const ref HEL.Math.Vector3,float)" .global $$258858 $$258858: - .incbin "baserom.dol", 0x4679A4, 0x50 + .asciz "void RequestPD(int,const ref HEL.Math.Vector3,const ref HEL.Math.Direciont3)" + .balign 4 .global $$258859 $$258859: - .incbin "baserom.dol", 0x4679F4, 0x54 + .asciz "void RequestPD(int,const ref HEL.Math.Vector3,const ref HEL.Math.Direciont3,float)" + .balign 4 .global $$258860 $$258860: - .incbin "baserom.dol", 0x467A48, 0x20 + .asciz "void RequestN(int,int,float)" + .balign 4 .global $$258861 $$258861: - .incbin "baserom.dol", 0x467A68, 0x38 + .asciz "void RequestN(int,int,const ref HEL.Math.Vector3)" + .balign 4 + .4byte 0 .global $$258862 $$258862: - .incbin "baserom.dol", 0x467AA0, 0x38 + .asciz "void RequestN(int,int,const ref HEL.Math.Vector3,float)" .global $$258863 $$258863: - .incbin "baserom.dol", 0x467AD8, 0x38 + .asciz "void RequestND(int,int,const ref HEL.Math.Direction3)" + .balign 4 .global $$258864 $$258864: - .incbin "baserom.dol", 0x467B10, 0x3C + .asciz "void RequestND(int,int,const ref HEL.Math.Direction3,float)" .global $$258865 $$258865: - .incbin "baserom.dol", 0x467B4C, 0x54 + .asciz "void RequestND(int,int,const ref HEL.Math.Direction3,const ref HEL.Math.Vector3)" + .balign 4 .global $$258866 $$258866: - .incbin "baserom.dol", 0x467BA0, 0x58 + .asciz "void RequestND(int,int,const ref HEL.Math.Direction3,const ref HEL.Math.Vector3,float)" + .balign 4 .global $$258867 $$258867: - .incbin "baserom.dol", 0x467BF8, 0x18 + .asciz "Scn.Step.Chara.ObjColl" + .balign 4 .global $$258868 $$258868: - .incbin "baserom.dol", 0x467C10, 0x20 + .asciz "void AddBodyColl(int,float)" + .4byte 0 .global $$258869 $$258869: - .incbin "baserom.dol", 0x467C30, 0x28 + .asciz "void AddBodyColl(int,float,float,float)" .global $$258870 $$258870: - .incbin "baserom.dol", 0x467C58, 0x34 + .asciz "void AddBodyColl(int,float,float,float,float,float)" .global $$258871 $$258871: - .incbin "baserom.dol", 0x467C8C, 0x38 + .asciz "void AddBodyColl(int,float,const ref HEL.Math.Vector2)" + .balign 4 .global $$258872 $$258872: - .incbin "baserom.dol", 0x467CC4, 0x54 + .asciz "void AddBodyColl(int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2)" + .balign 4 .global $$258873 $$258873: - .incbin "baserom.dol", 0x467D18, 0x18 + .asciz "void ClearBodyColl()" + .balign 4 .global $$258874 $$258874: - .incbin "baserom.dol", 0x467D30, 0x20 + .asciz "void AddAttack(int,int,float)" + .balign 4 .global $$258875 $$258875: - .incbin "baserom.dol", 0x467D50, 0x2C + .asciz "void AddAttack(int,int,float,float,float)" + .balign 4 .global $$258876 $$258876: - .incbin "baserom.dol", 0x467D7C, 0x38 + .asciz "void AddAttack(int,int,float,float,float,float,float)" + .balign 4 .global $$258877 $$258877: - .incbin "baserom.dol", 0x467DB4, 0x3C + .asciz "void AddAttack(int,int,float,float,float,float,float,bool)" + .balign 4 .global $$258878 $$258878: - .incbin "baserom.dol", 0x467DF0, 0x3C + .asciz "void AddAttack(int,int,float,const ref HEL.Math.Vector2)" + .balign 4 .global $$258879 $$258879: - .incbin "baserom.dol", 0x467E2C, 0x54 + .asciz "void AddAttack(int,int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2)" .global $$258880 $$258880: - .incbin "baserom.dol", 0x467E80, 0x5C + .asciz "void AddAttack(int,int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2,bool)" + .balign 4 .global $$258881 $$258881: - .incbin "baserom.dol", 0x467EDC, 0x14 + .asciz "void ClearAttack()" + .balign 4 .global $$258882 $$258882: - .incbin "baserom.dol", 0x467EF0, 0x18 + .asciz "void ClearAttack(int)" + .balign 4 .global $$258883 $$258883: - .incbin "baserom.dol", 0x467F08, 0x1C + .asciz "void SetAttackType(int,int)" .global $$258884 $$258884: - .incbin "baserom.dol", 0x467F24, 0x28 + .asciz "void SetAttackCenter(int,float,float)" + .balign 4 .global $$258885 $$258885: - .incbin "baserom.dol", 0x467F4C, 0x14 + .asciz "void RenewAttack()" + .balign 4 .global $$258886 $$258886: - .incbin "baserom.dol", 0x467F60, 0x20 + .asciz "void AddSearchHit(int,float)" + .balign 4 .global $$258887 $$258887: - .incbin "baserom.dol", 0x467F80, 0x2C + .asciz "void AddSearchHit(int,float,float,float)" + .balign 4 .global $$258888 $$258888: - .incbin "baserom.dol", 0x467FAC, 0x38 + .asciz "void AddSearchHit(int,float,float,float,float,float)" + .balign 4 .global $$258889 $$258889: - .incbin "baserom.dol", 0x467FE4, 0x3C + .asciz "void AddSearchHit(int,float,float,float,float,float,bool)" + .balign 4 .global $$258890 $$258890: - .incbin "baserom.dol", 0x468020, 0x38 + .asciz "void AddSearchHit(int,float,const ref HEL.Math.Vector2)" .global $$258891 $$258891: - .incbin "baserom.dol", 0x468058, 0x58 + .asciz "void AddSearchHit(int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2)" + .balign 4 + .4byte 0 .global $$258892 $$258892: - .incbin "baserom.dol", 0x4680B0, 0x58 + .asciz "void AddSearchHit(int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2,bool)" .global $$258893 $$258893: - .incbin "baserom.dol", 0x468108, 0x18 + .asciz "void ClearSearchHit()" + .balign 4 .global $$258894 $$258894: - .incbin "baserom.dol", 0x468120, 0x20 + .asciz "void SetSearchHitTeamXlu(int)" + .balign 4 .global $$258895 $$258895: - .incbin "baserom.dol", 0x468140, 0x20 + .asciz "void AddSearchAttack(int,float)" .global $$258896 $$258896: - .incbin "baserom.dol", 0x468160, 0x30 + .asciz "void AddSearchAttack(int,float,float,float)" + .4byte 0 .global $$258897 $$258897: - .incbin "baserom.dol", 0x468190, 0x38 + .asciz "void AddSearchAttack(int,float,float,float,float,float)" .global $$258898 $$258898: - .incbin "baserom.dol", 0x4681C8, 0x40 + .asciz "void AddSearchAttack(int,float,float,float,float,float,bool)" + .balign 4 .global $$258899 $$258899: - .incbin "baserom.dol", 0x468208, 0x3C + .asciz "void AddSearchAttack(int,float,const ref HEL.Math.Vector2)" + .balign 4 .global $$258900 $$258900: - .incbin "baserom.dol", 0x468244, 0x58 + .asciz "void AddSearchAttack(int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2)" + .balign 4 .global $$258901 $$258901: - .incbin "baserom.dol", 0x46829C, 0x5C + .asciz "void AddSearchAttack(int,float,const ref HEL.Math.Vector2,const ref HEL.Math.Vector2,bool)" + .balign 4 .global $$258902 $$258902: - .incbin "baserom.dol", 0x4682F8, 0x1C + .asciz "void ClearSearchAttack()" + .balign 4 .global $$258903 $$258903: - .incbin "baserom.dol", 0x468314, 0x20 + .asciz "bool IsSearchAttackCollide()" + .balign 4 .global $$258904 $$258904: - .incbin "baserom.dol", 0x468334, 0x20 + .asciz "void SetBodyCollStateNormal()" + .balign 4 .global $$258905 $$258905: - .incbin "baserom.dol", 0x468354, 0x24 + .asciz "void SetBodyCollStateInvincible()" + .balign 4 .global $$258906 $$258906: - .incbin "baserom.dol", 0x468378, 0x1C + .asciz "void SetBodyCollStateXlu()" + .balign 4 .global $$258907 $$258907: - .incbin "baserom.dol", 0x468394, 0x20 + .asciz "void SetBodyCollStateHitOnly()" + .balign 4 .global $$258908 $$258908: - .incbin "baserom.dol", 0x4683B4, 0x24 + .asciz "void SetBodyCollStateCaptureOnly()" + .balign 4 .global $$258909 $$258909: - .incbin "baserom.dol", 0x4683D8, 0x18 + .asciz "Scn.Step.Chara.Model" + .balign 4 .global $$258910 $$258910: - .incbin "baserom.dol", 0x4683F0, 0x24 + .asciz "void SetScale3(float,float,float)" + .balign 4 .global $$258911 $$258911: - .incbin "baserom.dol", 0x468414, 0x1C + .asciz "Scn.Step.Chara.ModelRotCtrl" .global $$258912 $$258912: - .incbin "baserom.dol", 0x468430, 0x14 + .asciz "void SetValid(bool)" .global $$258913 $$258913: - .incbin "baserom.dol", 0x468444, 0x1C + .asciz "void ResetRotTarget()" + .balign 4 + .4byte 0 .global $$258914 $$258914: - .incbin "baserom.dol", 0x468460, 0x10 + .asciz "float GetRotH()" .global $$258915 $$258915: - .incbin "baserom.dol", 0x468470, 0x18 + .asciz "void InitRotH(float)" + .balign 4 .global $$258916 $$258916: - .incbin "baserom.dol", 0x468488, 0x14 + .asciz "void SetRotH(float)" .global $$258917 $$258917: - .incbin "baserom.dol", 0x46849C, 0x1C + .asciz "void SetRotHTarget(float)" + .balign 4 .global $$258918 $$258918: - .incbin "baserom.dol", 0x4684B8, 0x1C + .asciz "void SetRotHIntpRate(float)" .global $$258919 $$258919: - .incbin "baserom.dol", 0x4684D4, 0x1C + .asciz "void SetRotHIntoTarget()" + .balign 4 .global $$258920 $$258920: - .incbin "baserom.dol", 0x4684F0, 0x10 + .asciz "float GetRotV()" .global $$258921 $$258921: - .incbin "baserom.dol", 0x468500, 0x18 + .asciz "void InitRotV(float)" + .balign 4 .global $$258922 $$258922: - .incbin "baserom.dol", 0x468518, 0x14 + .asciz "void SetRotV(float)" .global $$258923 $$258923: - .incbin "baserom.dol", 0x46852C, 0x1C + .asciz "void SetRotVTarget(float)" + .balign 4 .global $$258924 $$258924: - .incbin "baserom.dol", 0x468548, 0x1C + .asciz "void SetRotVIntpRate(float)" .global $$258925 $$258925: - .incbin "baserom.dol", 0x468564, 0x1C + .asciz "void SetRotVIntoTarget()" + .balign 4 .global $$258926 $$258926: - .incbin "baserom.dol", 0x468580, 0x10 + .asciz "float GetRotD()" .global $$258927 $$258927: - .incbin "baserom.dol", 0x468590, 0x18 + .asciz "void InitRotD(float)" + .balign 4 .global $$258928 $$258928: - .incbin "baserom.dol", 0x4685A8, 0x14 + .asciz "void SetRotD(float)" .global $$258929 $$258929: - .incbin "baserom.dol", 0x4685BC, 0x1C + .asciz "void SetRotDTarget(float)" + .balign 4 .global $$258930 $$258930: - .incbin "baserom.dol", 0x4685D8, 0x1C + .asciz "void SetRotDIntpRate(float)" .global $$258931 $$258931: - .incbin "baserom.dol", 0x4685F4, 0x1C + .asciz "void SetRotDIntoTarget()" + .balign 4 .global $$258932 $$258932: - .incbin "baserom.dol", 0x468610, 0x18 + .asciz "Scn.Step.Chara.Trigger" + .balign 4 .global $$258933 $$258933: - .incbin "baserom.dol", 0x468628, 0x10 + .asciz "void Set(int)" + .balign 4 .global $$258934 $$258934: - .incbin "baserom.dol", 0x468638, 0x18 + .asciz "Scn.Step.Chara.Shake" + .balign 4 .global $$258935 $$258935: - .incbin "baserom.dol", 0x468650, 0x14 + .asciz "void Request(int)" + .balign 4 .global $$259186 $$259186: - .incbin "baserom.dol", 0x468664, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026BD28 ;# ptr .global $$259211 $$259211: - .incbin "baserom.dol", 0x468670, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026BDD4 ;# ptr .global $$259220 $$259220: - .incbin "baserom.dol", 0x46867C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026BEA8 ;# ptr .global $$259229 $$259229: - .incbin "baserom.dol", 0x468688, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026BF68 ;# ptr .global $$259238 $$259238: - .incbin "baserom.dol", 0x468694, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C028 ;# ptr .global $$259246 $$259246: - .incbin "baserom.dol", 0x4686A0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C0D4 ;# ptr .global $$259254 $$259254: - .incbin "baserom.dol", 0x4686AC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C194 ;# ptr .global $$259262 $$259262: - .incbin "baserom.dol", 0x4686B8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C240 ;# ptr .global $$259270 $$259270: - .incbin "baserom.dol", 0x4686C4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C2EC ;# ptr .global $$259277 $$259277: - .incbin "baserom.dol", 0x4686D0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C384 ;# ptr .global $$259284 $$259284: - .incbin "baserom.dol", 0x4686DC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C444 ;# ptr .global $$259293 $$259293: - .incbin "baserom.dol", 0x4686E8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C4F0 ;# ptr .global $$259302 $$259302: - .incbin "baserom.dol", 0x4686F4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C59C ;# ptr .global $$259310 $$259310: - .incbin "baserom.dol", 0x468700, 0x88 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026C634 ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252121 $$252121: - .incbin "baserom.dol", 0x4687A0, 0x1C + .asciz "Scn.Step.Core.BGMController" .global $$252122 $$252122: - .incbin "baserom.dol", 0x4687BC, 0x1C + .asciz "void Request(int,int,bool)" + .balign 4 .global $$252123 $$252123: - .incbin "baserom.dol", 0x4687D8, 0x18 + .asciz "void Unrequest(int)" + .4byte 0 .global $$252124 $$252124: - .incbin "baserom.dol", 0x4687F0, 0x10 + .asciz "void Pause(int)" .global $$252125 $$252125: - .incbin "baserom.dol", 0x468800, 0x14 + .asciz "void Pause(int,int)" .global $$252126 $$252126: - .incbin "baserom.dol", 0x468814, 0x14 + .asciz "void Unpause(int)" + .balign 4 .global $$252127 $$252127: - .incbin "baserom.dol", 0x468828, 0x18 + .asciz "void Unpause(int,int)" + .balign 4 .global $$252128 $$252128: - .incbin "baserom.dol", 0x468840, 0x48 + .asciz "void SetVolume(int,float)" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256469 $$256469: - .incbin "baserom.dol", 0x46C300, 0x18 + .asciz "Scn.Step.Enemy.Effect" + .balign 4 .global $$256470 $$256470: - .incbin "baserom.dol", 0x46C318, 0x14 + .asciz "void BindNormal()" + .balign 4 .global $$256471 $$256471: - .incbin "baserom.dol", 0x46C32C, 0x14 + .asciz "void BindState()" + .balign 4 .global $$256472 $$256472: - .incbin "baserom.dol", 0x46C340, 0x14 + .asciz "void BindSuper()" + .balign 4 .global $$256473 $$256473: - .incbin "baserom.dol", 0x46C354, 0x18 + .asciz "Scn.Step.Enemy.SoundSE" + .balign 4 .global $$256474 $$256474: - .incbin "baserom.dol", 0x46C36C, 0x18 + .asciz "Scn.Step.Enemy.Flash" + .balign 4 .global $$256475 $$256475: - .incbin "baserom.dol", 0x46C384, 0x20 + .asciz "void SetEnf1F(int,int,int,int)" + .balign 4 .global $$256476 $$256476: - .incbin "baserom.dol", 0x46C3A4, 0x1C + .asciz "Scn.Step.Enemy.Utility" + .balign 4 + .4byte 0 .global $$256477 $$256477: - .incbin "baserom.dol", 0x46C3C0, 0x20 + .asciz "float GetModelScaleBySizeType()" .global $$256478 $$256478: - .incbin "baserom.dol", 0x46C3E0, 0x1C + .asciz "bool IsNearestPlayerRight()" .global $$256479 $$256479: - .incbin "baserom.dol", 0x46C3FC, 0x1C + .asciz "void SetTargetByDirType()" + .balign 4 .global $$256480 $$256480: - .incbin "baserom.dol", 0x46C418, 0x10 + .asciz "void Turn()" + .4byte 0 .global $$256481 $$256481: - .incbin "baserom.dol", 0x46C428, 0x10 + .asciz "bool ChkCliff()" .global $$256482 $$256482: - .incbin "baserom.dol", 0x46C438, 0x14 + .asciz "void ChkCliffTurn()" .global $$256483 $$256483: - .incbin "baserom.dol", 0x46C44C, 0x1C + .asciz "void ChkNururiTurn()" + .balign 4 + .4byte 0 .global $$256484 $$256484: - .incbin "baserom.dol", 0x46C468, 0x10 + .asciz "void TurnHero()" .global $$256485 $$256485: - .incbin "baserom.dol", 0x46C478, 0xC + .asciz "int Level()" .global $$256486 $$256486: - .incbin "baserom.dol", 0x46C484, 0x10 + .asciz "void Suicide()" + .balign 4 .global $$256487 $$256487: - .incbin "baserom.dol", 0x46C494, 0x2C + .asciz "bool IsHeroInRange(float,float,float,float)" .global $$256488 $$256488: - .incbin "baserom.dol", 0x46C4C0, 0x34 + .asciz "bool IsHeroInRangeByDir(float,float,float,float)" + .balign 4 .global $$256489 $$256489: - .incbin "baserom.dol", 0x46C4F4, 0x20 + .asciz "bool IsExistLand(float,float)" + .balign 4 .global $$256490 $$256490: - .incbin "baserom.dol", 0x46C514, 0x1C + .asciz "void GetDirVecByDirType()" + .balign 4 .global $$256491 $$256491: - .incbin "baserom.dol", 0x46C530, 0x18 + .asciz "bool IsFixDirType()" + .4byte 0 .global $$256492 $$256492: - .incbin "baserom.dol", 0x46C548, 0x18 + .asciz "float GetRotByDirType()" .global $$256493 $$256493: - .incbin "baserom.dol", 0x46C560, 0x20 + .asciz "bool IsWaterGrid(float,float)" + .balign 4 .global $$256494 $$256494: - .incbin "baserom.dol", 0x46C580, 0x18 + .asciz "bool IsPlayerExist()" + .balign 4 .global $$256495 $$256495: - .incbin "baserom.dol", 0x46C598, 0x14 + .asciz "bool IsCameraOut()" + .balign 4 .global $$256496 $$256496: - .incbin "baserom.dol", 0x46C5AC, 0x20 + .asciz "bool IsExistKeyCarryingHero()" + .balign 4 .global $$256497 $$256497: - .incbin "baserom.dol", 0x46C5CC, 0x74 + .asciz "bool IsExtra()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256079 $$256079: - .incbin "baserom.dol", 0x46EE38, 0x24 + .asciz "Scn.Step.Enemy.Common.SetNextState" + .balign 4 .global $$256080 $$256080: - .incbin "baserom.dol", 0x46EE5C, 0xC + .asciz "void Wait()" .global $$256081 $$256081: - .incbin "baserom.dol", 0x46EE68, 0x14 + .asciz "void WalkStraight()" .global $$256082 $$256082: - .incbin "baserom.dol", 0x46EE7C, 0x14 + .asciz "void WalkAround()" + .balign 4 .global $$256083 $$256083: - .incbin "baserom.dol", 0x46EE90, 0xC + .asciz "void Fall()" .global $$256084 $$256084: - .incbin "baserom.dol", 0x46EE9C, 0xC + .asciz "void Fly()" + .balign 4 .global $$256085 $$256085: - .incbin "baserom.dol", 0x46EEA8, 0x18 + .asciz "Scn.Step.Enemy.Common" + .balign 4 .global $$256086 $$256086: - .incbin "baserom.dol", 0x46EEC0, 0x18 + .asciz "int Random_Rand(int)" + .balign 4 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EED8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80290F8C ;# ptr + .4byte 0x80290F10 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EEF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80290F88 ;# ptr + .4byte 0x80290F2C ;# ptr .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EF08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80290F84 ;# ptr + .4byte 0x80290F48 ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EF18, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x80290F80 ;# ptr + .4byte 0x80290F64 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254073 $$254073: - .incbin "baserom.dol", 0x46F4C8, 0x20 + .asciz "Scn.Step.Enemy.ArmorDee.Custom" + .balign 4 .global $$254074 $$254074: - .incbin "baserom.dol", 0x46F4E8, 0x18 + .asciz "float GetFrameRate()" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255899 $$255899: - .incbin "baserom.dol", 0x46F6B0, 0x28 + .asciz "Scn.Step.Enemy.BladeKnight.SetNextState" .global $$255900 $$255900: - .incbin "baserom.dol", 0x46F6D8, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255901 $$255901: - .incbin "baserom.dol", 0x46F6E8, 0x14 + .asciz "void DoubleAttack()" .global $$255902 $$255902: - .incbin "baserom.dol", 0x46F6FC, 0xC + .asciz "void Walk()" .global $$255903 $$255903: - .incbin "baserom.dol", 0x46F708, 0x10 + .asciz "void StepBack()" .global $$255904 $$255904: - .incbin "baserom.dol", 0x46F718, 0x20 + .asciz "void GrandLowperEscape()" + .balign 4 + .4byte 0 .global __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F738, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296D04 ;# ptr + .4byte 0x80296C68 ;# ptr .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F748, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296D00 ;# ptr + .4byte 0x80296C84 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F758, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296CFC ;# ptr + .4byte 0x80296CA0 ;# ptr .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F768, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296CF8 ;# ptr + .4byte 0x80296CBC ;# ptr .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F778, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x80296CF4 ;# ptr + .4byte 0x80296CD8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256078 $$256078: - .incbin "baserom.dol", 0x46FBC8, 0x24 + .asciz "Scn.Step.Enemy.Blipper.SetNextState" .global $$256079 $$256079: - .incbin "baserom.dol", 0x46FBEC, 0x10 + .asciz "void Chase()" + .balign 4 .global $$256080 $$256080: - .incbin "baserom.dol", 0x46FBFC, 0xC + .asciz "void Dive()" .global $$256081 $$256081: - .incbin "baserom.dol", 0x46FC08, 0xC + .asciz "void Fall()" .global $$256082 $$256082: - .incbin "baserom.dol", 0x46FC14, 0x14 + .asciz "void FlyingOut()" + .balign 4 .global $$256083 $$256083: - .incbin "baserom.dol", 0x46FC28, 0xC + .asciz "void Jump()" .global $$256084 $$256084: - .incbin "baserom.dol", 0x46FC34, 0x10 + .asciz "void Landing()" + .balign 4 .global $$256085 $$256085: - .incbin "baserom.dol", 0x46FC44, 0xC + .asciz "void Move()" .global $$256086 $$256086: - .incbin "baserom.dol", 0x46FC50, 0x20 + .asciz "void FattyBufferEscapeNear()" + .balign 4 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FC70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A28 ;# ptr + .4byte 0x8029892C ;# ptr .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FC80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A24 ;# ptr + .4byte 0x80298948 ;# ptr .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FC90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A20 ;# ptr + .4byte 0x80298964 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FCA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A1C ;# ptr + .4byte 0x80298980 ;# ptr .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FCB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A18 ;# ptr + .4byte 0x8029899C ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FCC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A14 ;# ptr + .4byte 0x802989B8 ;# ptr .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FCD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298A10 ;# ptr + .4byte 0x802989D4 ;# ptr .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FCE0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x80298A0C ;# ptr + .4byte 0x802989F0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255833 $$255833: - .incbin "baserom.dol", 0x470158, 0x24 + .asciz "Scn.Step.Enemy.Bouncy.SetNextState" + .balign 4 .global $$255834 $$255834: - .incbin "baserom.dol", 0x47017C, 0xC + .asciz "void Jump()" .global $$255835 $$255835: - .incbin "baserom.dol", 0x470188, 0x10 + .asciz "void Landing()" + .balign 4 .global $$255836 $$255836: - .incbin "baserom.dol", 0x470198, 0x20 + .asciz "Scn.Step.Enemy.Bouncy.Custom" + .balign 4 .global $$255837 $$255837: - .incbin "baserom.dol", 0x4701B8, 0x18 + .asciz "void SetSpeedH(float)" + .balign 4 .global $$255838 $$255838: - .incbin "baserom.dol", 0x4701D0, 0x18 + .asciz "void SetSpeedV(float)" + .balign 4 .global $$255839 $$255839: - .incbin "baserom.dol", 0x4701E8, 0x20 + .asciz "void GrandLowperEscape()" + .balign 4 + .4byte 0 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470208, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029CB3C ;# ptr + .4byte 0x8029CAE0 ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470218, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029CB38 ;# ptr + .4byte 0x8029CAFC ;# ptr .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470228, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8029CB34 ;# ptr + .4byte 0x8029CB18 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255839 $$255839: - .incbin "baserom.dol", 0x470588, 0x24 + .asciz "Scn.Step.Enemy.Bowby.SetNextState" + .balign 4 .global $$255840 $$255840: - .incbin "baserom.dol", 0x4705AC, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255841 $$255841: - .incbin "baserom.dol", 0x4705BC, 0x1C + .asciz "Scn.Step.Enemy.Bowby.Custom" .global $$255842 $$255842: - .incbin "baserom.dol", 0x4705D8, 0x18 + .asciz "bool IsPlayerInArea()" + .balign 4 .global $$255843 $$255843: - .incbin "baserom.dol", 0x4705F0, 0x14 + .asciz "bool IsAnimStart()" + .balign 4 .global $$255844 $$255844: - .incbin "baserom.dol", 0x470604, 0x14 + .asciz "void OffAnimStart()" .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470618, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x8029E240 ;# ptr + .4byte 0x8029E224 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254184 $$254184: - .incbin "baserom.dol", 0x470860, 0x24 + .asciz "Scn.Step.Enemy.BrontoBurt.Custom" + .balign 4 .global $$254185 $$254185: - .incbin "baserom.dol", 0x470884, 0x14 + .asciz "bool IsHitFloor()" + .balign 4 .global $$254186 $$254186: - .incbin "baserom.dol", 0x470898, 0x78 + .asciz "bool IsHitRoof()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255719 $$255719: - .incbin "baserom.dol", 0x470C58, 0x28 + .asciz "Scn.Step.Enemy.BroomHatter.SetNextState" .global $$255720 $$255720: - .incbin "baserom.dol", 0x470C80, 0xC + .asciz "void Walk()" .global $$255721 $$255721: - .incbin "baserom.dol", 0x470C8C, 0x1C + .asciz "void GrandLowperEscape()" + .balign 4 .global $$255722 $$255722: - .incbin "baserom.dol", 0x470CA8, 0x14 + .asciz "void CreditWalk()" + .balign 4 .global $$255723 $$255723: - .incbin "baserom.dol", 0x470CBC, 0x14 + .asciz "void CreditPraise()" .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470CD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A0BCC ;# ptr + .4byte 0x802A0B70 ;# ptr .global __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470CE0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A0BC8 ;# ptr + .4byte 0x802A0B8C ;# ptr .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470CF0, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x802A0BC4 ;# ptr + .4byte 0x802A0BA8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255979 $$255979: - .incbin "baserom.dol", 0x471068, 0x24 + .asciz "Scn.Step.Enemy.Cappy.SetNextState" + .balign 4 .global $$255980 $$255980: - .incbin "baserom.dol", 0x47108C, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255981 $$255981: - .incbin "baserom.dol", 0x47109C, 0x1C + .asciz "Scn.Step.Enemy.Cappy.Custom" .global $$255982 $$255982: - .incbin "baserom.dol", 0x4710B8, 0x18 + .asciz "int ThrowCount()" + .balign 4 + .4byte 0 .global $$255983 $$255983: - .incbin "baserom.dol", 0x4710D0, 0x18 + .asciz "void SetThrowCount(int)" .global $$255984 $$255984: - .incbin "baserom.dol", 0x4710E8, 0x10 + .asciz "bool Cap()" + .balign 4 + .4byte 0 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4710F8, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802A2404 ;# ptr + .4byte 0x802A23E8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255881 $$255881: - .incbin "baserom.dol", 0x4716D0, 0x24 + .asciz "Scn.Step.Enemy.Chilly.SetNextState" + .balign 4 .global $$255882 $$255882: - .incbin "baserom.dol", 0x4716F4, 0xC + .asciz "void Wait()" .global $$255883 $$255883: - .incbin "baserom.dol", 0x471700, 0xC + .asciz "void Move()" .global $$255884 $$255884: - .incbin "baserom.dol", 0x47170C, 0x14 + .asciz "void LookAround()" + .balign 4 .global $$255885 $$255885: - .incbin "baserom.dol", 0x471720, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255886 $$255886: - .incbin "baserom.dol", 0x471730, 0x14 + .asciz "void CreditMove()" + .balign 4 .global $$255887 $$255887: - .incbin "baserom.dol", 0x471744, 0x24 + .asciz "void CreditPraise()" + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471768, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A5F94 ;# ptr + .4byte 0x802A5F18 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471778, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A5F90 ;# ptr + .4byte 0x802A5F34 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471788, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A5F8C ;# ptr + .4byte 0x802A5F50 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471798, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x802A5F88 ;# ptr + .4byte 0x802A5F6C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255521 $$255521: - .incbin "baserom.dol", 0x471A70, 0x24 + .asciz "Scn.Step.Enemy.Como.SetNextState" + .balign 4 .global $$255522 $$255522: - .incbin "baserom.dol", 0x471A94, 0xC + .asciz "void Dive()" .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471AA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A6C84 ;# ptr + .4byte 0x802A6C68 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255869 $$255869: - .incbin "baserom.dol", 0x471EA0, 0x24 + .asciz "Scn.Step.Enemy.Degout.SetNextState" + .balign 4 .global $$255870 $$255870: - .incbin "baserom.dol", 0x471EC4, 0x10 + .asciz "void Chase()" + .balign 4 .global $$255871 $$255871: - .incbin "baserom.dol", 0x471ED4, 0x20 + .asciz "Scn.Step.Enemy.Degout.Custom" + .balign 4 .global $$255872 $$255872: - .incbin "baserom.dol", 0x471EF4, 0x14 + .asciz "bool IsChaseFlag()" + .balign 4 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471F08, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802ACF38 ;# ptr + .4byte 0x802ACF1C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255902 $$255902: - .incbin "baserom.dol", 0x4721A0, 0x28 + .asciz "Scn.Step.Enemy.DubiorJr.SetNextState" + .balign 4 .global $$255903 $$255903: - .incbin "baserom.dol", 0x4721C8, 0x10 + .asciz "void Fly(float)" .global $$255904 $$255904: - .incbin "baserom.dol", 0x4721D8, 0x14 + .asciz "void Move(float)" + .balign 4 .global $$255905 $$255905: - .incbin "baserom.dol", 0x4721EC, 0x14 + .asciz "void Dash(float)" + .balign 4 .global $$255906 $$255906: - .incbin "baserom.dol", 0x472200, 0x18 + .asciz "void Back(float)" + .balign 4 + .4byte 0 .global __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1 __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1: - .incbin "baserom.dol", 0x472218, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ADEE4 ;# ptr + .4byte 0x802ADE9C ;# ptr .global __vt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1 __vt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1: - .incbin "baserom.dol", 0x472228, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ADEE0 ;# ptr + .4byte 0x802ADE78 ;# ptr .global __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1 __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1: - .incbin "baserom.dol", 0x472238, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x802ADEDC ;# ptr + .4byte 0x802ADEBC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256662 $$256662: - .incbin "baserom.dol", 0x472508, 0x20 + .asciz "Scn.Step.Enemy.Elec.Custom" + .balign 4 + .4byte 0 .global $$256663 $$256663: - .incbin "baserom.dol", 0x472528, 0x20 + .asciz "void SetViewOffset(float,float)" .global $$256664 $$256664: - .incbin "baserom.dol", 0x472548, 0x18 + .asciz "void AttackEffect0()" + .balign 4 .global $$256665 $$256665: - .incbin "baserom.dol", 0x472560, 0x50 + .asciz "void AttackEffect1()" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256629 $$256629: - .incbin "baserom.dol", 0x4728B0, 0x24 + .asciz "Scn.Step.Enemy.Flamer.SetNextState" + .balign 4 .global $$256630 $$256630: - .incbin "baserom.dol", 0x4728D4, 0x10 + .asciz "void MoveCWR()" + .balign 4 .global $$256631 $$256631: - .incbin "baserom.dol", 0x4728E4, 0x10 + .asciz "void MoveCCW()" + .balign 4 .global $$256632 $$256632: - .incbin "baserom.dol", 0x4728F4, 0x10 + .asciz "void Chase()" + .balign 4 .global $$256633 $$256633: - .incbin "baserom.dol", 0x472904, 0x10 + .asciz "void Attack()" + .balign 4 .global $$256634 $$256634: - .incbin "baserom.dol", 0x472914, 0x10 + .asciz "void Agony()" + .balign 4 .global $$256635 $$256635: - .incbin "baserom.dol", 0x472924, 0xC + .asciz "void Fall()" .global $$256636 $$256636: - .incbin "baserom.dol", 0x472930, 0x14 + .asciz "void ChaseOrAgony()" .global $$256637 $$256637: - .incbin "baserom.dol", 0x472944, 0x20 + .asciz "Scn.Step.Enemy.Flamer.Custom" + .balign 4 .global $$256638 $$256638: - .incbin "baserom.dol", 0x472964, 0x10 + .asciz "bool IsMove()" + .balign 4 .global $$256639 $$256639: - .incbin "baserom.dol", 0x472974, 0x18 + .asciz "void SetIsMove(bool)" + .balign 4 .global $$256640 $$256640: - .incbin "baserom.dol", 0x47298C, 0xC + .asciz "void Dead()" .global $$256641 $$256641: - .incbin "baserom.dol", 0x472998, 0x20 + .asciz "void SetViewOffset(float,float)" .global $$256642 $$256642: - .incbin "baserom.dol", 0x4729B8, 0x14 + .asciz "void ChaseEffect()" + .balign 4 .global $$256643 $$256643: - .incbin "baserom.dol", 0x4729CC, 0x18 + .asciz "void AttackREffect()" + .balign 4 .global $$256644 $$256644: - .incbin "baserom.dol", 0x4729E4, 0x1C + .asciz "void AttackLEffect()" + .balign 4 + .4byte 0 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472A00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B1BBC ;# ptr + .4byte 0x802B1A3C ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472A10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B1BB8 ;# ptr + .4byte 0x802B1A9C ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472A20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B1BB4 ;# ptr + .4byte 0x802B1AF8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472A40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B1BB0 ;# ptr + .4byte 0x802B1B14 ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472A50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B1BAC ;# ptr + .4byte 0x802B1B30 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step5enemy6flamer12StateMoveCCW __vt__Q53scn4step5enemy6flamer12StateMoveCCW: - .incbin "baserom.dol", 0x472A70, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x802B1BA8 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B36D4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B3B20 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0x802B1A34 ;# ptr .global __vt__Q53scn4step5enemy6flamer12StateMoveCWR __vt__Q53scn4step5enemy6flamer12StateMoveCWR: - .incbin "baserom.dol", 0x472A94, 0x84 + .4byte 0 + .4byte 0 + .4byte 0x802B1B4C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B36D4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B3B20 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0x802B1A38 ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: - .incbin "baserom.dol", 0x472FF0, 0x24 + .asciz "Scn.Step.Enemy.Gemra.SetNextState" + .balign 4 .global $$255575 $$255575: - .incbin "baserom.dol", 0x473014, 0xC + .asciz "void Fly()" + .balign 4 .global $$255576 $$255576: - .incbin "baserom.dol", 0x473020, 0x10 + .asciz "void Attack()" + .balign 4 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473030, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B5684 ;# ptr + .4byte 0x802B5648 ;# ptr .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473040, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802B5680 ;# ptr + .4byte 0x802B5664 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255988 $$255988: - .incbin "baserom.dol", 0x473238, 0x24 + .asciz "Scn.Step.Enemy.Gigatzo.SetNextState" .global $$255989 $$255989: - .incbin "baserom.dol", 0x47325C, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255990 $$255990: - .incbin "baserom.dol", 0x47326C, 0xC + .asciz "void Aim()" + .balign 4 .global $$255991 $$255991: - .incbin "baserom.dol", 0x473278, 0x20 + .asciz "Scn.Step.Enemy.Gigatzo.Custom" + .balign 4 .global $$255992 $$255992: - .incbin "baserom.dol", 0x473298, 0x20 + .asciz "bool IsPlayerInAimArea()" + .balign 4 + .4byte 0 .global $$255993 $$255993: - .incbin "baserom.dol", 0x4732B8, 0x18 + .asciz "int SetWaitAttackTime()" .global $$255994 $$255994: - .incbin "baserom.dol", 0x4732D0, 0x20 + .asciz "int SetWaitBackAttackTime()" + .4byte 0 .global $$255995 $$255995: - .incbin "baserom.dol", 0x4732F0, 0x20 + .asciz "int SetWaitBackAttackMoreTime()" .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473310, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B69C0 ;# ptr + .4byte 0x802B6984 ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473320, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802B69BC ;# ptr + .4byte 0x802B69A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255976 $$255976: - .incbin "baserom.dol", 0x4737E8, 0x24 + .asciz "Scn.Step.Enemy.HotHead.SetNextState" .global $$255977 $$255977: - .incbin "baserom.dol", 0x47380C, 0x14 + .asciz "void AttackBreath()" .global $$255978 $$255978: - .incbin "baserom.dol", 0x473820, 0x14 + .asciz "void AttackShot()" + .balign 4 .global $$255979 $$255979: - .incbin "baserom.dol", 0x473834, 0x20 + .asciz "Scn.Step.Enemy.HotHead.Custom" + .balign 4 .global $$255980 $$255980: - .incbin "baserom.dol", 0x473854, 0x18 + .asciz "bool IsPlayerPosNear()" + .balign 4 .global $$255981 $$255981: - .incbin "baserom.dol", 0x47386C, 0x14 + .asciz "bool IsInViewRect()" .global $$255982 $$255982: - .incbin "baserom.dol", 0x473880, 0x20 + .asciz "int SetAfterAttackFrame()" + .balign 4 + .4byte 0 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4738A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BA0FC ;# ptr + .4byte 0x802BA0C0 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4738B0, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802BA0F8 ;# ptr + .4byte 0x802BA0DC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255955 $$255955: - .incbin "baserom.dol", 0x473B58, 0x24 + .asciz "Scn.Step.Enemy.Juckle.SetNextState" + .balign 4 .global $$255956 $$255956: - .incbin "baserom.dol", 0x473B7C, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255957 $$255957: - .incbin "baserom.dol", 0x473B8C, 0x10 + .asciz "void Follow()" + .balign 4 .global $$255958 $$255958: - .incbin "baserom.dol", 0x473B9C, 0x20 + .asciz "Scn.Step.Enemy.Juckle.Custom" + .balign 4 .global $$255959 $$255959: - .incbin "baserom.dol", 0x473BBC, 0x1C + .asciz "bool IsPlayerInArea()" + .balign 4 + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473BD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BB120 ;# ptr + .4byte 0x802BB0E4 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473BE8, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802BB11C ;# ptr + .4byte 0x802BB100 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256136 $$256136: - .incbin "baserom.dol", 0x473E20, 0x24 + .asciz "Scn.Step.Enemy.Kabu.SetNextState" + .balign 4 .global $$256137 $$256137: - .incbin "baserom.dol", 0x473E44, 0xC + .asciz "void Jump()" .global $$256138 $$256138: - .incbin "baserom.dol", 0x473E50, 0xC + .asciz "void Move()" .global $$256139 $$256139: - .incbin "baserom.dol", 0x473E5C, 0x14 + .asciz "void MoveAround()" + .balign 4 .global $$256140 $$256140: - .incbin "baserom.dol", 0x473E70, 0x1C + .asciz "void GrandLowperEscape()" + .balign 4 .global $$256141 $$256141: - .incbin "baserom.dol", 0x473E8C, 0x1C + .asciz "Scn.Step.Enemy.Kabu.Custom" + .balign 4 .global $$256142 $$256142: - .incbin "baserom.dol", 0x473EA8, 0x18 + .asciz "int setJumpWaitTime()" + .balign 4 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473EC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BC5C0 ;# ptr + .4byte 0x802BC544 ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473ED0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BC5BC ;# ptr + .4byte 0x802BC560 ;# ptr .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473EE0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BC5B8 ;# ptr + .4byte 0x802BC57C ;# ptr .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473EF0, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802BC5B4 ;# ptr + .4byte 0x802BC598 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256081 $$256081: - .incbin "baserom.dol", 0x474358, 0x28 + .asciz "Scn.Step.Enemy.KnuckleJoe.SetNextState" + .balign 4 .global $$256082 $$256082: - .incbin "baserom.dol", 0x474380, 0xC + .asciz "void Walk()" .global $$256083 $$256083: - .incbin "baserom.dol", 0x47438C, 0x14 + .asciz "void WalkStepBack()" .global $$256084 $$256084: - .incbin "baserom.dol", 0x4743A0, 0x10 + .asciz "void Attack()" + .balign 4 .global $$256085 $$256085: - .incbin "baserom.dol", 0x4743B0, 0x24 + .asciz "Scn.Step.Enemy.KnuckleJoe.Custom" + .balign 4 .global $$256086 $$256086: - .incbin "baserom.dol", 0x4743D4, 0x18 + .asciz "void AttackEffect(int)" + .balign 4 .global $$256087 $$256087: - .incbin "baserom.dol", 0x4743EC, 0xC + .asciz "void Shot()" .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4743F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BF09C ;# ptr + .4byte 0x802BF040 ;# ptr .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474408, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BF098 ;# ptr + .4byte 0x802BF05C ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474418, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x802BF094 ;# ptr + .4byte 0x802BF078 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255828 $$255828: - .incbin "baserom.dol", 0x474B10, 0x24 + .asciz "Scn.Step.Enemy.Lanzer.SetNextState" + .balign 4 .global $$255829 $$255829: - .incbin "baserom.dol", 0x474B34, 0xC + .asciz "void Wait()" .global $$255830 $$255830: - .incbin "baserom.dol", 0x474B40, 0xC + .asciz "void Walk()" .global $$255831 $$255831: - .incbin "baserom.dol", 0x474B4C, 0x14 + .asciz "void WalkAround()" + .balign 4 .global $$255832 $$255832: - .incbin "baserom.dol", 0x474B60, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255833 $$255833: - .incbin "baserom.dol", 0x474B70, 0x20 + .asciz "Scn.Step.Enemy.Lanzer.Custom" + .balign 4 .global $$255834 $$255834: - .incbin "baserom.dol", 0x474B90, 0x18 + .asciz "void AttackEffect()" + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474BA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C1B00 ;# ptr + .4byte 0x802C1A84 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474BB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C1AFC ;# ptr + .4byte 0x802C1AA0 ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474BC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C1AF8 ;# ptr + .4byte 0x802C1ABC ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474BD8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802C1AF4 ;# ptr + .4byte 0x802C1AD8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255605 $$255605: - .incbin "baserom.dol", 0x474EB0, 0x24 + .asciz "Scn.Step.Enemy.Leafan.SetNextState" + .balign 4 .global $$255606 $$255606: - .incbin "baserom.dol", 0x474ED4, 0xC + .asciz "void Jump()" .global $$255607 $$255607: - .incbin "baserom.dol", 0x474EE0, 0x10 + .asciz "void Attack()" + .balign 4 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474EF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C33F8 ;# ptr + .4byte 0x802C33BC ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474F00, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802C33F4 ;# ptr + .4byte 0x802C33D8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255631 $$255631: - .incbin "baserom.dol", 0x475190, 0x24 + .asciz "Scn.Step.Enemy.Mumbies.SetNextState" .global $$255632 $$255632: - .incbin "baserom.dol", 0x4751B4, 0x14 + .asciz "void Chase()" + .balign 4 + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4751C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C4CE8 ;# ptr + .4byte 0x802C4CCC ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: - .incbin "baserom.dol", 0x4755F0, 0x24 + .asciz "Scn.Step.Enemy.Noddy.SetNextState" + .balign 4 .global $$255491 $$255491: - .incbin "baserom.dol", 0x475614, 0xC + .asciz "void Walk()" .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475620, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C71A0 ;# ptr + .4byte 0x802C7184 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255673 $$255673: - .incbin "baserom.dol", 0x475740, 0x24 + .asciz "Scn.Step.Enemy.Nruff.SetNextState" + .balign 4 .global $$255674 $$255674: - .incbin "baserom.dol", 0x475764, 0xC + .asciz "void Walk()" .global $$255675 $$255675: - .incbin "baserom.dol", 0x475770, 0xC + .asciz "void Stay()" .global $$255676 $$255676: - .incbin "baserom.dol", 0x47577C, 0x1C + .asciz "void GrandLowperEscape()" + .balign 4 .global $$255677 $$255677: - .incbin "baserom.dol", 0x475798, 0x1C + .asciz "Scn.Step.Enemy.Nruff.Model" + .balign 4 .global $$255678 $$255678: - .incbin "baserom.dol", 0x4757B4, 0x1C + .asciz "void ReqScriptWalk()" + .balign 4 + .4byte 0 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4757D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C776C ;# ptr + .4byte 0x802C7710 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4757E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C7768 ;# ptr + .4byte 0x802C772C ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4757F0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802C7764 ;# ptr + .4byte 0x802C7748 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255889 $$255889: - .incbin "baserom.dol", 0x475B78, 0x24 + .asciz "Scn.Step.Enemy.Owgulf.SetNextState" + .balign 4 .global $$255890 $$255890: - .incbin "baserom.dol", 0x475B9C, 0xC + .asciz "void Wait()" .global $$255891 $$255891: - .incbin "baserom.dol", 0x475BA8, 0x10 + .asciz "void WaitFix()" + .balign 4 .global $$255892 $$255892: - .incbin "baserom.dol", 0x475BB8, 0x14 + .asciz "void FlyStraight()" + .balign 4 .global $$255893 $$255893: - .incbin "baserom.dol", 0x475BCC, 0x24 + .asciz "void Attack()" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475BF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C9AC8 ;# ptr + .4byte 0x802C9A4C ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475C00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C9AC4 ;# ptr + .4byte 0x802C9A68 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475C10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C9AC0 ;# ptr + .4byte 0x802C9A84 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475C20, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802C9ABC ;# ptr + .4byte 0x802C9AA0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255979 $$255979: - .incbin "baserom.dol", 0x4766B0, 0x28 + .asciz "Scn.Step.Enemy.PoppyBroJr.SetNextState" + .balign 4 .global $$255980 $$255980: - .incbin "baserom.dol", 0x4766D8, 0xC + .asciz "void Move()" .global $$255981 $$255981: - .incbin "baserom.dol", 0x4766E4, 0x10 + .asciz "void Throw()" + .balign 4 .global $$255982 $$255982: - .incbin "baserom.dol", 0x4766F4, 0x24 + .asciz "Scn.Step.Enemy.PoppyBroJr.Custom" + .balign 4 .global $$255983 $$255983: - .incbin "baserom.dol", 0x476718, 0x14 + .asciz "int SetWaitTime()" + .balign 4 .global $$255984 $$255984: - .incbin "baserom.dol", 0x47672C, 0x14 + .asciz "bool IsThrowValid()" .global $$255985 $$255985: - .incbin "baserom.dol", 0x476740, 0x18 + .asciz "void RequestBomb()" + .balign 4 + .4byte 0 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476758, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D1568 ;# ptr + .4byte 0x802D152C ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476768, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802D1564 ;# ptr + .4byte 0x802D1548 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255661 $$255661: - .incbin "baserom.dol", 0x476BB0, 0x24 + .asciz "Scn.Step.Enemy.Rocky.SetNextState" + .balign 4 .global $$255662 $$255662: - .incbin "baserom.dol", 0x476BD4, 0x14 + .asciz "void WalkStart()" + .balign 4 .global $$255663 $$255663: - .incbin "baserom.dol", 0x476BE8, 0xC + .asciz "void Stay()" .global $$255664 $$255664: - .incbin "baserom.dol", 0x476BF4, 0x2C + .asciz "void CreditGoodbye()" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476C20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D360C ;# ptr + .4byte 0x802D35D0 ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476C30, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802D3608 ;# ptr + .4byte 0x802D35EC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255890 $$255890: - .incbin "baserom.dol", 0x477350, 0x24 + .asciz "Scn.Step.Enemy.Scarfy.SetNextState" + .balign 4 .global $$255891 $$255891: - .incbin "baserom.dol", 0x477374, 0x10 + .asciz "void Escape()" + .balign 4 .global $$255892 $$255892: - .incbin "baserom.dol", 0x477384, 0x20 + .asciz "Scn.Step.Enemy.Scarfy.Custom" + .balign 4 .global $$255893 $$255893: - .incbin "baserom.dol", 0x4773A4, 0x14 + .asciz "bool IsAnger()" + .balign 4 + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4773B8, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802D949C ;# ptr + .4byte 0x802D9480 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255748 $$255748: - .incbin "baserom.dol", 0x4779D0, 0x24 + .asciz "Scn.Step.Enemy.Sheld.SetNextState" + .balign 4 .global $$255749 $$255749: - .incbin "baserom.dol", 0x4779F4, 0xC + .asciz "void Dash()" .global $$255750 $$255750: - .incbin "baserom.dol", 0x477A00, 0x10 + .asciz "void Chase()" + .balign 4 .global $$255751 $$255751: - .incbin "baserom.dol", 0x477A10, 0x10 + .asciz "void Escape()" + .balign 4 .global $$255752 $$255752: - .incbin "baserom.dol", 0x477A20, 0x20 + .asciz "void GrandLowperEscape()" + .balign 4 + .4byte 0 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477A40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DC838 ;# ptr + .4byte 0x802DC7BC ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477A50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DC834 ;# ptr + .4byte 0x802DC7D8 ;# ptr .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477A60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DC830 ;# ptr + .4byte 0x802DC7F4 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477A70, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802DC82C ;# ptr + .4byte 0x802DC810 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255896 $$255896: - .incbin "baserom.dol", 0x477FB0, 0x24 + .asciz "Scn.Step.Enemy.Shotzo.SetNextState" + .balign 4 .global $$255897 $$255897: - .incbin "baserom.dol", 0x477FD4, 0xC + .asciz "void Shot()" .global $$255898 $$255898: - .incbin "baserom.dol", 0x477FE0, 0xC + .asciz "void Aim()" + .balign 4 .global $$255899 $$255899: - .incbin "baserom.dol", 0x477FEC, 0x20 + .asciz "Scn.Step.Enemy.Shotzo.Custom" + .balign 4 .global $$255900 $$255900: - .incbin "baserom.dol", 0x47800C, 0x1C + .asciz "bool IsPlayerInAimArea()" + .balign 4 .global $$255901 $$255901: - .incbin "baserom.dol", 0x478028, 0x10 + .asciz "bool IsFixPos()" .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478038, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DFD9C ;# ptr + .4byte 0x802DFD60 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478048, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802DFD98 ;# ptr + .4byte 0x802DFD7C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255925 $$255925: - .incbin "baserom.dol", 0x4782D0, 0x28 + .asciz "Scn.Step.Enemy.SirKibble.SetNextState" + .balign 4 .global $$255926 $$255926: - .incbin "baserom.dol", 0x4782F8, 0x10 + .asciz "void Attack()" + .balign 4 .global $$255927 $$255927: - .incbin "baserom.dol", 0x478308, 0x10 + .asciz "void Jump()" + .4byte 0 .global $$255928 $$255928: - .incbin "baserom.dol", 0x478318, 0x20 + .asciz "Scn.Step.Enemy.SirKibble.Custom" .global $$255929 $$255929: - .incbin "baserom.dol", 0x478338, 0x14 + .asciz "void ChkPlayerPos()" .global $$255930 $$255930: - .incbin "baserom.dol", 0x47834C, 0x18 + .asciz "bool IsPlayerUpPos()" + .balign 4 .global $$255931 $$255931: - .incbin "baserom.dol", 0x478364, 0x1C + .asciz "bool IsChangeDirType()" + .balign 4 + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478380, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E11F4 ;# ptr + .4byte 0x802E11B8 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478390, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802E11F0 ;# ptr + .4byte 0x802E11D4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255955 $$255955: - .incbin "baserom.dol", 0x478730, 0x28 + .asciz "Scn.Step.Enemy.SisterBound.SetNextState" .global $$255956 $$255956: - .incbin "baserom.dol", 0x478758, 0x14 + .asciz "void JumpStart()" + .balign 4 .global $$255957 $$255957: - .incbin "baserom.dol", 0x47876C, 0x10 + .asciz "void Landing()" + .balign 4 .global $$255958 $$255958: - .incbin "baserom.dol", 0x47877C, 0x24 + .asciz "Scn.Step.Enemy.SisterBound.Custom" + .balign 4 .global $$255959 $$255959: - .incbin "baserom.dol", 0x4787A0, 0x18 + .asciz "bool IsChangeDir()" + .balign 4 + .4byte 0 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4787B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E259C ;# ptr + .4byte 0x802E2560 ;# ptr .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4787C8, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802E2598 ;# ptr + .4byte 0x802E257C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256129 $$256129: - .incbin "baserom.dol", 0x478C60, 0x24 + .asciz "Scn.Step.Enemy.Sodory.SetNextState" + .balign 4 .global $$256130 $$256130: - .incbin "baserom.dol", 0x478C84, 0xC + .asciz "void Wait()" .global $$256131 $$256131: - .incbin "baserom.dol", 0x478C90, 0x14 + .asciz "void WalkAround()" + .balign 4 .global $$256132 $$256132: - .incbin "baserom.dol", 0x478CA4, 0xC + .asciz "void Fly()" + .balign 4 .global $$256133 $$256133: - .incbin "baserom.dol", 0x478CB0, 0x10 + .asciz "void Attack()" + .balign 4 .global $$256134 $$256134: - .incbin "baserom.dol", 0x478CC0, 0x14 + .asciz "void GroundAttack()" .global $$256135 $$256135: - .incbin "baserom.dol", 0x478CD4, 0x20 + .asciz "Scn.Step.Enemy.Sodory.Custom" + .balign 4 .global $$256136 $$256136: - .incbin "baserom.dol", 0x478CF4, 0x14 + .asciz "void AttackEffect()" .global $$256137 $$256137: - .incbin "baserom.dol", 0x478D08, 0x18 + .asciz "void SetDirection()" + .4byte 0 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478D20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E480C ;# ptr + .4byte 0x802E4770 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478D30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E4808 ;# ptr + .4byte 0x802E478C ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478D40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E4804 ;# ptr + .4byte 0x802E47A8 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478D50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E4800 ;# ptr + .4byte 0x802E47C4 ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478D60, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802E47FC ;# ptr + .4byte 0x802E47E0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: - .incbin "baserom.dol", 0x479078, 0x24 + .asciz "Scn.Step.Enemy.Sparky.SetNextState" + .balign 4 .global $$255575 $$255575: - .incbin "baserom.dol", 0x47909C, 0xC + .asciz "void Jump()" .global $$255576 $$255576: - .incbin "baserom.dol", 0x4790A8, 0x10 + .asciz "void Attack()" + .balign 4 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4790B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E6BE8 ;# ptr + .4byte 0x802E6BAC ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4790C8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802E6BE4 ;# ptr + .4byte 0x802E6BC8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256382 $$256382: - .incbin "baserom.dol", 0x4795E8, 0x28 + .asciz "Scn.Step.Enemy.Tsukikage.SetNextState" + .balign 4 .global $$256383 $$256383: - .incbin "baserom.dol", 0x479610, 0xC + .asciz "void Jump()" .global $$256384 $$256384: - .incbin "baserom.dol", 0x47961C, 0x10 + .asciz "void Attack()" + .balign 4 .global $$256385 $$256385: - .incbin "baserom.dol", 0x47962C, 0x14 + .asciz "void WallAttack()" + .balign 4 .global $$256386 $$256386: - .incbin "baserom.dol", 0x479640, 0xC + .asciz "void Wait()" .global $$256387 $$256387: - .incbin "baserom.dol", 0x47964C, 0x14 + .asciz "void JumpAttack()" + .balign 4 .global $$256388 $$256388: - .incbin "baserom.dol", 0x479660, 0xC + .asciz "void Warp()" .global $$256389 $$256389: - .incbin "baserom.dol", 0x47966C, 0xC + .asciz "void Wall()" .global $$256390 $$256390: - .incbin "baserom.dol", 0x479678, 0x20 + .asciz "Scn.Step.Enemy.Tsukikage.Custom" .global $$256391 $$256391: - .incbin "baserom.dol", 0x479698, 0x10 + .asciz "bool IsWall()" + .balign 4 .global $$256392 $$256392: - .incbin "baserom.dol", 0x4796A8, 0x14 + .asciz "bool IsJumpAttack()" .global $$256393 $$256393: - .incbin "baserom.dol", 0x4796BC, 0x18 + .asciz "bool IsFirstAppear()" + .balign 4 .global $$256394 $$256394: - .incbin "baserom.dol", 0x4796D4, 0x14 + .asciz "bool IsWallAttack()" .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4796E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA414 ;# ptr + .4byte 0x802EA338 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4796F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA410 ;# ptr + .4byte 0x802EA354 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479708, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA40C ;# ptr + .4byte 0x802EA370 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479718, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA408 ;# ptr + .4byte 0x802EA38C ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479728, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA404 ;# ptr + .4byte 0x802EA3A8 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479738, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA400 ;# ptr + .4byte 0x802EA3C4 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479748, 0x80 + .4byte 0 + .4byte 0 + .4byte 0x802EA3FC ;# ptr + .4byte 0x802EA3E0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: - .incbin "baserom.dol", 0x479B80, 0x28 + .asciz "Scn.Step.Enemy.WaddleDee.SetNextState" + .balign 4 .global $$255575 $$255575: - .incbin "baserom.dol", 0x479BA8, 0x1C + .asciz "void GrandLowperEscape()" + .balign 4 .global $$255576 $$255576: - .incbin "baserom.dol", 0x479BC4, 0x24 + .asciz "void CreditPraise()" + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479BE8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802ED1DC ;# ptr + .4byte 0x802ED1C0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: - .incbin "baserom.dol", 0x47A468, 0x28 + .asciz "Scn.Step.Enemy.WaddleDoo.SetNextState" + .balign 4 .global $$255575 $$255575: - .incbin "baserom.dol", 0x47A490, 0xC + .asciz "void Jump()" .global $$255576 $$255576: - .incbin "baserom.dol", 0x47A49C, 0x14 + .asciz "void Attack()" + .balign 4 + .4byte 0 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A4B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EF954 ;# ptr + .4byte 0x802EF918 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A4C0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x802EF950 ;# ptr + .4byte 0x802EF934 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: - .incbin "baserom.dol", 0x47A910, 0x28 + .asciz "Scn.Step.Enemy.WaterGalbo.SetNextState" + .balign 4 .global $$255491 $$255491: - .incbin "baserom.dol", 0x47A938, 0x10 + .asciz "void Attack()" + .balign 4 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A948, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F005C ;# ptr + .4byte 0x802F0040 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: - .incbin "baserom.dol", 0x47AAC8, 0x24 + .asciz "Scn.Step.Enemy.Whippy.SetNextState" + .balign 4 .global $$255491 $$255491: - .incbin "baserom.dol", 0x47AAEC, 0x14 + .asciz "void Attack()" + .balign 4 + .4byte 0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47AB00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F0734 ;# ptr + .4byte 0x802F0718 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255444 $$255444: - .incbin "baserom.dol", 0x47B130, 0x28 + .asciz "Scn.Step.Gimmick.AreaMapDemo.SoundSE" + .balign 4 .global $$255445 $$255445: - .incbin "baserom.dol", 0x47B158, 0x14 + .asciz "void BindNormal()" + .balign 4 .global $$255446 $$255446: - .incbin "baserom.dol", 0x47B16C, 0x24 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Custom" .global $$255447 $$255447: - .incbin "baserom.dol", 0x47B190, 0x14 + .asciz "void UnpauseBGM()" + .balign 4 .global $$255448 $$255448: - .incbin "baserom.dol", 0x47B1A4, 0x1C + .asciz "void StartDoorUnlockDemo()" + .balign 4 .global $$255449 $$255449: - .incbin "baserom.dol", 0x47B1C0, 0x1C + .asciz "bool IsDoorUnlockDemoEnd()" + .balign 4 .global $$255450 $$255450: - .incbin "baserom.dol", 0x47B1DC, 0x1C + .asciz "void SetZoom(bool,float)" + .balign 4 .global $$255451 $$255451: - .incbin "baserom.dol", 0x47B1F8, 0x14 + .asciz "void UnsetZoom()" + .balign 4 .global $$255452 $$255452: - .incbin "baserom.dol", 0x47B20C, 0x14 + .asciz "void UnsetZoomAll()" .global $$255453 $$255453: - .incbin "baserom.dol", 0x47B220, 0x10 + .asciz "void SetEnd()" + .balign 4 .global $$255454 $$255454: - .incbin "baserom.dol", 0x47B230, 0x24 + .asciz "void SetupOtherDoorUnlockDemoZoom()" .global $$255455 $$255455: - .incbin "baserom.dol", 0x47B254, 0x24 + .asciz "bool IsExistOtherDoorUnlockDemo()" + .balign 4 .global $$255456 $$255456: - .incbin "baserom.dol", 0x47B278, 0x20 + .asciz "void StartOtherDoorUnlockDemo()" .global $$255457 $$255457: - .incbin "baserom.dol", 0x47B298, 0x20 + .asciz "bool IsOtherDoorUnlockDemoEnd()" .global $$255458 $$255458: - .incbin "baserom.dol", 0x47B2B8, 0x20 + .asciz "void SetZoomTargetToMusouDoor()" .global $$255459 $$255459: - .incbin "baserom.dol", 0x47B2D8, 0x28 + .asciz "void SetZoomTargetToMasterDoor()" + .balign 4 + .4byte 0 .global $$255460 $$255460: - .incbin "baserom.dol", 0x47B300, 0x20 + .asciz "void StartMusouDoorUnlockDemo()" .global $$255461 $$255461: - .incbin "baserom.dol", 0x47B320, 0x20 + .asciz "bool IsMusouDoorUnlockDemoEnd()" .global $$255462 $$255462: - .incbin "baserom.dol", 0x47B340, 0x24 + .asciz "void StartMasterDoorUnlockDemo()" + .balign 4 .global $$255463 $$255463: - .incbin "baserom.dol", 0x47B364, 0x24 + .asciz "bool IsMasterDoorUnlockDemoEnd()" + .balign 4 .global $$255464 $$255464: - .incbin "baserom.dol", 0x47B388, 0x20 + .asciz "void FirstPlayStartCameraMove()" .global $$255465 $$255465: - .incbin "baserom.dol", 0x47B3A8, 0x2C + .asciz "void FirstLvInStartCameraMove(int,float)" + .balign 4 .global $$255466 $$255466: - .incbin "baserom.dol", 0x47B3D4, 0x24 + .asciz "void ChangeGradeAppearInfo()" + .balign 4 + .4byte 0 .global $$255467 $$255467: - .incbin "baserom.dol", 0x47B3F8, 0x20 + .asciz "void ChangeGradeDisappearInfo()" .global $$255468 $$255468: - .incbin "baserom.dol", 0x47B418, 0x20 + .asciz "void ChangeGradeAppearModel()" + .balign 4 .global $$255469 $$255469: - .incbin "baserom.dol", 0x47B438, 0x24 + .asciz "void ChangeGradeDisappearModel()" + .balign 4 .global $$255470 $$255470: - .incbin "baserom.dol", 0x47B45C, 0x28 + .asciz "bool ChangeGradeIsDisappearedModel()" + .balign 4 .global $$255471 $$255471: - .incbin "baserom.dol", 0x47B484, 0x24 + .asciz "void ChangeGradeRequestBGM()" + .balign 4 + .4byte 0 .global $$255472 $$255472: - .incbin "baserom.dol", 0x47B4A8, 0x20 + .asciz "void ChangeGradeRequestEffect()" .global $$255473 $$255473: - .incbin "baserom.dol", 0x47B4C8, 0x1C + .asciz "int ChangeGradeGetBGMType()" .global $$255474 $$255474: - .incbin "baserom.dol", 0x47B4E4, 0x30 + .asciz "void AppearWarpStarStartCameraMove(int,float)" + .balign 4 .global $$255475 $$255475: - .incbin "baserom.dol", 0x47B514, 0x2C + .asciz "void AppearWarpStarEndCameraMove(int,float)" .global $$255476 $$255476: - .incbin "baserom.dol", 0x47B540, 0x20 + .asciz "void AllStageClearAppearInfo()" + .balign 4 .global $$255477 $$255477: - .incbin "baserom.dol", 0x47B560, 0x24 + .asciz "void AllStageClearDisappearInfo()" + .balign 4 .global $$255478 $$255478: - .incbin "baserom.dol", 0x47B584, 0x20 + .asciz "void AllStageClearRequestBGM()" + .balign 4 .global $$255479 $$255479: - .incbin "baserom.dol", 0x47B5A4, 0x74 + .asciz "void AllStageClearRequestEffect()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256126 $$256126: - .incbin "baserom.dol", 0x47C5E0, 0x28 + .asciz "Scn.Step.Gimmick.ChallengeDoor.SoundSE" + .balign 4 .global $$256127 $$256127: - .incbin "baserom.dol", 0x47C608, 0x14 + .asciz "void BindNormal()" + .balign 4 .global $$256128 $$256128: - .incbin "baserom.dol", 0x47C61C, 0x28 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Custom" + .balign 4 .global $$256129 $$256129: - .incbin "baserom.dol", 0x47C644, 0x14 + .asciz "void FadeOut(int)" + .balign 4 .global $$256130 $$256130: - .incbin "baserom.dol", 0x47C658, 0x14 + .asciz "void FadeIn(int)" + .balign 4 .global $$256131 $$256131: - .incbin "baserom.dol", 0x47C66C, 0x1C + .asciz "int SetZoom(float,float)" + .balign 4 .global $$256132 $$256132: - .incbin "baserom.dol", 0x47C688, 0x1C + .asciz "void UpdateZoom(int,float)" + .balign 4 .global $$256133 $$256133: - .incbin "baserom.dol", 0x47C6A4, 0x14 + .asciz "void UnsetZoom(int)" .global $$256134 $$256134: - .incbin "baserom.dol", 0x47C6B8, 0x1C + .asciz "void SetVisibility(bool)" + .balign 4 .global $$256135 $$256135: - .incbin "baserom.dol", 0x47C6D4, 0x14 + .asciz "void UnlockAnim()" + .balign 4 .global $$256136 $$256136: - .incbin "baserom.dol", 0x47C6E8, 0x18 + .asciz "bool IsUnlockAnimEnd()" + .balign 4 .global $$256137 $$256137: - .incbin "baserom.dol", 0x47C700, 0x18 + .asciz "void StarStartEffect()" + .balign 4 .global $$256138 $$256138: - .incbin "baserom.dol", 0x47C718, 0x18 + .asciz "void StarStartAnim()" + .balign 4 .global $$256139 $$256139: - .incbin "baserom.dol", 0x47C730, 0x20 + .asciz "void StarSetZoom(bool,float)" + .balign 4 .global $$256140 $$256140: - .incbin "baserom.dol", 0x47C750, 0x18 + .asciz "void StarUnsetZoom()" + .balign 4 .global $$256141 $$256141: - .incbin "baserom.dol", 0x47C768, 0x14 + .asciz "bool StarIsFlyEnd()" .global $$256142 $$256142: - .incbin "baserom.dol", 0x47C77C, 0x24 + .asciz "void ReqUnlockEffect1_UnlockDoor()" + .balign 4 .global $$256143 $$256143: - .incbin "baserom.dol", 0x47C7A0, 0x1C + .asciz "bool IsNeedLastUnlockAnim()" .global $$256144 $$256144: - .incbin "baserom.dol", 0x47C7BC, 0x18 + .asciz "void LastUnlockAnim()" + .balign 4 .global $$256145 $$256145: - .incbin "baserom.dol", 0x47C7D4, 0x1C + .asciz "bool IsLastUnlockAnimEnd()" + .balign 4 .global $$256146 $$256146: - .incbin "baserom.dol", 0x47C7F0, 0x20 + .asciz "void ReqUnlockEffect1_LockHit()" .global $$256147 $$256147: - .incbin "baserom.dol", 0x47C810, 0x24 + .asciz "void ReqUnlockEffect1_LockBreak()" + .balign 4 .global $$256148 $$256148: - .incbin "baserom.dol", 0x47C834, 0x24 + .asciz "void ReqUnlockEffect1_UnlockEnd()" + .balign 4 .global $$256149 $$256149: - .incbin "baserom.dol", 0x47C858, 0x28 + .asciz "void ReqUnlockEffect2_ChainBreak(int)" + .balign 4 .global $$256150 $$256150: - .incbin "baserom.dol", 0x47C880, 0x18 + .asciz "void EndUnlockDemo()" + .balign 4 .global $$256151 $$256151: - .incbin "baserom.dol", 0x47C898, 0x68 + .asciz "void SetDemoEnd()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254867 $$254867: - .incbin "baserom.dol", 0x47DBC0, 0x20 + .asciz "Scn.Step.Gimmick.Monitor.Custom" .global $$254868 $$254868: - .incbin "baserom.dol", 0x47DBE0, 0x10 + .asciz "void SeReq()" + .balign 4 .global $$254869 $$254869: - .incbin "baserom.dol", 0x47DBF0, 0x14 + .asciz "void ViewNoise()" + .balign 4 .global $$254870 $$254870: - .incbin "baserom.dol", 0x47DC04, 0x14 + .asciz "void ViewCaution()" + .balign 4 .global $$254871 $$254871: - .incbin "baserom.dol", 0x47DC18, 0x10 + .asciz "void ViewMap()" + .balign 4 .global $$254872 $$254872: - .incbin "baserom.dol", 0x47DC28, 0x10 + .asciz "void ViewShip()" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257355 $$257355: - .incbin "baserom.dol", 0x47DCE0, 0x24 + .asciz "Scn.Step.Gimmick.ShipEvent.Custom" + .balign 4 .global $$257356 $$257356: - .incbin "baserom.dol", 0x47DD04, 0x18 + .asciz "void CCtrl_SeenPhoto()" + .balign 4 .global $$257357 $$257357: - .incbin "baserom.dol", 0x47DD1C, 0x1C + .asciz "void CCtrl_SeenTalkZoom()" + .balign 4 .global $$257358 $$257358: - .incbin "baserom.dol", 0x47DD38, 0x20 + .asciz "void CCtrl_SeenMonitor()" + .balign 4 + .4byte 0 .global $$257359 $$257359: - .incbin "baserom.dol", 0x47DD58, 0x18 + .asciz "void CCtrl_SeenReboot()" .global $$257360 $$257360: - .incbin "baserom.dol", 0x47DD70, 0x20 + .asciz "void CCtrl_SeenFirstDemoTalk()" + .balign 4 .global $$257361 $$257361: - .incbin "baserom.dol", 0x47DD90, 0x20 + .asciz "void CCtrl_SeenFirstDemoRoom()" + .balign 4 .global $$257362 $$257362: - .incbin "baserom.dol", 0x47DDB0, 0x1C + .asciz "void CCtrl_MomentMonitor()" + .balign 4 .global $$257363 $$257363: - .incbin "baserom.dol", 0x47DDCC, 0x18 + .asciz "void CCtrl_FadeOut()" + .balign 4 .global $$257364 $$257364: - .incbin "baserom.dol", 0x47DDE4, 0x14 + .asciz "void CCtrl_FadeIn()" .global $$257365 $$257365: - .incbin "baserom.dol", 0x47DDF8, 0x14 + .asciz "void CCtrl_Nature()" .global $$257366 $$257366: - .incbin "baserom.dol", 0x47DE0C, 0x18 + .asciz "void CCtrl_SeenReset()" + .balign 4 .global $$257367 $$257367: - .incbin "baserom.dol", 0x47DE24, 0x14 + .asciz "bool CCtrl_isEnd()" + .balign 4 .global $$257368 $$257368: - .incbin "baserom.dol", 0x47DE38, 0x14 + .asciz "void PCtrl_Wait()" + .balign 4 .global $$257369 $$257369: - .incbin "baserom.dol", 0x47DE4C, 0x18 + .asciz "void PCtrl_TurnBack()" + .balign 4 .global $$257370 $$257370: - .incbin "baserom.dol", 0x47DE64, 0x18 + .asciz "void PCtrl_ItemGet()" + .balign 4 .global $$257371 $$257371: - .incbin "baserom.dol", 0x47DE7C, 0x14 + .asciz "void PCtrl_Free()" + .balign 4 .global $$257372 $$257372: - .incbin "baserom.dol", 0x47DE90, 0x18 + .asciz "void PCtrl_Listening()" + .balign 4 .global $$257373 $$257373: - .incbin "baserom.dol", 0x47DEA8, 0x14 + .asciz "void MaCtrl_Wait()" + .balign 4 .global $$257374 $$257374: - .incbin "baserom.dol", 0x47DEBC, 0x14 + .asciz "void MaCtrl_Wait2()" .global $$257375 $$257375: - .incbin "baserom.dol", 0x47DED0, 0x14 + .asciz "void MaCtrl_Wait3()" .global $$257376 $$257376: - .incbin "baserom.dol", 0x47DEE4, 0x14 + .asciz "void MaCtrl_Wait5()" .global $$257377 $$257377: - .incbin "baserom.dol", 0x47DEF8, 0x14 + .asciz "void MaCtrl_Wait6()" .global $$257378 $$257378: - .incbin "baserom.dol", 0x47DF0C, 0x14 + .asciz "void MaCtrl_Wait7()" .global $$257379 $$257379: - .incbin "baserom.dol", 0x47DF20, 0x14 + .asciz "void MaCtrl_Wait8()" .global $$257380 $$257380: - .incbin "baserom.dol", 0x47DF34, 0x14 + .asciz "void MaCtrl_Wait9()" .global $$257381 $$257381: - .incbin "baserom.dol", 0x47DF48, 0x18 + .asciz "void MaCtrl_Wait10()" + .balign 4 .global $$257382 $$257382: - .incbin "baserom.dol", 0x47DF60, 0x18 + .asciz "void MaCtrl_Wait11()" + .balign 4 .global $$257383 $$257383: - .incbin "baserom.dol", 0x47DF78, 0x18 + .asciz "void MaCtrl_TurnFront()" .global $$257384 $$257384: - .incbin "baserom.dol", 0x47DF90, 0x18 + .asciz "void MaCtrl_TurnBack()" + .balign 4 .global $$257385 $$257385: - .incbin "baserom.dol", 0x47DFA8, 0x14 + .asciz "void MaCtrl_Talk()" + .balign 4 .global $$257386 $$257386: - .incbin "baserom.dol", 0x47DFBC, 0x18 + .asciz "void MaCtrl_TalkGlad()" + .balign 4 .global $$257387 $$257387: - .incbin "baserom.dol", 0x47DFD4, 0x1C + .asciz "void MaCtrl_TalkRegret()" + .balign 4 .global $$257388 $$257388: - .incbin "baserom.dol", 0x47DFF0, 0x1C + .asciz "void MaCtrl_TalkPointing()" + .balign 4 .global $$257389 $$257389: - .incbin "baserom.dol", 0x47E00C, 0x14 + .asciz "void MaCtrl_Glad()" + .balign 4 .global $$257390 $$257390: - .incbin "baserom.dol", 0x47E020, 0x20 + .asciz "void MaCtrl_TurnMainPlayer()" + .balign 4 .global $$257391 $$257391: - .incbin "baserom.dol", 0x47E040, 0x24 + .asciz "void MaCtrl_WaitMainPlayerMove()" + .balign 4 .global $$257392 $$257392: - .incbin "baserom.dol", 0x47E064, 0x18 + .asciz "void TCtrl_First(int)" + .balign 4 .global $$257393 $$257393: - .incbin "baserom.dol", 0x47E07C, 0x18 + .asciz "void TCtrl_Second(int)" + .balign 4 .global $$257394 $$257394: - .incbin "baserom.dol", 0x47E094, 0x14 + .asciz "void MoCtrl_SeReq()" .global $$257395 $$257395: - .incbin "baserom.dol", 0x47E0A8, 0x18 + .asciz "void MoCtrl_ViewNoise()" .global $$257396 $$257396: - .incbin "baserom.dol", 0x47E0C0, 0x1C + .asciz "void MoCtrl_ViewCaution()" + .balign 4 .global $$257397 $$257397: - .incbin "baserom.dol", 0x47E0DC, 0x18 + .asciz "void MoCtrl_ViewMap()" + .balign 4 .global $$257398 $$257398: - .incbin "baserom.dol", 0x47E0F4, 0x18 + .asciz "void MoCtrl_ViewShip()" + .balign 4 .global $$257399 $$257399: - .incbin "baserom.dol", 0x47E10C, 0x1C + .asciz "void BgmCtrl_PauseNormal()" + .balign 4 .global $$257400 $$257400: - .incbin "baserom.dol", 0x47E128, 0x20 + .asciz "void BgmCtrl_UnPauseNormal()" + .balign 4 .global $$257401 $$257401: - .incbin "baserom.dol", 0x47E148, 0x18 + .asciz "void BgmCtrl_ReqFanf1()" .global $$257402 $$257402: - .incbin "baserom.dol", 0x47E160, 0x14 + .asciz "bool IsSuspend()" + .balign 4 .global $$257403 $$257403: - .incbin "baserom.dol", 0x47E174, 0x18 + .asciz "void SuspendResume()" + .balign 4 .global $$257404 $$257404: - .incbin "baserom.dol", 0x47E18C, 0x14 + .asciz "bool IsTalkEnd()" + .balign 4 .global $$257405 $$257405: - .incbin "baserom.dol", 0x47E1A0, 0x14 + .asciz "void EnableSkip()" + .balign 4 .global $$257406 $$257406: - .incbin "baserom.dol", 0x47E1B4, 0x14 + .asciz "bool IsEnableSkip()" .global $$257407 $$257407: - .incbin "baserom.dol", 0x47E1C8, 0x60 + .asciz "void Release()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$259268 $$259268: - .incbin "baserom.dol", 0x47EAE0, 0x18 + .asciz "Scn.Step.Hero.Effect" + .balign 4 .global $$259269 $$259269: - .incbin "baserom.dol", 0x47EAF8, 0x14 + .asciz "void BindNormal()" + .balign 4 .global $$259270 $$259270: - .incbin "baserom.dol", 0x47EB0C, 0x18 + .asciz "void BindNormalWarp()" + .balign 4 .global $$259271 $$259271: - .incbin "baserom.dol", 0x47EB24, 0x14 + .asciz "void BindState()" + .balign 4 .global $$259272 $$259272: - .incbin "baserom.dol", 0x47EB38, 0x14 + .asciz "void BindState2()" + .balign 4 .global $$259273 $$259273: - .incbin "baserom.dol", 0x47EB4C, 0x18 + .asciz "void BindStateWarp()" + .balign 4 .global $$259274 $$259274: - .incbin "baserom.dol", 0x47EB64, 0x14 + .asciz "void BindMighty()" + .balign 4 .global $$259275 $$259275: - .incbin "baserom.dol", 0x47EB78, 0x14 + .asciz "void BindOther()" + .balign 4 .global $$259276 $$259276: - .incbin "baserom.dol", 0x47EB8C, 0x14 + .asciz "void BindSuper()" + .balign 4 .global $$259277 $$259277: - .incbin "baserom.dol", 0x47EBA0, 0x14 + .asciz "void BindWater()" + .balign 4 .global $$259278 $$259278: - .incbin "baserom.dol", 0x47EBB4, 0x18 + .asciz "void BindWaterState()" + .balign 4 .global $$259279 $$259279: - .incbin "baserom.dol", 0x47EBCC, 0x18 + .asciz "void BindWaterWarp()" + .balign 4 .global $$259280 $$259280: - .incbin "baserom.dol", 0x47EBE4, 0x14 + .asciz "void BindAbility()" + .balign 4 .global $$259281 $$259281: - .incbin "baserom.dol", 0x47EBF8, 0x14 + .asciz "void BindNonStop()" + .balign 4 .global $$259282 $$259282: - .incbin "baserom.dol", 0x47EC0C, 0x18 + .asciz "void BindNonStopFore()" + .balign 4 .global $$259283 $$259283: - .incbin "baserom.dol", 0x47EC24, 0x20 + .asciz "Scn.Step.Chara.Effect Normal()" + .balign 4 .global $$259284 $$259284: - .incbin "baserom.dol", 0x47EC44, 0x24 + .asciz "Scn.Step.Chara.Effect NormalWarp()" + .balign 4 .global $$259285 $$259285: - .incbin "baserom.dol", 0x47EC68, 0x20 + .asciz "Scn.Step.Chara.Effect State()" + .balign 4 .global $$259286 $$259286: - .incbin "baserom.dol", 0x47EC88, 0x20 + .asciz "Scn.Step.Chara.Effect State2()" + .balign 4 .global $$259287 $$259287: - .incbin "baserom.dol", 0x47ECA8, 0x24 + .asciz "Scn.Step.Chara.Effect StateWarp()" + .balign 4 .global $$259288 $$259288: - .incbin "baserom.dol", 0x47ECCC, 0x20 + .asciz "Scn.Step.Chara.Effect Mighty()" + .balign 4 .global $$259289 $$259289: - .incbin "baserom.dol", 0x47ECEC, 0x20 + .asciz "Scn.Step.Chara.Effect Other()" + .balign 4 .global $$259290 $$259290: - .incbin "baserom.dol", 0x47ED0C, 0x20 + .asciz "Scn.Step.Chara.Effect Super()" + .balign 4 .global $$259291 $$259291: - .incbin "baserom.dol", 0x47ED2C, 0x24 + .asciz "Scn.Step.Chara.Effect WaterWarp()" + .balign 4 .global $$259292 $$259292: - .incbin "baserom.dol", 0x47ED50, 0x20 + .asciz "Scn.Step.Chara.Effect Ability()" .global $$259293 $$259293: - .incbin "baserom.dol", 0x47ED70, 0x20 + .asciz "Scn.Step.Chara.Effect NonStop()" .global $$259294 $$259294: - .incbin "baserom.dol", 0x47ED90, 0x24 + .asciz "Scn.Step.Chara.Effect NonStopFore()" .global $$259295 $$259295: - .incbin "baserom.dol", 0x47EDB4, 0x18 + .asciz "Scn.Step.Hero.Utility" + .balign 4 .global $$259296 $$259296: - .incbin "baserom.dol", 0x47EDCC, 0x14 + .asciz "bool IsMainPlayer()" .global $$259297 $$259297: - .incbin "baserom.dol", 0x47EDE0, 0x10 + .asciz "bool IsKirby()" + .balign 4 .global $$259298 $$259298: - .incbin "baserom.dol", 0x47EDF0, 0x10 + .asciz "bool IsMeta()" + .balign 4 .global $$259299 $$259299: - .incbin "baserom.dol", 0x47EE00, 0x10 + .asciz "bool IsDedede()" .global $$259300 $$259300: - .incbin "baserom.dol", 0x47EE10, 0x10 + .asciz "bool IsDee()" + .balign 4 .global $$259301 $$259301: - .incbin "baserom.dol", 0x47EE20, 0x10 + .asciz "void LoadPos()" + .balign 4 .global $$259302 $$259302: - .incbin "baserom.dol", 0x47EE30, 0x10 + .asciz "void LoadDir()" + .balign 4 .global $$259303 $$259303: - .incbin "baserom.dol", 0x47EE40, 0x14 + .asciz "void LoadModelDir()" .global $$259304 $$259304: - .incbin "baserom.dol", 0x47EE54, 0x1C + .asciz "void LoadDirFollowFloor()" + .balign 4 .global $$259305 $$259305: - .incbin "baserom.dol", 0x47EE70, 0x18 + .asciz "void ReqLandingStar()" + .balign 4 .global $$259306 $$259306: - .incbin "baserom.dol", 0x47EE88, 0x14 + .asciz "void ReqNakigoe()" + .balign 4 .global $$259307 $$259307: - .incbin "baserom.dol", 0x47EE9C, 0x14 + .asciz "void ReqKakegoe()" + .balign 4 .global $$259308 $$259308: - .incbin "baserom.dol", 0x47EEB0, 0x10 + .asciz "bool IsPinch()" + .balign 4 .global $$259309 $$259309: - .incbin "baserom.dol", 0x47EEC0, 0x14 + .asciz "bool IsInWater()" + .balign 4 .global $$259310 $$259310: - .incbin "baserom.dol", 0x47EED4, 0x18 + .asciz "int ShakeChargePower()" + .balign 4 .global $$259311 $$259311: - .incbin "baserom.dol", 0x47EEEC, 0x14 + .asciz "bool IsInvisible()" + .balign 4 .global $$259312 $$259312: - .incbin "baserom.dol", 0x47EF00, 0x18 + .asciz "bool IsPressHDirKey()" + .balign 4 .global $$259313 $$259313: - .incbin "baserom.dol", 0x47EF18, 0x10 + .asciz "bool IsOnIce()" + .balign 4 .global $$259314 $$259314: - .incbin "baserom.dol", 0x47EF28, 0x20 + .asciz "bool IsExistPiggybackChild()" + .balign 4 .global $$259315 $$259315: - .incbin "baserom.dol", 0x47EF48, 0x18 + .asciz "bool IsExistCarryItem()" .global $$259316 $$259316: - .incbin "baserom.dol", 0x47EF60, 0x1C + .asciz "bool IsMainPlayerRight()" + .balign 4 .global $$259317 $$259317: - .incbin "baserom.dol", 0x47EF7C, 0x1C + .asciz "void SetIsDirRight(bool)" + .balign 4 .global $$259318 $$259318: - .incbin "baserom.dol", 0x47EF98, 0x14 + .asciz "bool IsDirRight()" + .balign 4 .global $$259319 $$259319: - .incbin "baserom.dol", 0x47EFAC, 0x14 + .asciz "bool IsHidDisable()" .global $$259320 $$259320: - .incbin "baserom.dol", 0x47EFC0, 0x18 + .asciz "bool IsBossDemoSilent()" .global $$259321 $$259321: - .incbin "baserom.dol", 0x47EFD8, 0x20 + .asciz "bool IsSeparateProcessMyTurn()" + .balign 4 .global $$259322 $$259322: - .incbin "baserom.dol", 0x47EFF8, 0x14 + .asciz "bool IsHaveCandle()" .global $$259323 $$259323: - .incbin "baserom.dol", 0x47F00C, 0x14 + .asciz "int PlayerCount()" + .balign 4 .global $$259324 $$259324: - .incbin "baserom.dol", 0x47F020, 0x28 + .asciz "void AddAttackGearNode3(int,int,float)" + .balign 4 .global $$259325 $$259325: - .incbin "baserom.dol", 0x47F048, 0x34 + .asciz "void AddAttackGearNode5(int,int,float,float,float)" + .balign 4 .global $$259326 $$259326: - .incbin "baserom.dol", 0x47F07C, 0x40 + .asciz "void AddAttackGearNode7(int,int,float,float,float,float,float)" + .balign 4 .global $$259327 $$259327: - .incbin "baserom.dol", 0x47F0BC, 0x44 + .asciz "void AddAttackGearNode8(int,int,float,float,float,float,float,bool)" .global $$259328 $$259328: - .incbin "baserom.dol", 0x47F100, 0x28 + .asciz "void RequestEffectGearNodeN(int,int)" + .balign 4 .global $$259329 $$259329: - .incbin "baserom.dol", 0x47F128, 0x2C + .asciz "void RequestEffectGearNodeNS(int,int,float)" .global $$259330 $$259330: - .incbin "baserom.dol", 0x47F154, 0x28 + .asciz "void RequestEffectGearNodeNO(int,int)" + .balign 4 .global $$259331 $$259331: - .incbin "baserom.dol", 0x47F17C, 0x30 + .asciz "void RequestEffectGearNodeNOS(int,int,float)" + .balign 4 .global $$259332 $$259332: - .incbin "baserom.dol", 0x47F1AC, 0x28 + .asciz "void RequestEffectGearNodeND(int,int)" + .balign 4 .global $$259333 $$259333: - .incbin "baserom.dol", 0x47F1D4, 0x30 + .asciz "void RequestEffectGearNodeNDS(int,int,float)" + .balign 4 .global $$259334 $$259334: - .incbin "baserom.dol", 0x47F204, 0x28 + .asciz "void RequestEffectGearNodeNDO(int,int)" + .balign 4 .global $$259335 $$259335: - .incbin "baserom.dol", 0x47F22C, 0x30 + .asciz "void RequestEffectGearNodeNDOS(int,int,float)" + .balign 4 .global $$259336 $$259336: - .incbin "baserom.dol", 0x47F25C, 0x1C + .asciz "Scn.Step.Hero.SoundSE" + .balign 4 + .4byte 0 .global $$259337 $$259337: - .incbin "baserom.dol", 0x47F278, 0x10 + .asciz "void BindLoop()" .global $$259338 $$259338: - .incbin "baserom.dol", 0x47F288, 0x14 + .asciz "void BindVacuum()" + .balign 4 .global $$259339 $$259339: - .incbin "baserom.dol", 0x47F29C, 0x18 + .asciz "Scn.Step.Hero.SlopeFit" + .balign 4 .global $$259340 $$259340: - .incbin "baserom.dol", 0x47F2B4, 0x14 + .asciz "void SetValid(bool)" .global $$259341 $$259341: - .incbin "baserom.dol", 0x47F2C8, 0x18 + .asciz "void SetIntpRate(float)" .global $$259342 $$259342: - .incbin "baserom.dol", 0x47F2E0, 0x1C + .asciz "void SetAffectRate(float)" + .balign 4 .global $$259343 $$259343: - .incbin "baserom.dol", 0x47F2FC, 0x18 + .asciz "Scn.Step.Hero.ObjColl" + .balign 4 .global $$259344 $$259344: - .incbin "baserom.dol", 0x47F314, 0x1C + .asciz "void SetBodyCollDefault()" + .balign 4 .global $$259345 $$259345: - .incbin "baserom.dol", 0x47F330, 0x18 + .asciz "void SetBodyCollBig()" + .balign 4 .global $$259346 $$259346: - .incbin "baserom.dol", 0x47F348, 0x18 + .asciz "void SetBodyCollSquat()" .global $$259347 $$259347: - .incbin "baserom.dol", 0x47F360, 0x18 + .asciz "void SetBodyCollJump()" + .balign 4 .global $$259348 $$259348: - .incbin "baserom.dol", 0x47F378, 0x1C + .asciz "Scn.Step.Hero.ScriptData" + .balign 4 .global $$259349 $$259349: - .incbin "baserom.dol", 0x47F394, 0x18 + .asciz "void SetFlipFoot(bool)" + .balign 4 .global $$259350 $$259350: - .incbin "baserom.dol", 0x47F3AC, 0x14 + .asciz "bool GetFlipFoot()" + .balign 4 .global $$259351 $$259351: - .incbin "baserom.dol", 0x47F3C0, 0x1C + .asciz "Scn.Step.Hero.StateChecker" + .balign 4 .global $$259352 $$259352: - .incbin "baserom.dol", 0x47F3DC, 0x10 + .asciz "bool IsRun()" + .balign 4 .global $$259353 $$259353: - .incbin "baserom.dol", 0x47F3EC, 0x10 + .asciz "bool IsFloat()" + .balign 4 .global $$259354 $$259354: - .incbin "baserom.dol", 0x47F3FC, 0x1C + .asciz "bool IsCarryBombDanger()" + .balign 4 .global $$259355 $$259355: - .incbin "baserom.dol", 0x47F418, 0x10 + .asciz "bool IsHover()" + .balign 4 .global $$259356 $$259356: - .incbin "baserom.dol", 0x47F428, 0x20 + .asciz "Scn.Step.Hero.AbilityManager" + .balign 4 .global $$259357 $$259357: - .incbin "baserom.dol", 0x47F448, 0x10 + .asciz "bool IsSuper()" + .balign 4 .global $$259358 $$259358: - .incbin "baserom.dol", 0x47F458, 0x14 + .asciz "int AbilityKind()" + .balign 4 .global $$259359 $$259359: - .incbin "baserom.dol", 0x47F46C, 0x14 + .asciz "int GetUseCount()" + .balign 4 .global $$259360 $$259360: - .incbin "baserom.dol", 0x47F480, 0x20 + .asciz "bool IsOnGrandLowperBattle()" + .balign 4 .global $$259361 $$259361: - .incbin "baserom.dol", 0x47F4A0, 0x14 + .asciz "Scn.Step.Hero.Model" .global $$259362 $$259362: - .incbin "baserom.dol", 0x47F4B4, 0x14 + .asciz "void BindGearHat()" + .balign 4 .global $$259363 $$259363: - .incbin "baserom.dol", 0x47F4C8, 0x14 + .asciz "void BindGearHat2()" .global $$259364 $$259364: - .incbin "baserom.dol", 0x47F4DC, 0x18 + .asciz "void BindGearRHand()" + .balign 4 .global $$259365 $$259365: - .incbin "baserom.dol", 0x47F4F4, 0x18 + .asciz "void BindGearLHand()" + .balign 4 .global $$259366 $$259366: - .incbin "baserom.dol", 0x47F50C, 0x14 + .asciz "void BindGearRot()" + .balign 4 .global $$259367 $$259367: - .incbin "baserom.dol", 0x47F520, 0x14 + .asciz "void BindGearTop()" + .balign 4 .global $$259368 $$259368: - .incbin "baserom.dol", 0x47F534, 0x18 + .asciz "void BindGearGoggle()" + .balign 4 .global $$259369 $$259369: - .incbin "baserom.dol", 0x47F54C, 0x1C + .asciz "void BindGearFloater()" + .balign 4 + .4byte 0 .global $$259370 $$259370: - .incbin "baserom.dol", 0x47F568, 0x18 + .asciz "void BindGearWarpStar()" .global $$259371 $$259371: - .incbin "baserom.dol", 0x47F580, 0x20 + .asciz "Scn.Step.Hero.Gear GearHat()" + .balign 4 .global $$259372 $$259372: - .incbin "baserom.dol", 0x47F5A0, 0x20 + .asciz "Scn.Step.Hero.Gear GearHat2()" + .balign 4 .global $$259373 $$259373: - .incbin "baserom.dol", 0x47F5C0, 0x20 + .asciz "Scn.Step.Hero.Gear GearRHand()" + .balign 4 .global $$259374 $$259374: - .incbin "baserom.dol", 0x47F5E0, 0x20 + .asciz "Scn.Step.Hero.Gear GearLHand()" + .balign 4 .global $$259375 $$259375: - .incbin "baserom.dol", 0x47F600, 0x20 + .asciz "Scn.Step.Hero.Gear GearRot()" + .balign 4 .global $$259376 $$259376: - .incbin "baserom.dol", 0x47F620, 0x20 + .asciz "Scn.Step.Hero.Gear GearTop()" + .balign 4 .global $$259377 $$259377: - .incbin "baserom.dol", 0x47F640, 0x20 + .asciz "Scn.Step.Hero.Gear GearGoggle()" .global $$259378 $$259378: - .incbin "baserom.dol", 0x47F660, 0x24 + .asciz "Scn.Step.Hero.Gear GearFloater()" + .balign 4 .global $$259379 $$259379: - .incbin "baserom.dol", 0x47F684, 0x24 + .asciz "Scn.Step.Hero.Gear GearWarpStar()" + .balign 4 .global $$259380 $$259380: - .incbin "baserom.dol", 0x47F6A8, 0x14 + .asciz "Scn.Step.Hero.Gear" + .balign 4 .global $$259381 $$259381: - .incbin "baserom.dol", 0x47F6BC, 0x20 + .asciz "void setVisibility(bool)const" + .balign 4 .global $$259382 $$259382: - .incbin "baserom.dol", 0x47F6DC, 0x2C + .asciz "void setNodeVisibility(int,bool)const" + .balign 4 + .4byte 0 .global $$259383 $$259383: - .incbin "baserom.dol", 0x47F708, 0x18 + .asciz "bool isAnimExist()const" .global $$259384 $$259384: - .incbin "baserom.dol", 0x47F720, 0x1C + .asciz "GObj.GearAnim anim()const" + .balign 4 .global $$259385 $$259385: - .incbin "baserom.dol", 0x47F73C, 0x24 + .asciz "Scn.Step.Chara.Effect effect()const" .global $$259386 $$259386: - .incbin "baserom.dol", 0x47F760, 0x28 + .asciz "Scn.Step.Chara.Effect effectWarp()const" .global $$259387 $$259387: - .incbin "baserom.dol", 0x47F788, 0x1C + .asciz "void SetVisibility(bool)" + .balign 4 .global $$259388 $$259388: - .incbin "baserom.dol", 0x47F7A4, 0x24 + .asciz "void SetNodeVisibility(int,bool)" + .balign 4 .global $$259389 $$259389: - .incbin "baserom.dol", 0x47F7C8, 0x14 + .asciz "void LoadNode(int)" + .balign 4 .global $$259390 $$259390: - .incbin "baserom.dol", 0x47F7DC, 0x14 + .asciz "void BindEffect()" + .balign 4 .global $$259391 $$259391: - .incbin "baserom.dol", 0x47F7F0, 0x18 + .asciz "void BindEffectWarp()" + .balign 4 .global $$259392 $$259392: - .incbin "baserom.dol", 0x47F808, 0x1C + .asciz "Scn.Step.Hero.GatherItem" + .balign 4 .global $$259393 $$259393: - .incbin "baserom.dol", 0x47F824, 0x24 + .asciz "void Add(float,float,float,float)" + .balign 4 .global $$259394 $$259394: - .incbin "baserom.dol", 0x47F848, 0x10 + .asciz "void Clear()" + .balign 4 .global $$259395 $$259395: - .incbin "baserom.dol", 0x47F858, 0x1C + .asciz "Scn.Step.Hero.Invincible" + .balign 4 .global $$259396 $$259396: - .incbin "baserom.dol", 0x47F874, 0x10 + .asciz "void Set(int)" + .balign 4 .global $$259397 $$259397: - .incbin "baserom.dol", 0x47F884, 0x10 + .asciz "void SetPerm()" + .balign 4 .global $$259398 $$259398: - .incbin "baserom.dol", 0x47F894, 0x14 + .asciz "void UnsetPerm()" + .balign 4 .global $$259399 $$259399: - .incbin "baserom.dol", 0x47F8A8, 0x10 + .asciz "bool IsMighty()" .global $$259400 $$259400: - .incbin "baserom.dol", 0x47F8B8, 0x14 + .asciz "Scn.Step.Hero.Hid" + .balign 4 .global $$259401 $$259401: - .incbin "baserom.dol", 0x47F8CC, 0x14 + .asciz "bool IsHold(int)" + .balign 4 .global $$259402 $$259402: - .incbin "baserom.dol", 0x47F8E0, 0x14 + .asciz "bool IsTrigger(int)" .global $$259403 $$259403: - .incbin "baserom.dol", 0x47F8F4, 0x1C + .asciz "void SetAutoInputHold(int)" + .balign 4 .global $$259404 $$259404: - .incbin "baserom.dol", 0x47F910, 0x18 + .asciz "Scn.Step.Hero.HidRumble" .global $$259405 $$259405: - .incbin "baserom.dol", 0x47F928, 0x10 + .asciz "void Start(int)" .global $$259406 $$259406: - .incbin "baserom.dol", 0x47F938, 0xC + .asciz "void Stop()" .global $$259407 $$259407: - .incbin "baserom.dol", 0x47F944, 0x1C + .asciz "Scn.Step.Hero.Squash" + .balign 4 + .4byte 0 .global $$259408 $$259408: - .incbin "baserom.dol", 0x47F960, 0x28 + .asciz "void SetTarget(float,float,float,float)" .global $$259409 $$259409: - .incbin "baserom.dol", 0x47F988, 0x18 + .asciz "void ResetTarget(float)" .global $$259410 $$259410: - .incbin "baserom.dol", 0x47F9A0, 0x1C + .asciz "Scn.Step.Hero.LandAttribute" .global $$259411 $$259411: - .incbin "baserom.dol", 0x47F9BC, 0x20 + .asciz "void ReqEffectL(float,float)" + .balign 4 .global $$259412 $$259412: - .incbin "baserom.dol", 0x47F9DC, 0x20 + .asciz "void ReqEffectS(float,float)" + .balign 4 .global $$259413 $$259413: - .incbin "baserom.dol", 0x47F9FC, 0x24 + .asciz "void ReqEffectLanding(float,float)" + .balign 4 .global $$259414 $$259414: - .incbin "baserom.dol", 0x47FA20, 0x10 + .asciz "void ReqSE()" + .balign 4 .global $$259415 $$259415: - .incbin "baserom.dol", 0x47FA30, 0x14 + .asciz "int AttributeType()" .global $$259416 $$259416: - .incbin "baserom.dol", 0x47FA44, 0x1C + .asciz "Scn.Step.Hero.StagingCtrl" + .balign 4 .global $$259417 $$259417: - .incbin "baserom.dol", 0x47FA60, 0x20 + .asciz "void SetZoom(float,float,float)" .global $$259418 $$259418: - .incbin "baserom.dol", 0x47FA80, 0x14 + .asciz "void SetZoom(float)" .global $$259419 $$259419: - .incbin "baserom.dol", 0x47FA94, 0x14 + .asciz "void UnsetZoom()" + .balign 4 .global $$259420 $$259420: - .incbin "baserom.dol", 0x47FAA8, 0x1C + .asciz "void SetCamRot(float,float)" .global $$259421 $$259421: - .incbin "baserom.dol", 0x47FAC4, 0x14 + .asciz "void UnsetCamRot()" + .balign 4 .global $$259422 $$259422: - .incbin "baserom.dol", 0x47FAD8, 0x20 + .asciz "Scn.Step.Hero.FloaterRotCtrl" + .balign 4 .global $$259423 $$259423: - .incbin "baserom.dol", 0x47FAF8, 0x10 + .asciz "float GetRotV()" .global $$259424 $$259424: - .incbin "baserom.dol", 0x47FB08, 0x18 + .asciz "void InitRotV(float)" + .balign 4 .global $$259425 $$259425: - .incbin "baserom.dol", 0x47FB20, 0x1C + .asciz "void SetRotVTarget(float)" + .balign 4 .global $$259426 $$259426: - .incbin "baserom.dol", 0x47FB3C, 0x18 + .asciz "void ResetRotVTarget()" + .balign 4 .global $$259427 $$259427: - .incbin "baserom.dol", 0x47FB54, 0x1C + .asciz "void SetRotVIntpRate(float)" .global $$259428 $$259428: - .incbin "baserom.dol", 0x47FB70, 0x1C + .asciz "void ResetRotVIntpRate()" + .balign 4 .global $$259429 $$259429: - .incbin "baserom.dol", 0x47FB8C, 0x20 + .asciz "Scn.Step.Hero.ClearDanceSync" + .balign 4 .global $$259430 $$259430: - .incbin "baserom.dol", 0x47FBAC, 0x14 + .asciz "bool IsSync()" + .balign 4 + .4byte 0 .global $$259431 $$259431: - .incbin "baserom.dol", 0x47FBC0, 0x10 + .asciz "int FirstAnim()" .global $$259432 $$259432: - .incbin "baserom.dol", 0x47FBD0, 0x18 + .asciz "int SecondAnim()" + .balign 4 + .4byte 0 .global $$259433 $$259433: - .incbin "baserom.dol", 0x47FBE8, 0x10 + .asciz "int ThirdAnim()" .global $$259434 $$259434: - .incbin "baserom.dol", 0x47FBF8, 0x14 + .asciz "int FinishAnim()" + .balign 4 .global $$259597 $$259597: - .incbin "baserom.dol", 0x47FC0C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FA4C .global $$259638 $$259638: - .incbin "baserom.dol", 0x47FC18, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FB4C .global $$259647 $$259647: - .incbin "baserom.dol", 0x47FC24, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FBFC .global $$259669 $$259669: - .incbin "baserom.dol", 0x47FC30, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FCC8 .global $$259683 $$259683: - .incbin "baserom.dol", 0x47FC3C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FD60 .global $$259690 $$259690: - .incbin "baserom.dol", 0x47FC48, 0x88 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8032FDE4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252285 $$252285: - .incbin "baserom.dol", 0x48EA88, 0x1C + .asciz "Scn.Step.OColl.AttackData" + .balign 4 .global $$252286 $$252286: - .incbin "baserom.dol", 0x48EAA4, 0x4C + .asciz "void Register(int,int,int,int,int,float,float,float,float,int,int,int)" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252096 $$252096: - .incbin "baserom.dol", 0x48EB30, 0x18 + .asciz "Scn.Step.Sfx.SuperFade" + .balign 4 .global $$252097 $$252097: - .incbin "baserom.dol", 0x48EB48, 0x14 + .asciz "void SetBack(bool)" + .balign 4 .global $$252098 $$252098: - .incbin "baserom.dol", 0x48EB5C, 0x24 + .asciz "Scn.Step.Sfx.SuperBackPicture" + .balign 4 + .4byte 0 .global $$252099 $$252099: - .incbin "baserom.dol", 0x48EB80, 0x18 + .asciz "void RequestEffect(int)" .global $$252100 $$252100: - .incbin "baserom.dol", 0x48EB98, 0x1C + .asciz "void RequestEffectN(int)" + .balign 4 .global $$252101 $$252101: - .incbin "baserom.dol", 0x48EBB4, 0x18 + .asciz "void ReleaseEffect()" + .balign 4 .global $$252102 $$252102: - .incbin "baserom.dol", 0x48EBCC, 0x1C + .asciz "void RequestEffect2(int)" + .balign 4 .global $$252103 $$252103: - .incbin "baserom.dol", 0x48EBE8, 0x1C + .asciz "void RequestEffect2N(int)" + .balign 4 .global $$252104 $$252104: - .incbin "baserom.dol", 0x48EC04, 0x18 + .asciz "void ReleaseEffect2()" + .balign 4 .global $$252105 $$252105: - .incbin "baserom.dol", 0x48EC1C, 0x24 + .asciz "void RequestEffectNonStop(int)" + .balign 4 + .4byte 0 .global $$252106 $$252106: - .incbin "baserom.dol", 0x48EC40, 0x20 + .asciz "void RequestEffectNonStopN(int)" .global $$252107 $$252107: - .incbin "baserom.dol", 0x48EC60, 0x20 + .asciz "void ReleaseEffectNonStop()" + .4byte 0 .global $$252108 $$252108: - .incbin "baserom.dol", 0x48EC80, 0x20 + .asciz "void RequestEffectNonStop2(int)" .global $$252109 $$252109: - .incbin "baserom.dol", 0x48ECA0, 0x24 + .asciz "void RequestEffectNonStop2N(int)" + .balign 4 .global $$252110 $$252110: - .incbin "baserom.dol", 0x48ECC4, 0x4C + .asciz "void ReleaseEffectNonStop2()" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252118 $$252118: - .incbin "baserom.dol", 0x48EE90, 0x1C + .asciz "Scn.Step.Vacuum.Attacker" + .balign 4 .global $$252119 $$252119: - .incbin "baserom.dol", 0x48EEAC, 0x14 + .asciz "int VacuumCount()" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256232 $$256232: - .incbin "baserom.dol", 0x491D38, 0x18 + .asciz "Scn.StaffCredit.Utility" .global $$256233 $$256233: - .incbin "baserom.dol", 0x491D50, 0x1C + .asciz "void SendHeroSignal(int)" + .balign 4 .global $$256234 $$256234: - .incbin "baserom.dol", 0x491D6C, 0x1C + .asciz "void SendBossSignal(int)" + .balign 4 .global $$256235 $$256235: - .incbin "baserom.dol", 0x491D88, 0x28 + .asciz "void SetPosDedede(float,float,float)" + .balign 4 .global $$256236 $$256236: - .incbin "baserom.dol", 0x491DB0, 0x24 + .asciz "void SetPosDee(float,float,float)" + .balign 4 .global $$256237 $$256237: - .incbin "baserom.dol", 0x491DD4, 0x24 + .asciz "void SetPosMeta(float,float,float)" + .balign 4 .global $$256238 $$256238: - .incbin "baserom.dol", 0x491DF8, 0x20 + .asciz "void SetupPlaceBasePos(float)" + .balign 4 .global $$256239 $$256239: - .incbin "baserom.dol", 0x491E18, 0x2C + .asciz "void ReqEnemyPraise(int,float,float,float)" + .balign 4 .global $$256240 $$256240: - .incbin "baserom.dol", 0x491E44, 0x34 + .asciz "void ReqEnemyMoveToPraise(int,float,float,float)" + .balign 4 .global $$256241 $$256241: - .incbin "baserom.dol", 0x491E78, 0x30 + .asciz "void ReqFlyFarBrontoBurt(int,float,float,float)" .global $$256242 $$256242: - .incbin "baserom.dol", 0x491EA8, 0x18 + .asciz "void GoodbyeAllEnemy()" + .balign 4 .global $$256243 $$256243: - .incbin "baserom.dol", 0x491EC0, 0x14 + .asciz "void SetNextBG()" + .balign 4 .global $$256244 $$256244: - .incbin "baserom.dol", 0x491ED4, 0x18 + .asciz "void StartStaffRoll()" + .balign 4 .global $$256245 $$256245: - .incbin "baserom.dol", 0x491EEC, 0x1C + .asciz "void StartPraiseCamera()" + .balign 4 .global $$256246 $$256246: - .incbin "baserom.dol", 0x491F08, 0x18 + .asciz "void EndPraiseCamera()" + .balign 4 .global $$256247 $$256247: - .incbin "baserom.dol", 0x491F20, 0x18 + .asciz "void StartIntroCamera()" .global $$256248 $$256248: - .incbin "baserom.dol", 0x491F38, 0x18 + .asciz "void MoveIntroCamera()" + .balign 4 .global $$256249 $$256249: - .incbin "baserom.dol", 0x491F50, 0x18 + .asciz "void EndIntroCamera()" + .balign 4 .global $$256250 $$256250: - .incbin "baserom.dol", 0x491F68, 0x14 + .asciz "bool IsEndScroll()" + .balign 4 .global $$256251 $$256251: - .incbin "baserom.dol", 0x491F7C, 0x20 + .asciz "bool IsEnableEndingObjPlace()" + .balign 4 .global $$256252 $$256252: - .incbin "baserom.dol", 0x491F9C, 0x18 + .asciz "void SetupOtachidai()" + .balign 4 .global $$256253 $$256253: - .incbin "baserom.dol", 0x491FB4, 0x6C + .asciz "void RequestEfConfetti()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252053 $$252053: - .incbin "baserom.dol", 0x492678, 0x10 + .asciz "Snd.SERequestor" .global $$252054 $$252054: - .incbin "baserom.dol", 0x492688, 0x10 + .asciz "void Start(int)" .global $$252055 $$252055: - .incbin "baserom.dol", 0x492698, 0x38 + .asciz "void Stop()" + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 $$255346: - .incbin "baserom.dol", 0x49A2B8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 $$255473: - .incbin "baserom.dol", 0x49AF20, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255121 $$255121: - .incbin "baserom.dol", 0x49B398, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254743 $$254743: - .incbin "baserom.dol", 0x49B4C8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256317 $$256317: - .incbin "baserom.dol", 0x49B590, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256635 $$256635: - .incbin "baserom.dol", 0x49C330, 0x4 + .4byte 0 .global $$256647 $$256647: - .incbin "baserom.dol", 0x49C334, 0x4 + .4byte 0x3E99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256592 $$256592: - .incbin "baserom.dol", 0x49C3B8, 0x4 + .4byte 0 .global $$256607 $$256607: - .incbin "baserom.dol", 0x49C3BC, 0x4 + .4byte 0x3F800000 .global $$256627 $$256627: - .incbin "baserom.dol", 0x49C3C0, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: - .incbin "baserom.dol", 0x49C6B0, 0x4 + .4byte 0 .global $$256060 $$256060: - .incbin "baserom.dol", 0x49C6B4, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255820 $$255820: - .incbin "baserom.dol", 0x49C790, 0x4 + .4byte 0 .global $$255821 $$255821: - .incbin "baserom.dol", 0x49C794, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256107 $$256107: - .incbin "baserom.dol", 0x49CE60, 0x4 + .4byte 0 .global $$256108 $$256108: - .incbin "baserom.dol", 0x49CE64, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/AddWiiRemote.s b/asm/src/AddWiiRemote.s index 172f314d..0dedcf78 100644 --- a/asm/src/AddWiiRemote.s +++ b/asm/src/AddWiiRemote.s @@ -982,77 +982,100 @@ setPhaseOn__Q44info6common12AddWiiRemote6RemoteFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252041 $$252041: - .incbin "baserom.dol", 0x4533A8, 0x10 + .asciz "common/Remote" + .balign 4 .global $$253618 $$253618: - .incbin "baserom.dol", 0x4533B8, 0xC + .asciz "PlusButtonN" .global $$253619 $$253619: - .incbin "baserom.dol", 0x4533C4, 0xC + .asciz "BackText" + .balign 4 .global $$253620 $$253620: - .incbin "baserom.dol", 0x4533D0, 0x18 + .asciz "SystemWiiRemoteAddBtn" + .balign 4 .global $$253754 $$253754: - .incbin "baserom.dol", 0x4533E8, 0xC + .asciz "Remote0%dN" + .balign 4 .global $$253755 $$253755: - .incbin "baserom.dol", 0x4533F4, 0xC + .asciz "BtnLamp01N" + .balign 4 .global $$253756 $$253756: - .incbin "baserom.dol", 0x453400, 0x40 + .asciz "BtnLamp02N" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2 T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2: - .incbin "baserom.dol", 0x493308, 0x4 + .4byte 0x804572A8 .global $$253617 $$253617: - .incbin "baserom.dol", 0x49330C, 0x8 + .asciz "Base" + .balign 4 .global $$253710 $$253710: - .incbin "baserom.dol", 0x493314, 0x8 + .asciz "Wait" + .balign 4 .global $$253727 $$253727: - .incbin "baserom.dol", 0x49331C, 0x4 + .4byte 0x4F757400 .global $$253751 $$253751: - .incbin "baserom.dol", 0x493320, 0x8 + .asciz "Remote" + .balign 4 .global $$253752 $$253752: - .incbin "baserom.dol", 0x493328, 0x8 + .asciz "BtnLamp" .global $$253753 $$253753: - .incbin "baserom.dol", 0x493330, 0x4 + .4byte 0x4C454400 .global $$253757 $$253757: - .incbin "baserom.dol", 0x493334, 0x8 + .asciz "LEDN" + .balign 4 .global $$253758 $$253758: - .incbin "baserom.dol", 0x49333C, 0x8 + .asciz "LED01" + .balign 4 .global $$253759 $$253759: - .incbin "baserom.dol", 0x493344, 0x8 + .asciz "LED02" + .balign 4 .global $$253760 $$253760: - .incbin "baserom.dol", 0x49334C, 0x8 + .asciz "LED03" + .balign 4 .global $$253761 $$253761: - .incbin "baserom.dol", 0x493354, 0x8 + .asciz "LED04" + .balign 4 .global $$253790 $$253790: - .incbin "baserom.dol", 0x49335C, 0x8 + .asciz "ToOn" + .balign 4 .global $$253799 $$253799: - .incbin "baserom.dol", 0x493364, 0x8 + .asciz "ToOff" + .balign 4 .global $$253807 $$253807: - .incbin "baserom.dol", 0x49336C, 0x4 + .4byte 0x4F666600 .global $$253810 $$253810: - .incbin "baserom.dol", 0x493370, 0x8 + .4byte 0x4F6E0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253693 $$253693: - .incbin "baserom.dol", 0x49A480, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/AdditionalMove.s b/asm/src/AdditionalMove.s index f2c01934..78f4ea6f 100644 --- a/asm/src/AdditionalMove.s +++ b/asm/src/AdditionalMove.s @@ -1384,39 +1384,43 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47EAD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8032DF00 + .4byte 0x8032DEE4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260222 $$260222: - .incbin "baserom.dol", 0x49D610, 0x4 + .4byte 0 .global $$260297 $$260297: - .incbin "baserom.dol", 0x49D614, 0x4 + .4byte 0x3727C5AC .global $$260353 $$260353: - .incbin "baserom.dol", 0x49D618, 0x4 + .4byte 0x3F000000 .global $$260413 $$260413: - .incbin "baserom.dol", 0x49D61C, 0x4 + .4byte 0x3F800000 .global $$260414 $$260414: - .incbin "baserom.dol", 0x49D620, 0x4 + .4byte 0xB727C5AC .global $$260415 $$260415: - .incbin "baserom.dol", 0x49D624, 0x4 + .4byte 0x40000000 .global $$260416 $$260416: - .incbin "baserom.dol", 0x49D628, 0x4 + .4byte 0x40490FDB .global $$260417 $$260417: - .incbin "baserom.dol", 0x49D62C, 0x4 + .4byte 0x4222F983 .global $$260420 $$260420: - .incbin "baserom.dol", 0x49D630, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$260503 $$260503: - .incbin "baserom.dol", 0x49D638, 0x4 + .4byte 0x42B40000 .global $$260504 $$260504: - .incbin "baserom.dol", 0x49D63C, 0x4 + .4byte 0x42652EE1 diff --git a/asm/src/AirFlow.s b/asm/src/AirFlow.s index 7557277a..d9afe774 100644 --- a/asm/src/AirFlow.s +++ b/asm/src/AirFlow.s @@ -1032,28 +1032,37 @@ lbl_802F9258: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global DIR_ROTATION__Q53scn4step7gimmick7airflow21$$2unnamed$$2AirFlow_cpp$$2 DIR_ROTATION__Q53scn4step7gimmick7airflow21$$2unnamed$$2AirFlow_cpp$$2: - .incbin "baserom.dol", 0x4157A8, 0x20 + .4byte 0 + .4byte 0x439D8000 + .4byte 0x43870000 + .4byte 0x43610000 + .4byte 0x43340000 + .4byte 0x43070000 + .4byte 0x42B40000 + .4byte 0x42340000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253529 $$253529: - .incbin "baserom.dol", 0x47B0F0, 0x18 + .asciz "step/gimmick/AirFlow" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253684 $$253684: - .incbin "baserom.dol", 0x4968C8, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253530 $$253530: - .incbin "baserom.dol", 0x49D120, 0x4 + .4byte 0 .global $$253767 $$253767: - .incbin "baserom.dol", 0x49D124, 0x4 + .4byte 0x3C8EFA35 .global $$253783 $$253783: - .incbin "baserom.dol", 0x49D128, 0x4 + .4byte 0x41800000 .global $$253784 $$253784: - .incbin "baserom.dol", 0x49D12C, 0x4 + .4byte 0x43100000 diff --git a/asm/src/Alarm.s b/asm/src/Alarm.s index 5aaf6996..51cb5ed3 100644 --- a/asm/src/Alarm.s +++ b/asm/src/Alarm.s @@ -128,20 +128,25 @@ __sinit_$$3Alarm_cpp: /* 804056BC 004014FC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402628, 0x4 + .4byte 0x8040566C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util5Alarm __vt__Q24util5Alarm: - .incbin "baserom.dol", 0x4927E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80405558 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248922 $$248922: - .incbin "baserom.dol", 0x49EEB8, 0x8 + .4byte 0x3C888889 + .4byte 0 .global $$248924 $$248924: - .incbin "baserom.dol", 0x49EEC0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global T_PERIOD__19$$2unnamed$$2Alarm_cpp$$2 diff --git a/asm/src/AlgorithmGrandLowperAppear.s b/asm/src/AlgorithmGrandLowperAppear.s index 58313fba..368a6a70 100644 --- a/asm/src/AlgorithmGrandLowperAppear.s +++ b/asm/src/AlgorithmGrandLowperAppear.s @@ -126,28 +126,29 @@ updateHoldFrameRate__Q53scn4step5enemy9algorithm26AlgorithmGrandLowperAppearFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250840 $$250840: - .incbin "baserom.dol", 0x49BC90, 0x4 + .4byte 0xFFFFFFFF .global $$250983 $$250983: - .incbin "baserom.dol", 0x49BC94, 0x4 + .4byte 0x3F800000 .global $$250984 $$250984: - .incbin "baserom.dol", 0x49BC98, 0x4 + .4byte 0 .global $$250860 $$250860: - .incbin "baserom.dol", 0x49BC9C, 0x4 + .4byte 0x000000FF .global $$250996 $$250996: - .incbin "baserom.dol", 0x49BCA0, 0x4 + .4byte 0x437F0000 .global $$251001 $$251001: - .incbin "baserom.dol", 0x49BCA4, 0x4 + .4byte 0x3951B717 .global $$251002 $$251002: - .incbin "baserom.dol", 0x49BCA8, 0x4 + .4byte 0x3E333333 .global $$251009 $$251009: - .incbin "baserom.dol", 0x49BCAC, 0x4 + .4byte 0x42200000 .global $$251012 $$251012: - .incbin "baserom.dol", 0x49BCB0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/AllStageClear.s b/asm/src/AllStageClear.s index 0ba65c90..133c1b31 100644 --- a/asm/src/AllStageClear.s +++ b/asm/src/AllStageClear.s @@ -323,50 +323,63 @@ constraintPos__Q53scn4step4info5lvmap13AllStageClearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253621 $$253621: - .incbin "baserom.dol", 0x48CFA8, 0x10 + .asciz "step/lvmap/Main" .global $$253622 $$253622: - .incbin "baserom.dol", 0x48CFB8, 0x14 + .asciz "LevelCompleteTrans" + .balign 4 .global $$253623 $$253623: - .incbin "baserom.dol", 0x48CFCC, 0x10 + .asciz "LevelComplete" + .balign 4 .global $$253667 $$253667: - .incbin "baserom.dol", 0x48CFDC, 0x10 + .asciz "BronzeTrophyN" + .balign 4 .global $$253668 $$253668: - .incbin "baserom.dol", 0x48CFEC, 0x10 + .asciz "SilverTrophyN" + .balign 4 .global $$253669 $$253669: - .incbin "baserom.dol", 0x48CFFC, 0xC + .asciz "GoldTrophyN" .global $$253670 $$253670: - .incbin "baserom.dol", 0x48D008, 0x10 + .asciz "PlatinumTrophyN" .global $$253671 $$253671: - .incbin "baserom.dol", 0x48D018, 0xC + .asciz "KingTrophyN" .global $$253672 $$253672: - .incbin "baserom.dol", 0x48D024, 0x10 + .asciz "StageCompleteN" + .balign 4 .global $$253678 $$253678: - .incbin "baserom.dol", 0x48D034, 0x3C + .asciz "Disappear" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253625 $$253625: - .incbin "baserom.dol", 0x497E28, 0x8 + .asciz "TransN" + .balign 4 .global $$253666 $$253666: - .incbin "baserom.dol", 0x497E30, 0x8 + .asciz "Appear" + .balign 4 .global $$253691 $$253691: - .incbin "baserom.dol", 0x497E38, 0x8 + .asciz "Wait" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253624 $$253624: - .incbin "baserom.dol", 0x49E4D0, 0x4 + .4byte 0 .global $$253702 $$253702: - .incbin "baserom.dol", 0x49E4D4, 0x4 + .4byte 0x42A00000 diff --git a/asm/src/Angry.s b/asm/src/Angry.s index cc2db59f..0676f224 100644 --- a/asm/src/Angry.s +++ b/asm/src/Angry.s @@ -80,4 +80,5 @@ setChangeBrain__Q43scn4step4boss5AngryFPCc: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252593 $$252593: - .incbin "baserom.dol", 0x49ADA0, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/Anim.s b/asm/src/Anim.s index a15055a7..71e1b9b1 100644 --- a/asm/src/Anim.s +++ b/asm/src/Anim.s @@ -455,4 +455,5 @@ mainAnim__Q24gobj4AnimCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252554 $$252554: - .incbin "baserom.dol", 0x49A2C0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/AnimController.s b/asm/src/AnimController.s index 57b63762..77d0a0ce 100644 --- a/asm/src/AnimController.s +++ b/asm/src/AnimController.s @@ -145,7 +145,7 @@ lbl_80405858: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248941 $$248941: - .incbin "baserom.dol", 0x49EEC8, 0x4 + .4byte 0 .global $$248942 $$248942: - .incbin "baserom.dol", 0x49EECC, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/AnimScript.s b/asm/src/AnimScript.s index f387261d..ef85f428 100644 --- a/asm/src/AnimScript.s +++ b/asm/src/AnimScript.s @@ -3,15 +3,18 @@ .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: - .incbin "baserom.dol", 0x4510D0, 0x24 + .asciz ".GObj.AnimScript.PlayLoop(int,int)" + .balign 4 .global $$248724 $$248724: - .incbin "baserom.dol", 0x4510F4, 0x2C + .asciz ".GObj.AnimScript.PlayOneShot(int,int)" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global PLAY_LOOP__Q24gobj10AnimScript PLAY_LOOP__Q24gobj10AnimScript: - .incbin "baserom.dol", 0x4931E0, 0x4 + .4byte 0x80454FD0 .global PLAY_ONE_SHOT__Q24gobj10AnimScript PLAY_ONE_SHOT__Q24gobj10AnimScript: - .incbin "baserom.dol", 0x4931E4, 0x4 + .4byte 0x80454FF4 diff --git a/asm/src/AppImpl.s b/asm/src/AppImpl.s index ffbac206..9a7162f0 100644 --- a/asm/src/AppImpl.s +++ b/asm/src/AppImpl.s @@ -1558,10 +1558,18 @@ $$24$$2__dt__Q23app7AppImplFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23app7AppImpl __vt__Q23app7AppImpl: - .incbin "baserom.dol", 0x44EC00, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x80175364 ;# ptr + .4byte 0x80175750 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x80176260 ;# ptr .global $$2STRING$$2NoName__Q33hel6common15RuntimeTypeInfoFv $$2STRING$$2NoName__Q33hel6common15RuntimeTypeInfoFv: - .incbin "baserom.dol", 0x44EC1C, 0x14 + .asciz "no name class" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q23scn6IScene$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/App__Alert.s b/asm/src/App__Alert.s index b7853647..1c8daae8 100644 --- a/asm/src/App__Alert.s +++ b/asm/src/App__Alert.s @@ -670,64 +670,84 @@ Func__Q38mintglue10App__Alert32Mint_Print_0$53247App__Alert_cppFRQ26mintvm13Mint .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253984 $$253984: - .incbin "baserom.dol", 0x455F28, 0xC + .asciz "App.Alert" + .balign 4 .global $$253985 $$253985: - .incbin "baserom.dol", 0x455F34, 0x14 + .asciz "void Print(string)" + .balign 4 .global $$253986 $$253986: - .incbin "baserom.dol", 0x455F48, 0x20 + .asciz "void PrintIndex(int,string)" + .4byte 0 .global $$253987 $$253987: - .incbin "baserom.dol", 0x455F68, 0x10 + .asciz "void Print(int)" .global $$253988 $$253988: - .incbin "baserom.dol", 0x455F78, 0x18 + .asciz "void Print(string,int)" + .balign 4 .global $$253989 $$253989: - .incbin "baserom.dol", 0x455F90, 0x1C + .asciz "void Print(string,int,int)" + .balign 4 .global $$253990 $$253990: - .incbin "baserom.dol", 0x455FAC, 0x20 + .asciz "void Print(string,int,int,int)" + .balign 4 .global $$253991 $$253991: - .incbin "baserom.dol", 0x455FCC, 0x1C + .asciz "void PrintIndex(int,int)" + .balign 4 .global $$253992 $$253992: - .incbin "baserom.dol", 0x455FE8, 0x20 + .asciz "void PrintIndex(int,string,int)" .global $$253993 $$253993: - .incbin "baserom.dol", 0x456008, 0x28 + .asciz "void PrintIndex(int,string,int,int)" + .4byte 0 .global $$253994 $$253994: - .incbin "baserom.dol", 0x456030, 0x28 + .asciz "void PrintIndex(int,string,int,int,int)" .global $$253995 $$253995: - .incbin "baserom.dol", 0x456058, 0x14 + .asciz "void Print(float)" + .balign 4 .global $$253996 $$253996: - .incbin "baserom.dol", 0x45606C, 0x1C + .asciz "void Print(string,float)" + .balign 4 .global $$253997 $$253997: - .incbin "baserom.dol", 0x456088, 0x20 + .asciz "void Print(string,float,float)" + .balign 4 .global $$253998 $$253998: - .incbin "baserom.dol", 0x4560A8, 0x28 + .asciz "void Print(string,float,float,float)" + .balign 4 .global $$253999 $$253999: - .incbin "baserom.dol", 0x4560D0, 0x1C + .asciz "void PrintIndex(int,float)" + .balign 4 .global $$254000 $$254000: - .incbin "baserom.dol", 0x4560EC, 0x24 + .asciz "void PrintIndex(int,string,float)" + .balign 4 .global $$254001 $$254001: - .incbin "baserom.dol", 0x456110, 0x28 + .asciz "void PrintIndex(int,string,float,float)" .global $$254002 $$254002: - .incbin "baserom.dol", 0x456138, 0x30 + .asciz "void PrintIndex(int,string,float,float,float)" + .balign 4 .global $$254003 $$254003: - .incbin "baserom.dol", 0x456168, 0x28 + .asciz "void Print(const ref HEL.Math.Vector3)" + .balign 4 .global $$254004 $$254004: - .incbin "baserom.dol", 0x456190, 0x58 + .asciz "void PrintIndex(int,const ref HEL.Math.Vector3)" + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/App__Random.s b/asm/src/App__Random.s index 4bb60188..b0281e92 100644 --- a/asm/src/App__Random.s +++ b/asm/src/App__Random.s @@ -197,22 +197,38 @@ lbl_801C1850: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252401 $$252401: - .incbin "baserom.dol", 0x4561E8, 0xC + .asciz "App.Random" + .balign 4 .global $$252402 $$252402: - .incbin "baserom.dol", 0x4561F4, 0x18 + .asciz "bool RandBool(float)" + .balign 4 .global $$252403 $$252403: - .incbin "baserom.dol", 0x45620C, 0x10 + .asciz "int Rand(int)" + .balign 4 .global $$252404 $$252404: - .incbin "baserom.dol", 0x45621C, 0x14 + .asciz "int Rand(int,int)" + .balign 4 .global $$252405 $$252405: - .incbin "baserom.dol", 0x456230, 0x1C + .asciz "float RandF(float,float)" + .balign 4 .global $$252406 $$252406: - .incbin "baserom.dol", 0x45624C, 0x10 + .asciz "float RandNF()" + .balign 4 .global $$252407 $$252407: - .incbin "baserom.dol", 0x45625C, 0x64 + .asciz "float RandAF()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/AreaLight.s b/asm/src/AreaLight.s index 97920ba5..a4be17b4 100644 --- a/asm/src/AreaLight.s +++ b/asm/src/AreaLight.s @@ -520,19 +520,19 @@ lbl_8026CD94: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252145 $$252145: - .incbin "baserom.dol", 0x49B748, 0x4 + .4byte 0x3DCCCCCD .global $$252192 $$252192: - .incbin "baserom.dol", 0x49B74C, 0x4 + .4byte 0x447A0000 .global $$252193 $$252193: - .incbin "baserom.dol", 0x49B750, 0x4 + .4byte 0x3F800000 .global $$252194 $$252194: - .incbin "baserom.dol", 0x49B754, 0x4 + .4byte 0 .global $$252195 $$252195: - .incbin "baserom.dol", 0x49B758, 0x4 + .4byte 0x41F00000 .global $$252206 $$252206: - .incbin "baserom.dol", 0x49B75C, 0x4 + .4byte 0x437F0000 diff --git a/asm/src/AreaLightInfo.s b/asm/src/AreaLightInfo.s index 846bd8d8..76ea1d26 100644 --- a/asm/src/AreaLightInfo.s +++ b/asm/src/AreaLightInfo.s @@ -208,4 +208,5 @@ LinearInterpolation$$0Q33hel6common6ColorF$$1__Q33hel4math4MathFRCQ33hel6common6 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250391 $$250391: - .incbin "baserom.dol", 0x49B8C0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/AreaOperation.s b/asm/src/AreaOperation.s index a3cdb21b..c85f6386 100644 --- a/asm/src/AreaOperation.s +++ b/asm/src/AreaOperation.s @@ -391,4 +391,5 @@ lbl_802745CC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250432 $$250432: - .incbin "baserom.dol", 0x49B8C8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/AreaSE.s b/asm/src/AreaSE.s index 57b63439..0e56a03d 100644 --- a/asm/src/AreaSE.s +++ b/asm/src/AreaSE.s @@ -222,15 +222,17 @@ lbl_802FE0B8: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SE_LABEL_TABLE__Q53scn4step7gimmick6arease20$$2unnamed$$2AreaSE_cpp$$2 SE_LABEL_TABLE__Q53scn4step7gimmick6arease20$$2unnamed$$2AreaSE_cpp$$2: - .incbin "baserom.dol", 0x496900, 0x8 + .4byte 0x00000262 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251649 $$251649: - .incbin "baserom.dol", 0x49D1C8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251670 $$251670: - .incbin "baserom.dol", 0x49D1D0, 0x4 + .4byte 0x3F800000 .global $$251671 $$251671: - .incbin "baserom.dol", 0x49D1D4, 0x4 + .4byte 0 diff --git a/asm/src/ArrowBoard.s b/asm/src/ArrowBoard.s index b356b1e1..88dd203d 100644 --- a/asm/src/ArrowBoard.s +++ b/asm/src/ArrowBoard.s @@ -523,43 +523,58 @@ lbl_802FEAF4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253055 $$253055: - .incbin "baserom.dol", 0x4157E8, 0x10 + .4byte 0x8055A528 + .4byte 0x8055A530 + .4byte 0x8055A538 + .4byte 0x8055A53C .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 $$254295: - .incbin "baserom.dol", 0x47BA70, 0x18 + .asciz "step/gimmick/ArrowBoard" .global $$254466 $$254466: - .incbin "baserom.dol", 0x47BA88, 0x24 + .asciz "step/gimmick/ChallengeArrowBoard" + .balign 4 .global $$254467 $$254467: - .incbin "baserom.dol", 0x47BAAC, 0x24 + .asciz "step/gimmick/DeathMatchArrowBoard" + .balign 4 .global $$254468 $$254468: - .incbin "baserom.dol", 0x47BAD0, 0x50 + .asciz "step/gimmick/MasterArrowBoard" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253051 $$253051: - .incbin "baserom.dol", 0x496908, 0x8 + .asciz "Right" + .balign 4 .global $$253052 $$253052: - .incbin "baserom.dol", 0x496910, 0x8 + .asciz "Left" + .balign 4 .global $$253053 $$253053: - .incbin "baserom.dol", 0x496918, 0x4 + .4byte 0x55700000 .global $$253054 $$253054: - .incbin "baserom.dol", 0x49691C, 0x8 + .asciz "Down" + .balign 4 .global $$254296 $$254296: - .incbin "baserom.dol", 0x496924, 0x8 + .asciz "TopL" + .balign 4 .global $$254469 $$254469: - .incbin "baserom.dol", 0x49692C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254369 $$254369: - .incbin "baserom.dol", 0x49D1D8, 0x8 + .4byte 0x40A00000 + .4byte 0 diff --git a/asm/src/AttackBallCtrl.s b/asm/src/AttackBallCtrl.s index 3c3a7586..259cb3f3 100644 --- a/asm/src/AttackBallCtrl.s +++ b/asm/src/AttackBallCtrl.s @@ -1174,18 +1174,20 @@ lbl_8023AE40: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x461548, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x46156C, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259619 $$259619: - .incbin "baserom.dol", 0x49AFA8, 0x4 + .4byte 0 .global $$259714 $$259714: - .incbin "baserom.dol", 0x49AFAC, 0x4 + .4byte 0x3F000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q43scn4step6weapon7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/AttackFlash.s b/asm/src/AttackFlash.s index 89a62ed5..07d39e18 100644 --- a/asm/src/AttackFlash.s +++ b/asm/src/AttackFlash.s @@ -136,36 +136,37 @@ setEnd__Q43scn4step4boss11AttackFlashF8_GXColor: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249258 $$249258: - .incbin "baserom.dol", 0x4952B0, 0x4 + .4byte 0 .global $$249259 $$249259: - .incbin "baserom.dol", 0x4952B4, 0x4 + .4byte 0x000000FF .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249397 $$249397: - .incbin "baserom.dol", 0x49ADA8, 0x4 + .4byte 0xFFFFFF00 .global $$249403 $$249403: - .incbin "baserom.dol", 0x49ADAC, 0x4 + .4byte 0 .global $$249404 $$249404: - .incbin "baserom.dol", 0x49ADB0, 0x4 + .4byte 0x40000000 .global $$249427 $$249427: - .incbin "baserom.dol", 0x49ADB4, 0x4 + .4byte 0x42B40000 .global $$249428 $$249428: - .incbin "baserom.dol", 0x49ADB8, 0x4 + .4byte 0x43B40000 .global $$249429 $$249429: - .incbin "baserom.dol", 0x49ADBC, 0x4 + .4byte 0x43480000 .global $$249430 $$249430: - .incbin "baserom.dol", 0x49ADC0, 0x4 + .4byte 0x4222F983 .global $$249431 $$249431: - .incbin "baserom.dol", 0x49ADC4, 0x4 + .4byte 0x3C8EFA35 .global $$249432 $$249432: - .incbin "baserom.dol", 0x49ADC8, 0x8 + .4byte 0x42200000 + .4byte 0 diff --git a/asm/src/AttackNode.s b/asm/src/AttackNode.s index 80bb99b4..715ffa1d 100644 --- a/asm/src/AttackNode.s +++ b/asm/src/AttackNode.s @@ -235,4 +235,5 @@ lbl_801D4D78: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252016 $$252016: - .incbin "baserom.dol", 0x49A7B0, 0x8 + .4byte 0xFF000080 + .4byte 0 diff --git a/asm/src/AttackResult.s b/asm/src/AttackResult.s index efa9a2a1..5a65446d 100644 --- a/asm/src/AttackResult.s +++ b/asm/src/AttackResult.s @@ -271,4 +271,5 @@ __vc__Q33hel6common45MutableArray$$0Q35ocoll12AttackResult5Datum$$410$$1FUl: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250282 $$250282: - .incbin "baserom.dol", 0x49A7B8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/AttackResultGimmick.s b/asm/src/AttackResultGimmick.s index 7192c913..12668bd2 100644 --- a/asm/src/AttackResultGimmick.s +++ b/asm/src/AttackResultGimmick.s @@ -55,4 +55,5 @@ lbl_801D51B4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250024 $$250024: - .incbin "baserom.dol", 0x49A7C0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Attacker.s b/asm/src/Attacker.s index 037ad62a..805e0a34 100644 --- a/asm/src/Attacker.s +++ b/asm/src/Attacker.s @@ -1853,13 +1853,13 @@ vacuumedPri__Q43scn4step6vacuum8AttackerCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254544 $$254544: - .incbin "baserom.dol", 0x49E810, 0x4 + .4byte 0 .global $$255010 $$255010: - .incbin "baserom.dol", 0x49E814, 0x4 + .4byte 0x3F400000 .global $$255011 $$255011: - .incbin "baserom.dol", 0x49E818, 0x4 + .4byte 0xBF400000 .global $$255012 $$255012: - .incbin "baserom.dol", 0x49E81C, 0x4 + .4byte 0xBFC00000 diff --git a/asm/src/AutoReqAnim.s b/asm/src/AutoReqAnim.s index 90610623..7e4a8b83 100644 --- a/asm/src/AutoReqAnim.s +++ b/asm/src/AutoReqAnim.s @@ -397,7 +397,9 @@ lbl_8018BE04: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249161 $$249161: - .incbin "baserom.dol", 0x49A1A0, 0x8 + .4byte 0 + .4byte 0 .global $$249224 $$249224: - .incbin "baserom.dol", 0x49A1A8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/AvoidEnemyCtrl.s b/asm/src/AvoidEnemyCtrl.s index 771d9515..35be59ac 100644 --- a/asm/src/AvoidEnemyCtrl.s +++ b/asm/src/AvoidEnemyCtrl.s @@ -500,4 +500,5 @@ lbl_8023B4F8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252973 $$252973: - .incbin "baserom.dol", 0x49AFB0, 0x8 + .4byte 0x41400000 + .4byte 0 diff --git a/asm/src/BCOpCode.s b/asm/src/BCOpCode.s index 3d4ad052..2cfc284e 100644 --- a/asm/src/BCOpCode.s +++ b/asm/src/BCOpCode.s @@ -359,291 +359,523 @@ getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249613 $$249613: - .incbin "baserom.dol", 0x457728, 0x10 + .asciz " %-8s" + .balign 4 .global $$249615 $$249615: - .incbin "baserom.dol", 0x457738, 0x10 + .asciz " %d, %d\n" + .balign 4 .global $$249617 $$249617: - .incbin "baserom.dol", 0x457748, 0x18 + .asciz " %d, %d, %d\n" + .balign 4 .global $$249618 $$249618: - .incbin "baserom.dol", 0x457760, 0x10 + .asciz "BCOpCode.cpp" + .balign 4 .global $$249619 $$249619: - .incbin "baserom.dol", 0x457770, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$249621 $$249621: - .incbin "baserom.dol", 0x457784, 0x34 + .4byte 0x801C5938 ;# ptr + .4byte 0x801C5648 ;# ptr + .4byte 0x801C5660 ;# ptr + .4byte 0x801C56A4 ;# ptr + .4byte 0x801C56EC ;# ptr + .4byte 0x801C5734 ;# ptr + .4byte 0x801C5744 ;# ptr + .4byte 0x801C5788 ;# ptr + .4byte 0x801C57D0 ;# ptr + .4byte 0x801C5818 ;# ptr + .4byte 0x801C5860 ;# ptr + .4byte 0x801C58AC ;# ptr + .4byte 0x801C58F4 ;# ptr .global $$249693 $$249693: - .incbin "baserom.dol", 0x4577B8, 0x108 + .4byte 0x801C5AD4 ;# ptr + .4byte 0x801C59CC ;# ptr + .4byte 0x801C59D4 ;# ptr + .4byte 0x801C59DC ;# ptr + .4byte 0x801C59DC ;# ptr + .4byte 0x801C59E4 ;# ptr + .4byte 0x801C59EC ;# ptr + .4byte 0x801C59F4 ;# ptr + .4byte 0x801C59FC ;# ptr + .4byte 0x801C59FC ;# ptr + .4byte 0x801C5A04 ;# ptr + .4byte 0x801C5A0C ;# ptr + .4byte 0x801C5A14 ;# ptr + .4byte 0x801C5A1C ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A2C ;# ptr + .4byte 0x801C5A2C ;# ptr + .4byte 0x801C5A34 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A24 ;# ptr + .4byte 0x801C5A2C ;# ptr + .4byte 0x801C5A2C ;# ptr + .4byte 0x801C5A34 ;# ptr + .4byte 0x801C5A3C ;# ptr + .4byte 0x801C5A3C ;# ptr + .4byte 0x801C5A3C ;# ptr + .4byte 0x801C5A3C ;# ptr + .4byte 0x801C5A44 ;# ptr + .4byte 0x801C5A44 ;# ptr + .4byte 0x801C5A44 ;# ptr + .4byte 0x801C5A44 ;# ptr + .4byte 0x801C5A4C ;# ptr + .4byte 0x801C5A4C ;# ptr + .4byte 0x801C5A54 ;# ptr + .4byte 0x801C5A54 ;# ptr + .4byte 0x801C5A5C ;# ptr + .4byte 0x801C5A5C ;# ptr + .4byte 0x801C5A5C ;# ptr + .4byte 0x801C5A64 ;# ptr + .4byte 0x801C5A64 ;# ptr + .4byte 0x801C5A6C ;# ptr + .4byte 0x801C5A6C ;# ptr + .4byte 0x801C5A74 ;# ptr + .4byte 0x801C5A7C ;# ptr + .4byte 0x801C5A7C ;# ptr + .4byte 0x801C5A84 ;# ptr + .4byte 0x801C5A8C ;# ptr + .4byte 0x801C5A8C ;# ptr + .4byte 0x801C5A94 ;# ptr + .4byte 0x801C5A9C ;# ptr + .4byte 0x801C5AA4 ;# ptr + .4byte 0x801C5AAC ;# ptr + .4byte 0x801C5AB4 ;# ptr + .4byte 0x801C5AB4 ;# ptr + .4byte 0x801C5AB4 ;# ptr + .4byte 0x801C5ABC ;# ptr + .4byte 0x801C5AC4 ;# ptr + .4byte 0x801C5ACC ;# ptr + .4byte 0x801C5ACC ;# ptr + .4byte 0x801C5AC4 ;# ptr .global $$2LOCAL$$2getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType$$2table $$2LOCAL$$2getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType$$2table: - .incbin "baserom.dol", 0x4578C0, 0x108 + .4byte 0x8055731C + .4byte 0x80557320 + .4byte 0x80557328 + .4byte 0x80557330 + .4byte 0x80557338 + .4byte 0x80557340 + .4byte 0x80557348 + .4byte 0x80557350 + .4byte 0x80557358 + .4byte 0x80557360 + .4byte 0x80557368 + .4byte 0x80557370 + .4byte 0x80557378 + .4byte 0x80557380 + .4byte 0x80557388 + .4byte 0x80557390 + .4byte 0x80557398 + .4byte 0x805573A0 + .4byte 0x805573A8 + .4byte 0x805573B0 + .4byte 0x805573B8 + .4byte 0x805573C0 + .4byte 0x805573C8 + .4byte 0x805573D0 + .4byte 0x805573D8 + .4byte 0x805573E0 + .4byte 0x805573E8 + .4byte 0x805573F0 + .4byte 0x805573F8 + .4byte 0x80557400 + .4byte 0x80557408 + .4byte 0x80557410 + .4byte 0x80557418 + .4byte 0x80557420 + .4byte 0x80557428 + .4byte 0x80557430 + .4byte 0x80557438 + .4byte 0x80557440 + .4byte 0x80557448 + .4byte 0x80557450 + .4byte 0x80557458 + .4byte 0x80557460 + .4byte 0x80557468 + .4byte 0x80557470 + .4byte 0x80557478 + .4byte 0x80557480 + .4byte 0x80557488 + .4byte 0x80557490 + .4byte 0x80557498 + .4byte 0x8055749C + .4byte 0x805574A4 + .4byte 0x805574AC + .4byte 0x805574B4 + .4byte 0x805574BC + .4byte 0x805574C4 + .4byte 0x805574CC + .4byte 0x805574D4 + .4byte 0x805574DC + .4byte 0x805574E4 + .4byte 0x805574EC + .4byte 0x805574F4 + .4byte 0x805574FC + .4byte 0x80557504 + .4byte 0x8055750C + .4byte 0x80557514 + .4byte 0x8055751C .global $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv$$20 $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv$$20: - .incbin "baserom.dol", 0x4579C8, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv: - .incbin "baserom.dol", 0x4579DC, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getCU1_CU1__Q26mintvm8BCOpCodeCFRUcRUc$$20 $$2STRING$$2getCU1_CU1__Q26mintvm8BCOpCodeCFRUcRUc$$20: - .incbin "baserom.dol", 0x4579EC, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getCU1_CU1__Q26mintvm8BCOpCodeCFRUcRUc $$2STRING$$2getCU1_CU1__Q26mintvm8BCOpCodeCFRUcRUc: - .incbin "baserom.dol", 0x457A00, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getFR1_SR1__Q26mintvm8BCOpCodeCFRUcRUc$$20 $$2STRING$$2getFR1_SR1__Q26mintvm8BCOpCodeCFRUcRUc$$20: - .incbin "baserom.dol", 0x457A10, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getFR1_SR1__Q26mintvm8BCOpCodeCFRUcRUc $$2STRING$$2getFR1_SR1__Q26mintvm8BCOpCodeCFRUcRUc: - .incbin "baserom.dol", 0x457A24, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1__Q26mintvm8BCOpCodeCFv$$20 $$2STRING$$2getSR1__Q26mintvm8BCOpCodeCFv$$20: - .incbin "baserom.dol", 0x457A34, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1__Q26mintvm8BCOpCodeCFv $$2STRING$$2getSR1__Q26mintvm8BCOpCodeCFv: - .incbin "baserom.dol", 0x457A48, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1_CS2__Q26mintvm8BCOpCodeCFRUcRs$$20 $$2STRING$$2getSR1_CS2__Q26mintvm8BCOpCodeCFRUcRs$$20: - .incbin "baserom.dol", 0x457A58, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1_CS2__Q26mintvm8BCOpCodeCFRUcRs $$2STRING$$2getSR1_CS2__Q26mintvm8BCOpCodeCFRUcRs: - .incbin "baserom.dol", 0x457A6C, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1_CTI__Q26mintvm8BCOpCodeCFRUcRUs$$20 $$2STRING$$2getSR1_CTI__Q26mintvm8BCOpCodeCFRUcRUs$$20: - .incbin "baserom.dol", 0x457A7C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1_CTI__Q26mintvm8BCOpCodeCFRUcRUs $$2STRING$$2getSR1_CTI__Q26mintvm8BCOpCodeCFRUcRUs: - .incbin "baserom.dol", 0x457A90, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1_SR2__Q26mintvm8BCOpCodeCFRUcRUc$$20 $$2STRING$$2getSR1_SR2__Q26mintvm8BCOpCodeCFRUcRUc$$20: - .incbin "baserom.dol", 0x457AA0, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1_SR2__Q26mintvm8BCOpCodeCFRUcRUc $$2STRING$$2getSR1_SR2__Q26mintvm8BCOpCodeCFRUcRUc: - .incbin "baserom.dol", 0x457AB4, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1_SR2_SR3__Q26mintvm8BCOpCodeCFRUcRUcRUc$$20 $$2STRING$$2getSR1_SR2_SR3__Q26mintvm8BCOpCodeCFRUcRUcRUc$$20: - .incbin "baserom.dol", 0x457AC4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1_SR2_SR3__Q26mintvm8BCOpCodeCFRUcRUcRUc $$2STRING$$2getSR1_SR2_SR3__Q26mintvm8BCOpCodeCFRUcRUcRUc: - .incbin "baserom.dol", 0x457AD8, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSR1_STI__Q26mintvm8BCOpCodeCFRUcRUs$$20 $$2STRING$$2getSR1_STI__Q26mintvm8BCOpCodeCFRUcRUs$$20: - .incbin "baserom.dol", 0x457AE8, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSR1_STI__Q26mintvm8BCOpCodeCFRUcRUs $$2STRING$$2getSR1_STI__Q26mintvm8BCOpCodeCFRUcRUs: - .incbin "baserom.dol", 0x457AFC, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv$$20 $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv$$20: - .incbin "baserom.dol", 0x457B0C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv: - .incbin "baserom.dol", 0x457B20, 0x10 + .asciz "BCOpCode.hpp" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249614 $$249614: - .incbin "baserom.dol", 0x4936F0, 0x8 + .asciz " %d\n" .global $$249616 $$249616: - .incbin "baserom.dol", 0x4936F8, 0x4 + .4byte 0x0A000000 .global $$249200 $$249200: - .incbin "baserom.dol", 0x4936FC, 0x4 + .4byte 0x4E4F5000 .global $$249201 $$249201: - .incbin "baserom.dol", 0x493700, 0x8 + .asciz "LDSRZR" + .balign 4 .global $$249202 $$249202: - .incbin "baserom.dol", 0x493708, 0x8 + .asciz "LDSRBT" + .balign 4 .global $$249203 $$249203: - .incbin "baserom.dol", 0x493710, 0x8 + .asciz "LDSRC4" + .balign 4 .global $$249204 $$249204: - .incbin "baserom.dol", 0x493718, 0x8 + .asciz "LDSRCA" + .balign 4 .global $$249205 $$249205: - .incbin "baserom.dol", 0x493720, 0x8 + .asciz "LDSRSR" + .balign 4 .global $$249206 $$249206: - .incbin "baserom.dol", 0x493728, 0x8 + .asciz "LDSRFZ" + .balign 4 .global $$249207 $$249207: - .incbin "baserom.dol", 0x493730, 0x8 + .asciz "LDFRSR" + .balign 4 .global $$249208 $$249208: - .incbin "baserom.dol", 0x493738, 0x8 + .asciz "LDSRSA" + .balign 4 .global $$249209 $$249209: - .incbin "baserom.dol", 0x493740, 0x8 + .asciz "LDSRSV" + .balign 4 .global $$249210 $$249210: - .incbin "baserom.dol", 0x493748, 0x8 + .asciz "LDSRA4" + .balign 4 .global $$249211 $$249211: - .incbin "baserom.dol", 0x493750, 0x8 + .asciz "LDSRSZ" + .balign 4 .global $$249212 $$249212: - .incbin "baserom.dol", 0x493758, 0x8 + .asciz "STSRSR" + .balign 4 .global $$249213 $$249213: - .incbin "baserom.dol", 0x493760, 0x8 + .asciz "STSVSR" + .balign 4 .global $$249214 $$249214: - .incbin "baserom.dol", 0x493768, 0x8 + .asciz "ADDI32" + .balign 4 .global $$249215 $$249215: - .incbin "baserom.dol", 0x493770, 0x8 + .asciz "SUBI32" + .balign 4 .global $$249216 $$249216: - .incbin "baserom.dol", 0x493778, 0x8 + .asciz "MULS32" + .balign 4 .global $$249217 $$249217: - .incbin "baserom.dol", 0x493780, 0x8 + .asciz "DIVS32" + .balign 4 .global $$249218 $$249218: - .incbin "baserom.dol", 0x493788, 0x8 + .asciz "MODS32" + .balign 4 .global $$249219 $$249219: - .incbin "baserom.dol", 0x493790, 0x8 + .asciz "INCI32" + .balign 4 .global $$249220 $$249220: - .incbin "baserom.dol", 0x493798, 0x8 + .asciz "DECI32" + .balign 4 .global $$249221 $$249221: - .incbin "baserom.dol", 0x4937A0, 0x8 + .asciz "NEGS32" + .balign 4 .global $$249222 $$249222: - .incbin "baserom.dol", 0x4937A8, 0x8 + .asciz "ADDF32" + .balign 4 .global $$249223 $$249223: - .incbin "baserom.dol", 0x4937B0, 0x8 + .asciz "SUBF32" + .balign 4 .global $$249224 $$249224: - .incbin "baserom.dol", 0x4937B8, 0x8 + .asciz "MULF32" + .balign 4 .global $$249225 $$249225: - .incbin "baserom.dol", 0x4937C0, 0x8 + .asciz "DIVF32" + .balign 4 .global $$249226 $$249226: - .incbin "baserom.dol", 0x4937C8, 0x8 + .asciz "INCF32" + .balign 4 .global $$249227 $$249227: - .incbin "baserom.dol", 0x4937D0, 0x8 + .asciz "DECF32" + .balign 4 .global $$249228 $$249228: - .incbin "baserom.dol", 0x4937D8, 0x8 + .asciz "NEGF32" + .balign 4 .global $$249229 $$249229: - .incbin "baserom.dol", 0x4937E0, 0x8 + .asciz "LTS32" + .balign 4 .global $$249230 $$249230: - .incbin "baserom.dol", 0x4937E8, 0x8 + .asciz "LES32" + .balign 4 .global $$249231 $$249231: - .incbin "baserom.dol", 0x4937F0, 0x8 + .asciz "EQI32" + .balign 4 .global $$249232 $$249232: - .incbin "baserom.dol", 0x4937F8, 0x8 + .asciz "NEI32" + .balign 4 .global $$249233 $$249233: - .incbin "baserom.dol", 0x493800, 0x8 + .asciz "LTF32" + .balign 4 .global $$249234 $$249234: - .incbin "baserom.dol", 0x493808, 0x8 + .asciz "LEF32" + .balign 4 .global $$249235 $$249235: - .incbin "baserom.dol", 0x493810, 0x8 + .asciz "EQF32" + .balign 4 .global $$249236 $$249236: - .incbin "baserom.dol", 0x493818, 0x8 + .asciz "NEF32" + .balign 4 .global $$249237 $$249237: - .incbin "baserom.dol", 0x493820, 0x8 + .asciz "LTCMP" + .balign 4 .global $$249238 $$249238: - .incbin "baserom.dol", 0x493828, 0x8 + .asciz "LECMP" + .balign 4 .global $$249239 $$249239: - .incbin "baserom.dol", 0x493830, 0x8 + .asciz "EQBOOL" + .balign 4 .global $$249240 $$249240: - .incbin "baserom.dol", 0x493838, 0x8 + .asciz "NEBOOL" + .balign 4 .global $$249241 $$249241: - .incbin "baserom.dol", 0x493840, 0x8 + .asciz "ANDI32" + .balign 4 .global $$249242 $$249242: - .incbin "baserom.dol", 0x493848, 0x8 + .asciz "ORI32" + .balign 4 .global $$249243 $$249243: - .incbin "baserom.dol", 0x493850, 0x8 + .asciz "XORI32" + .balign 4 .global $$249244 $$249244: - .incbin "baserom.dol", 0x493858, 0x8 + .asciz "NTI32" + .balign 4 .global $$249245 $$249245: - .incbin "baserom.dol", 0x493860, 0x8 + .asciz "NTBOOL" + .balign 4 .global $$249246 $$249246: - .incbin "baserom.dol", 0x493868, 0x8 + .asciz "SLLI32" + .balign 4 .global $$249247 $$249247: - .incbin "baserom.dol", 0x493870, 0x8 + .asciz "SLRI32" + .balign 4 .global $$249248 $$249248: - .incbin "baserom.dol", 0x493878, 0x4 + .4byte 0x4A4D5000 .global $$249249 $$249249: - .incbin "baserom.dol", 0x49387C, 0x8 + .asciz "JMPPOS" + .balign 4 .global $$249250 $$249250: - .incbin "baserom.dol", 0x493884, 0x8 + .asciz "JMPNEG" + .balign 4 .global $$249251 $$249251: - .incbin "baserom.dol", 0x49388C, 0x8 + .asciz "FENTER" + .balign 4 .global $$249252 $$249252: - .incbin "baserom.dol", 0x493894, 0x8 + .asciz "FLEAVE" + .balign 4 .global $$249253 $$249253: - .incbin "baserom.dol", 0x49389C, 0x8 + .asciz "FRET" + .balign 4 .global $$249254 $$249254: - .incbin "baserom.dol", 0x4938A4, 0x8 + .asciz "CALL" + .balign 4 .global $$249255 $$249255: - .incbin "baserom.dol", 0x4938AC, 0x8 + .asciz "YIELD" + .balign 4 .global $$249256 $$249256: - .incbin "baserom.dol", 0x4938B4, 0x8 + .asciz "MCOPY" + .balign 4 .global $$249257 $$249257: - .incbin "baserom.dol", 0x4938BC, 0x8 + .asciz "MZEROS" + .balign 4 .global $$249258 $$249258: - .incbin "baserom.dol", 0x4938C4, 0x8 + .asciz "SPPSH" + .balign 4 .global $$249259 $$249259: - .incbin "baserom.dol", 0x4938CC, 0x8 + .asciz "SPPSHZ" + .balign 4 .global $$249260 $$249260: - .incbin "baserom.dol", 0x4938D4, 0x8 + .asciz "SPPOP" + .balign 4 .global $$249261 $$249261: - .incbin "baserom.dol", 0x4938DC, 0x8 + .asciz "ADDOFS" + .balign 4 .global $$249262 $$249262: - .incbin "baserom.dol", 0x4938E4, 0x8 + .asciz "ARPSHZ" + .balign 4 .global $$249263 $$249263: - .incbin "baserom.dol", 0x4938EC, 0x8 + .asciz "ARIDX" + .balign 4 .global $$249264 $$249264: - .incbin "baserom.dol", 0x4938F4, 0x8 + .asciz "ARLEN" + .balign 4 .global $$249265 $$249265: - .incbin "baserom.dol", 0x4938FC, 0xC + .asciz "ARPOP" + .balign 4 + .4byte 0 diff --git a/asm/src/BG.s b/asm/src/BG.s index 43d09028..98db087f 100644 --- a/asm/src/BG.s +++ b/asm/src/BG.s @@ -313,50 +313,57 @@ startAnim__Q43scn9grandmenu4menu2BGFv: /* 803F4B20 003F0960 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402454, 0x4 + .4byte 0x80207284 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253189 $$253189: - .incbin "baserom.dol", 0x45CDC0, 0x10 + .asciz "history/Sky" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251625 $$251625: - .incbin "baserom.dol", 0x491890, 0x10 + .asciz "grandmenu/Main" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253190 $$253190: - .incbin "baserom.dol", 0x494868, 0x8 + .asciz "Main" + .balign 4 .global $$253192 $$253192: - .incbin "baserom.dol", 0x494870, 0x8 + .asciz "TopL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251626 $$251626: - .incbin "baserom.dol", 0x498888, 0x4 + .4byte 0x42470000 .global $$251637 $$251637: - .incbin "baserom.dol", 0x49888C, 0x8 + .asciz "Main" + .balign 4 .global $$251640 $$251640: - .incbin "baserom.dol", 0x498894, 0xC + .asciz "Start" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253191 $$253191: - .incbin "baserom.dol", 0x49AB48, 0x4 + .4byte 0x40900000 .global $$253252 $$253252: - .incbin "baserom.dol", 0x49AB4C, 0x4 + .4byte 0x42480000 .global $$253253 $$253253: - .incbin "baserom.dol", 0x49AB50, 0x4 + .4byte 0x40C00000 .global $$253254 $$253254: - .incbin "baserom.dol", 0x49AB54, 0x4 + .4byte 0xC0A00000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global MODEL_OFFSET__Q33scn7history16$$2unnamed$$2BG_cpp$$2 diff --git a/asm/src/BGLayout.s b/asm/src/BGLayout.s index 7fb90312..c2bc8e14 100644 --- a/asm/src/BGLayout.s +++ b/asm/src/BGLayout.s @@ -133,20 +133,24 @@ lbl_80200A20: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251541 $$251541: - .incbin "baserom.dol", 0x45C568, 0x10 + .asciz "grandtitle/Main" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251954 $$251954: - .incbin "baserom.dol", 0x4946F8, 0x4 + .4byte 0x42470000 .global $$251993 $$251993: - .incbin "baserom.dol", 0x4946FC, 0x8 + .asciz "Start" + .balign 4 .global $$251999 $$251999: - .incbin "baserom.dol", 0x494704, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2: - .incbin "baserom.dol", 0x49AA68, 0x8 + .4byte 0x80460468 + .4byte 0 diff --git a/asm/src/BGM.s b/asm/src/BGM.s index dc0db6fa..e37f3dab 100644 --- a/asm/src/BGM.s +++ b/asm/src/BGM.s @@ -12,4 +12,33 @@ Label__Q43scn7history6detail3BGMFi: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global BGM_LABEL_TABLE__Q43scn7history6detail17$$2unnamed$$2BGM_cpp$$2 BGM_LABEL_TABLE__Q43scn7history6detail17$$2unnamed$$2BGM_cpp$$2: - .incbin "baserom.dol", 0x411CD0, 0x78 + .4byte 0x00000014 + .4byte 0x00000014 + .4byte 0x00000016 + .4byte 0x00000017 + .4byte 0x00000014 + .4byte 0x00000018 + .4byte 0x0000002B + .4byte 0x0000001A + .4byte 0x0000001B + .4byte 0x00000007 + .4byte 0x0000001C + .4byte 0x0000001D + .4byte 0x00000014 + .4byte 0x00000014 + .4byte 0x0000001F + .4byte 0x00000020 + .4byte 0x00000022 + .4byte 0x00000029 + .4byte 0x00000005 + .4byte 0x00000024 + .4byte 0x00000025 + .4byte 0x00000026 + .4byte 0x00000014 + .4byte 0x0000002A + .4byte 0x00000014 + .4byte 0x0000002D + .4byte 0x0000002E + .4byte 0x0000002F + .4byte 0x00000003 + .4byte 0 diff --git a/asm/src/BGMController.s b/asm/src/BGMController.s index f2d77979..ee83644e 100644 --- a/asm/src/BGMController.s +++ b/asm/src/BGMController.s @@ -465,18 +465,19 @@ __ct__Q53scn4step4core13BGMController4MemoFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249495 $$249495: - .incbin "baserom.dol", 0x495848, 0x4 + .4byte 0 .global $$249496 $$249496: - .incbin "baserom.dol", 0x49584C, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249732 $$249732: - .incbin "baserom.dol", 0x49B8D0, 0x4 + .4byte 0x3F800000 .global $$249780 $$249780: - .incbin "baserom.dol", 0x49B8D4, 0x4 + .4byte 0x42F00000 .global $$249783 $$249783: - .incbin "baserom.dol", 0x49B8D8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/BGModel.s b/asm/src/BGModel.s index 377b3b8a..569c4894 100644 --- a/asm/src/BGModel.s +++ b/asm/src/BGModel.s @@ -137,25 +137,28 @@ update__Q33scn10grandtitle7BGModelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251709 $$251709: - .incbin "baserom.dol", 0x45ABB0, 0x20 + .asciz "challengetitle/TitleScene" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251679 $$251679: - .incbin "baserom.dol", 0x45C578, 0x18 + .asciz "grandtitle/TitleScene" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2: - .incbin "baserom.dol", 0x494090, 0x4 + .4byte 0x8045EAB0 .global $$251840 $$251840: - .incbin "baserom.dol", 0x494094, 0x4 + .4byte 0x4D617000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2: - .incbin "baserom.dol", 0x494710, 0x4 + .4byte 0x80460478 .global $$251825 $$251825: - .incbin "baserom.dol", 0x494714, 0x4 + .4byte 0x4D617000 diff --git a/asm/src/BackButton.s b/asm/src/BackButton.s index 3b6b99ca..ab1ef5f6 100644 --- a/asm/src/BackButton.s +++ b/asm/src/BackButton.s @@ -291,24 +291,32 @@ isPushEnd__Q43scn9grandmenu4menu10BackButtonCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252290 $$252290: - .incbin "baserom.dol", 0x491838, 0x10 + .asciz "grandmenu/Main" + .balign 4 .global $$252291 $$252291: - .incbin "baserom.dol", 0x491848, 0xC + .asciz "ModeButton" + .balign 4 .global $$252292 $$252292: - .incbin "baserom.dol", 0x491854, 0x3C + .asciz "ModeButtonN" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252293 $$252293: - .incbin "baserom.dol", 0x498870, 0x8 + .asciz "Back" + .balign 4 .global $$252294 $$252294: - .incbin "baserom.dol", 0x498878, 0x8 + .asciz "Wait" + .balign 4 .global $$252371 $$252371: - .incbin "baserom.dol", 0x498880, 0x4 + .4byte 0x496E0000 .global $$252374 $$252374: - .incbin "baserom.dol", 0x498884, 0x4 + .4byte 0x4F757400 diff --git a/asm/src/BackupFileData2.s b/asm/src/BackupFileData2.s index b06159aa..a14befbf 100644 --- a/asm/src/BackupFileData2.s +++ b/asm/src/BackupFileData2.s @@ -396,13 +396,39 @@ lbl_804047DC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: - .incbin "baserom.dol", 0x41D0C8, 0xC + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000008 .global UseMaster2AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 UseMaster2AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: - .incbin "baserom.dol", 0x41D0D4, 0xC + .4byte 0x00000004 + .4byte 0x00000015 + .4byte 0x00000013 .global UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: - .incbin "baserom.dol", 0x41D0E0, 0x20 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000015 + .4byte 0x00000013 + .4byte 0x00000018 + .4byte 0 .global challengeMasterDataTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 challengeMasterDataTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: - .incbin "baserom.dol", 0x41D100, 0x40 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x80420FC8 + .4byte 0x00000007 + .4byte 0x00000003 + .4byte 0x80420FD4 + .4byte 0x0000000A + .4byte 0x00000007 + .4byte 0x80420FE0 + .4byte 0x0000000B + .4byte 0x00000007 + .4byte 0x80420FE0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/src/Barrier.s b/asm/src/Barrier.s index a3c1cfca..dd365980 100644 --- a/asm/src/Barrier.s +++ b/asm/src/Barrier.s @@ -231,4 +231,5 @@ lbl_8039240C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259019 $$259019: - .incbin "baserom.dol", 0x49E150, 0x8 + .4byte 0x3F4CCCCD + .4byte 0 diff --git a/asm/src/BgCamera.s b/asm/src/BgCamera.s index 32dd6835..8f7d57d5 100644 --- a/asm/src/BgCamera.s +++ b/asm/src/BgCamera.s @@ -647,35 +647,39 @@ lbl_802629F8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2AsinDeg__Q24nw4r4mathFf$$20 $$2STRING$$2AsinDeg__Q24nw4r4mathFf$$20: - .incbin "baserom.dol", 0x4671F0, 0x28 + .asciz "AsinDeg: Input is out of the domain." + .balign 4 .global $$2STRING$$2AsinDeg__Q24nw4r4mathFf $$2STRING$$2AsinDeg__Q24nw4r4mathFf: - .incbin "baserom.dol", 0x467218, 0x10 + .asciz "triangular.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251615 $$251615: - .incbin "baserom.dol", 0x495810, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252471 $$252471: - .incbin "baserom.dol", 0x49B5D8, 0x4 + .4byte 0 .global $$252523 $$252523: - .incbin "baserom.dol", 0x49B5DC, 0x4 + .4byte 0x3C8EFA35 .global $$252524 $$252524: - .incbin "baserom.dol", 0x49B5E0, 0x4 + .4byte 0x3F800000 .global $$252525 $$252525: - .incbin "baserom.dol", 0x49B5E4, 0x4 + .4byte 0xBF800000 .global $$252526 $$252526: - .incbin "baserom.dol", 0x49B5E8, 0x4 + .4byte 0x3F000000 .global $$252527 $$252527: - .incbin "baserom.dol", 0x49B5EC, 0x4 + .4byte 0x42652EE1 .global $$252528 $$252528: - .incbin "baserom.dol", 0x49B5F0, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/BgManager.s b/asm/src/BgManager.s index baac1e58..6e9842da 100644 --- a/asm/src/BgManager.s +++ b/asm/src/BgManager.s @@ -259,12 +259,81 @@ lbl_803F8AD8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BG_DATA_TABLE__Q33scn11staffcredit23$$2unnamed$$2BgManager_cpp$$2 T_BG_DATA_TABLE__Q33scn11staffcredit23$$2unnamed$$2BgManager_cpp$$2: - .incbin "baserom.dol", 0x41CCF0, 0x118 + .4byte 0x00000019 + .4byte 0x3FD9999A + .4byte 0x42D3947B + .4byte 0xC35EBAE1 + .4byte 0xBFC00000 + .4byte 0xC1867AE1 + .4byte 0x41675C29 + .4byte 0x4236CCCD + .4byte 0x3DCCCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E4CCCCD + .4byte 0 + .4byte 0x0000001E + .4byte 0x4431347B + .4byte 0x4249AE14 + .4byte 0x438175C3 + .4byte 0xC0EF5C29 + .4byte 0x41BD3333 + .4byte 0 + .4byte 0x41A80000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0x0000001C + .4byte 0x436CAB85 + .4byte 0x40E4CCCD + .4byte 0x4295CCCD + .4byte 0xC0E1999A + .4byte 0x4047AE14 + .4byte 0 + .4byte 0x41D4CCCD + .asciz "?333" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0x3ECCCCCD + .4byte 0 + .4byte 0x0000001B + .4byte 0x42746666 + .4byte 0x4171C28F + .4byte 0x4271AE14 + .4byte 0xC0F75C29 + .4byte 0x40A570A4 + .4byte 0 + .4byte 0x4201999A + .4byte 0x3F000000 + .4byte 0 + .4byte 0xBE4CCCCD + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x0000001D + .4byte 0x42DD051F + .4byte 0x42590000 + .4byte 0x434FD70A + .4byte 0xC11A6666 + .4byte 0x40047AE1 + .4byte 0 + .4byte 0x4199999A + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252626 $$252626: - .incbin "baserom.dol", 0x49ED88, 0x4 + .4byte 0xFFFFFFFF .global $$252672 $$252672: - .incbin "baserom.dol", 0x49ED8C, 0x4 + .4byte 0xFFFFFFFF diff --git a/asm/src/BgmPlayer.s b/asm/src/BgmPlayer.s index c4ec30b0..011cc0b1 100644 --- a/asm/src/BgmPlayer.s +++ b/asm/src/BgmPlayer.s @@ -324,7 +324,7 @@ volumeFade__Q23snd9BgmPlayerFfi: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249146 $$249146: - .incbin "baserom.dol", 0x49EE98, 0x4 + .4byte 0x3F800000 .global $$249208 $$249208: - .incbin "baserom.dol", 0x49EE9C, 0x4 + .4byte 0x3ECCCCCD diff --git a/asm/src/BinCarryItemKindUtil.s b/asm/src/BinCarryItemKindUtil.s index 21e386c7..41260f4d 100644 --- a/asm/src/BinCarryItemKindUtil.s +++ b/asm/src/BinCarryItemKindUtil.s @@ -12,34 +12,52 @@ FDNName__Q43scn4step3map20BinCarryItemKindUtilFQ43scn4step3map16BinCarryItemKind .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: - .incbin "baserom.dol", 0x48E770, 0x18 + .asciz "StepItAbilityStar.dn" + .balign 4 .global $$248724 $$248724: - .incbin "baserom.dol", 0x48E788, 0x14 + .asciz "StepItLockKey.dn" + .balign 4 .global $$248725 $$248725: - .incbin "baserom.dol", 0x48E79C, 0x14 + .asciz "StepItMTomatoBox.dn" .global $$248726 $$248726: - .incbin "baserom.dol", 0x48E7B0, 0x10 + .asciz "StepItCandle.dn" .global $$248727 $$248727: - .incbin "baserom.dol", 0x48E7C0, 0x18 + .asciz "StepItCracker.dn" + .balign 4 + .4byte 0 .global $$248728 $$248728: - .incbin "baserom.dol", 0x48E7D8, 0x18 + .asciz "StepItInvisibleStone.dn" .global $$248729 $$248729: - .incbin "baserom.dol", 0x48E7F0, 0x18 + .asciz "StepItBalloonBomb.dn" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x48E808, 0x14 + .asciz "StepItStepShoe.dn" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x48E81C, 0x18 + .asciz "StepItPrismShield.dn" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x48E834, 0x18 + .asciz "StepItRepairParts.dn" + .balign 4 .global T_FDN_NAME_TABLE__Q43scn4step3map34$$2unnamed$$2BinCarryItemKindUtil_cpp$$2 T_FDN_NAME_TABLE__Q43scn4step3map34$$2unnamed$$2BinCarryItemKindUtil_cpp$$2: - .incbin "baserom.dol", 0x48E84C, 0x2C + .4byte 0x80492670 + .4byte 0x80492688 + .4byte 0x8049269C + .4byte 0x804926B0 + .4byte 0x804926C0 + .4byte 0x804926D8 + .4byte 0x804926F0 + .4byte 0x80492708 + .4byte 0x8049271C + .4byte 0x8049269C + .4byte 0x80492734 diff --git a/asm/src/BinDecorationKindUtil.s b/asm/src/BinDecorationKindUtil.s index 02316d4e..cd8fe9d5 100644 --- a/asm/src/BinDecorationKindUtil.s +++ b/asm/src/BinDecorationKindUtil.s @@ -124,95 +124,200 @@ IsMonotoneIncludeFore__Q43scn4step3map21BinDecorationKindUtilFQ43scn4step3map17B .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2 T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C3C0, 0x178 + .4byte 0x80492778 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492784 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492794 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927A8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927BC + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927C8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927D4 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927E0 + .4byte 0x3DCCCCCD + .4byte 0 + .4byte 0x804927EC + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804927F8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492804 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492810 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049281C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492828 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492834 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492840 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049284C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492858 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492864 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492870 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049287C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049287C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049287C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8049287C + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492888 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x80492894 + .4byte 0x3DCCCCCD + .4byte 0 + .4byte 0x8055BF00 + .4byte 0x3DCCCCCD + .4byte 0 + .4byte 0x8055BF08 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x804928A0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8055BF10 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8055BF18 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248877 $$248877: - .incbin "baserom.dol", 0x48E878, 0xC + .asciz "challenge" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x48E884, 0x10 + .asciz "challengemusou" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x48E894, 0x14 + .asciz "challengemaster1" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x48E8A8, 0x14 + .asciz "challengemaster2" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x48E8BC, 0xC + .asciz "challenge01" .global $$248882 $$248882: - .incbin "baserom.dol", 0x48E8C8, 0xC + .asciz "challenge02" .global $$248883 $$248883: - .incbin "baserom.dol", 0x48E8D4, 0xC + .asciz "challenge03" .global $$248884 $$248884: - .incbin "baserom.dol", 0x48E8E0, 0xC + .asciz "challenge04" .global $$248885 $$248885: - .incbin "baserom.dol", 0x48E8EC, 0xC + .asciz "challenge05" .global $$248886 $$248886: - .incbin "baserom.dol", 0x48E8F8, 0xC + .asciz "challenge06" .global $$248887 $$248887: - .incbin "baserom.dol", 0x48E904, 0xC + .asciz "challenge07" .global $$248888 $$248888: - .incbin "baserom.dol", 0x48E910, 0xC + .asciz "challenge08" .global $$248889 $$248889: - .incbin "baserom.dol", 0x48E91C, 0xC + .asciz "challenge09" .global $$248890 $$248890: - .incbin "baserom.dol", 0x48E928, 0xC + .asciz "challenge10" .global $$248891 $$248891: - .incbin "baserom.dol", 0x48E934, 0xC + .asciz "challenge11" .global $$248892 $$248892: - .incbin "baserom.dol", 0x48E940, 0xC + .asciz "challenge12" .global $$248893 $$248893: - .incbin "baserom.dol", 0x48E94C, 0xC + .asciz "challenge13" .global $$248894 $$248894: - .incbin "baserom.dol", 0x48E958, 0xC + .asciz "levelmap1" + .balign 4 .global $$248895 $$248895: - .incbin "baserom.dol", 0x48E964, 0xC + .asciz "levelmap2" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x48E970, 0xC + .asciz "levelmap3" + .balign 4 .global $$248897 $$248897: - .incbin "baserom.dol", 0x48E97C, 0xC + .asciz "abilityroom" .global $$248898 $$248898: - .incbin "baserom.dol", 0x48E988, 0xC + .asciz "firstdemo" + .balign 4 .global $$248899 $$248899: - .incbin "baserom.dol", 0x48E994, 0xC + .asciz "staffcredit" .global $$248902 $$248902: - .incbin "baserom.dol", 0x48E9A0, 0xC + .asciz "gckbeach" + .balign 4 .global $$249156 $$249156: - .incbin "baserom.dol", 0x48E9AC, 0xC + .asciz "step/map/%s" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248900 $$248900: - .incbin "baserom.dol", 0x4982E0, 0x8 + .asciz "airfort" .global $$248901 $$248901: - .incbin "baserom.dol", 0x4982E8, 0x8 + .asciz "desert" + .balign 4 .global $$248903 $$248903: - .incbin "baserom.dol", 0x4982F0, 0x8 + .asciz "grass" + .balign 4 .global $$248904 $$248904: - .incbin "baserom.dol", 0x4982F8, 0x8 + .asciz "snow" + .balign 4 diff --git a/asm/src/Blink.s b/asm/src/Blink.s index 8a5f66e6..94124f79 100644 --- a/asm/src/Blink.s +++ b/asm/src/Blink.s @@ -153,10 +153,11 @@ getColor__Q43scn4step4hero5BlinkCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248855 $$248855: - .incbin "baserom.dol", 0x49D640, 0x4 + .4byte 0x40000000 .global $$248856 $$248856: - .incbin "baserom.dol", 0x49D644, 0x4 + .4byte 0x3F800000 .global $$248860 $$248860: - .incbin "baserom.dol", 0x49D648, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/Block.s b/asm/src/Block.s index b83d38ca..15f1745c 100644 --- a/asm/src/Block.s +++ b/asm/src/Block.s @@ -1620,197 +1620,596 @@ lbl_8030021C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251712 $$251712: - .incbin "baserom.dol", 0x45C590, 0x18 + .asciz "grandtitle/BlockStar" + .balign 4 .global $$251723 $$251723: - .incbin "baserom.dol", 0x45C5A8, 0xC + .asciz "Block10L" + .balign 4 .global $$251724 $$251724: - .incbin "baserom.dol", 0x45C5B4, 0xC + .asciz "Block11L" + .balign 4 .global $$251725 $$251725: - .incbin "baserom.dol", 0x45C5C0, 0xC + .asciz "Block12L" + .balign 4 .global $$251726 $$251726: - .incbin "baserom.dol", 0x45C5CC, 0xC + .asciz "Block13L" + .balign 4 .global $$251727 $$251727: - .incbin "baserom.dol", 0x45C5D8, 0xC + .asciz "Block14L" + .balign 4 .global $$251728 $$251728: - .incbin "baserom.dol", 0x45C5E4, 0xC + .asciz "Block15L" + .balign 4 .global $$251729 $$251729: - .incbin "baserom.dol", 0x45C5F0, 0xC + .asciz "Block16L" + .balign 4 .global $$251730 $$251730: - .incbin "baserom.dol", 0x45C5FC, 0xC + .asciz "Block17L" + .balign 4 .global $$251731 $$251731: - .incbin "baserom.dol", 0x45C608, 0xC + .asciz "Block18L" + .balign 4 .global $$251732 $$251732: - .incbin "baserom.dol", 0x45C614, 0xC + .asciz "Block19L" + .balign 4 .global $$251733 $$251733: - .incbin "baserom.dol", 0x45C620, 0xC + .asciz "Block20L" + .balign 4 .global $$251734 $$251734: - .incbin "baserom.dol", 0x45C62C, 0xC + .asciz "Block21L" + .balign 4 .global $$251735 $$251735: - .incbin "baserom.dol", 0x45C638, 0xC + .asciz "Block22L" + .balign 4 .global $$251736 $$251736: - .incbin "baserom.dol", 0x45C644, 0xC + .asciz "Block23L" + .balign 4 .global $$251737 $$251737: - .incbin "baserom.dol", 0x45C650, 0xC + .asciz "Block24L" + .balign 4 .global $$251738 $$251738: - .incbin "baserom.dol", 0x45C65C, 0xC + .asciz "Block25L" + .balign 4 .global $$251739 $$251739: - .incbin "baserom.dol", 0x45C668, 0xC + .asciz "Block26L" + .balign 4 .global $$251740 $$251740: - .incbin "baserom.dol", 0x45C674, 0xC + .asciz "Block27L" + .balign 4 .global $$251741 $$251741: - .incbin "baserom.dol", 0x45C680, 0xC + .asciz "Block28L" + .balign 4 .global $$251742 $$251742: - .incbin "baserom.dol", 0x45C68C, 0xC + .asciz "Block29L" + .balign 4 .global $$251743 $$251743: - .incbin "baserom.dol", 0x45C698, 0xC + .asciz "Block30L" + .balign 4 .global $$251744 $$251744: - .incbin "baserom.dol", 0x45C6A4, 0xC + .asciz "Block31L" + .balign 4 .global $$251745 $$251745: - .incbin "baserom.dol", 0x45C6B0, 0xC + .asciz "Block32L" + .balign 4 .global $$251746 $$251746: - .incbin "baserom.dol", 0x45C6BC, 0xC + .asciz "Block33L" + .balign 4 .global $$251747 $$251747: - .incbin "baserom.dol", 0x45C6C8, 0xC + .asciz "Block34L" + .balign 4 .global $$251748 $$251748: - .incbin "baserom.dol", 0x45C6D4, 0xC + .asciz "Block35L" + .balign 4 .global $$251749 $$251749: - .incbin "baserom.dol", 0x45C6E0, 0xC + .asciz "Block36L" + .balign 4 .global $$251750 $$251750: - .incbin "baserom.dol", 0x45C6EC, 0xC + .asciz "Block37L" + .balign 4 .global T_PARENT_NODE_NAME__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2 T_PARENT_NODE_NAME__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: - .incbin "baserom.dol", 0x45C6F8, 0x98 + .4byte 0x80558340 + .4byte 0x80558348 + .4byte 0x80558350 + .4byte 0x80558358 + .4byte 0x80558360 + .4byte 0x80558368 + .4byte 0x80558370 + .4byte 0x80558378 + .4byte 0x80558380 + .4byte 0x80558388 + .4byte 0x804604A8 + .4byte 0x804604B4 + .4byte 0x804604C0 + .4byte 0x804604CC + .4byte 0x804604D8 + .4byte 0x804604E4 + .4byte 0x804604F0 + .4byte 0x804604FC + .4byte 0x80460508 + .4byte 0x80460514 + .4byte 0x80460520 + .4byte 0x8046052C + .4byte 0x80460538 + .4byte 0x80460544 + .4byte 0x80460550 + .4byte 0x8046055C + .4byte 0x80460568 + .4byte 0x80460574 + .4byte 0x80460580 + .4byte 0x8046058C + .4byte 0x80460598 + .4byte 0x804605A4 + .4byte 0x804605B0 + .4byte 0x804605BC + .4byte 0x804605C8 + .4byte 0x804605D4 + .4byte 0x804605E0 + .4byte 0x804605EC .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256431 $$256431: - .incbin "baserom.dol", 0x47BB20, 0xF0 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF1A4 + .4byte 0x802FF0C8 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0DC + .4byte 0x802FF0B4 + .4byte 0x802FF0F0 + .4byte 0x802FF104 + .4byte 0x802FF118 + .4byte 0x802FF12C + .4byte 0x802FF140 + .4byte 0x802FF154 + .4byte 0x802FF1A4 + .4byte 0x802FF168 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF0B4 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF17C + .4byte 0x802FF0B4 + .4byte 0x802FF0DC + .4byte 0x802FF190 + .4byte 0x802FF0C8 + .4byte 0x802FF1A4 + .4byte 0x802FF1A4 + .4byte 0x802FF0B4 + .4byte 0x802FF0DC + .4byte 0x802FF0C8 + .4byte 0x802FF0B4 .global $$256488 $$256488: - .incbin "baserom.dol", 0x47BC10, 0xF0 + .4byte 0x802FF460 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF468 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF470 + .4byte 0x802FF4A0 + .4byte 0x802FF478 + .4byte 0x802FF4A0 + .4byte 0x802FF480 + .4byte 0x802FF4A0 + .4byte 0x802FF488 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF490 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF490 + .4byte 0x802FF498 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF4A0 + .4byte 0x802FF498 .global $$256513 $$256513: - .incbin "baserom.dol", 0x47BD00, 0xF0 + .4byte 0x802FF4E0 + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF4EC + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF4F8 + .4byte 0x802FF55C + .4byte 0x802FF504 + .4byte 0x802FF55C + .4byte 0x802FF544 + .4byte 0x802FF55C + .4byte 0x802FF53C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF54C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF54C + .4byte 0x802FF554 + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF55C + .4byte 0x802FF554 .global $$256528 $$256528: - .incbin "baserom.dol", 0x47BDF0, 0x10 + .asciz "%sWaitVacuum" + .balign 4 .global $$256591 $$256591: - .incbin "baserom.dol", 0x47BE00, 0xC + .asciz "WaitCool" + .balign 4 .global $$256612 $$256612: - .incbin "baserom.dol", 0x47BE0C, 0xC + .asciz "BigShake" + .balign 4 .global $$256659 $$256659: - .incbin "baserom.dol", 0x47BE18, 0xC + .asciz "TopL3x3Wait" .global $$256661 $$256661: - .incbin "baserom.dol", 0x47BE24, 0x70 + .4byte 0x802FFB0C + .4byte 0x802FFC50 + .4byte 0x802FFB4C + .4byte 0x802FFB2C + .4byte 0x802FFB6C + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFB8C + .4byte 0x802FFBAC + .4byte 0x802FFBCC + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFBEC + .4byte 0x802FFC10 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC50 + .4byte 0x802FFC30 .global $$256695 $$256695: - .incbin "baserom.dol", 0x47BE94, 0xEC + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC0 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCC8 + .4byte 0x802FFCC8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 + .4byte 0x802FFCB8 .global $$256822 $$256822: - .incbin "baserom.dol", 0x47BF80, 0xF0 + .4byte 0x802FFF14 + .4byte 0x802FFF04 + .4byte 0x802FFF14 + .4byte 0x802FFEFC + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF04 + .4byte 0x802FFF04 + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF0C + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFF14 + .4byte 0x802FFEA8 + .4byte 0x802FFF14 + .4byte 0x802FFEC4 + .4byte 0x802FFECC + .4byte 0x802FFED4 + .4byte 0x802FFEF4 + .4byte 0x802FFEF4 + .4byte 0x802FFED4 + .4byte 0x802FFED4 + .4byte 0x802FFEE4 + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFF0C + .4byte 0x802FFEEC + .4byte 0x802FFF04 + .4byte 0x802FFF04 + .4byte 0x802FFF04 + .4byte 0x802FFF04 + .4byte 0x802FFF04 + .4byte 0x802FFEE4 + .4byte 0x802FFEDC + .4byte 0x802FFEFC + .4byte 0x802FFEFC + .4byte 0x802FFEFC + .4byte 0x802FFF04 + .4byte 0x802FFEDC .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: - .incbin "baserom.dol", 0x494718, 0x8 + .4byte 0x80460490 + .4byte 0 .global $$251713 $$251713: - .incbin "baserom.dol", 0x494720, 0x8 + .asciz "Block0L" .global $$251714 $$251714: - .incbin "baserom.dol", 0x494728, 0x8 + .asciz "Block1L" .global $$251715 $$251715: - .incbin "baserom.dol", 0x494730, 0x8 + .asciz "Block2L" .global $$251716 $$251716: - .incbin "baserom.dol", 0x494738, 0x8 + .asciz "Block3L" .global $$251717 $$251717: - .incbin "baserom.dol", 0x494740, 0x8 + .asciz "Block4L" .global $$251718 $$251718: - .incbin "baserom.dol", 0x494748, 0x8 + .asciz "Block5L" .global $$251719 $$251719: - .incbin "baserom.dol", 0x494750, 0x8 + .asciz "Block6L" .global $$251720 $$251720: - .incbin "baserom.dol", 0x494758, 0x8 + .asciz "Block7L" .global $$251721 $$251721: - .incbin "baserom.dol", 0x494760, 0x8 + .asciz "Block8L" .global $$251722 $$251722: - .incbin "baserom.dol", 0x494768, 0x8 + .asciz "Block9L" .global $$252315 $$252315: - .incbin "baserom.dol", 0x494770, 0x8 + .asciz "TopL" + .balign 4 .global $$251987 $$251987: - .incbin "baserom.dol", 0x494778, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256613 $$256613: - .incbin "baserom.dol", 0x496930, 0x8 + .asciz "Crumble" .global $$256658 $$256658: - .incbin "baserom.dol", 0x496938, 0x8 + .asciz "Wait" + .balign 4 .global $$256889 $$256889: - .incbin "baserom.dol", 0x496940, 0x8 + .asciz "Shake" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252316 $$252316: - .incbin "baserom.dol", 0x49AA70, 0x4 + .4byte 0x3F800000 .global $$252317 $$252317: - .incbin "baserom.dol", 0x49AA74, 0x4 + .4byte 0 .global $$252318 $$252318: - .incbin "baserom.dol", 0x49AA78, 0x8 + .4byte 0x40800000 + .4byte 0 .global $$252369 $$252369: - .incbin "baserom.dol", 0x49AA80, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 $$256372: - .incbin "baserom.dol", 0x49D1E0, 0x8 + .4byte 0 + .4byte 0 .global $$256531 $$256531: - .incbin "baserom.dol", 0x49D1E8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/BlockEffRequestInfo.s b/asm/src/BlockEffRequestInfo.s index 1cc32477..7c32fd75 100644 --- a/asm/src/BlockEffRequestInfo.s +++ b/asm/src/BlockEffRequestInfo.s @@ -215,7 +215,7 @@ __ct__Q63scn4step7gimmick5block19BlockEffRequestInfo4InfoFUlfRCQ33hel4math4Vec3U .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250372 $$250372: - .incbin "baserom.dol", 0x49D1F0, 0x4 + .4byte 0x3F800000 .global $$250373 $$250373: - .incbin "baserom.dol", 0x49D1F4, 0x4 + .4byte 0 diff --git a/asm/src/BlockManager.s b/asm/src/BlockManager.s index 817bc7dc..3a4160a2 100644 --- a/asm/src/BlockManager.s +++ b/asm/src/BlockManager.s @@ -2604,67 +2604,196 @@ lbl_80302C24: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$256150 $$256150: - .incbin "baserom.dol", 0x4157F8, 0x50 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0xFFFFFFFE + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0xFFFFFFFE + .4byte 0x00000001 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0x00000001 .global $$256153 $$256153: - .incbin "baserom.dol", 0x415848, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000001 .global $$256156 $$256156: - .incbin "baserom.dol", 0x415898, 0xB0 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0xFFFFFFFE + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0xFFFFFFFE + .4byte 0x00000001 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0xFFFFFFFD + .4byte 0 + .4byte 0xFFFFFFFD + .4byte 0x00000001 + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFC + .4byte 0 + .4byte 0xFFFFFFFC + .4byte 0x00000001 + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0xFFFFFFFE + .4byte 0x00000002 + .4byte 0xFFFFFFFD + .4byte 0x00000002 + .4byte 0xFFFFFFFC + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000002 .global $$256159 $$256159: - .incbin "baserom.dol", 0x415948, 0xB0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0x00000002 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$259290 $$259290: - .incbin "baserom.dol", 0x47C070, 0x18 + .asciz "step/gimmick/Block" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256309 $$256309: - .incbin "baserom.dol", 0x496948, 0x4 + .4byte 0 .global $$256310 $$256310: - .incbin "baserom.dol", 0x49694C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256162 $$256162: - .incbin "baserom.dol", 0x49D1F8, 0x4 + .4byte 0x00000001 .global lbl_805626BC lbl_805626BC: - .incbin "baserom.dol", 0x49D1FC, 0x4 + .4byte 0x00000001 .global $$256165 $$256165: - .incbin "baserom.dol", 0x49D200, 0x4 + .4byte 0xFFFFFFFF .global lbl_805626C4 lbl_805626C4: - .incbin "baserom.dol", 0x49D204, 0x4 + .4byte 0x00000001 .global $$259502 $$259502: - .incbin "baserom.dol", 0x49D208, 0x4 + .4byte 0x3F400000 .global $$259503 $$259503: - .incbin "baserom.dol", 0x49D20C, 0x4 + .4byte 0x3F800000 .global $$259535 $$259535: - .incbin "baserom.dol", 0x49D210, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$259539 $$259539: - .incbin "baserom.dol", 0x49D218, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259589 $$259589: - .incbin "baserom.dol", 0x49D220, 0x4 + .4byte 0x40000000 .global $$259627 $$259627: - .incbin "baserom.dol", 0x49D224, 0x4 + .4byte 0 .global $$259741 $$259741: - .incbin "baserom.dol", 0x49D228, 0x4 + .4byte 0x40400000 .global $$259805 $$259805: - .incbin "baserom.dol", 0x49D22C, 0x4 + .4byte 0xBF000000 .global $$259806 $$259806: - .incbin "baserom.dol", 0x49D230, 0x8 + .4byte 0x40A00000 + .4byte 0 diff --git a/asm/src/BlockResFiles.s b/asm/src/BlockResFiles.s index 7da9241b..839fb3be 100644 --- a/asm/src/BlockResFiles.s +++ b/asm/src/BlockResFiles.s @@ -164,82 +164,215 @@ __sinit_$$3BlockResFiles_cpp: /* 80302E60 002FECA0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025A0, 0x4 + .4byte 0x80302E30 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248773 $$248773: - .incbin "baserom.dol", 0x47C088, 0x18 + .asciz "step/gimmick/BlockStar" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x47C0A0, 0x18 + .asciz "step/gimmick/BlockHeavy" .global $$248779 $$248779: - .incbin "baserom.dol", 0x47C0B8, 0x18 + .asciz "step/gimmick/BlockBomb" + .balign 4 .global $$248780 $$248780: - .incbin "baserom.dol", 0x47C0D0, 0x20 + .asciz "step/gimmick/BlockChainBreak" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x47C0F0, 0x20 + .asciz "step/gimmick/BlockChainGenerate" .global $$248783 $$248783: - .incbin "baserom.dol", 0x47C110, 0xC + .asciz "TopLA1x2x1" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x47C11C, 0xC + .asciz "TopLB1x2x1" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x47C128, 0xC + .asciz "TopL1x2x3" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x47C134, 0xC + .asciz "TopL2x4x4x2" .global $$248789 $$248789: - .incbin "baserom.dol", 0x47C140, 0x18 + .asciz "step/gimmick/BlockChip" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x47C158, 0xC + .asciz "TopL3x2x1" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x47C164, 0x18 + .asciz "step/gimmick/BlockFire" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x47C17C, 0x1C + .asciz "step/gimmick/BlockCrumble" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x47C198, 0x18 + .asciz "step/gimmick/BlockHard" + .balign 4 .global T_CONTEXT_TABLE__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2 T_CONTEXT_TABLE__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: - .incbin "baserom.dol", 0x47C1B0, 0x1E0 + .4byte 0x8047FF88 + .4byte 0 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8047FFA0 + .4byte 0x8055A580 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8047FFA0 + .4byte 0x8055A588 + .4byte 0x8047FFA0 + .4byte 0x8055A590 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8047FFB8 + .4byte 0 + .4byte 0x8047FFD0 + .4byte 0 + .4byte 0x8047FFD0 + .4byte 0 + .4byte 0x8047FFF0 + .4byte 0 + .4byte 0x8047FFA0 + .4byte 0x8055A598 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8047FFA0 + .4byte 0x80480010 + .4byte 0x8047FFA0 + .4byte 0x8048001C + .4byte 0x8047FFA0 + .4byte 0x80480028 + .4byte 0x8047FFA0 + .4byte 0x8055A5A0 + .4byte 0x8047FFA0 + .4byte 0x8055A5A8 + .4byte 0x8047FFA0 + .4byte 0x80480034 + .4byte 0x80480040 + .4byte 0 + .4byte 0x8047FFA0 + .4byte 0x80480058 + .4byte 0x80480064 + .4byte 0 + .4byte 0x8048007C + .4byte 0 + .4byte 0x80480098 + .4byte 0 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 + .4byte 0x8055A578 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248772 $$248772: - .incbin "baserom.dol", 0x496950, 0x8 + .asciz "TopL" + .balign 4 .global $$248774 $$248774: - .incbin "baserom.dol", 0x496958, 0x8 + .4byte 0 + .4byte 0 .global $$248776 $$248776: - .incbin "baserom.dol", 0x496960, 0x8 + .asciz "TopL2x2" .global $$248777 $$248777: - .incbin "baserom.dol", 0x496968, 0x8 + .asciz "TopL1x1" .global $$248778 $$248778: - .incbin "baserom.dol", 0x496970, 0x8 + .asciz "TopL3x3" .global $$248782 $$248782: - .incbin "baserom.dol", 0x496978, 0x8 + .asciz "TopL4x4" .global $$248786 $$248786: - .incbin "baserom.dol", 0x496980, 0x8 + .asciz "TopL1x3" .global $$248787 $$248787: - .incbin "baserom.dol", 0x496988, 0x8 + .asciz "TopL3x1" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2 T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: - .incbin "baserom.dol", 0x49D238, 0x8 + .4byte 0x8055A570 + .4byte 0 diff --git a/asm/src/Boss.s b/asm/src/Boss.s index b80b2552..f4461379 100644 --- a/asm/src/Boss.s +++ b/asm/src/Boss.s @@ -4189,42 +4189,51 @@ stateChanger__Q43scn4step4boss4BossFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1: - .incbin "baserom.dol", 0x4604C8, 0xC + .4byte 0 + .4byte 0 + .4byte 0x8022C084 ;# ptr .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x4604D4, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x4604F8, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x460504, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x460528, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x460534, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x460558, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$269815 $$269815: - .incbin "baserom.dol", 0x49ADD0, 0x4 + .4byte 0 .global $$269816 $$269816: - .incbin "baserom.dol", 0x49ADD4, 0x4 + .4byte 0x3F800000 .global $$269817 $$269817: - .incbin "baserom.dol", 0x49ADD8, 0x4 + .4byte 0x41800000 .global $$269818 $$269818: - .incbin "baserom.dol", 0x49ADDC, 0x4 + .4byte 0x40000000 .global $$269819 $$269819: - .incbin "baserom.dol", 0x49ADE0, 0x4 + .4byte 0x3FA00000 .global $$269820 $$269820: - .incbin "baserom.dol", 0x49ADE4, 0x4 + .4byte 0x40200000 diff --git a/asm/src/BossDemoCtrl.s b/asm/src/BossDemoCtrl.s index 033d694e..b383c5b2 100644 --- a/asm/src/BossDemoCtrl.s +++ b/asm/src/BossDemoCtrl.s @@ -67,4 +67,5 @@ setSignal__Q43scn4step4hero12BossDemoCtrlFQ43scn4step4hero18BossDemoSignalKind: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248846 $$248846: - .incbin "baserom.dol", 0x49D650, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/BossPanel.s b/asm/src/BossPanel.s index 4d8680a8..ede81a5c 100644 --- a/asm/src/BossPanel.s +++ b/asm/src/BossPanel.s @@ -1423,212 +1423,337 @@ __dt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$ .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257129 $$257129: - .incbin "baserom.dol", 0x48B200, 0xC + .asciz "Guard%dN" + .balign 4 .global $$257130 $$257130: - .incbin "baserom.dol", 0x48B20C, 0xC + .asciz "Guard%dMaN" + .balign 4 .global $$257147 $$257147: - .incbin "baserom.dol", 0x48B218, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80402CD4 .global $$257172 $$257172: - .incbin "baserom.dol", 0x48B224, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$257173 $$257173: - .incbin "baserom.dol", 0x48B234, 0xC + .asciz "BossPanel" + .balign 4 .global $$257174 $$257174: - .incbin "baserom.dol", 0x48B240, 0x10 + .asciz "BossPanelGuard" + .balign 4 .global $$257177 $$257177: - .incbin "baserom.dol", 0x48B250, 0x14 + .asciz "BossPanelGuardParts" .global $$257179 $$257179: - .incbin "baserom.dol", 0x48B264, 0xC + .asciz "LifeBarEx" + .balign 4 .global $$257291 $$257291: - .incbin "baserom.dol", 0x48B270, 0x10 + .asciz "TransformWait" + .balign 4 .global $$257296 $$257296: - .incbin "baserom.dol", 0x48B280, 0xC + .asciz "Transform" + .balign 4 .global $$257322 $$257322: - .incbin "baserom.dol", 0x48B28C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803A6380 .global $$257433 $$257433: - .incbin "baserom.dol", 0x48B298, 0xC + .asciz "PartsExN" + .balign 4 .global $$257434 $$257434: - .incbin "baserom.dol", 0x48B2A4, 0xC + .asciz "PartsMaN" + .balign 4 .global $$257435 $$257435: - .incbin "baserom.dol", 0x48B2B0, 0xC + .asciz "PartsMaExN" + .balign 4 .global $$257436 $$257436: - .incbin "baserom.dol", 0x48B2BC, 0xC + .asciz "Parts%sN" + .balign 4 .global $$257438 $$257438: - .incbin "baserom.dol", 0x48B2C8, 0xC + .asciz "Center%sN" + .balign 4 .global $$257439 $$257439: - .incbin "baserom.dol", 0x48B2D4, 0xC + .asciz "Right%sN" + .balign 4 .global $$257458 $$257458: - .incbin "baserom.dol", 0x48B2E0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803A6414 .global $$257542 $$257542: - .incbin "baserom.dol", 0x48B2EC, 0xC + .asciz "CharaWhispy" .global $$257543 $$257543: - .incbin "baserom.dol", 0x48B2F8, 0x10 + .asciz "CharaGigantEdge" .global $$257544 $$257544: - .incbin "baserom.dol", 0x48B308, 0x14 + .asciz "CharaExGigantEdge" + .balign 4 .global $$257545 $$257545: - .incbin "baserom.dol", 0x48B31C, 0x14 + .asciz "CharaWaterGalboros" + .balign 4 .global $$257546 $$257546: - .incbin "baserom.dol", 0x48B330, 0x18 + .asciz "CharaExWaterGalboros" + .balign 4 .global $$257547 $$257547: - .incbin "baserom.dol", 0x48B348, 0x10 + .asciz "CharaKingsDoo" + .balign 4 .global $$257548 $$257548: - .incbin "baserom.dol", 0x48B358, 0x10 + .asciz "CharaExKingsDoo" .global $$257549 $$257549: - .incbin "baserom.dol", 0x48B368, 0x10 + .asciz "CharaZankibble" + .balign 4 .global $$257550 $$257550: - .incbin "baserom.dol", 0x48B378, 0x14 + .asciz "CharaExZankibble" + .balign 4 .global $$257551 $$257551: - .incbin "baserom.dol", 0x48B38C, 0x10 + .asciz "CharaBonkers" + .balign 4 .global $$257552 $$257552: - .incbin "baserom.dol", 0x48B39C, 0x10 + .asciz "CharaExBonkers" + .balign 4 .global $$257553 $$257553: - .incbin "baserom.dol", 0x48B3AC, 0xC + .asciz "CharaDobior" .global $$257554 $$257554: - .incbin "baserom.dol", 0x48B3B8, 0x10 + .asciz "CharaExDobior" + .balign 4 .global $$257555 $$257555: - .incbin "baserom.dol", 0x48B3C8, 0x10 + .asciz "CharaMoundeath" + .balign 4 .global $$257556 $$257556: - .incbin "baserom.dol", 0x48B3D8, 0x14 + .asciz "CharaExMoundeath" + .balign 4 .global $$257557 $$257557: - .incbin "baserom.dol", 0x48B3EC, 0x10 + .asciz "CharaSPBonkers" + .balign 4 .global $$257558 $$257558: - .incbin "baserom.dol", 0x48B3FC, 0x14 + .asciz "CharaExSPBonkers" + .balign 4 .global $$257559 $$257559: - .incbin "baserom.dol", 0x48B410, 0x14 + .asciz "CharaMahoroaBattle1" .global $$257560 $$257560: - .incbin "baserom.dol", 0x48B424, 0x1C + .asciz "CharaKingsDoo_GigantEdge" + .balign 4 .global $$257561 $$257561: - .incbin "baserom.dol", 0x48B440, 0x20 + .asciz "CharaExKingsDoo_ExGigantEdge" + .balign 4 .global $$257562 $$257562: - .incbin "baserom.dol", 0x48B460, 0x1C + .asciz "CharaZankibble_GigantEdge" + .balign 4 .global $$257563 $$257563: - .incbin "baserom.dol", 0x48B47C, 0x20 + .asciz "CharaExZankibble_ExGigantEdge" + .balign 4 .global $$257564 $$257564: - .incbin "baserom.dol", 0x48B49C, 0x1C + .asciz "CharaZankibble_Moundeath" + .balign 4 .global $$257565 $$257565: - .incbin "baserom.dol", 0x48B4B8, 0x20 + .asciz "CharaExZankibble_ExMoundeath" + .balign 4 .global $$257566 $$257566: - .incbin "baserom.dol", 0x48B4D8, 0x18 + .asciz "CharaKingsDoo_Moundeath" .global $$257567 $$257567: - .incbin "baserom.dol", 0x48B4F0, 0x1C + .asciz "CharaExKingsDoo_ExMoundeath" .global $$257568 $$257568: - .incbin "baserom.dol", 0x48B50C, 0x1C + .asciz "CharaSPBonkers_Moundeath" + .balign 4 .global $$257569 $$257569: - .incbin "baserom.dol", 0x48B528, 0x20 + .asciz "CharaExSPBonkers_ExMoundeath" + .balign 4 .global $$257570 $$257570: - .incbin "baserom.dol", 0x48B548, 0x1C + .asciz "CharaExKingsDoo_ExBonkers" + .balign 4 .global $$257571 $$257571: - .incbin "baserom.dol", 0x48B564, 0x20 + .asciz "CharaExWaterGalboros_ExDobior" + .balign 4 .global $$257574 $$257574: - .incbin "baserom.dol", 0x48B584, 0x10 + .asciz "PanelLength01" + .balign 4 .global $$257575 $$257575: - .incbin "baserom.dol", 0x48B594, 0x10 + .asciz "PanelLength02" + .balign 4 .global $$257576 $$257576: - .incbin "baserom.dol", 0x48B5A4, 0xC + .asciz "PanelBase" + .balign 4 .global $$257578 $$257578: - .incbin "baserom.dol", 0x48B5B0, 0x90 + .4byte 0x803A6138 + .4byte 0x803A6140 + .4byte 0x803A6148 + .4byte 0x803A6150 + .4byte 0x803A6158 + .4byte 0x803A6160 + .4byte 0x803A6168 + .4byte 0x803A6170 + .4byte 0x803A6178 + .4byte 0x803A6180 + .4byte 0x803A6188 + .4byte 0x803A6190 + .4byte 0x803A6198 + .4byte 0x803A61A0 + .4byte 0x803A61A8 + .4byte 0x803A6224 + .4byte 0x803A61B0 + .4byte 0x803A61B8 + .4byte 0x803A61C0 + .4byte 0x803A6224 + .4byte 0x803A6224 + .4byte 0x803A6224 + .4byte 0x803A6224 + .4byte 0x803A61C8 + .4byte 0x803A61D0 + .4byte 0x803A61D8 + .4byte 0x803A61E0 + .4byte 0x803A61E8 + .4byte 0x803A61F0 + .4byte 0x803A61F8 + .4byte 0x803A6200 + .4byte 0x803A6208 + .4byte 0x803A6210 + .4byte 0x803A6218 + .4byte 0x803A6220 + .4byte 0 .global __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail41mem_fn_1$$0v$$4Q43scn4step4info9BossPanel$$4Ul$$1$$4Q33std3tr1157tuple$$0PQ43scn4step4info9BossPanel$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail41mem_fn_1$$0v$$4Q43scn4step4info9BossPanel$$4Ul$$1$$4Q33std3tr1157tuple$$0PQ43scn4step4info9BossPanel$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48B640, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803A691C + .4byte 0x803A6728 + .4byte 0x803A6768 + .4byte 0x803A6784 .global __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48B658, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x803A6918 + .4byte 0x803A6788 + .4byte 0x803A67C8 + .4byte 0x803A67E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1150tuple$$0PQ23snd11SERequestor$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1150tuple$$0PQ23snd11SERequestor$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48B688, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x803A6914 + .4byte 0x803A67E8 + .4byte 0x803A6828 + .4byte 0x803A6844 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Failed assertion texSRTIdx < mGXMemNum.texSRT" + .balign 4 + .asciz "material.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257131 $$257131: - .incbin "baserom.dol", 0x497878, 0x4 + .4byte 0 .global $$257176 $$257176: - .incbin "baserom.dol", 0x49787C, 0x8 + .asciz "TopN" + .balign 4 .global $$257178 $$257178: - .incbin "baserom.dol", 0x497884, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 .global $$257180 $$257180: - .incbin "baserom.dol", 0x497890, 0x8 + .asciz "LifeBar" .global $$257278 $$257278: - .incbin "baserom.dol", 0x497898, 0x8 + .asciz "Appear" + .balign 4 .global $$257290 $$257290: - .incbin "baserom.dol", 0x4978A0, 0x8 + .asciz "Damage" + .balign 4 .global $$257488 $$257488: - .incbin "baserom.dol", 0x4978A8, 0x8 + .asciz "Dead" + .balign 4 .global $$257572 $$257572: - .incbin "baserom.dol", 0x4978B0, 0x8 + .asciz "0B0B0B" + .balign 4 .global $$257573 $$257573: - .incbin "baserom.dol", 0x4978B8, 0x8 + .asciz "Name" + .balign 4 .global $$257588 $$257588: - .incbin "baserom.dol", 0x4978C0, 0x8 + .asciz "Start" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257175 $$257175: - .incbin "baserom.dol", 0x49E3D0, 0x4 + .4byte 0 .global $$257277 $$257277: - .incbin "baserom.dol", 0x49E3D4, 0x4 + .4byte 0x3F800000 .global $$257623 $$257623: - .incbin "baserom.dol", 0x49E3D8, 0x4 + .4byte 0x3C03126F .global $$257641 $$257641: - .incbin "baserom.dol", 0x49E3DC, 0x4 + .4byte 0x3B83126F diff --git a/asm/src/BrainAttack.s b/asm/src/BrainAttack.s index 5f456e37..86f933a9 100644 --- a/asm/src/BrainAttack.s +++ b/asm/src/BrainAttack.s @@ -826,51 +826,119 @@ __dt__Q53scn4step5enemy6whippy11BrainAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471178, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A2700 ;# ptr + .4byte 0x802A26E0 ;# ptr .global __vt__Q53scn4step5enemy5cappy11BrainAttack __vt__Q53scn4step5enemy5cappy11BrainAttack: - .incbin "baserom.dol", 0x471188, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A26FC ;# ptr + .4byte 0x802A2444 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802A24C0 ;# ptr + .4byte 0x802A266C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4725B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802AF4D8 ;# ptr + .4byte 0x802AF4B8 ;# ptr .global __vt__Q53scn4step5enemy4elec11BrainAttack __vt__Q53scn4step5enemy4elec11BrainAttack: - .incbin "baserom.dol", 0x4725C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AF4D4 ;# ptr + .4byte 0x802AF430 ;# ptr + .4byte 0x802AF4B4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11BrainAttack __vt__Q53scn4step5enemy6flamer11BrainAttack: - .incbin "baserom.dol", 0x472B18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B1DC8 ;# ptr + .4byte 0x802B1BFC ;# ptr + .4byte 0x802B1CB0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4733A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B6AA4 ;# ptr + .4byte 0x802B6A84 ;# ptr .global __vt__Q53scn4step5enemy7gigatzo11BrainAttack __vt__Q53scn4step5enemy7gigatzo11BrainAttack: - .incbin "baserom.dol", 0x4733B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B6AA0 ;# ptr + .4byte 0x802B6A00 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead11BrainAttack __vt__Q53scn4step5enemy7hothead11BrainAttack: - .incbin "baserom.dol", 0x473930, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BA25C ;# ptr + .4byte 0x802BA13C ;# ptr + .4byte 0x802BA1F0 ;# ptr + .4byte 0x802BA1F4 ;# ptr + .4byte 0x802BA1F8 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474F30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C34E0 ;# ptr + .4byte 0x802C34C0 ;# ptr .global __vt__Q53scn4step5enemy6leafan11BrainAttack __vt__Q53scn4step5enemy6leafan11BrainAttack: - .incbin "baserom.dol", 0x474F40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C34DC ;# ptr + .4byte 0x802C3438 ;# ptr + .4byte 0x802C34BC ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11BrainAttack __vt__Q53scn4step5enemy10watergalbo11BrainAttack: - .incbin "baserom.dol", 0x47A958, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F0130 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x802F009C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11BrainAttack __vt__Q53scn4step5enemy6whippy11BrainAttack: - .incbin "baserom.dol", 0x47AB10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F0778 ;# ptr + .4byte 0x802F0774 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainAttackStraight.s b/asm/src/BrainAttackStraight.s index b5f2a7bb..0ad60e6c 100644 --- a/asm/src/BrainAttackStraight.s +++ b/asm/src/BrainAttackStraight.s @@ -224,21 +224,31 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4753C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C5D18 ;# ptr + .4byte 0x802C5CF8 ;# ptr .global __vt__Q53scn4step5enemy8needlous19BrainAttackStraight __vt__Q53scn4step5enemy8needlous19BrainAttackStraight: - .incbin "baserom.dol", 0x4753D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C5D14 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x802C5A80 ;# ptr + .4byte 0x802C5B50 ;# ptr + .4byte 0x802C5B54 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256259 $$256259: - .incbin "baserom.dol", 0x49C840, 0x4 + .4byte 0xBE99999A .global $$256260 $$256260: - .incbin "baserom.dol", 0x49C844, 0x4 + .4byte 0 .global $$256261 $$256261: - .incbin "baserom.dol", 0x49C848, 0x4 + .4byte 0x3E99999A .global $$256262 $$256262: - .incbin "baserom.dol", 0x49C84C, 0x4 + .4byte 0x3E8F5C29 diff --git a/asm/src/BrainBase.s b/asm/src/BrainBase.s index 0e50cb5c..345b72ce 100644 --- a/asm/src/BrainBase.s +++ b/asm/src/BrainBase.s @@ -55,4 +55,11 @@ lbl_8027EE78: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9BrainBase __vt__Q43scn4step5enemy9BrainBase: - .incbin "baserom.dol", 0x46C640, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8027EE38 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainBound.s b/asm/src/BrainBound.s index 833ffc8d..253f22eb 100644 --- a/asm/src/BrainBound.s +++ b/asm/src/BrainBound.s @@ -77,7 +77,17 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479368, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E78C0 ;# ptr + .4byte 0x802E78A0 ;# ptr .global __vt__Q53scn4step5enemy10stareffect10BrainBound __vt__Q53scn4step5enemy10stareffect10BrainBound: - .incbin "baserom.dol", 0x479378, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E78BC ;# ptr + .4byte 0x802E781C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainChase.s b/asm/src/BrainChase.s index 1ada7162..8b365add 100644 --- a/asm/src/BrainChase.s +++ b/asm/src/BrainChase.s @@ -619,33 +619,77 @@ __dt__Q53scn4step5enemy5sheld10BrainChaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper10BrainChase __vt__Q53scn4step5enemy7blipper10BrainChase: - .incbin "baserom.dol", 0x46FD10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80298B50 ;# ptr + .4byte 0x80298A68 ;# ptr + .4byte 0x80298B4C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10BrainChase __vt__Q53scn4step5enemy6degout10BrainChase: - .incbin "baserom.dol", 0x471F88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AD0EC ;# ptr + .4byte 0x802ACFF4 ;# ptr + .4byte 0x802AD070 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10BrainChase __vt__Q53scn4step5enemy7mumbies10BrainChase: - .incbin "baserom.dol", 0x4751D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C4DB0 ;# ptr + .4byte 0x802C4D28 ;# ptr + .4byte 0x802C4DAC ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477438, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D96FC ;# ptr + .4byte 0x802D969C ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477448, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D96F8 ;# ptr + .4byte 0x802D96B8 ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477458, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D96F4 ;# ptr + .4byte 0x802D96D4 ;# ptr .global __vt__Q53scn4step5enemy6scarfy10BrainChase __vt__Q53scn4step5enemy6scarfy10BrainChase: - .incbin "baserom.dol", 0x477468, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D96F0 ;# ptr + .4byte 0x802D94DC ;# ptr + .4byte 0x802D9558 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld10BrainChase __vt__Q53scn4step5enemy5sheld10BrainChase: - .incbin "baserom.dol", 0x477AA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DCA00 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802DC878 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainCreditFallToGoodbye.s b/asm/src/BrainCreditFallToGoodbye.s index 0ee42cac..d9ed6ab5 100644 --- a/asm/src/BrainCreditFallToGoodbye.s +++ b/asm/src/BrainCreditFallToGoodbye.s @@ -112,7 +112,17 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476C60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D3764 ;# ptr + .4byte 0x802D3744 ;# ptr .global __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye: - .incbin "baserom.dol", 0x476C70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D3760 ;# ptr + .4byte 0x802D364C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainCreditPraise.s b/asm/src/BrainCreditPraise.s index 8ca5ab32..06d4802d 100644 --- a/asm/src/BrainCreditPraise.s +++ b/asm/src/BrainCreditPraise.s @@ -224,17 +224,41 @@ __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EF98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802910C8 ;# ptr + .4byte 0x80291050 ;# ptr .global __vt__Q53scn4step5enemy6common17BrainCreditPraise __vt__Q53scn4step5enemy6common17BrainCreditPraise: - .incbin "baserom.dol", 0x46EFA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029106C ;# ptr + .4byte 0x80290FCC ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: - .incbin "baserom.dol", 0x470280, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029CC08 ;# ptr + .4byte 0x8029CB7C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky17BrainCreditPraise __vt__Q53scn4step5enemy6sparky17BrainCreditPraise: - .incbin "baserom.dol", 0x4790F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E6CB4 ;# ptr + .4byte 0x802E6C28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainCreditWalkToPraise.s b/asm/src/BrainCreditWalkToPraise.s index 901e49b7..16a9ac30 100644 --- a/asm/src/BrainCreditWalkToPraise.s +++ b/asm/src/BrainCreditWalkToPraise.s @@ -197,17 +197,41 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise: - .incbin "baserom.dol", 0x470D30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A0C90 ;# ptr + .4byte 0x802A0C0C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise: - .incbin "baserom.dol", 0x4717D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A6058 ;# ptr + .4byte 0x802A5FD4 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479C18, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ED2C0 ;# ptr + .4byte 0x802ED2A0 ;# ptr .global __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise: - .incbin "baserom.dol", 0x479C28, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ED2BC ;# ptr + .4byte 0x802ED21C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainCtrl.s b/asm/src/BrainCtrl.s index 174a3f35..d154c0fa 100644 --- a/asm/src/BrainCtrl.s +++ b/asm/src/BrainCtrl.s @@ -277,4 +277,6 @@ onLanding__Q43scn4step5enemy9BrainCtrlFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253447 $$253447: - .incbin "baserom.dol", 0x46C660, 0x18 + .asciz "Scn.Step.Enemy.%s" + .balign 4 + .4byte 0 diff --git a/asm/src/BrainDash.s b/asm/src/BrainDash.s index 863912d8..74a002d9 100644 --- a/asm/src/BrainDash.s +++ b/asm/src/BrainDash.s @@ -124,4 +124,11 @@ __dt__Q53scn4step5enemy5sheld9BrainDashFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9BrainDash __vt__Q53scn4step5enemy5sheld9BrainDash: - .incbin "baserom.dol", 0x477AC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DCB88 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802DCA40 ;# ptr + .4byte 0x802DCB84 ;# ptr + .4byte 0 diff --git a/asm/src/BrainDive.s b/asm/src/BrainDive.s index b18296e7..0a71bc34 100644 --- a/asm/src/BrainDive.s +++ b/asm/src/BrainDive.s @@ -206,15 +206,29 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateB .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471AB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A6F14 ;# ptr + .4byte 0x802A6ED4 ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471AC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A6F10 ;# ptr + .4byte 0x802A6EF0 ;# ptr .global __vt__Q53scn4step5enemy4como9BrainDive __vt__Q53scn4step5enemy4como9BrainDive: - .incbin "baserom.dol", 0x471AD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A6F0C ;# ptr + .4byte 0x802A6CC4 ;# ptr + .4byte 0x802A6DE8 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255290 $$255290: - .incbin "baserom.dol", 0x49C0A0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/BrainEscape.s b/asm/src/BrainEscape.s index ebec5907..c7a65f46 100644 --- a/asm/src/BrainEscape.s +++ b/asm/src/BrainEscape.s @@ -63,4 +63,11 @@ __dt__Q53scn4step5enemy5sheld11BrainEscapeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11BrainEscape __vt__Q53scn4step5enemy5sheld11BrainEscape: - .incbin "baserom.dol", 0x477AE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DCC4C ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802DCBC8 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFactory.s b/asm/src/BrainFactory.s index d58cb7ae..22e9099f 100644 --- a/asm/src/BrainFactory.s +++ b/asm/src/BrainFactory.s @@ -2203,384 +2203,1339 @@ ScriptPath__Q43scn4step5enemy12BrainFactoryFRQ43scn4step5enemy5Enemy: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2 T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2: - .incbin "baserom.dol", 0x413DD8, 0x6A8 + .4byte 0x80470C1C + .4byte 0x80470C34 + .4byte 0x80470C54 + .4byte 0x80470C54 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C90 + .4byte 0x80470CA8 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470CC0 + .4byte 0x80470C74 + .4byte 0x80470CDC + .4byte 0x80470CFC + .4byte 0x80470D18 + .4byte 0x80470D34 + .4byte 0x80470D4C + .4byte 0x80470D64 + .4byte 0x80470D7C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470D98 + .4byte 0x80470DC0 + .4byte 0x80470DE0 + .4byte 0x80470E04 + .4byte 0x80470E1C + .4byte 0x80470E38 + .4byte 0x80470E50 + .4byte 0x80470C74 + .4byte 0x80470E68 + .4byte 0x80470C74 + .4byte 0x80470E80 + .4byte 0x80470C74 + .4byte 0x80470E98 + .4byte 0x80470EB4 + .4byte 0x80470ED0 + .4byte 0x80470EF0 + .4byte 0x80470F10 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470F2C + .4byte 0x80470F44 + .4byte 0x80470F5C + .4byte 0x80470F7C + .4byte 0x80470F98 + .4byte 0x80470F98 + .4byte 0x80470F98 + .4byte 0x80470FB0 + .4byte 0x80470FCC + .4byte 0x80470FEC + .4byte 0x80470FCC + .4byte 0x8047100C + .4byte 0x80471028 + .4byte 0x80471040 + .4byte 0x8047105C + .4byte 0x80471078 + .4byte 0x80471094 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804710B4 + .4byte 0x804710D0 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804710E8 + .4byte 0x80471104 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471124 + .4byte 0x80471144 + .4byte 0x80471168 + .4byte 0x8047118C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804711B0 + .4byte 0x804711D4 + .4byte 0x804711F8 + .4byte 0x80470C74 + .4byte 0x8047121C + .4byte 0x8047121C + .4byte 0x80470C74 + .4byte 0x8047123C + .4byte 0x80471258 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471270 + .4byte 0x8047128C + .4byte 0x804712AC + .4byte 0x804712C4 + .4byte 0x804712DC + .4byte 0x804712F4 + .4byte 0x80471310 + .4byte 0x8047132C + .4byte 0x8047134C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471368 + .4byte 0x80471380 + .4byte 0x80471398 + .4byte 0x804713B0 + .4byte 0x804713C8 + .4byte 0x804713E0 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804713F8 + .4byte 0x804713F8 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471410 + .4byte 0x8047142C + .4byte 0x80471448 + .4byte 0x80471464 + .4byte 0x80471480 + .4byte 0x80471498 + .4byte 0x804714B0 + .4byte 0x804714C8 + .4byte 0x804714E8 + .4byte 0x80471500 + .4byte 0x80471518 + .4byte 0x80471040 + .4byte 0x80471124 + .4byte 0x804710E8 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80471530 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x8047154C + .4byte 0x80471564 + .4byte 0x80471584 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470D64 + .4byte 0x8047159C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471040 + .4byte 0x80471124 + .4byte 0x804710E8 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471104 + .4byte 0x80471144 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471368 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804715C0 + .4byte 0x80470C74 + .4byte 0x804715E0 + .4byte 0x80471600 + .4byte 0x80471620 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470D64 + .4byte 0x80470C74 + .4byte 0x80470C54 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C54 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C1C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471644 + .4byte 0x80471644 + .4byte 0x80471644 + .4byte 0x80471664 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C54 + .4byte 0x80470C54 + .4byte 0x80471688 + .4byte 0x80470C74 + .4byte 0x804716A0 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804716C0 + .4byte 0x804716E0 + .4byte 0x80471704 + .4byte 0x80471724 + .4byte 0x80471744 + .4byte 0x80471768 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x8047178C + .4byte 0x804717B0 + .4byte 0x804717D4 + .4byte 0x804717F4 + .4byte 0x80471818 + .4byte 0x80471838 + .4byte 0x80471854 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471878 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80471898 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804718B8 + .4byte 0x804718D8 + .4byte 0x804718F4 + .4byte 0x80471910 + .4byte 0x8047192C + .4byte 0x8047194C + .4byte 0x80471968 + .4byte 0x8047198C + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804719B0 + .4byte 0x804719CC + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x80470C74 + .4byte 0x804719E8 + .4byte 0x80471A10 + .4byte 0x80471A38 + .4byte 0x80471A60 + .4byte 0x80470C74 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257656 $$257656: - .incbin "baserom.dol", 0x46C678, 0x6A4 + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F16C ;# ptr + .4byte 0x8027F1A8 ;# ptr + .4byte 0x8027F130 ;# ptr + .4byte 0x8027F1E4 ;# ptr + .4byte 0x8027F220 ;# ptr + .4byte 0x8027F25C ;# ptr + .4byte 0x8027F298 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FEBC ;# ptr + .4byte 0x8027FFAC ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FC64 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FCA0 ;# ptr + .4byte 0x8027F8E0 ;# ptr + .4byte 0x8027F91C ;# ptr + .4byte 0x8027FD90 ;# ptr + .4byte 0x8027FDCC ;# ptr + .4byte 0x8027F958 ;# ptr + .4byte 0x8027F868 ;# ptr + .4byte 0x8027F868 ;# ptr + .4byte 0x8027FA84 ;# ptr + .4byte 0x8027FAC0 ;# ptr + .4byte 0x8027FAFC ;# ptr + .4byte 0x8027F46C ;# ptr + .4byte 0x8027F46C ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F4A8 ;# ptr + .4byte 0x8027F82C ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F82C ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FD18 ;# ptr + .4byte 0x8027FD18 ;# ptr + .4byte 0x8027FD54 ;# ptr + .4byte 0x8027FD54 ;# ptr + .4byte 0x8027FCDC ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F994 ;# ptr + .4byte 0x8027F9D0 ;# ptr + .4byte 0x8027FB38 ;# ptr + .4byte 0x8027F73C ;# ptr + .4byte 0x8027F55C ;# ptr + .4byte 0x8027F55C ;# ptr + .4byte 0x8027F55C ;# ptr + .4byte 0x8027FBEC ;# ptr + .4byte 0x8027FBEC ;# ptr + .4byte 0x8027FBEC ;# ptr + .4byte 0x8027FBEC ;# ptr + .4byte 0x8027FB74 ;# ptr + .4byte 0x8027FBB0 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027FA0C ;# ptr + .4byte 0x8027FA48 ;# ptr + .4byte 0x8027FA48 ;# ptr + .4byte 0x8027F520 ;# ptr + .4byte 0x8027F4E4 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FE80 ;# ptr + .4byte 0x8027F778 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027F32C ;# ptr + .4byte 0x8027F310 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027FEF8 ;# ptr + .4byte 0x8027FF34 ;# ptr + .4byte 0x8027F3A0 ;# ptr + .4byte 0x8027F364 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F6C4 ;# ptr + .4byte 0x8027F6C4 ;# ptr + .4byte 0x8027F700 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F598 ;# ptr + .4byte 0x8027F598 ;# ptr + .4byte 0x8027FF70 ;# ptr + .4byte 0x8027F5D4 ;# ptr + .4byte 0x8027F610 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F64C ;# ptr + .4byte 0x8027F688 ;# ptr + .4byte 0x8027FFE8 ;# ptr + .4byte 0x80280024 ;# ptr + .4byte 0x80280060 ;# ptr + .4byte 0x8028009C ;# ptr + .4byte 0x802800D8 ;# ptr + .4byte 0x80280114 ;# ptr + .4byte 0x80280150 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8028018C ;# ptr + .4byte 0x802806F0 ;# ptr + .4byte 0x8028072C ;# ptr + .4byte 0x80280768 ;# ptr + .4byte 0x802801C8 ;# ptr + .4byte 0x80280204 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280240 ;# ptr + .4byte 0x8028027C ;# ptr + .4byte 0x802802B8 ;# ptr + .4byte 0x802802F4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280330 ;# ptr + .4byte 0x80280330 ;# ptr + .4byte 0x8028036C ;# ptr + .4byte 0x802803A8 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x802803E4 ;# ptr + .4byte 0x80280420 ;# ptr + .4byte 0x8028045C ;# ptr + .4byte 0x802807A4 ;# ptr + .4byte 0x802807A4 ;# ptr + .4byte 0x802807A4 ;# ptr + .4byte 0x802807E0 ;# ptr + .4byte 0x8028081C ;# ptr + .4byte 0x80280858 ;# ptr + .4byte 0x80280858 ;# ptr + .4byte 0x80280858 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027FC28 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280894 ;# ptr + .4byte 0x802808D0 ;# ptr + .4byte 0x8028090C ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x802804D4 ;# ptr + .4byte 0x802804D4 ;# ptr + .4byte 0x802804D4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280510 ;# ptr + .4byte 0x80280510 ;# ptr + .4byte 0x80280510 ;# ptr + .4byte 0x80280510 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FE08 ;# ptr + .4byte 0x8027FE44 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280588 ;# ptr + .4byte 0x80280588 ;# ptr + .4byte 0x802805C4 ;# ptr + .4byte 0x802805C4 ;# ptr + .4byte 0x8028054C ;# ptr + .4byte 0x80280600 ;# ptr + .4byte 0x80280600 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280240 ;# ptr + .4byte 0x80280330 ;# ptr + .4byte 0x80280330 ;# ptr + .4byte 0x8028036C ;# ptr + .4byte 0x802803A8 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027F434 ;# ptr + .4byte 0x8027F418 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8028018C ;# ptr + .4byte 0x8027F450 ;# ptr + .4byte 0x8027F348 ;# ptr + .4byte 0x8027F3DC ;# ptr + .4byte 0x80280678 ;# ptr + .4byte 0x8028063C ;# ptr + .4byte 0x8027FCA0 ;# ptr + .4byte 0x8027FCA0 ;# ptr + .4byte 0x8027FCA0 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x802806B4 ;# ptr + .4byte 0x8027F8A4 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027FE08 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8027F1A8 ;# ptr + .4byte 0x8028063C ;# ptr + .4byte 0x8028063C ;# ptr + .4byte 0x8027F1E4 ;# ptr + .4byte 0x8027F1E4 ;# ptr + .4byte 0x80280240 ;# ptr + .4byte 0x8027F1A8 ;# ptr + .4byte 0x8027FF70 ;# ptr + .4byte 0x8027F4A8 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x8028063C ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x80280498 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x8027F2D4 ;# ptr + .4byte 0x8027F7B4 ;# ptr + .4byte 0x8027F7F0 ;# ptr + .4byte 0x80280984 ;# ptr + .4byte 0x802809C0 ;# ptr + .4byte 0x802809FC ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280948 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280A38 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280A74 ;# ptr + .4byte 0x80280AB0 ;# ptr + .4byte 0x80280AEC ;# ptr + .4byte 0x80280B28 ;# ptr + .4byte 0x80280B64 ;# ptr + .4byte 0x80280BA0 ;# ptr + .4byte 0x80280BDC ;# ptr + .4byte 0x80280C18 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280C54 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280C90 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280F60 ;# ptr + .4byte 0x80280CCC ;# ptr + .4byte 0x80280D08 ;# ptr + .4byte 0x80280D44 ;# ptr + .4byte 0x80280D80 ;# ptr + .4byte 0x80280DBC ;# ptr + .4byte 0x80280DF8 ;# ptr + .4byte 0x80280E34 ;# ptr + .4byte 0x80280E70 ;# ptr + .4byte 0x80280EAC ;# ptr + .4byte 0x80280EE8 ;# ptr + .4byte 0x80280F24 ;# ptr .global $$253027 $$253027: - .incbin "baserom.dol", 0x46CD1C, 0x18 + .asciz "Common.Brain.Wait.Exec" + .balign 4 .global $$253028 $$253028: - .incbin "baserom.dol", 0x46CD34, 0x20 + .asciz "Common.Brain.WalkStraight.Exec" + .balign 4 .global $$253029 $$253029: - .incbin "baserom.dol", 0x46CD54, 0x20 + .asciz "Common.Brain.WalkAround.Exec" + .balign 4 .global $$253030 $$253030: - .incbin "baserom.dol", 0x46CD74, 0x1C + .asciz "Common.Brain.DoNothing.Exec" .global $$253031 $$253031: - .incbin "baserom.dol", 0x46CD90, 0x18 + .asciz "Cappy.Brain.Attack.Exec" .global $$253032 $$253032: - .incbin "baserom.dol", 0x46CDA8, 0x18 + .asciz "Como.Brain.Dive.Exec" + .balign 4 .global $$253033 $$253033: - .incbin "baserom.dol", 0x46CDC0, 0x1C + .asciz "Whippy.Brain.Attack.Exec" + .balign 4 .global $$253034 $$253034: - .incbin "baserom.dol", 0x46CDDC, 0x20 + .asciz "BladeKnight.Brain.Attack.Exec" + .balign 4 .global $$253035 $$253035: - .incbin "baserom.dol", 0x46CDFC, 0x1C + .asciz "SirKibble.Brain.Attack.Exec" .global $$253036 $$253036: - .incbin "baserom.dol", 0x46CE18, 0x1C + .asciz "HotHead.Brain.Attack.Exec" + .balign 4 .global $$253037 $$253037: - .incbin "baserom.dol", 0x46CE34, 0x18 + .asciz "Bouncy.Brain.Wait.Exec" + .balign 4 .global $$253038 $$253038: - .incbin "baserom.dol", 0x46CE4C, 0x18 + .asciz "Bouncy.Brain.Move.Exec" + .balign 4 .global $$253039 $$253039: - .incbin "baserom.dol", 0x46CE64, 0x18 + .asciz "Shotzo.Brain.Fix.Exec" + .balign 4 .global $$253040 $$253040: - .incbin "baserom.dol", 0x46CE7C, 0x1C + .asciz "Shotzo.Brain.Pursuit.Exec" + .balign 4 .global $$253041 $$253041: - .incbin "baserom.dol", 0x46CE98, 0x28 + .asciz "WaddleDoo.Brain.WalkStraight.Exec" + .balign 4 + .4byte 0 .global $$253042 $$253042: - .incbin "baserom.dol", 0x46CEC0, 0x20 + .asciz "WaddleDoo.Brain.WalkAround.Exec" .global $$253043 $$253043: - .incbin "baserom.dol", 0x46CEE0, 0x24 + .asciz "WaddleDoo.Brain.JumpOrAttack.Exec" + .balign 4 .global $$253044 $$253044: - .incbin "baserom.dol", 0x46CF04, 0x18 + .asciz "Leafan.Brain.Jump.Exec" + .balign 4 .global $$253045 $$253045: - .incbin "baserom.dol", 0x46CF1C, 0x1C + .asciz "Leafan.Brain.Attack.Exec" + .balign 4 .global $$253046 $$253046: - .incbin "baserom.dol", 0x46CF38, 0x18 + .asciz "Sparky.Brain.Wait.Exec" + .balign 4 .global $$253047 $$253047: - .incbin "baserom.dol", 0x46CF50, 0x18 + .asciz "Sparky.Brain.Move.Exec" + .balign 4 .global $$253048 $$253048: - .incbin "baserom.dol", 0x46CF68, 0x18 + .asciz "Nruff.Brain.Move.Exec" + .balign 4 .global $$253049 $$253049: - .incbin "baserom.dol", 0x46CF80, 0x18 + .asciz "Nruff.Brain.Run.Exec" + .balign 4 .global $$253050 $$253050: - .incbin "baserom.dol", 0x46CF98, 0x1C + .asciz "Flamer.Brain.MoveCWR.Exec" + .balign 4 .global $$253051 $$253051: - .incbin "baserom.dol", 0x46CFB4, 0x1C + .asciz "Flamer.Brain.MoveCCW.Exec" + .balign 4 .global $$253052 $$253052: - .incbin "baserom.dol", 0x46CFD0, 0x20 + .asciz "Flamer.Brain.MoveCWRAttack.Exec" .global $$253053 $$253053: - .incbin "baserom.dol", 0x46CFF0, 0x20 + .asciz "Flamer.Brain.MoveCCWAttack.Exec" .global $$253054 $$253054: - .incbin "baserom.dol", 0x46D010, 0x1C + .asciz "Flamer.Brain.Attack.Exec" + .balign 4 .global $$253055 $$253055: - .incbin "baserom.dol", 0x46D02C, 0x18 + .asciz "Rocky.Brain.Move.Exec" + .balign 4 .global $$253056 $$253056: - .incbin "baserom.dol", 0x46D044, 0x18 + .asciz "Rocky.Brain.Walk.Exec" + .balign 4 .global $$253057 $$253057: - .incbin "baserom.dol", 0x46D05C, 0x20 + .asciz "WaterGalbo.Brain.Attack.Exec" + .balign 4 .global $$253058 $$253058: - .incbin "baserom.dol", 0x46D07C, 0x1C + .asciz "Noddy.Brain.Walk.Exec" + .balign 4 + .4byte 0 .global $$253059 $$253059: - .incbin "baserom.dol", 0x46D098, 0x18 + .asciz "Cerulean.Brain.Fly.Exec" .global $$253060 $$253060: - .incbin "baserom.dol", 0x46D0B0, 0x1C + .asciz "Blipper.Brain.MoveUD.Exec" + .balign 4 .global $$253061 $$253061: - .incbin "baserom.dol", 0x46D0CC, 0x20 + .asciz "Blipper.Brain.MoveLRWall.Exec" + .balign 4 .global $$253062 $$253062: - .incbin "baserom.dol", 0x46D0EC, 0x20 + .asciz "Blipper.Brain.MoveUDWall.Exec" + .balign 4 .global $$253063 $$253063: - .incbin "baserom.dol", 0x46D10C, 0x1C + .asciz "Blipper.Brain.Chase.Exec" + .balign 4 .global $$253064 $$253064: - .incbin "baserom.dol", 0x46D128, 0x18 + .asciz "Blipper.Brain.Jump.Exec" .global $$253065 $$253065: - .incbin "baserom.dol", 0x46D140, 0x1C + .asciz "Gigatzo.Brain.Attack.Exec" + .balign 4 .global $$253066 $$253066: - .incbin "baserom.dol", 0x46D15C, 0x1C + .asciz "SisterBound.Brain.Wait.Exec" .global $$253067 $$253067: - .incbin "baserom.dol", 0x46D178, 0x1C + .asciz "SisterBound.Brain.Move.Exec" .global $$253068 $$253068: - .incbin "baserom.dol", 0x46D194, 0x20 + .asciz "SisterBound.Brain.Pursuit.Exec" + .balign 4 .global $$253069 $$253069: - .incbin "baserom.dol", 0x46D1B4, 0x1C + .asciz "Mumbies.Brain.Chase.Exec" + .balign 4 .global $$253070 $$253070: - .incbin "baserom.dol", 0x46D1D0, 0x18 + .asciz "Noddy.Brain.Wait.Exec" + .balign 4 .global $$253071 $$253071: - .incbin "baserom.dol", 0x46D1E8, 0x1C + .asciz "Gigatzo.Brain.Pursuit.Exec" + .balign 4 .global $$253072 $$253072: - .incbin "baserom.dol", 0x46D204, 0x20 + .asciz "Gigatzo.Brain.BackAttack.Exec" + .balign 4 .global $$253073 $$253073: - .incbin "baserom.dol", 0x46D224, 0x20 + .asciz "Gigatzo.Brain.AttackMore.Exec" + .balign 4 .global $$253074 $$253074: - .incbin "baserom.dol", 0x46D244, 0x24 + .asciz "Gigatzo.Brain.BackAttackMore.Exec" + .balign 4 .global $$253075 $$253075: - .incbin "baserom.dol", 0x46D268, 0x24 + .asciz "PoppyBroJr.Brain.WaitAttack.Exec" + .balign 4 .global $$253076 $$253076: - .incbin "baserom.dol", 0x46D28C, 0x24 + .asciz "PoppyBroJr.Brain.MoveAttack.Exec" + .balign 4 .global $$253077 $$253077: - .incbin "baserom.dol", 0x46D2B0, 0x24 + .asciz "KnuckleJoe.Brain.WalkStraight.Exec" + .balign 4 .global $$253078 $$253078: - .incbin "baserom.dol", 0x46D2D4, 0x24 + .asciz "KnuckleJoe.Brain.WalkAround.Exec" + .balign 4 .global $$253079 $$253079: - .incbin "baserom.dol", 0x46D2F8, 0x24 + .asciz "KnuckleJoe.Brain.WalkStepBack.Exec" + .balign 4 .global $$253080 $$253080: - .incbin "baserom.dol", 0x46D31C, 0x20 + .asciz "Kabu.Brain.MoveStraight.Exec" + .balign 4 .global $$253081 $$253081: - .incbin "baserom.dol", 0x46D33C, 0x1C + .asciz "Kabu.Brain.MoveAround.Exec" + .balign 4 .global $$253082 $$253082: - .incbin "baserom.dol", 0x46D358, 0x18 + .asciz "Kabu.Brain.Jump.Exec" + .balign 4 .global $$253083 $$253083: - .incbin "baserom.dol", 0x46D370, 0x1C + .asciz "Kabu.Brain.Teleport.Exec" + .balign 4 .global $$253084 $$253084: - .incbin "baserom.dol", 0x46D38C, 0x20 + .asciz "Kabu.Brain.TeleportRepeat.Exec" + .balign 4 .global $$253085 $$253085: - .incbin "baserom.dol", 0x46D3AC, 0x18 + .asciz "Foley.Brain.Wait.Exec" + .balign 4 .global $$253086 $$253086: - .incbin "baserom.dol", 0x46D3C4, 0x18 + .asciz "Foley.Brain.Move.Exec" + .balign 4 .global $$253087 $$253087: - .incbin "baserom.dol", 0x46D3DC, 0x18 + .asciz "Juckle.Brain.Fly.Exec" + .balign 4 .global $$253088 $$253088: - .incbin "baserom.dol", 0x46D3F4, 0x1C + .asciz "Juckle.Brain.Follow.Exec" + .balign 4 .global $$253089 $$253089: - .incbin "baserom.dol", 0x46D410, 0x1C + .asciz "Owgulf.Brain.FlyWait.Exec" + .balign 4 .global $$253090 $$253090: - .incbin "baserom.dol", 0x46D42C, 0x20 + .asciz "Owgulf.Brain.FlyStraight.Exec" + .balign 4 .global $$253091 $$253091: - .incbin "baserom.dol", 0x46D44C, 0x1C + .asciz "Owgulf.Brain.FlyAround.Exec" .global $$253092 $$253092: - .incbin "baserom.dol", 0x46D468, 0x18 + .asciz "Bowby.Brain.Fly.Exec" + .balign 4 .global $$253093 $$253093: - .incbin "baserom.dol", 0x46D480, 0x18 + .asciz "Sheld.Brain.Dash.Exec" + .balign 4 .global $$253094 $$253094: - .incbin "baserom.dol", 0x46D498, 0x18 + .asciz "Sheld.Brain.Chase.Exec" + .balign 4 .global $$253095 $$253095: - .incbin "baserom.dol", 0x46D4B0, 0x18 + .asciz "Sheld.Brain.Escape.Exec" .global $$253096 $$253096: - .incbin "baserom.dol", 0x46D4C8, 0x18 + .asciz "Chilly.Brain.Wait.Exec" + .balign 4 .global $$253097 $$253097: - .incbin "baserom.dol", 0x46D4E0, 0x18 + .asciz "Chilly.Brain.Move.Exec" + .balign 4 .global $$253098 $$253098: - .incbin "baserom.dol", 0x46D4F8, 0x18 + .asciz "Degout.Brain.Chase.Exec" .global $$253099 $$253099: - .incbin "baserom.dol", 0x46D510, 0x1C + .asciz "Tsukikage.Brain.Ground.Exec" .global $$253100 $$253100: - .incbin "baserom.dol", 0x46D52C, 0x1C + .asciz "Tsukikage.Brain.Smoke.Exec" + .balign 4 .global $$253101 $$253101: - .incbin "baserom.dol", 0x46D548, 0x1C + .asciz "Tsukikage.Brain.Wall.Exec" + .balign 4 .global $$253102 $$253102: - .incbin "baserom.dol", 0x46D564, 0x1C + .asciz "Lanzer.Brain.Wait.Exec" + .balign 4 + .4byte 0 .global $$253103 $$253103: - .incbin "baserom.dol", 0x46D580, 0x18 + .asciz "Lanzer.Brain.WaitL.Exec" .global $$253104 $$253104: - .incbin "baserom.dol", 0x46D598, 0x18 + .asciz "Lanzer.Brain.WaitR.Exec" .global $$253105 $$253105: - .incbin "baserom.dol", 0x46D5B0, 0x18 + .asciz "Lanzer.Brain.Walk.Exec" + .balign 4 .global $$253106 $$253106: - .incbin "baserom.dol", 0x46D5C8, 0x20 + .asciz "Lanzer.Brain.WalkAround.Exec" + .balign 4 .global $$253107 $$253107: - .incbin "baserom.dol", 0x46D5E8, 0x18 + .asciz "Gemra.Brain.Wait.Exec" + .balign 4 .global $$253108 $$253108: - .incbin "baserom.dol", 0x46D600, 0x18 + .asciz "Gemra.Brain.MoveUD.Exec" .global $$253109 $$253109: - .incbin "baserom.dol", 0x46D618, 0x18 + .asciz "Gemra.Brain.MoveLR.Exec" .global $$253110 $$253110: - .incbin "baserom.dol", 0x46D630, 0x1C + .asciz "BladeKnight.Brain.Walk.Exec" .global $$253111 $$253111: - .incbin "baserom.dol", 0x46D64C, 0x18 + .asciz "Sodory.Brain.Wait.Exec" + .balign 4 .global $$253112 $$253112: - .incbin "baserom.dol", 0x46D664, 0x20 + .asciz "Sodory.Brain.WalkAround.Exec" + .balign 4 .global $$253113 $$253113: - .incbin "baserom.dol", 0x46D684, 0x18 + .asciz "Sodory.Brain.Fly.Exec" + .balign 4 .global $$253114 $$253114: - .incbin "baserom.dol", 0x46D69C, 0x24 + .asciz "Shotzo.Brain.PursuitCeil.Exec" + .balign 4 + .4byte 0 .global $$253115 $$253115: - .incbin "baserom.dol", 0x46D6C0, 0x20 + .asciz "SirKibble.Brain.JumpAttack.Exec" .global $$253116 $$253116: - .incbin "baserom.dol", 0x46D6E0, 0x20 + .asciz "HotHead.Brain.AttackShot.Exec" + .balign 4 .global $$253117 $$253117: - .incbin "baserom.dol", 0x46D700, 0x20 + .asciz "HotHead.Brain.WalkAttack.Exec" + .balign 4 .global $$253118 $$253118: - .incbin "baserom.dol", 0x46D720, 0x24 + .asciz "HotHead.Brain.WalkAttackShot.Exec" + .balign 4 .global $$253119 $$253119: - .incbin "baserom.dol", 0x46D744, 0x20 + .asciz "Gigatzo.Brain.AttackAir.Exec" + .balign 4 .global $$253120 $$253120: - .incbin "baserom.dol", 0x46D764, 0x24 + .asciz "Gigatzo.Brain.AttackMoreAir.Exec" + .balign 4 .global $$253121 $$253121: - .incbin "baserom.dol", 0x46D788, 0x18 + .asciz "Como.Brain.Whispy.Exec" + .balign 4 .global $$253122 $$253122: - .incbin "baserom.dol", 0x46D7A0, 0x20 + .asciz "Scarfy.Brain.Whispy.Exec" + .balign 4 + .4byte 0 .global $$253123 $$253123: - .incbin "baserom.dol", 0x46D7C0, 0x20 + .asciz "DubiorJr.Brain.Zigzag.ExecFirst" .global $$253124 $$253124: - .incbin "baserom.dol", 0x46D7E0, 0x24 + .asciz "DubiorJr.Brain.Zigzag.ExecSecond" + .balign 4 .global $$253125 $$253125: - .incbin "baserom.dol", 0x46D804, 0x20 + .asciz "DubiorJr.Brain.Cross.ExecOver" + .balign 4 .global $$253126 $$253126: - .incbin "baserom.dol", 0x46D824, 0x20 + .asciz "DubiorJr.Brain.Cross.ExecUnder" + .balign 4 .global $$253127 $$253127: - .incbin "baserom.dol", 0x46D844, 0x24 + .asciz "DubiorJr.Brain.Straight.ExecOver" + .balign 4 .global $$253128 $$253128: - .incbin "baserom.dol", 0x46D868, 0x24 + .asciz "DubiorJr.Brain.Straight.ExecUnder" + .balign 4 .global $$253129 $$253129: - .incbin "baserom.dol", 0x46D88C, 0x24 + .asciz "WaddleDee.Brain.GrandLowper.Exec" + .balign 4 .global $$253130 $$253130: - .incbin "baserom.dol", 0x46D8B0, 0x24 + .asciz "BladeKnight.Brain.GrandLowper.Exec" + .balign 4 .global $$253131 $$253131: - .incbin "baserom.dol", 0x46D8D4, 0x20 + .asciz "Bouncy.Brain.GrandLowper.Exec" + .balign 4 .global $$253132 $$253132: - .incbin "baserom.dol", 0x46D8F4, 0x24 + .asciz "BroomHatter.Brain.GrandLowper.Exec" + .balign 4 .global $$253133 $$253133: - .incbin "baserom.dol", 0x46D918, 0x20 + .asciz "Nruff.Brain.GrandLowper.Exec" + .balign 4 .global $$253134 $$253134: - .incbin "baserom.dol", 0x46D938, 0x1C + .asciz "Kabu.Brain.GrandLowper.Exec" .global $$253135 $$253135: - .incbin "baserom.dol", 0x46D954, 0x24 + .asciz "Sheld.Brain.GrandLowper.Exec" + .balign 4 + .4byte 0 .global $$253136 $$253136: - .incbin "baserom.dol", 0x46D978, 0x20 + .asciz "ArmorDee.Brain.GrandLowper.Exec" .global $$253137 $$253137: - .incbin "baserom.dol", 0x46D998, 0x20 + .asciz "Blipper.Brain.FattyBuffer.Exec" + .balign 4 .global $$253138 $$253138: - .incbin "baserom.dol", 0x46D9B8, 0x20 + .asciz "BladeKnight.Brain.Mahoroa1.Exec" .global $$253139 $$253139: - .incbin "baserom.dol", 0x46D9D8, 0x1C + .asciz "Sodory.Brain.Mahoroa1.Exec" + .balign 4 .global $$253140 $$253140: - .incbin "baserom.dol", 0x46D9F4, 0x1C + .asciz "HotHead.Brain.Mahoroa1.Exec" .global $$253141 $$253141: - .incbin "baserom.dol", 0x46DA10, 0x1C + .asciz "Flamer.Brain.Mahoroa1.Exec" + .balign 4 .global $$253142 $$253142: - .incbin "baserom.dol", 0x46DA2C, 0x20 + .asciz "WaddleDoo.Brain.Mahoroa1.Exec" + .balign 4 .global $$253143 $$253143: - .incbin "baserom.dol", 0x46DA4C, 0x1C + .asciz "Lanzer.Brain.Mahoroa1.Exec" + .balign 4 .global $$253144 $$253144: - .incbin "baserom.dol", 0x46DA68, 0x24 + .asciz "HalcandleDee.Brain.Mahoroa1.Exec" + .balign 4 .global $$253145 $$253145: - .incbin "baserom.dol", 0x46DA8C, 0x24 + .asciz "FattyBufferJr.Brain.Mahoroa1.Exec" + .balign 4 .global $$253146 $$253146: - .incbin "baserom.dol", 0x46DAB0, 0x1C + .asciz "Gemra.Brain.Mahoroa1.Exec" + .balign 4 .global $$253147 $$253147: - .incbin "baserom.dol", 0x46DACC, 0x1C + .asciz "Chilly.Brain.Mahoroa1.Exec" + .balign 4 .global $$253148 $$253148: - .incbin "baserom.dol", 0x46DAE8, 0x28 + .asciz "Chilly.Brain.CreditWalkToPraise.Exec" + .balign 4 .global $$253149 $$253149: - .incbin "baserom.dol", 0x46DB10, 0x28 + .asciz "Rocky.Brain.CreditFallToGoodbye.Exec" + .balign 4 .global $$253150 $$253150: - .incbin "baserom.dol", 0x46DB38, 0x28 + .asciz "WaddleDee.Brain.CreditWalkToPraise.Exec" .global $$253151 $$253151: - .incbin "baserom.dol", 0x46DB60, 0x30 + .asciz "BroomHatter.Brain.CreditWalkToPraise.Exec" + .balign 4 + .4byte 0 diff --git a/asm/src/BrainFattyBuffer.s b/asm/src/BrainFattyBuffer.s index 5be872a7..04b24b5a 100644 --- a/asm/src/BrainFattyBuffer.s +++ b/asm/src/BrainFattyBuffer.s @@ -81,7 +81,17 @@ __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FD30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80298C38 ;# ptr + .4byte 0x80298C18 ;# ptr .global __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer: - .incbin "baserom.dol", 0x46FD40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80298C34 ;# ptr + .4byte 0x80298B90 ;# ptr + .4byte 0x80298C14 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFix.s b/asm/src/BrainFix.s index 8fe9151f..6b2c59f3 100644 --- a/asm/src/BrainFix.s +++ b/asm/src/BrainFix.s @@ -114,7 +114,17 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4780C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DFEFC ;# ptr + .4byte 0x802DFEDC ;# ptr .global __vt__Q53scn4step5enemy6shotzo8BrainFix __vt__Q53scn4step5enemy6shotzo8BrainFix: - .incbin "baserom.dol", 0x4780D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DFEF8 ;# ptr + .4byte 0x802DFDDC ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFixCeil.s b/asm/src/BrainFixCeil.s index 4f9850ab..7c35cd91 100644 --- a/asm/src/BrainFixCeil.s +++ b/asm/src/BrainFixCeil.s @@ -139,18 +139,25 @@ __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo12BrainFixCeil __vt__Q53scn4step5enemy6shotzo12BrainFixCeil: - .incbin "baserom.dol", 0x4780F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E00D4 ;# ptr + .4byte 0x802DFF3C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255186 $$255186: - .incbin "baserom.dol", 0x49CD80, 0x4 + .4byte 0 .global $$255187 $$255187: - .incbin "baserom.dol", 0x49CD84, 0x4 + .4byte 0x4222F983 .global $$255188 $$255188: - .incbin "baserom.dol", 0x49CD88, 0x4 + .4byte 0x3C8EFA35 .global $$255189 $$255189: - .incbin "baserom.dol", 0x49CD8C, 0x4 + .4byte 0x3FB40000 diff --git a/asm/src/BrainFlushPursuit.s b/asm/src/BrainFlushPursuit.s index 3f4b8d9d..a4be0331 100644 --- a/asm/src/BrainFlushPursuit.s +++ b/asm/src/BrainFlushPursuit.s @@ -124,10 +124,23 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EFC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80291240 ;# ptr + .4byte 0x80291200 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46EFD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029123C ;# ptr + .4byte 0x8029121C ;# ptr .global __vt__Q53scn4step5enemy6common17BrainFlushPursuit __vt__Q53scn4step5enemy6common17BrainFlushPursuit: - .incbin "baserom.dol", 0x46EFE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291238 ;# ptr + .4byte 0x80291108 ;# ptr + .4byte 0x80291184 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFly.s b/asm/src/BrainFly.s index 021eb41d..c5244e69 100644 --- a/asm/src/BrainFly.s +++ b/asm/src/BrainFly.s @@ -901,79 +901,179 @@ __dt__Q53scn4step5enemy6sodory8BrainFlyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8BrainFly __vt__Q53scn4step5enemy6common8BrainFly: - .incbin "baserom.dol", 0x46F008, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291338 ;# ptr + .4byte 0x80291280 ;# ptr + .4byte 0x80291330 ;# ptr + .4byte 0x80291334 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby8BrainFly __vt__Q53scn4step5enemy5bowby8BrainFly: - .incbin "baserom.dol", 0x470698, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029E308 ;# ptr + .4byte 0x8029E280 ;# ptr + .4byte 0x8029E304 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470910, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029EDE8 ;# ptr + .4byte 0x8029EDC8 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt8BrainFly __vt__Q53scn4step5enemy10brontoburt8BrainFly: - .incbin "baserom.dol", 0x470920, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029EDE4 ;# ptr + .4byte 0x8029ED40 ;# ptr + .4byte 0x8029EDC4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471578, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A54F4 ;# ptr + .4byte 0x802A54D4 ;# ptr .global __vt__Q53scn4step5enemy8cerulean8BrainFly __vt__Q53scn4step5enemy8cerulean8BrainFly: - .incbin "baserom.dol", 0x471588, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A54F0 ;# ptr + .4byte 0x802A544C ;# ptr + .4byte 0x802A54D0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle8BrainFly __vt__Q53scn4step5enemy6juckle8BrainFly: - .incbin "baserom.dol", 0x473C68, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BB168 ;# ptr + .4byte 0x802BB160 ;# ptr + .4byte 0x802BB164 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4763F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CF88C ;# ptr + .4byte 0x802CF80C ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476408, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CF888 ;# ptr + .4byte 0x802CF828 ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476418, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CF884 ;# ptr + .4byte 0x802CF844 ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476428, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CF880 ;# ptr + .4byte 0x802CF860 ;# ptr .global __vt__Q53scn4step5enemy6pierce8BrainFly __vt__Q53scn4step5enemy6pierce8BrainFly: - .incbin "baserom.dol", 0x476438, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CF87C ;# ptr + .4byte 0x802CF678 ;# ptr + .4byte 0x802CF808 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy8BrainFly __vt__Q53scn4step5enemy6scarfy8BrainFly: - .incbin "baserom.dol", 0x477488, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D9744 ;# ptr + .4byte 0x802D973C ;# ptr + .4byte 0x802D9740 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4777D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DBB7C ;# ptr + .4byte 0x802DBB3C ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4777E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DBB78 ;# ptr + .4byte 0x802DBB58 ;# ptr .global __vt__Q53scn4step5enemy8searches8BrainFly __vt__Q53scn4step5enemy8searches8BrainFly: - .incbin "baserom.dol", 0x4777F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DBB74 ;# ptr + .4byte 0x802DBA54 ;# ptr + .4byte 0x802DBB38 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478AC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E36A0 ;# ptr + .4byte 0x802E3660 ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478AD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E369C ;# ptr + .4byte 0x802E367C ;# ptr .global __vt__Q53scn4step5enemy5snowl8BrainFly __vt__Q53scn4step5enemy5snowl8BrainFly: - .incbin "baserom.dol", 0x478AE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E3698 ;# ptr + .4byte 0x802E357C ;# ptr + .4byte 0x802E365C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8BrainFly __vt__Q53scn4step5enemy6sodory8BrainFly: - .incbin "baserom.dol", 0x478D90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E4958 ;# ptr + .4byte 0x802E484C ;# ptr + .4byte 0x802E4954 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFlyAround.s b/asm/src/BrainFlyAround.s index 927e7503..57234af1 100644 --- a/asm/src/BrainFlyAround.s +++ b/asm/src/BrainFlyAround.s @@ -153,4 +153,11 @@ __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf14BrainFlyAround __vt__Q53scn4step5enemy6owgulf14BrainFlyAround: - .incbin "baserom.dol", 0x475C50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C9CD4 ;# ptr + .4byte 0x802C9B30 ;# ptr + .4byte 0x802C9BB4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802C9BB8 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFlyFarSinCurve.s b/asm/src/BrainFlyFarSinCurve.s index 609848e2..920278ba 100644 --- a/asm/src/BrainFlyFarSinCurve.s +++ b/asm/src/BrainFlyFarSinCurve.s @@ -82,12 +82,23 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470940, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029EEE0 ;# ptr + .4byte 0x8029EEC0 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve: - .incbin "baserom.dol", 0x470950, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029EEDC ;# ptr + .4byte 0x8029EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254881 $$254881: - .incbin "baserom.dol", 0x49BEC8, 0x8 + .4byte 0x41700000 + .4byte 0 diff --git a/asm/src/BrainFlySinCurve.s b/asm/src/BrainFlySinCurve.s index 42fd9959..2f871969 100644 --- a/asm/src/BrainFlySinCurve.s +++ b/asm/src/BrainFlySinCurve.s @@ -99,7 +99,17 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F028, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80291450 ;# ptr + .4byte 0x80291430 ;# ptr .global __vt__Q53scn4step5enemy6common16BrainFlySinCurve __vt__Q53scn4step5enemy6common16BrainFlySinCurve: - .incbin "baserom.dol", 0x46F038, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029144C ;# ptr + .4byte 0x80291378 ;# ptr + .4byte 0x80291428 ;# ptr + .4byte 0x8029142C ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFlyStraight.s b/asm/src/BrainFlyStraight.s index ca4f38f8..86507f10 100644 --- a/asm/src/BrainFlyStraight.s +++ b/asm/src/BrainFlyStraight.s @@ -34,4 +34,11 @@ __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight: - .incbin "baserom.dol", 0x475C70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C9D1C ;# ptr + .4byte 0x802C9D14 ;# ptr + .4byte 0x802C9D18 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFlyUpDown.s b/asm/src/BrainFlyUpDown.s index f9254189..6ce32fef 100644 --- a/asm/src/BrainFlyUpDown.s +++ b/asm/src/BrainFlyUpDown.s @@ -175,15 +175,35 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80291568 ;# ptr + .4byte 0x80291548 ;# ptr .global __vt__Q53scn4step5enemy6common14BrainFlyUpDown __vt__Q53scn4step5enemy6common14BrainFlyUpDown: - .incbin "baserom.dol", 0x46F068, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291564 ;# ptr + .4byte 0x80291490 ;# ptr + .4byte 0x80291540 ;# ptr + .4byte 0x80291544 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4774A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D9824 ;# ptr + .4byte 0x802D9804 ;# ptr .global __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown: - .incbin "baserom.dol", 0x4774B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D9820 ;# ptr + .4byte 0x802D9784 ;# ptr + .4byte 0x802D9800 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFlyWait.s b/asm/src/BrainFlyWait.s index da2c8aba..52b39d8e 100644 --- a/asm/src/BrainFlyWait.s +++ b/asm/src/BrainFlyWait.s @@ -34,4 +34,11 @@ __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf12BrainFlyWait __vt__Q53scn4step5enemy6owgulf12BrainFlyWait: - .incbin "baserom.dol", 0x475C90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C9D64 ;# ptr + .4byte 0x802C9D5C ;# ptr + .4byte 0x802C9D60 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainFollow.s b/asm/src/BrainFollow.s index fd2bc7d8..da943c78 100644 --- a/asm/src/BrainFollow.s +++ b/asm/src/BrainFollow.s @@ -87,4 +87,11 @@ __dt__Q53scn4step5enemy6juckle11BrainFollowFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11BrainFollow __vt__Q53scn4step5enemy6juckle11BrainFollow: - .incbin "baserom.dol", 0x473C88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BB26C ;# ptr + .4byte 0x802BB1A8 ;# ptr + .4byte 0x802BB268 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainGrandLowper.s b/asm/src/BrainGrandLowper.s index eac17e12..14e77747 100644 --- a/asm/src/BrainGrandLowper.s +++ b/asm/src/BrainGrandLowper.s @@ -984,84 +984,179 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F500, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296388 ;# ptr + .4byte 0x80296368 ;# ptr .global __vt__Q53scn4step5enemy8armordee16BrainGrandLowper __vt__Q53scn4step5enemy8armordee16BrainGrandLowper: - .incbin "baserom.dol", 0x46F510, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80296384 ;# ptr + .4byte 0x80296270 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802962EC ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F7A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80296DE8 ;# ptr + .4byte 0x80296DC8 ;# ptr .global __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper: - .incbin "baserom.dol", 0x46F7B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80296DE4 ;# ptr + .4byte 0x80296D44 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4702A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029CDD0 ;# ptr + .4byte 0x8029CDB0 ;# ptr .global __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper: - .incbin "baserom.dol", 0x4702B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029CDCC ;# ptr + .4byte 0x8029CC48 ;# ptr + .4byte 0x8029CCC4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470D50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A0D78 ;# ptr + .4byte 0x802A0D58 ;# ptr .global __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper: - .incbin "baserom.dol", 0x470D60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A0D74 ;# ptr + .4byte 0x802A0CD0 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802A0D54 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473F70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BC704 ;# ptr + .4byte 0x802BC6E4 ;# ptr .global __vt__Q53scn4step5enemy4kabu16BrainGrandLowper __vt__Q53scn4step5enemy4kabu16BrainGrandLowper: - .incbin "baserom.dol", 0x473F80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BC700 ;# ptr + .4byte 0x802BC600 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802BC6C0 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475820, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C7988 ;# ptr + .4byte 0x802C7948 ;# ptr .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475830, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C7984 ;# ptr + .4byte 0x802C7964 ;# ptr .global __vt__Q53scn4step5enemy5nruff16BrainGrandLowper __vt__Q53scn4step5enemy5nruff16BrainGrandLowper: - .incbin "baserom.dol", 0x475840, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C7980 ;# ptr + .4byte 0x802C77AC ;# ptr + .4byte 0x802C78B8 ;# ptr + .4byte 0x802C783C ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4774D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D9904 ;# ptr + .4byte 0x802D98E4 ;# ptr .global __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper: - .incbin "baserom.dol", 0x4774E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D9900 ;# ptr + .4byte 0x802D9864 ;# ptr + .4byte 0x802D98E0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477B00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DCE74 ;# ptr + .4byte 0x802DCE54 ;# ptr .global __vt__Q53scn4step5enemy5sheld16BrainGrandLowper __vt__Q53scn4step5enemy5sheld16BrainGrandLowper: - .incbin "baserom.dol", 0x477B10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DCE70 ;# ptr + .4byte 0x802DCC8C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802DCD08 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479C48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ED3A0 ;# ptr + .4byte 0x802ED380 ;# ptr .global __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper: - .incbin "baserom.dol", 0x479C58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ED39C ;# ptr + .4byte 0x802ED300 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802ED37C ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254927 $$254927: - .incbin "baserom.dol", 0x49C648, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255058 $$255058: - .incbin "baserom.dol", 0x49C8B0, 0x8 + .4byte 0x41400000 + .4byte 0 diff --git a/asm/src/BrainGround.s b/asm/src/BrainGround.s index 24aa71b6..d7202ec0 100644 --- a/asm/src/BrainGround.s +++ b/asm/src/BrainGround.s @@ -63,4 +63,11 @@ __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11BrainGround __vt__Q53scn4step5enemy9tsukikage11BrainGround: - .incbin "baserom.dol", 0x4797C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EA4D8 ;# ptr + .4byte 0x802EA454 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainHang.s b/asm/src/BrainHang.s index 8c27edb9..4c171d7b 100644 --- a/asm/src/BrainHang.s +++ b/asm/src/BrainHang.s @@ -135,12 +135,23 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateH .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471AF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A70C4 ;# ptr + .4byte 0x802A70A4 ;# ptr .global __vt__Q53scn4step5enemy4como9BrainHang __vt__Q53scn4step5enemy4como9BrainHang: - .incbin "baserom.dol", 0x471B00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A70C0 ;# ptr + .4byte 0x802A6F54 ;# ptr + .4byte 0x802A6FEC ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255208 $$255208: - .incbin "baserom.dol", 0x49C0A8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/BrainJump.s b/asm/src/BrainJump.s index 78a241fa..0c214c47 100644 --- a/asm/src/BrainJump.s +++ b/asm/src/BrainJump.s @@ -121,9 +121,23 @@ __dt__Q53scn4step5enemy4kabu9BrainJumpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9BrainJump __vt__Q53scn4step5enemy7blipper9BrainJump: - .incbin "baserom.dol", 0x46FD60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80298D60 ;# ptr + .4byte 0x80298C78 ;# ptr + .4byte 0x80298D5C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9BrainJump __vt__Q53scn4step5enemy4kabu9BrainJump: - .incbin "baserom.dol", 0x473FA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BC748 ;# ptr + .4byte 0x802BC744 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainJumpAttack.s b/asm/src/BrainJumpAttack.s index cece006f..f9eb4410 100644 --- a/asm/src/BrainJumpAttack.s +++ b/asm/src/BrainJumpAttack.s @@ -77,7 +77,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478410, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E12D8 ;# ptr + .4byte 0x802E12B8 ;# ptr .global __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack: - .incbin "baserom.dol", 0x478420, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E12D4 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802E1234 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainJumpOrAttack.s b/asm/src/BrainJumpOrAttack.s index 0650fc36..e6d921b5 100644 --- a/asm/src/BrainJumpOrAttack.s +++ b/asm/src/BrainJumpOrAttack.s @@ -48,4 +48,11 @@ __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack: - .incbin "baserom.dol", 0x47A4F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EF9D4 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802EF994 ;# ptr + .4byte 0x802EF998 ;# ptr + .4byte 0 diff --git a/asm/src/BrainMain.s b/asm/src/BrainMain.s index f8b73ec0..ce4b2645 100644 --- a/asm/src/BrainMain.s +++ b/asm/src/BrainMain.s @@ -69,9 +69,17 @@ __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9BrainMain __vt__Q53scn4step5enemy8dubiorjr9BrainMain: - .incbin "baserom.dol", 0x472290, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ADFB4 ;# ptr + .4byte 0x802ADF24 ;# ptr + .4byte 0x802ADFB0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254871 $$254871: - .incbin "baserom.dol", 0x49C2E8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/BrainMove.s b/asm/src/BrainMove.s index 3bc10896..045271e9 100644 --- a/asm/src/BrainMove.s +++ b/asm/src/BrainMove.s @@ -1207,90 +1207,213 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMo .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9BrainMove __vt__Q53scn4step5enemy7blipper9BrainMove: - .incbin "baserom.dol", 0x46FD80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80298E88 ;# ptr + .4byte 0x80298DA0 ;# ptr + .4byte 0x80298E84 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9BrainMove __vt__Q53scn4step5enemy6bouncy9BrainMove: - .incbin "baserom.dol", 0x4702D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029CF3C ;# ptr + .4byte 0x8029CE10 ;# ptr + .4byte 0x8029CEA0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9BrainMove __vt__Q53scn4step5enemy6chilly9BrainMove: - .incbin "baserom.dol", 0x4717F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A611C ;# ptr + .4byte 0x802A6098 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4725E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802AF79C ;# ptr + .4byte 0x802AF67C ;# ptr .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4725F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802AF798 ;# ptr + .4byte 0x802AF6D8 ;# ptr .global __vt__Q53scn4step5enemy4elec12StateMoveCCW __vt__Q53scn4step5enemy4elec12StateMoveCCW: - .incbin "baserom.dol", 0x472600, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x802AF794 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B0568 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B0A30 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0x802AF674 ;# ptr .global __vt__Q53scn4step5enemy4elec12StateMoveCWR __vt__Q53scn4step5enemy4elec12StateMoveCWR: - .incbin "baserom.dol", 0x472624, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x802AF738 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B0568 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B0A30 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0x802AF678 ;# ptr .global __vt__Q53scn4step5enemy4elec9BrainMove __vt__Q53scn4step5enemy4elec9BrainMove: - .incbin "baserom.dol", 0x472648, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AF734 ;# ptr + .4byte 0x802AF518 ;# ptr + .4byte 0x802AF5F8 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer9BrainMove __vt__Q53scn4step5enemy6flamer9BrainMove: - .incbin "baserom.dol", 0x472B38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B1F34 ;# ptr + .4byte 0x802B1E20 ;# ptr + .4byte 0x802B1F00 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472DD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B43B4 ;# ptr + .4byte 0x802B4394 ;# ptr .global __vt__Q53scn4step5enemy5foley9BrainMove __vt__Q53scn4step5enemy5foley9BrainMove: - .incbin "baserom.dol", 0x472DE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B43B0 ;# ptr + .4byte 0x802B4310 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4735E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B8C28 ;# ptr + .4byte 0x802B8BC8 ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4735F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B8C24 ;# ptr + .4byte 0x802B8BE4 ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473608, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B8C20 ;# ptr + .4byte 0x802B8C00 ;# ptr .global __vt__Q53scn4step5enemy5gordo9BrainMove __vt__Q53scn4step5enemy5gordo9BrainMove: - .incbin "baserom.dol", 0x473618, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B8C1C ;# ptr + .4byte 0x802B8A7C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9BrainMove __vt__Q53scn4step5enemy5rocky9BrainMove: - .incbin "baserom.dol", 0x476C90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D38DC ;# ptr + .4byte 0x802D37A4 ;# ptr + .4byte 0x802D3828 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477098, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D616C ;# ptr + .4byte 0x802D614C ;# ptr .global __vt__Q53scn4step5enemy8rollball9BrainMove __vt__Q53scn4step5enemy8rollball9BrainMove: - .incbin "baserom.dol", 0x4770A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D6168 ;# ptr + .4byte 0x802D60C8 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478848, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E2720 ;# ptr + .4byte 0x802E26E0 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478858, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E271C ;# ptr + .4byte 0x802E26FC ;# ptr .global __vt__Q53scn4step5enemy11sisterbound9BrainMove __vt__Q53scn4step5enemy11sisterbound9BrainMove: - .incbin "baserom.dol", 0x478868, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E2718 ;# ptr + .4byte 0x802E25DC ;# ptr + .4byte 0x802E2664 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479478, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E87B0 ;# ptr + .4byte 0x802E8790 ;# ptr .global __vt__Q53scn4step5enemy3sun9BrainMove __vt__Q53scn4step5enemy3sun9BrainMove: - .incbin "baserom.dol", 0x479488, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E87AC ;# ptr + .4byte 0x802E870C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainMoveAround.s b/asm/src/BrainMoveAround.s index a9f6d1e6..65a4df5d 100644 --- a/asm/src/BrainMoveAround.s +++ b/asm/src/BrainMoveAround.s @@ -118,7 +118,17 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateF .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473FC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BC8C0 ;# ptr + .4byte 0x802BC8A0 ;# ptr .global __vt__Q53scn4step5enemy4kabu15BrainMoveAround __vt__Q53scn4step5enemy4kabu15BrainMoveAround: - .incbin "baserom.dol", 0x473FD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BC8BC ;# ptr + .4byte 0x802BC788 ;# ptr + .4byte 0x802BC814 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainMoveAttack.s b/asm/src/BrainMoveAttack.s index ba62efc9..31d1774a 100644 --- a/asm/src/BrainMoveAttack.s +++ b/asm/src/BrainMoveAttack.s @@ -405,28 +405,49 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec15BrainMoveAttack __vt__Q53scn4step5enemy4elec15BrainMoveAttack: - .incbin "baserom.dol", 0x472668, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AF9FC ;# ptr + .4byte 0x802AF7E4 ;# ptr + .4byte 0x802AF8C4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802AF978 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer15BrainMoveAttack __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: - .incbin "baserom.dol", 0x472B58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B2164 ;# ptr + .4byte 0x802B1F8C ;# ptr + .4byte 0x802B206C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack: - .incbin "baserom.dol", 0x4767E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D1630 ;# ptr + .4byte 0x802D15A8 ;# ptr + .4byte 0x802D162C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255142 $$255142: - .incbin "baserom.dol", 0x49C338, 0x4 + .4byte 0x41000000 .global $$255143 $$255143: - .incbin "baserom.dol", 0x49C33C, 0x4 + .4byte 0xC1000000 .global $$255144 $$255144: - .incbin "baserom.dol", 0x49C340, 0x4 + .4byte 0xC0400000 .global $$255145 $$255145: - .incbin "baserom.dol", 0x49C344, 0x4 + .4byte 0x40400000 diff --git a/asm/src/BrainMoveStraight.s b/asm/src/BrainMoveStraight.s index 5b3f3a92..33d646a1 100644 --- a/asm/src/BrainMoveStraight.s +++ b/asm/src/BrainMoveStraight.s @@ -68,4 +68,11 @@ __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu17BrainMoveStraight __vt__Q53scn4step5enemy4kabu17BrainMoveStraight: - .incbin "baserom.dol", 0x473FF0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BC98C ;# ptr + .4byte 0x802BC900 ;# ptr + .4byte 0x802BC988 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainNoseDive.s b/asm/src/BrainNoseDive.s index a1059840..7bc3d0ca 100644 --- a/asm/src/BrainNoseDive.s +++ b/asm/src/BrainNoseDive.s @@ -253,21 +253,47 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476098, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CB858 ;# ptr + .4byte 0x802CB818 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4760A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CB854 ;# ptr + .4byte 0x802CB834 ;# ptr .global __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive: - .incbin "baserom.dol", 0x4760B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CB850 ;# ptr + .4byte 0x802CB71C ;# ptr + .4byte 0x802CB798 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CB814 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476248, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CD984 ;# ptr + .4byte 0x802CD944 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476258, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CD980 ;# ptr + .4byte 0x802CD960 ;# ptr .global __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive: - .incbin "baserom.dol", 0x476268, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CD97C ;# ptr + .4byte 0x802CD848 ;# ptr + .4byte 0x802CD8C4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CD940 ;# ptr + .4byte 0 diff --git a/asm/src/BrainPuff.s b/asm/src/BrainPuff.s index 08aa893c..704815f0 100644 --- a/asm/src/BrainPuff.s +++ b/asm/src/BrainPuff.s @@ -77,7 +77,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479398, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E79A4 ;# ptr + .4byte 0x802E7984 ;# ptr .global __vt__Q53scn4step5enemy10stareffect9BrainPuff __vt__Q53scn4step5enemy10stareffect9BrainPuff: - .incbin "baserom.dol", 0x4793A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E79A0 ;# ptr + .4byte 0x802E7900 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainPursuit.s b/asm/src/BrainPursuit.s index 3282b266..8548c408 100644 --- a/asm/src/BrainPursuit.s +++ b/asm/src/BrainPursuit.s @@ -141,12 +141,29 @@ __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470970, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029EFC8 ;# ptr + .4byte 0x8029EFA8 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt12BrainPursuit __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: - .incbin "baserom.dol", 0x470980, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029EFC4 ;# ptr + .4byte 0x8029EF20 ;# ptr + .4byte 0x8029EFA4 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo12BrainPursuit __vt__Q53scn4step5enemy6shotzo12BrainPursuit: - .incbin "baserom.dol", 0x478118, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E0198 ;# ptr + .4byte 0x802E0114 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainPursuitCeil.s b/asm/src/BrainPursuitCeil.s index 9d4406fb..d6500dc9 100644 --- a/asm/src/BrainPursuitCeil.s +++ b/asm/src/BrainPursuitCeil.s @@ -30,4 +30,11 @@ __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil: - .incbin "baserom.dol", 0x478138, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E01DC ;# ptr + .4byte 0x802E01D8 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainRelease.s b/asm/src/BrainRelease.s index a2b3a615..ae60debe 100644 --- a/asm/src/BrainRelease.s +++ b/asm/src/BrainRelease.s @@ -231,15 +231,35 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldo .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4760D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CB9AC ;# ptr + .4byte 0x802CB98C ;# ptr .global __vt__Q53scn4step5enemy10parasoldee12BrainRelease __vt__Q53scn4step5enemy10parasoldee12BrainRelease: - .incbin "baserom.dol", 0x4760E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CB9A8 ;# ptr + .4byte 0x802CB898 ;# ptr + .4byte 0x802CB984 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CB988 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476288, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CDAD8 ;# ptr + .4byte 0x802CDAB8 ;# ptr .global __vt__Q53scn4step5enemy10parasoldoo12BrainRelease __vt__Q53scn4step5enemy10parasoldoo12BrainRelease: - .incbin "baserom.dol", 0x476298, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CDAD4 ;# ptr + .4byte 0x802CD9C4 ;# ptr + .4byte 0x802CDAB0 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CDAB4 ;# ptr + .4byte 0 diff --git a/asm/src/BrainRise.s b/asm/src/BrainRise.s index 40a7edae..95b196d6 100644 --- a/asm/src/BrainRise.s +++ b/asm/src/BrainRise.s @@ -77,7 +77,17 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475E98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CAAF4 ;# ptr + .4byte 0x802CAAD4 ;# ptr .global __vt__Q53scn4step5enemy7parasol9BrainRise __vt__Q53scn4step5enemy7parasol9BrainRise: - .incbin "baserom.dol", 0x475EA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CAAF0 ;# ptr + .4byte 0x802CAA50 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainRun.s b/asm/src/BrainRun.s index ca112c79..363992f9 100644 --- a/asm/src/BrainRun.s +++ b/asm/src/BrainRun.s @@ -72,4 +72,11 @@ __dt__Q53scn4step5enemy5nruff8BrainRunFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff8BrainRun __vt__Q53scn4step5enemy5nruff8BrainRun: - .incbin "baserom.dol", 0x475860, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C7A64 ;# ptr + .4byte 0x802C79C8 ;# ptr + .4byte 0x802C7A60 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainShot.s b/asm/src/BrainShot.s index 06bd5a92..0fb3b98d 100644 --- a/asm/src/BrainShot.s +++ b/asm/src/BrainShot.s @@ -77,7 +77,17 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybroj .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4769C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D282C ;# ptr + .4byte 0x802D280C ;# ptr .global __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot: - .incbin "baserom.dol", 0x4769D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D2828 ;# ptr + .4byte 0x802D2788 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainSmoke.s b/asm/src/BrainSmoke.s index 36070dfb..b402dcfc 100644 --- a/asm/src/BrainSmoke.s +++ b/asm/src/BrainSmoke.s @@ -63,4 +63,11 @@ __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage10BrainSmoke __vt__Q53scn4step5enemy9tsukikage10BrainSmoke: - .incbin "baserom.dol", 0x4797E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EA59C ;# ptr + .4byte 0x802EA518 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainTeleport.s b/asm/src/BrainTeleport.s index 4ba4287d..5f484ad8 100644 --- a/asm/src/BrainTeleport.s +++ b/asm/src/BrainTeleport.s @@ -80,7 +80,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474010, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BCA7C ;# ptr + .4byte 0x802BCA5C ;# ptr .global __vt__Q53scn4step5enemy4kabu13BrainTeleport __vt__Q53scn4step5enemy4kabu13BrainTeleport: - .incbin "baserom.dol", 0x474020, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BCA78 ;# ptr + .4byte 0x802BC9CC ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainTeleportRepeat.s b/asm/src/BrainTeleportRepeat.s index 170ae485..1d0602d9 100644 --- a/asm/src/BrainTeleportRepeat.s +++ b/asm/src/BrainTeleportRepeat.s @@ -111,4 +111,11 @@ __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat: - .incbin "baserom.dol", 0x474040, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BCBE8 ;# ptr + .4byte 0x802BCABC ;# ptr + .4byte 0x802BCB78 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWait.s b/asm/src/BrainWait.s index be18d272..66e81efc 100644 --- a/asm/src/BrainWait.s +++ b/asm/src/BrainWait.s @@ -971,58 +971,137 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9BrainWait __vt__Q53scn4step5enemy6bouncy9BrainWait: - .incbin "baserom.dol", 0x4702F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029D094 ;# ptr + .4byte 0x8029CF7C ;# ptr + .4byte 0x8029D010 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9BrainWait __vt__Q53scn4step5enemy6chilly9BrainWait: - .incbin "baserom.dol", 0x471818, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A61E0 ;# ptr + .4byte 0x802A615C ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471FA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802AD1CC ;# ptr + .4byte 0x802AD1AC ;# ptr .global __vt__Q53scn4step5enemy6degout9BrainWait __vt__Q53scn4step5enemy6degout9BrainWait: - .incbin "baserom.dol", 0x471FB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AD1C8 ;# ptr + .4byte 0x802AD12C ;# ptr + .4byte 0x802AD130 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472E08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B4498 ;# ptr + .4byte 0x802B4478 ;# ptr .global __vt__Q53scn4step5enemy5foley9BrainWait __vt__Q53scn4step5enemy5foley9BrainWait: - .incbin "baserom.dol", 0x472E18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B4494 ;# ptr + .4byte 0x802B43F4 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra9BrainWait __vt__Q53scn4step5enemy5gemra9BrainWait: - .incbin "baserom.dol", 0x473070, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B583C ;# ptr + .4byte 0x802B56C4 ;# ptr + .4byte 0x802B5774 ;# ptr + .4byte 0x802B5834 ;# ptr + .4byte 0x802B5838 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9BrainWait __vt__Q53scn4step5enemy6lanzer9BrainWait: - .incbin "baserom.dol", 0x474C08, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C1C60 ;# ptr + .4byte 0x802C1B40 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802C1C18 ;# ptr + .4byte 0x802C1C1C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9BrainWait __vt__Q53scn4step5enemy5noddy9BrainWait: - .incbin "baserom.dol", 0x475630, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C71E8 ;# ptr + .4byte 0x802C71E0 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802C71E4 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9BrainWait __vt__Q53scn4step5enemy11sisterbound9BrainWait: - .incbin "baserom.dol", 0x478888, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E288C ;# ptr + .4byte 0x802E2760 ;# ptr + .4byte 0x802E282C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9BrainWait __vt__Q53scn4step5enemy6sodory9BrainWait: - .incbin "baserom.dol", 0x478DB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E4B04 ;# ptr + .4byte 0x802E4998 ;# ptr + .4byte 0x802E4AC0 ;# ptr + .4byte 0x802E4ABC ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479C78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ED574 ;# ptr + .4byte 0x802ED554 ;# ptr .global __vt__Q53scn4step5enemy9waddledee9BrainWait __vt__Q53scn4step5enemy9waddledee9BrainWait: - .incbin "baserom.dol", 0x479C88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ED570 ;# ptr + .4byte 0x802ED3E8 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802ED46C ;# ptr + .4byte 0 diff --git a/asm/src/BrainWaitAndChase.s b/asm/src/BrainWaitAndChase.s index 47add544..8e331c8a 100644 --- a/asm/src/BrainWaitAndChase.s +++ b/asm/src/BrainWaitAndChase.s @@ -34,4 +34,11 @@ __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout17BrainWaitAndChase __vt__Q53scn4step5enemy6degout17BrainWaitAndChase: - .incbin "baserom.dol", 0x471FD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AD214 ;# ptr + .4byte 0x802AD20C ;# ptr + .4byte 0x802AD210 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWaitAttack.s b/asm/src/BrainWaitAttack.s index 7ba220d5..2bd98405 100644 --- a/asm/src/BrainWaitAttack.s +++ b/asm/src/BrainWaitAttack.s @@ -34,4 +34,11 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack: - .incbin "baserom.dol", 0x476808, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D1678 ;# ptr + .4byte 0x802D1670 ;# ptr + .4byte 0x802D1674 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWaitFlyStraight.s b/asm/src/BrainWaitFlyStraight.s index 0ddc7743..7fcb3f05 100644 --- a/asm/src/BrainWaitFlyStraight.s +++ b/asm/src/BrainWaitFlyStraight.s @@ -110,7 +110,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4709A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029F120 ;# ptr + .4byte 0x8029F100 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight: - .incbin "baserom.dol", 0x4709B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029F11C ;# ptr + .4byte 0x8029F008 ;# ptr + .4byte 0x8029F084 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWaitPursuit.s b/asm/src/BrainWaitPursuit.s index 7ba4f6e7..1c096c2a 100644 --- a/asm/src/BrainWaitPursuit.s +++ b/asm/src/BrainWaitPursuit.s @@ -65,4 +65,11 @@ __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit: - .incbin "baserom.dol", 0x4709D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029F1E0 ;# ptr + .4byte 0x8029F160 ;# ptr + .4byte 0x8029F164 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWalk.s b/asm/src/BrainWalk.s index 89f6492b..cb09bb14 100644 --- a/asm/src/BrainWalk.s +++ b/asm/src/BrainWalk.s @@ -454,34 +454,83 @@ __dt__Q53scn4step5enemy5rocky9BrainWalkFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight9BrainWalk __vt__Q53scn4step5enemy11bladeknight9BrainWalk: - .incbin "baserom.dol", 0x46F7D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80296F28 ;# ptr + .4byte 0x80296EA0 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x80296F24 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9BrainWalk __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: - .incbin "baserom.dol", 0x474470, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BF164 ;# ptr + .4byte 0x802BF0DC ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802BF160 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9BrainWalk __vt__Q53scn4step5enemy6lanzer9BrainWalk: - .incbin "baserom.dol", 0x474C28, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C1D28 ;# ptr + .4byte 0x802C1CA0 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802C1D24 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9BrainWalk __vt__Q53scn4step5enemy5noddy9BrainWalk: - .incbin "baserom.dol", 0x475650, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C72AC ;# ptr + .4byte 0x802C7228 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee9BrainWalk __vt__Q53scn4step5enemy10parasoldee9BrainWalk: - .incbin "baserom.dol", 0x476108, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CBA70 ;# ptr + .4byte 0x802CB9EC ;# ptr + .4byte 0x802CBA68 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CBA6C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo9BrainWalk __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: - .incbin "baserom.dol", 0x4762B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CDB9C ;# ptr + .4byte 0x802CDB18 ;# ptr + .4byte 0x802CDB94 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x802CDB98 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9BrainWalk __vt__Q53scn4step5enemy5rocky9BrainWalk: - .incbin "baserom.dol", 0x476CB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D3924 ;# ptr + .4byte 0x802D391C ;# ptr + .4byte 0x802D3920 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWalkAround.s b/asm/src/BrainWalkAround.s index 10d7554d..714042e3 100644 --- a/asm/src/BrainWalkAround.s +++ b/asm/src/BrainWalkAround.s @@ -398,27 +398,65 @@ __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15BrainWalkAround __vt__Q53scn4step5enemy6common15BrainWalkAround: - .incbin "baserom.dol", 0x46F088, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029162C ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802915A8 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470D80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A0E5C ;# ptr + .4byte 0x802A0E3C ;# ptr .global __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: - .incbin "baserom.dol", 0x470D90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A0E58 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802A0DB8 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15BrainWalkAround __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: - .incbin "baserom.dol", 0x474C48, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C1EE0 ;# ptr + .4byte 0x802C1D68 ;# ptr + .4byte 0x802C1E9C ;# ptr + .4byte 0x802C1E98 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15BrainWalkAround __vt__Q53scn4step5enemy6sodory15BrainWalkAround: - .incbin "baserom.dol", 0x478DD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E4C38 ;# ptr + .4byte 0x802E4B44 ;# ptr + .4byte 0x802E4BEC ;# ptr + .4byte 0x802E4BE8 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround: - .incbin "baserom.dol", 0x47A510, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EFA1C ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802EFA14 ;# ptr + .4byte 0x802EFA18 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWalkStepBack.s b/asm/src/BrainWalkStepBack.s index 2a02d656..5a818ab4 100644 --- a/asm/src/BrainWalkStepBack.s +++ b/asm/src/BrainWalkStepBack.s @@ -114,4 +114,11 @@ __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack: - .incbin "baserom.dol", 0x474490, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BF2C4 ;# ptr + .4byte 0x802BF1A4 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802BF29C ;# ptr + .4byte 0x802BF2A0 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWalkStraight.s b/asm/src/BrainWalkStraight.s index af3c98c3..f4fc0de7 100644 --- a/asm/src/BrainWalkStraight.s +++ b/asm/src/BrainWalkStraight.s @@ -99,9 +99,23 @@ __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17BrainWalkStraight __vt__Q53scn4step5enemy6common17BrainWalkStraight: - .incbin "baserom.dol", 0x46F0A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291704 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x80291680 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight: - .incbin "baserom.dol", 0x47A530, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EFA64 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802EFA5C ;# ptr + .4byte 0x802EFA60 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWalkTurnCliff.s b/asm/src/BrainWalkTurnCliff.s index 4efed0b9..f507a928 100644 --- a/asm/src/BrainWalkTurnCliff.s +++ b/asm/src/BrainWalkTurnCliff.s @@ -30,4 +30,11 @@ __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff: - .incbin "baserom.dol", 0x46F0C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291748 ;# ptr + .4byte 0x8027EE28 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x80291744 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWall.s b/asm/src/BrainWall.s index 7b8bae6f..8e27c18e 100644 --- a/asm/src/BrainWall.s +++ b/asm/src/BrainWall.s @@ -110,7 +110,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479808, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EA6F4 ;# ptr + .4byte 0x802EA6D4 ;# ptr .global __vt__Q53scn4step5enemy9tsukikage9BrainWall __vt__Q53scn4step5enemy9tsukikage9BrainWall: - .incbin "baserom.dol", 0x479818, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EA6F0 ;# ptr + .4byte 0x802EA5DC ;# ptr + .4byte 0x802EA658 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/BrainWhispy.s b/asm/src/BrainWhispy.s index d83237ac..8062ad0e 100644 --- a/asm/src/BrainWhispy.s +++ b/asm/src/BrainWhispy.s @@ -442,39 +442,89 @@ __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4709F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029F2D8 ;# ptr + .4byte 0x8029F2B8 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt11BrainWhispy __vt__Q53scn4step5enemy10brontoburt11BrainWhispy: - .incbin "baserom.dol", 0x470A00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029F2D4 ;# ptr + .4byte 0x8029F220 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8029F2B4 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471B20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A7234 ;# ptr + .4byte 0x802A7214 ;# ptr .global __vt__Q53scn4step5enemy4como11BrainWhispy __vt__Q53scn4step5enemy4como11BrainWhispy: - .incbin "baserom.dol", 0x471B30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A7230 ;# ptr + .4byte 0x802A7104 ;# ptr + .4byte 0x802A7198 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x473638, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B8D24 ;# ptr + .4byte 0x802B8D04 ;# ptr .global __vt__Q53scn4step5enemy5gordo11BrainWhispy __vt__Q53scn4step5enemy5gordo11BrainWhispy: - .incbin "baserom.dol", 0x473648, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B8D20 ;# ptr + .4byte 0x802B8C68 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477508, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D99FC ;# ptr + .4byte 0x802D99DC ;# ptr .global __vt__Q53scn4step5enemy6scarfy11BrainWhispy __vt__Q53scn4step5enemy6scarfy11BrainWhispy: - .incbin "baserom.dol", 0x477518, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D99F8 ;# ptr + .4byte 0x802D9944 ;# ptr + .4byte 0x802D99D8 ;# ptr + .4byte 0x8027EE30 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479CA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802ED66C ;# ptr + .4byte 0x802ED64C ;# ptr .global __vt__Q53scn4step5enemy9waddledee11BrainWhispy __vt__Q53scn4step5enemy9waddledee11BrainWhispy: - .incbin "baserom.dol", 0x479CB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ED668 ;# ptr + .4byte 0x802ED5B4 ;# ptr + .4byte 0x8027EE2C ;# ptr + .4byte 0x802ED648 ;# ptr + .4byte 0x8027EE34 ;# ptr + .4byte 0 diff --git a/asm/src/Button.s b/asm/src/Button.s index 21481833..d229dcc1 100644 --- a/asm/src/Button.s +++ b/asm/src/Button.s @@ -618,142 +618,228 @@ canCursorMoveRight__Q43scn7history6detail6ButtonCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251957 $$251957: - .incbin "baserom.dol", 0x410C60, 0x10 + .4byte 0x80556FB0 + .4byte 0x80556FB8 + .4byte 0x80556FC0 + .4byte 0x80556FC8 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global MOVE_TABLE__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 MOVE_TABLE__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .incbin "baserom.dol", 0x411D48, 0x30 + .4byte 0x00010000 + .4byte 0x00010000 + .4byte 0x01010001 + .4byte 0x01000100 + .4byte 0x00010000 + .4byte 0x01010000 + .4byte 0x01000000 + .4byte 0x01000000 + .4byte 0x00000001 + .4byte 0x00000101 + .4byte 0x00000100 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252299 $$252299: - .incbin "baserom.dol", 0x453440, 0xC + .asciz "common/Main" .global $$252300 $$252300: - .incbin "baserom.dol", 0x45344C, 0xC + .asciz "BlueButton" + .balign 4 .global $$252306 $$252306: - .incbin "baserom.dol", 0x453458, 0xC + .asciz "ButtonText" + .balign 4 .global $$252358 $$252358: - .incbin "baserom.dol", 0x453464, 0xC + .asciz "GrayChoice" + .balign 4 .global $$252360 $$252360: - .incbin "baserom.dol", 0x453470, 0x10 + .asciz "GrayNoChoice" + .balign 4 .global $$252361 $$252361: - .incbin "baserom.dol", 0x453480, 0xC + .asciz "NoChoice" + .balign 4 .global $$252370 $$252370: - .incbin "baserom.dol", 0x45348C, 0x3C + .asciz "GrayDecide" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251572 $$251572: - .incbin "baserom.dol", 0x45D7A0, 0x10 + .asciz "PackageButtonN" + .balign 4 .global $$251573 $$251573: - .incbin "baserom.dol", 0x45D7B0, 0x10 + .asciz "MovieButtonN" + .balign 4 .global $$251574 $$251574: - .incbin "baserom.dol", 0x45D7C0, 0x10 + .asciz "WatchButtonN" + .balign 4 .global $$251575 $$251575: - .incbin "baserom.dol", 0x45D7D0, 0xC + .asciz "PlayButtonN" .global $$251576 $$251576: - .incbin "baserom.dol", 0x45D7DC, 0x10 + .asciz "SelectButtonN" + .balign 4 .global $$251577 $$251577: - .incbin "baserom.dol", 0x45D7EC, 0x14 + .asciz "AnimePlayButtonN" + .balign 4 .global $$251578 $$251578: - .incbin "baserom.dol", 0x45D800, 0x10 + .asciz "AnimeButton02N" + .balign 4 .global $$251579 $$251579: - .incbin "baserom.dol", 0x45D810, 0x10 + .asciz "AnimeButton03N" + .balign 4 .global $$251580 $$251580: - .incbin "baserom.dol", 0x45D820, 0x10 + .asciz "TitleButtonN" + .balign 4 .global $$251581 $$251581: - .incbin "baserom.dol", 0x45D830, 0x10 + .asciz "TitleButtonSN" + .balign 4 .global $$251582 $$251582: - .incbin "baserom.dol", 0x45D840, 0x10 + .asciz "CheckButtonN" + .balign 4 .global $$251583 $$251583: - .incbin "baserom.dol", 0x45D850, 0xC + .asciz "ListButtonN" .global $$251584 $$251584: - .incbin "baserom.dol", 0x45D85C, 0x10 + .asciz "MusicButtonN" + .balign 4 .global PANES__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 PANES__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .incbin "baserom.dol", 0x45D86C, 0x34 + .4byte 0x804616A0 + .4byte 0x804616B0 + .4byte 0x804616C0 + .4byte 0x804616D0 + .4byte 0x804616DC + .4byte 0x804616EC + .4byte 0x80461700 + .4byte 0x80461710 + .4byte 0x80461720 + .4byte 0x80461730 + .4byte 0x80461740 + .4byte 0x80461750 + .4byte 0x8046175C .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .incbin "baserom.dol", 0x45D8A0, 0x2C + .4byte 0x804616A0 + .4byte 0x80461750 + .4byte 0x804616B0 + .4byte 0x804616D0 + .4byte 0x804616EC + .4byte 0x80461700 + .4byte 0x80461710 + .4byte 0x8046175C + .4byte 0x80461720 + .4byte 0x80461720 + .4byte 0x80461720 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .incbin "baserom.dol", 0x45D8CC, 0x2C + .4byte 0x804616A0 + .4byte 0x80461750 + .4byte 0x804616B0 + .4byte 0x804616D0 + .4byte 0x804616EC + .4byte 0x80461700 + .4byte 0x80461710 + .4byte 0x8046175C + .4byte 0x80461730 + .4byte 0x80461730 + .4byte 0x80461730 .global $$252197 $$252197: - .incbin "baserom.dol", 0x45D8F8, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252198 $$252198: - .incbin "baserom.dol", 0x45D908, 0x10 + .asciz "ProductButton" + .balign 4 .global $$252199 $$252199: - .incbin "baserom.dol", 0x45D918, 0xC + .asciz "TextBox_01" + .balign 4 .global $$252200 $$252200: - .incbin "baserom.dol", 0x45D924, 0xC + .asciz "PlayGame" + .balign 4 .global $$252201 $$252201: - .incbin "baserom.dol", 0x45D930, 0x10 + .asciz "ListButtonN_00" + .balign 4 .global $$252202 $$252202: - .incbin "baserom.dol", 0x45D940, 0x10 + .asciz "WatchAllPackage" .global $$252203 $$252203: - .incbin "baserom.dol", 0x45D950, 0x10 + .asciz "MusicButtonN_00" .global $$252204 $$252204: - .incbin "baserom.dol", 0x45D960, 0x40 + .asciz "ListenMusic" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252301 $$252301: - .incbin "baserom.dol", 0x493378, 0x8 + .asciz "Button" + .balign 4 .global $$252359 $$252359: - .incbin "baserom.dol", 0x493380, 0x8 + .asciz "Choice" + .balign 4 .global $$252371 $$252371: - .incbin "baserom.dol", 0x493388, 0x8 + .asciz "Decide" + .balign 4 .global $$251953 $$251953: - .incbin "baserom.dol", 0x493390, 0x8 + .asciz "Bound" + .balign 4 .global $$251954 $$251954: - .incbin "baserom.dol", 0x493398, 0x8 + .asciz "Button" + .balign 4 .global $$251955 $$251955: - .incbin "baserom.dol", 0x4933A0, 0x8 + .asciz "Choice" + .balign 4 .global $$251956 $$251956: - .incbin "baserom.dol", 0x4933A8, 0x8 + .asciz "Black" + .balign 4 .global $$251965 $$251965: - .incbin "baserom.dol", 0x4933B0, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252265 $$252265: - .incbin "baserom.dol", 0x494AB8, 0x8 + .asciz "CursorN" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252388 $$252388: - .incbin "baserom.dol", 0x49A488, 0x8 + .4byte 0x42700000 + .4byte 0 diff --git a/asm/src/ButtonHelp.s b/asm/src/ButtonHelp.s index b09d1125..7bc209d6 100644 --- a/asm/src/ButtonHelp.s +++ b/asm/src/ButtonHelp.s @@ -184,24 +184,35 @@ init__Q34info6common10ButtonHelpFRCQ23lyt12PaneAccessor: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252014 $$252014: - .incbin "baserom.dol", 0x4534C8, 0xC + .asciz "common/Main" .global $$252015 $$252015: - .incbin "baserom.dol", 0x4534D4, 0x10 + .asciz "CommonButton" + .balign 4 .global $$252016 $$252016: - .incbin "baserom.dol", 0x4534E4, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$252073 $$252073: - .incbin "baserom.dol", 0x4534F0, 0x40 + .asciz "CommonText" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252060 $$252060: - .incbin "baserom.dol", 0x4933B8, 0x8 + .asciz "Push" + .balign 4 .global $$252080 $$252080: - .incbin "baserom.dol", 0x4933C0, 0x8 + .asciz "Wait" + .balign 4 .global $$252081 $$252081: - .incbin "baserom.dol", 0x4933C8, 0x8 + .asciz "Back" + .balign 4 diff --git a/asm/src/ButtonPanel.s b/asm/src/ButtonPanel.s index c53032ee..bd417fb2 100644 --- a/asm/src/ButtonPanel.s +++ b/asm/src/ButtonPanel.s @@ -148,24 +148,30 @@ lbl_801DA740: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252079 $$252079: - .incbin "baserom.dol", 0x459520, 0xC + .asciz "common/Main" .global $$252080 $$252080: - .incbin "baserom.dol", 0x45952C, 0xC + .asciz "ButtonText" + .balign 4 .global $$252123 $$252123: - .incbin "baserom.dol", 0x459538, 0xC + .asciz "GrayChoice" + .balign 4 .global $$252130 $$252130: - .incbin "baserom.dol", 0x459544, 0xC + .asciz "NoChoice" + .balign 4 .global $$252131 $$252131: - .incbin "baserom.dol", 0x459550, 0x10 + .asciz "GrayNoChoice" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252122 $$252122: - .incbin "baserom.dol", 0x493A40, 0x8 + .asciz "Choice" + .balign 4 .global $$252134 $$252134: - .incbin "baserom.dol", 0x493A48, 0x8 + .asciz "Decide" + .balign 4 diff --git a/asm/src/Camera.s b/asm/src/Camera.s index e8b48974..6aacdc54 100644 --- a/asm/src/Camera.s +++ b/asm/src/Camera.s @@ -125,19 +125,21 @@ viewMtx__Q33scn9grandmenu6CameraFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251509 $$251509: - .incbin "baserom.dol", 0x49ED30, 0x4 + .4byte 0x42480000 .global $$251510 $$251510: - .incbin "baserom.dol", 0x49ED34, 0x4 + .4byte 0x3FB40000 .global $$251513 $$251513: - .incbin "baserom.dol", 0x49ED38, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251526 $$251526: - .incbin "baserom.dol", 0x49ED40, 0x4 + .4byte 0x3F800000 .global $$251528 $$251528: - .incbin "baserom.dol", 0x49ED44, 0x4 + .4byte 0x447A0000 .global $$251536 $$251536: - .incbin "baserom.dol", 0x49ED48, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/CameraAccessor.s b/asm/src/CameraAccessor.s index 2486975d..236e3312 100644 --- a/asm/src/CameraAccessor.s +++ b/asm/src/CameraAccessor.s @@ -605,20 +605,25 @@ toLayoutPos__Q43scn4step6camera14CameraAccessorCFQ43scn4step6camera4KindRCQ33hel .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv$$20 $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv$$20: - .incbin "baserom.dol", 0x450258, 0x28 + .asciz "NW4R:Pointer must not be NULL (mpData)" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv: - .incbin "baserom.dol", 0x450280, 0x18 + .asciz "g3d_rescommon_ac.h" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step6camera13ParamAccessorFv $$2STRING$$2__ct__Q43scn4step6camera13ParamAccessorFv: - .incbin "baserom.dol", 0x467228, 0x18 + .asciz "step/camera/Camera" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252507 $$252507: - .incbin "baserom.dol", 0x49B5F8, 0x4 + .4byte 0 .global $$252508 $$252508: - .incbin "baserom.dol", 0x49B5FC, 0x4 + .4byte 0x42C80000 diff --git a/asm/src/CameraController.s b/asm/src/CameraController.s index 27bb3e11..ccbc48ab 100644 --- a/asm/src/CameraController.s +++ b/asm/src/CameraController.s @@ -1899,43 +1899,45 @@ lbl_80264A1C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258912 $$258912: - .incbin "baserom.dol", 0x49B600, 0x4 + .4byte 0 .global $$258913 $$258913: - .incbin "baserom.dol", 0x49B604, 0x4 + .4byte 0x3F800000 .global $$259031 $$259031: - .incbin "baserom.dol", 0x49B608, 0x4 + .4byte 0x3FC00000 .global $$259032 $$259032: - .incbin "baserom.dol", 0x49B60C, 0x4 + .4byte 0xBF000000 .global $$259033 $$259033: - .incbin "baserom.dol", 0x49B610, 0x4 + .4byte 0x3E800000 .global $$259034 $$259034: - .incbin "baserom.dol", 0x49B614, 0x4 + .4byte 0x40800000 .global $$259035 $$259035: - .incbin "baserom.dol", 0x49B618, 0x4 + .4byte 0x3C23D70A .global $$259036 $$259036: - .incbin "baserom.dol", 0x49B61C, 0x4 + .4byte 0x3D4CCCCD .global $$259039 $$259039: - .incbin "baserom.dol", 0x49B620, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$259093 $$259093: - .incbin "baserom.dol", 0x49B628, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259119 $$259119: - .incbin "baserom.dol", 0x49B630, 0x4 + .4byte 0x3F000000 .global $$259190 $$259190: - .incbin "baserom.dol", 0x49B634, 0x4 + .4byte 0x3CC90FDB .global $$259191 $$259191: - .incbin "baserom.dol", 0x49B638, 0x4 + .4byte 0x4222F983 .global $$259192 $$259192: - .incbin "baserom.dol", 0x49B63C, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/src/CameraCtrl.s b/asm/src/CameraCtrl.s index a1384537..b23f37bc 100644 --- a/asm/src/CameraCtrl.s +++ b/asm/src/CameraCtrl.s @@ -747,33 +747,35 @@ __vc__Q33hel6common75MutableArray$$0Q63scn4step7gimmick11areamapdemo10CameraCtrl .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252141 $$252141: - .incbin "baserom.dol", 0x49AB58, 0x4 + .4byte 0xBF402FF9 .global $$252142 $$252142: - .incbin "baserom.dol", 0x49AB5C, 0x4 + .4byte 0x3FD9999A .global $$252143 $$252143: - .incbin "baserom.dol", 0x49AB60, 0x4 + .4byte 0xBF221102 .global $$252144 $$252144: - .incbin "baserom.dol", 0x49AB64, 0x4 + .4byte 0 .global $$252145 $$252145: - .incbin "baserom.dol", 0x49AB68, 0x4 + .4byte 0xBF3358E5 .global $$252146 $$252146: - .incbin "baserom.dol", 0x49AB6C, 0x4 + .4byte 0x40C00000 .global $$252147 $$252147: - .incbin "baserom.dol", 0x49AB70, 0x8 + .4byte 0x42480000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254595 $$254595: - .incbin "baserom.dol", 0x49D130, 0x4 + .4byte 0 .global $$254619 $$254619: - .incbin "baserom.dol", 0x49D134, 0x4 + .4byte 0x3F800000 .global $$254691 $$254691: - .incbin "baserom.dol", 0x49D138, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/CameraInfo.s b/asm/src/CameraInfo.s index 306d97bf..02f9697b 100644 --- a/asm/src/CameraInfo.s +++ b/asm/src/CameraInfo.s @@ -28,7 +28,7 @@ __ct__Q36effect6detail10CameraInfoFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251288 $$251288: - .incbin "baserom.dol", 0x49A170, 0x4 + .4byte 0 .global $$251289 $$251289: - .incbin "baserom.dol", 0x49A174, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/CameraLock.s b/asm/src/CameraLock.s index 731de5f8..8bc2e4e0 100644 --- a/asm/src/CameraLock.s +++ b/asm/src/CameraLock.s @@ -407,7 +407,22 @@ lbl_803033F0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251420 $$251420: - .incbin "baserom.dol", 0x47C390, 0x18 + .asciz "step/gimmick/CameraLock" .global $$251424 $$251424: - .incbin "baserom.dol", 0x47C3A8, 0x40 + .4byte 0x80302F04 + .4byte 0x80302F1C + .4byte 0x80302F34 + .4byte 0x80302F5C + .4byte 0x80302F5C + .4byte 0x80302F5C + .4byte 0x80302F5C + .4byte 0x80302F5C + .4byte 0x80302F88 + .4byte 0x8030301C + .4byte 0x80303034 + .4byte 0x8030304C + .4byte 0x803030E4 + .4byte 0x8030310C + .4byte 0x80303134 + .4byte 0x8030315C diff --git a/asm/src/CameraManager.s b/asm/src/CameraManager.s index b691c9bf..6446aaaa 100644 --- a/asm/src/CameraManager.s +++ b/asm/src/CameraManager.s @@ -345,7 +345,7 @@ lbl_803F90DC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254825 $$254825: - .incbin "baserom.dol", 0x49ED90, 0x4 + .4byte 0 .global $$254849 $$254849: - .incbin "baserom.dol", 0x49ED94, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/CameraSet.s b/asm/src/CameraSet.s index ee7554bd..db033e47 100644 --- a/asm/src/CameraSet.s +++ b/asm/src/CameraSet.s @@ -132,7 +132,7 @@ camera__Q33scn9grandmenu9CameraSetFQ33scn9grandmenu13DrawLayerKind: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251461 $$251461: - .incbin "baserom.dol", 0x49ED50, 0x4 + .4byte 0x41700000 .global $$251462 $$251462: - .incbin "baserom.dol", 0x49ED54, 0x4 + .4byte 0x40E00000 diff --git a/asm/src/CameraTarget.s b/asm/src/CameraTarget.s index 6697de1c..e33533a6 100644 --- a/asm/src/CameraTarget.s +++ b/asm/src/CameraTarget.s @@ -1029,54 +1029,55 @@ lbl_803D373C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256033 $$256033: - .incbin "baserom.dol", 0x49D658, 0x4 + .4byte 0 .global $$256034 $$256034: - .incbin "baserom.dol", 0x49D65C, 0x4 + .4byte 0x3F800000 .global $$256035 $$256035: - .incbin "baserom.dol", 0x49D660, 0x4 + .4byte 0x3E800000 .global $$256036 $$256036: - .incbin "baserom.dol", 0x49D664, 0x4 + .4byte 0x3F000000 .global $$256116 $$256116: - .incbin "baserom.dol", 0x49D668, 0x4 + .4byte 0xB727C5AC .global $$256117 $$256117: - .incbin "baserom.dol", 0x49D66C, 0x4 + .4byte 0x3727C5AC .global $$256118 $$256118: - .incbin "baserom.dol", 0x49D670, 0x4 + .4byte 0x3FC00000 .global $$256119 $$256119: - .incbin "baserom.dol", 0x49D674, 0x4 + .4byte 0xBF000000 .global $$256120 $$256120: - .incbin "baserom.dol", 0x49D678, 0x4 + .4byte 0xC0000000 .global $$256121 $$256121: - .incbin "baserom.dol", 0x49D67C, 0x4 + .4byte 0x40000000 .global $$256122 $$256122: - .incbin "baserom.dol", 0x49D680, 0x4 + .4byte 0x3DCCCCCD .global $$256123 $$256123: - .incbin "baserom.dol", 0x49D684, 0x4 + .4byte 0xC2200000 .global $$256124 $$256124: - .incbin "baserom.dol", 0x49D688, 0x4 + .4byte 0xC1F00000 .global $$256125 $$256125: - .incbin "baserom.dol", 0x49D68C, 0x4 + .4byte 0x42200000 .global $$256126 $$256126: - .incbin "baserom.dol", 0x49D690, 0x4 + .4byte 0x41F00000 .global $$256203 $$256203: - .incbin "baserom.dol", 0x49D694, 0x4 + .4byte 0x3D4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253235 $$253235: - .incbin "baserom.dol", 0x49E840, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/CaptureAttacker.s b/asm/src/CaptureAttacker.s index 217f1670..633f69ac 100644 --- a/asm/src/CaptureAttacker.s +++ b/asm/src/CaptureAttacker.s @@ -960,30 +960,37 @@ setIgnoreMapColl__Q43scn4step4hero15CaptureAttackerFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x47FCD0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x47FCF4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x47FD00, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x47FD24, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x47FD30, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x47FD54, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257629 $$257629: - .incbin "baserom.dol", 0x49D698, 0x4 + .4byte 0 .global $$257836 $$257836: - .incbin "baserom.dol", 0x49D69C, 0x4 + .4byte 0x3F000000 .global $$257837 $$257837: - .incbin "baserom.dol", 0x49D6A0, 0x8 + .4byte 0x461C4000 + .4byte 0 diff --git a/asm/src/CaptureHeroAttacker.s b/asm/src/CaptureHeroAttacker.s index 514e4c20..408c9d61 100644 --- a/asm/src/CaptureHeroAttacker.s +++ b/asm/src/CaptureHeroAttacker.s @@ -783,31 +783,41 @@ lbl_80332D5C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x47FD60, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x47FD84, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x47FD90, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x47FDB4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x47FDC0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x47FDE4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x47FDF0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x47FE14, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x47FE20, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x47FE44, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/CaptureHeroReceiver.s b/asm/src/CaptureHeroReceiver.s index 55bc008b..38efdc5d 100644 --- a/asm/src/CaptureHeroReceiver.s +++ b/asm/src/CaptureHeroReceiver.s @@ -1033,48 +1033,73 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FE50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333B0C + .4byte 0x80333A50 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FE60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333B08 + .4byte 0x80333A6C .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FE70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333B04 + .4byte 0x80333A88 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FE80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333B00 + .4byte 0x80333AA4 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FE90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333AFC + .4byte 0x80333AC0 .global __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FEA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333AF8 + .4byte 0x80333ADC .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x47FEB0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x47FED4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x47FEE0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x47FF04, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x47FF10, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x47FF34, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259086 $$259086: - .incbin "baserom.dol", 0x49D6A8, 0x4 + .4byte 0 .global $$259390 $$259390: - .incbin "baserom.dol", 0x49D6AC, 0x4 + .4byte 0x3ECCCCCD .global $$259421 $$259421: - .incbin "baserom.dol", 0x49D6B0, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/CaptureReceiver.s b/asm/src/CaptureReceiver.s index b558db3d..bf155524 100644 --- a/asm/src/CaptureReceiver.s +++ b/asm/src/CaptureReceiver.s @@ -788,36 +788,47 @@ isIgnoredNonSuper__Q43scn4step5enemy15CaptureReceiverCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x46DB90, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x46DBB4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x46DBC0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x46DBE4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x46DBF0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x46DC14, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x46DC20, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x46DC44, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x46DC50, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x46DC74, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258668 $$258668: - .incbin "baserom.dol", 0x49B930, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/CarryBlock.s b/asm/src/CarryBlock.s index f7bb2d77..837655df 100644 --- a/asm/src/CarryBlock.s +++ b/asm/src/CarryBlock.s @@ -111,23 +111,28 @@ update__Q33scn10grandtitle10CarryBlockFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251790 $$251790: - .incbin "baserom.dol", 0x45C790, 0x18 + .asciz "grandtitle/BlockStar" + .balign 4 .global $$252260 $$252260: - .incbin "baserom.dol", 0x45C7A8, 0x10 + .asciz "CA3BodyJ" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2: - .incbin "baserom.dol", 0x494780, 0x4 + .4byte 0x80460690 .global $$252259 $$252259: - .incbin "baserom.dol", 0x494784, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252261 $$252261: - .incbin "baserom.dol", 0x49AA88, 0x4 + .4byte 0 .global $$252262 $$252262: - .incbin "baserom.dol", 0x49AA8C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/Catcher.s b/asm/src/Catcher.s index edf26d9b..fccbbb7f 100644 --- a/asm/src/Catcher.s +++ b/asm/src/Catcher.s @@ -545,24 +545,31 @@ setIsOwnerHero__Q43scn4step4item7CatcherFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x48DDB8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x48DDDC, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x48DDE8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x48DE0C, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x48DE18, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x48DE3C, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251966 $$251966: - .incbin "baserom.dol", 0x49E4E8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ChainStarter.s b/asm/src/ChainStarter.s index b48c9a7c..7e038b01 100644 --- a/asm/src/ChainStarter.s +++ b/asm/src/ChainStarter.s @@ -92,4 +92,11 @@ onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick12chainstarter12ChainStarter __vt__Q53scn4step7gimmick12chainstarter12ChainStarter: - .incbin "baserom.dol", 0x47C5C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803057FC + .4byte 0x80305858 + .4byte 0x802F7CFC + .4byte 0x802F7CF8 + .4byte 0x802F7CF4 + .4byte 0x802F7CF0 diff --git a/asm/src/Challenge.s b/asm/src/Challenge.s index 10837d24..5cb3c729 100644 --- a/asm/src/Challenge.s +++ b/asm/src/Challenge.s @@ -979,84 +979,107 @@ masterResult__Q53scn4step4info9challenge9ChallengeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253888 $$253888: - .incbin "baserom.dol", 0x48C260, 0x14 + .asciz "step/challenge/Main" .global $$253890 $$253890: - .incbin "baserom.dol", 0x48C274, 0x10 + .asciz "MasterScoreN" + .balign 4 .global $$253893 $$253893: - .incbin "baserom.dol", 0x48C284, 0xC + .asciz "IntervalN" + .balign 4 .global $$253894 $$253894: - .incbin "baserom.dol", 0x48C290, 0x10 + .asciz "ScreenOutBase2N" .global $$253895 $$253895: - .incbin "baserom.dol", 0x48C2A0, 0x10 + .asciz "ScreenOutBaseN" + .balign 4 .global $$253896 $$253896: - .incbin "baserom.dol", 0x48C2B0, 0x10 + .asciz "PassageTimeN" + .balign 4 .global $$253897 $$253897: - .incbin "baserom.dol", 0x48C2C0, 0xC + .asciz "GameOver" + .balign 4 .global $$253898 $$253898: - .incbin "baserom.dol", 0x48C2CC, 0x10 + .asciz "GameOver_Yes" + .balign 4 .global $$253899 $$253899: - .incbin "baserom.dol", 0x48C2DC, 0xC + .asciz "GameOver_No" .global $$253900 $$253900: - .incbin "baserom.dol", 0x48C2E8, 0x10 + .asciz "ResultMenu_Hint" .global $$253901 $$253901: - .incbin "baserom.dol", 0x48C2F8, 0xC + .asciz "common/Main" .global $$253902 $$253902: - .incbin "baserom.dol", 0x48C304, 0x10 + .asciz "ConfirmWindow" + .balign 4 .global $$253904 $$253904: - .incbin "baserom.dol", 0x48C314, 0xC + .asciz "TimeScoreN" + .balign 4 .global $$253905 $$253905: - .incbin "baserom.dol", 0x48C320, 0x18 + .asciz "step/challenge/Master" + .balign 4 .global $$253906 $$253906: - .incbin "baserom.dol", 0x48C338, 0x10 + .asciz "TimeScoreMaster" .global $$253907 $$253907: - .incbin "baserom.dol", 0x48C348, 0x18 + .asciz "step/challenge/Musou" + .balign 4 .global $$253908 $$253908: - .incbin "baserom.dol", 0x48C360, 0x10 + .asciz "TimeScoreMusou" + .balign 4 .global $$253909 $$253909: - .incbin "baserom.dol", 0x48C370, 0x18 + .asciz "step/challenge/Normal" + .balign 4 .global $$253910 $$253910: - .incbin "baserom.dol", 0x48C388, 0x14 + .asciz "TimeScoreChallenge" + .balign 4 .global $$253911 $$253911: - .incbin "baserom.dol", 0x48C39C, 0x3C + .asciz "PictureN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253889 $$253889: - .incbin "baserom.dol", 0x497B18, 0x8 + .asciz "Base" + .balign 4 .global $$253891 $$253891: - .incbin "baserom.dol", 0x497B20, 0x8 + .asciz "ScoreN" + .balign 4 .global $$253892 $$253892: - .incbin "baserom.dol", 0x497B28, 0x8 + .asciz "TimeN" + .balign 4 .global $$253903 $$253903: - .incbin "baserom.dol", 0x497B30, 0x8 + .asciz "Wait" + .balign 4 .global $$254058 $$254058: - .incbin "baserom.dol", 0x497B38, 0x4 + .4byte 0x4F757400 .global $$254061 $$254061: - .incbin "baserom.dol", 0x497B3C, 0x4 + .4byte 0x496E0000 .global $$254064 $$254064: - .incbin "baserom.dol", 0x497B40, 0x8 + .asciz "OutS" + .balign 4 diff --git a/asm/src/ChallengeBattleCtrl.s b/asm/src/ChallengeBattleCtrl.s index fc97d88d..d1c365cd 100644 --- a/asm/src/ChallengeBattleCtrl.s +++ b/asm/src/ChallengeBattleCtrl.s @@ -223,7 +223,13 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FF40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333E00 + .4byte 0x80333DC0 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FF50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80333DFC + .4byte 0x80333DDC diff --git a/asm/src/ChallengeDoor.s b/asm/src/ChallengeDoor.s index c1c61956..58f2d484 100644 --- a/asm/src/ChallengeDoor.s +++ b/asm/src/ChallengeDoor.s @@ -1913,98 +1913,155 @@ __dt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257573 $$257573: - .incbin "baserom.dol", 0x47C900, 0x10 + .asciz "NormalClose00" + .balign 4 .global $$257574 $$257574: - .incbin "baserom.dol", 0x47C910, 0x10 + .asciz "NormalOpen00" + .balign 4 .global $$257575 $$257575: - .incbin "baserom.dol", 0x47C920, 0x10 + .asciz "NormalWait00" + .balign 4 .global T_ANIM_LIST__Q53scn4step7gimmick13challengedoor27$$2unnamed$$2ChallengeDoor_cpp$$2 T_ANIM_LIST__Q53scn4step7gimmick13challengedoor27$$2unnamed$$2ChallengeDoor_cpp$$2: - .incbin "baserom.dol", 0x47C930, 0xC + .4byte 0x80480800 + .4byte 0x80480810 + .4byte 0x80480820 .global $$260101 $$260101: - .incbin "baserom.dol", 0x47C93C, 0x1C + .asciz "step/gimmick/ChallengeDoor" + .balign 4 .global $$260204 $$260204: - .incbin "baserom.dol", 0x47C958, 0x14 + .asciz "GmkDoorChallenge" + .balign 4 .global $$260303 $$260303: - .incbin "baserom.dol", 0x47C96C, 0xC + .asciz "NewRelease" + .balign 4 .global $$260342 $$260342: - .incbin "baserom.dol", 0x47C978, 0x2C + .asciz "Scn.Step.Gimmick.ChallengeDoor.Common.Enter" .global $$260419 $$260419: - .incbin "baserom.dol", 0x47C9A4, 0xC + .asciz "IconConstL" + .balign 4 .global $$260499 $$260499: - .incbin "baserom.dol", 0x47C9B0, 0xC + .asciz "CopperGet" + .balign 4 .global $$260501 $$260501: - .incbin "baserom.dol", 0x47C9BC, 0xC + .asciz "SilverGet" + .balign 4 .global $$260505 $$260505: - .incbin "baserom.dol", 0x47C9C8, 0x10 + .asciz "KingCrownGet" + .balign 4 .global $$260506 $$260506: - .incbin "baserom.dol", 0x47C9D8, 0xC + .asciz "KingCrown" + .balign 4 .global $$260507 $$260507: - .incbin "baserom.dol", 0x47C9E4, 0xC + .asciz "PlatinumGet" .global $$260508 $$260508: - .incbin "baserom.dol", 0x47C9F0, 0x10 + .asciz "Platinum" + .balign 4 + .4byte 0 .global __vt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1 __vt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1: - .incbin "baserom.dol", 0x47CA00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80307ECC + .4byte 0x80307EA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step7gimmick13challengedoor13ChallengeDoor __vt__Q53scn4step7gimmick13challengedoor13ChallengeDoor: - .incbin "baserom.dol", 0x47CA20, 0x88 + .4byte 0 + .4byte 0 + .4byte 0x80306740 + .4byte 0 + .4byte 0x80306848 + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x80306D78 + .4byte 0x802FC218 + .4byte 0x80305FC4 + .4byte 0x803076D8 + .4byte 0x803076DC + .4byte 0x803076E0 + .4byte 0x803076E4 + .4byte 0x80307C68 + .4byte 0x80307BA0 + .4byte 0x80307BC8 + .4byte 0x80307C24 + .4byte 0x803079C0 + .4byte 0x803079CC + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260205 $$260205: - .incbin "baserom.dol", 0x496990, 0x8 + .asciz "TopL" + .balign 4 .global $$260206 $$260206: - .incbin "baserom.dol", 0x496998, 0x8 + .asciz "Main" + .balign 4 .global $$260207 $$260207: - .incbin "baserom.dol", 0x4969A0, 0x8 + .asciz "EffectL" .global $$260304 $$260304: - .incbin "baserom.dol", 0x4969A8, 0x4 + .4byte 0x4E657700 .global $$260498 $$260498: - .incbin "baserom.dol", 0x4969AC, 0x8 + .asciz "Normal" + .balign 4 .global $$260500 $$260500: - .incbin "baserom.dol", 0x4969B4, 0x8 + .asciz "Copper" + .balign 4 .global $$260502 $$260502: - .incbin "baserom.dol", 0x4969BC, 0xC + .asciz "Silver" + .balign 4 + .4byte 0 .global $$260503 $$260503: - .incbin "baserom.dol", 0x4969C8, 0x8 + .asciz "GoldGet" .global $$260504 $$260504: - .incbin "baserom.dol", 0x4969D0, 0x8 + .asciz "Gold" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260317 $$260317: - .incbin "baserom.dol", 0x49D2D0, 0x4 + .4byte 0x3F800000 .global $$260318 $$260318: - .incbin "baserom.dol", 0x49D2D4, 0x4 + .4byte 0x40000000 .global $$260331 $$260331: - .incbin "baserom.dol", 0x49D2D8, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .global $$260394 $$260394: - .incbin "baserom.dol", 0x49D2E0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$260420 $$260420: - .incbin "baserom.dol", 0x49D2E8, 0x8 + .4byte 0xBDCCCCCD + .4byte 0 diff --git a/asm/src/ChallengeDoorMaster.s b/asm/src/ChallengeDoorMaster.s index 2bfa8345..97a1d5da 100644 --- a/asm/src/ChallengeDoorMaster.s +++ b/asm/src/ChallengeDoorMaster.s @@ -861,133 +861,201 @@ kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$255380 $$255380: - .incbin "baserom.dol", 0x415AA8, 0x34 + .4byte 0x80480A34 + .4byte 0x80480A40 + .4byte 0x80480A4C + .4byte 0x80480A58 + .4byte 0x80480A64 + .4byte 0x80480A70 + .4byte 0x80480A7C + .4byte 0x80480A8C + .4byte 0x80480A98 + .4byte 0x80480AA4 + .4byte 0x80480AB0 + .4byte 0x80480ABC + .4byte 0x80480AC8 .global $$255490 $$255490: - .incbin "baserom.dol", 0x415ADC, 0xC + .4byte 0x8055A60C + .4byte 0x8055A614 + .4byte 0x8055A61C .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256036 $$256036: - .incbin "baserom.dol", 0x47CAA8, 0x24 + .asciz "step/gimmick/ChallengeMasterBoard" + .balign 4 .global $$256038 $$256038: - .incbin "baserom.dol", 0x47CACC, 0x24 + .asciz "step/gimmick/DoorChallengeMaster" + .balign 4 .global $$256159 $$256159: - .incbin "baserom.dol", 0x47CAF0, 0x38 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockMasterDoor" + .balign 4 .global $$256193 $$256193: - .incbin "baserom.dol", 0x47CB28, 0xC + .asciz "ChainBlake" + .balign 4 .global $$255367 $$255367: - .incbin "baserom.dol", 0x47CB34, 0xC + .asciz "Chain00L" + .balign 4 .global $$255368 $$255368: - .incbin "baserom.dol", 0x47CB40, 0xC + .asciz "Chain01L" + .balign 4 .global $$255369 $$255369: - .incbin "baserom.dol", 0x47CB4C, 0xC + .asciz "Chain02L" + .balign 4 .global $$255370 $$255370: - .incbin "baserom.dol", 0x47CB58, 0xC + .asciz "Chain03L" + .balign 4 .global $$255371 $$255371: - .incbin "baserom.dol", 0x47CB64, 0xC + .asciz "Chain04L" + .balign 4 .global $$255372 $$255372: - .incbin "baserom.dol", 0x47CB70, 0xC + .asciz "Chain05L" + .balign 4 .global $$255373 $$255373: - .incbin "baserom.dol", 0x47CB7C, 0x10 + .asciz "Chain06Lcenter" + .balign 4 .global $$255374 $$255374: - .incbin "baserom.dol", 0x47CB8C, 0xC + .asciz "Chain07L" + .balign 4 .global $$255375 $$255375: - .incbin "baserom.dol", 0x47CB98, 0xC + .asciz "Chain08L" + .balign 4 .global $$255376 $$255376: - .incbin "baserom.dol", 0x47CBA4, 0xC + .asciz "Chain09L" + .balign 4 .global $$255377 $$255377: - .incbin "baserom.dol", 0x47CBB0, 0xC + .asciz "Chain10L" + .balign 4 .global $$255378 $$255378: - .incbin "baserom.dol", 0x47CBBC, 0xC + .asciz "Chain11L" + .balign 4 .global $$255379 $$255379: - .incbin "baserom.dol", 0x47CBC8, 0xC + .asciz "Chain12L" + .balign 4 .global $$256269 $$256269: - .incbin "baserom.dol", 0x47CBD4, 0xC + .asciz "LockWait03" + .balign 4 .global $$256270 $$256270: - .incbin "baserom.dol", 0x47CBE0, 0xC + .asciz "LockWait04" + .balign 4 .global $$256271 $$256271: - .incbin "baserom.dol", 0x47CBEC, 0x10 + .asciz "NormalWait00" + .balign 4 .global $$256272 $$256272: - .incbin "baserom.dol", 0x47CBFC, 0xC + .asciz "LockWait00" + .balign 4 .global $$256273 $$256273: - .incbin "baserom.dol", 0x47CC08, 0xC + .asciz "LockWait01" + .balign 4 .global $$256274 $$256274: - .incbin "baserom.dol", 0x47CC14, 0xC + .asciz "LockWait02" + .balign 4 .global $$256295 $$256295: - .incbin "baserom.dol", 0x47CC20, 0xC + .asciz "LockBlake03" .global $$256296 $$256296: - .incbin "baserom.dol", 0x47CC2C, 0xC + .asciz "LockBlake04" .global $$256297 $$256297: - .incbin "baserom.dol", 0x47CC38, 0xC + .asciz "LockBlake00" .global $$256298 $$256298: - .incbin "baserom.dol", 0x47CC44, 0xC + .asciz "LockBlake01" .global $$256299 $$256299: - .incbin "baserom.dol", 0x47CC50, 0xC + .asciz "LockBlake02" .global __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMaster __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMaster: - .incbin "baserom.dol", 0x47CC5C, 0x84 + .4byte 0 + .4byte 0 + .4byte 0x80308064 + .4byte 0x80308A50 + .4byte 0x803080E8 + .4byte 0x8030811C + .4byte 0x80308130 + .4byte 0x80308144 + .4byte 0x80308198 + .4byte 0x80308234 + .4byte 0x80308348 + .4byte 0x803083A8 + .4byte 0x80308440 + .4byte 0x803083F8 + .4byte 0x80308450 + .4byte 0x80307C68 + .4byte 0x803086D0 + .4byte 0x803086F8 + .4byte 0x80307C24 + .4byte 0x80308720 + .4byte 0x80308724 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256037 $$256037: - .incbin "baserom.dol", 0x4969D8, 0x4 + .4byte 0 .global $$255478 $$255478: - .incbin "baserom.dol", 0x4969DC, 0x8 + .asciz "Lock4L" + .balign 4 .global $$255479 $$255479: - .incbin "baserom.dol", 0x4969E4, 0x8 + .asciz "Lock5L" + .balign 4 .global $$255487 $$255487: - .incbin "baserom.dol", 0x4969EC, 0x8 + .asciz "Lock1L" + .balign 4 .global $$255488 $$255488: - .incbin "baserom.dol", 0x4969F4, 0x8 + .asciz "Lock2L" + .balign 4 .global $$255489 $$255489: - .incbin "baserom.dol", 0x4969FC, 0xC + .asciz "Lock3L" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256039 $$256039: - .incbin "baserom.dol", 0x49D2F0, 0x4 + .4byte 0 .global $$256157 $$256157: - .incbin "baserom.dol", 0x49D2F4, 0x4 + .4byte 0x40400000 .global $$256158 $$256158: - .incbin "baserom.dol", 0x49D2F8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$255480 $$255480: - .incbin "baserom.dol", 0x49D300, 0x4 + .4byte 0x8055A5FC .global lbl_805627C4 lbl_805627C4: - .incbin "baserom.dol", 0x49D304, 0x4 + .4byte 0x8055A604 diff --git a/asm/src/ChallengeDoorMasterEx.s b/asm/src/ChallengeDoorMasterEx.s index 6b6411ec..55c38dd4 100644 --- a/asm/src/ChallengeDoorMasterEx.s +++ b/asm/src/ChallengeDoorMasterEx.s @@ -472,42 +472,74 @@ kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256569 $$256569: - .incbin "baserom.dol", 0x47CCE0, 0x24 + .asciz "step/gimmick/ChallengeMasterBoard" + .balign 4 .global $$256571 $$256571: - .incbin "baserom.dol", 0x47CD04, 0x24 + .asciz "step/gimmick/DoorChallengeMasterLv4" .global $$256631 $$256631: - .incbin "baserom.dol", 0x47CD28, 0x3C + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockMasterExDoor" + .balign 4 .global $$256636 $$256636: - .incbin "baserom.dol", 0x47CD64, 0x14 + .asciz "DoorAppearance00" + .balign 4 .global $$256688 $$256688: - .incbin "baserom.dol", 0x47CD78, 0x10 + .asciz "NormalWait00" + .balign 4 .global $$256691 $$256691: - .incbin "baserom.dol", 0x47CD88, 0xC + .asciz "locator21" + .balign 4 .global $$256692 $$256692: - .incbin "baserom.dol", 0x47CD94, 0xC + .asciz "locator18" + .balign 4 .global $$256693 $$256693: - .incbin "baserom.dol", 0x47CDA0, 0xC + .asciz "locator19" + .balign 4 .global __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx: - .incbin "baserom.dol", 0x47CDAC, 0x84 + .4byte 0 + .4byte 0 + .4byte 0x80308AE8 + .4byte 0x803090CC + .4byte 0x80308B54 + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x80308BB4 + .4byte 0x80308C10 + .4byte 0x80308C54 + .4byte 0x803076D8 + .4byte 0x80308CA0 + .4byte 0x803076E0 + .4byte 0x80308CFC + .4byte 0x80307C68 + .4byte 0x80308D84 + .4byte 0x80309054 + .4byte 0x80308D88 + .4byte 0x8030904C + .4byte 0x80309050 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256570 $$256570: - .incbin "baserom.dol", 0x496A08, 0x8 + .4byte 0 + .4byte 0 .global $$256687 $$256687: - .incbin "baserom.dol", 0x496A10, 0x8 + .asciz "AnimL52" .global $$256689 $$256689: - .incbin "baserom.dol", 0x496A18, 0x8 + .asciz "AnimL50" .global $$256690 $$256690: - .incbin "baserom.dol", 0x496A20, 0x8 + .asciz "AnimL51" diff --git a/asm/src/ChallengeDoorMusou.s b/asm/src/ChallengeDoorMusou.s index 8ec34f27..673335b7 100644 --- a/asm/src/ChallengeDoorMusou.s +++ b/asm/src/ChallengeDoorMusou.s @@ -253,32 +253,61 @@ kind__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254958 $$254958: - .incbin "baserom.dol", 0x47CE30, 0x18 + .asciz "FighterDoorAppearance00" .global $$254959 $$254959: - .incbin "baserom.dol", 0x47CE48, 0x1C + .asciz "SumaburaDoorAppearance00" + .balign 4 .global $$254966 $$254966: - .incbin "baserom.dol", 0x47CE64, 0x24 + .asciz "step/gimmick/ChallengeMusouBoard" + .balign 4 .global $$254967 $$254967: - .incbin "baserom.dol", 0x47CE88, 0x20 + .asciz "step/gimmick/ChallengeMusouIcon" .global $$254968 $$254968: - .incbin "baserom.dol", 0x47CEA8, 0x20 + .asciz "step/gimmick/DoorChallengeMusou" .global $$255023 $$255023: - .incbin "baserom.dol", 0x47CEC8, 0x34 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockDoor" + .balign 4 .global __vt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusou __vt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusou: - .incbin "baserom.dol", 0x47CEFC, 0x84 + .4byte 0 + .4byte 0 + .4byte 0x8030918C + .4byte 0x80309410 + .4byte 0x803091F8 + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x80306D78 + .4byte 0x80309278 + .4byte 0x803092BC + .4byte 0x803076D8 + .4byte 0x80309300 + .4byte 0x803076E0 + .4byte 0x80309354 + .4byte 0x80307C68 + .4byte 0x80307BA0 + .4byte 0x80307BC8 + .4byte 0x80307C24 + .4byte 0x803079C0 + .4byte 0x803079CC + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254960 $$254960: - .incbin "baserom.dol", 0x496A28, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255018 $$255018: - .incbin "baserom.dol", 0x49D308, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ChallengeDoorMusouEx.s b/asm/src/ChallengeDoorMusouEx.s index 3f6e67b6..457fc6f0 100644 --- a/asm/src/ChallengeDoorMusouEx.s +++ b/asm/src/ChallengeDoorMusouEx.s @@ -354,42 +354,75 @@ kind__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256569 $$256569: - .incbin "baserom.dol", 0x47CF80, 0x24 + .asciz "step/gimmick/ChallengeMusouBoard" + .balign 4 .global $$256571 $$256571: - .incbin "baserom.dol", 0x47CFA4, 0x1C + .asciz "step/gimmick/DoorMusouEx" + .balign 4 .global $$256631 $$256631: - .incbin "baserom.dol", 0x47CFC0, 0x38 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockMusouExDoor" .global $$256636 $$256636: - .incbin "baserom.dol", 0x47CFF8, 0x14 + .asciz "DoorAppearance00" + .balign 4 .global $$256692 $$256692: - .incbin "baserom.dol", 0x47D00C, 0x10 + .asciz "NormalWait00" + .balign 4 .global $$256695 $$256695: - .incbin "baserom.dol", 0x47D01C, 0xC + .asciz "locator21" + .balign 4 .global $$256696 $$256696: - .incbin "baserom.dol", 0x47D028, 0xC + .asciz "locator18" + .balign 4 .global $$256697 $$256697: - .incbin "baserom.dol", 0x47D034, 0xC + .asciz "locator19" + .balign 4 .global __vt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouEx __vt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouEx: - .incbin "baserom.dol", 0x47D040, 0x88 + .4byte 0 + .4byte 0 + .4byte 0x803094A8 + .4byte 0x803098D4 + .4byte 0x803094AC + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x8030950C + .4byte 0x80309510 + .4byte 0x80309554 + .4byte 0x803076D8 + .4byte 0x803095A0 + .4byte 0x803076E0 + .4byte 0x803095FC + .4byte 0x80307C68 + .4byte 0x80309600 + .4byte 0x80309604 + .4byte 0x80309608 + .4byte 0x803098CC + .4byte 0x803098D0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256570 $$256570: - .incbin "baserom.dol", 0x496A30, 0x8 + .4byte 0 + .4byte 0 .global $$256691 $$256691: - .incbin "baserom.dol", 0x496A38, 0x8 + .asciz "AnimL52" .global $$256693 $$256693: - .incbin "baserom.dol", 0x496A40, 0x8 + .asciz "AnimL50" .global $$256694 $$256694: - .incbin "baserom.dol", 0x496A48, 0x8 + .asciz "AnimL51" diff --git a/asm/src/ChallengeDoorNormal.s b/asm/src/ChallengeDoorNormal.s index 6cc4aba1..95f1eb0a 100644 --- a/asm/src/ChallengeDoorNormal.s +++ b/asm/src/ChallengeDoorNormal.s @@ -176,44 +176,79 @@ kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254974 $$254974: - .incbin "baserom.dol", 0x47D0C8, 0x18 + .asciz "SwordDoorAppearance00" + .balign 4 .global $$254975 $$254975: - .incbin "baserom.dol", 0x47D0E0, 0x18 + .asciz "ParasolDoorAppearance00" .global $$254976 $$254976: - .incbin "baserom.dol", 0x47D0F8, 0x18 + .asciz "SparkDoorAppearance00" + .balign 4 .global $$254977 $$254977: - .incbin "baserom.dol", 0x47D110, 0x18 + .asciz "WhipDoorAppearance00" + .balign 4 .global $$254978 $$254978: - .incbin "baserom.dol", 0x47D128, 0x18 + .asciz "WingDoorAppearance00" + .balign 4 .global $$254979 $$254979: - .incbin "baserom.dol", 0x47D140, 0x18 + .asciz "NormalDoorAppearance00" + .balign 4 .global $$254986 $$254986: - .incbin "baserom.dol", 0x47D158, 0x1C + .asciz "step/gimmick/ChallengeBoard" .global $$254987 $$254987: - .incbin "baserom.dol", 0x47D174, 0x1C + .asciz "step/gimmick/ChallengeIcon" + .balign 4 .global $$254988 $$254988: - .incbin "baserom.dol", 0x47D190, 0x1C + .asciz "step/gimmick/DoorChallenge" + .balign 4 .global $$255043 $$255043: - .incbin "baserom.dol", 0x47D1AC, 0x34 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockDoor" + .balign 4 .global __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormal __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormal: - .incbin "baserom.dol", 0x47D1E0, 0x88 + .4byte 0 + .4byte 0 + .4byte 0x803099D4 + .4byte 0x80309AF8 + .4byte 0x803099D8 + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x80306D78 + .4byte 0x80309A58 + .4byte 0x80309A9C + .4byte 0x803076D8 + .4byte 0x80309AA0 + .4byte 0x803076E0 + .4byte 0x80309AF4 + .4byte 0x80307C68 + .4byte 0x80307BA0 + .4byte 0x80307BC8 + .4byte 0x80307C24 + .4byte 0x803079C0 + .4byte 0x803079CC + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254980 $$254980: - .incbin "baserom.dol", 0x496A50, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255038 $$255038: - .incbin "baserom.dol", 0x49D310, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ChallengeDoorTraining.s b/asm/src/ChallengeDoorTraining.s index 7f2f8441..e23079e0 100644 --- a/asm/src/ChallengeDoorTraining.s +++ b/asm/src/ChallengeDoorTraining.s @@ -172,18 +172,42 @@ kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254623 $$254623: - .incbin "baserom.dol", 0x47D268, 0x24 + .asciz "step/gimmick/DoorChallengeTraining" + .balign 4 .global $$254636 $$254636: - .incbin "baserom.dol", 0x47D28C, 0x34 + .asciz "Scn.Step.Gimmick.ChallengeDoor.Unlock.UnlockDoor" + .balign 4 .global $$254641 $$254641: - .incbin "baserom.dol", 0x47D2C0, 0x14 + .asciz "DoorAppearance00" + .balign 4 .global __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTraining __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTraining: - .incbin "baserom.dol", 0x47D2D4, 0x54 + .4byte 0 + .4byte 0 + .4byte 0x80309B6C + .4byte 0x80309D08 + .4byte 0x80309BC8 + .4byte 0x80306D6C + .4byte 0x80306D70 + .4byte 0x80306D74 + .4byte 0x80306D78 + .4byte 0x80309C1C + .4byte 0x80309C60 + .4byte 0x803076D8 + .4byte 0x80309C64 + .4byte 0x803076E0 + .4byte 0x80309CB0 + .4byte 0x80309D04 + .4byte 0x80309CB4 + .4byte 0x80309CDC + .4byte 0x80307C24 + .4byte 0x803079C0 + .4byte 0x803079CC .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254622 $$254622: - .incbin "baserom.dol", 0x496A58, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ChallengeKindUtil.s b/asm/src/ChallengeKindUtil.s index 9af3c6e2..f1583adf 100644 --- a/asm/src/ChallengeKindUtil.s +++ b/asm/src/ChallengeKindUtil.s @@ -277,119 +277,308 @@ TitleLayoutContext__Q33scn4step17ChallengeKindUtilFQ33scn4step13ChallengeKindRQ2 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2 T_INFOS__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2: - .incbin "baserom.dol", 0x412288, 0x200 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x80558DA0 + .4byte 0x80558DA0 + .4byte 0x80558DA8 + .4byte 0x80558DA0 + .4byte 0 + .4byte 0x40400000 + .4byte 0x0000000B + .4byte 0x00000005 + .4byte 0x80558DB0 + .4byte 0x80558DB0 + .4byte 0x80558DB8 + .4byte 0x80558DB0 + .4byte 0x00000022 + .4byte 0x3F800000 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x80558DBC + .4byte 0x80558DBC + .4byte 0x80558DC4 + .4byte 0x80558DBC + .4byte 0x0000000F + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80558DC8 + .4byte 0x80558DC8 + .4byte 0x80558DD0 + .4byte 0x80558DD4 + .4byte 0x00000026 + .4byte 0x40000000 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x80558DDC + .4byte 0x80558DDC + .4byte 0x80558DE4 + .4byte 0x80558DDC + .4byte 0x0000000B + .4byte 0x40A00000 + .4byte 0x00000015 + .4byte 0x00000007 + .4byte 0x80558DE8 + .4byte 0x80558DE8 + .4byte 0x80558DF0 + .4byte 0x80558DE8 + .4byte 0x00000019 + .4byte 0x40C00000 + .4byte 0x00000013 + .4byte 0x00000006 + .4byte 0x80558DF4 + .4byte 0x80558DF4 + .4byte 0x80558DFC + .4byte 0x80558DF4 + .4byte 0x0000001A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80558E00 + .4byte 0x80558E00 + .4byte 0x80558E08 + .4byte 0x80558DD4 + .4byte 0x00000027 + .4byte 0x41000000 + .4byte 0x00000018 + .4byte 0x00000008 + .4byte 0x80558E0C + .4byte 0x80558E0C + .4byte 0x80558E14 + .4byte 0x80558E0C + .4byte 0x00000013 + .4byte 0x40E00000 + .4byte 0 + .4byte 0 + .4byte 0x80558DD4 + .4byte 0x80558DD4 + .4byte 0x80558E18 + .4byte 0x80558DD4 + .4byte 0x0000001E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80558E20 + .4byte 0x80558E20 + .4byte 0x80558E28 + .4byte 0x80558DD4 + .4byte 0x00000028 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80558E30 + .4byte 0x80558E30 + .4byte 0x80558E38 + .4byte 0x80558DD4 + .4byte 0x00000029 + .4byte 0x41000000 + .4byte 0x00000018 + .4byte 0x00000008 + .4byte 0x80558E40 + .4byte 0x80558E0C + .4byte 0x80558E48 + .4byte 0x80558E0C + .4byte 0x00000004 + .4byte 0x41000000 + .4byte 0 + .4byte 0 + .4byte 0x804639F8 + .4byte 0x804639F8 + .4byte 0x80558E50 + .4byte 0x80558DD4 + .4byte 0x0000002A + .4byte 0x41000000 + .4byte 0 + .4byte 0 + .4byte 0x80463A04 + .4byte 0x80463A04 + .4byte 0x80558E54 + .4byte 0x80558DD4 + .4byte 0x0000002B + .4byte 0x41000000 + .4byte 0 + .4byte 0 + .4byte 0x80463A10 + .4byte 0x80463A10 + .4byte 0x80558E58 + .4byte 0x80558DD4 + .4byte 0x0000002C .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248772 $$248772: - .incbin "baserom.dol", 0x45FAF8, 0xC + .asciz "Ability1" + .balign 4 .global $$248774 $$248774: - .incbin "baserom.dol", 0x45FB04, 0xC + .asciz "Ability2" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x45FB10, 0xC + .asciz "Ability3" + .balign 4 .global $$249088 $$249088: - .incbin "baserom.dol", 0x45FB1C, 0x18 + .asciz "Challengetutorial%s.dn" + .balign 4 .global $$249111 $$249111: - .incbin "baserom.dol", 0x45FB34, 0xC + .asciz "%sChallenge" .global $$249157 $$249157: - .incbin "baserom.dol", 0x45FB40, 0xB4 + .4byte 0x8021CFCC ;# ptr + .4byte 0x8021CFCC ;# ptr + .4byte 0x8021CFCC ;# ptr + .4byte 0x8021CFCC ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFD4 ;# ptr + .4byte 0x8021CFDC ;# ptr + .4byte 0x8021CFDC ;# ptr + .4byte 0x8021CFDC ;# ptr + .4byte 0x8021CFDC ;# ptr + .4byte 0x8021CFE4 ;# ptr + .4byte 0x8021CFE4 ;# ptr + .4byte 0x8021CFE4 ;# ptr + .4byte 0x8021CFE4 ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFEC ;# ptr + .4byte 0x8021CFF4 ;# ptr + .4byte 0x8021CFFC ;# ptr + .4byte 0x8021CFFC ;# ptr + .4byte 0x8021CFFC ;# ptr + .4byte 0x8021CFFC ;# ptr + .4byte 0x8021D004 ;# ptr + .4byte 0x8021D004 ;# ptr + .4byte 0x8021D004 ;# ptr + .4byte 0x8021D004 ;# ptr + .4byte 0x8021D00C ;# ptr + .4byte 0x8021D00C ;# ptr + .4byte 0x8021D00C ;# ptr + .4byte 0x8021D00C ;# ptr + .4byte 0x8021D014 ;# ptr + .4byte 0x8021D01C ;# ptr + .4byte 0x8021D024 ;# ptr + .4byte 0x8021D02C ;# ptr + .4byte 0x8021D034 ;# ptr + .4byte 0x8021D03C ;# ptr + .4byte 0x8021D044 ;# ptr .global $$249159 $$249159: - .incbin "baserom.dol", 0x45FBF4, 0x1C + .asciz "step/challenge/Title%s" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248746 $$248746: - .incbin "baserom.dol", 0x495180, 0x8 + .asciz "Sword" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x495188, 0x8 + .4byte 0x53770000 + .4byte 0 .global $$248748 $$248748: - .incbin "baserom.dol", 0x495190, 0x8 + .asciz "Parasol" .global $$248749 $$248749: - .incbin "baserom.dol", 0x495198, 0x4 + .4byte 0x50610000 .global $$248750 $$248750: - .incbin "baserom.dol", 0x49519C, 0x8 + .asciz "Spark" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x4951A4, 0x4 + .4byte 0x53700000 .global $$248752 $$248752: - .incbin "baserom.dol", 0x4951A8, 0x8 + .asciz "Master1" .global $$248753 $$248753: - .incbin "baserom.dol", 0x4951B0, 0x4 + .4byte 0x4D310000 .global $$248754 $$248754: - .incbin "baserom.dol", 0x4951B4, 0x8 + .asciz "Normal" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x4951BC, 0x8 + .asciz "Whip" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x4951C4, 0x4 + .4byte 0x57680000 .global $$248757 $$248757: - .incbin "baserom.dol", 0x4951C8, 0x8 + .asciz "Fighter" .global $$248758 $$248758: - .incbin "baserom.dol", 0x4951D0, 0x4 + .4byte 0x46670000 .global $$248759 $$248759: - .incbin "baserom.dol", 0x4951D4, 0x8 + .asciz "Wing" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x4951DC, 0x4 + .4byte 0x57690000 .global $$248761 $$248761: - .incbin "baserom.dol", 0x4951E0, 0x8 + .asciz "Master2" .global $$248762 $$248762: - .incbin "baserom.dol", 0x4951E8, 0x4 + .4byte 0x4D320000 .global $$248763 $$248763: - .incbin "baserom.dol", 0x4951EC, 0x8 + .asciz "Smash" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x4951F4, 0x4 + .4byte 0x536D0000 .global $$248765 $$248765: - .incbin "baserom.dol", 0x4951F8, 0x8 + .4byte 0x4E6F0000 + .4byte 0 .global $$248766 $$248766: - .incbin "baserom.dol", 0x495200, 0x8 + .asciz "Master3" .global $$248767 $$248767: - .incbin "baserom.dol", 0x495208, 0x8 + .4byte 0x4D330000 + .4byte 0 .global $$248768 $$248768: - .incbin "baserom.dol", 0x495210, 0x8 + .asciz "Master4" .global $$248769 $$248769: - .incbin "baserom.dol", 0x495218, 0x8 + .4byte 0x4D340000 + .4byte 0 .global $$248770 $$248770: - .incbin "baserom.dol", 0x495220, 0x8 + .asciz "Smashex" .global $$248771 $$248771: - .incbin "baserom.dol", 0x495228, 0x8 + .asciz "SmEx" + .balign 4 .global $$248773 $$248773: - .incbin "baserom.dol", 0x495230, 0x4 + .4byte 0x41310000 .global $$248775 $$248775: - .incbin "baserom.dol", 0x495234, 0x4 + .4byte 0x41320000 .global $$248777 $$248777: - .incbin "baserom.dol", 0x495238, 0x8 + .4byte 0x41330000 + .4byte 0 .global $$249160 $$249160: - .incbin "baserom.dol", 0x495240, 0x8 + .asciz "Title%s" diff --git a/asm/src/Chara.s b/asm/src/Chara.s index fa473c8f..2b6cc8c1 100644 --- a/asm/src/Chara.s +++ b/asm/src/Chara.s @@ -2352,225 +2352,332 @@ lbl_8020243C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2: - .incbin "baserom.dol", 0x411720, 0x54 + .4byte 0x80557CB8 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CC0 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CC8 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CD0 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CD8 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CE0 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 + .4byte 0x80557CE8 + .4byte 0x8045EAD0 + .4byte 0x8045EAF0 .global $$253282 $$253282: - .incbin "baserom.dol", 0x411774, 0x14 + .4byte 0x8045EB08 + .4byte 0x8045EB18 + .4byte 0x8045EB28 + .4byte 0x8045EB38 + .4byte 0x8045EB48 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2: - .incbin "baserom.dol", 0x411BF0, 0x84 + .4byte 0x805583B0 + .4byte 0x804606B8 + .4byte 0x804606B8 + .4byte 0x805583B8 + .4byte 0x804606CC + .4byte 0x804606CC + .4byte 0x805583C0 + .4byte 0x804606E4 + .4byte 0x804606E4 + .4byte 0x805583B0 + .4byte 0x804606F8 + .4byte 0x80460718 + .4byte 0x805583B8 + .4byte 0x8046072C + .4byte 0x80460750 + .4byte 0x805583C0 + .4byte 0x80460768 + .4byte 0x80460768 + .4byte 0x805583C8 + .4byte 0x80460778 + .4byte 0x80460778 + .4byte 0x805583D0 + .4byte 0x80460778 + .4byte 0x80460778 + .4byte 0x805583D8 + .4byte 0x80460788 + .4byte 0x80460788 + .4byte 0x804607A0 + .4byte 0x804607AC + .4byte 0x804607AC + .4byte 0x804607C0 + .4byte 0x804607CC + .4byte 0x804607CC .global $$253204 $$253204: - .incbin "baserom.dol", 0x411C74, 0x14 + .4byte 0x804607E4 + .4byte 0x804607F4 + .4byte 0x80460804 + .4byte 0x80460814 + .4byte 0x80460824 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253229 $$253229: - .incbin "baserom.dol", 0x45ABD0, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$253230 $$253230: - .incbin "baserom.dol", 0x45ABF0, 0x18 + .asciz "challengetitle/Kirby" + .balign 4 .global $$253277 $$253277: - .incbin "baserom.dol", 0x45AC08, 0x10 + .asciz "KirbyBodyBig3M" + .balign 4 .global $$253278 $$253278: - .incbin "baserom.dol", 0x45AC18, 0x10 + .asciz "KirbyBodyBigM" + .balign 4 .global $$253279 $$253279: - .incbin "baserom.dol", 0x45AC28, 0x10 + .asciz "KirbyBodyBlowM" + .balign 4 .global $$253280 $$253280: - .incbin "baserom.dol", 0x45AC38, 0x10 + .asciz "KirbyBodyDrawM" + .balign 4 .global $$253281 $$253281: - .incbin "baserom.dol", 0x45AC48, 0x14 + .asciz "KirbyBodyFlightM" + .balign 4 .global $$255175 $$255175: - .incbin "baserom.dol", 0x45AC5C, 0x10 + .asciz "RA1ShoulderJ" + .balign 4 .global $$255176 $$255176: - .incbin "baserom.dol", 0x45AC6C, 0xC + .asciz "HaveWait" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253144 $$253144: - .incbin "baserom.dol", 0x45C7B8, 0x14 + .asciz "grandtitle/DotKirby" .global $$253146 $$253146: - .incbin "baserom.dol", 0x45C7CC, 0x18 + .asciz "grandtitle/DotDedede" + .balign 4 .global $$253148 $$253148: - .incbin "baserom.dol", 0x45C7E4, 0x14 + .asciz "grandtitle/DotMeta" + .balign 4 .global $$253149 $$253149: - .incbin "baserom.dol", 0x45C7F8, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$253150 $$253150: - .incbin "baserom.dol", 0x45C818, 0x14 + .asciz "grandtitle/Kirby" + .balign 4 .global $$253151 $$253151: - .incbin "baserom.dol", 0x45C82C, 0x24 + .asciz "step/chara/hero/dedede/base/Default" .global $$253152 $$253152: - .incbin "baserom.dol", 0x45C850, 0x18 + .asciz "grandtitle/Dedede" + .balign 4 + .4byte 0 .global $$253153 $$253153: - .incbin "baserom.dol", 0x45C868, 0x10 + .asciz "grandtitle/Meta" .global $$253155 $$253155: - .incbin "baserom.dol", 0x45C878, 0x10 + .asciz "grandtitle/Dee" + .balign 4 .global $$253158 $$253158: - .incbin "baserom.dol", 0x45C888, 0x18 + .asciz "grandtitle/BandanaDee" + .balign 4 .global $$253159 $$253159: - .incbin "baserom.dol", 0x45C8A0, 0xC + .asciz "WarpStarL" + .balign 4 .global $$253160 $$253160: - .incbin "baserom.dol", 0x45C8AC, 0x14 + .asciz "grandtitle/WarpStar" .global $$253161 $$253161: - .incbin "baserom.dol", 0x45C8C0, 0xC + .asciz "TitleLogoL" + .balign 4 .global $$253162 $$253162: - .incbin "baserom.dol", 0x45C8CC, 0x18 + .asciz "grandtitle/TitleLogo" + .balign 4 .global $$253199 $$253199: - .incbin "baserom.dol", 0x45C8E4, 0x10 + .asciz "KirbyBodyBig3M" + .balign 4 .global $$253200 $$253200: - .incbin "baserom.dol", 0x45C8F4, 0x10 + .asciz "KirbyBodyBigM" + .balign 4 .global $$253201 $$253201: - .incbin "baserom.dol", 0x45C904, 0x10 + .asciz "KirbyBodyBlowM" + .balign 4 .global $$253202 $$253202: - .incbin "baserom.dol", 0x45C914, 0x10 + .asciz "KirbyBodyDrawM" + .balign 4 .global $$253203 $$253203: - .incbin "baserom.dol", 0x45C924, 0x14 + .asciz "KirbyBodyFlightM" + .balign 4 .global $$255505 $$255505: - .incbin "baserom.dol", 0x45C938, 0xC + .asciz "Celebrate" + .balign 4 .global $$255621 $$255621: - .incbin "baserom.dol", 0x45C944, 0x10 + .asciz "KirbyBodyDrawM" + .balign 4 .global $$255623 $$255623: - .incbin "baserom.dol", 0x45C954, 0xC + .asciz "KirbyBodyM" + .balign 4 .global $$255625 $$255625: - .incbin "baserom.dol", 0x45C960, 0x10 + .asciz "KirbyBodyBigM" + .balign 4 .global $$255637 $$255637: - .incbin "baserom.dol", 0x45C970, 0x10 + .asciz "VacuumHustleLv2" .global $$255638 $$255638: - .incbin "baserom.dol", 0x45C980, 0x40 + .asciz "VacuumEnd" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253228 $$253228: - .incbin "baserom.dol", 0x494098, 0x8 + .asciz "KirbyL" + .balign 4 .global $$253231 $$253231: - .incbin "baserom.dol", 0x4940A0, 0x8 + .asciz "Kirby1L" .global $$253232 $$253232: - .incbin "baserom.dol", 0x4940A8, 0x8 + .asciz "Kirby2L" .global $$253233 $$253233: - .incbin "baserom.dol", 0x4940B0, 0x8 + .asciz "Kirby3L" .global $$253234 $$253234: - .incbin "baserom.dol", 0x4940B8, 0x8 + .asciz "Kirby4L" .global $$253235 $$253235: - .incbin "baserom.dol", 0x4940C0, 0x8 + .asciz "Kirby5L" .global $$253236 $$253236: - .incbin "baserom.dol", 0x4940C8, 0x8 + .asciz "Kirby6L" .global $$254998 $$254998: - .incbin "baserom.dol", 0x4940D0, 0x8 + .asciz "Model" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253143 $$253143: - .incbin "baserom.dol", 0x494790, 0x8 + .asciz "KirbyL" + .balign 4 .global $$253145 $$253145: - .incbin "baserom.dol", 0x494798, 0x8 + .asciz "DededeL" .global $$253147 $$253147: - .incbin "baserom.dol", 0x4947A0, 0x8 + .asciz "MetaL" + .balign 4 .global $$253154 $$253154: - .incbin "baserom.dol", 0x4947A8, 0x8 + .asciz "DeeL" + .balign 4 .global $$253156 $$253156: - .incbin "baserom.dol", 0x4947B0, 0x8 + .asciz "Dee1L" + .balign 4 .global $$253157 $$253157: - .incbin "baserom.dol", 0x4947B8, 0x8 + .asciz "Dee2L" + .balign 4 .global $$255333 $$255333: - .incbin "baserom.dol", 0x4947C0, 0x8 + .asciz "TopL" + .balign 4 .global $$255334 $$255334: - .incbin "baserom.dol", 0x4947C8, 0x8 + .asciz "Model" + .balign 4 .global $$255636 $$255636: - .incbin "baserom.dol", 0x4947D0, 0x8 + .asciz "Vacuum" + .balign 4 .global $$255639 $$255639: - .incbin "baserom.dol", 0x4947D8, 0x8 + .asciz "EatWait" .global $$255640 $$255640: - .incbin "baserom.dol", 0x4947E0, 0x8 + .asciz "Vomit" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255165 $$255165: - .incbin "baserom.dol", 0x49A8E8, 0x8 + .4byte 0 + .4byte 0 .global $$255253 $$255253: - .incbin "baserom.dol", 0x49A8F0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255335 $$255335: - .incbin "baserom.dol", 0x49AA90, 0x4 + .4byte 0x3F800000 .global $$255336 $$255336: - .incbin "baserom.dol", 0x49AA94, 0x4 + .4byte 0 .global $$255337 $$255337: - .incbin "baserom.dol", 0x49AA98, 0x4 + .4byte 0x3F266666 .global $$255338 $$255338: - .incbin "baserom.dol", 0x49AA9C, 0x4 + .4byte 0x3F333333 .global $$255339 $$255339: - .incbin "baserom.dol", 0x49AAA0, 0x4 + .4byte 0xBDCCCCCD .global $$255340 $$255340: - .incbin "baserom.dol", 0x49AAA4, 0x4 + .4byte 0x3F666666 .global $$255341 $$255341: - .incbin "baserom.dol", 0x49AAA8, 0x4 + .4byte 0x3FA66666 .global $$255620 $$255620: - .incbin "baserom.dol", 0x49AAAC, 0x4 + .4byte 0x40800000 .global $$255622 $$255622: - .incbin "baserom.dol", 0x49AAB0, 0x4 + .4byte 0x41200000 .global $$255624 $$255624: - .incbin "baserom.dol", 0x49AAB4, 0x4 + .4byte 0x40400000 .global $$255655 $$255655: - .incbin "baserom.dol", 0x49AAB8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/CharaAnimBlender.s b/asm/src/CharaAnimBlender.s index 09dbe216..dbb9a522 100644 --- a/asm/src/CharaAnimBlender.s +++ b/asm/src/CharaAnimBlender.s @@ -912,39 +912,90 @@ lbl_8018CC6C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249791 $$249791: - .incbin "baserom.dol", 0x450298, 0x18 + .asciz "CharaAnimBlender.cpp" + .balign 4 .global $$249792 $$249792: - .incbin "baserom.dol", 0x4502B0, 0x34 + .asciz "NW4R:Pointer Error\npHeap(=%p) is not valid pointer." .global $$249793 $$249793: - .incbin "baserom.dol", 0x4502E4, 0x34 + .asciz "NW4R:Pointer Error\nbuf(=%p) is not valid pointer." + .balign 4 .global $$249794 $$249794: - .incbin "baserom.dol", 0x450318, 0x44 + .asciz "NW4R:Alignment Error(0x%x)\nbuf must be aligned to 4 bytes boundary." .global $$249903 $$249903: - .incbin "baserom.dol", 0x45035C, 0x60 + .4byte 0x4E573452 + .4byte 0x20496E74 + .4byte 0x65726E61 + .4byte 0x6C206572 + .4byte 0x726F720A + .4byte 0x83828366 + .4byte 0x838B8366 + .4byte 0x815B835E + .4byte 0x82F08E67 + .4byte 0x977082B5 + .4byte 0x82BD834C + .4byte 0x83838389 + .4byte 0x834E835E + .4byte 0x8341836A + .4byte 0x8381815B + .4byte 0x83568387 + .4byte 0x839382CC + .4byte 0x8375838C + .4byte 0x83938368 + .4byte 0x8F88979D + .4byte 0x82CD96A2 + .4byte 0x8EC09195 + .4byte 0x82C582B7 + .4byte 0x81420000 .global $$249981 $$249981: - .incbin "baserom.dol", 0x4503BC, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global __vt__Q23g3d16CharaAnimBlender __vt__Q23g3d16CharaAnimBlender: - .incbin "baserom.dol", 0x4503F0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x800D9600 ;# ptr + .4byte 0x800D8380 ;# ptr + .4byte 0x8018CC24 ;# ptr + .4byte 0x800D9710 ;# ptr + .4byte 0x800D9700 ;# ptr + .4byte 0x800D8020 ;# ptr + .4byte 0x800D8030 ;# ptr + .4byte 0x800D8010 ;# ptr + .4byte 0x800D8090 ;# ptr + .4byte 0x800D80A0 ;# ptr + .4byte 0x8018C94C ;# ptr + .4byte 0x800D8220 ;# ptr + .4byte 0x8018C2B4 ;# ptr + .4byte 0x800D7FE0 ;# ptr + .4byte 0x800D7FF0 ;# ptr + .4byte 0x800D8000 ;# ptr + .4byte 0x800D7E70 ;# ptr + .4byte 0x800D7E80 ;# ptr + .4byte 0x800D8110 ;# ptr + .4byte 0x800D8230 ;# ptr .global $$2STRING$$2FLog__Q24nw4r4mathFf$$20 $$2STRING$$2FLog__Q24nw4r4mathFf$$20: - .incbin "baserom.dol", 0x450448, 0x24 + .asciz "FLog: Input is out of the domain." + .balign 4 .global $$2STRING$$2FLog__Q24nw4r4mathFf $$2STRING$$2FLog__Q24nw4r4mathFf: - .incbin "baserom.dol", 0x45046C, 0x14 + .asciz "arithmetic.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249901 $$249901: - .incbin "baserom.dol", 0x49A1B0, 0x4 + .4byte 0 .global $$249902 $$249902: - .incbin "baserom.dol", 0x49A1B4, 0x4 + .4byte 0x3F800000 .global $$249917 $$249917: - .incbin "baserom.dol", 0x49A1B8, 0x8 + .4byte 0x7FC00000 + .4byte 0 diff --git a/asm/src/CharaAnimInterpolation.s b/asm/src/CharaAnimInterpolation.s index 85eb25b3..b9c804a7 100644 --- a/asm/src/CharaAnimInterpolation.s +++ b/asm/src/CharaAnimInterpolation.s @@ -229,7 +229,7 @@ lbl_8018CF48: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250437 $$250437: - .incbin "baserom.dol", 0x49A1C0, 0x4 + .4byte 0 .global $$250463 $$250463: - .incbin "baserom.dol", 0x49A1C4, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/CharaManager.s b/asm/src/CharaManager.s index 8db4c49a..292f69c7 100644 --- a/asm/src/CharaManager.s +++ b/asm/src/CharaManager.s @@ -1501,53 +1501,69 @@ block__Q33scn10grandtitle12CharaManagerFUl: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253270 $$253270: - .incbin "baserom.dol", 0x45AC78, 0x20 + .asciz "challengetitle/TitleScene" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254349 $$254349: - .incbin "baserom.dol", 0x45C9C0, 0x18 + .asciz "grandtitle/TitleScene" + .balign 4 .global $$254457 $$254457: - .incbin "baserom.dol", 0x45C9D8, 0x10 + .asciz "BgEffectL" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253271 $$253271: - .incbin "baserom.dol", 0x4940D8, 0x8 + .asciz "TopL" + .balign 4 .global $$253363 $$253363: - .incbin "baserom.dol", 0x4940E0, 0x8 + .asciz "Wait2" + .balign 4 .global $$253364 $$253364: - .incbin "baserom.dol", 0x4940E8, 0x8 + .asciz "Wait3" + .balign 4 .global $$253365 $$253365: - .incbin "baserom.dol", 0x4940F0, 0x8 + .asciz "Wait4" + .balign 4 .global $$253384 $$253384: - .incbin "baserom.dol", 0x4940F8, 0x8 + .asciz "Wait" + .balign 4 .global $$253385 $$253385: - .incbin "baserom.dol", 0x494100, 0x8 + .asciz "WaitA" + .balign 4 .global $$253386 $$253386: - .incbin "baserom.dol", 0x494108, 0x8 + .asciz "WaitB" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254350 $$254350: - .incbin "baserom.dol", 0x4947E8, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253326 $$253326: - .incbin "baserom.dol", 0x49A8F8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$253366 $$253366: - .incbin "baserom.dol", 0x49A900, 0x8 + .4byte 0x41400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254420 $$254420: - .incbin "baserom.dol", 0x49AAC0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/CharaModel.s b/asm/src/CharaModel.s index 155e61db..7ba28524 100644 --- a/asm/src/CharaModel.s +++ b/asm/src/CharaModel.s @@ -613,4 +613,7 @@ onDirty__Q23g3d10CharaModelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23g3d10CharaModel __vt__Q23g3d10CharaModel: - .incbin "baserom.dol", 0x450480, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8018D060 ;# ptr + .4byte 0x8018D648 ;# ptr diff --git a/asm/src/CharaParam.s b/asm/src/CharaParam.s index fda4f32a..45aae52c 100644 --- a/asm/src/CharaParam.s +++ b/asm/src/CharaParam.s @@ -2834,298 +2834,327 @@ lbl_802F235C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49BCB8, 0x4 + .4byte 0 .global lbl_8056117C lbl_8056117C: - .incbin "baserom.dol", 0x49BCBC, 0x4 + .4byte 0x3F99999A .global $$248789 $$248789: - .incbin "baserom.dol", 0x49BCC0, 0x4 + .4byte 0x3E99999A .global $$248790 $$248790: - .incbin "baserom.dol", 0x49BCC4, 0x4 + .4byte 0x3F933333 .global $$248791 $$248791: - .incbin "baserom.dol", 0x49BCC8, 0x8 + .4byte 0x40000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49BD68, 0x8 + .4byte 0x3F99999A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49BE50, 0x8 + .4byte 0x3EB33333 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49BE90, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49BED0, 0x8 + .asciz "?s33" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49BF48, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49BFA0, 0x4 + .4byte 0 .global lbl_80561464 lbl_80561464: - .incbin "baserom.dol", 0x49BFA4, 0x4 + .4byte 0x3F000000 .global $$248811 $$248811: - .incbin "baserom.dol", 0x49BFA8, 0x8 + .4byte 0x3EE66666 + .4byte 0 .global $$248748 $$248748: - .incbin "baserom.dol", 0x49BFB0, 0x4 + .4byte 0 .global lbl_80561474 lbl_80561474: - .incbin "baserom.dol", 0x49BFB4, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49BFC0, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C060, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49C0B0, 0x4 + .4byte 0 .global lbl_80561574 lbl_80561574: - .incbin "baserom.dol", 0x49C0B4, 0x4 + .4byte 0x3F266666 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49C0B8, 0x4 + .4byte 0 .global $$248790 $$248790: - .incbin "baserom.dol", 0x49C0BC, 0x4 + .4byte 0x3EE66666 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C2F0, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49C320, 0x8 + .4byte 0x3EB33333 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C348, 0x4 + .4byte 0 .global $$248779 $$248779: - .incbin "baserom.dol", 0x49C34C, 0x4 + .4byte 0x3E99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C3C8, 0x4 + .4byte 0 .global $$248779 $$248779: - .incbin "baserom.dol", 0x49C3CC, 0x4 + .4byte 0x3E99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49C4F8, 0x4 + .4byte 0 .global lbl_805619BC lbl_805619BC: - .incbin "baserom.dol", 0x49C4FC, 0x4 + .4byte 0x3FC00000 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49C500, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C588, 0x4 + .4byte 0 .global $$248779 $$248779: - .incbin "baserom.dol", 0x49C58C, 0x4 + .4byte 0x3ECCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C5E8, 0x4 + .4byte 0x42B40000 .global $$248779 $$248779: - .incbin "baserom.dol", 0x49C5EC, 0x4 + .4byte 0x3E4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C650, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49C7F0, 0x4 + .4byte 0 .global lbl_80561CB4 lbl_80561CB4: - .incbin "baserom.dol", 0x49C7F4, 0x4 + .4byte 0x3F4CCCCD .global $$248789 $$248789: - .incbin "baserom.dol", 0x49C7F8, 0x4 + .4byte 0x3ECCCCCD .global $$248790 $$248790: - .incbin "baserom.dol", 0x49C7FC, 0x4 + .4byte 0x3F99999A .global $$248791 $$248791: - .incbin "baserom.dol", 0x49C800, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49C850, 0x4 + .4byte 0 .global lbl_80561D14 lbl_80561D14: - .incbin "baserom.dol", 0x49C854, 0x4 + .4byte 0x3EB33333 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49C858, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C8B8, 0x8 + .4byte 0x3FC00000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49C918, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49CA90, 0x4 + .4byte 0 .global lbl_80561F54 lbl_80561F54: - .incbin "baserom.dol", 0x49CA94, 0x4 + .4byte 0x3F333333 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CA98, 0x8 + .4byte 0x3EE66666 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49CB10, 0x4 + .4byte 0 .global lbl_80561FD4 lbl_80561FD4: - .incbin "baserom.dol", 0x49CB14, 0x4 + .4byte 0x3F800000 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CB18, 0x4 + .4byte 0x3E99999A .global $$248790 $$248790: - .incbin "baserom.dol", 0x49CB1C, 0x4 + .4byte 0x3F8CCCCD .global $$248791 $$248791: - .incbin "baserom.dol", 0x49CB20, 0x8 + .4byte 0x40000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49CB80, 0x4 + .4byte 0 .global lbl_80562044 lbl_80562044: - .incbin "baserom.dol", 0x49CB84, 0x4 + .4byte 0x3F000000 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CB88, 0x8 + .4byte 0x40200000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49CCB8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49CCD8, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49CD90, 0x4 + .4byte 0 .global lbl_80562254 lbl_80562254: - .incbin "baserom.dol", 0x49CD94, 0x4 + .4byte 0x3F2147AE .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CD98, 0x4 + .4byte 0x3ECCCCCD .global $$248790 $$248790: - .incbin "baserom.dol", 0x49CD9C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49CDF8, 0x8 + .asciz "?s33" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49CE10, 0x8 + .4byte 0x3E99999A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49CE68, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CEF0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: - .incbin "baserom.dol", 0x49CF28, 0x4 + .4byte 0 .global lbl_805623EC lbl_805623EC: - .incbin "baserom.dol", 0x49CF2C, 0x4 + .4byte 0x3F000000 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CF30, 0x4 + .4byte 0 .global $$248790 $$248790: - .incbin "baserom.dol", 0x49CF34, 0x4 + .4byte 0x40200000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: - .incbin "baserom.dol", 0x49CFF0, 0x8 + .asciz "?fff" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49D068, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: - .incbin "baserom.dol", 0x49D078, 0x8 + .4byte 0x41F00000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: - .incbin "baserom.dol", 0x49D090, 0x4 + .4byte 0 .global $$248788 $$248788: - .incbin "baserom.dol", 0x49D094, 0x4 + .4byte 0x3EB33333 diff --git a/asm/src/ChargeFlash.s b/asm/src/ChargeFlash.s index f9f758cf..168a7f17 100644 --- a/asm/src/ChargeFlash.s +++ b/asm/src/ChargeFlash.s @@ -54,9 +54,15 @@ lbl_80333E80: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4hero25$$2unnamed$$2ChargeFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4hero25$$2unnamed$$2ChargeFlash_cpp$$2: - .incbin "baserom.dol", 0x415D50, 0x18 + .4byte 0x00000040 + .4byte 0x40408080 + .4byte 0x80C0C0C0 + .4byte 0x80808040 + .4byte 0x40400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249325 $$249325: - .incbin "baserom.dol", 0x49D6B8, 0x8 + .4byte 0xE0E0FF00 + .4byte 0 diff --git a/asm/src/CheckWindow.s b/asm/src/CheckWindow.s index 9231db30..86c4d308 100644 --- a/asm/src/CheckWindow.s +++ b/asm/src/CheckWindow.s @@ -987,81 +987,107 @@ lbl_801A9330: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253274 $$253274: - .incbin "baserom.dol", 0x453530, 0x14 + .asciz "common/Checkwindow" + .balign 4 .global $$253275 $$253275: - .incbin "baserom.dol", 0x453544, 0x10 + .asciz "ControlWindow" + .balign 4 .global $$253276 $$253276: - .incbin "baserom.dol", 0x453554, 0xC + .asciz "CheckWindow" .global $$253277 $$253277: - .incbin "baserom.dol", 0x453560, 0xC + .asciz "CheckButton" .global $$253278 $$253278: - .incbin "baserom.dol", 0x45356C, 0x14 + .asciz "CheckButtonCursor" + .balign 4 .global $$253279 $$253279: - .incbin "baserom.dol", 0x453580, 0x10 + .asciz "ControlN" + .balign 4 + .4byte 0 .global $$253283 $$253283: - .incbin "baserom.dol", 0x453590, 0x10 + .asciz "SaveFileButtonN" .global $$253284 $$253284: - .incbin "baserom.dol", 0x4535A0, 0x10 + .asciz "DeleteButtonN" + .balign 4 .global $$253386 $$253386: - .incbin "baserom.dol", 0x4535B0, 0xC + .asciz "TextGameT" + .balign 4 .global $$253387 $$253387: - .incbin "baserom.dol", 0x4535BC, 0xC + .asciz "TextPlayerT" .global $$253392 $$253392: - .incbin "baserom.dol", 0x4535C8, 0x10 + .asciz "CheckButtonT" + .balign 4 .global $$253458 $$253458: - .incbin "baserom.dol", 0x4535D8, 0x40 + .asciz "NoChoice" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253280 $$253280: - .incbin "baserom.dol", 0x4933D0, 0x8 + .asciz "YesN" + .balign 4 .global $$253281 $$253281: - .incbin "baserom.dol", 0x4933D8, 0x8 + .4byte 0x4E6F4E00 + .4byte 0 .global $$253282 $$253282: - .incbin "baserom.dol", 0x4933E0, 0x8 + .asciz "CursorN" .global $$253285 $$253285: - .incbin "baserom.dol", 0x4933E8, 0x8 + .asciz "Wait" + .balign 4 .global $$253379 $$253379: - .incbin "baserom.dol", 0x4933F0, 0x8 + .asciz "GameN" + .balign 4 .global $$253380 $$253380: - .incbin "baserom.dol", 0x4933F8, 0x8 + .asciz "TextT" + .balign 4 .global $$253400 $$253400: - .incbin "baserom.dol", 0x493400, 0x8 + .asciz "Open" + .balign 4 .global $$253401 $$253401: - .incbin "baserom.dol", 0x493408, 0x8 + .asciz "Choice" + .balign 4 .global $$253405 $$253405: - .incbin "baserom.dol", 0x493410, 0x8 + .asciz "Close" + .balign 4 .global $$253439 $$253439: - .incbin "baserom.dol", 0x493418, 0x8 + .asciz "Decide" + .balign 4 .global $$253459 $$253459: - .incbin "baserom.dol", 0x493420, 0x8 + .asciz "UnFocus" .global $$253460 $$253460: - .incbin "baserom.dol", 0x493428, 0x8 + .asciz "Wait2" + .balign 4 .global $$253461 $$253461: - .incbin "baserom.dol", 0x493430, 0x8 + .asciz "Focus" + .balign 4 .global $$253462 $$253462: - .incbin "baserom.dol", 0x493438, 0x8 + .asciz "Wait1" + .balign 4 diff --git a/asm/src/ChoseAbility.s b/asm/src/ChoseAbility.s index f3c97ab4..65919822 100644 --- a/asm/src/ChoseAbility.s +++ b/asm/src/ChoseAbility.s @@ -318,21 +318,27 @@ preLoadStage__Q43scn17challengetutorial4info12ChoseAbilityFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253002 $$253002: - .incbin "baserom.dol", 0x45BD98, 0x18 + .asciz "challengeability/Main" + .balign 4 .global $$253003 $$253003: - .incbin "baserom.dol", 0x45BDB0, 0x10 + .asciz "AbilityFrame" + .balign 4 .global $$253105 $$253105: - .incbin "baserom.dol", 0x45BDC0, 0x10 + .asciz "CloseShadow" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253004 $$253004: - .incbin "baserom.dol", 0x494530, 0x8 + .asciz "FrameN" + .balign 4 .global $$253086 $$253086: - .incbin "baserom.dol", 0x494538, 0x8 + .asciz "Start" + .balign 4 .global $$253104 $$253104: - .incbin "baserom.dol", 0x494540, 0x8 + .4byte 0x456E6400 + .4byte 0 diff --git a/asm/src/Chronology.s b/asm/src/Chronology.s index dc512873..5a493d76 100644 --- a/asm/src/Chronology.s +++ b/asm/src/Chronology.s @@ -121,90 +121,254 @@ lbl_802075C8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248725 $$248725: - .incbin "baserom.dol", 0x45CDD0, 0xC + .asciz "DotKirby" + .balign 4 .global $$248726 $$248726: - .incbin "baserom.dol", 0x45CDDC, 0xC + .asciz "Package1L" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x45CDE8, 0x10 + .asciz "Package2LA_A" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x45CDF8, 0x10 + .asciz "Package2LA_B" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x45CE08, 0xC + .asciz "Package3L_A" .global $$248735 $$248735: - .incbin "baserom.dol", 0x45CE14, 0xC + .asciz "Package3L_B" .global $$248736 $$248736: - .incbin "baserom.dol", 0x45CE20, 0xC + .asciz "Package3L_C" .global $$248743 $$248743: - .incbin "baserom.dol", 0x45CE2C, 0xC + .asciz "DotMaholor" + .balign 4 .global PRODUCTS__Q33scn7history24$$2unnamed$$2Chronology_cpp$$2 PRODUCTS__Q33scn7history24$$2unnamed$$2Chronology_cpp$$2: - .incbin "baserom.dol", 0x45CE38, 0x244 + .4byte 0x000007C7 + .4byte 0x80558498 + .4byte 0x80460CD0 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007C8 + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007C9 + .4byte 0x8055849C + .4byte 0x805584AC + .4byte 0 + .4byte 0x80460CE8 + .4byte 0x000007C9 + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000001 + .4byte 0x80460CF8 + .4byte 0x000007CA + .4byte 0x8055849C + .4byte 0x805584B0 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007CB + .4byte 0x8055849C + .4byte 0x805584B8 + .4byte 0 + .4byte 0x80460D08 + .4byte 0x000007CB + .4byte 0x8055849C + .4byte 0x805584B8 + .4byte 0x00000001 + .4byte 0x80460D14 + .4byte 0x000007CB + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000002 + .4byte 0x80460D20 + .4byte 0x000007CC + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000003 + .4byte 0x80460CE8 + .4byte 0x000007CC + .4byte 0x8055849C + .4byte 0x805584B8 + .4byte 0x00000002 + .4byte 0x80460CF8 + .4byte 0x000007CD + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000004 + .4byte 0x80460CE8 + .4byte 0x000007CD + .4byte 0x8055849C + .4byte 0x805584B8 + .4byte 0x00000003 + .4byte 0x80460CF8 + .4byte 0x000007CE + .4byte 0x8055849C + .4byte 0x805584C0 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007CF + .4byte 0x8055849C + .4byte 0x805584C8 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007D0 + .4byte 0x8055849C + .4byte 0x805584B8 + .4byte 0x00000004 + .4byte 0x80460CDC + .4byte 0x000007D1 + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000005 + .4byte 0x80460CDC + .4byte 0x000007D2 + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000006 + .4byte 0x80460CE8 + .4byte 0x000007D2 + .4byte 0x8055849C + .4byte 0x805584D0 + .4byte 0 + .4byte 0x80460CF8 + .4byte 0x000007D3 + .4byte 0x8055849C + .4byte 0x805584D8 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007D4 + .4byte 0x8055849C + .4byte 0x805584A4 + .4byte 0x00000007 + .4byte 0x80460CDC + .4byte 0x000007D5 + .4byte 0x8055849C + .4byte 0x805584DC + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007D6 + .4byte 0x8055849C + .4byte 0x805584DC + .4byte 0x00000001 + .4byte 0x80460CDC + .4byte 0x000007D7 + .4byte 0x8055849C + .4byte 0x805584E0 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007D8 + .4byte 0x8055849C + .4byte 0x805584DC + .4byte 0x00000002 + .4byte 0x80460CDC + .4byte 0x000007D9 + .4byte 0x8055849C + .4byte 0x80460D2C + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007DA + .4byte 0x8055849C + .4byte 0x805584E8 + .4byte 0 + .4byte 0x80460CDC + .4byte 0x000007DB + .4byte 0x8055849C + .4byte 0x805584DC + .4byte 0x00000003 + .4byte 0x80460CE8 + .4byte 0x000007DB + .4byte 0x8055849C + .4byte 0x805584E8 + .4byte 0x00000001 + .4byte 0x80460CF8 + .4byte 0x000007DC + .4byte 0x8055849C + .4byte 0x805584EC + .4byte 0 + .4byte 0x80460CDC .global $$248900 $$248900: - .incbin "baserom.dol", 0x45D07C, 0xC + .asciz "DotKirby" + .balign 4 .global $$248904 $$248904: - .incbin "baserom.dol", 0x45D088, 0x10 + .asciz "DotMaholor" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248724 $$248724: - .incbin "baserom.dol", 0x494878, 0x4 + .4byte 0x626F7800 .global $$248727 $$248727: - .incbin "baserom.dol", 0x49487C, 0x8 + .asciz "box_us" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x494884, 0x8 + .asciz "GbGba" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x49488C, 0x4 + .4byte 0x4E657300 .global $$248732 $$248732: - .incbin "baserom.dol", 0x494890, 0x8 + .asciz "DotRRR" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x494898, 0x8 + .asciz "Snes64" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x4948A0, 0x8 + .asciz "DotDee" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x4948A8, 0x8 + .asciz "DotDDD" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x4948B0, 0x8 + .asciz "Anime" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x4948B8, 0x4 + .4byte 0x47630000 .global $$248741 $$248741: - .incbin "baserom.dol", 0x4948BC, 0x4 + .4byte 0x44730000 .global $$248742 $$248742: - .incbin "baserom.dol", 0x4948C0, 0x8 + .asciz "DotMeta" .global $$248744 $$248744: - .incbin "baserom.dol", 0x4948C8, 0x4 + .4byte 0x57696900 .global $$248745 $$248745: - .incbin "baserom.dol", 0x4948CC, 0x8 + .asciz "Donut" + .balign 4 .global $$248901 $$248901: - .incbin "baserom.dol", 0x4948D4, 0x8 + .asciz "DotDee" + .balign 4 .global $$248902 $$248902: - .incbin "baserom.dol", 0x4948DC, 0xC + .asciz "DotDDD" + .balign 4 + .4byte 0 .global $$248903 $$248903: - .incbin "baserom.dol", 0x4948E8, 0x8 + .asciz "DotMeta" .global $$248905 $$248905: - .incbin "baserom.dol", 0x4948F0, 0x8 + .asciz "DotRRR" + .balign 4 diff --git a/asm/src/CinemaScope.s b/asm/src/CinemaScope.s index 819f84c9..e636633a 100644 --- a/asm/src/CinemaScope.s +++ b/asm/src/CinemaScope.s @@ -165,27 +165,33 @@ draw__Q43scn4step3sfx11CinemaScopeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251854 $$251854: - .incbin "baserom.dol", 0x45AC98, 0x10 + .asciz "step/sfx/CSTalk" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251791 $$251791: - .incbin "baserom.dol", 0x45C9E8, 0x18 + .asciz "step/sfx/CSTitle" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251630 $$251630: - .incbin "baserom.dol", 0x48ED10, 0x18 + .asciz "step/sfx/CSArrow" + .balign 4 + .4byte 0 .global $$251631 $$251631: - .incbin "baserom.dol", 0x48ED28, 0x10 + .asciz "step/sfx/CSTalk" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2 T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2: - .incbin "baserom.dol", 0x4947F0, 0x8 + .4byte 0x804608E8 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_CINEMASCOPE_FILE_PATH_TABLE__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2 T_CINEMASCOPE_FILE_PATH_TABLE__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2: - .incbin "baserom.dol", 0x4983D8, 0x8 + .4byte 0x80492C10 + .4byte 0x80492C28 diff --git a/asm/src/CinemaScopeModel.s b/asm/src/CinemaScopeModel.s index 960adc25..47609cd7 100644 --- a/asm/src/CinemaScopeModel.s +++ b/asm/src/CinemaScopeModel.s @@ -193,15 +193,19 @@ draw__Q23sfx16CinemaScopeModelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251766 $$251766: - .incbin "baserom.dol", 0x492668, 0x10 + .asciz "CinemaScope" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251772 $$251772: - .incbin "baserom.dol", 0x498A80, 0x8 + .asciz "Start" + .balign 4 .global $$251776 $$251776: - .incbin "baserom.dol", 0x498A88, 0x8 + .asciz "Wait" + .balign 4 .global $$251793 $$251793: - .incbin "baserom.dol", 0x498A90, 0x8 + .4byte 0x456E6400 + .4byte 0 diff --git a/asm/src/ClearDanceSync.s b/asm/src/ClearDanceSync.s index 750019d2..358d9f54 100644 --- a/asm/src/ClearDanceSync.s +++ b/asm/src/ClearDanceSync.s @@ -156,7 +156,15 @@ lbl_80334080: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ANIM_KIND_TABLE_A__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2 ANIM_KIND_TABLE_A__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2: - .incbin "baserom.dol", 0x415D68, 0x10 + .4byte 0x00000056 + .4byte 0x00000057 + .4byte 0x00000058 + .4byte 0 .global ANIM_KIND_TABLE_B__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2 ANIM_KIND_TABLE_B__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2: - .incbin "baserom.dol", 0x415D78, 0x18 + .4byte 0x00000056 + .4byte 0x00000057 + .4byte 0x00000058 + .4byte 0x0000005C + .4byte 0x0000005D + .4byte 0x0000005E diff --git a/asm/src/CliffChecker.s b/asm/src/CliffChecker.s index 378e0638..3524bb8c 100644 --- a/asm/src/CliffChecker.s +++ b/asm/src/CliffChecker.s @@ -154,16 +154,17 @@ setValid__Q43scn4step5chara12CliffCheckerFb: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252371 $$252371: - .incbin "baserom.dol", 0x49B760, 0x4 + .4byte 0x3D4CCCCD .global $$252372 $$252372: - .incbin "baserom.dol", 0x49B764, 0x4 + .4byte 0 .global $$252373 $$252373: - .incbin "baserom.dol", 0x49B768, 0x4 + .4byte 0xBF000000 .global $$252374 $$252374: - .incbin "baserom.dol", 0x49B76C, 0x4 + .4byte 0x3F000000 .global $$252377 $$252377: - .incbin "baserom.dol", 0x49B770, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/CliffEdgeBoundCtrl.s b/asm/src/CliffEdgeBoundCtrl.s index 6da748a7..af1cf180 100644 --- a/asm/src/CliffEdgeBoundCtrl.s +++ b/asm/src/CliffEdgeBoundCtrl.s @@ -77,7 +77,7 @@ lbl_803C0F0C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252540 $$252540: - .incbin "baserom.dol", 0x49E4F0, 0x4 + .4byte 0x3F800000 .global $$252541 $$252541: - .incbin "baserom.dol", 0x49E4F4, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/ClosePanel.s b/asm/src/ClosePanel.s index 20226db7..5d02bd1c 100644 --- a/asm/src/ClosePanel.s +++ b/asm/src/ClosePanel.s @@ -116,4 +116,5 @@ isDecideAnimating__Q25pause10ClosePanelCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252084 $$252084: - .incbin "baserom.dol", 0x459560, 0x10 + .asciz "PauseCloseN" + .4byte 0 diff --git a/asm/src/Closest.s b/asm/src/Closest.s index 01ccac2f..eb190a32 100644 --- a/asm/src/Closest.s +++ b/asm/src/Closest.s @@ -279,10 +279,11 @@ __pl__Q33hel4math7Vector2CFRCQ33hel4math7Vector2: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250353 $$250353: - .incbin "baserom.dol", 0x49A3F8, 0x4 + .4byte 0 .global $$250354 $$250354: - .incbin "baserom.dol", 0x49A3FC, 0x4 + .4byte 0x3F800000 .global $$250429 $$250429: - .incbin "baserom.dol", 0x49A400, 0x8 + .4byte 0x3727C5AC + .4byte 0 diff --git a/asm/src/CollidedAction.s b/asm/src/CollidedAction.s index 922ab245..c8311309 100644 --- a/asm/src/CollidedAction.s +++ b/asm/src/CollidedAction.s @@ -34,7 +34,7 @@ __ct__Q35mcoll6detail14CollidedActionFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248848 $$248848: - .incbin "baserom.dol", 0x49A578, 0x4 + .4byte 0 .global $$248852 $$248852: - .incbin "baserom.dol", 0x49A57C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/CollidedInfo.s b/asm/src/CollidedInfo.s index 5843dfae..235af406 100644 --- a/asm/src/CollidedInfo.s +++ b/asm/src/CollidedInfo.s @@ -176,4 +176,5 @@ landVelocity__Q35mcoll6detail12CollidedInfoCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250421 $$250421: - .incbin "baserom.dol", 0x49A580, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Color.s b/asm/src/Color.s index f67fa2fa..bdc02053 100644 --- a/asm/src/Color.s +++ b/asm/src/Color.s @@ -74,7 +74,7 @@ __ct__Q33hel6common5ColorFUcUcUcUc: /* 8019D990 001997D0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402414, 0x4 + .4byte 0x8019D88C ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global BLACK__Q33hel6common5Color diff --git a/asm/src/ColorAnim.s b/asm/src/ColorAnim.s index 69e1bf87..cb4523b7 100644 --- a/asm/src/ColorAnim.s +++ b/asm/src/ColorAnim.s @@ -554,4 +554,5 @@ setFlash__Q24gobj9ColorAnimFRCQ23g3d14ColorAnimFlash: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251917 $$251917: - .incbin "baserom.dol", 0x49A2C8, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 diff --git a/asm/src/ColorAnimMaterialTarget.s b/asm/src/ColorAnimMaterialTarget.s index a57ae011..6f3db416 100644 --- a/asm/src/ColorAnimMaterialTarget.s +++ b/asm/src/ColorAnimMaterialTarget.s @@ -43,7 +43,13 @@ tevRegId2GXTevColorArgAlpha__Q23g3d23ColorAnimMaterialTargetCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TEV_REG_ID_2_TEV_COLOR_ARG__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2 T_TEV_REG_ID_2_TEV_COLOR_ARG__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2: - .incbin "baserom.dol", 0x410698, 0x10 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000006 .global T_TEV_REG_ID_2_TEV_COLOR_ARG_ALPHA__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2 T_TEV_REG_ID_2_TEV_COLOR_ARG_ALPHA__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2: - .incbin "baserom.dol", 0x4106A8, 0x10 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000007 diff --git a/asm/src/ColorAnimTevManager.s b/asm/src/ColorAnimTevManager.s index d966a6b4..00fda69a 100644 --- a/asm/src/ColorAnimTevManager.s +++ b/asm/src/ColorAnimTevManager.s @@ -482,21 +482,59 @@ reserveWithTevRegID__Q23g3d19ColorAnimTevManagerF11_GXTevRegID: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249444 $$249444: - .incbin "baserom.dol", 0x450490, 0x50 + .4byte 0x8018E22C ;# ptr + .4byte 0x8018E244 ;# ptr + .4byte 0x8018E25C ;# ptr + .4byte 0x8018E274 ;# ptr + .4byte 0x8018E22C ;# ptr + .4byte 0x8018E244 ;# ptr + .4byte 0x8018E25C ;# ptr + .4byte 0x8018E274 ;# ptr + .4byte 0x8018E22C ;# ptr + .4byte 0x8018E244 ;# ptr + .4byte 0x8018E25C ;# ptr + .4byte 0x8018E274 ;# ptr + .4byte 0x8018E22C ;# ptr + .4byte 0x8018E244 ;# ptr + .4byte 0x8018E25C ;# ptr + .4byte 0x8018E274 ;# ptr + .4byte 0x8018E22C ;# ptr + .4byte 0x8018E244 ;# ptr + .4byte 0x8018E25C ;# ptr + .4byte 0x8018E274 ;# ptr .global $$249473 $$249473: - .incbin "baserom.dol", 0x4504E0, 0x40 + .4byte 0x8018E3A8 ;# ptr + .4byte 0x8018E3C0 ;# ptr + .4byte 0x8018E3D8 ;# ptr + .4byte 0x8018E3F0 ;# ptr + .4byte 0x8018E3A8 ;# ptr + .4byte 0x8018E3C0 ;# ptr + .4byte 0x8018E3D8 ;# ptr + .4byte 0x8018E3F0 ;# ptr + .4byte 0x8018E3A8 ;# ptr + .4byte 0x8018E3C0 ;# ptr + .4byte 0x8018E3D8 ;# ptr + .4byte 0x8018E3F0 ;# ptr + .4byte 0x8018E3A8 ;# ptr + .4byte 0x8018E3C0 ;# ptr + .4byte 0x8018E3D8 ;# ptr + .4byte 0x8018E3F0 ;# ptr .global $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv$$20: - .incbin "baserom.dol", 0x450520, 0x20 + .asciz "%s::%s: Object not valid." + .balign 4 + .4byte 0 .global $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv: - .incbin "baserom.dol", 0x450540, 0x10 + .asciz "g3d_restev_ac.h" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetClassName__Q34nw4r3g3d6ResTevFv $$2STRING$$2GetClassName__Q34nw4r3g3d6ResTevFv: - .incbin "baserom.dol", 0x493160, 0x8 + .asciz "ResTev" + .balign 4 .global __FUNCTION__$31740 __FUNCTION__$31740: - .incbin "baserom.dol", 0x493168, 0x8 + .4byte 0x72656600 + .4byte 0 diff --git a/asm/src/Commander.s b/asm/src/Commander.s index 1f27f2d8..d18d8e0c 100644 --- a/asm/src/Commander.s +++ b/asm/src/Commander.s @@ -3078,128 +3078,154 @@ requestEfConfetti__Q33scn11staffcredit9CommanderFv: /* 803F95DC 003F541C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40244C, 0x8 + .4byte 0x801EC444 ;# ptr + .4byte 0x80203844 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_RETRY_HP_RATE_TABLE__Q43scn4step4boss23$$2unnamed$$2Commander_cpp$$2 T_RETRY_HP_RATE_TABLE__Q43scn4step4boss23$$2unnamed$$2Commander_cpp$$2: - .incbin "baserom.dol", 0x412488, 0x20 + .4byte 0x3F800000 + .4byte 0x3F7851EC + .4byte 0x3F68F5C3 + .4byte 0x3F6147AE + .4byte 0x3F51EB85 + .4byte 0x3F3D70A4 + .4byte 0x3F1EB852 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255882 $$255882: - .incbin "baserom.dol", 0x45ACA8, 0x1C + .asciz "challengetitle/TitleScene" + .balign 4 .global $$255883 $$255883: - .incbin "baserom.dol", 0x45ACC4, 0xC + .asciz "SceneAnim" + .balign 4 .global $$255884 $$255884: - .incbin "baserom.dol", 0x45ACD0, 0x20 + .asciz "Scn.ChallengeTitle.Script.Start" .global $$255900 $$255900: - .incbin "baserom.dol", 0x45ACF0, 0x20 + .asciz "Scn.ChallengeTitle.Script.Skip" + .balign 4 .global $$255901 $$255901: - .incbin "baserom.dol", 0x45AD10, 0x20 + .asciz "Scn.ChallengeTitle.Script.Loop" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255960 $$255960: - .incbin "baserom.dol", 0x45CA00, 0x18 + .asciz "grandtitle/TitleScene" + .balign 4 .global $$255961 $$255961: - .incbin "baserom.dol", 0x45CA18, 0xC + .asciz "SceneAnim" + .balign 4 .global $$255962 $$255962: - .incbin "baserom.dol", 0x45CA24, 0x1C + .asciz "Scn.GrandTitle.Script.Start" .global $$255977 $$255977: - .incbin "baserom.dol", 0x45CA40, 0x1C + .asciz "Scn.GrandTitle.Script.Skip" + .balign 4 .global $$255978 $$255978: - .incbin "baserom.dol", 0x45CA5C, 0x1C + .asciz "Scn.GrandTitle.Script.Loop" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256622 $$256622: - .incbin "baserom.dol", 0x492020, 0x20 + .asciz "Scn.StaffCredit.Script.Exec" + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255800 $$255800: - .incbin "baserom.dol", 0x49A908, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255828 $$255828: - .incbin "baserom.dol", 0x49AAC8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259289 $$259289: - .incbin "baserom.dol", 0x49ADE8, 0x4 + .4byte 0 .global $$259455 $$259455: - .incbin "baserom.dol", 0x49ADEC, 0x4 + .4byte 0xBF800000 .global $$259456 $$259456: - .incbin "baserom.dol", 0x49ADF0, 0x8 + .4byte 0x3F400000 + .4byte 0 .global $$259460 $$259460: - .incbin "baserom.dol", 0x49ADF8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259461 $$259461: - .incbin "baserom.dol", 0x49AE00, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$259547 $$259547: - .incbin "baserom.dol", 0x49AE08, 0x4 + .4byte 0x41A00000 .global $$259548 $$259548: - .incbin "baserom.dol", 0x49AE0C, 0x4 + .4byte 0xC0A00000 .global $$259549 $$259549: - .incbin "baserom.dol", 0x49AE10, 0x4 + .4byte 0xC1A00000 .global $$259550 $$259550: - .incbin "baserom.dol", 0x49AE14, 0x4 + .4byte 0x41700000 .global $$259551 $$259551: - .incbin "baserom.dol", 0x49AE18, 0x4 + .4byte 0xC0000000 .global $$259552 $$259552: - .incbin "baserom.dol", 0x49AE1C, 0x4 + .4byte 0x40000000 .global $$259556 $$259556: - .incbin "baserom.dol", 0x49AE20, 0x4 + .4byte 0x40E00000 .global $$259557 $$259557: - .incbin "baserom.dol", 0x49AE24, 0x4 + .4byte 0xC1000000 .global $$259558 $$259558: - .incbin "baserom.dol", 0x49AE28, 0x4 + .4byte 0x41000000 .global $$259613 $$259613: - .incbin "baserom.dol", 0x49AE2C, 0x4 + .4byte 0x40A00000 .global $$259625 $$259625: - .incbin "baserom.dol", 0x49AE30, 0x8 + .4byte 0x40400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 $$256621: - .incbin "baserom.dol", 0x49ED98, 0x4 + .4byte 0 .global $$256647 $$256647: - .incbin "baserom.dol", 0x49ED9C, 0x4 + .4byte 0x3CCCCCCD .global $$256648 $$256648: - .incbin "baserom.dol", 0x49EDA0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$256652 $$256652: - .incbin "baserom.dol", 0x49EDA8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256774 $$256774: - .incbin "baserom.dol", 0x49EDB0, 0x8 + .4byte 0x40400000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q33scn14challengetitle23$$2unnamed$$2Commander_cpp$$2 diff --git a/asm/src/Common.s b/asm/src/Common.s index 17317713..e2edb05a 100644 --- a/asm/src/Common.s +++ b/asm/src/Common.s @@ -18,1092 +18,3176 @@ Script__Q53scn4step4hero9modeldesc6CommonFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20 $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20: - .incbin "baserom.dol", 0x4164C0, 0x1C20 + .4byte 0x804857A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804857C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804857F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485810 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485834 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485854 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485878 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485898 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804858BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804858E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485900 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485924 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485948 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048596C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485990 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804859B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804859D4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804859FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485A28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485A48 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485A6C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485A94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485AB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485AD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485AF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485B14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485B3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485B60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485B80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485BA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485BD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485BF8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485C24 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485C48 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485C70 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485C98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485CC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485CF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485D18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485D40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485D68 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485D90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485DB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485DD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485DF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485E18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485E3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485E60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485E80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485EA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485EC4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485EE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485F0C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485F30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485F58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485F7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485FA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485FD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80485FFC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486024 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486048 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048606C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486090 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804860B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804860DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486104 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486130 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486154 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486180 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804861B0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804861E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486204 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048622C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486260 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486280 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804862A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804862D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486308 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048632C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486358 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486390 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804863C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804863F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048641C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486448 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486478 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804864A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804864D4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048650C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048653C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486578 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804865A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804865E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486610 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486648 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486678 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804866A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804866D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804866F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486724 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486750 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486778 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804867A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804867C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804867F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486814 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486844 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486870 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486894 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804868BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804868E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048690C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486938 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486968 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486998 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804869C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804869E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486A08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486A30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486A5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486A84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486AA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486AC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486AE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486B08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486B2C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486B58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486B7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486BA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486BD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486BF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486C14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486C34 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486C5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486C7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486CA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486CC4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486CE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486D08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486D28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486D50 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486D74 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486D98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486DBC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486DE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486E0C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486E38 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486E64 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486E90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486EB0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486ED0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486EF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486F1C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486F40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486F60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486F84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486FA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486FC4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486FE0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80486FFC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487060 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487080 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048709C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804870C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804870DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804870FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048711C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487140 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487160 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487184 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804871AC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804871D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804871F4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487220 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487240 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487260 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487280 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804872A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804872C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804872E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487310 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487334 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487360 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487380 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804873A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804873C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804873E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487404 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487428 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487450 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487474 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487498 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804874C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804874E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048750C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487534 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487558 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048757C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804875A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804875C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804875E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487600 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487620 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487644 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487668 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487688 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804876AC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804876D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804876F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487718 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487738 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487760 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487780 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804877A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804877C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804877E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487808 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487830 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487854 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048787C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048789C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804878C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804878EC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048790C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487930 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487954 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487978 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487994 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804879B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804879D8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487A04 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487A28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487A54 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487A74 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487A98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487AC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487AEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487B08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487B2C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487B54 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487B7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487BA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487BCC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487BF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487C10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487C38 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487C5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487C80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487CA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487CD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487CF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487D14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487D3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487D60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487D80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487DA4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487DC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487DEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487E14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487E40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487E60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487E88 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487EB0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487ED0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487EF8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487F20 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487F48 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487F74 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487F9C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487FC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80487FE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488038 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488060 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488080 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804880A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804880C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804880E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488108 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488128 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488148 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488170 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488198 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804881BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804881E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488208 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488228 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488248 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488264 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488288 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804882A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804882C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804882EC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048830C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488330 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488350 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488370 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488394 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804883B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804883E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488404 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048842C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048844C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488474 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048849C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804884BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804884E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488508 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488530 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048854C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488568 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488584 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804885A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804885C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804885E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488608 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488624 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488648 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048866C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048868C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804886B0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804886D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804886EC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048870C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488728 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048874C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488774 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048879C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804887C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804887E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488810 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488838 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488864 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488888 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804888AC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804888D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804888F4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488918 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048893C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488964 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488990 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804889C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804889E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488A08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488A30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488A58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488A84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488AB0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488ADC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488B08 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488B30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488B60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488B94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488BCC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488BF8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488C28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488C58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488C8C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: - .incbin "baserom.dol", 0x4818A0, 0x20 + .asciz "Common.AnimScript.Wait.Exec()" + .balign 4 .global $$248727 $$248727: - .incbin "baserom.dol", 0x4818C0, 0x30 + .asciz "Common.AnimScript.Wait.ExecNoSpecialMotion()" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x4818F0, 0x20 + .asciz "Common.AnimScript.Fall.Exec()" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x481910, 0x24 + .asciz "Common.AnimScript.Landing.Exec()" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x481934, 0x20 + .asciz "Common.AnimScript.Walk.Exec()" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x481954, 0x24 + .asciz "Common.AnimScript.JumpStart.Exec()" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x481978, 0x20 + .asciz "Common.AnimScript.Jump.Exec()" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x481998, 0x24 + .asciz "Common.AnimScript.JumpEnd.Exec()" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x4819BC, 0x24 + .asciz "Common.AnimScript.AirJump.Exec()" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x4819E0, 0x20 + .asciz "Common.AnimScript.Squat.Exec()" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x481A00, 0x24 + .asciz "Common.AnimScript.SquatEnd.Exec()" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x481A24, 0x24 + .asciz "Common.AnimScript.Sliding.Exec()" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x481A48, 0x24 + .asciz "Common.AnimScript.SlidingEnd.Exec()" .global $$248739 $$248739: - .incbin "baserom.dol", 0x481A6C, 0x24 + .asciz "Common.AnimScript.SlidingHit.Exec()" .global $$248740 $$248740: - .incbin "baserom.dol", 0x481A90, 0x24 + .asciz "Common.AnimScript.HoverStart.Exec()" .global $$248741 $$248741: - .incbin "baserom.dol", 0x481AB4, 0x20 + .asciz "Common.AnimScript.Hover.Exec()" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x481AD4, 0x28 + .asciz "Common.AnimScript.HoverLanding.Exec()" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x481AFC, 0x2C + .asciz "Common.AnimScript.ShotAirBall.Exec()" + .balign 4 + .4byte 0 .global $$248744 $$248744: - .incbin "baserom.dol", 0x481B28, 0x20 + .asciz "Common.AnimScript.Vacuum.Exec()" .global $$248745 $$248745: - .incbin "baserom.dol", 0x481B48, 0x24 + .asciz "Common.AnimScript.VacuumEnd.Exec()" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x481B6C, 0x28 + .asciz "Common.AnimScript.VacuumSuper.Exec()" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x481B94, 0x20 + .asciz "Common.AnimScript.Eat.Exec()" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x481BB4, 0x20 + .asciz "Common.AnimScript.Drink.Exec()" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x481BD4, 0x20 + .asciz "Common.AnimScript.Vomit.Exec()" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x481BF4, 0x20 + .asciz "Common.AnimScript.Run.Exec()" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x481C14, 0x28 + .asciz "Common.AnimScript.Swim.ExecContinue()" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x481C3C, 0x24 + .asciz "Common.AnimScript.Swim.ExecFirst()" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x481C60, 0x20 + .asciz "Common.AnimScript.Stroke.Exec()" .global $$248754 $$248754: - .incbin "baserom.dol", 0x481C80, 0x24 + .asciz "Common.AnimScript.WaterWait.Exec()" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x481CA4, 0x2C + .asciz "Common.AnimScript.WaterLanding.Exec()" + .balign 4 + .4byte 0 .global $$248756 $$248756: - .incbin "baserom.dol", 0x481CD0, 0x28 + .asciz "Common.AnimScript.WaterPistol.ExecAir()" .global $$248757 $$248757: - .incbin "baserom.dol", 0x481CF8, 0x2C + .asciz "Common.AnimScript.WaterPistol.ExecGround()" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x481D24, 0x24 + .asciz "Common.AnimScript.WaterWalk.Exec()" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x481D48, 0x28 + .asciz "Common.AnimScript.WaterFloatWait.Exec()" .global $$248760 $$248760: - .incbin "baserom.dol", 0x481D70, 0x28 + .asciz "Common.AnimScript.WaterFloatMove.Exec()" .global $$248761 $$248761: - .incbin "baserom.dol", 0x481D98, 0x30 + .asciz "Common.AnimScript.WaterPistolFloat.Exec()" + .balign 4 + .4byte 0 .global $$248762 $$248762: - .incbin "baserom.dol", 0x481DC8, 0x28 + .asciz "Common.AnimScript.CarryItemCatch.Exec()" .global $$248763 $$248763: - .incbin "baserom.dol", 0x481DF0, 0x28 + .asciz "Common.AnimScript.CarryItemThrow.Exec()" .global $$248764 $$248764: - .incbin "baserom.dol", 0x481E18, 0x28 + .asciz "Common.AnimScript.CarryItemPut.Exec()" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x481E40, 0x28 + .asciz "Common.AnimScript.ClearDancePre.Exec()" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x481E68, 0x28 + .asciz "Common.AnimScript.ClearDanceLong.Exec()" .global $$248767 $$248767: - .incbin "baserom.dol", 0x481E90, 0x24 + .asciz "Common.AnimScript.CopyPre.Exec()" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x481EB4, 0x20 + .asciz "Common.AnimScript.Copy.Exec()" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x481ED4, 0x20 + .asciz "Common.AnimScript.Dead.Exec()" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x481EF4, 0x24 + .asciz "Common.AnimScript.Dead.ExecShort()" + .balign 4 .global $$248771 $$248771: - .incbin "baserom.dol", 0x481F18, 0x24 + .asciz "Common.AnimScript.Dead.ExecPre()" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x481F3C, 0x24 + .asciz "Common.AnimScript.Faint.Exec()" + .balign 4 + .4byte 0 .global $$248773 $$248773: - .incbin "baserom.dol", 0x481F60, 0x20 + .asciz "Common.AnimScript.WakeUp.Exec()" .global $$248774 $$248774: - .incbin "baserom.dol", 0x481F80, 0x24 + .asciz "Common.AnimScript.GuardStart.Exec()" .global $$248775 $$248775: - .incbin "baserom.dol", 0x481FA4, 0x20 + .asciz "Common.AnimScript.Guard.Exec()" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x481FC4, 0x24 + .asciz "Common.AnimScript.GuardEnd.Exec()" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x481FE8, 0x24 + .asciz "Common.AnimScript.LadderUp.Exec()" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x48200C, 0x24 + .asciz "Common.AnimScript.LadderDown.Exec()" .global $$248779 $$248779: - .incbin "baserom.dol", 0x482030, 0x28 + .asciz "Common.AnimScript.HappyLanding.Exec()" + .balign 4 .global $$248780 $$248780: - .incbin "baserom.dol", 0x482058, 0x24 + .asciz "Common.AnimScript.Plancher.Exec()" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x48207C, 0x2C + .asciz "Common.AnimScript.Plancher.ExecNoStart()" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x4820A8, 0x2C + .asciz "Common.AnimScript.PlancherLanding.Exec()" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x4820D4, 0x28 + .asciz "Common.AnimScript.PlancherBound.Exec()" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x4820FC, 0x28 + .asciz "Common.AnimScript.PlancherHit.Exec()" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x482124, 0x24 + .asciz "Common.AnimScript.SquashRoof.Exec()" .global $$248786 $$248786: - .incbin "baserom.dol", 0x482148, 0x24 + .asciz "Common.AnimScript.SquashWall.Exec()" .global $$248787 $$248787: - .incbin "baserom.dol", 0x48216C, 0x24 + .asciz "Common.AnimScript.AnyWhereIn.Exec()" .global $$248788 $$248788: - .incbin "baserom.dol", 0x482190, 0x28 + .asciz "Common.AnimScript.DebugFreeMove.Exec()" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x4821B8, 0x24 + .asciz "Common.AnimScript.Listening.Exec()" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x4821DC, 0x28 + .asciz "Common.AnimScript.Listening.WaitExec()" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x482204, 0x2C + .asciz "Interference.AnimScript.SuperJump.Exec()" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x482230, 0x24 + .asciz "Interference.AnimScript.Kiss.Exec()" .global $$248793 $$248793: - .incbin "baserom.dol", 0x482254, 0x2C + .asciz "Interference.AnimScript.KissReceive.Exec()" + .balign 4 .global $$248794 $$248794: - .incbin "baserom.dol", 0x482280, 0x30 + .asciz "Interference.AnimScript.Piggyback.Exec()" + .balign 4 + .4byte 0 .global $$248795 $$248795: - .incbin "baserom.dol", 0x4822B0, 0x30 + .asciz "Interference.AnimScript.Piggyback.ExecNoSound()" .global $$248796 $$248796: - .incbin "baserom.dol", 0x4822E0, 0x24 + .asciz "Interference.AnimScript.Hang.Exec()" .global $$248797 $$248797: - .incbin "baserom.dol", 0x482304, 0x28 + .asciz "Interference.AnimScript.Vomited.Exec()" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x48232C, 0x34 + .asciz "Interference.AnimScript.CombinationAttack.Exec()" + .balign 4 .global $$248799 $$248799: - .incbin "baserom.dol", 0x482360, 0x20 + .asciz "Damage.AnimScript.Damage.Exec()" .global $$248800 $$248800: - .incbin "baserom.dol", 0x482380, 0x24 + .asciz "Damage.AnimScript.DamageEtc.Exec()" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x4823A4, 0x2C + .asciz "Gimmick.AnimScript.EnterDoor.ExecDefault()" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x4823D0, 0x38 + .asciz "Gimmick.AnimScript.EnterDoor.ExecToChallengeResult()" + .balign 4 .global $$248803 $$248803: - .incbin "baserom.dol", 0x482408, 0x24 + .asciz "Gimmick.AnimScript.LeaveDoor.Exec()" .global $$248804 $$248804: - .incbin "baserom.dol", 0x48242C, 0x2C + .asciz "Gimmick.AnimScript.EnterMahoroaWait.Exec()" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x482458, 0x38 + .asciz "Gimmick.AnimScript.EnterMahoroaWait.FreeWaitExec()" + .balign 4 + .4byte 0 .global $$248806 $$248806: - .incbin "baserom.dol", 0x482490, 0x30 + .asciz "Gimmick.AnimScript.EnterMahoroaTurnFront.Exec()" .global $$248807 $$248807: - .incbin "baserom.dol", 0x4824C0, 0x30 + .asciz "Gimmick.AnimScript.EnterMahoroaTurnBack.Exec()" + .balign 4 .global $$248808 $$248808: - .incbin "baserom.dol", 0x4824F0, 0x2C + .asciz "Gimmick.AnimScript.EnterMahoroaGlad.Exec()" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x48251C, 0x2C + .asciz "Gimmick.AnimScript.EnterWarpLowper.ExecIn()" .global $$248810 $$248810: - .incbin "baserom.dol", 0x482548, 0x30 + .asciz "Gimmick.AnimScript.EnterWarpLowper.ExecOut()" + .balign 4 .global $$248811 $$248811: - .incbin "baserom.dol", 0x482578, 0x2C + .asciz "Gimmick.AnimScript.ReturnWarpLowper.Exec()" + .balign 4 .global $$248812 $$248812: - .incbin "baserom.dol", 0x4825A4, 0x30 + .asciz "Gimmick.AnimScript.ReturnWarpLowperDead.Exec()" + .balign 4 .global $$248813 $$248813: - .incbin "baserom.dol", 0x4825D4, 0x38 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecDefaultWithStart()" + .balign 4 .global $$248814 $$248814: - .incbin "baserom.dol", 0x48260C, 0x30 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecDefault()" + .balign 4 .global $$248815 $$248815: - .incbin "baserom.dol", 0x48263C, 0x3C + .asciz "Gimmick.AnimScript.WarpStarRide.ExecRightDownWithStart()" + .balign 4 .global $$248816 $$248816: - .incbin "baserom.dol", 0x482678, 0x30 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecRightDown()" .global $$248817 $$248817: - .incbin "baserom.dol", 0x4826A8, 0x38 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecLeftDownWithStart()" .global $$248818 $$248818: - .incbin "baserom.dol", 0x4826E0, 0x30 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecLeftDown()" + .balign 4 .global $$248819 $$248819: - .incbin "baserom.dol", 0x482710, 0x38 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecLeftUpWithStart()" + .balign 4 .global $$248820 $$248820: - .incbin "baserom.dol", 0x482748, 0x30 + .asciz "Gimmick.AnimScript.WarpStarRide.ExecLeftUp()" + .balign 4 .global $$248821 $$248821: - .incbin "baserom.dol", 0x482778, 0x2C + .asciz "Gimmick.AnimScript.CannonBlowWait.Exec()" + .balign 4 .global $$248822 $$248822: - .incbin "baserom.dol", 0x4827A4, 0x2C + .asciz "Gimmick.AnimScript.CannonBlowLaunch.Exec()" + .balign 4 .global $$248823 $$248823: - .incbin "baserom.dol", 0x4827D0, 0x28 + .asciz "Gimmick.AnimScript.CannonBlowHit.Exec()" .global $$248824 $$248824: - .incbin "baserom.dol", 0x4827F8, 0x2C + .asciz "Gimmick.AnimScript.CannonWaitOutWait.Exec()" .global $$248825 $$248825: - .incbin "baserom.dol", 0x482824, 0x2C + .asciz "Gimmick.AnimScript.CannonWaitInWait.Exec()" + .balign 4 .global $$248826 $$248826: - .incbin "baserom.dol", 0x482850, 0x28 + .asciz "Gimmick.AnimScript.CannonWaitOut.Exec()" .global $$248827 $$248827: - .incbin "baserom.dol", 0x482878, 0x28 + .asciz "Gimmick.AnimScript.CannonWaitIn.Exec()" + .balign 4 .global $$248828 $$248828: - .incbin "baserom.dol", 0x4828A0, 0x28 + .asciz "Gimmick.AnimScript.CannonReady.Exec()" + .balign 4 .global $$248829 $$248829: - .incbin "baserom.dol", 0x4828C8, 0x28 + .asciz "Gimmick.AnimScript.GetShipParts.Exec()" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x4828F0, 0x24 + .asciz "Gimmick.AnimScript.ItemGet.Exec()" + .balign 4 .global $$248831 $$248831: - .incbin "baserom.dol", 0x482914, 0x30 + .asciz "Gimmick.AnimScript.ItemGetLowperSphere.Exec()" + .balign 4 .global $$248832 $$248832: - .incbin "baserom.dol", 0x482944, 0x2C + .asciz "Gimmick.AnimScript.UnlockLvMapDoor.Exec()" + .balign 4 .global $$248833 $$248833: - .incbin "baserom.dol", 0x482970, 0x24 + .asciz "Gimmick.AnimScript.Dangle.Exec()" + .balign 4 .global $$248834 $$248834: - .incbin "baserom.dol", 0x482994, 0x28 + .asciz "Gimmick.AnimScript.DangleRope.Exec()" + .balign 4 .global $$248835 $$248835: - .incbin "baserom.dol", 0x4829BC, 0x28 + .asciz "Gimmick.AnimScript.DangleMoveR.Exec()" + .balign 4 .global $$248836 $$248836: - .incbin "baserom.dol", 0x4829E4, 0x28 + .asciz "Gimmick.AnimScript.DangleMoveL.Exec()" + .balign 4 .global $$248837 $$248837: - .incbin "baserom.dol", 0x482A0C, 0x2C + .asciz "Gimmick.AnimScript.ScrewSuperLaunch.Exec()" + .balign 4 .global $$248838 $$248838: - .incbin "baserom.dol", 0x482A38, 0x30 + .asciz "Gimmick.AnimScript.ChallengeBattleWin.Exec()" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x482A68, 0x30 + .asciz "Gimmick.AnimScript.ChallengeBattleLose.Exec()" + .balign 4 .global $$248840 $$248840: - .incbin "baserom.dol", 0x482A98, 0x28 + .asciz "Ride.AnimScript.StepShoeBound.Exec()" + .balign 4 .global $$248841 $$248841: - .incbin "baserom.dol", 0x482AC0, 0x24 + .asciz "Ride.AnimScript.StepShoeStep.Exec()" .global $$248842 $$248842: - .incbin "baserom.dol", 0x482AE4, 0x24 + .asciz "Ride.AnimScript.StepShoeJump.Exec()" .global $$248843 $$248843: - .incbin "baserom.dol", 0x482B08, 0x28 + .asciz "Ride.AnimScript.StepShoeLanding.Exec()" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x482B30, 0x2C + .asciz "Ride.AnimScript.StepShoeEnterDoor.Exec()" + .balign 4 .global $$248845 $$248845: - .incbin "baserom.dol", 0x482B5C, 0x28 + .asciz "Ride.AnimScript.StepShoeGuard.Exec()" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x482B84, 0x20 + .asciz "Sword.AnimScript.Attack.Exec()" + .balign 4 .global $$248847 $$248847: - .incbin "baserom.dol", 0x482BA4, 0x24 + .asciz "Sword.AnimScript.AttackEnd.Exec()" + .balign 4 .global $$248848 $$248848: - .incbin "baserom.dol", 0x482BC8, 0x20 + .asciz "Sword.AnimScript.AirSpin.Exec()" .global $$248849 $$248849: - .incbin "baserom.dol", 0x482BE8, 0x20 + .asciz "Sword.AnimScript.Thrust.Exec()" + .balign 4 .global $$248850 $$248850: - .incbin "baserom.dol", 0x482C08, 0x24 + .asciz "Sword.AnimScript.ThrustEnd.Exec()" + .balign 4 .global $$248851 $$248851: - .incbin "baserom.dol", 0x482C2C, 0x2C + .asciz "Sword.AnimScript.UnderThrustStart.Exec()" + .balign 4 .global $$248852 $$248852: - .incbin "baserom.dol", 0x482C58, 0x24 + .asciz "Sword.AnimScript.UnderThrust.Exec()" .global $$248853 $$248853: - .incbin "baserom.dol", 0x482C7C, 0x2C + .asciz "Sword.AnimScript.UnderThrustLanding.Exec()" + .balign 4 .global $$248854 $$248854: - .incbin "baserom.dol", 0x482CA8, 0x28 + .asciz "Sword.AnimScript.RaisingStart.Exec()" + .balign 4 .global $$248855 $$248855: - .incbin "baserom.dol", 0x482CD0, 0x20 + .asciz "Sword.AnimScript.Raising.Exec()" .global $$248856 $$248856: - .incbin "baserom.dol", 0x482CF0, 0x24 + .asciz "Sword.AnimScript.RaisingEnd.Exec()" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x482D14, 0x20 + .asciz "Sword.AnimScript.Meteor.Exec()" + .balign 4 .global $$248858 $$248858: - .incbin "baserom.dol", 0x482D34, 0x28 + .asciz "Sword.AnimScript.MeteorLanding.Exec()" + .balign 4 .global $$248859 $$248859: - .incbin "baserom.dol", 0x482D5C, 0x20 + .asciz "Sword.AnimScript.Mince.Exec()" + .balign 4 .global $$248860 $$248860: - .incbin "baserom.dol", 0x482D7C, 0x24 + .asciz "Sword.AnimScript.Chopping.Exec()" + .balign 4 .global $$248861 $$248861: - .incbin "baserom.dol", 0x482DA0, 0x24 + .asciz "Sword.AnimScript.ChargeStart.Exec()" .global $$248862 $$248862: - .incbin "baserom.dol", 0x482DC4, 0x20 + .asciz "Sword.AnimScript.Charge.Exec()" + .balign 4 .global $$248863 $$248863: - .incbin "baserom.dol", 0x482DE4, 0x24 + .asciz "Sword.AnimScript.Spin.Exec()" + .balign 4 + .4byte 0 .global $$248864 $$248864: - .incbin "baserom.dol", 0x482E08, 0x20 + .asciz "Sword.AnimScript.SpinEnd.Exec()" .global $$248865 $$248865: - .incbin "baserom.dol", 0x482E28, 0x28 + .asciz "Sword.AnimScript.AttackFinish.Exec()" + .balign 4 .global $$248866 $$248866: - .incbin "baserom.dol", 0x482E50, 0x24 + .asciz "Sword.AnimScript.WaterSpin.Exec()" + .balign 4 .global $$248867 $$248867: - .incbin "baserom.dol", 0x482E74, 0x24 + .asciz "Sword.AnimScript.FloatSpin.Exec()" + .balign 4 .global $$248868 $$248868: - .incbin "baserom.dol", 0x482E98, 0x24 + .asciz "Cutter.AnimScript.DashCutter.Exec()" .global $$248869 $$248869: - .incbin "baserom.dol", 0x482EBC, 0x28 + .asciz "Cutter.AnimScript.SlashChain1.Exec()" + .balign 4 .global $$248870 $$248870: - .incbin "baserom.dol", 0x482EE4, 0x28 + .asciz "Cutter.AnimScript.SlashChain2.Exec()" + .balign 4 .global $$248871 $$248871: - .incbin "baserom.dol", 0x482F0C, 0x2C + .asciz "Cutter.AnimScript.FinalCutterRise.Exec()" + .balign 4 .global $$248872 $$248872: - .incbin "baserom.dol", 0x482F38, 0x2C + .asciz "Cutter.AnimScript.FinalCutterDrop.Exec()" + .balign 4 .global $$248873 $$248873: - .incbin "baserom.dol", 0x482F64, 0x2C + .asciz "Cutter.AnimScript.FinalCutterLanding.Exec()" .global $$248874 $$248874: - .incbin "baserom.dol", 0x482F90, 0x20 + .asciz "Cutter.AnimScript.Throw.Exec()" + .balign 4 .global $$248875 $$248875: - .incbin "baserom.dol", 0x482FB0, 0x20 + .asciz "Cutter.AnimScript.Catch.Exec()" + .balign 4 .global $$248876 $$248876: - .incbin "baserom.dol", 0x482FD0, 0x24 + .asciz "Cutter.AnimScript.AirThrow.Exec()" + .balign 4 .global $$248877 $$248877: - .incbin "baserom.dol", 0x482FF4, 0x28 + .asciz "Cutter.AnimScript.SweepCutter.Exec()" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x48301C, 0x24 + .asciz "Cutter.AnimScript.Drop.Exec()" + .balign 4 + .4byte 0 .global $$248879 $$248879: - .incbin "baserom.dol", 0x483040, 0x20 + .asciz "Cutter.AnimScript.Charge.Exec()" .global $$248880 $$248880: - .incbin "baserom.dol", 0x483060, 0x24 + .asciz "Cutter.AnimScript.ThrowLong.Exec()" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x483084, 0x20 + .asciz "Whip.AnimScript.Charge.Exec()" + .balign 4 .global $$248882 $$248882: - .incbin "baserom.dol", 0x4830A4, 0x20 + .asciz "Whip.AnimScript.Front.Exec()" + .balign 4 .global $$248883 $$248883: - .incbin "baserom.dol", 0x4830C4, 0x1C + .asciz "Whip.AnimScript.Up.Exec()" + .balign 4 .global $$248884 $$248884: - .incbin "baserom.dol", 0x4830E0, 0x1C + .asciz "Whip.AnimScript.Hold.Exec()" .global $$248885 $$248885: - .incbin "baserom.dol", 0x4830FC, 0x24 + .asciz "Whip.AnimScript.SlamFront.Exec()" + .balign 4 .global $$248886 $$248886: - .incbin "baserom.dol", 0x483120, 0x20 + .asciz "Whip.AnimScript.SlamBack.Exec()" .global $$248887 $$248887: - .incbin "baserom.dol", 0x483140, 0x20 + .asciz "Whip.AnimScript.SlamUp.Exec()" + .balign 4 .global $$248888 $$248888: - .incbin "baserom.dol", 0x483160, 0x20 + .asciz "Whip.AnimScript.SlamDown.Exec()" .global $$248889 $$248889: - .incbin "baserom.dol", 0x483180, 0x1C + .asciz "Whip.AnimScript.Air.Exec()" + .balign 4 .global $$248890 $$248890: - .incbin "baserom.dol", 0x48319C, 0x24 + .asciz "Whip.AnimScript.RushStart.Exec()" + .balign 4 .global $$248891 $$248891: - .incbin "baserom.dol", 0x4831C0, 0x1C + .asciz "Whip.AnimScript.Rush.Exec()" .global $$248892 $$248892: - .incbin "baserom.dol", 0x4831DC, 0x20 + .asciz "Whip.AnimScript.RushEnd.Exec()" + .balign 4 .global $$248893 $$248893: - .incbin "baserom.dol", 0x4831FC, 0x20 + .asciz "Whip.AnimScript.Drill.Exec()" + .balign 4 .global $$248894 $$248894: - .incbin "baserom.dol", 0x48321C, 0x24 + .asciz "Whip.AnimScript.GazerSpiral.Exec()" + .balign 4 .global $$248895 $$248895: - .incbin "baserom.dol", 0x483240, 0x20 + .asciz "Fire.AnimScript.Breath.Exec()" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x483260, 0x24 + .asciz "Fire.AnimScript.BreathEnd.Exec()" + .balign 4 .global $$248897 $$248897: - .incbin "baserom.dol", 0x483284, 0x28 + .asciz "Fire.AnimScript.Burning.ExecGround()" + .balign 4 .global $$248898 $$248898: - .incbin "baserom.dol", 0x4832AC, 0x24 + .asciz "Fire.AnimScript.Burning.ExecAir()" + .balign 4 .global $$248899 $$248899: - .incbin "baserom.dol", 0x4832D0, 0x24 + .asciz "Fire.AnimScript.BurningEnd.Exec()" + .balign 4 .global $$248900 $$248900: - .incbin "baserom.dol", 0x4832F4, 0x2C + .asciz "Fire.AnimScript.BurningWallEnd.Exec()" + .balign 4 + .4byte 0 .global $$248901 $$248901: - .incbin "baserom.dol", 0x483320, 0x20 + .asciz "Fire.AnimScript.Ignition.Exec()" .global $$248902 $$248902: - .incbin "baserom.dol", 0x483340, 0x20 + .asciz "Fire.AnimScript.Spiral.Exec()" + .balign 4 .global $$248903 $$248903: - .incbin "baserom.dol", 0x483360, 0x20 + .asciz "Fire.AnimScript.Rolling.Exec()" + .balign 4 .global $$248904 $$248904: - .incbin "baserom.dol", 0x483380, 0x20 + .asciz "Spark.AnimScript.Attack.Exec()" + .balign 4 .global $$248905 $$248905: - .incbin "baserom.dol", 0x4833A0, 0x24 + .asciz "Spark.AnimScript.AttackEnd.Exec()" + .balign 4 .global $$248906 $$248906: - .incbin "baserom.dol", 0x4833C4, 0x24 + .asciz "Spark.AnimScript.AttackOver.Exec()" + .balign 4 .global $$248907 $$248907: - .incbin "baserom.dol", 0x4833E8, 0x28 + .asciz "Spark.AnimScript.AttackOverEnd.Exec()" + .balign 4 .global $$248908 $$248908: - .incbin "baserom.dol", 0x483410, 0x24 + .asciz "Spark.AnimScript.AttackUnder.Exec()" .global $$248909 $$248909: - .incbin "baserom.dol", 0x483434, 0x2C + .asciz "Spark.AnimScript.AttackUnderEnd.Exec()" + .balign 4 + .4byte 0 .global $$248910 $$248910: - .incbin "baserom.dol", 0x483460, 0x20 + .asciz "Spark.AnimScript.ShotLv1.Exec()" .global $$248911 $$248911: - .incbin "baserom.dol", 0x483480, 0x20 + .asciz "Spark.AnimScript.ShotLv2.Exec()" .global $$248912 $$248912: - .incbin "baserom.dol", 0x4834A0, 0x20 + .asciz "Spark.AnimScript.ShotLv3.Exec()" .global $$248913 $$248913: - .incbin "baserom.dol", 0x4834C0, 0x20 + .asciz "Spark.AnimScript.Charge.Exec()" + .balign 4 .global $$248914 $$248914: - .incbin "baserom.dol", 0x4834E0, 0x24 + .asciz "Spark.AnimScript.ChargeEnd.Exec()" + .balign 4 .global $$248915 $$248915: - .incbin "baserom.dol", 0x483504, 0x24 + .asciz "Stone.AnimScript.StartJump.Exec()" + .balign 4 .global $$248916 $$248916: - .incbin "baserom.dol", 0x483528, 0x28 + .asciz "Stone.AnimScript.Change.ExecNormal()" + .balign 4 .global $$248917 $$248917: - .incbin "baserom.dol", 0x483550, 0x24 + .asciz "Stone.AnimScript.Change.ExecScrew()" .global $$248918 $$248918: - .incbin "baserom.dol", 0x483574, 0x24 + .asciz "Stone.AnimScript.Fall.ExecNormal()" + .balign 4 .global $$248919 $$248919: - .incbin "baserom.dol", 0x483598, 0x28 + .asciz "Stone.AnimScript.FallScrewStart.Exec()" + .balign 4 .global $$248920 $$248920: - .incbin "baserom.dol", 0x4835C0, 0x24 + .asciz "Stone.AnimScript.Fall.ExecScrew()" + .balign 4 .global $$248921 $$248921: - .incbin "baserom.dol", 0x4835E4, 0x28 + .asciz "Stone.AnimScript.Landing.ExecNormal()" + .balign 4 .global $$248922 $$248922: - .incbin "baserom.dol", 0x48360C, 0x28 + .asciz "Stone.AnimScript.Landing.ExecScrew()" + .balign 4 .global $$248923 $$248923: - .incbin "baserom.dol", 0x483634, 0x24 + .asciz "Stone.AnimScript.Wait.ExecNormal()" + .balign 4 .global $$248924 $$248924: - .incbin "baserom.dol", 0x483658, 0x24 + .asciz "Stone.AnimScript.Wait.ExecScrew()" + .balign 4 .global $$248925 $$248925: - .incbin "baserom.dol", 0x48367C, 0x24 + .asciz "Stone.AnimScript.Slip.ExecNormal()" + .balign 4 .global $$248926 $$248926: - .incbin "baserom.dol", 0x4836A0, 0x24 + .asciz "Stone.AnimScript.Slip.ExecScrew()" + .balign 4 .global $$248927 $$248927: - .incbin "baserom.dol", 0x4836C4, 0x1C + .asciz "Stone.AnimScript.End.Exec()" .global $$248928 $$248928: - .incbin "baserom.dol", 0x4836E0, 0x20 + .asciz "Stone.AnimScript.Upper.Exec()" + .balign 4 .global $$248929 $$248929: - .incbin "baserom.dol", 0x483700, 0x20 + .asciz "Parasol.AnimScript.Swing.Exec()" .global $$248930 $$248930: - .incbin "baserom.dol", 0x483720, 0x24 + .asciz "Parasol.AnimScript.SwingEnd.Exec()" + .balign 4 .global $$248931 $$248931: - .incbin "baserom.dol", 0x483744, 0x24 + .asciz "Parasol.AnimScript.Parachute.Exec()" .global $$248932 $$248932: - .incbin "baserom.dol", 0x483768, 0x20 + .asciz "Parasol.AnimScript.Dive.Exec()" + .balign 4 .global $$248933 $$248933: - .incbin "baserom.dol", 0x483788, 0x24 + .asciz "Parasol.AnimScript.DiveEnd.Exec()" + .balign 4 .global $$248934 $$248934: - .incbin "baserom.dol", 0x4837AC, 0x24 + .asciz "Parasol.AnimScript.Shield.Exec()" + .balign 4 .global $$248935 $$248935: - .incbin "baserom.dol", 0x4837D0, 0x20 + .asciz "Parasol.AnimScript.Drill.Exec()" .global $$248936 $$248936: - .incbin "baserom.dol", 0x4837F0, 0x28 + .asciz "Parasol.AnimScript.DrillEnd.Exec()" + .balign 4 + .4byte 0 .global $$248937 $$248937: - .incbin "baserom.dol", 0x483818, 0x20 + .asciz "Parasol.AnimScript.Catch.Exec()" .global $$248938 $$248938: - .incbin "baserom.dol", 0x483838, 0x28 + .asciz "Parasol.AnimScript.Performance.Exec()" + .balign 4 .global $$248939 $$248939: - .incbin "baserom.dol", 0x483860, 0x20 + .asciz "Parasol.AnimScript.Under.Exec()" .global $$248940 $$248940: - .incbin "baserom.dol", 0x483880, 0x20 + .asciz "Hammer.AnimScript.Charge.Exec()" .global $$248941 $$248941: - .incbin "baserom.dol", 0x4838A0, 0x20 + .asciz "Hammer.AnimScript.Attack.Exec()" .global $$248942 $$248942: - .incbin "baserom.dol", 0x4838C0, 0x24 + .asciz "Hammer.AnimScript.AttackHit.Exec()" + .balign 4 .global $$248943 $$248943: - .incbin "baserom.dol", 0x4838E4, 0x24 + .asciz "Hammer.AnimScript.AttackMiss.Exec()" .global $$248944 $$248944: - .incbin "baserom.dol", 0x483908, 0x28 + .asciz "Hammer.AnimScript.TripleAttack.Exec()" + .balign 4 .global $$248945 $$248945: - .incbin "baserom.dol", 0x483930, 0x24 + .asciz "Hammer.AnimScript.AirSpin.Exec()" + .balign 4 .global $$248946 $$248946: - .incbin "baserom.dol", 0x483954, 0x28 + .asciz "Hammer.AnimScript.StrongAirSpin.Exec()" + .balign 4 .global $$248947 $$248947: - .incbin "baserom.dol", 0x48397C, 0x20 + .asciz "Hammer.AnimScript.Spin.Exec()" + .balign 4 .global $$248948 $$248948: - .incbin "baserom.dol", 0x48399C, 0x28 + .asciz "Hammer.AnimScript.StrongSwing.Exec()" + .balign 4 .global $$248949 $$248949: - .incbin "baserom.dol", 0x4839C4, 0x28 + .asciz "Hammer.AnimScript.UnderAttack.Exec()" + .balign 4 .global $$248950 $$248950: - .incbin "baserom.dol", 0x4839EC, 0x20 + .asciz "Hammer.AnimScript.Throw.Exec()" + .balign 4 .global $$248951 $$248951: - .incbin "baserom.dol", 0x483A0C, 0x24 + .asciz "Hammer.AnimScript.WaterSpin.Exec()" + .balign 4 .global $$248952 $$248952: - .incbin "baserom.dol", 0x483A30, 0x24 + .asciz "Hammer.AnimScript.FloatSpin.Exec()" + .balign 4 .global $$248953 $$248953: - .incbin "baserom.dol", 0x483A54, 0x24 + .asciz "Wing.AnimScript.ShotStart.Exec()" + .balign 4 .global $$248954 $$248954: - .incbin "baserom.dol", 0x483A78, 0x1C + .asciz "Wing.AnimScript.Shot.Exec()" .global $$248955 $$248955: - .incbin "baserom.dol", 0x483A94, 0x20 + .asciz "Wing.AnimScript.ShotEnd.Exec()" + .balign 4 .global $$248956 $$248956: - .incbin "baserom.dol", 0x483AB4, 0x24 + .asciz "Wing.AnimScript.UnderAttack.Exec()" + .balign 4 .global $$248957 $$248957: - .incbin "baserom.dol", 0x483AD8, 0x2C + .asciz "Wing.AnimScript.UnderAttackLanding.Exec()" + .balign 4 .global $$248958 $$248958: - .incbin "baserom.dol", 0x483B04, 0x24 + .asciz "Wing.AnimScript.DiveAttack.Exec()" + .balign 4 .global $$248959 $$248959: - .incbin "baserom.dol", 0x483B28, 0x2C + .asciz "Wing.AnimScript.DiveAttackLanding.Exec()" + .balign 4 .global $$248960 $$248960: - .incbin "baserom.dol", 0x483B54, 0x20 + .asciz "Wing.AnimScript.Flight.Exec()" + .balign 4 .global $$248961 $$248961: - .incbin "baserom.dol", 0x483B74, 0x24 + .asciz "Wing.AnimScript.DashAttack.Exec()" + .balign 4 .global $$248962 $$248962: - .incbin "baserom.dol", 0x483B98, 0x28 + .asciz "Wing.AnimScript.DashAttackAir.Exec()" + .balign 4 .global $$248963 $$248963: - .incbin "baserom.dol", 0x483BC0, 0x2C + .asciz "Wing.AnimScript.DashAttackWallHit.Exec()" + .balign 4 .global $$248964 $$248964: - .incbin "baserom.dol", 0x483BEC, 0x1C + .asciz "Wing.AnimScript.Toss.Exec()" .global $$248965 $$248965: - .incbin "baserom.dol", 0x483C08, 0x24 + .asciz "Wing.AnimScript.ShuttleLoop.Exec()" + .balign 4 .global $$248966 $$248966: - .incbin "baserom.dol", 0x483C2C, 0x28 + .asciz "Wing.AnimScript.ShuttleLoopEnd.Exec()" + .balign 4 .global $$248967 $$248967: - .incbin "baserom.dol", 0x483C54, 0x28 + .asciz "Fighter.AnimScript.FirstMotion.Exec()" + .balign 4 .global $$248968 $$248968: - .incbin "baserom.dol", 0x483C7C, 0x2C + .asciz "Fighter.AnimScript.FirstMotionDash.Exec()" + .balign 4 .global $$248969 $$248969: - .incbin "baserom.dol", 0x483CA8, 0x24 + .asciz "Fighter.AnimScript.Vulcan.Exec()" + .balign 4 .global $$248970 $$248970: - .incbin "baserom.dol", 0x483CCC, 0x24 + .asciz "Fighter.AnimScript.VulcanEnd.Exec()" .global $$248971 $$248971: - .incbin "baserom.dol", 0x483CF0, 0x20 + .asciz "Fighter.AnimScript.Smash.Exec()" .global $$248972 $$248972: - .incbin "baserom.dol", 0x483D10, 0x28 + .asciz "Fighter.AnimScript.Rising.ExecGround()" + .balign 4 .global $$248973 $$248973: - .incbin "baserom.dol", 0x483D38, 0x24 + .asciz "Fighter.AnimScript.Rising.ExecAir()" .global $$248974 $$248974: - .incbin "baserom.dol", 0x483D5C, 0x24 + .asciz "Fighter.AnimScript.FootSweep.Exec()" .global $$248975 $$248975: - .incbin "baserom.dol", 0x483D80, 0x28 + .asciz "Fighter.AnimScript.FootSweepEnd.Exec()" + .balign 4 .global $$248976 $$248976: - .incbin "baserom.dol", 0x483DA8, 0x28 + .asciz "Fighter.AnimScript.SpinKick.Exec()" + .balign 4 + .4byte 0 .global $$248977 $$248977: - .incbin "baserom.dol", 0x483DD0, 0x20 + .asciz "Fighter.AnimScript.Stamp.Exec()" .global $$248978 $$248978: - .incbin "baserom.dol", 0x483DF0, 0x24 + .asciz "Fighter.AnimScript.StampHit.Exec()" + .balign 4 .global $$248979 $$248979: - .incbin "baserom.dol", 0x483E14, 0x28 + .asciz "Fighter.AnimScript.DoubleKick.Exec()" + .balign 4 .global $$248980 $$248980: - .incbin "baserom.dol", 0x483E3C, 0x24 + .asciz "Fighter.AnimScript.Charge.Exec()" + .balign 4 .global $$248981 $$248981: - .incbin "baserom.dol", 0x483E60, 0x20 + .asciz "Fighter.AnimScript.Hadou.Exec()" .global $$248982 $$248982: - .incbin "baserom.dol", 0x483E80, 0x24 + .asciz "Fighter.AnimScript.MegaHadou.Exec()" .global $$248983 $$248983: - .incbin "baserom.dol", 0x483EA4, 0x24 + .asciz "Fighter.AnimScript.GigaHadou.Exec()" .global $$248984 $$248984: - .incbin "baserom.dol", 0x483EC8, 0x24 + .asciz "Fighter.AnimScript.Moonsault.Exec()" .global $$248985 $$248985: - .incbin "baserom.dol", 0x483EEC, 0x28 + .asciz "Fighter.AnimScript.UnderAttack.Exec()" + .balign 4 .global $$248986 $$248986: - .incbin "baserom.dol", 0x483F14, 0x2C + .asciz "Fighter.AnimScript.UnderAttackHit.Exec()" + .balign 4 .global $$248987 $$248987: - .incbin "baserom.dol", 0x483F40, 0x20 + .asciz "Fighter.AnimScript.Catch.Exec()" .global $$248988 $$248988: - .incbin "baserom.dol", 0x483F60, 0x28 + .asciz "Fighter.AnimScript.FrontThrow.Exec()" + .balign 4 .global $$248989 $$248989: - .incbin "baserom.dol", 0x483F88, 0x28 + .asciz "Fighter.AnimScript.BackThrow.Exec()" + .4byte 0 .global $$248990 $$248990: - .incbin "baserom.dol", 0x483FB0, 0x20 + .asciz "Smash.AnimScript.AirSpin.Exec()" .global $$248991 $$248991: - .incbin "baserom.dol", 0x483FD0, 0x28 + .asciz "Smash.AnimScript.FinalCutterPre.Exec()" + .balign 4 .global $$248992 $$248992: - .incbin "baserom.dol", 0x483FF8, 0x28 + .asciz "Smash.AnimScript.FinalCutterRise.Exec()" .global $$248993 $$248993: - .incbin "baserom.dol", 0x484020, 0x28 + .asciz "Smash.AnimScript.FinalCutterDrop.Exec()" .global $$248994 $$248994: - .incbin "baserom.dol", 0x484048, 0x2C + .asciz "Smash.AnimScript.FinalCutterLanding.Exec()" + .balign 4 .global $$248995 $$248995: - .incbin "baserom.dol", 0x484074, 0x28 + .asciz "Smash.AnimScript.HammerAirSpin.Exec()" + .balign 4 .global $$248996 $$248996: - .incbin "baserom.dol", 0x48409C, 0x24 + .asciz "Smash.AnimScript.StrongSwing.Exec()" .global $$248997 $$248997: - .incbin "baserom.dol", 0x4840C0, 0x28 + .asciz "Smash.AnimScript.SmashKick.ExecLv1()" + .balign 4 .global $$248998 $$248998: - .incbin "baserom.dol", 0x4840E8, 0x28 + .asciz "Smash.AnimScript.SmashKick.ExecLv2()" + .balign 4 .global $$248999 $$248999: - .incbin "baserom.dol", 0x484110, 0x28 + .asciz "Smash.AnimScript.SmashKick.ExecLv3()" + .balign 4 .global $$249000 $$249000: - .incbin "baserom.dol", 0x484138, 0x28 + .asciz "Smash.AnimScript.SmashKickCharge.Exec()" .global $$249001 $$249001: - .incbin "baserom.dol", 0x484160, 0x20 + .asciz "Meta.AnimScript.Attack1.Exec()" + .balign 4 .global $$249002 $$249002: - .incbin "baserom.dol", 0x484180, 0x20 + .asciz "Meta.AnimScript.Attack2.Exec()" + .balign 4 .global $$249003 $$249003: - .incbin "baserom.dol", 0x4841A0, 0x20 + .asciz "Meta.AnimScript.Attack3.Exec()" + .balign 4 .global $$249004 $$249004: - .incbin "baserom.dol", 0x4841C0, 0x20 + .asciz "Meta.AnimScript.Mince.Exec()" + .balign 4 .global $$249005 $$249005: - .incbin "baserom.dol", 0x4841E0, 0x28 + .asciz "Meta.AnimScript.AttackFinish.Exec()" + .4byte 0 .global $$249006 $$249006: - .incbin "baserom.dol", 0x484208, 0x20 + .asciz "Meta.AnimScript.AttackHi.Exec()" .global $$249007 $$249007: - .incbin "baserom.dol", 0x484228, 0x20 + .asciz "Meta.AnimScript.Thrust.Exec()" + .balign 4 .global $$249008 $$249008: - .incbin "baserom.dol", 0x484248, 0x28 + .asciz "Meta.AnimScript.ThrustEnd.Exec()" + .balign 4 + .4byte 0 .global $$249009 $$249009: - .incbin "baserom.dol", 0x484270, 0x28 + .asciz "Meta.AnimScript.UnderThrustStart.Exec()" .global $$249010 $$249010: - .incbin "baserom.dol", 0x484298, 0x24 + .asciz "Meta.AnimScript.UnderThrust.Exec()" + .balign 4 .global $$249011 $$249011: - .incbin "baserom.dol", 0x4842BC, 0x2C + .asciz "Meta.AnimScript.UnderThrustLanding.Exec()" + .balign 4 .global $$249012 $$249012: - .incbin "baserom.dol", 0x4842E8, 0x20 + .asciz "Meta.AnimScript.AirSpin.Exec()" + .balign 4 .global $$249013 $$249013: - .incbin "baserom.dol", 0x484308, 0x20 + .asciz "Meta.AnimScript.Chopping.Exec()" .global $$249014 $$249014: - .incbin "baserom.dol", 0x484328, 0x20 + .asciz "Meta.AnimScript.Charge.Exec()" + .balign 4 .global $$249015 $$249015: - .incbin "baserom.dol", 0x484348, 0x1C + .asciz "Meta.AnimScript.Spin.Exec()" .global $$249016 $$249016: - .incbin "baserom.dol", 0x484364, 0x24 + .asciz "Meta.AnimScript.WaterSpin.Exec()" + .balign 4 .global $$249017 $$249017: - .incbin "baserom.dol", 0x484388, 0x1C + .asciz "Meta.AnimScript.Dive.Exec()" .global $$249018 $$249018: - .incbin "baserom.dol", 0x4843A4, 0x24 + .asciz "Meta.AnimScript.DiveLanding.Exec()" + .balign 4 .global $$249019 $$249019: - .incbin "baserom.dol", 0x4843C8, 0x24 + .asciz "Meta.AnimScript.ShuttleLoop.Exec()" + .balign 4 .global $$249020 $$249020: - .incbin "baserom.dol", 0x4843EC, 0x20 + .asciz "Meta.AnimScript.Glide.Exec()" + .balign 4 .global $$249021 $$249021: - .incbin "baserom.dol", 0x48440C, 0x24 + .asciz "Meta.AnimScript.Flight.Exec()" + .balign 4 + .4byte 0 .global $$249022 $$249022: - .incbin "baserom.dol", 0x484430, 0x20 + .asciz "Dedede.AnimScript.Charge.Exec()" .global $$249023 $$249023: - .incbin "baserom.dol", 0x484450, 0x20 + .asciz "Dedede.AnimScript.Attack.Exec()" .global $$249024 $$249024: - .incbin "baserom.dol", 0x484470, 0x24 + .asciz "Dedede.AnimScript.AttackHit.Exec()" + .balign 4 .global $$249025 $$249025: - .incbin "baserom.dol", 0x484494, 0x24 + .asciz "Dedede.AnimScript.AttackMiss.Exec()" .global $$249026 $$249026: - .incbin "baserom.dol", 0x4844B8, 0x28 + .asciz "Dedede.AnimScript.TripleAttack.Exec()" + .balign 4 .global $$249027 $$249027: - .incbin "baserom.dol", 0x4844E0, 0x24 + .asciz "Dedede.AnimScript.AirSpin.Exec()" + .balign 4 .global $$249028 $$249028: - .incbin "baserom.dol", 0x484504, 0x28 + .asciz "Dedede.AnimScript.StrongAirSpin.Exec()" + .balign 4 .global $$249029 $$249029: - .incbin "baserom.dol", 0x48452C, 0x20 + .asciz "Dedede.AnimScript.Spin.Exec()" + .balign 4 .global $$249030 $$249030: - .incbin "baserom.dol", 0x48454C, 0x28 + .asciz "Dedede.AnimScript.StrongSwing.Exec()" + .balign 4 .global $$249031 $$249031: - .incbin "baserom.dol", 0x484574, 0x28 + .asciz "Dedede.AnimScript.UnderAttack.Exec()" + .balign 4 .global $$249032 $$249032: - .incbin "baserom.dol", 0x48459C, 0x20 + .asciz "Dedede.AnimScript.Throw.Exec()" + .balign 4 .global $$249033 $$249033: - .incbin "baserom.dol", 0x4845BC, 0x24 + .asciz "Dedede.AnimScript.AirAttack.Exec()" + .balign 4 .global $$249034 $$249034: - .incbin "baserom.dol", 0x4845E0, 0x28 + .asciz "Dedede.AnimScript.WaterAttack.Exec()" + .balign 4 .global $$249035 $$249035: - .incbin "baserom.dol", 0x484608, 0x28 + .asciz "Dedede.AnimScript.FloatAttack.Exec()" + .balign 4 .global $$249036 $$249036: - .incbin "baserom.dol", 0x484630, 0x1C + .asciz "Dee.AnimScript.Front.Exec()" .global $$249037 $$249037: - .incbin "baserom.dol", 0x48464C, 0x1C + .asciz "Dee.AnimScript.Back.Exec()" + .balign 4 .global $$249038 $$249038: - .incbin "baserom.dol", 0x484668, 0x1C + .asciz "Dee.AnimScript.Upper.Exec()" .global $$249039 $$249039: - .incbin "baserom.dol", 0x484684, 0x24 + .asciz "Dee.AnimScript.UnderStart.Exec()" + .balign 4 .global $$249040 $$249040: - .incbin "baserom.dol", 0x4846A8, 0x1C + .asciz "Dee.AnimScript.Under.Exec()" .global $$249041 $$249041: - .incbin "baserom.dol", 0x4846C4, 0x24 + .asciz "Dee.AnimScript.UnderLanding.Exec()" + .balign 4 .global $$249042 $$249042: - .incbin "baserom.dol", 0x4846E8, 0x20 + .asciz "Dee.AnimScript.Charge.Exec()" + .balign 4 .global $$249043 $$249043: - .incbin "baserom.dol", 0x484708, 0x1C + .asciz "Dee.AnimScript.Throw.Exec()" .global $$249044 $$249044: - .incbin "baserom.dol", 0x484724, 0x24 + .asciz "Dee.AnimScript.TripleThrow.Exec()" + .balign 4 .global $$249045 $$249045: - .incbin "baserom.dol", 0x484748, 0x24 + .asciz "Dee.AnimScript.FlightCharge.Exec()" + .balign 4 .global $$249046 $$249046: - .incbin "baserom.dol", 0x48476C, 0x20 + .asciz "Dee.AnimScript.FlightUp.Exec()" + .balign 4 .global $$249047 $$249047: - .incbin "baserom.dol", 0x48478C, 0x24 + .asciz "Dee.AnimScript.FlightDown.Exec()" + .balign 4 .global $$249048 $$249048: - .incbin "baserom.dol", 0x4847B0, 0x20 + .asciz "Dee.AnimScript.Thrust.Exec()" + .balign 4 .global $$249049 $$249049: - .incbin "baserom.dol", 0x4847D0, 0x1C + .asciz "Dee.AnimScript.Rush.Exec()" + .balign 4 .global $$249050 $$249050: - .incbin "baserom.dol", 0x4847EC, 0x20 + .asciz "Dee.AnimScript.RushEnd.Exec()" + .balign 4 .global $$249051 $$249051: - .incbin "baserom.dol", 0x48480C, 0x1C + .asciz "Dee.AnimScript.Swim.Exec()" + .balign 4 .global $$249052 $$249052: - .incbin "baserom.dol", 0x484828, 0x24 + .asciz "Dee.AnimScript.WaterUnder.Exec()" + .balign 4 .global $$249053 $$249053: - .incbin "baserom.dol", 0x48484C, 0x28 + .asciz "BossDemo.AnimScript.LookAround.Exec()" + .balign 4 .global $$249054 $$249054: - .incbin "baserom.dol", 0x484874, 0x28 + .asciz "BossDemo.AnimScript.LookAround2.Exec()" + .balign 4 .global $$249055 $$249055: - .incbin "baserom.dol", 0x48489C, 0x28 + .asciz "BossDemo.AnimScript.LookAround3.Exec()" + .balign 4 .global $$249056 $$249056: - .incbin "baserom.dol", 0x4848C4, 0x24 + .asciz "BossDemo.AnimScript.LookUp.Exec()" + .balign 4 .global $$249057 $$249057: - .incbin "baserom.dol", 0x4848E8, 0x28 + .asciz "BossDemo.AnimScript.LookUpEnd.Exec()" + .balign 4 .global $$249058 $$249058: - .incbin "baserom.dol", 0x484910, 0x28 + .asciz "BossDemo.AnimScript.StandReady.Exec()" + .balign 4 .global $$249059 $$249059: - .incbin "baserom.dol", 0x484938, 0x2C + .asciz "BossDemo.AnimScript.StandReadyEnd.Exec()" + .balign 4 .global $$249060 $$249060: - .incbin "baserom.dol", 0x484964, 0x24 + .asciz "BossDemo.AnimScript.Wonder.Exec()" + .balign 4 .global $$249061 $$249061: - .incbin "baserom.dol", 0x484988, 0x24 + .asciz "BossDemo.AnimScript.Wonder.Exec2()" + .balign 4 .global $$249062 $$249062: - .incbin "baserom.dol", 0x4849AC, 0x24 + .asciz "BossDemo.AnimScript.Wonder.Exec3()" + .balign 4 .global $$249063 $$249063: - .incbin "baserom.dol", 0x4849D0, 0x24 + .asciz "BossDemo.AnimScript.Wonder.Exec4()" + .balign 4 .global $$249064 $$249064: - .incbin "baserom.dol", 0x4849F4, 0x24 + .asciz "BossDemo.AnimScript.Wonder.Exec5()" + .balign 4 .global $$249065 $$249065: - .incbin "baserom.dol", 0x484A18, 0x24 + .asciz "BossDemo.AnimScript.Tumble.Exec()" + .balign 4 .global $$249066 $$249066: - .incbin "baserom.dol", 0x484A3C, 0x28 + .asciz "BossDemo.AnimScript.TumbleEnd.Exec()" + .balign 4 .global $$249067 $$249067: - .incbin "baserom.dol", 0x484A64, 0x2C + .asciz "BossDemo.AnimScript.GetDecoyParts.Exec()" + .balign 4 .global $$249068 $$249068: - .incbin "baserom.dol", 0x484A90, 0x30 + .asciz "BossDemo.AnimScript.LookForSphere.Exec()" + .balign 4 + .4byte 0 .global $$249069 $$249069: - .incbin "baserom.dol", 0x484AC0, 0x20 + .asciz "BossDemo.AnimScript.Stop.Exec()" .global $$249070 $$249070: - .incbin "baserom.dol", 0x484AE0, 0x28 + .asciz "BossDemo.AnimScript.Stop.Exec2()" + .balign 4 + .4byte 0 .global $$249071 $$249071: - .incbin "baserom.dol", 0x484B08, 0x28 + .asciz "BossDemo.AnimScript.Lighthearted.Exec()" .global $$249072 $$249072: - .incbin "baserom.dol", 0x484B30, 0x28 + .asciz "AreaMapDemo.AnimScript.FirstPlay.Exec()" .global $$249073 $$249073: - .incbin "baserom.dol", 0x484B58, 0x2C + .asciz "AreaMapDemo.AnimScript.ChangeGrade.Exec()" + .balign 4 .global $$249074 $$249074: - .incbin "baserom.dol", 0x484B84, 0x2C + .asciz "AreaMapDemo.AnimScript.ChangeGrade.Exec2()" + .balign 4 .global $$249075 $$249075: - .incbin "baserom.dol", 0x484BB0, 0x2C + .asciz "StaffCredit.AnimScript.CreditWait.Exec()" + .balign 4 .global $$249076 $$249076: - .incbin "baserom.dol", 0x484BDC, 0x2C + .asciz "StaffCredit.AnimScript.CreditWalk.Exec()" + .balign 4 .global $$249077 $$249077: - .incbin "baserom.dol", 0x484C08, 0x28 + .asciz "StaffCredit.AnimScript.CreditRun.Exec()" .global $$249078 $$249078: - .incbin "baserom.dol", 0x484C30, 0x30 + .asciz "StaffCredit.AnimScript.CreditLookRoah.Exec()" + .balign 4 .global $$249079 $$249079: - .incbin "baserom.dol", 0x484C60, 0x34 + .asciz "StaffCredit.AnimScript.CreditGoodbyeMahoroa.Exec()" + .balign 4 .global $$249080 $$249080: - .incbin "baserom.dol", 0x484C94, 0x38 + .asciz "StaffCredit.AnimScript.CreditGoodbyeMahoroaEnd.Exec()" + .balign 4 .global $$249081 $$249081: - .incbin "baserom.dol", 0x484CCC, 0x2C + .asciz "StaffCredit.AnimScript.CreditHello.Exec()" + .balign 4 .global $$249082 $$249082: - .incbin "baserom.dol", 0x484CF8, 0x30 + .asciz "StaffCredit.AnimScript.CreditGladFront.Exec()" + .balign 4 .global $$249083 $$249083: - .incbin "baserom.dol", 0x484D28, 0x30 + .asciz "StaffCredit.AnimScript.CreditWalkSmile.Exec()" + .balign 4 .global $$249084 $$249084: - .incbin "baserom.dol", 0x484D58, 0x34 + .asciz "StaffCredit.AnimScript.CreditHelloMahoroa.Exec()" + .balign 4 .global $$249085 $$249085: - .incbin "baserom.dol", 0x484D8C, 0x34 + .asciz "StaffCredit.AnimScript.CreditHelloMahoroaEnd.Exec()" .global $$249133 $$249133: - .incbin "baserom.dol", 0x484DC0, 0x10 + .asciz "Scn.Step.Hero" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2d diff --git a/asm/src/Component.s b/asm/src/Component.s index bfc7d1e2..d6bdb39a 100644 --- a/asm/src/Component.s +++ b/asm/src/Component.s @@ -7890,74 +7890,89 @@ lbl_803F9B3C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257322 $$257322: - .incbin "baserom.dol", 0x45AD30, 0x18 + .asciz "challengetitle/Global" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257925 $$257925: - .incbin "baserom.dol", 0x45CA78, 0x18 + .asciz "grandtitle/Global" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255625 $$255625: - .incbin "baserom.dol", 0x492040, 0x14 + .asciz "staffcredit/Param" + .balign 4 .global $$255626 $$255626: - .incbin "baserom.dol", 0x492054, 0x14 + .asciz "staffcredits/Main" + .balign 4 .global $$255628 $$255628: - .incbin "baserom.dol", 0x492068, 0x40 + .asciz "TextBaseN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253837 $$253837: - .incbin "baserom.dol", 0x493A50, 0x8 + .asciz "Pause" + .balign 4 .global $$253838 $$253838: - .incbin "baserom.dol", 0x493A58, 0x4 + .4byte 0x42670000 .global $$253839 $$253839: - .incbin "baserom.dol", 0x493A5C, 0x4 + .4byte 0x42674E00 .global $$253840 $$253840: - .incbin "baserom.dol", 0x493A60, 0x8 + .asciz "Wait" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255627 $$255627: - .incbin "baserom.dol", 0x498A00, 0x8 + .asciz "Base" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256022 $$256022: - .incbin "baserom.dol", 0x49A910, 0x4 + .4byte 0xFFFFFFFF .global $$256026 $$256026: - .incbin "baserom.dol", 0x49A914, 0x4 + .4byte 0xFFFFFFFF .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255954 $$255954: - .incbin "baserom.dol", 0x49AAD0, 0x4 + .4byte 0xFFFFFFFF .global $$255959 $$255959: - .incbin "baserom.dol", 0x49AAD4, 0x4 + .4byte 0x000000FF .global $$255962 $$255962: - .incbin "baserom.dol", 0x49AAD8, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252828 $$252828: - .incbin "baserom.dol", 0x49AB78, 0x4 + .4byte 0xFFFFFFFF .global $$252833 $$252833: - .incbin "baserom.dol", 0x49AB7C, 0x4 + .4byte 0xFFFFFFFF .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252815 $$252815: - .incbin "baserom.dol", 0x49ED58, 0x4 + .4byte 0xFFFFFFFF .global $$252819 $$252819: - .incbin "baserom.dol", 0x49ED5C, 0x4 + .4byte 0xFFFFFFFF diff --git a/asm/src/Confirm.s b/asm/src/Confirm.s index 61a151f6..0e0a1522 100644 --- a/asm/src/Confirm.s +++ b/asm/src/Confirm.s @@ -788,65 +788,85 @@ lbl_801A9DB8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252873 $$252873: - .incbin "baserom.dol", 0x453618, 0xC + .asciz "common/Main" .global $$252875 $$252875: - .incbin "baserom.dol", 0x453624, 0xC + .asciz "Button01N" + .balign 4 .global $$252876 $$252876: - .incbin "baserom.dol", 0x453630, 0xC + .asciz "Button02N" + .balign 4 .global $$252877 $$252877: - .incbin "baserom.dol", 0x45363C, 0xC + .asciz "Button03N" + .balign 4 .global $$252879 $$252879: - .incbin "baserom.dol", 0x453648, 0xC + .asciz "ConfirmText" .global $$252881 $$252881: - .incbin "baserom.dol", 0x453654, 0xC + .asciz "ConfirmYes" + .balign 4 .global $$252882 $$252882: - .incbin "baserom.dol", 0x453660, 0xC + .asciz "ConfirmNo" + .balign 4 .global $$252883 $$252883: - .incbin "baserom.dol", 0x45366C, 0xC + .asciz "Paturn01" + .balign 4 .global $$252884 $$252884: - .incbin "baserom.dol", 0x453678, 0xC + .asciz "Paturn03" + .balign 4 .global $$252885 $$252885: - .incbin "baserom.dol", 0x453684, 0xC + .asciz "Paturn02" + .balign 4 .global $$252886 $$252886: - .incbin "baserom.dol", 0x453690, 0x40 + .asciz "Paturn05" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252874 $$252874: - .incbin "baserom.dol", 0x493440, 0x8 + .asciz "Confirm" .global $$252878 $$252878: - .incbin "baserom.dol", 0x493448, 0x8 + .asciz "WinN" + .balign 4 .global $$252880 $$252880: - .incbin "baserom.dol", 0x493450, 0x4 + .4byte 0 .global $$252887 $$252887: - .incbin "baserom.dol", 0x493454, 0x4 + .4byte 0x42470000 .global $$252977 $$252977: - .incbin "baserom.dol", 0x493458, 0x8 + .asciz "Open2" + .balign 4 .global $$252978 $$252978: - .incbin "baserom.dol", 0x493460, 0x8 + .asciz "Open" + .balign 4 .global $$253036 $$253036: - .incbin "baserom.dol", 0x493468, 0x8 + .asciz "Close" + .balign 4 .global $$253048 $$253048: - .incbin "baserom.dol", 0x493470, 0x8 + .asciz "Close2" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253005 $$253005: - .incbin "baserom.dol", 0x49A490, 0x8 + .4byte 0x40800000 + .4byte 0 diff --git a/asm/src/ConsecutiveBattle.s b/asm/src/ConsecutiveBattle.s index 0da1f1e5..0c7e0c90 100644 --- a/asm/src/ConsecutiveBattle.s +++ b/asm/src/ConsecutiveBattle.s @@ -426,15 +426,17 @@ lbl_8030B644: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251712 $$251712: - .incbin "baserom.dol", 0x47D350, 0x20 + .asciz "step/gimmick/ConsecutiveBattle" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251713 $$251713: - .incbin "baserom.dol", 0x49D348, 0x4 + .4byte 0xFF7FFFFF .global $$251797 $$251797: - .incbin "baserom.dol", 0x49D34C, 0x4 + .4byte 0 .global $$251798 $$251798: - .incbin "baserom.dol", 0x49D350, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/Console.s b/asm/src/Console.s index 7fbd03d3..b8acc346 100644 --- a/asm/src/Console.s +++ b/asm/src/Console.s @@ -262,31 +262,41 @@ lbl_80189954: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20 $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20: - .incbin "baserom.dol", 0x44F9A0, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead: - .incbin "baserom.dol", 0x44F9C4, 0xC + .asciz "console.h" + .balign 4 .global $$2STRING$$2Console_SetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadl$$20 $$2STRING$$2Console_SetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadl$$20: - .incbin "baserom.dol", 0x44F9D0, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_SetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadl $$2STRING$$2Console_SetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadl: - .incbin "baserom.dol", 0x44F9F4, 0xC + .asciz "console.h" + .balign 4 .global $$2STRING$$2Console_GetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20 $$2STRING$$2Console_GetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20: - .incbin "baserom.dol", 0x44FA00, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_GetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead $$2STRING$$2Console_GetViewBaseLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead: - .incbin "baserom.dol", 0x44FA24, 0xC + .asciz "console.h" + .balign 4 .global $$2STRING$$2Console_SetPosition__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadll$$20 $$2STRING$$2Console_SetPosition__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadll$$20: - .incbin "baserom.dol", 0x44FA30, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_SetPosition__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadll $$2STRING$$2Console_SetPosition__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadll: - .incbin "baserom.dol", 0x44FA54, 0xC + .asciz "console.h" + .balign 4 .global $$2STRING$$2Console_GetViewHeight__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20 $$2STRING$$2Console_GetViewHeight__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20: - .incbin "baserom.dol", 0x44FA60, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_GetViewHeight__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead $$2STRING$$2Console_GetViewHeight__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead: - .incbin "baserom.dol", 0x44FA84, 0xC + .asciz "console.h" + .balign 4 diff --git a/asm/src/Constant.s b/asm/src/Constant.s index ee663c2f..35bb7153 100644 --- a/asm/src/Constant.s +++ b/asm/src/Constant.s @@ -18,36 +18,46 @@ LytResPathPage__Q25pause8ConstantFQ25pause11PageResKind: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2 T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2: - .incbin "baserom.dol", 0x411168, 0x18 + .4byte 0x8045D470 + .4byte 0x8045D484 + .4byte 0x8045D484 + .4byte 0x8045D484 + .4byte 0x8045D484 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 $$248724: - .incbin "baserom.dol", 0x459570, 0x14 + .asciz "pause/PageDropout" + .balign 4 .global $$248725 $$248725: - .incbin "baserom.dol", 0x459584, 0x14 + .asciz "pause/PageCommand" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x459598, 0x10 + .asciz "pause/Main" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ERROR_BG_COLOR__Q23app8Constant ERROR_BG_COLOR__Q23app8Constant: - .incbin "baserom.dol", 0x49A0E0, 0x4 + .4byte 0xFFE0E0FF .global ERROR_FONT_COLOR__Q23app8Constant ERROR_FONT_COLOR__Q23app8Constant: - .incbin "baserom.dol", 0x49A0E4, 0x4 + .4byte 0xE08080FF .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global LIFE_BAR_LENGTH_MAIN__Q43scn4step4hero8Constant LIFE_BAR_LENGTH_MAIN__Q43scn4step4hero8Constant: - .incbin "baserom.dol", 0x49D6C0, 0x4 + .4byte 0x3F800000 .global LIFE_BAR_LENGTH_EXTRA__Q43scn4step4hero8Constant LIFE_BAR_LENGTH_EXTRA__Q43scn4step4hero8Constant: - .incbin "baserom.dol", 0x49D6C4, 0x4 + .4byte 0x3F19999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ONE_GRID_SIZE_ON_MAPRO_POS__Q43scn4step3map8Constant ONE_GRID_SIZE_ON_MAPRO_POS__Q43scn4step3map8Constant: - .incbin "baserom.dol", 0x49E660, 0x8 + .4byte 0x41800000 + .4byte 0 diff --git a/asm/src/Context.s b/asm/src/Context.s index fe7fb484..c02f5fd0 100644 --- a/asm/src/Context.s +++ b/asm/src/Context.s @@ -19,4 +19,5 @@ __ct__Q53scn4step4hero5stone7ContextFRQ53scn4step4hero5stone21GearNodeRandomChan .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248858 $$248858: - .incbin "baserom.dol", 0x49E100, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ControlIcon.s b/asm/src/ControlIcon.s index 302cfb14..f998c76d 100644 --- a/asm/src/ControlIcon.s +++ b/asm/src/ControlIcon.s @@ -268,36 +268,54 @@ lbl_801E0008: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251820 $$251820: - .incbin "baserom.dol", 0x459C88, 0x10 + .asciz "ForwardN" + .balign 4 + .4byte 0 .global PANES__Q33scn5anime25$$2unnamed$$2ControlIcon_cpp$$2 PANES__Q33scn5anime25$$2unnamed$$2ControlIcon_cpp$$2: - .incbin "baserom.dol", 0x459C98, 0x10 + .4byte 0x80557930 + .4byte 0x80557938 + .4byte 0x80557940 + .4byte 0x8045DB88 .global $$252408 $$252408: - .incbin "baserom.dol", 0x459CA8, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252409 $$252409: - .incbin "baserom.dol", 0x459CB8, 0x14 + .asciz "MusicControlIcon" + .balign 4 .global $$252410 $$252410: - .incbin "baserom.dol", 0x459CCC, 0x14 + .asciz "AnimeControlIcon" + .balign 4 .global $$252469 $$252469: - .incbin "baserom.dol", 0x459CE0, 0x40 + .asciz "Disappear" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251817 $$251817: - .incbin "baserom.dol", 0x493D10, 0x8 + .asciz "RewindN" .global $$251818 $$251818: - .incbin "baserom.dol", 0x493D18, 0x8 + .asciz "PlayN" + .balign 4 .global $$251819 $$251819: - .incbin "baserom.dol", 0x493D20, 0x8 + .asciz "StopN" + .balign 4 .global $$252462 $$252462: - .incbin "baserom.dol", 0x493D28, 0x8 + .asciz "Appear" + .balign 4 .global $$252463 $$252463: - .incbin "baserom.dol", 0x493D30, 0x8 + .asciz "Wait" + .balign 4 diff --git a/asm/src/ControlPanel.s b/asm/src/ControlPanel.s index cb844312..44a83d95 100644 --- a/asm/src/ControlPanel.s +++ b/asm/src/ControlPanel.s @@ -839,113 +839,145 @@ unselectAllCursor__Q33scn5anime12ControlPanelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252991 $$252991: - .incbin "baserom.dol", 0x459D20, 0x14 + .asciz "MusicControlPanel" + .balign 4 .global $$252992 $$252992: - .incbin "baserom.dol", 0x459D34, 0x14 + .asciz "AnimeControlPanel" + .balign 4 .global $$252993 $$252993: - .incbin "baserom.dol", 0x459D48, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252994 $$252994: - .incbin "baserom.dol", 0x459D58, 0x10 + .asciz "AnimeScrollTab" + .balign 4 .global $$252995 $$252995: - .incbin "baserom.dol", 0x459D68, 0x10 + .asciz "ReWindButton" + .balign 4 .global $$252996 $$252996: - .incbin "baserom.dol", 0x459D78, 0x14 + .asciz "AnimeButtonCursor" + .balign 4 .global $$252997 $$252997: - .incbin "baserom.dol", 0x459D8C, 0xC + .asciz "PlayButton" + .balign 4 .global $$252998 $$252998: - .incbin "baserom.dol", 0x459D98, 0x10 + .asciz "ForwardButton" + .balign 4 .global $$253004 $$253004: - .incbin "baserom.dol", 0x459DA8, 0xC + .asciz "ForwardN" + .balign 4 .global $$253007 $$253007: - .incbin "baserom.dol", 0x459DB4, 0xC + .asciz "TabCursorN" + .balign 4 .global $$253065 $$253065: - .incbin "baserom.dol", 0x459DC0, 0xC + .asciz "Disappear" + .balign 4 .global $$253082 $$253082: - .incbin "baserom.dol", 0x459DCC, 0xC + .asciz "CurrentMinT" .global $$253084 $$253084: - .incbin "baserom.dol", 0x459DD8, 0x10 + .asciz "CurrentSecondT" + .balign 4 .global $$253095 $$253095: - .incbin "baserom.dol", 0x459DE8, 0xC + .asciz "TotalMinT" + .balign 4 .global $$253096 $$253096: - .incbin "baserom.dol", 0x459DF4, 0x10 + .asciz "TotalSecondT" + .balign 4 .global $$253145 $$253145: - .incbin "baserom.dol", 0x459E04, 0x3C + .asciz "NotSelect" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252999 $$252999: - .incbin "baserom.dol", 0x493D38, 0x8 + .asciz "BackN" + .balign 4 .global $$253000 $$253000: - .incbin "baserom.dol", 0x493D40, 0x8 + .asciz "TabN" + .balign 4 .global $$253001 $$253001: - .incbin "baserom.dol", 0x493D48, 0x8 + .asciz "RewindN" .global $$253002 $$253002: - .incbin "baserom.dol", 0x493D50, 0x8 + .asciz "CursorN" .global $$253003 $$253003: - .incbin "baserom.dol", 0x493D58, 0x8 + .asciz "PlayN" + .balign 4 .global $$253005 $$253005: - .incbin "baserom.dol", 0x493D60, 0x4 + .4byte 0x456E6400 .global $$253006 $$253006: - .incbin "baserom.dol", 0x493D64, 0x8 + .asciz "Wait" + .balign 4 .global $$253008 $$253008: - .incbin "baserom.dol", 0x493D6C, 0x8 + .asciz "Wait2" + .balign 4 .global $$253061 $$253061: - .incbin "baserom.dol", 0x493D74, 0x8 + .asciz "Appear" + .balign 4 .global $$253083 $$253083: - .incbin "baserom.dol", 0x493D7C, 0x8 + .asciz "%02u" + .balign 4 .global $$252254 $$252254: - .incbin "baserom.dol", 0x493D84, 0x4 + .4byte 0 .global $$252255 $$252255: - .incbin "baserom.dol", 0x493D88, 0x4 + .4byte 0x3F800000 .global $$253110 $$253110: - .incbin "baserom.dol", 0x493D8C, 0x8 + .asciz "Select" + .balign 4 .global $$253114 $$253114: - .incbin "baserom.dol", 0x493D94, 0x8 + .asciz "Push" + .balign 4 .global $$253119 $$253119: - .incbin "baserom.dol", 0x493D9C, 0x8 + .asciz "Push2" + .balign 4 .global $$253120 $$253120: - .incbin "baserom.dol", 0x493DA4, 0x8 + .asciz "Wait1" + .balign 4 .global $$253121 $$253121: - .incbin "baserom.dol", 0x493DAC, 0xC + .asciz "Push1" + .balign 4 + .4byte 0 .global $$253139 $$253139: - .incbin "baserom.dol", 0x493DB8, 0x8 + .asciz "Release" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253102 $$253102: - .incbin "baserom.dol", 0x49A820, 0x4 + .4byte 0 .global $$253103 $$253103: - .incbin "baserom.dol", 0x49A824, 0x4 + .4byte 0x42C60000 diff --git a/asm/src/CountDown.s b/asm/src/CountDown.s index 20808c4a..13d24d65 100644 --- a/asm/src/CountDown.s +++ b/asm/src/CountDown.s @@ -186,27 +186,37 @@ lbl_803B1FE4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252118 $$252118: - .incbin "baserom.dol", 0x48C3D8, 0x14 + .asciz "step/challenge/Main" .global $$252119 $$252119: - .incbin "baserom.dol", 0x48C3EC, 0xC + .asciz "CountDown" + .balign 4 .global $$252120 $$252120: - .incbin "baserom.dol", 0x48C3F8, 0x10 + .asciz "RemainingTime" + .balign 4 .global $$252122 $$252122: - .incbin "baserom.dol", 0x48C408, 0x10 + .asciz "TimeAlert_60" + .balign 4 .global $$252124 $$252124: - .incbin "baserom.dol", 0x48C418, 0x40 + .asciz "TimeAlert_30" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252121 $$252121: - .incbin "baserom.dol", 0x497B48, 0x8 + .asciz "Rest1S" + .balign 4 .global $$252123 $$252123: - .incbin "baserom.dol", 0x497B50, 0x8 + .asciz "Rest30M" .global $$252167 $$252167: - .incbin "baserom.dol", 0x497B58, 0x8 + .4byte 0x25640000 + .4byte 0 diff --git a/asm/src/Counter.s b/asm/src/Counter.s index d1a25220..abc5dcdf 100644 --- a/asm/src/Counter.s +++ b/asm/src/Counter.s @@ -72,4 +72,5 @@ addPointStarCount__Q43scn4step4hero7CounterFUl: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_COUNT_MAX__Q43scn4step4hero21$$2unnamed$$2Counter_cpp$$2 T_COUNT_MAX__Q43scn4step4hero21$$2unnamed$$2Counter_cpp$$2: - .incbin "baserom.dol", 0x49D6C8, 0x8 + .4byte 0x000003E7 + .4byte 0 diff --git a/asm/src/Cry.s b/asm/src/Cry.s index 28577226..a6acb6a8 100644 --- a/asm/src/Cry.s +++ b/asm/src/Cry.s @@ -335,15 +335,35 @@ lbl_80334A98: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global CRY_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 CRY_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: - .incbin "baserom.dol", 0x415D90, 0x20 + .4byte 0x0000007F + .4byte 0x00000080 + .4byte 0x00000081 + .4byte 0x00000083 + .4byte 0x00000084 + .4byte 0x00000085 + .4byte 0x00000086 + .4byte 0x0000008D .global CRY_TABLE_META__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 CRY_TABLE_META__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: - .incbin "baserom.dol", 0x415DB0, 0x1C + .4byte 0x00000099 + .4byte 0x0000009A + .4byte 0x0000009B + .4byte 0x0000009C + .4byte 0x0000009D + .4byte 0x0000009E + .4byte 0x0000009F .global CRY_TABLE_DEDEDE__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 CRY_TABLE_DEDEDE__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: - .incbin "baserom.dol", 0x415DCC, 0x1C + .4byte 0x0000008E + .4byte 0x0000008F + .4byte 0x00000090 + .4byte 0x00000091 + .4byte 0x00000092 + .4byte 0x00000093 + .4byte 0x00000094 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global SHOUT_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 SHOUT_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: - .incbin "baserom.dol", 0x49D6D0, 0x8 + .4byte 0x0000008A + .4byte 0x0000008B diff --git a/asm/src/Culling.s b/asm/src/Culling.s index 60003040..43350d44 100644 --- a/asm/src/Culling.s +++ b/asm/src/Culling.s @@ -301,19 +301,21 @@ lbl_8026DAD4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256037 $$256037: - .incbin "baserom.dol", 0x49B778, 0x8 + .4byte 0 + .4byte 0 .global $$256041 $$256041: - .incbin "baserom.dol", 0x49B780, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256053 $$256053: - .incbin "baserom.dol", 0x49B788, 0x4 + .4byte 0x3F000000 .global $$256054 $$256054: - .incbin "baserom.dol", 0x49B78C, 0x4 + .4byte 0xBF000000 .global $$256055 $$256055: - .incbin "baserom.dol", 0x49B790, 0x4 + .4byte 0x40400000 .global $$256056 $$256056: - .incbin "baserom.dol", 0x49B794, 0x4 + .4byte 0xC0400000 diff --git a/asm/src/Cursor.s b/asm/src/Cursor.s index d11b89cb..ca7a6070 100644 --- a/asm/src/Cursor.s +++ b/asm/src/Cursor.s @@ -395,102 +395,166 @@ playChoice__Q43scn7history6detail6CursorFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251586 $$251586: - .incbin "baserom.dol", 0x4115C8, 0x28 + .4byte 0x80557A28 + .4byte 0x80557A30 + .4byte 0x80557A38 + .4byte 0x80557A40 + .4byte 0x8045DF4C + .4byte 0x8045DF4C + .4byte 0x80557A48 + .4byte 0x80557A50 + .4byte 0x80557A58 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251991 $$251991: - .incbin "baserom.dol", 0x45A030, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$251582 $$251582: - .incbin "baserom.dol", 0x45A04C, 0xC + .asciz "PlatinaN" + .balign 4 .global __vt__Q33scn19challengefileselect6Cursor __vt__Q33scn19challengefileselect6Cursor: - .incbin "baserom.dol", 0x45A058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801E3004 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251547 $$251547: - .incbin "baserom.dol", 0x45D9A0, 0x10 + .asciz "PackageCursorN" + .balign 4 .global $$251548 $$251548: - .incbin "baserom.dol", 0x45D9B0, 0x10 + .asciz "MovieCursorN" + .balign 4 .global $$251549 $$251549: - .incbin "baserom.dol", 0x45D9C0, 0xC + .asciz "PlayCursorN" .global $$251550 $$251550: - .incbin "baserom.dol", 0x45D9CC, 0x10 + .asciz "SelectButtonN" + .balign 4 .global $$251551 $$251551: - .incbin "baserom.dol", 0x45D9DC, 0x14 + .asciz "AnimePlayButtonN" + .balign 4 .global $$251552 $$251552: - .incbin "baserom.dol", 0x45D9F0, 0x10 + .asciz "TitleButtonN" + .balign 4 .global $$251553 $$251553: - .incbin "baserom.dol", 0x45DA00, 0x10 + .asciz "TitleButtonSN" + .balign 4 .global $$251554 $$251554: - .incbin "baserom.dol", 0x45DA10, 0x10 + .asciz "CheckButtonN" + .balign 4 .global $$251555 $$251555: - .incbin "baserom.dol", 0x45DA20, 0xC + .asciz "ListButtonN" .global PANES__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 PANES__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .incbin "baserom.dol", 0x45DA2C, 0x2C + .4byte 0x804618A0 + .4byte 0x804618B0 + .4byte 0x804618C0 + .4byte 0x804618CC + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x804618F0 + .4byte 0x80461900 + .4byte 0x80461910 + .4byte 0x80461920 .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .incbin "baserom.dol", 0x45DA58, 0x2C + .4byte 0x804618A0 + .4byte 0x80461920 + .4byte 0x804618B0 + .4byte 0x804618C0 + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x80461920 + .4byte 0x804618F0 + .4byte 0x804618F0 + .4byte 0x804618F0 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .incbin "baserom.dol", 0x45DA84, 0x2C + .4byte 0x804618A0 + .4byte 0x80461920 + .4byte 0x804618B0 + .4byte 0x804618C0 + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x804618DC + .4byte 0x80461920 + .4byte 0x80461900 + .4byte 0x80461900 + .4byte 0x80461900 .global $$252454 $$252454: - .incbin "baserom.dol", 0x45DAB0, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252455 $$252455: - .incbin "baserom.dol", 0x45DAC0, 0x48 + .asciz "ProductButtonCursor" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251992 $$251992: - .incbin "baserom.dol", 0x493DF8, 0x8 + .asciz "Cursor" + .balign 4 .global $$251993 $$251993: - .incbin "baserom.dol", 0x493E00, 0x8 + .asciz "Wait" + .balign 4 .global $$251578 $$251578: - .incbin "baserom.dol", 0x493E08, 0x8 + .asciz "NormalN" .global $$251579 $$251579: - .incbin "baserom.dol", 0x493E10, 0x8 + .asciz "BronzeN" .global $$251580 $$251580: - .incbin "baserom.dol", 0x493E18, 0x8 + .asciz "SilverN" .global $$251581 $$251581: - .incbin "baserom.dol", 0x493E20, 0x8 + .asciz "GoldN" + .balign 4 .global $$251583 $$251583: - .incbin "baserom.dol", 0x493E28, 0x8 + .asciz "DeleteN" .global $$251584 $$251584: - .incbin "baserom.dol", 0x493E30, 0x8 + .asciz "RumbleN" .global $$251585 $$251585: - .incbin "baserom.dol", 0x493E38, 0x8 + .asciz "EndingN" .global $$252034 $$252034: - .incbin "baserom.dol", 0x493E40, 0x8 + .asciz "Focus" + .balign 4 .global $$252044 $$252044: - .incbin "baserom.dol", 0x493E48, 0x8 + .asciz "Decide" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252551 $$252551: - .incbin "baserom.dol", 0x494AC0, 0x8 + .asciz "Decide" + .balign 4 .global $$252560 $$252560: - .incbin "baserom.dol", 0x494AC8, 0x8 + .asciz "Choice" + .balign 4 diff --git a/asm/src/CursorPanel.s b/asm/src/CursorPanel.s index 3db6ed6e..a9f47812 100644 --- a/asm/src/CursorPanel.s +++ b/asm/src/CursorPanel.s @@ -135,10 +135,13 @@ lbl_801DB5BC: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251812 $$251812: - .incbin "baserom.dol", 0x493A68, 0x8 + .asciz "Wait" + .balign 4 .global $$251819 $$251819: - .incbin "baserom.dol", 0x493A70, 0x8 + .asciz "Push" + .balign 4 .global $$251823 $$251823: - .incbin "baserom.dol", 0x493A78, 0x8 + .asciz "Free" + .balign 4 diff --git a/asm/src/Curtain.s b/asm/src/Curtain.s index 6ee7ad2b..4bbaf725 100644 --- a/asm/src/Curtain.s +++ b/asm/src/Curtain.s @@ -219,24 +219,30 @@ isOpening__Q43scn9grandmenu4menu7CurtainCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251703 $$251703: - .incbin "baserom.dol", 0x4918A0, 0x10 + .asciz "grandmenu/Main" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251704 $$251704: - .incbin "baserom.dol", 0x4988A0, 0x8 + .asciz "Curtain" .global $$251718 $$251718: - .incbin "baserom.dol", 0x4988A8, 0x8 + .asciz "Main" + .balign 4 .global $$251723 $$251723: - .incbin "baserom.dol", 0x4988B0, 0x8 + .asciz "Start" + .balign 4 .global $$251728 $$251728: - .incbin "baserom.dol", 0x4988B8, 0x4 + .4byte 0x456E6400 .global $$251733 $$251733: - .incbin "baserom.dol", 0x4988BC, 0x8 + .asciz "Start2" + .balign 4 .global $$251738 $$251738: - .incbin "baserom.dol", 0x4988C4, 0xC + .asciz "End2" + .balign 4 + .4byte 0 diff --git a/asm/src/CurveUtility.s b/asm/src/CurveUtility.s index 501b2e86..df138f88 100644 --- a/asm/src/CurveUtility.s +++ b/asm/src/CurveUtility.s @@ -24,4 +24,5 @@ invSquare__Q24util12CurveUtilityFf: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249344 $$249344: - .incbin "baserom.dol", 0x49EED0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Custom.s b/asm/src/Custom.s index 35e1c2fd..711d641a 100644 --- a/asm/src/Custom.s +++ b/asm/src/Custom.s @@ -21967,1319 +21967,3004 @@ __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE_1__20$$2unnamed$$2Custom_cpp$$2 T_ALPHA_TABLE_1__20$$2unnamed$$2Custom_cpp$$2: - .incbin "baserom.dol", 0x415008, 0x80 + .4byte 0x00000030 + .4byte 0x00000060 + .4byte 0x00000080 + .4byte 0x00000070 + .4byte 0x00000060 + .4byte 0x00000050 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ALPHA_TABLE_2__20$$2unnamed$$2Custom_cpp$$2 T_ALPHA_TABLE_2__20$$2unnamed$$2Custom_cpp$$2: - .incbin "baserom.dol", 0x415088, 0x80 + .4byte 0x00000060 + .4byte 0x00000080 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257947 $$257947: - .incbin "baserom.dol", 0x460C60, 0x2C + .asciz "Scn.Step.Boss.Bonkers.Brain.ExecBossRushEx" + .balign 4 .global $$257948 $$257948: - .incbin "baserom.dol", 0x460C8C, 0x24 + .asciz "Scn.Step.Boss.Bonkers.Brain.ExecEx" + .balign 4 .global $$257949 $$257949: - .incbin "baserom.dol", 0x460CB0, 0x28 + .asciz "Scn.Step.Boss.Bonkers.Brain.ExecAngryEx" .global $$257950 $$257950: - .incbin "baserom.dol", 0x460CD8, 0x2C + .asciz "Scn.Step.Boss.Bonkers.Brain.ExecBossRush" + .balign 4 .global $$257951 $$257951: - .incbin "baserom.dol", 0x460D04, 0x24 + .asciz "Scn.Step.Boss.Bonkers.Brain.Exec" + .balign 4 .global $$257952 $$257952: - .incbin "baserom.dol", 0x460D28, 0x28 + .asciz "Scn.Step.Boss.Bonkers.Brain.ExecAngry" + .balign 4 .global __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1 __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1: - .incbin "baserom.dol", 0x460D50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80237C04 ;# ptr + .4byte 0x80237B68 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460D70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80237C00 ;# ptr + .4byte 0x80237B88 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss7bonkers6Custom __vt__Q53scn4step4boss7bonkers6Custom: - .incbin "baserom.dol", 0x460D90, 0x98 + .4byte 0 + .4byte 0 + .4byte 0x80237B64 ;# ptr + .4byte 0x80237BA4 ;# ptr + .4byte 0x802373E0 ;# ptr + .4byte 0x80237740 ;# ptr + .4byte 0x802377FC ;# ptr + .4byte 0x80237888 ;# ptr + .4byte 0x802378B8 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80237950 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x80237954 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257944 $$257944: - .incbin "baserom.dol", 0x461578, 0x34 + .asciz "Scn.Step.Boss.ChallengeMaster.Brain.Brain.ExecLv1" + .balign 4 .global $$257945 $$257945: - .incbin "baserom.dol", 0x4615AC, 0x34 + .asciz "Scn.Step.Boss.ChallengeMaster.Brain.Brain.ExecLv2" + .balign 4 .global $$257946 $$257946: - .incbin "baserom.dol", 0x4615E0, 0x34 + .asciz "Scn.Step.Boss.ChallengeMaster.Brain.Brain.ExecLv3" + .balign 4 .global $$257947 $$257947: - .incbin "baserom.dol", 0x461614, 0x34 + .asciz "Scn.Step.Boss.ChallengeMaster.Brain.Brain.ExecLv4" + .balign 4 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461648, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023C438 ;# ptr + .4byte 0x8023C33C ;# ptr .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461658, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8023C434 ;# ptr + .4byte 0x8023C358 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss15challengemaster6Custom __vt__Q53scn4step4boss15challengemaster6Custom: - .incbin "baserom.dol", 0x461678, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x8023C338 ;# ptr + .4byte 0x8023C374 ;# ptr + .4byte 0x8023BCB0 ;# ptr + .4byte 0x8023BECC ;# ptr + .4byte 0x8023BED0 ;# ptr + .4byte 0x8023BED4 ;# ptr + .4byte 0x8023BED8 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x8023BEDC ;# ptr + .4byte 0x8023BF2C ;# ptr + .4byte 0x8023BF74 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4625F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80247C54 ;# ptr + .4byte 0x80247C34 ;# ptr .global __vt__Q53scn4step4boss12creditdedede6Custom __vt__Q53scn4step4boss12creditdedede6Custom: - .incbin "baserom.dol", 0x462600, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80247C30 ;# ptr + .4byte 0x80247C50 ;# ptr + .4byte 0x80247B48 ;# ptr + .4byte 0x8022E5C8 ;# ptr + .4byte 0x80247C18 ;# ptr + .4byte 0x80247C1C ;# ptr + .4byte 0x80247C20 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80247C24 ;# ptr + .4byte 0x80247C28 ;# ptr + .4byte 0x80247C2C ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4628C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802486A4 ;# ptr + .4byte 0x80248684 ;# ptr .global __vt__Q53scn4step4boss9creditdee6Custom __vt__Q53scn4step4boss9creditdee6Custom: - .incbin "baserom.dol", 0x4628D0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80248680 ;# ptr + .4byte 0x802486A0 ;# ptr + .4byte 0x80248598 ;# ptr + .4byte 0x8022E5C8 ;# ptr + .4byte 0x80248668 ;# ptr + .4byte 0x8024866C ;# ptr + .4byte 0x80248670 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80248674 ;# ptr + .4byte 0x80248678 ;# ptr + .4byte 0x8024867C ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462D20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80249D40 ;# ptr + .4byte 0x80249D20 ;# ptr .global __vt__Q53scn4step4boss10creditmeta6Custom __vt__Q53scn4step4boss10creditmeta6Custom: - .incbin "baserom.dol", 0x462D30, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80249D1C ;# ptr + .4byte 0x80249D3C ;# ptr + .4byte 0x80249C34 ;# ptr + .4byte 0x8022E5C8 ;# ptr + .4byte 0x80249D04 ;# ptr + .4byte 0x80249D08 ;# ptr + .4byte 0x80249D0C ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80249D10 ;# ptr + .4byte 0x80249D14 ;# ptr + .4byte 0x80249D18 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4630B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024B6D0 ;# ptr + .4byte 0x8024B6B0 ;# ptr .global __vt__Q53scn4step4boss10creditroah6Custom __vt__Q53scn4step4boss10creditroah6Custom: - .incbin "baserom.dol", 0x4630C0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8024B6AC ;# ptr + .4byte 0x8024B6CC ;# ptr + .4byte 0x8024B3E8 ;# ptr + .4byte 0x8022E5C8 ;# ptr + .4byte 0x8024B4F0 ;# ptr + .4byte 0x8024B4F4 ;# ptr + .4byte 0x8024B4F8 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x8024B4FC ;# ptr + .4byte 0x8024B500 ;# ptr + .4byte 0x8024B504 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258559 $$258559: - .incbin "baserom.dol", 0x4634B8, 0x2C + .asciz "Scn.Step.Boss.Dubior.Brain.ExecBossRushEx" + .balign 4 .global $$258560 $$258560: - .incbin "baserom.dol", 0x4634E4, 0x24 + .asciz "Scn.Step.Boss.Dubior.Brain.ExecEx" + .balign 4 .global $$258561 $$258561: - .incbin "baserom.dol", 0x463508, 0x28 + .asciz "Scn.Step.Boss.Dubior.Brain.ExecAngryEx" + .balign 4 .global $$258562 $$258562: - .incbin "baserom.dol", 0x463530, 0x28 + .asciz "Scn.Step.Boss.Dubior.Brain.ExecBossRush" .global $$258563 $$258563: - .incbin "baserom.dol", 0x463558, 0x20 + .asciz "Scn.Step.Boss.Dubior.Brain.Exec" .global $$258564 $$258564: - .incbin "baserom.dol", 0x463578, 0x28 + .asciz "Scn.Step.Boss.Dubior.Brain.ExecAngry" + .balign 4 .global __vt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1 __vt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1: - .incbin "baserom.dol", 0x4635A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024D418 ;# ptr + .4byte 0x8024D388 ;# ptr .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4635B0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x8024D414 ;# ptr + .4byte 0x8024D38C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss6dubior6Custom __vt__Q53scn4step4boss6dubior6Custom: - .incbin "baserom.dol", 0x4635E0, 0x98 + .4byte 0 + .4byte 0 + .4byte 0x8024D384 ;# ptr + .4byte 0x8024D3A8 ;# ptr + .4byte 0x8024CB14 ;# ptr + .4byte 0x8024CDA4 ;# ptr + .4byte 0x8024CDD0 ;# ptr + .4byte 0x8024CE5C ;# ptr + .4byte 0x8024CE60 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x8024CEF8 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x8024CEFC ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8024CF00 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257877 $$257877: - .incbin "baserom.dol", 0x463B80, 0x30 + .asciz "Scn.Step.Boss.GigantEdge.Brain.ExecBossRushEx" + .balign 4 .global $$257878 $$257878: - .incbin "baserom.dol", 0x463BB0, 0x28 + .asciz "Scn.Step.Boss.GigantEdge.Brain.ExecEx" + .balign 4 .global $$257879 $$257879: - .incbin "baserom.dol", 0x463BD8, 0x2C + .asciz "Scn.Step.Boss.GigantEdge.Brain.ExecAngryEx" + .balign 4 .global $$257880 $$257880: - .incbin "baserom.dol", 0x463C04, 0x2C + .asciz "Scn.Step.Boss.GigantEdge.Brain.ExecBossRush" .global $$257881 $$257881: - .incbin "baserom.dol", 0x463C30, 0x24 + .asciz "Scn.Step.Boss.GigantEdge.Brain.Exec" .global $$257882 $$257882: - .incbin "baserom.dol", 0x463C54, 0x2C + .asciz "Scn.Step.Boss.GigantEdge.Brain.ExecAngry" + .balign 4 .global __vt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1 __vt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1: - .incbin "baserom.dol", 0x463C80, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x802522B4 ;# ptr + .4byte 0x802522AC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss10gigantedge6Custom __vt__Q53scn4step4boss10gigantedge6Custom: - .incbin "baserom.dol", 0x463CC0, 0x98 + .4byte 0 + .4byte 0 + .4byte 0x802522A8 ;# ptr + .4byte 0x802522B0 ;# ptr + .4byte 0x80251B80 ;# ptr + .4byte 0x80251E30 ;# ptr + .4byte 0x80251E34 ;# ptr + .4byte 0x80251E38 ;# ptr + .4byte 0x80251E3C ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80251ED4 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x80251ED8 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256375 $$256375: - .incbin "baserom.dol", 0x464330, 0x2C + .asciz "Scn.Step.Boss.KingsDoo.Brain.ExecBossRushEx" .global $$256376 $$256376: - .incbin "baserom.dol", 0x46435C, 0x24 + .asciz "Scn.Step.Boss.KingsDoo.Brain.ExecEx" .global $$256377 $$256377: - .incbin "baserom.dol", 0x464380, 0x2C + .asciz "Scn.Step.Boss.KingsDoo.Brain.ExecAngryEx" + .balign 4 .global $$256378 $$256378: - .incbin "baserom.dol", 0x4643AC, 0x2C + .asciz "Scn.Step.Boss.KingsDoo.Brain.ExecBossRush" + .balign 4 .global $$256379 $$256379: - .incbin "baserom.dol", 0x4643D8, 0x24 + .asciz "Scn.Step.Boss.KingsDoo.Brain.Exec" + .balign 4 .global $$256380 $$256380: - .incbin "baserom.dol", 0x4643FC, 0x2C + .asciz "Scn.Step.Boss.KingsDoo.Brain.ExecAngry" + .balign 4 + .4byte 0 .global __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1 __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1: - .incbin "baserom.dol", 0x464428, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x80253888 ;# ptr + .4byte 0x80253880 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss8kingsdoo6Custom __vt__Q53scn4step4boss8kingsdoo6Custom: - .incbin "baserom.dol", 0x464468, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x8025387C ;# ptr + .4byte 0x80253884 ;# ptr + .4byte 0x80253520 ;# ptr + .4byte 0x802537D0 ;# ptr + .4byte 0x802537D4 ;# ptr + .4byte 0x802537D8 ;# ptr + .4byte 0x802537DC ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80253874 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x80253878 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257220 $$257220: - .incbin "baserom.dol", 0x464AD0, 0x30 + .asciz "Scn.Step.Boss.Moundeath.Brain.ExecBossRushEx" + .balign 4 .global $$257221 $$257221: - .incbin "baserom.dol", 0x464B00, 0x28 + .asciz "Scn.Step.Boss.Moundeath.Brain.ExecEx" + .balign 4 .global $$257222 $$257222: - .incbin "baserom.dol", 0x464B28, 0x2C + .asciz "Scn.Step.Boss.Moundeath.Brain.ExecAngryEx" + .balign 4 .global $$257223 $$257223: - .incbin "baserom.dol", 0x464B54, 0x2C + .asciz "Scn.Step.Boss.Moundeath.Brain.ExecBossRush" + .balign 4 .global $$257224 $$257224: - .incbin "baserom.dol", 0x464B80, 0x28 + .asciz "Scn.Step.Boss.Moundeath.Brain.Exec" + .balign 4 + .4byte 0 .global $$257225 $$257225: - .incbin "baserom.dol", 0x464BA8, 0x28 + .asciz "Scn.Step.Boss.Moundeath.Brain.ExecAngry" .global __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1 __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1: - .incbin "baserom.dol", 0x464BD0, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x80255AC4 ;# ptr + .4byte 0x80255ABC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss9moundeath6Custom __vt__Q53scn4step4boss9moundeath6Custom: - .incbin "baserom.dol", 0x464C10, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80255AB8 ;# ptr + .4byte 0x80255AC0 ;# ptr + .4byte 0x80255678 ;# ptr + .4byte 0x80255908 ;# ptr + .4byte 0x8025590C ;# ptr + .4byte 0x80255910 ;# ptr + .4byte 0x80255914 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x802559AC ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x802559B0 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256473 $$256473: - .incbin "baserom.dol", 0x465538, 0x34 + .asciz "Scn.Step.Boss.WaterGalboros.Brain.ExecBossRushEx" + .balign 4 .global $$256474 $$256474: - .incbin "baserom.dol", 0x46556C, 0x2C + .asciz "Scn.Step.Boss.WaterGalboros.Brain.ExecEx" + .balign 4 .global $$256475 $$256475: - .incbin "baserom.dol", 0x465598, 0x30 + .asciz "Scn.Step.Boss.WaterGalboros.Brain.ExecAngryEx" + .balign 4 .global $$256476 $$256476: - .incbin "baserom.dol", 0x4655C8, 0x30 + .asciz "Scn.Step.Boss.WaterGalboros.Brain.ExecBossRush" + .balign 4 .global $$256477 $$256477: - .incbin "baserom.dol", 0x4655F8, 0x28 + .asciz "Scn.Step.Boss.WaterGalboros.Brain.Exec" + .balign 4 .global $$256478 $$256478: - .incbin "baserom.dol", 0x465620, 0x30 + .asciz "Scn.Step.Boss.WaterGalboros.Brain.ExecAngry" + .4byte 0 .global __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1 __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1: - .incbin "baserom.dol", 0x465650, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x80259DE0 ;# ptr + .4byte 0x80259D64 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss13watergalboros6Custom __vt__Q53scn4step4boss13watergalboros6Custom: - .incbin "baserom.dol", 0x465690, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80259D60 ;# ptr + .4byte 0x80259D68 ;# ptr + .4byte 0x802599BC ;# ptr + .4byte 0x80259C84 ;# ptr + .4byte 0x80259C88 ;# ptr + .4byte 0x80259C8C ;# ptr + .4byte 0x80259C90 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80259D4C ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x80259D54 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257035 $$257035: - .incbin "baserom.dol", 0x465E20, 0x24 + .asciz "Scn.Step.Boss.Whispy.Brain.ExecEx" + .balign 4 .global $$257036 $$257036: - .incbin "baserom.dol", 0x465E44, 0x2C + .asciz "Scn.Step.Boss.Whispy.Brain.ExecAngryEx" + .balign 4 + .4byte 0 .global $$257037 $$257037: - .incbin "baserom.dol", 0x465E70, 0x20 + .asciz "Scn.Step.Boss.Whispy.Brain.Exec" .global $$257038 $$257038: - .incbin "baserom.dol", 0x465E90, 0x28 + .asciz "Scn.Step.Boss.Whispy.Brain.ExecAngry" + .balign 4 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465EB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025C168 ;# ptr + .4byte 0x8025C07C ;# ptr .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465EC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025C164 ;# ptr + .4byte 0x8025C098 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465ED8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025C160 ;# ptr + .4byte 0x8025C0B4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss6whispy6Custom __vt__Q53scn4step4boss6whispy6Custom: - .incbin "baserom.dol", 0x465EF8, 0x98 + .4byte 0 + .4byte 0 + .4byte 0x8025C078 ;# ptr + .4byte 0x8025C0D0 ;# ptr + .4byte 0x8025BBFC ;# ptr + .4byte 0x8025BE28 ;# ptr + .4byte 0x8025BE2C ;# ptr + .4byte 0x8025BE30 ;# ptr + .4byte 0x8025BEEC ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8025BF70 ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x8025BF78 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x8025BFB0 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256693 $$256693: - .incbin "baserom.dol", 0x466AA8, 0x30 + .asciz "Scn.Step.Boss.Zankibble.Brain.ExecBossRushEx" + .balign 4 .global $$256694 $$256694: - .incbin "baserom.dol", 0x466AD8, 0x28 + .asciz "Scn.Step.Boss.Zankibble.Brain.ExecEx" + .balign 4 .global $$256695 $$256695: - .incbin "baserom.dol", 0x466B00, 0x2C + .asciz "Scn.Step.Boss.Zankibble.Brain.ExecAngryEx" + .balign 4 .global $$256696 $$256696: - .incbin "baserom.dol", 0x466B2C, 0x2C + .asciz "Scn.Step.Boss.Zankibble.Brain.ExecBossRush" + .balign 4 .global $$256697 $$256697: - .incbin "baserom.dol", 0x466B58, 0x28 + .asciz "Scn.Step.Boss.Zankibble.Brain.Exec" + .balign 4 + .4byte 0 .global $$256698 $$256698: - .incbin "baserom.dol", 0x466B80, 0x28 + .asciz "Scn.Step.Boss.Zankibble.Brain.ExecAngry" .global __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1 __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1: - .incbin "baserom.dol", 0x466BA8, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x8026080C ;# ptr + .4byte 0x8026079C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4boss9zankibble6Custom __vt__Q53scn4step4boss9zankibble6Custom: - .incbin "baserom.dol", 0x466BE8, 0x98 + .4byte 0 + .4byte 0 + .4byte 0x80260798 ;# ptr + .4byte 0x802607A0 ;# ptr + .4byte 0x8026043C ;# ptr + .4byte 0x802606EC ;# ptr + .4byte 0x802606F0 ;# ptr + .4byte 0x802606F4 ;# ptr + .4byte 0x802606F8 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x80260790 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x80260794 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8armordee6Custom __vt__Q53scn4step5enemy8armordee6Custom: - .incbin "baserom.dol", 0x46F530, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802965CC ;# ptr + .4byte 0x802965D0 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802964B8 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight6Custom __vt__Q53scn4step5enemy11bladeknight6Custom: - .incbin "baserom.dol", 0x46F7F8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802971BC ;# ptr + .4byte 0x802971C0 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper6Custom __vt__Q53scn4step5enemy7blipper6Custom: - .incbin "baserom.dol", 0x46FDA0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80299390 ;# ptr + .4byte 0x80299394 ;# ptr + .4byte 0x80298F50 ;# ptr + .4byte 0x802992BC ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80299064 ;# ptr + .4byte 0x802991B4 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80299348 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470060, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029C0DC ;# ptr + .4byte 0x8029C0BC ;# ptr .global __vt__Q53scn4step5enemy11bonkersbomb6Custom __vt__Q53scn4step5enemy11bonkersbomb6Custom: - .incbin "baserom.dol", 0x470070, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x8029C0B8 ;# ptr + .4byte 0x8029C0D8 ;# ptr + .4byte 0x8029BCB8 ;# ptr + .4byte 0x8029BE98 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x8029BE28 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x8029BEA8 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy6Custom __vt__Q53scn4step5enemy6bouncy6Custom: - .incbin "baserom.dol", 0x470310, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x8029D1CC ;# ptr + .4byte 0x8029D1D0 ;# ptr + .4byte 0x8029D154 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby6Custom __vt__Q53scn4step5enemy5bowby6Custom: - .incbin "baserom.dol", 0x4706B8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x8029E780 ;# ptr + .4byte 0x8029E784 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x8029E4B4 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x8029E548 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4711A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A2DA0 ;# ptr + .4byte 0x802A2D80 ;# ptr .global __vt__Q53scn4step5enemy5cappy6Custom __vt__Q53scn4step5enemy5cappy6Custom: - .incbin "baserom.dol", 0x4711B8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802A2D7C ;# ptr + .4byte 0x802A2D9C ;# ptr + .4byte 0x802A28BC ;# ptr + .4byte 0x802A2C24 ;# ptr + .4byte 0x802A29C4 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802A2C50 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802A2C60 ;# ptr + .4byte 0x802A2C54 ;# ptr + .4byte 0x802A2914 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cappyhat6Custom __vt__Q53scn4step5enemy8cappyhat6Custom: - .incbin "baserom.dol", 0x471398, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802A3D0C ;# ptr + .4byte 0x802A3D10 ;# ptr + .4byte 0x802A3A04 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802A3A34 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly6Custom __vt__Q53scn4step5enemy6chilly6Custom: - .incbin "baserom.dol", 0x471838, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802A62DC ;# ptr + .4byte 0x802A62E0 ;# ptr + .4byte 0x802A62A8 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como6Custom __vt__Q53scn4step5enemy4como6Custom: - .incbin "baserom.dol", 0x471B50, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802A7400 ;# ptr + .4byte 0x802A7404 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802A73C8 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802A73F0 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802A73F8 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout6Custom __vt__Q53scn4step5enemy6degout6Custom: - .incbin "baserom.dol", 0x471FF8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802AD33C ;# ptr + .4byte 0x802AD340 ;# ptr + .4byte 0x802AD2E8 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802AD2EC ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr6Custom __vt__Q53scn4step5enemy8dubiorjr6Custom: - .incbin "baserom.dol", 0x4722B0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802AE18C ;# ptr + .4byte 0x802AE190 ;# ptr + .4byte 0x802AE0B0 ;# ptr + .4byte 0x802AE108 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802AE104 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x802AE10C ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472468, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802AEE7C ;# ptr + .4byte 0x802AEE5C ;# ptr .global __vt__Q53scn4step5enemy11dubiorspark6Custom __vt__Q53scn4step5enemy11dubiorspark6Custom: - .incbin "baserom.dol", 0x472478, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802AEE58 ;# ptr + .4byte 0x802AEE78 ;# ptr + .4byte 0x802AED14 ;# ptr + .4byte 0x802AEDD4 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802AEDAC ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x802AEDD8 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec6Custom __vt__Q53scn4step5enemy4elec6Custom: - .incbin "baserom.dol", 0x472688, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802AFC38 ;# ptr + .4byte 0x802AFC3C ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802AFAF0 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer6Custom __vt__Q53scn4step5enemy6flamer6Custom: - .incbin "baserom.dol", 0x472B78, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802B22D0 ;# ptr + .4byte 0x802B22D4 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley6Custom __vt__Q53scn4step5enemy5foley6Custom: - .incbin "baserom.dol", 0x472E38, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802B49C0 ;# ptr + .4byte 0x802B49C4 ;# ptr + .4byte 0x802B4568 ;# ptr + .4byte 0x802B4854 ;# ptr + .4byte 0x802B4688 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802B4734 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra6Custom __vt__Q53scn4step5enemy5gemra6Custom: - .incbin "baserom.dol", 0x473090, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802B61A4 ;# ptr + .4byte 0x802B61A8 ;# ptr + .4byte 0x802B59EC ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x802B59F0 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802B59F4 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo6Custom __vt__Q53scn4step5enemy7gigatzo6Custom: - .incbin "baserom.dol", 0x4733D0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802B76B0 ;# ptr + .4byte 0x802B76B4 ;# ptr + .4byte 0x802B6C60 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802B707C ;# ptr + .4byte 0x802B70AC ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802B6EE0 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo6Custom __vt__Q53scn4step5enemy5gordo6Custom: - .incbin "baserom.dol", 0x473668, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802B9050 ;# ptr + .4byte 0x802B9054 ;# ptr + .4byte 0x802B8E24 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802B8EB0 ;# ptr + .4byte 0x802B8EB4 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802B8EB8 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead6Custom __vt__Q53scn4step5enemy7hothead6Custom: - .incbin "baserom.dol", 0x473950, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802BA664 ;# ptr + .4byte 0x802BA668 ;# ptr + .4byte 0x802BA324 ;# ptr + .4byte 0x802BA37C ;# ptr + .4byte 0x802BA3AC ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802BA3B0 ;# ptr + .4byte 0x802BA3B4 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802BA44C ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255360 $$255360: - .incbin "baserom.dol", 0x473CA8, 0x28 + .4byte 0x802BB624 ;# ptr + .4byte 0x802BB634 ;# ptr + .4byte 0x802BB604 ;# ptr + .4byte 0x802BB5C4 ;# ptr + .4byte 0x802BB5A4 ;# ptr + .4byte 0x802BB5E4 ;# ptr + .4byte 0x802BB614 ;# ptr + .4byte 0x802BB5B4 ;# ptr + .4byte 0x802BB5F4 ;# ptr + .4byte 0x802BB5D4 ;# ptr .global __vt__Q53scn4step5enemy6juckle6Custom __vt__Q53scn4step5enemy6juckle6Custom: - .incbin "baserom.dol", 0x473CD0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802BB798 ;# ptr + .4byte 0x802BB79C ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802BB454 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802BB4F8 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu6Custom __vt__Q53scn4step5enemy4kabu6Custom: - .incbin "baserom.dol", 0x474060, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802BCDC0 ;# ptr + .4byte 0x802BCDC4 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802BCCB0 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe6Custom __vt__Q53scn4step5enemy10knucklejoe6Custom: - .incbin "baserom.dol", 0x4744B0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802BF8B8 ;# ptr + .4byte 0x802BF8BC ;# ptr + .4byte 0x802BF42C ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802BF440 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer6Custom __vt__Q53scn4step5enemy6lanzer6Custom: - .incbin "baserom.dol", 0x474C68, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C2180 ;# ptr + .4byte 0x802C2184 ;# ptr + .4byte 0x802C208C ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802C2100 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4750E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C4694 ;# ptr + .4byte 0x802C460C ;# ptr .global __vt__Q53scn4step5enemy9mbossdead6Custom __vt__Q53scn4step5enemy9mbossdead6Custom: - .incbin "baserom.dol", 0x4750F8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C4608 ;# ptr + .4byte 0x802C4628 ;# ptr + .4byte 0x802C4284 ;# ptr + .4byte 0x802C445C ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802C4458 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x802C4408 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802C44CC ;# ptr + .4byte 0x802C4560 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4751F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C4FFC ;# ptr + .4byte 0x802C4FDC ;# ptr .global __vt__Q53scn4step5enemy7mumbies6Custom __vt__Q53scn4step5enemy7mumbies6Custom: - .incbin "baserom.dol", 0x475208, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C4FD8 ;# ptr + .4byte 0x802C4FF8 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802C4FA8 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x802C4E90 ;# ptr + .4byte 0x802C4FB8 ;# ptr + .4byte 0x802C4F2C ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x802C4FC8 ;# ptr + .4byte 0x802C4FBC ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous6Custom __vt__Q53scn4step5enemy8needlous6Custom: - .incbin "baserom.dol", 0x4753F0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C6194 ;# ptr + .4byte 0x802C6198 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x802C6080 ;# ptr + .4byte 0x802C6088 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff6Custom __vt__Q53scn4step5enemy5nruff6Custom: - .incbin "baserom.dol", 0x475880, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C7DFC ;# ptr + .4byte 0x802C7B34 ;# ptr + .4byte 0x802C7B38 ;# ptr + .4byte 0x802C7BC4 ;# ptr + .4byte 0x802C7BC8 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802C7BD0 ;# ptr + .4byte 0x802C7BDC ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802C7BD8 ;# ptr + .4byte 0x802C7BD4 ;# ptr + .4byte 0x802C7BCC ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf6Custom __vt__Q53scn4step5enemy6owgulf6Custom: - .incbin "baserom.dol", 0x475CB0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802C9F10 ;# ptr + .4byte 0x802C9F14 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7parasol6Custom __vt__Q53scn4step5enemy7parasol6Custom: - .incbin "baserom.dol", 0x475EC8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802CB100 ;# ptr + .4byte 0x802CABF8 ;# ptr + .4byte 0x802CAC84 ;# ptr + .4byte 0x802CAD2C ;# ptr + .4byte 0x802CAED4 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802CAD70 ;# ptr + .4byte 0x802CADB4 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802CAE40 ;# ptr + .4byte 0x802CAE94 ;# ptr + .4byte 0x802CAEF8 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee6Custom __vt__Q53scn4step5enemy10parasoldee6Custom: - .incbin "baserom.dol", 0x476128, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x802CC538 ;# ptr + .4byte 0x802CBB70 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802CBE4C ;# ptr + .4byte 0x802CBDD8 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802CBE70 ;# ptr + .4byte 0x802CBD54 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802CBEF8 ;# ptr + .4byte 0x802CBE74 ;# ptr + .4byte 0x802CBC00 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x802CC54C ;# ptr + .4byte 0x802CC544 ;# ptr + .4byte 0x802CC53C ;# ptr + .4byte 0x802CC134 ;# ptr + .4byte 0x802CC250 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo6Custom __vt__Q53scn4step5enemy10parasoldoo6Custom: - .incbin "baserom.dol", 0x4762D8, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x802CE460 ;# ptr + .4byte 0x802CDC9C ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802CDF78 ;# ptr + .4byte 0x802CDF04 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802CDF9C ;# ptr + .4byte 0x802CDE80 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802CDFA4 ;# ptr + .4byte 0x802CDFA0 ;# ptr + .4byte 0x802CDD2C ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x802CE474 ;# ptr + .4byte 0x802CE46C ;# ptr + .4byte 0x802CE464 ;# ptr + .4byte 0x802CE10C ;# ptr + .4byte 0x802CE220 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce6Custom __vt__Q53scn4step5enemy6pierce6Custom: - .incbin "baserom.dol", 0x476458, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802CFB34 ;# ptr + .4byte 0x802CFB38 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476828, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D1D24 ;# ptr + .4byte 0x802D1C9C ;# ptr .global __vt__Q53scn4step5enemy10poppybrojr6Custom __vt__Q53scn4step5enemy10poppybrojr6Custom: - .incbin "baserom.dol", 0x476838, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D1C98 ;# ptr + .4byte 0x802D1CB8 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802D1780 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x802D17C4 ;# ptr + .4byte 0x802D1804 ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb6Custom __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: - .incbin "baserom.dol", 0x4769F0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D2C04 ;# ptr + .4byte 0x802D2C08 ;# ptr + .4byte 0x802D2924 ;# ptr + .4byte 0x802D2B50 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802D2928 ;# ptr + .4byte 0x802D2B54 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9puppetdee6Custom __vt__Q53scn4step5enemy9puppetdee6Custom: - .incbin "baserom.dol", 0x476AA8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D3310 ;# ptr + .4byte 0x802D3314 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802D32C0 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky6Custom __vt__Q53scn4step5enemy5rocky6Custom: - .incbin "baserom.dol", 0x476CD0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D3A80 ;# ptr + .4byte 0x802D3A84 ;# ptr + .4byte 0x802D39F4 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8rollball6Custom __vt__Q53scn4step5enemy8rollball6Custom: - .incbin "baserom.dol", 0x4770C8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D6624 ;# ptr + .4byte 0x802D6628 ;# ptr + .4byte 0x802D62A0 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802D645C ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7sandbag6Custom __vt__Q53scn4step5enemy7sandbag6Custom: - .incbin "baserom.dol", 0x477250, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D9180 ;# ptr + .4byte 0x802D9184 ;# ptr + .4byte 0x802D88D0 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x802D8E28 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802D8E2C ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x802D8E60 ;# ptr + .4byte 0x802D8EB8 ;# ptr + .4byte 0x802D8BB8 ;# ptr + .4byte 0x802D893C ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy6Custom __vt__Q53scn4step5enemy6scarfy6Custom: - .incbin "baserom.dol", 0x477538, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802D9D50 ;# ptr + .4byte 0x802D9D54 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802D9C70 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x802D9C74 ;# ptr + .4byte 0x802D9C6C ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches6Custom __vt__Q53scn4step5enemy8searches6Custom: - .incbin "baserom.dol", 0x477818, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802DBDE8 ;# ptr + .4byte 0x802DBDEC ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x802DBDE4 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802DBDE0 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477B30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DD8F4 ;# ptr + .4byte 0x802DD8D4 ;# ptr .global __vt__Q53scn4step5enemy5sheld6Custom __vt__Q53scn4step5enemy5sheld6Custom: - .incbin "baserom.dol", 0x477B40, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802DD8D0 ;# ptr + .4byte 0x802DD8F0 ;# ptr + .4byte 0x802DCF68 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x802DD0A4 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802DD284 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo6Custom __vt__Q53scn4step5enemy6shotzo6Custom: - .incbin "baserom.dol", 0x478158, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E0738 ;# ptr + .4byte 0x802E073C ;# ptr + .4byte 0x802E02E4 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802E0384 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble6Custom __vt__Q53scn4step5enemy9sirkibble6Custom: - .incbin "baserom.dol", 0x478440, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E16DC ;# ptr + .4byte 0x802E16E0 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802E1404 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802E1428 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound6Custom __vt__Q53scn4step5enemy11sisterbound6Custom: - .incbin "baserom.dol", 0x4788A8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E2AEC ;# ptr + .4byte 0x802E2AF0 ;# ptr + .4byte 0x802E296C ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802E29FC ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl6Custom __vt__Q53scn4step5enemy5snowl6Custom: - .incbin "baserom.dol", 0x478B00, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E3838 ;# ptr + .4byte 0x802E383C ;# ptr + .4byte 0x802E3768 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory6Custom __vt__Q53scn4step5enemy6sodory6Custom: - .incbin "baserom.dol", 0x478DF0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E53C8 ;# ptr + .4byte 0x802E53CC ;# ptr + .4byte 0x802E4DCC ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802E4E44 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky6Custom __vt__Q53scn4step5enemy6sparky6Custom: - .incbin "baserom.dol", 0x479118, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E6E70 ;# ptr + .4byte 0x802E6E74 ;# ptr + .4byte 0x802E6D84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect6Custom __vt__Q53scn4step5enemy10stareffect6Custom: - .incbin "baserom.dol", 0x4793C8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E7E7C ;# ptr + .4byte 0x802E7E80 ;# ptr + .4byte 0x802E7AC4 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun6Custom __vt__Q53scn4step5enemy3sun6Custom: - .incbin "baserom.dol", 0x4794A8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802E8C3C ;# ptr + .4byte 0x802E8C40 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x802E8C08 ;# ptr + .4byte 0x802E8C0C ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage6Custom __vt__Q53scn4step5enemy9tsukikage6Custom: - .incbin "baserom.dol", 0x479838, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802EAFF4 ;# ptr + .4byte 0x802EAFF8 ;# ptr + .4byte 0x802EA810 ;# ptr + .4byte 0x802EA984 ;# ptr + .4byte 0x802EA934 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x802EA8C4 ;# ptr + .4byte 0x802EA988 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo6Custom __vt__Q53scn4step5enemy9waddledoo6Custom: - .incbin "baserom.dol", 0x47A550, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802EFB2C ;# ptr + .4byte 0x802EFB30 ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47AC78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F10A4 ;# ptr + .4byte 0x802F1084 ;# ptr .global __vt__Q53scn4step5enemy11whispyapple6Custom __vt__Q53scn4step5enemy11whispyapple6Custom: - .incbin "baserom.dol", 0x47AC88, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802F1080 ;# ptr + .4byte 0x802F10A0 ;# ptr + .4byte 0x802F0D94 ;# ptr + .4byte 0x802F0E5C ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x802F0F34 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x802F107C ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter6Custom __vt__Q53scn4step5enemy15zankibblecutter6Custom: - .incbin "baserom.dol", 0x47AF08, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x802F2568 ;# ptr + .4byte 0x802F256C ;# ptr + .4byte 0x802F23D8 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x802F2538 ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x802F24B4 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark6Custom __vt__Q53scn4step4hero5spark6Custom: - .incbin "baserom.dol", 0x489850, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038CD9C + .4byte 0x8038CD30 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol6Custom __vt__Q53scn4step4hero7parasol6Custom: - .incbin "baserom.dol", 0x489C48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80392554 + .4byte 0x803924E8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter6Custom __vt__Q53scn4step4hero7fighter6Custom: - .incbin "baserom.dol", 0x48A2F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039B4C0 + .4byte 0x8039B454 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490008, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803DC22C + .4byte 0x803DC164 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490018, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803DC228 + .4byte 0x803DC180 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490028, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803DC224 + .4byte 0x803DC19C .global __vt__Q53scn4step6weapon11starshotlv16Custom __vt__Q53scn4step6weapon11starshotlv16Custom: - .incbin "baserom.dol", 0x490038, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DC160 + .4byte 0x803DC1B8 + .4byte 0x803DBD40 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4902C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803DEB3C + .4byte 0x803DEB1C .global __vt__Q53scn4step6weapon7rollexp6Custom __vt__Q53scn4step6weapon7rollexp6Custom: - .incbin "baserom.dol", 0x4902D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DEB18 + .4byte 0x803DEB38 + .4byte 0x803DEA94 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4903A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E02B4 + .4byte 0x803E0294 .global __vt__Q53scn4step6weapon13gigatzobullet6Custom __vt__Q53scn4step6weapon13gigatzobullet6Custom: - .incbin "baserom.dol", 0x4903B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E0290 + .4byte 0x803E02B0 + .4byte 0x803E020C + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4904A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E2274 + .4byte 0x803E21EC .global __vt__Q53scn4step6weapon10comothread6Custom __vt__Q53scn4step6weapon10comothread6Custom: - .incbin "baserom.dol", 0x4904B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E21E8 + .4byte 0x803E2208 + .4byte 0x803E1FA0 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1 __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: - .incbin "baserom.dol", 0x490A08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E6C4C + .4byte 0x803E6C28 .global __vt__Q53scn4step6weapon16fighterhadoushot6Custom __vt__Q53scn4step6weapon16fighterhadoushot6Custom: - .incbin "baserom.dol", 0x490A18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6C24 + .4byte 0x803E6C48 + .4byte 0x803E6AF0 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256603 $$256603: - .incbin "baserom.dol", 0x491128, 0x30 + .4byte 0x803EE45C + .4byte 0x803EE464 + .4byte 0x803EE46C + .4byte 0x803EE474 + .4byte 0x803EE47C + .4byte 0x803EE484 + .4byte 0x803EE48C + .4byte 0x803EE494 + .4byte 0x803EE49C + .4byte 0x803EE4A4 + .4byte 0x803EE4AC + .4byte 0x803EE4B4 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x491158, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803EE564 + .4byte 0x803EE4DC .global __vt__Q53scn4step6weapon13vacuumedblock6Custom __vt__Q53scn4step6weapon13vacuumedblock6Custom: - .incbin "baserom.dol", 0x491168, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EE4D8 + .4byte 0x803EE4F8 + .4byte 0x803EE2F0 + .4byte 0x803EE3FC + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4913F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803EFA78 + .4byte 0x803EFA58 .global __vt__Q53scn4step6weapon26challengemastersummonlight6Custom __vt__Q53scn4step6weapon26challengemastersummonlight6Custom: - .incbin "baserom.dol", 0x491400, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EFA54 + .4byte 0x803EFA74 + .4byte 0x803EF9D0 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x491440, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803F04D8 + .4byte 0x803F0498 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x491450, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803F04D4 + .4byte 0x803F04B4 .global __vt__Q53scn4step6weapon19challengemastershot6Custom __vt__Q53scn4step6weapon19challengemastershot6Custom: - .incbin "baserom.dol", 0x491460, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803F0494 + .4byte 0x803F04D0 + .4byte 0x803F0280 + .4byte 0x803D3768 + .4byte 0x803F02FC + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256394 $$256394: - .incbin "baserom.dol", 0x495510, 0x4 + .4byte 0 .global $$256395 $$256395: - .incbin "baserom.dol", 0x495514, 0x4 + .4byte 0x3F800000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255826 $$255826: - .incbin "baserom.dol", 0x496510, 0x4 + .4byte 0xC2B40000 .global $$255827 $$255827: - .incbin "baserom.dol", 0x496514, 0x4 + .4byte 0x42B40000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256737 $$256737: - .incbin "baserom.dol", 0x496690, 0x8 + .4byte 0x00000002 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss7bonkers6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss7bonkers6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49AF28, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$257955 $$257955: - .incbin "baserom.dol", 0x49AF30, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257997 $$257997: - .incbin "baserom.dol", 0x49AF38, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257942 $$257942: - .incbin "baserom.dol", 0x49AFB8, 0x4 + .4byte 0 .global $$257943 $$257943: - .incbin "baserom.dol", 0x49AFBC, 0x4 + .4byte 0x3FCCCCCD .global $$258040 $$258040: - .incbin "baserom.dol", 0x49AFC0, 0x8 + .4byte 0x40400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: - .incbin "baserom.dol", 0x49B190, 0x8 + .4byte 0x3FCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: - .incbin "baserom.dol", 0x49B1A8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: - .incbin "baserom.dol", 0x49B1D0, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256676 $$256676: - .incbin "baserom.dol", 0x49B238, 0x4 + .4byte 0x3F800000 .global $$256677 $$256677: - .incbin "baserom.dol", 0x49B23C, 0x4 + .4byte 0 .global $$256720 $$256720: - .incbin "baserom.dol", 0x49B240, 0x4 + .4byte 0x43B40000 .global $$256721 $$256721: - .incbin "baserom.dol", 0x49B244, 0x4 + .4byte 0x3C23D70A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss6dubior6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss6dubior6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B278, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$258567 $$258567: - .incbin "baserom.dol", 0x49B280, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258587 $$258587: - .incbin "baserom.dol", 0x49B288, 0x4 + .4byte 0 .global $$258618 $$258618: - .incbin "baserom.dol", 0x49B28C, 0x4 + .4byte 0xBDCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss10gigantedge6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss10gigantedge6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B380, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$257885 $$257885: - .incbin "baserom.dol", 0x49B388, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257942 $$257942: - .incbin "baserom.dol", 0x49B390, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss8kingsdoo6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss8kingsdoo6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B3A0, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$256383 $$256383: - .incbin "baserom.dol", 0x49B3A8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss9moundeath6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss9moundeath6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B3F0, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$257228 $$257228: - .incbin "baserom.dol", 0x49B3F8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss13watergalboros6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss13watergalboros6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B4D0, 0x4 + .4byte 0x00000002 .global $$256479 $$256479: - .incbin "baserom.dol", 0x49B4D4, 0x4 + .4byte 0x42B40000 .global $$256482 $$256482: - .incbin "baserom.dol", 0x49B4D8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257034 $$257034: - .incbin "baserom.dol", 0x49B4F8, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss9zankibble6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss9zankibble6CustomFv$$2maxLevel: - .incbin "baserom.dol", 0x49B598, 0x8 + .4byte 0x00000002 + .4byte 0 .global $$256701 $$256701: - .incbin "baserom.dol", 0x49B5A0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251899 $$251899: - .incbin "baserom.dol", 0x49BCD0, 0x4 + .4byte 0x3F800000 .global $$251900 $$251900: - .incbin "baserom.dol", 0x49BCD4, 0x4 + .4byte 0x3FC00000 .global $$251901 $$251901: - .incbin "baserom.dol", 0x49BCD8, 0x4 + .4byte 0x40000000 .global $$251902 $$251902: - .incbin "baserom.dol", 0x49BCDC, 0x4 + .4byte 0x40400000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256347 $$256347: - .incbin "baserom.dol", 0x49BCF8, 0x4 + .4byte 0x3D4CCCCD .global $$256348 $$256348: - .incbin "baserom.dol", 0x49BCFC, 0x4 + .4byte 0 .global $$256349 $$256349: - .incbin "baserom.dol", 0x49BD00, 0x4 + .4byte 0xBF000000 .global $$256350 $$256350: - .incbin "baserom.dol", 0x49BD04, 0x4 + .4byte 0x3ECCCCCD .global $$256351 $$256351: - .incbin "baserom.dol", 0x49BD08, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256686 $$256686: - .incbin "baserom.dol", 0x49BD70, 0x4 + .4byte 0x3F0CCCCD .global $$256687 $$256687: - .incbin "baserom.dol", 0x49BD74, 0x4 + .4byte 0 .global $$256688 $$256688: - .incbin "baserom.dol", 0x49BD78, 0x4 + .4byte 0x40000000 .global $$256715 $$256715: - .incbin "baserom.dol", 0x49BD7C, 0x4 + .4byte 0x3DCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252926 $$252926: - .incbin "baserom.dol", 0x49BE68, 0x8 + .4byte 0x3EE66666 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256241 $$256241: - .incbin "baserom.dol", 0x49BE98, 0x4 + .4byte 0 .global $$256242 $$256242: - .incbin "baserom.dol", 0x49BE9C, 0x4 + .4byte 0x43340000 .global $$256243 $$256243: - .incbin "baserom.dol", 0x49BEA0, 0x4 + .4byte 0xC3340000 .global $$256244 $$256244: - .incbin "baserom.dol", 0x49BEA4, 0x4 + .4byte 0x42B40000 .global $$256245 $$256245: - .incbin "baserom.dol", 0x49BEA8, 0x4 + .4byte 0xC2B40000 .global $$256246 $$256246: - .incbin "baserom.dol", 0x49BEAC, 0x4 + .4byte 0x43870000 .global $$256275 $$256275: - .incbin "baserom.dol", 0x49BEB0, 0x4 + .4byte 0x3FB40000 .global $$256300 $$256300: - .incbin "baserom.dol", 0x49BEB4, 0x4 + .4byte 0x41000000 .global $$256301 $$256301: - .incbin "baserom.dol", 0x49BEB8, 0x4 + .4byte 0xC1000000 .global $$256302 $$256302: - .incbin "baserom.dol", 0x49BEBC, 0x4 + .4byte 0x41100000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255998 $$255998: - .incbin "baserom.dol", 0x49BFC8, 0x8 + .4byte 0 + .4byte 0 .global $$256001 $$256001: - .incbin "baserom.dol", 0x49BFD0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256003 $$256003: - .incbin "baserom.dol", 0x49BFD8, 0x4 + .4byte 0x41600000 .global $$256004 $$256004: - .incbin "baserom.dol", 0x49BFDC, 0x4 + .4byte 0xC1200000 .global $$256005 $$256005: - .incbin "baserom.dol", 0x49BFE0, 0x4 + .4byte 0xC1000000 .global $$256006 $$256006: - .incbin "baserom.dol", 0x49BFE4, 0x4 + .4byte 0x40000000 .global $$256007 $$256007: - .incbin "baserom.dol", 0x49BFE8, 0x4 + .4byte 0x41000000 .global $$256008 $$256008: - .incbin "baserom.dol", 0x49BFEC, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255268 $$255268: - .incbin "baserom.dol", 0x49C350, 0x4 + .4byte 0x3FB40000 .global $$255269 $$255269: - .incbin "baserom.dol", 0x49C354, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257219 $$257219: - .incbin "baserom.dol", 0x49C4A8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252709 $$252709: - .incbin "baserom.dol", 0x49C4D0, 0x4 + .4byte 0 .global $$252710 $$252710: - .incbin "baserom.dol", 0x49C4D4, 0x4 + .4byte 0x41A00000 .global $$252747 $$252747: - .incbin "baserom.dol", 0x49C4D8, 0x4 + .4byte 0x43340000 .global $$252748 $$252748: - .incbin "baserom.dol", 0x49C4DC, 0x4 + .4byte 0xBF800000 .global $$252749 $$252749: - .incbin "baserom.dol", 0x49C4E0, 0x4 + .4byte 0x3F800000 .global $$252768 $$252768: - .incbin "baserom.dol", 0x49C4E4, 0x4 + .4byte 0x40000000 .global $$252802 $$252802: - .incbin "baserom.dol", 0x49C4E8, 0x4 + .4byte 0x43B40000 .global $$252841 $$252841: - .incbin "baserom.dol", 0x49C4EC, 0x4 + .4byte 0x3DCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258787 $$258787: - .incbin "baserom.dol", 0x49C508, 0x4 + .4byte 0 .global $$258801 $$258801: - .incbin "baserom.dol", 0x49C50C, 0x4 + .4byte 0x3F333333 .global $$258802 $$258802: - .incbin "baserom.dol", 0x49C510, 0x4 + .4byte 0x3FCCCCCD .global $$258803 $$258803: - .incbin "baserom.dol", 0x49C514, 0x4 + .4byte 0x3F666666 .global $$258850 $$258850: - .incbin "baserom.dol", 0x49C518, 0x8 + .4byte 0x40C00000 + .4byte 0 .global $$258853 $$258853: - .incbin "baserom.dol", 0x49C520, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258870 $$258870: - .incbin "baserom.dol", 0x49C528, 0x4 + .4byte 0xBF800000 .global $$258883 $$258883: - .incbin "baserom.dol", 0x49C52C, 0x4 + .4byte 0x3FB40000 .global $$258884 $$258884: - .incbin "baserom.dol", 0x49C530, 0x4 + .4byte 0x42B40000 .global $$258885 $$258885: - .incbin "baserom.dol", 0x49C534, 0x4 + .4byte 0xC2B40000 .global $$258954 $$258954: - .incbin "baserom.dol", 0x49C538, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252107 $$252107: - .incbin "baserom.dol", 0x49C590, 0x4 + .4byte 0x3F000000 .global $$252119 $$252119: - .incbin "baserom.dol", 0x49C594, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255322 $$255322: - .incbin "baserom.dol", 0x49C5D0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255324 $$255324: - .incbin "baserom.dol", 0x49C5F0, 0x4 + .4byte 0 .global $$255325 $$255325: - .incbin "baserom.dol", 0x49C5F4, 0x4 + .4byte 0xC2B40000 .global $$255326 $$255326: - .incbin "baserom.dol", 0x49C5F8, 0x4 + .4byte 0x42B40000 .global $$255327 $$255327: - .incbin "baserom.dol", 0x49C5FC, 0x4 + .4byte 0x43B40000 .global $$255376 $$255376: - .incbin "baserom.dol", 0x49C600, 0x8 + .4byte 0x3FB40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257018 $$257018: - .incbin "baserom.dol", 0x49C6B8, 0x4 + .4byte 0 .global $$257019 $$257019: - .incbin "baserom.dol", 0x49C6BC, 0x4 + .4byte 0x3CA3D70A .global $$257086 $$257086: - .incbin "baserom.dol", 0x49C6C0, 0x4 + .4byte 0x40400000 .global $$257087 $$257087: - .incbin "baserom.dol", 0x49C6C4, 0x4 + .4byte 0x3F800000 .global $$257100 $$257100: - .incbin "baserom.dol", 0x49C6C8, 0x4 + .4byte 0x3F19999A .global $$257101 $$257101: - .incbin "baserom.dol", 0x49C6CC, 0x4 + .4byte 0x3E800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251376 $$251376: - .incbin "baserom.dol", 0x49C798, 0x4 + .4byte 0 .global $$251377 $$251377: - .incbin "baserom.dol", 0x49C79C, 0x4 + .4byte 0x3D23D70A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: - .incbin "baserom.dol", 0x49C808, 0x4 + .4byte 0x3FA00000 .global $$256158 $$256158: - .incbin "baserom.dol", 0x49C80C, 0x4 + .4byte 0x3F800000 .global $$256159 $$256159: - .incbin "baserom.dol", 0x49C810, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252122 $$252122: - .incbin "baserom.dol", 0x49C860, 0x4 + .4byte 0 .global $$252123 $$252123: - .incbin "baserom.dol", 0x49C864, 0x4 + .4byte 0x3CA3D70A .global $$252124 $$252124: - .incbin "baserom.dol", 0x49C868, 0x4 + .4byte 0x3CF5C28F .global $$252125 $$252125: - .incbin "baserom.dol", 0x49C86C, 0x4 + .4byte 0x3D23D70A .global $$252126 $$252126: - .incbin "baserom.dol", 0x49C870, 0x4 + .4byte 0x3D75C28F .global $$252145 $$252145: - .incbin "baserom.dol", 0x49C874, 0x4 + .4byte 0x40000000 .global $$252148 $$252148: - .incbin "baserom.dol", 0x49C878, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256294 $$256294: - .incbin "baserom.dol", 0x49C8C0, 0x8 + .4byte 0x42000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257038 $$257038: - .incbin "baserom.dol", 0x49C960, 0x4 + .4byte 0x3F000000 .global $$257069 $$257069: - .incbin "baserom.dol", 0x49C964, 0x4 + .4byte 0 .global $$257070 $$257070: - .incbin "baserom.dol", 0x49C968, 0x4 + .4byte 0x3F8CCCCD .global $$257071 $$257071: - .incbin "baserom.dol", 0x49C96C, 0x4 + .4byte 0x3E4CCCCD .global $$257076 $$257076: - .incbin "baserom.dol", 0x49C970, 0x4 + .4byte 0x3F59999A .global $$257077 $$257077: - .incbin "baserom.dol", 0x49C974, 0x4 + .4byte 0x3E99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257162 $$257162: - .incbin "baserom.dol", 0x49C9A8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257142 $$257142: - .incbin "baserom.dol", 0x49C9F8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258242 $$258242: - .incbin "baserom.dol", 0x49CAA0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256930 $$256930: - .incbin "baserom.dol", 0x49CAE8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256764 $$256764: - .incbin "baserom.dol", 0x49CB90, 0x4 + .4byte 0x40000000 .global $$256765 $$256765: - .incbin "baserom.dol", 0x49CB94, 0x4 + .4byte 0 .global $$256766 $$256766: - .incbin "baserom.dol", 0x49CB98, 0x4 + .4byte 0x3F000000 .global $$256794 $$256794: - .incbin "baserom.dol", 0x49CB9C, 0x4 + .4byte 0x3E99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257890 $$257890: - .incbin "baserom.dol", 0x49CC00, 0x4 + .4byte 0x3F2A7EFA .global $$257893 $$257893: - .incbin "baserom.dol", 0x49CC04, 0x4 + .4byte 0x3EAA7EFA .global $$257966 $$257966: - .incbin "baserom.dol", 0x49CC08, 0x4 + .4byte 0 .global $$258026 $$258026: - .incbin "baserom.dol", 0x49CC0C, 0x4 + .4byte 0x3F000000 .global $$256578 $$256578: - .incbin "baserom.dol", 0x49CC10, 0x4 + .4byte 0 .global $$256579 $$256579: - .incbin "baserom.dol", 0x49CC14, 0x4 + .4byte 0x40000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253480 $$253480: - .incbin "baserom.dol", 0x49CCC0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258052 $$258052: - .incbin "baserom.dol", 0x49CCE0, 0x4 + .4byte 0 .global $$258209 $$258209: - .incbin "baserom.dol", 0x49CCE4, 0x4 + .4byte 0xBF800000 .global $$258232 $$258232: - .incbin "baserom.dol", 0x49CCE8, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256292 $$256292: - .incbin "baserom.dol", 0x49CDA0, 0x4 + .4byte 0 .global $$256326 $$256326: - .incbin "baserom.dol", 0x49CDA4, 0x4 + .4byte 0x3F800000 .global $$256327 $$256327: - .incbin "baserom.dol", 0x49CDA8, 0x4 + .4byte 0x42340000 .global $$256328 $$256328: - .incbin "baserom.dol", 0x49CDAC, 0x4 + .4byte 0x42B40000 .global $$256329 $$256329: - .incbin "baserom.dol", 0x49CDB0, 0x4 + .4byte 0xC2B40000 .global $$256330 $$256330: - .incbin "baserom.dol", 0x49CDB4, 0x4 + .4byte 0x40000000 .global $$256331 $$256331: - .incbin "baserom.dol", 0x49CDB8, 0x4 + .4byte 0xC2340000 .global $$256332 $$256332: - .incbin "baserom.dol", 0x49CDBC, 0x4 + .4byte 0x43340000 .global $$256333 $$256333: - .incbin "baserom.dol", 0x49CDC0, 0x4 + .4byte 0x3F000000 .global $$256334 $$256334: - .incbin "baserom.dol", 0x49CDC4, 0x4 + .4byte 0xBF000000 .global $$256388 $$256388: - .incbin "baserom.dol", 0x49CDC8, 0x8 + .4byte 0x3FB40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253526 $$253526: - .incbin "baserom.dol", 0x49CE00, 0x4 + .4byte 0 .global $$253559 $$253559: - .incbin "baserom.dol", 0x49CE04, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253005 $$253005: - .incbin "baserom.dol", 0x49CE18, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256937 $$256937: - .incbin "baserom.dol", 0x49CE70, 0x4 + .4byte 0 .global $$256938 $$256938: - .incbin "baserom.dol", 0x49CE74, 0x4 + .4byte 0x3CA3D70A .global $$256945 $$256945: - .incbin "baserom.dol", 0x49CE78, 0x4 + .4byte 0x3F000000 .global $$256973 $$256973: - .incbin "baserom.dol", 0x49CE7C, 0x4 + .4byte 0x43340000 .global $$256974 $$256974: - .incbin "baserom.dol", 0x49CE80, 0x4 + .4byte 0x3F800000 .global $$257049 $$257049: - .incbin "baserom.dol", 0x49CE84, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257134 $$257134: - .incbin "baserom.dol", 0x49CEF8, 0x4 + .4byte 0 .global $$256798 $$256798: - .incbin "baserom.dol", 0x49CEFC, 0x4 + .4byte 0xFFFFFF00 .global $$257183 $$257183: - .incbin "baserom.dol", 0x49CF00, 0x4 + .4byte 0x3F800000 .global $$257184 $$257184: - .incbin "baserom.dol", 0x49CF04, 0x4 + .4byte 0x43B40000 .global $$257188 $$257188: - .incbin "baserom.dol", 0x49CF08, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256256 $$256256: - .incbin "baserom.dol", 0x49CF38, 0x4 + .4byte 0 .global $$256281 $$256281: - .incbin "baserom.dol", 0x49CF3C, 0x4 + .4byte 0x40490FDB .global $$256282 $$256282: - .incbin "baserom.dol", 0x49CF40, 0x4 + .4byte 0x40000000 .global $$256283 $$256283: - .incbin "baserom.dol", 0x49CF44, 0x4 + .4byte 0x43B40000 .global $$256284 $$256284: - .incbin "baserom.dol", 0x49CF48, 0x4 + .4byte 0xBF800000 .global $$256285 $$256285: - .incbin "baserom.dol", 0x49CF4C, 0x4 + .4byte 0x3C8EFA35 .global $$256286 $$256286: - .incbin "baserom.dol", 0x49CF50, 0x4 + .4byte 0x40800000 .global $$256287 $$256287: - .incbin "baserom.dol", 0x49CF54, 0x4 + .4byte 0xC0600000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257004 $$257004: - .incbin "baserom.dol", 0x49CF90, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .global $$257030 $$257030: - .incbin "baserom.dol", 0x49CF98, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257034 $$257034: - .incbin "baserom.dol", 0x49CFA0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257054 $$257054: - .incbin "baserom.dol", 0x49D098, 0x4 + .4byte 0 .global $$257055 $$257055: - .incbin "baserom.dol", 0x49D09C, 0x4 + .4byte 0x3BA3D70A .global $$257056 $$257056: - .incbin "baserom.dol", 0x49D0A0, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 .global $$257059 $$257059: - .incbin "baserom.dol", 0x49D0A8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256310 $$256310: - .incbin "baserom.dol", 0x49E980, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256594 $$256594: - .incbin "baserom.dol", 0x49ECB8, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step6weapon7rollexp6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/CustomBase.s b/asm/src/CustomBase.s index c228c999..0a83f8ed 100644 --- a/asm/src/CustomBase.s +++ b/asm/src/CustomBase.s @@ -428,31 +428,86 @@ lbl_803D37C4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x460568, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8022E6A0 ;# ptr + .4byte 0x8022E618 ;# ptr .global __vt__Q24util28StateFactory$$0Q24util6IState$$1 __vt__Q24util28StateFactory$$0Q24util6IState$$1: - .incbin "baserom.dol", 0x460578, 0x10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q43scn4step4boss10CustomBase __vt__Q43scn4step4boss10CustomBase: - .incbin "baserom.dol", 0x460588, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8022E614 ;# ptr + .4byte 0x8022E634 ;# ptr + .4byte 0x8022E554 ;# ptr + .4byte 0x8022E5C8 ;# ptr + .4byte 0x8022E5CC ;# ptr + .4byte 0x8022E5D0 ;# ptr + .4byte 0x8022E5D4 ;# ptr + .4byte 0x8022E5D8 ;# ptr + .4byte 0x8022E5DC ;# ptr + .4byte 0x8022E5E0 ;# ptr + .4byte 0x8022E5E4 ;# ptr + .4byte 0x8022E5E8 ;# ptr + .4byte 0x8022E5EC ;# ptr + .4byte 0x8022E5F0 ;# ptr + .4byte 0x8022E5F4 ;# ptr + .4byte 0x8022E5F8 ;# ptr + .4byte 0x8022E5FC ;# ptr + .4byte 0x8022E600 ;# ptr + .4byte 0x8022E604 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46DC80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80281FB8 ;# ptr + .4byte 0x80281F30 ;# ptr .global __vt__Q43scn4step5enemy10CustomBase __vt__Q43scn4step5enemy10CustomBase: - .incbin "baserom.dol", 0x46DC90, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80281F2C ;# ptr + .4byte 0x80281F4C ;# ptr + .4byte 0x80281E84 ;# ptr + .4byte 0x80281E88 ;# ptr + .4byte 0x80281E8C ;# ptr + .4byte 0x80281E90 ;# ptr + .4byte 0x80281E94 ;# ptr + .4byte 0x80281E98 ;# ptr + .4byte 0x80281F10 ;# ptr + .4byte 0x80281F14 ;# ptr + .4byte 0x80281F18 ;# ptr + .4byte 0x80281F1C ;# ptr + .4byte 0x80281F20 ;# ptr + .4byte 0x80281F24 ;# ptr + .4byte 0x80281F28 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon10CustomBase __vt__Q43scn4step6weapon10CustomBase: - .incbin "baserom.dol", 0x48F018, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D3774 + .4byte 0x803D3764 + .4byte 0x803D3768 + .4byte 0x803D376C + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250257 $$250257: - .incbin "baserom.dol", 0x49AE38, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q43scn4step4boss10CustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/CustomFactory.s b/asm/src/CustomFactory.s index c08223e9..bb387435 100644 --- a/asm/src/CustomFactory.s +++ b/asm/src/CustomFactory.s @@ -6003,269 +6003,888 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadf .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252639 $$252639: - .incbin "baserom.dol", 0x4605E0, 0x70 + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EDE0 ;# ptr + .4byte 0x8022ECF0 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EDA4 ;# ptr + .4byte 0x8022ED2C ;# ptr + .4byte 0x8022EE1C ;# ptr + .4byte 0x8022EB4C ;# ptr + .4byte 0x8022ECB4 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022ED68 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EE58 ;# ptr + .4byte 0x8022EB88 ;# ptr + .4byte 0x8022EC78 ;# ptr + .4byte 0x8022EBC4 ;# ptr + .4byte 0x8022EC00 ;# ptr + .4byte 0x8022EC3C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256431 $$256431: - .incbin "baserom.dol", 0x46DCD8, 0x258 + .4byte 0x80283BDC ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283404 ;# ptr + .4byte 0x8028356C ;# ptr + .4byte 0x80283440 ;# ptr + .4byte 0x80283C90 ;# ptr + .4byte 0x8028365C ;# ptr + .4byte 0x80283698 ;# ptr + .4byte 0x802832D8 ;# ptr + .4byte 0x802836D4 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x802834F4 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283B48 ;# ptr + .4byte 0x80283260 ;# ptr + .4byte 0x802833C8 ;# ptr + .4byte 0x802834B8 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x802831E8 ;# ptr + .4byte 0x802831AC ;# ptr + .4byte 0x8028347C ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283314 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283B0C ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x8028338C ;# ptr + .4byte 0x80283968 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283350 ;# ptr + .4byte 0x8028392C ;# ptr + .4byte 0x80283530 ;# ptr + .4byte 0x80283154 ;# ptr + .4byte 0x802830DC ;# ptr + .4byte 0x80283170 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283710 ;# ptr + .4byte 0x8028374C ;# ptr + .4byte 0x8028383C ;# ptr + .4byte 0x80283800 ;# ptr + .4byte 0x80283878 ;# ptr + .4byte 0x80283C54 ;# ptr + .4byte 0x80283CCC ;# ptr + .4byte 0x802839A4 ;# ptr + .4byte 0x802838F0 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D08 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283968 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x802839E0 ;# ptr + .4byte 0x80283A1C ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283A58 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D44 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283A94 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283968 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283B84 ;# ptr + .4byte 0x80283BC0 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x8028383C ;# ptr + .4byte 0x80283C18 ;# ptr + .4byte 0x80283C18 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x8028392C ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283224 ;# ptr + .4byte 0x802835A8 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x8028329C ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283118 ;# ptr + .4byte 0x802835E4 ;# ptr + .4byte 0x80283620 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283788 ;# ptr + .4byte 0x802837C4 ;# ptr + .4byte 0x802838B4 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283AD0 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x80283D80 ;# ptr + .4byte 0x8028356C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264044 $$264044: - .incbin "baserom.dol", 0x48F038, 0x108 + .4byte 0x803D38C0 + .4byte 0x803D38C0 + .4byte 0x803D38C0 + .4byte 0x803D38FC + .4byte 0x803D393C + .4byte 0x803D397C + .4byte 0x803D39BC + .4byte 0x803D39FC + .4byte 0x803D3A3C + .4byte 0x803D3A7C + .4byte 0x803D3AB8 + .4byte 0x803D3AF8 + .4byte 0x803D3B38 + .4byte 0x803D3B78 + .4byte 0x803D3BB8 + .4byte 0x803D3BF8 + .4byte 0x803D3C78 + .4byte 0x803D3CB8 + .4byte 0x803D3CF8 + .4byte 0x803D3D38 + .4byte 0x803D3D78 + .4byte 0x803D3DB8 + .4byte 0x803D3DF8 + .4byte 0x803D3E34 + .4byte 0x803D3E74 + .4byte 0x803D3EB4 + .4byte 0x803D3EF4 + .4byte 0x803D3F30 + .4byte 0x803D3F6C + .4byte 0x803D3C38 + .4byte 0x803D3FAC + .4byte 0x803D3FEC + .4byte 0x803D402C + .4byte 0x803D4048 + .4byte 0x803D4088 + .4byte 0x803D3F30 + .4byte 0x803D40C8 + .4byte 0x803D4108 + .4byte 0x803D4148 + .4byte 0x803D3F30 + .4byte 0x803D4188 + .4byte 0x803D41C8 + .4byte 0x803D4208 + .4byte 0x803D4248 + .4byte 0x803D4288 + .4byte 0x803D42C8 + .4byte 0x803D4308 + .4byte 0x803D4348 + .4byte 0x803D4388 + .4byte 0x803D43C8 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4408 + .4byte 0x803D4444 + .4byte 0x803D4460 + .4byte 0x803D44A0 + .4byte 0x803D44DC .global __vt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1 __vt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1: - .incbin "baserom.dol", 0x48F140, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B20 + .4byte 0x803D59A8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1: - .incbin "baserom.dol", 0x48F15C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B1C + .4byte 0x803D592C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1: - .incbin "baserom.dol", 0x48F178, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B18 + .4byte 0x803D58B0 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1: - .incbin "baserom.dol", 0x48F194, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B14 + .4byte 0x803D5834 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1: - .incbin "baserom.dol", 0x48F1B0, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B10 + .4byte 0x803D57B8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1: - .incbin "baserom.dol", 0x48F1CC, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B0C + .4byte 0x803D573C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1: - .incbin "baserom.dol", 0x48F1E8, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B08 + .4byte 0x803D56C0 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1: - .incbin "baserom.dol", 0x48F204, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B04 + .4byte 0x803D5644 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1: - .incbin "baserom.dol", 0x48F220, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5B00 + .4byte 0x803D55C8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1: - .incbin "baserom.dol", 0x48F23C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AFC + .4byte 0x803D554C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1: - .incbin "baserom.dol", 0x48F258, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AF8 + .4byte 0x803D54D0 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1: - .incbin "baserom.dol", 0x48F274, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AF4 + .4byte 0x803D5454 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1: - .incbin "baserom.dol", 0x48F290, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AF0 + .4byte 0x803D53D8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1: - .incbin "baserom.dol", 0x48F2AC, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AEC + .4byte 0x803D535C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1: - .incbin "baserom.dol", 0x48F2C8, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AE8 + .4byte 0x803D52E0 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1: - .incbin "baserom.dol", 0x48F2E4, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AE4 + .4byte 0x803D5264 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1: - .incbin "baserom.dol", 0x48F300, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AE0 + .4byte 0x803D51E8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1: - .incbin "baserom.dol", 0x48F31C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5ADC + .4byte 0x803D516C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1: - .incbin "baserom.dol", 0x48F338, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AD8 + .4byte 0x803D50F0 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1 __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1: - .incbin "baserom.dol", 0x48F354, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AD4 + .4byte 0x803D5074 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1: - .incbin "baserom.dol", 0x48F370, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AD0 + .4byte 0x803D4FF8 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1 __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1: - .incbin "baserom.dol", 0x48F38C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5ACC + .4byte 0x803D4F7C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1: - .incbin "baserom.dol", 0x48F3A8, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AC8 + .4byte 0x803D4F00 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1: - .incbin "baserom.dol", 0x48F3C4, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AC4 + .4byte 0x803D4E84 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1: - .incbin "baserom.dol", 0x48F3E0, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AC0 + .4byte 0x803D4E08 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1: - .incbin "baserom.dol", 0x48F3FC, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5ABC + .4byte 0x803D4D8C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1: - .incbin "baserom.dol", 0x48F418, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AB8 + .4byte 0x803D4D10 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1: - .incbin "baserom.dol", 0x48F434, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AB4 + .4byte 0x803D4C94 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1: - .incbin "baserom.dol", 0x48F450, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AB0 + .4byte 0x803D4C18 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1: - .incbin "baserom.dol", 0x48F46C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AAC + .4byte 0x803D4B9C + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1: - .incbin "baserom.dol", 0x48F488, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AA8 + .4byte 0x803D4B20 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1: - .incbin "baserom.dol", 0x48F4A4, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AA4 + .4byte 0x803D4AA4 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1: - .incbin "baserom.dol", 0x48F4C0, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5AA0 + .4byte 0x803D4A28 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1: - .incbin "baserom.dol", 0x48F4DC, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A9C + .4byte 0x803D49AC + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1 __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1: - .incbin "baserom.dol", 0x48F4F8, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A98 + .4byte 0x803D4930 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1 __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1: - .incbin "baserom.dol", 0x48F514, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A94 + .4byte 0x803D48B4 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1: - .incbin "baserom.dol", 0x48F530, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A90 + .4byte 0x803D4838 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1: - .incbin "baserom.dol", 0x48F54C, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A8C + .4byte 0x803D47BC + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1: - .incbin "baserom.dol", 0x48F568, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A88 + .4byte 0x803D4740 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1: - .incbin "baserom.dol", 0x48F584, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A84 + .4byte 0x803D46C4 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1: - .incbin "baserom.dol", 0x48F5A0, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A80 + .4byte 0x803D4648 + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1: - .incbin "baserom.dol", 0x48F5BC, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x803D3770 + .4byte 0x803D5A24 + .4byte 0x803D45CC + .4byte 0x803D3768 + .4byte 0x803D376C .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F5D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6060 + .4byte 0x803D5B24 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F5E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D605C + .4byte 0x803D5B40 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F5F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6058 + .4byte 0x803D5B5C .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F608, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6054 + .4byte 0x803D5B78 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F618, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6050 + .4byte 0x803D5B94 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F628, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D604C + .4byte 0x803D5BB0 .global __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F638, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6048 + .4byte 0x803D5BCC .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F648, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6044 + .4byte 0x803D5BE8 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F658, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6040 + .4byte 0x803D5C04 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F668, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D603C + .4byte 0x803D5C20 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F678, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6038 + .4byte 0x803D5C3C .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F688, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6034 + .4byte 0x803D5C58 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F698, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6030 + .4byte 0x803D5C74 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D602C + .4byte 0x803D5C90 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6028 + .4byte 0x803D5CAC .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6024 + .4byte 0x803D5CC8 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6020 + .4byte 0x803D5CE4 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D601C + .4byte 0x803D5D00 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F6F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6018 + .4byte 0x803D5D1C .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F708, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6014 + .4byte 0x803D5D38 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F718, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6010 + .4byte 0x803D5D54 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F728, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D600C + .4byte 0x803D5D70 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F738, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6008 + .4byte 0x803D5D8C .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F748, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6004 + .4byte 0x803D5DA8 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F758, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D6000 + .4byte 0x803D5DC4 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F768, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FFC + .4byte 0x803D5DE0 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F778, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FF8 + .4byte 0x803D5DFC .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F788, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FF4 + .4byte 0x803D5E18 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F798, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FF0 + .4byte 0x803D5E34 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FEC + .4byte 0x803D5E50 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FE8 + .4byte 0x803D5E6C .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FE4 + .4byte 0x803D5E88 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FE0 + .4byte 0x803D5EA4 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FDC + .4byte 0x803D5EC0 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F7F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FD8 + .4byte 0x803D5EDC .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F808, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FD4 + .4byte 0x803D5EF8 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F818, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FD0 + .4byte 0x803D5F14 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F828, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FCC + .4byte 0x803D5F30 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F838, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FC8 + .4byte 0x803D5F4C .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F848, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FC4 + .4byte 0x803D5F68 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F858, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FC0 + .4byte 0x803D5F84 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48F868, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D5FBC + .4byte 0x803D5FA0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step4boss7bonkers6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/CutIn.s b/asm/src/CutIn.s index 2344a9ca..c518ed7b 100644 --- a/asm/src/CutIn.s +++ b/asm/src/CutIn.s @@ -728,99 +728,135 @@ lbl_803B255C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252354 $$252354: - .incbin "baserom.dol", 0x453868, 0x18 + .asciz "step/lvmap/Cutinanime" + .balign 4 .global $$252355 $$252355: - .incbin "baserom.dol", 0x453880, 0xC + .asciz "CutinAnime" + .balign 4 .global $$252356 $$252356: - .incbin "baserom.dol", 0x45388C, 0xC + .asciz "Lv%dTextN" + .balign 4 .global $$252439 $$252439: - .incbin "baserom.dol", 0x453898, 0xC + .asciz "TitleText" + .balign 4 .global $$252440 $$252440: - .incbin "baserom.dol", 0x4538A4, 0xC + .asciz "Lv%dTitle" + .balign 4 .global $$252441 $$252441: - .incbin "baserom.dol", 0x4538B0, 0x10 + .asciz "TitleTextSh" + .4byte 0 .global $$252442 $$252442: - .incbin "baserom.dol", 0x4538C0, 0x10 + .asciz "Lv%dMapNameText" .global $$252443 $$252443: - .incbin "baserom.dol", 0x4538D0, 0x14 + .asciz "Lv%dTitleMain_00" + .balign 4 .global $$252444 $$252444: - .incbin "baserom.dol", 0x4538E4, 0x14 + .asciz "Lv%dMapNameTextSh" + .balign 4 .global $$252445 $$252445: - .incbin "baserom.dol", 0x4538F8, 0x18 + .asciz "Lv%dMapNameText2" + .balign 4 + .4byte 0 .global $$252446 $$252446: - .incbin "baserom.dol", 0x453910, 0x10 + .asciz "Lv%dTitleSub_00" .global $$252447 $$252447: - .incbin "baserom.dol", 0x453920, 0x10 + .asciz "Lv%dAreaText" + .balign 4 .global $$252449 $$252449: - .incbin "baserom.dol", 0x453930, 0x40 + .asciz "Lv%dAreaTextSh" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252734 $$252734: - .incbin "baserom.dol", 0x48C458, 0x14 + .asciz "step/challenge/Main" .global $$252735 $$252735: - .incbin "baserom.dol", 0x48C46C, 0x10 + .asciz "TutorialBase" + .balign 4 .global $$252737 $$252737: - .incbin "baserom.dol", 0x48C47C, 0x18 + .asciz "step/challenge/Master" + .balign 4 .global $$252738 $$252738: - .incbin "baserom.dol", 0x48C494, 0xC + .asciz "BoardMaster" .global $$252739 $$252739: - .incbin "baserom.dol", 0x48C4A0, 0x18 + .asciz "step/challenge/Musou" + .balign 4 .global $$252740 $$252740: - .incbin "baserom.dol", 0x48C4B8, 0xC + .asciz "BoardMusou" + .balign 4 .global $$252741 $$252741: - .incbin "baserom.dol", 0x48C4C4, 0x18 + .asciz "step/challenge/Normal" + .balign 4 .global $$252742 $$252742: - .incbin "baserom.dol", 0x48C4DC, 0x44 + .asciz "BoardChallenge" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252448 $$252448: - .incbin "baserom.dol", 0x493518, 0x8 + .asciz "Lv%d" + .balign 4 .global $$252452 $$252452: - .incbin "baserom.dol", 0x493520, 0x8 + .asciz "Start" + .balign 4 .global $$252455 $$252455: - .incbin "baserom.dol", 0x493528, 0x4 + .4byte 0x456E6400 .global $$252458 $$252458: - .incbin "baserom.dol", 0x49352C, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252736 $$252736: - .incbin "baserom.dol", 0x497B60, 0x8 + .asciz "TitleN" + .balign 4 .global $$252743 $$252743: - .incbin "baserom.dol", 0x497B68, 0x8 + .asciz "BoardN" + .balign 4 .global $$252744 $$252744: - .incbin "baserom.dol", 0x497B70, 0x8 + .asciz "Close" + .balign 4 .global $$252745 $$252745: - .incbin "baserom.dol", 0x497B78, 0x8 + .asciz "close" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251802 $$251802: - .incbin "baserom.dol", 0x49E458, 0x8 + .4byte 0x000000FF + .4byte 0 diff --git a/asm/src/CutRopeStep.s b/asm/src/CutRopeStep.s index bbddad1a..633c89c7 100644 --- a/asm/src/CutRopeStep.s +++ b/asm/src/CutRopeStep.s @@ -1969,98 +1969,113 @@ lbl_8030D4B0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256444 $$256444: - .incbin "baserom.dol", 0x47D370, 0x1C + .asciz "step/gimmick/CutRopeLand" + .balign 4 .global $$256445 $$256445: - .incbin "baserom.dol", 0x47D38C, 0x20 + .asciz "step/gimmick/CutRopeLandHard" + .balign 4 .global $$259529 $$259529: - .incbin "baserom.dol", 0x47D3AC, 0x1C + .asciz "step/gimmick/CutRopeStep" + .balign 4 .global $$259530 $$259530: - .incbin "baserom.dol", 0x47D3C8, 0x18 + .asciz "step/gimmick/CutRope" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256456 $$256456: - .incbin "baserom.dol", 0x496A80, 0x8 + .asciz "TopL1" + .balign 4 .global $$256457 $$256457: - .incbin "baserom.dol", 0x496A88, 0x8 + .asciz "TopL2" + .balign 4 .global $$256472 $$256472: - .incbin "baserom.dol", 0x496A90, 0x8 + .asciz "Wait1" + .balign 4 .global $$256473 $$256473: - .incbin "baserom.dol", 0x496A98, 0x8 + .asciz "Wait2" + .balign 4 .global $$256484 $$256484: - .incbin "baserom.dol", 0x496AA0, 0x8 + .asciz "Crush1" + .balign 4 .global $$256485 $$256485: - .incbin "baserom.dol", 0x496AA8, 0x8 + .asciz "Crush2" + .balign 4 .global $$259531 $$259531: - .incbin "baserom.dol", 0x496AB0, 0x8 + .asciz "TopL1" + .balign 4 .global $$259853 $$259853: - .incbin "baserom.dol", 0x496AB8, 0x8 + .asciz "TopL2" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259467 $$259467: - .incbin "baserom.dol", 0x49D358, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$259471 $$259471: - .incbin "baserom.dol", 0x49D360, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259480 $$259480: - .incbin "baserom.dol", 0x49D368, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$256446 $$256446: - .incbin "baserom.dol", 0x49D370, 0x4 + .4byte 0x80481270 .global lbl_80562834 lbl_80562834: - .incbin "baserom.dol", 0x49D374, 0x4 + .4byte 0x8048128C .global $$256458 $$256458: - .incbin "baserom.dol", 0x49D378, 0x4 + .4byte 0x8055A6A0 .global lbl_8056283C lbl_8056283C: - .incbin "baserom.dol", 0x49D37C, 0x4 + .4byte 0x8055A6A8 .global $$256474 $$256474: - .incbin "baserom.dol", 0x49D380, 0x4 + .4byte 0x8055A6B0 .global lbl_80562844 lbl_80562844: - .incbin "baserom.dol", 0x49D384, 0x4 + .4byte 0x8055A6B8 .global $$256486 $$256486: - .incbin "baserom.dol", 0x49D388, 0x4 + .4byte 0x8055A6C0 .global lbl_8056284C lbl_8056284C: - .incbin "baserom.dol", 0x49D38C, 0x4 + .4byte 0x8055A6C8 .global $$259707 $$259707: - .incbin "baserom.dol", 0x49D390, 0x4 + .4byte 0x3F000000 .global $$259708 $$259708: - .incbin "baserom.dol", 0x49D394, 0x4 + .4byte 0 .global $$259798 $$259798: - .incbin "baserom.dol", 0x49D398, 0x4 + .4byte 0x41A00000 .global $$259854 $$259854: - .incbin "baserom.dol", 0x49D39C, 0x4 + .4byte 0x40400000 .global $$259855 $$259855: - .incbin "baserom.dol", 0x49D3A0, 0x4 + .4byte 0x40A00000 .global $$259856 $$259856: - .incbin "baserom.dol", 0x49D3A4, 0x4 + .4byte 0x3E800000 .global $$259857 $$259857: - .incbin "baserom.dol", 0x49D3A8, 0x4 + .4byte 0xBF800000 .global $$259935 $$259935: - .incbin "baserom.dol", 0x49D3AC, 0x4 + .4byte 0x42B40000 diff --git a/asm/src/Cutter.s b/asm/src/Cutter.s index 5aebd666..57dec4a2 100644 --- a/asm/src/Cutter.s +++ b/asm/src/Cutter.s @@ -10,4 +10,5 @@ CutterPath__Q53scn4step4hero9modeldesc6CutterFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248792 $$248792: - .incbin "baserom.dol", 0x484DD0, 0x28 + .asciz "step/chara/hero/kirby/cutter/Cutter" + .4byte 0 diff --git a/asm/src/DPD.s b/asm/src/DPD.s index da68d78b..b68c5f28 100644 --- a/asm/src/DPD.s +++ b/asm/src/DPD.s @@ -43,4 +43,5 @@ update__Q23hid3DPDFfRC4Vec2RC4Vec2: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248825 $$248825: - .incbin "baserom.dol", 0x49A448, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/DamageFeedback.s b/asm/src/DamageFeedback.s index 10d4cafc..aaf2fb9e 100644 --- a/asm/src/DamageFeedback.s +++ b/asm/src/DamageFeedback.s @@ -43,7 +43,7 @@ lbl_80334B14: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250097 $$250097: - .incbin "baserom.dol", 0x49D6D8, 0x4 + .4byte 0x3F000000 .global $$250098 $$250098: - .incbin "baserom.dol", 0x49D6DC, 0x4 + .4byte 0x3E800000 diff --git a/asm/src/DamageFieldReact.s b/asm/src/DamageFieldReact.s index 29d82153..633e46d6 100644 --- a/asm/src/DamageFieldReact.s +++ b/asm/src/DamageFieldReact.s @@ -740,23 +740,31 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FF60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80335074 + .4byte 0x80335038 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FF70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80335070 + .4byte 0x80335054 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256861 $$256861: - .incbin "baserom.dol", 0x49B938, 0x4 + .4byte 0 .global $$256862 $$256862: - .incbin "baserom.dol", 0x49B93C, 0x4 + .4byte 0x3727C5AC .global $$256863 $$256863: - .incbin "baserom.dol", 0x49B940, 0x8 + .asciz "?fff" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258791 $$258791: - .incbin "baserom.dol", 0x49D6E0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DamageFlash.s b/asm/src/DamageFlash.s index 21fe069c..57260105 100644 --- a/asm/src/DamageFlash.s +++ b/asm/src/DamageFlash.s @@ -450,84 +450,95 @@ getColor__Q43scn4step4hero11DamageFlashCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4boss25$$2unnamed$$2DamageFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss25$$2unnamed$$2DamageFlash_cpp$$2: - .incbin "baserom.dol", 0x4124A8, 0x10 + .4byte 0x6018400C + .4byte 0x20001000 + .4byte 0x08000000 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__25$$2unnamed$$2DamageFlash_cpp$$2 T_ALPHA_TABLE__25$$2unnamed$$2DamageFlash_cpp$$2: - .incbin "baserom.dol", 0x415DE8, 0x18 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0x000000F0 + .4byte 0x00000060 + .4byte 0x000000C0 + .4byte 0x00000040 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250026 $$250026: - .incbin "baserom.dol", 0x495A00, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248757 $$248757: - .incbin "baserom.dol", 0x49AE40, 0x4 + .4byte 0xF0FFA0FF .global $$248762 $$248762: - .incbin "baserom.dol", 0x49AE44, 0x4 + .4byte 0xA05000FF .global $$248766 $$248766: - .incbin "baserom.dol", 0x49AE48, 0x4 + .4byte 0xA0F0FFFF .global $$248770 $$248770: - .incbin "baserom.dol", 0x49AE4C, 0x4 + .4byte 0xA0FF50FF .global $$248775 $$248775: - .incbin "baserom.dol", 0x49AE50, 0x8 + .4byte 0xFFFFFFFF + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_COLOR_TABLE__Q43scn4step5enemy25$$2unnamed$$2DamageFlash_cpp$$2 T_COLOR_TABLE__Q43scn4step5enemy25$$2unnamed$$2DamageFlash_cpp$$2: - .incbin "baserom.dol", 0x49B948, 0x4 + .4byte 0xFF004000 .global $$250237 $$250237: - .incbin "baserom.dol", 0x49B94C, 0x4 + .4byte 0xFFFFFF00 .global $$250243 $$250243: - .incbin "baserom.dol", 0x49B950, 0x4 + .4byte 0 .global $$250244 $$250244: - .incbin "baserom.dol", 0x49B954, 0x4 + .4byte 0x3F800000 .global $$250268 $$250268: - .incbin "baserom.dol", 0x49B958, 0x4 + .4byte 0x40600000 .global $$250269 $$250269: - .incbin "baserom.dol", 0x49B95C, 0x4 + .4byte 0x43B40000 .global $$250270 $$250270: - .incbin "baserom.dol", 0x49B960, 0x4 + .4byte 0x3D19999A .global $$250271 $$250271: - .incbin "baserom.dol", 0x49B964, 0x4 + .4byte 0x3F733333 .global $$250272 $$250272: - .incbin "baserom.dol", 0x49B968, 0x4 + .4byte 0x4222F983 .global $$250273 $$250273: - .incbin "baserom.dol", 0x49B96C, 0x4 + .4byte 0x3C8EFA35 .global $$250274 $$250274: - .incbin "baserom.dol", 0x49B970, 0x4 + .4byte 0x3F000000 .global $$250275 $$250275: - .incbin "baserom.dol", 0x49B974, 0x4 + .4byte 0x437F0000 .global $$250068 $$250068: - .incbin "baserom.dol", 0x49B978, 0x4 + .4byte 0xF0FFA0FF .global $$250073 $$250073: - .incbin "baserom.dol", 0x49B97C, 0x4 + .4byte 0xA00000FF .global $$250077 $$250077: - .incbin "baserom.dol", 0x49B980, 0x4 + .4byte 0xA0F0FFFF .global $$250081 $$250081: - .incbin "baserom.dol", 0x49B984, 0x4 + .4byte 0xA0FF50FF .global $$250086 $$250086: - .incbin "baserom.dol", 0x49B988, 0x8 + .4byte 0xFFF0F0FF + .4byte 0 diff --git a/asm/src/DamageInfo.s b/asm/src/DamageInfo.s index 9e7eb721..c84b290d 100644 --- a/asm/src/DamageInfo.s +++ b/asm/src/DamageInfo.s @@ -223,4 +223,5 @@ __ct__Q53scn4step5chara10DamageInfo4DataFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249900 $$249900: - .incbin "baserom.dol", 0x49B798, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/DamageInvincible.s b/asm/src/DamageInvincible.s index 71782f15..545dea4c 100644 --- a/asm/src/DamageInvincible.s +++ b/asm/src/DamageInvincible.s @@ -109,4 +109,17 @@ lbl_8022F228: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_FRAME_BY_DAMAGE_TABLE__Q43scn4step4boss30$$2unnamed$$2DamageInvincible_cpp$$2 T_FRAME_BY_DAMAGE_TABLE__Q43scn4step4boss30$$2unnamed$$2DamageInvincible_cpp$$2: - .incbin "baserom.dol", 0x460650, 0x38 + .4byte 0x00000023 + .4byte 0x00000024 + .4byte 0x00000019 + .4byte 0x0000001C + .4byte 0x00000014 + .4byte 0x00000014 + .4byte 0x0000000B + .4byte 0x00000010 + .4byte 0x00000006 + .4byte 0x0000000C + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0 + .4byte 0 diff --git a/asm/src/DamagePrevent.s b/asm/src/DamagePrevent.s index 5f8b1738..89d9e389 100644 --- a/asm/src/DamagePrevent.s +++ b/asm/src/DamagePrevent.s @@ -111,4 +111,5 @@ __vc__Q33hel6common67MutableArray$$0Q53scn4step4boss13DamagePrevent17PreventTarg .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250316 $$250316: - .incbin "baserom.dol", 0x49AE58, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DarknessAdjust.s b/asm/src/DarknessAdjust.s index e755391e..5b0532cb 100644 --- a/asm/src/DarknessAdjust.s +++ b/asm/src/DarknessAdjust.s @@ -123,15 +123,16 @@ draw__Q43scn4step3sfx14DarknessAdjustFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252031 $$252031: - .incbin "baserom.dol", 0x48ED38, 0x18 + .asciz "step/sfx/DarknessAdjust" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252071 $$252071: - .incbin "baserom.dol", 0x49E6C0, 0x4 + .4byte 0x3F800000 .global $$252072 $$252072: - .incbin "baserom.dol", 0x49E6C4, 0x4 + .4byte 0xBF800000 .global $$252073 $$252073: - .incbin "baserom.dol", 0x49E6C8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/DarknessLight.s b/asm/src/DarknessLight.s index f0a7dc8d..1b009cf5 100644 --- a/asm/src/DarknessLight.s +++ b/asm/src/DarknessLight.s @@ -390,56 +390,67 @@ lbl_803CD504: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252574 $$252574: - .incbin "baserom.dol", 0x48ED50, 0x18 + .asciz "step/sfx/DarknessLight" + .balign 4 .global $$252694 $$252694: - .incbin "baserom.dol", 0x48ED68, 0x20 + .4byte 0x803CD4C4 + .4byte 0x803CD4CC + .4byte 0x803CD4D4 + .4byte 0x803CD4DC + .4byte 0x803CD4E4 + .4byte 0x803CD4EC + .4byte 0x803CD4F4 + .4byte 0x803CD4FC .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252675 $$252675: - .incbin "baserom.dol", 0x4983E0, 0x8 + .asciz "BigL" + .balign 4 .global $$252676 $$252676: - .incbin "baserom.dol", 0x4983E8, 0x8 + .asciz "SmallL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252572 $$252572: - .incbin "baserom.dol", 0x49E6D0, 0x4 + .4byte 0 .global $$252573 $$252573: - .incbin "baserom.dol", 0x49E6D4, 0x4 + .4byte 0x3F800000 .global $$252627 $$252627: - .incbin "baserom.dol", 0x49E6D8, 0x4 + .4byte 0x3F666666 .global $$252628 $$252628: - .incbin "baserom.dol", 0x49E6DC, 0x4 + .4byte 0x3DCCCCCD .global $$252639 $$252639: - .incbin "baserom.dol", 0x49E6E0, 0x4 + .4byte 0x3E4CCCCD .global $$252645 $$252645: - .incbin "baserom.dol", 0x49E6E4, 0x4 + .4byte 0x3F000000 .global $$252687 $$252687: - .incbin "baserom.dol", 0x49E6E8, 0x4 + .4byte 0x3F19999A .global $$252688 $$252688: - .incbin "baserom.dol", 0x49E6EC, 0x4 + .4byte 0x40200000 .global $$252689 $$252689: - .incbin "baserom.dol", 0x49E6F0, 0x4 + .4byte 0x40400000 .global $$252690 $$252690: - .incbin "baserom.dol", 0x49E6F4, 0x4 + .4byte 0x40800000 .global $$252691 $$252691: - .incbin "baserom.dol", 0x49E6F8, 0x4 + .4byte 0x40900000 .global $$252692 $$252692: - .incbin "baserom.dol", 0x49E6FC, 0x4 + .4byte 0x40C00000 .global $$252693 $$252693: - .incbin "baserom.dol", 0x49E700, 0x8 + .4byte 0x41700000 + .4byte 0 diff --git a/asm/src/DarknessRoot.s b/asm/src/DarknessRoot.s index 212e8640..9b729270 100644 --- a/asm/src/DarknessRoot.s +++ b/asm/src/DarknessRoot.s @@ -394,34 +394,35 @@ lbl_803CDA70: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252364 $$252364: - .incbin "baserom.dol", 0x49E708, 0x4 + .4byte 0 .global $$252365 $$252365: - .incbin "baserom.dol", 0x49E70C, 0x4 + .4byte 0x3FC00000 .global $$252390 $$252390: - .incbin "baserom.dol", 0x49E710, 0x4 + .4byte 0x3E99999A .global $$252391 $$252391: - .incbin "baserom.dol", 0x49E714, 0x4 + .4byte 0x40C90FDB .global $$252392 $$252392: - .incbin "baserom.dol", 0x49E718, 0x4 + .4byte 0x3D4CCCCD .global $$252404 $$252404: - .incbin "baserom.dol", 0x49E71C, 0x4 + .4byte 0x3D99999A .global $$252405 $$252405: - .incbin "baserom.dol", 0x49E720, 0x4 + .4byte 0x3E4CCCCD .global $$252417 $$252417: - .incbin "baserom.dol", 0x49E724, 0x4 + .4byte 0x43960000 .global $$252181 $$252181: - .incbin "baserom.dol", 0x49E728, 0x4 + .4byte 0x0000006F .global $$252210 $$252210: - .incbin "baserom.dol", 0x49E72C, 0x4 + .4byte 0x000000FF .global $$252432 $$252432: - .incbin "baserom.dol", 0x49E730, 0x8 + .4byte 0x3E800000 + .4byte 0 diff --git a/asm/src/DataAccessor.s b/asm/src/DataAccessor.s index 6753b187..9b6d9f8c 100644 --- a/asm/src/DataAccessor.s +++ b/asm/src/DataAccessor.s @@ -744,4 +744,5 @@ header__Q43scn4step3map12DataAccessorCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253264 $$253264: - .incbin "baserom.dol", 0x49E668, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 diff --git a/asm/src/Dead.s b/asm/src/Dead.s index c2a24435..ee014125 100644 --- a/asm/src/Dead.s +++ b/asm/src/Dead.s @@ -360,7 +360,13 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1: - .incbin "baserom.dol", 0x47FF80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803356E0 + .4byte 0x803356A0 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x47FF90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803356DC + .4byte 0x803356C0 diff --git a/asm/src/DeadFlash.s b/asm/src/DeadFlash.s index d5719ec2..d431bd93 100644 --- a/asm/src/DeadFlash.s +++ b/asm/src/DeadFlash.s @@ -33,9 +33,15 @@ lbl_8022F3EC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4boss23$$2unnamed$$2DeadFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss23$$2unnamed$$2DeadFlash_cpp$$2: - .incbin "baserom.dol", 0x4124B8, 0x18 + .4byte 0x50607080 + .4byte 0x78706860 + .4byte 0x58504030 + .4byte 0x18000000 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248801 $$248801: - .incbin "baserom.dol", 0x49AE60, 0x8 + .4byte 0xC0C0C000 + .4byte 0 diff --git a/asm/src/DeadUtil.s b/asm/src/DeadUtil.s index 86de54a9..8915dc6d 100644 --- a/asm/src/DeadUtil.s +++ b/asm/src/DeadUtil.s @@ -101,7 +101,7 @@ lbl_80244538: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254560 $$254560: - .incbin "baserom.dol", 0x49B108, 0x4 + .4byte 0xFFFFFF3C .global $$254563 $$254563: - .incbin "baserom.dol", 0x49B10C, 0x4 + .4byte 0xFFFFFFC0 diff --git a/asm/src/DebugCamera.s b/asm/src/DebugCamera.s index 75b89d24..197c9d26 100644 --- a/asm/src/DebugCamera.s +++ b/asm/src/DebugCamera.s @@ -463,10 +463,11 @@ getBGFovy__Q43scn4step6camera11DebugCameraCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253482 $$253482: - .incbin "baserom.dol", 0x49B640, 0x4 + .4byte 0 .global $$253734 $$253734: - .incbin "baserom.dol", 0x49B644, 0x4 + .4byte 0x3C8EFA35 .global $$253831 $$253831: - .incbin "baserom.dol", 0x49B648, 0x8 + .4byte 0x3FB40000 + .4byte 0 diff --git a/asm/src/DecorationBG.s b/asm/src/DecorationBG.s index 24351760..a58d810e 100644 --- a/asm/src/DecorationBG.s +++ b/asm/src/DecorationBG.s @@ -338,24 +338,30 @@ registerToRoot__Q43scn4step2bg12DecorationBGFRQ23g3d4Root: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252617 $$252617: - .incbin "baserom.dol", 0x45FD68, 0x10 + .asciz "step/map/%s/Bg" + .balign 4 .global $$252689 $$252689: - .incbin "baserom.dol", 0x45FD78, 0xC + .asciz "SceneAnim" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv$$20: - .incbin "baserom.dol", 0x45FD84, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv: - .incbin "baserom.dol", 0x45FDA0, 0x10 + .asciz "g3d_resmdl_ac.h" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252618 $$252618: - .incbin "baserom.dol", 0x495248, 0x8 + .asciz "TopL" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMdlFv $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMdlFv: - .incbin "baserom.dol", 0x495250, 0x8 + .asciz "ResMdl" + .balign 4 .global __FUNCTION__$31429 __FUNCTION__$31429: - .incbin "baserom.dol", 0x495258, 0x8 + .4byte 0x72656600 + .4byte 0 diff --git a/asm/src/DecorationManager.s b/asm/src/DecorationManager.s index 08f0b2c5..2ef230c0 100644 --- a/asm/src/DecorationManager.s +++ b/asm/src/DecorationManager.s @@ -1276,28 +1276,31 @@ createAABBox__Q43scn4step2bg17DecorationManagerCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254496 $$254496: - .incbin "baserom.dol", 0x49AD68, 0x4 + .4byte 0xBF800000 .global $$254497 $$254497: - .incbin "baserom.dol", 0x49AD6C, 0x4 + .4byte 0 .global $$254498 $$254498: - .incbin "baserom.dol", 0x49AD70, 0x4 + .4byte 0x3F000000 .global $$254499 $$254499: - .incbin "baserom.dol", 0x49AD74, 0x4 + .4byte 0x3F800000 .global $$254500 $$254500: - .incbin "baserom.dol", 0x49AD78, 0x8 + .4byte 0x3B808081 + .4byte 0 .global $$254505 $$254505: - .incbin "baserom.dol", 0x49AD80, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$254511 $$254511: - .incbin "baserom.dol", 0x49AD88, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$254590 $$254590: - .incbin "baserom.dol", 0x49AD90, 0x4 + .4byte 0xFF7FFFFF .global $$254591 $$254591: - .incbin "baserom.dol", 0x49AD94, 0x4 + .4byte 0x7F7FFFFF diff --git a/asm/src/DecorationMapro.s b/asm/src/DecorationMapro.s index 62597e42..3e42f5d4 100644 --- a/asm/src/DecorationMapro.s +++ b/asm/src/DecorationMapro.s @@ -462,18 +462,23 @@ drawFrontXlu__Q43scn4step2bg15DecorationMaproCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252744 $$252744: - .incbin "baserom.dol", 0x45FDB0, 0x14 + .asciz "step/map/%s/Parts" + .balign 4 .global $$252770 $$252770: - .incbin "baserom.dol", 0x45FDC4, 0xC + .asciz "SceneAnim" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252745 $$252745: - .incbin "baserom.dol", 0x495260, 0x8 + .asciz "BLand" + .balign 4 .global $$252746 $$252746: - .incbin "baserom.dol", 0x495268, 0x8 + .asciz "MLand" + .balign 4 .global $$252747 $$252747: - .incbin "baserom.dol", 0x495270, 0x8 + .asciz "FLand" + .balign 4 diff --git a/asm/src/DecorationMaproColl.s b/asm/src/DecorationMaproColl.s index a8ccba9e..409774f8 100644 --- a/asm/src/DecorationMaproColl.s +++ b/asm/src/DecorationMaproColl.s @@ -3604,80 +3604,88 @@ gridHeight__Q43scn4step2bg7ResPartCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResVtxPosFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResVtxPosFv: - .incbin "baserom.dol", 0x45FDD0, 0xC + .asciz "ResVtxPos" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResVtxPosCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResVtxPosCFv$$20: - .incbin "baserom.dol", 0x45FDDC, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResVtxPosCFv $$2STRING$$2ref__Q34nw4r3g3d9ResVtxPosCFv: - .incbin "baserom.dol", 0x45FDF8, 0x10 + .asciz "g3d_resvtx_ac.h" .global $$2STRING$$2ref__Q34nw4r3g3d6ResMdlFv$$20 $$2STRING$$2ref__Q34nw4r3g3d6ResMdlFv$$20: - .incbin "baserom.dol", 0x45FE08, 0x20 + .asciz "%s::%s: Object not valid." + .balign 4 + .4byte 0 .global $$2STRING$$2ref__Q34nw4r3g3d6ResMdlFv $$2STRING$$2ref__Q34nw4r3g3d6ResMdlFv: - .incbin "baserom.dol", 0x45FE28, 0x10 + .asciz "g3d_resmdl_ac.h" .global $$2STRING$$2__ct__Q34nw4r3g3d10ResMdlInfoFPv$$20 $$2STRING$$2__ct__Q34nw4r3g3d10ResMdlInfoFPv$$20: - .incbin "baserom.dol", 0x45FE38, 0x28 + .asciz "NW4R:Failed assertion !((u32)p & 0x3)" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r3g3d10ResMdlInfoFPv $$2STRING$$2__ct__Q34nw4r3g3d10ResMdlInfoFPv: - .incbin "baserom.dol", 0x45FE60, 0x10 + .asciz "g3d_resmdl_ac.h" .global $$2STRING$$2GetClassName__Q34nw4r3g3d10ResMdlInfoFv $$2STRING$$2GetClassName__Q34nw4r3g3d10ResMdlInfoFv: - .incbin "baserom.dol", 0x45FE70, 0xC + .asciz "ResMdlInfo" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv$$20: - .incbin "baserom.dol", 0x45FE7C, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv: - .incbin "baserom.dol", 0x45FE98, 0x10 + .asciz "g3d_resmdl_ac.h" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253352 $$253352: - .incbin "baserom.dol", 0x495278, 0x4 + .4byte 0 .global $$253355 $$253355: - .incbin "baserom.dol", 0x49527C, 0x4 + .4byte 0 .global $$258266 $$258266: - .incbin "baserom.dol", 0x495280, 0x8 + .asciz "%s%04lu" .global $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4Q53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4Q53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu_v$$2shuffle$$20: - .incbin "baserom.dol", 0x495288, 0x4 + .4byte 0xFFFFFFFC .global $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4RQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperRQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4RQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperRQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortXlu_v$$2shuffle$$20: - .incbin "baserom.dol", 0x49528C, 0x4 + .4byte 0xFFFFFFFC .global $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4Q53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4Q53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa_v$$2shuffle$$20: - .incbin "baserom.dol", 0x495290, 0x4 + .4byte 0xFFFFFFFC .global $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4RQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperRQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ43scn4step2bg16DrawEntryWrapper$$4RQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa$$1__3stdFPQ43scn4step2bg16DrawEntryWrapperPQ43scn4step2bg16DrawEntryWrapperRQ53scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$29T_SortOpa_v$$2shuffle$$20: - .incbin "baserom.dol", 0x495294, 0x4 + .4byte 0xFFFFFFFC .global __FUNCTION__$34959 __FUNCTION__$34959: - .incbin "baserom.dol", 0x495298, 0x4 + .4byte 0x72656600 .global __FUNCTION__$32217 __FUNCTION__$32217: - .incbin "baserom.dol", 0x49529C, 0x4 + .4byte 0x72656600 .global __FUNCTION__$31454 __FUNCTION__$31454: - .incbin "baserom.dol", 0x4952A0, 0x4 + .4byte 0x72656600 .global __FUNCTION__$31183 __FUNCTION__$31183: - .incbin "baserom.dol", 0x4952A4, 0x4 + .4byte 0x72656600 .global __FUNCTION__$30538 __FUNCTION__$30538: - .incbin "baserom.dol", 0x4952A8, 0x4 + .4byte 0x72656600 .global __FUNCTION__$30525 __FUNCTION__$30525: - .incbin "baserom.dol", 0x4952AC, 0x4 + .4byte 0x72656600 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257830 $$257830: - .incbin "baserom.dol", 0x49AD98, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2next__Q43scn4step2bg14DrawEntryReposFb$$2dummyObj diff --git a/asm/src/Dedede.s b/asm/src/Dedede.s index 7aa4580d..3458681c 100644 --- a/asm/src/Dedede.s +++ b/asm/src/Dedede.s @@ -84,455 +84,1490 @@ Script__Q53scn4step4hero9modeldesc6DededeFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: - .incbin "baserom.dol", 0x4180E0, 0xE38 + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA58 + .4byte 0x0000000D + .4byte 0x8055AA60 + .4byte 0x0000000D + .4byte 0x8055AA68 + .4byte 0x0000000D + .4byte 0x8055AA70 + .4byte 0x0000000D + .4byte 0x8055AA78 + .4byte 0x0000000D + .4byte 0x8055AA80 + .4byte 0x0000000D + .4byte 0x80488CF8 + .4byte 0x0000000D + .4byte 0x8055AA88 + .4byte 0x0000000D + .4byte 0x8055AA90 + .4byte 0x0000000D + .4byte 0x8055AA98 + .4byte 0x0000000D + .4byte 0x80488D04 + .4byte 0x0000000D + .4byte 0x8055AAA0 + .4byte 0x0000000D + .4byte 0x80488D10 + .4byte 0x0000000D + .4byte 0x80488D1C + .4byte 0x0000000D + .4byte 0x8055AAA8 + .4byte 0x0000000D + .4byte 0x80488D2C + .4byte 0x0000000D + .4byte 0x80488D38 + .4byte 0x0000000D + .4byte 0x80488D44 + .4byte 0x0000000D + .4byte 0x8055AAB0 + .4byte 0x0000000D + .4byte 0x80488D50 + .4byte 0x0000000D + .4byte 0x80488D5C + .4byte 0x0000000D + .4byte 0x80488D6C + .4byte 0x0000000D + .4byte 0x8055AAB8 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AAC0 + .4byte 0x0000000D + .4byte 0x80488D7C + .4byte 0x0000000D + .4byte 0x8055AAC8 + .4byte 0x0000000D + .4byte 0x80488D88 + .4byte 0x0000000D + .4byte 0x8055AAD0 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AAC0 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488D94 + .4byte 0x0000000D + .4byte 0x80488DA4 + .4byte 0x0000000D + .4byte 0x80488DB0 + .4byte 0x0000000D + .4byte 0x80488DC0 + .4byte 0x0000000D + .4byte 0x80488DD0 + .4byte 0x0000000D + .4byte 0x80488DDC + .4byte 0x0000000D + .4byte 0x80488D7C + .4byte 0x0000000D + .4byte 0x80488DE8 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AAD4 + .4byte 0x0000000D + .4byte 0x80488DF4 + .4byte 0x0000000D + .4byte 0x8055AAD4 + .4byte 0x0000000D + .4byte 0x80488DF4 + .4byte 0x0000000D + .4byte 0x80488E00 + .4byte 0x0000000D + .4byte 0x8055AADC + .4byte 0x0000000D + .4byte 0x80488E0C + .4byte 0x0000000D + .4byte 0x8055AAE4 + .4byte 0x0000000D + .4byte 0x80488E18 + .4byte 0x0000000D + .4byte 0x80488E30 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AAE8 + .4byte 0x0000000D + .4byte 0x8055AAF0 + .4byte 0x0000000D + .4byte 0x8055AAF8 + .4byte 0x0000000D + .4byte 0x8055AB00 + .4byte 0x0000000D + .4byte 0x80488E44 + .4byte 0x0000000D + .4byte 0x80488E50 + .4byte 0x0000000D + .4byte 0x8055AB08 + .4byte 0x0000000D + .4byte 0x8055AB10 + .4byte 0x0000000D + .4byte 0x8055AB18 + .4byte 0x0000000D + .4byte 0x8055AB20 + .4byte 0x0000000D + .4byte 0x8055AB28 + .4byte 0x0000000D + .4byte 0x8055AB30 + .4byte 0x0000000D + .4byte 0x8055AB38 + .4byte 0x0000000D + .4byte 0x8055AB40 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA78 + .4byte 0x0000000D + .4byte 0x8055AB48 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0x8055AB50 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0x8055AB58 + .4byte 0x0000000D + .4byte 0x8055AB60 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488E5C + .4byte 0x0000000D + .4byte 0x80488E68 + .4byte 0x0000000D + .4byte 0x80488E74 + .4byte 0x0000000D + .4byte 0x8055AA88 + .4byte 0x0000000D + .4byte 0x8055AB68 + .4byte 0x0000000D + .4byte 0x80488E80 + .4byte 0x0000000D + .4byte 0x80488E8C + .4byte 0x0000000D + .4byte 0x80488EA0 + .4byte 0x0000000D + .4byte 0x80488EB0 + .4byte 0x0000000D + .4byte 0x80488EBC + .4byte 0x0000000D + .4byte 0x80488ECC + .4byte 0x0000000D + .4byte 0x8055AB70 + .4byte 0x0000000D + .4byte 0x80488EDC + .4byte 0x0000000D + .4byte 0x80488EE8 + .4byte 0x0000000D + .4byte 0x80488EF8 + .4byte 0x0000000D + .4byte 0x80488F04 + .4byte 0x0000000D + .4byte 0x80488F10 + .4byte 0x0000000D + .4byte 0x8055AB78 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x80488F20 + .4byte 0x0000000D + .4byte 0x80488F2C + .4byte 0x0000000D + .4byte 0x80488F38 + .4byte 0x0000000D + .4byte 0x80488F48 + .4byte 0x0000000D + .4byte 0x80488F58 + .4byte 0x0000000D + .4byte 0x80488F70 + .4byte 0x0000000D + .4byte 0x80488F80 + .4byte 0x0000000D + .4byte 0x80488F98 + .4byte 0x0000000D + .4byte 0x8055AB80 + .4byte 0x0000000D + .4byte 0x80488FA4 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80488FB0 + .4byte 0x0000000D + .4byte 0x80488FC8 + .4byte 0x0000000D + .4byte 0x80488FDC + .4byte 0x0000000D + .4byte 0x80488FF0 + .4byte 0x0000000D + .4byte 0x80489000 + .4byte 0x0000000D + .4byte 0x80489014 + .4byte 0x0000000D + .4byte 0x80489028 + .4byte 0x0000000D + .4byte 0x8048903C + .4byte 0x0000000D + .4byte 0x80489050 + .4byte 0x0000000D + .4byte 0x80489068 + .4byte 0x0000000D + .4byte 0x80489078 + .4byte 0x0000000D + .4byte 0x80489088 + .4byte 0x0000000D + .4byte 0x80489098 + .4byte 0x0000000D + .4byte 0x804890A4 + .4byte 0x0000000D + .4byte 0x804890B0 + .4byte 0x0000000D + .4byte 0x804890C0 + .4byte 0x0000000D + .4byte 0x804890CC + .4byte 0x0000000D + .4byte 0x804890E0 + .4byte 0x0000000D + .4byte 0x804890F0 + .4byte 0x0000000D + .4byte 0x80489100 + .4byte 0x0000000D + .4byte 0x80489110 + .4byte 0x0000000D + .4byte 0x80489128 + .4byte 0x0000000D + .4byte 0x8048913C + .4byte 0x0000000D + .4byte 0x8048914C + .4byte 0x0000000D + .4byte 0x80489160 + .4byte 0x0000000D + .4byte 0x80489170 + .4byte 0x0000000D + .4byte 0x80489180 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80489194 + .4byte 0x0000000D + .4byte 0x804891A0 + .4byte 0x0000000D + .4byte 0x804891AC + .4byte 0x0000000D + .4byte 0x804891B8 + .4byte 0x0000000D + .4byte 0x8055AB88 + .4byte 0x0000000D + .4byte 0x804891C4 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AA50 + .4byte 0x0000000D + .4byte 0x8055AB90 + .4byte 0x0000000D + .4byte 0x8055AB98 + .4byte 0x0000000D + .4byte 0x804891D0 + .4byte 0x0000000D + .4byte 0x8055ABA0 + .4byte 0x0000000D + .4byte 0x804891DC + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: - .incbin "baserom.dol", 0x484DF8, 0xC + .asciz "JumpStart" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x484E04, 0xC + .asciz "SquatStart" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x484E10, 0xC + .asciz "SquatEnd" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x484E1C, 0x10 + .asciz "SlidingStart" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x484E2C, 0xC + .asciz "SlidingEnd" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x484E38, 0xC + .asciz "SlidingHit" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x484E44, 0xC + .asciz "FlightStart" .global $$248747 $$248747: - .incbin "baserom.dol", 0x484E50, 0xC + .asciz "FlightFall" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x484E5C, 0x10 + .asciz "FlightLanding" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x484E6C, 0x10 + .asciz "FlightDamage" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x484E7C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x484E88, 0xC + .asciz "LadderDown" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x484E94, 0x10 + .asciz "PlancherStart" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x484EA4, 0xC + .asciz "Plancher" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x484EB0, 0x10 + .asciz "PlancherLanding" .global $$248759 $$248759: - .incbin "baserom.dol", 0x484EC0, 0x10 + .asciz "PlancherBound" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x484ED0, 0xC + .asciz "SquashRoof" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x484EDC, 0xC + .asciz "SquashWall" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x484EE8, 0xC + .asciz "DyingWait" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x484EF4, 0xC + .asciz "GuardEnd" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x484F00, 0xC + .asciz "HaveTwoHand" .global $$248767 $$248767: - .incbin "baserom.dol", 0x484F0C, 0xC + .asciz "AirThrow" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x484F18, 0x18 + .asciz "WarpStarDemoRideStart" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x484F30, 0x14 + .asciz "WarpStarDemoRide" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x484F44, 0xC + .asciz "DanceAEL" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x484F50, 0xC + .asciz "DanceAER" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x484F5C, 0xC + .asciz "FloatWait" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x484F68, 0xC + .asciz "FloatMove" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x484F74, 0xC + .asciz "Piggyback" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x484F80, 0xC + .asciz "ItemGetWait" .global $$248794 $$248794: - .incbin "baserom.dol", 0x484F8C, 0x14 + .asciz "ItemGetWaitStart" + .balign 4 .global $$248795 $$248795: - .incbin "baserom.dol", 0x484FA0, 0x10 + .asciz "ItemGetWaitEnd" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x484FB0, 0xC + .asciz "CannonWait" + .balign 4 .global $$248797 $$248797: - .incbin "baserom.dol", 0x484FBC, 0x10 + .asciz "CannonWaitHide" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x484FCC, 0x10 + .asciz "CannonWaitShow" + .balign 4 .global $$248800 $$248800: - .incbin "baserom.dol", 0x484FDC, 0xC + .asciz "DangleBar" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x484FE8, 0x10 + .asciz "DanglePlayer" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x484FF8, 0xC + .asciz "DangleMoveL" .global $$248803 $$248803: - .incbin "baserom.dol", 0x485004, 0xC + .asciz "DangleMoveR" .global $$248804 $$248804: - .incbin "baserom.dol", 0x485010, 0x10 + .asciz "CarryBombDanger" .global $$248806 $$248806: - .incbin "baserom.dol", 0x485020, 0xC + .asciz "Listening" + .balign 4 .global $$248807 $$248807: - .incbin "baserom.dol", 0x48502C, 0xC + .asciz "GoalGame" + .balign 4 .global $$248808 $$248808: - .incbin "baserom.dol", 0x485038, 0x10 + .asciz "WaitNoWeapon" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x485048, 0x10 + .asciz "VictoryStand" + .balign 4 .global $$248810 $$248810: - .incbin "baserom.dol", 0x485058, 0x18 + .asciz "VictoryStandStart" + .balign 4 + .4byte 0 .global $$248811 $$248811: - .incbin "baserom.dol", 0x485070, 0x10 + .asciz "VictoryStandCup" .global $$248812 $$248812: - .incbin "baserom.dol", 0x485080, 0x18 + .asciz "VictoryStandCupStart" + .balign 4 .global $$248813 $$248813: - .incbin "baserom.dol", 0x485098, 0xC + .asciz "Struggle" + .balign 4 .global $$248815 $$248815: - .incbin "baserom.dol", 0x4850A4, 0xC + .asciz "LoseStart" + .balign 4 .global $$248816 $$248816: - .incbin "baserom.dol", 0x4850B0, 0x18 + .asciz "HammerAttackChargrStart" .global $$248817 $$248817: - .incbin "baserom.dol", 0x4850C8, 0x14 + .asciz "HammerAttackCharge" + .balign 4 .global $$248818 $$248818: - .incbin "baserom.dol", 0x4850DC, 0x14 + .asciz "HammerAttack" + .balign 4 + .4byte 0 .global $$248819 $$248819: - .incbin "baserom.dol", 0x4850F0, 0x10 + .asciz "HammerAttackHit" .global $$248820 $$248820: - .incbin "baserom.dol", 0x485100, 0x14 + .asciz "HammerAttackMiss" + .balign 4 .global $$248821 $$248821: - .incbin "baserom.dol", 0x485114, 0x14 + .asciz "TripleHammerAttack1" .global $$248822 $$248822: - .incbin "baserom.dol", 0x485128, 0x14 + .asciz "TripleHammerAttack2" .global $$248823 $$248823: - .incbin "baserom.dol", 0x48513C, 0x14 + .asciz "TripleHammerAttack3" .global $$248824 $$248824: - .incbin "baserom.dol", 0x485150, 0x18 + .asciz "TripleHammerAttack3Hit" + .balign 4 .global $$248825 $$248825: - .incbin "baserom.dol", 0x485168, 0x10 + .asciz "GuriGuriHammer" + .balign 4 .global $$248826 $$248826: - .incbin "baserom.dol", 0x485178, 0x10 + .asciz "GiantSwing" + .balign 4 + .4byte 0 .global $$248827 $$248827: - .incbin "baserom.dol", 0x485188, 0x10 + .asciz "OnigorosiHammer" .global $$248828 $$248828: - .incbin "baserom.dol", 0x485198, 0xC + .asciz "HammerThrow" .global $$248829 $$248829: - .incbin "baserom.dol", 0x4851A4, 0xC + .asciz "JumpAttack" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x4851B0, 0x10 + .asciz "JumpAttackHit" + .balign 4 .global $$248831 $$248831: - .incbin "baserom.dol", 0x4851C0, 0xC + .asciz "WaterAttack" .global $$248832 $$248832: - .incbin "baserom.dol", 0x4851CC, 0x14 + .asciz "LandiaFlightWait" + .balign 4 .global $$248833 $$248833: - .incbin "baserom.dol", 0x4851E0, 0x10 + .asciz "LandiaDamage" + .balign 4 .global $$248834 $$248834: - .incbin "baserom.dol", 0x4851F0, 0x10 + .asciz "LandiaDamageEtc" .global $$248835 $$248835: - .incbin "baserom.dol", 0x485200, 0x10 + .asciz "LandiaDeathFall" .global $$248836 $$248836: - .incbin "baserom.dol", 0x485210, 0x18 + .asciz "LandiaCannonChargeStart" .global $$248837 $$248837: - .incbin "baserom.dol", 0x485228, 0x14 + .asciz "LandiaCannonCharge" + .balign 4 .global $$248838 $$248838: - .incbin "baserom.dol", 0x48523C, 0x10 + .asciz "LandiaCannon" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x48524C, 0x14 + .asciz "SpiralDragonStart" + .balign 4 .global $$248840 $$248840: - .incbin "baserom.dol", 0x485260, 0x10 + .asciz "SpiralDragon" + .balign 4 .global $$248841 $$248841: - .incbin "baserom.dol", 0x485270, 0x10 + .asciz "SpiralDragonEnd" .global $$248842 $$248842: - .incbin "baserom.dol", 0x485280, 0x14 + .asciz "SpiralDragonBack" + .balign 4 .global $$248843 $$248843: - .incbin "baserom.dol", 0x485294, 0xC + .asciz "LookAround" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x4852A0, 0xC + .asciz "LookAround2" .global $$248845 $$248845: - .incbin "baserom.dol", 0x4852AC, 0xC + .asciz "LookAround3" .global $$248846 $$248846: - .incbin "baserom.dol", 0x4852B8, 0xC + .asciz "LookUpStart" .global $$248848 $$248848: - .incbin "baserom.dol", 0x4852C4, 0xC + .asciz "LookUpEnd" + .balign 4 .global $$248851 $$248851: - .incbin "baserom.dol", 0x4852D0, 0xC + .asciz "TumbleStart" .global $$248853 $$248853: - .incbin "baserom.dol", 0x4852DC, 0xC + .asciz "TumbleEnd" + .balign 4 .global $$248865 $$248865: - .incbin "baserom.dol", 0x4852E8, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$248866 $$248866: - .incbin "baserom.dol", 0x4852F4, 0xC + .asciz "Control2L" + .balign 4 .global $$248867 $$248867: - .incbin "baserom.dol", 0x485300, 0xC + .asciz "CA4NeckJ" + .balign 4 .global $$248869 $$248869: - .incbin "baserom.dol", 0x48530C, 0xC + .asciz "LD5ThumbJ" + .balign 4 .global $$248872 $$248872: - .incbin "baserom.dol", 0x485318, 0xC + .asciz "CA5HeadJ" + .balign 4 .global $$248874 $$248874: - .incbin "baserom.dol", 0x485324, 0xC + .asciz "Control1L" + .balign 4 .global $$248875 $$248875: - .incbin "baserom.dol", 0x485330, 0xC + .asciz "CA6UpLipJ" + .balign 4 .global $$248877 $$248877: - .incbin "baserom.dol", 0x48533C, 0xC + .asciz "HammerGripJ" .global $$248878 $$248878: - .incbin "baserom.dol", 0x485348, 0xC + .asciz "HammerTopL" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x485354, 0xC + .asciz "HammerheadJ" .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc6DededeFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc6DededeFv$$2NAMES$$20: - .incbin "baserom.dol", 0x485360, 0x78 + .4byte 0x8055ABA8 + .4byte 0x804891E8 + .4byte 0x804891F4 + .4byte 0x80489200 + .4byte 0x8055ABB0 + .4byte 0x8048920C + .4byte 0x80489200 + .4byte 0x80489200 + .4byte 0x8055ABB8 + .4byte 0x8055ABC0 + .4byte 0x80489218 + .4byte 0x804891E8 + .4byte 0x8055ABC8 + .4byte 0x80489224 + .4byte 0x804891F4 + .4byte 0x80489230 + .4byte 0x804891E8 + .4byte 0x8055ABD0 + .4byte 0x8048923C + .4byte 0x80489248 + .4byte 0x8055ABD8 + .4byte 0x8055ABE0 + .4byte 0x80489254 + .4byte 0x8055ABA8 + .4byte 0x8055ABE8 + .4byte 0x8055ABE8 + .4byte 0x8055ABE8 + .4byte 0x8055ABE8 + .4byte 0x8055ABE8 + .4byte 0x8055ABE8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: - .incbin "baserom.dol", 0x496E30, 0x8 + .asciz "Wait" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x496E38, 0x8 + .asciz "Wait2" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x496E40, 0x8 + .asciz "Wait3" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x496E48, 0x8 + .asciz "Wait4" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x496E50, 0x8 + .asciz "Wait5" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x496E58, 0x8 + .asciz "Fall" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x496E60, 0x8 + .asciz "Walk" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x496E68, 0x8 + .asciz "Jump" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x496E70, 0x8 + .asciz "JumpEnd" .global $$248737 $$248737: - .incbin "baserom.dol", 0x496E78, 0x8 + .asciz "Landing" .global $$248739 $$248739: - .incbin "baserom.dol", 0x496E80, 0x8 + .asciz "Squat" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x496E88, 0x8 + .asciz "Sliding" .global $$248746 $$248746: - .incbin "baserom.dol", 0x496E90, 0x8 + .asciz "Flight" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x496E98, 0x8 + .asciz "AirBall" .global $$248751 $$248751: - .incbin "baserom.dol", 0x496EA0, 0x8 + .asciz "DamageL" .global $$248753 $$248753: - .incbin "baserom.dol", 0x496EA8, 0x8 + .asciz "LaderUp" .global $$248755 $$248755: - .incbin "baserom.dol", 0x496EB0, 0x4 + .4byte 0x52756E00 .global $$248763 $$248763: - .incbin "baserom.dol", 0x496EB4, 0x8 + .asciz "Guard" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x496EBC, 0x8 + .asciz "Throw" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x496EC4, 0x4 + .4byte 0x50757400 .global $$248771 $$248771: - .incbin "baserom.dol", 0x496EC8, 0x8 + .asciz "DanceK1" .global $$248772 $$248772: - .incbin "baserom.dol", 0x496ED0, 0x8 + .asciz "DanceK2" .global $$248773 $$248773: - .incbin "baserom.dol", 0x496ED8, 0x8 + .asciz "DanceK3" .global $$248774 $$248774: - .incbin "baserom.dol", 0x496EE0, 0x8 + .asciz "DanceKE" .global $$248777 $$248777: - .incbin "baserom.dol", 0x496EE8, 0x8 + .asciz "DanceA1" .global $$248778 $$248778: - .incbin "baserom.dol", 0x496EF0, 0x8 + .asciz "DanceA2" .global $$248779 $$248779: - .incbin "baserom.dol", 0x496EF8, 0x8 + .asciz "DanceA3" .global $$248780 $$248780: - .incbin "baserom.dol", 0x496F00, 0x8 + .asciz "DanceAE" .global $$248781 $$248781: - .incbin "baserom.dol", 0x496F08, 0x8 + .asciz "DanceT1" .global $$248782 $$248782: - .incbin "baserom.dol", 0x496F10, 0x8 + .asciz "DanceT2" .global $$248783 $$248783: - .incbin "baserom.dol", 0x496F18, 0x8 + .asciz "DanceT3" .global $$248784 $$248784: - .incbin "baserom.dol", 0x496F20, 0x8 + .asciz "DanceTE" .global $$248785 $$248785: - .incbin "baserom.dol", 0x496F28, 0x8 + .asciz "Faint" + .balign 4 .global $$248786 $$248786: - .incbin "baserom.dol", 0x496F30, 0x8 + .asciz "WakeUp" + .balign 4 .global $$248787 $$248787: - .incbin "baserom.dol", 0x496F38, 0x8 + .asciz "Swim" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x496F40, 0x8 + .asciz "Stroke" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x496F48, 0x8 + .asciz "ItemGet" .global $$248799 $$248799: - .incbin "baserom.dol", 0x496F50, 0x8 + .asciz "Dangle" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x496F58, 0x8 + .asciz "Door" + .balign 4 .global $$248814 $$248814: - .incbin "baserom.dol", 0x496F60, 0x8 + .asciz "Lose" + .balign 4 .global $$248847 $$248847: - .incbin "baserom.dol", 0x496F68, 0x8 + .asciz "LookUp" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x496F70, 0x8 + .asciz "WonderR" .global $$248850 $$248850: - .incbin "baserom.dol", 0x496F78, 0x8 + .asciz "WonderL" .global $$248852 $$248852: - .incbin "baserom.dol", 0x496F80, 0x8 + .asciz "Tumble" + .balign 4 .global $$248864 $$248864: - .incbin "baserom.dol", 0x496F88, 0x8 + .asciz "TopL" + .balign 4 .global $$248868 $$248868: - .incbin "baserom.dol", 0x496F90, 0x8 + .asciz "RHaveL" + .balign 4 .global $$248870 $$248870: - .incbin "baserom.dol", 0x496F98, 0x8 + .asciz "LA2ArmJ" .global $$248871 $$248871: - .incbin "baserom.dol", 0x496FA0, 0x8 + .asciz "RA2ArmJ" .global $$248873 $$248873: - .incbin "baserom.dol", 0x496FA8, 0x8 + .asciz "CA1HipJ" .global $$248876 $$248876: - .incbin "baserom.dol", 0x496FB0, 0x8 + .asciz "LHandH" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x496FB8, 0x8 + .asciz "LoadL" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x496FC0, 0x8 + .asciz "HammerM" .global $$248882 $$248882: - .incbin "baserom.dol", 0x496FC8, 0x8 + .asciz "BodyM" + .balign 4 .global $$248972 $$248972: - .incbin "baserom.dol", 0x496FD0, 0x8 + .asciz "Dedede" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2d diff --git a/asm/src/Dee.s b/asm/src/Dee.s index 1982f96a..7d339376 100644 --- a/asm/src/Dee.s +++ b/asm/src/Dee.s @@ -304,475 +304,1525 @@ lbl_8035C0B8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: - .incbin "baserom.dol", 0x418F18, 0xE38 + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055AC00 + .4byte 0x0000000E + .4byte 0x8055AC08 + .4byte 0x0000000E + .4byte 0x8055AC10 + .4byte 0x0000000E + .4byte 0x8055AC18 + .4byte 0x0000000E + .4byte 0x8055AC20 + .4byte 0x0000000E + .4byte 0x8055AC28 + .4byte 0x0000000E + .4byte 0x804892F0 + .4byte 0x0000000E + .4byte 0x8055AC30 + .4byte 0x0000000E + .4byte 0x8055AC38 + .4byte 0x0000000E + .4byte 0x8055AC40 + .4byte 0x0000000E + .4byte 0x804892FC + .4byte 0x0000000E + .4byte 0x8055AC48 + .4byte 0x0000000E + .4byte 0x80489308 + .4byte 0x0000000E + .4byte 0x80489314 + .4byte 0x0000000E + .4byte 0x8055AC50 + .4byte 0x0000000E + .4byte 0x80489324 + .4byte 0x0000000E + .4byte 0x80489330 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AC58 + .4byte 0x0000000E + .4byte 0x8048933C + .4byte 0x0000000E + .4byte 0x80489348 + .4byte 0x0000000E + .4byte 0x80489354 + .4byte 0x0000000E + .4byte 0x8055AC60 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80489360 + .4byte 0x0000000E + .4byte 0x80489370 + .4byte 0x0000000E + .4byte 0x80489380 + .4byte 0x0000000E + .4byte 0x80489390 + .4byte 0x0000000E + .4byte 0x804893A0 + .4byte 0x0000000E + .4byte 0x804893AC + .4byte 0x0000000E + .4byte 0x804893B8 + .4byte 0x0000000E + .4byte 0x804893C4 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AC64 + .4byte 0x0000000E + .4byte 0x804893D0 + .4byte 0x0000000E + .4byte 0x8055AC6C + .4byte 0x0000000E + .4byte 0x804893DC + .4byte 0x0000000E + .4byte 0x804893E8 + .4byte 0x0000000E + .4byte 0x8055AC74 + .4byte 0x0000000E + .4byte 0x804893F4 + .4byte 0x0000000E + .4byte 0x8055AC7C + .4byte 0x0000000E + .4byte 0x80489400 + .4byte 0x0000000E + .4byte 0x80489418 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AC80 + .4byte 0x0000000E + .4byte 0x8055AC88 + .4byte 0x0000000E + .4byte 0x8055AC90 + .4byte 0x0000000E + .4byte 0x8055AC98 + .4byte 0x0000000E + .4byte 0x8048942C + .4byte 0x0000000E + .4byte 0x80489438 + .4byte 0x0000000E + .4byte 0x8055ACA0 + .4byte 0x0000000E + .4byte 0x8055ACA8 + .4byte 0x0000000E + .4byte 0x8055ACB0 + .4byte 0x0000000E + .4byte 0x8055ACB8 + .4byte 0x0000000E + .4byte 0x8055ACC0 + .4byte 0x0000000E + .4byte 0x8055ACC8 + .4byte 0x0000000E + .4byte 0x8055ACD0 + .4byte 0x0000000E + .4byte 0x8055ACD8 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055AC20 + .4byte 0x0000000E + .4byte 0x8055ACE0 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0x8055ACE8 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0x8055ACF0 + .4byte 0x0000000E + .4byte 0x8055ACF8 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80489444 + .4byte 0x0000000E + .4byte 0x80489450 + .4byte 0x0000000E + .4byte 0x8048945C + .4byte 0x0000000E + .4byte 0x8055AC30 + .4byte 0x0000000E + .4byte 0x8055AD00 + .4byte 0x0000000E + .4byte 0x80489468 + .4byte 0x0000000E + .4byte 0x80489474 + .4byte 0x0000000E + .4byte 0x80489488 + .4byte 0x0000000E + .4byte 0x80489498 + .4byte 0x0000000E + .4byte 0x804894A4 + .4byte 0x0000000E + .4byte 0x804894B4 + .4byte 0x0000000E + .4byte 0x8055AD08 + .4byte 0x0000000E + .4byte 0x8055AD08 + .4byte 0x0000000E + .4byte 0x8055AD08 + .4byte 0x0000000E + .4byte 0x804894C4 + .4byte 0x0000000E + .4byte 0x804894D0 + .4byte 0x0000000E + .4byte 0x804894E0 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x804894F0 + .4byte 0x0000000E + .4byte 0x80489348 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x804894FC + .4byte 0x0000000E + .4byte 0x8048950C + .4byte 0x0000000E + .4byte 0x80489520 + .4byte 0x0000000E + .4byte 0x80489530 + .4byte 0x0000000E + .4byte 0x80489548 + .4byte 0x0000000E + .4byte 0x8055AD10 + .4byte 0x0000000E + .4byte 0x80489554 + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80489560 + .4byte 0x0000000E + .4byte 0x80489574 + .4byte 0x0000000E + .4byte 0x80489588 + .4byte 0x0000000E + .4byte 0x80489598 + .4byte 0x0000000E + .4byte 0x804895AC + .4byte 0x0000000E + .4byte 0x804895C0 + .4byte 0x0000000E + .4byte 0x804895D4 + .4byte 0x0000000E + .4byte 0x804895E8 + .4byte 0x0000000E + .4byte 0x804895F8 + .4byte 0x0000000E + .4byte 0x8048960C + .4byte 0x0000000E + .4byte 0x80489620 + .4byte 0x0000000E + .4byte 0x80489634 + .4byte 0x0000000E + .4byte 0x8048964C + .4byte 0x0000000E + .4byte 0x80489664 + .4byte 0x0000000E + .4byte 0x80489678 + .4byte 0x0000000E + .4byte 0x80489690 + .4byte 0x0000000E + .4byte 0x804896A4 + .4byte 0x0000000E + .4byte 0x804896B8 + .4byte 0x0000000E + .4byte 0x804896D0 + .4byte 0x0000000E + .4byte 0x804896E4 + .4byte 0x0000000E + .4byte 0x804896F8 + .4byte 0x0000000E + .4byte 0x80489708 + .4byte 0x0000000E + .4byte 0x80489718 + .4byte 0x0000000E + .4byte 0x80489730 + .4byte 0x0000000E + .4byte 0x8048974C + .4byte 0x0000000E + .4byte 0x8048976C + .4byte 0x0000000E + .4byte 0x80489788 + .4byte 0x0000000E + .4byte 0x804897A0 + .4byte 0x0000000E + .4byte 0x8055AD18 + .4byte 0x0000000E + .4byte 0x804897BC + .4byte 0x0000000E + .4byte 0x804897D0 + .4byte 0x0000000E + .4byte 0x804897E0 + .4byte 0x0000000E + .4byte 0x804897F0 + .4byte 0x0000000E + .4byte 0x80489800 + .4byte 0x0000000E + .4byte 0x80489818 + .4byte 0x0000000E + .4byte 0x8048982C + .4byte 0x0000000E + .4byte 0x8048983C + .4byte 0x0000000E + .4byte 0x80489850 + .4byte 0x0000000E + .4byte 0x80489860 + .4byte 0x0000000E + .4byte 0x80489870 + .4byte 0x0000000E + .4byte 0x80489884 + .4byte 0x0000000E + .4byte 0x80489890 + .4byte 0x0000000E + .4byte 0x8048989C + .4byte 0x0000000E + .4byte 0x804898A8 + .4byte 0x0000000E + .4byte 0x8055AD20 + .4byte 0x0000000E + .4byte 0x804898B4 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055ABF8 + .4byte 0x0000000E + .4byte 0x8055AD28 + .4byte 0x0000000E + .4byte 0x8055AD30 + .4byte 0x0000000E + .4byte 0x804898C0 + .4byte 0x0000000E + .4byte 0x8055AD38 + .4byte 0x0000000E + .4byte 0x804898CC + .4byte 0x0000000E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249987 $$249987: - .incbin "baserom.dol", 0x4853D8, 0x18 + .asciz "step/hero/modeldesc/Dee" .global $$249534 $$249534: - .incbin "baserom.dol", 0x4853F0, 0xC + .asciz "JumpStart" + .balign 4 .global $$249538 $$249538: - .incbin "baserom.dol", 0x4853FC, 0xC + .asciz "SquatStart" + .balign 4 .global $$249540 $$249540: - .incbin "baserom.dol", 0x485408, 0xC + .asciz "SquatEnd" + .balign 4 .global $$249541 $$249541: - .incbin "baserom.dol", 0x485414, 0x10 + .asciz "SlidingStart" + .balign 4 .global $$249543 $$249543: - .incbin "baserom.dol", 0x485424, 0xC + .asciz "SlidingEnd" + .balign 4 .global $$249544 $$249544: - .incbin "baserom.dol", 0x485430, 0xC + .asciz "SlidingHit" + .balign 4 .global $$249546 $$249546: - .incbin "baserom.dol", 0x48543C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$249547 $$249547: - .incbin "baserom.dol", 0x485448, 0xC + .asciz "LadderUp" + .balign 4 .global $$249548 $$249548: - .incbin "baserom.dol", 0x485454, 0xC + .asciz "LadderDown" + .balign 4 .global $$249550 $$249550: - .incbin "baserom.dol", 0x485460, 0x10 + .asciz "PlancherStart" + .balign 4 .global $$249551 $$249551: - .incbin "baserom.dol", 0x485470, 0x10 + .asciz "Plancher" + .balign 4 + .4byte 0 .global $$249552 $$249552: - .incbin "baserom.dol", 0x485480, 0x10 + .asciz "PlancherLanding" .global $$249553 $$249553: - .incbin "baserom.dol", 0x485490, 0x10 + .asciz "PlancherBound" + .balign 4 .global $$249554 $$249554: - .incbin "baserom.dol", 0x4854A0, 0xC + .asciz "SquashRoof" + .balign 4 .global $$249555 $$249555: - .incbin "baserom.dol", 0x4854AC, 0xC + .asciz "SquashWall" + .balign 4 .global $$249556 $$249556: - .incbin "baserom.dol", 0x4854B8, 0xC + .asciz "DeadFall" + .balign 4 .global $$249557 $$249557: - .incbin "baserom.dol", 0x4854C4, 0xC + .asciz "DyingWait" + .balign 4 .global $$249559 $$249559: - .incbin "baserom.dol", 0x4854D0, 0xC + .asciz "LGuardEnd" + .balign 4 .global $$249561 $$249561: - .incbin "baserom.dol", 0x4854DC, 0xC + .asciz "RGuardEnd" + .balign 4 .global $$249562 $$249562: - .incbin "baserom.dol", 0x4854E8, 0xC + .asciz "HaveTwoHand" .global $$249564 $$249564: - .incbin "baserom.dol", 0x4854F4, 0xC + .asciz "AirThrow" + .balign 4 .global $$249566 $$249566: - .incbin "baserom.dol", 0x485500, 0x18 + .asciz "WarpStarDemoRideStart" + .balign 4 .global $$249567 $$249567: - .incbin "baserom.dol", 0x485518, 0x14 + .asciz "WarpStarDemoRide" + .balign 4 .global $$249572 $$249572: - .incbin "baserom.dol", 0x48552C, 0xC + .asciz "DanceAEL" + .balign 4 .global $$249573 $$249573: - .incbin "baserom.dol", 0x485538, 0xC + .asciz "DanceAER" + .balign 4 .global $$249586 $$249586: - .incbin "baserom.dol", 0x485544, 0xC + .asciz "FloatWait" + .balign 4 .global $$249587 $$249587: - .incbin "baserom.dol", 0x485550, 0xC + .asciz "FloatMove" + .balign 4 .global $$249588 $$249588: - .incbin "baserom.dol", 0x48555C, 0xC + .asciz "Piggyback" + .balign 4 .global $$249590 $$249590: - .incbin "baserom.dol", 0x485568, 0xC + .asciz "ItemGetWait" .global $$249591 $$249591: - .incbin "baserom.dol", 0x485574, 0x14 + .asciz "ItemGetWaitStart" + .balign 4 .global $$249592 $$249592: - .incbin "baserom.dol", 0x485588, 0x10 + .asciz "ItemGetWaitEnd" + .balign 4 .global $$249593 $$249593: - .incbin "baserom.dol", 0x485598, 0xC + .asciz "CannonWait" + .balign 4 .global $$249594 $$249594: - .incbin "baserom.dol", 0x4855A4, 0x10 + .asciz "CannonWaitHide" + .balign 4 .global $$249595 $$249595: - .incbin "baserom.dol", 0x4855B4, 0x10 + .asciz "CannonWaitShow" + .balign 4 .global $$249597 $$249597: - .incbin "baserom.dol", 0x4855C4, 0xC + .asciz "DangleMoveR" .global $$249598 $$249598: - .incbin "baserom.dol", 0x4855D0, 0x10 + .asciz "DangleMoveL" + .4byte 0 .global $$249599 $$249599: - .incbin "baserom.dol", 0x4855E0, 0x10 + .asciz "CarryBombDanger" .global $$249600 $$249600: - .incbin "baserom.dol", 0x4855F0, 0xC + .asciz "Listening" + .balign 4 .global $$249601 $$249601: - .incbin "baserom.dol", 0x4855FC, 0x10 + .asciz "VictoryStand" + .balign 4 .global $$249602 $$249602: - .incbin "baserom.dol", 0x48560C, 0x14 + .asciz "VictoryStandStart" + .balign 4 .global $$249603 $$249603: - .incbin "baserom.dol", 0x485620, 0x10 + .asciz "VictoryStandCup" .global $$249604 $$249604: - .incbin "baserom.dol", 0x485630, 0x18 + .asciz "VictoryStandCupStart" + .balign 4 .global $$249605 $$249605: - .incbin "baserom.dol", 0x485648, 0xC + .asciz "Struggle" + .balign 4 .global $$249607 $$249607: - .incbin "baserom.dol", 0x485654, 0xC + .asciz "LoseStart" + .balign 4 .global $$249608 $$249608: - .incbin "baserom.dol", 0x485660, 0x14 + .asciz "SpearAttackFront" + .balign 4 .global $$249609 $$249609: - .incbin "baserom.dol", 0x485674, 0x14 + .asciz "SpearAttackFrontEnd" .global $$249610 $$249610: - .incbin "baserom.dol", 0x485688, 0x10 + .asciz "SpearAttackBack" .global $$249611 $$249611: - .incbin "baserom.dol", 0x485698, 0x14 + .asciz "SpearAttackBackEnd" + .balign 4 .global $$249612 $$249612: - .incbin "baserom.dol", 0x4856AC, 0x14 + .asciz "SpearAttackUpper" + .balign 4 .global $$249613 $$249613: - .incbin "baserom.dol", 0x4856C0, 0x14 + .asciz "SpearAttackUpperEnd" .global $$249614 $$249614: - .incbin "baserom.dol", 0x4856D4, 0x14 + .asciz "SpearAttackLowStart" .global $$249615 $$249615: - .incbin "baserom.dol", 0x4856E8, 0x10 + .asciz "SpearAttackLow" + .balign 4 .global $$249616 $$249616: - .incbin "baserom.dol", 0x4856F8, 0x14 + .asciz "SpearAttackLowEndL" + .balign 4 .global $$249617 $$249617: - .incbin "baserom.dol", 0x48570C, 0x14 + .asciz "SpearAttackLowEndR" + .balign 4 .global $$249618 $$249618: - .incbin "baserom.dol", 0x485720, 0x14 + .asciz "DashSpearShooting" + .balign 4 .global $$249619 $$249619: - .incbin "baserom.dol", 0x485734, 0x18 + .asciz "DashSpearShootingEnd" + .balign 4 .global $$249620 $$249620: - .incbin "baserom.dol", 0x48574C, 0x18 + .asciz "ContinuousAttackStart" + .balign 4 .global $$249621 $$249621: - .incbin "baserom.dol", 0x485764, 0x14 + .asciz "ContinuousAttack" + .balign 4 .global $$249622 $$249622: - .incbin "baserom.dol", 0x485778, 0x18 + .asciz "HorizontalAttackStart" + .balign 4 .global $$249623 $$249623: - .incbin "baserom.dol", 0x485790, 0x14 + .asciz "HorizontalAttack" + .balign 4 .global $$249624 $$249624: - .incbin "baserom.dol", 0x4857A4, 0x14 + .asciz "HorizontalAttackEnd" .global $$249625 $$249625: - .incbin "baserom.dol", 0x4857B8, 0x18 + .asciz "SpearCopterChargeStart" + .balign 4 .global $$249626 $$249626: - .incbin "baserom.dol", 0x4857D0, 0x14 + .asciz "SpearCopterCharge" + .balign 4 .global $$249627 $$249627: - .incbin "baserom.dol", 0x4857E4, 0x14 + .asciz "SpearCopterUpStart" + .balign 4 .global $$249628 $$249628: - .incbin "baserom.dol", 0x4857F8, 0x10 + .asciz "SpearCopterUp" + .balign 4 .global $$249629 $$249629: - .incbin "baserom.dol", 0x485808, 0x10 + .asciz "SpearCopterDown" .global $$249630 $$249630: - .incbin "baserom.dol", 0x485818, 0x18 + .asciz "ContinuousFinelyAttack" + .balign 4 .global $$249631 $$249631: - .incbin "baserom.dol", 0x485830, 0x1C + .asciz "ContinuousFinelyAttackEnd" + .balign 4 .global $$249632 $$249632: - .incbin "baserom.dol", 0x48584C, 0x20 + .asciz "DashSpearTripleShootingCharge" + .balign 4 .global $$249633 $$249633: - .incbin "baserom.dol", 0x48586C, 0x1C + .asciz "TripleShootingChargeWalk" + .balign 4 .global $$249634 $$249634: - .incbin "baserom.dol", 0x485888, 0x18 + .asciz "DashSpearTripleShooting" .global $$249635 $$249635: - .incbin "baserom.dol", 0x4858A0, 0x1C + .asciz "DashSpearTripleShootingEnd" + .balign 4 .global $$249637 $$249637: - .incbin "baserom.dol", 0x4858BC, 0x14 + .asciz "LandiaFlightWait" + .balign 4 .global $$249638 $$249638: - .incbin "baserom.dol", 0x4858D0, 0x10 + .asciz "LandiaDamage" + .balign 4 .global $$249639 $$249639: - .incbin "baserom.dol", 0x4858E0, 0x10 + .asciz "LandiaDamageEtc" .global $$249640 $$249640: - .incbin "baserom.dol", 0x4858F0, 0x10 + .asciz "LandiaDeathFall" .global $$249641 $$249641: - .incbin "baserom.dol", 0x485900, 0x18 + .asciz "LandiaCannonChargeStart" .global $$249642 $$249642: - .incbin "baserom.dol", 0x485918, 0x14 + .asciz "LandiaCannonCharge" + .balign 4 .global $$249643 $$249643: - .incbin "baserom.dol", 0x48592C, 0x10 + .asciz "LandiaCannon" + .balign 4 .global $$249644 $$249644: - .incbin "baserom.dol", 0x48593C, 0x14 + .asciz "SpiralDragonStart" + .balign 4 .global $$249645 $$249645: - .incbin "baserom.dol", 0x485950, 0x10 + .asciz "SpiralDragon" + .balign 4 .global $$249646 $$249646: - .incbin "baserom.dol", 0x485960, 0x10 + .asciz "SpiralDragonEnd" .global $$249647 $$249647: - .incbin "baserom.dol", 0x485970, 0x14 + .asciz "SpiralDragonBack" + .balign 4 .global $$249648 $$249648: - .incbin "baserom.dol", 0x485984, 0xC + .asciz "LookAround" + .balign 4 .global $$249649 $$249649: - .incbin "baserom.dol", 0x485990, 0xC + .asciz "LookAround2" .global $$249650 $$249650: - .incbin "baserom.dol", 0x48599C, 0xC + .asciz "LookAround3" .global $$249651 $$249651: - .incbin "baserom.dol", 0x4859A8, 0xC + .asciz "LookUpStart" .global $$249653 $$249653: - .incbin "baserom.dol", 0x4859B4, 0xC + .asciz "LookUpEnd" + .balign 4 .global $$249656 $$249656: - .incbin "baserom.dol", 0x4859C0, 0xC + .asciz "TumbleStart" .global $$249658 $$249658: - .incbin "baserom.dol", 0x4859CC, 0xC + .asciz "TumbleEnd" + .balign 4 .global $$249670 $$249670: - .incbin "baserom.dol", 0x4859D8, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$249671 $$249671: - .incbin "baserom.dol", 0x4859E4, 0xC + .asciz "Control2L" + .balign 4 .global $$249675 $$249675: - .incbin "baserom.dol", 0x4859F0, 0xC + .asciz "CA4FaceJ" + .balign 4 .global $$249676 $$249676: - .incbin "baserom.dol", 0x4859FC, 0x10 + .asciz "LA1ShoulderJ" + .balign 4 .global $$249677 $$249677: - .incbin "baserom.dol", 0x485A0C, 0x14 + .asciz "RA1ShoulderJ" + .balign 4 + .4byte 0 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc3DeeFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc3DeeFv$$2NAMES$$20: - .incbin "baserom.dol", 0x485A20, 0x78 + .4byte 0x8055AD40 + .4byte 0x804898D8 + .4byte 0x804898E4 + .4byte 0x8055AD48 + .4byte 0x8055AD50 + .4byte 0x8055AD58 + .4byte 0x804898F0 + .4byte 0x804898F0 + .4byte 0x804898FC + .4byte 0x8048990C + .4byte 0x804898F0 + .4byte 0x804898D8 + .4byte 0x8055AD60 + .4byte 0x8055AD68 + .4byte 0x8055AD70 + .4byte 0x804898F0 + .4byte 0x804898F0 + .4byte 0x8055AD78 + .4byte 0x8055AD80 + .4byte 0x8055AD50 + .4byte 0x8055AD88 + .4byte 0x8055AD40 + .4byte 0x8055AD40 + .4byte 0x8055AD90 + .4byte 0x8055AD98 + .4byte 0x8055AD98 + .4byte 0x8055AD98 + .4byte 0x8055AD98 + .4byte 0x8055AD98 + .4byte 0x8055AD98 .global $$250026 $$250026: - .incbin "baserom.dol", 0x485A98, 0x10 + .asciz "Ribbon1DJ" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249527 $$249527: - .incbin "baserom.dol", 0x496FD8, 0x8 + .asciz "Wait" + .balign 4 .global $$249528 $$249528: - .incbin "baserom.dol", 0x496FE0, 0x8 + .asciz "Wait2" + .balign 4 .global $$249529 $$249529: - .incbin "baserom.dol", 0x496FE8, 0x8 + .asciz "Wait3" + .balign 4 .global $$249530 $$249530: - .incbin "baserom.dol", 0x496FF0, 0x8 + .asciz "Wait4" + .balign 4 .global $$249531 $$249531: - .incbin "baserom.dol", 0x496FF8, 0x8 + .asciz "Wait5" + .balign 4 .global $$249532 $$249532: - .incbin "baserom.dol", 0x497000, 0x8 + .asciz "Fall" + .balign 4 .global $$249533 $$249533: - .incbin "baserom.dol", 0x497008, 0x8 + .asciz "Walk" + .balign 4 .global $$249535 $$249535: - .incbin "baserom.dol", 0x497010, 0x8 + .asciz "Jump" + .balign 4 .global $$249536 $$249536: - .incbin "baserom.dol", 0x497018, 0x8 + .asciz "JumpEnd" .global $$249537 $$249537: - .incbin "baserom.dol", 0x497020, 0x8 + .asciz "Landing" .global $$249539 $$249539: - .incbin "baserom.dol", 0x497028, 0x8 + .asciz "Squat" + .balign 4 .global $$249542 $$249542: - .incbin "baserom.dol", 0x497030, 0x8 + .asciz "Sliding" .global $$249545 $$249545: - .incbin "baserom.dol", 0x497038, 0x8 + .asciz "Damage" + .balign 4 .global $$249549 $$249549: - .incbin "baserom.dol", 0x497040, 0x4 + .4byte 0x52756E00 .global $$249558 $$249558: - .incbin "baserom.dol", 0x497044, 0x8 + .asciz "LGuard" + .balign 4 .global $$249560 $$249560: - .incbin "baserom.dol", 0x49704C, 0x8 + .asciz "RGuard" + .balign 4 .global $$249563 $$249563: - .incbin "baserom.dol", 0x497054, 0x8 + .asciz "Throw" + .balign 4 .global $$249565 $$249565: - .incbin "baserom.dol", 0x49705C, 0x4 + .4byte 0x50757400 .global $$249568 $$249568: - .incbin "baserom.dol", 0x497060, 0x8 + .asciz "DanceK1" .global $$249569 $$249569: - .incbin "baserom.dol", 0x497068, 0x8 + .asciz "DanceK2" .global $$249570 $$249570: - .incbin "baserom.dol", 0x497070, 0x8 + .asciz "DanceK3" .global $$249571 $$249571: - .incbin "baserom.dol", 0x497078, 0x8 + .asciz "DanceKE" .global $$249574 $$249574: - .incbin "baserom.dol", 0x497080, 0x8 + .asciz "DanceA1" .global $$249575 $$249575: - .incbin "baserom.dol", 0x497088, 0x8 + .asciz "DanceA2" .global $$249576 $$249576: - .incbin "baserom.dol", 0x497090, 0x8 + .asciz "DanceA3" .global $$249577 $$249577: - .incbin "baserom.dol", 0x497098, 0x8 + .asciz "DanceAE" .global $$249578 $$249578: - .incbin "baserom.dol", 0x4970A0, 0x8 + .asciz "DanceT1" .global $$249579 $$249579: - .incbin "baserom.dol", 0x4970A8, 0x8 + .asciz "DanceT2" .global $$249580 $$249580: - .incbin "baserom.dol", 0x4970B0, 0x8 + .asciz "DanceT3" .global $$249581 $$249581: - .incbin "baserom.dol", 0x4970B8, 0x8 + .asciz "DanceTE" .global $$249582 $$249582: - .incbin "baserom.dol", 0x4970C0, 0x8 + .asciz "Faint" + .balign 4 .global $$249583 $$249583: - .incbin "baserom.dol", 0x4970C8, 0x8 + .asciz "WakeUp" + .balign 4 .global $$249584 $$249584: - .incbin "baserom.dol", 0x4970D0, 0x8 + .asciz "Swim" + .balign 4 .global $$249585 $$249585: - .incbin "baserom.dol", 0x4970D8, 0x8 + .asciz "Stroke" + .balign 4 .global $$249589 $$249589: - .incbin "baserom.dol", 0x4970E0, 0x8 + .asciz "ItemGet" .global $$249596 $$249596: - .incbin "baserom.dol", 0x4970E8, 0x8 + .asciz "Dangle" + .balign 4 .global $$249606 $$249606: - .incbin "baserom.dol", 0x4970F0, 0x8 + .asciz "Lose" + .balign 4 .global $$249636 $$249636: - .incbin "baserom.dol", 0x4970F8, 0x8 + .asciz "Copter" + .balign 4 .global $$249652 $$249652: - .incbin "baserom.dol", 0x497100, 0x8 + .asciz "LookUp" + .balign 4 .global $$249654 $$249654: - .incbin "baserom.dol", 0x497108, 0x8 + .asciz "WonderR" .global $$249655 $$249655: - .incbin "baserom.dol", 0x497110, 0x8 + .asciz "WonderL" .global $$249657 $$249657: - .incbin "baserom.dol", 0x497118, 0x8 + .asciz "Tumble" + .balign 4 .global $$249669 $$249669: - .incbin "baserom.dol", 0x497120, 0x8 + .asciz "TopL" + .balign 4 .global $$249672 $$249672: - .incbin "baserom.dol", 0x497128, 0x8 + .asciz "HatL" + .balign 4 .global $$249673 $$249673: - .incbin "baserom.dol", 0x497130, 0x8 + .asciz "RHaveL" + .balign 4 .global $$249674 $$249674: - .incbin "baserom.dol", 0x497138, 0x8 + .asciz "LHaveL" + .balign 4 .global $$249678 $$249678: - .incbin "baserom.dol", 0x497140, 0x8 + .asciz "CA1HipJ" .global $$249679 $$249679: - .incbin "baserom.dol", 0x497148, 0x8 + .asciz "Rot1L" + .balign 4 .global $$249680 $$249680: - .incbin "baserom.dol", 0x497150, 0x8 + .asciz "Rot2L" + .balign 4 .global $$249681 $$249681: - .incbin "baserom.dol", 0x497158, 0x8 + .asciz "ThrowL" + .balign 4 .global $$249682 $$249682: - .incbin "baserom.dol", 0x497160, 0x8 + .asciz "Spear1J" .global $$249683 $$249683: - .incbin "baserom.dol", 0x497168, 0x8 + .asciz "LoadL" + .balign 4 .global $$249684 $$249684: - .incbin "baserom.dol", 0x497170, 0x8 + .asciz "EdgeL" + .balign 4 .global $$249685 $$249685: - .incbin "baserom.dol", 0x497178, 0x8 + .asciz "DeeM" + .balign 4 .global $$250011 $$250011: - .incbin "baserom.dol", 0x497180, 0x8 + .4byte 0x44656500 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250025 $$250025: - .incbin "baserom.dol", 0x49DAE0, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2d diff --git a/asm/src/Delete.s b/asm/src/Delete.s index e1f20558..139094b5 100644 --- a/asm/src/Delete.s +++ b/asm/src/Delete.s @@ -125,30 +125,46 @@ lbl_801E334C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251963 $$251963: - .incbin "baserom.dol", 0x45A068, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$251965 $$251965: - .incbin "baserom.dol", 0x45A084, 0xC + .asciz "DeleteFile" + .balign 4 .global $$252004 $$252004: - .incbin "baserom.dol", 0x45A090, 0xC + .asciz "OpenSmall" + .balign 4 .global __vt__Q33scn19challengefileselect6Delete __vt__Q33scn19challengefileselect6Delete: - .incbin "baserom.dol", 0x45A09C, 0x2C + .4byte 0 + .4byte 0 + .4byte 0x801E32FC ;# ptr + .4byte 0x801E32A8 ;# ptr + .4byte 0x801E32AC ;# ptr + .4byte 0x801E32BC ;# ptr + .4byte 0x801E32C8 ;# ptr + .4byte 0x801E32D4 ;# ptr + .4byte 0x801E32E0 ;# ptr + .4byte 0x801E32E8 ;# ptr + .4byte 0x801E32F0 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 $$251964: - .incbin "baserom.dol", 0x493E50, 0x8 + .asciz "Delete" + .balign 4 .global $$252007 $$252007: - .incbin "baserom.dol", 0x493E58, 0x8 + .asciz "Focus" + .balign 4 .global $$252010 $$252010: - .incbin "baserom.dol", 0x493E60, 0x8 + .asciz "UnFocus" .global $$252013 $$252013: - .incbin "baserom.dol", 0x493E68, 0x8 + .asciz "Decide" + .balign 4 .global $$252019 $$252019: - .incbin "baserom.dol", 0x493E70, 0x8 + .asciz "CursorN" diff --git a/asm/src/DeleteConfirm.s b/asm/src/DeleteConfirm.s index 5a9bc652..91aed5ce 100644 --- a/asm/src/DeleteConfirm.s +++ b/asm/src/DeleteConfirm.s @@ -460,54 +460,72 @@ lbl_801E39D0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252625 $$252625: - .incbin "baserom.dol", 0x45A0C8, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$252626 $$252626: - .incbin "baserom.dol", 0x45A0E4, 0x14 + .asciz "DeleteConfirmWindow" .global $$252627 $$252627: - .incbin "baserom.dol", 0x45A0F8, 0xC + .asciz "Button01N" + .balign 4 .global $$252628 $$252628: - .incbin "baserom.dol", 0x45A104, 0xC + .asciz "Button02N" + .balign 4 .global $$252690 $$252690: - .incbin "baserom.dol", 0x45A110, 0x10 + .asciz "ConfirmTitle" + .balign 4 .global $$252691 $$252691: - .incbin "baserom.dol", 0x45A120, 0xC + .asciz "CautionN" + .balign 4 .global $$252692 $$252692: - .incbin "baserom.dol", 0x45A12C, 0xC + .asciz "ConfirmYes" + .balign 4 .global $$252693 $$252693: - .incbin "baserom.dol", 0x45A138, 0xC + .asciz "ConfirmNo" + .balign 4 .global $$252696 $$252696: - .incbin "baserom.dol", 0x45A144, 0x10 + .asciz "ReConfirmTitle" + .balign 4 .global $$252697 $$252697: - .incbin "baserom.dol", 0x45A154, 0x10 + .asciz "ReConfirmYes" + .balign 4 .global $$252698 $$252698: - .incbin "baserom.dol", 0x45A164, 0xC + .asciz "ReConfirmNo" .global $$252701 $$252701: - .incbin "baserom.dol", 0x45A170, 0x18 + .asciz "FinalConfirmTitle" + .balign 4 + .4byte 0 .global $$252702 $$252702: - .incbin "baserom.dol", 0x45A188, 0x10 + .asciz "FinalConfirmYes" .global $$252703 $$252703: - .incbin "baserom.dol", 0x45A198, 0x40 + .asciz "FinalConfirmNo" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252689 $$252689: - .incbin "baserom.dol", 0x493E78, 0x8 + .asciz "Confirm" .global $$252708 $$252708: - .incbin "baserom.dol", 0x493E80, 0x8 + .asciz "Open" + .balign 4 .global $$252711 $$252711: - .incbin "baserom.dol", 0x493E88, 0x8 + .asciz "Close" + .balign 4 diff --git a/asm/src/Demo.s b/asm/src/Demo.s index 174df29f..ddb05f0a 100644 --- a/asm/src/Demo.s +++ b/asm/src/Demo.s @@ -130,12 +130,21 @@ unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick11areamapdemo4Demo __vt__Q53scn4step7gimmick11areamapdemo4Demo: - .incbin "baserom.dol", 0x47B618, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FAD8C + .4byte 0x802FAE04 + .4byte 0x802FAE08 + .4byte 0 + .4byte 0 + .4byte 0x802F9A60 + .4byte 0x802F9A94 + .4byte 0x802FAE90 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252595 $$252595: - .incbin "baserom.dol", 0x49D140, 0x4 + .4byte 0x41100000 .global $$252596 $$252596: - .incbin "baserom.dol", 0x49D144, 0x4 + .4byte 0x41800000 diff --git a/asm/src/DemoAllStageClear.s b/asm/src/DemoAllStageClear.s index 1e5825e0..46d6d31f 100644 --- a/asm/src/DemoAllStageClear.s +++ b/asm/src/DemoAllStageClear.s @@ -265,21 +265,32 @@ mfGetBasePos__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257907 $$257907: - .incbin "baserom.dol", 0x47B640, 0x38 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.AllStageClear" + .balign 4 + .4byte 0 .global __vt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClear __vt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClear: - .incbin "baserom.dol", 0x47B678, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FAFA0 + .4byte 0x802FAE04 + .4byte 0x802FAE08 + .4byte 0x802FB00C + .4byte 0x802FB09C + .4byte 0x802F9A60 + .4byte 0x802F9A94 + .4byte 0x802FAE90 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257905 $$257905: - .incbin "baserom.dol", 0x49D148, 0x4 + .4byte 0x41080000 .global $$257906 $$257906: - .incbin "baserom.dol", 0x49D14C, 0x4 + .4byte 0 .global $$257936 $$257936: - .incbin "baserom.dol", 0x49D150, 0x4 + .4byte 0x40C00000 .global $$257937 $$257937: - .incbin "baserom.dol", 0x49D154, 0x4 + .4byte 0x3E4CCCCD diff --git a/asm/src/DemoAppearWarpStar.s b/asm/src/DemoAppearWarpStar.s index 155a095c..f6528a71 100644 --- a/asm/src/DemoAppearWarpStar.s +++ b/asm/src/DemoAppearWarpStar.s @@ -281,21 +281,32 @@ endCameraMove__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFif: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256147 $$256147: - .incbin "baserom.dol", 0x47B6A0, 0x38 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.AppearWarpStar" + .balign 4 + .4byte 0 .global __vt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStar __vt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStar: - .incbin "baserom.dol", 0x47B6D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FB2AC + .4byte 0x802FAE04 + .4byte 0x802FB308 + .4byte 0x802FB3B0 + .4byte 0x802FB3C0 + .4byte 0x802FB3EC + .4byte 0x802FB3FC + .4byte 0x802FAE90 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256125 $$256125: - .incbin "baserom.dol", 0x49D158, 0x4 + .4byte 0 .global $$256141 $$256141: - .incbin "baserom.dol", 0x49D15C, 0x4 + .4byte 0x40400000 .global $$256142 $$256142: - .incbin "baserom.dol", 0x49D160, 0x4 + .4byte 0x40000000 .global $$256183 $$256183: - .incbin "baserom.dol", 0x49D164, 0x4 + .4byte 0x41380000 diff --git a/asm/src/DemoChangeGrade.s b/asm/src/DemoChangeGrade.s index e0222215..aeaf8302 100644 --- a/asm/src/DemoChangeGrade.s +++ b/asm/src/DemoChangeGrade.s @@ -678,62 +678,89 @@ lbl_802FBF78: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257294 $$257294: - .incbin "baserom.dol", 0x47B700, 0x24 + .asciz "challengefileselect/Coppertrophy" + .balign 4 .global $$257295 $$257295: - .incbin "baserom.dol", 0x47B724, 0x24 + .asciz "challengefileselect/Silvertrophy" + .balign 4 .global $$257296 $$257296: - .incbin "baserom.dol", 0x47B748, 0x20 + .asciz "challengefileselect/Goldtrophy" + .balign 4 .global $$257297 $$257297: - .incbin "baserom.dol", 0x47B768, 0x24 + .asciz "challengefileselect/Platinumtrophy" + .balign 4 .global $$257298 $$257298: - .incbin "baserom.dol", 0x47B78C, 0x24 + .asciz "challengefileselect/Kingtrophy" + .balign 4 + .4byte 0 .global t_TrophyResFileName__29$$2unnamed$$2DemoChangeGrade_cpp$$2 t_TrophyResFileName__29$$2unnamed$$2DemoChangeGrade_cpp$$2: - .incbin "baserom.dol", 0x47B7B0, 0x18 + .4byte 0x8055A4F8 + .4byte 0x8047F600 + .4byte 0x8047F624 + .4byte 0x8047F648 + .4byte 0x8047F668 + .4byte 0x8047F68C .global $$258717 $$258717: - .incbin "baserom.dol", 0x47B7C8, 0x20 + .asciz "challengefileselect/Trophyanime" .global $$258843 $$258843: - .incbin "baserom.dol", 0x47B7E8, 0x30 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.ChangeGrade" .global $$258879 $$258879: - .incbin "baserom.dol", 0x47B818, 0x10 + .asciz "Disappear" + .balign 4 + .4byte 0 .global __vt__Q53scn4step7gimmick11areamapdemo15DemoChangeGrade __vt__Q53scn4step7gimmick11areamapdemo15DemoChangeGrade: - .incbin "baserom.dol", 0x47B828, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FB848 + .4byte 0x802FB8CC + .4byte 0x802FB904 + .4byte 0x802FB9F4 + .4byte 0x802FBA84 + .4byte 0x802F9A60 + .4byte 0x802F9A94 + .4byte 0x802FAE90 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257293 $$257293: - .incbin "baserom.dol", 0x4968D8, 0x4 + .4byte 0 .global $$258869 $$258869: - .incbin "baserom.dol", 0x4968DC, 0x8 + .asciz "Wait" + .balign 4 .global $$258870 $$258870: - .incbin "baserom.dol", 0x4968E4, 0x8 + .asciz "ScaleL" + .balign 4 .global $$258871 $$258871: - .incbin "baserom.dol", 0x4968EC, 0x8 + .asciz "Appear" + .balign 4 .global $$258872 $$258872: - .incbin "baserom.dol", 0x4968F4, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258841 $$258841: - .incbin "baserom.dol", 0x49D168, 0x4 + .4byte 0x41080000 .global $$258842 $$258842: - .incbin "baserom.dol", 0x49D16C, 0x4 + .4byte 0 .global $$258855 $$258855: - .incbin "baserom.dol", 0x49D170, 0x4 + .4byte 0x40C00000 .global $$258856 $$258856: - .incbin "baserom.dol", 0x49D174, 0x4 + .4byte 0x3E4CCCCD diff --git a/asm/src/DemoFirstLvIn.s b/asm/src/DemoFirstLvIn.s index a2db60e4..8cf4e088 100644 --- a/asm/src/DemoFirstLvIn.s +++ b/asm/src/DemoFirstLvIn.s @@ -331,24 +331,35 @@ lbl_802FC354: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255389 $$255389: - .incbin "baserom.dol", 0x47B850, 0x30 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.FirstLvIn" + .balign 4 .global __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvIn __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvIn: - .incbin "baserom.dol", 0x47B880, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FC004 + .4byte 0x802FAE04 + .4byte 0x802FC070 + .4byte 0x802FC100 + .4byte 0x802FC180 + .4byte 0x802FC1B0 + .4byte 0x802FC21C + .4byte 0x802FC2A0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255356 $$255356: - .incbin "baserom.dol", 0x49D178, 0x4 + .4byte 0 .global $$255377 $$255377: - .incbin "baserom.dol", 0x49D17C, 0x4 + .4byte 0x40400000 .global $$255378 $$255378: - .incbin "baserom.dol", 0x49D180, 0x4 + .4byte 0x40000000 .global $$255469 $$255469: - .incbin "baserom.dol", 0x49D184, 0x4 + .4byte 0x3F800000 .global $$255472 $$255472: - .incbin "baserom.dol", 0x49D188, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DemoFirstPlay.s b/asm/src/DemoFirstPlay.s index f6535362..4195e240 100644 --- a/asm/src/DemoFirstPlay.s +++ b/asm/src/DemoFirstPlay.s @@ -322,18 +322,29 @@ lbl_802FC820: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255320 $$255320: - .incbin "baserom.dol", 0x47B8A8, 0x30 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.FirstPlay" + .balign 4 .global __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlay __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlay: - .incbin "baserom.dol", 0x47B8D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FC464 + .4byte 0x802FAE04 + .4byte 0x802FAE08 + .4byte 0x802FC4D0 + .4byte 0x802FC560 + .4byte 0x802FC5A4 + .4byte 0x802FC664 + .4byte 0x802FAE90 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255319 $$255319: - .incbin "baserom.dol", 0x49D190, 0x4 + .4byte 0 .global $$255407 $$255407: - .incbin "baserom.dol", 0x49D194, 0x4 + .4byte 0x3F800000 .global $$255410 $$255410: - .incbin "baserom.dol", 0x49D198, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DemoUnlockMaster.s b/asm/src/DemoUnlockMaster.s index 1c2570d4..007d370e 100644 --- a/asm/src/DemoUnlockMaster.s +++ b/asm/src/DemoUnlockMaster.s @@ -306,18 +306,30 @@ lbl_802FCC4C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255141 $$255141: - .incbin "baserom.dol", 0x47B900, 0x38 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.UnlockMaster" + .balign 4 + .4byte 0 .global __vt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMaster __vt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMaster: - .incbin "baserom.dol", 0x47B938, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FC8D8 + .4byte 0x802FAE04 + .4byte 0x802FAE08 + .4byte 0x802FC944 + .4byte 0x802FC954 + .4byte 0x802FC958 + .4byte 0x802FC96C + .4byte 0x802FC9A0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255199 $$255199: - .incbin "baserom.dol", 0x49D1A0, 0x4 + .4byte 0x3F800000 .global $$255200 $$255200: - .incbin "baserom.dol", 0x49D1A4, 0x4 + .4byte 0 .global $$255203 $$255203: - .incbin "baserom.dol", 0x49D1A8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DemoUnlockMasterEx.s b/asm/src/DemoUnlockMasterEx.s index f09a356e..c4c15da8 100644 --- a/asm/src/DemoUnlockMasterEx.s +++ b/asm/src/DemoUnlockMasterEx.s @@ -135,12 +135,24 @@ isMasterDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExC .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254711 $$254711: - .incbin "baserom.dol", 0x47B960, 0x38 + .asciz "Scn.Step.Gimmick.AreaMapDemo.Unlock.UnlockMasterEx" + .balign 4 + .4byte 0 .global __vt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterEx __vt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterEx: - .incbin "baserom.dol", 0x47B998, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802FCCB8 + .4byte 0x802FAE04 + .4byte 0x802FAE08 + .4byte 0x802FCCBC + .4byte 0x802FCCCC + .4byte 0x802FCCD0 + .4byte 0x802FCCD4 + .4byte 0x802FAE90 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254729 $$254729: - .incbin "baserom.dol", 0x49D1B0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Detail.s b/asm/src/Detail.s index a77ce32d..fd032e27 100644 --- a/asm/src/Detail.s +++ b/asm/src/Detail.s @@ -3610,202 +3610,273 @@ canRemove__Q43scn7history6detail6DetailFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252852 $$252852: - .incbin "baserom.dol", 0x411D78, 0xC + .4byte 0x80461A20 + .4byte 0x80461A2C + .4byte 0x80461A38 .global $$252854 $$252854: - .incbin "baserom.dol", 0x411D84, 0xC + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x0000000A .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252845 $$252845: - .incbin "baserom.dol", 0x45DB08, 0xC + .asciz "Select1N" + .balign 4 .global $$252846 $$252846: - .incbin "baserom.dol", 0x45DB14, 0xC + .asciz "Select2N" + .balign 4 .global $$252849 $$252849: - .incbin "baserom.dol", 0x45DB20, 0xC + .asciz "SelectLN" + .balign 4 .global $$252850 $$252850: - .incbin "baserom.dol", 0x45DB2C, 0xC + .asciz "SelectMN" + .balign 4 .global $$252851 $$252851: - .incbin "baserom.dol", 0x45DB38, 0xC + .asciz "SelectRN" + .balign 4 .global $$258572 $$258572: - .incbin "baserom.dol", 0x45DB44, 0x10 + .asciz "history/Detail" + .balign 4 .global $$258573 $$258573: - .incbin "baserom.dol", 0x45DB54, 0x10 + .asciz "ProductDetail" + .balign 4 .global $$258574 $$258574: - .incbin "baserom.dol", 0x45DB64, 0x10 + .asciz "ProductTitle" + .balign 4 .global $$258577 $$258577: - .incbin "baserom.dol", 0x45DB74, 0xC + .asciz "HardIcon" + .balign 4 .global $$258578 $$258578: - .incbin "baserom.dol", 0x45DB80, 0x18 + .asciz "history/detail/Detail" + .balign 4 .global $$258579 $$258579: - .incbin "baserom.dol", 0x45DB98, 0x10 + .asciz "PackageButtonN" + .balign 4 .global $$258580 $$258580: - .incbin "baserom.dol", 0x45DBA8, 0x10 + .asciz "MovieButtonN" + .balign 4 .global $$258581 $$258581: - .incbin "baserom.dol", 0x45DBB8, 0xC + .asciz "PlayButtonN" .global $$258582 $$258582: - .incbin "baserom.dol", 0x45DBC4, 0x10 + .asciz "AnimeButton01N" + .balign 4 .global $$258583 $$258583: - .incbin "baserom.dol", 0x45DBD4, 0x10 + .asciz "AnimeButton02N" + .balign 4 .global $$258584 $$258584: - .incbin "baserom.dol", 0x45DBE4, 0x10 + .asciz "AnimeButton03N" + .balign 4 .global $$258585 $$258585: - .incbin "baserom.dol", 0x45DBF4, 0x10 + .asciz "MusicButtonN" + .balign 4 .global $$258586 $$258586: - .incbin "baserom.dol", 0x45DC04, 0x10 + .asciz "TitleWindowN" + .balign 4 .global $$258587 $$258587: - .incbin "baserom.dol", 0x45DC14, 0xC + .asciz "TextWindowN" .global $$258588 $$258588: - .incbin "baserom.dol", 0x45DC20, 0xC + .asciz "PackageN" + .balign 4 .global $$258592 $$258592: - .incbin "baserom.dol", 0x45DC2C, 0xC + .asciz "PictureSN" + .balign 4 .global $$258593 $$258593: - .incbin "baserom.dol", 0x45DC38, 0xC + .asciz "PictureN" + .balign 4 .global $$258594 $$258594: - .incbin "baserom.dol", 0x45DC44, 0x10 + .asciz "TitleButtonST" + .balign 4 .global $$258595 $$258595: - .incbin "baserom.dol", 0x45DC54, 0x10 + .asciz "TitleButtonT" + .balign 4 .global $$258856 $$258856: - .incbin "baserom.dol", 0x45DC64, 0x48 + .4byte 0x80212BC0 ;# ptr + .4byte 0x80212AF8 ;# ptr + .4byte 0x80212B04 ;# ptr + .4byte 0x80212B10 ;# ptr + .4byte 0x80212B1C ;# ptr + .4byte 0x80212B28 ;# ptr + .4byte 0x80212B40 ;# ptr + .4byte 0x80212B34 ;# ptr + .4byte 0x80212B58 ;# ptr + .4byte 0x80212B4C ;# ptr + .4byte 0x80212B70 ;# ptr + .4byte 0x80212B64 ;# ptr + .4byte 0x80212B88 ;# ptr + .4byte 0x80212B7C ;# ptr + .4byte 0x80212BA0 ;# ptr + .4byte 0x80212B94 ;# ptr + .4byte 0x80212BAC ;# ptr + .4byte 0x80212BB8 ;# ptr .global $$258998 $$258998: - .incbin "baserom.dol", 0x45DCAC, 0x10 + .asciz "AnimeCommon.dn" + .balign 4 .global $$259139 $$259139: - .incbin "baserom.dol", 0x45DCBC, 0xC + .asciz "TitleLongT" + .balign 4 .global $$259142 $$259142: - .incbin "baserom.dol", 0x45DCC8, 0x10 + .asciz "ExplanationT" + .balign 4 .global $$259143 $$259143: - .incbin "baserom.dol", 0x45DCD8, 0x14 + .asciz "AnimePlayButtonT" + .balign 4 .global $$259145 $$259145: - .incbin "baserom.dol", 0x45DCEC, 0x10 + .asciz "AnimeButton02" + .balign 4 .global $$259147 $$259147: - .incbin "baserom.dol", 0x45DCFC, 0x14 + .asciz "AnimeButton03_00" + .balign 4 .global $$259149 $$259149: - .incbin "baserom.dol", 0x45DD10, 0xC + .asciz "HardIconSFC" .global $$259150 $$259150: - .incbin "baserom.dol", 0x45DD1C, 0xC + .asciz "HardIcon64" + .balign 4 .global $$259151 $$259151: - .incbin "baserom.dol", 0x45DD28, 0xC + .asciz "HardIconFC" + .balign 4 .global $$259152 $$259152: - .incbin "baserom.dol", 0x45DD34, 0x3C + .asciz "HardIconGB" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258575 $$258575: - .incbin "baserom.dol", 0x494AD0, 0x8 + .asciz "AgeN" + .balign 4 .global $$258576 $$258576: - .incbin "baserom.dol", 0x494AD8, 0x8 + .asciz "BackN" + .balign 4 .global $$258589 $$258589: - .incbin "baserom.dol", 0x494AE0, 0x8 + .asciz "MovieN" + .balign 4 .global $$258590 $$258590: - .incbin "baserom.dol", 0x494AE8, 0x8 + .asciz "IconN" + .balign 4 .global $$258591 $$258591: - .incbin "baserom.dol", 0x494AF0, 0x8 + .asciz "WindowN" .global $$258596 $$258596: - .incbin "baserom.dol", 0x494AF8, 0x8 + .asciz "Back" + .balign 4 .global $$258597 $$258597: - .incbin "baserom.dol", 0x494B00, 0x8 + .asciz "BarN" + .balign 4 .global $$258876 $$258876: - .incbin "baserom.dol", 0x494B08, 0x4 + .4byte 0x496E3200 .global $$258877 $$258877: - .incbin "baserom.dol", 0x494B0C, 0x8 + .asciz "Wait1" + .balign 4 .global $$258878 $$258878: - .incbin "baserom.dol", 0x494B14, 0x4 + .4byte 0x496E3100 .global $$258879 $$258879: - .incbin "baserom.dol", 0x494B18, 0x8 + .asciz "Wait2" + .balign 4 .global $$258946 $$258946: - .incbin "baserom.dol", 0x494B20, 0x8 + .asciz "Out1" + .balign 4 .global $$258996 $$258996: - .incbin "baserom.dol", 0x494B28, 0x4 + .4byte 0x59657300 .global $$258997 $$258997: - .incbin "baserom.dol", 0x494B2C, 0x4 + .4byte 0x4E6F0000 .global $$259010 $$259010: - .incbin "baserom.dol", 0x494B30, 0x8 + .asciz "CursorN" .global $$259072 $$259072: - .incbin "baserom.dol", 0x494B38, 0x8 + .asciz "Out2" + .balign 4 .global $$259138 $$259138: - .incbin "baserom.dol", 0x494B40, 0x8 + .asciz "TitleT" + .balign 4 .global $$259140 $$259140: - .incbin "baserom.dol", 0x494B48, 0x4 + .4byte 0 .global $$259141 $$259141: - .incbin "baserom.dol", 0x494B4C, 0x4 + .4byte 0x00200000 .global $$259144 $$259144: - .incbin "baserom.dol", 0x494B50, 0x8 + .asciz "Play1" + .balign 4 .global $$259146 $$259146: - .incbin "baserom.dol", 0x494B58, 0x8 + .asciz "Play4" + .balign 4 .global $$259148 $$259148: - .incbin "baserom.dol", 0x494B60, 0x8 + .asciz "Play5" + .balign 4 .global $$259187 $$259187: - .incbin "baserom.dol", 0x494B68, 0x8 + .asciz "Focus" + .balign 4 .global $$259188 $$259188: - .incbin "baserom.dol", 0x494B70, 0x8 + .asciz "UnFocus" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252847 $$252847: - .incbin "baserom.dol", 0x49ACB0, 0x4 + .4byte 0x80461A08 .global lbl_80560174 lbl_80560174: - .incbin "baserom.dol", 0x49ACB4, 0x4 + .4byte 0x80461A14 .global $$252906 $$252906: - .incbin "baserom.dol", 0x49ACB8, 0x4 + .4byte 0xFFFFFFFF .global $$255019 $$255019: - .incbin "baserom.dol", 0x49ACBC, 0x4 + .4byte 0x000000FF diff --git a/asm/src/DetailContext.s b/asm/src/DetailContext.s index f53abc2d..5df22dd2 100644 --- a/asm/src/DetailContext.s +++ b/asm/src/DetailContext.s @@ -120,4 +120,5 @@ __ct__Q43scn7history6detail13DetailContextFRQ23mem10IAllocatorRCQ33hel6common43M .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248752 $$248752: - .incbin "baserom.dol", 0x494B78, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/DetectArg.s b/asm/src/DetectArg.s index f543c1e8..73c9eb55 100644 --- a/asm/src/DetectArg.s +++ b/asm/src/DetectArg.s @@ -106,4 +106,5 @@ toActorDetectOption__Q35mcoll6detail9DetectArgCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249806 $$249806: - .incbin "baserom.dol", 0x49A588, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/DetectResultContext.s b/asm/src/DetectResultContext.s index 17ca2c15..28beab4e 100644 --- a/asm/src/DetectResultContext.s +++ b/asm/src/DetectResultContext.s @@ -35,4 +35,5 @@ lbl_801B7594: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250294 $$250294: - .incbin "baserom.dol", 0x49A590, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Direction3.s b/asm/src/Direction3.s index cb3ee723..0a628864 100644 --- a/asm/src/Direction3.s +++ b/asm/src/Direction3.s @@ -443,18 +443,19 @@ __sinit_$$3Direction3_cpp: /* 8019E58C 0019A3CC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402418, 0x4 + .4byte 0x8019E454 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255184 $$255184: - .incbin "baserom.dol", 0x49A368, 0x4 + .4byte 0 .global $$255436 $$255436: - .incbin "baserom.dol", 0x49A36C, 0x4 + .4byte 0x3F800000 .global $$255438 $$255438: - .incbin "baserom.dol", 0x49A370, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global BASIS__Q33hel4math10Direction3 diff --git a/asm/src/DisableIcon.s b/asm/src/DisableIcon.s index b64f885b..320c4ebb 100644 --- a/asm/src/DisableIcon.s +++ b/asm/src/DisableIcon.s @@ -170,33 +170,35 @@ __sinit_$$3DisableIcon_cpp: /* 8019C38C 001981CC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402410, 0x4 + .4byte 0x8019C354 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250030 $$250030: - .incbin "baserom.dol", 0x49A2F8, 0x4 + .4byte 0x41700000 .global $$250031 $$250031: - .incbin "baserom.dol", 0x49A2FC, 0x4 + .4byte 0x437F0000 .global $$250032 $$250032: - .incbin "baserom.dol", 0x49A300, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$250035 $$250035: - .incbin "baserom.dol", 0x49A308, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$250056 $$250056: - .incbin "baserom.dol", 0x49A310, 0x4 + .4byte 0xC35C0000 .global $$250057 $$250057: - .incbin "baserom.dol", 0x49A314, 0x4 + .4byte 0x42D20000 .global $$250058 $$250058: - .incbin "baserom.dol", 0x49A318, 0x4 + .4byte 0xC39E0000 .global $$250059 $$250059: - .incbin "baserom.dol", 0x49A31C, 0x4 + .4byte 0x430C0000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global DISABLE_ICON_POS_4x3__25$$2unnamed$$2DisableIcon_cpp$$2 diff --git a/asm/src/DisableIconResource.s b/asm/src/DisableIconResource.s index 31b4c7f2..d0db2e7b 100644 --- a/asm/src/DisableIconResource.s +++ b/asm/src/DisableIconResource.s @@ -3,4 +3,1587 @@ .section .data, "wa" # 0x80421040 - 0x80496700 .global DISABLE_ICON_TPL_RESOURCE__3hbm DISABLE_ICON_TPL_RESOURCE__3hbm: - .incbin "baserom.dol", 0x451160, 0x18C0 + .4byte 0x0020AF30 + .4byte 0x00000001 + .4byte 0x0000000C + .4byte 0x00000014 + .4byte 0 + .4byte 0x00380038 + .4byte 0x00000005 + .4byte 0x00000040 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03003400 + .4byte 0x5600C000 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03001300 + .4byte 0x13003400 + .4byte 0xC000CC00 + .4byte 0xCC00D421 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x34003400 + .4byte 0x34001300 + .4byte 0xD421D421 + .4byte 0xD421CC00 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xC4006700 + .4byte 0x55002400 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x24005600 + .4byte 0x03004500 + .4byte 0xC800E442 + .4byte 0x03000300 + .4byte 0x24005600 + .4byte 0x24006600 + .4byte 0xD021E843 + .4byte 0xD021E843 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xC800D821 + .4byte 0xE442F063 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F063 + .4byte 0xEC63DC42 + .4byte 0xCC01BC01 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xE843E042 + .4byte 0xDC42D421 + .4byte 0xB844B8A8 + .4byte 0xBCC9C56E + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xD421D821 + .4byte 0xE042E042 + .4byte 0xC56EC54E + .4byte 0xB8A8B888 + .4byte 0xF464EC63 + .4byte 0xE042D421 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xE863F463 + .4byte 0xF464F464 + .4byte 0xB823C400 + .4byte 0xD021E442 + .4byte 0xC4005500 + .4byte 0x13000300 + .4byte 0xF063E442 + .4byte 0xCC004500 + .4byte 0xF464F464 + .4byte 0xF464E042 + .4byte 0xF063F464 + .4byte 0xF464F464 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x13000300 + .4byte 0x03000300 + .4byte 0xC8004500 + .4byte 0x03000300 + .4byte 0xF063DC42 + .4byte 0xC4003400 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x13005500 + .4byte 0x03001300 + .4byte 0xC400E442 + .4byte 0x03004500 + .4byte 0xE042F464 + .4byte 0x4500D021 + .4byte 0xF063F464 + .4byte 0xD821F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464E042 + .4byte 0xF464F463 + .4byte 0xD421B8A8 + .4byte 0xF464F464 + .4byte 0xE442CC01 + .4byte 0xEC63D021 + .4byte 0xB845CDD1 + .4byte 0xC400C12D + .4byte 0xF7BEF7BE + .4byte 0xDA76F7BE + .4byte 0xF7BEFBDF + .4byte 0xBC02BCEA + .4byte 0xD634F7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xFBDFFBDF + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xFBDFFBDF + .4byte 0xFBDFFBDF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xFBDFFBDF + .4byte 0xF7BEF7BE + .4byte 0xFFFFFFFF + .4byte 0xFFFFFBDF + .4byte 0xF7BEEF5C + .4byte 0xC9B1B866 + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xFBDFF7BE + .4byte 0xF7BEF7BE + .4byte 0xC400D421 + .4byte 0xEC63F464 + .4byte 0xF39DC12D + .4byte 0xC400D821 + .4byte 0xF7BEF7BE + .4byte 0xEF7CBCCA + .4byte 0xF7BEF7BE + .4byte 0xF7BEF6B6 + .4byte 0xF464F464 + .4byte 0xEC63C800 + .4byte 0xF063F464 + .4byte 0xF464F063 + .4byte 0xD821F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0x35000300 + .4byte 0x03000300 + .4byte 0xCC014500 + .4byte 0x03000300 + .4byte 0xF463D421 + .4byte 0x45000300 + .4byte 0xF464F463 + .4byte 0xD0214500 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03004500 + .4byte 0x03000300 + .4byte 0x1300C400 + .4byte 0x03000300 + .4byte 0x4500DC42 + .4byte 0x4500D821 + .4byte 0xF464F464 + .4byte 0xD021F463 + .4byte 0xF464F463 + .4byte 0xF063F464 + .4byte 0xF464D421 + .4byte 0xF464F464 + .4byte 0xE442B866 + .4byte 0xF063D021 + .4byte 0xBCA9F7BE + .4byte 0xD021BCCA + .4byte 0xF7BEF7BE + .4byte 0xBCA9F7BE + .4byte 0xF7BEFBDF + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7DE + .4byte 0xFBDFFFFF + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFA1B6 + .4byte 0xFFFFFFFF + .4byte 0xCEBA8D78 + .4byte 0xFFFFC69A + .4byte 0x8D7899FD + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x9976FBDF + .4byte 0xFFFFFFFF + .4byte 0x9179BA59 + .4byte 0xFFFFFFFF + .4byte 0x9E1F8D78 + .4byte 0xBA59FFFF + .4byte 0xFFFFFBDF + .4byte 0xF7DEF7BE + .4byte 0xFFFFFFFF + .4byte 0xFFFFFBDF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFAD6 + .4byte 0xF7BEF7BE + .4byte 0xF6B6F484 + .4byte 0xF7BEF6B6 + .4byte 0xF484F464 + .4byte 0xFAB6F484 + .4byte 0xF464F464 + .4byte 0xF484F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF063C800 + .4byte 0xF464F464 + .4byte 0xF464EC63 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464DC42 + .4byte 0xF063F464 + .4byte 0x34000300 + .4byte 0x03000300 + .4byte 0xC4002400 + .4byte 0x03000300 + .4byte 0xE4425600 + .4byte 0x03000300 + .4byte 0xF464CC01 + .4byte 0x24000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03001300 + .4byte 0xC800F463 + .4byte 0x03005500 + .4byte 0xE442F464 + .4byte 0x1300CC00 + .4byte 0xF464F464 + .4byte 0x4500DC42 + .4byte 0xF464F464 + .4byte 0xF464F063 + .4byte 0xC800D213 + .4byte 0xF464DC22 + .4byte 0xBCCAF7BE + .4byte 0xEC63C400 + .4byte 0xEB3BF7BE + .4byte 0xD821C10C + .4byte 0xF7BEFBDF + .4byte 0xF7BEFBDF + .4byte 0xFFFFFFFF + .4byte 0xF7DFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFBA59 + .4byte 0xFFFFFFFF + .4byte 0xA9F78D78 + .4byte 0xFFFF9996 + .4byte 0x9178A21F + .4byte 0xC2798D78 + .4byte 0x9DFEA21F + .4byte 0x8D789DFE + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0xA21F9E1F + .4byte 0x8D78B218 + .4byte 0x9E1F9E1F + .4byte 0x9E1F8D78 + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1FB996 + .4byte 0xFFFFFFFF + .4byte 0xFAD6F484 + .4byte 0xADF7FAD6 + .4byte 0xF484F464 + .4byte 0xB112F064 + .4byte 0xF464F464 + .4byte 0xF084F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F211 + .4byte 0xF464F464 + .4byte 0xF231F39D + .4byte 0xF464F632 + .4byte 0xF39EF39D + .4byte 0xF211BCEB + .4byte 0xD421F464 + .4byte 0xEF7DEF7D + .4byte 0xB823EC63 + .4byte 0xEF7DEB7D + .4byte 0xC12DD021 + .4byte 0xEF7DEB7C + .4byte 0xEB5CB845 + .4byte 0xF464E843 + .4byte 0x66000300 + .4byte 0xF464F464 + .4byte 0xD0213400 + .4byte 0xF464F464 + .4byte 0xEC636700 + .4byte 0xE442F464 + .4byte 0xF464CC01 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x13000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03001300 + .4byte 0x03000300 + .4byte 0x03003400 + .4byte 0x03000300 + .4byte 0x03005600 + .4byte 0xC400F063 + .4byte 0xF464F063 + .4byte 0xCC00F464 + .4byte 0xF464E442 + .4byte 0xD821F464 + .4byte 0xF464D421 + .4byte 0xE442F464 + .4byte 0xF464C800 + .4byte 0xC400EF5C + .4byte 0xF7BEFBDF + .4byte 0xB866F7BE + .4byte 0xF7BEFFFF + .4byte 0xC56FF7BE + .4byte 0xFBDFFFFF + .4byte 0xDEB8F7BE + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFBDF + .4byte 0xFFFFFFFF + .4byte 0xEF9E8D55 + .4byte 0xFFFFDF3C + .4byte 0x8D34919A + .4byte 0xDF1C8934 + .4byte 0x95BBA21F + .4byte 0x91558D78 + .4byte 0xA21FA21F + .4byte 0x91799E1F + .4byte 0x9E1FA21F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1FB996 + .4byte 0x9E1F9E1F + .4byte 0xB996F084 + .4byte 0x9E1FB996 + .4byte 0xF084F464 + .4byte 0xB996F084 + .4byte 0xF464F464 + .4byte 0xF084F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F632 + .4byte 0xF464F464 + .4byte 0xE1B0F7BE + .4byte 0xF464C131 + .4byte 0x8D58CABA + .4byte 0xF632F7BE + .4byte 0xF3BEF39D + .4byte 0xF7BEF7BE + .4byte 0xF7BEF39D + .4byte 0xF7BEF7BE + .4byte 0xF7BEF39D + .4byte 0xF7BEF7BE + .4byte 0xF7BEF39E + .4byte 0xEF7DEB5C + .4byte 0xEB5CC14E + .4byte 0xEF7DEB5C + .4byte 0xEB5CDEF9 + .4byte 0xEF7DEB5C + .4byte 0xEB5CE73C + .4byte 0xEF7DEB5C + .4byte 0xEB5CE73C + .4byte 0xD421F464 + .4byte 0xF464E042 + .4byte 0xC400F063 + .4byte 0xF464EC63 + .4byte 0xB844E843 + .4byte 0xF464F464 + .4byte 0xBCEBD821 + .4byte 0xF464F464 + .4byte 0x45000300 + .4byte 0x03000300 + .4byte 0xBC000300 + .4byte 0x03000300 + .4byte 0xC8001300 + .4byte 0x03000300 + .4byte 0xD4212400 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03006700 + .4byte 0x03000300 + .4byte 0x0300C000 + .4byte 0x03000300 + .4byte 0x0300C400 + .4byte 0x03000300 + .4byte 0x0300C800 + .4byte 0xEC63F464 + .4byte 0xF063C000 + .4byte 0xF463F464 + .4byte 0xEC63B823 + .4byte 0xF464F464 + .4byte 0xE442B845 + .4byte 0xF464F464 + .4byte 0xE442B866 + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFD71C + .4byte 0xFFFFFFFF + .4byte 0xD6FB8D57 + .4byte 0xFFFFBE59 + .4byte 0x8D5899DC + .4byte 0x997684F4 + .4byte 0x84F484F4 + .4byte 0x895795BC + .4byte 0x9E1F9E1F + .4byte 0x99DC9E1F + .4byte 0x9E1F9E1F + .4byte 0xA21F9E1F + .4byte 0x9E1F9E1F + .4byte 0x84F484F4 + .4byte 0x8D789E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1FB112 + .4byte 0x9E1F9E1F + .4byte 0xB996F084 + .4byte 0x9E1FB996 + .4byte 0xF084F464 + .4byte 0xB996F084 + .4byte 0xF464F464 + .4byte 0xF064F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464C553 + .4byte 0xF464F464 + .4byte 0xC5539E1F + .4byte 0xF464C553 + .4byte 0x9E1F9E1F + .4byte 0xC5539E1F + .4byte 0x99DD8D78 + .4byte 0x9E1F9E1F + .4byte 0x9E1F99DD + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F8D78 + .4byte 0x80F480F4 + .4byte 0xCA9AF7BE + .4byte 0xF7BEF39E + .4byte 0x8D78BE59 + .4byte 0xF7BEF39E + .4byte 0x9E1E8D78 + .4byte 0xA9D7F39E + .4byte 0x80F480F4 + .4byte 0x80F49575 + .4byte 0xEF7DEB5C + .4byte 0xEB5CE73C + .4byte 0xEF7DEB5C + .4byte 0xE75CE73C + .4byte 0xEF7DEB5C + .4byte 0xE75CE73B + .4byte 0xEF7DEB5C + .4byte 0xE75CE73B + .4byte 0xC590D021 + .4byte 0xF464F464 + .4byte 0xD256C800 + .4byte 0xF464F464 + .4byte 0xDAB8C800 + .4byte 0xF464F464 + .4byte 0xE73BC000 + .4byte 0xF464F464 + .4byte 0xDC224500 + .4byte 0x03000300 + .4byte 0xE0425500 + .4byte 0x03000300 + .4byte 0xE4425600 + .4byte 0x03000300 + .4byte 0xE8435600 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x0300C800 + .4byte 0x03000300 + .4byte 0x0300C400 + .4byte 0x03000300 + .4byte 0x0300C000 + .4byte 0x03000300 + .4byte 0x03006700 + .4byte 0xF464F464 + .4byte 0xE442B866 + .4byte 0xF464F464 + .4byte 0xE442B845 + .4byte 0xF463F464 + .4byte 0xEC63B823 + .4byte 0xEC63F464 + .4byte 0xF063C000 + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7BE + .4byte 0xFBDFFFFF + .4byte 0xF7BEF7BE + .4byte 0xF7BEFFFF + .4byte 0xF7BEF7BE + .4byte 0xF7BEFBDF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x84F49E1F + .4byte 0xFFFFFFFF + .4byte 0x84F49E1F + .4byte 0xFFFFFFFF + .4byte 0x84F49E1F + .4byte 0xFFFFFFFF + .4byte 0x84F4B996 + .4byte 0x9E1F9E1F + .4byte 0xB996F064 + .4byte 0x9E1FB996 + .4byte 0xF084F464 + .4byte 0xB996F084 + .4byte 0xF464F464 + .4byte 0xF084F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F632 + .4byte 0xF464F464 + .4byte 0xF632F7BE + .4byte 0xF464F632 + .4byte 0xF7BEF7BE + .4byte 0xB4AC9E1F + .4byte 0x9E1F9E1F + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF39D + .4byte 0xF7BEF7BE + .4byte 0xF39EF39D + .4byte 0xF7BEF7BE + .4byte 0xF39EEF9D + .4byte 0xF7BEF7BE + .4byte 0xF39EEF7D + .4byte 0xEF7DEB5C + .4byte 0xE75CE73B + .4byte 0xEF7DEB5C + .4byte 0xE75CE73B + .4byte 0xEF7DEB5C + .4byte 0xE73CE73B + .4byte 0xEB7CEB5C + .4byte 0xE73CE73B + .4byte 0xE73BC000 + .4byte 0xF464F464 + .4byte 0xDA98C800 + .4byte 0xF464F464 + .4byte 0xD255C800 + .4byte 0xF464F464 + .4byte 0xC590D021 + .4byte 0xF464F464 + .4byte 0xE8435600 + .4byte 0x03000300 + .4byte 0xE4425600 + .4byte 0x03000300 + .4byte 0xE0425500 + .4byte 0x03000300 + .4byte 0xDC224500 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03005600 + .4byte 0x03000300 + .4byte 0x03003400 + .4byte 0x03000300 + .4byte 0x03001300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xE442F464 + .4byte 0xF464C800 + .4byte 0xD821F464 + .4byte 0xF464D421 + .4byte 0xCC00F464 + .4byte 0xF464E442 + .4byte 0xC400F063 + .4byte 0xF464F063 + .4byte 0xDEB8F7BE + .4byte 0xF7BEF7DF + .4byte 0xC56FF7BE + .4byte 0xF7BEF7BE + .4byte 0xB866F7BE + .4byte 0xF7BEF7BE + .4byte 0xC400EF5C + .4byte 0xF7BEF7BE + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFBDFFFFF + .4byte 0xFFFFFFFF + .4byte 0xF7BEFFFF + .4byte 0xFFFFFFFF + .4byte 0xF7BEFBDF + .4byte 0xFFFFFAD6 + .4byte 0xFFFFFFFF + .4byte 0xA8CEF084 + .4byte 0xFFFFFAD6 + .4byte 0xF064F464 + .4byte 0xFAD6F484 + .4byte 0xF464F464 + .4byte 0xF484F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F632 + .4byte 0xF464F464 + .4byte 0xF632F7BE + .4byte 0xF464B4AC + .4byte 0x80F480F4 + .4byte 0xF632F7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0x80F480F4 + .4byte 0x80F480F4 + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x80F49E1F + .4byte 0x9E1F9E1F + .4byte 0x8D789E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0x9E1F80F4 + .4byte 0xF7BEF7BE + .4byte 0xF7BEF3BE + .4byte 0xF39DEF7D + .4byte 0xF7BEF39E + .4byte 0xEF9DEF7D + .4byte 0xF7BEF39D + .4byte 0xEF7DEB5C + .4byte 0xF39EEF7D + .4byte 0xEF7DEB5C + .4byte 0xEB5CE75C + .4byte 0xE73BE73B + .4byte 0xEB5CE73C + .4byte 0xE73BE73B + .4byte 0xEB5CE73C + .4byte 0xE73BDEFA + .4byte 0xE75CE73B + .4byte 0xE73BC16F + .4byte 0xB8EBD821 + .4byte 0xF464F464 + .4byte 0xB844E442 + .4byte 0xF464F464 + .4byte 0xC400F063 + .4byte 0xF464EC63 + .4byte 0xD421F464 + .4byte 0xF464E042 + .4byte 0xD4212400 + .4byte 0x03000300 + .4byte 0xC8001300 + .4byte 0x03000300 + .4byte 0xBC000300 + .4byte 0x03000300 + .4byte 0x45000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x4500DC42 + .4byte 0xF464F464 + .4byte 0x1300CC00 + .4byte 0xF464F464 + .4byte 0x03005600 + .4byte 0xE442F464 + .4byte 0x03002300 + .4byte 0xC800F463 + .4byte 0xD421C10C + .4byte 0xF7BEF7BE + .4byte 0xEC63C400 + .4byte 0xEB3BF7BE + .4byte 0xF464DC22 + .4byte 0xBCCAF7BE + .4byte 0xF464F063 + .4byte 0xC800E1AF + .4byte 0xF7BEF7BE + .4byte 0xF6B6F484 + .4byte 0xF7BEF6B6 + .4byte 0xF484F464 + .4byte 0xF6B6F484 + .4byte 0xF464F464 + .4byte 0xF484F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464C553 + .4byte 0xF464F464 + .4byte 0xC5539E1F + .4byte 0xF464B4CD + .4byte 0x80F480F4 + .4byte 0xC5539E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x80F480F4 + .4byte 0x80F480F4 + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x80F480F4 + .4byte 0x80F480F4 + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x9E1F9E1F + .4byte 0x80F480F4 + .4byte 0x80F480F4 + .4byte 0x9E1F80F4 + .4byte 0xF7BEF39E + .4byte 0x9E1F80F4 + .4byte 0xF39EF39D + .4byte 0x9E1F80F4 + .4byte 0xF39DEF7D + .4byte 0x80F480F4 + .4byte 0xEF7DEF7D + .4byte 0xF39DEF7D + .4byte 0xEB5CE75C + .4byte 0xEF7DEB7C + .4byte 0xEB5CE73C + .4byte 0xEF7DEB5C + .4byte 0xE75CE73B + .4byte 0xEB5CE75C + .4byte 0xE73CE73B + .4byte 0xE73CE73B + .4byte 0xE33BB844 + .4byte 0xE73BE73B + .4byte 0xBD2DD021 + .4byte 0xE73BE33B + .4byte 0xB823EC63 + .4byte 0xE73BB8CA + .4byte 0xD421F464 + .4byte 0xE442F464 + .4byte 0xF464CC01 + .4byte 0xF464F464 + .4byte 0xEC636700 + .4byte 0xF464F464 + .4byte 0xD0213400 + .4byte 0xF464E843 + .4byte 0x66000300 + .4byte 0x13000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x4500E042 + .4byte 0x03000300 + .4byte 0x1300C800 + .4byte 0x03000300 + .4byte 0x03004500 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xF464F464 + .4byte 0xE843F464 + .4byte 0xF063F464 + .4byte 0xF464F464 + .4byte 0xD021F463 + .4byte 0xF464F464 + .4byte 0x4500D821 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F653 + .4byte 0xF464F464 + .4byte 0xF232F39E + .4byte 0xF464F232 + .4byte 0xEF7DEF7D + .4byte 0xF653F7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF39EF39E + .4byte 0xF39EF39E + .4byte 0xEF9DEF9D + .4byte 0xEF9DEF9D + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF39EF39E + .4byte 0xF39EF39E + .4byte 0xEF9DEF9D + .4byte 0xEF9DEF9D + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF7BEF7BE + .4byte 0xF39EF39E + .4byte 0xF39EF39D + .4byte 0xEF9DEF7D + .4byte 0xEF7DEF7D + .4byte 0xF7BEF7BE + .4byte 0xF39EF39E + .4byte 0xF39EF39E + .4byte 0xF39DEF7D + .4byte 0xEF9DEF7D + .4byte 0xEF7DEB7D + .4byte 0xEF7DEB7C + .4byte 0xEB5CEB5C + .4byte 0xEF9DEF7D + .4byte 0xEB7DEB5C + .4byte 0xEF7DEB5C + .4byte 0xEB5CE75C + .4byte 0xEB5CEB5C + .4byte 0xE75CE73C + .4byte 0xE75CE73C + .4byte 0xE73BE73B + .4byte 0xE75CE73C + .4byte 0xE73BE73B + .4byte 0xE73CE73B + .4byte 0xE73BC9D2 + .4byte 0xE73BE73B + .4byte 0xD235B866 + .4byte 0xE73BC590 + .4byte 0xB845E042 + .4byte 0xBD2DC800 + .4byte 0xF063F464 + .4byte 0xC400E863 + .4byte 0xF464F464 + .4byte 0xE442F464 + .4byte 0xF464EC63 + .4byte 0xF464F464 + .4byte 0xF063C800 + .4byte 0xF464CC01 + .4byte 0x24000300 + .4byte 0xE4425600 + .4byte 0x03000300 + .4byte 0xC4002400 + .4byte 0x03000300 + .4byte 0x34000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03004500 + .4byte 0xE042F464 + .4byte 0x03001300 + .4byte 0xC400E442 + .4byte 0x03000300 + .4byte 0x13005500 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464E843 + .4byte 0xDC22F464 + .4byte 0xF464F464 + .4byte 0x4500D021 + .4byte 0xF063F464 + .4byte 0xE18EEF7D + .4byte 0xEF7DEF7D + .4byte 0xC400C12D + .4byte 0xEB5CEB5C + .4byte 0xEC63D021 + .4byte 0xB845C5B1 + .4byte 0xF464F464 + .4byte 0xE442CC01 + .4byte 0xEF7DEF7D + .4byte 0xEF7DEF7D + .4byte 0xEB5CEB5C + .4byte 0xEB5CEB5C + .4byte 0xEB5CE75C + .4byte 0xE75CE75C + .4byte 0xBC02B8C9 + .4byte 0xC9F2E73B + .4byte 0xEF7DEF7D + .4byte 0xEF7DEF7D + .4byte 0xEB5CEB5C + .4byte 0xEB5CEB5C + .4byte 0xE75CE75C + .4byte 0xE75CE73C + .4byte 0xE73BE73B + .4byte 0xE73BE73B + .4byte 0xEF7DEB7D + .4byte 0xEB5CEB5C + .4byte 0xEB5CEB5C + .4byte 0xEB5CE75C + .4byte 0xE73CE73C + .4byte 0xE73CE73B + .4byte 0xE73BE73B + .4byte 0xE73BE73B + .4byte 0xEB5CEB5C + .4byte 0xE75CE73C + .4byte 0xE75CE73C + .4byte 0xE73BE73B + .4byte 0xE73BE73B + .4byte 0xE73BE73B + .4byte 0xE73BDED9 + .4byte 0xC16FB866 + .4byte 0xE73CE73B + .4byte 0xE73BE73B + .4byte 0xE73BE73B + .4byte 0xDEF9B8A9 + .4byte 0xE31ABD0C + .4byte 0xC400D821 + .4byte 0xC400D421 + .4byte 0xEC63F464 + .4byte 0xBD0CC400 + .4byte 0xE442F464 + .4byte 0xC800EC63 + .4byte 0xF464F464 + .4byte 0xF063F464 + .4byte 0xF464F063 + .4byte 0xF464F464 + .4byte 0xEC63C800 + .4byte 0xF464F463 + .4byte 0xD0214500 + .4byte 0xF463D421 + .4byte 0x45000300 + .4byte 0xCC014500 + .4byte 0x03000300 + .4byte 0x35000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03004500 + .4byte 0xC800E442 + .4byte 0x03000300 + .4byte 0x24005600 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xD021E863 + .4byte 0xF464F464 + .4byte 0x34006600 + .4byte 0xD021E843 + .4byte 0x03000300 + .4byte 0x24005600 + .4byte 0xEC63DC42 + .4byte 0xCC01BC01 + .4byte 0xF464F464 + .4byte 0xF464F063 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xC800D821 + .4byte 0xE442F063 + .4byte 0xB824B887 + .4byte 0xB8A8BD2D + .4byte 0xE843E042 + .4byte 0xDC42D421 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xBD2DBD0C + .4byte 0xB887B887 + .4byte 0xD421D821 + .4byte 0xE042E042 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xB823C400 + .4byte 0xD021E442 + .4byte 0xE863F463 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464EC63 + .4byte 0xE042D421 + .4byte 0xF063F464 + .4byte 0xF464F464 + .4byte 0xF464F464 + .4byte 0xF464E042 + .4byte 0xF063E442 + .4byte 0xCC004500 + .4byte 0xC4005500 + .4byte 0x13000300 + .4byte 0xF063DC42 + .4byte 0xC4003400 + .4byte 0xC8004500 + .4byte 0x03000300 + .4byte 0x13000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03003400 + .4byte 0x5600C000 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xC000CC00 + .4byte 0xCC00D421 + .4byte 0x03001300 + .4byte 0x13003400 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xD421D421 + .4byte 0xD421CC00 + .4byte 0x34003400 + .4byte 0x34001300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0xC400BC00 + .4byte 0x55002400 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 + .4byte 0x03000300 diff --git a/asm/src/Door.s b/asm/src/Door.s index 417d8c81..75de23cb 100644 --- a/asm/src/Door.s +++ b/asm/src/Door.s @@ -1468,21 +1468,24 @@ lbl_80335E7C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254039 $$254039: - .incbin "baserom.dol", 0x47D3E0, 0x18 + .asciz "step/gimmick/Door" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254159 $$254159: - .incbin "baserom.dol", 0x49D3B0, 0x4 + .4byte 0 .global $$254182 $$254182: - .incbin "baserom.dol", 0x49D3B4, 0x4 + .4byte 0x3F000000 .global $$254192 $$254192: - .incbin "baserom.dol", 0x49D3B8, 0x4 + .4byte 0x3EFAE148 .global $$254193 $$254193: - .incbin "baserom.dol", 0x49D3BC, 0x4 + .4byte 0x3F7D70A4 .global $$254202 $$254202: - .incbin "baserom.dol", 0x49D3C0, 0x8 + .4byte 0x40C00000 + .4byte 0 diff --git a/asm/src/DoorUnlockStar.s b/asm/src/DoorUnlockStar.s index 98ea20c7..cecdd59b 100644 --- a/asm/src/DoorUnlockStar.s +++ b/asm/src/DoorUnlockStar.s @@ -611,50 +611,56 @@ mfSetupEffect__Q53scn4step7gimmick13challengedoor14DoorUnlockStarFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256175 $$256175: - .incbin "baserom.dol", 0x47D328, 0x18 + .asciz "step/gimmick/Starlvmap2" .global $$256289 $$256289: - .incbin "baserom.dol", 0x47D340, 0x10 + .asciz "BigStarL" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256176 $$256176: - .incbin "baserom.dol", 0x496A60, 0x8 + .asciz "TopL" + .balign 4 .global $$256286 $$256286: - .incbin "baserom.dol", 0x496A68, 0x8 + .4byte 0x466C7900 + .4byte 0 .global $$256288 $$256288: - .incbin "baserom.dol", 0x496A70, 0x8 + .asciz "Destroy" .global $$256309 $$256309: - .incbin "baserom.dol", 0x496A78, 0x8 + .asciz "Start" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256174 $$256174: - .incbin "baserom.dol", 0x49D318, 0x4 + .4byte 0 .global $$256177 $$256177: - .incbin "baserom.dol", 0x49D31C, 0x4 + .4byte 0x41000000 .global $$256178 $$256178: - .incbin "baserom.dol", 0x49D320, 0x4 + .4byte 0x41100000 .global $$256246 $$256246: - .incbin "baserom.dol", 0x49D324, 0x4 + .4byte 0xBF800000 .global $$256247 $$256247: - .incbin "baserom.dol", 0x49D328, 0x4 + .4byte 0x40400000 .global $$256248 $$256248: - .incbin "baserom.dol", 0x49D32C, 0x4 + .4byte 0x40000000 .global $$256287 $$256287: - .incbin "baserom.dol", 0x49D330, 0x4 + .4byte 0x3F800000 .global $$256325 $$256325: - .incbin "baserom.dol", 0x49D334, 0x4 + .4byte 0x44E4C000 .global $$256327 $$256327: - .incbin "baserom.dol", 0x49D338, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/DrawInfo.s b/asm/src/DrawInfo.s index d311c8aa..f23ead71 100644 --- a/asm/src/DrawInfo.s +++ b/asm/src/DrawInfo.s @@ -134,7 +134,7 @@ lbl_8017F538: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251405 $$251405: - .incbin "baserom.dol", 0x49A178, 0x4 + .4byte 0 .global $$251406 $$251406: - .incbin "baserom.dol", 0x49A17C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/DrawLayerKindUtil.s b/asm/src/DrawLayerKindUtil.s index afed3d0a..25420d6d 100644 --- a/asm/src/DrawLayerKindUtil.s +++ b/asm/src/DrawLayerKindUtil.s @@ -30,4 +30,43 @@ G3DLightSetCount__Q43scn4step4core17DrawLayerKindUtilFQ43scn4step4core13DrawLaye .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ENTRIES__Q43scn4step4core31$$2unnamed$$2DrawLayerKindUtil_cpp$$2 T_ENTRIES__Q43scn4step4core31$$2unnamed$$2DrawLayerKindUtil_cpp$$2: - .incbin "baserom.dol", 0x413B60, 0xA0 + .4byte 0x00000001 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00001000 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000100 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000100 + .4byte 0x00000020 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000010 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000010 + .4byte 0 + .4byte 0x00000080 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000080 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000001 + .4byte 0 diff --git a/asm/src/Drawer.s b/asm/src/Drawer.s index 71872c86..c3851d8a 100644 --- a/asm/src/Drawer.s +++ b/asm/src/Drawer.s @@ -1441,24 +1441,39 @@ lbl_80275F60: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VIEW_PORT_SETTINGS__Q43scn4step4core20$$2unnamed$$2Drawer_cpp$$2 VIEW_PORT_SETTINGS__Q43scn4step4core20$$2unnamed$$2Drawer_cpp$$2: - .incbin "baserom.dol", 0x413B20, 0x40 + .4byte 0 + .4byte 0 + .4byte 0x43A00000 + .4byte 0x43640000 + .4byte 0x43A00000 + .4byte 0 + .4byte 0x43A00000 + .4byte 0x43640000 + .4byte 0 + .4byte 0x43640000 + .4byte 0x43A00000 + .4byte 0x43640000 + .4byte 0x43A00000 + .4byte 0x43640000 + .4byte 0x43A00000 + .4byte 0x43640000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258077 $$258077: - .incbin "baserom.dol", 0x49B8E0, 0x4 + .4byte 0x3ECCCCCD .global $$258078 $$258078: - .incbin "baserom.dol", 0x49B8E4, 0x4 + .4byte 0x3F800000 .global $$258079 $$258079: - .incbin "baserom.dol", 0x49B8E8, 0x4 + .4byte 0x3E99999A .global $$258080 $$258080: - .incbin "baserom.dol", 0x49B8EC, 0x4 + .4byte 0 .global $$258129 $$258129: - .incbin "baserom.dol", 0x49B8F0, 0x4 + .4byte 0x3E4CCCCD .global $$258130 $$258130: - .incbin "baserom.dol", 0x49B8F4, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/DvdControl.s b/asm/src/DvdControl.s index 197fdf34..f9fa0698 100644 --- a/asm/src/DvdControl.s +++ b/asm/src/DvdControl.s @@ -491,18 +491,27 @@ __sinit_$$3DvdControl_cpp: /* 801CE5C0 001CA400 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40243C, 0x4 + .4byte 0x801CE598 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249342 $$249342: - .incbin "baserom.dol", 0x458DA8, 0x10 + .asciz "DvdControl.cpp" + .balign 4 .global $$249343 $$249343: - .incbin "baserom.dol", 0x458DB8, 0x10 + .asciz "WiiFile::Close" + .balign 4 .global dvdControlBlock dvdControlBlock: - .incbin "baserom.dol", 0x458DC8, 0x20 + .4byte 0x801CE11C ;# ptr + .4byte 0x801CE588 ;# ptr + .4byte 0x801CE280 ;# ptr + .4byte 0x801CE590 ;# ptr + .4byte 0x801CE44C ;# ptr + .4byte 0x801CE454 ;# ptr + .4byte 0x801CE2F0 ;# ptr + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global meFile diff --git a/asm/src/DvdWatch.s b/asm/src/DvdWatch.s index 52a2ba35..448dc27c 100644 --- a/asm/src/DvdWatch.s +++ b/asm/src/DvdWatch.s @@ -1009,48 +1009,54 @@ lbl_8017769C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl$$20 $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl$$20: - .incbin "baserom.dol", 0x44EC30, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl: - .incbin "baserom.dol", 0x44EC64, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff$$20 $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff$$20: - .incbin "baserom.dol", 0x44EC78, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff: - .incbin "baserom.dol", 0x44ECAC, 0x14 + .asciz "CharWriter.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253258 $$253258: - .incbin "baserom.dol", 0x49A0E8, 0x4 + .4byte 0 .global $$253259 $$253259: - .incbin "baserom.dol", 0x49A0EC, 0x4 + .4byte 0x3F800000 .global $$253260 $$253260: - .incbin "baserom.dol", 0x49A0F0, 0x4 + .4byte 0x43E40000 .global $$253261 $$253261: - .incbin "baserom.dol", 0x49A0F4, 0x4 + .4byte 0x3C23D70A .global $$253262 $$253262: - .incbin "baserom.dol", 0x49A0F8, 0x4 + .4byte 0x42C80000 .global $$253263 $$253263: - .incbin "baserom.dol", 0x49A0FC, 0x4 + .4byte 0xBF800000 .global $$253264 $$253264: - .incbin "baserom.dol", 0x49A100, 0x4 + .4byte 0x41F00000 .global $$253265 $$253265: - .incbin "baserom.dol", 0x49A104, 0x4 + .4byte 0x41D00000 .global $$253266 $$253266: - .incbin "baserom.dol", 0x49A108, 0x4 + .4byte 0x3F000000 .global $$253267 $$253267: - .incbin "baserom.dol", 0x49A10C, 0x4 + .4byte 0x43640000 .global $$253272 $$253272: - .incbin "baserom.dol", 0x49A110, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/DvdWatch_ENG.s b/asm/src/DvdWatch_ENG.s index a141a2e7..5fea8b8a 100644 --- a/asm/src/DvdWatch_ENG.s +++ b/asm/src/DvdWatch_ENG.s @@ -3,20 +3,28 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ERROR_MSG_ENG__Q23app8DvdWatch ERROR_MSG_ENG__Q23app8DvdWatch: - .incbin "baserom.dol", 0x4105C8, 0x18 + .4byte 0x80556B78 + .4byte 0x80452BC0 + .4byte 0x80452BC0 + .4byte 0x80452C04 + .4byte 0x80452C50 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248837 $$248837: - .incbin "baserom.dol", 0x44ECC0, 0x44 + .asciz "Please insert the\nKirby's Dream Collection\nSpecial Edition disc." + .balign 4 .global $$248838 $$248838: - .incbin "baserom.dol", 0x44ED04, 0x4C + .asciz "The disc could not be read.\nRefer to the Wii Operations\nManual for details." .global $$248839 $$248839: - .incbin "baserom.dol", 0x44ED50, 0xA8 + .asciz "An error has occurred.\nPress the Eject Button, remove\nthe disc, and turn off the power\nto the console. Please read the\nWii Operations Manual for\nfurther instructions." + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248836 $$248836: - .incbin "baserom.dol", 0x492F58, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Dynamics.s b/asm/src/Dynamics.s index 4a04a3d7..a7125708 100644 --- a/asm/src/Dynamics.s +++ b/asm/src/Dynamics.s @@ -419,12 +419,15 @@ SetDescNode__Q53scn4step4hero9modeldesc8DynamicsFRQ28dynamics8DescNodeRCQ63scn4s .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x44F200, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x44F224, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249488 $$249488: - .incbin "baserom.dol", 0x49DAE8, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 diff --git a/asm/src/EFBToLetterBox.s b/asm/src/EFBToLetterBox.s index b00b9c10..8d5f8568 100644 --- a/asm/src/EFBToLetterBox.s +++ b/asm/src/EFBToLetterBox.s @@ -420,25 +420,25 @@ RoundUp$$0Us$$1__Q34nw4r2ut24$$2unnamed$$2Precompile_pch$$2FUsUi_Us: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251900 $$251900: - .incbin "baserom.dol", 0x49A230, 0x4 + .4byte 0x000000FF .global $$251984 $$251984: - .incbin "baserom.dol", 0x49A234, 0x4 + .4byte 0x3F800000 .global $$251985 $$251985: - .incbin "baserom.dol", 0x49A238, 0x4 + .4byte 0xBF800000 .global $$251986 $$251986: - .incbin "baserom.dol", 0x49A23C, 0x4 + .4byte 0 .global $$251987 $$251987: - .incbin "baserom.dol", 0x49A240, 0x4 + .4byte 0x42740000 .global $$251988 $$251988: - .incbin "baserom.dol", 0x49A244, 0x4 + .4byte 0x44200000 .global $$251989 $$251989: - .incbin "baserom.dol", 0x49A248, 0x4 + .4byte 0x43A70000 .global $$251990 $$251990: - .incbin "baserom.dol", 0x49A24C, 0x4 + .4byte 0xBF000000 diff --git a/asm/src/EasyRender3D.s b/asm/src/EasyRender3D.s index 741fa445..35c0f250 100644 --- a/asm/src/EasyRender3D.s +++ b/asm/src/EasyRender3D.s @@ -596,33 +596,35 @@ __sinit_$$3EasyRender3D_cpp: /* 80195850 00191690 4B FF F7 D4 */ b __ct__Q33hel4math8Matrix34Fv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023E8, 0x4 + .4byte 0x80195848 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251446 $$251446: - .incbin "baserom.dol", 0x49A208, 0x4 + .4byte 0x4040C0FF .global $$251747 $$251747: - .incbin "baserom.dol", 0x49A20C, 0x4 + .4byte 0xFFFFFFFF .global $$251775 $$251775: - .incbin "baserom.dol", 0x49A210, 0x4 + .4byte 0x40000000 .global $$251776 $$251776: - .incbin "baserom.dol", 0x49A214, 0x4 + .4byte 0 .global $$251777 $$251777: - .incbin "baserom.dol", 0x49A218, 0x8 + .4byte 0x40490FDB + .4byte 0 .global $$251782 $$251782: - .incbin "baserom.dol", 0x49A220, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251809 $$251809: - .incbin "baserom.dol", 0x49A228, 0x4 + .4byte 0x4222F983 .global $$251844 $$251844: - .incbin "baserom.dol", 0x49A22C, 0x4 + .4byte 0x40C00000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_viewMtx__26$$2unnamed$$2EasyRender3D_cpp$$2 diff --git a/asm/src/Effect.s b/asm/src/Effect.s index 41ea790c..553e219c 100644 --- a/asm/src/Effect.s +++ b/asm/src/Effect.s @@ -2865,13 +2865,17 @@ onObjStopFinished__Q43scn4step6weapon6EffectFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x44F3F0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x44F414, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$20: - .incbin "baserom.dol", 0x44F420, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1: - .incbin "baserom.dol", 0x44F444, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/EffectLocatorModelDesc.s b/asm/src/EffectLocatorModelDesc.s index b6e2fed8..d3dd55aa 100644 --- a/asm/src/EffectLocatorModelDesc.s +++ b/asm/src/EffectLocatorModelDesc.s @@ -49,18 +49,23 @@ lbl_803D6398: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250196 $$250196: - .incbin "baserom.dol", 0x48F878, 0x10 + .asciz "EffectLocator" + .balign 4 .global $$250197 $$250197: - .incbin "baserom.dol", 0x48F888, 0x28 + .asciz "step/weapon/common/EffectLocator" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498418, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q43scn4step6weapon36$$2unnamed$$2EffectLocatorModelDesc_cpp$$2 T_NODE_NAMES__Q43scn4step6weapon36$$2unnamed$$2EffectLocatorModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498420, 0x8 + .4byte 0x8055C038 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2CreateTmpl$$067$$1__Q43scn4step6weapon13ModelDescUtilFPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry_RQ43scn4step5chara9ModelDesc$$2desc diff --git a/asm/src/EffectManager.s b/asm/src/EffectManager.s index 9dfdb0f0..a6f197d6 100644 --- a/asm/src/EffectManager.s +++ b/asm/src/EffectManager.s @@ -2094,54 +2094,60 @@ drawLYT__Q33scn9grandmenu13EffectManagerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x44F450, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x44F474, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x44F480, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x44F4A4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x44F4B0, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x44F4D4, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253266 $$253266: - .incbin "baserom.dol", 0x49A918, 0x4 + .4byte 0x3DCCCCCD .global $$253267 $$253267: - .incbin "baserom.dol", 0x49A91C, 0x4 + .4byte 0x447A0000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253568 $$253568: - .incbin "baserom.dol", 0x49AAE0, 0x4 + .4byte 0x3DCCCCCD .global $$253569 $$253569: - .incbin "baserom.dol", 0x49AAE4, 0x4 + .4byte 0x447A0000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253274 $$253274: - .incbin "baserom.dol", 0x49AB80, 0x4 + .4byte 0x3DCCCCCD .global $$253275 $$253275: - .incbin "baserom.dol", 0x49AB84, 0x4 + .4byte 0x447A0000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253185 $$253185: - .incbin "baserom.dol", 0x49ED60, 0x4 + .4byte 0x3DCCCCCD .global $$253186 $$253186: - .incbin "baserom.dol", 0x49ED64, 0x4 + .4byte 0x447A0000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common49PrivateSingleton$$0Q36effect6detail13EffectManager$$1 diff --git a/asm/src/EmotionCtrl.s b/asm/src/EmotionCtrl.s index 50d8a09f..5b60c132 100644 --- a/asm/src/EmotionCtrl.s +++ b/asm/src/EmotionCtrl.s @@ -455,27 +455,31 @@ lbl_8023CA54: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255334 $$255334: - .incbin "baserom.dol", 0x495330, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255774 $$255774: - .incbin "baserom.dol", 0x49AFC8, 0x4 + .4byte 0 .global $$255809 $$255809: - .incbin "baserom.dol", 0x49AFCC, 0x4 + .4byte 0x4222F983 .global $$255810 $$255810: - .incbin "baserom.dol", 0x49AFD0, 0x4 + .4byte 0x3C8EFA35 .global $$255811 $$255811: - .incbin "baserom.dol", 0x49AFD4, 0x4 + .4byte 0x42B40000 .global $$255812 $$255812: - .incbin "baserom.dol", 0x49AFD8, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$255815 $$255815: - .incbin "baserom.dol", 0x49AFE0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255831 $$255831: - .incbin "baserom.dol", 0x49AFE8, 0x8 + .4byte 0x3F4CCCCD + .4byte 0 diff --git a/asm/src/Enemy.s b/asm/src/Enemy.s index fe461512..1cda36c8 100644 --- a/asm/src/Enemy.s +++ b/asm/src/Enemy.s @@ -4199,48 +4199,67 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46DF30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80288210 ;# ptr + .4byte 0x802881B4 ;# ptr .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46DF40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028820C ;# ptr + .4byte 0x802881D0 ;# ptr .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46DF50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80288208 ;# ptr + .4byte 0x802881EC ;# ptr .global __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1 __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1: - .incbin "baserom.dol", 0x46DF60, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80286DF4 ;# ptr .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x46DF6C, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x46DF90, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x46DF9C, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x46DFC0, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x46DFCC, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x46DFF0, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$270296 $$270296: - .incbin "baserom.dol", 0x49B990, 0x4 + .4byte 0 .global $$270297 $$270297: - .incbin "baserom.dol", 0x49B994, 0x4 + .4byte 0x40000000 .global $$270298 $$270298: - .incbin "baserom.dol", 0x49B998, 0x4 + .4byte 0x41800000 .global $$270299 $$270299: - .incbin "baserom.dol", 0x49B99C, 0x4 + .4byte 0x3ECCCCCD .global $$270305 $$270305: - .incbin "baserom.dol", 0x49B9A0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/EnemyCtrl.s b/asm/src/EnemyCtrl.s index 4b296f7d..1ac21fda 100644 --- a/asm/src/EnemyCtrl.s +++ b/asm/src/EnemyCtrl.s @@ -862,32 +862,67 @@ lbl_80260D4C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_OBVERSE_TABLE__Q53scn4step4boss6whispy23$$2unnamed$$2EnemyCtrl_cpp$$2 T_OBVERSE_TABLE__Q53scn4step4boss6whispy23$$2unnamed$$2EnemyCtrl_cpp$$2: - .incbin "baserom.dol", 0x413650, 0x58 + .4byte 0x00000002 + .4byte 0x00000155 + .4byte 0x40D80000 + .4byte 0x00000001 + .4byte 0x00000156 + .4byte 0x40D80000 + .4byte 0x00000009 + .4byte 0x00000157 + .4byte 0x40F00000 + .4byte 0x0000000A + .4byte 0x00000158 + .4byte 0x40980000 + .4byte 0x0000006C + .4byte 0x00000001 + .4byte 0x40980000 + .4byte 0x0000006D + .4byte 0x00000001 + .4byte 0x40980000 + .4byte 0x00000015 + .4byte 0x00000159 + .4byte 0x40D80000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1 __vt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1: - .incbin "baserom.dol", 0x466C80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260CFC ;# ptr + .4byte 0x80260C78 ;# ptr .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1: - .incbin "baserom.dol", 0x466C90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260CF8 ;# ptr + .4byte 0x80260C98 ;# ptr .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x466CA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260CF4 ;# ptr + .4byte 0x80260CB8 ;# ptr .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x466CB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80260CF0 ;# ptr + .4byte 0x80260CD4 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252522 $$252522: - .incbin "baserom.dol", 0x49B500, 0x4 + .4byte 0x40D80000 .global $$252577 $$252577: - .incbin "baserom.dol", 0x49B504, 0x4 + .4byte 0x3FC00000 .global $$252578 $$252578: - .incbin "baserom.dol", 0x49B508, 0x8 + .4byte 0x41280000 + .4byte 0 .global $$252581 $$252581: - .incbin "baserom.dol", 0x49B510, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/EnemyKiller.s b/asm/src/EnemyKiller.s index ad5cf043..6048a1d0 100644 --- a/asm/src/EnemyKiller.s +++ b/asm/src/EnemyKiller.s @@ -117,4 +117,5 @@ lbl_8027A5B4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252852 $$252852: - .incbin "baserom.dol", 0x49B918, 0x8 + .4byte 0x41C80000 + .4byte 0 diff --git a/asm/src/EnemySummonCtrl.s b/asm/src/EnemySummonCtrl.s index e2a362a3..a3018880 100644 --- a/asm/src/EnemySummonCtrl.s +++ b/asm/src/EnemySummonCtrl.s @@ -830,24 +830,28 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x461740, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023D5B0 ;# ptr + .4byte 0x8023D594 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259024 $$259024: - .incbin "baserom.dol", 0x49AFF0, 0x4 + .4byte 0 .global $$259025 $$259025: - .incbin "baserom.dol", 0x49AFF4, 0x4 + .4byte 0x3F800000 .global $$259026 $$259026: - .incbin "baserom.dol", 0x49AFF8, 0x4 + .4byte 0x3F000000 .global $$259027 $$259027: - .incbin "baserom.dol", 0x49AFFC, 0x4 + .4byte 0x3C8EFA35 .global $$259038 $$259038: - .incbin "baserom.dol", 0x49B000, 0x8 + .4byte 0x40800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step6weapon26challengemastersummonlight6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/Engine.s b/asm/src/Engine.s index 126db7b6..4a8d47e5 100644 --- a/asm/src/Engine.s +++ b/asm/src/Engine.s @@ -152,7 +152,9 @@ lbl_801BFCC4: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251818 $$251818: - .incbin "baserom.dol", 0x493698, 0x8 + .asciz "Mint" + .balign 4 .global $$251855 $$251855: - .incbin "baserom.dol", 0x4936A0, 0x8 + .4byte 0x25732E00 + .4byte 0 diff --git a/asm/src/EntryPoint.s b/asm/src/EntryPoint.s index 568a3a90..1e83a7e6 100644 --- a/asm/src/EntryPoint.s +++ b/asm/src/EntryPoint.s @@ -185,10 +185,12 @@ lbl_80177920: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249240 $$249240: - .incbin "baserom.dol", 0x44EDF8, 0x10 + .asciz "HBM_RESET" + .balign 4 + .4byte 0 .global $$249241 $$249241: - .incbin "baserom.dol", 0x44EE08, 0x10 + .asciz "WIISYSTEM_RESET" .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common31PrivateSingleton$$0Q23app6System$$1 diff --git a/asm/src/Exception.s b/asm/src/Exception.s index ca66692e..bd674eec 100644 --- a/asm/src/Exception.s +++ b/asm/src/Exception.s @@ -638,194 +638,256 @@ lbl_8018A1F0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248845 $$248845: - .incbin "baserom.dol", 0x44FA90, 0x10 + .asciz "SYSTEM RESET" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x44FAA0, 0x10 + .asciz "MACHINE CHECK" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x44FAB0, 0x14 + .asciz "EXTERNAL INTERRUPT" + .balign 4 .global $$248850 $$248850: - .incbin "baserom.dol", 0x44FAC4, 0xC + .asciz "ALIGNMENT" + .balign 4 .global $$248852 $$248852: - .incbin "baserom.dol", 0x44FAD0, 0x10 + .asciz "FLOATING POINT" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x44FAE0, 0xC + .asciz "DECREMENTER" .global $$248854 $$248854: - .incbin "baserom.dol", 0x44FAEC, 0xC + .asciz "SYSTEM CALL" .global $$248856 $$248856: - .incbin "baserom.dol", 0x44FAF8, 0x14 + .asciz "PERFORMACE MONITOR" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x44FB0C, 0xC + .asciz "BREAK POINT" .global $$248858 $$248858: - .incbin "baserom.dol", 0x44FB18, 0x14 + .asciz "SYSTEM INTERRUPT" + .balign 4 .global $$248859 $$248859: - .incbin "baserom.dol", 0x44FB2C, 0x14 + .asciz "THERMAL INTERRUPT" + .balign 4 .global $$248860 $$248860: - .incbin "baserom.dol", 0x44FB40, 0xC + .asciz "PROTECTION" + .balign 4 .global CPU_EXP_NAME__23$$2unnamed$$2Exception_cpp$$2 CPU_EXP_NAME__23$$2unnamed$$2Exception_cpp$$2: - .incbin "baserom.dol", 0x44FB4C, 0x44 + .4byte 0x80453990 + .4byte 0x804539A0 + .4byte 0x80556D38 + .4byte 0x80556D3C + .4byte 0x804539B0 + .4byte 0x804539C4 + .4byte 0x80556D40 + .4byte 0x804539D0 + .4byte 0x804539E0 + .4byte 0x804539EC + .4byte 0x80556D48 + .4byte 0x804539F8 + .4byte 0x80453A0C + .4byte 0x80453A18 + .4byte 0x80453A2C + .4byte 0x80453A40 + .4byte 0x804539D0 .global $$249260 $$249260: - .incbin "baserom.dol", 0x44FB90, 0x28 + .asciz "******** EXCEPTION OCCURRED! ********\n" + .balign 4 .global $$249261 $$249261: - .incbin "baserom.dol", 0x44FBB8, 0x20 + .asciz "******** USER HALT ********\n" + .balign 4 .global $$249262 $$249262: - .incbin "baserom.dol", 0x44FBD8, 0x10 + .asciz "---MainInfo---\n" .global $$249263 $$249263: - .incbin "baserom.dol", 0x44FBE8, 0x1C + .asciz "---EXCEPTION_INFO_GPR---\n" + .balign 4 .global $$249264 $$249264: - .incbin "baserom.dol", 0x44FC04, 0x20 + .asciz "---EXCEPTION_INFO_SRR0MAP---\n" + .balign 4 .global $$249265 $$249265: - .incbin "baserom.dol", 0x44FC24, 0x20 + .asciz "---EXCEPTION_INFO_GPRMAP---\n" + .balign 4 .global $$249266 $$249266: - .incbin "baserom.dol", 0x44FC44, 0x1C + .asciz "---EXCEPTION_INFO_FPR---\n" + .balign 4 .global $$249267 $$249267: - .incbin "baserom.dol", 0x44FC60, 0x1C + .asciz " MSR:%08XH FPSCR:%08XH\n" .global $$249268 $$249268: - .incbin "baserom.dol", 0x44FC7C, 0x24 + .asciz "--------------------------------\n" + .balign 4 .global $$249286 $$249286: - .incbin "baserom.dol", 0x44FCA0, 0x1C + .asciz " FPE: Invalid operation @" + .balign 4 .global $$249288 $$249288: - .incbin "baserom.dol", 0x44FCBC, 0x18 + .asciz " Infinity - Infinity\n" + .balign 4 .global $$249289 $$249289: - .incbin "baserom.dol", 0x44FCD4, 0x18 + .asciz " Infinity / Infinity\n" + .balign 4 .global $$249291 $$249291: - .incbin "baserom.dol", 0x44FCEC, 0x10 + .asciz " Infinity * 0\n" + .balign 4 .global $$249292 $$249292: - .incbin "baserom.dol", 0x44FCFC, 0x14 + .asciz " Invalid compare\n" + .balign 4 .global $$249293 $$249293: - .incbin "baserom.dol", 0x44FD10, 0x14 + .asciz " Software request\n" + .balign 4 .global $$249294 $$249294: - .incbin "baserom.dol", 0x44FD24, 0x18 + .asciz " Invalid square root\n" + .balign 4 .global $$249295 $$249295: - .incbin "baserom.dol", 0x44FD3C, 0x1C + .asciz " Invalid integer convert\n" + .balign 4 .global $$249296 $$249296: - .incbin "baserom.dol", 0x44FD58, 0x10 + .asciz " FPE: Overflow\n" .global $$249297 $$249297: - .incbin "baserom.dol", 0x44FD68, 0x14 + .asciz " FPE: Underflow\n" + .balign 4 .global $$249298 $$249298: - .incbin "baserom.dol", 0x44FD7C, 0x18 + .asciz " FPE: Zero division\n" + .balign 4 .global $$249299 $$249299: - .incbin "baserom.dol", 0x44FD94, 0x18 + .asciz " FPE: Inexact result\n" + .balign 4 .global $$249305 $$249305: - .incbin "baserom.dol", 0x44FDAC, 0x20 + .asciz "CONTEXT:%08XH (%s EXCEPTION)\n" + .balign 4 .global $$249306 $$249306: - .incbin "baserom.dol", 0x44FDCC, 0x10 + .asciz "CONTEXT:%08XH\n" + .balign 4 .global $$249307 $$249307: - .incbin "baserom.dol", 0x44FDDC, 0x1C + .asciz "SRR0: %08XH SRR1:%08XH\n" .global $$249308 $$249308: - .incbin "baserom.dol", 0x44FDF8, 0x1C + .asciz "DSISR: %08XH DAR: %08XH\n" .global $$249318 $$249318: - .incbin "baserom.dol", 0x44FE14, 0x28 + .asciz "-------------------------------- GPR\n" + .balign 4 .global $$249319 $$249319: - .incbin "baserom.dol", 0x44FE3C, 0x28 + .asciz "R%02d:%08XH R%02d:%08XH R%02d:%08XH\n" + .balign 4 .global $$249320 $$249320: - .incbin "baserom.dol", 0x44FE64, 0x1C + .asciz "R%02d:%08XH R%02d:%08XH\n" + .balign 4 .global $$249329 $$249329: - .incbin "baserom.dol", 0x44FE80, 0x2C + .asciz "-------------------------------- GPRMAP\n" + .balign 4 .global $$249330 $$249330: - .incbin "baserom.dol", 0x44FEAC, 0x10 + .asciz "R%02d: %08XH " + .balign 4 .global $$249331 $$249331: - .incbin "baserom.dol", 0x44FEBC, 0x14 + .asciz " no information\n" + .balign 4 .global $$249332 $$249332: - .incbin "baserom.dol", 0x44FED0, 0x28 + .asciz " no register which seem to address.\n" + .balign 4 .global $$249338 $$249338: - .incbin "baserom.dol", 0x44FEF8, 0x2C + .asciz "-------------------------------- SRR0MAP\n" + .balign 4 .global $$249339 $$249339: - .incbin "baserom.dol", 0x44FF24, 0x10 + .asciz "SRR0: %08XH " + .balign 4 .global $$249350 $$249350: - .incbin "baserom.dol", 0x44FF34, 0x14 + .asciz "F%02d: Nan " + .balign 4 .global $$249351 $$249351: - .incbin "baserom.dol", 0x44FF48, 0x14 + .asciz "F%02d:+Inf " + .balign 4 .global $$249352 $$249352: - .incbin "baserom.dol", 0x44FF5C, 0x14 + .asciz "F%02d:-Inf " + .balign 4 .global $$249354 $$249354: - .incbin "baserom.dol", 0x44FF70, 0x14 + .asciz "F%02d: 0.0 " + .balign 4 .global $$249355 $$249355: - .incbin "baserom.dol", 0x44FF84, 0xC + .asciz "F%02d:%+.3E" .global $$249364 $$249364: - .incbin "baserom.dol", 0x44FF90, 0x28 + .asciz "-------------------------------- FPR\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248847 $$248847: - .incbin "baserom.dol", 0x493118, 0x4 + .4byte 0x44534900 .global $$248848 $$248848: - .incbin "baserom.dol", 0x49311C, 0x4 + .4byte 0x49534900 .global $$248851 $$248851: - .incbin "baserom.dol", 0x493120, 0x8 + .asciz "PROGRAM" .global $$248855 $$248855: - .incbin "baserom.dol", 0x493128, 0x8 + .asciz "TRACE" + .balign 4 .global $$249287 $$249287: - .incbin "baserom.dol", 0x493130, 0x8 + .asciz " SNaN\n" + .balign 4 .global $$249290 $$249290: - .incbin "baserom.dol", 0x493138, 0x8 + .asciz " 0 / 0\n" .global $$249365 $$249365: - .incbin "baserom.dol", 0x493140, 0x4 + .4byte 0x20000000 .global $$249366 $$249366: - .incbin "baserom.dol", 0x493144, 0x4 + .4byte 0x0A000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249353 $$249353: - .incbin "baserom.dol", 0x49A198, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global object___Q33hel6common38ExplicitSingleton$$0Q26freeze9Exception$$1 diff --git a/asm/src/ExplainBase.s b/asm/src/ExplainBase.s index d0077814..525d5696 100644 --- a/asm/src/ExplainBase.s +++ b/asm/src/ExplainBase.s @@ -1556,132 +1556,184 @@ lbl_803BBC98: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256661 $$256661: - .incbin "baserom.dol", 0x48D070, 0x14 + .asciz "ExplainWindowBase" + .balign 4 .global $$256662 $$256662: - .incbin "baserom.dol", 0x48D084, 0xC + .asciz "ButtonBaseN" .global $$256664 $$256664: - .incbin "baserom.dol", 0x48D090, 0xC + .asciz "RankingN" + .balign 4 .global $$256947 $$256947: - .incbin "baserom.dol", 0x48D09C, 0x14 + .asciz "ExplainWindowMaster" .global $$256948 $$256948: - .incbin "baserom.dol", 0x48D0B0, 0x14 + .asciz "ExplainWindowMusou" + .balign 4 .global $$256949 $$256949: - .incbin "baserom.dol", 0x48D0C4, 0x18 + .asciz "ExplainWindowChallenge" + .balign 4 .global $$256950 $$256950: - .incbin "baserom.dol", 0x48D0DC, 0x14 + .asciz "WindowPictureN" + .balign 4 + .4byte 0 .global $$256956 $$256956: - .incbin "baserom.dol", 0x48D0F0, 0x10 + .asciz "TotalScoreBaseN" .global $$256957 $$256957: - .incbin "baserom.dol", 0x48D100, 0xC + .asciz "PlayerIconN" .global $$256959 $$256959: - .incbin "baserom.dol", 0x48D10C, 0xC + .asciz "%sChallenge" .global $$256961 $$256961: - .incbin "baserom.dol", 0x48D118, 0xC + .asciz "TitleShadow" .global $$256962 $$256962: - .incbin "baserom.dol", 0x48D124, 0xC + .asciz "SmEXTitle" + .balign 4 .global $$256963 $$256963: - .incbin "baserom.dol", 0x48D130, 0x10 + .asciz "SmEXTitleShadow" .global $$256965 $$256965: - .incbin "baserom.dol", 0x48D140, 0x10 + .asciz "SmTitleShadow" + .balign 4 .global $$256967 $$256967: - .incbin "baserom.dol", 0x48D150, 0x10 + .asciz "FgTitleShadow" + .balign 4 .global $$256968 $$256968: - .incbin "baserom.dol", 0x48D160, 0x14 + .asciz "Explain%sChallenge" + .balign 4 .global $$256969 $$256969: - .incbin "baserom.dol", 0x48D174, 0x10 + .asciz "TrainingShot" + .balign 4 .global $$256971 $$256971: - .incbin "baserom.dol", 0x48D184, 0xC + .asciz "BestScore" + .balign 4 .global $$256972 $$256972: - .incbin "baserom.dol", 0x48D190, 0x14 + .asciz "ExplainBestScore" + .balign 4 .global $$257160 $$257160: - .incbin "baserom.dol", 0x48D1A4, 0x20 + .4byte 0x803BB950 + .4byte 0x803BB960 + .4byte 0x803BB970 + .4byte 0x803BB980 + .4byte 0x803BB9A0 + .4byte 0x803BB990 + .4byte 0x803BB9C0 + .4byte 0x803BB9B0 .global $$257159 $$257159: - .incbin "baserom.dol", 0x48D1C4, 0x34 + .4byte 0x803BB814 + .4byte 0x803BB820 + .4byte 0x803BB82C + .4byte 0x803BB880 + .4byte 0x803BB838 + .4byte 0x803BB844 + .4byte 0x803BB850 + .4byte 0x803BB88C + .4byte 0x803BB85C + .4byte 0x803BB868 + .4byte 0x803BB898 + .4byte 0x803BB8A4 + .4byte 0x803BB874 .global $$257190 $$257190: - .incbin "baserom.dol", 0x48D1F8, 0x14 + .asciz "StepExplainSword.dn" .global $$257191 $$257191: - .incbin "baserom.dol", 0x48D20C, 0x18 + .asciz "StepExplainParasol.dn" + .balign 4 .global $$257192 $$257192: - .incbin "baserom.dol", 0x48D224, 0x14 + .asciz "StepExplainSpark.dn" .global $$257193 $$257193: - .incbin "baserom.dol", 0x48D238, 0x14 + .asciz "StepExplainWhip.dn" + .balign 4 .global $$257194 $$257194: - .incbin "baserom.dol", 0x48D24C, 0x14 + .asciz "StepExplainWing.dn" + .balign 4 .global $$257195 $$257195: - .incbin "baserom.dol", 0x48D260, 0x18 + .asciz "StepExplainFighter.dn" + .balign 4 .global $$257196 $$257196: - .incbin "baserom.dol", 0x48D278, 0x48 + .asciz "StepExplainSmash.dn" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256660 $$256660: - .incbin "baserom.dol", 0x497E40, 0x8 + .asciz "Base" + .balign 4 .global $$256663 $$256663: - .incbin "baserom.dol", 0x497E48, 0x8 + .asciz "BackN" + .balign 4 .global $$256665 $$256665: - .incbin "baserom.dol", 0x497E50, 0x8 + .asciz "TopN" + .balign 4 .global $$256946 $$256946: - .incbin "baserom.dol", 0x497E58, 0x8 + .asciz "Open" + .balign 4 .global $$256951 $$256951: - .incbin "baserom.dol", 0x497E60, 0x8 + .asciz "BGStarN" .global $$256952 $$256952: - .incbin "baserom.dol", 0x497E68, 0x8 + .asciz "Wait" + .balign 4 .global $$256953 $$256953: - .incbin "baserom.dol", 0x497E70, 0x8 + .asciz "StarN" + .balign 4 .global $$256954 $$256954: - .incbin "baserom.dol", 0x497E78, 0x8 + .asciz "ShotN" + .balign 4 .global $$256955 $$256955: - .incbin "baserom.dol", 0x497E80, 0x8 + .asciz "MedalN" + .balign 4 .global $$256958 $$256958: - .incbin "baserom.dol", 0x497E88, 0x8 + .asciz "NoScore" .global $$256960 $$256960: - .incbin "baserom.dol", 0x497E90, 0x8 + .asciz "Title" + .balign 4 .global $$256964 $$256964: - .incbin "baserom.dol", 0x497E98, 0x8 + .asciz "SmTitle" .global $$256966 $$256966: - .incbin "baserom.dol", 0x497EA0, 0x8 + .asciz "FgTitle" .global $$256970 $$256970: - .incbin "baserom.dol", 0x497EA8, 0x8 + .asciz "Shot" + .balign 4 .global $$257157 $$257157: - .incbin "baserom.dol", 0x497EB0, 0x8 + .asciz "Close" + .balign 4 diff --git a/asm/src/ExplainButton.s b/asm/src/ExplainButton.s index 4051a3f7..855d8ce1 100644 --- a/asm/src/ExplainButton.s +++ b/asm/src/ExplainButton.s @@ -333,102 +333,153 @@ lbl_803BC15C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251576 $$251576: - .incbin "baserom.dol", 0x48D2C0, 0x10 + .asciz "ExplainStart" + .balign 4 .global $$251577 $$251577: - .incbin "baserom.dol", 0x48D2D0, 0x14 + .asciz "ExplainCommandList" + .balign 4 .global $$251578 $$251578: - .incbin "baserom.dol", 0x48D2E4, 0x10 + .asciz "ExplainGhost" + .balign 4 .global $$251579 $$251579: - .incbin "baserom.dol", 0x48D2F4, 0x10 + .asciz "ExplainRanking" + .balign 4 .global $$251580 $$251580: - .incbin "baserom.dol", 0x48D304, 0x14 + .asciz "AbilitySelect_Sword" .global $$251581 $$251581: - .incbin "baserom.dol", 0x48D318, 0x18 + .asciz "AbilitySelect_Parasol" + .balign 4 .global $$251582 $$251582: - .incbin "baserom.dol", 0x48D330, 0x14 + .asciz "AbilitySelect_Spark" .global $$251583 $$251583: - .incbin "baserom.dol", 0x48D344, 0x14 + .asciz "AbilitySelect_Whip" + .balign 4 .global $$251584 $$251584: - .incbin "baserom.dol", 0x48D358, 0x14 + .asciz "AbilitySelect_Wing" + .balign 4 .global $$251585 $$251585: - .incbin "baserom.dol", 0x48D36C, 0x18 + .asciz "AbilitySelect_Fighter" + .balign 4 .global $$251586 $$251586: - .incbin "baserom.dol", 0x48D384, 0x18 + .asciz "AbilitySelect_Normal" + .balign 4 .global $$251587 $$251587: - .incbin "baserom.dol", 0x48D39C, 0x14 + .asciz "AbilitySelect_Smash" .global ButtonMsgTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2 ButtonMsgTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2: - .incbin "baserom.dol", 0x48D3B0, 0x30 + .4byte 0x804911C0 + .4byte 0x804911D0 + .4byte 0x804911E4 + .4byte 0x804911F4 + .4byte 0x80491204 + .4byte 0x80491218 + .4byte 0x80491230 + .4byte 0x80491244 + .4byte 0x80491258 + .4byte 0x8049126C + .4byte 0x80491284 + .4byte 0x8049129C .global $$251590 $$251590: - .incbin "baserom.dol", 0x48D3E0, 0xC + .asciz "ParasolN" + .balign 4 .global $$251594 $$251594: - .incbin "baserom.dol", 0x48D3EC, 0xC + .asciz "FighterN" + .balign 4 .global ButtonIconTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2 ButtonIconTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2: - .incbin "baserom.dol", 0x48D3F8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055BAD8 + .4byte 0x804912E0 + .4byte 0x8055BAE0 + .4byte 0x8055BAE8 + .4byte 0x8055BAF0 + .4byte 0x804912EC + .4byte 0x8055BAF8 + .4byte 0x8055BB00 .global $$252410 $$252410: - .incbin "baserom.dol", 0x48D428, 0x14 + .asciz "ButtonActionBase" + .balign 4 .global $$252412 $$252412: - .incbin "baserom.dol", 0x48D43C, 0x10 + .asciz "TrainingIcon" + .balign 4 .global $$252414 $$252414: - .incbin "baserom.dol", 0x48D44C, 0x10 + .asciz "TrainingIconN" + .balign 4 .global $$252521 $$252521: - .incbin "baserom.dol", 0x48D45C, 0x10 + .asciz "TrainingButton" + .balign 4 .global $$252522 $$252522: - .incbin "baserom.dol", 0x48D46C, 0x3C + .asciz "ButtonBigN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251589 $$251589: - .incbin "baserom.dol", 0x497EB8, 0x8 + .asciz "SwordN" + .balign 4 .global $$251591 $$251591: - .incbin "baserom.dol", 0x497EC0, 0x8 + .asciz "SparkN" + .balign 4 .global $$251592 $$251592: - .incbin "baserom.dol", 0x497EC8, 0x8 + .asciz "WhipN" + .balign 4 .global $$251593 $$251593: - .incbin "baserom.dol", 0x497ED0, 0x8 + .asciz "WingN" + .balign 4 .global $$251595 $$251595: - .incbin "baserom.dol", 0x497ED8, 0x8 + .asciz "NormalN" .global $$251596 $$251596: - .incbin "baserom.dol", 0x497EE0, 0x8 + .asciz "SmashN" + .balign 4 .global $$252411 $$252411: - .incbin "baserom.dol", 0x497EE8, 0x8 + .asciz "Button" + .balign 4 .global $$252413 $$252413: - .incbin "baserom.dol", 0x497EF0, 0x8 + .asciz "ButtonN" .global $$252520 $$252520: - .incbin "baserom.dol", 0x497EF8, 0x4 + .4byte 0 .global $$252528 $$252528: - .incbin "baserom.dol", 0x497EFC, 0xC + .asciz "Focus" + .balign 4 + .4byte 0 .global $$252531 $$252531: - .incbin "baserom.dol", 0x497F08, 0x8 + .asciz "UnFocus" .global $$252534 $$252534: - .incbin "baserom.dol", 0x497F10, 0x8 + .asciz "Decide" + .balign 4 diff --git a/asm/src/ExplainConsole.s b/asm/src/ExplainConsole.s index 90ae051a..130ec454 100644 --- a/asm/src/ExplainConsole.s +++ b/asm/src/ExplainConsole.s @@ -986,73 +986,162 @@ lbl_803BCF40: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x41BF28, 0x80 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x8055BB38 + .4byte 0x00000002 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x8055BB38 + .4byte 0x00000002 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x8055BB38 + .4byte 0x00000002 + .4byte 0x8055BB38 + .4byte 0x00000002 + .4byte 0x804913A8 + .4byte 0x00000003 + .4byte 0x804913D4 + .4byte 0x00000003 + .4byte 0x804913E0 + .4byte 0x00000003 + .4byte 0x8055BB40 + .4byte 0x00000002 .global cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x41BFA8, 0x80 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913C8 + .4byte 0x00000003 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913C8 + .4byte 0x00000003 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913C8 + .4byte 0x00000003 + .4byte 0x804913C8 + .4byte 0x00000003 + .4byte 0x804913B8 + .4byte 0x00000004 + .4byte 0x804913D4 + .4byte 0x00000003 + .4byte 0x804913E0 + .4byte 0x00000003 + .4byte 0x8055BB40 + .4byte 0x00000002 .section .data, "wa" # 0x80421040 - 0x80496700 .global bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x48D4A8, 0x10 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0 .global bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x48D4B8, 0x10 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000003 .global bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x48D4C8, 0xC + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000003 .global bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x48D4D4, 0xC + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 .global bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x48D4E0, 0xC + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x00000008 .global $$253492 $$253492: - .incbin "baserom.dol", 0x48D4EC, 0xC + .asciz "ButtonBase" + .balign 4 .global $$253493 $$253493: - .incbin "baserom.dol", 0x48D4F8, 0xC + .asciz "ButtonBG" + .balign 4 .global $$253496 $$253496: - .incbin "baserom.dol", 0x48D504, 0xC + .asciz "ButtonBGN" + .balign 4 .global $$253690 $$253690: - .incbin "baserom.dol", 0x48D510, 0xC + .asciz "TrainingLv3" .global $$253691 $$253691: - .incbin "baserom.dol", 0x48D51C, 0xC + .asciz "Training" + .balign 4 .global $$253692 $$253692: - .incbin "baserom.dol", 0x48D528, 0xC + .asciz "MasterGhost" .global $$253694 $$253694: - .incbin "baserom.dol", 0x48D534, 0x10 + .asciz "ChallengeGhost" + .balign 4 .global $$253695 $$253695: - .incbin "baserom.dol", 0x48D544, 0xC + .asciz "Challenge" + .balign 4 .global $$253696 $$253696: - .incbin "baserom.dol", 0x48D550, 0x40 + .asciz "Button%dN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x497F18, 0x8 + .4byte 0 + .4byte 0x00000003 .global bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .incbin "baserom.dol", 0x497F20, 0x8 + .4byte 0x0000000B + .4byte 0x0000000A .global $$253494 $$253494: - .incbin "baserom.dol", 0x497F28, 0x8 + .asciz "CursorN" .global $$253693 $$253693: - .incbin "baserom.dol", 0x497F30, 0x8 + .asciz "Master" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253495 $$253495: - .incbin "baserom.dol", 0x49E4D8, 0x4 + .4byte 0 .global $$253847 $$253847: - .incbin "baserom.dol", 0x49E4DC, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/ExplainCursor.s b/asm/src/ExplainCursor.s index 97480bd0..cc4b4819 100644 --- a/asm/src/ExplainCursor.s +++ b/asm/src/ExplainCursor.s @@ -289,15 +289,18 @@ lbl_803BD324: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252146 $$252146: - .incbin "baserom.dol", 0x48D590, 0x10 + .asciz "ButtonCursor" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252181 $$252181: - .incbin "baserom.dol", 0x497F38, 0x8 + .asciz "UnFocus" .global $$252190 $$252190: - .incbin "baserom.dol", 0x497F40, 0x8 + .asciz "Focus" + .balign 4 .global $$252221 $$252221: - .incbin "baserom.dol", 0x497F48, 0x8 + .asciz "Decide" + .balign 4 diff --git a/asm/src/ExplainUtil.s b/asm/src/ExplainUtil.s index 2e09efa5..538efa6a 100644 --- a/asm/src/ExplainUtil.s +++ b/asm/src/ExplainUtil.s @@ -191,203 +191,362 @@ MedalToGrade__Q53scn4step4info5lvmap11ExplainUtilFQ33scn4step18ChallengeMedalKin .section .rodata, "wa" # 0x80406560 - 0x80421040 .global explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .incbin "baserom.dol", 0x41C028, 0x140 + .4byte 0x804914A0 + .4byte 0x804914AC + .4byte 0x804914B8 + .4byte 0x8055BB70 + .4byte 0x8055BB70 + .4byte 0x804914C4 + .4byte 0x804914D4 + .4byte 0x804914E0 + .4byte 0x8055BB78 + .4byte 0x8055BB78 + .4byte 0x804914EC + .4byte 0x804914F8 + .4byte 0x80491504 + .4byte 0x8055BB80 + .4byte 0x8055BB80 + .4byte 0x80491510 + .4byte 0x80491520 + .4byte 0x8049152C + .4byte 0x8055BB88 + .4byte 0x8055BB88 + .4byte 0x80491538 + .4byte 0x80491544 + .4byte 0x80491550 + .4byte 0x8055BB90 + .4byte 0x8055BB90 + .4byte 0x8049155C + .4byte 0x8049156C + .4byte 0x80491578 + .4byte 0x8055BB98 + .4byte 0x8055BB98 + .4byte 0x80491584 + .4byte 0x80491590 + .4byte 0x8049159C + .4byte 0x8055BBA0 + .4byte 0x8055BBA0 + .4byte 0x80491510 + .4byte 0x80491520 + .4byte 0x804915A8 + .4byte 0x8055BBA8 + .4byte 0x8055BBA8 + .4byte 0x804915B4 + .4byte 0x804915C0 + .4byte 0x804915CC + .4byte 0x8055BBB0 + .4byte 0x8055BBB0 + .4byte 0x804915D8 + .4byte 0x804915E8 + .4byte 0x804915F4 + .4byte 0x8055BBB8 + .4byte 0x8055BBB8 + .4byte 0x80491510 + .4byte 0x80491520 + .4byte 0x80491600 + .4byte 0x8055BBC0 + .4byte 0x8055BBC0 + .4byte 0x80491510 + .4byte 0x80491520 + .4byte 0x8049160C + .4byte 0x8055BBC0 + .4byte 0x8055BBC8 + .4byte 0x804915B4 + .4byte 0x804915C0 + .4byte 0x804915CC + .4byte 0x8055BBB0 + .4byte 0x8055BBD0 + .4byte 0x80491618 + .4byte 0x80491628 + .4byte 0x80491638 + .4byte 0x80491648 + .4byte 0x80491648 + .4byte 0x80491618 + .4byte 0x80491628 + .4byte 0x80491654 + .4byte 0x80491664 + .4byte 0x80491664 + .4byte 0x80491618 + .4byte 0x80491628 + .4byte 0x80491670 + .4byte 0x80491680 + .4byte 0x80491680 .global explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .incbin "baserom.dol", 0x41C168, 0x80 + .4byte 0x8055BBD8 + .4byte 0x8055BBD8 + .4byte 0x8055BBD8 + .4byte 0x8055BBD8 + .4byte 0x8055BBD8 + .4byte 0x8055BBD8 + .4byte 0x8055BBDC + .4byte 0x8055BBD8 + .4byte 0x8055BBE4 + .4byte 0x8055BBE4 + .4byte 0x8055BBE4 + .4byte 0x8055BBE4 + .4byte 0x8055BBE4 + .4byte 0x8055BBE4 + .4byte 0x8055BBDC + .4byte 0x8055BBE4 + .4byte 0x8055BBE8 + .4byte 0x8055BBE8 + .4byte 0x8055BBE8 + .4byte 0x8055BBE8 + .4byte 0x8055BBDC + .4byte 0x8055BBE8 + .4byte 0x8055BBDC + .4byte 0x8055BBE8 + .4byte 0x8055BBE8 + .4byte 0x8055BBE8 + .4byte 0x8055BBDC + .4byte 0x8055BBD8 + .4byte 0x8055BBDC + .4byte 0x8055BBE4 + .4byte 0x8055BBDC + .4byte 0x8055BBE8 .global medalToGradeTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 medalToGradeTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .incbin "baserom.dol", 0x41C1E8, 0x18 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248733 $$248733: - .incbin "baserom.dol", 0x48D5A0, 0xC + .asciz "BGStarSword" .global $$248734 $$248734: - .incbin "baserom.dol", 0x48D5AC, 0xC + .asciz "StarSword" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x48D5B8, 0xC + .asciz "ShotSword" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x48D5C4, 0x10 + .asciz "BGStarParasol" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x48D5D4, 0xC + .asciz "StarParasol" .global $$248739 $$248739: - .incbin "baserom.dol", 0x48D5E0, 0xC + .asciz "ShotParasol" .global $$248741 $$248741: - .incbin "baserom.dol", 0x48D5EC, 0xC + .asciz "BGStarSpark" .global $$248742 $$248742: - .incbin "baserom.dol", 0x48D5F8, 0xC + .asciz "StarSpark" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x48D604, 0xC + .asciz "ShotSpark" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x48D610, 0x10 + .asciz "BGStarMaster" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x48D620, 0xC + .asciz "StarMaster" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x48D62C, 0xC + .asciz "ShotMaster1" .global $$248749 $$248749: - .incbin "baserom.dol", 0x48D638, 0xC + .asciz "BGStarWhip" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x48D644, 0xC + .asciz "StarWhip" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x48D650, 0xC + .asciz "ShotWhip" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x48D65C, 0x10 + .asciz "BGStarFighter" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x48D66C, 0xC + .asciz "StarFighter" .global $$248755 $$248755: - .incbin "baserom.dol", 0x48D678, 0xC + .asciz "ShotFighter" .global $$248757 $$248757: - .incbin "baserom.dol", 0x48D684, 0xC + .asciz "BGStarWing" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x48D690, 0xC + .asciz "StarWing" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x48D69C, 0xC + .asciz "ShotWing" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x48D6A8, 0xC + .asciz "ShotMaster2" .global $$248763 $$248763: - .incbin "baserom.dol", 0x48D6B4, 0xC + .asciz "BGStarSmash" .global $$248764 $$248764: - .incbin "baserom.dol", 0x48D6C0, 0xC + .asciz "StarSmash" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x48D6CC, 0xC + .asciz "ShotSmash" + .balign 4 .global $$248767 $$248767: - .incbin "baserom.dol", 0x48D6D8, 0x10 + .asciz "BGStarNormal" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x48D6E8, 0xC + .asciz "StarNormal" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x48D6F4, 0xC + .asciz "ShotNormal" + .balign 4 .global $$248771 $$248771: - .incbin "baserom.dol", 0x48D700, 0xC + .asciz "ShotMaster3" .global $$248773 $$248773: - .incbin "baserom.dol", 0x48D70C, 0xC + .asciz "ShotMaster4" .global $$248776 $$248776: - .incbin "baserom.dol", 0x48D718, 0x10 + .asciz "BGStarAbility" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x48D728, 0x10 + .asciz "StarTraining" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x48D738, 0x10 + .asciz "ShotAbility1" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x48D748, 0xC + .asciz "Ability1" + .balign 4 .global $$248780 $$248780: - .incbin "baserom.dol", 0x48D754, 0x10 + .asciz "ShotAbility2" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x48D764, 0xC + .asciz "Ability2" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x48D770, 0x10 + .asciz "ShotAbility3" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x48D780, 0x10 + .asciz "Ability3" + .balign 4 + .4byte 0 .global $$248807 $$248807: - .incbin "baserom.dol", 0x48D790, 0x18 + .asciz "step/challengeship/Main" .global $$248808 $$248808: - .incbin "baserom.dol", 0x48D7A8, 0x10 + .asciz "MedalBronzeS" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x48D7B8, 0x10 + .asciz "MedalSilverS" + .balign 4 .global $$248810 $$248810: - .incbin "baserom.dol", 0x48D7C8, 0xC + .asciz "MedalGoldS" + .balign 4 .global $$248811 $$248811: - .incbin "baserom.dol", 0x48D7D4, 0x10 + .asciz "MedalPlatinumS" + .balign 4 .global medalNameTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 medalNameTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .incbin "baserom.dol", 0x48D7E4, 0x14 + .4byte 0x804916A8 + .4byte 0x804916A8 + .4byte 0x804916B8 + .4byte 0x804916C8 + .4byte 0x804916D4 .global $$249054 $$249054: - .incbin "baserom.dol", 0x48D7F8, 0x18 + .asciz "step/challengeship/%s" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248736 $$248736: - .incbin "baserom.dol", 0x497F50, 0x8 + .asciz "Sword" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x497F58, 0x8 + .asciz "Parasol" .global $$248744 $$248744: - .incbin "baserom.dol", 0x497F60, 0x8 + .asciz "Spark" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x497F68, 0x8 + .asciz "Master1" .global $$248752 $$248752: - .incbin "baserom.dol", 0x497F70, 0x8 + .asciz "Whip" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x497F78, 0x8 + .asciz "Fighter" .global $$248760 $$248760: - .incbin "baserom.dol", 0x497F80, 0x8 + .asciz "Wing" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x497F88, 0x8 + .asciz "Master2" .global $$248766 $$248766: - .incbin "baserom.dol", 0x497F90, 0x8 + .asciz "Smash" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x497F98, 0x8 + .asciz "Normal" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x497FA0, 0x8 + .asciz "Master3" .global $$248774 $$248774: - .incbin "baserom.dol", 0x497FA8, 0x8 + .asciz "Master4" .global $$248775 $$248775: - .incbin "baserom.dol", 0x497FB0, 0x8 + .asciz "SmashEx" .global $$248794 $$248794: - .incbin "baserom.dol", 0x497FB8, 0x4 + .4byte 0x4C763100 .global $$248795 $$248795: - .incbin "baserom.dol", 0x497FBC, 0x8 + .asciz "Main" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x497FC4, 0x4 + .4byte 0x4C763200 .global $$248797 $$248797: - .incbin "baserom.dol", 0x497FC8, 0x4 + .4byte 0x4C763300 .global explainCommonPath__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainCommonPath__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .incbin "baserom.dol", 0x497FCC, 0x4 + .4byte 0x80491690 diff --git a/asm/src/Explanation.s b/asm/src/Explanation.s index 9eee6b43..07aeb27d 100644 --- a/asm/src/Explanation.s +++ b/asm/src/Explanation.s @@ -485,83 +485,144 @@ lbl_803F542C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2 t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2: - .incbin "baserom.dol", 0x41CC40, 0x90 + .4byte 0 + .4byte 0 + .4byte 0x0000000F + .4byte 0x804957B0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x804957C8 + .4byte 0 + .4byte 0x00000002 + .4byte 0x0000000F + .4byte 0x804957D8 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x0000000F + .4byte 0x8055C4F0 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x0000000F + .4byte 0x8055C4F8 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x0000000F + .4byte 0x8055C500 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x0000000F + .4byte 0x804957EC + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x0000000F + .4byte 0x804957FC + .4byte 0x00000001 + .4byte 0x00000006 + .4byte 0x0000000F + .4byte 0x8055C508 .global $$252218 $$252218: - .incbin "baserom.dol", 0x41CCD0, 0x20 + .4byte 0x80495844 + .4byte 0x80495850 + .4byte 0x8049585C + .4byte 0x80495868 + .4byte 0x80495874 + .4byte 0x80495880 + .4byte 0x80495890 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251882 $$251882: - .incbin "baserom.dol", 0x4918B0, 0x18 + .asciz "Explain_Challenge" + .balign 4 + .4byte 0 .global $$251883 $$251883: - .incbin "baserom.dol", 0x4918C8, 0x10 + .asciz "Explain_History" .global $$251884 $$251884: - .incbin "baserom.dol", 0x4918D8, 0x14 + .asciz "Explain_Collection" + .balign 4 .global $$251888 $$251888: - .incbin "baserom.dol", 0x4918EC, 0x10 + .asciz "KirbyDreamLand" + .balign 4 .global $$251889 $$251889: - .incbin "baserom.dol", 0x4918FC, 0xC + .asciz "KirbySDX" + .balign 4 .global $$252784 $$252784: - .incbin "baserom.dol", 0x491908, 0x10 + .asciz "grandmenu/Main" + .balign 4 .global $$252785 $$252785: - .incbin "baserom.dol", 0x491918, 0xC + .asciz "Explanation" .global $$252786 $$252786: - .incbin "baserom.dol", 0x491924, 0x10 + .asciz "explanationLT" + .balign 4 .global $$252788 $$252788: - .incbin "baserom.dol", 0x491934, 0x10 + .asciz "explanationCT" + .balign 4 .global $$252211 $$252211: - .incbin "baserom.dol", 0x491944, 0xC + .asciz "Iconstar_mc" .global $$252212 $$252212: - .incbin "baserom.dol", 0x491950, 0xC + .asciz "Iconstar_tl" .global $$252213 $$252213: - .incbin "baserom.dol", 0x49195C, 0xC + .asciz "Iconstar_vc" .global $$252214 $$252214: - .incbin "baserom.dol", 0x491968, 0xC + .asciz "Iconstar_gb" .global $$252215 $$252215: - .incbin "baserom.dol", 0x491974, 0xC + .asciz "Iconstar_fc" .global $$252216 $$252216: - .incbin "baserom.dol", 0x491980, 0x10 + .asciz "Iconstar_sfc" + .balign 4 .global $$252217 $$252217: - .incbin "baserom.dol", 0x491990, 0x40 + .asciz "Iconstar_64" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251885 $$251885: - .incbin "baserom.dol", 0x4988D0, 0x8 + .asciz "Kirby1" + .balign 4 .global $$251886 $$251886: - .incbin "baserom.dol", 0x4988D8, 0x8 + .asciz "Kirby2" + .balign 4 .global $$251887 $$251887: - .incbin "baserom.dol", 0x4988E0, 0x8 + .asciz "Kirby3" + .balign 4 .global $$251890 $$251890: - .incbin "baserom.dol", 0x4988E8, 0x8 + .asciz "Kirby64" .global $$252787 $$252787: - .incbin "baserom.dol", 0x4988F0, 0x8 + .asciz "Range" + .balign 4 .global $$252857 $$252857: - .incbin "baserom.dol", 0x4988F8, 0x8 + .asciz "Main" + .balign 4 .global $$252877 $$252877: - .incbin "baserom.dol", 0x498900, 0x4 + .4byte 0x496E0000 .global $$252880 $$252880: - .incbin "baserom.dol", 0x498904, 0x4 + .4byte 0x4F757400 diff --git a/asm/src/EyeCtrl.s b/asm/src/EyeCtrl.s index 4eb3ea13..c027b8fc 100644 --- a/asm/src/EyeCtrl.s +++ b/asm/src/EyeCtrl.s @@ -152,4 +152,9 @@ lbl_8023D794: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_WAIT_FRAME_TABLE__Q53scn4step4boss15challengemaster21$$2unnamed$$2EyeCtrl_cpp$$2 T_WAIT_FRAME_TABLE__Q53scn4step4boss15challengemaster21$$2unnamed$$2EyeCtrl_cpp$$2: - .incbin "baserom.dol", 0x412898, 0x18 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x0000003C + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x0000001E diff --git a/asm/src/FDGManager.s b/asm/src/FDGManager.s index 07af6906..6cb8f613 100644 --- a/asm/src/FDGManager.s +++ b/asm/src/FDGManager.s @@ -378,19 +378,23 @@ reset__Q24file10FDGManagerFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PREFIX_EXFLAG__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_PREFIX_EXFLAG__Q24file24$$2unnamed$$2FDGManager_cpp$$2: - .incbin "baserom.dol", 0x410618, 0x10 + .asciz ":EXFlag:" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249254 $$249254: - .incbin "baserom.dol", 0x44F8E0, 0x10 + .asciz "fdg/Archive.dat" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2: - .incbin "baserom.dol", 0x4930F0, 0x8 + .4byte 0x804537E0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PREFIX_MSG__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_PREFIX_MSG__Q24file24$$2unnamed$$2FDGManager_cpp$$2: - .incbin "baserom.dol", 0x49A190, 0x8 + .asciz ":MSG:" + .balign 4 diff --git a/asm/src/FaceRotCtrl.s b/asm/src/FaceRotCtrl.s index 9e388fbf..dc13f0d3 100644 --- a/asm/src/FaceRotCtrl.s +++ b/asm/src/FaceRotCtrl.s @@ -107,12 +107,15 @@ lbl_8025C7A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TARGET_NODE__Q53scn4step4boss6whispy25$$2unnamed$$2FaceRotCtrl_cpp$$2 T_TARGET_NODE__Q53scn4step4boss6whispy25$$2unnamed$$2FaceRotCtrl_cpp$$2: - .incbin "baserom.dol", 0x4136A8, 0x10 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254989 $$254989: - .incbin "baserom.dol", 0x49B518, 0x4 + .4byte 0x43B40000 .global $$254990 $$254990: - .incbin "baserom.dol", 0x49B51C, 0x4 + .4byte 0 diff --git a/asm/src/Fade.s b/asm/src/Fade.s index 6c2b1321..3e30d0a7 100644 --- a/asm/src/Fade.s +++ b/asm/src/Fade.s @@ -360,28 +360,29 @@ lbl_80400C30: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251794 $$251794: - .incbin "baserom.dol", 0x49EDE8, 0x4 + .4byte 0x3F800000 .global $$251795 $$251795: - .incbin "baserom.dol", 0x49EDEC, 0x4 + .4byte 0 .global $$251817 $$251817: - .incbin "baserom.dol", 0x49EDF0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251595 $$251595: - .incbin "baserom.dol", 0x49EDF8, 0x4 + .4byte 0xFFFFFFFF .global $$251905 $$251905: - .incbin "baserom.dol", 0x49EDFC, 0x4 + .4byte 0x3F000000 .global $$251906 $$251906: - .incbin "baserom.dol", 0x49EE00, 0x4 + .4byte 0x41200000 .global $$251907 $$251907: - .incbin "baserom.dol", 0x49EE04, 0x4 + .4byte 0x42200000 .global $$251908 $$251908: - .incbin "baserom.dol", 0x49EE08, 0x4 + .4byte 0xBF800000 .global $$251909 $$251909: - .incbin "baserom.dol", 0x49EE0C, 0x4 + .4byte 0x40D00000 diff --git a/asm/src/FallLandController.s b/asm/src/FallLandController.s index 63534d97..800bdeaf 100644 --- a/asm/src/FallLandController.s +++ b/asm/src/FallLandController.s @@ -154,4 +154,5 @@ setInvalid__Q43scn4step7gimmick18FallLandControllerFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253415 $$253415: - .incbin "baserom.dol", 0x49D110, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Fighter.s b/asm/src/Fighter.s index 14764424..845cef54 100644 --- a/asm/src/Fighter.s +++ b/asm/src/Fighter.s @@ -497,43 +497,71 @@ procAnim__Q53scn4step4hero7fighter7FighterFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249834 $$249834: - .incbin "baserom.dol", 0x485AA8, 0x1C + .asciz "step/hero/modeldesc/Fighter" .global $$249851 $$249851: - .incbin "baserom.dol", 0x485AC4, 0x24 + .asciz "step/chara/hero/kirby/fighter/Hat" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256343 $$256343: - .incbin "baserom.dol", 0x48A300, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$256344 $$256344: - .incbin "baserom.dol", 0x48A320, 0x28 + .asciz "step/chara/hero/kirby/fighter/Motion" + .balign 4 .global __vt__Q53scn4step4hero7fighter7Fighter __vt__Q53scn4step4hero7fighter7Fighter: - .incbin "baserom.dol", 0x48A348, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x8039B508 + .4byte 0x8039B594 + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x8039B698 + .4byte 0x8032B7B0 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8039B744 + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249541 $$249541: - .incbin "baserom.dol", 0x497188, 0x8 + .asciz "HatM" + .balign 4 .global $$249542 $$249542: - .incbin "baserom.dol", 0x497190, 0x8 + .asciz "HatBigM" .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21: - .incbin "baserom.dol", 0x497198, 0x8 + .4byte 0x8055ADA8 + .4byte 0x8055ADB0 .global $$249857 $$249857: - .incbin "baserom.dol", 0x4971A0, 0x8 + .asciz "LBand1S" .global $$249888 $$249888: - .incbin "baserom.dol", 0x4971A8, 0x8 + .asciz "RBand1S" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249856 $$249856: - .incbin "baserom.dol", 0x49DAF0, 0x8 + .4byte 0x3BA3D70A + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2desc diff --git a/asm/src/File.s b/asm/src/File.s index 370ae067..dbc514f5 100644 --- a/asm/src/File.s +++ b/asm/src/File.s @@ -564,101 +564,156 @@ lbl_801E4194: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252047 $$252047: - .incbin "baserom.dol", 0x4115F0, 0x18 + .4byte 0x80557B00 + .4byte 0x80557B08 + .4byte 0x80557B10 + .4byte 0x80557B18 + .4byte 0x80557B20 + .4byte 0x80557B20 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252743 $$252743: - .incbin "baserom.dol", 0x45A1D8, 0x20 + .asciz "challengefileselect/Main" + .balign 4 + .4byte 0 .global $$252745 $$252745: - .incbin "baserom.dol", 0x45A1F8, 0x10 + .asciz "TotalScoreBaseN" .global $$252748 $$252748: - .incbin "baserom.dol", 0x45A208, 0xC + .asciz "FileNumber" + .balign 4 .global $$252750 $$252750: - .incbin "baserom.dol", 0x45A214, 0x10 + .asciz "FileNumberBG" + .balign 4 .global $$252752 $$252752: - .incbin "baserom.dol", 0x45A224, 0xC + .asciz "BlankFile" + .balign 4 .global $$252753 $$252753: - .incbin "baserom.dol", 0x45A230, 0xC + .asciz "ScoreText" + .balign 4 .global $$252754 $$252754: - .incbin "baserom.dol", 0x45A23C, 0xC + .asciz "TotalScore" + .balign 4 .global $$252818 $$252818: - .incbin "baserom.dol", 0x45A248, 0xC + .asciz "OpenSmall" + .balign 4 .global $$252895 $$252895: - .incbin "baserom.dol", 0x45A254, 0xC + .asciz "Blank%dPN" + .balign 4 .global $$252897 $$252897: - .incbin "baserom.dol", 0x45A260, 0xC + .asciz "%sFrameN" + .balign 4 .global $$252898 $$252898: - .incbin "baserom.dol", 0x45A26C, 0xC + .asciz "Black%sN" + .balign 4 .global __vt__Q33scn19challengefileselect4File __vt__Q33scn19challengefileselect4File: - .incbin "baserom.dol", 0x45A278, 0x88 + .4byte 0 + .4byte 0 + .4byte 0x801E412C ;# ptr + .4byte 0x801E3D1C ;# ptr + .4byte 0x801E3D54 ;# ptr + .4byte 0x801E3D64 ;# ptr + .4byte 0x801E3D70 ;# ptr + .4byte 0x801E3D7C ;# ptr + .4byte 0x801E3D88 ;# ptr + .4byte 0x801E3D90 ;# ptr + .4byte 0x801E3E00 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252744 $$252744: - .incbin "baserom.dol", 0x493E90, 0x8 + .asciz "File" + .balign 4 .global $$252746 $$252746: - .incbin "baserom.dol", 0x493E98, 0x8 + .asciz "Kirby" + .balign 4 .global $$252747 $$252747: - .incbin "baserom.dol", 0x493EA0, 0x8 + .asciz "FileBG" + .balign 4 .global $$252749 $$252749: - .incbin "baserom.dol", 0x493EA8, 0x4 + .4byte 0x25640000 .global $$252751 $$252751: - .incbin "baserom.dol", 0x493EAC, 0x8 + .asciz "Blank" + .balign 4 .global $$252821 $$252821: - .incbin "baserom.dol", 0x493EB4, 0xC + .asciz "Focus" + .balign 4 + .4byte 0 .global $$252824 $$252824: - .incbin "baserom.dol", 0x493EC0, 0x8 + .asciz "UnFocus" .global $$252827 $$252827: - .incbin "baserom.dol", 0x493EC8, 0x8 + .asciz "Decide" + .balign 4 .global $$252843 $$252843: - .incbin "baserom.dol", 0x493ED0, 0x8 + .asciz "CursorN" .global $$252847 $$252847: - .incbin "baserom.dol", 0x493ED8, 0x8 + .asciz "OpenBig" .global $$252042 $$252042: - .incbin "baserom.dol", 0x493EE0, 0x8 + .asciz "Normal" + .balign 4 .global $$252043 $$252043: - .incbin "baserom.dol", 0x493EE8, 0x8 + .asciz "Bronze" + .balign 4 .global $$252044 $$252044: - .incbin "baserom.dol", 0x493EF0, 0x8 + .asciz "Silver" + .balign 4 .global $$252045 $$252045: - .incbin "baserom.dol", 0x493EF8, 0x8 + .asciz "Gold" + .balign 4 .global $$252046 $$252046: - .incbin "baserom.dol", 0x493F00, 0x8 + .asciz "Platina" .global $$252894 $$252894: - .incbin "baserom.dol", 0x493F08, 0x8 + .asciz "File%dN" .global $$252896 $$252896: - .incbin "baserom.dol", 0x493F10, 0x4 + .4byte 0x25734E00 .global $$252899 $$252899: - .incbin "baserom.dol", 0x493F14, 0x8 + .asciz "BlankN" + .balign 4 .global $$252900 $$252900: - .incbin "baserom.dol", 0x493F1C, 0xC + .asciz "ScoreN" + .balign 4 + .4byte 0 diff --git a/asm/src/FileLoader.s b/asm/src/FileLoader.s index 70b27647..50fafb7a 100644 --- a/asm/src/FileLoader.s +++ b/asm/src/FileLoader.s @@ -443,4 +443,5 @@ lbl_801881EC: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249818 $$249818: - .incbin "baserom.dol", 0x4930F8, 0x8 + .asciz ".cmp" + .balign 4 diff --git a/asm/src/FixedGridManager.s b/asm/src/FixedGridManager.s index 328bec82..97962b34 100644 --- a/asm/src/FixedGridManager.s +++ b/asm/src/FixedGridManager.s @@ -209,4 +209,5 @@ gatherCollideTarget__Q35mcoll6detail16FixedGridManagerCFRQ35mcoll6detail18Collid .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251044 $$251044: - .incbin "baserom.dol", 0x49A598, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/Flash.s b/asm/src/Flash.s index 6de90ccd..c8de2488 100644 --- a/asm/src/Flash.s +++ b/asm/src/Flash.s @@ -1890,101 +1890,253 @@ updateUseGPU__Q43scn4step6weapon5FlashFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global COLOR_TABLE__Q33scn14challengetitle19$$2unnamed$$2Flash_cpp$$2 COLOR_TABLE__Q33scn14challengetitle19$$2unnamed$$2Flash_cpp$$2: - .incbin "baserom.dol", 0x411788, 0x240 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C4 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000060 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000060 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252135 $$252135: - .incbin "baserom.dol", 0x49A920, 0x4 + .4byte 0xFFFFFF00 .global $$253765 $$253765: - .incbin "baserom.dol", 0x49A924, 0x4 + .4byte 0x3F800000 .global $$253766 $$253766: - .incbin "baserom.dol", 0x49A928, 0x8 + .4byte 0x437F0000 + .4byte 0 .global $$253769 $$253769: - .incbin "baserom.dol", 0x49A930, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$252808 $$252808: - .incbin "baserom.dol", 0x49A938, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252172 $$252172: - .incbin "baserom.dol", 0x49AAE8, 0x4 + .4byte 0xFFFFFFFF .global $$252176 $$252176: - .incbin "baserom.dol", 0x49AAEC, 0x4 + .4byte 0xFFFFFF00 .global $$252815 $$252815: - .incbin "baserom.dol", 0x49AAF0, 0x4 + .4byte 0xFFFFFFFF .global $$252819 $$252819: - .incbin "baserom.dol", 0x49AAF4, 0x4 + .4byte 0xFFFFFF00 .global $$253899 $$253899: - .incbin "baserom.dol", 0x49AAF8, 0x4 + .4byte 0x3F800000 .global $$253900 $$253900: - .incbin "baserom.dol", 0x49AAFC, 0x4 + .4byte 0x437F0000 .global $$253903 $$253903: - .incbin "baserom.dol", 0x49AB00, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$252931 $$252931: - .incbin "baserom.dol", 0x49AB08, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255122 $$255122: - .incbin "baserom.dol", 0x49AE68, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255211 $$255211: - .incbin "baserom.dol", 0x49B9A8, 0x4 + .4byte 0xFFFFFF00 .global $$255232 $$255232: - .incbin "baserom.dol", 0x49B9AC, 0x4 + .4byte 0xFFFFFF00 .global $$255689 $$255689: - .incbin "baserom.dol", 0x49B9B0, 0x4 + .4byte 0x42B40000 .global $$255690 $$255690: - .incbin "baserom.dol", 0x49B9B4, 0x4 + .4byte 0x40000000 .global $$255691 $$255691: - .incbin "baserom.dol", 0x49B9B8, 0x4 + .4byte 0x437F0000 .global $$255692 $$255692: - .incbin "baserom.dol", 0x49B9BC, 0x4 + .4byte 0x3F000000 .global $$255693 $$255693: - .incbin "baserom.dol", 0x49B9C0, 0x4 + .4byte 0x3F800000 .global $$255694 $$255694: - .incbin "baserom.dol", 0x49B9C4, 0x4 + .4byte 0x43B40000 .global $$255695 $$255695: - .incbin "baserom.dol", 0x49B9C8, 0x4 + .4byte 0x43340000 .global $$255696 $$255696: - .incbin "baserom.dol", 0x49B9CC, 0x4 + .4byte 0x43100000 .global $$255697 $$255697: - .incbin "baserom.dol", 0x49B9D0, 0x8 + .4byte 0x43870000 + .4byte 0 .global $$255700 $$255700: - .incbin "baserom.dol", 0x49B9D8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255587 $$255587: - .incbin "baserom.dol", 0x49D6E8, 0x4 + .4byte 0xFFFFFF00 .global $$255591 $$255591: - .incbin "baserom.dol", 0x49D6EC, 0x4 + .4byte 0xFFFFFF00 .global $$255626 $$255626: - .incbin "baserom.dol", 0x49D6F0, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 diff --git a/asm/src/FloaterRotCtrl.s b/asm/src/FloaterRotCtrl.s index 0705d683..6608be56 100644 --- a/asm/src/FloaterRotCtrl.s +++ b/asm/src/FloaterRotCtrl.s @@ -44,10 +44,11 @@ resetRotVIntpRate__Q43scn4step4hero14FloaterRotCtrlFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250072 $$250072: - .incbin "baserom.dol", 0x49D6F8, 0x4 + .4byte 0 .global $$250073 $$250073: - .incbin "baserom.dol", 0x49D6FC, 0x4 + .4byte 0x3E3851EC .global $$250080 $$250080: - .incbin "baserom.dol", 0x49D700, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/FogAccessor.s b/asm/src/FogAccessor.s index 27c7d8b5..fa56c8a6 100644 --- a/asm/src/FogAccessor.s +++ b/asm/src/FogAccessor.s @@ -151,25 +151,33 @@ lbl_8018E624: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType$$20 $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType$$20: - .incbin "baserom.dol", 0x450550, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType: - .incbin "baserom.dol", 0x450570, 0x10 + .asciz "g3d_fog.h" + .balign 4 + .4byte 0 .global $$2STRING$$2SetZ__Q34nw4r3g3d3FogFff$$20 $$2STRING$$2SetZ__Q34nw4r3g3d3FogFff$$20: - .incbin "baserom.dol", 0x450580, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2SetZ__Q34nw4r3g3d3FogFff $$2STRING$$2SetZ__Q34nw4r3g3d3FogFff: - .incbin "baserom.dol", 0x4505A0, 0x10 + .asciz "g3d_fog.h" + .balign 4 + .4byte 0 .global $$2STRING$$2SetFogColor__Q34nw4r3g3d3FogF8_GXColor$$20 $$2STRING$$2SetFogColor__Q34nw4r3g3d3FogF8_GXColor$$20: - .incbin "baserom.dol", 0x4505B0, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2SetFogColor__Q34nw4r3g3d3FogF8_GXColor $$2STRING$$2SetFogColor__Q34nw4r3g3d3FogF8_GXColor: - .incbin "baserom.dol", 0x4505D0, 0x10 + .asciz "g3d_fog.h" + .balign 4 + .4byte 0 .global $$2STRING$$2SetFogRangeAdj__Q34nw4r3g3d3FogFb$$20 $$2STRING$$2SetFogRangeAdj__Q34nw4r3g3d3FogFb$$20: - .incbin "baserom.dol", 0x4505E0, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2SetFogRangeAdj__Q34nw4r3g3d3FogFb $$2STRING$$2SetFogRangeAdj__Q34nw4r3g3d3FogFb: - .incbin "baserom.dol", 0x450600, 0x10 + .asciz "g3d_fog.h" + .balign 4 + .4byte 0 diff --git a/asm/src/FontKindUtil.s b/asm/src/FontKindUtil.s index d1fa6c33..62ed2df0 100644 --- a/asm/src/FontKindUtil.s +++ b/asm/src/FontKindUtil.s @@ -62,41 +62,67 @@ Name__Q24font12FontKindUtilFQ24font8FontKind: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2 T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2: - .incbin "baserom.dol", 0x410628, 0x48 + .4byte 0x80556D28 + .4byte 0x804537F0 + .4byte 0x80556D28 + .4byte 0x80453800 + .4byte 0x80556D28 + .4byte 0x80453814 + .4byte 0x80556D28 + .4byte 0x80453828 + .4byte 0x80556D28 + .4byte 0x80453840 + .4byte 0x80556D28 + .4byte 0x8045384C + .4byte 0x80556D28 + .4byte 0x80453860 + .4byte 0x80556D28 + .4byte 0x80453874 + .4byte 0x80556D28 + .4byte 0x80453888 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 $$248724: - .incbin "baserom.dol", 0x44F8F0, 0x10 + .asciz "CommonEB.brfnt" + .balign 4 .global $$248725 $$248725: - .incbin "baserom.dol", 0x44F900, 0x14 + .asciz "CommonEBFixed.brfnt" .global $$248726 $$248726: - .incbin "baserom.dol", 0x44F914, 0x14 + .asciz "CommonEBOL.brfnt" + .balign 4 .global $$248727 $$248727: - .incbin "baserom.dol", 0x44F928, 0x18 + .asciz "CommonEBOLFixed.brfnt" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x44F940, 0xC + .asciz "Skip.brfnt" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x44F94C, 0x14 + .asciz "SkipOutline.brfnt" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x44F960, 0x14 + .asciz "ExternalChar.brfnt" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x44F974, 0x14 + .asciz "StaffCredits.brfnt" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x44F988, 0xC + .asciz "Arare.brfnt" .global $$248861 $$248861: - .incbin "baserom.dol", 0x44F994, 0xC + .asciz "font/%s%s" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248723 $$248723: - .incbin "baserom.dol", 0x493108, 0x8 + .4byte 0x6A702F00 + .4byte 0 diff --git a/asm/src/FontManager.s b/asm/src/FontManager.s index a4522fc3..a94e3327 100644 --- a/asm/src/FontManager.s +++ b/asm/src/FontManager.s @@ -127,4 +127,5 @@ font__Q24font11FontManagerFQ24font8FontKind: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249284 $$249284: - .incbin "baserom.dol", 0x493110, 0x8 + .asciz "Font" + .balign 4 diff --git a/asm/src/Food.s b/asm/src/Food.s index 5c224977..e574dbcb 100644 --- a/asm/src/Food.s +++ b/asm/src/Food.s @@ -1382,327 +1382,451 @@ lbl_803C7050: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252580 $$252580: - .incbin "baserom.dol", 0x48E0A0, 0xC + .asciz "FdCherry" + .balign 4 .global $$252581 $$252581: - .incbin "baserom.dol", 0x48E0AC, 0x18 + .asciz "step/item/food/Cherry" + .balign 4 .global $$252583 $$252583: - .incbin "baserom.dol", 0x48E0C4, 0x1C + .asciz "step/item/food/Humburger" + .balign 4 .global $$252584 $$252584: - .incbin "baserom.dol", 0x48E0E0, 0xC + .asciz "FdHumburger" .global $$252585 $$252585: - .incbin "baserom.dol", 0x48E0EC, 0x18 + .asciz "step/item/food/Juice" + .balign 4 .global $$252587 $$252587: - .incbin "baserom.dol", 0x48E104, 0x14 + .asciz "step/item/food/Meat" .global $$252589 $$252589: - .incbin "baserom.dol", 0x48E118, 0x18 + .asciz "step/item/food/Potato" + .balign 4 .global $$252590 $$252590: - .incbin "baserom.dol", 0x48E130, 0xC + .asciz "FdPoteto" + .balign 4 .global $$252591 $$252591: - .incbin "baserom.dol", 0x48E13C, 0x18 + .asciz "step/item/food/Banana" + .balign 4 .global $$252592 $$252592: - .incbin "baserom.dol", 0x48E154, 0xC + .asciz "FdBanana" + .balign 4 .global $$252593 $$252593: - .incbin "baserom.dol", 0x48E160, 0x18 + .asciz "step/item/food/Grape" + .balign 4 .global $$252595 $$252595: - .incbin "baserom.dol", 0x48E178, 0x1C + .asciz "step/item/food/Pineapple" + .balign 4 .global $$252596 $$252596: - .incbin "baserom.dol", 0x48E194, 0xC + .asciz "FdPineapple" .global $$252597 $$252597: - .incbin "baserom.dol", 0x48E1A0, 0x18 + .asciz "step/item/food/Doughnut" .global $$252598 $$252598: - .incbin "baserom.dol", 0x48E1B8, 0xC + .asciz "FdDoughnut" + .balign 4 .global $$252599 $$252599: - .incbin "baserom.dol", 0x48E1C4, 0x18 + .asciz "step/item/food/Hotdog" + .balign 4 .global $$252600 $$252600: - .incbin "baserom.dol", 0x48E1DC, 0xC + .asciz "FdHotdog" + .balign 4 .global $$252601 $$252601: - .incbin "baserom.dol", 0x48E1E8, 0x18 + .asciz "step/item/food/Pudding" + .balign 4 .global $$252602 $$252602: - .incbin "baserom.dol", 0x48E200, 0xC + .asciz "FdPudding" + .balign 4 .global $$252603 $$252603: - .incbin "baserom.dol", 0x48E20C, 0x18 + .asciz "step/item/food/Tomato" + .balign 4 .global $$252604 $$252604: - .incbin "baserom.dol", 0x48E224, 0xC + .asciz "FdTomato" + .balign 4 .global $$252605 $$252605: - .incbin "baserom.dol", 0x48E230, 0x18 + .asciz "step/item/food/Candy" + .balign 4 .global $$252607 $$252607: - .incbin "baserom.dol", 0x48E248, 0x20 + .asciz "step/item/food/ChineseNoodles" + .balign 4 .global $$252608 $$252608: - .incbin "baserom.dol", 0x48E268, 0x14 + .asciz "FdChinesenoodles" + .balign 4 .global $$252609 $$252609: - .incbin "baserom.dol", 0x48E27C, 0x1C + .asciz "step/item/food/ChocoCake" + .balign 4 .global $$252610 $$252610: - .incbin "baserom.dol", 0x48E298, 0xC + .asciz "FdChococake" .global $$252611 $$252611: - .incbin "baserom.dol", 0x48E2A4, 0x18 + .asciz "step/item/food/Curry" + .balign 4 .global $$252613 $$252613: - .incbin "baserom.dol", 0x48E2BC, 0x1C + .asciz "step/item/food/LemonJuice" + .balign 4 .global $$252614 $$252614: - .incbin "baserom.dol", 0x48E2D8, 0x10 + .asciz "FdLemonjuice" + .balign 4 .global $$252615 $$252615: - .incbin "baserom.dol", 0x48E2E8, 0x18 + .asciz "step/item/food/Omelet" + .balign 4 .global $$252616 $$252616: - .incbin "baserom.dol", 0x48E300, 0xC + .asciz "FdOmelet" + .balign 4 .global $$252617 $$252617: - .incbin "baserom.dol", 0x48E30C, 0x1C + .asciz "step/item/food/Pizza" + .balign 4 + .4byte 0 .global $$252619 $$252619: - .incbin "baserom.dol", 0x48E328, 0x18 + .asciz "step/item/food/Sandwich" .global $$252620 $$252620: - .incbin "baserom.dol", 0x48E340, 0xC + .asciz "FdSandwich" + .balign 4 .global $$252621 $$252621: - .incbin "baserom.dol", 0x48E34C, 0x1C + .asciz "step/item/food/ShortCake" + .balign 4 .global $$252622 $$252622: - .incbin "baserom.dol", 0x48E368, 0xC + .asciz "FdShortcake" .global $$252623 $$252623: - .incbin "baserom.dol", 0x48E374, 0x1C + .asciz "step/item/food/SoftCream" + .balign 4 .global $$252624 $$252624: - .incbin "baserom.dol", 0x48E390, 0x10 + .asciz "FdSoftcreeam" + .balign 4 .global $$252625 $$252625: - .incbin "baserom.dol", 0x48E3A0, 0x1C + .asciz "step/item/food/FriedRice" + .balign 4 .global $$252626 $$252626: - .incbin "baserom.dol", 0x48E3BC, 0xC + .asciz "FdFriedrice" .global $$252627 $$252627: - .incbin "baserom.dol", 0x48E3C8, 0x18 + .asciz "step/item/food/Gyoza" + .balign 4 .global $$252629 $$252629: - .incbin "baserom.dol", 0x48E3E0, 0x1C + .asciz "step/item/food/Spaghetti" + .balign 4 .global $$252630 $$252630: - .incbin "baserom.dol", 0x48E3FC, 0xC + .asciz "FdSpaghetti" .global $$252631 $$252631: - .incbin "baserom.dol", 0x48E408, 0x18 + .asciz "step/item/food/CupCake" + .balign 4 .global $$252632 $$252632: - .incbin "baserom.dol", 0x48E420, 0xC + .asciz "FdCupcake" + .balign 4 .global $$252633 $$252633: - .incbin "baserom.dol", 0x48E42C, 0x1C + .asciz "step/item/food/DoughnutPink" .global $$252634 $$252634: - .incbin "baserom.dol", 0x48E448, 0x10 + .asciz "FdDoughnutpink" + .balign 4 .global $$252635 $$252635: - .incbin "baserom.dol", 0x48E458, 0x18 + .asciz "step/item/food/HotCake" + .balign 4 .global $$252636 $$252636: - .incbin "baserom.dol", 0x48E470, 0x10 + .asciz "FdHotcake" + .balign 4 + .4byte 0 .global $$252637 $$252637: - .incbin "baserom.dol", 0x48E480, 0x18 + .asciz "step/item/food/Icecream" .global $$252638 $$252638: - .incbin "baserom.dol", 0x48E498, 0xC + .asciz "FdIcecream" + .balign 4 .global $$252639 $$252639: - .incbin "baserom.dol", 0x48E4A4, 0x18 + .asciz "step/item/food/Parfait" + .balign 4 .global $$252640 $$252640: - .incbin "baserom.dol", 0x48E4BC, 0xC + .asciz "FdParfait" + .balign 4 .global $$252641 $$252641: - .incbin "baserom.dol", 0x48E4C8, 0x18 + .asciz "step/item/food/Sousage" + .balign 4 .global $$252642 $$252642: - .incbin "baserom.dol", 0x48E4E0, 0xC + .asciz "FdSousage" + .balign 4 .global $$252643 $$252643: - .incbin "baserom.dol", 0x48E4EC, 0x14 + .asciz "step/item/food/Tea" + .balign 4 .global $$252645 $$252645: - .incbin "baserom.dol", 0x48E500, 0x18 + .asciz "step/item/food/Nikuman" + .balign 4 .global $$252646 $$252646: - .incbin "baserom.dol", 0x48E518, 0xC + .asciz "FdNikuman" + .balign 4 .global $$252647 $$252647: - .incbin "baserom.dol", 0x48E524, 0x14 + .asciz "step/item/food/Milk" .global $$252649 $$252649: - .incbin "baserom.dol", 0x48E538, 0x20 + .asciz "step/item/food/SoftCreamPink" + .balign 4 .global $$252650 $$252650: - .incbin "baserom.dol", 0x48E558, 0x10 + .asciz "FdSoftcreampink" .global $$252651 $$252651: - .incbin "baserom.dol", 0x48E568, 0x90 + .4byte 0x803C5C24 + .4byte 0x803C5C38 + .4byte 0x803C5CCC + .4byte 0x803C5D60 + .4byte 0x803C5DF4 + .4byte 0x803C5E88 + .4byte 0x803C5F1C + .4byte 0x803C5FB0 + .4byte 0x803C6044 + .4byte 0x803C60D8 + .4byte 0x803C616C + .4byte 0x803C6200 + .4byte 0x803C6294 + .4byte 0x803C6328 + .4byte 0x803C63BC + .4byte 0x803C6450 + .4byte 0x803C64E4 + .4byte 0x803C6578 + .4byte 0x803C660C + .4byte 0x803C66A0 + .4byte 0x803C6734 + .4byte 0x803C67C8 + .4byte 0x803C685C + .4byte 0x803C68F0 + .4byte 0x803C6984 + .4byte 0x803C6A18 + .4byte 0x803C6AAC + .4byte 0x803C6B40 + .4byte 0x803C6BD4 + .4byte 0x803C6C68 + .4byte 0x803C6CFC + .4byte 0x803C6D90 + .4byte 0x803C6E24 + .4byte 0x803C6EB8 + .4byte 0x803C6F4C + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252582 $$252582: - .incbin "baserom.dol", 0x498160, 0x8 + .asciz "TopL" + .balign 4 .global $$252586 $$252586: - .incbin "baserom.dol", 0x498168, 0x8 + .asciz "FdJuice" .global $$252588 $$252588: - .incbin "baserom.dol", 0x498170, 0x8 + .asciz "FdMeat" + .balign 4 .global $$252594 $$252594: - .incbin "baserom.dol", 0x498178, 0x8 + .asciz "FdGrape" .global $$252606 $$252606: - .incbin "baserom.dol", 0x498180, 0x8 + .asciz "FdCandy" .global $$252612 $$252612: - .incbin "baserom.dol", 0x498188, 0x8 + .asciz "FdCurry" .global $$252618 $$252618: - .incbin "baserom.dol", 0x498190, 0x8 + .asciz "FdPizza" .global $$252628 $$252628: - .incbin "baserom.dol", 0x498198, 0x8 + .asciz "FdGyoza" .global $$252644 $$252644: - .incbin "baserom.dol", 0x4981A0, 0x8 + .asciz "FdTea" + .balign 4 .global $$252648 $$252648: - .incbin "baserom.dol", 0x4981A8, 0x8 + .asciz "FdMilk" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$40$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$40$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981B0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$41$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$41$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981B8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$42$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$42$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981C0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$43$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$43$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981C8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$44$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$44$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981D0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$45$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$45$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981D8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$46$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$46$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981E0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$47$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$47$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981E8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$48$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$48$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981F0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$49$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$49$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4981F8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$410$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$410$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498200, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$411$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$411$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498208, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$412$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$412$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498210, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$413$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$413$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498218, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$414$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$414$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498220, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$415$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$415$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498228, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$416$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$416$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498230, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$417$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$417$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498238, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$418$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$418$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498240, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$419$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$419$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498248, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$420$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$420$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498250, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$421$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$421$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498258, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$422$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$422$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498260, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$423$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$423$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498268, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$424$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$424$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498270, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$425$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$425$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498278, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$426$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$426$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498280, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$427$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$427$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498288, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$428$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$428$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498290, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$429$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$429$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x498298, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$430$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$430$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982A0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$431$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$431$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982A8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$432$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$432$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982B0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$433$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$433$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982B8, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$03$$434$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$03$$434$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982C0, 0x8 + .asciz "Model" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2CreateTmpl$$03$$434$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry_RQ43scn4step5chara9ModelDesc$$2desc diff --git a/asm/src/FoodTableKindUtil.s b/asm/src/FoodTableKindUtil.s index bb908823..c65568d6 100644 --- a/asm/src/FoodTableKindUtil.s +++ b/asm/src/FoodTableKindUtil.s @@ -25,28 +25,75 @@ RandomFoodKind__Q43scn4step4item17FoodTableKindUtilFQ43scn4step4item13FoodTableK .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C228, 0x14 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 .global T_TABLE_LV1__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV1__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C23C, 0x14 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000013 .global T_TABLE_LV2__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV2__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C250, 0x14 + .4byte 0x00000001 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000020 .global T_TABLE_LV3__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV3__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C264, 0x14 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000015 + .4byte 0x0000000C + .4byte 0x00000021 .global T_TABLE_LV4__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV4__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C278, 0x14 + .4byte 0x00000014 + .4byte 0x0000000D + .4byte 0x00000022 + .4byte 0x00000019 + .4byte 0x0000001F .global T_TABLE_LV5__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV5__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C28C, 0x14 + .4byte 0x0000000A + .4byte 0x00000015 + .4byte 0x0000000E + .4byte 0x0000001D + .4byte 0x0000001A .global T_TABLE_LV6__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV6__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C2A0, 0x14 + .4byte 0x00000011 + .4byte 0x0000000D + .4byte 0x00000016 + .4byte 0x00000018 + .4byte 0x00000017 .global T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C2B4, 0x14 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x0000000F + .4byte 0x00000022 + .4byte 0x0000001C .global T_TABLES__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLES__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C2C8, 0x40 + .4byte 0x00000005 + .4byte 0x80420128 + .4byte 0x00000005 + .4byte 0x8042013C + .4byte 0x00000005 + .4byte 0x80420150 + .4byte 0x00000005 + .4byte 0x80420164 + .4byte 0x00000005 + .4byte 0x80420178 + .4byte 0x00000005 + .4byte 0x8042018C + .4byte 0x00000005 + .4byte 0x804201A0 + .4byte 0x00000005 + .4byte 0x804201B4 diff --git a/asm/src/Frame.s b/asm/src/Frame.s index d9525de7..0b107754 100644 --- a/asm/src/Frame.s +++ b/asm/src/Frame.s @@ -768,82 +768,110 @@ isTargetScoreEnd__Q53scn4step4info5lvmap5FrameCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251962 $$251962: - .incbin "baserom.dol", 0x45A300, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$251964 $$251964: - .incbin "baserom.dol", 0x45A31C, 0x10 + .asciz "BackButton02N" + .balign 4 .global $$251965 $$251965: - .incbin "baserom.dol", 0x45A32C, 0xC + .asciz "FileSelect" + .balign 4 .global $$251966 $$251966: - .incbin "baserom.dol", 0x45A338, 0x40 + .asciz "FileSelectBG" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253212 $$253212: - .incbin "baserom.dol", 0x48D810, 0x18 + .asciz "step/lvmap/Cutinanime" + .balign 4 .global $$253214 $$253214: - .incbin "baserom.dol", 0x48D828, 0xC + .asciz "TotalScoreN" .global $$253215 $$253215: - .incbin "baserom.dol", 0x48D834, 0x14 + .asciz "TargetScoreBaseN" + .balign 4 .global $$253216 $$253216: - .incbin "baserom.dol", 0x48D848, 0xC + .asciz "Lv%dTextN" + .balign 4 .global $$253217 $$253217: - .incbin "baserom.dol", 0x48D854, 0xC + .asciz "TitleText" + .balign 4 .global $$253218 $$253218: - .incbin "baserom.dol", 0x48D860, 0xC + .asciz "Lv%dTitle" + .balign 4 .global $$253219 $$253219: - .incbin "baserom.dol", 0x48D86C, 0xC + .asciz "TitleTextSh" .global $$253220 $$253220: - .incbin "baserom.dol", 0x48D878, 0x10 + .asciz "Lv%dAreaText" + .balign 4 .global $$253222 $$253222: - .incbin "baserom.dol", 0x48D888, 0x10 + .asciz "Lv%dAreaTextSh" + .balign 4 .global $$253223 $$253223: - .incbin "baserom.dol", 0x48D898, 0x10 + .asciz "Lv%dMapNameText" .global $$253224 $$253224: - .incbin "baserom.dol", 0x48D8A8, 0x14 + .asciz "Lv%dTitleMain_00" + .balign 4 .global $$253225 $$253225: - .incbin "baserom.dol", 0x48D8BC, 0x44 + .asciz "Lv%dMapNameTextSh" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251963 $$251963: - .incbin "baserom.dol", 0x493F28, 0x8 + .asciz "Frame" + .balign 4 .global $$252008 $$252008: - .incbin "baserom.dol", 0x493F30, 0x8 + .asciz "Start" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253213 $$253213: - .incbin "baserom.dol", 0x497FD0, 0x8 + .asciz "Frame" + .balign 4 .global $$253221 $$253221: - .incbin "baserom.dol", 0x497FD8, 0x8 + .asciz "Lv%d" + .balign 4 .global $$253310 $$253310: - .incbin "baserom.dol", 0x497FE0, 0x8 + .asciz "Wait" + .balign 4 .global $$253322 $$253322: - .incbin "baserom.dol", 0x497FE8, 0x4 + .4byte 0x496E0000 .global $$253330 $$253330: - .incbin "baserom.dol", 0x497FEC, 0x4 + .4byte 0x496E5300 .global $$253337 $$253337: - .incbin "baserom.dol", 0x497FF0, 0x4 + .4byte 0x4F757400 .global $$253344 $$253344: - .incbin "baserom.dol", 0x497FF4, 0xC + .asciz "OutS" + .balign 4 + .4byte 0 diff --git a/asm/src/FrameCounter.s b/asm/src/FrameCounter.s index 8c32423e..75c747aa 100644 --- a/asm/src/FrameCounter.s +++ b/asm/src/FrameCounter.s @@ -100,7 +100,9 @@ inversedNormalizedFrame__Q24util12FrameCounterCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248873 $$248873: - .incbin "baserom.dol", 0x49EED8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$248876 $$248876: - .incbin "baserom.dol", 0x49EEE0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/FramePanel.s b/asm/src/FramePanel.s index 678c891a..99a99cb0 100644 --- a/asm/src/FramePanel.s +++ b/asm/src/FramePanel.s @@ -528,80 +528,104 @@ lbl_801DBD2C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251725 $$251725: - .incbin "baserom.dol", 0x4595A8, 0xC + .asciz "IconFixN" + .balign 4 .global $$252727 $$252727: - .incbin "baserom.dol", 0x4595B4, 0xC + .asciz "PauseFrame" + .balign 4 .global $$252808 $$252808: - .incbin "baserom.dol", 0x4595C0, 0x10 + .asciz "PTotalTextD1" + .balign 4 .global $$252809 $$252809: - .incbin "baserom.dol", 0x4595D0, 0x10 + .asciz "PTotalTextD2" + .balign 4 .global $$252821 $$252821: - .incbin "baserom.dol", 0x4595E0, 0xC + .asciz "SwitchOut" + .balign 4 .global $$252824 $$252824: - .incbin "baserom.dol", 0x4595EC, 0xC + .asciz "SwitchIn" + .balign 4 .global $$252852 $$252852: - .incbin "baserom.dol", 0x4595F8, 0x10 + .asciz "PCurrentTextD1" + .balign 4 .global $$252853 $$252853: - .incbin "baserom.dol", 0x459608, 0x10 + .asciz "PCurrentTextD2" + .balign 4 .global $$252854 $$252854: - .incbin "baserom.dol", 0x459618, 0x40 + .asciz "TitleText" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251724 $$251724: - .incbin "baserom.dol", 0x493A80, 0x8 + .asciz "IconN" + .balign 4 .global $$252728 $$252728: - .incbin "baserom.dol", 0x493A88, 0x8 + .asciz "Icon" + .balign 4 .global $$252729 $$252729: - .incbin "baserom.dol", 0x493A90, 0x8 + .asciz "FrameN" + .balign 4 .global $$252730 $$252730: - .incbin "baserom.dol", 0x493A98, 0x8 + .asciz "Wait" + .balign 4 .global $$252790 $$252790: - .incbin "baserom.dol", 0x493AA0, 0x8 + .asciz "AbStar" + .balign 4 .global $$252791 $$252791: - .incbin "baserom.dol", 0x493AA8, 0x8 + .asciz "AbIconN" .global $$252810 $$252810: - .incbin "baserom.dol", 0x493AB0, 0x4 + .4byte 0x256C7500 .global $$252811 $$252811: - .incbin "baserom.dol", 0x493AB4, 0xC + .asciz "PageN" + .balign 4 + .4byte 0 .global $$252846 $$252846: - .incbin "baserom.dol", 0x493AC0, 0x8 + .asciz "Dropout" .global $$252847 $$252847: - .incbin "baserom.dol", 0x493AC8, 0x8 + .asciz "Special" .global $$252848 $$252848: - .incbin "baserom.dol", 0x493AD0, 0x8 + .asciz "Ship" + .balign 4 .global $$252849 $$252849: - .incbin "baserom.dol", 0x493AD8, 0x8 + .asciz "Remote" + .balign 4 .global $$252850 $$252850: - .incbin "baserom.dol", 0x493AE0, 0x8 + .asciz "Ability" .global $$252851 $$252851: - .incbin "baserom.dol", 0x493AE8, 0x8 + .asciz "Friend" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: - .incbin "baserom.dol", 0x49A7F8, 0x4 + .4byte 0x805576A0 .global T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: - .incbin "baserom.dol", 0x49A7FC, 0x4 + .4byte 0x8045D4A8 diff --git a/asm/src/FreeRotController.s b/asm/src/FreeRotController.s index 8735cd84..467ad1f8 100644 --- a/asm/src/FreeRotController.s +++ b/asm/src/FreeRotController.s @@ -238,16 +238,17 @@ lbl_8026E5EC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251588 $$251588: - .incbin "baserom.dol", 0x49B7A0, 0x4 + .4byte 0 .global $$251589 $$251589: - .incbin "baserom.dol", 0x49B7A4, 0x4 + .4byte 0x3F000000 .global $$251590 $$251590: - .incbin "baserom.dol", 0x49B7A8, 0x4 + .4byte 0x3DCCCCCD .global $$251591 $$251591: - .incbin "baserom.dol", 0x49B7AC, 0x4 + .4byte 0x3F800000 .global $$251646 $$251646: - .incbin "baserom.dol", 0x49B7B0, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/FreezeHandler.s b/asm/src/FreezeHandler.s index 4a403107..3d1c45dc 100644 --- a/asm/src/FreezeHandler.s +++ b/asm/src/FreezeHandler.s @@ -183,7 +183,9 @@ lbl_8018A538: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb$$20 $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb$$20: - .incbin "baserom.dol", 0x44FFB8, 0x24 + .asciz "Pointer must not be NULL (console)" + .balign 4 .global $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb: - .incbin "baserom.dol", 0x44FFDC, 0xC + .asciz "console.h" + .balign 4 diff --git a/asm/src/FreezeManager.s b/asm/src/FreezeManager.s index 72913f67..a3bcdb9b 100644 --- a/asm/src/FreezeManager.s +++ b/asm/src/FreezeManager.s @@ -494,15 +494,18 @@ VReport__Q26freeze13FreezeManagerFPCcP16__va_list_struct: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249629 $$249629: - .incbin "baserom.dol", 0x44FFE8, 0x18 + .asciz "%s in %s on line %d.\n" + .balign 4 .global $$249630 $$249630: - .incbin "baserom.dol", 0x450000, 0x20 + .asciz "not construct FreezeManager\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global doSerialReport doSerialReport: - .incbin "baserom.dol", 0x493148, 0x8 + .4byte 0x01000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global debug_context diff --git a/asm/src/FreezeThread.s b/asm/src/FreezeThread.s index 88a5fb4e..c6884500 100644 --- a/asm/src/FreezeThread.s +++ b/asm/src/FreezeThread.s @@ -395,38 +395,53 @@ run__Q26freeze12FreezeThreadFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$248997 $$248997: - .incbin "baserom.dol", 0x410670, 0x28 + .4byte 0x00000C00 + .4byte 0x00000100 + .4byte 0x00000002 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00001000 + .4byte 0x00000008 + .4byte 0x00000200 + .4byte 0x00000004 + .4byte 0x00000100 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249333 $$249333: - .incbin "baserom.dol", 0x450020, 0x20 + .asciz "Address BackChain LR save\n" + .balign 4 .global $$249334 $$249334: - .incbin "baserom.dol", 0x450040, 0x14 + .asciz "%08X %08X %08X " + .balign 4 .global $$249432 $$249432: - .incbin "baserom.dol", 0x450054, 0x1C + .asciz "[ originate exception ]\n" + .balign 4 .global $$249433 $$249433: - .incbin "baserom.dol", 0x450070, 0x20 + .asciz "--OSThread=%p con=%p pri=%2d--\n" .global $$249434 $$249434: - .incbin "baserom.dol", 0x450090, 0x24 + .asciz "--debug context (from OSPanic)--\n" + .balign 4 .global $$249435 $$249435: - .incbin "baserom.dol", 0x4500B4, 0x2C + .asciz "==---------------------------------------\n\n" .global $$249436 $$249436: - .incbin "baserom.dol", 0x4500E0, 0x2C + .asciz "-----------------------------------------\n" + .balign 4 .global $$249437 $$249437: - .incbin "baserom.dol", 0x45010C, 0x2C + .asciz "--- Thread list end (thread num %d) ---\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249335 $$249335: - .incbin "baserom.dol", 0x493150, 0x4 + .4byte 0x25730A00 .global $$249336 $$249336: - .incbin "baserom.dol", 0x493154, 0x4 + .4byte 0x0A000000 diff --git a/asm/src/FullScreenModel.s b/asm/src/FullScreenModel.s index 6bfa7ea5..d1a64f83 100644 --- a/asm/src/FullScreenModel.s +++ b/asm/src/FullScreenModel.s @@ -407,27 +407,31 @@ draw__Q23sfx15FullScreenModelFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252811 $$252811: - .incbin "baserom.dol", 0x498A98, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252748 $$252748: - .incbin "baserom.dol", 0x49EE10, 0x4 + .4byte 0 .global $$252749 $$252749: - .incbin "baserom.dol", 0x49EE14, 0x4 + .4byte 0x3F000000 .global $$252750 $$252750: - .incbin "baserom.dol", 0x49EE18, 0x4 + .4byte 0x3DCCCCCD .global $$252751 $$252751: - .incbin "baserom.dol", 0x49EE1C, 0x4 + .4byte 0x447A0000 .global $$252752 $$252752: - .incbin "baserom.dol", 0x49EE20, 0x8 + .4byte 0x42C80000 + .4byte 0 .global $$252756 $$252756: - .incbin "baserom.dol", 0x49EE28, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$252877 $$252877: - .incbin "baserom.dol", 0x49EE30, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/FullScreenPlate.s b/asm/src/FullScreenPlate.s index 5afedc9a..4fa383ac 100644 --- a/asm/src/FullScreenPlate.s +++ b/asm/src/FullScreenPlate.s @@ -72,10 +72,11 @@ draw__Q23gfx15FullScreenPlateCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249012 $$249012: - .incbin "baserom.dol", 0x49A250, 0x4 + .4byte 0x3F800000 .global $$249023 $$249023: - .incbin "baserom.dol", 0x49A254, 0x4 + .4byte 0 .global $$249026 $$249026: - .incbin "baserom.dol", 0x49A258, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/G3DAutoReqAnimCallback.s b/asm/src/G3DAutoReqAnimCallback.s index a0b179d7..fbc92a00 100644 --- a/asm/src/G3DAutoReqAnimCallback.s +++ b/asm/src/G3DAutoReqAnimCallback.s @@ -88,4 +88,7 @@ request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36effect6detail22G3DAutoReqAnimCallback __vt__Q36effect6detail22G3DAutoReqAnimCallback: - .incbin "baserom.dol", 0x44F4E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8017E9D0 ;# ptr + .4byte 0x801813B4 ;# ptr diff --git a/asm/src/G3DRootSet.s b/asm/src/G3DRootSet.s index 3078b49c..1581ba52 100644 --- a/asm/src/G3DRootSet.s +++ b/asm/src/G3DRootSet.s @@ -1800,12 +1800,15 @@ setViewMtx__Q33scn9grandmenu10G3DRootSetFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252374 $$252374: - .incbin "baserom.dol", 0x495850, 0x8 + .4byte 0x00000008 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253282 $$253282: - .incbin "baserom.dol", 0x49B8F8, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$253286 $$253286: - .incbin "baserom.dol", 0x49B900, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/GameCheckWindow.s b/asm/src/GameCheckWindow.s index fcdcb290..1b5e6098 100644 --- a/asm/src/GameCheckWindow.s +++ b/asm/src/GameCheckWindow.s @@ -776,81 +776,106 @@ lbl_802157B4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253205 $$253205: - .incbin "baserom.dol", 0x45DD70, 0x14 + .asciz "common/Checkwindow" + .balign 4 .global $$253206 $$253206: - .incbin "baserom.dol", 0x45DD84, 0x10 + .asciz "ControlWindow" + .balign 4 .global $$253207 $$253207: - .incbin "baserom.dol", 0x45DD94, 0x10 + .asciz "CheckWindowL2" + .balign 4 .global $$253208 $$253208: - .incbin "baserom.dol", 0x45DDA4, 0xC + .asciz "CheckButton" .global $$253209 $$253209: - .incbin "baserom.dol", 0x45DDB0, 0x14 + .asciz "CheckButtonCursor" + .balign 4 .global $$253210 $$253210: - .incbin "baserom.dol", 0x45DDC4, 0xC + .asciz "ControlN" + .balign 4 .global $$253214 $$253214: - .incbin "baserom.dol", 0x45DDD0, 0x10 + .asciz "SaveFileButtonN" .global $$253215 $$253215: - .incbin "baserom.dol", 0x45DDE0, 0x10 + .asciz "DeleteButtonN" + .balign 4 .global $$253311 $$253311: - .incbin "baserom.dol", 0x45DDF0, 0xC + .asciz "TextGameT" + .balign 4 .global $$253312 $$253312: - .incbin "baserom.dol", 0x45DDFC, 0xC + .asciz "TextPlayerT" .global $$253313 $$253313: - .incbin "baserom.dol", 0x45DE08, 0xC + .asciz "TextHomeT" + .balign 4 .global $$253321 $$253321: - .incbin "baserom.dol", 0x45DE14, 0x10 + .asciz "CheckButtonT" + .balign 4 .global $$253387 $$253387: - .incbin "baserom.dol", 0x45DE24, 0x3C + .asciz "NoChoice" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253211 $$253211: - .incbin "baserom.dol", 0x494B80, 0x8 + .asciz "YesN" + .balign 4 .global $$253212 $$253212: - .incbin "baserom.dol", 0x494B88, 0x8 + .4byte 0x4E6F4E00 + .4byte 0 .global $$253213 $$253213: - .incbin "baserom.dol", 0x494B90, 0x8 + .asciz "CursorN" .global $$253216 $$253216: - .incbin "baserom.dol", 0x494B98, 0x8 + .asciz "Wait" + .balign 4 .global $$253310 $$253310: - .incbin "baserom.dol", 0x494BA0, 0x8 + .asciz "GameN" + .balign 4 .global $$253329 $$253329: - .incbin "baserom.dol", 0x494BA8, 0x8 + .asciz "Open" + .balign 4 .global $$253330 $$253330: - .incbin "baserom.dol", 0x494BB0, 0x8 + .asciz "Choice" + .balign 4 .global $$253334 $$253334: - .incbin "baserom.dol", 0x494BB8, 0x8 + .asciz "Close" + .balign 4 .global $$253368 $$253368: - .incbin "baserom.dol", 0x494BC0, 0x8 + .asciz "Decide" + .balign 4 .global $$253388 $$253388: - .incbin "baserom.dol", 0x494BC8, 0x8 + .asciz "UnFocus" .global $$253389 $$253389: - .incbin "baserom.dol", 0x494BD0, 0x8 + .asciz "Wait2" + .balign 4 .global $$253390 $$253390: - .incbin "baserom.dol", 0x494BD8, 0x8 + .asciz "Focus" + .balign 4 .global $$253391 $$253391: - .incbin "baserom.dol", 0x494BE0, 0x8 + .asciz "Wait1" + .balign 4 diff --git a/asm/src/Gear.s b/asm/src/Gear.s index 1ecc2a70..1d85f3c4 100644 --- a/asm/src/Gear.s +++ b/asm/src/Gear.s @@ -1858,17 +1858,22 @@ allocator__Q43scn4step4hero4GearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252434 $$252434: - .incbin "baserom.dol", 0x45AD48, 0x10 + .asciz "WhipReset" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252432 $$252432: - .incbin "baserom.dol", 0x494110, 0x8 + .asciz "Model" + .balign 4 .global $$252433 $$252433: - .incbin "baserom.dol", 0x494118, 0x8 + .asciz "RHaveL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252435 $$252435: - .incbin "baserom.dol", 0x49A940, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/GearModel.s b/asm/src/GearModel.s index 178aeaf2..7008e9f1 100644 --- a/asm/src/GearModel.s +++ b/asm/src/GearModel.s @@ -199,4 +199,7 @@ lbl_8019A88C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24gobj9GearModel __vt__Q24gobj9GearModel: - .incbin "baserom.dol", 0x451120, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8019A750 ;# ptr + .4byte 0x8019A7C8 ;# ptr diff --git a/asm/src/GearModelDesc.s b/asm/src/GearModelDesc.s index 7a989532..7e158561 100644 --- a/asm/src/GearModelDesc.s +++ b/asm/src/GearModelDesc.s @@ -54,7 +54,9 @@ lbl_8019A8F4: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248848 $$248848: - .incbin "baserom.dol", 0x4931E8, 0x8 + .asciz "noname" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x4931F0, 0x8 + .asciz "Model" + .balign 4 diff --git a/asm/src/GenContext.s b/asm/src/GenContext.s index 238160ed..f4a48dde 100644 --- a/asm/src/GenContext.s +++ b/asm/src/GenContext.s @@ -256,4 +256,5 @@ polyModelPrefixRef__Q36effect6detail10GenContextCFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249006 $$249006: - .incbin "baserom.dol", 0x4930B8, 0x8 + .4byte 0x25730000 + .4byte 0 diff --git a/asm/src/GenContextTable.s b/asm/src/GenContextTable.s index dbf07382..b08060f9 100644 --- a/asm/src/GenContextTable.s +++ b/asm/src/GenContextTable.s @@ -344,4 +344,5 @@ lbl_80181B84: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249762 $$249762: - .incbin "baserom.dol", 0x44F4F0, 0x18 + .asciz "vector length error" + .4byte 0 diff --git a/asm/src/GeneralDrawer.s b/asm/src/GeneralDrawer.s index 117c0c7a..1f049eb0 100644 --- a/asm/src/GeneralDrawer.s +++ b/asm/src/GeneralDrawer.s @@ -289,7 +289,7 @@ lbl_8027A994: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global DEFAULT_COLOR__Q43scn4step5debug27$$2unnamed$$2GeneralDrawer_cpp$$2 DEFAULT_COLOR__Q43scn4step5debug27$$2unnamed$$2GeneralDrawer_cpp$$2: - .incbin "baserom.dol", 0x49B920, 0x4 + .4byte 0xFFFFFF80 .global $$252239 $$252239: - .incbin "baserom.dol", 0x49B924, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/GenerateFromObj.s b/asm/src/GenerateFromObj.s index 44203be3..da1ea57a 100644 --- a/asm/src/GenerateFromObj.s +++ b/asm/src/GenerateFromObj.s @@ -309,36 +309,73 @@ lbl_803C13EC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x41C308, 0x44 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x0000000A + .4byte 0x0000000F + .4byte 0x00000014 + .4byte 0x00000019 + .4byte 0x0000001E + .4byte 0x00000023 + .4byte 0x00000028 + .4byte 0x0000002D + .4byte 0x00000032 + .4byte 0x00000064 .global T_ODDS_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDS_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x41C34C, 0x34 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000014 + .4byte 0x0000001E + .4byte 0x00000028 + .4byte 0x00000032 + .4byte 0x0000003C + .4byte 0x00000046 + .4byte 0x00000050 + .4byte 0x0000005A + .4byte 0x00000064 .global T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x41C380, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000041 + .4byte 0x00000064 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x49E4F8, 0x8 + .4byte 0x00000011 + .4byte 0x80420208 .global T_ODDSTABLE_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x49E500, 0x8 + .4byte 0x0000000D + .4byte 0x8042024C .global T_ODDSTABLE_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: - .incbin "baserom.dol", 0x49E508, 0x8 + .4byte 0x00000005 + .4byte 0x80420280 .global $$254118 $$254118: - .incbin "baserom.dol", 0x49E510, 0x4 + .4byte 0x3E99999A .global $$254119 $$254119: - .incbin "baserom.dol", 0x49E514, 0x4 + .4byte 0x3F19999A .global $$254139 $$254139: - .incbin "baserom.dol", 0x49E518, 0x4 + .4byte 0 .global $$254140 $$254140: - .incbin "baserom.dol", 0x49E51C, 0x4 + .4byte 0x3F800000 .global $$254143 $$254143: - .incbin "baserom.dol", 0x49E520, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/Generator.s b/asm/src/Generator.s index 4ec38fc9..96a88935 100644 --- a/asm/src/Generator.s +++ b/asm/src/Generator.s @@ -1128,28 +1128,29 @@ isInRoomGuarder__Q43scn4step4ogen9GeneratorCFRCQ33hel4math7Vector2: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global HALF_HEIGHT__Q43scn4step4ogen9Generator HALF_HEIGHT__Q43scn4step4ogen9Generator: - .incbin "baserom.dol", 0x49E670, 0x4 + .4byte 0x40B00000 .global $$257153 $$257153: - .incbin "baserom.dol", 0x49E674, 0x4 + .4byte 0x40B00000 .global $$257154 $$257154: - .incbin "baserom.dol", 0x49E678, 0x4 + .4byte 0xC0B00000 .global $$257155 $$257155: - .incbin "baserom.dol", 0x49E67C, 0x4 + .4byte 0x40000000 .global $$257156 $$257156: - .incbin "baserom.dol", 0x49E680, 0x4 + .4byte 0xC0000000 .global $$257322 $$257322: - .incbin "baserom.dol", 0x49E684, 0x4 + .4byte 0x3F000000 .global $$257323 $$257323: - .incbin "baserom.dol", 0x49E688, 0x4 + .4byte 0 .global $$257441 $$257441: - .incbin "baserom.dol", 0x49E68C, 0x4 + .4byte 0x3F800000 .global $$257448 $$257448: - .incbin "baserom.dol", 0x49E690, 0x8 + .4byte 0x40400000 + .4byte 0 diff --git a/asm/src/Ghost.s b/asm/src/Ghost.s index 0aacb1e5..b8bbeb66 100644 --- a/asm/src/Ghost.s +++ b/asm/src/Ghost.s @@ -611,67 +611,73 @@ __sinit_$$3Ghost_cpp: /* 8030FB98 0030B9D8 4B DA E5 28 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025AC, 0x4 + .4byte 0x8030FB84 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254434 $$254434: - .incbin "baserom.dol", 0x47D3F8, 0x18 + .asciz "step/chara/ghost/Ghost" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254435 $$254435: - .incbin "baserom.dol", 0x496AC0, 0x8 + .asciz "TopL" + .balign 4 .global $$254437 $$254437: - .incbin "baserom.dol", 0x496AC8, 0x8 + .asciz "Wait" + .balign 4 .global $$254505 $$254505: - .incbin "baserom.dol", 0x496AD0, 0x8 + .asciz "Door" + .balign 4 .global $$254506 $$254506: - .incbin "baserom.dol", 0x496AD8, 0x8 + .asciz "Appear" + .balign 4 .global $$254507 $$254507: - .incbin "baserom.dol", 0x496AE0, 0x8 + .asciz "Goal" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254436 $$254436: - .incbin "baserom.dol", 0x49D3D0, 0x4 + .4byte 0x42480000 .global $$254508 $$254508: - .incbin "baserom.dol", 0x49D3D4, 0x4 + .4byte 0xC1700000 .global $$254509 $$254509: - .incbin "baserom.dol", 0x49D3D8, 0x4 + .4byte 0x41700000 .global $$254510 $$254510: - .incbin "baserom.dol", 0x49D3DC, 0x4 + .4byte 0 .global $$254573 $$254573: - .incbin "baserom.dol", 0x49D3E0, 0x4 + .4byte 0xC2480000 .global $$254574 $$254574: - .incbin "baserom.dol", 0x49D3E4, 0x4 + .4byte 0x43B40000 .global $$254575 $$254575: - .incbin "baserom.dol", 0x49D3E8, 0x4 + .4byte 0xC3B40000 .global $$254576 $$254576: - .incbin "baserom.dol", 0x49D3EC, 0x4 + .4byte 0x3F000000 .global $$254577 $$254577: - .incbin "baserom.dol", 0x49D3F0, 0x4 + .4byte 0x40A00000 .global $$254578 $$254578: - .incbin "baserom.dol", 0x49D3F4, 0x4 + .4byte 0x3C8EFA35 .global $$254587 $$254587: - .incbin "baserom.dol", 0x49D3F8, 0x4 + .4byte 0x3F4CCCCD .global $$254588 $$254588: - .incbin "baserom.dol", 0x49D3FC, 0x4 + .4byte 0xBF800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global Offset__19$$2unnamed$$2Ghost_cpp$$2 diff --git a/asm/src/GhostIcon.s b/asm/src/GhostIcon.s index 5b3a30e8..218848a2 100644 --- a/asm/src/GhostIcon.s +++ b/asm/src/GhostIcon.s @@ -1061,68 +1061,82 @@ lbl_803B3484: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257163 $$257163: - .incbin "baserom.dol", 0x48C520, 0x14 + .asciz "step/challenge/Main" .global $$257164 $$257164: - .incbin "baserom.dol", 0x48C534, 0x10 + .asciz "ScreenOutBase" + .balign 4 .global $$257165 $$257165: - .incbin "baserom.dol", 0x48C544, 0x10 + .asciz "ScreenOutGhost" + .balign 4 .global $$257166 $$257166: - .incbin "baserom.dol", 0x48C554, 0x10 + .asciz "ScreenOutArrow" + .balign 4 .global $$257167 $$257167: - .incbin "baserom.dol", 0x48C564, 0x14 + .asciz "ScreenOutIconN" + .balign 4 + .4byte 0 .global $$257168 $$257168: - .incbin "baserom.dol", 0x48C578, 0x10 + .asciz "ScreenOutArrowN" .global $$257170 $$257170: - .incbin "baserom.dol", 0x48C588, 0x10 + .asciz "MahoroaArrowN" + .balign 4 .global $$257171 $$257171: - .incbin "baserom.dol", 0x48C598, 0xC + .asciz "IconLimitLU" .global $$257172 $$257172: - .incbin "baserom.dol", 0x48C5A4, 0xC + .asciz "IconLimitRD" .global $$257173 $$257173: - .incbin "baserom.dol", 0x48C5B0, 0x10 + .asciz "MasterLimitLU" + .balign 4 .global $$257174 $$257174: - .incbin "baserom.dol", 0x48C5C0, 0x40 + .asciz "MasterLimitRD" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257169 $$257169: - .incbin "baserom.dol", 0x497B80, 0x8 + .asciz "Wait" + .balign 4 .global $$257325 $$257325: - .incbin "baserom.dol", 0x497B88, 0x8 + .asciz "ScaleN" + .balign 4 .global $$257333 $$257333: - .incbin "baserom.dol", 0x497B90, 0x4 + .4byte 0x496E0000 .global $$257340 $$257340: - .incbin "baserom.dol", 0x497B94, 0x4 + .4byte 0x4F757400 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257175 $$257175: - .incbin "baserom.dol", 0x49E460, 0x4 + .4byte 0x41200000 .global $$257267 $$257267: - .incbin "baserom.dol", 0x49E464, 0x4 + .4byte 0x3727C5AC .global $$257268 $$257268: - .incbin "baserom.dol", 0x49E468, 0x4 + .4byte 0 .global $$257269 $$257269: - .incbin "baserom.dol", 0x49E46C, 0x4 + .4byte 0x3F800000 .global $$257326 $$257326: - .incbin "baserom.dol", 0x49E470, 0x4 + .4byte 0x3CC90FDB .global $$257327 $$257327: - .incbin "baserom.dol", 0x49E474, 0x4 + .4byte 0x42652EE1 diff --git a/asm/src/Gimmick.s b/asm/src/Gimmick.s index 4d964da0..021bc99c 100644 --- a/asm/src/Gimmick.s +++ b/asm/src/Gimmick.s @@ -267,4 +267,123 @@ mfIsBreakGold__Q25ocoll7GimmickCFRCQ25ocoll10AttackData: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BLOCK_CENTER_OFFS__21$$2unnamed$$2Gimmick_cpp$$2 T_BLOCK_CENTER_OFFS__21$$2unnamed$$2Gimmick_cpp$$2: - .incbin "baserom.dol", 0x410F88, 0x1E0 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3FC00000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x3FC00000 + .4byte 0x3FC00000 + .4byte 0x3F800000 + .4byte 0x3F800000 diff --git a/asm/src/Goal.s b/asm/src/Goal.s index 2f123fe6..28c0f2dd 100644 --- a/asm/src/Goal.s +++ b/asm/src/Goal.s @@ -158,18 +158,23 @@ lbl_803B36B4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253424 $$253424: - .incbin "baserom.dol", 0x48C600, 0x18 + .asciz "step/challenge/Main" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253425 $$253425: - .incbin "baserom.dol", 0x497B98, 0x8 + .asciz "Goal" + .balign 4 .global $$253462 $$253462: - .incbin "baserom.dol", 0x497BA0, 0x8 + .asciz "Start" + .balign 4 .global $$253478 $$253478: - .incbin "baserom.dol", 0x497BA8, 0x8 + .asciz "Wait" + .balign 4 .global $$253479 $$253479: - .incbin "baserom.dol", 0x497BB0, 0x8 + .4byte 0x456E6400 + .4byte 0 diff --git a/asm/src/GoalFlag.s b/asm/src/GoalFlag.s index a18a6a7b..8f915435 100644 --- a/asm/src/GoalFlag.s +++ b/asm/src/GoalFlag.s @@ -113,20 +113,23 @@ lbl_8030FEF4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252652 $$252652: - .incbin "baserom.dol", 0x47D410, 0x18 + .asciz "step/gimmick/GoalFlag" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252653 $$252653: - .incbin "baserom.dol", 0x496AE8, 0x8 + .asciz "TopL" + .balign 4 .global $$252655 $$252655: - .incbin "baserom.dol", 0x496AF0, 0x8 + .asciz "Main" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252654 $$252654: - .incbin "baserom.dol", 0x49D400, 0x4 + .4byte 0xC0400000 .global $$252669 $$252669: - .incbin "baserom.dol", 0x49D404, 0x4 + .4byte 0x40A00000 diff --git a/asm/src/GridPos.s b/asm/src/GridPos.s index 88322e07..3ecda383 100644 --- a/asm/src/GridPos.s +++ b/asm/src/GridPos.s @@ -124,7 +124,9 @@ lbl_80221660: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249743 $$249743: - .incbin "baserom.dol", 0x49AD40, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$249758 $$249758: - .incbin "baserom.dol", 0x49AD48, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/GroundChecker.s b/asm/src/GroundChecker.s index 2ee0d2f2..443b1c1b 100644 --- a/asm/src/GroundChecker.s +++ b/asm/src/GroundChecker.s @@ -287,13 +287,13 @@ getFloorPosVector3__Q43scn4step5chara13GroundCheckerCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253931 $$253931: - .incbin "baserom.dol", 0x49B7B8, 0x4 + .4byte 0 .global $$253995 $$253995: - .incbin "baserom.dol", 0x49B7BC, 0x4 + .4byte 0x3727C5AC .global $$253996 $$253996: - .incbin "baserom.dol", 0x49B7C0, 0x4 + .4byte 0x3C23D70A .global $$253997 $$253997: - .incbin "baserom.dol", 0x49B7C4, 0x4 + .4byte 0xC1400000 diff --git a/asm/src/Group.s b/asm/src/Group.s index a29b6214..5709543f 100644 --- a/asm/src/Group.s +++ b/asm/src/Group.s @@ -566,25 +566,33 @@ Empty__Q34nw4r3g3d8ScnGroupCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$20: - .incbin "baserom.dol", 0x44F2A0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1: - .incbin "baserom.dol", 0x44F2C4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x44F2D0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x44F2F4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x44F300, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x44F324, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x44F330, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1Fv: - .incbin "baserom.dol", 0x44F354, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/Guard.s b/asm/src/Guard.s index 214d9e9f..c0232cfc 100644 --- a/asm/src/Guard.s +++ b/asm/src/Guard.s @@ -133,20 +133,47 @@ lbl_80338690: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DAMAGE_PASS_RATE_TABLE__Q43scn4step4boss19$$2unnamed$$2Guard_cpp$$2 T_DAMAGE_PASS_RATE_TABLE__Q43scn4step4boss19$$2unnamed$$2Guard_cpp$$2: - .incbin "baserom.dol", 0x4124D0, 0x20 + .4byte 0x3F800000 + .asciz "?333?" + .balign 4 + .4byte 0x3ECCCCCD + .4byte 0x3E99999A + .4byte 0x3E4CCCCD + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__19$$2unnamed$$2Guard_cpp$$2 T_ALPHA_TABLE__19$$2unnamed$$2Guard_cpp$$2: - .incbin "baserom.dol", 0x415E00, 0x50 + .4byte 0x000000C0 + .4byte 0x000000C0 + .4byte 0x000000A0 + .4byte 0x00000090 + .4byte 0x00000080 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249320 $$249320: - .incbin "baserom.dol", 0x49AE70, 0x4 + .4byte 0x3727C5AC .global $$249321 $$249321: - .incbin "baserom.dol", 0x49AE74, 0x4 + .4byte 0xB727C5AC .global $$249324 $$249324: - .incbin "baserom.dol", 0x49AE78, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/GuardFlash.s b/asm/src/GuardFlash.s index cbbf7f97..d58af505 100644 --- a/asm/src/GuardFlash.s +++ b/asm/src/GuardFlash.s @@ -32,7 +32,7 @@ lbl_802304F8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ALPHA_TABLE__Q43scn4step4boss24$$2unnamed$$2GuardFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss24$$2unnamed$$2GuardFlash_cpp$$2: - .incbin "baserom.dol", 0x49AE80, 0x4 + .4byte 0x00006464 .global $$249319 $$249319: - .incbin "baserom.dol", 0x49AE84, 0x4 + .4byte 0xC0C0C000 diff --git a/asm/src/GuideBoard.s b/asm/src/GuideBoard.s index fe3a0791..e1664979 100644 --- a/asm/src/GuideBoard.s +++ b/asm/src/GuideBoard.s @@ -993,23 +993,24 @@ lbl_80312B48: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255157 $$255157: - .incbin "baserom.dol", 0x47D688, 0x18 + .asciz "step/gimmick/GuideBoard" .global $$255422 $$255422: - .incbin "baserom.dol", 0x47D6A0, 0x18 + .asciz "step/gimmick/SwordBoard" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255290 $$255290: - .incbin "baserom.dol", 0x496B80, 0x8 + .asciz "EffectL" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255276 $$255276: - .incbin "baserom.dol", 0x49D430, 0x4 + .4byte 0x3FC00000 .global $$255277 $$255277: - .incbin "baserom.dol", 0x49D434, 0x4 + .4byte 0 .global $$255339 $$255339: - .incbin "baserom.dol", 0x49D438, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/HEL__Math__Vector2.s b/asm/src/HEL__Math__Vector2.s index 66fbb23c..af1bcb4a 100644 --- a/asm/src/HEL__Math__Vector2.s +++ b/asm/src/HEL__Math__Vector2.s @@ -776,99 +776,153 @@ lbl_801C231C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254029 $$254029: - .incbin "baserom.dol", 0x4562C0, 0x14 + .asciz "HEL.Math.Vector2" + .balign 4 .global $$254032 $$254032: - .incbin "baserom.dol", 0x4562D4, 0x18 + .asciz "void this(float,float)" + .balign 4 .global $$254033 $$254033: - .incbin "baserom.dol", 0x4562EC, 0x18 + .asciz "void set(float,float)" + .balign 4 .global $$254034 $$254034: - .incbin "baserom.dol", 0x456304, 0x20 + .asciz "bool isZeroLoose(float)const" + .balign 4 .global $$254035 $$254035: - .incbin "baserom.dol", 0x456324, 0x1C + .asciz "bool isZeroStrict()const" + .balign 4 .global $$254036 $$254036: - .incbin "baserom.dol", 0x456340, 0x14 + .asciz "bool isZero()const" + .balign 4 .global $$254037 $$254037: - .incbin "baserom.dol", 0x456354, 0x30 + .asciz "void opAddAssign(const ref HEL.Math.Vector2)" + .balign 4 .global $$254038 $$254038: - .incbin "baserom.dol", 0x456384, 0x34 + .asciz "void opSubAssign(const ref HEL.Math.Vector2)" + .balign 4 + .4byte 0 .global $$254039 $$254039: - .incbin "baserom.dol", 0x4563B8, 0x18 + .asciz "void opMulAssign(float)" .global $$254040 $$254040: - .incbin "baserom.dol", 0x4563D0, 0x18 + .asciz "void opDivAssign(float)" .global $$254041 $$254041: - .incbin "baserom.dol", 0x4563E8, 0x38 + .asciz "HEL.Math.Vector2 opAdd(const ref HEL.Math.Vector2)const" .global $$254042 $$254042: - .incbin "baserom.dol", 0x456420, 0x38 + .asciz "HEL.Math.Vector2 opSub(const ref HEL.Math.Vector2)const" .global $$254043 $$254043: - .incbin "baserom.dol", 0x456458, 0x24 + .asciz "HEL.Math.Vector2 opMul(float)const" + .balign 4 .global $$254044 $$254044: - .incbin "baserom.dol", 0x45647C, 0x24 + .asciz "HEL.Math.Vector2 opDiv(float)const" + .balign 4 .global $$254045 $$254045: - .incbin "baserom.dol", 0x4564A0, 0x24 + .asciz "HEL.Math.Vector3 toVector3()const" + .balign 4 .global $$254046 $$254046: - .incbin "baserom.dol", 0x4564C4, 0x28 + .asciz "HEL.Math.Vector3 toVector3XOY()const" + .balign 4 .global $$254048 $$254048: - .incbin "baserom.dol", 0x4564EC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F46C ;# ptr .global $$254109 $$254109: - .incbin "baserom.dol", 0x4564F8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F45C ;# ptr .global $$254114 $$254114: - .incbin "baserom.dol", 0x456504, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C1BB4 ;# ptr .global $$254145 $$254145: - .incbin "baserom.dol", 0x456510, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F3B4 ;# ptr .global $$254153 $$254153: - .incbin "baserom.dol", 0x45651C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A01FC ;# ptr .global $$254175 $$254175: - .incbin "baserom.dol", 0x456528, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A0590 ;# ptr .global $$254187 $$254187: - .incbin "baserom.dol", 0x456534, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F0F8 ;# ptr .global $$254195 $$254195: - .incbin "baserom.dol", 0x456540, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F000 ;# ptr .global $$254200 $$254200: - .incbin "baserom.dol", 0x45654C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F48C ;# ptr .global $$254208 $$254208: - .incbin "baserom.dol", 0x456558, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F438 ;# ptr .global $$254213 $$254213: - .incbin "baserom.dol", 0x456564, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801B8E30 ;# ptr .global $$254239 $$254239: - .incbin "baserom.dol", 0x456570, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A08C0 ;# ptr .global $$254244 $$254244: - .incbin "baserom.dol", 0x45657C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801B58AC ;# ptr .global $$254265 $$254265: - .incbin "baserom.dol", 0x456588, 0x88 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F3A8 ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254030 $$254030: - .incbin "baserom.dol", 0x4936C0, 0x4 + .4byte 0x78000000 .global $$254031 $$254031: - .incbin "baserom.dol", 0x4936C4, 0x4 + .4byte 0x79000000 diff --git a/asm/src/HEL__Math__Vector3.s b/asm/src/HEL__Math__Vector3.s index 1f1ad5d4..38a7b1cf 100644 --- a/asm/src/HEL__Math__Vector3.s +++ b/asm/src/HEL__Math__Vector3.s @@ -1263,174 +1263,254 @@ lbl_801C3434: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254520 $$254520: - .incbin "baserom.dol", 0x456610, 0x14 + .asciz "HEL.Math.Vector3" + .balign 4 .global $$254524 $$254524: - .incbin "baserom.dol", 0x456624, 0x20 + .asciz "void this(float,float,float)" + .balign 4 .global $$254525 $$254525: - .incbin "baserom.dol", 0x456644, 0x1C + .asciz "void set(float,float,float)" .global $$254526 $$254526: - .incbin "baserom.dol", 0x456660, 0x20 + .asciz "bool isZeroLoose(float)const" + .balign 4 .global $$254527 $$254527: - .incbin "baserom.dol", 0x456680, 0x1C + .asciz "bool isZeroStrict()const" + .balign 4 .global $$254528 $$254528: - .incbin "baserom.dol", 0x45669C, 0x14 + .asciz "bool isZero()const" + .balign 4 .global $$254529 $$254529: - .incbin "baserom.dol", 0x4566B0, 0x30 + .asciz "void opAddAssign(const ref HEL.Math.Vector3)" + .balign 4 .global $$254530 $$254530: - .incbin "baserom.dol", 0x4566E0, 0x30 + .asciz "void opSubAssign(const ref HEL.Math.Vector3)" + .balign 4 .global $$254531 $$254531: - .incbin "baserom.dol", 0x456710, 0x18 + .asciz "void opMulAssign(float)" .global $$254532 $$254532: - .incbin "baserom.dol", 0x456728, 0x18 + .asciz "void opDivAssign(float)" .global $$254533 $$254533: - .incbin "baserom.dol", 0x456740, 0x38 + .asciz "HEL.Math.Vector3 opAdd(const ref HEL.Math.Vector3)const" .global $$254534 $$254534: - .incbin "baserom.dol", 0x456778, 0x38 + .asciz "HEL.Math.Vector3 opSub(const ref HEL.Math.Vector3)const" .global $$254535 $$254535: - .incbin "baserom.dol", 0x4567B0, 0x24 + .asciz "HEL.Math.Vector3 opMul(float)const" + .balign 4 .global $$254536 $$254536: - .incbin "baserom.dol", 0x4567D4, 0x24 + .asciz "HEL.Math.Vector3 opDiv(float)const" + .balign 4 .global $$254537 $$254537: - .incbin "baserom.dol", 0x4567F8, 0x20 + .asciz "HEL.Math.Vector2 getXY()const" + .balign 4 .global $$254538 $$254538: - .incbin "baserom.dol", 0x456818, 0x20 + .asciz "HEL.Math.Vector2 getXZ()const" + .balign 4 .global $$254539 $$254539: - .incbin "baserom.dol", 0x456838, 0x20 + .asciz "HEL.Math.Vector2 getYX()const" + .balign 4 .global $$254540 $$254540: - .incbin "baserom.dol", 0x456858, 0x20 + .asciz "HEL.Math.Vector2 getYZ()const" + .balign 4 .global $$254541 $$254541: - .incbin "baserom.dol", 0x456878, 0x20 + .asciz "HEL.Math.Vector2 getZX()const" + .balign 4 .global $$254542 $$254542: - .incbin "baserom.dol", 0x456898, 0x20 + .asciz "HEL.Math.Vector2 getZY()const" + .balign 4 .global $$254543 $$254543: - .incbin "baserom.dol", 0x4568B8, 0x20 + .asciz "const HEL.Math.Vector3 Get()" + .balign 4 .global $$254544 $$254544: - .incbin "baserom.dol", 0x4568D8, 0x10 + .asciz "float GetX()" + .balign 4 .global $$254545 $$254545: - .incbin "baserom.dol", 0x4568E8, 0x10 + .asciz "float GetY()" + .balign 4 .global $$254546 $$254546: - .incbin "baserom.dol", 0x4568F8, 0x10 + .asciz "float GetZ()" + .balign 4 .global $$254547 $$254547: - .incbin "baserom.dol", 0x456908, 0x28 + .asciz "void Set(const ref HEL.Math.Vector3)" + .balign 4 .global $$254548 $$254548: - .incbin "baserom.dol", 0x456930, 0x20 + .asciz "void SetXYZ(float,float,float)" + .balign 4 .global $$254549 $$254549: - .incbin "baserom.dol", 0x456950, 0x14 + .asciz "void SetX(float)" + .balign 4 .global $$254550 $$254550: - .incbin "baserom.dol", 0x456964, 0x14 + .asciz "void SetY(float)" + .balign 4 .global $$254551 $$254551: - .incbin "baserom.dol", 0x456978, 0x18 + .asciz "void SetZ(float)" + .balign 4 + .4byte 0 .global $$254552 $$254552: - .incbin "baserom.dol", 0x456990, 0x10 + .asciz "void Mul(float)" .global $$254553 $$254553: - .incbin "baserom.dol", 0x4569A0, 0x10 + .asciz "void Div(float)" .global $$254554 $$254554: - .incbin "baserom.dol", 0x4569B0, 0x14 + .asciz "void SlotLoad(int)" + .balign 4 .global $$254555 $$254555: - .incbin "baserom.dol", 0x4569C4, 0x14 + .asciz "void SlotSave(int)" + .balign 4 .global $$254556 $$254556: - .incbin "baserom.dol", 0x4569D8, 0x14 + .asciz "void SlotAdd(int)" + .balign 4 .global $$254557 $$254557: - .incbin "baserom.dol", 0x4569EC, 0x14 + .asciz "void SlotSub(int)" + .balign 4 .global $$254558 $$254558: - .incbin "baserom.dol", 0x456A00, 0x34 + .asciz "const HEL.Math.Vector3 Create(float,float,float)" + .balign 4 .global $$254663 $$254663: - .incbin "baserom.dol", 0x456A34, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2990 ;# ptr .global $$254702 $$254702: - .incbin "baserom.dol", 0x456A40, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2A7C ;# ptr .global $$254710 $$254710: - .incbin "baserom.dol", 0x456A4C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2AD0 ;# ptr .global $$254718 $$254718: - .incbin "baserom.dol", 0x456A58, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2B24 ;# ptr .global $$254726 $$254726: - .incbin "baserom.dol", 0x456A64, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2B78 ;# ptr .global $$254734 $$254734: - .incbin "baserom.dol", 0x456A70, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2BCC ;# ptr .global $$254742 $$254742: - .incbin "baserom.dol", 0x456A7C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C2C20 ;# ptr .global $$254772 $$254772: - .incbin "baserom.dol", 0x456A88, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8017C568 ;# ptr .global $$254782 $$254782: - .incbin "baserom.dol", 0x456A94, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8017C84C ;# ptr .global $$254806 $$254806: - .incbin "baserom.dol", 0x456AA0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801954E0 ;# ptr .global $$254820 $$254820: - .incbin "baserom.dol", 0x456AAC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F724 ;# ptr .global $$254828 $$254828: - .incbin "baserom.dol", 0x456AB8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F730 ;# ptr .global $$254833 $$254833: - .incbin "baserom.dol", 0x456AC4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019FC88 ;# ptr .global $$254841 $$254841: - .incbin "baserom.dol", 0x456AD0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801829AC ;# ptr .global $$254846 $$254846: - .incbin "baserom.dol", 0x456ADC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019E1BC ;# ptr .global $$254875 $$254875: - .incbin "baserom.dol", 0x456AE8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8019F888 ;# ptr .global $$254880 $$254880: - .incbin "baserom.dol", 0x456AF4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C326C ;# ptr .global $$254904 $$254904: - .incbin "baserom.dol", 0x456B00, 0x88 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C33B4 ;# ptr + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254521 $$254521: - .incbin "baserom.dol", 0x4936C8, 0x4 + .4byte 0x78000000 .global $$254522 $$254522: - .incbin "baserom.dol", 0x4936CC, 0x4 + .4byte 0x79000000 .global $$254523 $$254523: - .incbin "baserom.dol", 0x4936D0, 0x8 + .4byte 0x7A000000 + .4byte 0 diff --git a/asm/src/HIDAccessor.s b/asm/src/HIDAccessor.s index 2c0b177f..22142eb3 100644 --- a/asm/src/HIDAccessor.s +++ b/asm/src/HIDAccessor.s @@ -465,18 +465,131 @@ checkInputSubStick__Q23hid11HIDAccessorCFRCQ33hel4math7Vector2f: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BUTTON_CONVDATA_CL__25$$2unnamed$$2HIDAccessor_cpp$$2 T_BUTTON_CONVDATA_CL__25$$2unnamed$$2HIDAccessor_cpp$$2: - .incbin "baserom.dol", 0x410A70, 0xF0 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0 + .4byte 0x00008000 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00004000 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00000100 + .4byte 0x00000100 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000200 + .4byte 0x00000200 + .4byte 0 + .4byte 0x00000400 + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0 + .4byte 0x00001000 + .4byte 0x00001000 + .4byte 0x00001000 + .4byte 0 + .4byte 0x00000800 + .4byte 0x00008000 + .4byte 0x00008000 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000100 + .4byte 0x00000800 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000200 + .4byte 0 + .4byte 0 + .4byte 0x00002000 + .4byte 0x00000800 + .4byte 0 + .4byte 0 + .4byte 0x00000200 + .4byte 0x00000800 + .4byte 0 + .4byte 0 + .4byte 0x00000080 + .4byte 0x00000400 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000400 + .4byte 0 + .4byte 0 .global T_BUTTON_CONVDATA_GC__25$$2unnamed$$2HIDAccessor_cpp$$2 T_BUTTON_CONVDATA_GC__25$$2unnamed$$2HIDAccessor_cpp$$2: - .incbin "baserom.dol", 0x410B60, 0xC0 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000100 + .4byte 0x00000100 + .4byte 0x00000100 + .4byte 0 + .4byte 0x00000200 + .4byte 0x00000200 + .4byte 0x00000200 + .4byte 0 + .4byte 0x00001000 + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00001000 + .4byte 0x00001000 + .4byte 0 + .4byte 0x00000400 + .4byte 0x00000100 + .4byte 0x00000800 + .4byte 0 + .4byte 0x00000800 + .4byte 0x00000200 + .4byte 0 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000800 + .4byte 0 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000800 + .4byte 0 + .4byte 0 .global T_STICK_CONVDATA__25$$2unnamed$$2HIDAccessor_cpp$$2 T_STICK_CONVDATA__25$$2unnamed$$2HIDAccessor_cpp$$2: - .incbin "baserom.dol", 0x410C20, 0x20 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250596 $$250596: - .incbin "baserom.dol", 0x49A450, 0x4 + .4byte 0x3E800000 .global $$250617 $$250617: - .incbin "baserom.dol", 0x49A454, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/HIDErrorMenu.s b/asm/src/HIDErrorMenu.s index a278807c..a9478e36 100644 --- a/asm/src/HIDErrorMenu.s +++ b/asm/src/HIDErrorMenu.s @@ -1937,132 +1937,176 @@ lbl_801793A0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252181 $$252181: - .incbin "baserom.dol", 0x44EE18, 0x10 + .asciz "DisconnectTitle" .global ON_CANCEL_WINDOW_TEXT_MAIN__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_MAIN__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .incbin "baserom.dol", 0x44EE28, 0xC + .4byte 0x80452D18 + .4byte 0x80452D18 + .4byte 0x80452D18 .global $$252182 $$252182: - .incbin "baserom.dol", 0x44EE34, 0x20 + .asciz "DisconnectTitleSubWithCancel" + .balign 4 .global $$252183 $$252183: - .incbin "baserom.dol", 0x44EE54, 0x1C + .asciz "DisconnectTitleSubWithQuit" + .balign 4 .global ON_CANCEL_WINDOW_TEXT_SUB__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_SUB__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .incbin "baserom.dol", 0x44EE70, 0xC + .4byte 0x80452D18 + .4byte 0x80452D34 + .4byte 0x80452D54 .global $$252184 $$252184: - .incbin "baserom.dol", 0x44EE7C, 0x14 + .asciz "DisconnectContinue" + .balign 4 .global $$252185 $$252185: - .incbin "baserom.dol", 0x44EE90, 0x10 + .asciz "DisconnectQuit" + .balign 4 .global ON_CANCEL_WINDOW_TEXT_CONFIRM__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_CONFIRM__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .incbin "baserom.dol", 0x44EEA0, 0xC + .4byte 0x80452D7C + .4byte 0x80452D7C + .4byte 0x80452D90 .global $$254504 $$254504: - .incbin "baserom.dol", 0x44EEAC, 0xC + .asciz "ErrorMenu" + .balign 4 .global $$254614 $$254614: - .incbin "baserom.dol", 0x44EEB8, 0xC + .asciz "common/Main" .global $$254616 $$254616: - .incbin "baserom.dol", 0x44EEC4, 0x10 + .asciz "BatteryWindow" + .balign 4 .global $$254617 $$254617: - .incbin "baserom.dol", 0x44EED4, 0xC + .asciz "Button01N" + .balign 4 .global $$254618 $$254618: - .incbin "baserom.dol", 0x44EEE0, 0xC + .asciz "Button02N" + .balign 4 .global $$254620 $$254620: - .incbin "baserom.dol", 0x44EEEC, 0xC + .asciz "ConfirmYes" + .balign 4 .global $$254621 $$254621: - .incbin "baserom.dol", 0x44EEF8, 0xC + .asciz "ConfirmNo" + .balign 4 .global $$254699 $$254699: - .incbin "baserom.dol", 0x44EF04, 0xC + .asciz "Switch01" + .balign 4 .global $$254701 $$254701: - .incbin "baserom.dol", 0x44EF10, 0x28 + .4byte 0x801784F4 ;# ptr + .4byte 0x80178514 ;# ptr + .4byte 0x80178530 ;# ptr + .4byte 0x801785B4 ;# ptr + .4byte 0x801785D0 ;# ptr + .4byte 0x801786F0 ;# ptr + .4byte 0x80178738 ;# ptr + .4byte 0x80178754 ;# ptr + .4byte 0x80178774 ;# ptr + .4byte 0 .global $$254822 $$254822: - .incbin "baserom.dol", 0x44EF38, 0x10 + .asciz "DisconnectTitle" .global $$254823 $$254823: - .incbin "baserom.dol", 0x44EF48, 0x14 + .asciz "DisconnectExtTitle" + .balign 4 .global $$254824 $$254824: - .incbin "baserom.dol", 0x44EF5C, 0x14 + .asciz "ConnectClassicCtrl" + .balign 4 .global $$254825 $$254825: - .incbin "baserom.dol", 0x44EF70, 0x18 + .asciz "DisconnectClassicCtrl" + .balign 4 .global $$254826 $$254826: - .incbin "baserom.dol", 0x44EF88, 0xC + .asciz "MainText" + .balign 4 .global $$254828 $$254828: - .incbin "baserom.dol", 0x44EF94, 0xC + .asciz "ConfirmText" .global $$254876 $$254876: - .incbin "baserom.dol", 0x44EFA0, 0xC + .asciz "Switch02" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x44EFAC, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x44EFD0, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254615 $$254615: - .incbin "baserom.dol", 0x492F60, 0x8 + .asciz "Confirm" .global $$254619 $$254619: - .incbin "baserom.dol", 0x492F68, 0x8 + .asciz "WinN" + .balign 4 .global $$254816 $$254816: - .incbin "baserom.dol", 0x492F70, 0x8 + .asciz "StdN" + .balign 4 .global $$254817 $$254817: - .incbin "baserom.dol", 0x492F78, 0x8 + .asciz "SelN" + .balign 4 .global $$254818 $$254818: - .incbin "baserom.dol", 0x492F80, 0x8 + .asciz "ExtN" + .balign 4 .global $$254819 $$254819: - .incbin "baserom.dol", 0x492F88, 0x8 + .asciz "ClaN" + .balign 4 .global $$254820 $$254820: - .incbin "baserom.dol", 0x492F90, 0x8 + .asciz "Start" + .balign 4 .global $$254821 $$254821: - .incbin "baserom.dol", 0x492F98, 0x8 + .4byte 0 + .4byte 0 .global $$254827 $$254827: - .incbin "baserom.dol", 0x492FA0, 0x8 + .asciz "SubText" .global $$254829 $$254829: - .incbin "baserom.dol", 0x492FA8, 0x8 + .asciz "Open" + .balign 4 .global $$254873 $$254873: - .incbin "baserom.dol", 0x492FB0, 0x8 + .asciz "Connect" .global $$254880 $$254880: - .incbin "baserom.dol", 0x492FB8, 0x8 + .asciz "Close" + .balign 4 .global $$254896 $$254896: - .incbin "baserom.dol", 0x492FC0, 0x4 + .4byte 0x53746400 .global $$254897 $$254897: - .incbin "baserom.dol", 0x492FC4, 0x4 + .4byte 0x53656C00 .global $$254898 $$254898: - .incbin "baserom.dol", 0x492FC8, 0x4 + .4byte 0x45787400 .global $$254899 $$254899: - .incbin "baserom.dol", 0x492FCC, 0x4 + .4byte 0x436C6100 .global $$254900 $$254900: - .incbin "baserom.dol", 0x492FD0, 0x8 + .asciz "%s%s" + .balign 4 diff --git a/asm/src/HIDManager.s b/asm/src/HIDManager.s index 9f33fdb9..c8a74bcd 100644 --- a/asm/src/HIDManager.s +++ b/asm/src/HIDManager.s @@ -1107,7 +1107,7 @@ __sinit_$$3HIDManager_cpp: /* 801A3838 0019F678 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402428, 0x4 + .4byte 0x801A3808 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_wpadInfoArray__24$$2unnamed$$2HIDManager_cpp$$2 diff --git a/asm/src/Hammer.s b/asm/src/Hammer.s index a93c5931..2cf11e1e 100644 --- a/asm/src/Hammer.s +++ b/asm/src/Hammer.s @@ -61,74 +61,121 @@ HammerAnim__Q53scn4step4hero9modeldesc6HammerFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21 $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21: - .incbin "baserom.dol", 0x419D50, 0x80 + .4byte 0x8055ADE0 + .4byte 0 + .4byte 0x80489A28 + .4byte 0 + .4byte 0x80489A40 + .4byte 0 + .4byte 0x80489A54 + .4byte 0 + .4byte 0x80489A68 + .4byte 0 + .4byte 0x80489A78 + .4byte 0 + .4byte 0x80489A8C + .4byte 0 + .4byte 0x80489AA0 + .4byte 0 + .4byte 0x80489AB4 + .4byte 0 + .4byte 0x80489AC8 + .4byte 0 + .4byte 0x80489AE0 + .4byte 0 + .4byte 0x80489AF0 + .4byte 0 + .4byte 0x80489AFC + .4byte 0 + .4byte 0x80489B08 + .4byte 0 + .4byte 0x80489B20 + .4byte 0 + .4byte 0x80489B30 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248814 $$248814: - .incbin "baserom.dol", 0x485AE8, 0x24 + .asciz "step/chara/hero/kirby/hammer/Hammer" .global $$248737 $$248737: - .incbin "baserom.dol", 0x485B0C, 0xC + .asciz "HammerheadJ" .global $$2LOCAL$$2HammerModel__Q53scn4step4hero9modeldesc6HammerFv$$2names$$21 $$2LOCAL$$2HammerModel__Q53scn4step4hero9modeldesc6HammerFv$$2names$$21: - .incbin "baserom.dol", 0x485B18, 0x10 + .4byte 0x8055ADD0 + .4byte 0x8055ADD8 + .4byte 0x80489A0C + .4byte 0 .global $$248745 $$248745: - .incbin "baserom.dol", 0x485B28, 0x18 + .asciz "HammerAttackChargeStart" .global $$248746 $$248746: - .incbin "baserom.dol", 0x485B40, 0x14 + .asciz "HammerAttackCharge" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x485B54, 0x14 + .asciz "HammerAttack" + .balign 4 + .4byte 0 .global $$248748 $$248748: - .incbin "baserom.dol", 0x485B68, 0x10 + .asciz "HammerAttackHit" .global $$248749 $$248749: - .incbin "baserom.dol", 0x485B78, 0x14 + .asciz "HammerAttackMiss" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x485B8C, 0x14 + .asciz "TripleHammerAttack1" .global $$248751 $$248751: - .incbin "baserom.dol", 0x485BA0, 0x14 + .asciz "TripleHammerAttack2" .global $$248752 $$248752: - .incbin "baserom.dol", 0x485BB4, 0x14 + .asciz "TripleHammerAttack3" .global $$248753 $$248753: - .incbin "baserom.dol", 0x485BC8, 0x18 + .asciz "TripleHammerAttack3Hit" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x485BE0, 0x10 + .asciz "GuriguriHammer" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x485BF0, 0xC + .asciz "GiantSwing" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x485BFC, 0xC + .asciz "WheelHammer" .global $$248757 $$248757: - .incbin "baserom.dol", 0x485C08, 0x18 + .asciz "StrongWheelHammer" + .balign 4 + .4byte 0 .global $$248758 $$248758: - .incbin "baserom.dol", 0x485C20, 0x10 + .asciz "OnigorosiHammer" .global $$248759 $$248759: - .incbin "baserom.dol", 0x485C30, 0x10 + .asciz "HammerThrow" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 $$248735: - .incbin "baserom.dol", 0x4971B0, 0x8 + .asciz "TopL" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x4971B8, 0x8 + .asciz "AllL" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x4971C0, 0x8 + .asciz "Carry" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2HammerModel__Q53scn4step4hero9modeldesc6HammerFv$$2desc diff --git a/asm/src/Hang.s b/asm/src/Hang.s index 04107263..f29ab55d 100644 --- a/asm/src/Hang.s +++ b/asm/src/Hang.s @@ -475,10 +475,11 @@ param__Q43scn4step4hero4HangCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256705 $$256705: - .incbin "baserom.dol", 0x49D708, 0x4 + .4byte 0x3F800000 .global $$256706 $$256706: - .incbin "baserom.dol", 0x49D70C, 0x4 + .4byte 0x3ECCCCCD .global $$256707 $$256707: - .incbin "baserom.dol", 0x49D710, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/Hat.s b/asm/src/Hat.s index 46249211..c187bf93 100644 --- a/asm/src/Hat.s +++ b/asm/src/Hat.s @@ -406,27 +406,35 @@ lbl_80338D70: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253823 $$253823: - .incbin "baserom.dol", 0x45AD58, 0xC + .asciz "PtcPointL" + .balign 4 .global $$253825 $$253825: - .incbin "baserom.dol", 0x45AD64, 0x14 + .asciz "WinghatWingBM" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253819 $$253819: - .incbin "baserom.dol", 0x494120, 0x4 + .4byte 0x48617400 .global $$253820 $$253820: - .incbin "baserom.dol", 0x494124, 0x8 + .asciz "TopL" + .balign 4 .global $$253821 $$253821: - .incbin "baserom.dol", 0x49412C, 0x8 + .asciz "Model" + .balign 4 .global $$253822 $$253822: - .incbin "baserom.dol", 0x494134, 0x8 + .asciz "HatL" + .balign 4 .global $$253824 $$253824: - .incbin "baserom.dol", 0x49413C, 0xC + .asciz "Main" + .balign 4 + .4byte 0 .global $$253826 $$253826: - .incbin "baserom.dol", 0x494148, 0x8 + .asciz "HatBigM" diff --git a/asm/src/HateCtrl.s b/asm/src/HateCtrl.s index 397a5e53..e20a15c9 100644 --- a/asm/src/HateCtrl.s +++ b/asm/src/HateCtrl.s @@ -415,7 +415,9 @@ lbl_80230A5C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x460688, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x4606AC, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/Heap.s b/asm/src/Heap.s index a2f199cb..a33a89b0 100644 --- a/asm/src/Heap.s +++ b/asm/src/Heap.s @@ -789,20 +789,25 @@ lbl_80338ED4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252930 $$252930: - .incbin "baserom.dol", 0x455EB0, 0x10 + .asciz "mint/Heap" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250138 $$250138: - .incbin "baserom.dol", 0x47FFA0, 0x10 + .asciz "HeroGear%02lu" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252931 $$252931: - .incbin "baserom.dol", 0x4936A8, 0x8 + .asciz "Mint" + .balign 4 .global $$252932 $$252932: - .incbin "baserom.dol", 0x4936B0, 0x8 + .asciz "MNT%s" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_heapPtr__Q24mint18$$2unnamed$$2Heap_cpp$$2 diff --git a/asm/src/HeapCompaction.s b/asm/src/HeapCompaction.s index eb52a9a1..af138d39 100644 --- a/asm/src/HeapCompaction.s +++ b/asm/src/HeapCompaction.s @@ -1072,12 +1072,35 @@ $$24$$2__dt__Q23mem14HeapCompactionFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem14HeapCompaction __vt__Q23mem14HeapCompaction: - .incbin "baserom.dol", 0x455DB0, 0x4C + .4byte 0 + .4byte 0 + .4byte 0x801BD720 ;# ptr + .4byte 0x801BDC58 ;# ptr + .4byte 0x801BDC60 ;# ptr + .4byte 0x801BDC64 ;# ptr + .4byte 0x801BDCB4 ;# ptr + .4byte 0x801BDCB8 ;# ptr + .4byte 0x801BDCBC ;# ptr + .4byte 0x801BDCC4 ;# ptr + .4byte 0x801BDCCC ;# ptr + .4byte 0x801BDD44 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0x801BE1F0 ;# ptr + .4byte 0x801BE1E8 ;# ptr + .4byte 0x801BE1E0 ;# ptr + .4byte 0x801BDD48 ;# ptr + .4byte 0x801BDD88 ;# ptr .global __vt__Q33mem14HeapCompaction22AllocFromTailAllocator __vt__Q33mem14HeapCompaction22AllocFromTailAllocator: - .incbin "baserom.dol", 0x455DFC, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801BD6C4 ;# ptr + .4byte 0x801BE188 ;# ptr + .4byte 0x801BE1CC ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249358 $$249358: - .incbin "baserom.dol", 0x493648, 0x8 + .4byte 0x00000020 + .4byte 0 diff --git a/asm/src/HeapExp.s b/asm/src/HeapExp.s index 0d3d3d4a..aa3ee816 100644 --- a/asm/src/HeapExp.s +++ b/asm/src/HeapExp.s @@ -296,7 +296,19 @@ allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem7HeapExp __vt__Q23mem7HeapExp: - .incbin "baserom.dol", 0x455E10, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x801BE458 ;# ptr + .4byte 0x801BE5B4 ;# ptr + .4byte 0x801BE5B8 ;# ptr + .4byte 0x801BE5BC ;# ptr + .4byte 0x801BE5C0 ;# ptr + .4byte 0x801BE5D0 ;# ptr + .4byte 0x801BE5D4 ;# ptr .global __vt__Q33mem7HeapExp22AllocFromTailAllocator __vt__Q33mem7HeapExp22AllocFromTailAllocator: - .incbin "baserom.dol", 0x455E34, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801BE3A4 ;# ptr + .4byte 0x801BE62C ;# ptr + .4byte 0x801BE638 ;# ptr diff --git a/asm/src/HeapExpArray.s b/asm/src/HeapExpArray.s index b9c4bd05..66e839d0 100644 --- a/asm/src/HeapExpArray.s +++ b/asm/src/HeapExpArray.s @@ -455,7 +455,8 @@ clearIfUsing__Q33mem12HeapExpArray5BlockFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249831 $$249831: - .incbin "baserom.dol", 0x493650, 0x8 + .4byte 0x25730000 + .4byte 0 .global $$249832 $$249832: - .incbin "baserom.dol", 0x493658, 0x8 + .asciz "%s%02lu" diff --git a/asm/src/HeapMapUserRepos.s b/asm/src/HeapMapUserRepos.s index 5ae48158..d2d945e8 100644 --- a/asm/src/HeapMapUserRepos.s +++ b/asm/src/HeapMapUserRepos.s @@ -155,7 +155,7 @@ __dt__Q33hel6common55MutableArray$$0PQ44nrel6devkit7heapmap12IHeapMapUser$$4512$ /* 801BEEB4 001BACF4 4B FB 6C B4 */ b __dt__Q23scn6ISceneFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402434, 0x4 + .4byte 0x801BEE48 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$248741 diff --git a/asm/src/HeapUnit.s b/asm/src/HeapUnit.s index 1a57a6fd..da8187fd 100644 --- a/asm/src/HeapUnit.s +++ b/asm/src/HeapUnit.s @@ -244,4 +244,13 @@ heapDump__Q23mem8HeapUnitCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem8HeapUnit __vt__Q23mem8HeapUnit: - .incbin "baserom.dol", 0x455E48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x801BF06C ;# ptr + .4byte 0x801BF190 ;# ptr + .4byte 0x801BF194 ;# ptr + .4byte 0x801BF198 ;# ptr + .4byte 0x801BF19C ;# ptr + .4byte 0x801BF1AC ;# ptr + .4byte 0x801BF1B0 ;# ptr + .4byte 0 diff --git a/asm/src/HelpPushAll.s b/asm/src/HelpPushAll.s index a69191d0..6cdf7cb1 100644 --- a/asm/src/HelpPushAll.s +++ b/asm/src/HelpPushAll.s @@ -158,20 +158,23 @@ onObjStopChanged__Q43scn4step4info11HelpPushAllFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252048 $$252048: - .incbin "baserom.dol", 0x48B728, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$252049 $$252049: - .incbin "baserom.dol", 0x48B738, 0x10 + .asciz "HelpPushAll" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252111 $$252111: - .incbin "baserom.dol", 0x4978C8, 0x8 + .asciz "TopN" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252106 $$252106: - .incbin "baserom.dol", 0x49E3E0, 0x4 + .4byte 0 .global $$252107 $$252107: - .incbin "baserom.dol", 0x49E3E4, 0x4 + .4byte 0x42F00000 diff --git a/asm/src/HelpPushUp.s b/asm/src/HelpPushUp.s index 0820a678..374caf12 100644 --- a/asm/src/HelpPushUp.s +++ b/asm/src/HelpPushUp.s @@ -361,32 +361,40 @@ startDisappearAnim__Q43scn4step4info10HelpPushUpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252107 $$252107: - .incbin "baserom.dol", 0x48B748, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$252108 $$252108: - .incbin "baserom.dol", 0x48B758, 0x10 + .asciz "HelpPushUp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252109 $$252109: - .incbin "baserom.dol", 0x4978D0, 0x8 + .asciz "Wait" + .balign 4 .global $$252189 $$252189: - .incbin "baserom.dol", 0x4978D8, 0x8 + .asciz "TopN" + .balign 4 .global $$252192 $$252192: - .incbin "baserom.dol", 0x4978E0, 0x8 + .asciz "Start" + .balign 4 .global $$252195 $$252195: - .incbin "baserom.dol", 0x4978E8, 0x8 + .4byte 0x456E6400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global APPEAR_WAIT_DEFAULT__Q43scn4step4info10HelpPushUp APPEAR_WAIT_DEFAULT__Q43scn4step4info10HelpPushUp: - .incbin "baserom.dol", 0x49E3E8, 0x4 + .4byte 0x0000001E .global $$252184 $$252184: - .incbin "baserom.dol", 0x49E3EC, 0x4 + .4byte 0 .global $$252185 $$252185: - .incbin "baserom.dol", 0x49E3F0, 0x8 + .4byte 0x42C80000 + .4byte 0 diff --git a/asm/src/HelpShake.s b/asm/src/HelpShake.s index 5dbfb766..52251ae8 100644 --- a/asm/src/HelpShake.s +++ b/asm/src/HelpShake.s @@ -347,32 +347,41 @@ startDisappearAnim__Q43scn4step4info9HelpShakeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252130 $$252130: - .incbin "baserom.dol", 0x48B768, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$252131 $$252131: - .incbin "baserom.dol", 0x48B778, 0x10 + .asciz "HelpShake" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252133 $$252133: - .incbin "baserom.dol", 0x4978F0, 0x8 + .asciz "Wait" + .balign 4 .global $$252212 $$252212: - .incbin "baserom.dol", 0x4978F8, 0x8 + .asciz "Shake" + .balign 4 .global $$252215 $$252215: - .incbin "baserom.dol", 0x497900, 0x8 + .asciz "Success" .global $$252231 $$252231: - .incbin "baserom.dol", 0x497908, 0x8 + .asciz "TopN" + .balign 4 .global $$252234 $$252234: - .incbin "baserom.dol", 0x497910, 0x8 + .asciz "Start" + .balign 4 .global $$252237 $$252237: - .incbin "baserom.dol", 0x497918, 0x8 + .4byte 0x456E6400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252132 $$252132: - .incbin "baserom.dol", 0x49E3F8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Hero.s b/asm/src/Hero.s index 6754ebea..388ff969 100644 --- a/asm/src/Hero.s +++ b/asm/src/Hero.s @@ -8866,123 +8866,211 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interferen .section .data, "wa" # 0x80421040 - 0x80496700 .global $$287026 $$287026: - .incbin "baserom.dol", 0x47FFB0, 0x48 + .4byte 0x8033FCD4 + .4byte 0x8033FC94 + .4byte 0x80340114 + .4byte 0x8033FDAC + .4byte 0x8033FDD8 + .4byte 0x803401A4 + .4byte 0x8033FE04 + .4byte 0x8033FE74 + .4byte 0x8033FEE4 + .4byte 0x8033FEE4 + .4byte 0x8033FF24 + .4byte 0x8033FF64 + .4byte 0x8033FFA4 + .4byte 0x8033FFE4 + .4byte 0x80340024 + .4byte 0x80340114 + .4byte 0x80340094 + .4byte 0x803400D4 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x47FFF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340868 + .4byte 0x80340594 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480008, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340864 + .4byte 0x8034070C .global __vt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1 __vt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1: - .incbin "baserom.dol", 0x480018, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340860 + .4byte 0x8034050C .global __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1 __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1: - .incbin "baserom.dol", 0x480028, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8034085C + .4byte 0x803405B4 .global __vt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1 __vt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1: - .incbin "baserom.dol", 0x480038, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340858 + .4byte 0x80340530 .global __vt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: - .incbin "baserom.dol", 0x480048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340854 + .4byte 0x80340614 .global __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: - .incbin "baserom.dol", 0x480058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340850 + .4byte 0x80340670 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480068, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8034084C + .4byte 0x80340728 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480078, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340848 + .4byte 0x80340744 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480088, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340844 + .4byte 0x80340760 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480098, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340840 + .4byte 0x8034077C .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4800A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8034083C + .4byte 0x80340798 .global __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: - .incbin "baserom.dol", 0x4800B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340838 + .4byte 0x80340690 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4800C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340834 + .4byte 0x803407B4 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4800D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340830 + .4byte 0x803407D0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4800E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8034082C + .4byte 0x803407EC .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4800F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340828 + .4byte 0x80340808 .global __vt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: - .incbin "baserom.dol", 0x480108, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80340824 + .4byte 0x803406EC .global __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1: - .incbin "baserom.dol", 0x480118, 0xC + .4byte 0 + .4byte 0 + .4byte 0x8033C7C8 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x480124, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x480148, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x480154, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x480178, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x480184, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x4801A8, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x4801B4, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x4801D8, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x4801E4, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x480208, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x480214, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x480238, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$284672 $$284672: - .incbin "baserom.dol", 0x49D718, 0x4 + .4byte 0 .global $$284673 $$284673: - .incbin "baserom.dol", 0x49D71C, 0x4 + .4byte 0xBF4CCCCD .global $$284674 $$284674: - .incbin "baserom.dol", 0x49D720, 0x4 + .4byte 0x3E4CCCCD .global $$286043 $$286043: - .incbin "baserom.dol", 0x49D724, 0x4 + .4byte 0x3F800000 .global $$286044 $$286044: - .incbin "baserom.dol", 0x49D728, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$286212 $$286212: - .incbin "baserom.dol", 0x49D730, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$286832 $$286832: - .incbin "baserom.dol", 0x49D738, 0x4 + .4byte 0x3E800000 .global $$286833 $$286833: - .incbin "baserom.dol", 0x49D73C, 0x4 + .4byte 0x3F400000 diff --git a/asm/src/HeroLifeBar.s b/asm/src/HeroLifeBar.s index 76a19090..0b6d20b0 100644 --- a/asm/src/HeroLifeBar.s +++ b/asm/src/HeroLifeBar.s @@ -847,68 +847,88 @@ lbl_803A8074: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253933 $$253933: - .incbin "baserom.dol", 0x48B788, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$253934 $$253934: - .incbin "baserom.dol", 0x48B798, 0xC + .asciz "HeroLifeBar" .global $$253935 $$253935: - .incbin "baserom.dol", 0x48B7A4, 0x14 + .asciz "HeroLifeBarFlash" + .balign 4 .global $$253995 $$253995: - .incbin "baserom.dol", 0x48B7B8, 0xC + .asciz "NormalModeN" .global $$253996 $$253996: - .incbin "baserom.dol", 0x48B7C4, 0x10 + .asciz "LifeBar_Star" + .balign 4 .global $$254005 $$254005: - .incbin "baserom.dol", 0x48B7D4, 0xC + .asciz "PinchDamage" .global $$254012 $$254012: - .incbin "baserom.dol", 0x48B7E0, 0x10 + .asciz "PinchRecovery" + .balign 4 .global $$254013 $$254013: - .incbin "baserom.dol", 0x48B7F0, 0xC + .asciz "Recovery" + .balign 4 .global $$254021 $$254021: - .incbin "baserom.dol", 0x48B7FC, 0xC + .asciz "PinchWait" + .balign 4 .global $$254024 $$254024: - .incbin "baserom.dol", 0x48B808, 0x10 + .asciz "InvincibleStart" .global $$254025 $$254025: - .incbin "baserom.dol", 0x48B818, 0x10 + .asciz "InvincibleWait" + .balign 4 .global $$254032 $$254032: - .incbin "baserom.dol", 0x48B828, 0x80 + .asciz "InvincibleEnd" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Failed assertion texSRTIdx < mGXMemNum.texSRT" + .balign 4 + .asciz "material.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253937 $$253937: - .incbin "baserom.dol", 0x497920, 0x8 + .asciz "FlashN" + .balign 4 .global $$253938 $$253938: - .incbin "baserom.dol", 0x497928, 0x8 + .asciz "Wait" + .balign 4 .global $$254006 $$254006: - .incbin "baserom.dol", 0x497930, 0x8 + .asciz "Damage" + .balign 4 .global $$254018 $$254018: - .incbin "baserom.dol", 0x497938, 0x8 + .asciz "Pinch" + .balign 4 .global $$254091 $$254091: - .incbin "baserom.dol", 0x497940, 0x8 + .asciz "LifeBar" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253936 $$253936: - .incbin "baserom.dol", 0x49E400, 0x4 + .4byte 0 .global $$253939 $$253939: - .incbin "baserom.dol", 0x49E404, 0x4 + .4byte 0x3F800000 .global $$254057 $$254057: - .incbin "baserom.dol", 0x49E408, 0x4 + .4byte 0x3C449BA6 .global $$254072 $$254072: - .incbin "baserom.dol", 0x49E40C, 0x4 + .4byte 0x3B83126F diff --git a/asm/src/HeroPanel.s b/asm/src/HeroPanel.s index f1ad4495..c434469b 100644 --- a/asm/src/HeroPanel.s +++ b/asm/src/HeroPanel.s @@ -1071,9 +1071,12 @@ helpShakeSuccess__Q43scn4step4info9HeroPanelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256777 $$256777: - .incbin "baserom.dol", 0x48B8A8, 0x10 + .asciz "IfHrPanel" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257013 $$257013: - .incbin "baserom.dol", 0x49E410, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/HeroPanelController.s b/asm/src/HeroPanelController.s index 6ff967c8..c1e7965b 100644 --- a/asm/src/HeroPanelController.s +++ b/asm/src/HeroPanelController.s @@ -335,21 +335,21 @@ __sinit_$$3HeroPanelController_cpp: /* 803A9378 003A51B8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025D4, 0x4 + .4byte 0x803A9310 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252387 $$252387: - .incbin "baserom.dol", 0x49E418, 0x4 + .4byte 0 .global $$252459 $$252459: - .incbin "baserom.dol", 0x49E41C, 0x4 + .4byte 0x7F7FFFFF .global $$252460 $$252460: - .incbin "baserom.dol", 0x49E420, 0x4 + .4byte 0x42000000 .global $$252461 $$252461: - .incbin "baserom.dol", 0x49E424, 0x4 + .4byte 0x3F000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global INVALID_POS__Q43scn4step4info33$$2unnamed$$2HeroPanelController_cpp$$2 diff --git a/asm/src/HeroStatus.s b/asm/src/HeroStatus.s index 5c6fafbe..1ee15de3 100644 --- a/asm/src/HeroStatus.s +++ b/asm/src/HeroStatus.s @@ -743,59 +743,79 @@ lbl_803A9DB4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 $$254295: - .incbin "baserom.dol", 0x48B8B8, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$254296 $$254296: - .incbin "baserom.dol", 0x48B8C8, 0x14 + .asciz "ChallengeHeroPanel" + .balign 4 .global $$254297 $$254297: - .incbin "baserom.dol", 0x48B8DC, 0x14 + .asciz "HeroGAEffect" + .balign 4 + .4byte 0 .global $$254298 $$254298: - .incbin "baserom.dol", 0x48B8F0, 0x10 + .asciz "HeroStatusIconN" .global $$254300 $$254300: - .incbin "baserom.dol", 0x48B900, 0x10 + .asciz "HeroLifeBarN" + .balign 4 .global $$254302 $$254302: - .incbin "baserom.dol", 0x48B910, 0xC + .asciz "Bounding" + .balign 4 .global $$254305 $$254305: - .incbin "baserom.dol", 0x48B91C, 0x10 + .asciz "TransparencyN" + .balign 4 .global $$254306 $$254306: - .incbin "baserom.dol", 0x48B92C, 0x10 + .asciz "HeroGAEffectN" + .balign 4 .global $$254307 $$254307: - .incbin "baserom.dol", 0x48B93C, 0xC + .asciz "GetAbility" + .balign 4 .global $$254308 $$254308: - .incbin "baserom.dol", 0x48B948, 0x10 + .asciz "HeroPanelMaster" .global $$254309 $$254309: - .incbin "baserom.dol", 0x48B958, 0x10 + .asciz "HeroPanelMusou" + .balign 4 .global $$254310 $$254310: - .incbin "baserom.dol", 0x48B968, 0x14 + .asciz "HeroPanelChallenge" + .balign 4 .global $$254311 $$254311: - .incbin "baserom.dol", 0x48B97C, 0xC + .asciz "HeroPanelN" + .balign 4 .global $$254460 $$254460: - .incbin "baserom.dol", 0x48B988, 0x40 + .asciz "HeroEffectN" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254299 $$254299: - .incbin "baserom.dol", 0x497948, 0x8 + .asciz "AbGageN" .global $$254303 $$254303: - .incbin "baserom.dol", 0x497950, 0x8 + .asciz "Ita02N" + .balign 4 .global $$254304 $$254304: - .incbin "baserom.dol", 0x497958, 0x8 + .asciz "ItaN" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254301 $$254301: - .incbin "baserom.dol", 0x49E428, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/HeroStatusIcon.s b/asm/src/HeroStatusIcon.s index df3240c0..062ff545 100644 --- a/asm/src/HeroStatusIcon.s +++ b/asm/src/HeroStatusIcon.s @@ -611,141 +611,216 @@ lbl_803AA5D4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251660 $$251660: - .incbin "baserom.dol", 0x48B9C8, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$251661 $$251661: - .incbin "baserom.dol", 0x48B9D8, 0x20 + .asciz "step/game/ability_icon/Sword" + .balign 4 .global $$251662 $$251662: - .incbin "baserom.dol", 0x48B9F8, 0x20 + .asciz "step/game/ability_icon/Cutter" + .balign 4 .global $$251663 $$251663: - .incbin "baserom.dol", 0x48BA18, 0x1C + .asciz "step/game/ability_icon/Leaf" .global $$251664 $$251664: - .incbin "baserom.dol", 0x48BA34, 0x1C + .asciz "step/game/ability_icon/Whip" .global $$251665 $$251665: - .incbin "baserom.dol", 0x48BA50, 0x1C + .asciz "step/game/ability_icon/Fire" .global $$251666 $$251666: - .incbin "baserom.dol", 0x48BA6C, 0x20 + .asciz "step/game/ability_icon/Needle" + .balign 4 .global $$251667 $$251667: - .incbin "baserom.dol", 0x48BA8C, 0x1C + .asciz "step/game/ability_icon/Beam" .global $$251668 $$251668: - .incbin "baserom.dol", 0x48BAA8, 0x20 + .asciz "step/game/ability_icon/Spark" + .balign 4 .global $$251669 $$251669: - .incbin "baserom.dol", 0x48BAC8, 0x20 + .asciz "step/game/ability_icon/Stone" + .balign 4 .global $$251670 $$251670: - .incbin "baserom.dol", 0x48BAE8, 0x20 + .asciz "step/game/ability_icon/Sleep" + .balign 4 .global $$251671 $$251671: - .incbin "baserom.dol", 0x48BB08, 0x20 + .asciz "step/game/ability_icon/Parasol" + .balign 4 .global $$251672 $$251672: - .incbin "baserom.dol", 0x48BB28, 0x20 + .asciz "step/game/ability_icon/Water" + .balign 4 .global $$251673 $$251673: - .incbin "baserom.dol", 0x48BB48, 0x20 + .asciz "step/game/ability_icon/Highjump" .global $$251674 $$251674: - .incbin "baserom.dol", 0x48BB68, 0x20 + .asciz "step/game/ability_icon/Tornado" + .balign 4 .global $$251675 $$251675: - .incbin "baserom.dol", 0x48BB88, 0x1C + .asciz "step/game/ability_icon/Bomb" .global $$251676 $$251676: - .incbin "baserom.dol", 0x48BBA4, 0x20 + .asciz "step/game/ability_icon/Spear" + .balign 4 .global $$251677 $$251677: - .incbin "baserom.dol", 0x48BBC4, 0x20 + .asciz "step/game/ability_icon/Hammer" + .balign 4 .global $$251678 $$251678: - .incbin "baserom.dol", 0x48BBE4, 0x1C + .asciz "step/game/ability_icon/Ice" + .balign 4 .global $$251679 $$251679: - .incbin "baserom.dol", 0x48BC00, 0x1C + .asciz "step/game/ability_icon/Wing" .global $$251680 $$251680: - .incbin "baserom.dol", 0x48BC1C, 0x20 + .asciz "step/game/ability_icon/Ninja" + .balign 4 .global $$251681 $$251681: - .incbin "baserom.dol", 0x48BC3C, 0x24 + .asciz "step/game/ability_icon/Fighter" + .balign 4 + .4byte 0 .global T_ABILITY_KIND_TO_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2 T_ABILITY_KIND_TO_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2: - .incbin "baserom.dol", 0x48BC60, 0x90 + .4byte 0 + .4byte 0x8048F8D8 + .4byte 0x8048F8F8 + .4byte 0x8048F918 + .4byte 0x8048F934 + .4byte 0x8048F950 + .4byte 0x8048F96C + .4byte 0x8048F98C + .4byte 0x8048F9A8 + .4byte 0x8048F9C8 + .4byte 0x8048F9E8 + .4byte 0x8048FA08 + .4byte 0x8048FA28 + .4byte 0x8048FA48 + .4byte 0x8048FA68 + .4byte 0x8048FA88 + .4byte 0x8048FAA4 + .4byte 0x8048FAC4 + .4byte 0x8048FAE4 + .4byte 0x8048FB00 + .4byte 0x8048FB1C + .4byte 0x8048FB3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$253019 $$253019: - .incbin "baserom.dol", 0x48BCF0, 0xC + .asciz "IfHrStIcon" + .balign 4 .global $$253020 $$253020: - .incbin "baserom.dol", 0x48BCFC, 0x14 + .asciz "HeroStatusIconBase" + .balign 4 .global $$253021 $$253021: - .incbin "baserom.dol", 0x48BD10, 0x10 + .asciz "HeroStatusIcon" + .balign 4 .global $$253022 $$253022: - .incbin "baserom.dol", 0x48BD20, 0xC + .asciz "HeroPEffect" .global $$253024 $$253024: - .incbin "baserom.dol", 0x48BD2C, 0x10 + .asciz "HeroPEffectN" + .balign 4 .global $$253210 $$253210: - .incbin "baserom.dol", 0x48BD3C, 0xC + .asciz "HeroIcon" + .balign 4 .global $$253211 $$253211: - .incbin "baserom.dol", 0x48BD48, 0x40 + .asciz "HeroIconN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2 T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2: - .incbin "baserom.dol", 0x497960, 0x4 + .4byte 0x8048F8C8 .global $$253023 $$253023: - .incbin "baserom.dol", 0x497964, 0x8 + .asciz "IconN" + .balign 4 .global $$253025 $$253025: - .incbin "baserom.dol", 0x49796C, 0x8 + .asciz "Pinch" + .balign 4 .global $$253132 $$253132: - .incbin "baserom.dol", 0x497974, 0x8 + .asciz "Wait" + .balign 4 .global $$253135 $$253135: - .incbin "baserom.dol", 0x49797C, 0x8 + .asciz "Damage" + .balign 4 .global $$253138 $$253138: - .incbin "baserom.dol", 0x497984, 0x8 + .asciz "Flash" + .balign 4 .global $$253141 $$253141: - .incbin "baserom.dol", 0x49798C, 0x8 + .asciz "Dead" + .balign 4 .global $$253202 $$253202: - .incbin "baserom.dol", 0x497994, 0x8 + .asciz "Normal" + .balign 4 .global $$253203 $$253203: - .incbin "baserom.dol", 0x49799C, 0xC + .asciz "Sword" + .balign 4 + .4byte 0 .global $$253204 $$253204: - .incbin "baserom.dol", 0x4979A8, 0x8 + .asciz "Parasol" .global $$253205 $$253205: - .incbin "baserom.dol", 0x4979B0, 0x8 + .asciz "Spark" + .balign 4 .global $$253206 $$253206: - .incbin "baserom.dol", 0x4979B8, 0x8 + .asciz "Whip" + .balign 4 .global $$253207 $$253207: - .incbin "baserom.dol", 0x4979C0, 0x8 + .asciz "Wing" + .balign 4 .global $$253208 $$253208: - .incbin "baserom.dol", 0x4979C8, 0x8 + .asciz "Fighter" .global $$253209 $$253209: - .incbin "baserom.dol", 0x4979D0, 0x8 + .asciz "Smash" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global object___Q33hel6common57ExplicitSingleton$$0Q43scn4step4info20HeroStatusIconSyncer$$1 diff --git a/asm/src/Hid.s b/asm/src/Hid.s index 6c1c7d7b..03cc3860 100644 --- a/asm/src/Hid.s +++ b/asm/src/Hid.s @@ -461,12 +461,31 @@ isEnableInputs__Q43scn4step4hero3HidCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BUTTONCONVDATA_WR__17$$2unnamed$$2Hid_cpp$$2 T_BUTTONCONVDATA_WR__17$$2unnamed$$2Hid_cpp$$2: - .incbin "baserom.dol", 0x415E50, 0x50 + .4byte 0x00000008 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x00000100 + .4byte 0x00000010 + .4byte 0x00000200 + .4byte 0x00000020 + .4byte 0x00000800 + .4byte 0x00000080 + .4byte 0x00000800 + .4byte 0x00000040 + .4byte 0x00000400 + .4byte 0x00000200 + .4byte 0x00001000 + .4byte 0x00000100 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253822 $$253822: - .incbin "baserom.dol", 0x49D740, 0x4 + .4byte 0 .global $$253823 $$253823: - .incbin "baserom.dol", 0x49D744, 0x4 + .4byte 0x3ECCCCCD diff --git a/asm/src/HidKindUtil.s b/asm/src/HidKindUtil.s index c1b99161..e7aa8b6a 100644 --- a/asm/src/HidKindUtil.s +++ b/asm/src/HidKindUtil.s @@ -12,175 +12,272 @@ ScriptPath__Q43scn4step4hero11HidKindUtilFQ43scn4step4hero7HidKind: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: - .incbin "baserom.dol", 0x480248, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSword.Exec1" .global $$248724 $$248724: - .incbin "baserom.dol", 0x480274, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSword.Exec2" .global $$248725 $$248725: - .incbin "baserom.dol", 0x4802A0, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSword.Exec3" .global $$248726 $$248726: - .incbin "baserom.dol", 0x4802CC, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSword.Exec4" .global $$248727 $$248727: - .incbin "baserom.dol", 0x4802F8, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSword.Exec5" .global $$248728 $$248728: - .incbin "baserom.dol", 0x480324, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec1" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x480354, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec2" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x480384, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec3" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x4803B4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec4" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x4803E4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec5" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x480414, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestParasol.Exec6" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x480444, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec1" .global $$248735 $$248735: - .incbin "baserom.dol", 0x480470, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec2" .global $$248736 $$248736: - .incbin "baserom.dol", 0x48049C, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec3" .global $$248737 $$248737: - .incbin "baserom.dol", 0x4804C8, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec4" .global $$248738 $$248738: - .incbin "baserom.dol", 0x4804F4, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec5" .global $$248739 $$248739: - .incbin "baserom.dol", 0x480520, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSpark.Exec6" .global $$248740 $$248740: - .incbin "baserom.dol", 0x48054C, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec1" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x480578, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec2" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x4805A4, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec3" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x4805D0, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec4" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x4805FC, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec5" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x480628, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWhip.Exec6" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x480654, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestFighter.Exec" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x480684, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec1" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x4806B0, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec2" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x4806DC, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec3" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x480708, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec4" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x480734, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec5" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x480760, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestWing.Exec6" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x48078C, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec1" .global $$248754 $$248754: - .incbin "baserom.dol", 0x4807B8, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec2" .global $$248755 $$248755: - .incbin "baserom.dol", 0x4807E4, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec3" .global $$248756 $$248756: - .incbin "baserom.dol", 0x480810, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec4" .global $$248757 $$248757: - .incbin "baserom.dol", 0x48083C, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec5" .global $$248758 $$248758: - .incbin "baserom.dol", 0x480868, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestSmash.Exec6" .global $$248759 $$248759: - .incbin "baserom.dol", 0x480894, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec1" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x4808C4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec2" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x4808F4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec3" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x480924, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec4" + .balign 4 .global $$248763 $$248763: - .incbin "baserom.dol", 0x480954, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec5" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x480984, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestNormal.Exec6" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x4809B4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec1" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x4809E4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec2" + .balign 4 .global $$248767 $$248767: - .incbin "baserom.dol", 0x480A14, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec3" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x480A44, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec4" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x480A74, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec5" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x480AA4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec6" + .balign 4 .global $$248771 $$248771: - .incbin "baserom.dol", 0x480AD4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestSmashEx.Exec7" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x480B04, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestMaster1.Exec" + .balign 4 .global $$248773 $$248773: - .incbin "baserom.dol", 0x480B34, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestMaster2.Exec" + .balign 4 .global $$248774 $$248774: - .incbin "baserom.dol", 0x480B64, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestMaster3.Exec" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x480B94, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestMaster4.Exec" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x480BC4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestAbility.Exec1" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x480BF4, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestAbility.Exec2" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x480C24, 0x30 + .asciz "Scn.Step.Hero.HidScript.AutoTestAbility.Exec3" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x480C54, 0x2C + .asciz "Scn.Step.Hero.HidScript.AutoTestLevel.Exec" + .balign 4 .global T_SCRIPT_PATH__Q43scn4step4hero25$$2unnamed$$2HidKindUtil_cpp$$2 T_SCRIPT_PATH__Q43scn4step4hero25$$2unnamed$$2HidKindUtil_cpp$$2: - .incbin "baserom.dol", 0x480C80, 0xE8 + .4byte 0 + .4byte 0x80484148 + .4byte 0x80484174 + .4byte 0x804841A0 + .4byte 0x804841CC + .4byte 0x804841F8 + .4byte 0x80484224 + .4byte 0x80484254 + .4byte 0x80484284 + .4byte 0x804842B4 + .4byte 0x804842E4 + .4byte 0x80484314 + .4byte 0x80484344 + .4byte 0x80484370 + .4byte 0x8048439C + .4byte 0x804843C8 + .4byte 0x804843F4 + .4byte 0x80484420 + .4byte 0x8048444C + .4byte 0x80484478 + .4byte 0x804844A4 + .4byte 0x804844D0 + .4byte 0x804844FC + .4byte 0x80484528 + .4byte 0x80484554 + .4byte 0x80484584 + .4byte 0x804845B0 + .4byte 0x804845DC + .4byte 0x80484608 + .4byte 0x80484634 + .4byte 0x80484660 + .4byte 0x8048468C + .4byte 0x804846B8 + .4byte 0x804846E4 + .4byte 0x80484710 + .4byte 0x8048473C + .4byte 0x80484768 + .4byte 0x80484794 + .4byte 0x804847C4 + .4byte 0x804847F4 + .4byte 0x80484824 + .4byte 0x80484854 + .4byte 0x80484884 + .4byte 0x804848B4 + .4byte 0x804848E4 + .4byte 0x80484914 + .4byte 0x80484944 + .4byte 0x80484974 + .4byte 0x804849A4 + .4byte 0x804849D4 + .4byte 0x80484A04 + .4byte 0x80484A34 + .4byte 0x80484A64 + .4byte 0x80484A94 + .4byte 0x80484AC4 + .4byte 0x80484AF4 + .4byte 0x80484B24 + .4byte 0x80484B54 diff --git a/asm/src/Hit.s b/asm/src/Hit.s index 0a45b05c..f24cae24 100644 --- a/asm/src/Hit.s +++ b/asm/src/Hit.s @@ -710,4 +710,7 @@ sortResult__Q25ocoll3HitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll3Hit __vt__Q25ocoll3Hit: - .incbin "baserom.dol", 0x4594D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801D6230 ;# ptr + .4byte 0 diff --git a/asm/src/HitNode.s b/asm/src/HitNode.s index a1dba0d0..96a7d92e 100644 --- a/asm/src/HitNode.s +++ b/asm/src/HitNode.s @@ -238,4 +238,5 @@ lbl_801D6C08: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252002 $$252002: - .incbin "baserom.dol", 0x49A7C8, 0x8 + .4byte 0xFFFF0080 + .4byte 0 diff --git a/asm/src/HitPoint.s b/asm/src/HitPoint.s index 1341a022..4593d453 100644 --- a/asm/src/HitPoint.s +++ b/asm/src/HitPoint.s @@ -171,4 +171,5 @@ rate__Q43scn4step5chara8HitPointCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249001 $$249001: - .incbin "baserom.dol", 0x49B7C8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/HitStopCallback.s b/asm/src/HitStopCallback.s index aace0dba..aaa41fd4 100644 --- a/asm/src/HitStopCallback.s +++ b/asm/src/HitStopCallback.s @@ -260,19 +260,39 @@ onEnd__Q43scn4step6weapon15HitStopCallbackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss15HitStopCallback __vt__Q43scn4step4boss15HitStopCallback: - .incbin "baserom.dol", 0x4606B8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80230AA8 ;# ptr + .4byte 0x80230B04 ;# ptr + .4byte 0x80230B74 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy15HitStopCallback __vt__Q43scn4step5enemy15HitStopCallback: - .incbin "baserom.dol", 0x46E000, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80288A34 ;# ptr + .4byte 0x80288A38 ;# ptr + .4byte 0x80288A78 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero15HitStopCallback __vt__Q43scn4step4hero15HitStopCallback: - .incbin "baserom.dol", 0x480D68, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80340EE4 + .4byte 0x80340EE8 + .4byte 0x80340F34 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon15HitStopCallback __vt__Q43scn4step6weapon15HitStopCallback: - .incbin "baserom.dol", 0x48F8B0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803D64E0 + .4byte 0x803D64E4 + .4byte 0x803D6524 + .4byte 0 diff --git a/asm/src/HomeButtonMenu.s b/asm/src/HomeButtonMenu.s index fb5e0f7b..9fc019ae 100644 --- a/asm/src/HomeButtonMenu.s +++ b/asm/src/HomeButtonMenu.s @@ -1317,65 +1317,67 @@ lbl_8019D5C0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252296 $$252296: - .incbin "baserom.dol", 0x452A20, 0x10 + .asciz "HomeBtnWork" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250553 $$250553: - .incbin "baserom.dol", 0x493210, 0x4 + .4byte 0x3F800000 .global $$250554 $$250554: - .incbin "baserom.dol", 0x493214, 0x4 + .4byte 0x3F800000 .global $$250559 $$250559: - .incbin "baserom.dol", 0x493218, 0x4 + .4byte 0x3F800000 .global $$250561 $$250561: - .incbin "baserom.dol", 0x49321C, 0x4 + .4byte 0x3F800000 .global $$250606 $$250606: - .incbin "baserom.dol", 0x493220, 0x4 + .4byte 0x3F800000 .global $$250607 $$250607: - .incbin "baserom.dol", 0x493224, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250642 $$250642: - .incbin "baserom.dol", 0x49A320, 0x4 + .4byte 0x808080FF .global $$252357 $$252357: - .incbin "baserom.dol", 0x49A324, 0x4 + .4byte 0x3FAF286C .global $$252358 $$252358: - .incbin "baserom.dol", 0x49A328, 0x4 + .4byte 0x3F800000 .global $$252383 $$252383: - .incbin "baserom.dol", 0x49A32C, 0x4 + .4byte 0 .global $$252536 $$252536: - .incbin "baserom.dol", 0x49A330, 0x4 + .4byte 0x44200000 .global $$252537 $$252537: - .incbin "baserom.dol", 0x49A334, 0x4 + .4byte 0x43E40000 .global $$252538 $$252538: - .incbin "baserom.dol", 0x49A338, 0x4 + .4byte 0x44180000 .global $$252539 $$252539: - .incbin "baserom.dol", 0x49A33C, 0x4 + .4byte 0x44500000 .global $$252540 $$252540: - .incbin "baserom.dol", 0x49A340, 0x4 + .4byte 0x3F000000 .global $$252541 $$252541: - .incbin "baserom.dol", 0x49A344, 0x4 + .4byte 0x43FA0000 .global $$252594 $$252594: - .incbin "baserom.dol", 0x49A348, 0x4 + .4byte 0x3D100000 .global $$252595 $$252595: - .incbin "baserom.dol", 0x49A34C, 0x4 + .4byte 0x3CCBA511 .global $$252596 $$252596: - .incbin "baserom.dol", 0x49A350, 0x8 + .4byte 0x41E38E39 + .4byte 0 diff --git a/asm/src/InactiveHero.s b/asm/src/InactiveHero.s index 249851cf..97e5a60c 100644 --- a/asm/src/InactiveHero.s +++ b/asm/src/InactiveHero.s @@ -645,18 +645,27 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1: - .incbin "baserom.dol", 0x480D80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80341814 + .4byte 0x803417F4 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1: - .incbin "baserom.dol", 0x480D90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80341810 + .4byte 0x803417D4 .global __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1 __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1: - .incbin "baserom.dol", 0x480DA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803412AC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256074 $$256074: - .incbin "baserom.dol", 0x49D748, 0x4 + .4byte 0 .global $$256075 $$256075: - .incbin "baserom.dol", 0x49D74C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/InactiveStateBase.s b/asm/src/InactiveStateBase.s index 8dbd60a7..d3205dcf 100644 --- a/asm/src/InactiveStateBase.s +++ b/asm/src/InactiveStateBase.s @@ -43,4 +43,7 @@ lbl_80341870: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero17InactiveStateBase __vt__Q43scn4step4hero17InactiveStateBase: - .incbin "baserom.dol", 0x480DB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80341830 + .4byte 0x8034182C diff --git a/asm/src/InactiveStateCallback.s b/asm/src/InactiveStateCallback.s index f9e27de7..b7e1c756 100644 --- a/asm/src/InactiveStateCallback.s +++ b/asm/src/InactiveStateCallback.s @@ -16,4 +16,7 @@ onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero21InactiveStateCallback __vt__Q43scn4step4hero21InactiveStateCallback: - .incbin "baserom.dol", 0x480DC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803412A8 + .4byte 0x803418A0 diff --git a/asm/src/IndiviCamera.s b/asm/src/IndiviCamera.s index 84278b0c..ada44256 100644 --- a/asm/src/IndiviCamera.s +++ b/asm/src/IndiviCamera.s @@ -251,10 +251,11 @@ setCameraRect__Q43scn4step6camera12IndiviCameraFRCQ33hel3geo4Rectf: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251843 $$251843: - .incbin "baserom.dol", 0x49B650, 0x4 + .4byte 0x3F800000 .global $$251844 $$251844: - .incbin "baserom.dol", 0x49B654, 0x4 + .4byte 0xBF800000 .global $$251864 $$251864: - .incbin "baserom.dol", 0x49B658, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 diff --git a/asm/src/IndiviUtil.s b/asm/src/IndiviUtil.s index a4c14308..45938465 100644 --- a/asm/src/IndiviUtil.s +++ b/asm/src/IndiviUtil.s @@ -562,52 +562,634 @@ lbl_803D6590: /* 803D65A4 003D23E4 4E 80 04 20 */ bctr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024B8, 0x4 + .4byte 0x80288B18 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2: - .incbin "baserom.dol", 0x41C920, 0x210 + .4byte 0x803DC230 + .4byte 0 + .4byte 0x803DCAA8 + .4byte 0 + .4byte 0x803DD184 + .4byte 0 + .4byte 0x803DB1B8 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803DE400 + .4byte 0x803DE534 + .4byte 0x803E2278 + .4byte 0 + .4byte 0x803E77F4 + .4byte 0 + .4byte 0x803E7290 + .4byte 0 + .4byte 0x803DF078 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803E3F64 + .4byte 0 + .4byte 0x803E5350 + .4byte 0 + .4byte 0x803E5AF4 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803E2A0C + .4byte 0 + .4byte 0x803E3668 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803E02B8 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803E8040 + .4byte 0 + .4byte 0x803E84A4 + .4byte 0 + .4byte 0x803E87F4 + .4byte 0 + .4byte 0x803E9494 + .4byte 0 + .4byte 0x803E98C8 + .4byte 0 + .4byte 0x803E0378 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803E0438 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803EA768 + .4byte 0 + .4byte 0x803EACAC + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803EBE30 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803EC79C + .4byte 0 + .4byte 0x803ECF88 + .4byte 0 + .4byte 0x803EE568 + .4byte 0 + .4byte 0x803EE628 + .4byte 0 + .4byte 0x803EE6E8 + .4byte 0 + .4byte 0x803EE7A8 + .4byte 0 + .4byte 0x803EE868 + .4byte 0 + .4byte 0x803EE928 + .4byte 0 + .4byte 0x803EE9E8 + .4byte 0 + .4byte 0x803EEAA8 + .4byte 0 + .4byte 0x803EEB68 + .4byte 0 + .4byte 0x803EEC28 + .4byte 0 + .4byte 0x803EECE8 + .4byte 0 + .4byte 0x803EEDA8 + .4byte 0 + .4byte 0x803E88B4 + .4byte 0 + .4byte 0x803EF5EC + .4byte 0 + .4byte 0x803D6350 + .4byte 0 + .4byte 0x803D6350 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: - .incbin "baserom.dol", 0x46E018, 0x700 + .4byte 0x802E16E4 ;# ptr + .4byte 0x802E12DC ;# ptr + .4byte 0 + .4byte 0x8029F364 ;# ptr + .4byte 0x8029F2DC ;# ptr + .4byte 0 + .4byte 0x802ED6F4 ;# ptr + .4byte 0x802ED670 ;# ptr + .4byte 0 + .4byte 0x802972CC ;# ptr + .4byte 0x80296F2C ;# ptr + .4byte 0 + .4byte 0x802A2DA4 ;# ptr + .4byte 0x802A2704 ;# ptr + .4byte 0 + .4byte 0x802BA66C ;# ptr + .4byte 0x802BA260 ;# ptr + .4byte 0 + .4byte 0x802BF8C0 ;# ptr + .4byte 0x802BF2C8 ;# ptr + .4byte 0 + .4byte 0x802D3318 ;# ptr + .4byte 0x802D3198 ;# ptr + .4byte 0 + .4byte 0x8029662C ;# ptr + .4byte 0x8029638C ;# ptr + .4byte 0 + .4byte 0x802A7470 ;# ptr + .4byte 0x802A7238 ;# ptr + .4byte 0 + .4byte 0x802B9058 ;# ptr + .4byte 0x802B8D28 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802F0804 ;# ptr + .4byte 0x802F077C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802E0740 ;# ptr + .4byte 0x802E01E0 ;# ptr + .4byte 0 + .4byte 0x802C3564 ;# ptr + .4byte 0x802C34E4 ;# ptr + .4byte 0 + .4byte 0x802EFB34 ;# ptr + .4byte 0x802EFA68 ;# ptr + .4byte 0 + .4byte 0x8029D1D4 ;# ptr + .4byte 0x8029D098 ;# ptr + .4byte 0 + .4byte 0x802E6E78 ;# ptr + .4byte 0x802E6CB8 ;# ptr + .4byte 0 + .4byte 0x802C6204 ;# ptr + .4byte 0x802C5D1C ;# ptr + .4byte 0 + .4byte 0x802A0EE8 ;# ptr + .4byte 0x802A0E60 ;# ptr + .4byte 0 + .4byte 0x802D9D58 ;# ptr + .4byte 0x802D9A00 ;# ptr + .4byte 0 + .4byte 0x802C7E00 ;# ptr + .4byte 0x802C7A68 ;# ptr + .4byte 0 + .4byte 0x802B22D8 ;# ptr + .4byte 0x802B2168 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802F01BC ;# ptr + .4byte 0x802F0134 ;# ptr + .4byte 0 + .4byte 0x802D3A88 ;# ptr + .4byte 0x802D3928 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802D1D28 ;# ptr + .4byte 0x802D167C ;# ptr + .4byte 0 + .4byte 0x802C732C ;# ptr + .4byte 0x802C72B0 ;# ptr + .4byte 0 + .4byte 0x802A5580 ;# ptr + .4byte 0x802A54F8 ;# ptr + .4byte 0 + .4byte 0x80299398 ;# ptr + .4byte 0x80298E8C ;# ptr + .4byte 0 + .4byte 0x802B76B8 ;# ptr + .4byte 0x802B6AA8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802E2AF4 ;# ptr + .4byte 0x802E2890 ;# ptr + .4byte 0 + .4byte 0x802D662C ;# ptr + .4byte 0x802D6170 ;# ptr + .4byte 0 + .4byte 0x802C5000 ;# ptr + .4byte 0x802C4DB4 ;# ptr + .4byte 0 + .4byte 0x802ED6F4 ;# ptr + .4byte 0x802CBA74 ;# ptr + .4byte 0 + .4byte 0x802BCDC8 ;# ptr + .4byte 0x802BCBEC ;# ptr + .4byte 0 + .4byte 0x802EFB34 ;# ptr + .4byte 0x802CDBA0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802B49C8 ;# ptr + .4byte 0x802B449C ;# ptr + .4byte 0 + .4byte 0x802BB7A0 ;# ptr + .4byte 0x802BB270 ;# ptr + .4byte 0 + .4byte 0x8029E788 ;# ptr + .4byte 0x8029E30C ;# ptr + .4byte 0 + .4byte 0x802C9F18 ;# ptr + .4byte 0x802C9D68 ;# ptr + .4byte 0 + .4byte 0x802AD344 ;# ptr + .4byte 0x802AD218 ;# ptr + .4byte 0 + .4byte 0x802DD8F8 ;# ptr + .4byte 0x802DCE78 ;# ptr + .4byte 0 + .4byte 0x802C2188 ;# ptr + .4byte 0x802C1EE4 ;# ptr + .4byte 0 + .4byte 0x802A62E4 ;# ptr + .4byte 0x802A61E4 ;# ptr + .4byte 0 + .4byte 0x802EAFFC ;# ptr + .4byte 0x802EA6F8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802B61AC ;# ptr + .4byte 0x802B5840 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802B7768 ;# ptr + .4byte 0x802B6AA8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802CFB3C ;# ptr + .4byte 0x802CF890 ;# ptr + .4byte 0 + .4byte 0x802DBDF0 ;# ptr + .4byte 0x802DBB80 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802AFC40 ;# ptr + .4byte 0x802AFA00 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802E53D0 ;# ptr + .4byte 0x802E4C3C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802E3840 ;# ptr + .4byte 0x802E36A4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802ED7AC ;# ptr + .4byte 0x802ED670 ;# ptr + .4byte 0 + .4byte 0x802B7818 ;# ptr + .4byte 0x802B6AA8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802ED6F4 ;# ptr + .4byte 0x802E9CD4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8029F414 ;# ptr + .4byte 0x8029F2DC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802D9188 ;# ptr + .4byte 0x802D87F8 ;# ptr + .4byte 0 + .4byte 0x802ED7AC ;# ptr + .4byte 0x802CBA74 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8029E838 ;# ptr + .4byte 0x8029E30C ;# ptr + .4byte 0 + .4byte 0x802E8C44 ;# ptr + .4byte 0x802E87B4 ;# ptr + .4byte 0 + .4byte 0x802E8C44 ;# ptr + .4byte 0x802E87B4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802D66DC ;# ptr + .4byte 0x802D6170 ;# ptr + .4byte 0 + .4byte 0x802ED864 ;# ptr + .4byte 0x802ED674 ;# ptr + .4byte 0 + .4byte 0x802E7E84 ;# ptr + .4byte 0x802E79A8 ;# ptr + .4byte 0 + .4byte 0x802A3D14 ;# ptr + .4byte 0x802A3918 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802F10A8 ;# ptr + .4byte 0x802F0C94 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802CB104 ;# ptr + .4byte 0x802CAAF8 ;# ptr + .4byte 0 + .4byte 0x802AE194 ;# ptr + .4byte 0x802ADFB8 ;# ptr + .4byte 0x802AE2A0 ;# ptr + .4byte 0x802D2C0C ;# ptr + .4byte 0x802D2830 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802F2570 ;# ptr + .4byte 0x802F22D4 ;# ptr + .4byte 0 + .4byte 0x8029C0E0 ;# ptr + .4byte 0x8029BB80 ;# ptr + .4byte 0 + .4byte 0x802AEE80 ;# ptr + .4byte 0x802AEC08 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802C4698 ;# ptr + .4byte 0x802C4154 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x802A2DA4 ;# ptr + .4byte 0x802A27B0 ;# ptr + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252523 $$252523: - .incbin "baserom.dol", 0x480DD0, 0x1C + .asciz "step/hero/nodeattach/Meta" + .balign 4 .global $$252524 $$252524: - .incbin "baserom.dol", 0x480DEC, 0x1C + .asciz "step/hero/nodeattach/Dedede" .global $$252525 $$252525: - .incbin "baserom.dol", 0x480E08, 0x20 + .asciz "step/hero/nodeattach/Dee" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MODEL_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_MODEL_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: - .incbin "baserom.dol", 0x49B9E0, 0x4 + .4byte 0x802ED6F4 ;# ptr .global T_CHARA_PARAM_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_CHARA_PARAM_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: - .incbin "baserom.dol", 0x49B9E4, 0x4 + .4byte 0x8029174C ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252509 $$252509: - .incbin "baserom.dol", 0x49D750, 0x4 + .4byte 0x3F000000 .global $$252510 $$252510: - .incbin "baserom.dol", 0x49D754, 0x4 + .4byte 0x3F400000 .global $$252516 $$252516: - .incbin "baserom.dol", 0x49D758, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250317 $$250317: - .incbin "baserom.dol", 0x49E528, 0x4 + .4byte 0x3F000000 .global $$250325 $$250325: - .incbin "baserom.dol", 0x49E52C, 0x4 + .4byte 0 diff --git a/asm/src/InfoControl.s b/asm/src/InfoControl.s index ecc4407a..a0fbf6f8 100644 --- a/asm/src/InfoControl.s +++ b/asm/src/InfoControl.s @@ -1027,4 +1027,11 @@ lbl_803AB77C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255923 $$255923: - .incbin "baserom.dol", 0x48BD88, 0x20 + .4byte 0x803AAA48 + .4byte 0x803AAA54 + .4byte 0x803AAB5C + .4byte 0x803AAB80 + .4byte 0x803AAB8C + .4byte 0x803AABE8 + .4byte 0x803AABF4 + .4byte 0x803AAC30 diff --git a/asm/src/InfoGameStatus.s b/asm/src/InfoGameStatus.s index 98805ac5..b08bd40b 100644 --- a/asm/src/InfoGameStatus.s +++ b/asm/src/InfoGameStatus.s @@ -1203,60 +1203,80 @@ safeboolFunc__Q24util45PlacementNew$$0Q43scn4step4info13WarpStarPanel$$1CFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254554 $$254554: - .incbin "baserom.dol", 0x48BDA8, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$254556 $$254556: - .incbin "baserom.dol", 0x48BDB8, 0xC + .asciz "FollowHeroN" .global $$254557 $$254557: - .incbin "baserom.dol", 0x48BDC4, 0xC + .asciz "BossPanelN" + .balign 4 .global $$254558 $$254558: - .incbin "baserom.dol", 0x48BDD0, 0x10 + .asciz "FollowHeroN%d" + .balign 4 .global $$254559 $$254559: - .incbin "baserom.dol", 0x48BDE0, 0x10 + .asciz "BatteryPanelN%d" .global $$254560 $$254560: - .incbin "baserom.dol", 0x48BDF0, 0x14 + .asciz "BatteryPanelInN%d" + .balign 4 .global $$254561 $$254561: - .incbin "baserom.dol", 0x48BE04, 0x10 + .asciz "HeroPanelN%lu" + .balign 4 .global $$254562 $$254562: - .incbin "baserom.dol", 0x48BE14, 0x14 + .asciz "LMapStageSphereN" + .balign 4 .global $$254563 $$254563: - .incbin "baserom.dol", 0x48BE28, 0x14 + .asciz "RestPlayerPanelN" + .balign 4 .global $$254564 $$254564: - .incbin "baserom.dol", 0x48BE3C, 0xC + .asciz "StarPanelN" + .balign 4 .global $$254565 $$254565: - .incbin "baserom.dol", 0x48BE48, 0x14 + .asciz "LMapTotalSphereN" + .balign 4 .global $$254566 $$254566: - .incbin "baserom.dol", 0x48BE5C, 0xC + .asciz "HeroPanelN0" .global $$254817 $$254817: - .incbin "baserom.dol", 0x48BE68, 0x40 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803AC804 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254555 $$254555: - .incbin "baserom.dol", 0x4979D8, 0x8 + .asciz "Base" + .balign 4 .global $$254737 $$254737: - .incbin "baserom.dol", 0x4979E0, 0x4 + .4byte 0x4F757400 .global $$254742 $$254742: - .incbin "baserom.dol", 0x4979E4, 0x8 + .asciz "Wait" + .balign 4 .global $$254743 $$254743: - .incbin "baserom.dol", 0x4979EC, 0x4 + .4byte 0x496E0000 .global $$254746 $$254746: - .incbin "baserom.dol", 0x4979F0, 0x8 + .asciz "OutS" + .balign 4 .global $$254751 $$254751: - .incbin "baserom.dol", 0x4979F8, 0x8 + .4byte 0x496E5300 + .4byte 0 diff --git a/asm/src/InfoUtil.s b/asm/src/InfoUtil.s index a71b3e92..e98fdb14 100644 --- a/asm/src/InfoUtil.s +++ b/asm/src/InfoUtil.s @@ -132,4 +132,5 @@ PlayerNumDisappear__Q43scn4step4hero8InfoUtilFRQ43scn4step4hero4Hero: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252825 $$252825: - .incbin "baserom.dol", 0x49D760, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Input.s b/asm/src/Input.s index 37547cae..553a6fdf 100644 --- a/asm/src/Input.s +++ b/asm/src/Input.s @@ -679,4 +679,6 @@ isRight__Q43scn9grandmenu4menu5InputCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251081 $$251081: - .incbin "baserom.dol", 0x4919D0, 0x18 + .asciz "bad_function_call" + .balign 4 + .4byte 0 diff --git a/asm/src/Intersection.s b/asm/src/Intersection.s index f97bfc64..41a6abc6 100644 --- a/asm/src/Intersection.s +++ b/asm/src/Intersection.s @@ -569,16 +569,17 @@ lbl_801A0D7C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250828 $$250828: - .incbin "baserom.dol", 0x49A408, 0x4 + .4byte 0 .global $$250829 $$250829: - .incbin "baserom.dol", 0x49A40C, 0x4 + .4byte 0xB58637BD .global $$250830 $$250830: - .incbin "baserom.dol", 0x49A410, 0x4 + .4byte 0x358637BD .global $$250831 $$250831: - .incbin "baserom.dol", 0x49A414, 0x4 + .4byte 0xBF800000 .global $$250946 $$250946: - .incbin "baserom.dol", 0x49A418, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Invincible.s b/asm/src/Invincible.s index 8f121e20..9594c735 100644 --- a/asm/src/Invincible.s +++ b/asm/src/Invincible.s @@ -847,19 +847,173 @@ lbl_803429C0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_ANIM_TABLE__Q43scn4step5chara24$$2unnamed$$2Invincible_cpp$$2 T_ALPHA_ANIM_TABLE__Q43scn4step5chara24$$2unnamed$$2Invincible_cpp$$2: - .incbin "baserom.dol", 0x413A60, 0x28 + .4byte 0x000000F0 + .4byte 0x00000050 + .4byte 0x000000A0 + .4byte 0x00000014 + .4byte 0x0000008C + .4byte 0x0000000A + .4byte 0x00000078 + .4byte 0 + .4byte 0x00000064 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global MIGHTY_COLOR_TABLE__24$$2unnamed$$2Invincible_cpp$$2 MIGHTY_COLOR_TABLE__24$$2unnamed$$2Invincible_cpp$$2: - .incbin "baserom.dol", 0x415EA0, 0x240 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C4 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000060 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000020 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000040 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000060 + .4byte 0 + .4byte 0x000000FF + .4byte 0x00000080 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000A0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000C0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000E0 + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000E0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000C0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x000000A0 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000080 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000060 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000040 + .4byte 0x000000FF + .4byte 0 + .4byte 0x00000020 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250018 $$250018: - .incbin "baserom.dol", 0x49AE88, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253735 $$253735: - .incbin "baserom.dol", 0x49D768, 0x8 + .4byte 0xFFFFFF00 + .4byte 0 diff --git a/asm/src/Item.s b/asm/src/Item.s index d0f1a454..efdec37a 100644 --- a/asm/src/Item.s +++ b/asm/src/Item.s @@ -3180,198 +3180,303 @@ mfReqEffect__Q43scn9grandmenu4menu4ItemFQ43scn9grandmenu6effect4KindRCQ33hel4mat .section .data, "wa" # 0x80421040 - 0x80496700 .global $$266370 $$266370: - .incbin "baserom.dol", 0x48DE48, 0x20 + .4byte 0x803C292C + .4byte 0x803C2A08 + .4byte 0x803C292C + .4byte 0x803C2A08 + .4byte 0x803C292C + .4byte 0x803C2A08 + .4byte 0x803C292C + .4byte 0x803C2A08 .global $$266928 $$266928: - .incbin "baserom.dol", 0x48DE68, 0x30 + .4byte 0x803C3810 + .4byte 0x803C3690 + .4byte 0x803C36D0 + .4byte 0x803C36D0 + .4byte 0x803C3810 + .4byte 0x803C3810 + .4byte 0x803C3710 + .4byte 0x803C3750 + .4byte 0x803C3790 + .4byte 0x803C3690 + .4byte 0x803C37D0 + .4byte 0 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DE98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3970 + .4byte 0x803C3890 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DEA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C396C + .4byte 0x803C38AC .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DEB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3968 + .4byte 0x803C38C8 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DEC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3964 + .4byte 0x803C38E4 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DED8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3960 + .4byte 0x803C3900 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DEE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C395C + .4byte 0x803C391C .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48DEF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3958 + .4byte 0x803C3938 .global __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1 __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1: - .incbin "baserom.dol", 0x48DF08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C3954 + .4byte 0x803C3870 .global __vt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1: - .incbin "baserom.dol", 0x48DF18, 0xC + .4byte 0 + .4byte 0 + .4byte 0x803C1D38 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x48DF24, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x48DF48, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x48DF54, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x48DF78, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x48DF84, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x48DFA8, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252783 $$252783: - .incbin "baserom.dol", 0x4919E8, 0xC + .asciz "SoftKSDX" + .balign 4 .global t_LayoutNameTable__18$$2unnamed$$2Item_cpp$$2 t_LayoutNameTable__18$$2unnamed$$2Item_cpp$$2: - .incbin "baserom.dol", 0x4919F4, 0x24 + .4byte 0x8055C528 + .4byte 0x8055C530 + .4byte 0x8055C538 + .4byte 0x8055C540 + .4byte 0x8055C548 + .4byte 0x8055C550 + .4byte 0x8055C558 + .4byte 0x804958E8 + .4byte 0x8055C560 .global $$252786 $$252786: - .incbin "baserom.dol", 0x491A18, 0xC + .asciz "MenuMCBN" + .balign 4 .global $$252787 $$252787: - .incbin "baserom.dol", 0x491A24, 0xC + .asciz "MenuMCFN" + .balign 4 .global $$252788 $$252788: - .incbin "baserom.dol", 0x491A30, 0xC + .asciz "MenuTLBN" + .balign 4 .global $$252789 $$252789: - .incbin "baserom.dol", 0x491A3C, 0xC + .asciz "MenuTLFN" + .balign 4 .global $$252790 $$252790: - .incbin "baserom.dol", 0x491A48, 0xC + .asciz "MenuVCBN" + .balign 4 .global $$252791 $$252791: - .incbin "baserom.dol", 0x491A54, 0xC + .asciz "MenuVCFN" + .balign 4 .global $$252792 $$252792: - .incbin "baserom.dol", 0x491A60, 0xC + .asciz "SoftK01BN" + .balign 4 .global $$252793 $$252793: - .incbin "baserom.dol", 0x491A6C, 0xC + .asciz "SoftK01FN" + .balign 4 .global $$252794 $$252794: - .incbin "baserom.dol", 0x491A78, 0xC + .asciz "SoftK02BN" + .balign 4 .global $$252795 $$252795: - .incbin "baserom.dol", 0x491A84, 0xC + .asciz "SoftK02FN" + .balign 4 .global $$252796 $$252796: - .incbin "baserom.dol", 0x491A90, 0xC + .asciz "SoftK03BN" + .balign 4 .global $$252797 $$252797: - .incbin "baserom.dol", 0x491A9C, 0xC + .asciz "SoftK03FN" + .balign 4 .global $$252798 $$252798: - .incbin "baserom.dol", 0x491AA8, 0xC + .asciz "SoftKFCBN" + .balign 4 .global $$252799 $$252799: - .incbin "baserom.dol", 0x491AB4, 0xC + .asciz "SoftKFCFN" + .balign 4 .global $$252800 $$252800: - .incbin "baserom.dol", 0x491AC0, 0xC + .asciz "SoftKSDXBN" + .balign 4 .global $$252801 $$252801: - .incbin "baserom.dol", 0x491ACC, 0xC + .asciz "SoftKSDXFN" + .balign 4 .global $$252802 $$252802: - .incbin "baserom.dol", 0x491AD8, 0xC + .asciz "SoftK64BN" + .balign 4 .global $$252803 $$252803: - .incbin "baserom.dol", 0x491AE4, 0xC + .asciz "SoftK64FN" + .balign 4 .global t_ParentPaneNameTable__18$$2unnamed$$2Item_cpp$$2 t_ParentPaneNameTable__18$$2unnamed$$2Item_cpp$$2: - .incbin "baserom.dol", 0x491AF0, 0x48 + .4byte 0x80495918 + .4byte 0x80495924 + .4byte 0x80495930 + .4byte 0x8049593C + .4byte 0x80495948 + .4byte 0x80495954 + .4byte 0x80495960 + .4byte 0x8049596C + .4byte 0x80495978 + .4byte 0x80495984 + .4byte 0x80495990 + .4byte 0x8049599C + .4byte 0x804959A8 + .4byte 0x804959B4 + .4byte 0x804959C0 + .4byte 0x804959CC + .4byte 0x804959D8 + .4byte 0x804959E4 .global $$253750 $$253750: - .incbin "baserom.dol", 0x491B38, 0x10 + .asciz "grandmenu/Main" + .balign 4 .global $$253828 $$253828: - .incbin "baserom.dol", 0x491B48, 0x10 + .asciz "EffectDecisionN" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$266368 $$266368: - .incbin "baserom.dol", 0x498140, 0x8 + .asciz "AnimL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252776 $$252776: - .incbin "baserom.dol", 0x498908, 0x8 + .asciz "MenuMC" + .balign 4 .global $$252777 $$252777: - .incbin "baserom.dol", 0x498910, 0x8 + .asciz "MenuTL" + .balign 4 .global $$252778 $$252778: - .incbin "baserom.dol", 0x498918, 0x8 + .asciz "MenuVC" + .balign 4 .global $$252779 $$252779: - .incbin "baserom.dol", 0x498920, 0x8 + .asciz "SoftK01" .global $$252780 $$252780: - .incbin "baserom.dol", 0x498928, 0x8 + .asciz "SoftK02" .global $$252781 $$252781: - .incbin "baserom.dol", 0x498930, 0x8 + .asciz "SoftK03" .global $$252782 $$252782: - .incbin "baserom.dol", 0x498938, 0x8 + .asciz "SoftKFC" .global $$252784 $$252784: - .incbin "baserom.dol", 0x498940, 0x8 + .asciz "SoftK64" .global $$253802 $$253802: - .incbin "baserom.dol", 0x498948, 0x8 + .asciz "Wait2" + .balign 4 .global $$253803 $$253803: - .incbin "baserom.dol", 0x498950, 0x8 + .asciz "Wait" + .balign 4 .global $$253810 $$253810: - .incbin "baserom.dol", 0x498958, 0x8 + .asciz "Choose" + .balign 4 .global $$253811 $$253811: - .incbin "baserom.dol", 0x498960, 0x8 + .asciz "EffectN" .global $$253818 $$253818: - .incbin "baserom.dol", 0x498968, 0x8 + .asciz "Quit" + .balign 4 .global $$253827 $$253827: - .incbin "baserom.dol", 0x498970, 0x8 + .asciz "Decide" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$265701 $$265701: - .incbin "baserom.dol", 0x49E530, 0x4 + .4byte 0x40200000 .global $$266209 $$266209: - .incbin "baserom.dol", 0x49E534, 0x4 + .4byte 0x3F800000 .global $$266241 $$266241: - .incbin "baserom.dol", 0x49E538, 0x4 + .4byte 0 .global $$266242 $$266242: - .incbin "baserom.dol", 0x49E53C, 0x4 + .4byte 0x3F000000 .global $$266317 $$266317: - .incbin "baserom.dol", 0x49E540, 0x4 + .4byte 0x41000000 .global $$266318 $$266318: - .incbin "baserom.dol", 0x49E544, 0x4 + .4byte 0x40800000 .global $$266329 $$266329: - .incbin "baserom.dol", 0x49E548, 0x4 + .4byte 0x41800000 .global $$266845 $$266845: - .incbin "baserom.dol", 0x49E54C, 0x4 + .4byte 0x3F4CCCCD diff --git a/asm/src/ItemCatcher.s b/asm/src/ItemCatcher.s index c44ca206..764867c2 100644 --- a/asm/src/ItemCatcher.s +++ b/asm/src/ItemCatcher.s @@ -382,20 +382,21 @@ __sinit_$$3ItemCatcher_cpp: /* 80342C6C 0033EAAC 4B E5 C7 3C */ b set__Q33hel4math7Vector2Fff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025BC, 0x4 + .4byte 0x80342C60 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254426 $$254426: - .incbin "baserom.dol", 0x49B008, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253107 $$253107: - .incbin "baserom.dol", 0x49D770, 0x4 + .4byte 0 .global $$253162 $$253162: - .incbin "baserom.dol", 0x49D774, 0x4 + .4byte 0x3F000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global T_DEFAULT_OFFSET__Q43scn4step4hero25$$2unnamed$$2ItemCatcher_cpp$$2 diff --git a/asm/src/ItemCollReact.s b/asm/src/ItemCollReact.s index 5404e732..2f0712c3 100644 --- a/asm/src/ItemCollReact.s +++ b/asm/src/ItemCollReact.s @@ -496,21 +496,49 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258446 $$258446: - .incbin "baserom.dol", 0x480E28, 0x20 + .4byte 0x803431A0 + .4byte 0x803431B8 + .4byte 0x803431A0 + .4byte 0x803431B8 + .4byte 0x803431A0 + .4byte 0x803431B8 + .4byte 0x803431A0 + .4byte 0x803431B8 .global $$258445 $$258445: - .incbin "baserom.dol", 0x480E48, 0x38 + .4byte 0x80342D10 + .4byte 0x80342DCC + .4byte 0x80342DF0 + .4byte 0x80342E6C + .4byte 0x80342F9C + .4byte 0x80342F28 + .4byte 0x80342D10 + .4byte 0x80342D10 + .4byte 0x8034309C + .4byte 0x8034317C + .4byte 0x803431CC + .4byte 0x80342FE4 + .4byte 0x803431CC + .4byte 0x80342D10 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480E80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80343374 + .4byte 0x80343338 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480E90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80343370 + .4byte 0x80343354 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258474 $$258474: - .incbin "baserom.dol", 0x49D778, 0x8 + .4byte 0x3F19999A + .4byte 0 .global $$258477 $$258477: - .incbin "baserom.dol", 0x49D780, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/KindUtil.s b/asm/src/KindUtil.s index 6557d050..6f9117ca 100644 --- a/asm/src/KindUtil.s +++ b/asm/src/KindUtil.s @@ -386,125 +386,397 @@ ToLevelIndex__Q43scn4step3map8KindUtilFQ43scn4step3map4Kind: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q43scn4step3map22$$2unnamed$$2KindUtil_cpp$$2 T_INFOS__Q43scn4step3map22$$2unnamed$$2KindUtil_cpp$$2: - .incbin "baserom.dol", 0x41C538, 0x3E8 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF20 + .4byte 0x8055BF28 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF20 + .4byte 0x8055BF30 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF20 + .4byte 0x8055BF38 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF20 + .4byte 0x8055BF40 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF30 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF38 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF40 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF50 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF58 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF48 + .4byte 0x8055BF60 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF68 + .4byte 0x8055BF28 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF68 + .4byte 0x8055BF30 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF68 + .4byte 0x8055BF38 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF68 + .4byte 0x8055BF40 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF70 + .4byte 0x8055BF28 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF70 + .4byte 0x8055BF30 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF70 + .4byte 0x8055BF38 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF70 + .4byte 0x8055BF40 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF30 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF38 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF40 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF50 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF78 + .4byte 0x8055BF58 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF80 + .4byte 0x8055BF28 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF88 + .4byte 0x8055BF28 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF88 + .4byte 0x8055BF30 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF88 + .4byte 0x8055BF38 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF88 + .4byte 0x8055BF40 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF90 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF90 + .4byte 0x8055BF30 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF90 + .4byte 0x8055BF38 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF90 + .4byte 0x8055BF40 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF98 + .4byte 0x8055BF28 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF98 + .4byte 0x8055BF30 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF98 + .4byte 0x8055BF38 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BF98 + .4byte 0x8055BF40 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BFA0 + .4byte 0x8055BF28 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BFA8 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BFB0 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x8055BFB8 + .4byte 0x8055BF28 + .4byte 0 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x804928C4 + .4byte 0x8055BF28 + .4byte 0x00000001 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x804928D0 + .4byte 0x8055BF28 + .4byte 0x00000002 + .4byte 0 + .4byte 0x804928B8 + .4byte 0x804928DC + .4byte 0x8055BF28 + .4byte 0 + .4byte 0 + .4byte 0x8055BFC0 + .4byte 0x8055BFC8 + .4byte 0x8055BFD0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x8055BFC0 + .4byte 0x8055BFC8 + .4byte 0x8055BFD8 + .4byte 0x00000002 + .4byte 0 + .4byte 0x8055BFC0 + .4byte 0x8055BFC8 + .4byte 0x8055BFE0 + .4byte 0 + .4byte 0 + .4byte 0x8055BFC0 + .4byte 0x8055BFE8 + .4byte 0x804928E8 + .4byte 0 + .4byte 0 + .4byte 0x8055BFC0 + .4byte 0x804928F4 + .4byte 0x80492900 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249154 $$249154: - .incbin "baserom.dol", 0x48E9B8, 0xC + .asciz "challenge" + .balign 4 .global $$249175 $$249175: - .incbin "baserom.dol", 0x48E9C4, 0xC + .asciz "ability1" + .balign 4 .global $$249176 $$249176: - .incbin "baserom.dol", 0x48E9D0, 0xC + .asciz "ability2" + .balign 4 .global $$249177 $$249177: - .incbin "baserom.dol", 0x48E9DC, 0xC + .asciz "ability3" + .balign 4 .global $$249184 $$249184: - .incbin "baserom.dol", 0x48E9E8, 0xC + .asciz "Credit01" + .balign 4 .global $$249185 $$249185: - .incbin "baserom.dol", 0x48E9F4, 0xC + .asciz "firstdemo" + .balign 4 .global $$249186 $$249186: - .incbin "baserom.dol", 0x48EA00, 0xC + .asciz "Firstdemo01" .global $$250020 $$250020: - .incbin "baserom.dol", 0x48EA0C, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$250021 $$250021: - .incbin "baserom.dol", 0x48EA1C, 0x18 + .asciz "StepLevelMapCommon.dn" + .balign 4 .global $$250022 $$250022: - .incbin "baserom.dol", 0x48EA34, 0x14 + .asciz "StepFirstDemo.dn" + .balign 4 .global $$250078 $$250078: - .incbin "baserom.dol", 0x48EA48, 0x18 + .asciz "map/step/%s/%s/%s.dat" + .balign 4 .global $$250094 $$250094: - .incbin "baserom.dol", 0x48EA60, 0xC + .asciz "%s/%s/%s" + .balign 4 .global $$250108 $$250108: - .incbin "baserom.dol", 0x48EA6C, 0x1C + .asciz "StepMapData%s%s%s.dn" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249155 $$249155: - .incbin "baserom.dol", 0x498300, 0x8 + .asciz "stage01" .global $$249156 $$249156: - .incbin "baserom.dol", 0x498308, 0x8 + .asciz "Step01" + .balign 4 .global $$249157 $$249157: - .incbin "baserom.dol", 0x498310, 0x8 + .asciz "Step02" + .balign 4 .global $$249158 $$249158: - .incbin "baserom.dol", 0x498318, 0x8 + .asciz "Step03" + .balign 4 .global $$249159 $$249159: - .incbin "baserom.dol", 0x498320, 0x8 + .asciz "Step04" + .balign 4 .global $$249160 $$249160: - .incbin "baserom.dol", 0x498328, 0x8 + .asciz "stage02" .global $$249161 $$249161: - .incbin "baserom.dol", 0x498330, 0x8 + .asciz "Step05" + .balign 4 .global $$249162 $$249162: - .incbin "baserom.dol", 0x498338, 0x8 + .asciz "Step06" + .balign 4 .global $$249163 $$249163: - .incbin "baserom.dol", 0x498340, 0x8 + .asciz "Step07" + .balign 4 .global $$249164 $$249164: - .incbin "baserom.dol", 0x498348, 0x8 + .asciz "stage03" .global $$249165 $$249165: - .incbin "baserom.dol", 0x498350, 0x8 + .asciz "stage04" .global $$249166 $$249166: - .incbin "baserom.dol", 0x498358, 0x8 + .asciz "stage05" .global $$249167 $$249167: - .incbin "baserom.dol", 0x498360, 0x8 + .asciz "stage06" .global $$249168 $$249168: - .incbin "baserom.dol", 0x498368, 0x8 + .asciz "stage07" .global $$249169 $$249169: - .incbin "baserom.dol", 0x498370, 0x8 + .asciz "stage08" .global $$249170 $$249170: - .incbin "baserom.dol", 0x498378, 0x8 + .asciz "stage10" .global $$249171 $$249171: - .incbin "baserom.dol", 0x498380, 0x8 + .asciz "master1" .global $$249172 $$249172: - .incbin "baserom.dol", 0x498388, 0x8 + .asciz "master2" .global $$249173 $$249173: - .incbin "baserom.dol", 0x498390, 0x8 + .asciz "master3" .global $$249174 $$249174: - .incbin "baserom.dol", 0x498398, 0x8 + .asciz "master4" .global $$249178 $$249178: - .incbin "baserom.dol", 0x4983A0, 0x8 + .asciz "other" + .balign 4 .global $$249179 $$249179: - .incbin "baserom.dol", 0x4983A8, 0x8 + .asciz "lvmap" + .balign 4 .global $$249180 $$249180: - .incbin "baserom.dol", 0x4983B0, 0x8 + .asciz "Level01" .global $$249181 $$249181: - .incbin "baserom.dol", 0x4983B8, 0x8 + .asciz "Level02" .global $$249182 $$249182: - .incbin "baserom.dol", 0x4983C0, 0x8 + .asciz "Level03" .global $$249183 $$249183: - .incbin "baserom.dol", 0x4983C8, 0x8 + .asciz "credit" + .balign 4 diff --git a/asm/src/Kirby.s b/asm/src/Kirby.s index af2794ec..497e47d7 100644 --- a/asm/src/Kirby.s +++ b/asm/src/Kirby.s @@ -1828,1240 +1828,2482 @@ Script__Q53scn4step4hero9modeldesc5KirbyFv: /* 8035C778 003585B8 4B FF F4 34 */ b Script__Q53scn4step4hero9modeldesc6CommonFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402458, 0x4 + .4byte 0x80209BD4 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: - .incbin "baserom.dol", 0x419DD0, 0xE38 + .4byte 0x8055ADE8 + .4byte 0 + .4byte 0x8055ADF0 + .4byte 0 + .4byte 0x8055ADF8 + .4byte 0 + .4byte 0x8055AE00 + .4byte 0 + .4byte 0x8055AE08 + .4byte 0 + .4byte 0x8055AE10 + .4byte 0 + .4byte 0x8055AE18 + .4byte 0 + .4byte 0x80489B40 + .4byte 0 + .4byte 0x8055AE20 + .4byte 0 + .4byte 0x8055AE28 + .4byte 0 + .4byte 0x8055AE30 + .4byte 0 + .4byte 0x80489B4C + .4byte 0 + .4byte 0x8055AE38 + .4byte 0 + .4byte 0x80489B58 + .4byte 0 + .4byte 0x80489B64 + .4byte 0 + .4byte 0x8055AE40 + .4byte 0 + .4byte 0x80489B74 + .4byte 0 + .4byte 0x80489B80 + .4byte 0 + .4byte 0x80489B8C + .4byte 0 + .4byte 0x8055AE48 + .4byte 0 + .4byte 0x80489B98 + .4byte 0 + .4byte 0x80489BA4 + .4byte 0 + .4byte 0x80489BB4 + .4byte 0 + .4byte 0x8055AE50 + .4byte 0 + .4byte 0x80489BC4 + .4byte 0 + .4byte 0x80489BD0 + .4byte 0 + .4byte 0x8055AE58 + .4byte 0 + .4byte 0x80489BE0 + .4byte 0 + .4byte 0x80489BF0 + .4byte 0 + .4byte 0x80489C00 + .4byte 0 + .4byte 0x8055AE60 + .4byte 0 + .4byte 0x80489C10 + .4byte 0 + .4byte 0x80489C1C + .4byte 0 + .4byte 0x80489C28 + .4byte 0 + .4byte 0x8055AE68 + .4byte 0 + .4byte 0x8055AE6C + .4byte 0 + .4byte 0x8055AE70 + .4byte 0 + .4byte 0x8055AE78 + .4byte 0 + .4byte 0x8055AE80 + .4byte 0 + .4byte 0x80489C34 + .4byte 0 + .4byte 0x8055AE88 + .4byte 0 + .4byte 0x8055AE90 + .4byte 0 + .4byte 0x80489C44 + .4byte 0 + .4byte 0x80489C50 + .4byte 0 + .4byte 0x80489C60 + .4byte 0 + .4byte 0x80489C70 + .4byte 0 + .4byte 0x80489C7C + .4byte 0 + .4byte 0x8055AE98 + .4byte 0 + .4byte 0x80489C8C + .4byte 0 + .4byte 0x8055AEA0 + .4byte 0 + .4byte 0x8055AEA8 + .4byte 0 + .4byte 0x80489C98 + .4byte 0 + .4byte 0x80489CA8 + .4byte 0 + .4byte 0x80489CB8 + .4byte 0 + .4byte 0x80489CC8 + .4byte 0 + .4byte 0x80489CD8 + .4byte 0 + .4byte 0x80489CE4 + .4byte 0 + .4byte 0x80489CF0 + .4byte 0 + .4byte 0x80489CFC + .4byte 0 + .4byte 0x80489D08 + .4byte 0 + .4byte 0x80489D14 + .4byte 0 + .4byte 0x8055AEB0 + .4byte 0 + .4byte 0x80489D20 + .4byte 0 + .4byte 0x80489D30 + .4byte 0 + .4byte 0x80489D3C + .4byte 0 + .4byte 0x80489D48 + .4byte 0 + .4byte 0x80489D54 + .4byte 0 + .4byte 0x80489D60 + .4byte 0 + .4byte 0x80489D70 + .4byte 0 + .4byte 0x80489D7C + .4byte 0 + .4byte 0x8055AEB8 + .4byte 0 + .4byte 0x80489D8C + .4byte 0 + .4byte 0x8055AEC0 + .4byte 0 + .4byte 0x80489D98 + .4byte 0 + .4byte 0x80489DA4 + .4byte 0 + .4byte 0x8055AEC8 + .4byte 0 + .4byte 0x80489DB0 + .4byte 0 + .4byte 0x8055AED0 + .4byte 0 + .4byte 0x80489DBC + .4byte 0 + .4byte 0x80489DD0 + .4byte 0 + .4byte 0x80489DE4 + .4byte 0 + .4byte 0x80489DF8 + .4byte 0 + .4byte 0x80489E0C + .4byte 0 + .4byte 0x80489E20 + .4byte 0 + .4byte 0x80489E34 + .4byte 0 + .4byte 0x80489E48 + .4byte 0 + .4byte 0x8055AED8 + .4byte 0 + .4byte 0x8055AEE0 + .4byte 0 + .4byte 0x8055AEE8 + .4byte 0 + .4byte 0x8055AEF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055AEF8 + .4byte 0 + .4byte 0x8055AF00 + .4byte 0 + .4byte 0x8055AF08 + .4byte 0 + .4byte 0x8055AF10 + .4byte 0 + .4byte 0x8055AF18 + .4byte 0 + .4byte 0x8055AF20 + .4byte 0 + .4byte 0x8055AF28 + .4byte 0 + .4byte 0x8055AF30 + .4byte 0 + .4byte 0x8055AF38 + .4byte 0 + .4byte 0x8055AF40 + .4byte 0 + .4byte 0x8055AF48 + .4byte 0 + .4byte 0x8055AF50 + .4byte 0 + .4byte 0x8055AF58 + .4byte 0 + .4byte 0x80489E5C + .4byte 0 + .4byte 0x8055AF60 + .4byte 0 + .4byte 0x80489E68 + .4byte 0 + .4byte 0x8055AF68 + .4byte 0 + .4byte 0x8055AF70 + .4byte 0 + .4byte 0x80489E74 + .4byte 0 + .4byte 0x80489E80 + .4byte 0 + .4byte 0x80489E94 + .4byte 0 + .4byte 0x80489EA0 + .4byte 0 + .4byte 0x80489EAC + .4byte 0 + .4byte 0x8055AF78 + .4byte 0 + .4byte 0x8055AF80 + .4byte 0 + .4byte 0x80489EB8 + .4byte 0 + .4byte 0x80489EC4 + .4byte 0 + .4byte 0x80489ED8 + .4byte 0 + .4byte 0x80489EE8 + .4byte 0 + .4byte 0x80489EF4 + .4byte 0 + .4byte 0x80489F04 + .4byte 0 + .4byte 0x8055AF88 + .4byte 0 + .4byte 0x8055AF88 + .4byte 0 + .4byte 0x8055AF88 + .4byte 0 + .4byte 0x80489F14 + .4byte 0 + .4byte 0x80489F20 + .4byte 0 + .4byte 0x80489F30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055ADE8 + .4byte 0 + .4byte 0x80489F40 + .4byte 0 + .4byte 0x80489C1C + .4byte 0 + .4byte 0x8055ADE8 + .4byte 0 + .4byte 0x80489F4C + .4byte 0 + .4byte 0x80489F5C + .4byte 0 + .4byte 0x80489F70 + .4byte 0 + .4byte 0x80489F80 + .4byte 0 + .4byte 0x80489F98 + .4byte 0 + .4byte 0x8055AF90 + .4byte 0 + .4byte 0x80489FA4 + .4byte 0 + .4byte 0x80489FB0 + .4byte 0 + .4byte 0x80489FBC + .4byte 0 + .4byte 0x80489FC8 + .4byte 0 + .4byte 0x80489FD4 + .4byte 0x00000001 + .4byte 0x80489FE8 + .4byte 0x00000001 + .4byte 0x80489FF4 + .4byte 0x00000001 + .4byte 0x8048A004 + .4byte 0x00000001 + .4byte 0x8048A014 + .4byte 0x00000001 + .4byte 0x8055AF98 + .4byte 0x00000001 + .4byte 0x8048A020 + .4byte 0x00000001 + .4byte 0x8048A02C + .4byte 0x00000001 + .4byte 0x8048A040 + .4byte 0x00000001 + .4byte 0x8048A04C + .4byte 0x00000001 + .4byte 0x8048A060 + .4byte 0x00000001 + .4byte 0x8055AFA0 + .4byte 0x00000001 + .4byte 0x8048A070 + .4byte 0x00000001 + .4byte 0x8048A07C + .4byte 0x00000001 + .4byte 0x8048A090 + .4byte 0x00000001 + .4byte 0x8048A0A8 + .4byte 0x00000001 + .4byte 0x8048A0B8 + .4byte 0x00000001 + .4byte 0x8048A0D0 + .4byte 0x00000001 + .4byte 0x8048A0DC + .4byte 0x00000001 + .4byte 0x8048A0EC + .4byte 0x00000001 + .4byte 0x8048A0F8 + .4byte 0x00000001 + .4byte 0x8055AFA8 + .4byte 0x00000001 + .4byte 0x8048A108 + .4byte 0x00000002 + .4byte 0x8048A114 + .4byte 0x00000002 + .4byte 0x8048A128 + .4byte 0x00000002 + .4byte 0x8048A140 + .4byte 0x00000002 + .4byte 0x8048A150 + .4byte 0x00000002 + .4byte 0x8048A160 + .4byte 0x00000002 + .4byte 0x8048A16C + .4byte 0x00000002 + .4byte 0x8048A178 + .4byte 0x00000002 + .4byte 0x8048A188 + .4byte 0x00000002 + .4byte 0x8048A1A0 + .4byte 0x00000002 + .4byte 0x8048A1B0 + .4byte 0x00000002 + .4byte 0x8048A1C0 + .4byte 0x00000003 + .4byte 0x8048A1D0 + .4byte 0x00000003 + .4byte 0x8055AFB0 + .4byte 0x00000003 + .4byte 0x8048A1E0 + .4byte 0x00000003 + .4byte 0x8048A1F0 + .4byte 0x00000003 + .4byte 0x8055AFB8 + .4byte 0x00000003 + .4byte 0x8055AFC0 + .4byte 0x00000003 + .4byte 0x8048A200 + .4byte 0x00000003 + .4byte 0x8048A210 + .4byte 0x00000003 + .4byte 0x8048A21C + .4byte 0x00000003 + .4byte 0x8048A228 + .4byte 0x00000003 + .4byte 0x8055AFC8 + .4byte 0x00000003 + .4byte 0x8048A234 + .4byte 0x00000003 + .4byte 0x8048A244 + .4byte 0x00000003 + .4byte 0x8048A254 + .4byte 0x00000003 + .4byte 0x8048A260 + .4byte 0x00000003 + .4byte 0x8048A270 + .4byte 0x00000004 + .4byte 0x8048A280 + .4byte 0x00000004 + .4byte 0x8048A28C + .4byte 0x00000004 + .4byte 0x8048A29C + .4byte 0x00000004 + .4byte 0x8048A2A8 + .4byte 0x00000004 + .4byte 0x8048A2B8 + .4byte 0x00000004 + .4byte 0x8055AFD0 + .4byte 0x00000004 + .4byte 0x8048A2C8 + .4byte 0x00000004 + .4byte 0x8048A2D4 + .4byte 0x00000004 + .4byte 0x8048A2E4 + .4byte 0x00000004 + .4byte 0x8048A2F0 + .4byte 0x00000004 + .4byte 0x8048A304 + .4byte 0x00000005 + .4byte 0x8055AFD8 + .4byte 0x00000005 + .4byte 0x8048A310 + .4byte 0x00000005 + .4byte 0x8048A31C + .4byte 0x00000005 + .4byte 0x8055AFE0 + .4byte 0x00000005 + .4byte 0x8048A32C + .4byte 0x00000005 + .4byte 0x8048A338 + .4byte 0x00000005 + .4byte 0x8048A344 + .4byte 0x00000005 + .4byte 0x8048A350 + .4byte 0x00000005 + .4byte 0x8048A35C + .4byte 0x00000006 + .4byte 0x8048A36C + .4byte 0x00000006 + .4byte 0x8048A36C + .4byte 0x00000006 + .4byte 0x8048A378 + .4byte 0x00000006 + .4byte 0x8048A384 + .4byte 0x00000006 + .4byte 0x8048A390 + .4byte 0x00000006 + .4byte 0x8055AFE8 + .4byte 0x00000007 + .4byte 0x8048A3A0 + .4byte 0x00000007 + .4byte 0x8048A3AC + .4byte 0x00000007 + .4byte 0x8048A3B8 + .4byte 0x00000007 + .4byte 0x8055AFF0 + .4byte 0x00000007 + .4byte 0x8055AFF8 + .4byte 0x00000007 + .4byte 0x8055B000 + .4byte 0x00000007 + .4byte 0x8048A3C4 + .4byte 0x00000007 + .4byte 0x8055AFC8 + .4byte 0x00000007 + .4byte 0x8048A3D0 + .4byte 0x00000007 + .4byte 0x8048A3DC + .4byte 0x00000007 + .4byte 0x8048A3EC + .4byte 0x00000007 + .4byte 0x8048A400 + .4byte 0x00000007 + .4byte 0x8048A410 + .4byte 0x00000008 + .4byte 0x8048A428 + .4byte 0x00000008 + .4byte 0x8048A43C + .4byte 0x00000008 + .4byte 0x8048A450 + .4byte 0x00000008 + .4byte 0x8048A460 + .4byte 0x00000008 + .4byte 0x8048A474 + .4byte 0x00000008 + .4byte 0x8048A488 + .4byte 0x00000008 + .4byte 0x8048A49C + .4byte 0x00000008 + .4byte 0x8048A4B0 + .4byte 0x00000008 + .4byte 0x8048A4C8 + .4byte 0x00000008 + .4byte 0x8048A4D8 + .4byte 0x00000008 + .4byte 0x8048A4E4 + .4byte 0x00000008 + .4byte 0x8048A4F0 + .4byte 0x00000008 + .4byte 0x8048A508 + .4byte 0x00000008 + .4byte 0x8048A518 + .4byte 0x00000008 + .4byte 0x8048A524 + .4byte 0x00000009 + .4byte 0x8048A538 + .4byte 0x00000009 + .4byte 0x8048A54C + .4byte 0x00000009 + .4byte 0x8048A560 + .4byte 0x00000009 + .4byte 0x8048A570 + .4byte 0x00000009 + .4byte 0x8048A588 + .4byte 0x00000009 + .4byte 0x8048A5A0 + .4byte 0x00000009 + .4byte 0x8048A5B8 + .4byte 0x00000009 + .4byte 0x8048A5CC + .4byte 0x00000009 + .4byte 0x8048A5D8 + .4byte 0x00000009 + .4byte 0x8048A5E8 + .4byte 0x00000009 + .4byte 0x8048A5FC + .4byte 0x00000009 + .4byte 0x8048A60C + .4byte 0x00000009 + .4byte 0x8048A620 + .4byte 0x00000009 + .4byte 0x8048A634 + .4byte 0x00000009 + .4byte 0x8048A644 + .4byte 0x00000009 + .4byte 0x8048A658 + .4byte 0x00000009 + .4byte 0x8048A668 + .4byte 0x00000009 + .4byte 0x8048A678 + .4byte 0x00000009 + .4byte 0x8048A688 + .4byte 0x00000009 + .4byte 0x8048A69C + .4byte 0x00000009 + .4byte 0x8048A6A8 + .4byte 0x00000009 + .4byte 0x8048A6B8 + .4byte 0x00000009 + .4byte 0x8048A6C8 + .4byte 0x0000000A + .4byte 0x8048A6E0 + .4byte 0x0000000A + .4byte 0x8048A6F8 + .4byte 0x0000000A + .4byte 0x8048A710 + .4byte 0x0000000A + .4byte 0x8048A730 + .4byte 0x0000000A + .4byte 0x8048A748 + .4byte 0x0000000A + .4byte 0x8048A760 + .4byte 0x0000000A + .4byte 0x8048A774 + .4byte 0x0000000A + .4byte 0x8048A784 + .4byte 0x0000000A + .4byte 0x8048A79C + .4byte 0x0000000A + .4byte 0x8048A7B0 + .4byte 0x0000000A + .4byte 0x8048A7C4 + .4byte 0x0000000A + .4byte 0x8048A7D0 + .4byte 0x0000000A + .4byte 0x8048A7E4 + .4byte 0x0000000A + .4byte 0x8048A7F4 + .4byte 0x0000000A + .4byte 0x8048A808 + .4byte 0x0000000A + .4byte 0x8048A81C + .4byte 0x0000000A + .4byte 0x8048A830 + .4byte 0x0000000A + .4byte 0x8048A844 + .4byte 0x0000000A + .4byte 0x8048A85C + .4byte 0x0000000A + .4byte 0x8048A874 + .4byte 0x0000000A + .4byte 0x8048A88C + .4byte 0x0000000A + .4byte 0x8048A8A4 + .4byte 0x0000000A + .4byte 0x8048A8C0 + .4byte 0x0000000A + .4byte 0x8048A8D8 + .4byte 0x0000000A + .4byte 0x8048A8F0 + .4byte 0x0000000A + .4byte 0x8048A908 + .4byte 0x0000000A + .4byte 0x8048A924 + .4byte 0x0000000A + .4byte 0x8048A938 + .4byte 0x0000000A + .4byte 0x8048A938 + .4byte 0x0000000A + .4byte 0x8048A948 + .4byte 0x0000000A + .4byte 0x8048A95C + .4byte 0x0000000A + .4byte 0x8048A970 + .4byte 0x0000000A + .4byte 0x8048A988 + .4byte 0x0000000A + .4byte 0x8048A9A0 + .4byte 0x0000000A + .4byte 0x8048A9B4 + .4byte 0x0000000A + .4byte 0x8048A9C8 + .4byte 0x0000000A + .4byte 0x8048A9DC + .4byte 0x0000000A + .4byte 0x8048A9F0 + .4byte 0x0000000A + .4byte 0x8048AA04 + .4byte 0x0000000A + .4byte 0x8048AA18 + .4byte 0x0000000A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048AA2C + .4byte 0 + .4byte 0x8048AA38 + .4byte 0 + .4byte 0x8048AA44 + .4byte 0 + .4byte 0x8048AA50 + .4byte 0 + .4byte 0x8055B008 + .4byte 0 + .4byte 0x8048AA5C + .4byte 0 + .4byte 0x8048AA68 + .4byte 0 + .4byte 0x8048AA7C + .4byte 0 + .4byte 0x8048AA88 + .4byte 0 + .4byte 0x8048AA98 + .4byte 0 + .4byte 0x8048AAAC + .4byte 0 + .4byte 0x8048AAB8 + .4byte 0 + .4byte 0x8055B010 + .4byte 0 + .4byte 0x8055B018 + .4byte 0 + .4byte 0x8048AAC8 + .4byte 0 + .4byte 0x8055B020 + .4byte 0 + .4byte 0x8048AAD4 + .4byte 0 + .4byte 0x8048AAE0 + .4byte 0 + .4byte 0x8048AAF0 + .4byte 0 + .4byte 0x8048AB08 + .4byte 0 + .4byte 0x8048AB18 + .4byte 0 + .4byte 0x8055B028 + .4byte 0 + .4byte 0x8055B030 + .4byte 0 + .4byte 0x8048AB2C + .4byte 0 + .4byte 0x8048AB38 + .4byte 0 + .4byte 0x8048AB44 + .4byte 0 + .4byte 0x8048AB54 + .4byte 0 + .4byte 0x8048AB60 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254770 $$254770: - .incbin "baserom.dol", 0x45D098, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$254771 $$254771: - .incbin "baserom.dol", 0x45D0B8, 0x10 + .asciz "history/Kirby" + .balign 4 .global $$254774 $$254774: - .incbin "baserom.dol", 0x45D0C8, 0x10 + .asciz "KirbyBodyBig3M" + .balign 4 .global $$254775 $$254775: - .incbin "baserom.dol", 0x45D0D8, 0x10 + .asciz "KirbyBodyBigM" + .balign 4 .global $$254776 $$254776: - .incbin "baserom.dol", 0x45D0E8, 0x10 + .asciz "KirbyBodyBlowM" + .balign 4 .global $$254777 $$254777: - .incbin "baserom.dol", 0x45D0F8, 0x10 + .asciz "KirbyBodyDrawM" + .balign 4 .global $$254778 $$254778: - .incbin "baserom.dol", 0x45D108, 0x14 + .asciz "KirbyBodyFlightM" + .balign 4 .global $$254941 $$254941: - .incbin "baserom.dol", 0x45D11C, 0x10 + .asciz "VacuumStart2" + .balign 4 .global $$254942 $$254942: - .incbin "baserom.dol", 0x45D12C, 0xC + .asciz "KirbyBodyM" + .balign 4 .global $$254953 $$254953: - .incbin "baserom.dol", 0x45D138, 0x2C + .4byte 0x80208854 ;# ptr + .4byte 0x802089CC ;# ptr + .4byte 0x80208A8C ;# ptr + .4byte 0x80208B14 ;# ptr + .4byte 0x80208C00 ;# ptr + .4byte 0x80208C34 ;# ptr + .4byte 0x80208D44 ;# ptr + .4byte 0x80208E58 ;# ptr + .4byte 0x80208F78 ;# ptr + .4byte 0x80209020 ;# ptr + .4byte 0x80209108 ;# ptr .global $$255043 $$255043: - .incbin "baserom.dol", 0x45D164, 0x3C + .asciz "VacuumStart" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: - .incbin "baserom.dol", 0x485C40, 0xC + .asciz "JumpStart" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x485C4C, 0xC + .asciz "SquatStart" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x485C58, 0xC + .asciz "SquatEnd" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x485C64, 0x10 + .asciz "SlidingStart" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x485C74, 0xC + .asciz "SlidingEnd" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x485C80, 0xC + .asciz "SlidingHit" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x485C8C, 0xC + .asciz "FlightStart" .global $$248747 $$248747: - .incbin "baserom.dol", 0x485C98, 0xC + .asciz "FlightFall" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x485CA4, 0x10 + .asciz "FlightLanding" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x485CB4, 0x10 + .asciz "FlightDamage" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x485CC4, 0xC + .asciz "VacuumStart" .global $$248752 $$248752: - .incbin "baserom.dol", 0x485CD0, 0x10 + .asciz "VacuumStart2" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x485CE0, 0x10 + .asciz "VacuumEnd" + .balign 4 + .4byte 0 .global $$248755 $$248755: - .incbin "baserom.dol", 0x485CF0, 0x10 + .asciz "VacuumHustleLv2" .global $$248756 $$248756: - .incbin "baserom.dol", 0x485D00, 0x10 + .asciz "VacuumSuperEnd" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x485D10, 0xC + .asciz "DamageEtc" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x485D1C, 0xC + .asciz "LadderUp" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x485D28, 0xC + .asciz "LadderDown" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x485D34, 0x10 + .asciz "EatJumpStart" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x485D44, 0xC + .asciz "EatLanding" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x485D50, 0x10 + .asciz "EatSquashRoof" + .balign 4 .global $$248771 $$248771: - .incbin "baserom.dol", 0x485D60, 0x10 + .asciz "EatSquashWall" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x485D70, 0xC + .asciz "EatDamage" + .balign 4 .global $$248773 $$248773: - .incbin "baserom.dol", 0x485D7C, 0x10 + .asciz "EatDamageEtc" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x485D8C, 0xC + .asciz "VomitAir" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x485D98, 0x10 + .asciz "PlancherStart" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x485DA8, 0x10 + .asciz "Plancher" + .balign 4 + .4byte 0 .global $$248780 $$248780: - .incbin "baserom.dol", 0x485DB8, 0x10 + .asciz "PlancherLanding" .global $$248781 $$248781: - .incbin "baserom.dol", 0x485DC8, 0x10 + .asciz "PlancherBound" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x485DD8, 0xC + .asciz "SquashRoof" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x485DE4, 0xC + .asciz "SquashWall" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x485DF0, 0xC + .asciz "DeadFall" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x485DFC, 0xC + .asciz "DyingWait" + .balign 4 .global $$248786 $$248786: - .incbin "baserom.dol", 0x485E08, 0xC + .asciz "HaveWait" + .balign 4 .global $$248787 $$248787: - .incbin "baserom.dol", 0x485E14, 0xC + .asciz "HaveWalk" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x485E20, 0x10 + .asciz "HaveJumpStart" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x485E30, 0xC + .asciz "HaveJump" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x485E3C, 0xC + .asciz "HaveJumpEnd" .global $$248792 $$248792: - .incbin "baserom.dol", 0x485E48, 0xC + .asciz "HaveFall" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x485E54, 0xC + .asciz "HaveLanding" .global $$248794 $$248794: - .incbin "baserom.dol", 0x485E60, 0x10 + .asciz "HaveSquatStart" + .balign 4 .global $$248795 $$248795: - .incbin "baserom.dol", 0x485E70, 0xC + .asciz "HaveSquat" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x485E7C, 0x10 + .asciz "HaveSquatEnd" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x485E8C, 0xC + .asciz "LGuardEnd" + .balign 4 .global $$248800 $$248800: - .incbin "baserom.dol", 0x485E98, 0xC + .asciz "RGuardEnd" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x485EA4, 0xC + .asciz "HaveTwoHand" .global $$248803 $$248803: - .incbin "baserom.dol", 0x485EB0, 0xC + .asciz "AirThrow" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x485EBC, 0x14 + .asciz "WarpStarRideStart" + .balign 4 .global $$248806 $$248806: - .incbin "baserom.dol", 0x485ED0, 0x14 + .asciz "WarpStarDemoRide" + .balign 4 .global $$248807 $$248807: - .incbin "baserom.dol", 0x485EE4, 0x14 + .asciz "WarpStarRideDLStart" .global $$248808 $$248808: - .incbin "baserom.dol", 0x485EF8, 0x14 + .asciz "WarpStarDemoRideDL" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x485F0C, 0x14 + .asciz "WarpStarRideDRStart" .global $$248810 $$248810: - .incbin "baserom.dol", 0x485F20, 0x14 + .asciz "WarpStarDemoRideDR" + .balign 4 .global $$248811 $$248811: - .incbin "baserom.dol", 0x485F34, 0x14 + .asciz "WarpStarRideRStart" + .balign 4 .global $$248812 $$248812: - .incbin "baserom.dol", 0x485F48, 0x14 + .asciz "WarpStarDemoRideR" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x485F5C, 0xC + .asciz "EatFaint" + .balign 4 .global $$248832 $$248832: - .incbin "baserom.dol", 0x485F68, 0xC + .asciz "EatWakeUp" + .balign 4 .global $$248835 $$248835: - .incbin "baserom.dol", 0x485F74, 0xC + .asciz "WaterPistol" .global $$248836 $$248836: - .incbin "baserom.dol", 0x485F80, 0x14 + .asciz "WaterPistolLanding" + .balign 4 .global $$248837 $$248837: - .incbin "baserom.dol", 0x485F94, 0xC + .asciz "FloatWait" + .balign 4 .global $$248838 $$248838: - .incbin "baserom.dol", 0x485FA0, 0xC + .asciz "FloatMove" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x485FAC, 0xC + .asciz "Piggyback" + .balign 4 .global $$248842 $$248842: - .incbin "baserom.dol", 0x485FB8, 0xC + .asciz "ItemGetWait" .global $$248843 $$248843: - .incbin "baserom.dol", 0x485FC4, 0x14 + .asciz "ItemGetWaitStart" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x485FD8, 0x10 + .asciz "ItemGetWaitEnd" + .balign 4 .global $$248845 $$248845: - .incbin "baserom.dol", 0x485FE8, 0xC + .asciz "CannonWait" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x485FF4, 0x10 + .asciz "CannonWaitHide" + .balign 4 .global $$248847 $$248847: - .incbin "baserom.dol", 0x486004, 0x10 + .asciz "CannonWaitShow" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x486014, 0xC + .asciz "DangleMoveR" .global $$248850 $$248850: - .incbin "baserom.dol", 0x486020, 0x10 + .asciz "DangleMoveL" + .4byte 0 .global $$248851 $$248851: - .incbin "baserom.dol", 0x486030, 0x10 + .asciz "CarryBombDanger" .global $$248852 $$248852: - .incbin "baserom.dol", 0x486040, 0xC + .asciz "Listening" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x48604C, 0x10 + .asciz "VictoryStand" + .balign 4 .global $$248854 $$248854: - .incbin "baserom.dol", 0x48605C, 0x14 + .asciz "VictoryStandStart" + .balign 4 .global $$248855 $$248855: - .incbin "baserom.dol", 0x486070, 0x10 + .asciz "VictoryStandCup" .global $$248856 $$248856: - .incbin "baserom.dol", 0x486080, 0x18 + .asciz "VictoryStandCupStart" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x486098, 0xC + .asciz "Struggle" + .balign 4 .global $$248859 $$248859: - .incbin "baserom.dol", 0x4860A4, 0xC + .asciz "LoseStart" + .balign 4 .global $$248860 $$248860: - .incbin "baserom.dol", 0x4860B0, 0xC + .asciz "WinStart" + .balign 4 .global $$248861 $$248861: - .incbin "baserom.dol", 0x4860BC, 0xC + .asciz "WinWait1" + .balign 4 .global $$248862 $$248862: - .incbin "baserom.dol", 0x4860C8, 0xC + .asciz "WinWait2" + .balign 4 .global $$248863 $$248863: - .incbin "baserom.dol", 0x4860D4, 0x14 + .asciz "SwordAttackStart" + .balign 4 .global $$248864 $$248864: - .incbin "baserom.dol", 0x4860E8, 0xC + .asciz "SwordAttack" .global $$248865 $$248865: - .incbin "baserom.dol", 0x4860F4, 0x10 + .asciz "SwordAttackEnd" + .balign 4 .global $$248866 $$248866: - .incbin "baserom.dol", 0x486104, 0x10 + .asciz "AirSpinSword" + .balign 4 .global $$248867 $$248867: - .incbin "baserom.dol", 0x486114, 0xC + .asciz "ThrustStart" .global $$248869 $$248869: - .incbin "baserom.dol", 0x486120, 0xC + .asciz "ThrustEnd" + .balign 4 .global $$248870 $$248870: - .incbin "baserom.dol", 0x48612C, 0x14 + .asciz "UnderThrustStart" + .balign 4 .global $$248871 $$248871: - .incbin "baserom.dol", 0x486140, 0xC + .asciz "UnderThrust" .global $$248872 $$248872: - .incbin "baserom.dol", 0x48614C, 0x14 + .asciz "UnderThrustLanding" + .balign 4 .global $$248873 $$248873: - .incbin "baserom.dol", 0x486160, 0x10 + .asciz "RaisingStart" + .balign 4 .global $$248875 $$248875: - .incbin "baserom.dol", 0x486170, 0xC + .asciz "RaisingEnd" + .balign 4 .global $$248876 $$248876: - .incbin "baserom.dol", 0x48617C, 0x14 + .asciz "TornadoAttackCharge" .global $$248877 $$248877: - .incbin "baserom.dol", 0x486190, 0x18 + .asciz "TornadoAttackChargeMax" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x4861A8, 0x10 + .asciz "TornadoAttack" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x4861B8, 0x18 + .asciz "TornadoAttackCharge2" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x4861D0, 0xC + .asciz "FinelyCut" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x4861DC, 0x10 + .asciz "ChoppingStart" + .balign 4 .global $$248882 $$248882: - .incbin "baserom.dol", 0x4861EC, 0xC + .asciz "Chopping" + .balign 4 .global $$248883 $$248883: - .incbin "baserom.dol", 0x4861F8, 0x10 + .asciz "FinelyCutEnd" + .balign 4 .global $$248885 $$248885: - .incbin "baserom.dol", 0x486208, 0xC + .asciz "DashCutter" + .balign 4 .global $$248886 $$248886: - .incbin "baserom.dol", 0x486214, 0x14 + .asciz "CutterSlashChain1" + .balign 4 .global $$248887 $$248887: - .incbin "baserom.dol", 0x486228, 0x18 + .asciz "CutterSlashChain2" + .balign 4 + .4byte 0 .global $$248888 $$248888: - .incbin "baserom.dol", 0x486240, 0x10 + .asciz "FinalCutterRise" .global $$248889 $$248889: - .incbin "baserom.dol", 0x486250, 0x10 + .asciz "FinalCutterDrop" .global $$248890 $$248890: - .incbin "baserom.dol", 0x486260, 0xC + .asciz "CutterThrow" .global $$248891 $$248891: - .incbin "baserom.dol", 0x48626C, 0xC + .asciz "CutterCatch" .global $$248892 $$248892: - .incbin "baserom.dol", 0x486278, 0x10 + .asciz "AirCutterThrow" + .balign 4 .global $$248893 $$248893: - .incbin "baserom.dol", 0x486288, 0x18 + .asciz "AirCutterThrowEnd" + .balign 4 + .4byte 0 .global $$248894 $$248894: - .incbin "baserom.dol", 0x4862A0, 0x10 + .asciz "AirCutterStroke" .global $$248895 $$248895: - .incbin "baserom.dol", 0x4862B0, 0x10 + .asciz "AirCutterCatch" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x4862C0, 0x10 + .asciz "WhipCatchStart" + .balign 4 .global $$248897 $$248897: - .incbin "baserom.dol", 0x4862D0, 0x10 + .asciz "WhipCatchCharge" .global $$248899 $$248899: - .incbin "baserom.dol", 0x4862E0, 0x10 + .asciz "WhipCatchWait" + .balign 4 .global $$248900 $$248900: - .incbin "baserom.dol", 0x4862F0, 0x10 + .asciz "WhipCatchEnd" + .balign 4 .global $$248903 $$248903: - .incbin "baserom.dol", 0x486300, 0x10 + .asciz "WhipRushStart" + .balign 4 .global $$248904 $$248904: - .incbin "baserom.dol", 0x486310, 0xC + .asciz "WhipRush" + .balign 4 .global $$248905 $$248905: - .incbin "baserom.dol", 0x48631C, 0xC + .asciz "WhipRushEnd" .global $$248906 $$248906: - .incbin "baserom.dol", 0x486328, 0xC + .asciz "GazerSpiral" .global $$248908 $$248908: - .incbin "baserom.dol", 0x486334, 0x10 + .asciz "WhipSlamFront" + .balign 4 .global $$248909 $$248909: - .incbin "baserom.dol", 0x486344, 0x10 + .asciz "WhipSlamBack" + .balign 4 .global $$248910 $$248910: - .incbin "baserom.dol", 0x486354, 0xC + .asciz "WhipSlamUp" + .balign 4 .global $$248911 $$248911: - .incbin "baserom.dol", 0x486360, 0x10 + .asciz "WhipSlamDown" + .balign 4 .global $$248912 $$248912: - .incbin "baserom.dol", 0x486370, 0x10 + .asciz "FireBreathStart" .global $$248913 $$248913: - .incbin "baserom.dol", 0x486380, 0xC + .asciz "FireBreath" + .balign 4 .global $$248914 $$248914: - .incbin "baserom.dol", 0x48638C, 0x10 + .asciz "FireBreathEnd" + .balign 4 .global $$248915 $$248915: - .incbin "baserom.dol", 0x48639C, 0xC + .asciz "Ignition" + .balign 4 .global $$248916 $$248916: - .incbin "baserom.dol", 0x4863A8, 0x10 + .asciz "RollongAttack" + .balign 4 .global $$248917 $$248917: - .incbin "baserom.dol", 0x4863B8, 0x10 + .asciz "BurningStart" + .balign 4 .global $$248919 $$248919: - .incbin "baserom.dol", 0x4863C8, 0xC + .asciz "BurningEnd" + .balign 4 .global $$248920 $$248920: - .incbin "baserom.dol", 0x4863D4, 0x10 + .asciz "BurningWallEnd" + .balign 4 .global $$248921 $$248921: - .incbin "baserom.dol", 0x4863E4, 0xC + .asciz "SpiralFall" + .balign 4 .global $$248922 $$248922: - .incbin "baserom.dol", 0x4863F0, 0x14 + .asciz "SpiralFallReverse" + .balign 4 .global $$248923 $$248923: - .incbin "baserom.dol", 0x486404, 0xC + .asciz "SparkStart" + .balign 4 .global $$248925 $$248925: - .incbin "baserom.dol", 0x486410, 0xC + .asciz "SparkEnd" + .balign 4 .global $$248926 $$248926: - .incbin "baserom.dol", 0x48641C, 0x10 + .asciz "UpSparkStart" + .balign 4 .global $$248928 $$248928: - .incbin "baserom.dol", 0x48642C, 0xC + .asciz "UpSparkEnd" + .balign 4 .global $$248929 $$248929: - .incbin "baserom.dol", 0x486438, 0xC + .asciz "SparkShot" + .balign 4 .global $$248930 $$248930: - .incbin "baserom.dol", 0x486444, 0xC + .asciz "SparkLaser" + .balign 4 .global $$248931 $$248931: - .incbin "baserom.dol", 0x486450, 0xC + .asciz "SparkArrow" + .balign 4 .global $$248932 $$248932: - .incbin "baserom.dol", 0x48645C, 0x10 + .asciz "StoneStartJump" + .balign 4 .global $$248933 $$248933: - .incbin "baserom.dol", 0x48646C, 0xC + .asciz "StoneChange" .global $$248934 $$248934: - .incbin "baserom.dol", 0x486478, 0xC + .asciz "StoneEnd" + .balign 4 .global $$248935 $$248935: - .incbin "baserom.dol", 0x486484, 0xC + .asciz "StoneUpper" + .balign 4 .global $$248936 $$248936: - .incbin "baserom.dol", 0x486490, 0x10 + .asciz "StoneUpperEnd" + .balign 4 .global $$248938 $$248938: - .incbin "baserom.dol", 0x4864A0, 0xC + .asciz "SwingEnd" + .balign 4 .global $$248939 $$248939: - .incbin "baserom.dol", 0x4864AC, 0xC + .asciz "Parachute" + .balign 4 .global $$248940 $$248940: - .incbin "baserom.dol", 0x4864B8, 0xC + .asciz "DiveStart" + .balign 4 .global $$248944 $$248944: - .incbin "baserom.dol", 0x4864C4, 0xC + .asciz "DrillStart" + .balign 4 .global $$248945 $$248945: - .incbin "baserom.dol", 0x4864D0, 0xC + .asciz "DrillEnd" + .balign 4 .global $$248946 $$248946: - .incbin "baserom.dol", 0x4864DC, 0x10 + .asciz "ParasolCatch" + .balign 4 .global $$248947 $$248947: - .incbin "baserom.dol", 0x4864EC, 0x14 + .asciz "ParasolPerformance" + .balign 4 .global $$248948 $$248948: - .incbin "baserom.dol", 0x486500, 0x10 + .asciz "ParasolThrow" + .balign 4 .global $$248949 $$248949: - .incbin "baserom.dol", 0x486510, 0x18 + .asciz "HammerAttackChargeStart" .global $$248950 $$248950: - .incbin "baserom.dol", 0x486528, 0x14 + .asciz "HammerAttackCharge" + .balign 4 .global $$248951 $$248951: - .incbin "baserom.dol", 0x48653C, 0x14 + .asciz "HammerAttack" + .balign 4 + .4byte 0 .global $$248952 $$248952: - .incbin "baserom.dol", 0x486550, 0x10 + .asciz "HammerAttackHit" .global $$248953 $$248953: - .incbin "baserom.dol", 0x486560, 0x14 + .asciz "HammerAttackMiss" + .balign 4 .global $$248954 $$248954: - .incbin "baserom.dol", 0x486574, 0x14 + .asciz "TripleHammerAttack1" .global $$248955 $$248955: - .incbin "baserom.dol", 0x486588, 0x14 + .asciz "TripleHammerAttack2" .global $$248956 $$248956: - .incbin "baserom.dol", 0x48659C, 0x14 + .asciz "TripleHammerAttack3" .global $$248957 $$248957: - .incbin "baserom.dol", 0x4865B0, 0x18 + .asciz "TripleHammerAttack3Hit" + .balign 4 .global $$248958 $$248958: - .incbin "baserom.dol", 0x4865C8, 0x10 + .asciz "GuriguriHammer" + .balign 4 .global $$248959 $$248959: - .incbin "baserom.dol", 0x4865D8, 0xC + .asciz "GiantSwing" + .balign 4 .global $$248960 $$248960: - .incbin "baserom.dol", 0x4865E4, 0xC + .asciz "WheelHammer" .global $$248961 $$248961: - .incbin "baserom.dol", 0x4865F0, 0x18 + .asciz "StrongWheelHammer" + .balign 4 + .4byte 0 .global $$248962 $$248962: - .incbin "baserom.dol", 0x486608, 0x10 + .asciz "OnigorosiHammer" .global $$248963 $$248963: - .incbin "baserom.dol", 0x486618, 0xC + .asciz "HammerThrow" .global $$248964 $$248964: - .incbin "baserom.dol", 0x486624, 0x14 + .asciz "WingFeatheGunStart" + .balign 4 .global $$248965 $$248965: - .incbin "baserom.dol", 0x486638, 0x14 + .asciz "WingFeatheGunLoop" + .balign 4 .global $$248966 $$248966: - .incbin "baserom.dol", 0x48664C, 0x14 + .asciz "WingFeatheGunWait" + .balign 4 .global $$248967 $$248967: - .incbin "baserom.dol", 0x486660, 0x10 + .asciz "WingFeatheGun" + .balign 4 .global $$248968 $$248968: - .incbin "baserom.dol", 0x486670, 0x18 + .asciz "WingFeatheGunAirStart" + .balign 4 .global $$248969 $$248969: - .incbin "baserom.dol", 0x486688, 0x18 + .asciz "WingFeatheGunAirLoop" + .balign 4 .global $$248970 $$248970: - .incbin "baserom.dol", 0x4866A0, 0x18 + .asciz "WingFeatheGunAirWait" + .balign 4 .global $$248971 $$248971: - .incbin "baserom.dol", 0x4866B8, 0x14 + .asciz "WingFeatheGunAir" + .balign 4 .global $$248972 $$248972: - .incbin "baserom.dol", 0x4866CC, 0xC + .asciz "WingFlight" + .balign 4 .global $$248973 $$248973: - .incbin "baserom.dol", 0x4866D8, 0x10 + .asciz "WingFlightFall" + .balign 4 .global $$248974 $$248974: - .incbin "baserom.dol", 0x4866E8, 0x14 + .asciz "WingBigBangAirStart" .global $$248975 $$248975: - .incbin "baserom.dol", 0x4866FC, 0x10 + .asciz "WingBigBangAir" + .balign 4 .global $$248976 $$248976: - .incbin "baserom.dol", 0x48670C, 0x14 + .asciz "WingBigBangAirEnd" + .balign 4 .global $$248977 $$248977: - .incbin "baserom.dol", 0x486720, 0x14 + .asciz "WingCondorDiveStart" .global $$248978 $$248978: - .incbin "baserom.dol", 0x486734, 0x10 + .asciz "WingCondorDive" + .balign 4 .global $$248979 $$248979: - .incbin "baserom.dol", 0x486744, 0x14 + .asciz "WingCondorDiveEnd" + .balign 4 .global $$248980 $$248980: - .incbin "baserom.dol", 0x486758, 0x10 + .asciz "WingTossStart" + .balign 4 .global $$248981 $$248981: - .incbin "baserom.dol", 0x486768, 0x10 + .asciz "WingTossJump" + .balign 4 .global $$248982 $$248982: - .incbin "baserom.dol", 0x486778, 0x10 + .asciz "WingShuttleLoop" .global $$248983 $$248983: - .incbin "baserom.dol", 0x486788, 0x14 + .asciz "WingShuttleLoopEnd" + .balign 4 .global $$248984 $$248984: - .incbin "baserom.dol", 0x48679C, 0xC + .asciz "WingDash" + .balign 4 .global $$248985 $$248985: - .incbin "baserom.dol", 0x4867A8, 0x10 + .asciz "WingAirDash" + .4byte 0 .global $$248986 $$248986: - .incbin "baserom.dol", 0x4867B8, 0x10 + .asciz "WingDashEndWall" .global $$248987 $$248987: - .incbin "baserom.dol", 0x4867C8, 0x18 + .asciz "FighterAttackSmashStart" .global $$248988 $$248988: - .incbin "baserom.dol", 0x4867E0, 0x18 + .asciz "FighterAttackSmashLoop" + .balign 4 .global $$248989 $$248989: - .incbin "baserom.dol", 0x4867F8, 0x18 + .asciz "FighterAttackSmashEnd" + .balign 4 .global $$248990 $$248990: - .incbin "baserom.dol", 0x486810, 0x20 + .asciz "FighterAttackVulcanStart" + .balign 4 + .4byte 0 .global $$248991 $$248991: - .incbin "baserom.dol", 0x486830, 0x18 + .asciz "FighterAttackVulcanLoop" .global $$248992 $$248992: - .incbin "baserom.dol", 0x486848, 0x18 + .asciz "FighterAttackVulcanEnd" + .balign 4 .global $$248993 $$248993: - .incbin "baserom.dol", 0x486860, 0x14 + .asciz "FighterRisingStart" + .balign 4 .global $$248994 $$248994: - .incbin "baserom.dol", 0x486874, 0x10 + .asciz "FighterRising" + .balign 4 .global $$248995 $$248995: - .incbin "baserom.dol", 0x486884, 0x18 + .asciz "FighterRisingAirStart" + .balign 4 .global $$248996 $$248996: - .incbin "baserom.dol", 0x48689C, 0x14 + .asciz "FighterRisingAir" + .balign 4 .global $$248997 $$248997: - .incbin "baserom.dol", 0x4868B0, 0x14 + .asciz "FighterSpinStart" + .balign 4 .global $$248998 $$248998: - .incbin "baserom.dol", 0x4868C4, 0xC + .asciz "FighterSpin" .global $$248999 $$248999: - .incbin "baserom.dol", 0x4868D0, 0x14 + .asciz "FighterSlidingStart" .global $$249000 $$249000: - .incbin "baserom.dol", 0x4868E4, 0x10 + .asciz "FighterSliding" + .balign 4 .global $$249001 $$249001: - .incbin "baserom.dol", 0x4868F4, 0x14 + .asciz "FighterSlidingEnd" + .balign 4 .global $$249002 $$249002: - .incbin "baserom.dol", 0x486908, 0x14 + .asciz "FighterHadouStart" + .balign 4 .global $$249003 $$249003: - .incbin "baserom.dol", 0x48691C, 0x14 + .asciz "FighterHadouCharge" + .balign 4 .global $$249004 $$249004: - .incbin "baserom.dol", 0x486930, 0x14 + .asciz "FighterHadouHadou" + .balign 4 .global $$249005 $$249005: - .incbin "baserom.dol", 0x486944, 0x18 + .asciz "FighterHadouHadouEnd" + .balign 4 .global $$249006 $$249006: - .incbin "baserom.dol", 0x48695C, 0x18 + .asciz "FighterMegaHadouStart" + .balign 4 .global $$249007 $$249007: - .incbin "baserom.dol", 0x486974, 0x18 + .asciz "FighterMegaHadouCharge" + .balign 4 .global $$249008 $$249008: - .incbin "baserom.dol", 0x48698C, 0x18 + .asciz "FighterMegaHadouHadou" + .balign 4 .global $$249009 $$249009: - .incbin "baserom.dol", 0x4869A4, 0x1C + .asciz "FighterMegaHadouHadouEnd" + .balign 4 .global $$249010 $$249010: - .incbin "baserom.dol", 0x4869C0, 0x18 + .asciz "FighterGigaHadouStart" + .balign 4 .global $$249011 $$249011: - .incbin "baserom.dol", 0x4869D8, 0x18 + .asciz "FighterGigaHadouCharge" + .balign 4 .global $$249012 $$249012: - .incbin "baserom.dol", 0x4869F0, 0x18 + .asciz "FighterGigaHadouHadou" + .balign 4 .global $$249013 $$249013: - .incbin "baserom.dol", 0x486A08, 0x1C + .asciz "FighterGigaHadouHadouEnd" + .balign 4 .global $$249014 $$249014: - .incbin "baserom.dol", 0x486A24, 0x14 + .asciz "FighterSkyKickStart" .global $$249015 $$249015: - .incbin "baserom.dol", 0x486A38, 0x10 + .asciz "FighterSkyKick" + .balign 4 .global $$249016 $$249016: - .incbin "baserom.dol", 0x486A48, 0x14 + .asciz "FighterSkyKickHit" + .balign 4 .global $$249017 $$249017: - .incbin "baserom.dol", 0x486A5C, 0x14 + .asciz "FighterDoubleKick" + .balign 4 .global $$249018 $$249018: - .incbin "baserom.dol", 0x486A70, 0x18 + .asciz "FighterDoubleKickEnd" + .balign 4 .global $$249019 $$249019: - .incbin "baserom.dol", 0x486A88, 0x18 + .asciz "FighterStampKickStart" + .balign 4 .global $$249020 $$249020: - .incbin "baserom.dol", 0x486AA0, 0x14 + .asciz "FighterStampKick" + .balign 4 .global $$249021 $$249021: - .incbin "baserom.dol", 0x486AB4, 0x14 + .asciz "FighterStampKickEnd" .global $$249022 $$249022: - .incbin "baserom.dol", 0x486AC8, 0x14 + .asciz "FighterStampKickHit" .global $$249023 $$249023: - .incbin "baserom.dol", 0x486ADC, 0x14 + .asciz "FighterCatchWait" + .balign 4 .global $$249024 $$249024: - .incbin "baserom.dol", 0x486AF0, 0x14 + .asciz "FighterThrowFront" + .balign 4 .global $$249025 $$249025: - .incbin "baserom.dol", 0x486B04, 0x14 + .asciz "FighterThrowBack" + .balign 4 .global $$249026 $$249026: - .incbin "baserom.dol", 0x486B18, 0x14 + .asciz "FighterMoonsault" + .balign 4 .global $$249027 $$249027: - .incbin "baserom.dol", 0x486B2C, 0xC + .asciz "LookAround" + .balign 4 .global $$249028 $$249028: - .incbin "baserom.dol", 0x486B38, 0xC + .asciz "LookAround2" .global $$249029 $$249029: - .incbin "baserom.dol", 0x486B44, 0xC + .asciz "LookAround3" .global $$249030 $$249030: - .incbin "baserom.dol", 0x486B50, 0xC + .asciz "LookUpStart" .global $$249032 $$249032: - .incbin "baserom.dol", 0x486B5C, 0xC + .asciz "LookUpEnd" + .balign 4 .global $$249033 $$249033: - .incbin "baserom.dol", 0x486B68, 0x14 + .asciz "StandReadyRStart" + .balign 4 .global $$249034 $$249034: - .incbin "baserom.dol", 0x486B7C, 0xC + .asciz "StandReadyR" .global $$249035 $$249035: - .incbin "baserom.dol", 0x486B88, 0x10 + .asciz "StandReadyREnd" + .balign 4 .global $$249036 $$249036: - .incbin "baserom.dol", 0x486B98, 0x14 + .asciz "StandReadyLStart" + .balign 4 .global $$249037 $$249037: - .incbin "baserom.dol", 0x486BAC, 0xC + .asciz "StandReadyL" .global $$249038 $$249038: - .incbin "baserom.dol", 0x486BB8, 0x10 + .asciz "StandReadyLEnd" + .balign 4 .global $$249041 $$249041: - .incbin "baserom.dol", 0x486BC8, 0xC + .asciz "TumbleStart" .global $$249043 $$249043: - .incbin "baserom.dol", 0x486BD4, 0xC + .asciz "TumbleEnd" + .balign 4 .global $$249044 $$249044: - .incbin "baserom.dol", 0x486BE0, 0x10 + .asciz "Lighthearted" + .balign 4 .global $$249045 $$249045: - .incbin "baserom.dol", 0x486BF0, 0x18 + .asciz "LightheartedLoop" + .balign 4 + .4byte 0 .global $$249046 $$249046: - .incbin "baserom.dol", 0x486C08, 0x10 + .asciz "ChallengeArrive" .global $$249047 $$249047: - .incbin "baserom.dol", 0x486C18, 0x14 + .asciz "ChallengeArriveWait" .global $$249050 $$249050: - .incbin "baserom.dol", 0x486C2C, 0xC + .asciz "ViewHello" + .balign 4 .global $$249051 $$249051: - .incbin "baserom.dol", 0x486C38, 0xC + .asciz "WalkSmile" + .balign 4 .global $$249052 $$249052: - .incbin "baserom.dol", 0x486C44, 0x10 + .asciz "WorrisomeStart" + .balign 4 .global $$249053 $$249053: - .incbin "baserom.dol", 0x486C54, 0xC + .asciz "Worrisome" + .balign 4 .global $$249054 $$249054: - .incbin "baserom.dol", 0x486C60, 0x10 + .asciz "WorrisomeEnd" + .balign 4 .global $$249066 $$249066: - .incbin "baserom.dol", 0x486C70, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$249067 $$249067: - .incbin "baserom.dol", 0x486C7C, 0xC + .asciz "Control2L" + .balign 4 .global $$249072 $$249072: - .incbin "baserom.dol", 0x486C88, 0xC + .asciz "FakeMouthL" + .balign 4 .global $$249073 $$249073: - .incbin "baserom.dol", 0x486C94, 0x10 + .asciz "LA1ShoulderJ" + .balign 4 .global $$249074 $$249074: - .incbin "baserom.dol", 0x486CA4, 0x10 + .asciz "RA1ShoulderJ" + .balign 4 .global $$249075 $$249075: - .incbin "baserom.dol", 0x486CB4, 0xC + .asciz "CA4FaceJ" + .balign 4 .global $$249079 $$249079: - .incbin "baserom.dol", 0x486CC0, 0xC + .asciz "CA5MouthAJ" + .balign 4 .global $$249081 $$249081: - .incbin "baserom.dol", 0x486CCC, 0xC + .asciz "KirbyBodyM" + .balign 4 .global $$249082 $$249082: - .incbin "baserom.dol", 0x486CD8, 0x10 + .asciz "KirbyBodyBigM" + .balign 4 .global $$249083 $$249083: - .incbin "baserom.dol", 0x486CE8, 0x10 + .asciz "KirbyBodyBig3M" + .balign 4 .global $$249084 $$249084: - .incbin "baserom.dol", 0x486CF8, 0x10 + .asciz "KirbyBodyBlowM" + .balign 4 .global $$249085 $$249085: - .incbin "baserom.dol", 0x486D08, 0x10 + .asciz "KirbyBodyDrawM" + .balign 4 .global $$249086 $$249086: - .incbin "baserom.dol", 0x486D18, 0x18 + .asciz "KirbyBodyFlightM" + .balign 4 + .4byte 0 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc5KirbyFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc5KirbyFv$$2NAMES$$20: - .incbin "baserom.dol", 0x486D30, 0x78 + .4byte 0x8055B038 + .4byte 0x8048AB70 + .4byte 0x8048AB7C + .4byte 0x8055B040 + .4byte 0x8055B048 + .4byte 0x8055B050 + .4byte 0x8055B058 + .4byte 0x8048AB88 + .4byte 0x8048AB94 + .4byte 0x8048ABA4 + .4byte 0x8048ABB4 + .4byte 0x8048AB70 + .4byte 0x8055B060 + .4byte 0x8055B068 + .4byte 0x8055B070 + .4byte 0x8048ABC0 + .4byte 0x8048ABB4 + .4byte 0x8055B078 + .4byte 0x8055B038 + .4byte 0x8055B038 + .4byte 0x8055B038 + .4byte 0x8055B038 + .4byte 0x8055B038 + .4byte 0x8055B038 + .4byte 0x8048ABCC + .4byte 0x8048ABD8 + .4byte 0x8048ABE8 + .4byte 0x8048ABF8 + .4byte 0x8048AC08 + .4byte 0x8048AC18 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254931 $$254931: - .incbin "baserom.dol", 0x4948F8, 0x8 + .asciz "Wait3" + .balign 4 .global $$254932 $$254932: - .incbin "baserom.dol", 0x494900, 0x8 + .asciz "Wait4" + .balign 4 .global $$254933 $$254933: - .incbin "baserom.dol", 0x494908, 0x8 + .asciz "Wait5" + .balign 4 .global $$254934 $$254934: - .incbin "baserom.dol", 0x494910, 0x8 + .asciz "Wait" + .balign 4 .global $$254935 $$254935: - .incbin "baserom.dol", 0x494918, 0x8 + .asciz "Wait2" + .balign 4 .global $$254943 $$254943: - .incbin "baserom.dol", 0x494920, 0x8 + .asciz "Vacuum" + .balign 4 .global $$254944 $$254944: - .incbin "baserom.dol", 0x494928, 0x8 + .asciz "TopL" + .balign 4 .global $$254945 $$254945: - .incbin "baserom.dol", 0x494930, 0x8 + .asciz "Drink" + .balign 4 .global $$254947 $$254947: - .incbin "baserom.dol", 0x494938, 0x8 + .asciz "Copy" + .balign 4 .global $$254951 $$254951: - .incbin "baserom.dol", 0x494940, 0x8 + .asciz "Tired" + .balign 4 .global $$254976 $$254976: - .incbin "baserom.dol", 0x494948, 0x8 + .asciz "walk" + .balign 4 .global $$254986 $$254986: - .incbin "baserom.dol", 0x494950, 0x4 + .4byte 0x52756E00 .global $$254995 $$254995: - .incbin "baserom.dol", 0x494954, 0xC + .asciz "Jump" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: - .incbin "baserom.dol", 0x4971C8, 0x8 + .asciz "Wait" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x4971D0, 0x8 + .asciz "Wait2" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x4971D8, 0x8 + .asciz "Wait3" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x4971E0, 0x8 + .asciz "Wait4" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x4971E8, 0x8 + .asciz "Wait5" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x4971F0, 0x8 + .asciz "Fall" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x4971F8, 0x8 + .asciz "Walk" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x497200, 0x8 + .asciz "Jump" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x497208, 0x8 + .asciz "JumpEnd" .global $$248737 $$248737: - .incbin "baserom.dol", 0x497210, 0x8 + .asciz "Landing" .global $$248739 $$248739: - .incbin "baserom.dol", 0x497218, 0x8 + .asciz "Squat" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x497220, 0x8 + .asciz "Sliding" .global $$248746 $$248746: - .incbin "baserom.dol", 0x497228, 0x8 + .asciz "Flight" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x497230, 0x8 + .asciz "AirBall" .global $$248753 $$248753: - .incbin "baserom.dol", 0x497238, 0x8 + .asciz "Vacuum" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x497240, 0x8 + .asciz "Damage" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x497248, 0x4 + .4byte 0x52756E00 .global $$248762 $$248762: - .incbin "baserom.dol", 0x49724C, 0x4 + .4byte 0x45617400 .global $$248763 $$248763: - .incbin "baserom.dol", 0x497250, 0x8 + .asciz "EatWait" .global $$248764 $$248764: - .incbin "baserom.dol", 0x497258, 0x8 + .asciz "EatWalk" .global $$248765 $$248765: - .incbin "baserom.dol", 0x497260, 0x8 + .asciz "EatRun" + .balign 4 .global $$248767 $$248767: - .incbin "baserom.dol", 0x497268, 0x8 + .asciz "EatJump" .global $$248768 $$248768: - .incbin "baserom.dol", 0x497270, 0x8 + .asciz "EatFall" .global $$248774 $$248774: - .incbin "baserom.dol", 0x497278, 0x8 + .asciz "Vomit" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x497280, 0x8 + .asciz "Drink" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x497288, 0x8 + .asciz "Copy" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x497290, 0x8 + .asciz "HaveRun" .global $$248797 $$248797: - .incbin "baserom.dol", 0x497298, 0x8 + .asciz "LGuard" + .balign 4 .global $$248799 $$248799: - .incbin "baserom.dol", 0x4972A0, 0x8 + .asciz "RGuard" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x4972A8, 0x8 + .asciz "Throw" + .balign 4 .global $$248804 $$248804: - .incbin "baserom.dol", 0x4972B0, 0x8 + .4byte 0x50757400 + .4byte 0 .global $$248813 $$248813: - .incbin "baserom.dol", 0x4972B8, 0x8 + .asciz "DanceA1" .global $$248814 $$248814: - .incbin "baserom.dol", 0x4972C0, 0x8 + .asciz "DanceA2" .global $$248815 $$248815: - .incbin "baserom.dol", 0x4972C8, 0x8 + .asciz "DanceA3" .global $$248816 $$248816: - .incbin "baserom.dol", 0x4972D0, 0x8 + .asciz "DanceAE" .global $$248817 $$248817: - .incbin "baserom.dol", 0x4972D8, 0x8 + .asciz "DanceC1" .global $$248818 $$248818: - .incbin "baserom.dol", 0x4972E0, 0x8 + .asciz "DanceC2" .global $$248819 $$248819: - .incbin "baserom.dol", 0x4972E8, 0x8 + .asciz "DanceC3" .global $$248820 $$248820: - .incbin "baserom.dol", 0x4972F0, 0x8 + .asciz "DanceCE" .global $$248821 $$248821: - .incbin "baserom.dol", 0x4972F8, 0x8 + .asciz "DanceT1" .global $$248822 $$248822: - .incbin "baserom.dol", 0x497300, 0x8 + .asciz "DanceT2" .global $$248823 $$248823: - .incbin "baserom.dol", 0x497308, 0x8 + .asciz "DanceT3" .global $$248824 $$248824: - .incbin "baserom.dol", 0x497310, 0x8 + .asciz "DanceTE" .global $$248825 $$248825: - .incbin "baserom.dol", 0x497318, 0x8 + .asciz "DanceDE" .global $$248826 $$248826: - .incbin "baserom.dol", 0x497320, 0x8 + .asciz "DanceEE" .global $$248827 $$248827: - .incbin "baserom.dol", 0x497328, 0x8 + .asciz "Loop" + .balign 4 .global $$248828 $$248828: - .incbin "baserom.dol", 0x497330, 0x8 + .asciz "AWExit" + .balign 4 .global $$248829 $$248829: - .incbin "baserom.dol", 0x497338, 0x8 + .asciz "Faint" + .balign 4 .global $$248831 $$248831: - .incbin "baserom.dol", 0x497340, 0x8 + .asciz "WakeUp" + .balign 4 .global $$248833 $$248833: - .incbin "baserom.dol", 0x497348, 0x8 + .asciz "Swim" + .balign 4 .global $$248834 $$248834: - .incbin "baserom.dol", 0x497350, 0x8 + .asciz "Stroke" + .balign 4 .global $$248840 $$248840: - .incbin "baserom.dol", 0x497358, 0x8 + .asciz "AirJump" .global $$248841 $$248841: - .incbin "baserom.dol", 0x497360, 0x8 + .asciz "ItemGet" .global $$248848 $$248848: - .incbin "baserom.dol", 0x497368, 0x8 + .asciz "Dangle" + .balign 4 .global $$248858 $$248858: - .incbin "baserom.dol", 0x497370, 0x8 + .asciz "Lose" + .balign 4 .global $$248868 $$248868: - .incbin "baserom.dol", 0x497378, 0x8 + .asciz "Thrust" + .balign 4 .global $$248874 $$248874: - .incbin "baserom.dol", 0x497380, 0x8 + .asciz "Raising" .global $$248884 $$248884: - .incbin "baserom.dol", 0x497388, 0x8 + .asciz "Meteo" + .balign 4 .global $$248898 $$248898: - .incbin "baserom.dol", 0x497390, 0x8 + .asciz "Whip" + .balign 4 .global $$248901 $$248901: - .incbin "baserom.dol", 0x497398, 0x8 + .asciz "WhipUp" + .balign 4 .global $$248902 $$248902: - .incbin "baserom.dol", 0x4973A0, 0x8 + .asciz "WhipAir" .global $$248907 $$248907: - .incbin "baserom.dol", 0x4973A8, 0x8 + .asciz "Drill" + .balign 4 .global $$248918 $$248918: - .incbin "baserom.dol", 0x4973B0, 0x8 + .asciz "Burning" .global $$248924 $$248924: - .incbin "baserom.dol", 0x4973B8, 0x8 + .asciz "Spark" + .balign 4 .global $$248927 $$248927: - .incbin "baserom.dol", 0x4973C0, 0x8 + .asciz "UpSpark" .global $$248937 $$248937: - .incbin "baserom.dol", 0x4973C8, 0x8 + .asciz "Swing" + .balign 4 .global $$248941 $$248941: - .incbin "baserom.dol", 0x4973D0, 0x8 + .asciz "Dive" + .balign 4 .global $$248942 $$248942: - .incbin "baserom.dol", 0x4973D8, 0x8 + .asciz "DiveEnd" .global $$248943 $$248943: - .incbin "baserom.dol", 0x4973E0, 0x8 + .asciz "Shield" + .balign 4 .global $$249031 $$249031: - .incbin "baserom.dol", 0x4973E8, 0x8 + .asciz "LookUp" + .balign 4 .global $$249039 $$249039: - .incbin "baserom.dol", 0x4973F0, 0x8 + .asciz "WonderR" .global $$249040 $$249040: - .incbin "baserom.dol", 0x4973F8, 0x8 + .asciz "WonderL" .global $$249042 $$249042: - .incbin "baserom.dol", 0x497400, 0x8 + .asciz "Tumble" + .balign 4 .global $$249048 $$249048: - .incbin "baserom.dol", 0x497408, 0x8 + .asciz "View" + .balign 4 .global $$249049 $$249049: - .incbin "baserom.dol", 0x497410, 0x8 + .asciz "ViewEnd" .global $$249065 $$249065: - .incbin "baserom.dol", 0x497418, 0x8 + .asciz "TopL" + .balign 4 .global $$249068 $$249068: - .incbin "baserom.dol", 0x497420, 0x8 + .asciz "HatL" + .balign 4 .global $$249069 $$249069: - .incbin "baserom.dol", 0x497428, 0x8 + .asciz "RHaveL" + .balign 4 .global $$249070 $$249070: - .incbin "baserom.dol", 0x497430, 0x8 + .asciz "LHaveL" + .balign 4 .global $$249071 $$249071: - .incbin "baserom.dol", 0x497438, 0x8 + .asciz "MouthL" + .balign 4 .global $$249076 $$249076: - .incbin "baserom.dol", 0x497440, 0x8 + .asciz "CA1HipJ" .global $$249077 $$249077: - .incbin "baserom.dol", 0x497448, 0x8 + .asciz "Rot1L" + .balign 4 .global $$249078 $$249078: - .incbin "baserom.dol", 0x497450, 0x8 + .asciz "Rot2L" + .balign 4 .global $$249080 $$249080: - .incbin "baserom.dol", 0x497458, 0x8 + .asciz "ThrowL" + .balign 4 .global $$249176 $$249176: - .incbin "baserom.dol", 0x497460, 0x8 + .asciz "Kirby" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global PREV_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 PREV_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2: - .incbin "baserom.dol", 0x49AB88, 0x4 + .4byte 0xC2960000 .global NEXT_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 NEXT_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2: - .incbin "baserom.dol", 0x49AB8C, 0x4 + .4byte 0x42AA0000 .global VACUUM_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 VACUUM_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2: - .incbin "baserom.dol", 0x49AB90, 0x4 + .4byte 0xC2F00000 .global VACUUM_SUKA_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 VACUUM_SUKA_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2: - .incbin "baserom.dol", 0x49AB94, 0x4 + .4byte 0xC3430000 .global $$254772 $$254772: - .incbin "baserom.dol", 0x49AB98, 0x4 + .4byte 0 .global $$254773 $$254773: - .incbin "baserom.dol", 0x49AB9C, 0x4 + .4byte 0x3F666666 .global $$254779 $$254779: - .incbin "baserom.dol", 0x49ABA0, 0x4 + .4byte 0x3F333333 .global $$254780 $$254780: - .incbin "baserom.dol", 0x49ABA4, 0x4 + .4byte 0x3F800000 .global $$254929 $$254929: - .incbin "baserom.dol", 0x49ABA8, 0x4 + .4byte 0x3EB33333 .global $$254930 $$254930: - .incbin "baserom.dol", 0x49ABAC, 0x4 + .4byte 0x3E99999A .global $$254936 $$254936: - .incbin "baserom.dol", 0x49ABB0, 0x4 + .4byte 0x43820000 .global $$254937 $$254937: - .incbin "baserom.dol", 0x49ABB4, 0x4 + .4byte 0x43C30000 .global $$254938 $$254938: - .incbin "baserom.dol", 0x49ABB8, 0x4 + .4byte 0x40E00000 .global $$254939 $$254939: - .incbin "baserom.dol", 0x49ABBC, 0x4 + .4byte 0x41700000 .global $$254940 $$254940: - .incbin "baserom.dol", 0x49ABC0, 0x4 + .4byte 0x41600000 .global $$254946 $$254946: - .incbin "baserom.dol", 0x49ABC4, 0x4 + .4byte 0x41800000 .global $$254948 $$254948: - .incbin "baserom.dol", 0x49ABC8, 0x4 + .4byte 0x3FAAAAAB .global $$254949 $$254949: - .incbin "baserom.dol", 0x49ABCC, 0x4 + .4byte 0x41100000 .global $$254950 $$254950: - .incbin "baserom.dol", 0x49ABD0, 0x4 + .4byte 0x41200000 .global $$254977 $$254977: - .incbin "baserom.dol", 0x49ABD4, 0x4 + .4byte 0x3F400000 .global $$255044 $$255044: - .incbin "baserom.dol", 0x49ABD8, 0x4 + .4byte 0x3FA00000 .global $$255053 $$255053: - .incbin "baserom.dol", 0x49ABDC, 0x4 + .4byte 0xBF800000 .global $$255080 $$255080: - .incbin "baserom.dol", 0x49ABE0, 0x4 + .4byte 0x3ECCCCCD .global $$255081 $$255081: - .incbin "baserom.dol", 0x49ABE4, 0x4 + .4byte 0x3FE00000 .global $$255082 $$255082: - .incbin "baserom.dol", 0x49ABE8, 0x4 + .4byte 0x3FC00000 .global $$255083 $$255083: - .incbin "baserom.dol", 0x49ABEC, 0x4 + .4byte 0x40100000 .global $$255084 $$255084: - .incbin "baserom.dol", 0x49ABF0, 0x4 + .4byte 0x3F000000 .global $$255085 $$255085: - .incbin "baserom.dol", 0x49ABF4, 0x4 + .4byte 0xBECCCCCD .global $$255086 $$255086: - .incbin "baserom.dol", 0x49ABF8, 0x4 + .4byte 0x3DCCCCCD .global $$255087 $$255087: - .incbin "baserom.dol", 0x49ABFC, 0x4 + .4byte 0xBF4CCCCD .section .bss, "wa" # 0x80496700 - 0x805643FC .global POS_OFFSET__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 diff --git a/asm/src/Kiss.s b/asm/src/Kiss.s index 1dca652d..8bc41a73 100644 --- a/asm/src/Kiss.s +++ b/asm/src/Kiss.s @@ -1170,23 +1170,28 @@ lbl_80344378: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1 __vt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1: - .incbin "baserom.dol", 0x480EA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80344328 + .4byte 0x80344268 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256609 $$256609: - .incbin "baserom.dol", 0x496DD8, 0x1 + .byte 0x00 .global $$256610 $$256610: - .incbin "baserom.dol", 0x496DD9, 0x7 + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258801 $$258801: - .incbin "baserom.dol", 0x49D788, 0x4 + .4byte 0x3FC00000 .global $$258802 $$258802: - .incbin "baserom.dol", 0x49D78C, 0x4 + .4byte 0 .global $$258803 $$258803: - .incbin "baserom.dol", 0x49D790, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/Knockback.s b/asm/src/Knockback.s index aab66982..d159e4b3 100644 --- a/asm/src/Knockback.s +++ b/asm/src/Knockback.s @@ -102,22 +102,23 @@ reset__Q43scn4step5chara9KnockbackFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250134 $$250134: - .incbin "baserom.dol", 0x49B7D0, 0x4 + .4byte 0 .global $$250145 $$250145: - .incbin "baserom.dol", 0x49B7D4, 0x4 + .4byte 0x40C00000 .global $$250146 $$250146: - .incbin "baserom.dol", 0x49B7D8, 0x4 + .4byte 0x4222F983 .global $$250147 $$250147: - .incbin "baserom.dol", 0x49B7DC, 0x4 + .4byte 0x3C8EFA35 .global $$250148 $$250148: - .incbin "baserom.dol", 0x49B7E0, 0x4 + .4byte 0x42B40000 .global $$250149 $$250149: - .incbin "baserom.dol", 0x49B7E4, 0x4 + .4byte 0x3F800000 .global $$250152 $$250152: - .incbin "baserom.dol", 0x49B7E8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/LadderInfo.s b/asm/src/LadderInfo.s index fe78b13c..11b41990 100644 --- a/asm/src/LadderInfo.s +++ b/asm/src/LadderInfo.s @@ -36,4 +36,5 @@ leftBottomPos__Q35mcoll6detail10LadderInfoCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249664 $$249664: - .incbin "baserom.dol", 0x49A5A0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/LandAttribute.s b/asm/src/LandAttribute.s index 6de11739..f0cff254 100644 --- a/asm/src/LandAttribute.s +++ b/asm/src/LandAttribute.s @@ -515,23 +515,77 @@ lbl_80344A7C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global EFFECT_TABLE_L__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2 EFFECT_TABLE_L__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: - .incbin "baserom.dol", 0x4160E0, 0x30 + .4byte 0x00000015 + .4byte 0x00000009 + .4byte 0x00000021 + .4byte 0x0000001E + .4byte 0x00000018 + .4byte 0x0000001B + .4byte 0x00000003 + .4byte 0x0000000F + .4byte 0x00000015 + .4byte 0x00000012 + .4byte 0x0000000C + .4byte 0x00000006 .global EFFECT_TABLE_S__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2 EFFECT_TABLE_S__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: - .incbin "baserom.dol", 0x416110, 0x30 + .4byte 0x00000014 + .4byte 0x00000008 + .4byte 0x00000020 + .4byte 0x0000001D + .4byte 0x00000017 + .4byte 0x0000001A + .4byte 0x00000002 + .4byte 0x0000000E + .4byte 0x00000014 + .4byte 0x00000011 + .4byte 0x0000000B + .4byte 0x00000005 .global EFFECT_TABLE_LANDING__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2 EFFECT_TABLE_LANDING__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: - .incbin "baserom.dol", 0x416140, 0x30 + .4byte 0x00000013 + .4byte 0x00000007 + .4byte 0x0000001F + .4byte 0x0000001C + .4byte 0x00000016 + .4byte 0x00000019 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000013 + .4byte 0x00000010 + .4byte 0x0000000A + .4byte 0x00000004 .global SE_TABLE__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2 SE_TABLE__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: - .incbin "baserom.dol", 0x416170, 0x30 + .4byte 0x00000064 + .4byte 0x0000006F + .4byte 0x0000006E + .4byte 0x0000006E + .4byte 0x0000006A + .4byte 0x0000006B + .4byte 0x00000070 + .4byte 0x0000006C + .4byte 0x00000064 + .4byte 0x0000006D + .4byte 0x00000067 + .4byte 0x00000064 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253793 $$253793: - .incbin "baserom.dol", 0x480EB0, 0x28 + .4byte 0x80344A7C + .4byte 0x80344A3C + .4byte 0x80344A44 + .4byte 0x80344A4C + .4byte 0x80344A54 + .4byte 0x80344A5C + .4byte 0x80344A64 + .4byte 0x80344A6C + .4byte 0x80344A74 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253684 $$253684: - .incbin "baserom.dol", 0x49D798, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/LandConstraint.s b/asm/src/LandConstraint.s index 37ec5059..3eb4eb23 100644 --- a/asm/src/LandConstraint.s +++ b/asm/src/LandConstraint.s @@ -382,4 +382,5 @@ lbl_8026F600: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253036 $$253036: - .incbin "baserom.dol", 0x49B7F0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/LandLayer.s b/asm/src/LandLayer.s index e2202bd4..41d90200 100644 --- a/asm/src/LandLayer.s +++ b/asm/src/LandLayer.s @@ -1789,119 +1789,1003 @@ __sinit_$$3LandLayer_cpp: /* 801B9ACC 001B590C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40242C, 0x4 + .4byte 0x801B931C ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x454198, 0xDD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_NORMAL_WALL_L__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_WALL_L__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5A8, 0x4 + .4byte 0xBF800000 .global lbl_8055FA6C lbl_8055FA6C: - .incbin "baserom.dol", 0x49A5AC, 0x4 + .4byte 0 .global T_NORMAL_WALL_R__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_WALL_R__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5B0, 0x4 + .4byte 0x3F800000 .global lbl_8055FA74 lbl_8055FA74: - .incbin "baserom.dol", 0x49A5B4, 0x4 + .4byte 0 .global T_NORMAL_WALL_B__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_WALL_B__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5B8, 0x4 + .4byte 0 .global lbl_8055FA7C lbl_8055FA7C: - .incbin "baserom.dol", 0x49A5BC, 0x4 + .4byte 0xBF800000 .global T_NORMAL_WALL_T__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_WALL_T__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5C0, 0x4 + .4byte 0 .global lbl_8055FA84 lbl_8055FA84: - .incbin "baserom.dol", 0x49A5C4, 0x4 + .4byte 0x3F800000 .global T_NORMAL_FSLOPE_LS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_LS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5C8, 0x4 + .4byte 0xBF3504F3 .global lbl_8055FA8C lbl_8055FA8C: - .incbin "baserom.dol", 0x49A5CC, 0x4 + .4byte 0x3F3504F3 .global T_NORMAL_FSLOPE_LS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_LS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5D0, 0x4 + .4byte 0xBEE4F92E .global lbl_8055FA94 lbl_8055FA94: - .incbin "baserom.dol", 0x49A5D4, 0x4 + .4byte 0x3F64F92E .global T_NORMAL_FSLOPE_LS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_LS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5D8, 0x4 + .4byte 0xBEA1E89B .global lbl_8055FA9C lbl_8055FA9C: - .incbin "baserom.dol", 0x49A5DC, 0x4 + .4byte 0x3F72DCEC .global T_NORMAL_FSLOPE_RS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_RS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5E0, 0x4 + .4byte 0x3F3504F3 .global lbl_8055FAA4 lbl_8055FAA4: - .incbin "baserom.dol", 0x49A5E4, 0x4 + .4byte 0x3F3504F3 .global T_NORMAL_FSLOPE_RS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_RS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5E8, 0x4 + .4byte 0x3EE4F92E .global lbl_8055FAAC lbl_8055FAAC: - .incbin "baserom.dol", 0x49A5EC, 0x4 + .4byte 0x3F64F92E .global T_NORMAL_FSLOPE_RS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_FSLOPE_RS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5F0, 0x4 + .4byte 0x3EA1E89B .global lbl_8055FAB4 lbl_8055FAB4: - .incbin "baserom.dol", 0x49A5F4, 0x4 + .4byte 0x3F72DCEC .global T_NORMAL_RSLOPE_LS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_LS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A5F8, 0x4 + .4byte 0xBF3504F3 .global lbl_8055FABC lbl_8055FABC: - .incbin "baserom.dol", 0x49A5FC, 0x4 + .4byte 0xBF3504F3 .global T_NORMAL_RSLOPE_LS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_LS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A600, 0x4 + .4byte 0xBEE4F92E .global lbl_8055FAC4 lbl_8055FAC4: - .incbin "baserom.dol", 0x49A604, 0x4 + .4byte 0xBF64F92E .global T_NORMAL_RSLOPE_LS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_LS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A608, 0x4 + .4byte 0xBEA1E89B .global lbl_8055FACC lbl_8055FACC: - .incbin "baserom.dol", 0x49A60C, 0x4 + .4byte 0xBF72DCEC .global T_NORMAL_RSLOPE_RS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_RS1__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A610, 0x4 + .4byte 0x3F3504F3 .global lbl_8055FAD4 lbl_8055FAD4: - .incbin "baserom.dol", 0x49A614, 0x4 + .4byte 0xBF3504F3 .global T_NORMAL_RSLOPE_RS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_RS2__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A618, 0x4 + .4byte 0x3EE4F92E .global lbl_8055FADC lbl_8055FADC: - .incbin "baserom.dol", 0x49A61C, 0x4 + .4byte 0xBF64F92E .global T_NORMAL_RSLOPE_RS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_RSLOPE_RS3__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: - .incbin "baserom.dol", 0x49A620, 0x4 + .4byte 0x3EA1E89B .global lbl_8055FAE4 lbl_8055FAE4: - .incbin "baserom.dol", 0x49A624, 0x4 + .4byte 0xBF72DCEC .global $$254420 $$254420: - .incbin "baserom.dol", 0x49A628, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$254545 $$254545: - .incbin "baserom.dol", 0x49A630, 0x4 + .4byte 0 .global $$254699 $$254699: - .incbin "baserom.dol", 0x49A634, 0x4 + .4byte 0xBF800000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global T_NORMAL_NONE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 diff --git a/asm/src/LandManager.s b/asm/src/LandManager.s index 5c4def99..2e2181c6 100644 --- a/asm/src/LandManager.s +++ b/asm/src/LandManager.s @@ -1306,7 +1306,9 @@ mgAccessor__Q43scn4step3map11LandManagerCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253368 $$253368: - .incbin "baserom.dol", 0x49A520, 0x8 + .4byte 0 + .4byte 0 .global $$253373 $$253373: - .incbin "baserom.dol", 0x49A528, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/Landing.s b/asm/src/Landing.s index 0c69881a..d1d4d062 100644 --- a/asm/src/Landing.s +++ b/asm/src/Landing.s @@ -133,7 +133,7 @@ lbl_80344C24: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252449 $$252449: - .incbin "baserom.dol", 0x49D7A0, 0x4 + .4byte 0 .global $$252450 $$252450: - .incbin "baserom.dol", 0x49D7A4, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/Layout.s b/asm/src/Layout.s index ea4d87c3..ef92ab69 100644 --- a/asm/src/Layout.s +++ b/asm/src/Layout.s @@ -2073,62 +2073,79 @@ lbl_801ADCD4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255792 $$255792: - .incbin "baserom.dol", 0x453970, 0x10 + .asciz "lyt/%s.arc.cmp" + .balign 4 .global $$256286 $$256286: - .incbin "baserom.dol", 0x453980, 0xC + .asciz "%s.brlyt" + .balign 4 .global $$256339 $$256339: - .incbin "baserom.dol", 0x45398C, 0xC + .asciz "root/anim" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x453998, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x4539BC, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x4539C8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut28LinkList$$0Q34nw4r3lyt4Pane$$44$$18IteratorCFv: - .incbin "baserom.dol", 0x4539EC, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x4539F8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x453A1C, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x453A28, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x453A4C, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x453A58, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x453A7C, 0xC + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255793 $$255793: - .incbin "baserom.dol", 0x493538, 0x4 + .4byte 0 .global $$255794 $$255794: - .incbin "baserom.dol", 0x49353C, 0x8 + .asciz "root" + .balign 4 .global $$256337 $$256337: - .incbin "baserom.dol", 0x493544, 0x4 + .4byte 0x25735F00 .global $$256338 $$256338: - .incbin "baserom.dol", 0x493548, 0x8 + .asciz "anim" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 $$256461: - .incbin "baserom.dol", 0x49A4C0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256509 $$256509: - .incbin "baserom.dol", 0x49A4C8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/LibInitializer.s b/asm/src/LibInitializer.s index 1f812e3d..1e7daea3 100644 --- a/asm/src/LibInitializer.s +++ b/asm/src/LibInitializer.s @@ -158,19 +158,20 @@ lbl_801A3A40: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249040 $$249040: - .incbin "baserom.dol", 0x49A458, 0x4 + .4byte 0x3DCCCCCD .global $$249041 $$249041: - .incbin "baserom.dol", 0x49A45C, 0x4 + .4byte 0x3F000000 .global $$249042 $$249042: - .incbin "baserom.dol", 0x49A460, 0x4 + .4byte 0x3E4CCCCD .global $$249043 $$249043: - .incbin "baserom.dol", 0x49A464, 0x4 + .4byte 0x3D8F5C29 .global $$249044 $$249044: - .incbin "baserom.dol", 0x49A468, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common40PrivateSingleton$$0Q23hid14LibInitializer$$1 diff --git a/asm/src/LoadIcon.s b/asm/src/LoadIcon.s index 03e638f3..775f8265 100644 --- a/asm/src/LoadIcon.s +++ b/asm/src/LoadIcon.s @@ -203,32 +203,44 @@ disappear__Q33scn5anime8LoadIconFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252060 $$252060: - .incbin "baserom.dol", 0x459E40, 0xC + .asciz "movie/Main" + .balign 4 .global $$252061 $$252061: - .incbin "baserom.dol", 0x459E4C, 0xC + .asciz "LoadBase" + .balign 4 .global $$252062 $$252062: - .incbin "baserom.dol", 0x459E58, 0x40 + .asciz "LoadIcon" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252063 $$252063: - .incbin "baserom.dol", 0x493DC0, 0x8 + .asciz "IconN" + .balign 4 .global $$252066 $$252066: - .incbin "baserom.dol", 0x493DC8, 0x8 + .asciz "Wait" + .balign 4 .global $$252106 $$252106: - .incbin "baserom.dol", 0x493DD0, 0x8 + .asciz "Start" + .balign 4 .global $$252107 $$252107: - .incbin "baserom.dol", 0x493DD8, 0x8 + .4byte 0x456E6400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252064 $$252064: - .incbin "baserom.dol", 0x49A828, 0x4 + .4byte 0xC2C80000 .global $$252065 $$252065: - .incbin "baserom.dol", 0x49A82C, 0x4 + .4byte 0 diff --git a/asm/src/Loader.s b/asm/src/Loader.s index cec59b8d..051db4dd 100644 --- a/asm/src/Loader.s +++ b/asm/src/Loader.s @@ -31,22 +31,33 @@ load__Q33scn2vc6LoaderFQ33scn2vc11ContentKind: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250070 $$250070: - .incbin "baserom.dol", 0x491648, 0x18 + .asciz "vc/GB_kby1/GB_kby1.dol" + .balign 4 .global $$250071 $$250071: - .incbin "baserom.dol", 0x491660, 0x18 + .asciz "vc/FC_yume/FC_yume.dol" + .balign 4 .global $$250072 $$250072: - .incbin "baserom.dol", 0x491678, 0x18 + .asciz "vc/GB_kby2/GB_kby2.dol" + .balign 4 .global $$250073 $$250073: - .incbin "baserom.dol", 0x491690, 0x18 + .asciz "vc/SF_kby3/SF_kby3.dol" + .balign 4 .global $$250074 $$250074: - .incbin "baserom.dol", 0x4916A8, 0x18 + .asciz "vc/SF_sdx/SF_sdx.dol" + .balign 4 .global $$250075 $$250075: - .incbin "baserom.dol", 0x4916C0, 0x18 + .asciz "vc/64_k64/64_k64.dol" + .balign 4 .global tFILENAME_TABLE__Q33scn2vc20$$2unnamed$$2Loader_cpp$$2 tFILENAME_TABLE__Q33scn2vc20$$2unnamed$$2Loader_cpp$$2: - .incbin "baserom.dol", 0x4916D8, 0x18 + .4byte 0x80495548 + .4byte 0x80495560 + .4byte 0x80495578 + .4byte 0x80495590 + .4byte 0x804955A8 + .4byte 0x804955C0 diff --git a/asm/src/Locale.s b/asm/src/Locale.s index a4bd6b60..b65ab519 100644 --- a/asm/src/Locale.s +++ b/asm/src/Locale.s @@ -290,49 +290,71 @@ lbl_8019DDFC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2 T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2: - .incbin "baserom.dol", 0x4105E0, 0x20 + .4byte 0x80556BF8 + .4byte 0x80556C00 + .4byte 0x80556C08 + .4byte 0x80556C10 + .4byte 0x80556C18 + .4byte 0x80556C20 + .4byte 0x80556C28 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249074 $$249074: - .incbin "baserom.dol", 0x452AD0, 0x10 + .4byte 0x00530050 + .4byte 0x00250075 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250071 $$250071: - .incbin "baserom.dol", 0x492FD8, 0x8 + .asciz "US_JPN" + .balign 4 .global $$250072 $$250072: - .incbin "baserom.dol", 0x492FE0, 0x8 + .asciz "US_ENG" + .balign 4 .global $$250073 $$250073: - .incbin "baserom.dol", 0x492FE8, 0x8 + .asciz "US_GER" + .balign 4 .global $$250074 $$250074: - .incbin "baserom.dol", 0x492FF0, 0x8 + .asciz "US_FRA" + .balign 4 .global $$250075 $$250075: - .incbin "baserom.dol", 0x492FF8, 0x8 + .asciz "US_SPA" + .balign 4 .global $$250076 $$250076: - .incbin "baserom.dol", 0x493000, 0x8 + .asciz "US_ITA" + .balign 4 .global $$250077 $$250077: - .incbin "baserom.dol", 0x493008, 0x8 + .asciz "US_NED" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249050 $$249050: - .incbin "baserom.dol", 0x493240, 0x8 + .4byte 0x00250064 + .4byte 0 .global $$249072 $$249072: - .incbin "baserom.dol", 0x493248, 0x8 + .4byte 0x00250075 + .4byte 0x00500000 .global $$249073 $$249073: - .incbin "baserom.dol", 0x493250, 0x8 + .4byte 0x00500025 + .4byte 0x00750000 .global $$249075 $$249075: - .incbin "baserom.dol", 0x493258, 0x8 + .4byte 0x004A0025 + .4byte 0x00750000 .global $$249076 $$249076: - .incbin "baserom.dol", 0x493260, 0x8 + .4byte 0x00470025 + .4byte 0x00750000 diff --git a/asm/src/Lose.s b/asm/src/Lose.s index 018312f6..4a630e3e 100644 --- a/asm/src/Lose.s +++ b/asm/src/Lose.s @@ -143,18 +143,23 @@ lbl_803B38A4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253395 $$253395: - .incbin "baserom.dol", 0x48C618, 0x18 + .asciz "step/challenge/Main" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253396 $$253396: - .incbin "baserom.dol", 0x497BB8, 0x8 + .asciz "Lose" + .balign 4 .global $$253433 $$253433: - .incbin "baserom.dol", 0x497BC0, 0x8 + .asciz "Start" + .balign 4 .global $$253436 $$253436: - .incbin "baserom.dol", 0x497BC8, 0x4 + .4byte 0x456E6400 .global $$253446 $$253446: - .incbin "baserom.dol", 0x497BCC, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 diff --git a/asm/src/LowBattery.s b/asm/src/LowBattery.s index 10025458..0be3b8b3 100644 --- a/asm/src/LowBattery.s +++ b/asm/src/LowBattery.s @@ -254,18 +254,21 @@ start__Q34info6common10LowBatteryFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252080 $$252080: - .incbin "baserom.dol", 0x4536D0, 0xC + .asciz "common/Main" .global $$252081 $$252081: - .incbin "baserom.dol", 0x4536DC, 0xC + .asciz "BatteryInfo" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252134 $$252134: - .incbin "baserom.dol", 0x493478, 0x4 + .4byte 0x456E6400 .global $$252135 $$252135: - .incbin "baserom.dol", 0x49347C, 0x8 + .asciz "Wait" + .balign 4 .global $$252157 $$252157: - .incbin "baserom.dol", 0x493484, 0xC + .asciz "Start" + .balign 4 + .4byte 0 diff --git a/asm/src/LvMap.s b/asm/src/LvMap.s index 5e5ead2a..2dba4214 100644 --- a/asm/src/LvMap.s +++ b/asm/src/LvMap.s @@ -457,15 +457,19 @@ frameControl__Q53scn4step4info5lvmap5LvMapFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254826 $$254826: - .incbin "baserom.dol", 0x48D900, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$254828 $$254828: - .incbin "baserom.dol", 0x48D910, 0x10 + .asciz "LvMapFrameN" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254825 $$254825: - .incbin "baserom.dol", 0x498000, 0x8 + .asciz "LvMap" + .balign 4 .global $$254827 $$254827: - .incbin "baserom.dol", 0x498008, 0x8 + .asciz "Base" + .balign 4 diff --git a/asm/src/Mahoroa.s b/asm/src/Mahoroa.s index d14dfccc..890156d9 100644 --- a/asm/src/Mahoroa.s +++ b/asm/src/Mahoroa.s @@ -1194,174 +1194,350 @@ lbl_80344FD4: /* 80344FE4 00340E24 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025B0, 0x4 + .4byte 0x80313D40 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .incbin "baserom.dol", 0x415AE8, 0xB8 + .4byte 0x8055A7B4 + .4byte 0 + .4byte 0x8055A7BC + .4byte 0 + .4byte 0x8055A7C4 + .4byte 0 + .4byte 0x804815B8 + .4byte 0 + .4byte 0x804815C8 + .4byte 0 + .4byte 0x804815D4 + .4byte 0 + .4byte 0x804815E0 + .4byte 0 + .4byte 0x804815F0 + .4byte 0 + .4byte 0x804815FC + .4byte 0 + .4byte 0x8048160C + .4byte 0 + .4byte 0x8048161C + .4byte 0 + .4byte 0x80481630 + .4byte 0 + .4byte 0x8055A7CC + .4byte 0 + .4byte 0x8048163C + .4byte 0 + .4byte 0x8055A7D4 + .4byte 0 + .4byte 0x8055A7DC + .4byte 0 + .4byte 0x8055A7E4 + .4byte 0 + .4byte 0x8055A7EC + .4byte 0 + .4byte 0x8055A7F4 + .4byte 0 + .4byte 0x8055A7FC + .4byte 0 + .4byte 0x8055A804 + .4byte 0 + .4byte 0x8055A80C + .4byte 0 + .4byte 0x8055A814 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253502 $$253502: - .incbin "baserom.dol", 0x45AD78, 0x1C + .asciz "step/chara/enemy/Mahoroa" + .balign 4 .global $$253504 $$253504: - .incbin "baserom.dol", 0x45AD94, 0xC + .asciz "MahoroaL" + .balign 4 .global $$253574 $$253574: - .incbin "baserom.dol", 0x45ADA0, 0xC + .asciz "TitleAgain" + .balign 4 .global $$253576 $$253576: - .incbin "baserom.dol", 0x45ADAC, 0x10 + .asciz "TitleWaitStart" + .balign 4 .global $$253578 $$253578: - .incbin "baserom.dol", 0x45ADBC, 0xC + .asciz "TitleWait1" + .balign 4 .global $$253579 $$253579: - .incbin "baserom.dol", 0x45ADC8, 0xC + .asciz "TitleWait2" + .balign 4 .global $$253580 $$253580: - .incbin "baserom.dol", 0x45ADD4, 0x44 + .asciz "TitleWaitEnd" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255208 $$255208: - .incbin "baserom.dol", 0x47D6B8, 0x10 + .asciz "TalkGladStart" + .balign 4 .global $$255209 $$255209: - .incbin "baserom.dol", 0x47D6C8, 0xC + .asciz "TalkGlad" + .balign 4 .global $$255210 $$255210: - .incbin "baserom.dol", 0x47D6D4, 0xC + .asciz "TalkGladEnd" .global $$255211 $$255211: - .incbin "baserom.dol", 0x47D6E0, 0x10 + .asciz "TalkRegretStart" .global $$255212 $$255212: - .incbin "baserom.dol", 0x47D6F0, 0xC + .asciz "TalkRegret" + .balign 4 .global $$255213 $$255213: - .incbin "baserom.dol", 0x47D6FC, 0x10 + .asciz "TalkRegretEnd" + .balign 4 .global $$255214 $$255214: - .incbin "baserom.dol", 0x47D70C, 0x10 + .asciz "TalkPointing" + .balign 4 .global $$255215 $$255215: - .incbin "baserom.dol", 0x47D71C, 0x14 + .asciz "TalkChuckleStart" + .balign 4 .global $$255216 $$255216: - .incbin "baserom.dol", 0x47D730, 0xC + .asciz "TalkChuckle" .global $$255218 $$255218: - .incbin "baserom.dol", 0x47D73C, 0xC + .asciz "TalkGoLoop" + .balign 4 .global $$255229 $$255229: - .incbin "baserom.dol", 0x47D748, 0x20 + .asciz "Mahoroa.AnimScript.Wait.Exec()" + .balign 4 .global $$255230 $$255230: - .incbin "baserom.dol", 0x47D768, 0x24 + .asciz "Mahoroa.AnimScript.TalkGlad.Exec()" + .balign 4 .global $$255231 $$255231: - .incbin "baserom.dol", 0x47D78C, 0x28 + .asciz "Mahoroa.AnimScript.TalkRegret.Exec()" + .balign 4 .global $$255232 $$255232: - .incbin "baserom.dol", 0x47D7B4, 0x28 + .asciz "Mahoroa.AnimScript.TalkChuckle.Exec()" + .balign 4 .global $$255233 $$255233: - .incbin "baserom.dol", 0x47D7DC, 0x24 + .asciz "Mahoroa.AnimScript.TalkGo.Exec()" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .incbin "baserom.dol", 0x47D800, 0x154 + .4byte 0x80481648 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0x80481668 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048168C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0x804816B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804816DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000011 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000013 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000015 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000016 + .4byte 0x00000010 + .4byte 0 + .4byte 0 .global $$258000 $$258000: - .incbin "baserom.dol", 0x47D954, 0x1C + .asciz "step/chara/enemy/Mahoroa" + .balign 4 .global $$258002 $$258002: - .incbin "baserom.dol", 0x47D970, 0x48 + .asciz "Scn.Step.Gimmick" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253503 $$253503: - .incbin "baserom.dol", 0x494150, 0x8 + .asciz "Model" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255203 $$255203: - .incbin "baserom.dol", 0x496B88, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_NODE_NAMES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .incbin "baserom.dol", 0x496B90, 0x4 + .4byte 0x8055A7A8 .global $$255205 $$255205: - .incbin "baserom.dol", 0x496B94, 0x8 + .asciz "Wait" + .balign 4 .global $$255206 $$255206: - .incbin "baserom.dol", 0x496B9C, 0x8 + .asciz "Talk1" + .balign 4 .global $$255207 $$255207: - .incbin "baserom.dol", 0x496BA4, 0x8 + .asciz "Glad" + .balign 4 .global $$255217 $$255217: - .incbin "baserom.dol", 0x496BAC, 0x8 + .asciz "TalkGo" + .balign 4 .global $$255219 $$255219: - .incbin "baserom.dol", 0x496BB4, 0x8 + .asciz "Wait2" + .balign 4 .global $$255220 $$255220: - .incbin "baserom.dol", 0x496BBC, 0x8 + .asciz "Wait3" + .balign 4 .global $$255221 $$255221: - .incbin "baserom.dol", 0x496BC4, 0x8 + .asciz "Wait5" + .balign 4 .global $$255222 $$255222: - .incbin "baserom.dol", 0x496BCC, 0x8 + .asciz "Wait6" + .balign 4 .global $$255223 $$255223: - .incbin "baserom.dol", 0x496BD4, 0x8 + .asciz "Wait7" + .balign 4 .global $$255224 $$255224: - .incbin "baserom.dol", 0x496BDC, 0x8 + .asciz "Wait8" + .balign 4 .global $$255225 $$255225: - .incbin "baserom.dol", 0x496BE4, 0x8 + .asciz "Wait9" + .balign 4 .global $$255226 $$255226: - .incbin "baserom.dol", 0x496BEC, 0x8 + .asciz "Wait10" + .balign 4 .global $$255227 $$255227: - .incbin "baserom.dol", 0x496BF4, 0xC + .asciz "Wait11" + .balign 4 + .4byte 0 .global $$258001 $$258001: - .incbin "baserom.dol", 0x496C00, 0x8 + .asciz "Mahoroa" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253575 $$253575: - .incbin "baserom.dol", 0x49A948, 0x4 + .4byte 0 .global $$253577 $$253577: - .incbin "baserom.dol", 0x49A94C, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257700 $$257700: - .incbin "baserom.dol", 0x49D440, 0x4 + .4byte 0 .global $$257847 $$257847: - .incbin "baserom.dol", 0x49D444, 0x4 + .4byte 0x40000000 .global $$257942 $$257942: - .incbin "baserom.dol", 0x49D448, 0x4 + .4byte 0xBF000000 .global $$257943 $$257943: - .incbin "baserom.dol", 0x49D44C, 0x4 + .4byte 0x3F000000 .global $$257944 $$257944: - .incbin "baserom.dol", 0x49D450, 0x4 + .4byte 0x3F800000 .global $$258016 $$258016: - .incbin "baserom.dol", 0x49D454, 0x4 + .4byte 0x3DCCCCCD .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2createModelDesc__Q53scn4step7gimmick7mahoroa7MahoroaFv$$2desc diff --git a/asm/src/Main.s b/asm/src/Main.s index e68eda4d..ee223dc3 100644 --- a/asm/src/Main.s +++ b/asm/src/Main.s @@ -10922,485 +10922,741 @@ lbl_803F3F7C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2 COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2: - .incbin "baserom.dol", 0x411BD8, 0x18 + .4byte 0x804601E8 + .4byte 0x00000027 + .4byte 0x804601F8 + .4byte 0x00000027 + .4byte 0x80460208 + .4byte 0x00000027 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254402 $$254402: - .incbin "baserom.dol", 0x459E98, 0x10 + .asciz "history/Detail" + .balign 4 .global $$254403 $$254403: - .incbin "baserom.dol", 0x459EA8, 0xC + .asciz "AnimeBase" + .balign 4 .global $$254404 $$254404: - .incbin "baserom.dol", 0x459EB4, 0xC + .asciz "MusicBase" + .balign 4 .global $$254405 $$254405: - .incbin "baserom.dol", 0x459EC0, 0x10 + .asciz "ControlPanelN" + .balign 4 .global $$254406 $$254406: - .incbin "baserom.dol", 0x459ED0, 0x10 + .asciz "ControlIconN" + .balign 4 .global $$254407 $$254407: - .incbin "baserom.dol", 0x459EE0, 0xC + .asciz "anime/Param" .global $$254409 $$254409: - .incbin "baserom.dol", 0x459EEC, 0x14 + .asciz "ExitAnimeCheck" + .balign 4 + .4byte 0 .global $$254410 $$254410: - .incbin "baserom.dol", 0x459F00, 0x10 + .asciz "ExitAnimeCheck1" .global $$254411 $$254411: - .incbin "baserom.dol", 0x459F10, 0x10 + .asciz "ExitAnimeCheck2" .global $$254412 $$254412: - .incbin "baserom.dol", 0x459F20, 0x40 + .asciz "ExitMusicCheck" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257307 $$257307: - .incbin "baserom.dol", 0x45AE18, 0x14 + .asciz "StepFirstDemo.dn" + .balign 4 .global $$257308 $$257308: - .incbin "baserom.dol", 0x45AE2C, 0x18 + .asciz "StepShipMapCommon.dn" + .balign 4 .global $$257309 $$257309: - .incbin "baserom.dol", 0x45AE44, 0x1C + .asciz "StepShipMapInCommon.dn" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251866 $$251866: - .incbin "baserom.dol", 0x45C2E8, 0x10 + .asciz "comic/Sakuma" + .balign 4 .global $$251867 $$251867: - .incbin "baserom.dol", 0x45C2F8, 0x10 + .asciz "comic/Hikawa" + .balign 4 .global $$251868 $$251868: - .incbin "baserom.dol", 0x45C308, 0x10 + .asciz "comic/Taniguchi" .global $$251870 $$251870: - .incbin "baserom.dol", 0x45C318, 0x10 + .asciz "ExitComicCheck" + .balign 4 .global $$251871 $$251871: - .incbin "baserom.dol", 0x45C328, 0x10 + .asciz "ExitComicCheck1" .global $$251872 $$251872: - .incbin "baserom.dol", 0x45C338, 0x10 + .asciz "ExitComicCheck2" .global EXIT_COMIC_LABEL_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2 EXIT_COMIC_LABEL_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2: - .incbin "baserom.dol", 0x45C348, 0xC + .4byte 0x80460218 + .4byte 0x80460228 + .4byte 0x80460238 .global $$257641 $$257641: - .incbin "baserom.dol", 0x45C354, 0xC + .asciz "comic/Param" .global $$257642 $$257642: - .incbin "baserom.dol", 0x45C360, 0xC + .asciz "comic/Main" + .balign 4 .global $$257646 $$257646: - .incbin "baserom.dol", 0x45C36C, 0xC + .asciz "CursorUp" + .balign 4 .global $$257647 $$257647: - .incbin "baserom.dol", 0x45C378, 0xC + .asciz "CursorUnder" .global $$257651 $$257651: - .incbin "baserom.dol", 0x45C384, 0xC + .asciz "Button2N" + .balign 4 .global $$257653 $$257653: - .incbin "baserom.dol", 0x45C390, 0xC + .asciz "CursorLN" + .balign 4 .global $$257654 $$257654: - .incbin "baserom.dol", 0x45C39C, 0xC + .asciz "CursorRN" + .balign 4 .global $$257655 $$257655: - .incbin "baserom.dol", 0x45C3A8, 0xC + .asciz "CursorUpN" + .balign 4 .global $$257656 $$257656: - .incbin "baserom.dol", 0x45C3B4, 0x10 + .asciz "CursorUnderN" + .balign 4 .global $$257660 $$257660: - .incbin "baserom.dol", 0x45C3C4, 0xC + .asciz "Page%02d" + .balign 4 .global $$257661 $$257661: - .incbin "baserom.dol", 0x45C3D0, 0xC + .asciz "PageS%02d" + .balign 4 .global $$258412 $$258412: - .incbin "baserom.dol", 0x45C3DC, 0xC + .asciz "Picture_00" + .balign 4 .global $$258413 $$258413: - .incbin "baserom.dol", 0x45C3E8, 0x40 + .asciz "Picture_01" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$262253 $$262253: - .incbin "baserom.dol", 0x45D1A0, 0x10 + .asciz "history/Scene" + .balign 4 .global $$262254 $$262254: - .incbin "baserom.dol", 0x45D1B0, 0x10 + .asciz "history/Main" + .balign 4 .global $$262257 $$262257: - .incbin "baserom.dol", 0x45D1C0, 0xC + .asciz "NewsSmallN" + .balign 4 .global $$262259 $$262259: - .incbin "baserom.dol", 0x45D1CC, 0x10 + .asciz "HistoryButton" + .balign 4 .global $$262267 $$262267: - .incbin "baserom.dol", 0x45D1DC, 0x10 + .asciz "CheckWindowN" + .balign 4 .global $$262268 $$262268: - .incbin "baserom.dol", 0x45D1EC, 0x14 + .asciz "ExitHistoryCheck" + .balign 4 .global $$262439 $$262439: - .incbin "baserom.dol", 0x45D200, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8020E5A0 ;# ptr .global $$262440 $$262440: - .incbin "baserom.dol", 0x45D20C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8021037C ;# ptr .global $$262441 $$262441: - .incbin "baserom.dol", 0x45D218, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80402CD4 .global $$262442 $$262442: - .incbin "baserom.dol", 0x45D224, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80209444 ;# ptr .global $$262443 $$262443: - .incbin "baserom.dol", 0x45D230, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80209570 ;# ptr .global $$262444 $$262444: - .incbin "baserom.dol", 0x45D23C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x802094A8 ;# ptr .global $$262445 $$262445: - .incbin "baserom.dol", 0x45D248, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x802103A0 ;# ptr .global $$262446 $$262446: - .incbin "baserom.dol", 0x45D254, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x802095F8 ;# ptr .global $$262447 $$262447: - .incbin "baserom.dol", 0x45D260, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$262448 $$262448: - .incbin "baserom.dol", 0x45D26C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$262449 $$262449: - .incbin "baserom.dol", 0x45D278, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global $$262450 $$262450: - .incbin "baserom.dol", 0x45D284, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80209500 ;# ptr .global $$262451 $$262451: - .incbin "baserom.dol", 0x45D290, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8021049C ;# ptr .global $$262452 $$262452: - .incbin "baserom.dol", 0x45D29C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x802095F8 ;# ptr .global $$262453 $$262453: - .incbin "baserom.dol", 0x45D2A8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80210510 ;# ptr .global $$262454 $$262454: - .incbin "baserom.dol", 0x45D2B4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8020961C ;# ptr .global $$262455 $$262455: - .incbin "baserom.dol", 0x45D2C0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$262456 $$262456: - .incbin "baserom.dol", 0x45D2CC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$262457 $$262457: - .incbin "baserom.dol", 0x45D2D8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global $$262648 $$262648: - .incbin "baserom.dol", 0x45D2E4, 0x2C + .4byte 0x8020A930 ;# ptr + .4byte 0x8020A960 ;# ptr + .4byte 0x8020B528 ;# ptr + .4byte 0x8020B598 ;# ptr + .4byte 0x8020B5D0 ;# ptr + .4byte 0x8020B5EC ;# ptr + .4byte 0x8020B624 ;# ptr + .4byte 0x8020B7AC ;# ptr + .4byte 0x8020B9B4 ;# ptr + .4byte 0x8020BA20 ;# ptr + .4byte 0 .global __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail40mem_fn_0$$0v$$4Q33scn7history12PackageHelps$$1$$4Q33std3tr1171tuple$$0PQ33scn7history12PackageHelps$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail40mem_fn_0$$0v$$4Q33scn7history12PackageHelps$$1$$4Q33std3tr1171tuple$$0PQ33scn7history12PackageHelps$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D310, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA54 ;# ptr + .4byte 0x8020C4E0 ;# ptr + .4byte 0x8020C520 ;# ptr + .4byte 0x8020C53C ;# ptr .global __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D328, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA50 ;# ptr + .4byte 0x8020C56C ;# ptr + .4byte 0x8020C5AC ;# ptr + .4byte 0x8020C5C8 ;# ptr .global __vt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D340, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA4C ;# ptr + .4byte 0x8020C5CC ;# ptr + .4byte 0x8020C60C ;# ptr + .4byte 0x8020C628 ;# ptr .global __vt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D358, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA48 ;# ptr + .4byte 0x8020C62C ;# ptr + .4byte 0x8020C66C ;# ptr + .4byte 0x8020C688 ;# ptr .global __vt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D370, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA44 ;# ptr + .4byte 0x8020C6C8 ;# ptr + .4byte 0x8020C708 ;# ptr + .4byte 0x8020C724 ;# ptr .global __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D388, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8020CA40 ;# ptr + .4byte 0x8020C76C ;# ptr + .4byte 0x8020C7AC ;# ptr + .4byte 0x8020C7C8 ;# ptr .global __vt__Q43std3tr16detail288function_imp$$0PFv_b$$4Q43std3tr16detail244bound_func$$0b$$4Q43std3tr16detail34mem_fn_0_c$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail288function_imp$$0PFv_b$$4Q43std3tr16detail244bound_func$$0b$$4Q43std3tr16detail34mem_fn_0_c$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45D3A0, 0xC0 + .4byte 0 + .4byte 0 + .4byte 0x8020CA3C ;# ptr + .4byte 0x8020C800 ;# ptr + .4byte 0x8020C840 ;# ptr + .4byte 0x8020C85C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255596 $$255596: - .incbin "baserom.dol", 0x45F900, 0x10 + .asciz "history/View" + .balign 4 .global $$255600 $$255600: - .incbin "baserom.dol", 0x45F910, 0x14 + .asciz "PackageListTitle" + .balign 4 .global $$255601 $$255601: - .incbin "baserom.dol", 0x45F924, 0xC + .asciz "TitleShadow" .global $$255656 $$255656: - .incbin "baserom.dol", 0x45F930, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A84A4 ;# ptr .global $$255657 $$255657: - .incbin "baserom.dol", 0x45F93C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$255658 $$255658: - .incbin "baserom.dol", 0x45F948, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$255659 $$255659: - .incbin "baserom.dol", 0x45F954, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global __vt__Q43std3tr16detail330function_imp$$0PFv_b$$4Q43std3tr16detail286bound_func$$0b$$4Q43std3tr16detail40mem_fn_0_c$$0b$$4Q34info6common10ButtonHelp$$1$$4Q33std3tr1199tuple$$0Q33std3tr145reference_wrapper$$0Q34info6common10ButtonHelp$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail330function_imp$$0PFv_b$$4Q43std3tr16detail286bound_func$$0b$$4Q43std3tr16detail40mem_fn_0_c$$0b$$4Q34info6common10ButtonHelp$$1$$4Q33std3tr1199tuple$$0Q33std3tr145reference_wrapper$$0Q34info6common10ButtonHelp$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45F960, 0xC0 + .4byte 0 + .4byte 0 + .4byte 0x8021C950 ;# ptr + .4byte 0x8021C8AC ;# ptr + .4byte 0x8021C8EC ;# ptr + .4byte 0x8021C908 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255477 $$255477: - .incbin "baserom.dol", 0x468888, 0x18 + .asciz "StepLevelMapCommon.dn" + .balign 4 .global $$255493 $$255493: - .incbin "baserom.dol", 0x4688A0, 0x18 + .asciz "Challengetutorial.dn" + .balign 4 .global $$255494 $$255494: - .incbin "baserom.dol", 0x4688B8, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$255526 $$255526: - .incbin "baserom.dol", 0x4688C8, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$255527 $$255527: - .incbin "baserom.dol", 0x4688D8, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$255528 $$255528: - .incbin "baserom.dol", 0x4688E8, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$255529 $$255529: - .incbin "baserom.dol", 0x4688FC, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$255530 $$255530: - .incbin "baserom.dol", 0x468910, 0x18 + .asciz "HistoryPackage3.dn" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248781 $$248781: - .incbin "baserom.dol", 0x492F50, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254408 $$254408: - .incbin "baserom.dol", 0x493DE0, 0x4 + .4byte 0x42470000 .global $$254413 $$254413: - .incbin "baserom.dol", 0x493DE4, 0x4 + .4byte 0x59657300 .global $$254414 $$254414: - .incbin "baserom.dol", 0x493DE8, 0x8 + .4byte 0x4E6F0000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257643 $$257643: - .incbin "baserom.dol", 0x494628, 0x8 + .asciz "Base" + .balign 4 .global $$257644 $$257644: - .incbin "baserom.dol", 0x494630, 0x8 + .asciz "CursorL" .global $$257645 $$257645: - .incbin "baserom.dol", 0x494638, 0x8 + .asciz "CursorR" .global $$257648 $$257648: - .incbin "baserom.dol", 0x494640, 0x8 + .asciz "Page" + .balign 4 .global $$257649 $$257649: - .incbin "baserom.dol", 0x494648, 0x8 + .asciz "BackN" + .balign 4 .global $$257650 $$257650: - .incbin "baserom.dol", 0x494650, 0x8 + .asciz "Zoom" + .balign 4 .global $$257657 $$257657: - .incbin "baserom.dol", 0x494658, 0x8 + .asciz "PageN" + .balign 4 .global $$257658 $$257658: - .incbin "baserom.dol", 0x494660, 0x8 + .asciz "ZoomN" + .balign 4 .global $$257659 $$257659: - .incbin "baserom.dol", 0x494668, 0x8 + .asciz "MinusN" + .balign 4 .global $$257662 $$257662: - .incbin "baserom.dol", 0x494670, 0x8 + .asciz "Guard" + .balign 4 .global $$257663 $$257663: - .incbin "baserom.dol", 0x494678, 0x8 + .asciz "GuardN" + .balign 4 .global $$257664 $$257664: - .incbin "baserom.dol", 0x494680, 0x8 + .asciz "GuardSN" .global $$257666 $$257666: - .incbin "baserom.dol", 0x494688, 0x4 + .4byte 0x59657300 .global $$257667 $$257667: - .incbin "baserom.dol", 0x49468C, 0x4 + .4byte 0x4E6F0000 .global $$257668 $$257668: - .incbin "baserom.dol", 0x494690, 0x4 + .4byte 0x456E6400 .global $$257925 $$257925: - .incbin "baserom.dol", 0x494694, 0x8 + .asciz "Push" + .balign 4 .global $$257926 $$257926: - .incbin "baserom.dol", 0x49469C, 0x8 + .asciz "Free" + .balign 4 .global $$257978 $$257978: - .incbin "baserom.dol", 0x4946A4, 0x8 + .asciz "Wait" + .balign 4 .global $$258108 $$258108: - .incbin "baserom.dol", 0x4946AC, 0x8 + .asciz "Back" + .balign 4 .global $$258304 $$258304: - .incbin "baserom.dol", 0x4946B4, 0xC + .4byte 0x00250075 + .4byte 0 + .4byte 0 .global $$258305 $$258305: - .incbin "baserom.dol", 0x4946C0, 0x8 + .asciz "NowPage" .global $$258306 $$258306: - .incbin "baserom.dol", 0x4946C8, 0x8 + .asciz "MaxPage" .global $$258323 $$258323: - .incbin "baserom.dol", 0x4946D0, 0x4 + .4byte 0x496E0000 .global $$258324 $$258324: - .incbin "baserom.dol", 0x4946D4, 0x4 + .4byte 0x4F757400 .global $$258402 $$258402: - .incbin "baserom.dol", 0x4946D8, 0x8 + .asciz "ComicN" + .balign 4 .global $$258406 $$258406: - .incbin "baserom.dol", 0x4946E0, 0x8 + .asciz "ComicSN" .global $$258419 $$258419: - .incbin "baserom.dol", 0x4946E8, 0x8 + .asciz "Shadow" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$262255 $$262255: - .incbin "baserom.dol", 0x494960, 0x8 + .asciz "Base" + .balign 4 .global $$262256 $$262256: - .incbin "baserom.dol", 0x494968, 0x8 + .asciz "NewsN" + .balign 4 .global $$262258 $$262258: - .incbin "baserom.dol", 0x494970, 0x8 + .asciz "BackN" + .balign 4 .global $$262260 $$262260: - .incbin "baserom.dol", 0x494978, 0x8 + .asciz "IconN" + .balign 4 .global $$262266 $$262266: - .incbin "baserom.dol", 0x494980, 0x8 + .asciz "Model" + .balign 4 .global $$262269 $$262269: - .incbin "baserom.dol", 0x494988, 0x4 + .4byte 0x59657300 .global $$262270 $$262270: - .incbin "baserom.dol", 0x49498C, 0x4 + .4byte 0x4E6F0000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255597 $$255597: - .incbin "baserom.dol", 0x495160, 0x8 + .asciz "Base" + .balign 4 .global $$255598 $$255598: - .incbin "baserom.dol", 0x495168, 0x8 + .asciz "BackN" + .balign 4 .global $$255599 $$255599: - .incbin "baserom.dol", 0x495170, 0x8 + .asciz "Title" + .balign 4 .global $$255602 $$255602: - .incbin "baserom.dol", 0x495178, 0x8 + .asciz "Wait" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254657 $$254657: - .incbin "baserom.dol", 0x49A830, 0x4 + .4byte 0x41F00000 .global $$254658 $$254658: - .incbin "baserom.dol", 0x49A834, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256391 $$256391: - .incbin "baserom.dol", 0x49A950, 0x8 + .4byte 0x000000FF + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251904 $$251904: - .incbin "baserom.dol", 0x49AA10, 0x4 + .4byte 0xFFFFFFFF .global $$257652 $$257652: - .incbin "baserom.dol", 0x49AA14, 0x4 + .4byte 0 .global $$257665 $$257665: - .incbin "baserom.dol", 0x49AA18, 0x8 + .4byte 0xBF800000 + .4byte 0 .global $$257672 $$257672: - .incbin "baserom.dol", 0x49AA20, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257929 $$257929: - .incbin "baserom.dol", 0x49AA28, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257983 $$257983: - .incbin "baserom.dol", 0x49AA30, 0x4 + .4byte 0x3FC00000 .global $$257984 $$257984: - .incbin "baserom.dol", 0x49AA34, 0x4 + .4byte 0xBF000000 .global $$258105 $$258105: - .incbin "baserom.dol", 0x49AA38, 0x4 + .4byte 0x437F0000 .global $$258106 $$258106: - .incbin "baserom.dol", 0x49AA3C, 0x4 + .4byte 0x3F800000 .global $$258107 $$258107: - .incbin "baserom.dol", 0x49AA40, 0x8 + .4byte 0x40000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257239 $$257239: - .incbin "baserom.dol", 0x49AB10, 0x4 + .4byte 0x3F19999A .global $$257240 $$257240: - .incbin "baserom.dol", 0x49AB14, 0x4 + .4byte 0x3F800000 .global $$257241 $$257241: - .incbin "baserom.dol", 0x49AB18, 0x4 + .4byte 0x3E4CCCCD .global $$257242 $$257242: - .incbin "baserom.dol", 0x49AB1C, 0x4 + .4byte 0x3DCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262204 $$262204: - .incbin "baserom.dol", 0x49AC00, 0x4 + .4byte 0xFFFFFFFF .global $$262261 $$262261: - .incbin "baserom.dol", 0x49AC04, 0x4 + .4byte 0xC2C80000 .global $$262262 $$262262: - .incbin "baserom.dol", 0x49AC08, 0x4 + .4byte 0x42C80000 .global $$262263 $$262263: - .incbin "baserom.dol", 0x49AC0C, 0x4 + .4byte 0 .global $$262264 $$262264: - .incbin "baserom.dol", 0x49AC10, 0x4 + .4byte 0x3F800000 .global $$262265 $$262265: - .incbin "baserom.dol", 0x49AC14, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254093 $$254093: - .incbin "baserom.dol", 0x49ED68, 0x4 + .4byte 0 .global $$254094 $$254094: - .incbin "baserom.dol", 0x49ED6C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/MainCamera.s b/asm/src/MainCamera.s index 0b626031..c6550c44 100644 --- a/asm/src/MainCamera.s +++ b/asm/src/MainCamera.s @@ -945,28 +945,31 @@ lbl_80266268: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252770 $$252770: - .incbin "baserom.dol", 0x49B660, 0x4 + .4byte 0 .global $$252771 $$252771: - .incbin "baserom.dol", 0x49B664, 0x4 + .4byte 0x42200000 .global $$252772 $$252772: - .incbin "baserom.dol", 0x49B668, 0x4 + .4byte 0x41200000 .global $$252773 $$252773: - .incbin "baserom.dol", 0x49B66C, 0x4 + .4byte 0xC1200000 .global $$252774 $$252774: - .incbin "baserom.dol", 0x49B670, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$252778 $$252778: - .incbin "baserom.dol", 0x49B678, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$252812 $$252812: - .incbin "baserom.dol", 0x49B680, 0x4 + .4byte 0xBF800000 .global $$252832 $$252832: - .incbin "baserom.dol", 0x49B684, 0x4 + .4byte 0x3C8EFA35 .global $$252921 $$252921: - .incbin "baserom.dol", 0x49B688, 0x8 + .4byte 0x3FB40000 + .4byte 0 diff --git a/asm/src/Manager.s b/asm/src/Manager.s index 6afd3ba7..129e9c0c 100644 --- a/asm/src/Manager.s +++ b/asm/src/Manager.s @@ -37905,572 +37905,797 @@ screenRemapDrawEnd__Q23sfx7ManagerFv: /* 80401308 003FD148 4B C2 31 98 */ b DefaultSwitchThreadCallback .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402444, 0x4 + .4byte 0x801D13FC ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$257185 $$257185: - .incbin "baserom.dol", 0x4157C8, 0xC + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x0000000A .global $$257316 $$257316: - .incbin "baserom.dol", 0x4157D4, 0x14 + .4byte 0x8047F8DC + .4byte 0x8047F8F8 + .4byte 0x8047F914 + .4byte 0x8047F930 + .4byte 0x8047F950 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251648 $$251648: - .incbin "baserom.dol", 0x455EC0, 0xC + .asciz "Manager.cpp" .global $$251649 $$251649: - .incbin "baserom.dol", 0x455ECC, 0x14 + .asciz "Halt on Mint." + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249094 $$249094: - .incbin "baserom.dol", 0x459208, 0xC + .asciz "Challenge" + .balign 4 .global $$249095 $$249095: - .incbin "baserom.dol", 0x459214, 0x10 + .asciz "ChallengeTitle" + .balign 4 .global $$249096 $$249096: - .incbin "baserom.dol", 0x459224, 0x14 + .asciz "ChallengeFileSelect" .global $$249103 $$249103: - .incbin "baserom.dol", 0x459238, 0xC + .asciz "PlayMovie" + .balign 4 .global $$249104 $$249104: - .incbin "baserom.dol", 0x459244, 0xC + .asciz "Resident" + .balign 4 .global $$249105 $$249105: - .incbin "baserom.dol", 0x459250, 0xC + .asciz "GrandMenu" + .balign 4 .global $$249106 $$249106: - .incbin "baserom.dol", 0x45925C, 0xC + .asciz "GrandTitle" + .balign 4 .global $$249107 $$249107: - .incbin "baserom.dol", 0x459268, 0x10 + .asciz "StaffCredit" + .4byte 0 .global t_fileNames__Q23msg21$$2unnamed$$2Manager_cpp$$2 t_fileNames__Q23msg21$$2unnamed$$2Manager_cpp$$2: - .incbin "baserom.dol", 0x459278, 0x48 + .4byte 0x805575D0 + .4byte 0x805575D8 + .4byte 0x805575E0 + .4byte 0x805575E8 + .4byte 0x8045D108 + .4byte 0x8045D114 + .4byte 0x8045D124 + .4byte 0x805575F0 + .4byte 0x805575F8 + .4byte 0x80557600 + .4byte 0x80557608 + .4byte 0x80557610 + .4byte 0x80557618 + .4byte 0x8045D138 + .4byte 0x8045D144 + .4byte 0x8045D150 + .4byte 0x8045D15C + .4byte 0x8045D168 .global $$249787 $$249787: - .incbin "baserom.dol", 0x4592C0, 0x10 + .asciz "MsgManager" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252774 $$252774: - .incbin "baserom.dol", 0x45B1E0, 0x18 + .asciz "step/challenge/Main" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252572 $$252572: - .incbin "baserom.dol", 0x45BDD0, 0x14 + .asciz "step/challenge/Main" .global $$252573 $$252573: - .incbin "baserom.dol", 0x45BDE4, 0x14 + .asciz "TutorialBase" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step2bg7Manager __vt__Q43scn4step2bg7Manager: - .incbin "baserom.dol", 0x45FEA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802273A8 ;# ptr + .4byte 0x802276B0 ;# ptr + .4byte 0x802276B8 ;# ptr + .4byte 0x802276C0 ;# ptr + .4byte 0x802276D0 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255431 $$255431: - .incbin "baserom.dol", 0x4606D0, 0xC + .asciz "BossManager" .global $$255433 $$255433: - .incbin "baserom.dol", 0x4606DC, 0x14 + .asciz "BossCommander" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCORE_KIND_INFO_TABLE__21$$2unnamed$$2Manager_cpp$$2 T_SCORE_KIND_INFO_TABLE__21$$2unnamed$$2Manager_cpp$$2: - .incbin "baserom.dol", 0x467340, 0xA0 + .4byte 0x00000127 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026823C ;# ptr + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268C84 ;# ptr + .4byte 0 + .4byte 0x00000128 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026822C ;# ptr + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268CD8 ;# ptr + .4byte 0x01000000 + .4byte 0x00000126 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268234 ;# ptr + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268D2C ;# ptr + .4byte 0 + .4byte 0x00000128 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8026822C ;# ptr + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268D88 ;# ptr + .4byte 0x01000000 + .4byte 0x00000244 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268224 ;# ptr + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80268DDC ;# ptr + .4byte 0 .global $$255619 $$255619: - .incbin "baserom.dol", 0x4673E0, 0x20 + .asciz "step/challenge/Challenge" + .balign 4 + .4byte 0 .global $$255620 $$255620: - .incbin "baserom.dol", 0x467400, 0x18 + .asciz "step/info/score/Score50" .global $$255621 $$255621: - .incbin "baserom.dol", 0x467418, 0x1C + .asciz "step/info/score/Score100" + .balign 4 .global $$255622 $$255622: - .incbin "baserom.dol", 0x467434, 0x1C + .asciz "step/info/score/Score1000" + .balign 4 .global $$255623 $$255623: - .incbin "baserom.dol", 0x467450, 0x20 + .asciz "step/info/score/Score100minus" + .balign 4 .global $$255626 $$255626: - .incbin "baserom.dol", 0x467470, 0x28 + .4byte 0x80268600 ;# ptr + .4byte 0x8026866C ;# ptr + .4byte 0x802685DC ;# ptr + .4byte 0x8026866C ;# ptr + .4byte 0x80268600 ;# ptr + .4byte 0x802685E8 ;# ptr + .4byte 0x80268618 ;# ptr + .4byte 0x8026860C ;# ptr + .4byte 0x8026860C ;# ptr + .4byte 0x802685F4 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$259391 $$259391: - .incbin "baserom.dol", 0x46E718, 0x10 + .asciz "EnemyManager" + .balign 4 .global __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1: - .incbin "baserom.dol", 0x46E728, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028A278 ;# ptr + .4byte 0x8028A214 ;# ptr .global __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1: - .incbin "baserom.dol", 0x46E738, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028A274 ;# ptr + .4byte 0x8028A234 ;# ptr .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46E748, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028A270 ;# ptr + .4byte 0x8028A254 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component: - .incbin "baserom.dol", 0x47B108, 0x28 + .asciz "step/weapon/common/EffectLocator" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257888 $$257888: - .incbin "baserom.dol", 0x47B9C0, 0x1C + .asciz "step/gimmick/AreaMapDemo" + .balign 4 .global $$257311 $$257311: - .incbin "baserom.dol", 0x47B9DC, 0x1C + .asciz "StepLevelMapCopperTrophy.dn" .global $$257312 $$257312: - .incbin "baserom.dol", 0x47B9F8, 0x1C + .asciz "StepLevelMapSilverTrophy.dn" .global $$257313 $$257313: - .incbin "baserom.dol", 0x47BA14, 0x1C + .asciz "StepLevelMapGoldTrophy.dn" + .balign 4 .global $$257314 $$257314: - .incbin "baserom.dol", 0x47BA30, 0x20 + .asciz "StepLevelMapPlatinumTrophy.dn" + .balign 4 .global $$257315 $$257315: - .incbin "baserom.dol", 0x47BA50, 0x20 + .asciz "StepLevelMapKingTrophy.dn" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258399 $$258399: - .incbin "baserom.dol", 0x47E5B8, 0x14 + .asciz "step/gimmick/Sun" + .balign 4 .global $$258838 $$258838: - .incbin "baserom.dol", 0x47E5CC, 0x24 + .4byte 0x80326AAC + .4byte 0x80326AB4 + .4byte 0x80326ABC + .4byte 0x80326AC4 + .4byte 0x80326ACC + .4byte 0x80326AD4 + .4byte 0x80326ADC + .4byte 0x80326AE4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component: - .incbin "baserom.dol", 0x47E7D0, 0x28 + .asciz "step/weapon/common/EffectLocator" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$266848 $$266848: - .incbin "baserom.dol", 0x480ED8, 0x10 + .asciz "InactiveHero" + .balign 4 .global __vt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1 __vt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1: - .incbin "baserom.dol", 0x480EE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80348E2C + .4byte 0x80348D68 .global __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1 __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1: - .incbin "baserom.dol", 0x480EF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80348E28 + .4byte 0x80348DC8 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480F08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80348E24 + .4byte 0x80348DE8 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x480F18, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80348E20 + .4byte 0x80348E04 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256047 $$256047: - .incbin "baserom.dol", 0x48BEA8, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$256049 $$256049: - .incbin "baserom.dol", 0x48BEB8, 0x10 + .asciz "MessageWindowN" + .balign 4 .global $$256236 $$256236: - .incbin "baserom.dol", 0x48BEC8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA04 .global $$256340 $$256340: - .incbin "baserom.dol", 0x48BED4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA08 .global $$256351 $$256351: - .incbin "baserom.dol", 0x48BEE0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA0C .global $$256362 $$256362: - .incbin "baserom.dol", 0x48BEEC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA10 .global $$256373 $$256373: - .incbin "baserom.dol", 0x48BEF8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA14 .global $$256384 $$256384: - .incbin "baserom.dol", 0x48BF04, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803ADA18 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254030 $$254030: - .incbin "baserom.dol", 0x48DFB8, 0xC + .asciz "ItemManager" .global $$254033 $$254033: - .incbin "baserom.dol", 0x48DFC4, 0x14 + .asciz "step/item/Item" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255166 $$255166: - .incbin "baserom.dol", 0x48EB20, 0x10 + .asciz "OGenManager" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255168 $$255168: - .incbin "baserom.dol", 0x48EEC0, 0x80 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F3C + .4byte 0x803D2F88 + .4byte 0x803D2F34 + .4byte 0x803D2F44 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F88 + .4byte 0x803D2F4C + .4byte 0x803D2F88 + .4byte 0x803D2F54 + .4byte 0x803D2F5C + .4byte 0x803D2F64 + .4byte 0x803D2F6C + .4byte 0x803D2F74 + .4byte 0x803D2F7C + .4byte 0x803D2F88 + .4byte 0x803D2F84 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257345 $$257345: - .incbin "baserom.dol", 0x48F8C8, 0x10 + .asciz "WeaponManager" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252659 $$252659: - .incbin "baserom.dol", 0x4914F0, 0x20 + .4byte 0x803F18F8 + .4byte 0x803F1904 + .4byte 0x803F1928 + .4byte 0x803F19B0 + .4byte 0x803F19C0 + .4byte 0x803F19D0 + .4byte 0x803F19E0 + .4byte 0x803F19F0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249090 $$249090: - .incbin "baserom.dol", 0x4939B0, 0x8 + .asciz "Name" + .balign 4 .global $$249091 $$249091: - .incbin "baserom.dol", 0x4939B8, 0x8 + .asciz "LvMap" + .balign 4 .global $$249092 $$249092: - .incbin "baserom.dol", 0x4939C0, 0x8 + .asciz "Ship" + .balign 4 .global $$249093 $$249093: - .incbin "baserom.dol", 0x4939C8, 0x8 + .asciz "Step" + .balign 4 .global $$249097 $$249097: - .incbin "baserom.dol", 0x4939D0, 0x8 + .asciz "Pause" + .balign 4 .global $$249098 $$249098: - .incbin "baserom.dol", 0x4939D8, 0x8 + .asciz "Common" + .balign 4 .global $$249099 $$249099: - .incbin "baserom.dol", 0x4939E0, 0x8 + .asciz "Option" + .balign 4 .global $$249100 $$249100: - .incbin "baserom.dol", 0x4939E8, 0x8 + .asciz "History" .global $$249101 $$249101: - .incbin "baserom.dol", 0x4939F0, 0x8 + .asciz "Product" .global $$249102 $$249102: - .incbin "baserom.dol", 0x4939F8, 0x8 + .asciz "News" + .balign 4 .global $$249848 $$249848: - .incbin "baserom.dol", 0x493A00, 0x4 + .4byte 0x49554B00 .global $$249870 $$249870: - .incbin "baserom.dol", 0x493A04, 0x4 + .4byte 0x003F0000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252773 $$252773: - .incbin "baserom.dol", 0x4941D8, 0x8 + .asciz "Info" + .balign 4 .global $$252775 $$252775: - .incbin "baserom.dol", 0x4941E0, 0x8 + .asciz "Base" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252571 $$252571: - .incbin "baserom.dol", 0x494548, 0x8 + .asciz "Info" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255432 $$255432: - .incbin "baserom.dol", 0x4952B8, 0x8 + .asciz "Boss" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253081 $$253081: - .incbin "baserom.dol", 0x495870, 0x8 + .asciz "Effect" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259392 $$259392: - .incbin "baserom.dol", 0x495A08, 0x8 + .asciz "Enemy" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component$$20 $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component$$20: - .incbin "baserom.dol", 0x4968D0, 0x8 + .asciz "Model" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252170 $$252170: - .incbin "baserom.dol", 0x496C08, 0x4 + .4byte 0 .global $$252196 $$252196: - .incbin "baserom.dol", 0x496C0C, 0x4 + .4byte 0 .global $$252197 $$252197: - .incbin "baserom.dol", 0x496C10, 0x4 + .4byte 0x3F800000 .global $$252204 $$252204: - .incbin "baserom.dol", 0x496C14, 0x4 + .4byte 0 .global $$252205 $$252205: - .incbin "baserom.dol", 0x496C18, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component$$20 $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component$$20: - .incbin "baserom.dol", 0x496DC8, 0x8 + .asciz "Model" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$266847 $$266847: - .incbin "baserom.dol", 0x496DE0, 0x5 + .asciz "Hero" .global $$260218 $$260218: - .incbin "baserom.dol", 0x496DE5, 0x3 + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256046 $$256046: - .incbin "baserom.dol", 0x497A00, 0x8 + .asciz "Info" + .balign 4 .global $$256048 $$256048: - .incbin "baserom.dol", 0x497A08, 0x8 + .asciz "Base" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254031 $$254031: - .incbin "baserom.dol", 0x498148, 0x8 + .asciz "Item" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257346 $$257346: - .incbin "baserom.dol", 0x498428, 0x8 + .asciz "Weapon" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252901 $$252901: - .incbin "baserom.dol", 0x49A990, 0x4 + .4byte 0x3DCCCCCD .global $$252902 $$252902: - .incbin "baserom.dol", 0x49A994, 0x4 + .4byte 0x447A0000 .global $$252904 $$252904: - .incbin "baserom.dol", 0x49A998, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255739 $$255739: - .incbin "baserom.dol", 0x49B730, 0x4 + .4byte 0 .global $$255740 $$255740: - .incbin "baserom.dol", 0x49B734, 0x4 + .4byte 0x3F800000 .global $$255920 $$255920: - .incbin "baserom.dol", 0x49B738, 0x4 + .4byte 0x3F0CCCCD .global $$255921 $$255921: - .incbin "baserom.dol", 0x49B73C, 0x4 + .4byte 0x3F19999A .global $$255922 $$255922: - .incbin "baserom.dol", 0x49B740, 0x4 + .4byte 0x3F4CCCCD .global $$255933 $$255933: - .incbin "baserom.dol", 0x49B744, 0x4 + .4byte 0x3F99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259636 $$259636: - .incbin "baserom.dol", 0x49B9E8, 0x8 + .4byte 0x40000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256948 $$256948: - .incbin "baserom.dol", 0x49D1B8, 0x4 + .4byte 0x00000003 .global lbl_8056267C lbl_8056267C: - .incbin "baserom.dol", 0x49D1BC, 0x4 + .4byte 0x00000007 .global $$257218 $$257218: - .incbin "baserom.dol", 0x49D1C0, 0x4 + .4byte 0x00000003 .global lbl_80562684 lbl_80562684: - .incbin "baserom.dol", 0x49D1C4, 0x4 + .4byte 0x00000007 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253517 $$253517: - .incbin "baserom.dol", 0x49D488, 0x4 + .4byte 0 .global $$253649 $$253649: - .incbin "baserom.dol", 0x49D48C, 0x4 + .4byte 0x7F7FFFFF .global $$253650 $$253650: - .incbin "baserom.dol", 0x49D490, 0x4 + .4byte 0x3F000000 .global $$253651 $$253651: - .incbin "baserom.dol", 0x49D494, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254600 $$254600: - .incbin "baserom.dol", 0x49D4A0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253900 $$253900: - .incbin "baserom.dol", 0x49D528, 0x4 + .4byte 0x40400000 .global $$253901 $$253901: - .incbin "baserom.dol", 0x49D52C, 0x4 + .4byte 0x40000000 .global $$253902 $$253902: - .incbin "baserom.dol", 0x49D530, 0x8 + .4byte 0x40B00000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258587 $$258587: - .incbin "baserom.dol", 0x49D5C8, 0x4 + .4byte 0x40000000 .global $$258588 $$258588: - .incbin "baserom.dol", 0x49D5CC, 0x4 + .4byte 0x40400000 .global $$258589 $$258589: - .incbin "baserom.dol", 0x49D5D0, 0x4 + .4byte 0x40800000 .global $$258590 $$258590: - .incbin "baserom.dol", 0x49D5D4, 0x4 + .4byte 0x41100000 .global $$258591 $$258591: - .incbin "baserom.dol", 0x49D5D8, 0x8 + .4byte 0x40B00000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$266891 $$266891: - .incbin "baserom.dol", 0x49D7A8, 0x4 + .4byte 0 .global $$260254 $$260254: - .incbin "baserom.dol", 0x49D7AC, 0x4 + .4byte 0x000000FF .global $$260264 $$260264: - .incbin "baserom.dol", 0x49D7B0, 0x4 + .4byte 0xFFFFFFFF .global $$260270 $$260270: - .incbin "baserom.dol", 0x49D7B4, 0x4 + .4byte 0x000000FF .global $$260274 $$260274: - .incbin "baserom.dol", 0x49D7B8, 0x4 + .4byte 0x000000FF .global $$266959 $$266959: - .incbin "baserom.dol", 0x49D7BC, 0x4 + .4byte 0x40400000 .global $$266960 $$266960: - .incbin "baserom.dol", 0x49D7C0, 0x4 + .4byte 0x40A00000 .global $$267340 $$267340: - .incbin "baserom.dol", 0x49D7C4, 0x4 + .4byte 0x7F7FFFFF .global $$267601 $$267601: - .incbin "baserom.dol", 0x49D7C8, 0x4 + .4byte 0x3F000000 .global $$267723 $$267723: - .incbin "baserom.dol", 0x49D7CC, 0x4 + .4byte 0x3F800000 .global $$267724 $$267724: - .incbin "baserom.dol", 0x49D7D0, 0x4 + .4byte 0xBFA00000 .global $$267725 $$267725: - .incbin "baserom.dol", 0x49D7D4, 0x4 + .4byte 0x3FC00000 .global $$267726 $$267726: - .incbin "baserom.dol", 0x49D7D8, 0x4 + .4byte 0x40000000 .global $$267727 $$267727: - .incbin "baserom.dol", 0x49D7DC, 0x4 + .4byte 0x3F4CCCCD .global $$267728 $$267728: - .incbin "baserom.dol", 0x49D7E0, 0x4 + .4byte 0x3FCCCCCD .global $$267945 $$267945: - .incbin "baserom.dol", 0x49D7E4, 0x4 + .4byte 0xBF800000 .global $$267948 $$267948: - .incbin "baserom.dol", 0x49D7E8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256050 $$256050: - .incbin "baserom.dol", 0x49E430, 0x4 + .4byte 0 .global $$256051 $$256051: - .incbin "baserom.dol", 0x49E434, 0x4 + .4byte 0x447A0000 .global $$256052 $$256052: - .incbin "baserom.dol", 0x49E438, 0x4 + .4byte 0x43D00000 .global $$256053 $$256053: - .incbin "baserom.dol", 0x49E43C, 0x4 + .4byte 0x43640000 .global $$256054 $$256054: - .incbin "baserom.dol", 0x49E440, 0x4 + .4byte 0x3F800000 .global $$256055 $$256055: - .incbin "baserom.dol", 0x49E444, 0x4 + .4byte 0x44FA0000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254032 $$254032: - .incbin "baserom.dol", 0x49E550, 0x4 + .4byte 0 .global $$254132 $$254132: - .incbin "baserom.dol", 0x49E554, 0x4 + .4byte 0xC0C00000 .global $$254133 $$254133: - .incbin "baserom.dol", 0x49E558, 0x4 + .4byte 0x43B40000 .global $$254187 $$254187: - .incbin "baserom.dol", 0x49E55C, 0x4 + .4byte 0x41F00000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255341 $$255341: - .incbin "baserom.dol", 0x49E698, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255090 $$255090: - .incbin "baserom.dol", 0x49E820, 0x4 + .4byte 0 .global $$255165 $$255165: - .incbin "baserom.dol", 0x49E824, 0x4 + .4byte 0xBC23D70A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252582 $$252582: - .incbin "baserom.dol", 0x49ECF8, 0x4 + .4byte 0 .global $$252646 $$252646: - .incbin "baserom.dol", 0x49ECFC, 0x4 + .4byte 0x42480000 .global $$252647 $$252647: - .incbin "baserom.dol", 0x49ED00, 0x4 + .4byte 0x3CA3D70A .global $$252648 $$252648: - .incbin "baserom.dol", 0x49ED04, 0x4 + .4byte 0x42800000 .global $$252649 $$252649: - .incbin "baserom.dol", 0x49ED08, 0x4 + .4byte 0x42C80000 .global $$252650 $$252650: - .incbin "baserom.dol", 0x49ED0C, 0x4 + .4byte 0x43000000 .global $$252651 $$252651: - .incbin "baserom.dol", 0x49ED10, 0x4 + .4byte 0x3C23D70A .global $$252652 $$252652: - .incbin "baserom.dol", 0x49ED14, 0x4 + .4byte 0x47000000 .global $$252658 $$252658: - .incbin "baserom.dol", 0x49ED18, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common35PrivateSingleton$$0Q26effect7Manager$$1 diff --git a/asm/src/ManagerCreator.s b/asm/src/ManagerCreator.s index fbb56a50..9f2a056f 100644 --- a/asm/src/ManagerCreator.s +++ b/asm/src/ManagerCreator.s @@ -53,4 +53,5 @@ lbl_803CAB30: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251813 $$251813: - .incbin "baserom.dol", 0x48EAF0, 0x30 + .asciz "Scn.Step.OColl.AttackData.ExecRegisterAll()" + .4byte 0 diff --git a/asm/src/ManualData.s b/asm/src/ManualData.s index 7b8ca1ef..83ae8435 100644 --- a/asm/src/ManualData.s +++ b/asm/src/ManualData.s @@ -467,299 +467,593 @@ IsCommandLineDouble__Q25pause10ManualDataFQ25pause10ManualKindUlUl: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x411180, 0x40 + .4byte 0x80557710 + .4byte 0 + .4byte 0x80557718 + .4byte 0 + .4byte 0x8045D558 + .4byte 0 + .4byte 0x80557720 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80557728 + .4byte 0 + .4byte 0x80557730 + .4byte 0 + .4byte 0x80557738 + .4byte 0 .global T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x4111C0, 0x18 + .4byte 0x80557740 + .4byte 0 + .4byte 0x80557748 + .4byte 0 + .4byte 0x80557750 + .4byte 0 .global T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x4111D8, 0x68 + .4byte 0x80557758 + .4byte 0 + .4byte 0x80557760 + .4byte 0 + .4byte 0x8045D568 + .4byte 0 + .4byte 0x8045D574 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80557768 + .4byte 0 + .4byte 0x80557728 + .4byte 0 + .4byte 0x8045D584 + .4byte 0 + .4byte 0x80557770 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80557778 + .4byte 0 + .4byte 0x80557780 + .4byte 0 + .4byte 0x80557788 + .4byte 0 .global T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x411240, 0x70 + .4byte 0x8045D590 + .4byte 0 + .4byte 0x80557790 + .4byte 0 + .4byte 0x8045D59C + .4byte 0 + .4byte 0x80557798 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80557710 + .4byte 0 + .4byte 0x8045D5A8 + .4byte 0 + .4byte 0x805577A0 + .4byte 0 + .4byte 0x805577A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D5B4 + .4byte 0 + .4byte 0x8045D5C0 + .4byte 0 + .4byte 0x8045D5CC + .4byte 0 + .4byte 0x8045D5D8 + .4byte 0 .global T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x4112B0, 0x48 + .4byte 0x805577B0 + .4byte 0 + .4byte 0x805577B8 + .4byte 0 + .4byte 0x805577C0 + .4byte 0 + .4byte 0x805577C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x805577D0 + .4byte 0 + .4byte 0x805577D8 + .4byte 0 + .4byte 0x8045D5E4 + .4byte 0 + .4byte 0x8045D5F0 + .4byte 0 .global T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x4112F8, 0x48 + .4byte 0x805577E0 + .4byte 0 + .4byte 0x805577E8 + .4byte 0 + .4byte 0x8045D5FC + .4byte 0 + .4byte 0x80557768 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D608 + .4byte 0 + .4byte 0x805577F0 + .4byte 0 + .4byte 0x805577F8 + .4byte 0 + .4byte 0x80557800 + .4byte 0 .global T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x411340, 0x60 + .4byte 0x8045D614 + .4byte 0 + .4byte 0x8045D620 + .4byte 0 + .4byte 0x80557808 + .4byte 0 + .4byte 0x8045D630 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D640 + .4byte 0 + .4byte 0x8045D64C + .4byte 0 + .4byte 0x8045D658 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80557810 + .4byte 0 + .4byte 0x8045D668 + .4byte 0 + .4byte 0x8045D674 + .4byte 0 .global T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x4113A0, 0x98 + .4byte 0x80557710 + .4byte 0 + .4byte 0x80557818 + .4byte 0 + .4byte 0x80557770 + .4byte 0 + .4byte 0x8045D680 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D68C + .4byte 0 + .4byte 0x8045D698 + .4byte 0 + .4byte 0x8045D6A4 + .4byte 0 + .4byte 0x80557820 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x805577D0 + .4byte 0 + .4byte 0x8045D6B0 + .4byte 0 + .4byte 0x8045D6BC + .4byte 0 + .4byte 0x8045D6C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D6D8 + .4byte 0 + .4byte 0x805577A8 + .4byte 0 + .4byte 0x805577F8 + .4byte 0 + .4byte 0x8045D6E4 + .4byte 0 .global T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x411438, 0x48 + .4byte 0x80557828 + .4byte 0 + .4byte 0x80557728 + .4byte 0 + .4byte 0x8055782C + .4byte 0 + .4byte 0x80557834 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8045D6F0 + .4byte 0 + .4byte 0x80557840 + .4byte 0 + .4byte 0x80557848 + .4byte 0 + .4byte 0x8045D700 + .4byte 0 .global T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .incbin "baserom.dol", 0x411480, 0xB8 + .4byte 0 + .4byte 0x80557758 + .4byte 0 + .4byte 0x80415080 + .4byte 0x00000008 + .4byte 0 + .4byte 0x8045D710 + .4byte 0x80557758 + .4byte 0x804150C0 + .4byte 0x00000003 + .4byte 0 + .4byte 0x80557850 + .4byte 0 + .4byte 0x804150D8 + .4byte 0x0000000D + .4byte 0x01000000 + .4byte 0x80557858 + .4byte 0 + .4byte 0x80415140 + .4byte 0x0000000E + .4byte 0 + .4byte 0x80557860 + .4byte 0 + .4byte 0x804151B0 + .4byte 0x00000009 + .4byte 0x01000000 + .4byte 0x80557868 + .4byte 0 + .4byte 0x804151F8 + .4byte 0x00000009 + .4byte 0 + .4byte 0x80557870 + .4byte 0 + .4byte 0x80415240 + .4byte 0x0000000C + .4byte 0x01000000 + .4byte 0x80557878 + .4byte 0 + .4byte 0x804152A0 + .4byte 0x00000013 + .4byte 0 + .4byte 0x80557880 + .4byte 0 + .4byte 0x80415338 + .4byte 0x00000009 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: - .incbin "baserom.dol", 0x459658, 0x10 + .asciz "DrawingSuper" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x459668, 0xC + .asciz "ComboAttack" .global $$248745 $$248745: - .incbin "baserom.dol", 0x459674, 0x10 + .asciz "ComboAttack2" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x459684, 0xC + .asciz "Chopping" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x459690, 0xC + .asciz "ItemCatch" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x45969C, 0xC + .asciz "MultiAttack" .global $$248756 $$248756: - .incbin "baserom.dol", 0x4596A8, 0xC + .asciz "CicleRibon" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x4596B4, 0xC + .asciz "BeatFront" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x4596C0, 0xC + .asciz "BeatDouble" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x4596CC, 0xC + .asciz "BeatBack" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x4596D8, 0xC + .asciz "BeatHight" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x4596E4, 0xC + .asciz "Thunderbolt" .global $$248770 $$248770: - .incbin "baserom.dol", 0x4596F0, 0xC + .asciz "Lightning" + .balign 4 .global $$248773 $$248773: - .incbin "baserom.dol", 0x4596FC, 0xC + .asciz "Direction" + .balign 4 .global $$248774 $$248774: - .incbin "baserom.dol", 0x459708, 0xC + .asciz "Guriguri" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x459714, 0xC + .asciz "FeatherGun" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x459720, 0x10 + .asciz "FeatherSnipe" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x459730, 0x10 + .asciz "FallingCombo" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x459740, 0xC + .asciz "DivingCombo" .global $$248783 $$248783: - .incbin "baserom.dol", 0x45974C, 0xC + .asciz "FallingBomb" .global $$248784 $$248784: - .incbin "baserom.dol", 0x459758, 0x10 + .asciz "DivingCondor" + .balign 4 .global $$248786 $$248786: - .incbin "baserom.dol", 0x459768, 0xC + .asciz "ShuttleLoop" .global $$248787 $$248787: - .incbin "baserom.dol", 0x459774, 0xC + .asciz "Flapping" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x459780, 0xC + .asciz "SpinKick" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x45978C, 0xC + .asciz "TrampleKick" .global $$248791 $$248791: - .incbin "baserom.dol", 0x459798, 0xC + .asciz "DoubleKick" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x4597A4, 0xC + .asciz "RisingBreak" .global $$248794 $$248794: - .incbin "baserom.dol", 0x4597B0, 0xC + .asciz "MegaCannon" + .balign 4 .global $$248795 $$248795: - .incbin "baserom.dol", 0x4597BC, 0xC + .asciz "GigaCannon" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x4597C8, 0x10 + .asciz "MegaCannonFast" + .balign 4 .global $$248797 $$248797: - .incbin "baserom.dol", 0x4597D8, 0xC + .asciz "MoonSalto" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x4597E4, 0xC + .asciz "BackThrow" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x4597F0, 0x10 + .asciz "FinalCombo" + .balign 4 + .4byte 0 .global $$248805 $$248805: - .incbin "baserom.dol", 0x459800, 0x10 + .asciz "StoneFallingAir" .global $$248895 $$248895: - .incbin "baserom.dol", 0x459810, 0xC + .asciz "NormalWater" .global $$249240 $$249240: - .incbin "baserom.dol", 0x45981C, 0x1C + .asciz "common/abilitystaricon/%s" + .balign 4 .global $$249254 $$249254: - .incbin "baserom.dol", 0x459838, 0xC + .asciz "Abl%sTitle" + .balign 4 .global $$249263 $$249263: - .incbin "baserom.dol", 0x459844, 0x18 + .asciz "pause/abilityimage/%s" + .balign 4 .global $$249272 $$249272: - .incbin "baserom.dol", 0x45985C, 0xC + .asciz "Abl%sInfo" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: - .incbin "baserom.dol", 0x493AF0, 0x8 + .asciz "Jump" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x493AF8, 0x8 + .asciz "Drawing" .global $$248735 $$248735: - .incbin "baserom.dol", 0x493B00, 0x8 + .asciz "Drawn" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x493B08, 0x8 + .asciz "Dash" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x493B10, 0x8 + .asciz "Guard" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x493B18, 0x8 + .asciz "Sliding" .global $$248739 $$248739: - .incbin "baserom.dol", 0x493B20, 0x8 + .asciz "Swim" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x493B28, 0x8 + .asciz "Swim2" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x493B30, 0x8 + .asciz "Pistol" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x493B38, 0x8 + .asciz "Normal" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x493B40, 0x8 + .asciz "Beam" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x493B48, 0x8 + .asciz "Dril" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x493B50, 0x8 + .asciz "Under" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x493B58, 0x8 + .asciz "Upper" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x493B60, 0x8 + .asciz "Mteoend" .global $$248751 $$248751: - .incbin "baserom.dol", 0x493B68, 0x8 + .asciz "Roll" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x493B70, 0x8 + .asciz "Slash" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x493B78, 0x8 + .asciz "Roof" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x493B80, 0x8 + .asciz "Typhoon" .global $$248758 $$248758: - .incbin "baserom.dol", 0x493B88, 0x8 + .asciz "Capture" .global $$248763 $$248763: - .incbin "baserom.dol", 0x493B90, 0x8 + .asciz "Attack" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x493B98, 0x8 + .asciz "Stored" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x493BA0, 0x8 + .asciz "Arrow" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x493BA8, 0x8 + .asciz "Laser" + .balign 4 .global $$248767 $$248767: - .incbin "baserom.dol", 0x493BB0, 0x8 + .asciz "Cannon" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x493BB8, 0x8 + .asciz "Barrier" .global $$248771 $$248771: - .incbin "baserom.dol", 0x493BC0, 0x8 + .asciz "Swing" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x493BC8, 0x8 + .asciz "Sheild" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x493BD0, 0x8 + .asciz "Diving" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x493BD8, 0x8 + .asciz "Throw" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x493BE0, 0x8 + .asciz "Falling" .global $$248780 $$248780: - .incbin "baserom.dol", 0x493BE8, 0x8 + .asciz "Heading" .global $$248785 $$248785: - .incbin "baserom.dol", 0x493BF0, 0x8 + .asciz "Toss" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x493BF8, 0x8 + .asciz "Panchi" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x493C00, 0x8 + .asciz "SkyKick" .global $$248799 $$248799: - .incbin "baserom.dol", 0x493C08, 0x4 + .4byte 0x4A616200 .global $$248800 $$248800: - .incbin "baserom.dol", 0x493C0C, 0x8 + .asciz "Hammer" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x493C14, 0xC + .asciz "Wheel" + .balign 4 + .4byte 0 .global $$248803 $$248803: - .incbin "baserom.dol", 0x493C20, 0x8 + .asciz "Twinkle" .global $$248804 $$248804: - .incbin "baserom.dol", 0x493C28, 0x8 + .asciz "Stone" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x493C30, 0x8 + .asciz "Sword" + .balign 4 .global $$248897 $$248897: - .incbin "baserom.dol", 0x493C38, 0x8 + .asciz "Whip" + .balign 4 .global $$248898 $$248898: - .incbin "baserom.dol", 0x493C40, 0x8 + .asciz "Spark" + .balign 4 .global $$248899 $$248899: - .incbin "baserom.dol", 0x493C48, 0x8 + .asciz "Parasol" .global $$248900 $$248900: - .incbin "baserom.dol", 0x493C50, 0x8 + .asciz "Wing" + .balign 4 .global $$248901 $$248901: - .incbin "baserom.dol", 0x493C58, 0x8 + .asciz "Fighter" .global $$248902 $$248902: - .incbin "baserom.dol", 0x493C60, 0x8 + .asciz "Smash" + .balign 4 .global $$249320 $$249320: - .incbin "baserom.dol", 0x493C68, 0x8 + .asciz "%sBtn" + .balign 4 .global $$249331 $$249331: - .incbin "baserom.dol", 0x493C70, 0x8 + .asciz "Abl%s%s" diff --git a/asm/src/MapColl.s b/asm/src/MapColl.s index 003e9bd3..d7249901 100644 --- a/asm/src/MapColl.s +++ b/asm/src/MapColl.s @@ -5093,135 +5093,137 @@ initActor__Q43scn4step6weapon7MapCollFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253609 $$253609: - .incbin "baserom.dol", 0x49AE90, 0x4 + .4byte 0x3ECCCCCD .global $$253610 $$253610: - .incbin "baserom.dol", 0x49AE94, 0x4 + .4byte 0x3EFAE148 .global $$253611 $$253611: - .incbin "baserom.dol", 0x49AE98, 0x4 + .4byte 0x3F7D70A4 .global $$253678 $$253678: - .incbin "baserom.dol", 0x49AE9C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253932 $$253932: - .incbin "baserom.dol", 0x49B9F0, 0x4 + .4byte 0 .global $$253933 $$253933: - .incbin "baserom.dol", 0x49B9F4, 0x4 + .4byte 0x3F800000 .global $$254044 $$254044: - .incbin "baserom.dol", 0x49B9F8, 0x4 + .4byte 0x3F733333 .global $$254045 $$254045: - .incbin "baserom.dol", 0x49B9FC, 0x4 + .4byte 0x3F000000 .global $$254159 $$254159: - .incbin "baserom.dol", 0x49BA00, 0x4 + .4byte 0x3ECCCCCD .global $$254160 $$254160: - .incbin "baserom.dol", 0x49BA04, 0x4 + .4byte 0x3EFAE148 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259351 $$259351: - .incbin "baserom.dol", 0x49D7F0, 0x4 + .4byte 0 .global $$259406 $$259406: - .incbin "baserom.dol", 0x49D7F4, 0x4 + .4byte 0x3F800000 .global $$259407 $$259407: - .incbin "baserom.dol", 0x49D7F8, 0x4 + .4byte 0x3EE66666 .global $$259408 $$259408: - .incbin "baserom.dol", 0x49D7FC, 0x4 + .4byte 0x3E4F5C28 .global $$259555 $$259555: - .incbin "baserom.dol", 0x49D800, 0x4 + .4byte 0x3EFAE148 .global $$259556 $$259556: - .incbin "baserom.dol", 0x49D804, 0x4 + .4byte 0x3EB33333 .global $$259557 $$259557: - .incbin "baserom.dol", 0x49D808, 0x4 + .4byte 0x3F19999A .global $$259558 $$259558: - .incbin "baserom.dol", 0x49D80C, 0x4 + .4byte 0xBF400000 .global $$259559 $$259559: - .incbin "baserom.dol", 0x49D810, 0x4 + .4byte 0x3F0CCCCD .global $$259560 $$259560: - .incbin "baserom.dol", 0x49D814, 0x4 + .4byte 0x3F400000 .global $$259660 $$259660: - .incbin "baserom.dol", 0x49D818, 0x4 + .4byte 0x3F30A3D7 .global $$259661 $$259661: - .incbin "baserom.dol", 0x49D81C, 0x4 + .4byte 0x3F7D70A4 .global $$259838 $$259838: - .incbin "baserom.dol", 0x49D820, 0x4 + .4byte 0xBF800000 .global $$259839 $$259839: - .incbin "baserom.dol", 0x49D824, 0x4 + .4byte 0x3DCCCCCD .global $$259840 $$259840: - .incbin "baserom.dol", 0x49D828, 0x4 + .4byte 0xBF000000 .global $$259841 $$259841: - .incbin "baserom.dol", 0x49D82C, 0x4 + .4byte 0x3C23D70A .global $$259842 $$259842: - .incbin "baserom.dol", 0x49D830, 0x4 + .4byte 0x3F000000 .global $$259990 $$259990: - .incbin "baserom.dol", 0x49D834, 0x4 + .4byte 0x3EAE147B .global $$259991 $$259991: - .incbin "baserom.dol", 0x49D838, 0x4 + .4byte 0x3EC7AE14 .global $$260018 $$260018: - .incbin "baserom.dol", 0x49D83C, 0x4 + .4byte 0x3727C5AC .global $$260019 $$260019: - .incbin "baserom.dol", 0x49D840, 0x8 + .4byte 0xB727C5AC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254075 $$254075: - .incbin "baserom.dol", 0x49E560, 0x4 + .4byte 0 .global $$254135 $$254135: - .incbin "baserom.dol", 0x49E564, 0x4 + .4byte 0x3F000000 .global $$254228 $$254228: - .incbin "baserom.dol", 0x49E568, 0x4 + .4byte 0x3EC7AE14 .global $$254229 $$254229: - .incbin "baserom.dol", 0x49E56C, 0x4 + .4byte 0x3EFAE148 .global $$254230 $$254230: - .incbin "baserom.dol", 0x49E570, 0x8 + .4byte 0x3ED1EB84 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253837 $$253837: - .incbin "baserom.dol", 0x49E848, 0x4 + .4byte 0 .global $$253838 $$253838: - .incbin "baserom.dol", 0x49E84C, 0x4 + .4byte 0x3F800000 .global $$253839 $$253839: - .incbin "baserom.dol", 0x49E850, 0x4 + .4byte 0xBDCCCCCD .global $$253840 $$253840: - .incbin "baserom.dol", 0x49E854, 0x4 + .4byte 0x3DCCCCCD .global $$253960 $$253960: - .incbin "baserom.dol", 0x49E858, 0x4 + .4byte 0x3BF5C28F .global $$253961 $$253961: - .incbin "baserom.dol", 0x49E85C, 0x4 + .4byte 0xBF000000 diff --git a/asm/src/MapCollConstant.s b/asm/src/MapCollConstant.s index f6ec2bd9..85f78466 100644 --- a/asm/src/MapCollConstant.s +++ b/asm/src/MapCollConstant.s @@ -3,16 +3,17 @@ .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global EPSILON__Q43scn4step5chara15MapCollConstant EPSILON__Q43scn4step5chara15MapCollConstant: - .incbin "baserom.dol", 0x49B7F8, 0x4 + .4byte 0x3BF5C28F .global EPSILON2__Q43scn4step5chara15MapCollConstant EPSILON2__Q43scn4step5chara15MapCollConstant: - .incbin "baserom.dol", 0x49B7FC, 0x4 + .4byte 0x3BA3D70A .global ADSORPTION__Q43scn4step5chara15MapCollConstant ADSORPTION__Q43scn4step5chara15MapCollConstant: - .incbin "baserom.dol", 0x49B800, 0x4 + .4byte 0x3CF5C28F .global THRESHOLD__Q43scn4step5chara15MapCollConstant THRESHOLD__Q43scn4step5chara15MapCollConstant: - .incbin "baserom.dol", 0x49B804, 0x4 + .4byte 0x3F400000 .global PRESSVEC__Q43scn4step5chara15MapCollConstant PRESSVEC__Q43scn4step5chara15MapCollConstant: - .incbin "baserom.dol", 0x49B808, 0x8 + .4byte 0 + .4byte 0xBF000000 diff --git a/asm/src/MaproPos.s b/asm/src/MaproPos.s index 0e8b772c..a3538dce 100644 --- a/asm/src/MaproPos.s +++ b/asm/src/MaproPos.s @@ -29,4 +29,5 @@ toWorldPos__Q33scn4step8MaproPosCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249677 $$249677: - .incbin "baserom.dol", 0x49AD50, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/MaproRect.s b/asm/src/MaproRect.s index 5845d121..b52923b2 100644 --- a/asm/src/MaproRect.s +++ b/asm/src/MaproRect.s @@ -54,7 +54,9 @@ toWorldRect__Q33scn4step9MaproRectCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249776 $$249776: - .incbin "baserom.dol", 0x49AD58, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$249777 $$249777: - .incbin "baserom.dol", 0x49AD60, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/MasterIcon.s b/asm/src/MasterIcon.s index 83bc4d59..f13e8e2e 100644 --- a/asm/src/MasterIcon.s +++ b/asm/src/MasterIcon.s @@ -1009,71 +1009,88 @@ lbl_803B4720: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256921 $$256921: - .incbin "baserom.dol", 0x48C630, 0x14 + .asciz "step/challenge/Main" .global $$256922 $$256922: - .incbin "baserom.dol", 0x48C644, 0x10 + .asciz "ScreenOutBase" + .balign 4 .global $$256923 $$256923: - .incbin "baserom.dol", 0x48C654, 0x10 + .asciz "ScreenOutIcon" + .balign 4 .global $$256924 $$256924: - .incbin "baserom.dol", 0x48C664, 0x10 + .asciz "ScreenOutArrow" + .balign 4 .global $$256925 $$256925: - .incbin "baserom.dol", 0x48C674, 0x14 + .asciz "ScreenOutIconN" + .balign 4 + .4byte 0 .global $$256926 $$256926: - .incbin "baserom.dol", 0x48C688, 0x10 + .asciz "ScreenOutArrowN" .global $$256929 $$256929: - .incbin "baserom.dol", 0x48C698, 0xC + .asciz "GhostArrowN" .global $$256930 $$256930: - .incbin "baserom.dol", 0x48C6A4, 0xC + .asciz "IconLimitLU" .global $$256931 $$256931: - .incbin "baserom.dol", 0x48C6B0, 0xC + .asciz "IconLimitRD" .global $$256932 $$256932: - .incbin "baserom.dol", 0x48C6BC, 0x10 + .asciz "MasterLimitLU" + .balign 4 .global $$256933 $$256933: - .incbin "baserom.dol", 0x48C6CC, 0x44 + .asciz "MasterLimitRD" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256927 $$256927: - .incbin "baserom.dol", 0x497BD8, 0x4 + .4byte 0x57696E00 .global $$256928 $$256928: - .incbin "baserom.dol", 0x497BDC, 0x8 + .asciz "Wait" + .balign 4 .global $$257083 $$257083: - .incbin "baserom.dol", 0x497BE4, 0x8 + .asciz "ScaleN" + .balign 4 .global $$257095 $$257095: - .incbin "baserom.dol", 0x497BEC, 0x8 + .asciz "Lose" + .balign 4 .global $$257098 $$257098: - .incbin "baserom.dol", 0x497BF4, 0x4 + .4byte 0x496E0000 .global $$257105 $$257105: - .incbin "baserom.dol", 0x497BF8, 0x8 + .4byte 0x4F757400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257025 $$257025: - .incbin "baserom.dol", 0x49E478, 0x4 + .4byte 0x3727C5AC .global $$257026 $$257026: - .incbin "baserom.dol", 0x49E47C, 0x4 + .4byte 0 .global $$257027 $$257027: - .incbin "baserom.dol", 0x49E480, 0x4 + .4byte 0x3F800000 .global $$257084 $$257084: - .incbin "baserom.dol", 0x49E484, 0x4 + .4byte 0x3CC90FDB .global $$257085 $$257085: - .incbin "baserom.dol", 0x49E488, 0x8 + .4byte 0x42652EE1 + .4byte 0 diff --git a/asm/src/MasterMarker.s b/asm/src/MasterMarker.s index d44af07d..23412d92 100644 --- a/asm/src/MasterMarker.s +++ b/asm/src/MasterMarker.s @@ -54,4 +54,5 @@ __ct__Q53scn4step7gimmick12mastermarker12MasterMarkerFRCQ43scn4step3map18BinGmkG .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249893 $$249893: - .incbin "baserom.dol", 0x49D498, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MaterialAccessor.s b/asm/src/MaterialAccessor.s index 16d96f20..b324a9c9 100644 --- a/asm/src/MaterialAccessor.s +++ b/asm/src/MaterialAccessor.s @@ -285,13 +285,17 @@ lbl_801ADF98: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10$$20 $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10$$20: - .incbin "baserom.dol", 0x453A88, 0x28 + .asciz "NW4R:Failed assertion idx < TevColorMax" .global $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10 $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10: - .incbin "baserom.dol", 0x453AB0, 0xC + .asciz "material.h" + .balign 4 .global $$2STRING$$2SetTexSRTElement__Q34nw4r3lyt8MaterialFUlUlf$$20 $$2STRING$$2SetTexSRTElement__Q34nw4r3lyt8MaterialFUlUlf$$20: - .incbin "baserom.dol", 0x453ABC, 0x34 + .asciz "NW4R:Failed assertion texSRTIdx < mGXMemNum.texSRT" + .balign 4 .global $$2STRING$$2SetTexSRTElement__Q34nw4r3lyt8MaterialFUlUlf $$2STRING$$2SetTexSRTElement__Q34nw4r3lyt8MaterialFUlUlf: - .incbin "baserom.dol", 0x453AF0, 0x10 + .asciz "material.h" + .balign 4 + .4byte 0 diff --git a/asm/src/Matrix34.s b/asm/src/Matrix34.s index 8628f298..c22969c9 100644 --- a/asm/src/Matrix34.s +++ b/asm/src/Matrix34.s @@ -377,13 +377,13 @@ lbl_8019EACC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251888 $$251888: - .incbin "baserom.dol", 0x49A378, 0x4 + .4byte 0x4222F983 .global $$251900 $$251900: - .incbin "baserom.dol", 0x49A37C, 0x4 + .4byte 0x3F360B61 .global $$251977 $$251977: - .incbin "baserom.dol", 0x49A380, 0x4 + .4byte 0x3727C5AC .global $$251978 $$251978: - .incbin "baserom.dol", 0x49A384, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/Medal.s b/asm/src/Medal.s index 2e793e0f..bb89703a 100644 --- a/asm/src/Medal.s +++ b/asm/src/Medal.s @@ -246,39 +246,56 @@ lbl_803B4A64: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252254 $$252254: - .incbin "baserom.dol", 0x48C710, 0x14 + .asciz "masterresult/Main" + .balign 4 .global $$252255 $$252255: - .incbin "baserom.dol", 0x48C724, 0x18 + .asciz "challengeresult/Main" + .balign 4 .global $$252301 $$252301: - .incbin "baserom.dol", 0x48C73C, 0xC + .asciz "Platinum" + .balign 4 .global $$252313 $$252313: - .incbin "baserom.dol", 0x48C748, 0xC + .asciz "BronzeWait" + .balign 4 .global $$252314 $$252314: - .incbin "baserom.dol", 0x48C754, 0xC + .asciz "SilverWait" + .balign 4 .global $$252315 $$252315: - .incbin "baserom.dol", 0x48C760, 0xC + .asciz "GoldWait" + .balign 4 .global $$252316 $$252316: - .incbin "baserom.dol", 0x48C76C, 0x44 + .asciz "PlatinumWait" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252256 $$252256: - .incbin "baserom.dol", 0x497C00, 0x8 + .asciz "Medal" + .balign 4 .global $$252257 $$252257: - .incbin "baserom.dol", 0x497C08, 0x8 + .asciz "MedalN" + .balign 4 .global $$252298 $$252298: - .incbin "baserom.dol", 0x497C10, 0x8 + .asciz "Bronze" + .balign 4 .global $$252299 $$252299: - .incbin "baserom.dol", 0x497C18, 0x8 + .asciz "Silver" + .balign 4 .global $$252300 $$252300: - .incbin "baserom.dol", 0x497C20, 0x8 + .asciz "Gold" + .balign 4 diff --git a/asm/src/MemManager.s b/asm/src/MemManager.s index a766a92e..e25ac70d 100644 --- a/asm/src/MemManager.s +++ b/asm/src/MemManager.s @@ -41,4 +41,5 @@ allocatorForBG__Q43scn4step3map10MemManagerFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248975 $$248975: - .incbin "baserom.dol", 0x4983D0, 0x8 + .4byte 0x4D617000 + .4byte 0 diff --git a/asm/src/Memory.s b/asm/src/Memory.s index 7a4a95f5..c15efc25 100644 --- a/asm/src/Memory.s +++ b/asm/src/Memory.s @@ -300,30 +300,35 @@ seqHeap__Q23mem6MemoryFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249237 $$249237: - .incbin "baserom.dol", 0x455E70, 0x10 + .asciz "External" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249232 $$249232: - .incbin "baserom.dol", 0x493660, 0x8 + .asciz "ArenaM1" .global $$249233 $$249233: - .incbin "baserom.dol", 0x493668, 0x8 + .asciz "ArenaM2" .global $$249234 $$249234: - .incbin "baserom.dol", 0x493670, 0x8 + .asciz "Mem1Fix" .global $$249235 $$249235: - .incbin "baserom.dol", 0x493678, 0x8 + .asciz "Scene" + .balign 4 .global $$249236 $$249236: - .incbin "baserom.dol", 0x493680, 0x8 + .asciz "Mem2Fix" .global $$249238 $$249238: - .incbin "baserom.dol", 0x493688, 0x8 + .asciz "Debug" + .balign 4 .global $$249239 $$249239: - .incbin "baserom.dol", 0x493690, 0x8 + .4byte 0x53657100 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$248941 diff --git a/asm/src/Menu.s b/asm/src/Menu.s index a2a28d5e..681cac9c 100644 --- a/asm/src/Menu.s +++ b/asm/src/Menu.s @@ -1870,83 +1870,131 @@ lbl_803F7B84: .section .data, "wa" # 0x80421040 - 0x80496700 .global t_ModeItemSetList__18$$2unnamed$$2Menu_cpp$$2 t_ModeItemSetList__18$$2unnamed$$2Menu_cpp$$2: - .incbin "baserom.dol", 0x491B58, 0x10 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 .global t_VCItemSetList__18$$2unnamed$$2Menu_cpp$$2 t_VCItemSetList__18$$2unnamed$$2Menu_cpp$$2: - .incbin "baserom.dol", 0x491B68, 0x18 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 .global t_NextItemKindTable__18$$2unnamed$$2Menu_cpp$$2 t_NextItemKindTable__18$$2unnamed$$2Menu_cpp$$2: - .incbin "baserom.dol", 0x491B80, 0x48 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000009 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000009 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000009 .global $$255667 $$255667: - .incbin "baserom.dol", 0x491BC8, 0x10 + .asciz "grandmenu/Main" + .balign 4 .global $$255670 $$255670: - .incbin "baserom.dol", 0x491BD8, 0xC + .asciz "CurtainN" + .balign 4 .global $$255671 $$255671: - .incbin "baserom.dol", 0x491BE4, 0x10 + .asciz "ExplanationN" + .balign 4 .global $$255942 $$255942: - .incbin "baserom.dol", 0x491BF4, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$255943 $$255943: - .incbin "baserom.dol", 0x491C04, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$255944 $$255944: - .incbin "baserom.dol", 0x491C14, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$255945 $$255945: - .incbin "baserom.dol", 0x491C24, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$255946 $$255946: - .incbin "baserom.dol", 0x491C38, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$255947 $$255947: - .incbin "baserom.dol", 0x491C4C, 0x44 + .asciz "HistoryPackage3.dn" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255668 $$255668: - .incbin "baserom.dol", 0x498978, 0x8 + .asciz "Base" + .balign 4 .global $$255669 $$255669: - .incbin "baserom.dol", 0x498980, 0x4 + .4byte 0x42474E00 .global $$255672 $$255672: - .incbin "baserom.dol", 0x498984, 0x8 + .asciz "Mode" + .balign 4 .global $$255673 $$255673: - .incbin "baserom.dol", 0x49898C, 0x8 + .asciz "ModeN" + .balign 4 .global $$255674 $$255674: - .incbin "baserom.dol", 0x498994, 0x4 + .4byte 0x53697800 .global $$255675 $$255675: - .incbin "baserom.dol", 0x498998, 0x8 + .asciz "ButtonN" .global $$255676 $$255676: - .incbin "baserom.dol", 0x4989A0, 0x8 + .asciz "Wipe" + .balign 4 .global $$255677 $$255677: - .incbin "baserom.dol", 0x4989A8, 0x8 + .asciz "PlayerN" .global $$256091 $$256091: - .incbin "baserom.dol", 0x4989B0, 0x8 + .asciz "Start" + .balign 4 .global $$256099 $$256099: - .incbin "baserom.dol", 0x4989B8, 0x8 + .asciz "MenuBN" + .balign 4 .global $$256100 $$256100: - .incbin "baserom.dol", 0x4989C0, 0x8 + .asciz "MenuFN" + .balign 4 .global $$256101 $$256101: - .incbin "baserom.dol", 0x4989C8, 0x8 + .asciz "VCBN" + .balign 4 .global $$256102 $$256102: - .incbin "baserom.dol", 0x4989D0, 0x8 + .asciz "VCFN" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256090 $$256090: - .incbin "baserom.dol", 0x49ED80, 0x8 + .4byte 0x41200000 + .4byte 0 diff --git a/asm/src/Message.s b/asm/src/Message.s index ee79408f..6f981ebd 100644 --- a/asm/src/Message.s +++ b/asm/src/Message.s @@ -700,414 +700,734 @@ ListenConfirmMusic__Q43scn7history6detail7MessageFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2 MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2: - .incbin "baserom.dol", 0x411D90, 0x330 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80558810 + .4byte 0x80461D60 + .4byte 0x80461D70 + .4byte 0x80461D80 + .4byte 0x80558818 + .4byte 0x80461D90 + .4byte 0x80461DA4 + .4byte 0x80461DB0 + .4byte 0x80461DC0 + .4byte 0x80461DD8 + .4byte 0x80461DF0 + .4byte 0x8055881C + .4byte 0x80461E08 + .4byte 0x80461DA4 + .4byte 0x80461E24 + .4byte 0x80461E34 + .4byte 0x80461E48 + .4byte 0x80461E5C + .4byte 0x80558818 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80461E70 + .4byte 0x80461E80 + .4byte 0x80461E90 + .4byte 0x80461EA4 + .4byte 0x80558824 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80461EB8 + .4byte 0x80461EC8 + .4byte 0x80461EE0 + .4byte 0x80461EF8 + .4byte 0x80558824 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558828 + .4byte 0x80461F10 + .4byte 0x80461F20 + .4byte 0x80461F30 + .4byte 0x80558818 + .4byte 0x80461F40 + .4byte 0x80461DA4 + .4byte 0x80461F54 + .4byte 0x80461F64 + .4byte 0x80461F7C + .4byte 0x80461F94 + .4byte 0x80558818 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80461FAC + .4byte 0x80461FB8 + .4byte 0x80461FC8 + .4byte 0x80461FD8 + .4byte 0x80558824 + .4byte 0x80461FE8 + .4byte 0x80462000 + .4byte 0x80462010 + .4byte 0x8046201C + .4byte 0x80462030 + .4byte 0x80462044 + .4byte 0x80558818 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558830 + .4byte 0x80462058 + .4byte 0x80462068 + .4byte 0x80462078 + .4byte 0x80558824 + .4byte 0x80462088 + .4byte 0x80462000 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80558838 + .4byte 0x8046209C + .4byte 0x804620AC + .4byte 0x804620BC + .4byte 0x80558840 + .4byte 0x804620CC + .4byte 0x804620E8 + .4byte 0x804620F8 + .4byte 0x80462108 + .4byte 0x8046211C + .4byte 0x80462134 + .4byte 0x80558844 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x8046214C + .4byte 0x80462160 + .4byte 0x80462178 + .4byte 0x80462190 + .4byte 0x80558848 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x804621A8 + .4byte 0x804621B4 + .4byte 0x804621C8 + .4byte 0x804621DC + .4byte 0x80558850 + .4byte 0x804621F0 + .4byte 0x80558820 + .4byte 0x80462200 + .4byte 0x80462210 + .4byte 0x80462224 + .4byte 0x80462238 + .4byte 0x80558858 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x8046224C + .4byte 0x80462258 + .4byte 0x8046226C + .4byte 0x80462280 + .4byte 0x80558848 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80462294 + .4byte 0x804622A0 + .4byte 0x804622B4 + .4byte 0x804622C8 + .4byte 0x8055885C + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x804622DC + .4byte 0x804622EC + .4byte 0x80462300 + .4byte 0x80462314 + .4byte 0x8055885C + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80462328 + .4byte 0x80462334 + .4byte 0x80462348 + .4byte 0x80462358 + .4byte 0x8055885C + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0x80558808 + .4byte 0 + .4byte 0x80462368 + .4byte 0x80462378 + .4byte 0x8046238C + .4byte 0x804623A4 + .4byte 0x80558860 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x804623C0 + .4byte 0x804623D0 + .4byte 0x804623E8 + .4byte 0x80462400 + .4byte 0x8055885C + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80462418 + .4byte 0x80462424 + .4byte 0x80462438 + .4byte 0x80462448 + .4byte 0x80558860 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0x80558868 + .4byte 0x80462458 + .4byte 0x80462468 + .4byte 0x80462478 + .4byte 0x80558870 + .4byte 0x80558820 + .4byte 0x80558820 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248890 $$248890: - .incbin "baserom.dol", 0x4592D0, 0xC + .asciz "US_English" + .balign 4 .global $$248891 $$248891: - .incbin "baserom.dol", 0x4592DC, 0xC + .asciz "US_French" + .balign 4 .global $$248892 $$248892: - .incbin "baserom.dol", 0x4592E8, 0xC + .asciz "US_Spanish" + .balign 4 .global DIRS_US__21$$2unnamed$$2Message_cpp$$2 DIRS_US__21$$2unnamed$$2Message_cpp$$2: - .incbin "baserom.dol", 0x4592F4, 0x1C + .4byte 0 + .4byte 0x8045D1D0 + .4byte 0 + .4byte 0x8045D1DC + .4byte 0x8045D1E8 + .4byte 0 + .4byte 0 .global $$248894 $$248894: - .incbin "baserom.dol", 0x459310, 0xC + .asciz "EU_English" + .balign 4 .global $$248895 $$248895: - .incbin "baserom.dol", 0x45931C, 0xC + .asciz "EU_German" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x459328, 0xC + .asciz "EU_French" + .balign 4 .global $$248897 $$248897: - .incbin "baserom.dol", 0x459334, 0xC + .asciz "EU_Spanish" + .balign 4 .global $$248898 $$248898: - .incbin "baserom.dol", 0x459340, 0xC + .asciz "EU_Italian" + .balign 4 .global $$248899 $$248899: - .incbin "baserom.dol", 0x45934C, 0xC + .asciz "EU_Dutch" + .balign 4 .global DIRS_EU__21$$2unnamed$$2Message_cpp$$2 DIRS_EU__21$$2unnamed$$2Message_cpp$$2: - .incbin "baserom.dol", 0x459358, 0x1C + .4byte 0 + .4byte 0x8045D210 + .4byte 0x8045D21C + .4byte 0x8045D228 + .4byte 0x8045D234 + .4byte 0x8045D240 + .4byte 0x8045D24C .global $$248901 $$248901: - .incbin "baserom.dol", 0x459374, 0xC + .asciz "JP_Japanese" .global DIRS_JP__21$$2unnamed$$2Message_cpp$$2 DIRS_JP__21$$2unnamed$$2Message_cpp$$2: - .incbin "baserom.dol", 0x459380, 0x1C + .4byte 0x8045D274 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$249227 $$249227: - .incbin "baserom.dol", 0x45939C, 0xC + .asciz "msg/%s/%s" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248755 $$248755: - .incbin "baserom.dol", 0x45DE60, 0x10 + .asciz "SelectKirby1" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x45DE70, 0x10 + .asciz "ReleaseKirby1" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x45DE80, 0x10 + .asciz "ExplainKirby1" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x45DE90, 0x14 + .asciz "PlayGameCheckKirby1" .global $$248760 $$248760: - .incbin "baserom.dol", 0x45DEA4, 0xC + .asciz "OnePersons" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x45DEB0, 0x10 + .asciz "KirbyDreamLand" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x45DEC0, 0x18 + .asciz "SelectKirbyDreamLand" + .balign 4 .global $$248763 $$248763: - .incbin "baserom.dol", 0x45DED8, 0x18 + .asciz "ReleaseKirbyDreamLand" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x45DEF0, 0x18 + .asciz "ExplainKirbyDreamLand" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x45DF08, 0x1C + .asciz "PlayGameCheckKirbyDreamLand" .global $$248767 $$248767: - .incbin "baserom.dol", 0x45DF24, 0x10 + .asciz "KirbyPinBall" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x45DF34, 0x14 + .asciz "SelectKirbyPinBall" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x45DF48, 0x14 + .asciz "ReleaseKirbyPinBall" .global $$248770 $$248770: - .incbin "baserom.dol", 0x45DF5C, 0x14 + .asciz "ExplainKirbyPinBall" .global $$248772 $$248772: - .incbin "baserom.dol", 0x45DF70, 0x10 + .asciz "KirbyBall" + .balign 4 + .4byte 0 .global $$248773 $$248773: - .incbin "baserom.dol", 0x45DF80, 0x10 + .asciz "SelectKirbyBall" .global $$248774 $$248774: - .incbin "baserom.dol", 0x45DF90, 0x14 + .asciz "ReleaseKirbyBall" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x45DFA4, 0x14 + .asciz "ExplainKirbyBall" + .balign 4 .global $$248777 $$248777: - .incbin "baserom.dol", 0x45DFB8, 0x10 + .asciz "KirbyAvalanche" + .balign 4 .global $$248778 $$248778: - .incbin "baserom.dol", 0x45DFC8, 0x18 + .asciz "SelectKirbyAvalanche" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x45DFE0, 0x18 + .asciz "ReleaseKirbyAvalanche" + .balign 4 .global $$248780 $$248780: - .incbin "baserom.dol", 0x45DFF8, 0x18 + .asciz "ExplainKirbyAvalanche" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x45E010, 0x10 + .asciz "SelectKirby2" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x45E020, 0x10 + .asciz "ReleaseKirby2" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x45E030, 0x10 + .asciz "ExplainKirby2" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x45E040, 0x14 + .asciz "PlayGameCheckKirby2" .global $$248786 $$248786: - .incbin "baserom.dol", 0x45E054, 0x10 + .asciz "KirbyBlockBall" + .balign 4 .global $$248787 $$248787: - .incbin "baserom.dol", 0x45E064, 0x18 + .asciz "SelectKirbyBlockBall" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x45E07C, 0x18 + .asciz "ReleaseKirbyBlockBall" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x45E094, 0x18 + .asciz "ExplainKirbyBlockBall" + .balign 4 .global $$248790 $$248790: - .incbin "baserom.dol", 0x45E0AC, 0xC + .asciz "KirbySDX" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x45E0B8, 0x10 + .asciz "SelectKirbySDX" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x45E0C8, 0x10 + .asciz "ReleaseKirbySDX" .global $$248793 $$248793: - .incbin "baserom.dol", 0x45E0D8, 0x10 + .asciz "ExplainKirbySDX" .global $$248794 $$248794: - .incbin "baserom.dol", 0x45E0E8, 0x18 + .asciz "PlayGameCheckKirbySDX" + .balign 4 .global $$248795 $$248795: - .incbin "baserom.dol", 0x45E100, 0x10 + .asciz "One_TwoPersons" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x45E110, 0xC + .asciz "KirbyKidsGB" .global $$248797 $$248797: - .incbin "baserom.dol", 0x45E11C, 0x14 + .asciz "SelectKirbyKidsGB" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x45E130, 0x14 + .asciz "ReleaseKirbyKidsGB" + .balign 4 .global $$248799 $$248799: - .incbin "baserom.dol", 0x45E144, 0x14 + .asciz "ExplainKirbyKidsGB" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x45E158, 0x10 + .asciz "SelectKirby3" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x45E168, 0x10 + .asciz "ReleaseKirby3" + .balign 4 .global $$248803 $$248803: - .incbin "baserom.dol", 0x45E178, 0x10 + .asciz "ExplainKirby3" + .balign 4 .global $$248804 $$248804: - .incbin "baserom.dol", 0x45E188, 0x14 + .asciz "PlayGameCheckKirby3" .global $$248806 $$248806: - .incbin "baserom.dol", 0x45E19C, 0x10 + .asciz "SelectKirby64" + .balign 4 .global $$248807 $$248807: - .incbin "baserom.dol", 0x45E1AC, 0x10 + .asciz "ReleaseKirby64" + .balign 4 .global $$248808 $$248808: - .incbin "baserom.dol", 0x45E1BC, 0x10 + .asciz "ExplainKirby64" + .balign 4 .global $$248810 $$248810: - .incbin "baserom.dol", 0x45E1CC, 0x1C + .asciz "PlayGameCheckKirby64" + .balign 4 + .4byte 0 .global $$248811 $$248811: - .incbin "baserom.dol", 0x45E1E8, 0x10 + .asciz "One_FourPersons" .global $$248812 $$248812: - .incbin "baserom.dol", 0x45E1F8, 0x10 + .asciz "KirbyKoroKoro" + .balign 4 .global $$248813 $$248813: - .incbin "baserom.dol", 0x45E208, 0x14 + .asciz "SelectKirbyKoroKoro" .global $$248814 $$248814: - .incbin "baserom.dol", 0x45E21C, 0x18 + .asciz "ReleaseKirbyKoroKoro" + .balign 4 .global $$248815 $$248815: - .incbin "baserom.dol", 0x45E234, 0x18 + .asciz "ExplainKirbyKoroKoro" + .balign 4 .global $$248817 $$248817: - .incbin "baserom.dol", 0x45E24C, 0x14 + .asciz "KirbyDreamLandDX" + .balign 4 .global $$248818 $$248818: - .incbin "baserom.dol", 0x45E260, 0x18 + .asciz "SelectKirbyDreamLandDX" + .balign 4 .global $$248819 $$248819: - .incbin "baserom.dol", 0x45E278, 0x18 + .asciz "ReleaseKirbyDreamLandDX" .global $$248820 $$248820: - .incbin "baserom.dol", 0x45E290, 0x18 + .asciz "ExplainKirbyDreamLandDX" .global $$248822 $$248822: - .incbin "baserom.dol", 0x45E2A8, 0xC + .asciz "KirbyAnime1" .global $$248823 $$248823: - .incbin "baserom.dol", 0x45E2B4, 0x14 + .asciz "SelectKirbyAnime1" + .balign 4 .global $$248824 $$248824: - .incbin "baserom.dol", 0x45E2C8, 0x14 + .asciz "ReleaseKirbyAnime1" + .balign 4 .global $$248825 $$248825: - .incbin "baserom.dol", 0x45E2DC, 0x14 + .asciz "ExplainKirbyAnime1" + .balign 4 .global $$248827 $$248827: - .incbin "baserom.dol", 0x45E2F0, 0x10 + .asciz "PlayAnimeCheck" + .balign 4 .global $$248828 $$248828: - .incbin "baserom.dol", 0x45E300, 0x10 + .asciz "KirbyAirRide" + .balign 4 .global $$248829 $$248829: - .incbin "baserom.dol", 0x45E310, 0x14 + .asciz "SelectKirbyAirRide" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x45E324, 0x14 + .asciz "ReleaseKirbyAirRide" .global $$248831 $$248831: - .incbin "baserom.dol", 0x45E338, 0x14 + .asciz "ExplainKirbyAirRide" .global $$248833 $$248833: - .incbin "baserom.dol", 0x45E34C, 0xC + .asciz "KirbyMirror" .global $$248834 $$248834: - .incbin "baserom.dol", 0x45E358, 0x14 + .asciz "SelectKirbyMirror" + .balign 4 .global $$248835 $$248835: - .incbin "baserom.dol", 0x45E36C, 0x14 + .asciz "ReleaseKirbyMirror" + .balign 4 .global $$248836 $$248836: - .incbin "baserom.dol", 0x45E380, 0x14 + .asciz "ExplainKirbyMirror" + .balign 4 .global $$248837 $$248837: - .incbin "baserom.dol", 0x45E394, 0xC + .asciz "KirbyTouch" + .balign 4 .global $$248838 $$248838: - .incbin "baserom.dol", 0x45E3A0, 0x14 + .asciz "SelectKirbyTouch" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x45E3B4, 0x14 + .asciz "ReleaseKirbyTouch" + .balign 4 .global $$248840 $$248840: - .incbin "baserom.dol", 0x45E3C8, 0x14 + .asciz "ExplainKirbyTouch" + .balign 4 .global $$248842 $$248842: - .incbin "baserom.dol", 0x45E3DC, 0x10 + .asciz "KirbyDoroche" + .balign 4 .global $$248843 $$248843: - .incbin "baserom.dol", 0x45E3EC, 0x14 + .asciz "SelectKirbyDoroche" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x45E400, 0x14 + .asciz "ReleaseKirbyDoroche" .global $$248845 $$248845: - .incbin "baserom.dol", 0x45E414, 0x14 + .asciz "ExplainKirbyDoroche" .global $$248846 $$248846: - .incbin "baserom.dol", 0x45E428, 0xC + .asciz "KirbyDDX" + .balign 4 .global $$248847 $$248847: - .incbin "baserom.dol", 0x45E434, 0x14 + .asciz "SelectKirbyDDX" + .balign 4 + .4byte 0 .global $$248848 $$248848: - .incbin "baserom.dol", 0x45E448, 0x10 + .asciz "ReleaseKirbyDDX" .global $$248849 $$248849: - .incbin "baserom.dol", 0x45E458, 0x10 + .asciz "ExplainKirbyDDX" .global $$248850 $$248850: - .incbin "baserom.dol", 0x45E468, 0x10 + .asciz "KirbyEpicYarn" + .balign 4 .global $$248851 $$248851: - .incbin "baserom.dol", 0x45E478, 0x14 + .asciz "SelectKirbyEpicYarn" .global $$248852 $$248852: - .incbin "baserom.dol", 0x45E48C, 0x18 + .asciz "ReleaseKirbyEpicYarn" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x45E4A4, 0x1C + .asciz "ExplainKirbyEpicYarn" + .balign 4 + .4byte 0 .global $$248855 $$248855: - .incbin "baserom.dol", 0x45E4C0, 0x10 + .asciz "KirbyMassAttack" .global $$248856 $$248856: - .incbin "baserom.dol", 0x45E4D0, 0x18 + .asciz "SelectKirbyMassAttack" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x45E4E8, 0x18 + .asciz "ReleaseKirbyMassAttack" + .balign 4 .global $$248858 $$248858: - .incbin "baserom.dol", 0x45E500, 0x18 + .asciz "ExplainKirbyMassAttack" + .balign 4 .global $$248859 $$248859: - .incbin "baserom.dol", 0x45E518, 0xC + .asciz "KirbyWii" + .balign 4 .global $$248860 $$248860: - .incbin "baserom.dol", 0x45E524, 0x14 + .asciz "SelectKirbyWii" + .balign 4 + .4byte 0 .global $$248861 $$248861: - .incbin "baserom.dol", 0x45E538, 0x10 + .asciz "ReleaseKirbyWii" .global $$248862 $$248862: - .incbin "baserom.dol", 0x45E548, 0x10 + .asciz "ExplainKirbyWii" .global $$248864 $$248864: - .incbin "baserom.dol", 0x45E558, 0x10 + .asciz "SelectKirby20" + .balign 4 .global $$248865 $$248865: - .incbin "baserom.dol", 0x45E568, 0x10 + .asciz "ReleaseKirby20" + .balign 4 .global $$248866 $$248866: - .incbin "baserom.dol", 0x45E578, 0x10 + .asciz "ExplainKirby20" + .balign 4 .global $$249027 $$249027: - .incbin "baserom.dol", 0x45E588, 0xC + .asciz "ToMainMenu" + .balign 4 .global $$249035 $$249035: - .incbin "baserom.dol", 0x45E594, 0x14 + .asciz "PlayMusicCheck" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249207 $$249207: - .incbin "baserom.dol", 0x493A08, 0x8 + .asciz ".msbt" + .balign 4 .global $$249208 $$249208: - .incbin "baserom.dol", 0x493A10, 0x8 + .asciz "%s%s" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248753 $$248753: - .incbin "baserom.dol", 0x494BE8, 0x8 + .asciz "Dummy" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x494BF0, 0x8 + .asciz "Kirby1" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x494BF8, 0x4 + .4byte 0x47420000 .global $$248765 $$248765: - .incbin "baserom.dol", 0x494BFC, 0x4 + .4byte 0x46430000 .global $$248771 $$248771: - .incbin "baserom.dol", 0x494C00, 0x4 + .4byte 0 .global $$248776 $$248776: - .incbin "baserom.dol", 0x494C04, 0x4 + .4byte 0x53464300 .global $$248781 $$248781: - .incbin "baserom.dol", 0x494C08, 0x8 + .asciz "Kirby2" + .balign 4 .global $$248800 $$248800: - .incbin "baserom.dol", 0x494C10, 0x8 + .asciz "Kirby3" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x494C18, 0x8 + .asciz "Kirby64" .global $$248809 $$248809: - .incbin "baserom.dol", 0x494C20, 0x4 + .4byte 0x4E363400 .global $$248816 $$248816: - .incbin "baserom.dol", 0x494C24, 0x4 + .4byte 0x47424300 .global $$248821 $$248821: - .incbin "baserom.dol", 0x494C28, 0x8 + .4byte 0x47424100 + .4byte 0 .global $$248826 $$248826: - .incbin "baserom.dol", 0x494C30, 0x8 + .asciz "TVAnime" .global $$248832 $$248832: - .incbin "baserom.dol", 0x494C38, 0x4 + .4byte 0x47430000 .global $$248841 $$248841: - .incbin "baserom.dol", 0x494C3C, 0x4 + .4byte 0x44530000 .global $$248854 $$248854: - .incbin "baserom.dol", 0x494C40, 0x8 + .4byte 0x57696900 + .4byte 0 .global $$248863 $$248863: - .incbin "baserom.dol", 0x494C48, 0x8 + .asciz "Kirby20" .global $$248867 $$248867: - .incbin "baserom.dol", 0x494C50, 0x8 + .asciz "Donut" + .balign 4 .global $$249033 $$249033: - .incbin "baserom.dol", 0x494C58, 0x8 + .asciz "%s%d" + .balign 4 diff --git a/asm/src/MessageWindow.s b/asm/src/MessageWindow.s index 7360a812..152926d4 100644 --- a/asm/src/MessageWindow.s +++ b/asm/src/MessageWindow.s @@ -2057,81 +2057,148 @@ __dt__Q43std3tr16detail367function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail318bound_ .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257430 $$257430: - .incbin "baserom.dol", 0x48BF10, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$257431 $$257431: - .incbin "baserom.dol", 0x48BF20, 0x10 + .asciz "MessageWindow" + .balign 4 .global $$257432 $$257432: - .incbin "baserom.dol", 0x48BF30, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$257579 $$257579: - .incbin "baserom.dol", 0x48BF3C, 0xC + .asciz "MessageText" .global $$257580 $$257580: - .incbin "baserom.dol", 0x48BF48, 0x10 + .asciz "MessageText_Sh" + .balign 4 .global $$257614 $$257614: - .incbin "baserom.dol", 0x48BF58, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803AEDE0 .global $$257687 $$257687: - .incbin "baserom.dol", 0x48BF64, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803AEDE0 .global $$257688 $$257688: - .incbin "baserom.dol", 0x48BF70, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803AEDE0 .global $$257731 $$257731: - .incbin "baserom.dol", 0x48BF7C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803AF1FC .global $$257820 $$257820: - .incbin "baserom.dol", 0x48BF88, 0xC + .asciz "MahoroaName" .global $$257831 $$257831: - .incbin "baserom.dol", 0x48BF94, 0x14 + .asciz "bad_function_call" + .balign 4 .global __vt__Q43std3tr16detail367function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail318bound_func$$0v$$4Q43std3tr16detail51mem_fn_2$$0v$$4Q43scn4step4info13MessageWindow$$4PCc$$4PCc$$1$$4Q33std3tr1220tuple$$0PQ43scn4step4info13MessageWindow$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1 __vt__Q43std3tr16detail367function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail318bound_func$$0v$$4Q43std3tr16detail51mem_fn_2$$0v$$4Q43scn4step4info13MessageWindow$$4PCc$$4PCc$$1$$4Q33std3tr1220tuple$$0PQ43scn4step4info13MessageWindow$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1: - .incbin "baserom.dol", 0x48BFA8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x803AF644 + .4byte 0x803AF30C + .4byte 0x803AF34C + .4byte 0x803AF368 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48BFD8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x803AF640 + .4byte 0x803AF36C + .4byte 0x803AF3AC + .4byte 0x803AF3C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48C008, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803AF63C + .4byte 0x803AF3D0 + .4byte 0x803AF410 + .4byte 0x803AF42C .global __vt__Q43std3tr16detail299function_imp$$0PFv_b$$4Q43std3tr16detail255bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1162tuple$$0PQ43scn4step4info13MessageWindow$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail299function_imp$$0PFv_b$$4Q43std3tr16detail255bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1162tuple$$0PQ43scn4step4info13MessageWindow$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x48C020, 0x78 + .4byte 0 + .4byte 0 + .4byte 0x803AF638 + .4byte 0x803AF458 + .4byte 0x803AF498 + .4byte 0x803AF4B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257581 $$257581: - .incbin "baserom.dol", 0x497A10, 0x8 + .asciz "Name" + .balign 4 .global $$257582 $$257582: - .incbin "baserom.dol", 0x497A18, 0x8 + .asciz "Name_Sh" .global $$257583 $$257583: - .incbin "baserom.dol", 0x497A20, 0x8 + .asciz "Exit" + .balign 4 .global $$257584 $$257584: - .incbin "baserom.dol", 0x497A28, 0x8 + .asciz "Exit_Sh" .global $$257585 $$257585: - .incbin "baserom.dol", 0x497A30, 0x8 + .asciz "Start" + .balign 4 .global $$257590 $$257590: - .incbin "baserom.dol", 0x497A38, 0x8 + .asciz "Wait" + .balign 4 .global $$257596 $$257596: - .incbin "baserom.dol", 0x497A40, 0x4 + .4byte 0x456E6400 .global $$257634 $$257634: - .incbin "baserom.dol", 0x497A44, 0x8 + .asciz "Close" + .balign 4 .global $$257635 $$257635: - .incbin "baserom.dol", 0x497A4C, 0x8 + .asciz "Next" + .balign 4 .global $$257702 $$257702: - .incbin "baserom.dol", 0x497A54, 0x4 + .4byte 0 .global $$257830 $$257830: - .incbin "baserom.dol", 0x497A58, 0x8 + .asciz "Suspend" diff --git a/asm/src/Meta.s b/asm/src/Meta.s index 5553d555..284ee4f8 100644 --- a/asm/src/Meta.s +++ b/asm/src/Meta.s @@ -95,479 +95,1526 @@ Script__Q53scn4step4hero9modeldesc4MetaFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: - .incbin "baserom.dol", 0x41AC08, 0xE38 + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B090 + .4byte 0x0000000C + .4byte 0x8055B098 + .4byte 0x0000000C + .4byte 0x8055B0A0 + .4byte 0x0000000C + .4byte 0x8055B0A8 + .4byte 0x0000000C + .4byte 0x8055B0B0 + .4byte 0x0000000C + .4byte 0x8055B0B8 + .4byte 0x0000000C + .4byte 0x8048ACA8 + .4byte 0x0000000C + .4byte 0x8055B0C0 + .4byte 0x0000000C + .4byte 0x8055B0C8 + .4byte 0x0000000C + .4byte 0x8055B0D0 + .4byte 0x0000000C + .4byte 0x8048ACB4 + .4byte 0x0000000C + .4byte 0x8055B0D8 + .4byte 0x0000000C + .4byte 0x8048ACC0 + .4byte 0x0000000C + .4byte 0x8048ACCC + .4byte 0x0000000C + .4byte 0x8055B0E0 + .4byte 0x0000000C + .4byte 0x8048ACDC + .4byte 0x0000000C + .4byte 0x8048ACE8 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055B0E8 + .4byte 0x0000000C + .4byte 0x8048ACF4 + .4byte 0x0000000C + .4byte 0x8048AD00 + .4byte 0x0000000C + .4byte 0x8048AD0C + .4byte 0x0000000C + .4byte 0x8055B0F0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048AD18 + .4byte 0x0000000C + .4byte 0x8048AD28 + .4byte 0x0000000C + .4byte 0x8048AD38 + .4byte 0x0000000C + .4byte 0x8048AD48 + .4byte 0x0000000C + .4byte 0x8048AD58 + .4byte 0x0000000C + .4byte 0x8048AD64 + .4byte 0x0000000C + .4byte 0x8048AD70 + .4byte 0x0000000C + .4byte 0x8048AD7C + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055B0F4 + .4byte 0x0000000C + .4byte 0x8048AD88 + .4byte 0x0000000C + .4byte 0x8055B0F4 + .4byte 0x0000000C + .4byte 0x8048AD88 + .4byte 0x0000000C + .4byte 0x8048AD94 + .4byte 0x0000000C + .4byte 0x8055B0FC + .4byte 0x0000000C + .4byte 0x8048ADA0 + .4byte 0x0000000C + .4byte 0x8055B104 + .4byte 0x0000000C + .4byte 0x8048ADAC + .4byte 0x0000000C + .4byte 0x8048ADC4 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055B108 + .4byte 0x0000000C + .4byte 0x8055B110 + .4byte 0x0000000C + .4byte 0x8055B118 + .4byte 0x0000000C + .4byte 0x8055B120 + .4byte 0x0000000C + .4byte 0x8048ADD8 + .4byte 0x0000000C + .4byte 0x8048ADE4 + .4byte 0x0000000C + .4byte 0x8055B128 + .4byte 0x0000000C + .4byte 0x8055B130 + .4byte 0x0000000C + .4byte 0x8055B138 + .4byte 0x0000000C + .4byte 0x8055B140 + .4byte 0x0000000C + .4byte 0x8055B148 + .4byte 0x0000000C + .4byte 0x8055B150 + .4byte 0x0000000C + .4byte 0x8055B158 + .4byte 0x0000000C + .4byte 0x8055B160 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B0B0 + .4byte 0x0000000C + .4byte 0x8055B168 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0x8055B170 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0x8055B178 + .4byte 0x0000000C + .4byte 0x8055B180 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048ADF0 + .4byte 0x0000000C + .4byte 0x8048ADFC + .4byte 0x0000000C + .4byte 0x8048AE08 + .4byte 0x0000000C + .4byte 0x8055B188 + .4byte 0x0000000C + .4byte 0x8055B190 + .4byte 0x0000000C + .4byte 0x8048AE14 + .4byte 0x0000000C + .4byte 0x8048AE20 + .4byte 0x0000000C + .4byte 0x8048AE34 + .4byte 0x0000000C + .4byte 0x8048AE44 + .4byte 0x0000000C + .4byte 0x8048AE50 + .4byte 0x0000000C + .4byte 0x8048AE60 + .4byte 0x0000000C + .4byte 0x8055B198 + .4byte 0x0000000C + .4byte 0x8055B198 + .4byte 0x0000000C + .4byte 0x8055B198 + .4byte 0x0000000C + .4byte 0x8048AE70 + .4byte 0x0000000C + .4byte 0x8048AE7C + .4byte 0x0000000C + .4byte 0x8048AE88 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8048AE98 + .4byte 0x0000000C + .4byte 0x8048AD00 + .4byte 0x0000000C + .4byte 0x8048AEA4 + .4byte 0x0000000C + .4byte 0x8048AEB4 + .4byte 0x0000000C + .4byte 0x8048AEC4 + .4byte 0x0000000C + .4byte 0x8048AED8 + .4byte 0x0000000C + .4byte 0x8048AEE8 + .4byte 0x0000000C + .4byte 0x8048AF00 + .4byte 0x0000000C + .4byte 0x8055B1A0 + .4byte 0x0000000C + .4byte 0x8048AF0C + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048AF18 + .4byte 0x0000000C + .4byte 0x8055B1A8 + .4byte 0x0000000C + .4byte 0x8048AF28 + .4byte 0x0000000C + .4byte 0x8055B1B0 + .4byte 0x0000000C + .4byte 0x8048AF34 + .4byte 0x0000000C + .4byte 0x8055B1B8 + .4byte 0x0000000C + .4byte 0x8048AF40 + .4byte 0x0000000C + .4byte 0x8048AF4C + .4byte 0x0000000C + .4byte 0x8048AF58 + .4byte 0x0000000C + .4byte 0x8048AF68 + .4byte 0x0000000C + .4byte 0x8048AF74 + .4byte 0x0000000C + .4byte 0x8048AF80 + .4byte 0x0000000C + .4byte 0x8048AF90 + .4byte 0x0000000C + .4byte 0x8048AF9C + .4byte 0x0000000C + .4byte 0x8048AFAC + .4byte 0x0000000C + .4byte 0x8048AFBC + .4byte 0x0000000C + .4byte 0x8048AFC8 + .4byte 0x0000000C + .4byte 0x8048AFD4 + .4byte 0x0000000C + .4byte 0x8048AFE4 + .4byte 0x0000000C + .4byte 0x8048AFF8 + .4byte 0x0000000C + .4byte 0x8048B004 + .4byte 0x0000000C + .4byte 0x8048B014 + .4byte 0x0000000C + .4byte 0x8048B024 + .4byte 0x0000000C + .4byte 0x8048B038 + .4byte 0x0000000C + .4byte 0x8048B04C + .4byte 0x0000000C + .4byte 0x8048B064 + .4byte 0x0000000C + .4byte 0x8048B078 + .4byte 0x0000000C + .4byte 0x8048B098 + .4byte 0x0000000C + .4byte 0x8048B0B8 + .4byte 0x0000000C + .4byte 0x8048B0D8 + .4byte 0x0000000C + .4byte 0x8048B0EC + .4byte 0x0000000C + .4byte 0x8048B0FC + .4byte 0x0000000C + .4byte 0x8048B110 + .4byte 0x0000000C + .4byte 0x8048B120 + .4byte 0x0000000C + .4byte 0x8055B1C0 + .4byte 0x0000000C + .4byte 0x8048B134 + .4byte 0x0000000C + .4byte 0x8048B150 + .4byte 0x0000000C + .4byte 0x8048B168 + .4byte 0x0000000C + .4byte 0x8048B184 + .4byte 0x0000000C + .4byte 0x8048B198 + .4byte 0x0000000C + .4byte 0x8048B1A8 + .4byte 0x0000000C + .4byte 0x8048B1B8 + .4byte 0x0000000C + .4byte 0x8048B1C8 + .4byte 0x0000000C + .4byte 0x8048B1E0 + .4byte 0x0000000C + .4byte 0x8048B1F4 + .4byte 0x0000000C + .4byte 0x8048B204 + .4byte 0x0000000C + .4byte 0x8048B218 + .4byte 0x0000000C + .4byte 0x8048B228 + .4byte 0x0000000C + .4byte 0x8048B238 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8048B24C + .4byte 0x0000000C + .4byte 0x8048B258 + .4byte 0x0000000C + .4byte 0x8048B264 + .4byte 0x0000000C + .4byte 0x8048B270 + .4byte 0x0000000C + .4byte 0x8055B1C8 + .4byte 0x0000000C + .4byte 0x8048B27C + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B088 + .4byte 0x0000000C + .4byte 0x8055B1D0 + .4byte 0x0000000C + .4byte 0x8055B1D8 + .4byte 0x0000000C + .4byte 0x8048B288 + .4byte 0x0000000C + .4byte 0x8055B1E0 + .4byte 0x0000000C + .4byte 0x8048B294 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: - .incbin "baserom.dol", 0x486DA8, 0xC + .asciz "JumpStart" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x486DB4, 0xC + .asciz "SquatStart" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x486DC0, 0xC + .asciz "SquatEnd" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x486DCC, 0x10 + .asciz "SlidingStart" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x486DDC, 0xC + .asciz "SlidingEnd" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x486DE8, 0xC + .asciz "SlidingHit" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x486DF4, 0xC + .asciz "DamageEtc" + .balign 4 .global $$248747 $$248747: - .incbin "baserom.dol", 0x486E00, 0xC + .asciz "LadderUp" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x486E0C, 0xC + .asciz "LadderDown" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x486E18, 0x10 + .asciz "PlancherStart" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x486E28, 0x10 + .asciz "Plancher" + .balign 4 + .4byte 0 .global $$248752 $$248752: - .incbin "baserom.dol", 0x486E38, 0x10 + .asciz "PlancherLanding" .global $$248753 $$248753: - .incbin "baserom.dol", 0x486E48, 0x10 + .asciz "PlancherBound" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x486E58, 0xC + .asciz "SquashRoof" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x486E64, 0xC + .asciz "SquashWall" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x486E70, 0xC + .asciz "DeadFall" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x486E7C, 0xC + .asciz "DyingWait" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x486E88, 0xC + .asciz "GuardEnd" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x486E94, 0xC + .asciz "HaveTwoHand" .global $$248762 $$248762: - .incbin "baserom.dol", 0x486EA0, 0xC + .asciz "AirThrow" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x486EAC, 0x18 + .asciz "WarpStarDemoRideStart" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x486EC4, 0x14 + .asciz "WarpStarDemoRide" + .balign 4 .global $$248770 $$248770: - .incbin "baserom.dol", 0x486ED8, 0xC + .asciz "DanceAEL" + .balign 4 .global $$248771 $$248771: - .incbin "baserom.dol", 0x486EE4, 0xC + .asciz "DanceAER" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x486EF0, 0xC + .asciz "FloatWait" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x486EFC, 0xC + .asciz "FloatMove" + .balign 4 .global $$248786 $$248786: - .incbin "baserom.dol", 0x486F08, 0xC + .asciz "Piggyback" + .balign 4 .global $$248789 $$248789: - .incbin "baserom.dol", 0x486F14, 0xC + .asciz "ItemGetWait" .global $$248790 $$248790: - .incbin "baserom.dol", 0x486F20, 0x14 + .asciz "ItemGetWaitStart" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x486F34, 0x10 + .asciz "ItemGetWaitEnd" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x486F44, 0xC + .asciz "CannonWait" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x486F50, 0x10 + .asciz "CannonWaitHide" + .balign 4 .global $$248794 $$248794: - .incbin "baserom.dol", 0x486F60, 0x10 + .asciz "CannonWaitShow" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x486F70, 0xC + .asciz "DangleMoveR" .global $$248797 $$248797: - .incbin "baserom.dol", 0x486F7C, 0xC + .asciz "DangleMoveL" .global $$248798 $$248798: - .incbin "baserom.dol", 0x486F88, 0x10 + .asciz "CarryBombDanger" .global $$248799 $$248799: - .incbin "baserom.dol", 0x486F98, 0xC + .asciz "Listening" + .balign 4 .global $$248800 $$248800: - .incbin "baserom.dol", 0x486FA4, 0x10 + .asciz "WaitNoWeapon" + .balign 4 .global $$248801 $$248801: - .incbin "baserom.dol", 0x486FB4, 0x10 + .asciz "VictoryStand" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x486FC4, 0x14 + .asciz "VictoryStandStart" + .balign 4 .global $$248803 $$248803: - .incbin "baserom.dol", 0x486FD8, 0x10 + .asciz "VictoryStandCup" .global $$248804 $$248804: - .incbin "baserom.dol", 0x486FE8, 0x18 + .asciz "VictoryStandCupStart" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x487000, 0xC + .asciz "Struggle" + .balign 4 .global $$248807 $$248807: - .incbin "baserom.dol", 0x48700C, 0xC + .asciz "LoseStart" + .balign 4 .global $$248808 $$248808: - .incbin "baserom.dol", 0x487018, 0x10 + .asciz "Attack1Start" + .balign 4 .global $$248810 $$248810: - .incbin "baserom.dol", 0x487028, 0xC + .asciz "Attack1End" + .balign 4 .global $$248812 $$248812: - .incbin "baserom.dol", 0x487034, 0xC + .asciz "Attack2End" + .balign 4 .global $$248814 $$248814: - .incbin "baserom.dol", 0x487040, 0xC + .asciz "Attack3End" + .balign 4 .global $$248815 $$248815: - .incbin "baserom.dol", 0x48704C, 0xC + .asciz "AttackAir" + .balign 4 .global $$248816 $$248816: - .incbin "baserom.dol", 0x487058, 0x10 + .asciz "AttackHiStart" + .balign 4 .global $$248817 $$248817: - .incbin "baserom.dol", 0x487068, 0xC + .asciz "AttackHi" + .balign 4 .global $$248818 $$248818: - .incbin "baserom.dol", 0x487074, 0xC + .asciz "AttackHiEnd" .global $$248819 $$248819: - .incbin "baserom.dol", 0x487080, 0x10 + .asciz "AttackSideStart" .global $$248820 $$248820: - .incbin "baserom.dol", 0x487090, 0xC + .asciz "AttackSide" + .balign 4 .global $$248821 $$248821: - .incbin "baserom.dol", 0x48709C, 0x10 + .asciz "AttackSideEnd" + .balign 4 .global $$248822 $$248822: - .incbin "baserom.dol", 0x4870AC, 0x10 + .asciz "ChoppingStart" + .balign 4 .global $$248823 $$248823: - .incbin "baserom.dol", 0x4870BC, 0xC + .asciz "Chopping" + .balign 4 .global $$248824 $$248824: - .incbin "baserom.dol", 0x4870C8, 0xC + .asciz "FinelyCut" + .balign 4 .global $$248825 $$248825: - .incbin "baserom.dol", 0x4870D4, 0x10 + .asciz "FinelyCutEnd" + .balign 4 .global $$248826 $$248826: - .incbin "baserom.dol", 0x4870E4, 0x14 + .asciz "UnderThrustStart" + .balign 4 .global $$248827 $$248827: - .incbin "baserom.dol", 0x4870F8, 0xC + .asciz "UnderThrust" .global $$248828 $$248828: - .incbin "baserom.dol", 0x487104, 0x10 + .asciz "UnderThrustEnd" + .balign 4 .global $$248829 $$248829: - .incbin "baserom.dol", 0x487114, 0x10 + .asciz "UnderThrustHit" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x487124, 0x14 + .asciz "UnderThrustLanding" + .balign 4 .global $$248831 $$248831: - .incbin "baserom.dol", 0x487138, 0x14 + .asciz "TornadoAttackCharge" .global $$248832 $$248832: - .incbin "baserom.dol", 0x48714C, 0x18 + .asciz "TornadoAttackChargeMax" + .balign 4 .global $$248833 $$248833: - .incbin "baserom.dol", 0x487164, 0x14 + .asciz "TornadoAttack" + .balign 4 + .4byte 0 .global $$248834 $$248834: - .incbin "baserom.dol", 0x487178, 0x20 + .asciz "TornadeAttackChargeAttack1Chain" .global $$248835 $$248835: - .incbin "baserom.dol", 0x487198, 0x20 + .asciz "TornadeAttackChargeAttack2Chain" .global $$248836 $$248836: - .incbin "baserom.dol", 0x4871B8, 0x20 + .asciz "TornadeAttackChargeAttack3Chain" .global $$248837 $$248837: - .incbin "baserom.dol", 0x4871D8, 0x14 + .asciz "WingCondorDiveStart" .global $$248838 $$248838: - .incbin "baserom.dol", 0x4871EC, 0x10 + .asciz "WingCondorDive" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x4871FC, 0x14 + .asciz "WingCondorDiveEnd" + .balign 4 .global $$248840 $$248840: - .incbin "baserom.dol", 0x487210, 0x10 + .asciz "WingShuttleLoop" .global $$248841 $$248841: - .incbin "baserom.dol", 0x487220, 0x14 + .asciz "WingShuttleLoopEnd" + .balign 4 .global $$248843 $$248843: - .incbin "baserom.dol", 0x487234, 0x1C + .asciz "MetaCombinationAttackStart" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x487250, 0x18 + .asciz "MetaCombinationAttack" + .balign 4 .global $$248845 $$248845: - .incbin "baserom.dol", 0x487268, 0x1C + .asciz "MetaCombinationAttackEnd" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x487284, 0x14 + .asciz "LandiaFlightWait" + .balign 4 .global $$248847 $$248847: - .incbin "baserom.dol", 0x487298, 0x10 + .asciz "LandiaDamage" + .balign 4 .global $$248848 $$248848: - .incbin "baserom.dol", 0x4872A8, 0x10 + .asciz "LandiaDamageEtc" .global $$248849 $$248849: - .incbin "baserom.dol", 0x4872B8, 0x10 + .asciz "LandiaDeathFall" .global $$248850 $$248850: - .incbin "baserom.dol", 0x4872C8, 0x18 + .asciz "LandiaCannonChargeStart" .global $$248851 $$248851: - .incbin "baserom.dol", 0x4872E0, 0x14 + .asciz "LandiaCannonCharge" + .balign 4 .global $$248852 $$248852: - .incbin "baserom.dol", 0x4872F4, 0x10 + .asciz "LandiaCannon" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x487304, 0x14 + .asciz "SpiralDragonStart" + .balign 4 .global $$248854 $$248854: - .incbin "baserom.dol", 0x487318, 0x10 + .asciz "SpiralDragon" + .balign 4 .global $$248855 $$248855: - .incbin "baserom.dol", 0x487328, 0x10 + .asciz "SpiralDragonEnd" .global $$248856 $$248856: - .incbin "baserom.dol", 0x487338, 0x14 + .asciz "SpiralDragonBack" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x48734C, 0xC + .asciz "LookAround" + .balign 4 .global $$248858 $$248858: - .incbin "baserom.dol", 0x487358, 0xC + .asciz "LookAround2" .global $$248859 $$248859: - .incbin "baserom.dol", 0x487364, 0xC + .asciz "LookAround3" .global $$248860 $$248860: - .incbin "baserom.dol", 0x487370, 0xC + .asciz "LookUpStart" .global $$248862 $$248862: - .incbin "baserom.dol", 0x48737C, 0xC + .asciz "LookUpEnd" + .balign 4 .global $$248865 $$248865: - .incbin "baserom.dol", 0x487388, 0xC + .asciz "TumbleStart" .global $$248867 $$248867: - .incbin "baserom.dol", 0x487394, 0xC + .asciz "TumbleEnd" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x4873A0, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x4873AC, 0xC + .asciz "Control2L" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x4873B8, 0xC + .asciz "CA4FaceJ" + .balign 4 .global $$248883 $$248883: - .incbin "baserom.dol", 0x4873C4, 0xC + .asciz "LA3HandJ" + .balign 4 .global $$248884 $$248884: - .incbin "baserom.dol", 0x4873D0, 0x10 + .asciz "LA1ShoulderJ" + .balign 4 .global $$248885 $$248885: - .incbin "baserom.dol", 0x4873E0, 0x10 + .asciz "RA1ShoulderJ" + .balign 4 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc4MetaFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc4MetaFv$$2NAMES$$20: - .incbin "baserom.dol", 0x4873F0, 0x78 + .4byte 0x8055B1E8 + .4byte 0x8048B2A0 + .4byte 0x8048B2AC + .4byte 0x8048B2B8 + .4byte 0x8055B1F0 + .4byte 0x8048B2C4 + .4byte 0x8048B2B8 + .4byte 0x8048B2B8 + .4byte 0x8048B2D0 + .4byte 0x8048B2E0 + .4byte 0x8048B2B8 + .4byte 0x8048B2A0 + .4byte 0x8055B1F8 + .4byte 0x8055B200 + .4byte 0x8048B2AC + .4byte 0x8048B2B8 + .4byte 0x8048B2B8 + .4byte 0x8048B2C4 + .4byte 0x8055B208 + .4byte 0x8055B1F0 + .4byte 0x8055B210 + .4byte 0x8055B1E8 + .4byte 0x8055B1E8 + .4byte 0x8055B1E8 + .4byte 0x8055B218 + .4byte 0x8055B218 + .4byte 0x8055B218 + .4byte 0x8055B218 + .4byte 0x8055B218 + .4byte 0x8055B218 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: - .incbin "baserom.dol", 0x497468, 0x8 + .asciz "Wait" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x497470, 0x8 + .asciz "Wait2" + .balign 4 .global $$248729 $$248729: - .incbin "baserom.dol", 0x497478, 0x8 + .asciz "Wait3" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x497480, 0x8 + .asciz "Wait4" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x497488, 0x8 + .asciz "Wait5" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x497490, 0x8 + .asciz "Fall" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x497498, 0x8 + .asciz "Walk" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x4974A0, 0x8 + .asciz "Jump" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x4974A8, 0x8 + .asciz "JumpEnd" .global $$248737 $$248737: - .incbin "baserom.dol", 0x4974B0, 0x8 + .asciz "Landing" .global $$248739 $$248739: - .incbin "baserom.dol", 0x4974B8, 0x8 + .asciz "Squat" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x4974C0, 0x8 + .asciz "Sliding" .global $$248745 $$248745: - .incbin "baserom.dol", 0x4974C8, 0x8 + .asciz "Damage" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x4974D0, 0x4 + .4byte 0x52756E00 .global $$248758 $$248758: - .incbin "baserom.dol", 0x4974D4, 0x8 + .asciz "Guard" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x4974DC, 0x8 + .asciz "Throw" + .balign 4 .global $$248763 $$248763: - .incbin "baserom.dol", 0x4974E4, 0x4 + .4byte 0x50757400 .global $$248766 $$248766: - .incbin "baserom.dol", 0x4974E8, 0x8 + .asciz "DanceK1" .global $$248767 $$248767: - .incbin "baserom.dol", 0x4974F0, 0x8 + .asciz "DanceK2" .global $$248768 $$248768: - .incbin "baserom.dol", 0x4974F8, 0x8 + .asciz "DanceK3" .global $$248769 $$248769: - .incbin "baserom.dol", 0x497500, 0x8 + .asciz "DanceKE" .global $$248772 $$248772: - .incbin "baserom.dol", 0x497508, 0x8 + .asciz "DanceA1" .global $$248773 $$248773: - .incbin "baserom.dol", 0x497510, 0x8 + .asciz "DanceA2" .global $$248774 $$248774: - .incbin "baserom.dol", 0x497518, 0x8 + .asciz "DanceA3" .global $$248775 $$248775: - .incbin "baserom.dol", 0x497520, 0x8 + .asciz "DanceAE" .global $$248776 $$248776: - .incbin "baserom.dol", 0x497528, 0x8 + .asciz "DanceT1" .global $$248777 $$248777: - .incbin "baserom.dol", 0x497530, 0x8 + .asciz "DanceT2" .global $$248778 $$248778: - .incbin "baserom.dol", 0x497538, 0x8 + .asciz "DanceT3" .global $$248779 $$248779: - .incbin "baserom.dol", 0x497540, 0x8 + .asciz "DanceTE" .global $$248780 $$248780: - .incbin "baserom.dol", 0x497548, 0x8 + .asciz "Faint" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x497550, 0x8 + .asciz "WakeUp" + .balign 4 .global $$248782 $$248782: - .incbin "baserom.dol", 0x497558, 0x8 + .asciz "Swim" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x497560, 0x8 + .asciz "Stroke" + .balign 4 .global $$248787 $$248787: - .incbin "baserom.dol", 0x497568, 0x8 + .asciz "Flight" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x497570, 0x8 + .asciz "ItemGet" .global $$248795 $$248795: - .incbin "baserom.dol", 0x497578, 0x8 + .asciz "Dangle" + .balign 4 .global $$248806 $$248806: - .incbin "baserom.dol", 0x497580, 0x8 + .asciz "Lose" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x497588, 0x8 + .asciz "Attack1" .global $$248811 $$248811: - .incbin "baserom.dol", 0x497590, 0x8 + .asciz "Attack2" .global $$248813 $$248813: - .incbin "baserom.dol", 0x497598, 0x8 + .asciz "Attack3" .global $$248842 $$248842: - .incbin "baserom.dol", 0x4975A0, 0x8 + .asciz "Glide" + .balign 4 .global $$248861 $$248861: - .incbin "baserom.dol", 0x4975A8, 0x8 + .asciz "LookUp" + .balign 4 .global $$248863 $$248863: - .incbin "baserom.dol", 0x4975B0, 0x8 + .asciz "WonderR" .global $$248864 $$248864: - .incbin "baserom.dol", 0x4975B8, 0x8 + .asciz "WonderL" .global $$248866 $$248866: - .incbin "baserom.dol", 0x4975C0, 0x8 + .asciz "Tumble" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x4975C8, 0x8 + .asciz "TopL" + .balign 4 .global $$248882 $$248882: - .incbin "baserom.dol", 0x4975D0, 0x8 + .asciz "RHaveL" + .balign 4 .global $$248886 $$248886: - .incbin "baserom.dol", 0x4975D8, 0x8 + .asciz "CA1HipJ" .global $$248887 $$248887: - .incbin "baserom.dol", 0x4975E0, 0x8 + .asciz "Rot1L" + .balign 4 .global $$248888 $$248888: - .incbin "baserom.dol", 0x4975E8, 0x8 + .asciz "SwordM" + .balign 4 .global $$248889 $$248889: - .incbin "baserom.dol", 0x4975F0, 0x8 + .asciz "LoadL" + .balign 4 .global $$248890 $$248890: - .incbin "baserom.dol", 0x4975F8, 0x8 + .asciz "BodyM" + .balign 4 .global $$248980 $$248980: - .incbin "baserom.dol", 0x497600, 0x8 + .asciz "Meta" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2d diff --git a/asm/src/MintAnim.s b/asm/src/MintAnim.s index 7a5f426d..b1222722 100644 --- a/asm/src/MintAnim.s +++ b/asm/src/MintAnim.s @@ -94,7 +94,7 @@ __sinit_$$3MintAnim_cpp: /* 8019AC64 00196AA4 4B F4 27 7C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023EC, 0x4 + .4byte 0x8019AC60 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj22$$2unnamed$$2MintAnim_cpp$$2 diff --git a/asm/src/MintAttacker.s b/asm/src/MintAttacker.s index 44299167..36bbb821 100644 --- a/asm/src/MintAttacker.s +++ b/asm/src/MintAttacker.s @@ -23,7 +23,7 @@ __sinit_$$3MintAttacker_cpp: /* 803D30B8 003CEEF8 4B D0 A3 28 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025E4, 0x4 + .4byte 0x803D30B4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6vacuum26$$2unnamed$$2MintAttacker_cpp$$2 diff --git a/asm/src/MintBGMController.s b/asm/src/MintBGMController.s index fe97207c..3fc84500 100644 --- a/asm/src/MintBGMController.s +++ b/asm/src/MintBGMController.s @@ -68,7 +68,7 @@ __sinit_$$3MintBGMController_cpp: /* 80277638 00273478 4B E6 5D A8 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024B4, 0x4 + .4byte 0x80277634 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4core31$$2unnamed$$2MintBGMController_cpp$$2 diff --git a/asm/src/MintBoss.s b/asm/src/MintBoss.s index 4e9bdb69..d18c9a2f 100644 --- a/asm/src/MintBoss.s +++ b/asm/src/MintBoss.s @@ -23,7 +23,7 @@ __sinit_$$3MintBoss_cpp: /* 802329D0 0022E810 4B EA AA 10 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402470, 0x4 + .4byte 0x802329CC ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4boss22$$2unnamed$$2MintBoss_cpp$$2 diff --git a/asm/src/MintCameraController.s b/asm/src/MintCameraController.s index d9d2a398..aa56efcd 100644 --- a/asm/src/MintCameraController.s +++ b/asm/src/MintCameraController.s @@ -23,7 +23,7 @@ __sinit_$$3MintCameraController_cpp: /* 8026629C 002620DC 4B E7 71 44 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402494, 0x4 + .4byte 0x80266298 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6camera34$$2unnamed$$2MintCameraController_cpp$$2 diff --git a/asm/src/MintChallengeDoor.s b/asm/src/MintChallengeDoor.s index e87700f5..78230539 100644 --- a/asm/src/MintChallengeDoor.s +++ b/asm/src/MintChallengeDoor.s @@ -23,7 +23,7 @@ __sinit_$$3MintChallengeDoor_cpp: /* 8030B06C 00306EAC 4B DD 23 74 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025A8, 0x4 + .4byte 0x8030B068 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick13challengedoor31$$2unnamed$$2MintChallengeDoor_cpp$$2 diff --git a/asm/src/MintCommander.s b/asm/src/MintCommander.s index 24558339..87c7cb69 100644 --- a/asm/src/MintCommander.s +++ b/asm/src/MintCommander.s @@ -23,7 +23,7 @@ __sinit_$$3MintCommander_cpp: /* 803F9B78 003F59B8 4B CE 38 68 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402620, 0x4 + .4byte 0x803F9B74 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q33scn11staffcredit27$$2unnamed$$2MintCommander_cpp$$2 diff --git a/asm/src/MintDemo.s b/asm/src/MintDemo.s index 637389f0..eeb2bd61 100644 --- a/asm/src/MintDemo.s +++ b/asm/src/MintDemo.s @@ -23,7 +23,7 @@ __sinit_$$3MintDemo_cpp: /* 802FDDB4 002F9BF4 4B DD F6 2C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40259C, 0x4 + .4byte 0x802FDDB0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick11areamapdemo22$$2unnamed$$2MintDemo_cpp$$2 diff --git a/asm/src/MintEffect.s b/asm/src/MintEffect.s index af5805af..581aac14 100644 --- a/asm/src/MintEffect.s +++ b/asm/src/MintEffect.s @@ -417,7 +417,7 @@ __sinit_$$3MintEffect_cpp: /* 8026FD7C 0026BBBC 4B E6 D6 64 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40249C, 0x4 + .4byte 0x8026FD78 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara24$$2unnamed$$2MintEffect_cpp$$2 diff --git a/asm/src/MintEnemy.s b/asm/src/MintEnemy.s index 28f4bad6..ce014c38 100644 --- a/asm/src/MintEnemy.s +++ b/asm/src/MintEnemy.s @@ -23,7 +23,7 @@ __sinit_$$3MintEnemy_cpp: /* 8028ADD8 00286C18 4B E5 26 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024BC, 0x4 + .4byte 0x8028ADD4 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5enemy23$$2unnamed$$2MintEnemy_cpp$$2 diff --git a/asm/src/MintFootState.s b/asm/src/MintFootState.s index ba1c58ca..f4f1dff4 100644 --- a/asm/src/MintFootState.s +++ b/asm/src/MintFootState.s @@ -28,7 +28,7 @@ __sinit_$$3MintFootState_cpp: /* 8019AC90 00196AD0 4B F4 27 50 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023F0, 0x4 + .4byte 0x8019AC8C ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj27$$2unnamed$$2MintFootState_cpp$$2 diff --git a/asm/src/MintGear.s b/asm/src/MintGear.s index ea7b4b7d..ebe7a467 100644 --- a/asm/src/MintGear.s +++ b/asm/src/MintGear.s @@ -123,7 +123,7 @@ __sinit_$$3MintGear_cpp: /* 8034B690 003474D0 4B D9 1D 50 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025C0, 0x4 + .4byte 0x8034B68C .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4hero22$$2unnamed$$2MintGear_cpp$$2 diff --git a/asm/src/MintGearAnim.s b/asm/src/MintGearAnim.s index fb0638a6..96df1bec 100644 --- a/asm/src/MintGearAnim.s +++ b/asm/src/MintGearAnim.s @@ -87,7 +87,7 @@ __sinit_$$3MintGearAnim_cpp: /* 8019AD30 00196B70 4B F4 26 B0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023F4, 0x4 + .4byte 0x8019AD2C ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintGearAnim_cpp$$2 diff --git a/asm/src/MintHero.s b/asm/src/MintHero.s index b451d92f..cec33785 100644 --- a/asm/src/MintHero.s +++ b/asm/src/MintHero.s @@ -23,7 +23,7 @@ __sinit_$$3MintHero_cpp: /* 8034B6B4 003474F4 4B D9 1D 2C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025C4, 0x4 + .4byte 0x8034B6B0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4hero22$$2unnamed$$2MintHero_cpp$$2 diff --git a/asm/src/MintLocation.s b/asm/src/MintLocation.s index b19a55f9..231ec2f6 100644 --- a/asm/src/MintLocation.s +++ b/asm/src/MintLocation.s @@ -58,7 +58,7 @@ __sinit_$$3MintLocation_cpp: /* 8019ADBC 00196BFC 4B F4 26 24 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023F8, 0x4 + .4byte 0x8019ADB8 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintLocation_cpp$$2 diff --git a/asm/src/MintManager.s b/asm/src/MintManager.s index e4aad019..c4789f89 100644 --- a/asm/src/MintManager.s +++ b/asm/src/MintManager.s @@ -143,59 +143,70 @@ __ct__Q43scn4step4core11MintManagerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: - .incbin "baserom.dol", 0x45AE60, 0x18 + .asciz "Scn.ChallengeTitle" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: - .incbin "baserom.dol", 0x45CA90, 0x10 + .asciz "Scn.GrandTitle" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: - .incbin "baserom.dol", 0x468928, 0x10 + .asciz "Scn.Step" + .balign 4 + .4byte 0 .global $$251599 $$251599: - .incbin "baserom.dol", 0x468938, 0x10 + .asciz "Scn.StaffCredit" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: - .incbin "baserom.dol", 0x494158, 0x4 + .4byte 0x41707000 .global $$251595 $$251595: - .incbin "baserom.dol", 0x49415C, 0x8 + .asciz "GObj" + .balign 4 .global $$251596 $$251596: - .incbin "baserom.dol", 0x494164, 0x4 + .4byte 0x48454C00 .global $$251598 $$251598: - .incbin "baserom.dol", 0x494168, 0x8 + .4byte 0x536E6400 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: - .incbin "baserom.dol", 0x4947F8, 0x4 + .4byte 0x41707000 .global $$251595 $$251595: - .incbin "baserom.dol", 0x4947FC, 0x8 + .asciz "GObj" + .balign 4 .global $$251596 $$251596: - .incbin "baserom.dol", 0x494804, 0x4 + .4byte 0x48454C00 .global $$251598 $$251598: - .incbin "baserom.dol", 0x494808, 0x8 + .4byte 0x536E6400 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: - .incbin "baserom.dol", 0x495858, 0x4 + .4byte 0x41707000 .global $$251595 $$251595: - .incbin "baserom.dol", 0x49585C, 0x8 + .asciz "GObj" + .balign 4 .global $$251596 $$251596: - .incbin "baserom.dol", 0x495864, 0x4 + .4byte 0x48454C00 .global $$251598 $$251598: - .incbin "baserom.dol", 0x495868, 0x8 + .4byte 0x536E6400 + .4byte 0 diff --git a/asm/src/MintMeshFlip.s b/asm/src/MintMeshFlip.s index 9dcb3694..1987af23 100644 --- a/asm/src/MintMeshFlip.s +++ b/asm/src/MintMeshFlip.s @@ -24,7 +24,7 @@ __sinit_$$3MintMeshFlip_cpp: /* 8019ADE4 00196C24 4B F4 25 FC */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023FC, 0x4 + .4byte 0x8019ADE0 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintMeshFlip_cpp$$2 diff --git a/asm/src/MintModel.s b/asm/src/MintModel.s index 538634e6..a8539b49 100644 --- a/asm/src/MintModel.s +++ b/asm/src/MintModel.s @@ -91,10 +91,10 @@ __sinit_$$3MintModel_cpp: /* 8026FDCC 0026BC0C 4B E6 D6 14 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402400, 0x4 + .4byte 0x8019AE84 ;# ptr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024A0, 0x4 + .4byte 0x8026FDC8 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj23$$2unnamed$$2MintModel_cpp$$2 diff --git a/asm/src/MintModelAccessor.s b/asm/src/MintModelAccessor.s index 37cbe61b..2ed8961e 100644 --- a/asm/src/MintModelAccessor.s +++ b/asm/src/MintModelAccessor.s @@ -56,7 +56,7 @@ __sinit_$$3MintModelAccessor_cpp: /* 8018E9E8 0018A828 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023E0, 0x4 + .4byte 0x8018E9A4 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253943 diff --git a/asm/src/MintModelRotCtrl.s b/asm/src/MintModelRotCtrl.s index e1b053fb..ec5c2787 100644 --- a/asm/src/MintModelRotCtrl.s +++ b/asm/src/MintModelRotCtrl.s @@ -119,7 +119,7 @@ __sinit_$$3MintModelRotCtrl_cpp: /* 8026FE8C 0026BCCC 4B E6 D5 54 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024A4, 0x4 + .4byte 0x8026FE88 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara30$$2unnamed$$2MintModelRotCtrl_cpp$$2 diff --git a/asm/src/MintMonitor.s b/asm/src/MintMonitor.s index b7063be3..4ec044d1 100644 --- a/asm/src/MintMonitor.s +++ b/asm/src/MintMonitor.s @@ -12,7 +12,7 @@ __sinit_$$3MintMonitor_cpp: /* 80319808 00315648 4B DC 3B D8 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025B4, 0x4 + .4byte 0x80319804 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick7monitor25$$2unnamed$$2MintMonitor_cpp$$2 diff --git a/asm/src/MintMove.s b/asm/src/MintMove.s index 07a1c5a1..7902c799 100644 --- a/asm/src/MintMove.s +++ b/asm/src/MintMove.s @@ -75,7 +75,7 @@ __sinit_$$3MintMove_cpp: /* 8019AF40 00196D80 4B F4 24 A0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402404, 0x4 + .4byte 0x8019AF3C ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj22$$2unnamed$$2MintMove_cpp$$2 diff --git a/asm/src/MintNodeAccessor.s b/asm/src/MintNodeAccessor.s index a2795e99..d89fe37f 100644 --- a/asm/src/MintNodeAccessor.s +++ b/asm/src/MintNodeAccessor.s @@ -117,7 +117,7 @@ __sinit_$$3MintNodeAccessor_cpp: /* 8018EB48 0018A988 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023E4, 0x4 + .4byte 0x8018EB04 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253785 diff --git a/asm/src/MintOCollManager.s b/asm/src/MintOCollManager.s index 5f7d512f..ee94fbeb 100644 --- a/asm/src/MintOCollManager.s +++ b/asm/src/MintOCollManager.s @@ -23,7 +23,7 @@ __sinit_$$3MintOCollManager_cpp: /* 803CABB8 003C69F8 4B D1 28 28 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025D8, 0x4 + .4byte 0x803CABB4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_manager__Q43scn4step5ocoll30$$2unnamed$$2MintOCollManager_cpp$$2 diff --git a/asm/src/MintObjColl.s b/asm/src/MintObjColl.s index 3e630c99..e47f736d 100644 --- a/asm/src/MintObjColl.s +++ b/asm/src/MintObjColl.s @@ -706,7 +706,7 @@ SetBodyCollJump__Q43scn4step4hero11MintObjCollFv: /* 8034BAA0 003478E0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024A8, 0x4 + .4byte 0x80270684 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara25$$2unnamed$$2MintObjColl_cpp$$2 diff --git a/asm/src/MintSERequestor.s b/asm/src/MintSERequestor.s index 1ca346ff..501ff27f 100644 --- a/asm/src/MintSERequestor.s +++ b/asm/src/MintSERequestor.s @@ -29,7 +29,7 @@ __sinit_$$3MintSERequestor_cpp: /* 80402A68 003FE8A8 4B CD A9 78 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402624, 0x4 + .4byte 0x80402A64 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q23snd29$$2unnamed$$2MintSERequestor_cpp$$2 diff --git a/asm/src/MintScript.s b/asm/src/MintScript.s index b6593520..47dc9d10 100644 --- a/asm/src/MintScript.s +++ b/asm/src/MintScript.s @@ -23,7 +23,7 @@ __sinit_$$3MintScript_cpp: /* 8019AF64 00196DA4 4B F4 24 7C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402408, 0x4 + .4byte 0x8019AF60 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj24$$2unnamed$$2MintScript_cpp$$2 diff --git a/asm/src/MintScriptTrigger.s b/asm/src/MintScriptTrigger.s index 505aa859..da38af0c 100644 --- a/asm/src/MintScriptTrigger.s +++ b/asm/src/MintScriptTrigger.s @@ -24,7 +24,7 @@ __sinit_$$3MintScriptTrigger_cpp: /* 802706B0 0026C4F0 4B E6 CD 30 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024AC, 0x4 + .4byte 0x802706AC ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara31$$2unnamed$$2MintScriptTrigger_cpp$$2 diff --git a/asm/src/MintSetting.s b/asm/src/MintSetting.s index 53d3c6a2..db35b08f 100644 --- a/asm/src/MintSetting.s +++ b/asm/src/MintSetting.s @@ -356,96 +356,131 @@ lbl_801C5F7C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249262 $$249262: - .incbin "baserom.dol", 0x457B30, 0x10 + .asciz "MintSetting.cpp" .global $$249263 $$249263: - .incbin "baserom.dol", 0x457B40, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$249278 $$249278: - .incbin "baserom.dol", 0x457B54, 0x18 + .asciz "--- MintSetting ---\n" + .balign 4 .global $$249279 $$249279: - .incbin "baserom.dol", 0x457B6C, 0x24 + .asciz "[vmAllocator] alloc: %x, free: %x\n" .global $$249280 $$249280: - .incbin "baserom.dol", 0x457B90, 0x24 + .asciz "[runAllocator] alloc: %x, free: %x\n" .global $$249283 $$249283: - .incbin "baserom.dol", 0x457BB4, 0x34 + .asciz "*************************************************\n" + .balign 4 .global $$249284 $$249284: - .incbin "baserom.dol", 0x457BE8, 0x14 + .asciz "* [Mint][%s] %s\n" + .balign 4 .global $$249285 $$249285: - .incbin "baserom.dol", 0x457BFC, 0x1C + .asciz "* ----------------------\n" + .balign 4 .global $$2LOCAL$$2messageKindString__Q26mintvm11MintSettingFQ26mintvm11MintMsgKind$$2table $$2LOCAL$$2messageKindString__Q26mintvm11MintSettingFQ26mintvm11MintMsgKind$$2table: - .incbin "baserom.dol", 0x457C18, 0xC + .4byte 0x80557530 + .4byte 0x80557538 + .4byte 0x80557540 .global __vt__Q26mintvm13MintAllocator __vt__Q26mintvm13MintAllocator: - .incbin "baserom.dol", 0x457C24, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801C5C54 ;# ptr + .4byte 0x801C5F38 ;# ptr + .4byte 0x801C5ECC ;# ptr .global __vt__Q26mintvm10IAllocator __vt__Q26mintvm10IAllocator: - .incbin "baserom.dol", 0x457C38, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801C5BB8 ;# ptr + .4byte 0 + .4byte 0 .global $$2STRING$$2UnsetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 $$2STRING$$2UnsetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20: - .incbin "baserom.dol", 0x457C4C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2UnsetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv $$2STRING$$2UnsetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv: - .incbin "baserom.dol", 0x457C60, 0x18 + .asciz "ExplicitSingleton.hpp" + .balign 4 .global $$2STRING$$2SetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1FRQ26mintvm11MintSetting$$20 $$2STRING$$2SetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1FRQ26mintvm11MintSetting$$20: - .incbin "baserom.dol", 0x457C78, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2SetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1FRQ26mintvm11MintSetting $$2STRING$$2SetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1FRQ26mintvm11MintSetting: - .incbin "baserom.dol", 0x457C8C, 0x18 + .asciz "ExplicitSingleton.hpp" + .balign 4 .global $$2STRING$$2__dt__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 $$2STRING$$2__dt__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20: - .incbin "baserom.dol", 0x457CA4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2__dt__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv $$2STRING$$2__dt__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv: - .incbin "baserom.dol", 0x457CB8, 0x18 + .asciz "ExplicitSingleton.hpp" + .balign 4 .global $$2STRING$$2__ct__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 $$2STRING$$2__ct__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20: - .incbin "baserom.dol", 0x457CD0, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2__ct__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv $$2STRING$$2__ct__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv: - .incbin "baserom.dol", 0x457CE4, 0x18 + .asciz "ExplicitSingleton.hpp" + .balign 4 .global $$2STRING$$2mintAlloc__Q26mintvm13MintAllocatorFUl$$20 $$2STRING$$2mintAlloc__Q26mintvm13MintAllocatorFUl$$20: - .incbin "baserom.dol", 0x457CFC, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2mintAlloc__Q26mintvm13MintAllocatorFUl $$2STRING$$2mintAlloc__Q26mintvm13MintAllocatorFUl: - .incbin "baserom.dol", 0x457D10, 0x14 + .asciz "MintAllocator.hpp" + .balign 4 .global $$2STRING$$2mintFree__Q26mintvm13MintAllocatorFPv$$20 $$2STRING$$2mintFree__Q26mintvm13MintAllocatorFPv$$20: - .incbin "baserom.dol", 0x457D24, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2mintFree__Q26mintvm13MintAllocatorFPv $$2STRING$$2mintFree__Q26mintvm13MintAllocatorFPv: - .incbin "baserom.dol", 0x457D38, 0x14 + .asciz "MintAllocator.hpp" + .balign 4 .global $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$22 $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$22: - .incbin "baserom.dol", 0x457D4C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$21 $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$21: - .incbin "baserom.dol", 0x457D60, 0x14 + .asciz "MintAllocator.hpp" + .balign 4 .global $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$20 $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$20: - .incbin "baserom.dol", 0x457D74, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2verify__Q26mintvm13MintAllocatorFv $$2STRING$$2verify__Q26mintvm13MintAllocatorFv: - .incbin "baserom.dol", 0x457D88, 0x18 + .asciz "MintAllocator.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249286 $$249286: - .incbin "baserom.dol", 0x493908, 0x8 + .asciz "* %s\n" + .balign 4 .global $$249078 $$249078: - .incbin "baserom.dol", 0x493910, 0x8 + .asciz "Warning" .global $$249079 $$249079: - .incbin "baserom.dol", 0x493918, 0x8 + .asciz "Error" + .balign 4 .global $$249080 $$249080: - .incbin "baserom.dol", 0x493920, 0x8 + .asciz "Fatal" + .balign 4 diff --git a/asm/src/MintShake.s b/asm/src/MintShake.s index 96680c9d..932c00e8 100644 --- a/asm/src/MintShake.s +++ b/asm/src/MintShake.s @@ -24,7 +24,7 @@ __sinit_$$3MintShake_cpp: /* 802706D8 0026C518 4B E6 CD 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024B0, 0x4 + .4byte 0x802706D4 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara23$$2unnamed$$2MintShake_cpp$$2 diff --git a/asm/src/MintShipEvent.s b/asm/src/MintShipEvent.s index a2312555..376035c9 100644 --- a/asm/src/MintShipEvent.s +++ b/asm/src/MintShipEvent.s @@ -23,7 +23,7 @@ __sinit_$$3MintShipEvent_cpp: /* 8031F7C0 0031B600 4B DB DC 20 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025B8, 0x4 + .4byte 0x8031F7BC .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick9shipevent27$$2unnamed$$2MintShipEvent_cpp$$2 diff --git a/asm/src/MintSuperBackPicture.s b/asm/src/MintSuperBackPicture.s index 7eb2310f..28c9725b 100644 --- a/asm/src/MintSuperBackPicture.s +++ b/asm/src/MintSuperBackPicture.s @@ -150,7 +150,7 @@ __sinit_$$3MintSuperBackPicture_cpp: /* 803CDCD8 003C9B18 4B D0 F7 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025DC, 0x4 + .4byte 0x803CDCD4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step3sfx34$$2unnamed$$2MintSuperBackPicture_cpp$$2 diff --git a/asm/src/MintSuperFade.s b/asm/src/MintSuperFade.s index 5a6c4474..ee757b85 100644 --- a/asm/src/MintSuperFade.s +++ b/asm/src/MintSuperFade.s @@ -24,7 +24,7 @@ __sinit_$$3MintSuperFade_cpp: /* 803CDD00 003C9B40 4B D0 F6 E0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025E0, 0x4 + .4byte 0x803CDCFC .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step3sfx27$$2unnamed$$2MintSuperFade_cpp$$2 diff --git a/asm/src/MintSystemCall.s b/asm/src/MintSystemCall.s index aeda5281..855d5cd8 100644 --- a/asm/src/MintSystemCall.s +++ b/asm/src/MintSystemCall.s @@ -119,4 +119,6 @@ lbl_801C611C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249097 $$249097: - .incbin "baserom.dol", 0x457DA0, 0x28 + .asciz "[Mint_Panic] file \"%s\" : line %d.\n" + .balign 4 + .4byte 0 diff --git a/asm/src/MintTarget.s b/asm/src/MintTarget.s index 204fdac7..ab28124b 100644 --- a/asm/src/MintTarget.s +++ b/asm/src/MintTarget.s @@ -54,7 +54,7 @@ __sinit_$$3MintTarget_cpp: /* 8019AFD4 00196E14 4B F4 24 0C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40240C, 0x4 + .4byte 0x8019AFD0 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj24$$2unnamed$$2MintTarget_cpp$$2 diff --git a/asm/src/MintUtility.s b/asm/src/MintUtility.s index 35922c4b..9fae28ed 100644 --- a/asm/src/MintUtility.s +++ b/asm/src/MintUtility.s @@ -943,10 +943,11 @@ RequestEffectGearNodeNDOS__Q43scn4step4hero11MintUtilityFQ43scn4step6effect4Kind .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259354 $$259354: - .incbin "baserom.dol", 0x49D848, 0x4 + .4byte 0x3F800000 .global $$259355 $$259355: - .incbin "baserom.dol", 0x49D84C, 0x4 + .4byte 0xBF800000 .global $$259357 $$259357: - .incbin "baserom.dol", 0x49D850, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MintZoomQuake.s b/asm/src/MintZoomQuake.s index 6f27d88c..7da3e1c8 100644 --- a/asm/src/MintZoomQuake.s +++ b/asm/src/MintZoomQuake.s @@ -23,7 +23,7 @@ __sinit_$$3MintZoomQuake_cpp: /* 802662C0 00262100 4B E7 71 20 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402498, 0x4 + .4byte 0x802662BC ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6camera27$$2unnamed$$2MintZoomQuake_cpp$$2 diff --git a/asm/src/Model.s b/asm/src/Model.s index 75b291ea..f4d1e957 100644 --- a/asm/src/Model.s +++ b/asm/src/Model.s @@ -5316,215 +5316,327 @@ onObjStopFinished__Q43scn4step4hero5ModelFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$258142 $$258142: - .incbin "baserom.dol", 0x4161A0, 0x1C + .4byte 0x8035C6B4 + .4byte 0x8035C6B4 + .4byte 0x8035C6B4 + .4byte 0x8035C6B4 + .4byte 0x8035C7D4 + .4byte 0x8035BC10 + .4byte 0x8035BE24 .global $$258152 $$258152: - .incbin "baserom.dol", 0x4161BC, 0x1C + .4byte 0x8035C634 + .4byte 0x8035C634 + .4byte 0x8035C634 + .4byte 0x8035C634 + .4byte 0x8035C77C + .4byte 0x8035BBE4 + .4byte 0x8035BDCC .global $$258162 $$258162: - .incbin "baserom.dol", 0x4161D8, 0x1C + .4byte 0x8035C65C + .4byte 0x8035C65C + .4byte 0x8035C65C + .4byte 0x8035C65C + .4byte 0x8035C7A4 + .4byte 0x8035BC0C + .4byte 0x8035BDF4 .global $$258172 $$258172: - .incbin "baserom.dol", 0x4161F4, 0x1C + .4byte 0x8035C778 + .4byte 0x8035C778 + .4byte 0x8035C778 + .4byte 0x8035C778 + .4byte 0x8035C8A8 + .4byte 0x8035BCE4 + .4byte 0x8035BEF8 .global $$258190 $$258190: - .incbin "baserom.dol", 0x416210, 0x1C + .4byte 0x80484E28 + .4byte 0x80484E48 + .4byte 0x80484E70 + .4byte 0x80484E90 + .4byte 0x80484EB4 + .4byte 0x80484ED8 + .4byte 0x80484EFC .global $$258207 $$258207: - .incbin "baserom.dol", 0x41622C, 0x1C + .4byte 0x80484F20 + .4byte 0x80484F20 + .4byte 0x80484F20 + .4byte 0x80484F20 + .4byte 0x80484F44 + .4byte 0x80484F68 + .4byte 0x80484F90 .global $$258220 $$258220: - .incbin "baserom.dol", 0x416248, 0x20 + .4byte 0x80484FB4 + .4byte 0x80484FB4 + .4byte 0x80484FB4 + .4byte 0x80484FB4 + .4byte 0x80484FDC + .4byte 0x80485000 + .4byte 0x80485028 + .4byte 0 .global $$258964 $$258964: - .incbin "baserom.dol", 0x416268, 0x10 + .4byte 0x8055AA08 + .4byte 0x804850E0 + .4byte 0x804850EC + .4byte 0x804850F8 .global $$258967 $$258967: - .incbin "baserom.dol", 0x416278, 0x10 + .4byte 0x8055AA08 + .4byte 0x8055AA08 + .4byte 0x8055AA08 + .4byte 0x8055AA08 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256416 $$256416: - .incbin "baserom.dol", 0x450610, 0x18 + .asciz "vector length error" + .4byte 0 .global __vt__Q33g3d5Model14ScnObjCallback __vt__Q33g3d5Model14ScnObjCallback: - .incbin "baserom.dol", 0x450628, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80190270 ;# ptr + .4byte 0x801903A4 ;# ptr + .4byte 0x800E9D20 ;# ptr + .4byte 0x801904C4 ;# ptr + .4byte 0x800EC990 ;# ptr + .4byte 0x800EC9A0 ;# ptr .global __vt__Q33g3d5Model17CalcWorldCallback __vt__Q33g3d5Model17CalcWorldCallback: - .incbin "baserom.dol", 0x450648, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8018FFB0 ;# ptr + .4byte 0x80190024 ;# ptr + .4byte 0x800E3740 ;# ptr + .4byte 0x800E3750 ;# ptr .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x450660, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x450684, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x450690, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x4506B4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x4506C0, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x4506E4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d6ResMatCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d6ResMatCFv$$20: - .incbin "baserom.dol", 0x4506F0, 0x20 + .asciz "%s::%s: Object not valid." + .balign 4 + .4byte 0 .global $$2STRING$$2ref__Q34nw4r3g3d6ResMatCFv $$2STRING$$2ref__Q34nw4r3g3d6ResMatCFv: - .incbin "baserom.dol", 0x450710, 0x10 + .asciz "g3d_resmat_ac.h" .global $$2STRING$$2__ct__Q34nw4r3g3d7ResNodeFPv$$20 $$2STRING$$2__ct__Q34nw4r3g3d7ResNodeFPv$$20: - .incbin "baserom.dol", 0x450720, 0x28 + .asciz "NW4R:Failed assertion !((u32)p & 0x3)" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r3g3d7ResNodeFPv $$2STRING$$2__ct__Q34nw4r3g3d7ResNodeFPv: - .incbin "baserom.dol", 0x450748, 0x14 + .asciz "g3d_resnode_ac.h" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv$$20 $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv$$20: - .incbin "baserom.dol", 0x45075C, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv: - .incbin "baserom.dol", 0x450778, 0x18 + .asciz "g3d_resnode_ac.h" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24gobj5Model __vt__Q24gobj5Model: - .incbin "baserom.dol", 0x451130, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8019B11C ;# ptr + .4byte 0x8019B194 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5chara5Model __vt__Q43scn4step5chara5Model: - .incbin "baserom.dol", 0x468788, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80270C60 ;# ptr + .4byte 0x802710AC ;# ptr + .4byte 0x802710CC ;# ptr + .4byte 0x80271124 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258183 $$258183: - .incbin "baserom.dol", 0x480F28, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$258184 $$258184: - .incbin "baserom.dol", 0x480F48, 0x28 + .asciz "step/chara/hero/kirby/base/Yellow" + .balign 4 + .4byte 0 .global $$258185 $$258185: - .incbin "baserom.dol", 0x480F70, 0x20 + .asciz "step/chara/hero/kirby/base/Blue" .global $$258186 $$258186: - .incbin "baserom.dol", 0x480F90, 0x24 + .asciz "step/chara/hero/kirby/base/Green" + .balign 4 .global $$258187 $$258187: - .incbin "baserom.dol", 0x480FB4, 0x24 + .asciz "step/chara/hero/meta/base/Default" + .balign 4 .global $$258188 $$258188: - .incbin "baserom.dol", 0x480FD8, 0x24 + .asciz "step/chara/hero/dedede/base/Default" .global $$258189 $$258189: - .incbin "baserom.dol", 0x480FFC, 0x24 + .asciz "step/chara/hero/dee/base/Default" + .balign 4 .global $$258203 $$258203: - .incbin "baserom.dol", 0x481020, 0x24 + .asciz "step/chara/hero/kirby/normal/Goggle" .global $$258204 $$258204: - .incbin "baserom.dol", 0x481044, 0x24 + .asciz "step/chara/hero/meta/normal/Goggle" + .balign 4 .global $$258205 $$258205: - .incbin "baserom.dol", 0x481068, 0x28 + .asciz "step/chara/hero/dedede/normal/Goggle" + .balign 4 .global $$258206 $$258206: - .incbin "baserom.dol", 0x481090, 0x24 + .asciz "step/chara/hero/dee/normal/Goggle" + .balign 4 .global $$258216 $$258216: - .incbin "baserom.dol", 0x4810B4, 0x28 + .asciz "step/chara/hero/kirby/normal/Floater" + .balign 4 .global $$258217 $$258217: - .incbin "baserom.dol", 0x4810DC, 0x24 + .asciz "step/chara/hero/meta/normal/Floater" .global $$258218 $$258218: - .incbin "baserom.dol", 0x481100, 0x28 + .asciz "step/chara/hero/dedede/normal/Floater" + .balign 4 .global $$258219 $$258219: - .incbin "baserom.dol", 0x481128, 0x24 + .asciz "step/chara/hero/dee/normal/Floater" + .balign 4 .global $$260285 $$260285: - .incbin "baserom.dol", 0x48114C, 0x24 + .asciz "step/chara/hero/kirby/normal/Motion" .global $$260286 $$260286: - .incbin "baserom.dol", 0x481170, 0x24 + .asciz "step/chara/hero/meta/normal/Motion" + .balign 4 .global $$260287 $$260287: - .incbin "baserom.dol", 0x481194, 0x28 + .asciz "step/chara/hero/dedede/normal/Motion" + .balign 4 .global $$260288 $$260288: - .incbin "baserom.dol", 0x4811BC, 0x24 + .asciz "step/chara/hero/dee/normal/Motion" + .balign 4 .global $$258961 $$258961: - .incbin "baserom.dol", 0x4811E0, 0xC + .asciz "GoggleBigM" + .balign 4 .global $$258962 $$258962: - .incbin "baserom.dol", 0x4811EC, 0xC + .asciz "GoggleBig2M" .global $$258963 $$258963: - .incbin "baserom.dol", 0x4811F8, 0xC + .asciz "GoggleBig3M" .global $$258997 $$258997: - .incbin "baserom.dol", 0x481204, 0xC + .asciz "FloaterM" + .balign 4 .global __vt__Q43scn4step4hero5Model __vt__Q43scn4step4hero5Model: - .incbin "baserom.dol", 0x481210, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x8034D120 + .4byte 0x8034D83C + .4byte 0x8034D9F4 + .4byte 0x8034DADC + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMatFv $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMatFv: - .incbin "baserom.dol", 0x493170, 0x8 + .asciz "ResMat" + .balign 4 .global __FUNCTION__$34959 __FUNCTION__$34959: - .incbin "baserom.dol", 0x493178, 0x8 + .4byte 0x72656600 + .4byte 0 .global $$2STRING$$2GetClassName__Q34nw4r3g3d7ResNodeFv $$2STRING$$2GetClassName__Q34nw4r3g3d7ResNodeFv: - .incbin "baserom.dol", 0x493180, 0x8 + .asciz "ResNode" .global __FUNCTION__$30538 __FUNCTION__$30538: - .incbin "baserom.dol", 0x493188, 0x8 + .4byte 0x72656600 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258960 $$258960: - .incbin "baserom.dol", 0x496DE8, 0x8 + .asciz "GoggleM" .global $$258993 $$258993: - .incbin "baserom.dol", 0x496DF0, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257702 $$257702: - .incbin "baserom.dol", 0x49B810, 0x4 + .4byte 0x3727C5AC .global $$257703 $$257703: - .incbin "baserom.dol", 0x49B814, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260284 $$260284: - .incbin "baserom.dol", 0x49D858, 0x4 + .4byte 0 .global $$260389 $$260389: - .incbin "baserom.dol", 0x49D85C, 0x4 + .4byte 0x3F000000 .global $$260416 $$260416: - .incbin "baserom.dol", 0x49D860, 0x4 + .4byte 0x3F800000 .global $$260417 $$260417: - .incbin "baserom.dol", 0x49D864, 0x4 + .4byte 0xBF800000 .global $$258994 $$258994: - .incbin "baserom.dol", 0x49D868, 0x4 + .4byte 0x8055AA10 .global $$258998 $$258998: - .incbin "baserom.dol", 0x49D86C, 0x4 + .4byte 0x80485104 .global $$260515 $$260515: - .incbin "baserom.dol", 0x49D870, 0x4 + .4byte 0xBE99999A .global $$260516 $$260516: - .incbin "baserom.dol", 0x49D874, 0x4 + .4byte 0x3F147AE1 diff --git a/asm/src/ModelAnim.s b/asm/src/ModelAnim.s index dd4a0149..a157f14b 100644 --- a/asm/src/ModelAnim.s +++ b/asm/src/ModelAnim.s @@ -1636,83 +1636,103 @@ lbl_80191C68: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmShpFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmShpFv: - .incbin "baserom.dol", 0x450790, 0xC + .asciz "ResAnmShp" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmShpCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResAnmShpCFv$$20: - .incbin "baserom.dol", 0x45079C, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmShpCFv $$2STRING$$2ref__Q34nw4r3g3d9ResAnmShpCFv: - .incbin "baserom.dol", 0x4507B8, 0x14 + .asciz "g3d_resanmshp_ac.h" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d12ResAnmTexSrtFv $$2STRING$$2GetClassName__Q34nw4r3g3d12ResAnmTexSrtFv: - .incbin "baserom.dol", 0x4507CC, 0x10 + .asciz "ResAnmTexSrt" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexSrtCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexSrtCFv$$20: - .incbin "baserom.dol", 0x4507DC, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexSrtCFv $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexSrtCFv: - .incbin "baserom.dol", 0x4507F8, 0x18 + .asciz "g3d_resanmtexsrt_ac.h" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d12ResAnmTexPatFv $$2STRING$$2GetClassName__Q34nw4r3g3d12ResAnmTexPatFv: - .incbin "baserom.dol", 0x450810, 0x10 + .asciz "ResAnmTexPat" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexPatCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexPatCFv$$20: - .incbin "baserom.dol", 0x450820, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexPatCFv $$2STRING$$2ref__Q34nw4r3g3d12ResAnmTexPatCFv: - .incbin "baserom.dol", 0x45083C, 0x18 + .asciz "g3d_resanmtexpat_ac.h" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmVisFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmVisFv: - .incbin "baserom.dol", 0x450854, 0xC + .asciz "ResAnmVis" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmVisCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResAnmVisCFv$$20: - .incbin "baserom.dol", 0x450860, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmVisCFv $$2STRING$$2ref__Q34nw4r3g3d9ResAnmVisCFv: - .incbin "baserom.dol", 0x45087C, 0x14 + .asciz "g3d_resanmvis_ac.h" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmClrFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmClrFv: - .incbin "baserom.dol", 0x450890, 0xC + .asciz "ResAnmClr" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmClrCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResAnmClrCFv$$20: - .incbin "baserom.dol", 0x45089C, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmClrCFv $$2STRING$$2ref__Q34nw4r3g3d9ResAnmClrCFv: - .incbin "baserom.dol", 0x4508B8, 0x14 + .asciz "g3d_resanmclr_ac.h" + .balign 4 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmChrFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmChrFv: - .incbin "baserom.dol", 0x4508CC, 0xC + .asciz "ResAnmChr" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv$$20: - .incbin "baserom.dol", 0x4508D8, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv: - .incbin "baserom.dol", 0x4508F4, 0x14 + .asciz "g3d_resanmchr_ac.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$37026 __FUNCTION__$37026: - .incbin "baserom.dol", 0x493190, 0x4 + .4byte 0x72656600 .global __FUNCTION__$35235 __FUNCTION__$35235: - .incbin "baserom.dol", 0x493194, 0x4 + .4byte 0x72656600 .global __FUNCTION__$30873 __FUNCTION__$30873: - .incbin "baserom.dol", 0x493198, 0x4 + .4byte 0x72656600 .global __FUNCTION__$29726 __FUNCTION__$29726: - .incbin "baserom.dol", 0x49319C, 0x4 + .4byte 0x72656600 .global __FUNCTION__$29445 __FUNCTION__$29445: - .incbin "baserom.dol", 0x4931A0, 0x4 + .4byte 0x72656600 .global __FUNCTION__$29180 __FUNCTION__$29180: - .incbin "baserom.dol", 0x4931A4, 0x4 + .4byte 0x72656600 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253047 $$253047: - .incbin "baserom.dol", 0x49A1C8, 0x8 + .4byte 0 + .4byte 0 .global $$253701 $$253701: - .incbin "baserom.dol", 0x49A1D0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/ModelAnimAccessor.s b/asm/src/ModelAnimAccessor.s index 062bc503..a95aa470 100644 --- a/asm/src/ModelAnimAccessor.s +++ b/asm/src/ModelAnimAccessor.s @@ -216,7 +216,10 @@ onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAc .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23g3d34NullModelAnimAccessorEventReceiver __vt__Q23g3d34NullModelAnimAccessorEventReceiver: - .incbin "baserom.dol", 0x450908, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80191E8C ;# ptr + .4byte 0x80191EE8 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2Instance__Q23g3d34NullModelAnimAccessorEventReceiverFv$$2obj diff --git a/asm/src/ModelDesc.s b/asm/src/ModelDesc.s index f12fdbde..86e22992 100644 --- a/asm/src/ModelDesc.s +++ b/asm/src/ModelDesc.s @@ -8779,5955 +8779,13275 @@ __sinit_$$3ModelDesc_cpp: /* 803EF704 003EB544 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402474, 0x8 + .4byte 0x80232B24 ;# ptr + .4byte 0x8023DB80 ;# ptr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402480, 0x14 + .4byte 0x80247D14 ;# ptr + .4byte 0x802488FC ;# ptr + .4byte 0x80249E00 ;# ptr + .4byte 0x8024B7E8 ;# ptr + .4byte 0x8025C8DC ;# ptr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4024C0, 0xDC + .4byte 0x802966DC ;# ptr + .4byte 0x802975A8 ;# ptr + .4byte 0x80299448 ;# ptr + .4byte 0x8029D284 ;# ptr + .4byte 0x8029E8F0 ;# ptr + .4byte 0x8029F4C4 ;# ptr + .4byte 0x802A0F98 ;# ptr + .4byte 0x802A2E54 ;# ptr + .4byte 0x802A3DC4 ;# ptr + .4byte 0x802A5630 ;# ptr + .4byte 0x802A6394 ;# ptr + .4byte 0x802A7520 ;# ptr + .4byte 0x802AD3F4 ;# ptr + .4byte 0x802AE2FC ;# ptr + .4byte 0x802AEF8C ;# ptr + .4byte 0x802AFCF0 ;# ptr + .4byte 0x802B2388 ;# ptr + .4byte 0x802B4A78 ;# ptr + .4byte 0x802B625C ;# ptr + .4byte 0x802B78C8 ;# ptr + .4byte 0x802B9108 ;# ptr + .4byte 0x802BA71C ;# ptr + .4byte 0x802BB850 ;# ptr + .4byte 0x802BCE78 ;# ptr + .4byte 0x802BFC34 ;# ptr + .4byte 0x802C2238 ;# ptr + .4byte 0x802C3614 ;# ptr + .4byte 0x802C50B0 ;# ptr + .4byte 0x802C62B4 ;# ptr + .4byte 0x802C73DC ;# ptr + .4byte 0x802C7EB0 ;# ptr + .4byte 0x802C9FC8 ;# ptr + .4byte 0x802CB1B4 ;# ptr + .4byte 0x802CFBEC ;# ptr + .4byte 0x802D1FC0 ;# ptr + .4byte 0x802D33C8 ;# ptr + .4byte 0x802D3B38 ;# ptr + .4byte 0x802D678C ;# ptr + .4byte 0x802D9238 ;# ptr + .4byte 0x802D9E2C ;# ptr + .4byte 0x802DBEA0 ;# ptr + .4byte 0x802DD9A8 ;# ptr + .4byte 0x802E07F0 ;# ptr + .4byte 0x802E1794 ;# ptr + .4byte 0x802E2BA4 ;# ptr + .4byte 0x802E38F0 ;# ptr + .4byte 0x802E5480 ;# ptr + .4byte 0x802E6F28 ;# ptr + .4byte 0x802E8CF4 ;# ptr + .4byte 0x802EB0AC ;# ptr + .4byte 0x802ED91C ;# ptr + .4byte 0x802EFBEC ;# ptr + .4byte 0x802F026C ;# ptr + .4byte 0x802F08B4 ;# ptr + .4byte 0x802F1160 ;# ptr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025E8, 0x38 + .4byte 0x803DB2C0 + .4byte 0x803DCBB4 + .4byte 0x803DD290 + .4byte 0x803DE5B8 + .4byte 0x803E2B18 + .4byte 0x803E3774 + .4byte 0x803E4070 + .4byte 0x803E5C00 + .4byte 0x803E7900 + .4byte 0x803E85B0 + .4byte 0x803E99D4 + .4byte 0x803EADB8 + .4byte 0x803ED094 + .4byte 0x803EF6F8 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412668, 0xC8 + .4byte 0x80558F10 + .4byte 0 + .4byte 0x80558F18 + .4byte 0 + .4byte 0x80464D58 + .4byte 0 + .4byte 0x80464D64 + .4byte 0 + .4byte 0x80464D70 + .4byte 0 + .4byte 0x80464D7C + .4byte 0 + .4byte 0x80464D88 + .4byte 0 + .4byte 0x80464D98 + .4byte 0 + .4byte 0x80464DA4 + .4byte 0 + .4byte 0x80558F20 + .4byte 0 + .4byte 0x80558F28 + .4byte 0 + .4byte 0x80558F30 + .4byte 0 + .4byte 0x80464DB0 + .4byte 0 + .4byte 0x80464DBC + .4byte 0 + .4byte 0x80464DCC + .4byte 0 + .4byte 0x80464DDC + .4byte 0 + .4byte 0x80558F38 + .4byte 0 + .4byte 0x80558F40 + .4byte 0 + .4byte 0x80464DE8 + .4byte 0 + .4byte 0x80464DF8 + .4byte 0 + .4byte 0x80464E04 + .4byte 0 + .4byte 0x80464E14 + .4byte 0 + .4byte 0x80464E28 + .4byte 0 + .4byte 0x80464E38 + .4byte 0 + .4byte 0x80464E48 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412730, 0x168 + .4byte 0x80464E58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464E78 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464E98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464EB8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464ED8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464EF8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464F18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464F3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464F60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464F84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464FB0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464FD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80464FF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465014 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465038 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046505C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465080 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804650A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4128B0, 0x100 + .4byte 0x80558F78 + .4byte 0 + .4byte 0x80558F80 + .4byte 0 + .4byte 0x80465680 + .4byte 0 + .4byte 0x8046568C + .4byte 0 + .4byte 0x80558F84 + .4byte 0 + .4byte 0x80558F8C + .4byte 0 + .4byte 0x8046569C + .4byte 0 + .4byte 0x804656AC + .4byte 0 + .4byte 0x80558F94 + .4byte 0 + .4byte 0x80558F9C + .4byte 0 + .4byte 0x804656B8 + .4byte 0 + .4byte 0x80558FA8 + .4byte 0 + .4byte 0x80558FB0 + .4byte 0 + .4byte 0x80558FB8 + .4byte 0 + .4byte 0x804656C8 + .4byte 0 + .4byte 0x80558FC0 + .4byte 0 + .4byte 0x804656D8 + .4byte 0 + .4byte 0x80558FC8 + .4byte 0 + .4byte 0x804656E4 + .4byte 0 + .4byte 0x804656F0 + .4byte 0 + .4byte 0x80558FD0 + .4byte 0 + .4byte 0x80558FD8 + .4byte 0 + .4byte 0x80558FE0 + .4byte 0 + .4byte 0x804656FC + .4byte 0 + .4byte 0x80558FE8 + .4byte 0 + .4byte 0x80465708 + .4byte 0 + .4byte 0x80558FF0 + .4byte 0 + .4byte 0x80465714 + .4byte 0 + .4byte 0x80465724 + .4byte 0 + .4byte 0x80465734 + .4byte 0 + .4byte 0x80465744 + .4byte 0 + .4byte 0x80465754 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4129B0, 0x60 + .4byte 0x80559030 + .4byte 0 + .4byte 0x80559038 + .4byte 0 + .4byte 0x80559040 + .4byte 0 + .4byte 0x8046657C + .4byte 0 + .4byte 0x80559048 + .4byte 0 + .4byte 0x80559050 + .4byte 0 + .4byte 0x80559058 + .4byte 0 + .4byte 0x80559060 + .4byte 0 + .4byte 0x80559064 + .4byte 0 + .4byte 0x80466588 + .4byte 0 + .4byte 0x8055906C + .4byte 0 + .4byte 0x80466594 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412A10, 0x88 + .4byte 0x80559088 + .4byte 0 + .4byte 0x80559090 + .4byte 0 + .4byte 0x80559098 + .4byte 0 + .4byte 0x80466850 + .4byte 0 + .4byte 0x805590A0 + .4byte 0 + .4byte 0x805590A8 + .4byte 0 + .4byte 0x805590B0 + .4byte 0 + .4byte 0x805590B8 + .4byte 0 + .4byte 0x8046685C + .4byte 0 + .4byte 0x80466868 + .4byte 0 + .4byte 0x80466880 + .4byte 0 + .4byte 0x80466894 + .4byte 0 + .4byte 0x805590C0 + .4byte 0 + .4byte 0x804668A8 + .4byte 0 + .4byte 0x804668B8 + .4byte 0 + .4byte 0x805590C8 + .4byte 0 + .4byte 0x805590D0 + .4byte 0 .global T_DYNAMICS_DESCNODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_DYNAMICS_DESCNODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412A98, 0x48 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3BAB92A6 + .4byte 0x3DCCCCCD + .4byte 0x3AE4C388 + .4byte 0x3D0EFA35 + .4byte 0x3E0EFA35 + .4byte 0x3FBDE44E + .4byte 0x40800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3BAB92A6 + .4byte 0x3DCCCCCD + .4byte 0x3AE4C388 + .4byte 0x3D0EFA35 + .4byte 0x3E0EFA35 + .4byte 0x3F060A92 + .4byte 0x3F800000 .global T_ANIM_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412AE0, 0x60 + .4byte 0x805590E8 + .4byte 0 + .4byte 0x805590F0 + .4byte 0 + .4byte 0x805590F8 + .4byte 0 + .4byte 0x80466CAC + .4byte 0 + .4byte 0x80559100 + .4byte 0 + .4byte 0x80559108 + .4byte 0 + .4byte 0x80559110 + .4byte 0 + .4byte 0x80559118 + .4byte 0 + .4byte 0x8055911C + .4byte 0 + .4byte 0x80466CB8 + .4byte 0 + .4byte 0x80466CC8 + .4byte 0 + .4byte 0x80466CDC + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412B40, 0x80 + .4byte 0x8055918C + .4byte 0 + .4byte 0x80467578 + .4byte 0 + .4byte 0x80467584 + .4byte 0 + .4byte 0x80467590 + .4byte 0 + .4byte 0x80559194 + .4byte 0 + .4byte 0x8046759C + .4byte 0 + .4byte 0x804675A8 + .4byte 0 + .4byte 0x805591A0 + .4byte 0 + .4byte 0x804675B4 + .4byte 0 + .4byte 0x80467578 + .4byte 0 + .4byte 0x804675C4 + .4byte 0 + .4byte 0x804675B4 + .4byte 0 + .4byte 0x8055918C + .4byte 0 + .4byte 0x804675D0 + .4byte 0 + .4byte 0x804675B4 + .4byte 0 + .4byte 0x804675B4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412BC0, 0x108 + .4byte 0x804675DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804675F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467618 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467634 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467650 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467650 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467674 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467698 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804676BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804676BC + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804676E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412CD8, 0xC8 + .4byte 0x805591C8 + .4byte 0 + .4byte 0x805591D0 + .4byte 0 + .4byte 0x80467C78 + .4byte 0 + .4byte 0x80467C84 + .4byte 0 + .4byte 0x805591D8 + .4byte 0 + .4byte 0x80467C90 + .4byte 0 + .4byte 0x80467C9C + .4byte 0 + .4byte 0x805591E0 + .4byte 0 + .4byte 0x80467CAC + .4byte 0 + .4byte 0x805591E8 + .4byte 0 + .4byte 0x80467CB8 + .4byte 0 + .4byte 0x805591F0 + .4byte 0 + .4byte 0x805591F8 + .4byte 0 + .4byte 0x80467CC4 + .4byte 0 + .4byte 0x80467CD4 + .4byte 0 + .4byte 0x80467CE0 + .4byte 0 + .4byte 0x80467CF0 + .4byte 0 + .4byte 0x80467CFC + .4byte 0 + .4byte 0x80467D08 + .4byte 0 + .4byte 0x80559200 + .4byte 0 + .4byte 0x80559208 + .4byte 0 + .4byte 0x80467D14 + .4byte 0 + .4byte 0x80467C84 + .4byte 0 + .4byte 0x805591D8 + .4byte 0 + .4byte 0x80467C90 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412DA0, 0x180 + .4byte 0x80467D20 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467D40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467D64 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467D88 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467DA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467DC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467DE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E34 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E58 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E58 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467E80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467EA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467ECC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467EF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467F10 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467F3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467F64 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412F20, 0x98 + .4byte 0x80559238 + .4byte 0 + .4byte 0x80559240 + .4byte 0 + .4byte 0x804683E4 + .4byte 0 + .4byte 0x80559248 + .4byte 0 + .4byte 0x80559250 + .4byte 0 + .4byte 0x804683F0 + .4byte 0 + .4byte 0x80559258 + .4byte 0 + .4byte 0x80559260 + .4byte 0 + .4byte 0x80559260 + .4byte 0 + .4byte 0x80559268 + .4byte 0 + .4byte 0x80559248 + .4byte 0 + .4byte 0x804683FC + .4byte 0 + .4byte 0x80559270 + .4byte 0 + .4byte 0x80559278 + .4byte 0 + .4byte 0x804683E4 + .4byte 0 + .4byte 0x80559258 + .4byte 0 + .4byte 0x80468408 + .4byte 0 + .4byte 0x80468414 + .4byte 0 + .4byte 0x80559280 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x412FB8, 0x180 + .4byte 0x80468420 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468440 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468460 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468484 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804684A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804684C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804684E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046850C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468530 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468550 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468578 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046859C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804685BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804685E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804685E8 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468614 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468648 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468670 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046869C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x413138, 0x90 + .4byte 0x805592A0 + .4byte 0 + .4byte 0x80468B78 + .4byte 0 + .4byte 0x805592A8 + .4byte 0 + .4byte 0x805592B0 + .4byte 0 + .4byte 0x80468B8C + .4byte 0 + .4byte 0x80468B98 + .4byte 0 + .4byte 0x805592B8 + .4byte 0 + .4byte 0x80468BA4 + .4byte 0 + .4byte 0x805592C0 + .4byte 0 + .4byte 0x805592C8 + .4byte 0 + .4byte 0x80468BB0 + .4byte 0 + .4byte 0x80468BB0 + .4byte 0 + .4byte 0x80468B78 + .4byte 0 + .4byte 0x80468BBC + .4byte 0 + .4byte 0x80468BC8 + .4byte 0 + .4byte 0x805592A8 + .4byte 0 + .4byte 0x805592A0 + .4byte 0 + .4byte 0x805592A8 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4131C8, 0x230 + .4byte 0x80468BD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468BF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468C18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468C3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468C5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468C7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468CA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468CC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468CEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468D0C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468D38 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468D5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468D88 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468DB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468DDC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468E0C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468E38 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468E64 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468E88 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468EB0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468ED4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468F00 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468F20 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468F48 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468F6C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468F90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468FB8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80468FE0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4133F8, 0xC8 + .4byte 0x805592DC + .4byte 0 + .4byte 0x805592E4 + .4byte 0 + .4byte 0x805592F0 + .4byte 0 + .4byte 0x805592F8 + .4byte 0 + .4byte 0x804695F8 + .4byte 0 + .4byte 0x80469604 + .4byte 0 + .4byte 0x80559300 + .4byte 0 + .4byte 0x80469610 + .4byte 0 + .4byte 0x8046961C + .4byte 0 + .4byte 0x80559308 + .4byte 0 + .4byte 0x80469628 + .4byte 0 + .4byte 0x80469634 + .4byte 0 + .4byte 0x80559310 + .4byte 0 + .4byte 0x80559318 + .4byte 0 + .4byte 0x80469640 + .4byte 0 + .4byte 0x80559320 + .4byte 0 + .4byte 0x80469640 + .4byte 0 + .4byte 0x80559320 + .4byte 0 + .4byte 0x8046964C + .4byte 0 + .4byte 0x80559328 + .4byte 0 + .4byte 0x80469658 + .4byte 0 + .4byte 0x80469634 + .4byte 0 + .4byte 0x80559308 + .4byte 0 + .4byte 0x80469664 + .4byte 0 + .4byte 0x805592F0 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4134C0, 0x190 + .4byte 0x80469670 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469694 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804696BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804696E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469708 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469730 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469758 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046977C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804697A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804697D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804697FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469828 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469854 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046987C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804698A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804698CC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804698F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469920 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046994C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80469974 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4136B8, 0x110 + .4byte 0x80559368 + .4byte 0 + .4byte 0x80559370 + .4byte 0 + .4byte 0x80469F00 + .4byte 0 + .4byte 0x80559378 + .4byte 0 + .4byte 0x80559380 + .4byte 0 + .4byte 0x80559388 + .4byte 0 + .4byte 0x80469F0C + .4byte 0 + .4byte 0x80469F18 + .4byte 0 + .4byte 0x80469F28 + .4byte 0 + .4byte 0x80469F38 + .4byte 0 + .4byte 0x80469F4C + .4byte 0 + .4byte 0x80469F58 + .4byte 0 + .4byte 0x80469F68 + .4byte 0 + .4byte 0x80469F74 + .4byte 0 + .4byte 0x80469F80 + .4byte 0 + .4byte 0x80469F8C + .4byte 0 + .4byte 0x80469F9C + .4byte 0 + .4byte 0x80469FB0 + .4byte 0 + .4byte 0x80469FC0 + .4byte 0 + .4byte 0x80469FD4 + .4byte 0 + .4byte 0x80469FE0 + .4byte 0 + .4byte 0x80559390 + .4byte 0 + .4byte 0x80559398 + .4byte 0 + .4byte 0x80469FF0 + .4byte 0 + .4byte 0x8046A000 + .4byte 0 + .4byte 0x8046A00C + .4byte 0 + .4byte 0x805593A0 + .4byte 0 + .4byte 0x8046A01C + .4byte 0 + .4byte 0x805593A8 + .4byte 0 + .4byte 0x8046A028 + .4byte 0 + .4byte 0x805593B0 + .4byte 0 + .4byte 0x805593B8 + .4byte 0 + .4byte 0x805593C0 + .4byte 0 + .4byte 0x8046A034 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x413800, 0xA8 + .4byte 0x805593F0 + .4byte 0 + .4byte 0x805593F8 + .4byte 0 + .4byte 0x8046ABCC + .4byte 0 + .4byte 0x80559400 + .4byte 0 + .4byte 0x80559408 + .4byte 0 + .4byte 0x8046ABD8 + .4byte 0 + .4byte 0x8046ABE4 + .4byte 0 + .4byte 0x80559410 + .4byte 0 + .4byte 0x8046ABF0 + .4byte 0 + .4byte 0x80559418 + .4byte 0 + .4byte 0x80559420 + .4byte 0 + .4byte 0x8046AC00 + .4byte 0 + .4byte 0x8046AC10 + .4byte 0 + .4byte 0x8046AC1C + .4byte 0 + .4byte 0x8046AC1C + .4byte 0 + .4byte 0x8046AC2C + .4byte 0 + .4byte 0x8046AC40 + .4byte 0 + .4byte 0x8046AC4C + .4byte 0 + .4byte 0x8046AC58 + .4byte 0 + .4byte 0x80559428 + .4byte 0 + .4byte 0x8046AC64 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4138A8, 0x1B8 + .4byte 0x8046AC78 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AC98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046ACBC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046ACE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD04 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD24 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD48 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD70 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AD94 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046ADB8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046ADE0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE04 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE50 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE50 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE50 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AE7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AEA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AED0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046AEF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046ACBC + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414520, 0x30 + .4byte 0x80559658 + .4byte 0 + .4byte 0x80559660 + .4byte 0 + .4byte 0x80559668 + .4byte 0 + .4byte 0x80559670 + .4byte 0 + .4byte 0x80559678 + .4byte 0 + .4byte 0x80473478 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414550, 0x70 + .4byte 0x80559690 + .4byte 0 + .4byte 0x80559698 + .4byte 0 + .4byte 0x805596A0 + .4byte 0 + .4byte 0x805596A8 + .4byte 0 + .4byte 0x805596B0 + .4byte 0 + .4byte 0x80473758 + .4byte 0 + .4byte 0x80473764 + .4byte 0 + .4byte 0x80473770 + .4byte 0 + .4byte 0x805596B8 + .4byte 0 + .4byte 0x805596C0 + .4byte 0 + .4byte 0x805596C8 + .4byte 0 + .4byte 0x80473780 + .4byte 0 + .4byte 0x805596D0 + .4byte 0 + .4byte 0x8047378C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4145C0, 0x50 + .4byte 0x805596E8 + .4byte 0 + .4byte 0x80473CF4 + .4byte 0 + .4byte 0x80473D00 + .4byte 0 + .4byte 0x80473D0C + .4byte 0 + .4byte 0x805596F0 + .4byte 0 + .4byte 0x80473D18 + .4byte 0 + .4byte 0x80473D24 + .4byte 0 + .4byte 0x805596F8 + .4byte 0 + .4byte 0x80559700 + .4byte 0 + .4byte 0x80559708 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414610, 0x90 + .4byte 0x80473FB8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4146A0, 0x40 + .4byte 0x80559748 + .4byte 0 + .4byte 0x80559750 + .4byte 0 + .4byte 0x80474264 + .4byte 0 + .4byte 0x80559748 + .4byte 0 + .4byte 0x80559758 + .4byte 0 + .4byte 0x80474270 + .4byte 0 + .4byte 0x80559760 + .4byte 0 + .4byte 0x80474264 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4146E0, 0x30 + .4byte 0x80559788 + .4byte 0 + .4byte 0x80559790 + .4byte 0 + .4byte 0x80474600 + .4byte 0 + .4byte 0x80559798 + .4byte 0 + .4byte 0x8047460C + .4byte 0 + .4byte 0x80474618 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414710, 0x48 + .4byte 0x80474920 + .4byte 0 + .4byte 0x805597B4 + .4byte 0 + .4byte 0x805597B8 + .4byte 0 + .4byte 0x805597C0 + .4byte 0 + .4byte 0x805597C8 + .4byte 0 + .4byte 0x8047492C + .4byte 0 + .4byte 0x8047492C + .4byte 0 + .4byte 0x80474938 + .4byte 0 + .4byte 0x80474944 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414758, 0x48 + .4byte 0x805597E8 + .4byte 0 + .4byte 0x805597F0 + .4byte 0 + .4byte 0x805597F8 + .4byte 0 + .4byte 0x80559800 + .4byte 0 + .4byte 0x80559808 + .4byte 0 + .4byte 0x80559810 + .4byte 0 + .4byte 0x80474CB0 + .4byte 0 + .4byte 0x80474CBC + .4byte 0 + .4byte 0x80474CC8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4147A0, 0x48 + .4byte 0x80559830 + .4byte 0 + .4byte 0x80559838 + .4byte 0 + .4byte 0x80559840 + .4byte 0 + .4byte 0x80559830 + .4byte 0 + .4byte 0x80559848 + .4byte 0 + .4byte 0x80475120 + .4byte 0 + .4byte 0x80559850 + .4byte 0 + .4byte 0x8047512C + .4byte 0 + .4byte 0x80475138 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4147E8, 0x10 + .4byte 0x80559868 + .4byte 0 + .4byte 0x80559868 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4147F8, 0x48 + .4byte 0x80559888 + .4byte 0 + .4byte 0x80559890 + .4byte 0 + .4byte 0x80559888 + .4byte 0 + .4byte 0x80559890 + .4byte 0 + .4byte 0x80559898 + .4byte 0 + .4byte 0x804754B4 + .4byte 0 + .4byte 0x80559890 + .4byte 0 + .4byte 0x805598A0 + .4byte 0 + .4byte 0x805598A8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414840, 0x58 + .4byte 0x805598C0 + .4byte 0 + .4byte 0x805598C8 + .4byte 0 + .4byte 0x805598D0 + .4byte 0 + .4byte 0x80475780 + .4byte 0 + .4byte 0x805598D8 + .4byte 0 + .4byte 0x805598E0 + .4byte 0 + .4byte 0x805598E8 + .4byte 0 + .4byte 0x805598F0 + .4byte 0 + .4byte 0x8047578C + .4byte 0 + .4byte 0x80475798 + .4byte 0 + .4byte 0x804757A4 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414898, 0x30 + .4byte 0x80559908 + .4byte 0 + .4byte 0x80559908 + .4byte 0 + .4byte 0x80559910 + .4byte 0 + .4byte 0x80559908 + .4byte 0 + .4byte 0x80559918 + .4byte 0 + .4byte 0x80475AB0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4148C8, 0x40 + .4byte 0x8055993C + .4byte 0 + .4byte 0x80559944 + .4byte 0 + .4byte 0x80475F40 + .4byte 0 + .4byte 0x8055994C + .4byte 0 + .4byte 0x80475F4C + .4byte 0 + .4byte 0x80559958 + .4byte 0 + .4byte 0x80559960 + .4byte 0 + .4byte 0x80559968 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414908, 0x18 + .4byte 0x80559990 + .4byte 0 + .4byte 0x80559998 + .4byte 0 + .4byte 0x804761F8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414920, 0x48 + .4byte 0x805599D8 + .4byte 0 + .4byte 0x805599D8 + .4byte 0 + .4byte 0x805599E0 + .4byte 0 + .4byte 0x805599E8 + .4byte 0 + .4byte 0x804765E8 + .4byte 0 + .4byte 0x804765F4 + .4byte 0 + .4byte 0x805599F0 + .4byte 0 + .4byte 0x80476600 + .4byte 0 + .4byte 0x805599F8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414968, 0x30 + .4byte 0x80559A20 + .4byte 0 + .4byte 0x80559A28 + .4byte 0 + .4byte 0x80476ACC + .4byte 0 + .4byte 0x80559A30 + .4byte 0 + .4byte 0x80559A38 + .4byte 0 + .4byte 0x80476AD8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414998, 0x28 + .4byte 0x80559A70 + .4byte 0 + .4byte 0x80559A78 + .4byte 0 + .4byte 0x80476D94 + .4byte 0 + .4byte 0x80476DA0 + .4byte 0 + .4byte 0x80559A80 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4149C0, 0x20 + .4byte 0x80477008 + .4byte 0 + .4byte 0x80559AC8 + .4byte 0 + .4byte 0x80477014 + .4byte 0 + .4byte 0x80559AD0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4149E0, 0x38 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B28 + .4byte 0 + .4byte 0x80559B30 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414A18, 0x30 + .4byte 0x80559B60 + .4byte 0 + .4byte 0x80559B60 + .4byte 0 + .4byte 0x80559B60 + .4byte 0 + .4byte 0x80559B60 + .4byte 0 + .4byte 0x80559B60 + .4byte 0 + .4byte 0x80559B60 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414A48, 0x50 + .4byte 0x80559B88 + .4byte 0 + .4byte 0x80559B90 + .4byte 0 + .4byte 0x80559B98 + .4byte 0 + .4byte 0x80559BA0 + .4byte 0 + .4byte 0x80559BA8 + .4byte 0 + .4byte 0x804778C4 + .4byte 0 + .4byte 0x804778D0 + .4byte 0 + .4byte 0x80559BB0 + .4byte 0 + .4byte 0x804778E0 + .4byte 0 + .4byte 0x80559BB8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414A98, 0x20 + .4byte 0x80559BD4 + .4byte 0 + .4byte 0x80559BDC + .4byte 0 + .4byte 0x80477C18 + .4byte 0 + .4byte 0x80559BE4 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414AB8, 0x58 + .4byte 0x80559C10 + .4byte 0 + .4byte 0x80559C18 + .4byte 0 + .4byte 0x80559C20 + .4byte 0 + .4byte 0x80559C10 + .4byte 0 + .4byte 0x80559C28 + .4byte 0 + .4byte 0x80477FA8 + .4byte 0 + .4byte 0x80477FB4 + .4byte 0 + .4byte 0x80559C30 + .4byte 0 + .4byte 0x80559C38 + .4byte 0 + .4byte 0x80559C40 + .4byte 0 + .4byte 0x80559C48 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414B10, 0xD8 + .4byte 0x80559C70 + .4byte 0 + .4byte 0x80559C78 + .4byte 0 + .4byte 0x804784A4 + .4byte 0 + .4byte 0x804784B0 + .4byte 0 + .4byte 0x80559C80 + .4byte 0 + .4byte 0x80559C88 + .4byte 0 + .4byte 0x80559C90 + .4byte 0 + .4byte 0x80559C98 + .4byte 0 + .4byte 0x804784BC + .4byte 0 + .4byte 0x80559CA0 + .4byte 0 + .4byte 0x80559CA8 + .4byte 0 + .4byte 0x804784C8 + .4byte 0 + .4byte 0x804784E0 + .4byte 0 + .4byte 0x804784F8 + .4byte 0 + .4byte 0x80478510 + .4byte 0 + .4byte 0x80478528 + .4byte 0 + .4byte 0x80478544 + .4byte 0 + .4byte 0x80478560 + .4byte 0 + .4byte 0x80478578 + .4byte 0 + .4byte 0x80478590 + .4byte 0 + .4byte 0x804785A4 + .4byte 0 + .4byte 0x804785B8 + .4byte 0 + .4byte 0x804785D0 + .4byte 0 + .4byte 0x804785E8 + .4byte 0 + .4byte 0x80478604 + .4byte 0 + .4byte 0x80478620 + .4byte 0 + .4byte 0x8047863C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414BE8, 0x48 + .4byte 0x80559CC8 + .4byte 0 + .4byte 0x80559CD0 + .4byte 0 + .4byte 0x80559CD8 + .4byte 0 + .4byte 0x80559CE0 + .4byte 0 + .4byte 0x80559CE8 + .4byte 0 + .4byte 0x80478BD0 + .4byte 0 + .4byte 0x80559CF0 + .4byte 0 + .4byte 0x80478BDC + .4byte 0 + .4byte 0x80478BE8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414C30, 0x38 + .4byte 0x80559D0C + .4byte 0 + .4byte 0x80559D14 + .4byte 0 + .4byte 0x80559D20 + .4byte 0 + .4byte 0x80559D0C + .4byte 0 + .4byte 0x80559D28 + .4byte 0 + .4byte 0x80478E60 + .4byte 0 + .4byte 0x80559D30 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414C68, 0x90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414CF8, 0x38 + .4byte 0x80559D64 + .4byte 0 + .4byte 0x80559D6C + .4byte 0 + .4byte 0x80479150 + .4byte 0 + .4byte 0x8047915C + .4byte 0 + .4byte 0x80479168 + .4byte 0 + .4byte 0x80479178 + .4byte 0 + .4byte 0x80559D74 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414D30, 0x48 + .4byte 0x80559DA0 + .4byte 0 + .4byte 0x80559DA8 + .4byte 0 + .4byte 0x80559DB0 + .4byte 0 + .4byte 0x80559DB8 + .4byte 0 + .4byte 0x80559DC0 + .4byte 0 + .4byte 0x80479344 + .4byte 0 + .4byte 0x80479350 + .4byte 0 + .4byte 0x80559DC8 + .4byte 0 + .4byte 0x8047935C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414D78, 0x30 + .4byte 0x80559DDC + .4byte 0 + .4byte 0x80559DE4 + .4byte 0 + .4byte 0x80559DF0 + .4byte 0 + .4byte 0x80559DF8 + .4byte 0 + .4byte 0x80559E00 + .4byte 0 + .4byte 0x80479570 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414DA8, 0x30 + .4byte 0x80559E18 + .4byte 0 + .4byte 0x80559E20 + .4byte 0 + .4byte 0x80559E28 + .4byte 0 + .4byte 0x80559E30 + .4byte 0 + .4byte 0x80559E38 + .4byte 0 + .4byte 0x80479800 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414DD8, 0x30 + .4byte 0x80559E58 + .4byte 0 + .4byte 0x80479C04 + .4byte 0 + .4byte 0x80479C10 + .4byte 0 + .4byte 0x80479C1C + .4byte 0 + .4byte 0x80559E5C + .4byte 0 + .4byte 0x80479C28 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414E08, 0x48 + .4byte 0x80559E80 + .4byte 0 + .4byte 0x80559E88 + .4byte 0 + .4byte 0x80479E28 + .4byte 0 + .4byte 0x80559E90 + .4byte 0 + .4byte 0x80479E38 + .4byte 0 + .4byte 0x80559E88 + .4byte 0 + .4byte 0x80479E28 + .4byte 0 + .4byte 0x80479E44 + .4byte 0 + .4byte 0x80479E38 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414E50, 0x40 + .4byte 0x80559EB0 + .4byte 0 + .4byte 0x80559EB8 + .4byte 0 + .4byte 0x8047A3AC + .4byte 0 + .4byte 0x80559EC0 + .4byte 0 + .4byte 0x8047A3B8 + .4byte 0 + .4byte 0x80559EC8 + .4byte 0 + .4byte 0x80559ED0 + .4byte 0 + .4byte 0x80559ED8 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414E90, 0x38 + .4byte 0x80559F00 + .4byte 0 + .4byte 0x80559F08 + .4byte 0 + .4byte 0x80559F10 + .4byte 0 + .4byte 0x80559F18 + .4byte 0 + .4byte 0x8047A780 + .4byte 0 + .4byte 0x80559F20 + .4byte 0 + .4byte 0x8047A78C + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414EC8, 0x90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414F58, 0x30 + .4byte 0x80559FA8 + .4byte 0 + .4byte 0x80559FB0 + .4byte 0 + .4byte 0x80559FB8 + .4byte 0 + .4byte 0x80559FC0 + .4byte 0 + .4byte 0x80559FC8 + .4byte 0 + .4byte 0x8047A9F0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414F88, 0x68 + .4byte 0x80559FE0 + .4byte 0 + .4byte 0x8047AC30 + .4byte 0 + .4byte 0x8047AC3C + .4byte 0 + .4byte 0x80559FE8 + .4byte 0 + .4byte 0x80559FF0 + .4byte 0 + .4byte 0x8047AC4C + .4byte 0 + .4byte 0x8047AC58 + .4byte 0 + .4byte 0x80559FF8 + .4byte 0 + .4byte 0x8047AC64 + .4byte 0 + .4byte 0x8047AC70 + .4byte 0 + .4byte 0x8055A000 + .4byte 0 + .4byte 0x8055A008 + .4byte 0 + .4byte 0x8047AC7C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x414FF0, 0x18 + .4byte 0x8055A028 + .4byte 0 + .4byte 0x8055A030 + .4byte 0 + .4byte 0x8055A028 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415108, 0x30 + .4byte 0x8055A044 + .4byte 0 + .4byte 0x8055A04C + .4byte 0 + .4byte 0x8055A058 + .4byte 0 + .4byte 0x8055A044 + .4byte 0 + .4byte 0x8055A060 + .4byte 0 + .4byte 0x8047B198 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415138, 0x40 + .4byte 0x8055A078 + .4byte 0 + .4byte 0x8055A080 + .4byte 0 + .4byte 0x8047B4AC + .4byte 0 + .4byte 0x8055A088 + .4byte 0 + .4byte 0x8055A090 + .4byte 0 + .4byte 0x8047B4B8 + .4byte 0 + .4byte 0x8047B4C4 + .4byte 0 + .4byte 0x8047B4D0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415178, 0x28 + .4byte 0x8055A0AC + .4byte 0 + .4byte 0x8055A0B4 + .4byte 0 + .4byte 0x8047B760 + .4byte 0 + .4byte 0x8055A0BC + .4byte 0 + .4byte 0x8047B76C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4151A0, 0x68 + .4byte 0x8055A0E0 + .4byte 0 + .4byte 0x8055A0E8 + .4byte 0 + .4byte 0x8055A0F0 + .4byte 0 + .4byte 0x8055A0F8 + .4byte 0 + .4byte 0x8055A100 + .4byte 0 + .4byte 0x8047BA94 + .4byte 0 + .4byte 0x8055A108 + .4byte 0 + .4byte 0x8047BAA0 + .4byte 0 + .4byte 0x8055A110 + .4byte 0 + .4byte 0x8055A118 + .4byte 0 + .4byte 0x8047BAAC + .4byte 0 + .4byte 0x8047BAB8 + .4byte 0 + .4byte 0x8055A120 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415208, 0x38 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A148 + .4byte 0 + .4byte 0x8055A150 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415240, 0x60 + .4byte 0x8055A168 + .4byte 0 + .4byte 0x8055A170 + .4byte 0 + .4byte 0x8055A178 + .4byte 0 + .4byte 0x8055A180 + .4byte 0 + .4byte 0x8055A188 + .4byte 0 + .4byte 0x8047C3D4 + .4byte 0 + .4byte 0x8047C3E0 + .4byte 0 + .4byte 0x8047C3EC + .4byte 0 + .4byte 0x8047C3F8 + .4byte 0 + .4byte 0x8055A190 + .4byte 0 + .4byte 0x8047C404 + .4byte 0 + .4byte 0x8047C414 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4152A0, 0x38 + .4byte 0x8055A1A8 + .4byte 0 + .4byte 0x8055A1B0 + .4byte 0 + .4byte 0x8055A1B8 + .4byte 0 + .4byte 0x8055A1C0 + .4byte 0 + .4byte 0x8047C7FC + .4byte 0 + .4byte 0x8055A1C8 + .4byte 0 + .4byte 0x8047C808 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4152D8, 0x20 + .4byte 0x8055A1DC + .4byte 0 + .4byte 0x8047CA48 + .4byte 0 + .4byte 0x8055A1E4 + .4byte 0 + .4byte 0x8055A1EC + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4152F8, 0x50 + .4byte 0x8055A238 + .4byte 0 + .4byte 0x8055A240 + .4byte 0 + .4byte 0x8055A248 + .4byte 0 + .4byte 0x8055A250 + .4byte 0 + .4byte 0x8055A258 + .4byte 0 + .4byte 0x8047CD88 + .4byte 0 + .4byte 0x8047CD94 + .4byte 0 + .4byte 0x8055A260 + .4byte 0 + .4byte 0x8047CDA0 + .4byte 0 + .4byte 0x8047CDB4 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415348, 0x50 + .4byte 0x8055A278 + .4byte 0 + .4byte 0x8055A280 + .4byte 0 + .4byte 0x8055A288 + .4byte 0 + .4byte 0x8055A290 + .4byte 0 + .4byte 0x8047D098 + .4byte 0 + .4byte 0x8055A298 + .4byte 0 + .4byte 0x8047D0A4 + .4byte 0 + .4byte 0x8055A2A0 + .4byte 0 + .4byte 0x8047D0B0 + .4byte 0 + .4byte 0x8047D0BC + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415398, 0x90 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ANIM_ENTRIES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415428, 0x10 + .4byte 0x8055A2E0 + .4byte 0 + .4byte 0x8055A2E0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415438, 0x68 + .4byte 0x8047D780 + .4byte 0 + .4byte 0x8055A2FC + .4byte 0 + .4byte 0x8055A308 + .4byte 0 + .4byte 0x8055A310 + .4byte 0 + .4byte 0x8047D78C + .4byte 0 + .4byte 0x8047D798 + .4byte 0 + .4byte 0x8055A318 + .4byte 0 + .4byte 0x8047D7A4 + .4byte 0 + .4byte 0x8047D7B0 + .4byte 0 + .4byte 0x8047D7C0 + .4byte 0 + .4byte 0x8047D7D0 + .4byte 0 + .4byte 0x8047D7E0 + .4byte 0 + .4byte 0x8047D7F0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4154A0, 0xE0 + .4byte 0x8055A330 + .4byte 0 + .4byte 0x8055A338 + .4byte 0 + .4byte 0x8055A340 + .4byte 0 + .4byte 0x8055A348 + .4byte 0 + .4byte 0x8055A350 + .4byte 0 + .4byte 0x8047DC14 + .4byte 0 + .4byte 0x8047DC20 + .4byte 0 + .4byte 0x8047DC2C + .4byte 0 + .4byte 0x8055A358 + .4byte 0 + .4byte 0x8055A360 + .4byte 0 + .4byte 0x8047DC38 + .4byte 0 + .4byte 0x8047DC44 + .4byte 0 + .4byte 0x8047DC58 + .4byte 0 + .4byte 0x8047DC68 + .4byte 0 + .4byte 0x8047DC74 + .4byte 0 + .4byte 0x8055A368 + .4byte 0 + .4byte 0x8047DC80 + .4byte 0 + .4byte 0x8047DC94 + .4byte 0 + .4byte 0x8047DCA0 + .4byte 0 + .4byte 0x8047DCAC + .4byte 0 + .4byte 0x8047DCB8 + .4byte 0 + .4byte 0x8047DCC4 + .4byte 0 + .4byte 0x8055A370 + .4byte 0 + .4byte 0x8055A378 + .4byte 0 + .4byte 0x8055A380 + .4byte 0 + .4byte 0x8055A388 + .4byte 0 + .4byte 0x8055A390 + .4byte 0 + .4byte 0x8047DCD0 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415580, 0xB0 + .4byte 0x8055A3C8 + .4byte 0 + .4byte 0x8055A3D0 + .4byte 0 + .4byte 0x8055A3D8 + .4byte 0 + .4byte 0x8055A3E0 + .4byte 0 + .4byte 0x8055A3E8 + .4byte 0 + .4byte 0x8055A3F0 + .4byte 0 + .4byte 0x8047E4F8 + .4byte 0 + .4byte 0x8055A3F8 + .4byte 0 + .4byte 0x8055A3E8 + .4byte 0 + .4byte 0x8047E504 + .4byte 0 + .4byte 0x8047E510 + .4byte 0 + .4byte 0x8047E51C + .4byte 0 + .4byte 0x8047E52C + .4byte 0 + .4byte 0x8047E538 + .4byte 0 + .4byte 0x8047E54C + .4byte 0 + .4byte 0x8047E55C + .4byte 0 + .4byte 0x8047E568 + .4byte 0 + .4byte 0x8047E57C + .4byte 0 + .4byte 0x8047E588 + .4byte 0 + .4byte 0x8047E594 + .4byte 0 + .4byte 0x8047E5A0 + .4byte 0 + .4byte 0x8047E5AC + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415630, 0x50 + .4byte 0x8055A40C + .4byte 0 + .4byte 0x8055A414 + .4byte 0 + .4byte 0x8055A420 + .4byte 0 + .4byte 0x8055A40C + .4byte 0 + .4byte 0x8055A428 + .4byte 0 + .4byte 0x8047E878 + .4byte 0 + .4byte 0x8055A430 + .4byte 0 + .4byte 0x8047E884 + .4byte 0 + .4byte 0x8047E890 + .4byte 0 + .4byte 0x8047E89C + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x415680, 0x48 + .4byte 0x8055A488 + .4byte 0 + .4byte 0x8055A488 + .4byte 0 + .4byte 0x8055A488 + .4byte 0 + .4byte 0x8055A488 + .4byte 0 + .4byte 0x8055A490 + .4byte 0 + .4byte 0x8047EA58 + .4byte 0 + .4byte 0x8047EA64 + .4byte 0 + .4byte 0x8047EA70 + .4byte 0 + .4byte 0x8055A498 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4156C8, 0x18 + .4byte 0x8055A4B4 + .4byte 0 + .4byte 0x8055A4BC + .4byte 0 + .4byte 0x8047EBD0 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4156E0, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047EE50 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047EE7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047EE7C + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x41CBB8, 0x10 + .4byte 0x8055C0EC + .4byte 0 + .4byte 0x8055C0F8 + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x41CBE0, 0x18 + .4byte 0x80494610 + .4byte 0 + .4byte 0x8055C190 + .4byte 0 + .4byte 0x8055C198 + .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x41CBF8, 0x10 + .4byte 0x8055C244 + .4byte 0 + .4byte 0x8055C24C + .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x41CC28, 0x18 + .4byte 0x80494ED8 + .4byte 0 + .4byte 0x8055C388 + .4byte 0 + .4byte 0x8055C390 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2 T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4606F0, 0x6C + .4byte 0 + .4byte 0x8025C810 ;# ptr + .4byte 0x802522B8 ;# ptr + .4byte 0 + .4byte 0x80259DE4 ;# ptr + .4byte 0x8025388C ;# ptr + .4byte 0x80260D68 ;# ptr + .4byte 0x80237C08 ;# ptr + .4byte 0x8024D75C ;# ptr + .4byte 0 + .4byte 0x80255AC8 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8023DAC8 ;# ptr + .4byte 0x8024B6D4 ;# ptr + .4byte 0x80247C58 ;# ptr + .4byte 0x802486A8 ;# ptr + .4byte 0x80249D44 ;# ptr .global $$250315 $$250315: - .incbin "baserom.dol", 0x46075C, 0x14 + .asciz "Scn.Step.Boss" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: - .incbin "baserom.dol", 0x460E28, 0x10 + .asciz "LA6HammertopJ" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x460E38, 0x10 + .asciz "HammerEffectL" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x460E48, 0x10 + .4byte 0x80558F00 + .4byte 0x80464D28 + .4byte 0x80464D38 + .4byte 0x80558F08 .global $$250139 $$250139: - .incbin "baserom.dol", 0x460E58, 0xC + .asciz "DownStart" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x460E64, 0xC + .asciz "DownBound" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x460E70, 0xC + .asciz "DownWait" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x460E7C, 0xC + .asciz "HammerStart" .global $$250143 $$250143: - .incbin "baserom.dol", 0x460E88, 0x10 + .asciz "HammerCharge" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x460E98, 0xC + .asciz "HammerHit" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x460EA4, 0xC + .asciz "Onigoroshi" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x460EB0, 0xC + .asciz "SmallJump" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x460EBC, 0x10 + .asciz "SmallJumpEnd" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x460ECC, 0x10 + .asciz "SmallJumpFall" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x460EDC, 0xC + .asciz "JumpStart" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x460EE8, 0x10 + .asciz "HammerDashStart" .global $$250156 $$250156: - .incbin "baserom.dol", 0x460EF8, 0xC + .asciz "HammerDash" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x460F04, 0x10 + .asciz "HammerDashEnd" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x460F14, 0x14 + .asciz "BombThroughStart" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x460F28, 0x10 + .asciz "BombThrowCharge" .global $$250160 $$250160: - .incbin "baserom.dol", 0x460F38, 0x10 + .asciz "BombThroughLoop" .global $$250161 $$250161: - .incbin "baserom.dol", 0x460F48, 0x10 + .asciz "BombThroughEnd" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x460F58, 0x20 + .asciz "Bonkers.AnimScript.Wait.Exec" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x460F78, 0x20 + .asciz "Bonkers.AnimScript.Appear.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x460F98, 0x20 + .asciz "Bonkers.AnimScript.Landing.Exec" .global $$250166 $$250166: - .incbin "baserom.dol", 0x460FB8, 0x20 + .asciz "Bonkers.AnimScript.Fall.Exec" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x460FD8, 0x20 + .asciz "Bonkers.AnimScript.Dead.Exec" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x460FF8, 0x20 + .asciz "Bonkers.AnimScript.Hammer.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x461018, 0x24 + .asciz "Bonkers.AnimScript.FireHammer.Exec" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x46103C, 0x24 + .asciz "Bonkers.AnimScript.MoveForward.Exec" .global $$250171 $$250171: - .incbin "baserom.dol", 0x461060, 0x24 + .asciz "Bonkers.AnimScript.StampFoot.Exec" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x461084, 0x2C + .asciz "Bonkers.AnimScript.JumpBigStart.Exec" + .balign 4 + .4byte 0 .global $$250173 $$250173: - .incbin "baserom.dol", 0x4610B0, 0x20 + .asciz "Bonkers.AnimScript.JumpBig.Exec" .global $$250174 $$250174: - .incbin "baserom.dol", 0x4610D0, 0x20 + .asciz "Bonkers.AnimScript.Swing.Exec" + .balign 4 .global $$250175 $$250175: - .incbin "baserom.dol", 0x4610F0, 0x24 + .asciz "Bonkers.AnimScript.SwingEnd.Exec" + .balign 4 .global $$250176 $$250176: - .incbin "baserom.dol", 0x461114, 0x24 + .asciz "Bonkers.AnimScript.BombStart.Exec" + .balign 4 .global $$250177 $$250177: - .incbin "baserom.dol", 0x461138, 0x24 + .asciz "Bonkers.AnimScript.BombLoop.Exec" + .balign 4 .global $$250178 $$250178: - .incbin "baserom.dol", 0x46115C, 0x24 + .asciz "Bonkers.AnimScript.BombLast.Exec" + .balign 4 .global $$250179 $$250179: - .incbin "baserom.dol", 0x461180, 0x28 + .asciz "Bonkers.AnimScript.RainBombStart.Exec" + .balign 4 .global $$250180 $$250180: - .incbin "baserom.dol", 0x4611A8, 0x28 + .asciz "Bonkers.AnimScript.RainBomb.Exec" + .balign 4 + .4byte 0 .global $$250315 $$250315: - .incbin "baserom.dol", 0x4611D0, 0x20 + .asciz "step/chara/enemy/bonkers/Motion" .global $$250316 $$250316: - .incbin "baserom.dol", 0x4611F0, 0x24 + .asciz "step/chara/enemy/bonkers/ModelEx" + .balign 4 .global $$250317 $$250317: - .incbin "baserom.dol", 0x461214, 0x20 + .asciz "step/chara/enemy/bonkers/Model" + .balign 4 .global $$250324 $$250324: - .incbin "baserom.dol", 0x461234, 0x24 + .asciz "step/chara/enemy/bonkers/ModelSpEx" + .balign 4 .global $$250325 $$250325: - .incbin "baserom.dol", 0x461258, 0x28 + .asciz "step/chara/enemy/bonkers/ModelSp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250132 $$250132: - .incbin "baserom.dol", 0x461750, 0xC + .asciz "ControlL" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x46175C, 0xC + .asciz "RFingerJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x461768, 0x18 + .4byte 0x80558F58 + .4byte 0x80558F60 + .4byte 0x80465650 + .4byte 0x80558F68 + .4byte 0x8046565C + .4byte 0x80558F70 .global $$250139 $$250139: - .incbin "baserom.dol", 0x461780, 0xC + .asciz "FlightWait" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x46178C, 0x10 + .asciz "FlyWallStart" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x46179C, 0x10 + .asciz "FlySuperStart" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x4617AC, 0xC + .asciz "FlySuper" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x4617B8, 0x10 + .asciz "SummonsStart" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x4617C8, 0x10 + .asciz "Lightthearted" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x4617D8, 0xC + .asciz "Regretful" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x4617E4, 0xC + .asciz "WorrisomeL" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x4617F0, 0xC + .asciz "WorrisomeR" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x4617FC, 0xC + .asciz "GladLoop" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x461808, 0xC + .asciz "DefeatLoop" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x461814, 0x10 + .asciz "GoodbyeFinal" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x461824, 0x10 + .asciz "LookKirbyStart" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x461834, 0x10 + .asciz "LookKirbyWait" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x461844, 0x10 + .asciz "LookKirbyEnd" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x461854, 0xC + .asciz "EyeBlink" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x461860, 0x28 + .asciz "ChallengeMaster.AnimScript.Wait.Exec" + .balign 4 .global $$250171 $$250171: - .incbin "baserom.dol", 0x461888, 0x2C + .asciz "ChallengeMaster.AnimScript.StartWait.Exec" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x4618B4, 0x24 + .asciz "ChallengeMaster.AnimScript.Fly.Exec" .global $$250173 $$250173: - .incbin "baserom.dol", 0x4618D8, 0x28 + .asciz "ChallengeMaster.AnimScript.Panic.Exec" + .balign 4 .global $$250174 $$250174: - .incbin "baserom.dol", 0x461900, 0x30 + .asciz "ChallengeMaster.AnimScript.Worrisome.ExecNear" + .balign 4 .global $$250175 $$250175: - .incbin "baserom.dol", 0x461930, 0x30 + .asciz "ChallengeMaster.AnimScript.Worrisome.ExecFar" + .balign 4 .global $$250176 $$250176: - .incbin "baserom.dol", 0x461960, 0x2C + .asciz "ChallengeMaster.AnimScript.DashStart.Exec" + .balign 4 .global $$250177 $$250177: - .incbin "baserom.dol", 0x46198C, 0x28 + .asciz "ChallengeMaster.AnimScript.Dash.Exec" + .balign 4 .global $$250178 $$250178: - .incbin "baserom.dol", 0x4619B4, 0x2C + .asciz "ChallengeMaster.AnimScript.FlyUp.Exec" + .balign 4 + .4byte 0 .global $$250179 $$250179: - .incbin "baserom.dol", 0x4619E0, 0x28 + .asciz "ChallengeMaster.AnimScript.FlyDown.Exec" .global $$250180 $$250180: - .incbin "baserom.dol", 0x461A08, 0x30 + .asciz "ChallengeMaster.AnimScript.FlyWallStart.Exec" + .balign 4 .global $$250181 $$250181: - .incbin "baserom.dol", 0x461A38, 0x28 + .asciz "ChallengeMaster.AnimScript.FlyWall.Exec" .global $$250182 $$250182: - .incbin "baserom.dol", 0x461A60, 0x28 + .asciz "ChallengeMaster.AnimScript.Summon.Exec" + .balign 4 .global $$250183 $$250183: - .incbin "baserom.dol", 0x461A88, 0x28 + .asciz "ChallengeMaster.AnimScript.Shot.Exec" + .balign 4 .global $$250184 $$250184: - .incbin "baserom.dol", 0x461AB0, 0x28 + .asciz "ChallengeMaster.AnimScript.Laugh.Exec" + .balign 4 .global $$250185 $$250185: - .incbin "baserom.dol", 0x461AD8, 0x24 + .asciz "ChallengeMaster.AnimScript.Win.Exec" .global $$250186 $$250186: - .incbin "baserom.dol", 0x461AFC, 0x28 + .asciz "ChallengeMaster.AnimScript.Lose.Exec" + .balign 4 .global $$250187 $$250187: - .incbin "baserom.dol", 0x461B24, 0x2C + .asciz "ChallengeMaster.AnimScript.SCPursuit.Exec" + .balign 4 .global $$250188 $$250188: - .incbin "baserom.dol", 0x461B50, 0x2C + .asciz "ChallengeMaster.AnimScript.SCLookKirby.Exec" .global $$250189 $$250189: - .incbin "baserom.dol", 0x461B7C, 0x2C + .asciz "ChallengeMaster.AnimScript.SCLookFar.Exec" + .balign 4 .global $$250190 $$250190: - .incbin "baserom.dol", 0x461BA8, 0x2C + .asciz "ChallengeMaster.AnimScript.SCGoodbye.Exec" + .balign 4 .global $$250191 $$250191: - .incbin "baserom.dol", 0x461BD4, 0x2C + .asciz "ChallengeMaster.AnimScript.SCFlyAway.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x461C00, 0x208 + .4byte 0x80465760 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80465788 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804657B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804657D8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465800 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465830 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465860 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046588C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804658B4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804658E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465908 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465938 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465960 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465988 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804659B0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804659D8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804659FC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465A24 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465A50 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465A7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465AA8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80465AD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250286 $$250286: - .incbin "baserom.dol", 0x461E08, 0x10 + .asciz "ChallengeMaster" .global $$250287 $$250287: - .incbin "baserom.dol", 0x461E18, 0x20 + .asciz "step/chara/enemy/mahoroa" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x462658, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x462664, 0xC + .asciz "Control2L" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462670, 0xC + .4byte 0x80559028 + .4byte 0x80466558 + .4byte 0x80466564 .global $$250137 $$250137: - .incbin "baserom.dol", 0x46267C, 0xC + .asciz "JumpStart" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x462688, 0xC + .asciz "FlightFall" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x462694, 0xC + .asciz "GoodbyeLoop" .global $$250147 $$250147: - .incbin "baserom.dol", 0x4626A0, 0x28 + .asciz "CreditDedede.AnimScript.HoverFar.Exec" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x4626C8, 0x24 + .asciz "CreditDedede.AnimScript.Praise.Exec" .global $$250149 $$250149: - .incbin "baserom.dol", 0x4626EC, 0x2C + .asciz "CreditDedede.AnimScript.Goodbye.Exec" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462718, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x804665A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804665C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804665EC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250230 $$250230: - .incbin "baserom.dol", 0x4627E0, 0x10 + .asciz "CreditDedede" + .balign 4 .global $$250231 $$250231: - .incbin "baserom.dol", 0x4627F0, 0x28 + .asciz "step/chara/hero/dedede/normal/Motion" + .balign 4 .global $$250232 $$250232: - .incbin "baserom.dol", 0x462818, 0x28 + .asciz "step/chara/hero/dedede/base/Default" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x462928, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x462934, 0xC + .asciz "Control2L" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462940, 0x10 + .4byte 0x80559078 + .4byte 0x80466828 + .4byte 0x80466834 + .4byte 0x80559080 .global $$250138 $$250138: - .incbin "baserom.dol", 0x462950, 0xC + .asciz "JumpStart" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x46295C, 0xC + .asciz "LookAround2" .global $$250144 $$250144: - .incbin "baserom.dol", 0x462968, 0x18 + .asciz "ContinuousAttackStart" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x462980, 0x14 + .asciz "ContinuousAttack" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x462994, 0x14 + .asciz "SpearAttackFrontEnd" .global $$250148 $$250148: - .incbin "baserom.dol", 0x4629A8, 0x10 + .asciz "SpearCopterUp" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x4629B8, 0x10 + .asciz "SpearCopterDown" .global $$250153 $$250153: - .incbin "baserom.dol", 0x4629C8, 0x20 + .asciz "CreditDee.AnimScript.Run.Exec" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x4629E8, 0x24 + .asciz "CreditDee.AnimScript.Run.ExecFast" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x462A0C, 0x20 + .asciz "CreditDee.AnimScript.Pick.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x462A2C, 0x24 + .asciz "CreditDee.AnimScript.Wonder.Exec" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x462A50, 0x24 + .asciz "CreditDee.AnimScript.FlightUp.Exec" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x462A74, 0x28 + .asciz "CreditDee.AnimScript.FlightDown.Exec" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x462A9C, 0x24 + .asciz "CreditDee.AnimScript.Praise.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462AC0, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804668C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804668E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046690C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046692C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466950 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466974 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046699C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250161 $$250161: - .incbin "baserom.dol", 0x462BB0, 0xC + .asciz "Ribbon1DJ" + .balign 4 .global $$250360 $$250360: - .incbin "baserom.dol", 0x462BBC, 0xC + .asciz "CreditDee" + .balign 4 .global $$250361 $$250361: - .incbin "baserom.dol", 0x462BC8, 0x24 + .asciz "step/chara/hero/dee/normal/Motion" + .balign 4 .global $$250362 $$250362: - .incbin "baserom.dol", 0x462BEC, 0x24 + .asciz "step/chara/hero/dee/base/Default" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x462D88, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x462D94, 0xC + .asciz "Control2L" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462DA0, 0xC + .4byte 0x805590E0 + .4byte 0x80466C88 + .4byte 0x80466C94 .global $$250137 $$250137: - .incbin "baserom.dol", 0x462DAC, 0xC + .asciz "JumpStart" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x462DB8, 0x10 + .asciz "WingShuttleLoop" .global $$250144 $$250144: - .incbin "baserom.dol", 0x462DC8, 0x14 + .asciz "WingShuttleLoopEnd" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x462DDC, 0xC + .asciz "GoodbyeLoop" .global $$250147 $$250147: - .incbin "baserom.dol", 0x462DE8, 0x24 + .asciz "CreditMeta.AnimScript.WaitBack.Exec" .global $$250148 $$250148: - .incbin "baserom.dol", 0x462E0C, 0x24 + .asciz "CreditMeta.AnimScript.WalkAway.Exec" .global $$250149 $$250149: - .incbin "baserom.dol", 0x462E30, 0x24 + .asciz "CreditMeta.AnimScript.Glide.Exec" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x462E54, 0x28 + .asciz "CreditMeta.AnimScript.ShuttleLoop.Exec" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x462E7C, 0x24 + .asciz "CreditMeta.AnimScript.Praise.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x462EA0, 0xDC + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466CE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466D0C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466D30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466D54 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80466D7C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250232 $$250232: - .incbin "baserom.dol", 0x462F7C, 0xC + .asciz "CreditMeta" + .balign 4 .global $$250233 $$250233: - .incbin "baserom.dol", 0x462F88, 0x24 + .asciz "step/chara/hero/meta/normal/Motion" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x462FAC, 0x24 + .asciz "step/chara/hero/meta/base/Default" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x463118, 0x10 + .asciz "ControlL" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x463128, 0x18 + .4byte 0x80559138 + .4byte 0x80467018 + .4byte 0x80559140 + .4byte 0x80559148 + .4byte 0x80559150 + .4byte 0x80559158 .global $$250139 $$250139: - .incbin "baserom.dol", 0x463140, 0x24 + .asciz "CreditRoah.AnimScript.Appear.Exec" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x463164, 0x24 + .asciz "CreditRoah.AnimScript.WaitFar.Exec" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x463188, 0x24 + .asciz "CreditRoah.AnimScript.FlyAway.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4631AC, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80467040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467064 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80467088 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250258 $$250258: - .incbin "baserom.dol", 0x463238, 0xC + .asciz "CreditRoah" + .balign 4 .global $$250259 $$250259: - .incbin "baserom.dol", 0x463244, 0x20 + .asciz "step/chara/enemy/roah/Motion" + .balign 4 .global $$250260 $$250260: - .incbin "baserom.dol", 0x463264, 0x24 + .asciz "step/chara/enemy/roah/ModelCredit" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: - .incbin "baserom.dol", 0x463678, 0xC + .asciz "Attack1Loop" .global $$250134 $$250134: - .incbin "baserom.dol", 0x463684, 0xC + .asciz "DeathDamage" .global $$250135 $$250135: - .incbin "baserom.dol", 0x463690, 0xC + .asciz "DeathStart" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x46369C, 0xC + .asciz "CallStart" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4636A8, 0xC + .asciz "CallLoop" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x4636B4, 0x10 + .asciz "Attack1Start" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x4636C4, 0xC + .asciz "Attack1End" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x4636D0, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x4636DC, 0x1C + .asciz "Dubior.AnimScript.Wait.Exec" .global $$250145 $$250145: - .incbin "baserom.dol", 0x4636F8, 0x20 + .asciz "Dubior.AnimScript.Appear.Exec" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x463718, 0x1C + .asciz "Dubior.AnimScript.Dead.Exec" .global $$250147 $$250147: - .incbin "baserom.dol", 0x463734, 0x1C + .asciz "Dubior.AnimScript.Call.Exec" .global $$250148 $$250148: - .incbin "baserom.dol", 0x463750, 0x24 + .asciz "Dubior.AnimScript.Dash.Exec(int)" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x463774, 0x24 + .asciz "Dubior.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x463798, 0x24 + .asciz "Dubior.AnimScript.ThunderStart.Exec" .global $$250151 $$250151: - .incbin "baserom.dol", 0x4637BC, 0x24 + .asciz "Dubior.AnimScript.Thunder.Exec(int)" .global $$250152 $$250152: - .incbin "baserom.dol", 0x4637E0, 0x1C + .asciz "Dubior.AnimScript.Shot.Exec" .global $$250246 $$250246: - .incbin "baserom.dol", 0x4637FC, 0x24 + .asciz "step/chara/enemy/dubior/Motion" + .balign 4 + .4byte 0 .global $$250247 $$250247: - .incbin "baserom.dol", 0x463820, 0x20 + .asciz "step/chara/enemy/dubior/ModelEx" .global $$250248 $$250248: - .incbin "baserom.dol", 0x463840, 0x20 + .asciz "step/chara/enemy/dubior/Model" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: - .incbin "baserom.dol", 0x463D58, 0x10 + .asciz "LShieldJ" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x463D68, 0x10 + .4byte 0x805591B0 + .4byte 0x805591B8 + .4byte 0x805591C0 + .4byte 0x80467C58 .global $$250137 $$250137: - .incbin "baserom.dol", 0x463D78, 0xC + .asciz "PreAppear" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x463D84, 0xC + .asciz "AttackStart" .global $$250140 $$250140: - .incbin "baserom.dol", 0x463D90, 0xC + .asciz "AttackEnd" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x463D9C, 0x10 + .asciz "Attack2Start" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x463DAC, 0xC + .asciz "Attack2End" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x463DB8, 0xC + .asciz "MoveBack" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x463DC4, 0x10 + .asciz "BreakawayStart" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x463DD4, 0xC + .asciz "Breakaway" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x463DE0, 0x10 + .asciz "BreakawayEnd" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x463DF0, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x463DFC, 0xC + .asciz "DeathDamage" .global $$250153 $$250153: - .incbin "baserom.dol", 0x463E08, 0xC + .asciz "DeathStart" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x463E14, 0xC + .asciz "ShieldWait" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x463E20, 0x20 + .asciz "GigantEdge.AnimScript.Wait.Exec" .global $$250159 $$250159: - .incbin "baserom.dol", 0x463E40, 0x24 + .asciz "GigantEdge.AnimScript.Appear.Exec" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x463E64, 0x24 + .asciz "GigantEdge.AnimScript.Landing.Exec" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x463E88, 0x20 + .asciz "GigantEdge.AnimScript.Fall.Exec" .global $$250162 $$250162: - .incbin "baserom.dol", 0x463EA8, 0x20 + .asciz "GigantEdge.AnimScript.Dead.Exec" .global $$250163 $$250163: - .incbin "baserom.dol", 0x463EC8, 0x20 + .asciz "GigantEdge.AnimScript.Dash.Exec" .global $$250164 $$250164: - .incbin "baserom.dol", 0x463EE8, 0x28 + .asciz "GigantEdge.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x463F10, 0x24 + .asciz "GigantEdge.AnimScript.DashEnd.Exec" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x463F34, 0x24 + .asciz "GigantEdge.AnimScript.Attack1.Exec" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x463F58, 0x28 + .asciz "GigantEdge.AnimScript.Attack2.Exec(int)" .global $$250168 $$250168: - .incbin "baserom.dol", 0x463F80, 0x28 + .asciz "GigantEdge.AnimScript.MoveForward.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x463FA8, 0x24 + .asciz "GigantEdge.AnimScript.MoveBack.Exec" .global $$250170 $$250170: - .incbin "baserom.dol", 0x463FCC, 0x24 + .asciz "GigantEdge.AnimScript.Guard.Exec" + .balign 4 .global $$250171 $$250171: - .incbin "baserom.dol", 0x463FF0, 0x20 + .asciz "GigantEdge.AnimScript.Shot.Exec" .global $$250172 $$250172: - .incbin "baserom.dol", 0x464010, 0x2C + .asciz "GigantEdge.AnimScript.JumpAttackStart.Exec" + .balign 4 .global $$250173 $$250173: - .incbin "baserom.dol", 0x46403C, 0x28 + .asciz "GigantEdge.AnimScript.JumpAttack.Exec" + .balign 4 .global $$250174 $$250174: - .incbin "baserom.dol", 0x464064, 0x30 + .asciz "GigantEdge.AnimScript.JumpAttackLanding.Exec" + .balign 4 .global $$250267 $$250267: - .incbin "baserom.dol", 0x464094, 0xC + .asciz "GigantEdge" + .balign 4 .global $$250268 $$250268: - .incbin "baserom.dol", 0x4640A0, 0x24 + .asciz "step/chara/enemy/gigantedge/Motion" + .balign 4 .global $$250269 $$250269: - .incbin "baserom.dol", 0x4640C4, 0x24 + .asciz "step/chara/enemy/gigantedge/ModelEx" .global $$250270 $$250270: - .incbin "baserom.dol", 0x4640E8, 0x28 + .asciz "step/chara/enemy/gigantedge/Model" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4644D0, 0x14 + .4byte 0x80559210 + .4byte 0x80559218 + .4byte 0x80559220 + .4byte 0x80559228 + .4byte 0x80559230 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4644E4, 0xC + .asciz "PreAppear" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x4644F0, 0xC + .asciz "AttackStart" .global $$250145 $$250145: - .incbin "baserom.dol", 0x4644FC, 0xC + .asciz "JumpStart" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x464508, 0xC + .asciz "DeathDamage" .global $$250149 $$250149: - .incbin "baserom.dol", 0x464514, 0xC + .asciz "DeathStart" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x464520, 0x20 + .asciz "KingsDoo.AnimScript.Wait.Exec" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x464540, 0x20 + .asciz "KingsDoo.AnimScript.Appear.Exec" .global $$250154 $$250154: - .incbin "baserom.dol", 0x464560, 0x24 + .asciz "KingsDoo.AnimScript.Landing.Exec" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x464584, 0x20 + .asciz "KingsDoo.AnimScript.Fall.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x4645A4, 0x20 + .asciz "KingsDoo.AnimScript.Dead.Exec" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x4645C4, 0x20 + .asciz "KingsDoo.AnimScript.Dash.Exec" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x4645E4, 0x28 + .asciz "KingsDoo.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x46460C, 0x24 + .asciz "KingsDoo.AnimScript.DashEnd.Exec" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x464630, 0x20 + .asciz "KingsDoo.AnimScript.Attack.Exec" .global $$250161 $$250161: - .incbin "baserom.dol", 0x464650, 0x28 + .asciz "KingsDoo.AnimScript.MoveForward.Exec" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x464678, 0x24 + .asciz "KingsDoo.AnimScript.JumpStart.Exec" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x46469C, 0x20 + .asciz "KingsDoo.AnimScript.Jump.Exec" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x4646BC, 0x2C + .asciz "KingsDoo.AnimScript.JumpAttackStart.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x4646E8, 0x2C + .asciz "KingsDoo.AnimScript.JumpAttack.Exec(int)" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x464714, 0x34 + .asciz "KingsDoo.AnimScript.JumpMachinegunStart.Exec" + .balign 4 + .4byte 0 .global $$250167 $$250167: - .incbin "baserom.dol", 0x464748, 0x28 + .asciz "KingsDoo.AnimScript.JumpMachinegun.Exec" .global $$250168 $$250168: - .incbin "baserom.dol", 0x464770, 0x2C + .asciz "KingsDoo.AnimScript.ChargeAttackStart.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x46479C, 0x28 + .asciz "KingsDoo.AnimScript.ChargeAttack.Exec" + .balign 4 .global $$250262 $$250262: - .incbin "baserom.dol", 0x4647C4, 0xC + .asciz "KingsDoo" + .balign 4 .global $$250263 $$250263: - .incbin "baserom.dol", 0x4647D0, 0x24 + .asciz "step/chara/enemy/beholdoo/Motion" + .balign 4 .global $$250264 $$250264: - .incbin "baserom.dol", 0x4647F4, 0x24 + .asciz "step/chara/enemy/beholdoo/ModelEx" + .balign 4 .global $$250265 $$250265: - .incbin "baserom.dol", 0x464818, 0x20 + .asciz "step/chara/enemy/beholdoo/Model" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250134 $$250134: - .incbin "baserom.dol", 0x464C78, 0x14 + .asciz "BigJumpPressLanding" .global $$250137 $$250137: - .incbin "baserom.dol", 0x464C8C, 0xC + .asciz "DeathDamage" .global $$250138 $$250138: - .incbin "baserom.dol", 0x464C98, 0xC + .asciz "DeathStart" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x464CA4, 0xC + .asciz "MoveStart" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x464CB0, 0xC + .asciz "JumpStart" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x464CBC, 0xC + .asciz "RunAttack" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x464CC8, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x464CD4, 0x20 + .asciz "Moundeath.AnimScript.Wait.Exec" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x464CF4, 0x24 + .asciz "Moundeath.AnimScript.Appear.Exec" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x464D18, 0x24 + .asciz "Moundeath.AnimScript.Landing.Exec" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x464D3C, 0x20 + .asciz "Moundeath.AnimScript.Fall.Exec" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x464D5C, 0x20 + .asciz "Moundeath.AnimScript.Dead.Exec" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x464D7C, 0x24 + .asciz "Moundeath.AnimScript.MoveStart.Exec" .global $$250153 $$250153: - .incbin "baserom.dol", 0x464DA0, 0x28 + .asciz "Moundeath.AnimScript.MoveForward.Exec" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x464DC8, 0x24 + .asciz "Moundeath.AnimScript.MoveEnd.Exec" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x464DEC, 0x20 + .asciz "Moundeath.AnimScript.Jump.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x464E0C, 0x2C + .asciz "Moundeath.AnimScript.PressJumpStart.Exec" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x464E38, 0x24 + .asciz "Moundeath.AnimScript.PressJump.Exec" .global $$250158 $$250158: - .incbin "baserom.dol", 0x464E5C, 0x2C + .asciz "Moundeath.AnimScript.PressJumpLanding.Exec" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x464E88, 0x2C + .asciz "Moundeath.AnimScript.PressFallStart.Exec" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x464EB4, 0x28 + .asciz "Moundeath.AnimScript.PressBigJump.Exec" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x464EDC, 0x30 + .asciz "Moundeath.AnimScript.PressBigJumpLanding.Exec" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x464F0C, 0x2C + .asciz "Moundeath.AnimScript.GiantJumpLanding.Exec" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x464F38, 0x2C + .asciz "Moundeath.AnimScript.GiantFallStart.Exec" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x464F64, 0x24 + .asciz "Moundeath.AnimScript.GiantFall.Exec" .global $$250165 $$250165: - .incbin "baserom.dol", 0x464F88, 0x28 + .asciz "Moundeath.AnimScript.RollJumpStart.Exec" .global $$250166 $$250166: - .incbin "baserom.dol", 0x464FB0, 0x24 + .asciz "Moundeath.AnimScript.RollJump.Exec" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x464FD4, 0x2C + .asciz "Moundeath.AnimScript.RollJumpLanding.Exec" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x465000, 0x20 + .asciz "Moundeath.AnimScript.Dash.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x465020, 0x28 + .asciz "Moundeath.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x465048, 0x24 + .asciz "Moundeath.AnimScript.DashEnd.Exec" + .balign 4 .global $$250171 $$250171: - .incbin "baserom.dol", 0x46506C, 0x24 + .asciz "Moundeath.AnimScript.Rolling.Exec" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x465090, 0x28 + .asciz "Moundeath.AnimScript.RollingEnd.Exec" + .balign 4 .global $$250173 $$250173: - .incbin "baserom.dol", 0x4650B8, 0x28 + .asciz "Moundeath.AnimScript.TornadoRise.Exec" + .balign 4 .global $$250174 $$250174: - .incbin "baserom.dol", 0x4650E0, 0x28 + .asciz "Moundeath.AnimScript.TornadoChase.Exec" + .balign 4 .global $$250267 $$250267: - .incbin "baserom.dol", 0x465108, 0xC + .asciz "Moundeath" + .balign 4 .global $$250268 $$250268: - .incbin "baserom.dol", 0x465114, 0x24 + .asciz "step/chara/enemy/moundeath/Motion" + .balign 4 .global $$250269 $$250269: - .incbin "baserom.dol", 0x465138, 0x24 + .asciz "step/chara/enemy/moundeath/ModelEx" + .balign 4 .global $$250270 $$250270: - .incbin "baserom.dol", 0x46515C, 0x24 + .asciz "step/chara/enemy/moundeath/Model" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4656F8, 0xC + .asciz "DeathDamage" .global $$250137 $$250137: - .incbin "baserom.dol", 0x465704, 0xC + .asciz "DeathStart" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x465710, 0xC + .asciz "Preparation" .global $$250140 $$250140: - .incbin "baserom.dol", 0x46571C, 0xC + .asciz "AttackStart" .global $$250142 $$250142: - .incbin "baserom.dol", 0x465728, 0xC + .asciz "AttackEnd" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x465734, 0xC + .asciz "WaveStart" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x465740, 0xC + .asciz "JumpStart" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x46574C, 0xC + .asciz "SplashStart" .global $$250150 $$250150: - .incbin "baserom.dol", 0x465758, 0xC + .asciz "SplashEnd" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x465764, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x465770, 0x24 + .asciz "WaterGalboros.AnimScript.Wait.Exec" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x465794, 0x28 + .asciz "WaterGalboros.AnimScript.Appear.Exec" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x4657BC, 0x28 + .asciz "WaterGalboros.AnimScript.Landing.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x4657E4, 0x24 + .asciz "WaterGalboros.AnimScript.Fall.Exec" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x465808, 0x28 + .asciz "WaterGalboros.AnimScript.Dead.Exec" + .balign 4 + .4byte 0 .global $$250158 $$250158: - .incbin "baserom.dol", 0x465830, 0x28 + .asciz "WaterGalboros.AnimScript.JumpStart.Exec" .global $$250159 $$250159: - .incbin "baserom.dol", 0x465858, 0x24 + .asciz "WaterGalboros.AnimScript.Jump.Exec" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x46587C, 0x2C + .asciz "WaterGalboros.AnimScript.JumpBigStart.Exec" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x4658A8, 0x28 + .asciz "WaterGalboros.AnimScript.JumpBig.Exec" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x4658D0, 0x2C + .asciz "WaterGalboros.AnimScript.AttackPrepare.Exec" .global $$250163 $$250163: - .incbin "baserom.dol", 0x4658FC, 0x2C + .asciz "WaterGalboros.AnimScript.AttackWater.Exec" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x465928, 0x2C + .asciz "WaterGalboros.AnimScript.AttackWave.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x465954, 0x28 + .asciz "WaterGalboros.AnimScript.Quivery.Exec" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x46597C, 0x2C + .asciz "WaterGalboros.AnimScript.QuiveryEnd.Exec" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x4659A8, 0x24 + .asciz "WaterGalboros.AnimScript.Dash.Exec" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x4659CC, 0x2C + .asciz "WaterGalboros.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x4659F8, 0x28 + .asciz "WaterGalboros.AnimScript.DashEnd.Exec" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x465A20, 0x2C + .asciz "WaterGalboros.AnimScript.CaptureAttack.Exec" .global $$250171 $$250171: - .incbin "baserom.dol", 0x465A4C, 0x28 + .asciz "WaterGalboros.AnimScript.Capture.Exec" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x465A74, 0x24 + .asciz "WaterGalboros.AnimScript.Vomit.Exec" .global $$250265 $$250265: - .incbin "baserom.dol", 0x465A98, 0x10 + .asciz "WaterGalboros" + .balign 4 .global $$250266 $$250266: - .incbin "baserom.dol", 0x465AA8, 0x28 + .asciz "step/chara/enemy/watergalboros/Motion" + .balign 4 .global $$250267 $$250267: - .incbin "baserom.dol", 0x465AD0, 0x28 + .asciz "step/chara/enemy/watergalboros/ModelEx" + .balign 4 .global $$250268 $$250268: - .incbin "baserom.dol", 0x465AF8, 0x28 + .asciz "step/chara/enemy/watergalboros/Model" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250134 $$250134: - .incbin "baserom.dol", 0x465F90, 0xC + .asciz "CB1LegSJ" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x465F9C, 0xC + .asciz "CA4HeadSJ" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x465FA8, 0xC + .asciz "FaceRotJ" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x465FB4, 0xC + .asciz "MouthRotJ" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x465FC0, 0x10 + .asciz "LA1ShoulderJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x465FD0, 0x30 + .4byte 0x80559330 + .4byte 0x80559338 + .4byte 0x80559340 + .4byte 0x80559348 + .4byte 0x80469E90 + .4byte 0x80559350 + .4byte 0x80559358 + .4byte 0x80559360 + .4byte 0x80469E9C + .4byte 0x80469EA8 + .4byte 0x80469EB4 + .4byte 0x80469EC0 .global $$250145 $$250145: - .incbin "baserom.dol", 0x466000, 0xC + .asciz "WaitNoFace" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x46600C, 0xC + .asciz "ShootStart" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x466018, 0x10 + .asciz "BigShootStart" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x466028, 0x10 + .asciz "ShootStartWait" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x466038, 0x14 + .asciz "BigShootStartWait" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x46604C, 0xC + .asciz "ShootLoop" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x466058, 0x10 + .asciz "BigShootLoop" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x466068, 0xC + .asciz "ShootEnd" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x466074, 0xC + .asciz "BigShootEnd" .global $$250157 $$250157: - .incbin "baserom.dol", 0x466080, 0xC + .asciz "FallApple" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x46608C, 0x10 + .asciz "FallEnemyStart" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x46609C, 0x14 + .asciz "BigFallEnemyStart" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x4660B0, 0x10 + .asciz "FallEnemyWait" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x4660C0, 0x14 + .asciz "BigFallEnemyWait" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x4660D4, 0xC + .asciz "FallEnemy" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x4660E0, 0x10 + .asciz "BigFallEnemy" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x4660F0, 0x10 + .asciz "VacuumBigStart" + .balign 4 .global $$250167 $$250167: - .incbin "baserom.dol", 0x466100, 0xC + .asciz "VacuumBig" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x46610C, 0x10 + .asciz "VacuumBigEnd" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x46611C, 0xC + .asciz "AnemicEnd" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x466128, 0xC + .asciz "DeathWait" + .balign 4 .global $$250176 $$250176: - .incbin "baserom.dol", 0x466134, 0xC + .asciz "ShakeNoFace" .global $$250178 $$250178: - .incbin "baserom.dol", 0x466140, 0x1C + .asciz "Whispy.AnimScript.Wait.Exec" .global $$250179 $$250179: - .incbin "baserom.dol", 0x46615C, 0x20 + .asciz "Whispy.AnimScript.Appear.Exec" + .balign 4 .global $$250180 $$250180: - .incbin "baserom.dol", 0x46617C, 0x24 + .asciz "Whispy.AnimScript.ShootStart.Exec" + .balign 4 .global $$250181 $$250181: - .incbin "baserom.dol", 0x4661A0, 0x28 + .asciz "Whispy.AnimScript.ShootStartWait.Exec" + .balign 4 .global $$250182 $$250182: - .incbin "baserom.dol", 0x4661C8, 0x28 + .asciz "Whispy.AnimScript.ShootLoop.Exec" + .balign 4 + .4byte 0 .global $$250183 $$250183: - .incbin "baserom.dol", 0x4661F0, 0x20 + .asciz "Whispy.AnimScript.ShootEnd.Exec" .global $$250184 $$250184: - .incbin "baserom.dol", 0x466210, 0x24 + .asciz "Whispy.AnimScript.FallApple.Exec" + .balign 4 .global $$250185 $$250185: - .incbin "baserom.dol", 0x466234, 0x24 + .asciz "Whispy.AnimScript.FallEnemy.Exec" + .balign 4 .global $$250186 $$250186: - .incbin "baserom.dol", 0x466258, 0x24 + .asciz "Whispy.AnimScript.FallEnemy2.Exec" + .balign 4 .global $$250187 $$250187: - .incbin "baserom.dol", 0x46627C, 0x1C + .asciz "Whispy.AnimScript.Grow.Exec" .global $$250188 $$250188: - .incbin "baserom.dol", 0x466298, 0x24 + .asciz "Whispy.AnimScript.VacuumStart.Exec" + .balign 4 .global $$250189 $$250189: - .incbin "baserom.dol", 0x4662BC, 0x20 + .asciz "Whispy.AnimScript.Vacuum.Exec" + .balign 4 .global $$250190 $$250190: - .incbin "baserom.dol", 0x4662DC, 0x24 + .asciz "Whispy.AnimScript.VacuumEnd.Exec" + .balign 4 .global $$250191 $$250191: - .incbin "baserom.dol", 0x466300, 0x20 + .asciz "Whispy.AnimScript.Capture.Exec" + .balign 4 .global $$250192 $$250192: - .incbin "baserom.dol", 0x466320, 0x20 + .asciz "Whispy.AnimScript.Chewing.Exec" + .balign 4 .global $$250193 $$250193: - .incbin "baserom.dol", 0x466340, 0x20 + .asciz "Whispy.AnimScript.Vomit.Exec" + .balign 4 .global $$250194 $$250194: - .incbin "baserom.dol", 0x466360, 0x1C + .asciz "Whispy.AnimScript.Dead.Exec" .global $$250195 $$250195: - .incbin "baserom.dol", 0x46637C, 0x24 + .asciz "Whispy.AnimScript.AppearLong.Exec" + .balign 4 .global $$250196 $$250196: - .incbin "baserom.dol", 0x4663A0, 0x28 + .asciz "Whispy.AnimScript.RootAttack.Exec" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4663C8, 0x1E0 + .4byte 0x8046A040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A05C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0x8046A07C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A0A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A0C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A0F0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A110 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A134 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A158 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000016 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A17C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A198 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A1BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A1DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A200 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A220 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A240 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A260 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A27C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8046A2A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250291 $$250291: - .incbin "baserom.dol", 0x4665A8, 0x20 + .asciz "step/chara/enemy/whispy/Motion" + .balign 4 .global $$250292 $$250292: - .incbin "baserom.dol", 0x4665C8, 0x20 + .asciz "step/chara/enemy/whispy/ModelEx" .global $$250293 $$250293: - .incbin "baserom.dol", 0x4665E8, 0x20 + .asciz "step/chara/enemy/whispy/Model" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x466CC0, 0xC + .asciz "RCutterL" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x466CCC, 0xC + .asciz "PreAppear" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x466CD8, 0xC + .asciz "DeathDamage" .global $$250139 $$250139: - .incbin "baserom.dol", 0x466CE4, 0xC + .asciz "DeathStart" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x466CF0, 0x10 + .asciz "MoveStart" + .balign 4 + .4byte 0 .global $$250144 $$250144: - .incbin "baserom.dol", 0x466D00, 0x10 + .asciz "DashCutterStart" .global $$250145 $$250145: - .incbin "baserom.dol", 0x466D10, 0xC + .asciz "DashCutter" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x466D1C, 0x10 + .asciz "DashCutterEnd" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x466D2C, 0x14 + .asciz "CutterEllipseThrow" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x466D40, 0xC + .asciz "CutterCatch" .global $$250149 $$250149: - .incbin "baserom.dol", 0x466D4C, 0xC + .asciz "CutterThrow" .global $$250150 $$250150: - .incbin "baserom.dol", 0x466D58, 0xC + .asciz "JumpStart" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x466D64, 0x14 + .asciz "JumpingCutterThrow" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x466D78, 0x20 + .asciz "Zankibble.AnimScript.Wait.Exec" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x466D98, 0x24 + .asciz "Zankibble.AnimScript.Appear.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x466DBC, 0x28 + .asciz "Zankibble.AnimScript.Landing.Exec(int)" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x466DE4, 0x20 + .asciz "Zankibble.AnimScript.Fall.Exec" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x466E04, 0x20 + .asciz "Zankibble.AnimScript.Dead.Exec" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x466E24, 0x24 + .asciz "Zankibble.AnimScript.MoveStart.Exec" .global $$250160 $$250160: - .incbin "baserom.dol", 0x466E48, 0x28 + .asciz "Zankibble.AnimScript.MoveForward.Exec" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x466E70, 0x24 + .asciz "Zankibble.AnimScript.MoveEnd.Exec" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x466E94, 0x24 + .asciz "Zankibble.AnimScript.Dash.Exec(int)" .global $$250163 $$250163: - .incbin "baserom.dol", 0x466EB8, 0x28 + .asciz "Zankibble.AnimScript.DashWallHit.Exec" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x466EE0, 0x24 + .asciz "Zankibble.AnimScript.DashEnd.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x466F04, 0x2C + .asciz "Zankibble.AnimScript.AttackStraight.Exec" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x466F30, 0x20 + .asciz "Zankibble.AnimScript.Catch.Exec" .global $$250167 $$250167: - .incbin "baserom.dol", 0x466F50, 0x2C + .asciz "Zankibble.AnimScript.AttackCircle.Exec(int)" .global $$250168 $$250168: - .incbin "baserom.dol", 0x466F7C, 0x2C + .asciz "Zankibble.AnimScript.JumpAttackStart.Exec" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x466FA8, 0x28 + .asciz "Zankibble.AnimScript.JumpAttack.Exec" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x466FD0, 0x24 + .asciz "Zankibble.AnimScript.JumpStart.Exec" .global $$250171 $$250171: - .incbin "baserom.dol", 0x466FF4, 0x20 + .asciz "Zankibble.AnimScript.Jump.Exec" + .balign 4 .global $$250264 $$250264: - .incbin "baserom.dol", 0x467014, 0xC + .asciz "Zankibble" + .balign 4 .global $$250265 $$250265: - .incbin "baserom.dol", 0x467020, 0x24 + .asciz "step/chara/enemy/zankibble/Motion" + .balign 4 .global $$250266 $$250266: - .incbin "baserom.dol", 0x467044, 0x24 + .asciz "step/chara/enemy/zankibble/ModelEx" + .balign 4 .global $$250267 $$250267: - .incbin "baserom.dol", 0x467068, 0x28 + .asciz "step/chara/enemy/zankibble/Model" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: - .incbin "baserom.dol", 0x46F578, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x46F584, 0x24 + .asciz "ArmorDee.AnimScript.Landing.Exec" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x46F5A8, 0x20 + .asciz "ArmorDee.AnimScript.Walk.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x46F5C8, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80473484 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804734A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250208 $$250208: - .incbin "baserom.dol", 0x46F668, 0xC + .asciz "Armordee" + .balign 4 .global $$250209 $$250209: - .incbin "baserom.dol", 0x46F674, 0x1C + .asciz "step/chara/enemy/ArmorDee" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x46F840, 0xC + .asciz "CA4FaceJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x46F84C, 0xC + .4byte 0x80559680 + .4byte 0x80473740 + .4byte 0x80559688 .global $$250131 $$250131: - .incbin "baserom.dol", 0x46F858, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x46F864, 0xC + .asciz "AttackStart" .global $$250133 $$250133: - .incbin "baserom.dol", 0x46F870, 0x10 + .asciz "DoubleAttack" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x46F880, 0xC + .asciz "JumpStart" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x46F88C, 0xC + .asciz "GoodbyeLoop" .global $$250141 $$250141: - .incbin "baserom.dol", 0x46F898, 0x24 + .asciz "BladeKnight.AnimScript.Attack.Exec" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x46F8BC, 0x2C + .asciz "BladeKnight.AnimScript.DoubleAttack.Exec" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x46F8E8, 0x34 + .asciz "BladeKnight.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x46F91C, 0x34 + .asciz "BladeKnight.AnimScript.GrandLowperEscape.Exec" + .balign 4 + .4byte 0 .global $$250145 $$250145: - .incbin "baserom.dol", 0x46F950, 0x28 + .asciz "BladeKnight.AnimScript.SuperAppear.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x46F978, 0x12C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80473798 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804737BC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x804737E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047381C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80473850 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000008 + .4byte 0 + .4byte 0 .global $$250409 $$250409: - .incbin "baserom.dol", 0x46FAA4, 0xC + .asciz "Bladeknight" .global $$250410 $$250410: - .incbin "baserom.dol", 0x46FAB0, 0x18 + .asciz "step/chara/enemy/Blade" + .balign 4 .global $$250422 $$250422: - .incbin "baserom.dol", 0x46FAC8, 0x10 + .asciz "CA5Hair1DJ" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x46FDE8, 0xC + .asciz "ControlL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x46FDF4, 0xC + .asciz "WaitFall" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x46FE00, 0xC + .asciz "WaitLanding" .global $$250128 $$250128: - .incbin "baserom.dol", 0x46FE0C, 0xC + .asciz "WaitJump" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x46FE18, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x46FE24, 0xC + .asciz "WaitStart" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x46FE30, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250212 $$250212: - .incbin "baserom.dol", 0x46FF20, 0x20 + .asciz "step/chara/enemy/Blipper" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4700B8, 0x24 + .asciz "BonkersBomb.AnimScript.Wait.Exec" + .balign 4 .global $$250201 $$250201: - .incbin "baserom.dol", 0x4700DC, 0xC + .asciz "BonkersBomb" .global $$250202 $$250202: - .incbin "baserom.dol", 0x4700E8, 0x20 + .asciz "step/weapon/bonkers/Coconutbomb" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x470358, 0xC + .asciz "CA2UpBodyJ" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x470364, 0xC + .asciz "JumpStart" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x470370, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x47037C, 0x30 + .asciz "Bouncy.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4703AC, 0x2C + .asciz "Bouncy.AnimScript.GrandLowperEscape.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4703D8, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047427C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804742AC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250210 $$250210: - .incbin "baserom.dol", 0x4704A0, 0x18 + .asciz "step/chara/enemy/Bouncy" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: - .incbin "baserom.dol", 0x470700, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x47070C, 0xC + .asciz "AttackStart" .global $$250130 $$250130: - .incbin "baserom.dol", 0x470718, 0xC + .asciz "AttackWait" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x470724, 0x20 + .asciz "Bowby.AnimScript.Attack.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x470744, 0xB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80474624 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250237 $$250237: - .incbin "baserom.dol", 0x4707F8, 0x18 + .asciz "step/chara/enemy/Bowby" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x470810, 0xC + .asciz "HalcanBowby" .global $$250241 $$250241: - .incbin "baserom.dol", 0x47081C, 0x24 + .asciz "step/chara/enemy/HalcanBowby" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x470A20, 0xC + .asciz "WaitLoop" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x470A2C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x470A38, 0xC + .asciz "DamageHard" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x470A44, 0xC + .asciz "FlyStart" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x470A50, 0x20 + .asciz "BrontoBurt.AnimScript.Fly.Exec" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x470A70, 0x28 + .asciz "BrontoBurt.AnimScript.WhispyAppear.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x470A98, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80474950 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80474970 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250236 $$250236: - .incbin "baserom.dol", 0x470B38, 0xC + .asciz "Brontoburt" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x470B44, 0x18 + .asciz "step/chara/enemy/Bront" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x470B5C, 0xC + .asciz "HalcantBurt" .global $$250241 $$250241: - .incbin "baserom.dol", 0x470B68, 0x20 + .asciz "step/chara/enemy/HalcantBurt" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: - .incbin "baserom.dol", 0x470DB0, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x470DBC, 0xC + .asciz "SlopeStart" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x470DC8, 0xC + .asciz "SlopeLoop" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x470DD4, 0x24 + .asciz "BroomHatter.AnimScript.Walk.Exec" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x470DF8, 0x34 + .asciz "BroomHatter.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x470E2C, 0x30 + .asciz "BroomHatter.AnimScript.GrandLowperEscape.Exec" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x470E5C, 0x24 + .asciz "BroomHatter.AnimScript.Praise.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x470E80, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x80474CD4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x0000000A + .4byte 0 + .4byte 0 + .4byte 0x80474CF8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80474D2C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80474D5C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x470F70, 0xC + .asciz "Broomhatter" .global $$250215 $$250215: - .incbin "baserom.dol", 0x470F7C, 0x1C + .asciz "step/chara/enemy/Broom" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x471200, 0x10 + .asciz "CappyhatM" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x471210, 0x10 + .4byte 0x80559818 + .4byte 0x80559820 + .4byte 0x80475100 + .4byte 0x80559828 .global $$250131 $$250131: - .incbin "baserom.dol", 0x471220, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x47122C, 0xC + .asciz "ZHatLose" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x471238, 0x10 + .asciz "ZHatLoseLoop" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x471248, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250212 $$250212: - .incbin "baserom.dol", 0x471310, 0x18 + .asciz "step/chara/enemy/Cappy" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4713E0, 0x10 + .asciz "ControlL" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4713F0, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250201 $$250201: - .incbin "baserom.dol", 0x471490, 0xC + .asciz "CappyHat" + .balign 4 .global $$250202 $$250202: - .incbin "baserom.dol", 0x47149C, 0x1C + .asciz "step/chara/enemy/CappyHat" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4715A8, 0xC + .asciz "CeruleanM" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4715B4, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4715C0, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250207 $$250207: - .incbin "baserom.dol", 0x471688, 0xC + .asciz "Cerulean" + .balign 4 .global $$250208 $$250208: - .incbin "baserom.dol", 0x471694, 0x1C + .asciz "step/chara/enemy/Cerulean" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: - .incbin "baserom.dol", 0x471880, 0xC + .asciz "JumpStart" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x47188C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x471898, 0xC + .asciz "Blizzard" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4718A4, 0xC + .asciz "GoodbyeLoop" .global $$250136 $$250136: - .incbin "baserom.dol", 0x4718B0, 0x24 + .asciz "Chilly.AnimScript.SuperAppear.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4718D4, 0x104 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x804757B0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x4719D8, 0x18 + .asciz "step/chara/enemy/Chilly" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x471B98, 0xC + .asciz "CA3Thread1J" .global T_NODE_NAMES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x471BA4, 0xC + .4byte 0x80559900 + .4byte 0x80559900 + .4byte 0x80475A98 .global $$250128 $$250128: - .incbin "baserom.dol", 0x471BB0, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x471BBC, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250206 $$250206: - .incbin "baserom.dol", 0x471C48, 0x18 + .asciz "step/chara/enemy/Como" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x472040, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47204C, 0xC + .asciz "HitStart" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472058, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250210 $$250210: - .incbin "baserom.dol", 0x472148, 0x18 + .asciz "step/chara/enemy/Degout" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: - .incbin "baserom.dol", 0x4722F8, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472304, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250210 $$250210: - .incbin "baserom.dol", 0x472390, 0x20 + .asciz "step/chara/enemy/dubiorjr/Model" .global $$250211 $$250211: - .incbin "baserom.dol", 0x4723B0, 0xC + .asciz "DubiorJr" + .balign 4 .global $$250212 $$250212: - .incbin "baserom.dol", 0x4723BC, 0x24 + .asciz "step/chara/enemy/dubiorjr/Motion" + .balign 4 .global $$250221 $$250221: - .incbin "baserom.dol", 0x4723E0, 0x28 + .asciz "step/chara/enemy/dubiorjr/ModelEx" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: - .incbin "baserom.dol", 0x4724C0, 0xC + .asciz "DubiorSpark" .global $$250239 $$250239: - .incbin "baserom.dol", 0x4724CC, 0x1C + .asciz "step/weapon/dubior/Spark" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4726D0, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4726DC, 0xC + .4byte 0x805599C8 + .4byte 0x804765D0 + .4byte 0x805599D0 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4726E8, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4726F4, 0xC + .asciz "MoveStart" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x472700, 0xC + .asciz "AttackStart" .global $$250135 $$250135: - .incbin "baserom.dol", 0x47270C, 0x1C + .asciz "Elec.AnimScript.Chase.Exec" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x472728, 0x1C + .asciz "Elec.AnimScript.Attack.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472744, 0xDC + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047660C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80476628 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x472820, 0x18 + .asciz "step/chara/enemy/Elec" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472BC0, 0xC + .4byte 0x80559A08 + .4byte 0x80559A10 + .4byte 0x80559A18 .global $$250128 $$250128: - .incbin "baserom.dol", 0x472BCC, 0xC + .asciz "MoveStart" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x472BD8, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x472BE4, 0x20 + .asciz "Flamer.AnimScript.Chase.Exec" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x472C04, 0x20 + .asciz "Flamer.AnimScript.AttackR.Exec" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x472C24, 0x24 + .asciz "Flamer.AnimScript.AttackL.Exec" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472C48, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0x80476AE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80476B04 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80476B24 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250212 $$250212: - .incbin "baserom.dol", 0x472D38, 0x18 + .asciz "step/chara/enemy/Flamer" .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472E80, 0x14 + .4byte 0x80559A48 + .4byte 0x80559A50 + .4byte 0x80559A58 + .4byte 0x80559A60 + .4byte 0x80559A68 .global $$250130 $$250130: - .incbin "baserom.dol", 0x472E94, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x472EA0, 0x10 + .asciz "AttackBefore" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x472EB0, 0xB4 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250210 $$250210: - .incbin "baserom.dol", 0x472F64, 0x1C + .asciz "step/chara/enemy/Foley" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4730D8, 0x10 + .asciz "BeamBaseJ" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4730E8, 0x20 + .4byte 0x80559A90 + .4byte 0x80559A98 + .4byte 0x80476FD8 + .4byte 0x80559AA0 + .4byte 0x80559AA8 + .4byte 0x80559AB0 + .4byte 0x80559AB8 + .4byte 0x80559AC0 .global $$250131 $$250131: - .incbin "baserom.dol", 0x473108, 0xC + .asciz "FlightWait" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x473114, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x473120, 0x20 + .asciz "Gemra.AnimScript.Attack.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473140, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80477020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x4731E0, 0x18 + .asciz "step/chara/enemy/Gemra" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473418, 0x24 + .4byte 0x80559AE0 + .4byte 0x80559AE8 + .4byte 0x80559AF0 + .4byte 0x80559AF8 + .4byte 0x80559AE8 + .4byte 0x80559AE8 + .4byte 0x80559AE8 + .4byte 0x80559B00 + .4byte 0x80559B08 .global $$250129 $$250129: - .incbin "baserom.dol", 0x47343C, 0xC + .asciz "Effect1L" + .balign 4 .global T_NODE_NAMES_VOLT__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_VOLT__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473448, 0x24 + .4byte 0x80559AE0 + .4byte 0x80559AE8 + .4byte 0x80559AF0 + .4byte 0x80559AF8 + .4byte 0x8047733C + .4byte 0x80559B10 + .4byte 0x80559B18 + .4byte 0x80559B00 + .4byte 0x80559B08 .global T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47346C, 0x24 + .4byte 0x80559AE0 + .4byte 0x80559AE8 + .4byte 0x80559AF0 + .4byte 0x80559AF8 + .4byte 0x80559AE8 + .4byte 0x80559AE8 + .4byte 0x80559B18 + .4byte 0x80559B20 + .4byte 0x80559B20 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473490, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250266 $$250266: - .incbin "baserom.dol", 0x473530, 0x1C + .asciz "step/chara/enemy/Gigatzo" + .balign 4 .global $$250270 $$250270: - .incbin "baserom.dol", 0x47354C, 0x1C + .asciz "step/chara/enemy/Volttzo" + .balign 4 .global $$250274 $$250274: - .incbin "baserom.dol", 0x473568, 0x20 + .asciz "step/chara/enemy/Coldtzo" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4736B0, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250202 $$250202: - .incbin "baserom.dol", 0x47373C, 0x1C + .asciz "step/chara/enemy/Gordo" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x473998, 0xC + .asciz "FireLPtclL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4739A4, 0xC + .asciz "CA4FaceJ" + .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4739B0, 0x14 + .4byte 0x80559B78 + .4byte 0x80559B78 + .4byte 0x80477898 + .4byte 0x80559B80 + .4byte 0x804778A4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4739C4, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4739D0, 0x10 + .asciz "Attack1Start" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4739E0, 0xC + .asciz "Attack1End" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4739EC, 0x20 + .asciz "HotHead.AnimScript.Attack.Exec" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x473A0C, 0x24 + .asciz "HotHead.AnimScript.SuperAppear.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473A30, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x804778EC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047790C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250216 $$250216: - .incbin "baserom.dol", 0x473AF8, 0x20 + .asciz "step/chara/enemy/Hothead" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x473D18, 0x10 + .asciz "DamageEtc" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x473D28, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250205 $$250205: - .incbin "baserom.dol", 0x473DC8, 0x18 + .asciz "step/chara/enemy/Juckle" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4740A8, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4740B4, 0xC + .asciz "JumpStart" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4740C0, 0x2C + .asciz "Kabu.AnimScript.GrandLowperEscapeStart.Exec" .global $$250137 $$250137: - .incbin "baserom.dol", 0x4740EC, 0x2C + .asciz "Kabu.AnimScript.GrandLowperEscape.Exec" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474118, 0x118 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x80477FC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80477FEC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x474230, 0x18 + .asciz "step/chara/enemy/Kabu" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4744F8, 0xC + .asciz "LA4HandJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x474504, 0xC + .asciz "RA4HandJ" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x474510, 0xC + .asciz "LBand1DJ" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47451C, 0xC + .asciz "LBand2DJ" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x474528, 0xC + .asciz "LBand3DJ" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x474534, 0xC + .asciz "LBandEndDJ" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x474540, 0xC + .asciz "RBand1DJ" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x47454C, 0xC + .asciz "RBand2DJ" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x474558, 0xC + .asciz "RBand3DJ" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x474564, 0xC + .asciz "RBandEndDJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474570, 0x34 + .4byte 0x80559C58 + .4byte 0x804783F8 + .4byte 0x80478404 + .4byte 0x80559C60 + .4byte 0x80559C68 + .4byte 0x80478410 + .4byte 0x8047841C + .4byte 0x80478428 + .4byte 0x80478434 + .4byte 0x80478440 + .4byte 0x8047844C + .4byte 0x80478458 + .4byte 0x80478464 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4745A4, 0xC + .asciz "LandingL" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x4745B0, 0xC + .asciz "LandingR" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x4745BC, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x4745C8, 0x18 + .asciz "FighterAttackHadouEndL" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x4745E0, 0x18 + .asciz "FighterAttackHadouEndR" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x4745F8, 0x18 + .asciz "FighterAttackHadouLoopL" .global $$250150 $$250150: - .incbin "baserom.dol", 0x474610, 0x18 + .asciz "FighterAttackHadouLoopR" .global $$250151 $$250151: - .incbin "baserom.dol", 0x474628, 0x1C + .asciz "FighterAttackHadouStartL" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x474644, 0x1C + .asciz "FighterAttackHadouStartR" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x474660, 0x18 + .asciz "FighterAttackRisingL" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x474678, 0x18 + .asciz "FighterAttackRisingR" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x474690, 0x14 + .asciz "FighterAttackSpinL" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x4746A4, 0x14 + .asciz "FighterAttackSpinR" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x4746B8, 0x18 + .asciz "FighterAttackVulcanEndL" .global $$250158 $$250158: - .incbin "baserom.dol", 0x4746D0, 0x18 + .asciz "FighterAttackVulcanEndR" .global $$250159 $$250159: - .incbin "baserom.dol", 0x4746E8, 0x1C + .asciz "FighterAttackVulcanLoopL" + .balign 4 .global $$250160 $$250160: - .incbin "baserom.dol", 0x474704, 0x1C + .asciz "FighterAttackVulcanLoopR" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x474720, 0x1C + .asciz "FighterAttackVulcanStartL" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x47473C, 0x1C + .asciz "FighterAttackVulcanStartR" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x474758, 0x24 + .asciz "KnuckleJoe.AnimScript.Landing.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x47477C, 0x24 + .asciz "KnuckleJoe.AnimScript.Damage.Exec" + .balign 4 .global $$250166 $$250166: - .incbin "baserom.dol", 0x4747A0, 0x20 + .asciz "KnuckleJoe.AnimScript.Walk.Exec" .global $$250167 $$250167: - .incbin "baserom.dol", 0x4747C0, 0x20 + .asciz "KnuckleJoe.AnimScript.Back.Exec" .global $$250168 $$250168: - .incbin "baserom.dol", 0x4747E0, 0x24 + .asciz "KnuckleJoe.AnimScript.BackStep.Exec" .global $$250169 $$250169: - .incbin "baserom.dol", 0x474804, 0x24 + .asciz "KnuckleJoe.AnimScript.Hadou.Exec" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x474828, 0x28 + .asciz "KnuckleJoe.AnimScript.Rising.Exec" + .balign 4 + .4byte 0 .global $$250171 $$250171: - .incbin "baserom.dol", 0x474850, 0x20 + .asciz "KnuckleJoe.AnimScript.Spin.Exec" .global $$250172 $$250172: - .incbin "baserom.dol", 0x474870, 0x28 + .asciz "KnuckleJoe.AnimScript.Vulcan.Exec" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474898, 0x118 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0x80478658 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047867C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x804786A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804786C0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804786E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478704 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478728 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478750 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478770 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250469 $$250469: - .incbin "baserom.dol", 0x4749B0, 0xC + .asciz "Knucklejoe" + .balign 4 .global $$250470 $$250470: - .incbin "baserom.dol", 0x4749BC, 0x18 + .asciz "step/chara/enemy/Joe" + .balign 4 .global $$250481 $$250481: - .incbin "baserom.dol", 0x4749D4, 0xC + .asciz "LBand1DJ" + .balign 4 .global $$250487 $$250487: - .incbin "baserom.dol", 0x4749E0, 0x10 + .asciz "RBand1DJ" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: - .incbin "baserom.dol", 0x474CB0, 0x10 + .asciz "SpearPointL" + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474CC0, 0x10 + .4byte 0x80559CB0 + .4byte 0x80559CB8 + .4byte 0x80559CC0 + .4byte 0x80478BB0 .global $$250132 $$250132: - .incbin "baserom.dol", 0x474CD0, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x474CDC, 0xC + .asciz "AttackEnd" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x474CE8, 0xC + .asciz "AttackStart" .global $$250137 $$250137: - .incbin "baserom.dol", 0x474CF4, 0x20 + .asciz "Lanzer.AnimScript.Front.Exec" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x474D14, 0x1C + .asciz "Lanzer.AnimScript.Stay.Exec" .global $$250139 $$250139: - .incbin "baserom.dol", 0x474D30, 0x20 + .asciz "Lanzer.AnimScript.Attack.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474D50, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80478BF4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478C14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80478C30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250217 $$250217: - .incbin "baserom.dol", 0x474E18, 0x18 + .asciz "step/chara/enemy/Lanzer" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: - .incbin "baserom.dol", 0x474F60, 0x10 + .asciz "DamageEtc" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x474F70, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250207 $$250207: - .incbin "baserom.dol", 0x475010, 0x18 + .asciz "step/chara/enemy/Leafan" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250234 $$250234: - .incbin "baserom.dol", 0x475140, 0xC + .asciz "MbossDead" + .balign 4 .global $$250235 $$250235: - .incbin "baserom.dol", 0x47514C, 0x24 + .asciz "step/weapon/common/EffectLocator" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x475250, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x47525C, 0xC + .asciz "Tracking" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x475268, 0x10 + .asciz "TrackingStart" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x475278, 0xC + .asciz "TrackingEnd" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475284, 0xDC + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250208 $$250208: - .incbin "baserom.dol", 0x475360, 0x20 + .asciz "step/chara/enemy/Mumbies" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475438, 0xC + .4byte 0x80559D88 + .4byte 0x80559D90 + .4byte 0x80559D98 .global $$250131 $$250131: - .incbin "baserom.dol", 0x475444, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x475450, 0xC + .asciz "AttackStart" .global $$250134 $$250134: - .incbin "baserom.dol", 0x47545C, 0xC + .asciz "AttackEnd" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x475468, 0x20 + .asciz "Needlous.AnimScript.Walk.Exec" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x475488, 0x20 + .asciz "Needlous.AnimScript.Attack.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4754A8, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x80479368 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x80479388 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250213 $$250213: - .incbin "baserom.dol", 0x475548, 0xC + .asciz "Needlous" + .balign 4 .global $$250214 $$250214: - .incbin "baserom.dol", 0x475554, 0x1C + .asciz "step/chara/enemy/Needlous" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: - .incbin "baserom.dol", 0x475670, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47567C, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250207 $$250207: - .incbin "baserom.dol", 0x475708, 0x18 + .asciz "step/chara/enemy/Noddy" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4758C8, 0xC + .asciz "ControlL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4758D4, 0xC + .asciz "CA3BodyJ" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4758E0, 0x10 + .asciz "DeeControlL" + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4758F0, 0x10 + .4byte 0x80559E10 + .4byte 0x804797C8 + .4byte 0x804797D4 + .4byte 0x804797E0 .global $$250132 $$250132: - .incbin "baserom.dol", 0x475900, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x47590C, 0x34 + .asciz "Nruff.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 + .4byte 0 .global $$250135 $$250135: - .incbin "baserom.dol", 0x475940, 0x28 + .asciz "Nruff.AnimScript.GrandLowperEscape.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475968, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047980C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80479840 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250212 $$250212: - .incbin "baserom.dol", 0x475A30, 0x18 + .asciz "step/chara/enemy/Nruff" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x475CF8, 0xC + .asciz "ControlL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x475D04, 0xC + .asciz "FlightWait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x475D10, 0xC + .asciz "AttackSmall" .global $$250128 $$250128: - .incbin "baserom.dol", 0x475D1C, 0xC + .asciz "AttackBig" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x475D28, 0x10 + .asciz "DamageEtc" + .balign 4 + .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475D38, 0xC8 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250209 $$250209: - .incbin "baserom.dol", 0x475E00, 0x18 + .asciz "step/chara/enemy/Owgulf" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x475F10, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475F1C, 0xC + .4byte 0x80559E70 + .4byte 0x80559E78 + .4byte 0x80479E10 .global $$250128 $$250128: - .incbin "baserom.dol", 0x475F28, 0x10 + .asciz "ParasolLanding" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x475F38, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x475F44, 0xC + .asciz "ParasolOut" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x475F50, 0xDC + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250209 $$250209: - .incbin "baserom.dol", 0x47602C, 0x1C + .asciz "step/chara/enemy/Parasol" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4764A0, 0xC + .asciz "SpearFrontL" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4764AC, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4764B8, 0xC + .asciz "MoveStart" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4764C4, 0x24 + .asciz "Pierce.AnimScript.MoveStart.Exec" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4764E8, 0x20 + .asciz "Pierce.AnimScript.AttackL.Exec" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x476508, 0x20 + .asciz "Pierce.AnimScript.AttackR.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x476528, 0xF0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000A + .4byte 0 + .4byte 0 + .4byte 0x8047A3C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047A3E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047A408 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x476618, 0x18 + .asciz "step/chara/enemy/Pierce" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: - .incbin "baserom.dol", 0x476880, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x47688C, 0xC + .asciz "GoodbyeLoop" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x476898, 0xB4 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250390 $$250390: - .incbin "baserom.dol", 0x47694C, 0xC + .asciz "Poppybrojr" + .balign 4 .global $$250391 $$250391: - .incbin "baserom.dol", 0x476958, 0x1C + .asciz "step/chara/enemy/PoppyJr" + .balign 4 .global $$250402 $$250402: - .incbin "baserom.dol", 0x476974, 0xC + .asciz "CA6Hat1DJ" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250198 $$250198: - .incbin "baserom.dol", 0x476A38, 0x10 + .asciz "PoppybrojrBomb" + .balign 4 .global $$250199 $$250199: - .incbin "baserom.dol", 0x476A48, 0x20 + .asciz "step/weapon/poppyjr/Bomb" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: - .incbin "baserom.dol", 0x476AF0, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x476AFC, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250206 $$250206: - .incbin "baserom.dol", 0x476B88, 0xC + .asciz "Puppetdee" + .balign 4 .global $$250207 $$250207: - .incbin "baserom.dol", 0x476B94, 0x1C + .asciz "step/chara/enemy/PuppetDee" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x476D18, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x476D24, 0xC + .4byte 0x80559FD0 + .4byte 0x8047AC18 + .4byte 0x80559FD8 .global $$250127 $$250127: - .incbin "baserom.dol", 0x476D30, 0xC + .asciz "StoneFall" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x476D3C, 0x10 + .asciz "StoneLanding" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x476D4C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x476D58, 0xC + .asciz "MoveStart" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x476D64, 0xC + .asciz "StoneStart" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x476D70, 0xC + .asciz "StoneAttack" .global $$250138 $$250138: - .incbin "baserom.dol", 0x476D7C, 0xC + .asciz "GoodbyeLoop" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x476D88, 0x118 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250216 $$250216: - .incbin "baserom.dol", 0x476EA0, 0x18 + .asciz "step/chara/enemy/Rocky" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x477110, 0xC + .asciz "ControlL" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47711C, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250229 $$250229: - .incbin "baserom.dol", 0x4771A8, 0xC + .asciz "Ballrock" + .balign 4 .global $$250230 $$250230: - .incbin "baserom.dol", 0x4771B4, 0x1C + .asciz "step/chara/enemy/BallRock" + .balign 4 .global $$250233 $$250233: - .incbin "baserom.dol", 0x4771D0, 0x10 + .asciz "BallMaster" + .balign 4 + .4byte 0 .global $$250234 $$250234: - .incbin "baserom.dol", 0x4771E0, 0x20 + .asciz "step/chara/enemy/BallRockMaster" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: - .incbin "baserom.dol", 0x477298, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4772A4, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250206 $$250206: - .incbin "baserom.dol", 0x477330, 0x20 + .asciz "step/chara/enemy/Sandbag" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x477580, 0x10 + .asciz "ScarfyBody1M" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x477590, 0x10 + .asciz "ScarfyBody2M" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4775A0, 0xC + .4byte 0x8055A070 + .4byte 0x8047B480 + .4byte 0x8047B490 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4775AC, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x4775B8, 0xC + .asciz "ChangeWait" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4775C4, 0xC + .asciz "BeforeBurst" .global $$250133 $$250133: - .incbin "baserom.dol", 0x4775D0, 0xC + .asciz "GoodbyeLoop" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4775DC, 0x104 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250213 $$250213: - .incbin "baserom.dol", 0x4776E0, 0x18 + .asciz "step/chara/enemy/Scarfy" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x477860, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47786C, 0xC + .asciz "AttackStart" .global $$250130 $$250130: - .incbin "baserom.dol", 0x477878, 0x20 + .asciz "Searches.AnimScript.Attack.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x477898, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047B778 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250207 $$250207: - .incbin "baserom.dol", 0x477938, 0xC + .asciz "Searches" + .balign 4 .global $$250208 $$250208: - .incbin "baserom.dol", 0x477944, 0x1C + .asciz "step/chara/enemy/Searches" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x477B88, 0xC + .4byte 0x8055A0C8 + .4byte 0x8055A0D0 + .4byte 0x8055A0D8 .global $$250131 $$250131: - .incbin "baserom.dol", 0x477B94, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x477BA0, 0xC + .asciz "JumpStart" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x477BAC, 0xC + .asciz "DashStart" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x477BB8, 0xC + .asciz "ShellDamage" .global $$250140 $$250140: - .incbin "baserom.dol", 0x477BC4, 0x1C + .asciz "Sheld.AnimScript.Walk.Exec" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x477BE0, 0x20 + .asciz "Sheld.AnimScript.JumpStart.Exec" .global $$250142 $$250142: - .incbin "baserom.dol", 0x477C00, 0x1C + .asciz "Sheld.AnimScript.Dash.Exec" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x477C1C, 0x20 + .asciz "Sheld.AnimScript.Escape.Exec" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x477C3C, 0x34 + .asciz "Sheld.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 + .4byte 0 .global $$250145 $$250145: - .incbin "baserom.dol", 0x477C70, 0x28 + .asciz "Sheld.AnimScript.GrandLowperEscape.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x477C98, 0x140 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047BAC4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047BAE0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047BB00 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047BB1C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047BB3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047BB70 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250222 $$250222: - .incbin "baserom.dol", 0x477DD8, 0x18 + .asciz "step/chara/enemy/Sheld" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4781A0, 0xC + .asciz "CA2XrotateJ" .global T_NODE_NAMES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4781AC, 0xC + .4byte 0x8055A138 + .4byte 0x8047C0A0 + .4byte 0x8055A140 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4781B8, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 .global $$250205 $$250205: - .incbin "baserom.dol", 0x478258, 0x18 + .asciz "step/chara/enemy/Shotzo" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x478488, 0xC + .asciz "SirkibbleM" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x478494, 0xC + .asciz "HeadCutterM" .global $$250125 $$250125: - .incbin "baserom.dol", 0x4784A0, 0x10 + .asciz "LItemCutterM" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4784B0, 0x10 + .asciz "RItemCutterM" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4784C0, 0x14 + .4byte 0x8055A160 + .4byte 0x8047C388 + .4byte 0x8047C394 + .4byte 0x8047C3A0 + .4byte 0x8047C3B0 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4784D4, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4784E0, 0xC + .asciz "CutterThrow" .global $$250135 $$250135: - .incbin "baserom.dol", 0x4784EC, 0xC + .asciz "CutterCatch" .global $$250136 $$250136: - .incbin "baserom.dol", 0x4784F8, 0xC + .asciz "JumpStart" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x478504, 0x10 + .asciz "AirCutterThrow" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x478514, 0xC + .asciz "GoodbyeLoop" .global $$250141 $$250141: - .incbin "baserom.dol", 0x478520, 0x20 + .asciz "SirKibble.AnimScript.Jump.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x478540, 0x104 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x0000000A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0x8047C420 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000008 + .4byte 0 + .4byte 0 .global $$250217 $$250217: - .incbin "baserom.dol", 0x478644, 0xC + .asciz "Sirkibble" + .balign 4 .global $$250218 $$250218: - .incbin "baserom.dol", 0x478650, 0x20 + .asciz "step/chara/enemy/Sirkibble" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4788F0, 0xC + .asciz "CA2UpBodyJ" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4788FC, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x478908, 0xC + .asciz "JumpStart" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x478914, 0x24 + .asciz "SisterBound.AnimScript.Fall.Exec" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x478938, 0x28 + .asciz "SisterBound.AnimScript.JumpStart.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x478960, 0xB4 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047C814 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047C838 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250210 $$250210: - .incbin "baserom.dol", 0x478A14, 0xC + .asciz "Sisterbound" .global $$250211 $$250211: - .incbin "baserom.dol", 0x478A20, 0x20 + .asciz "step/chara/enemy/SisterBound" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: - .incbin "baserom.dol", 0x478B48, 0xC + .asciz "DamageEtc" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x478B54, 0xB4 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250206 $$250206: - .incbin "baserom.dol", 0x478C08, 0x18 + .asciz "step/chara/enemy/Snowl" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: - .incbin "baserom.dol", 0x478E38, 0xC + .asciz "HitPoint1L" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x478E44, 0xC + .asciz "HitPoint2L" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x478E50, 0x10 + .asciz "HitPoint3L" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x478E60, 0x28 + .4byte 0x8055A200 + .4byte 0x8055A208 + .4byte 0x8055A210 + .4byte 0x8055A218 + .4byte 0x8055A220 + .4byte 0x8047CD38 + .4byte 0x8047CD44 + .4byte 0x8047CD50 + .4byte 0x8055A228 + .4byte 0x8055A230 .global $$250138 $$250138: - .incbin "baserom.dol", 0x478E88, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x478E94, 0xC + .asciz "FlightWait" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x478EA0, 0x14 + .asciz "GroundAttackStart" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x478EB4, 0x10 + .asciz "GroundAttack" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x478EC4, 0x20 + .asciz "Sodory.AnimScript.Attack.Exec" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x478EE4, 0x24 + .asciz "Sodory.AnimScript.GroundAttack.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x478F08, 0xB8 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047CDC4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047CDE4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250223 $$250223: - .incbin "baserom.dol", 0x478FC0, 0x18 + .asciz "step/chara/enemy/Sodory" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x479160, 0xC + .asciz "ControlL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x47916C, 0xC + .asciz "LSphereM" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x479178, 0x10 + .asciz "RSphereM" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x479188, 0x10 + .4byte 0x8055A270 + .4byte 0x8047D060 + .4byte 0x8047D06C + .4byte 0x8047D078 .global $$250131 $$250131: - .incbin "baserom.dol", 0x479198, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4791A4, 0xC + .asciz "JumpStart" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4791B0, 0xC + .asciz "SparkEnd" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4791BC, 0xC + .asciz "SparkStart" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4791C8, 0x20 + .asciz "Sparky.AnimScript.Attack.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4791E8, 0x108 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047D0C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250215 $$250215: - .incbin "baserom.dol", 0x4792F0, 0x18 + .asciz "step/chara/enemy/Sparky" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250198 $$250198: - .incbin "baserom.dol", 0x479410, 0xC + .asciz "StarEffect" + .balign 4 .global $$250199 $$250199: - .incbin "baserom.dol", 0x47941C, 0x1C + .asciz "step/chara/enemy/StarEffect" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4794F0, 0x10 + .asciz "EffectForeL" + .4byte 0 .global T_NODE_NAMES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x479500, 0x10 + .4byte 0x8055A2C8 + .4byte 0x8055A2D0 + .4byte 0x8047D3F0 + .4byte 0x8055A2D8 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x479510, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 .global $$250205 $$250205: - .incbin "baserom.dol", 0x4795B0, 0x18 + .asciz "step/chara/enemy/Sun" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x479880, 0xC + .asciz "WaitLeft" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47988C, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x479898, 0xC + .asciz "JumpStart" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x4798A4, 0xC + .asciz "AttackLeft" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4798B0, 0x10 + .asciz "WaitWallLeft" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4798C0, 0x10 + .asciz "WaitWallRight" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4798D0, 0x10 + .asciz "AttackWallLeft" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4798E0, 0x10 + .asciz "AttackWallRight" .global $$250136 $$250136: - .incbin "baserom.dol", 0x4798F0, 0xC + .asciz "WaitRight" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4798FC, 0x12C + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000006 + .4byte 0 + .4byte 0 .global $$250214 $$250214: - .incbin "baserom.dol", 0x479A28, 0xC + .asciz "Tsukikage" + .balign 4 .global $$250215 $$250215: - .incbin "baserom.dol", 0x479A34, 0x1C + .asciz "step/chara/enemy/Tsukikage" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x479CD8, 0xC + .asciz "CA4FaceJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x479CE4, 0xC + .asciz "RA3HandJ" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x479CF0, 0x10 + .asciz "RA1ShoulderJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x479D00, 0x14 + .4byte 0x8055A320 + .4byte 0x8047DBD8 + .4byte 0x8047DBE4 + .4byte 0x8047DBF0 + .4byte 0x8055A328 .global $$250133 $$250133: - .incbin "baserom.dol", 0x479D14, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x479D20, 0xC + .asciz "DamageEnd" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x479D2C, 0xC + .asciz "SleepFall" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x479D38, 0xC + .asciz "ParasolDee" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x479D44, 0x14 + .asciz "ParasolDeeLanding" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x479D58, 0x10 + .asciz "ParasolDeeOut" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x479D68, 0xC + .asciz "HaveParasol" .global $$250142 $$250142: - .incbin "baserom.dol", 0x479D74, 0xC + .asciz "JumpStart" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x479D80, 0x14 + .asciz "ConnectionHavePose" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x479D94, 0xC + .asciz "SwingFront" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x479DA0, 0xC + .asciz "SwingBack" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x479DAC, 0xC + .asciz "TurnFront" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x479DB8, 0xC + .asciz "TurnBack" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x479DC4, 0xC + .asciz "RideWait" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x479DD0, 0xC + .asciz "GoodbyeLoop" .global $$250157 $$250157: - .incbin "baserom.dol", 0x479DDC, 0x28 + .asciz "WaddleDee.AnimScript.WhispyAppear.Exec" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x479E04, 0x2C + .asciz "WaddleDee.AnimScript.WhispyFall.Exec" + .balign 4 + .4byte 0 .global $$250159 $$250159: - .incbin "baserom.dol", 0x479E30, 0x28 + .asciz "WaddleDee.AnimScript.WhispyLanding.Exec" .global $$250160 $$250160: - .incbin "baserom.dol", 0x479E58, 0x2C + .asciz "WaddleDee.AnimScript.GrandLowperAppear.Exec" .global $$250161 $$250161: - .incbin "baserom.dol", 0x479E84, 0x30 + .asciz "WaddleDee.AnimScript.GrandLowperLanding.Exec" + .balign 4 .global $$250162 $$250162: - .incbin "baserom.dol", 0x479EB4, 0x34 + .asciz "WaddleDee.AnimScript.GrandLowperEscapeStart.Exec" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x479EE8, 0x2C + .asciz "WaddleDee.AnimScript.GrandLowperEscape.Exec" .global $$250164 $$250164: - .incbin "baserom.dol", 0x479F14, 0x20 + .asciz "WaddleDee.AnimScript.Jump.Exec" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x479F34, 0x2C + .asciz "WaddleDee.AnimScript.CreditPraise.Exec" + .balign 4 + .4byte 0 .global $$250166 $$250166: - .incbin "baserom.dol", 0x479F60, 0x28 + .asciz "WaddleDee.AnimScript.CreditGoodbye.Exec" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x479F88, 0x2BC + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000024 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047DCDC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DD04 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DD30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DD58 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DD84 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DDB4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DDE8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000011 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000012 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000013 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000014 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000015 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000016 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000017 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000018 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0x8047DE14 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000019 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001A + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0x8047DE34 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8047DE60 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250297 $$250297: - .incbin "baserom.dol", 0x47A244, 0xC + .asciz "Waddledee" + .balign 4 .global $$250298 $$250298: - .incbin "baserom.dol", 0x47A250, 0x18 + .asciz "step/chara/enemy/Dee" + .balign 4 .global $$250301 $$250301: - .incbin "baserom.dol", 0x47A268, 0x10 + .asciz "Halcandledee" + .balign 4 .global $$250302 $$250302: - .incbin "baserom.dol", 0x47A278, 0x20 + .asciz "step/chara/enemy/Halcandledee" + .balign 4 .global $$250305 $$250305: - .incbin "baserom.dol", 0x47A298, 0x10 + .asciz "GoldWaddledee" + .balign 4 .global $$250306 $$250306: - .incbin "baserom.dol", 0x47A2A8, 0x20 + .asciz "step/chara/enemy/DeeGold" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x47A598, 0xC + .asciz "CA4FaceJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x47A5A4, 0xC + .asciz "BeamBaseJ" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x47A5B0, 0xC + .asciz "RA3HandJ" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x47A5BC, 0x10 + .asciz "RA1ShoulderJ" + .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47A5CC, 0x2C + .4byte 0x8055A398 + .4byte 0x8047E498 + .4byte 0x8047E4A4 + .4byte 0x8055A3A0 + .4byte 0x8055A3A8 + .4byte 0x8055A3B0 + .4byte 0x8055A3B8 + .4byte 0x8047E4B0 + .4byte 0x8047E4BC + .4byte 0x8055A3C0 + .4byte 0x8047E498 .global $$250139 $$250139: - .incbin "baserom.dol", 0x47A5F8, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x47A604, 0xC + .asciz "JumpStart" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x47A610, 0xC + .asciz "AttackStart" .global $$250143 $$250143: - .incbin "baserom.dol", 0x47A61C, 0x10 + .asciz "AttackReserve" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x47A62C, 0xC + .asciz "ParasolDoo" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x47A638, 0x14 + .asciz "ParasolDooLanding" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x47A64C, 0x10 + .asciz "ParasolDooOut" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x47A65C, 0xC + .asciz "HaveParasol" .global $$250148 $$250148: - .incbin "baserom.dol", 0x47A668, 0x14 + .asciz "ConnectionHavePose" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x47A67C, 0xC + .asciz "SwingFront" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x47A688, 0xC + .asciz "SwingBack" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x47A694, 0xC + .asciz "TurnFront" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x47A6A0, 0xC + .asciz "TurnBack" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x47A6AC, 0xC + .asciz "GoodbyeLoop" .global $$250155 $$250155: - .incbin "baserom.dol", 0x47A6B8, 0x24 + .asciz "WaddleDoo.AnimScript.Attack.Exec" + .balign 4 .global $$250156 $$250156: - .incbin "baserom.dol", 0x47A6DC, 0x28 + .asciz "WaddleDoo.AnimScript.SuperAppear.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47A704, 0x1A4 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047E5B8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000024 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000011 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000013 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047E5DC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000015 + .4byte 0x00000008 + .4byte 0 + .4byte 0 .global $$250233 $$250233: - .incbin "baserom.dol", 0x47A8A8, 0xC + .asciz "Waddledoo" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x47A8B4, 0x1C + .asciz "step/chara/enemy/Doo" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47A978, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x47A984, 0xC + .asciz "AttackStart" .global $$250131 $$250131: - .incbin "baserom.dol", 0x47A990, 0xC + .asciz "AttackEnd" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x47A99C, 0xC + .asciz "Preparation" .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47A9A8, 0xDC + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250209 $$250209: - .incbin "baserom.dol", 0x47AA84, 0xC + .asciz "Watergalbo" + .balign 4 .global $$250210 $$250210: - .incbin "baserom.dol", 0x47AA90, 0x18 + .asciz "step/chara/enemy/Wgalbo" .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47AB30, 0x28 + .4byte 0x8055A438 + .4byte 0x8055A440 + .4byte 0x8055A448 + .4byte 0x8055A450 + .4byte 0x8055A458 + .4byte 0x8055A460 + .4byte 0x8055A468 + .4byte 0x8055A470 + .4byte 0x8055A478 + .4byte 0x8055A480 .global $$250135 $$250135: - .incbin "baserom.dol", 0x47AB58, 0xC + .asciz "DamageEtc" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x47AB64, 0xC + .asciz "AttackStart" .global $$250137 $$250137: - .incbin "baserom.dol", 0x47AB70, 0x10 + .asciz "AttackCharge" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x47AB80, 0x20 + .asciz "Whippy.AnimScript.Attack.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47ABA0, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047EA80 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250217 $$250217: - .incbin "baserom.dol", 0x47AC40, 0x18 + .asciz "step/chara/enemy/Whippy" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: - .incbin "baserom.dol", 0x47ACD0, 0xC + .asciz "FallSign" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47ACDC, 0x24 + .asciz "WhispyApple.AnimScript.Appear.Exec" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x47AD00, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x8047EBDC + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250232 $$250232: - .incbin "baserom.dol", 0x47ADA0, 0xC + .asciz "WhispyApple" .global $$250233 $$250233: - .incbin "baserom.dol", 0x47ADAC, 0x24 + .asciz "step/chara/enemy/whispyapple/Model" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x47ADD0, 0x24 + .asciz "step/chara/enemy/whispyapple/Motion" .global $$250237 $$250237: - .incbin "baserom.dol", 0x47ADF4, 0x14 + .asciz "WhispyApplePoison" + .balign 4 .global $$250238 $$250238: - .incbin "baserom.dol", 0x47AE08, 0x30 + .asciz "step/chara/enemy/whispyapple/ModelPoison" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: - .incbin "baserom.dol", 0x47AF50, 0x2C + .asciz "ZankibbleCutter.AnimScript.Straight.Exec" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x47AF7C, 0x2C + .asciz "ZankibbleCutter.AnimScript.Circle.Exec(int)" .global $$250202 $$250202: - .incbin "baserom.dol", 0x47AFA8, 0x10 + .asciz "ZankibbleCutter" .global $$250203 $$250203: - .incbin "baserom.dol", 0x47AFB8, 0x20 + .asciz "step/weapon/zankibble/Cutter" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250239 $$250239: - .incbin "baserom.dol", 0x48FFA8, 0x20 + .asciz "step/weapon/common/Airball" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490058, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv123$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv123$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490064, 0xC + .4byte 0x8055C078 + .4byte 0x80493F58 + .4byte 0x8055C080 .global $$250198 $$250198: - .incbin "baserom.dol", 0x490070, 0x10 + .asciz "StarShotLv1" + .4byte 0 .global $$250199 $$250199: - .incbin "baserom.dol", 0x490080, 0x18 + .asciz "step/weapon/normal/Star" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4900B8, 0xC + .asciz "ControlL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4900C4, 0xC + .asciz "SmallStarM" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4900D0, 0x10 + .4byte 0x8055C090 + .4byte 0x80493FB8 + .4byte 0x8055C098 + .4byte 0x80493FC4 .global $$250241 $$250241: - .incbin "baserom.dol", 0x4900E0, 0xC + .asciz "StarShotLv2" .global $$250242 $$250242: - .incbin "baserom.dol", 0x4900EC, 0x24 + .asciz "step/weapon/normal/StrongStar" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490130, 0x10 + .asciz "RotControlLL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490140, 0xC + .asciz "SmallStarM" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x49014C, 0xC + .asciz "SmallStar2M" .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490158, 0x14 + .4byte 0x8055C0B8 + .4byte 0x80494030 + .4byte 0x8055C0C0 + .4byte 0x80494040 + .4byte 0x8049404C .global $$250242 $$250242: - .incbin "baserom.dol", 0x49016C, 0xC + .asciz "StarShotLv3" .global $$250243 $$250243: - .incbin "baserom.dol", 0x490178, 0x28 + .asciz "step/weapon/normal/BigStrongStar" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490200, 0x28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250255 $$250255: - .incbin "baserom.dol", 0x490228, 0x20 + .asciz "step/weapon/whispy/breath/Model" .global $$250256 $$250256: - .incbin "baserom.dol", 0x490248, 0x10 + .asciz "WhispyAirBall" + .balign 4 .global $$250258 $$250258: - .incbin "baserom.dol", 0x490258, 0x24 + .asciz "step/weapon/whispy/breath/Motion" + .balign 4 .global $$250277 $$250277: - .incbin "baserom.dol", 0x49027C, 0x24 + .asciz "step/weapon/whispy/breath/ModelEx" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250122 $$250122: - .incbin "baserom.dol", 0x490310, 0xC + .asciz "pSphere1" + .balign 4 .global $$250233 $$250233: - .incbin "baserom.dol", 0x49031C, 0xC + .asciz "LeafanSeed" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x490328, 0x20 + .asciz "step/weapon/leafan/Leafanseed" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4903D8, 0x10 + .asciz "ControlL" + .balign 4 + .4byte 0 .global T_NODE_NAMES__Q53scn4step6weapon13gigatzobullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13gigatzobullet23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4903E8, 0x10 + .4byte 0x8055C118 + .4byte 0x8055C120 + .4byte 0x804942D8 + .4byte 0x8055C128 .global $$250288 $$250288: - .incbin "baserom.dol", 0x4903F8, 0x10 + .asciz "GigatzoBullet" + .balign 4 .global $$250289 $$250289: - .incbin "baserom.dol", 0x490408, 0x1C + .asciz "step/weapon/gigatzo/Bomb" + .balign 4 .global $$250303 $$250303: - .incbin "baserom.dol", 0x490424, 0x10 + .asciz "VolttzoBullet" + .balign 4 .global $$250304 $$250304: - .incbin "baserom.dol", 0x490434, 0x1C + .asciz "step/weapon/volttzo/Bomb" + .balign 4 .global $$250307 $$250307: - .incbin "baserom.dol", 0x490450, 0x10 + .asciz "ColdtzoBullet" + .balign 4 .global $$250308 $$250308: - .incbin "baserom.dol", 0x490460, 0x20 + .asciz "step/weapon/coldtzo/Bomb" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4904D0, 0xC + .asciz "CB1ThreadJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4904DC, 0xC + .asciz "CB2ThreadJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10comothread23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10comothread23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4904E8, 0xC + .4byte 0x8055C138 + .4byte 0x804943D0 + .4byte 0x804943DC .global $$250235 $$250235: - .incbin "baserom.dol", 0x4904F4, 0xC + .asciz "ComoThread" + .balign 4 .global $$250236 $$250236: - .incbin "baserom.dol", 0x490500, 0x18 + .asciz "step/weapon/como/Thread" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490558, 0xC + .asciz "Control1J" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x490564, 0xC + .asciz "Control2J" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490570, 0xC + .asciz "Control3J" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x49057C, 0xC + .asciz "WnWaterM" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490588, 0x14 + .4byte 0x8055C148 + .4byte 0x80494458 + .4byte 0x80494464 + .4byte 0x80494470 + .4byte 0x8049447C .global $$250242 $$250242: - .incbin "baserom.dol", 0x49059C, 0x14 + .asciz "EnemyWaterBullet" + .balign 4 .global $$250243 $$250243: - .incbin "baserom.dol", 0x4905B0, 0x20 + .asciz "step/weapon/wgalbo/Water" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4905F0, 0xC + .asciz "Control1J" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4905FC, 0xC + .asciz "Control2J" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490608, 0xC + .asciz "Control3J" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x490614, 0x10 + .asciz "WnWaterWarpM" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490624, 0x14 + .4byte 0x8055C160 + .4byte 0x804944F0 + .4byte 0x804944FC + .4byte 0x80494508 + .4byte 0x80494514 .global $$250242 $$250242: - .incbin "baserom.dol", 0x490638, 0x18 + .asciz "EnemyWaterBulletWarp" + .balign 4 .global $$250243 $$250243: - .incbin "baserom.dol", 0x490650, 0x20 + .asciz "step/weapon/wgalbo/WaterWarp" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490710, 0xC + .asciz "ShootStart" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49071C, 0x3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250241 $$250241: - .incbin "baserom.dol", 0x490758, 0x10 + .asciz "SpearSpear" + .balign 4 + .4byte 0 .global $$250242 $$250242: - .incbin "baserom.dol", 0x490768, 0x18 + .asciz "step/weapon/spear/Spear" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: - .incbin "baserom.dol", 0x490860, 0xC + .asciz "HammerheadJ" .global T_NODE_NAMES__Q53scn4step6weapon12hammerhammer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12hammerhammer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49086C, 0xC + .4byte 0x8055C1A8 + .4byte 0x8055C1B0 + .4byte 0x80494760 .global $$250235 $$250235: - .incbin "baserom.dol", 0x490878, 0x10 + .asciz "HammerHammer" + .balign 4 .global $$250236 $$250236: - .incbin "baserom.dol", 0x490888, 0x28 + .asciz "step/chara/hero/kirby/hammer/Hammer" + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: - .incbin "baserom.dol", 0x490900, 0xC + .asciz "WingShot" + .balign 4 .global $$250239 $$250239: - .incbin "baserom.dol", 0x49090C, 0x1C + .asciz "step/weapon/wing/FeatherGun" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490A88, 0x10 + .asciz "ShotzoWeaponM" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x490A98, 0x10 + .asciz "ShotzoBullet" + .balign 4 .global $$250235 $$250235: - .incbin "baserom.dol", 0x490AA8, 0x18 + .asciz "step/weapon/Shotzo/Shot" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250239 $$250239: - .incbin "baserom.dol", 0x490AE0, 0x10 + .asciz "SirkibbleCutter" .global $$250240 $$250240: - .incbin "baserom.dol", 0x490AF0, 0x20 + .asciz "step/weapon/sirkibble/Cutter" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250233 $$250233: - .incbin "baserom.dol", 0x490B30, 0x10 + .asciz "OwgulfFeather" + .balign 4 .global $$250234 $$250234: - .incbin "baserom.dol", 0x490B40, 0x20 + .asciz "step/weapon/owgulf/Feather" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490B80, 0x28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250239 $$250239: - .incbin "baserom.dol", 0x490BA8, 0xC + .asciz "FoleyLeaf" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x490BB4, 0x1C + .asciz "step/weapon/foley/Leaf" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490BF0, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10bowbyarrow23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10bowbyarrow23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490BFC, 0x14 + .4byte 0x8055C260 + .4byte 0x8055C268 + .4byte 0x8055C270 + .4byte 0x80494AF0 + .4byte 0x8055C278 .global $$250261 $$250261: - .incbin "baserom.dol", 0x490C10, 0x18 + .asciz "step/weapon/bowby/Arrow" .global $$250275 $$250275: - .incbin "baserom.dol", 0x490C28, 0x20 + .asciz "step/weapon/halcanbowby/Arrow" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490C68, 0xC + .asciz "ControlL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12jucklecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12jucklecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490C74, 0xC + .4byte 0x8055C290 + .4byte 0x80494B68 + .4byte 0x8055C298 .global $$250236 $$250236: - .incbin "baserom.dol", 0x490C80, 0x20 + .asciz "step/weapon/juckle/Cutter" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: - .incbin "baserom.dol", 0x490CC0, 0xC + .asciz "Shuriken" + .balign 4 .global $$250239 $$250239: - .incbin "baserom.dol", 0x490CCC, 0x24 + .asciz "step/weapon/tsukikage/Shuriken" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250233 $$250233: - .incbin "baserom.dol", 0x490D90, 0x10 + .asciz "WhispyRoot" + .balign 4 + .4byte 0 .global $$250234 $$250234: - .incbin "baserom.dol", 0x490DA0, 0x18 + .asciz "step/weapon/whispy/Root" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: - .incbin "baserom.dol", 0x490DD8, 0x14 + .asciz "CombinationAirBall" + .balign 4 .global $$250239 $$250239: - .incbin "baserom.dol", 0x490DEC, 0x2C + .asciz "step/weapon/common/CombinationAirBall" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490EA8, 0xC + .4byte 0x8055C328 + .4byte 0x8055C330 + .4byte 0x8055C338 .global $$250235 $$250235: - .incbin "baserom.dol", 0x490EB4, 0x14 + .asciz "CombinationDeeShot" + .balign 4 .global $$250236 $$250236: - .incbin "baserom.dol", 0x490EC8, 0x28 + .asciz "step/weapon/dee/CombinationDeeShot" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: - .incbin "baserom.dol", 0x490F50, 0xC + .asciz "HammerHeadL" .global $$250234 $$250234: - .incbin "baserom.dol", 0x490F5C, 0x10 + .asciz "DededeHammer" + .balign 4 .global $$250235 $$250235: - .incbin "baserom.dol", 0x490F6C, 0x1C + .asciz "step/weapon/dedede/Hammer" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: - .incbin "baserom.dol", 0x490FD8, 0xC + .asciz "ShootStart" + .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x490FE4, 0x3C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 .global $$250241 $$250241: - .incbin "baserom.dol", 0x491020, 0xC + .asciz "DeeSpear" + .balign 4 .global $$250242 $$250242: - .incbin "baserom.dol", 0x49102C, 0x1C + .asciz "step/weapon/dee/DeeSpear" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250568 $$250568: - .incbin "baserom.dol", 0x491188, 0xC + .asciz "BlockStar" + .balign 4 .global $$250569 $$250569: - .incbin "baserom.dol", 0x491194, 0x18 + .asciz "step/gimmick/BlockStar" + .balign 4 .global $$250583 $$250583: - .incbin "baserom.dol", 0x4911AC, 0x14 + .asciz "BlockHeavy1x1" + .balign 4 + .4byte 0 .global $$250584 $$250584: - .incbin "baserom.dol", 0x4911C0, 0x18 + .asciz "step/gimmick/BlockHeavy" .global $$250588 $$250588: - .incbin "baserom.dol", 0x4911D8, 0x10 + .asciz "BlockHeavy2x2" + .balign 4 .global $$250592 $$250592: - .incbin "baserom.dol", 0x4911E8, 0x10 + .asciz "BlockHeavy3x3" + .balign 4 .global $$250596 $$250596: - .incbin "baserom.dol", 0x4911F8, 0x10 + .asciz "BlockHeavy4x4" + .balign 4 .global $$250263 $$250263: - .incbin "baserom.dol", 0x491208, 0xC + .asciz "TopLA1x2x1" + .balign 4 .global $$250600 $$250600: - .incbin "baserom.dol", 0x491214, 0x14 + .asciz "BlockHeavyA1x2x1" + .balign 4 .global $$250601 $$250601: - .incbin "baserom.dol", 0x491228, 0xC + .asciz "TopLA1x2x1" + .balign 4 .global $$250286 $$250286: - .incbin "baserom.dol", 0x491234, 0xC + .asciz "TopLB1x2x1" + .balign 4 .global $$250604 $$250604: - .incbin "baserom.dol", 0x491240, 0x14 + .asciz "BlockHeavyB1x2x1" + .balign 4 .global $$250605 $$250605: - .incbin "baserom.dol", 0x491254, 0xC + .asciz "TopLB1x2x1" + .balign 4 .global $$250309 $$250309: - .incbin "baserom.dol", 0x491260, 0x10 + .asciz "TopL1x2x3" + .balign 4 + .4byte 0 .global $$250608 $$250608: - .incbin "baserom.dol", 0x491270, 0x10 + .asciz "BlockHeavy1x2x3" .global $$250609 $$250609: - .incbin "baserom.dol", 0x491280, 0xC + .asciz "TopL1x2x3" + .balign 4 .global $$250612 $$250612: - .incbin "baserom.dol", 0x49128C, 0x10 + .asciz "BlockHeavy1x3" + .balign 4 .global $$250616 $$250616: - .incbin "baserom.dol", 0x49129C, 0x10 + .asciz "BlockHeavy3x1" + .balign 4 .global $$250378 $$250378: - .incbin "baserom.dol", 0x4912AC, 0xC + .asciz "TopL2x4x4x2" .global $$250620 $$250620: - .incbin "baserom.dol", 0x4912B8, 0x14 + .asciz "BlockHeavy2x4x4x2" + .balign 4 .global $$250621 $$250621: - .incbin "baserom.dol", 0x4912CC, 0xC + .asciz "TopL2x4x4x2" .global $$250401 $$250401: - .incbin "baserom.dol", 0x4912D8, 0x10 + .asciz "TopL3x2x1" + .balign 4 + .4byte 0 .global $$250624 $$250624: - .incbin "baserom.dol", 0x4912E8, 0x10 + .asciz "BlockHeavy3x2x1" .global $$250625 $$250625: - .incbin "baserom.dol", 0x4912F8, 0x10 + .asciz "TopL3x2x1" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: - .incbin "baserom.dol", 0x4913A0, 0x10 + .asciz "HotHeadFire" + .4byte 0 .global $$250239 $$250239: - .incbin "baserom.dol", 0x4913B0, 0x20 + .asciz "step/weapon/hothead/HotHeadFire" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248848 $$248848: - .incbin "baserom.dol", 0x4931F8, 0x8 + .asciz "noname" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x493200, 0x8 + .asciz "Model" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4952E0, 0x8 + .asciz "TopL" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4952E8, 0x8 + .asciz "StarL" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x4952F0, 0x8 + .asciz "Wait1" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4952F8, 0x8 + .asciz "Appear" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x495300, 0x8 + .4byte 0x52756E00 + .4byte 0 .global $$250147 $$250147: - .incbin "baserom.dol", 0x495308, 0x8 + .asciz "Landing" .global $$250148 $$250148: - .incbin "baserom.dol", 0x495310, 0x8 + .asciz "Fall" + .balign 4 .global $$250153 $$250153: - .incbin "baserom.dol", 0x495318, 0x8 + .asciz "Jump" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x495320, 0x8 + .asciz "JumpEnd" .global $$250314 $$250314: - .incbin "baserom.dol", 0x495328, 0x8 + .asciz "Bonkers" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495338, 0x8 + .asciz "TopL" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495340, 0x8 + .asciz "BodyM" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495348, 0x8 + .asciz "RHandJ" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495350, 0x8 + .asciz "HeadJ" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x495358, 0x8 + .asciz "Wait" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x495360, 0x4 + .4byte 0x466C7900 .global $$250141 $$250141: - .incbin "baserom.dol", 0x495364, 0x8 + .asciz "Fly2" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x49536C, 0x8 + .asciz "Fly3" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x495374, 0x8 + .asciz "Fly4" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x49537C, 0xC + .asciz "Fly5" + .balign 4 + .4byte 0 .global $$250148 $$250148: - .incbin "baserom.dol", 0x495388, 0x8 + .asciz "Summons" .global $$250149 $$250149: - .incbin "baserom.dol", 0x495390, 0x8 + .asciz "Shot" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x495398, 0x8 + .asciz "ShotEnd" .global $$250152 $$250152: - .incbin "baserom.dol", 0x4953A0, 0x8 + .asciz "Margin" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x4953A8, 0x8 + .asciz "Panic" + .balign 4 .global $$250157 $$250157: - .incbin "baserom.dol", 0x4953B0, 0x8 + .asciz "SafeL" + .balign 4 .global $$250158 $$250158: - .incbin "baserom.dol", 0x4953B8, 0x8 + .asciz "SafeR" + .balign 4 .global $$250159 $$250159: - .incbin "baserom.dol", 0x4953C0, 0x8 + .asciz "Glad" + .balign 4 .global $$250161 $$250161: - .incbin "baserom.dol", 0x4953C8, 0x8 + .asciz "Defeat" + .balign 4 .global $$250163 $$250163: - .incbin "baserom.dol", 0x4953D0, 0x8 + .asciz "Goodbye" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495408, 0x8 + .asciz "TopL" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495410, 0x8 + .asciz "Wait" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495418, 0x8 + .asciz "Fall" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495420, 0x8 + .asciz "Walk" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x495428, 0x8 + .asciz "Jump" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x495430, 0x8 + .asciz "JumpEnd" .global $$250140 $$250140: - .incbin "baserom.dol", 0x495438, 0x8 + .asciz "Landing" .global $$250141 $$250141: - .incbin "baserom.dol", 0x495440, 0x4 + .4byte 0x52756E00 .global $$250142 $$250142: - .incbin "baserom.dol", 0x495444, 0x8 + .asciz "Flight" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x49544C, 0xC + .asciz "Praise" + .balign 4 + .4byte 0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495458, 0x8 + .asciz "TopL" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495460, 0x8 + .asciz "RHaveL" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495468, 0x8 + .asciz "Wait" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495470, 0x8 + .asciz "Fall" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x495478, 0x8 + .asciz "Walk" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x495480, 0x8 + .asciz "Jump" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x495488, 0x8 + .asciz "JumpEnd" .global $$250141 $$250141: - .incbin "baserom.dol", 0x495490, 0x8 + .asciz "Landing" .global $$250142 $$250142: - .incbin "baserom.dol", 0x495498, 0x8 + .4byte 0x52756E00 + .4byte 0 .global $$250147 $$250147: - .incbin "baserom.dol", 0x4954A0, 0x8 + .asciz "WonderL" .global $$250150 $$250150: - .incbin "baserom.dol", 0x4954A8, 0x8 + .asciz "Copter" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x4954B0, 0x8 + .asciz "Praise" + .balign 4 .global T_DYNAMICS_TARGET_NODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_DYNAMICS_TARGET_NODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4954B8, 0x8 + .4byte 0x80466AB0 + .4byte 0x80466AB0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4954C0, 0x8 + .asciz "TopL" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4954C8, 0x8 + .asciz "Wait" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4954D0, 0x8 + .asciz "Fall" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4954D8, 0x8 + .asciz "Walk" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4954E0, 0x8 + .asciz "Jump" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x4954E8, 0x8 + .asciz "JumpEnd" .global $$250140 $$250140: - .incbin "baserom.dol", 0x4954F0, 0x8 + .asciz "Landing" .global $$250141 $$250141: - .incbin "baserom.dol", 0x4954F8, 0x4 + .4byte 0x52756E00 .global $$250142 $$250142: - .incbin "baserom.dol", 0x4954FC, 0xC + .asciz "Glide" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495518, 0x8 + .asciz "TopL" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495520, 0x8 + .asciz "RotL" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495528, 0x8 + .asciz "Ptcl1L" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495530, 0x8 + .asciz "Ptcl2L" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495538, 0x8 + .asciz "OarL" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x495540, 0x8 + .asciz "Wait" + .balign 4 .global $$250261 $$250261: - .incbin "baserom.dol", 0x495548, 0x8 + .asciz "TopL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495560, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495568, 0x4 + .4byte 0x80559180 .global $$250132 $$250132: - .incbin "baserom.dol", 0x49556C, 0x8 + .asciz "Wait1" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495574, 0xC + .asciz "Death" + .balign 4 + .4byte 0 .global $$250139 $$250139: - .incbin "baserom.dol", 0x495580, 0x8 + .asciz "CallEnd" .global $$250245 $$250245: - .incbin "baserom.dol", 0x495588, 0x8 + .asciz "Dubior" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495590, 0x8 + .asciz "TopL" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495598, 0x8 + .asciz "SwordL" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4955A0, 0x8 + .asciz "TransL" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4955A8, 0x8 + .asciz "Wait" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4955B0, 0x8 + .asciz "Appear" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x4955B8, 0x8 + .asciz "Attack" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x4955C0, 0x8 + .asciz "Attack2" .global $$250144 $$250144: - .incbin "baserom.dol", 0x4955C8, 0x8 + .asciz "Move" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x4955D0, 0x8 + .asciz "Fall" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x4955D8, 0x8 + .asciz "Landing" .global $$250154 $$250154: - .incbin "baserom.dol", 0x4955E0, 0x8 + .asciz "Death" + .balign 4 .global $$250155 $$250155: - .incbin "baserom.dol", 0x4955E8, 0x8 + .asciz "Guard" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4955F0, 0x8 + .asciz "TopL" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x4955F8, 0x8 + .asciz "Beam1J" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495600, 0x8 + .asciz "Beam2J" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495608, 0x8 + .asciz "Beam3J" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495610, 0x8 + .asciz "Beam4J" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495618, 0x8 + .asciz "Wait1" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x495620, 0x8 + .asciz "Appear" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x495628, 0x8 + .asciz "Landing" .global $$250140 $$250140: - .incbin "baserom.dol", 0x495630, 0x8 + .asciz "Fall" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x495638, 0x8 + .asciz "Attack" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x495640, 0x8 + .asciz "Move" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x495648, 0x8 + .asciz "Damage" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x495650, 0x8 + .asciz "Jump" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x495658, 0x8 + .asciz "BeamAir" .global $$250150 $$250150: - .incbin "baserom.dol", 0x495660, 0x8 + .asciz "Death" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495668, 0x8 + .asciz "TopL" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495670, 0x8 + .asciz "TransL" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495678, 0x8 + .4byte 0x80559288 + .4byte 0x80559290 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495680, 0x8 + .asciz "Wait" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495688, 0x8 + .asciz "Landing" .global $$250136 $$250136: - .incbin "baserom.dol", 0x495690, 0x8 + .asciz "Fall" + .balign 4 .global $$250139 $$250139: - .incbin "baserom.dol", 0x495698, 0x8 + .asciz "Death" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x4956A0, 0x8 + .asciz "Move" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x4956A8, 0x8 + .asciz "MoveEnd" .global $$250130 $$250130: - .incbin "baserom.dol", 0x4956B0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4956B8, 0x4 + .4byte 0x805592D0 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4956BC, 0x8 + .asciz "Wait" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4956C4, 0xC + .asciz "Appear" + .balign 4 + .4byte 0 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4956D0, 0x8 + .asciz "Landing" .global $$250135 $$250135: - .incbin "baserom.dol", 0x4956D8, 0x8 + .asciz "Fall" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4956E0, 0x8 + .asciz "Death" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x4956E8, 0x8 + .asciz "Attack" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x4956F0, 0x8 + .asciz "Wave" + .balign 4 .global $$250145 $$250145: - .incbin "baserom.dol", 0x4956F8, 0x8 + .asciz "WaveEnd" .global $$250147 $$250147: - .incbin "baserom.dol", 0x495700, 0x8 + .asciz "Jump" + .balign 4 .global $$250149 $$250149: - .incbin "baserom.dol", 0x495708, 0x8 + .asciz "Splash" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495710, 0x8 + .asciz "TopL" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495718, 0x8 + .asciz "EyeJ" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495720, 0x8 + .asciz "MouthJ" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495728, 0x8 + .asciz "MasterJ" .global $$250135 $$250135: - .incbin "baserom.dol", 0x495730, 0x8 + .asciz "CA1SJ" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495738, 0x8 + .asciz "CA2SJ" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x495740, 0x8 + .asciz "CA3SJ" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x495748, 0x8 + .asciz "Wait" + .balign 4 .global $$250144 $$250144: - .incbin "baserom.dol", 0x495750, 0x8 + .asciz "WaitBig" .global $$250146 $$250146: - .incbin "baserom.dol", 0x495758, 0x8 + .asciz "Appear" + .balign 4 .global $$250147 $$250147: - .incbin "baserom.dol", 0x495760, 0x8 + .asciz "Menace" + .balign 4 .global $$250148 $$250148: - .incbin "baserom.dol", 0x495768, 0x8 + .asciz "Grow" + .balign 4 .global $$250164 $$250164: - .incbin "baserom.dol", 0x495770, 0x8 + .asciz "Damage" + .balign 4 .global $$250165 $$250165: - .incbin "baserom.dol", 0x495778, 0x8 + .asciz "DamageL" .global $$250169 $$250169: - .incbin "baserom.dol", 0x495780, 0x8 + .asciz "Anemic" + .balign 4 .global $$250171 $$250171: - .incbin "baserom.dol", 0x495788, 0x8 + .asciz "Death" + .balign 4 .global $$250173 $$250173: - .incbin "baserom.dol", 0x495790, 0x8 + .asciz "Catch" + .balign 4 .global $$250174 $$250174: - .incbin "baserom.dol", 0x495798, 0x8 + .asciz "Chewing" .global $$250175 $$250175: - .incbin "baserom.dol", 0x4957A0, 0x8 + .asciz "Vomit" + .balign 4 .global $$250290 $$250290: - .incbin "baserom.dol", 0x4957A8, 0x8 + .asciz "Whispy" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4957C0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4957C8, 0x8 + .4byte 0x805593E0 + .4byte 0x8046ABC0 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4957D0, 0x8 + .asciz "Wait" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4957D8, 0x8 + .asciz "Appear" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x4957E0, 0x8 + .asciz "Landing" .global $$250137 $$250137: - .incbin "baserom.dol", 0x4957E8, 0x8 + .asciz "Fall" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x4957F0, 0x8 + .asciz "Death" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x4957F8, 0x8 + .asciz "Move" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x495800, 0x8 + .asciz "MoveEnd" .global $$250151 $$250151: - .incbin "baserom.dol", 0x495808, 0x8 + .asciz "Jump" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250160 $$250160: - .incbin "baserom.dol", 0x495830, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495A28, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495A30, 0x8 + .4byte 0x80559648 + .4byte 0x80559648 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495A38, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495A40, 0x8 + .asciz "Fall" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495A48, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x495A50, 0x8 + .asciz "Move" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495A58, 0x8 + .asciz "Damage" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495A60, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495A68, 0x8 + .asciz "TransL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495A70, 0x8 + .asciz "Wait1" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495A78, 0x8 + .asciz "Fall" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495A80, 0x8 + .asciz "Landing" .global $$250129 $$250129: - .incbin "baserom.dol", 0x495A88, 0x8 + .asciz "Walk" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495A90, 0x8 + .asciz "Damage" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495A98, 0x8 + .asciz "Attack" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495AA0, 0x8 + .asciz "Retreat" .global $$250136 $$250136: - .incbin "baserom.dol", 0x495AA8, 0x8 + .asciz "Walk2" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x495AB0, 0x8 + .asciz "Jump" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495AB8, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495AC0, 0x8 + .4byte 0x805596D8 + .4byte 0x80473CE8 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495AC8, 0x8 + .asciz "Wait2" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495AD0, 0x8 + .asciz "Damage" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495AD8, 0x8 + .asciz "Move" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495AE0, 0x8 + .asciz "Fall" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495AE8, 0x8 + .asciz "Landing" .global $$250211 $$250211: - .incbin "baserom.dol", 0x495AF0, 0x8 + .asciz "Blipper" .global $$250122 $$250122: - .incbin "baserom.dol", 0x495AF8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495B00, 0x8 + .asciz "Model" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495B08, 0x8 + .4byte 0x80559718 + .4byte 0x80559720 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495B18, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495B20, 0x8 + .4byte 0x80559738 + .4byte 0x80474258 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495B28, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495B30, 0x8 + .asciz "Fall" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495B38, 0x8 + .asciz "Damage" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495B40, 0x8 + .asciz "Jump" + .balign 4 .global $$250209 $$250209: - .incbin "baserom.dol", 0x495B48, 0x8 + .asciz "Bouncy" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495B50, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495B58, 0x8 + .asciz "FaceJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495B60, 0x8 + .4byte 0x80559770 + .4byte 0x80559778 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495B68, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495B70, 0x8 + .asciz "Damage" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495B78, 0x8 + .asciz "Attack" + .balign 4 .global $$250236 $$250236: - .incbin "baserom.dol", 0x495B80, 0x8 + .asciz "Bowby" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495B88, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495B90, 0x4 + .4byte 0x805597A8 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495B94, 0x4 + .4byte 0x466C7900 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495B98, 0x8 + .asciz "WaitEnd" .global $$250127 $$250127: - .incbin "baserom.dol", 0x495BA0, 0x8 + .asciz "Walk" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495BA8, 0x8 + .asciz "Damage" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495BB0, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495BB8, 0x8 + .asciz "Hoki3J" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495BC0, 0x8 + .4byte 0x805597D0 + .4byte 0x805597D8 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495BC8, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495BD0, 0x8 + .asciz "Fall" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495BD8, 0x8 + .asciz "Landing" .global $$250128 $$250128: - .incbin "baserom.dol", 0x495BE0, 0x8 + .asciz "Move" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495BE8, 0x8 + .asciz "Move2" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495BF0, 0x8 + .asciz "Damage" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495BF8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495C00, 0x8 + .asciz "CappyM" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495C08, 0x8 + .asciz "ArmM" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495C10, 0x8 + .asciz "Wait" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495C18, 0x8 + .asciz "Fall" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495C20, 0x8 + .asciz "Landing" .global $$250130 $$250130: - .incbin "baserom.dol", 0x495C28, 0x8 + .asciz "Damage" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495C30, 0x8 + .asciz "KasaUp" + .balign 4 .global $$250211 $$250211: - .incbin "baserom.dol", 0x495C38, 0x8 + .asciz "Cappy" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495C40, 0x8 + .4byte 0x804752E0 + .4byte 0x804752E0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495C48, 0x8 + .asciz "Attack" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495C58, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495C60, 0x8 + .4byte 0x80559878 + .4byte 0x804754A8 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495C68, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495C70, 0x8 + .asciz "Move" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495C78, 0x8 + .asciz "Damage" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495C80, 0x8 + .asciz "Turn" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495C88, 0x8 + .4byte 0x48697400 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495C90, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495C98, 0x8 + .4byte 0x805598B0 + .4byte 0x805598B0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495CA0, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495CA8, 0x8 + .asciz "Wait2" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495CB0, 0x8 + .asciz "Move" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495CB8, 0x8 + .asciz "Jump" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495CC0, 0x8 + .asciz "Fall" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495CC8, 0x8 + .asciz "Landing" .global $$250131 $$250131: - .incbin "baserom.dol", 0x495CD0, 0x8 + .asciz "Damage" + .balign 4 .global $$250213 $$250213: - .incbin "baserom.dol", 0x495CD8, 0x8 + .asciz "Chilly" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495CE0, 0x8 + .asciz "TopL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495CE8, 0x8 + .asciz "Move" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495CF0, 0x8 + .asciz "Damage2" .global $$250127 $$250127: - .incbin "baserom.dol", 0x495CF8, 0x8 + .asciz "Damage" + .balign 4 .global $$250205 $$250205: - .incbin "baserom.dol", 0x495D00, 0x8 + .asciz "Como" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495D10, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495D18, 0x4 + .4byte 0x80559930 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495D1C, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495D24, 0x8 + .asciz "Damage" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495D2C, 0xC + .asciz "Chase" + .balign 4 + .4byte 0 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495D38, 0x8 + .asciz "HitSpin" .global $$250130 $$250130: - .incbin "baserom.dol", 0x495D40, 0x8 + .asciz "HitEnd" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495D48, 0x8 + .asciz "Move" + .balign 4 .global $$250209 $$250209: - .incbin "baserom.dol", 0x495D50, 0x8 + .asciz "Degout" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495D58, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495D60, 0x8 + .asciz "HipJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495D68, 0x8 + .4byte 0x80559978 + .4byte 0x80559980 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495D70, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495D78, 0x8 + .asciz "Damage" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495D88, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495D90, 0x4 + .4byte 0x805599A8 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495D94, 0x8 + .asciz "Main" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x495D9C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495DA8, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495DB0, 0x8 + .asciz "EyeJ" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495DB8, 0x8 + .asciz "RMove" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495DC0, 0x8 + .asciz "LMove" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495DC8, 0x8 + .asciz "Damage" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495DD0, 0x8 + .asciz "Move" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495DD8, 0x8 + .asciz "Attack" + .balign 4 .global $$250213 $$250213: - .incbin "baserom.dol", 0x495DE0, 0x8 + .asciz "Elec" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495DE8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495DF0, 0x8 + .asciz "BodyJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495DF8, 0x8 + .asciz "Rot2L" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495E00, 0x8 + .asciz "RMove" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495E08, 0x8 + .asciz "LMove" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495E10, 0x8 + .asciz "Move" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x495E18, 0x8 + .asciz "Damage" + .balign 4 .global $$250211 $$250211: - .incbin "baserom.dol", 0x495E20, 0x8 + .asciz "Flamer" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495E28, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495E30, 0x8 + .asciz "Leaf1M" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495E38, 0x8 + .asciz "Leaf2M" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495E40, 0x8 + .asciz "RotL2" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495E48, 0x8 + .asciz "BodyL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495E50, 0x8 + .asciz "Wait" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495E58, 0x8 + .asciz "Damage" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495E60, 0x8 + .asciz "Attack" + .balign 4 .global $$250209 $$250209: - .incbin "baserom.dol", 0x495E68, 0x8 + .asciz "Foley" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495E70, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495E78, 0x8 + .asciz "BodyJ" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495E80, 0x8 + .asciz "Beam1J" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495E88, 0x8 + .asciz "Beam2J" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495E90, 0x8 + .asciz "Beam3J" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495E98, 0x8 + .asciz "Beam4J" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495EA0, 0x8 + .asciz "Beam5J" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x495EA8, 0x8 + .asciz "Damage" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495EB0, 0x8 + .asciz "Attack" + .balign 4 .global $$250213 $$250213: - .incbin "baserom.dol", 0x495EB8, 0x8 + .asciz "Gemra" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495EC0, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495EC8, 0x8 + .asciz "BodyJ" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495ED0, 0x8 + .asciz "TopJ" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495ED8, 0x8 + .asciz "TransL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495EE0, 0x8 + .asciz "BaseM01" .global $$250127 $$250127: - .incbin "baserom.dol", 0x495EE8, 0x8 + .asciz "BaseM02" .global $$250130 $$250130: - .incbin "baserom.dol", 0x495EF0, 0x8 + .asciz "Body2J" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495EF8, 0x8 + .asciz "Body3J" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x495F00, 0x8 + .asciz "BaseM" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x495F08, 0x8 + .asciz "Wait" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x495F10, 0x8 + .asciz "Attack" + .balign 4 .global $$250265 $$250265: - .incbin "baserom.dol", 0x495F18, 0x8 + .asciz "Gigatzo" .global $$250269 $$250269: - .incbin "baserom.dol", 0x495F20, 0x8 + .asciz "Volttzo" .global $$250273 $$250273: - .incbin "baserom.dol", 0x495F28, 0x8 + .asciz "Coldtzo" .global $$250122 $$250122: - .incbin "baserom.dol", 0x495F30, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495F38, 0x8 + .4byte 0x80559B50 + .4byte 0x80559B50 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495F40, 0x8 + .asciz "Wait" + .balign 4 .global $$250201 $$250201: - .incbin "baserom.dol", 0x495F48, 0x8 + .asciz "Gordo" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495F58, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495F60, 0x8 + .asciz "MouthL" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495F68, 0x8 + .asciz "Wait" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x495F70, 0x8 + .asciz "Fall" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x495F78, 0x8 + .asciz "Landing" .global $$250130 $$250130: - .incbin "baserom.dol", 0x495F80, 0x8 + .asciz "Walk" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x495F88, 0x8 + .asciz "Damage" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x495F90, 0x8 + .asciz "Attack1" .global $$250136 $$250136: - .incbin "baserom.dol", 0x495F98, 0x8 + .asciz "Attack2" .global $$250215 $$250215: - .incbin "baserom.dol", 0x495FA0, 0x8 + .asciz "Hothead" .global $$250122 $$250122: - .incbin "baserom.dol", 0x495FA8, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495FB0, 0x4 + .4byte 0x80559BC8 .global $$250124 $$250124: - .incbin "baserom.dol", 0x495FB4, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495FBC, 0x8 + .asciz "Damage" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x495FC4, 0x8 + .asciz "Attack" + .balign 4 .global $$250204 $$250204: - .incbin "baserom.dol", 0x495FCC, 0xC + .asciz "Juckle" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x495FD8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x495FE0, 0x8 + .asciz "BodyL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x495FE8, 0x8 + .4byte 0x80559BF8 + .4byte 0x80559C00 .global $$250125 $$250125: - .incbin "baserom.dol", 0x495FF0, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x495FF8, 0x8 + .asciz "Fall" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496000, 0x8 + .asciz "Landing" .global $$250128 $$250128: - .incbin "baserom.dol", 0x496008, 0x8 + .asciz "Damage" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x496010, 0x8 + .asciz "Jump" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x496018, 0x8 + .asciz "Move" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x496020, 0x8 + .asciz "Warp1" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x496028, 0x8 + .asciz "Warp2" + .balign 4 .global $$250213 $$250213: - .incbin "baserom.dol", 0x496030, 0x8 + .asciz "Kabu" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496038, 0x8 + .asciz "TopL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496040, 0x8 + .asciz "LL4ToeJ" .global $$250126 $$250126: - .incbin "baserom.dol", 0x496048, 0x8 + .asciz "RL4ToeJ" .global $$250136 $$250136: - .incbin "baserom.dol", 0x496050, 0x8 + .asciz "Wait" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x496058, 0x8 + .asciz "Fall" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x496060, 0x8 + .asciz "WalkL" + .balign 4 .global $$250141 $$250141: - .incbin "baserom.dol", 0x496068, 0x8 + .asciz "WalkR" + .balign 4 .global $$250142 $$250142: - .incbin "baserom.dol", 0x496070, 0x8 + .asciz "DamageL" .global $$250143 $$250143: - .incbin "baserom.dol", 0x496078, 0x8 + .asciz "DamageR" .global $$250145 $$250145: - .incbin "baserom.dol", 0x496080, 0x8 + .asciz "BackL" + .balign 4 .global $$250146 $$250146: - .incbin "baserom.dol", 0x496088, 0x8 + .asciz "BackR" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496090, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x496098, 0x8 + .asciz "Spear2J" .global $$250124 $$250124: - .incbin "baserom.dol", 0x4960A0, 0x8 + .asciz "Spear3J" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4960A8, 0x8 + .asciz "Wait" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4960B0, 0x8 + .asciz "Fall" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4960B8, 0x8 + .asciz "Landing" .global $$250130 $$250130: - .incbin "baserom.dol", 0x4960C0, 0x8 + .asciz "Move" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x4960C8, 0x8 + .asciz "Damage" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4960D0, 0x8 + .asciz "Attack" + .balign 4 .global $$250216 $$250216: - .incbin "baserom.dol", 0x4960D8, 0x8 + .asciz "Lanzer" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4960E0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4960E8, 0x4 + .4byte 0x80559D00 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4960EC, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4960F4, 0xC + .asciz "Fall" + .balign 4 + .4byte 0 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496100, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x496108, 0x8 + .asciz "Damage" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496110, 0x8 + .asciz "Attack" + .balign 4 .global $$250206 $$250206: - .incbin "baserom.dol", 0x496118, 0x8 + .asciz "Leafan" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496120, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496128, 0x4 + .4byte 0x80559D40 .global $$250236 $$250236: - .incbin "baserom.dol", 0x49612C, 0xC + .asciz "Model" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496138, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496140, 0x4 + .4byte 0x80559D58 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496144, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x49614C, 0x8 + .asciz "Damage" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496154, 0xC + .asciz "Endure" + .balign 4 + .4byte 0 .global $$250207 $$250207: - .incbin "baserom.dol", 0x496160, 0x8 + .asciz "Mumbies" .global $$250122 $$250122: - .incbin "baserom.dol", 0x496168, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x496170, 0x8 + .asciz "RotL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496178, 0x8 + .asciz "RoundL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496180, 0x8 + .asciz "Wait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496188, 0x8 + .asciz "Fall" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496190, 0x8 + .asciz "Landing" .global $$250129 $$250129: - .incbin "baserom.dol", 0x496198, 0x8 + .asciz "Move" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4961A0, 0x8 + .asciz "Damage" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4961A8, 0x8 + .asciz "Attack" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4961B0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4961B8, 0x4 + .4byte 0x80559DD0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4961BC, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4961C4, 0xC + .asciz "Fall" + .balign 4 + .4byte 0 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4961D0, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4961D8, 0x8 + .asciz "Move" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4961E0, 0x8 + .asciz "Damage" + .balign 4 .global $$250206 $$250206: - .incbin "baserom.dol", 0x4961E8, 0x8 + .asciz "Noddy" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4961F0, 0x8 + .asciz "TopL" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x4961F8, 0x8 + .asciz "Wait" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496200, 0x8 + .asciz "Fall" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496208, 0x8 + .asciz "Landing" .global $$250130 $$250130: - .incbin "baserom.dol", 0x496210, 0x8 + .asciz "Move" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x496218, 0x8 + .asciz "Damage" + .balign 4 .global $$250211 $$250211: - .incbin "baserom.dol", 0x496220, 0x8 + .asciz "Nruff" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496228, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496230, 0x8 + .4byte 0x80559E48 + .4byte 0x80479BF8 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496238, 0x4 + .4byte 0x466C7900 .global $$250129 $$250129: - .incbin "baserom.dol", 0x49623C, 0x8 + .asciz "Damage" + .balign 4 .global $$250208 $$250208: - .incbin "baserom.dol", 0x496244, 0xC + .asciz "Owgulf" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496250, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x496258, 0x8 + .asciz "BodyM" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496260, 0x8 + .asciz "Wait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496268, 0x8 + .asciz "Parasol" .global $$250129 $$250129: - .incbin "baserom.dol", 0x496270, 0x8 + .asciz "Damage" + .balign 4 .global $$250208 $$250208: - .incbin "baserom.dol", 0x496278, 0x8 + .asciz "Parasol" .global $$250122 $$250122: - .incbin "baserom.dol", 0x496280, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496288, 0x8 + .4byte 0x80559EA0 + .4byte 0x8047A3A0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496290, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496298, 0x8 + .asciz "Damage" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4962A0, 0x8 + .asciz "Move" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4962A8, 0x8 + .asciz "MoveEnd" .global $$250131 $$250131: - .incbin "baserom.dol", 0x4962B0, 0x8 + .asciz "AttackL" .global $$250132 $$250132: - .incbin "baserom.dol", 0x4962B8, 0x8 + .asciz "AttackR" .global $$250213 $$250213: - .incbin "baserom.dol", 0x4962C0, 0x8 + .asciz "Pierce" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4962C8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4962D0, 0x8 + .asciz "BomM" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4962D8, 0x8 + .4byte 0x80559EE8 + .4byte 0x80559EF0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4962E0, 0x8 + .asciz "Wait2" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4962E8, 0x8 + .asciz "Fall" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x4962F0, 0x8 + .asciz "Landing" .global $$250128 $$250128: - .incbin "baserom.dol", 0x4962F8, 0x8 + .asciz "Damage" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496300, 0x8 + .asciz "Attack" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496368, 0x8 + .asciz "BomM" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496370, 0x8 + .4byte 0x80559F88 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496378, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496380, 0x8 + .4byte 0x80559F98 + .4byte 0x80559F98 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496388, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496390, 0x8 + .asciz "Fall" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496398, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4963A0, 0x8 + .asciz "Move" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4963A8, 0x8 + .asciz "Damage" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4963B0, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4963B8, 0x8 + .asciz "CA1HipJ" .global $$250126 $$250126: - .incbin "baserom.dol", 0x4963C0, 0x8 + .asciz "Wait" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x4963C8, 0x8 + .asciz "Move" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4963D0, 0x8 + .asciz "Damage" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4963D8, 0x8 + .asciz "MoveEnd" .global $$250136 $$250136: - .incbin "baserom.dol", 0x4963E0, 0x8 + .asciz "Stream" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x4963E8, 0x8 + .asciz "Praise" + .balign 4 .global $$250215 $$250215: - .incbin "baserom.dol", 0x4963F0, 0x8 + .asciz "Rocky" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4963F8, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496400, 0x8 + .4byte 0x8055A018 + .4byte 0x8047B010 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496408, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496410, 0x8 + .asciz "Damage" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496418, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496420, 0x4 + .4byte 0x8055A038 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496424, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x49642C, 0xC + .asciz "Fall" + .balign 4 + .4byte 0 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496438, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x496440, 0x8 + .asciz "Damage" + .balign 4 .global $$250205 $$250205: - .incbin "baserom.dol", 0x496448, 0x8 + .asciz "Sandbag" .global $$250122 $$250122: - .incbin "baserom.dol", 0x496450, 0x8 + .asciz "TopL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496458, 0x8 + .asciz "Wait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496460, 0x8 + .asciz "Damage" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496468, 0x8 + .asciz "Change" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496470, 0x8 + .asciz "Change2" .global $$250212 $$250212: - .incbin "baserom.dol", 0x496478, 0x8 + .asciz "Scarfy" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496480, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496488, 0x4 + .4byte 0x8055A0A0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x49648C, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496494, 0x8 + .asciz "Damage" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x49649C, 0xC + .asciz "Attack" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4964A8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4964B0, 0x8 + .asciz "BodyM" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4964B8, 0x8 + .asciz "ShellM" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4964C0, 0x8 + .asciz "Wait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x4964C8, 0x8 + .asciz "Fall" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4964D0, 0x8 + .asciz "Landing" .global $$250129 $$250129: - .incbin "baserom.dol", 0x4964D8, 0x8 + .asciz "Move" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4964E0, 0x8 + .asciz "Damage" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x4964E8, 0x8 + .asciz "Jump" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4964F0, 0x8 + .asciz "Dash" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4964F8, 0x8 + .asciz "DashEnd" .global $$250138 $$250138: - .incbin "baserom.dol", 0x496500, 0x8 + .asciz "Escape" + .balign 4 .global $$250221 $$250221: - .incbin "baserom.dol", 0x496508, 0x8 + .asciz "Sheld" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496518, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496520, 0x8 + .asciz "PtclL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496528, 0x8 + .asciz "Wait" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496530, 0x8 + .asciz "Attack" + .balign 4 .global $$250204 $$250204: - .incbin "baserom.dol", 0x496538, 0x8 + .asciz "Shotzo" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496540, 0x8 + .asciz "TopL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496548, 0x8 + .asciz "Wait" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496550, 0x8 + .asciz "Fall" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496558, 0x8 + .asciz "Landing" .global $$250131 $$250131: - .incbin "baserom.dol", 0x496560, 0x8 + .asciz "Walk" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x496568, 0x8 + .asciz "Damage" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x496570, 0x8 + .asciz "Jump" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496578, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496580, 0x8 + .4byte 0x8055A198 + .4byte 0x8047C7F0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496588, 0x8 + .asciz "Wait" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496590, 0x8 + .asciz "Fall" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496598, 0x8 + .asciz "Landing" .global $$250128 $$250128: - .incbin "baserom.dol", 0x4965A0, 0x8 + .asciz "Damage" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4965A8, 0x8 + .asciz "Jump" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4965B0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4965B8, 0x4 + .4byte 0x8055A1D0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4965BC, 0x8 + .asciz "Damage" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4965C4, 0x8 + .asciz "Move" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x4965CC, 0x8 + .asciz "Attack" + .balign 4 .global $$250205 $$250205: - .incbin "baserom.dol", 0x4965D4, 0xC + .asciz "Snowl" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4965E0, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4965E8, 0x8 + .asciz "Rot1L" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4965F0, 0x8 + .asciz "Rot2L" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4965F8, 0x8 + .asciz "RotateL" .global $$250126 $$250126: - .incbin "baserom.dol", 0x496600, 0x8 + .asciz "EyeL" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496608, 0x8 + .asciz "Foot1J" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x496610, 0x8 + .asciz "Foot2J" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x496618, 0x8 + .asciz "Wait" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x496620, 0x8 + .asciz "Fall" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x496628, 0x8 + .asciz "Landing" .global $$250136 $$250136: - .incbin "baserom.dol", 0x496630, 0x8 + .asciz "Move" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x496638, 0x8 + .asciz "Damage" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x496640, 0x8 + .asciz "Attack" + .balign 4 .global $$250222 $$250222: - .incbin "baserom.dol", 0x496648, 0x8 + .asciz "Sodory" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496650, 0x8 + .asciz "TopL" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496658, 0x8 + .asciz "Wait" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496660, 0x8 + .asciz "Fall" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496668, 0x8 + .asciz "Landing" .global $$250130 $$250130: - .incbin "baserom.dol", 0x496670, 0x8 + .asciz "Damage" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x496678, 0x8 + .asciz "Jump" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x496680, 0x8 + .asciz "Spark" + .balign 4 .global $$250214 $$250214: - .incbin "baserom.dol", 0x496688, 0x8 + .asciz "Sparky" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496698, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4966A0, 0x8 + .4byte 0x8055A2B8 + .4byte 0x8055A2B8 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4966A8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4966B0, 0x8 + .asciz "EffectL" .global $$250125 $$250125: - .incbin "baserom.dol", 0x4966B8, 0x8 + .asciz "RotateL" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4966C0, 0x8 + .asciz "Wait" + .balign 4 .global $$250204 $$250204: - .incbin "baserom.dol", 0x4966C8, 0x8 + .4byte 0x53756E00 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4966D0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4966D8, 0x4 + .4byte 0x8055A2F0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4966DC, 0xC + .asciz "Fall" + .balign 4 + .4byte 0 .global $$250126 $$250126: - .incbin "baserom.dol", 0x4966E8, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x4966F0, 0x8 + .asciz "Damage" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x4966F8, 0x8 + .asciz "Jump" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496700, 0x8 + .asciz "TopL" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496708, 0x8 + .asciz "RHaveL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496710, 0x8 + .asciz "Wait" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496718, 0x8 + .asciz "Fall" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496720, 0x8 + .asciz "Landing" .global $$250131 $$250131: - .incbin "baserom.dol", 0x496728, 0x8 + .asciz "Walk" + .balign 4 .global $$250132 $$250132: - .incbin "baserom.dol", 0x496730, 0x8 + .asciz "Damage" + .balign 4 .global $$250136 $$250136: - .incbin "baserom.dol", 0x496738, 0x8 + .asciz "Cheer1" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x496740, 0x8 + .asciz "Cheer2" + .balign 4 .global $$250143 $$250143: - .incbin "baserom.dol", 0x496748, 0x8 + .asciz "Jump" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x496750, 0x8 + .asciz "LRide2" + .balign 4 .global $$250151 $$250151: - .incbin "baserom.dol", 0x496758, 0x8 + .asciz "RRide2" + .balign 4 .global $$250152 $$250152: - .incbin "baserom.dol", 0x496760, 0x8 + .asciz "Pursuit" .global $$250153 $$250153: - .incbin "baserom.dol", 0x496768, 0x8 + .asciz "Wait2" + .balign 4 .global $$250154 $$250154: - .incbin "baserom.dol", 0x496770, 0x8 + .asciz "Wait3" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496778, 0x8 + .asciz "TopL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496780, 0x8 + .asciz "Beam1J" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496788, 0x8 + .asciz "Beam2J" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496790, 0x8 + .asciz "Beam3J" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496798, 0x8 + .asciz "Beam4J" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x4967A0, 0x8 + .asciz "RHaveL" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x4967A8, 0x8 + .asciz "Wait1" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x4967B0, 0x8 + .asciz "Fall" + .balign 4 .global $$250135 $$250135: - .incbin "baserom.dol", 0x4967B8, 0x8 + .asciz "Landing" .global $$250136 $$250136: - .incbin "baserom.dol", 0x4967C0, 0x8 + .asciz "Move" + .balign 4 .global $$250137 $$250137: - .incbin "baserom.dol", 0x4967C8, 0x8 + .asciz "Jump" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x4967D0, 0x8 + .asciz "Damage" + .balign 4 .global $$250140 $$250140: - .incbin "baserom.dol", 0x4967D8, 0x8 + .asciz "Attack" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4967E0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4967E8, 0x4 + .4byte 0x8055A400 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4967EC, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4967F4, 0xC + .asciz "Fall" + .balign 4 + .4byte 0 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496800, 0x8 + .asciz "Landing" .global $$250127 $$250127: - .incbin "baserom.dol", 0x496808, 0x8 + .asciz "Damage" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496810, 0x8 + .asciz "Attack" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496818, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x496820, 0x8 + .asciz "PJointJ" .global $$250124 $$250124: - .incbin "baserom.dol", 0x496828, 0x8 + .asciz "TailJ8" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x496830, 0x8 + .asciz "TailJ7" + .balign 4 .global $$250126 $$250126: - .incbin "baserom.dol", 0x496838, 0x8 + .asciz "TailJ6" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x496840, 0x8 + .asciz "TailJ5" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x496848, 0x8 + .asciz "TailJ4" + .balign 4 .global $$250129 $$250129: - .incbin "baserom.dol", 0x496850, 0x8 + .asciz "TailJ3" + .balign 4 .global $$250130 $$250130: - .incbin "baserom.dol", 0x496858, 0x8 + .asciz "TailJ2" + .balign 4 .global $$250131 $$250131: - .incbin "baserom.dol", 0x496860, 0x8 + .asciz "TailJ1" + .balign 4 .global $$250133 $$250133: - .incbin "baserom.dol", 0x496868, 0x8 + .asciz "Wait" + .balign 4 .global $$250134 $$250134: - .incbin "baserom.dol", 0x496870, 0x8 + .asciz "Damage" + .balign 4 .global $$250138 $$250138: - .incbin "baserom.dol", 0x496878, 0x8 + .asciz "Attack" + .balign 4 .global $$250216 $$250216: - .incbin "baserom.dol", 0x496880, 0x8 + .asciz "Whippy" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x496888, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x496890, 0x4 + .4byte 0x8055A4A8 .global $$250124 $$250124: - .incbin "baserom.dol", 0x496894, 0x8 + .asciz "Wait" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x49689C, 0xC + .asciz "Appear" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4968A8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4968B0, 0x8 + .asciz "ScaleL" + .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4968B8, 0x8 + .4byte 0x8055A4C8 + .4byte 0x8055A4D0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4968C0, 0x8 + .asciz "Loop" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498430, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498438, 0x4 + .4byte 0x8055C050 .global $$250124 $$250124: - .incbin "baserom.dol", 0x49843C, 0xC + .asciz "Main" + .balign 4 + .4byte 0 .global $$250238 $$250238: - .incbin "baserom.dol", 0x498448, 0x8 + .asciz "AirBall" .global $$250240 $$250240: - .incbin "baserom.dol", 0x498450, 0x8 + .asciz "TopL" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498458, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498460, 0x8 + .asciz "PtclL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498470, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498478, 0x8 + .asciz "PtclL" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x498480, 0x8 + .asciz "Main" + .balign 4 .global $$250243 $$250243: - .incbin "baserom.dol", 0x498488, 0x8 + .asciz "TopL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498498, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4984A0, 0x8 + .asciz "PtclL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x4984A8, 0x8 + .asciz "Main" + .balign 4 .global $$250244 $$250244: - .incbin "baserom.dol", 0x4984B0, 0x8 + .asciz "TopL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4984C0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4984C8, 0x4 + .4byte 0x8055C0E0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4984CC, 0xC + .asciz "Loop" + .balign 4 + .4byte 0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4984D8, 0x8 + .asciz "BigLoop" .global $$250257 $$250257: - .incbin "baserom.dol", 0x4984E0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12leafanpollen23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12leafanpollen23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4984E8, 0x4 + .4byte 0x80494210 .global $$250235 $$250235: - .incbin "baserom.dol", 0x4984EC, 0xC + .asciz "Model" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4984F8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498500, 0x8 + .asciz "TransL" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x498508, 0x8 + .asciz "RotL" + .balign 4 .global $$250290 $$250290: - .incbin "baserom.dol", 0x498510, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498518, 0x8 + .asciz "TopL" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x498520, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498528, 0x8 + .asciz "TopL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x498530, 0x8 + .asciz "Loop" + .balign 4 .global $$250244 $$250244: - .incbin "baserom.dol", 0x498538, 0x8 + .asciz "TopL" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498540, 0x8 + .asciz "TopL" + .balign 4 .global $$250128 $$250128: - .incbin "baserom.dol", 0x498548, 0x8 + .asciz "Loop" + .balign 4 .global $$250244 $$250244: - .incbin "baserom.dol", 0x498550, 0x8 + .asciz "TopL" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498558, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498560, 0x8 + .asciz "AllJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498568, 0x8 + .4byte 0x8055C178 + .4byte 0x8055C180 .global $$250126 $$250126: - .incbin "baserom.dol", 0x498570, 0x8 + .asciz "Loop" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x498578, 0x4 + .4byte 0x48697400 .global $$250243 $$250243: - .incbin "baserom.dol", 0x49857C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498588, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498590, 0x8 + .asciz "AllL" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x498598, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4985A0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4985A8, 0x4 + .4byte 0x8055C1C0 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4985AC, 0x8 + .asciz "Main" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x4985B4, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4985C0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12shotzobullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12shotzobullet23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4985C8, 0x8 + .4byte 0x8055C1E0 + .4byte 0x80494988 .global $$250236 $$250236: - .incbin "baserom.dol", 0x4985D0, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4985D8, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x4985E0, 0x8 + .asciz "ScaleL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4985E8, 0x8 + .4byte 0x8055C1F8 + .4byte 0x8055C200 .global $$250125 $$250125: - .incbin "baserom.dol", 0x4985F0, 0x8 + .asciz "Main" + .balign 4 .global $$250241 $$250241: - .incbin "baserom.dol", 0x4985F8, 0x8 + .asciz "TopL" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498600, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon13owgulffeather23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13owgulffeather23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498608, 0x4 + .4byte 0x8055C220 .global $$250235 $$250235: - .incbin "baserom.dol", 0x49860C, 0xC + .asciz "Model" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498618, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498620, 0x4 + .4byte 0x8055C238 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498624, 0x8 + .asciz "Vanish" + .balign 4 .global $$250125 $$250125: - .incbin "baserom.dol", 0x49862C, 0x8 + .asciz "Rotate" + .balign 4 .global $$250241 $$250241: - .incbin "baserom.dol", 0x498634, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498640, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498648, 0x8 + .asciz "TailL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498650, 0x8 + .asciz "EffectL" .global $$250126 $$250126: - .incbin "baserom.dol", 0x498658, 0x8 + .asciz "HeadL" + .balign 4 .global $$250260 $$250260: - .incbin "baserom.dol", 0x498660, 0x8 + .asciz "Arrow" + .balign 4 .global $$250262 $$250262: - .incbin "baserom.dol", 0x498668, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498670, 0x8 + .asciz "TopL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498678, 0x8 + .asciz "RotL" + .balign 4 .global $$250235 $$250235: - .incbin "baserom.dol", 0x498680, 0x8 + .asciz "Cutter" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x498688, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498690, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498698, 0x8 + .asciz "AnimL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4986A0, 0x8 + .4byte 0x8055C2B0 + .4byte 0x8055C2B8 .global $$250240 $$250240: - .incbin "baserom.dol", 0x4986A8, 0x8 + .asciz "TopL" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4986B0, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10whispyroot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10whispyroot23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4986B8, 0x4 + .4byte 0x8055C2D0 .global $$250235 $$250235: - .incbin "baserom.dol", 0x4986BC, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x4986C8, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x4986D0, 0x4 + .4byte 0x8055C2E8 .global $$250124 $$250124: - .incbin "baserom.dol", 0x4986D4, 0x8 + .asciz "Main" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x4986DC, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498708, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498710, 0x8 + .asciz "RotL" + .balign 4 .global $$250124 $$250124: - .incbin "baserom.dol", 0x498718, 0x8 + .asciz "PtcL" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x498720, 0x8 + .asciz "TopL" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498738, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12dededehammer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12dededehammer23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498740, 0x8 + .4byte 0x8055C358 + .4byte 0x80494E50 .global $$250236 $$250236: - .incbin "baserom.dol", 0x498748, 0x8 + .asciz "Model" + .balign 4 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498750, 0x8 + .asciz "TopL" + .balign 4 .global $$250123 $$250123: - .incbin "baserom.dol", 0x498758, 0x8 + .asciz "AllJ" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498760, 0x8 + .4byte 0x8055C370 + .4byte 0x8055C378 .global $$250126 $$250126: - .incbin "baserom.dol", 0x498768, 0x8 + .asciz "Loop" + .balign 4 .global $$250127 $$250127: - .incbin "baserom.dol", 0x498770, 0x4 + .4byte 0x48697400 .global $$250243 $$250243: - .incbin "baserom.dol", 0x498774, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x498780, 0x8 + .asciz "pCube1" + .balign 4 .global $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x498788, 0x4 + .4byte 0x8055C3A0 .global $$250570 $$250570: - .incbin "baserom.dol", 0x49878C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .global $$250171 $$250171: - .incbin "baserom.dol", 0x498798, 0x8 + .asciz "TopL1x1" .global $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987A0, 0x8 + .4byte 0x8055C3B8 + .4byte 0 .global $$250585 $$250585: - .incbin "baserom.dol", 0x4987A8, 0x8 + .asciz "TopL1x1" .global $$250194 $$250194: - .incbin "baserom.dol", 0x4987B0, 0x8 + .asciz "TopL2x2" .global $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987B8, 0x8 + .4byte 0x8055C3D0 + .4byte 0 .global $$250589 $$250589: - .incbin "baserom.dol", 0x4987C0, 0x8 + .asciz "TopL2x2" .global $$250217 $$250217: - .incbin "baserom.dol", 0x4987C8, 0x8 + .asciz "TopL3x3" .global $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987D0, 0x8 + .4byte 0x8055C3E8 + .4byte 0 .global $$250593 $$250593: - .incbin "baserom.dol", 0x4987D8, 0x8 + .asciz "TopL3x3" .global $$250240 $$250240: - .incbin "baserom.dol", 0x4987E0, 0x8 + .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987E8, 0x8 + .4byte 0x8055C400 + .4byte 0 .global $$250597 $$250597: - .incbin "baserom.dol", 0x4987F0, 0x8 + .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987F8, 0x4 + .4byte 0x80495108 .global $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x4987FC, 0x4 + .4byte 0x80495134 .global $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x498800, 0x8 + .4byte 0x80495160 + .4byte 0 .global $$250332 $$250332: - .incbin "baserom.dol", 0x498808, 0x8 + .asciz "TopL1x3" .global $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x498810, 0x8 + .4byte 0x8055C428 + .4byte 0 .global $$250613 $$250613: - .incbin "baserom.dol", 0x498818, 0x8 + .asciz "TopL1x3" .global $$250355 $$250355: - .incbin "baserom.dol", 0x498820, 0x8 + .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x498828, 0x8 + .4byte 0x8055C440 + .4byte 0 .global $$250617 $$250617: - .incbin "baserom.dol", 0x498830, 0x8 + .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x498838, 0x4 + .4byte 0x804951AC .global $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .incbin "baserom.dol", 0x49883C, 0x4 + .4byte 0x804951D8 .global $$250122 $$250122: - .incbin "baserom.dol", 0x498840, 0x8 + .asciz "TopL" + .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x498848, 0x4 + .4byte 0x8055C460 .global $$250124 $$250124: - .incbin "baserom.dol", 0x49884C, 0x8 + .asciz "Attack" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x498854, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MODEL_DESC_FUNC_DUMMY__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2 T_MODEL_DESC_FUNC_DUMMY__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49AEA0, 0x4 + .4byte 0x8023DAC8 ;# ptr .global $$250316 $$250316: - .incbin "baserom.dol", 0x49AEA4, 0x4 + .4byte 0 .global $$250317 $$250317: - .incbin "baserom.dol", 0x49AEA8, 0x8 + .4byte 0x3F99999A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250363 $$250363: - .incbin "baserom.dol", 0x49B1B0, 0x4 + .4byte 0 .global $$250364 $$250364: - .incbin "baserom.dol", 0x49B1B4, 0x4 + .4byte 0x3CA3D70A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49B248, 0x8 + .4byte 0x80559160 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250161 $$250161: - .incbin "baserom.dol", 0x49B818, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250411 $$250411: - .incbin "baserom.dol", 0x49BD10, 0x4 + .4byte 0 .global $$250412 $$250412: - .incbin "baserom.dol", 0x49BD14, 0x4 + .4byte 0x3CA3D70A .global $$250413 $$250413: - .incbin "baserom.dol", 0x49BD18, 0x4 + .4byte 0x3F800000 .global $$250414 $$250414: - .incbin "baserom.dol", 0x49BD1C, 0x4 + .4byte 0x3ECCCCCD .global $$250415 $$250415: - .incbin "baserom.dol", 0x49BD20, 0x4 + .4byte 0x3B64C388 .global $$250416 $$250416: - .incbin "baserom.dol", 0x49BD24, 0x4 + .4byte 0x3D0EFA35 .global $$250417 $$250417: - .incbin "baserom.dol", 0x49BD28, 0x4 + .4byte 0x3DFA35DD .global $$250418 $$250418: - .incbin "baserom.dol", 0x49BD2C, 0x4 + .4byte 0x3F490FDB .global $$250419 $$250419: - .incbin "baserom.dol", 0x49BD30, 0x4 + .4byte 0x3E99999A .global $$250420 $$250420: - .incbin "baserom.dol", 0x49BD34, 0x4 + .4byte 0x3E4CCCCD .global $$250421 $$250421: - .incbin "baserom.dol", 0x49BD38, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49C328, 0x8 + .4byte 0x805599B4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250471 $$250471: - .incbin "baserom.dol", 0x49C6D0, 0x4 + .4byte 0 .global $$250472 $$250472: - .incbin "baserom.dol", 0x49C6D4, 0x4 + .4byte 0x3CA3D70A .global $$250473 $$250473: - .incbin "baserom.dol", 0x49C6D8, 0x4 + .4byte 0x3F800000 .global $$250474 $$250474: - .incbin "baserom.dol", 0x49C6DC, 0x4 + .4byte 0x3ECCCCCD .global $$250475 $$250475: - .incbin "baserom.dol", 0x49C6E0, 0x4 + .4byte 0x3B64C388 .global $$250476 $$250476: - .incbin "baserom.dol", 0x49C6E4, 0x4 + .4byte 0x3D0EFA35 .global $$250477 $$250477: - .incbin "baserom.dol", 0x49C6E8, 0x4 + .4byte 0x3DFA35DD .global $$250478 $$250478: - .incbin "baserom.dol", 0x49C6EC, 0x4 + .4byte 0x3F490FDB .global $$250479 $$250479: - .incbin "baserom.dol", 0x49C6F0, 0x4 + .4byte 0x3E99999A .global $$250480 $$250480: - .incbin "baserom.dol", 0x49C6F4, 0x4 + .4byte 0x3E4CCCCD .global $$250482 $$250482: - .incbin "baserom.dol", 0x49C6F8, 0x4 + .4byte 0x3EE66666 .global $$250483 $$250483: - .incbin "baserom.dol", 0x49C6FC, 0x4 + .4byte 0x3D8EFA35 .global $$250484 $$250484: - .incbin "baserom.dol", 0x49C700, 0x4 + .4byte 0x3F1C61AA .global $$250485 $$250485: - .incbin "baserom.dol", 0x49C704, 0x4 + .4byte 0x3EB33333 .global $$250486 $$250486: - .incbin "baserom.dol", 0x49C708, 0x8 + .4byte 0x3E800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250392 $$250392: - .incbin "baserom.dol", 0x49CAA8, 0x4 + .4byte 0 .global $$250393 $$250393: - .incbin "baserom.dol", 0x49CAAC, 0x4 + .4byte 0x3CA3D70A .global $$250394 $$250394: - .incbin "baserom.dol", 0x49CAB0, 0x4 + .4byte 0x3F800000 .global $$250395 $$250395: - .incbin "baserom.dol", 0x49CAB4, 0x4 + .4byte 0x3ECCCCCD .global $$250396 $$250396: - .incbin "baserom.dol", 0x49CAB8, 0x4 + .4byte 0x3B64C388 .global $$250397 $$250397: - .incbin "baserom.dol", 0x49CABC, 0x4 + .4byte 0x3D0EFA35 .global $$250398 $$250398: - .incbin "baserom.dol", 0x49CAC0, 0x4 + .4byte 0x3DFA35DD .global $$250399 $$250399: - .incbin "baserom.dol", 0x49CAC4, 0x4 + .4byte 0x3F490FDB .global $$250400 $$250400: - .incbin "baserom.dol", 0x49CAC8, 0x4 + .4byte 0x3E99999A .global $$250401 $$250401: - .incbin "baserom.dol", 0x49CACC, 0x4 + .4byte 0x3E4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MESHFLIP_NODE_TABLE__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_MESHFLIP_NODE_TABLE__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49CC18, 0x8 + .4byte 0x00000001 + .4byte 0x00000002 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49D0D0, 0x8 + .4byte 0x8055A4E0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49E890, 0x8 + .4byte 0x8055C05C + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49E8E8, 0x8 + .4byte 0x8055C0A0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49E910, 0x8 + .4byte 0x8055C0C8 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EA18, 0x8 + .4byte 0x8055C150 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EA40, 0x8 + .4byte 0x8055C168 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EAB8, 0x8 + .4byte 0x8055C1CC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EB20, 0x8 + .4byte 0x8055C210 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EB88, 0x8 + .4byte 0x8055C2B0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EBE0, 0x8 + .4byte 0x8055C2F4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2: - .incbin "baserom.dol", 0x49EC78, 0x8 + .4byte 0x8055C46C + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2CreateTmpl$$07$$40$$40$$1__Q43scn4step4boss9ModelDescFPCcPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry_RQ43scn4step5chara9ModelDesc$$2desc diff --git a/asm/src/ModelDescUtil.s b/asm/src/ModelDescUtil.s index 2beae17c..d4f60079 100644 --- a/asm/src/ModelDescUtil.s +++ b/asm/src/ModelDescUtil.s @@ -235,30 +235,42 @@ lbl_803D7B30: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2 T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2: - .incbin "baserom.dol", 0x41C398, 0x28 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250228 $$250228: - .incbin "baserom.dol", 0x46E758, 0x10 + .asciz "Scn.Step.Enemy" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250281 $$250281: - .incbin "baserom.dol", 0x48DFD8, 0x10 + .asciz "Scn.Step.Item" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250293 $$250293: - .incbin "baserom.dol", 0x48F8D8, 0x10 + .asciz "Scn.Step.Weapon" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil: - .incbin "baserom.dol", 0x498150, 0x4 + .4byte 0x80420298 .global $$250143 $$250143: - .incbin "baserom.dol", 0x498154, 0x8 + .asciz "TopL" + .balign 4 .global $$2LOCAL$$2Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry$$2NODE_NAMES $$2LOCAL$$2Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry$$2NODE_NAMES: - .incbin "baserom.dol", 0x49815C, 0x4 + .4byte 0x8055BD74 diff --git a/asm/src/ModelMultiAnim.s b/asm/src/ModelMultiAnim.s index 00c46a5b..c7cfb3af 100644 --- a/asm/src/ModelMultiAnim.s +++ b/asm/src/ModelMultiAnim.s @@ -739,4 +739,4 @@ __ct__Q33g3d14ModelMultiAnim16ModelAnimWrapperFRCQ23g3d15ResModelContextRCQ23mem .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251837 $$251837: - .incbin "baserom.dol", 0x4931A8, 0x8 + .asciz "%s_A%lu" diff --git a/asm/src/ModelMultiAnimContext.s b/asm/src/ModelMultiAnimContext.s index 34715d2e..6d3e5229 100644 --- a/asm/src/ModelMultiAnimContext.s +++ b/asm/src/ModelMultiAnimContext.s @@ -65,7 +65,9 @@ lbl_80192CC8: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248944 $$248944: - .incbin "baserom.dol", 0x4931B0, 0x4 + .4byte 0x25730000 .global $$248945 $$248945: - .incbin "baserom.dol", 0x4931B4, 0xC + .asciz "MdlAnm" + .balign 4 + .4byte 0 diff --git a/asm/src/ModelNode.s b/asm/src/ModelNode.s index 8f5923c5..19d97669 100644 --- a/asm/src/ModelNode.s +++ b/asm/src/ModelNode.s @@ -1142,27 +1142,30 @@ __md__Q33hel4math7Vector3CFRCQ33hel4math7Vector3: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2FSqrt__Q24nw4r4mathFf$$20 $$2STRING$$2FSqrt__Q24nw4r4mathFf$$20: - .incbin "baserom.dol", 0x44F230, 0x24 + .asciz "FSqrt: Input is out of the domain." + .balign 4 .global $$2STRING$$2FSqrt__Q24nw4r4mathFf $$2STRING$$2FSqrt__Q24nw4r4mathFf: - .incbin "baserom.dol", 0x44F254, 0x14 + .asciz "arithmetic.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253498 $$253498: - .incbin "baserom.dol", 0x49A130, 0x4 + .4byte 0x3C8EFA35 .global $$253499 $$253499: - .incbin "baserom.dol", 0x49A134, 0x4 + .4byte 0 .global $$253589 $$253589: - .incbin "baserom.dol", 0x49A138, 0x4 + .4byte 0x3727C5AC .global $$253675 $$253675: - .incbin "baserom.dol", 0x49A13C, 0x4 + .4byte 0xBF800000 .global $$253676 $$253676: - .incbin "baserom.dol", 0x49A140, 0x4 + .4byte 0x4222F983 .global $$253677 $$253677: - .incbin "baserom.dol", 0x49A144, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/ModelRotCtrl.s b/asm/src/ModelRotCtrl.s index 75530837..86176976 100644 --- a/asm/src/ModelRotCtrl.s +++ b/asm/src/ModelRotCtrl.s @@ -261,22 +261,23 @@ lbl_802718B0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ROT_H_TARGET__Q43scn4step5chara12ModelRotCtrl ROT_H_TARGET__Q43scn4step5chara12ModelRotCtrl: - .incbin "baserom.dol", 0x49B820, 0x4 + .4byte 0x42480000 .global ROT_H_TARGET_DEFAULT__Q43scn4step5chara12ModelRotCtrl ROT_H_TARGET_DEFAULT__Q43scn4step5chara12ModelRotCtrl: - .incbin "baserom.dol", 0x49B824, 0x4 + .4byte 0x42480000 .global $$250889 $$250889: - .incbin "baserom.dol", 0x49B828, 0x4 + .4byte 0 .global $$250890 $$250890: - .incbin "baserom.dol", 0x49B82C, 0x4 + .4byte 0x42480000 .global $$250891 $$250891: - .incbin "baserom.dol", 0x49B830, 0x4 + .4byte 0x3DCCCCCD .global $$250896 $$250896: - .incbin "baserom.dol", 0x49B834, 0x4 + .4byte 0x3F800000 .global $$250956 $$250956: - .incbin "baserom.dol", 0x49B838, 0x8 + .4byte 0x43B40000 + .4byte 0 diff --git a/asm/src/Monitor.s b/asm/src/Monitor.s index 437786e1..c8cc2f37 100644 --- a/asm/src/Monitor.s +++ b/asm/src/Monitor.s @@ -148,26 +148,31 @@ viewShip__Q53scn4step7gimmick7monitor7MonitorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251935 $$251935: - .incbin "baserom.dol", 0x47DC38, 0xC + .asciz "screen00" + .balign 4 .global $$251936 $$251936: - .incbin "baserom.dol", 0x47DC44, 0xC + .asciz "screen03" + .balign 4 .global $$252077 $$252077: - .incbin "baserom.dol", 0x47DC50, 0x18 + .asciz "step/gimmick/Monitor05" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252078 $$252078: - .incbin "baserom.dol", 0x496C20, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251937 $$251937: - .incbin "baserom.dol", 0x49D4F0, 0x4 + .4byte 0x80481B38 .global lbl_805629B4 lbl_805629B4: - .incbin "baserom.dol", 0x49D4F4, 0x4 + .4byte 0x80481B44 .global $$252079 $$252079: - .incbin "baserom.dol", 0x49D4F8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Monotone.s b/asm/src/Monotone.s index eef317d4..0920bccd 100644 --- a/asm/src/Monotone.s +++ b/asm/src/Monotone.s @@ -933,35 +933,40 @@ setupDrawOriginal__Q23sfx8MonotoneFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253437 $$253437: - .incbin "baserom.dol", 0x48ED88, 0x18 + .asciz "step/sfx/Monotone" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253430 $$253430: - .incbin "baserom.dol", 0x49E738, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$253502 $$253502: - .incbin "baserom.dol", 0x49E740, 0x4 + .4byte 0x3F800000 .global $$252981 $$252981: - .incbin "baserom.dol", 0x49E744, 0x4 + .4byte 0x000000FF .global $$252983 $$252983: - .incbin "baserom.dol", 0x49E748, 0x4 + .4byte 0x000000FF .global $$253028 $$253028: - .incbin "baserom.dol", 0x49E74C, 0x4 + .4byte 0xFFFFFF00 .global $$253596 $$253596: - .incbin "baserom.dol", 0x49E750, 0x8 + .4byte 0x437F0000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251472 $$251472: - .incbin "baserom.dol", 0x49EE38, 0x4 + .4byte 0xFFFFFFFF .global $$251648 $$251648: - .incbin "baserom.dol", 0x49EE3C, 0x4 + .4byte 0x000000FF .global $$251673 $$251673: - .incbin "baserom.dol", 0x49EE40, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Move.s b/asm/src/Move.s index 9fe20f2d..80dd90e6 100644 --- a/asm/src/Move.s +++ b/asm/src/Move.s @@ -524,7 +524,7 @@ lbl_8019B98C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250561 $$250561: - .incbin "baserom.dol", 0x49A2D0, 0x4 + .4byte 0x3F800000 .global $$250589 $$250589: - .incbin "baserom.dol", 0x49A2D4, 0x4 + .4byte 0 diff --git a/asm/src/MoveAlgorithmVacuumReceive.s b/asm/src/MoveAlgorithmVacuumReceive.s index a4e5ca7e..d6b939b8 100644 --- a/asm/src/MoveAlgorithmVacuumReceive.s +++ b/asm/src/MoveAlgorithmVacuumReceive.s @@ -313,27 +313,31 @@ lbl_80271D20: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251342 $$251342: - .incbin "baserom.dol", 0x495838, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251568 $$251568: - .incbin "baserom.dol", 0x49B840, 0x4 + .4byte 0x3F800000 .global $$251569 $$251569: - .incbin "baserom.dol", 0x49B844, 0x4 + .4byte 0 .global $$251570 $$251570: - .incbin "baserom.dol", 0x49B848, 0x4 + .4byte 0x40800000 .global $$251616 $$251616: - .incbin "baserom.dol", 0x49B84C, 0x4 + .4byte 0x4222F983 .global $$251617 $$251617: - .incbin "baserom.dol", 0x49B850, 0x8 + .4byte 0x3FC90FDB + .4byte 0 .global $$251620 $$251620: - .incbin "baserom.dol", 0x49B858, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251639 $$251639: - .incbin "baserom.dol", 0x49B860, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/MoveCtrl.s b/asm/src/MoveCtrl.s index 10a9ca4c..bef73d29 100644 --- a/asm/src/MoveCtrl.s +++ b/asm/src/MoveCtrl.s @@ -1760,57 +1760,61 @@ lbl_8023F41C: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257205 $$257205: - .incbin "baserom.dol", 0x4953D8, 0x4 + .4byte 0 .global $$257481 $$257481: - .incbin "baserom.dol", 0x4953DC, 0x4 + .4byte 0 .global $$257626 $$257626: - .incbin "baserom.dol", 0x4953E0, 0x4 + .4byte 0 .global $$257627 $$257627: - .incbin "baserom.dol", 0x4953E4, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258595 $$258595: - .incbin "baserom.dol", 0x49B010, 0x4 + .4byte 0 .global $$258596 $$258596: - .incbin "baserom.dol", 0x49B014, 0x4 + .4byte 0x3E4CCCCD .global $$258597 $$258597: - .incbin "baserom.dol", 0x49B018, 0x4 + .4byte 0x3727C5AC .global $$258673 $$258673: - .incbin "baserom.dol", 0x49B01C, 0x4 + .4byte 0x3F5DB22D .global $$258676 $$258676: - .incbin "baserom.dol", 0x49B020, 0x4 + .4byte 0xBF5DB22D .global $$258687 $$258687: - .incbin "baserom.dol", 0x49B024, 0x4 + .4byte 0x3FA00000 .global $$258708 $$258708: - .incbin "baserom.dol", 0x49B028, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$258712 $$258712: - .incbin "baserom.dol", 0x49B030, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$258750 $$258750: - .incbin "baserom.dol", 0x49B038, 0x4 + .4byte 0x3D23D70A .global $$258776 $$258776: - .incbin "baserom.dol", 0x49B03C, 0x4 + .4byte 0x40400000 .global $$258816 $$258816: - .incbin "baserom.dol", 0x49B040, 0x8 + .4byte 0x447A0000 + .4byte 0 .global $$258823 $$258823: - .incbin "baserom.dol", 0x49B048, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258835 $$258835: - .incbin "baserom.dol", 0x49B050, 0x4 + .4byte 0x3F800000 .global $$258900 $$258900: - .incbin "baserom.dol", 0x49B054, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/MoveGridGroup.s b/asm/src/MoveGridGroup.s index 86f59d37..14540f49 100644 --- a/asm/src/MoveGridGroup.s +++ b/asm/src/MoveGridGroup.s @@ -2015,127 +2015,1013 @@ __sinit_$$3MoveGridGroup_cpp: /* 801BBA68 001B78A8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402430, 0x4 + .4byte 0x801BB2B8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x454F68, 0xDD0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F2AAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F2AAAAB + .4byte 0x3F800000 + .4byte 0x3EAAAAAB + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3EAAAAAB + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253670 $$253670: - .incbin "baserom.dol", 0x493640, 0x4 + .4byte 0 .global $$253673 $$253673: - .incbin "baserom.dol", 0x493644, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_NORMAL_WALL_L__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_WALL_L__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A638, 0x4 + .4byte 0xBF800000 .global lbl_8055FAFC lbl_8055FAFC: - .incbin "baserom.dol", 0x49A63C, 0x4 + .4byte 0 .global T_NORMAL_WALL_R__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_WALL_R__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A640, 0x4 + .4byte 0x3F800000 .global lbl_8055FB04 lbl_8055FB04: - .incbin "baserom.dol", 0x49A644, 0x4 + .4byte 0 .global T_NORMAL_WALL_B__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_WALL_B__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A648, 0x4 + .4byte 0 .global lbl_8055FB0C lbl_8055FB0C: - .incbin "baserom.dol", 0x49A64C, 0x4 + .4byte 0xBF800000 .global T_NORMAL_WALL_T__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_WALL_T__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A650, 0x4 + .4byte 0 .global lbl_8055FB14 lbl_8055FB14: - .incbin "baserom.dol", 0x49A654, 0x4 + .4byte 0x3F800000 .global T_NORMAL_FSLOPE_LS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_LS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A658, 0x4 + .4byte 0xBF3504F3 .global lbl_8055FB1C lbl_8055FB1C: - .incbin "baserom.dol", 0x49A65C, 0x4 + .4byte 0x3F3504F3 .global T_NORMAL_FSLOPE_LS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_LS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A660, 0x4 + .4byte 0xBEE4F92E .global lbl_8055FB24 lbl_8055FB24: - .incbin "baserom.dol", 0x49A664, 0x4 + .4byte 0x3F64F92E .global T_NORMAL_FSLOPE_LS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_LS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A668, 0x4 + .4byte 0xBEA1E89B .global lbl_8055FB2C lbl_8055FB2C: - .incbin "baserom.dol", 0x49A66C, 0x4 + .4byte 0x3F72DCEC .global T_NORMAL_FSLOPE_RS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_RS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A670, 0x4 + .4byte 0x3F3504F3 .global lbl_8055FB34 lbl_8055FB34: - .incbin "baserom.dol", 0x49A674, 0x4 + .4byte 0x3F3504F3 .global T_NORMAL_FSLOPE_RS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_RS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A678, 0x4 + .4byte 0x3EE4F92E .global lbl_8055FB3C lbl_8055FB3C: - .incbin "baserom.dol", 0x49A67C, 0x4 + .4byte 0x3F64F92E .global T_NORMAL_FSLOPE_RS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_FSLOPE_RS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A680, 0x4 + .4byte 0x3EA1E89B .global lbl_8055FB44 lbl_8055FB44: - .incbin "baserom.dol", 0x49A684, 0x4 + .4byte 0x3F72DCEC .global T_NORMAL_RSLOPE_LS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_LS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A688, 0x4 + .4byte 0xBF3504F3 .global lbl_8055FB4C lbl_8055FB4C: - .incbin "baserom.dol", 0x49A68C, 0x4 + .4byte 0xBF3504F3 .global T_NORMAL_RSLOPE_LS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_LS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A690, 0x4 + .4byte 0xBEE4F92E .global lbl_8055FB54 lbl_8055FB54: - .incbin "baserom.dol", 0x49A694, 0x4 + .4byte 0xBF64F92E .global T_NORMAL_RSLOPE_LS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_LS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A698, 0x4 + .4byte 0xBEA1E89B .global lbl_8055FB5C lbl_8055FB5C: - .incbin "baserom.dol", 0x49A69C, 0x4 + .4byte 0xBF72DCEC .global T_NORMAL_RSLOPE_RS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_RS1__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A6A0, 0x4 + .4byte 0x3F3504F3 .global lbl_8055FB64 lbl_8055FB64: - .incbin "baserom.dol", 0x49A6A4, 0x4 + .4byte 0xBF3504F3 .global T_NORMAL_RSLOPE_RS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_RS2__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A6A8, 0x4 + .4byte 0x3EE4F92E .global lbl_8055FB6C lbl_8055FB6C: - .incbin "baserom.dol", 0x49A6AC, 0x4 + .4byte 0xBF64F92E .global T_NORMAL_RSLOPE_RS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_RSLOPE_RS3__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: - .incbin "baserom.dol", 0x49A6B0, 0x4 + .4byte 0x3EA1E89B .global lbl_8055FB74 lbl_8055FB74: - .incbin "baserom.dol", 0x49A6B4, 0x4 + .4byte 0xBF72DCEC .global $$255847 $$255847: - .incbin "baserom.dol", 0x49A6B8, 0x8 + .4byte 0 + .4byte 0 .global $$255958 $$255958: - .incbin "baserom.dol", 0x49A6C0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256140 $$256140: - .incbin "baserom.dol", 0x49A6C8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global T_NORMAL_NONE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 diff --git a/asm/src/MoveGridManager.s b/asm/src/MoveGridManager.s index b60acb3d..11d86af0 100644 --- a/asm/src/MoveGridManager.s +++ b/asm/src/MoveGridManager.s @@ -775,50 +775,161 @@ lbl_801BC4FC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D48, 0xC + .4byte 0x00002700 + .4byte 0x01002700 + .4byte 0x02002700 .global addType_ConditionalStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D54, 0xC + .4byte 0x00000100 + .4byte 0x01000100 + .4byte 0x02000100 .global addType_ConditionalStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D60, 0x14 + .4byte 0x00002700 + .4byte 0x01002700 + .4byte 0x02002700 + .4byte 0x03002700 + .4byte 0x04002700 .global addType_ConditionalStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D74, 0x14 + .4byte 0x00000100 + .4byte 0x01000100 + .4byte 0x02000100 + .4byte 0x03000100 + .4byte 0x04000100 .global addType_ConditionalCloudStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCloudStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D88, 0xC + .4byte 0x00002730 + .4byte 0x01002730 + .4byte 0x02002730 .global addType_ConditionalCloudStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCloudStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410D94, 0xC + .4byte 0x00000130 + .4byte 0x01000130 + .4byte 0x02000130 .global addType_ConditionalCloudStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCloudStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410DA0, 0x14 + .4byte 0x00002730 + .4byte 0x01002730 + .4byte 0x02002730 + .4byte 0x03002730 + .4byte 0x04002730 .global addType_ConditionalCloudStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCloudStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410DB4, 0x14 + .4byte 0x00000130 + .4byte 0x01000130 + .4byte 0x02000130 + .4byte 0x03000130 + .4byte 0x04000130 .global addType_ConditionalChallengeMasterExDoor__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalChallengeMasterExDoor__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410DC8, 0x10 + .4byte 0x00001A00 + .4byte 0x01001A00 + .4byte 0x02001A00 + .4byte 0x03001A00 .global addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x410DD8, 0xF8 + .4byte 0x00000100 + .4byte 0x0E000100 + .4byte 0x00010200 + .4byte 0x01010100 + .4byte 0x02010100 + .4byte 0x03010100 + .4byte 0x04010100 + .4byte 0x05010100 + .4byte 0x06010100 + .4byte 0x07010100 + .4byte 0x08010100 + .4byte 0x09010100 + .4byte 0x0A010100 + .4byte 0x0B010100 + .4byte 0x0C010100 + .4byte 0x0D010100 + .4byte 0x0E010800 + .4byte 0x01020200 + .4byte 0x02020100 + .4byte 0x03020100 + .4byte 0x04020100 + .4byte 0x05020100 + .4byte 0x06020100 + .4byte 0x07020100 + .4byte 0x08020100 + .4byte 0x09020100 + .4byte 0x0A020100 + .4byte 0x0B020100 + .4byte 0x0C020100 + .4byte 0x0D020800 + .4byte 0x02030200 + .4byte 0x03030100 + .4byte 0x04030100 + .4byte 0x05030100 + .4byte 0x06030100 + .4byte 0x07030100 + .4byte 0x08030100 + .4byte 0x09030100 + .4byte 0x0A030100 + .4byte 0x0B030100 + .4byte 0x0C030800 + .4byte 0x03040200 + .4byte 0x04040100 + .4byte 0x05040100 + .4byte 0x06040100 + .4byte 0x07040100 + .4byte 0x08040100 + .4byte 0x09040100 + .4byte 0x0A040100 + .4byte 0x0B040800 + .4byte 0x04050200 + .4byte 0x05050100 + .4byte 0x06050100 + .4byte 0x07050100 + .4byte 0x08050100 + .4byte 0x09050100 + .4byte 0x0A050800 + .4byte 0x05060200 + .4byte 0x06060100 + .4byte 0x07060100 + .4byte 0x08060100 + .4byte 0x09060800 .section .data, "wa" # 0x80421040 - 0x80496700 .global addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x455D38, 0x30 + .4byte 0 + .4byte 0x80414C48 + .4byte 0x80414C54 + .4byte 0x80414C60 + .4byte 0x80414C74 + .4byte 0x80414CD8 + .4byte 0x80414C88 + .4byte 0x80414C94 + .4byte 0x80414CA0 + .4byte 0x80414CB4 + .4byte 0x80414CC8 + .4byte 0x8055FB90 .global $$252675 $$252675: - .incbin "baserom.dol", 0x455D68, 0x30 + .4byte 0x801BBC00 ;# ptr + .4byte 0x801BBAC0 ;# ptr + .4byte 0x801BBAC0 ;# ptr + .4byte 0x801BBB00 ;# ptr + .4byte 0x801BBB00 ;# ptr + .4byte 0x801BBB40 ;# ptr + .4byte 0x801BBAC0 ;# ptr + .4byte 0x801BBAC0 ;# ptr + .4byte 0x801BBB00 ;# ptr + .4byte 0x801BBB00 ;# ptr + .4byte 0x801BBB84 ;# ptr + .4byte 0x801BBBC4 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: - .incbin "baserom.dol", 0x49A6D0, 0x8 + .4byte 0x00002700 + .4byte 0x01002700 .global $$252703 $$252703: - .incbin "baserom.dol", 0x49A6D8, 0x4 + .4byte 0x38D1B717 .global $$252716 $$252716: - .incbin "baserom.dol", 0x49A6DC, 0x4 + .4byte 0 diff --git a/asm/src/MoveGroupCtrl.s b/asm/src/MoveGroupCtrl.s index 25edf25f..4f253013 100644 --- a/asm/src/MoveGroupCtrl.s +++ b/asm/src/MoveGroupCtrl.s @@ -1971,38 +1971,53 @@ lbl_80319188: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global t_VibrationSize__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2 t_VibrationSize__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2: - .incbin "baserom.dol", 0x415BA0, 0x10 + .4byte 0 + .4byte 0x3CF5C28F + .4byte 0x3D75C28F + .4byte 0x3DF5C28F .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrl __vt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrl: - .incbin "baserom.dol", 0x47DB60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8031775C + .4byte 0x80317AB8 + .4byte 0x80317B24 + .4byte 0x802F7CF8 + .4byte 0x802F7CF4 + .4byte 0x802F7CF0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257160 $$257160: - .incbin "baserom.dol", 0x49D4A8, 0x4 + .4byte 0 .global $$257240 $$257240: - .incbin "baserom.dol", 0x49D4AC, 0x4 + .4byte 0x41200000 .global $$257241 $$257241: - .incbin "baserom.dol", 0x49D4B0, 0x8 + .4byte 0x41000000 + .4byte 0 .global $$257263 $$257263: - .incbin "baserom.dol", 0x49D4B8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257314 $$257314: - .incbin "baserom.dol", 0x49D4C0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257372 $$257372: - .incbin "baserom.dol", 0x49D4C8, 0x8 + .4byte 0x3F847AE1 + .4byte 0x47AE147B .global $$257529 $$257529: - .incbin "baserom.dol", 0x49D4D0, 0x4 + .4byte 0x3DCCCCCD .global $$257530 $$257530: - .incbin "baserom.dol", 0x49D4D4, 0x4 + .4byte 0x3B03126F .global $$257531 $$257531: - .incbin "baserom.dol", 0x49D4D8, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/MoveLandAttack.s b/asm/src/MoveLandAttack.s index 33fb7096..f7e2bbf5 100644 --- a/asm/src/MoveLandAttack.s +++ b/asm/src/MoveLandAttack.s @@ -268,20 +268,26 @@ lbl_8031A058: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254149 $$254149: - .incbin "baserom.dol", 0x47DC68, 0x28 + .asciz "step/weapon/common/EffectLocator" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254150 $$254150: - .incbin "baserom.dol", 0x496C28, 0x8 + .asciz "Model" + .balign 4 .global $$254151 $$254151: - .incbin "baserom.dol", 0x496C30, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254152 $$254152: - .incbin "baserom.dol", 0x49D500, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$254157 $$254157: - .incbin "baserom.dol", 0x49D508, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/MoveLimit.s b/asm/src/MoveLimit.s index 37268841..163b8f95 100644 --- a/asm/src/MoveLimit.s +++ b/asm/src/MoveLimit.s @@ -401,15 +401,17 @@ lbl_8034EA74: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252312 $$252312: - .incbin "baserom.dol", 0x49B908, 0x8 + .4byte 0 + .4byte 0 .global $$252315 $$252315: - .incbin "baserom.dol", 0x49B910, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252015 $$252015: - .incbin "baserom.dol", 0x49D878, 0x4 + .4byte 0 .global $$252069 $$252069: - .incbin "baserom.dol", 0x49D87C, 0x4 + .4byte 0xB727C5AC diff --git a/asm/src/MoveLimitResponseCtrl.s b/asm/src/MoveLimitResponseCtrl.s index c9abf5b0..43766f44 100644 --- a/asm/src/MoveLimitResponseCtrl.s +++ b/asm/src/MoveLimitResponseCtrl.s @@ -26,4 +26,5 @@ setResponseSpaceJumpToPos__Q43scn4step4hero21MoveLimitResponseCtrlFRCQ33hel4math .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250125 $$250125: - .incbin "baserom.dol", 0x49D880, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MoveParamAccel.s b/asm/src/MoveParamAccel.s index a1efd2ba..d8f60a85 100644 --- a/asm/src/MoveParamAccel.s +++ b/asm/src/MoveParamAccel.s @@ -30,4 +30,5 @@ Create__Q24gobj14MoveParamAccelFfff: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: - .incbin "baserom.dol", 0x49A2D8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MoveParamDecel.s b/asm/src/MoveParamDecel.s index f3cf2ed3..62b0fbe7 100644 --- a/asm/src/MoveParamDecel.s +++ b/asm/src/MoveParamDecel.s @@ -17,4 +17,5 @@ Create__Q24gobj14MoveParamDecelFf: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248779 $$248779: - .incbin "baserom.dol", 0x49A2E0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MoveParamFall.s b/asm/src/MoveParamFall.s index 6246172c..fde49716 100644 --- a/asm/src/MoveParamFall.s +++ b/asm/src/MoveParamFall.s @@ -11,4 +11,5 @@ Zero__Q24gobj13MoveParamFallFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: - .incbin "baserom.dol", 0x49A2E8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/MovieButtonContent.s b/asm/src/MovieButtonContent.s index 2c07f3a4..811decb9 100644 --- a/asm/src/MovieButtonContent.s +++ b/asm/src/MovieButtonContent.s @@ -107,90 +107,163 @@ lbl_80215A30: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251550 $$251550: - .incbin "baserom.dol", 0x45E5A8, 0xC + .asciz "KAvalancheN" .global $$251553 $$251553: - .incbin "baserom.dol", 0x45E5B4, 0xC + .asciz "KPinballN" + .balign 4 .global $$251555 $$251555: - .incbin "baserom.dol", 0x45E5C0, 0xC + .asciz "KAirRideN" + .balign 4 .global $$251559 $$251559: - .incbin "baserom.dol", 0x45E5CC, 0xC + .asciz "KDreamDXN" + .balign 4 .global $$251560 $$251560: - .incbin "baserom.dol", 0x45E5D8, 0xC + .asciz "KMirrorN" + .balign 4 .global $$251563 $$251563: - .incbin "baserom.dol", 0x45E5E4, 0xC + .asciz "KAtsumeteN" + .balign 4 .global PANES__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2 PANES__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45E5F0, 0x58 + .4byte 0x80558880 + .4byte 0x80558888 + .4byte 0x8055888C + .4byte 0x80558890 + .4byte 0x80558894 + .4byte 0x804624A8 + .4byte 0x805588A0 + .4byte 0x805588A8 + .4byte 0x804624B4 + .4byte 0x805588B0 + .4byte 0x804624C0 + .4byte 0x805588B8 + .4byte 0x805588C0 + .4byte 0x805588C8 + .4byte 0x804624CC + .4byte 0x804624D8 + .4byte 0x805588D0 + .4byte 0x805588D8 + .4byte 0x804624E4 + .4byte 0x805588E0 + .4byte 0x805588E8 + .4byte 0x805588F0 .global TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2 TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45E648, 0x74 + .4byte 0x805588F8 + .4byte 0x80558888 + .4byte 0x805588A0 + .4byte 0x804624B4 + .4byte 0x805588F8 + .4byte 0x805588A8 + .4byte 0x804624A8 + .4byte 0x8055888C + .4byte 0x805588E0 + .4byte 0x80558880 + .4byte 0x805588B0 + .4byte 0x80558890 + .4byte 0x805588F8 + .4byte 0x805588F8 + .4byte 0x80558894 + .4byte 0x805588E8 + .4byte 0x804624CC + .4byte 0x80558888 + .4byte 0x804624C0 + .4byte 0x804624D8 + .4byte 0x805588C8 + .4byte 0x805588D0 + .4byte 0x805588F8 + .4byte 0x805588C0 + .4byte 0x805588F8 + .4byte 0x805588D8 + .4byte 0x804624E4 + .4byte 0x805588B8 + .4byte 0x805588F0 .global $$252003 $$252003: - .incbin "baserom.dol", 0x45E6BC, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252004 $$252004: - .incbin "baserom.dol", 0x45E6CC, 0x44 + .asciz "ProductMovieButton" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: - .incbin "baserom.dol", 0x494C60, 0x8 + .asciz "KSDXN" + .balign 4 .global $$251546 $$251546: - .incbin "baserom.dol", 0x494C68, 0x4 + .4byte 0x4B314E00 .global $$251547 $$251547: - .incbin "baserom.dol", 0x494C6C, 0x4 + .4byte 0x4B324E00 .global $$251548 $$251548: - .incbin "baserom.dol", 0x494C70, 0x4 + .4byte 0x4B334E00 .global $$251549 $$251549: - .incbin "baserom.dol", 0x494C74, 0xC + .asciz "K64N" + .balign 4 + .4byte 0 .global $$251551 $$251551: - .incbin "baserom.dol", 0x494C80, 0x8 + .asciz "KDreamN" .global $$251552 $$251552: - .incbin "baserom.dol", 0x494C88, 0x8 + .asciz "KBallN" + .balign 4 .global $$251554 $$251554: - .incbin "baserom.dol", 0x494C90, 0x8 + .asciz "KKiraN" + .balign 4 .global $$251556 $$251556: - .incbin "baserom.dol", 0x494C98, 0x8 + .asciz "KWiiN" + .balign 4 .global $$251557 $$251557: - .incbin "baserom.dol", 0x494CA0, 0x8 + .asciz "KUSDXN" + .balign 4 .global $$251558 $$251558: - .incbin "baserom.dol", 0x494CA8, 0x8 + .asciz "KTouchN" .global $$251561 $$251561: - .incbin "baserom.dol", 0x494CB0, 0x8 + .asciz "KDoroN" + .balign 4 .global $$251562 $$251562: - .incbin "baserom.dol", 0x494CB8, 0x8 + .asciz "KWoolN" + .balign 4 .global $$251564 $$251564: - .incbin "baserom.dol", 0x494CC0, 0x8 + .asciz "KBBN" + .balign 4 .global $$251565 $$251565: - .incbin "baserom.dol", 0x494CC8, 0x8 + .asciz "KCoroN" + .balign 4 .global $$251566 $$251566: - .incbin "baserom.dol", 0x494CD0, 0x8 + .asciz "KDonutN" .global $$251567 $$251567: - .incbin "baserom.dol", 0x494CD8, 0x8 + .asciz "Dummy" + .balign 4 .global $$252005 $$252005: - .incbin "baserom.dol", 0x494CE0, 0x8 + .asciz "Unfocus" .global $$252051 $$252051: - .incbin "baserom.dol", 0x494CE8, 0x8 + .asciz "Focus" + .balign 4 diff --git a/asm/src/MovieKindUtil.s b/asm/src/MovieKindUtil.s index 9d97d8f3..59b66642 100644 --- a/asm/src/MovieKindUtil.s +++ b/asm/src/MovieKindUtil.s @@ -92,95 +92,190 @@ __sinit_$$3MovieKindUtil_cpp: /* 801CEDA8 001CABE8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402440, 0x4 + .4byte 0x801CED30 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: - .incbin "baserom.dol", 0x458DE8, 0x10 + .asciz "mov/Kirby1.mo" + .balign 4 .global $$248727 $$248727: - .incbin "baserom.dol", 0x458DF8, 0x18 + .asciz "mov/KirbyDreamLand.mo" + .balign 4 .global $$248728 $$248728: - .incbin "baserom.dol", 0x458E10, 0x14 + .asciz "mov/KirbyPinBall.mo" .global $$248729 $$248729: - .incbin "baserom.dol", 0x458E24, 0x14 + .asciz "mov/KirbyBall.mo" + .balign 4 .global $$248730 $$248730: - .incbin "baserom.dol", 0x458E38, 0x10 + .asciz "mov/Kirby2.mo" + .balign 4 .global $$248731 $$248731: - .incbin "baserom.dol", 0x458E48, 0x18 + .asciz "mov/KirbyBlockBall.mo" + .balign 4 .global $$248732 $$248732: - .incbin "baserom.dol", 0x458E60, 0x10 + .asciz "mov/KirbySDX.mo" .global $$248733 $$248733: - .incbin "baserom.dol", 0x458E70, 0x14 + .asciz "mov/KirbyKidsGB.mo" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x458E84, 0x10 + .asciz "mov/Kirby3.mo" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x458E94, 0x14 + .asciz "mov/KirbyKidsSFC.mo" .global $$248736 $$248736: - .incbin "baserom.dol", 0x458EA8, 0x10 + .asciz "mov/Kirby64.mo" + .balign 4 .global $$248737 $$248737: - .incbin "baserom.dol", 0x458EB8, 0x18 + .asciz "mov/KirbyKoroKoro.mo" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x458ED0, 0x18 + .asciz "mov/KirbyDreamLandDX.mo" .global $$248739 $$248739: - .incbin "baserom.dol", 0x458EE8, 0x14 + .asciz "mov/KirbyAirRide.mo" .global $$248740 $$248740: - .incbin "baserom.dol", 0x458EFC, 0x14 + .asciz "mov/KirbyMirror.mo" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x458F10, 0x14 + .asciz "mov/KirbyTouch.mo" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x458F24, 0x14 + .asciz "mov/KirbyDoroche.mo" .global $$248743 $$248743: - .incbin "baserom.dol", 0x458F38, 0x10 + .asciz "mov/KirbyDDX.mo" .global $$248744 $$248744: - .incbin "baserom.dol", 0x458F48, 0x18 + .asciz "mov/KirbyEpicYarn.mo" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x458F60, 0x18 + .asciz "mov/KirbyMassAttack.mo" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x458F78, 0x10 + .asciz "mov/KirbyWii.mo" .global $$248747 $$248747: - .incbin "baserom.dol", 0x458F88, 0x18 + .asciz "mov/KirbyAvalanche.mo" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x458FA0, 0x10 + .asciz "mov/Anime01.mo" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x458FB0, 0x10 + .asciz "mov/Anime02.mo" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x458FC0, 0x10 + .asciz "mov/Anime03.mo" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x458FD0, 0x10 + .asciz "mov/music.mo" + .balign 4 .global MOVIE_INFO_TABLE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2 MOVIE_INFO_TABLE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: - .incbin "baserom.dol", 0x458FE0, 0x138 + .4byte 0x8045CCE8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CCF8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD10 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD24 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD38 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD48 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD60 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD70 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD84 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CD94 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CDA8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CDB8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CDD0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CDE8 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CDFC + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE10 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE24 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE38 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE48 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE60 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE78 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CE88 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CEA0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CEB0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CEC0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x8045CED0 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_WHITE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2 T_WHITE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: - .incbin "baserom.dol", 0x49A740, 0x4 + .4byte 0xFFFFFFFF .global T_BLACK__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2 T_BLACK__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: - .incbin "baserom.dol", 0x49A744, 0x4 + .4byte 0x000000FF diff --git a/asm/src/MoviePlayer.s b/asm/src/MoviePlayer.s index 6c401253..7b71eeda 100644 --- a/asm/src/MoviePlayer.s +++ b/asm/src/MoviePlayer.s @@ -904,39 +904,51 @@ canRemove__Q23mov11MoviePlayerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250367 $$250367: - .incbin "baserom.dol", 0x459118, 0x28 + .4byte 0x801CF744 ;# ptr + .4byte 0x801CF518 ;# ptr + .4byte 0x801CF534 ;# ptr + .4byte 0x801CF554 ;# ptr + .4byte 0x801CF590 ;# ptr + .4byte 0x801CF5AC ;# ptr + .4byte 0x801CF644 ;# ptr + .4byte 0x801CF688 ;# ptr + .4byte 0x801CF70C ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250273 $$250273: - .incbin "baserom.dol", 0x49A748, 0x4 + .4byte 0 .global $$250331 $$250331: - .incbin "baserom.dol", 0x49A74C, 0x4 + .4byte 0x3F800000 .global $$249607 $$249607: - .incbin "baserom.dol", 0x49A750, 0x4 + .4byte 0x801CEDC0 ;# ptr .global lbl_8055FC14 lbl_8055FC14: - .incbin "baserom.dol", 0x49A754, 0x4 + .4byte 0x801CEDAC ;# ptr .global $$250385 $$250385: - .incbin "baserom.dol", 0x49A758, 0x4 + .4byte 0x3B800000 .global $$250386 $$250386: - .incbin "baserom.dol", 0x49A75C, 0x4 + .4byte 0x41F00000 .global $$250387 $$250387: - .incbin "baserom.dol", 0x49A760, 0x4 + .4byte 0x41EF3333 .global $$250388 $$250388: - .incbin "baserom.dol", 0x49A764, 0x4 + .4byte 0x42700000 .global $$250389 $$250389: - .incbin "baserom.dol", 0x49A768, 0x8 + .4byte 0x425FF5C3 + .4byte 0 .global $$250390 $$250390: - .incbin "baserom.dol", 0x49A770, 0x8 + .4byte 0x3FE00000 + .4byte 0 .global $$250393 $$250393: - .incbin "baserom.dol", 0x49A778, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/MovieThread.s b/asm/src/MovieThread.s index 3517ceae..90ced538 100644 --- a/asm/src/MovieThread.s +++ b/asm/src/MovieThread.s @@ -827,16 +827,40 @@ lbl_801D0544: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250121 $$250121: - .incbin "baserom.dol", 0x459140, 0x30 + .4byte 0x2573206F + .4byte 0x70656E50 + .4byte 0x50726F63 + .4byte 0x65737328 + .4byte 0x29203A20 + .4byte 0x4D4F4F70 + .4byte 0x656E82C9 + .4byte 0x8EB89473 + .4byte 0x82B582DC + .4byte 0x82B582BD + .4byte 0x0A000000 + .4byte 0 .global $$250122 $$250122: - .incbin "baserom.dol", 0x459170, 0x10 + .asciz "MovieThread.cpp" .global $$250149 $$250149: - .incbin "baserom.dol", 0x459180, 0x18 + .asciz "%s SkipImage fail %d\n" + .balign 4 .global $$250150 $$250150: - .incbin "baserom.dol", 0x459198, 0x1C + .asciz "%s SkipAudioPacket fail %d\n" .global $$250246 $$250246: - .incbin "baserom.dol", 0x4591B4, 0x34 + .4byte 0x801CFFB4 ;# ptr + .4byte 0x801D0230 ;# ptr + .4byte 0x801D0328 ;# ptr + .4byte 0x801D0340 ;# ptr + .4byte 0x801D03A0 ;# ptr + .4byte 0x801D0400 ;# ptr + .4byte 0x801D04B4 ;# ptr + .4byte 0x801D0060 ;# ptr + .4byte 0x801D0178 ;# ptr + .4byte 0x801D0190 ;# ptr + .4byte 0x801CFFDC ;# ptr + .4byte 0x801D0058 ;# ptr + .4byte 0 diff --git a/asm/src/MovieWindow.s b/asm/src/MovieWindow.s index 8c96a06f..886208f0 100644 --- a/asm/src/MovieWindow.s +++ b/asm/src/MovieWindow.s @@ -1867,199 +1867,310 @@ lbl_802174CC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251646 $$251646: - .incbin "baserom.dol", 0x4120C0, 0xC + .4byte 0 + .4byte 0 + .4byte 0xC2C80000 .global $$251648 $$251648: - .incbin "baserom.dol", 0x4120CC, 0xC + .4byte 0 + .4byte 0 + .4byte 0x42C80000 .global $$251650 $$251650: - .incbin "baserom.dol", 0x4120D8, 0xC + .4byte 0 + .4byte 0xBF800000 + .4byte 0 .global MOVIE_KIND_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2 MOVIE_KIND_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2: - .incbin "baserom.dol", 0x4120E4, 0x74 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000015 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0 + .4byte 0x0000000D + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0 + .4byte 0x00000011 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252430 $$252430: - .incbin "baserom.dol", 0x45E710, 0x10 + .asciz "PlayMovieKirby1" .global $$252431 $$252431: - .incbin "baserom.dol", 0x45E720, 0x18 + .asciz "PlayMovieKirbyDreamLand" .global $$252432 $$252432: - .incbin "baserom.dol", 0x45E738, 0x18 + .asciz "PlayMovieKirbyPinBall" + .balign 4 .global $$252433 $$252433: - .incbin "baserom.dol", 0x45E750, 0x18 + .asciz "PlayMovieKirbyBall" + .balign 4 + .4byte 0 .global $$252434 $$252434: - .incbin "baserom.dol", 0x45E768, 0x18 + .asciz "PlayMovieKirbyAvalanche" .global $$252435 $$252435: - .incbin "baserom.dol", 0x45E780, 0x10 + .asciz "PlayMovieKirby2" .global $$252436 $$252436: - .incbin "baserom.dol", 0x45E790, 0x18 + .asciz "PlayMovieKirbyBlockBall" .global $$252437 $$252437: - .incbin "baserom.dol", 0x45E7A8, 0x14 + .asciz "PlayMovieKirbySDX" + .balign 4 .global $$252438 $$252438: - .incbin "baserom.dol", 0x45E7BC, 0x1C + .asciz "PlayMovieKirbyKidsGB" + .balign 4 + .4byte 0 .global $$252439 $$252439: - .incbin "baserom.dol", 0x45E7D8, 0x10 + .asciz "PlayMovieKirby3" .global $$252440 $$252440: - .incbin "baserom.dol", 0x45E7E8, 0x14 + .asciz "PlayMovieKirby64" + .balign 4 .global $$252441 $$252441: - .incbin "baserom.dol", 0x45E7FC, 0x18 + .asciz "PlayMovieKirbyKoroKoro" + .balign 4 .global $$252442 $$252442: - .incbin "baserom.dol", 0x45E814, 0x1C + .asciz "PlayMovieKirbyDreamLandDX" + .balign 4 .global $$252443 $$252443: - .incbin "baserom.dol", 0x45E830, 0x18 + .asciz "PlayMovieKirbyAirRide" + .balign 4 .global $$252444 $$252444: - .incbin "baserom.dol", 0x45E848, 0x18 + .asciz "PlayMovieKirbyMirror" + .balign 4 .global $$252445 $$252445: - .incbin "baserom.dol", 0x45E860, 0x14 + .asciz "PlayMovieKirbyTouch" .global $$252446 $$252446: - .incbin "baserom.dol", 0x45E874, 0x18 + .asciz "PlayMovieKirbyDoroche" + .balign 4 .global $$252447 $$252447: - .incbin "baserom.dol", 0x45E88C, 0x14 + .asciz "PlayMovieKirbyDDX" + .balign 4 .global $$252448 $$252448: - .incbin "baserom.dol", 0x45E8A0, 0x18 + .asciz "PlayMovieKirbyEpicYarn" + .balign 4 .global $$252449 $$252449: - .incbin "baserom.dol", 0x45E8B8, 0x1C + .asciz "PlayMovieKirbyMassAttack" + .balign 4 .global $$252450 $$252450: - .incbin "baserom.dol", 0x45E8D4, 0x14 + .asciz "PlayMovieKirbyWii" + .balign 4 .global MSG_LABEL_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2 MSG_LABEL_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2: - .incbin "baserom.dol", 0x45E8E8, 0x74 + .4byte 0x80558910 + .4byte 0x80462610 + .4byte 0x80462620 + .4byte 0x80462638 + .4byte 0x80558910 + .4byte 0x80462650 + .4byte 0x80462668 + .4byte 0x80462680 + .4byte 0x80462690 + .4byte 0x804626A8 + .4byte 0x804626BC + .4byte 0x804626D8 + .4byte 0x80558910 + .4byte 0x80558910 + .4byte 0x804626E8 + .4byte 0x804626FC + .4byte 0x80462714 + .4byte 0x80558910 + .4byte 0x80462730 + .4byte 0x80462748 + .4byte 0x80462760 + .4byte 0x80462774 + .4byte 0x80558910 + .4byte 0x8046278C + .4byte 0x80558910 + .4byte 0x804627A0 + .4byte 0x804627B8 + .4byte 0x804627D4 + .4byte 0x80558910 .global $$254931 $$254931: - .incbin "baserom.dol", 0x45E95C, 0xC + .asciz "MovieWindow" .global $$254932 $$254932: - .incbin "baserom.dol", 0x45E968, 0x10 + .asciz "history/Detail" + .balign 4 .global $$254933 $$254933: - .incbin "baserom.dol", 0x45E978, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$254934 $$254934: - .incbin "baserom.dol", 0x45E984, 0x10 + .asciz "ReWindButton" + .balign 4 .global $$254935 $$254935: - .incbin "baserom.dol", 0x45E994, 0x14 + .asciz "AnimeButtonCursor" + .balign 4 .global $$254936 $$254936: - .incbin "baserom.dol", 0x45E9A8, 0xC + .asciz "PlayButton" + .balign 4 .global $$254937 $$254937: - .incbin "baserom.dol", 0x45E9B4, 0x10 + .asciz "ForwardButton" + .balign 4 .global $$254938 $$254938: - .incbin "baserom.dol", 0x45E9C4, 0xC + .asciz "ExplainText" .global $$254939 $$254939: - .incbin "baserom.dol", 0x45E9D0, 0xC + .asciz "ExplainBG" + .balign 4 .global $$254940 $$254940: - .incbin "baserom.dol", 0x45E9DC, 0x1C + .asciz "history/detail/MovieWindow" + .balign 4 .global $$254943 $$254943: - .incbin "baserom.dol", 0x45E9F8, 0xC + .asciz "PlayButtonN" .global $$254944 $$254944: - .incbin "baserom.dol", 0x45EA04, 0xC + .asciz "ForwardN" + .balign 4 .global $$254946 $$254946: - .incbin "baserom.dol", 0x45EA10, 0xC + .asciz "TabCursor" + .balign 4 .global $$255209 $$255209: - .incbin "baserom.dol", 0x45EA1C, 0xC + .asciz "CurrentMinT" .global $$255211 $$255211: - .incbin "baserom.dol", 0x45EA28, 0x10 + .asciz "CurrentSecondT" + .balign 4 .global $$255212 $$255212: - .incbin "baserom.dol", 0x45EA38, 0xC + .asciz "TotalMinT" + .balign 4 .global $$255213 $$255213: - .incbin "baserom.dol", 0x45EA44, 0x10 + .asciz "TotalSecondT" + .balign 4 .global $$255335 $$255335: - .incbin "baserom.dol", 0x45EA54, 0x3C + .asciz "NotSelect" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252429 $$252429: - .incbin "baserom.dol", 0x494CF0, 0x8 + .4byte 0 + .4byte 0 .global $$254941 $$254941: - .incbin "baserom.dol", 0x494CF8, 0x8 + .asciz "RewindN" .global $$254942 $$254942: - .incbin "baserom.dol", 0x494D00, 0x8 + .asciz "CursorN" .global $$254945 $$254945: - .incbin "baserom.dol", 0x494D08, 0x8 + .asciz "Wait" + .balign 4 .global $$254947 $$254947: - .incbin "baserom.dol", 0x494D10, 0x8 + .asciz "Wait1" + .balign 4 .global $$254948 $$254948: - .incbin "baserom.dol", 0x494D18, 0x8 + .asciz "Close" + .balign 4 .global $$255047 $$255047: - .incbin "baserom.dol", 0x494D20, 0x8 + .asciz "Release" .global $$255087 $$255087: - .incbin "baserom.dol", 0x494D28, 0x8 + .asciz "Wait2" + .balign 4 .global $$255088 $$255088: - .incbin "baserom.dol", 0x494D30, 0x8 + .asciz "Open" + .balign 4 .global $$255210 $$255210: - .incbin "baserom.dol", 0x494D38, 0x8 + .asciz "%02u" + .balign 4 .global $$255214 $$255214: - .incbin "baserom.dol", 0x494D40, 0x8 + .asciz "Push2" + .balign 4 .global $$255215 $$255215: - .incbin "baserom.dol", 0x494D48, 0x8 + .asciz "Push1" + .balign 4 .global $$255216 $$255216: - .incbin "baserom.dol", 0x494D50, 0x8 + .asciz "Push" + .balign 4 .global $$255332 $$255332: - .incbin "baserom.dol", 0x494D58, 0x8 + .asciz "Select" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251657 $$251657: - .incbin "baserom.dol", 0x49ACC0, 0x4 + .4byte 0x64000080 .global $$255217 $$255217: - .incbin "baserom.dol", 0x49ACC4, 0x4 + .4byte 0x40000000 .global $$255218 $$255218: - .incbin "baserom.dol", 0x49ACC8, 0x8 + .4byte 0 + .4byte 0 .global $$255221 $$255221: - .incbin "baserom.dol", 0x49ACD0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$255269 $$255269: - .incbin "baserom.dol", 0x49ACD8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$255273 $$255273: - .incbin "baserom.dol", 0x49ACE0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/MovieYuv.s b/asm/src/MovieYuv.s index f3a068ba..4c4d4d0c 100644 --- a/asm/src/MovieYuv.s +++ b/asm/src/MovieYuv.s @@ -621,24 +621,31 @@ getImage__Q23mov8MovieYuvFPv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mov8MovieYuv __vt__Q23mov8MovieYuv: - .incbin "baserom.dol", 0x4591E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x801D0670 ;# ptr + .4byte 0x801D0DEC ;# ptr + .4byte 0x801D0DB8 ;# ptr + .4byte 0x801D0AC0 ;# ptr + .4byte 0x801D0B7C ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249275 $$249275: - .incbin "baserom.dol", 0x49A780, 0x4 + .4byte 0xFFA60000 .global lbl_8055FC44 lbl_8055FC44: - .incbin "baserom.dol", 0x49A784, 0x4 + .4byte 0xFF8E0087 .global $$249278 $$249278: - .incbin "baserom.dol", 0x49A788, 0x4 + .4byte 0x0000E258 .global $$249281 $$249281: - .incbin "baserom.dol", 0x49A78C, 0x4 + .4byte 0xB30000B6 .global $$249284 $$249284: - .incbin "baserom.dol", 0x49A790, 0x4 + .4byte 0xFF00FF40 .global $$249305 $$249305: - .incbin "baserom.dol", 0x49A794, 0x4 + .4byte 0 diff --git a/asm/src/MusicCheckWindow.s b/asm/src/MusicCheckWindow.s index e5aba167..6e28e278 100644 --- a/asm/src/MusicCheckWindow.s +++ b/asm/src/MusicCheckWindow.s @@ -761,81 +761,107 @@ lbl_80217F9C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253274 $$253274: - .incbin "baserom.dol", 0x45EA90, 0x14 + .asciz "common/Checkwindow" + .balign 4 .global $$253275 $$253275: - .incbin "baserom.dol", 0x45EAA4, 0x10 + .asciz "ControlWindow" + .balign 4 .global $$253276 $$253276: - .incbin "baserom.dol", 0x45EAB4, 0x10 + .asciz "CheckWindowL" + .balign 4 .global $$253277 $$253277: - .incbin "baserom.dol", 0x45EAC4, 0xC + .asciz "CheckButton" .global $$253278 $$253278: - .incbin "baserom.dol", 0x45EAD0, 0x14 + .asciz "CheckButtonCursor" + .balign 4 .global $$253279 $$253279: - .incbin "baserom.dol", 0x45EAE4, 0xC + .asciz "ControlN" + .balign 4 .global $$253283 $$253283: - .incbin "baserom.dol", 0x45EAF0, 0x10 + .asciz "SaveFileButtonN" .global $$253284 $$253284: - .incbin "baserom.dol", 0x45EB00, 0x10 + .asciz "DeleteButtonN" + .balign 4 .global $$253386 $$253386: - .incbin "baserom.dol", 0x45EB10, 0xC + .asciz "TextGameT" + .balign 4 .global $$253387 $$253387: - .incbin "baserom.dol", 0x45EB1C, 0xC + .asciz "TextPlayerT" .global $$253392 $$253392: - .incbin "baserom.dol", 0x45EB28, 0x10 + .asciz "CheckButtonT" + .balign 4 .global $$253458 $$253458: - .incbin "baserom.dol", 0x45EB38, 0x40 + .asciz "NoChoice" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253280 $$253280: - .incbin "baserom.dol", 0x494D60, 0x8 + .asciz "YesN" + .balign 4 .global $$253281 $$253281: - .incbin "baserom.dol", 0x494D68, 0x8 + .4byte 0x4E6F4E00 + .4byte 0 .global $$253282 $$253282: - .incbin "baserom.dol", 0x494D70, 0x8 + .asciz "CursorN" .global $$253285 $$253285: - .incbin "baserom.dol", 0x494D78, 0x8 + .asciz "Wait" + .balign 4 .global $$253379 $$253379: - .incbin "baserom.dol", 0x494D80, 0x8 + .asciz "GameN" + .balign 4 .global $$253380 $$253380: - .incbin "baserom.dol", 0x494D88, 0x8 + .asciz "TextT" + .balign 4 .global $$253400 $$253400: - .incbin "baserom.dol", 0x494D90, 0x8 + .asciz "Open" + .balign 4 .global $$253401 $$253401: - .incbin "baserom.dol", 0x494D98, 0x8 + .asciz "Choice" + .balign 4 .global $$253405 $$253405: - .incbin "baserom.dol", 0x494DA0, 0x8 + .asciz "Close" + .balign 4 .global $$253439 $$253439: - .incbin "baserom.dol", 0x494DA8, 0x8 + .asciz "Decide" + .balign 4 .global $$253459 $$253459: - .incbin "baserom.dol", 0x494DB0, 0x8 + .asciz "UnFocus" .global $$253460 $$253460: - .incbin "baserom.dol", 0x494DB8, 0x8 + .asciz "Wait2" + .balign 4 .global $$253461 $$253461: - .incbin "baserom.dol", 0x494DC0, 0x8 + .asciz "Focus" + .balign 4 .global $$253462 $$253462: - .incbin "baserom.dol", 0x494DC8, 0x8 + .asciz "Wait1" + .balign 4 diff --git a/asm/src/NANDErrorMenu.s b/asm/src/NANDErrorMenu.s index 6f2aacad..2aa7a8d5 100644 --- a/asm/src/NANDErrorMenu.s +++ b/asm/src/NANDErrorMenu.s @@ -942,111 +942,155 @@ decide__Q33app17NANDErrorMenuImpl6ButtonFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251882 $$251882: - .incbin "baserom.dol", 0x44EFE0, 0x10 + .asciz "resident/Main" + .balign 4 .global $$253133 $$253133: - .incbin "baserom.dol", 0x44EFF0, 0xC + .asciz "NANDError" + .balign 4 .global $$253141 $$253141: - .incbin "baserom.dol", 0x44EFFC, 0x10 + .asciz "NANDErrorMenu" + .balign 4 .global $$253194 $$253194: - .incbin "baserom.dol", 0x44F00C, 0x10 + .asciz "SaveCheckBase" + .balign 4 .global $$253195 $$253195: - .incbin "baserom.dol", 0x44F01C, 0xC + .asciz "SaveCheck" + .balign 4 .global $$253196 $$253196: - .incbin "baserom.dol", 0x44F028, 0xC + .asciz "Button01N" + .balign 4 .global $$253197 $$253197: - .incbin "baserom.dol", 0x44F034, 0xC + .asciz "Button02N" + .balign 4 .global $$253303 $$253303: - .incbin "baserom.dol", 0x44F040, 0x10 + .asciz "ReturnToMenu" + .balign 4 .global $$253307 $$253307: - .incbin "baserom.dol", 0x44F050, 0xC + .asciz "NoSaveLoad" + .balign 4 .global $$253308 $$253308: - .incbin "baserom.dol", 0x44F05C, 0xC + .asciz "DeleteFile" + .balign 4 .global $$253313 $$253313: - .incbin "baserom.dol", 0x44F068, 0xC + .asciz "EmptyBlock" + .balign 4 .global $$253314 $$253314: - .incbin "baserom.dol", 0x44F074, 0xC + .asciz "EmptyINode" + .balign 4 .global $$253315 $$253315: - .incbin "baserom.dol", 0x44F080, 0xC + .asciz "BrokenWarn" + .balign 4 .global $$253319 $$253319: - .incbin "baserom.dol", 0x44F08C, 0x10 + .asciz "WinSelectText" + .balign 4 .global $$253323 $$253323: - .incbin "baserom.dol", 0x44F09C, 0x2C + .4byte 0x8017A0E8 ;# ptr + .4byte 0x8017A074 ;# ptr + .4byte 0x8017A080 ;# ptr + .4byte 0x8017A08C ;# ptr + .4byte 0x8017A098 ;# ptr + .4byte 0x8017A0AC ;# ptr + .4byte 0x8017A0C0 ;# ptr + .4byte 0x8017A0AC ;# ptr + .4byte 0x8017A0D4 ;# ptr + .4byte 0x8017A0E8 ;# ptr + .4byte 0x8017A0AC ;# ptr .global $$253362 $$253362: - .incbin "baserom.dol", 0x44F0C8, 0x10 + .asciz "SaveCheckButton" .global $$253374 $$253374: - .incbin "baserom.dol", 0x44F0D8, 0xC + .asciz "NoChoice" + .balign 4 .global $$253377 $$253377: - .incbin "baserom.dol", 0x44F0E4, 0x3C + .asciz "ButtonText" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2 T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2: - .incbin "baserom.dol", 0x493010, 0x4 + .4byte 0x80452EE0 .global $$253132 $$253132: - .incbin "baserom.dol", 0x493014, 0x8 + .asciz "%s%s%s" + .balign 4 .global $$253198 $$253198: - .incbin "baserom.dol", 0x49301C, 0x8 + .asciz "WinN" + .balign 4 .global $$253304 $$253304: - .incbin "baserom.dol", 0x493024, 0x8 + .asciz "NoSave" + .balign 4 .global $$253305 $$253305: - .incbin "baserom.dol", 0x49302C, 0x4 + .4byte 0x59657300 .global $$253306 $$253306: - .incbin "baserom.dol", 0x493030, 0x8 + .asciz "Cancel" + .balign 4 .global $$253309 $$253309: - .incbin "baserom.dol", 0x493038, 0x4 + .4byte 0 .global $$253310 $$253310: - .incbin "baserom.dol", 0x49303C, 0x8 + .asciz "Error" + .balign 4 .global $$253311 $$253311: - .incbin "baserom.dol", 0x493044, 0xC + .asciz "Failed" + .balign 4 + .4byte 0 .global $$253312 $$253312: - .incbin "baserom.dol", 0x493050, 0x8 + .asciz "Corrupt" .global $$253316 $$253316: - .incbin "baserom.dol", 0x493058, 0x8 + .asciz "Wait02" + .balign 4 .global $$253317 $$253317: - .incbin "baserom.dol", 0x493060, 0x8 + .asciz "WinText" .global $$253318 $$253318: - .incbin "baserom.dol", 0x493068, 0x8 + .asciz "Wait01" + .balign 4 .global $$253320 $$253320: - .incbin "baserom.dol", 0x493070, 0x8 + .asciz "Item" + .balign 4 .global $$253321 $$253321: - .incbin "baserom.dol", 0x493078, 0x8 + .asciz "Open" + .balign 4 .global $$253359 $$253359: - .incbin "baserom.dol", 0x493080, 0x8 + .asciz "Close" + .balign 4 .global $$253373 $$253373: - .incbin "baserom.dol", 0x493088, 0x8 + .asciz "Choice" + .balign 4 .global $$253381 $$253381: - .incbin "baserom.dol", 0x493090, 0x8 + .asciz "Decide" + .balign 4 diff --git a/asm/src/NW4RAssert.s b/asm/src/NW4RAssert.s index 42d02d8c..a9a74bf2 100644 --- a/asm/src/NW4RAssert.s +++ b/asm/src/NW4RAssert.s @@ -37,9 +37,11 @@ VPanic__Q24nw4r2dbFPCciPCcP16__va_list_structb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248782 $$248782: - .incbin "baserom.dol", 0x450138, 0x10 + .asciz "NW4R ASSERT: " + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248783 $$248783: - .incbin "baserom.dol", 0x493158, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/N_Mint_Cast.s b/asm/src/N_Mint_Cast.s index 62f46bb0..7306f473 100644 --- a/asm/src/N_Mint_Cast.s +++ b/asm/src/N_Mint_Cast.s @@ -118,18 +118,23 @@ lbl_801C62A4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi$$20 $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi$$20: - .incbin "baserom.dol", 0x457DC8, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi: - .incbin "baserom.dol", 0x457DDC, 0x14 + .asciz "MintFuncProxy.hpp" + .balign 4 .global $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf$$20 $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf$$20: - .incbin "baserom.dol", 0x457DF0, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf: - .incbin "baserom.dol", 0x457E04, 0x14 + .asciz "MintFuncProxy.hpp" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249893 $$249893: - .incbin "baserom.dol", 0x49A718, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/N_Mint_Debug.s b/asm/src/N_Mint_Debug.s index ad0ca8e2..d04ef20a 100644 --- a/asm/src/N_Mint_Debug.s +++ b/asm/src/N_Mint_Debug.s @@ -434,53 +434,115 @@ N_Mint_Debug_StackDump__6mintvmFRQ26mintvm13MintFuncProxy: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250074 $$250074: - .incbin "baserom.dol", 0x457E18, 0xC + .asciz "Assert Fail" .global $$250077 $$250077: - .incbin "baserom.dol", 0x457E24, 0xC + .asciz "Test Fail!" + .balign 4 .global $$250082 $$250082: - .incbin "baserom.dol", 0x457E30, 0x14 + .asciz "N_Mint_Debug.cpp" + .balign 4 .global $$250083 $$250083: - .incbin "baserom.dol", 0x457E44, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$250098 $$250098: - .incbin "baserom.dol", 0x457E58, 0x20 + .4byte 0x5B417373 + .4byte 0x6572745F + .4byte 0x695D208A + .4byte 0xFA91D23A + .4byte 0x2025642C + .4byte 0x208EC08D + .4byte 0xDB3A2025 + .4byte 0x640A0000 .global $$250104 $$250104: - .incbin "baserom.dol", 0x457E78, 0x20 + .4byte 0x5B417373 + .4byte 0x6572745F + .4byte 0x665D208A + .4byte 0xFA91D23A + .4byte 0x2025662C + .4byte 0x208EC08D + .4byte 0xDB3A2025 + .4byte 0x660A0000 .global $$250115 $$250115: - .incbin "baserom.dol", 0x457E98, 0x40 + .4byte 0x5B417373 + .4byte 0x6572745F + .4byte 0x66745D20 + .4byte 0x8AFA91D2 + .4byte 0x3A202566 + .4byte 0x2C208EC0 + .4byte 0x8DDB3A20 + .4byte 0x2566207C + .4byte 0x208CEB8D + .4byte 0xB73D2566 + .4byte 0x2C208B96 + .4byte 0x97658CEB + .4byte 0x8DB73D20 + .asciz "+-%f\n" + .balign 4 + .4byte 0 .global $$250119 $$250119: - .incbin "baserom.dol", 0x457ED8, 0x28 + .4byte 0x5B546573 + .4byte 0x745F695D + .4byte 0x208AFA91 + .4byte 0xD23A2025 + .4byte 0x642C208E + .4byte 0xC08DDB3A + .asciz " %d ... error!\n" .global $$250123 $$250123: - .incbin "baserom.dol", 0x457F00, 0x28 + .4byte 0x5B546573 + .4byte 0x745F665D + .4byte 0x208AFA91 + .4byte 0xD23A2025 + .4byte 0x662C208E + .4byte 0xC08DDB3A + .asciz " %f ... error!\n" .global $$250131 $$250131: - .incbin "baserom.dol", 0x457F28, 0x48 + .4byte 0x5B546573 + .4byte 0x745F6674 + .4byte 0x5D208AFA + .4byte 0x91D23A20 + .4byte 0x25662C20 + .4byte 0x8EC08DDB + .4byte 0x3A202566 + .4byte 0x207C208C + .4byte 0xEB8DB73D + .4byte 0x25662C20 + .4byte 0x8B969765 + .4byte 0x8CEB8DB7 + .asciz "= +-%f ... error!\n" + .balign 4 + .4byte 0 .global $$250134 $$250134: - .incbin "baserom.dol", 0x457F70, 0x10 + .asciz "Dump(int) : %d\n" .global $$250137 $$250137: - .incbin "baserom.dol", 0x457F80, 0x18 + .asciz "Dump(float) : %f\n" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250075 $$250075: - .incbin "baserom.dol", 0x493928, 0x4 + .4byte 0 .global $$250140 $$250140: - .incbin "baserom.dol", 0x49392C, 0x4 + .4byte 0x25730000 .global $$250145 $$250145: - .incbin "baserom.dol", 0x493930, 0x8 + .4byte 0x25730A00 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250114 $$250114: - .incbin "baserom.dol", 0x49A720, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/NandThread.s b/asm/src/NandThread.s index 5c11c612..1c1a75f9 100644 --- a/asm/src/NandThread.s +++ b/asm/src/NandThread.s @@ -1647,77 +1647,140 @@ lbl_801D3020: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global SaveFiles__4nand SaveFiles__4nand: - .incbin "baserom.dol", 0x410ED0, 0xB8 + .4byte 0 + .4byte 0x0000F0A0 + .4byte 0x8045D2B8 + .4byte 0x00000001 + .4byte 0x000007D8 + .4byte 0x8045D2C4 + .4byte 0x00000001 + .4byte 0x00071C00 + .4byte 0x8045D2D4 + .4byte 0x00000001 + .4byte 0x00071C00 + .4byte 0x8045D2E0 + .4byte 0x00000001 + .4byte 0x00071C00 + .4byte 0x8045D2EC + .4byte 0x00000002 + .4byte 0x00002000 + .4byte 0x8045D2F8 + .4byte 0x00000002 + .4byte 0x00002040 + .4byte 0x8045D308 + .4byte 0x00000002 + .4byte 0x00002020 + .4byte 0x8045D318 + .4byte 0x00000002 + .4byte 0x00008020 + .4byte 0x8045D324 + .4byte 0x00000002 + .4byte 0x00004000 + .4byte 0x8045D334 + .4byte 0x00000002 + .4byte 0x0000F788 + .4byte 0x8045D340 + .4byte 0x00000002 + .4byte 0x00011788 + .4byte 0x8045D350 + .4byte 0x00000002 + .4byte 0x00004260 + .4byte 0x8045D360 + .4byte 0x00000002 + .4byte 0x0005FD20 + .4byte 0x8045D370 + .4byte 0x00000002 + .4byte 0x00065D20 + .4byte 0x8045D37C + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249991 $$249991: - .incbin "baserom.dol", 0x4593B8, 0xC + .asciz "banner.bin" + .balign 4 .global $$249992 $$249992: - .incbin "baserom.dol", 0x4593C4, 0x10 + .asciz "savedata.dat" + .balign 4 .global $$249993 $$249993: - .incbin "baserom.dol", 0x4593D4, 0xC + .asciz "ghost1.dat" + .balign 4 .global $$249994 $$249994: - .incbin "baserom.dol", 0x4593E0, 0xC + .asciz "ghost2.dat" + .balign 4 .global $$249995 $$249995: - .incbin "baserom.dol", 0x4593EC, 0xC + .asciz "ghost3.dat" + .balign 4 .global $$249996 $$249996: - .incbin "baserom.dol", 0x4593F8, 0x10 + .asciz "GB_kby2_sdat" + .balign 4 .global $$249997 $$249997: - .incbin "baserom.dol", 0x459408, 0x10 + .asciz "FC_yume_sdat" + .balign 4 .global $$249998 $$249998: - .incbin "baserom.dol", 0x459418, 0xC + .asciz "SF_sdx_sdat" .global $$249999 $$249999: - .incbin "baserom.dol", 0x459424, 0x10 + .asciz "SF_kby3_sdat" + .balign 4 .global $$250000 $$250000: - .incbin "baserom.dol", 0x459434, 0xC + .asciz "64_k64_sdat" .global $$250001 $$250001: - .incbin "baserom.dol", 0x459440, 0x10 + .asciz "GB_kby1_qdat" + .balign 4 .global $$250002 $$250002: - .incbin "baserom.dol", 0x459450, 0x10 + .asciz "GB_kby2_qdat" + .balign 4 .global $$250003 $$250003: - .incbin "baserom.dol", 0x459460, 0x10 + .asciz "FC_yume_qdat" + .balign 4 .global $$250004 $$250004: - .incbin "baserom.dol", 0x459470, 0xC + .asciz "SF_sdx_qdat" .global $$250005 $$250005: - .incbin "baserom.dol", 0x45947C, 0x10 + .asciz "SF_kby3_qdat" + .balign 4 .global $$251580 $$251580: - .incbin "baserom.dol", 0x45948C, 0x14 + .asciz "nand/Banner.JP.bin" + .balign 4 .global $$251581 $$251581: - .incbin "baserom.dol", 0x4594A0, 0x14 + .asciz "nand/Banner.US.bin" + .balign 4 .global $$251582 $$251582: - .incbin "baserom.dol", 0x4594B4, 0x14 + .asciz "nand/Banner.EU.bin" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249989 $$249989: - .incbin "baserom.dol", 0x493A18, 0x8 + .asciz "/tmp" + .balign 4 .global TMP_DIRECTORY__4nand TMP_DIRECTORY__4nand: - .incbin "baserom.dol", 0x493A20, 0x4 + .4byte 0x80557638 .global $$251560 $$251560: - .incbin "baserom.dol", 0x493A24, 0x8 + .asciz "Nand" + .balign 4 .global $$251583 $$251583: - .incbin "baserom.dol", 0x493A2C, 0x4 + .4byte 0 .global $$251705 $$251705: - .incbin "baserom.dol", 0x493A30, 0x8 + .asciz "%s/%s" + .balign 4 diff --git a/asm/src/News.s b/asm/src/News.s index 99e64870..3cfd4d16 100644 --- a/asm/src/News.s +++ b/asm/src/News.s @@ -592,67 +592,98 @@ lbl_8020D2BC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global IS_LARGE__Q33scn7history18$$2unnamed$$2News_cpp$$2 IS_LARGE__Q33scn7history18$$2unnamed$$2News_cpp$$2: - .incbin "baserom.dol", 0x411C88, 0x18 + .4byte 0x01000000 + .4byte 0x01010001 + .4byte 0x00000100 + .4byte 0x01010101 + .4byte 0x00010001 + .4byte 0x01010000 .global SHOW_DECORATION__Q33scn7history18$$2unnamed$$2News_cpp$$2 SHOW_DECORATION__Q33scn7history18$$2unnamed$$2News_cpp$$2: - .incbin "baserom.dol", 0x411CA0, 0x18 + .4byte 0 + .4byte 0x01000001 + .4byte 0 + .4byte 0x01010000 + .4byte 0x00000001 + .4byte 0x01010000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253381 $$253381: - .incbin "baserom.dol", 0x45D460, 0x10 + .asciz "history/Main" + .balign 4 .global $$253383 $$253383: - .incbin "baserom.dol", 0x45D470, 0x14 + .asciz "history/NewsIcon" + .balign 4 .global $$253385 $$253385: - .incbin "baserom.dol", 0x45D484, 0xC + .asciz "HardPicture" .global $$253386 $$253386: - .incbin "baserom.dol", 0x45D490, 0xC + .asciz "HardPicN" + .balign 4 .global $$253508 $$253508: - .incbin "baserom.dol", 0x45D49C, 0x10 + .asciz "PictureSmall" + .balign 4 .global $$253509 $$253509: - .incbin "baserom.dol", 0x45D4AC, 0x10 + .asciz "PictureLarge" + .balign 4 .global $$253513 $$253513: - .incbin "baserom.dol", 0x45D4BC, 0x14 + .asciz "NewsTitleBefore1991" .global $$253514 $$253514: - .incbin "baserom.dol", 0x45D4D0, 0xC + .asciz "NewsTitle" + .balign 4 .global $$253516 $$253516: - .incbin "baserom.dol", 0x45D4DC, 0x44 + .asciz "Title_Shadow" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253382 $$253382: - .incbin "baserom.dol", 0x494990, 0x8 + .asciz "News" + .balign 4 .global $$253384 $$253384: - .incbin "baserom.dol", 0x494998, 0x8 + .asciz "Wait" + .balign 4 .global $$253510 $$253510: - .incbin "baserom.dol", 0x4949A0, 0x8 + .asciz "StarN" + .balign 4 .global $$253511 $$253511: - .incbin "baserom.dol", 0x4949A8, 0x8 + .asciz "Text01" + .balign 4 .global $$253512 $$253512: - .incbin "baserom.dol", 0x4949B0, 0x8 + .asciz "News%d" + .balign 4 .global $$253515 $$253515: - .incbin "baserom.dol", 0x4949B8, 0x8 + .asciz "Title" + .balign 4 .global $$253528 $$253528: - .incbin "baserom.dol", 0x4949C0, 0x8 + .asciz "Start" + .balign 4 .global $$253532 $$253532: - .incbin "baserom.dol", 0x4949C8, 0x8 + .4byte 0x456E6400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253533 $$253533: - .incbin "baserom.dol", 0x49AC18, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/NextArrowPanel.s b/asm/src/NextArrowPanel.s index 8d19d5d3..88da6f97 100644 --- a/asm/src/NextArrowPanel.s +++ b/asm/src/NextArrowPanel.s @@ -324,56 +324,80 @@ lbl_803AFACC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253080 $$253080: - .incbin "baserom.dol", 0x41BED8, 0x10 + .4byte 0x8055B680 + .4byte 0x8055B688 + .4byte 0x8055B690 + .4byte 0x8055B694 .global $$253090 $$253090: - .incbin "baserom.dol", 0x41BEE8, 0x10 + .4byte 0x8055B680 + .4byte 0x8055B688 + .4byte 0x8055B690 + .4byte 0x8055B694 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253551 $$253551: - .incbin "baserom.dol", 0x48C098, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$253552 $$253552: - .incbin "baserom.dol", 0x48C0A8, 0x10 + .asciz "NextArrowBase" + .balign 4 .global $$253553 $$253553: - .incbin "baserom.dol", 0x48C0B8, 0x40 + .asciz "NextArrow" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253076 $$253076: - .incbin "baserom.dol", 0x497A60, 0x8 + .asciz "RightN" + .balign 4 .global $$253077 $$253077: - .incbin "baserom.dol", 0x497A68, 0x8 + .asciz "LeftN" + .balign 4 .global $$253078 $$253078: - .incbin "baserom.dol", 0x497A70, 0x4 + .4byte 0x55704E00 .global $$253079 $$253079: - .incbin "baserom.dol", 0x497A74, 0x8 + .asciz "DownN" + .balign 4 .global $$253554 $$253554: - .incbin "baserom.dol", 0x497A7C, 0x8 + .asciz "RightN" + .balign 4 .global $$253555 $$253555: - .incbin "baserom.dol", 0x497A84, 0x8 + .asciz "LeftN" + .balign 4 .global $$253556 $$253556: - .incbin "baserom.dol", 0x497A8C, 0x4 + .4byte 0x55704E00 .global $$253557 $$253557: - .incbin "baserom.dol", 0x497A90, 0x8 + .asciz "DownN" + .balign 4 .global $$253599 $$253599: - .incbin "baserom.dol", 0x497A98, 0x8 + .asciz "Wait" + .balign 4 .global $$253600 $$253600: - .incbin "baserom.dol", 0x497AA0, 0x8 + .asciz "StartR" + .balign 4 .global $$253601 $$253601: - .incbin "baserom.dol", 0x497AA8, 0x8 + .asciz "WaitR" + .balign 4 .global $$253612 $$253612: - .incbin "baserom.dol", 0x497AB0, 0x8 + .asciz "EndR" + .balign 4 diff --git a/asm/src/NodeAttach.s b/asm/src/NodeAttach.s index ba150957..2b21c29a 100644 --- a/asm/src/NodeAttach.s +++ b/asm/src/NodeAttach.s @@ -349,7 +349,7 @@ setScale__Q43scn4step4hero10NodeAttachFf: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256190 $$256190: - .incbin "baserom.dol", 0x49D888, 0x4 + .4byte 0x3F800000 .global $$256194 $$256194: - .incbin "baserom.dol", 0x49D88C, 0x4 + .4byte 0 diff --git a/asm/src/NodeDesc.s b/asm/src/NodeDesc.s index 7a09c196..2a332c66 100644 --- a/asm/src/NodeDesc.s +++ b/asm/src/NodeDesc.s @@ -75,4 +75,5 @@ lbl_801D80F8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251991 $$251991: - .incbin "baserom.dol", 0x49A7D0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/NodeLocalMtx.s b/asm/src/NodeLocalMtx.s index c71ee681..a2d99f28 100644 --- a/asm/src/NodeLocalMtx.s +++ b/asm/src/NodeLocalMtx.s @@ -108,4 +108,5 @@ setCalcOp__Q23g3d12NodeLocalMtxFQ23g3d18NodeLocalMtxCalcOp: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251380 $$251380: - .incbin "baserom.dol", 0x49A1D8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Nururi.s b/asm/src/Nururi.s index 8c6ffe24..3a00f487 100644 --- a/asm/src/Nururi.s +++ b/asm/src/Nururi.s @@ -961,64 +961,69 @@ mode__Q43scn4step4hero6NururiFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26nururi6Nururi __vt__Q26nururi6Nururi: - .incbin "baserom.dol", 0x4594C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801D3510 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249890 $$249890: - .incbin "baserom.dol", 0x49A798, 0x4 + .4byte 0 .global $$249939 $$249939: - .incbin "baserom.dol", 0x49A79C, 0x4 + .4byte 0x3F000000 .global $$249952 $$249952: - .incbin "baserom.dol", 0x49A7A0, 0x4 + .4byte 0xBF800000 .global $$249953 $$249953: - .incbin "baserom.dol", 0x49A7A4, 0x4 + .4byte 0x3F800000 .global $$249988 $$249988: - .incbin "baserom.dol", 0x49A7A8, 0x8 + .4byte 0x3727C5AC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250754 $$250754: - .incbin "baserom.dol", 0x49BA08, 0x4 + .4byte 0 .global $$250755 $$250755: - .incbin "baserom.dol", 0x49BA0C, 0x4 + .4byte 0x40000000 .global $$250789 $$250789: - .incbin "baserom.dol", 0x49BA10, 0x4 + .4byte 0x3DCCCCCD .global $$250790 $$250790: - .incbin "baserom.dol", 0x49BA14, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251445 $$251445: - .incbin "baserom.dol", 0x49D890, 0x4 + .4byte 0 .global $$251446 $$251446: - .incbin "baserom.dol", 0x49D894, 0x4 + .4byte 0x3F800000 .global $$251447 $$251447: - .incbin "baserom.dol", 0x49D898, 0x4 + .4byte 0x3F19999A .global $$251467 $$251467: - .incbin "baserom.dol", 0x49D89C, 0x4 + .4byte 0x3DCCCCCD .global $$251468 $$251468: - .incbin "baserom.dol", 0x49D8A0, 0x4 + .4byte 0x3D4CCCCD .global $$251526 $$251526: - .incbin "baserom.dol", 0x49D8A4, 0x4 + .4byte 0x3F8CCCCD .global $$251527 $$251527: - .incbin "baserom.dol", 0x49D8A8, 0x4 + .4byte 0x3FD9999A .global $$251528 $$251528: - .incbin "baserom.dol", 0x49D8AC, 0x4 + .4byte 0x3F733333 .global $$251529 $$251529: - .incbin "baserom.dol", 0x49D8B0, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 diff --git a/asm/src/ObjColl.s b/asm/src/ObjColl.s index e4377f5c..69427482 100644 --- a/asm/src/ObjColl.s +++ b/asm/src/ObjColl.s @@ -907,25 +907,25 @@ onObjStopFinished__Q43scn4step4hero7ObjCollFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257554 $$257554: - .incbin "baserom.dol", 0x49D8B8, 0x4 + .4byte 0 .global $$257555 $$257555: - .incbin "baserom.dol", 0x49D8BC, 0x4 + .4byte 0x3F000000 .global $$257556 $$257556: - .incbin "baserom.dol", 0x49D8C0, 0x4 + .4byte 0x3F400000 .global $$257604 $$257604: - .incbin "baserom.dol", 0x49D8C4, 0x4 + .4byte 0x3ECCCCCD .global $$257615 $$257615: - .incbin "baserom.dol", 0x49D8C8, 0x4 + .4byte 0x3E4CCCCD .global $$257616 $$257616: - .incbin "baserom.dol", 0x49D8CC, 0x4 + .4byte 0x3E800000 .global $$257617 $$257617: - .incbin "baserom.dol", 0x49D8D0, 0x4 + .4byte 0xBE4CCCCD .global $$257622 $$257622: - .incbin "baserom.dol", 0x49D8D4, 0x4 + .4byte 0x3F4CCCCD diff --git a/asm/src/ObjCollReact.s b/asm/src/ObjCollReact.s index 3cca1456..664d36ef 100644 --- a/asm/src/ObjCollReact.s +++ b/asm/src/ObjCollReact.s @@ -2921,150 +2921,327 @@ lbl_803D7C2C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x4124F0, 0x64 + .4byte 0x00000072 + .4byte 0x00000071 + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x0000007B + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x0000007C + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000072 + .4byte 0x00000076 .global T_HITSE_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITSE_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x412554, 0x3C + .4byte 0x000001E5 + .4byte 0x000001E5 + .4byte 0x000001EB + .4byte 0x000001E9 + .4byte 0x000001E8 + .4byte 0x000001E7 + .4byte 0x0000016F + .4byte 0x000001A4 + .4byte 0x000001A4 + .4byte 0x000001EA + .4byte 0x000001D8 + .4byte 0x000001E8 + .4byte 0x000001A5 + .4byte 0x00000257 + .4byte 0x000001E3 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x414480, 0x64 + .4byte 0x00000072 + .4byte 0x00000071 + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x0000007B + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x00000072 + .4byte 0x0000007C + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000072 + .4byte 0x00000076 .global T_HITSE_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITSE_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x4144E4, 0x3C + .4byte 0x000001E5 + .4byte 0x000001E5 + .4byte 0x000001EB + .4byte 0x000001E9 + .4byte 0x000001E8 + .4byte 0x000001E7 + .4byte 0x0000016F + .4byte 0x000001A4 + .4byte 0x000001A4 + .4byte 0x000001EA + .4byte 0x000001D8 + .4byte 0x000001D9 + .4byte 0x000001A5 + .4byte 0x00000257 + .4byte 0x000001E3 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x416288, 0x64 + .4byte 0x00000077 + .4byte 0x00000071 + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x0000007B + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x00000077 + .4byte 0x0000007C + .4byte 0x00000073 + .4byte 0x00000075 + .4byte 0x00000075 + .4byte 0x00000078 + .4byte 0x00000077 + .4byte 0x00000076 .global T_HITSE_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITSE_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x4162EC, 0x3C + .4byte 0x000000A2 + .4byte 0x000000A2 + .4byte 0x000001EB + .4byte 0x000000A5 + .4byte 0x000000A4 + .4byte 0x000000A3 + .4byte 0x0000016F + .4byte 0x000001A4 + .4byte 0x000001A4 + .4byte 0x000000A6 + .4byte 0x000001D8 + .4byte 0x000000A4 + .4byte 0x000001A5 + .4byte 0x000000A2 + .4byte 0x000000AC .section .data, "wa" # 0x80421040 - 0x80496700 .global T_DAMAGERATE_BY_PLAYERCOUNT__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_DAMAGERATE_BY_PLAYERCOUNT__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x460770, 0x18 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F4CCCCD + .4byte 0x3F400000 + .asciz "?333" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1 __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: - .incbin "baserom.dol", 0x46E768, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028C028 ;# ptr + .4byte 0x8028BF88 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46E778, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028C024 ;# ptr + .4byte 0x8028BFA8 ;# ptr .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46E788, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028C020 ;# ptr + .4byte 0x8028BFC4 ;# ptr .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46E798, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028C01C ;# ptr + .4byte 0x8028BFE0 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46E7A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8028C018 ;# ptr + .4byte 0x8028BFFC ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481258, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350838 + .4byte 0x803506F4 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481268, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350834 + .4byte 0x80350710 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481278, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350830 + .4byte 0x8035072C .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481288, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035082C + .4byte 0x80350748 .global __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1 __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1: - .incbin "baserom.dol", 0x481298, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350828 + .4byte 0x803506D4 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350824 + .4byte 0x80350768 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350820 + .4byte 0x80350784 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035081C + .4byte 0x803507A0 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350818 + .4byte 0x803507BC .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350814 + .4byte 0x803507D8 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4812F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80350810 + .4byte 0x803507F4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAMAGERATE_BY_PILE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_DAMAGERATE_BY_PILE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: - .incbin "baserom.dol", 0x4952C0, 0x8 + .4byte 0x3F800000 + .4byte 0x3F400000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256339 $$256339: - .incbin "baserom.dol", 0x495A10, 0x8 + .4byte 0x00000001 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257720 $$257720: - .incbin "baserom.dol", 0x49AEB0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257778 $$257778: - .incbin "baserom.dol", 0x49AEB8, 0x4 + .4byte 0 .global $$257779 $$257779: - .incbin "baserom.dol", 0x49AEBC, 0x4 + .4byte 0x3727C5AC .global $$257780 $$257780: - .incbin "baserom.dol", 0x49AEC0, 0x8 + .4byte 0x3F400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258198 $$258198: - .incbin "baserom.dol", 0x49BA18, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$258310 $$258310: - .incbin "baserom.dol", 0x49BA20, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258416 $$258416: - .incbin "baserom.dol", 0x49BA28, 0x4 + .4byte 0x3727C5AC .global $$258417 $$258417: - .incbin "baserom.dol", 0x49BA2C, 0x4 + .4byte 0x3F666666 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260300 $$260300: - .incbin "baserom.dol", 0x49D8D8, 0x4 + .4byte 0x3F800000 .global $$260301 $$260301: - .incbin "baserom.dol", 0x49D8DC, 0x4 + .4byte 0x3727C5AC .global $$260302 $$260302: - .incbin "baserom.dol", 0x49D8E0, 0x4 + .4byte 0 .global $$260303 $$260303: - .incbin "baserom.dol", 0x49D8E4, 0x4 + .4byte 0xBE800000 .global $$260304 $$260304: - .incbin "baserom.dol", 0x49D8E8, 0x8 + .4byte 0xBDCCCCCD + .4byte 0 .global $$260307 $$260307: - .incbin "baserom.dol", 0x49D8F0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$260308 $$260308: - .incbin "baserom.dol", 0x49D8F8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$260390 $$260390: - .incbin "baserom.dol", 0x49D900, 0x4 + .4byte 0x3F000000 .global $$260391 $$260391: - .incbin "baserom.dol", 0x49D904, 0x4 + .4byte 0x3A83126F .global $$260392 $$260392: - .incbin "baserom.dol", 0x49D908, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 diff --git a/asm/src/ObjInfoImpl.s b/asm/src/ObjInfoImpl.s index e291f441..b66a3e9f 100644 --- a/asm/src/ObjInfoImpl.s +++ b/asm/src/ObjInfoImpl.s @@ -345,40 +345,81 @@ state__Q43scn4step4hero11ObjInfoImplCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss11ObjInfoImpl __vt__Q43scn4step4boss11ObjInfoImpl: - .incbin "baserom.dol", 0x460788, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x80233610 ;# ptr + .4byte 0x80233690 ;# ptr + .4byte 0x802336B8 ;# ptr + .4byte 0x802336E0 ;# ptr + .4byte 0x802336E8 ;# ptr + .4byte 0x802336F0 ;# ptr + .4byte 0x80233718 ;# ptr + .4byte 0x80233720 ;# ptr + .4byte 0x80233748 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255463 $$255463: - .incbin "baserom.dol", 0x481308, 0x14 + .4byte 0x834A815B + .4byte 0x83728342 + .4byte 0x28837383 + .4byte 0x93834E29 + .4byte 0 .global $$255464 $$255464: - .incbin "baserom.dol", 0x48131C, 0x10 + .4byte 0x834A815B + .4byte 0x83728342 + .4byte 0x2889A929 + .4byte 0 .global $$255465 $$255465: - .incbin "baserom.dol", 0x48132C, 0x10 + .4byte 0x834A815B + .4byte 0x83728342 + .4byte 0x2890C229 + .4byte 0 .global $$255466 $$255466: - .incbin "baserom.dol", 0x48133C, 0x10 + .4byte 0x834A815B + .4byte 0x83728342 + .4byte 0x2897CE29 + .4byte 0 .global $$255467 $$255467: - .incbin "baserom.dol", 0x48134C, 0xC + .4byte 0x8381835E + .4byte 0x83698343 + .4byte 0x83670000 .global $$255469 $$255469: - .incbin "baserom.dol", 0x481358, 0xC + .4byte 0x838F8368 + .4byte 0x838B8366 + .4byte 0x83420000 .global __vt__Q43scn4step4hero11ObjInfoImpl __vt__Q43scn4step4hero11ObjInfoImpl: - .incbin "baserom.dol", 0x481364, 0x2C + .4byte 0 + .4byte 0 + .4byte 0x8035088C + .4byte 0x8035090C + .4byte 0x80350A04 + .4byte 0x80350A2C + .4byte 0x80350A34 + .4byte 0x80350A3C + .4byte 0x80350A64 + .4byte 0x80350A6C + .4byte 0x80350A94 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254747 $$254747: - .incbin "baserom.dol", 0x4952C8, 0x8 + .4byte 0x837B8358 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255468 $$255468: - .incbin "baserom.dol", 0x496DF8, 0x8 + .4byte 0x83668366 + .4byte 0x83660000 .global $$255470 $$255470: - .incbin "baserom.dol", 0x496E00, 0x8 + .4byte 0x96A292E8 + .4byte 0x8B600000 diff --git a/asm/src/ObjStop.s b/asm/src/ObjStop.s index 98bdfe6b..490cc5e4 100644 --- a/asm/src/ObjStop.s +++ b/asm/src/ObjStop.s @@ -895,24 +895,59 @@ onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss7ObjStop __vt__Q43scn4step4boss7ObjStop: - .incbin "baserom.dol", 0x4607B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802337D4 ;# ptr + .4byte 0x80233878 ;# ptr + .4byte 0x802338BC ;# ptr + .4byte 0x80233914 ;# ptr + .4byte 0x80233978 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy7ObjStop __vt__Q43scn4step5enemy7ObjStop: - .incbin "baserom.dol", 0x46E7B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8028C090 ;# ptr + .4byte 0x8028C114 ;# ptr + .4byte 0x8028C164 ;# ptr + .4byte 0x8028C1C8 ;# ptr + .4byte 0x8028C208 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero7ObjStop __vt__Q43scn4step4hero7ObjStop: - .incbin "baserom.dol", 0x481390, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80350B24 + .4byte 0x80350C40 + .4byte 0x80350C84 + .4byte 0x80350CDC + .4byte 0x80350D40 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item7ObjStop __vt__Q43scn4step4item7ObjStop: - .incbin "baserom.dol", 0x48DFE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803C4E90 + .4byte 0x803C4F14 + .4byte 0x803C4F58 + .4byte 0x803C4FB0 + .4byte 0x803C5008 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon7ObjStop __vt__Q43scn4step6weapon7ObjStop: - .incbin "baserom.dol", 0x48F8E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803D7CB8 + .4byte 0x803D7D44 + .4byte 0x803D7D88 + .4byte 0x803D7DE0 + .4byte 0x803D7E3C + .4byte 0 diff --git a/asm/src/OperatorNewDelete.s b/asm/src/OperatorNewDelete.s index dd71129c..7b855922 100644 --- a/asm/src/OperatorNewDelete.s +++ b/asm/src/OperatorNewDelete.s @@ -121,7 +121,7 @@ __sinit_$$3OperatorNewDelete_cpp: /* 801BF75C 001BB59C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402438, 0x4 + .4byte 0x801BF734 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_allocator__31$$2unnamed$$2OperatorNewDelete_cpp$$2 diff --git a/asm/src/OrderUtil.s b/asm/src/OrderUtil.s index 8a1f2f8e..a9647fb3 100644 --- a/asm/src/OrderUtil.s +++ b/asm/src/OrderUtil.s @@ -42,15 +42,31 @@ toMoveRate__Q53scn4step7gimmick13movegroupctrl9OrderUtilFUc: .section .data, "wa" # 0x80421040 - 0x80496700 .global t_SEList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2 t_SEList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2: - .incbin "baserom.dol", 0x47DB80, 0x28 + .4byte 0 + .4byte 0x00000261 + .4byte 0x00000260 + .4byte 0x0000025F + .4byte 0x0000025E + .4byte 0x0000025D + .4byte 0x0000025C + .4byte 0x0000025B + .4byte 0x00000259 + .4byte 0x0000025A .global t_QuakeList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2 t_QuakeList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2: - .incbin "baserom.dol", 0x47DBA8, 0x18 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248798 $$248798: - .incbin "baserom.dol", 0x49D4E0, 0x8 + .4byte 0x3C23D70A + .4byte 0 .global $$248800 $$248800: - .incbin "baserom.dol", 0x49D4E8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/Otachidai.s b/asm/src/Otachidai.s index e9e10add..0e49779f 100644 --- a/asm/src/Otachidai.s +++ b/asm/src/Otachidai.s @@ -195,26 +195,29 @@ mfCreateMoveLand__Q53scn4step7gimmick9otachidai9OtachidaiFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253405 $$253405: - .incbin "baserom.dol", 0x47DC90, 0x18 + .asciz "step/gimmick/Otachidai" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253406 $$253406: - .incbin "baserom.dol", 0x496C38, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253404 $$253404: - .incbin "baserom.dol", 0x49D510, 0x4 + .4byte 0 .global $$253427 $$253427: - .incbin "baserom.dol", 0x49D514, 0x4 + .4byte 0x40A00000 .global $$253443 $$253443: - .incbin "baserom.dol", 0x49D518, 0x4 + .4byte 0x3F000000 .global $$253444 $$253444: - .incbin "baserom.dol", 0x49D51C, 0x4 + .4byte 0x3F800000 .global $$253445 $$253445: - .incbin "baserom.dol", 0x49D520, 0x8 + .4byte 0x3F400000 + .4byte 0 diff --git a/asm/src/Package.s b/asm/src/Package.s index 69fc6b1b..48d65ea1 100644 --- a/asm/src/Package.s +++ b/asm/src/Package.s @@ -937,70 +937,101 @@ __sinit_$$3Package_cpp: /* 8020E010 00209E50 4B EB 00 B0 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40245C, 0x4 + .4byte 0x8020DFFC ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253252 $$253252: - .incbin "baserom.dol", 0x45D520, 0x10 + .asciz "history/%s/%s" + .balign 4 .global $$253253 $$253253: - .incbin "baserom.dol", 0x45D530, 0x10 + .asciz "history/Boxanim" .global $$253255 $$253255: - .incbin "baserom.dol", 0x45D540, 0x18 + .asciz "history/PackageScale" + .balign 4 .global $$253256 $$253256: - .incbin "baserom.dol", 0x45D558, 0x18 + .asciz "history/ShadowScale" + .4byte 0 .global __vt__Q33scn7history7Package __vt__Q33scn7history7Package: - .incbin "baserom.dol", 0x45D570, 0x70 + .4byte 0 + .4byte 0 + .4byte 0x8020D6B0 ;# ptr + .4byte 0x8020DD50 ;# ptr + .4byte 0x800E9D20 ;# ptr + .4byte 0x800E9D30 ;# ptr + .4byte 0x800EC990 ;# ptr + .4byte 0x800EC9A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253254 $$253254: - .incbin "baserom.dol", 0x4949D0, 0x8 + .asciz "TopL" + .balign 4 .global $$253257 $$253257: - .incbin "baserom.dol", 0x4949D8, 0x8 + .asciz "RotYL" + .balign 4 .global $$253258 $$253258: - .incbin "baserom.dol", 0x4949E0, 0x8 + .asciz "ScaleL" + .balign 4 .global $$253259 $$253259: - .incbin "baserom.dol", 0x4949E8, 0x8 + .asciz "Model" + .balign 4 .global $$253368 $$253368: - .incbin "baserom.dol", 0x4949F0, 0x8 + .asciz "Vacuum" + .balign 4 .global $$253369 $$253369: - .incbin "baserom.dol", 0x4949F8, 0x8 + .asciz "Vacuum2" .global $$253383 $$253383: - .incbin "baserom.dol", 0x494A00, 0x8 + .asciz "Shake" + .balign 4 .global $$253427 $$253427: - .incbin "baserom.dol", 0x494A08, 0x8 + .asciz "BoxM" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253265 $$253265: - .incbin "baserom.dol", 0x49AC20, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$253278 $$253278: - .incbin "baserom.dol", 0x49AC28, 0x4 + .4byte 0 .global $$253410 $$253410: - .incbin "baserom.dol", 0x49AC2C, 0x4 + .4byte 0x3F800000 .global $$253411 $$253411: - .incbin "baserom.dol", 0x49AC30, 0x4 + .4byte 0x3ECCCCCD .global $$253466 $$253466: - .incbin "baserom.dol", 0x49AC34, 0x4 + .4byte 0x3E4CCCCD .global $$253467 $$253467: - .incbin "baserom.dol", 0x49AC38, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global BIG_SHADOW_OFFSET__Q33scn7history21$$2unnamed$$2Package_cpp$$2 diff --git a/asm/src/PackageButtonContent.s b/asm/src/PackageButtonContent.s index d591ff8e..f3f59f54 100644 --- a/asm/src/PackageButtonContent.s +++ b/asm/src/PackageButtonContent.s @@ -107,90 +107,164 @@ lbl_80218118: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251550 $$251550: - .incbin "baserom.dol", 0x45EB78, 0xC + .asciz "KAvalancheN" .global $$251553 $$251553: - .incbin "baserom.dol", 0x45EB84, 0xC + .asciz "KPinballN" + .balign 4 .global $$251555 $$251555: - .incbin "baserom.dol", 0x45EB90, 0xC + .asciz "KAirRideN" + .balign 4 .global $$251559 $$251559: - .incbin "baserom.dol", 0x45EB9C, 0xC + .asciz "KDreamDXN" + .balign 4 .global $$251560 $$251560: - .incbin "baserom.dol", 0x45EBA8, 0xC + .asciz "KMirrorN" + .balign 4 .global $$251565 $$251565: - .incbin "baserom.dol", 0x45EBB4, 0xC + .asciz "KAtsumeteN" + .balign 4 .global PANES__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2 PANES__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45EBC0, 0x58 + .4byte 0x805589F0 + .4byte 0x805589F8 + .4byte 0x805589FC + .4byte 0x80558A00 + .4byte 0x80558A04 + .4byte 0x80462A78 + .4byte 0x80558A10 + .4byte 0x80558A18 + .4byte 0x80462A84 + .4byte 0x80558A20 + .4byte 0x80462A90 + .4byte 0x80558A28 + .4byte 0x80558A30 + .4byte 0x80558A38 + .4byte 0x80462A9C + .4byte 0x80462AA8 + .4byte 0x80558A40 + .4byte 0x80558A48 + .4byte 0x80558A50 + .4byte 0x80558A58 + .4byte 0x80462AB4 + .4byte 0x80558A60 .global TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2 TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45EC18, 0x74 + .4byte 0x80558A68 + .4byte 0x805589F8 + .4byte 0x80558A10 + .4byte 0x80462A84 + .4byte 0x80558A68 + .4byte 0x80558A18 + .4byte 0x80462A78 + .4byte 0x805589FC + .4byte 0x80558A58 + .4byte 0x805589F0 + .4byte 0x80558A20 + .4byte 0x80558A00 + .4byte 0x80558A68 + .4byte 0x80558A68 + .4byte 0x80558A04 + .4byte 0x80558A50 + .4byte 0x80462A9C + .4byte 0x805589F8 + .4byte 0x80462A90 + .4byte 0x80462AA8 + .4byte 0x80558A38 + .4byte 0x80558A40 + .4byte 0x80558A68 + .4byte 0x80558A30 + .4byte 0x80558A68 + .4byte 0x80558A48 + .4byte 0x80462AB4 + .4byte 0x80558A28 + .4byte 0x80558A60 .global $$252003 $$252003: - .incbin "baserom.dol", 0x45EC8C, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252004 $$252004: - .incbin "baserom.dol", 0x45EC9C, 0x44 + .asciz "ProductPackage" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: - .incbin "baserom.dol", 0x494DD0, 0x8 + .asciz "KSDXN" + .balign 4 .global $$251546 $$251546: - .incbin "baserom.dol", 0x494DD8, 0x4 + .4byte 0x4B314E00 .global $$251547 $$251547: - .incbin "baserom.dol", 0x494DDC, 0x4 + .4byte 0x4B324E00 .global $$251548 $$251548: - .incbin "baserom.dol", 0x494DE0, 0x4 + .4byte 0x4B334E00 .global $$251549 $$251549: - .incbin "baserom.dol", 0x494DE4, 0xC + .asciz "K64N" + .balign 4 + .4byte 0 .global $$251551 $$251551: - .incbin "baserom.dol", 0x494DF0, 0x8 + .asciz "KDreamN" .global $$251552 $$251552: - .incbin "baserom.dol", 0x494DF8, 0x8 + .asciz "KBallN" + .balign 4 .global $$251554 $$251554: - .incbin "baserom.dol", 0x494E00, 0x8 + .asciz "KKiraN" + .balign 4 .global $$251556 $$251556: - .incbin "baserom.dol", 0x494E08, 0x8 + .asciz "KWiiN" + .balign 4 .global $$251557 $$251557: - .incbin "baserom.dol", 0x494E10, 0x8 + .asciz "KUSDXN" + .balign 4 .global $$251558 $$251558: - .incbin "baserom.dol", 0x494E18, 0x8 + .asciz "KTouchN" .global $$251561 $$251561: - .incbin "baserom.dol", 0x494E20, 0x8 + .asciz "KDoroN" + .balign 4 .global $$251562 $$251562: - .incbin "baserom.dol", 0x494E28, 0x8 + .asciz "KWoolN" + .balign 4 .global $$251563 $$251563: - .incbin "baserom.dol", 0x494E30, 0x8 + .asciz "KCoroN" + .balign 4 .global $$251564 $$251564: - .incbin "baserom.dol", 0x494E38, 0x8 + .asciz "KBBN" + .balign 4 .global $$251566 $$251566: - .incbin "baserom.dol", 0x494E40, 0x8 + .asciz "KDonutN" .global $$251567 $$251567: - .incbin "baserom.dol", 0x494E48, 0x8 + .asciz "Dummy" + .balign 4 .global $$252005 $$252005: - .incbin "baserom.dol", 0x494E50, 0x8 + .asciz "Unfocus" .global $$252051 $$252051: - .incbin "baserom.dol", 0x494E58, 0x8 + .asciz "Focus" + .balign 4 diff --git a/asm/src/PackageHelp.s b/asm/src/PackageHelp.s index 181b7a58..677371b3 100644 --- a/asm/src/PackageHelp.s +++ b/asm/src/PackageHelp.s @@ -228,30 +228,38 @@ lbl_8020E328: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252155 $$252155: - .incbin "baserom.dol", 0x45D5E0, 0x10 + .asciz "history/Main" + .balign 4 .global $$252156 $$252156: - .incbin "baserom.dol", 0x45D5F0, 0x10 + .asciz "IconAnim" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252157 $$252157: - .incbin "baserom.dol", 0x494A10, 0x8 + .asciz "Icon" + .balign 4 .global $$252158 $$252158: - .incbin "baserom.dol", 0x494A18, 0x8 + .asciz "TopN" + .balign 4 .global $$252200 $$252200: - .incbin "baserom.dol", 0x494A20, 0x8 + .asciz "Start" + .balign 4 .global $$252201 $$252201: - .incbin "baserom.dol", 0x494A28, 0x8 + .asciz "Wait" + .balign 4 .global $$252210 $$252210: - .incbin "baserom.dol", 0x494A30, 0x8 + .asciz "MovieN" + .balign 4 .global $$252211 $$252211: - .incbin "baserom.dol", 0x494A38, 0x4 + .4byte 0x56434E00 .global $$252220 $$252220: - .incbin "baserom.dol", 0x494A3C, 0x4 + .4byte 0x456E6400 diff --git a/asm/src/PackageHelps.s b/asm/src/PackageHelps.s index ebd10774..00e8129c 100644 --- a/asm/src/PackageHelps.s +++ b/asm/src/PackageHelps.s @@ -235,15 +235,19 @@ lbl_8020E65C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252124 $$252124: - .incbin "baserom.dol", 0x45D600, 0x18 + .asciz "history/PackageHelpPos" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252169 $$252169: - .incbin "baserom.dol", 0x494A40, 0x8 + .asciz "Anime" + .balign 4 .global $$252170 $$252170: - .incbin "baserom.dol", 0x494A48, 0x8 + .asciz "Comic" + .balign 4 .global $$252171 $$252171: - .incbin "baserom.dol", 0x494A50, 0x8 + .4byte 0x56430000 + .4byte 0 diff --git a/asm/src/PackageWindow.s b/asm/src/PackageWindow.s index 0f56f199..3029b4a5 100644 --- a/asm/src/PackageWindow.s +++ b/asm/src/PackageWindow.s @@ -2043,154 +2043,233 @@ __sinit_$$3PackageWindow_cpp: /* 80219EA8 00215CE8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402468, 0x4 + .4byte 0x80219E54 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255641 $$255641: - .incbin "baserom.dol", 0x45ECE0, 0x20 + .asciz "history/detail/PackageWindow" + .balign 4 .global $$255642 $$255642: - .incbin "baserom.dol", 0x45ED00, 0x10 + .asciz "history/Detail" + .balign 4 .global $$255643 $$255643: - .incbin "baserom.dol", 0x45ED10, 0x10 + .asciz "PackageWindow" + .balign 4 .global $$255644 $$255644: - .incbin "baserom.dol", 0x45ED20, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$255645 $$255645: - .incbin "baserom.dol", 0x45ED2C, 0xC + .asciz "common/Back" .global $$255646 $$255646: - .incbin "baserom.dol", 0x45ED38, 0xC + .asciz "Rotation" + .balign 4 .global $$255647 $$255647: - .incbin "baserom.dol", 0x45ED44, 0xC + .asciz "Button1N" + .balign 4 .global $$255650 $$255650: - .incbin "baserom.dol", 0x45ED50, 0xC + .asciz "Button2N" + .balign 4 .global $$255652 $$255652: - .incbin "baserom.dol", 0x45ED5C, 0x10 + .asciz "CrossButtonN" + .balign 4 .global $$255653 $$255653: - .incbin "baserom.dol", 0x45ED6C, 0x10 + .asciz "ResetButtonN" + .balign 4 .global $$255655 $$255655: - .incbin "baserom.dol", 0x45ED7C, 0xC + .asciz "BackText" + .balign 4 .global $$255657 $$255657: - .incbin "baserom.dol", 0x45ED88, 0xC + .asciz "RotateReset" .global $$255831 $$255831: - .incbin "baserom.dol", 0x45ED94, 0xC + .asciz "PackageN" + .balign 4 .global $$256044 $$256044: - .incbin "baserom.dol", 0x45EDA0, 0x10 + .asciz "history/%s/%s" + .balign 4 .global $$256102 $$256102: - .incbin "baserom.dol", 0x45EDB0, 0x78 + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219DB0 ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DBC ;# ptr + .4byte 0x80219DBC ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219DBC ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219DBC ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DC8 ;# ptr + .4byte 0x80219DA4 ;# ptr + .4byte 0x80219DD4 ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DE0 ;# ptr + .4byte 0x80219DD4 ;# ptr + .4byte 0x80219DEC ;# ptr + .4byte 0x80219DEC ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DEC ;# ptr + .4byte 0x80219E04 ;# ptr + .4byte 0x80219DF8 ;# ptr + .4byte 0x80219DEC ;# ptr + .4byte 0x80219DF8 ;# ptr + .4byte 0x80219DF8 ;# ptr + .4byte 0 .global __vt__Q43scn7history6detail13PackageWindow __vt__Q43scn7history6detail13PackageWindow: - .incbin "baserom.dol", 0x45EE28, 0xA0 + .4byte 0 + .4byte 0 + .4byte 0x802187C8 ;# ptr + .4byte 0x80218A70 ;# ptr + .4byte 0x800E9D20 ;# ptr + .4byte 0x800E9D30 ;# ptr + .4byte 0x800EC990 ;# ptr + .4byte 0x800EC9A0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255648 $$255648: - .incbin "baserom.dol", 0x494E60, 0x8 + .asciz "Reset" + .balign 4 .global $$255649 $$255649: - .incbin "baserom.dol", 0x494E68, 0x8 + .asciz "Zoom" + .balign 4 .global $$255654 $$255654: - .incbin "baserom.dol", 0x494E70, 0x8 + .asciz "ZoomN" + .balign 4 .global $$255656 $$255656: - .incbin "baserom.dol", 0x494E78, 0x8 + .asciz "Rotate" + .balign 4 .global $$255658 $$255658: - .incbin "baserom.dol", 0x494E80, 0x8 + .asciz "Close" + .balign 4 .global $$255788 $$255788: - .incbin "baserom.dol", 0x494E88, 0x8 + .asciz "BoxM" + .balign 4 .global $$252738 $$252738: - .incbin "baserom.dol", 0x494E90, 0x4 + .4byte 0x3A83126F .global $$255827 $$255827: - .incbin "baserom.dol", 0x494E94, 0x8 + .asciz "PlusN" + .balign 4 .global $$255828 $$255828: - .incbin "baserom.dol", 0x494E9C, 0x8 + .asciz "MinusN" + .balign 4 .global $$255829 $$255829: - .incbin "baserom.dol", 0x494EA4, 0x8 + .asciz "Open" + .balign 4 .global $$255830 $$255830: - .incbin "baserom.dol", 0x494EAC, 0x8 + .asciz "Wait" + .balign 4 .global $$255832 $$255832: - .incbin "baserom.dol", 0x494EB4, 0x8 + .asciz "ScaleL" + .balign 4 .global $$252838 $$252838: - .incbin "baserom.dol", 0x494EBC, 0x4 + .4byte 0x3A83126F .global $$253200 $$253200: - .incbin "baserom.dol", 0x494EC0, 0x4 + .4byte 0x3A83126F .global $$256045 $$256045: - .incbin "baserom.dol", 0x494EC4, 0xC + .asciz "Model" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255615 $$255615: - .incbin "baserom.dol", 0x49ACE8, 0x4 + .4byte 0xFFFFFFFF .global $$255651 $$255651: - .incbin "baserom.dol", 0x49ACEC, 0x4 + .4byte 0x3F800000 .global $$255659 $$255659: - .incbin "baserom.dol", 0x49ACF0, 0x4 + .4byte 0 .global $$255660 $$255660: - .incbin "baserom.dol", 0x49ACF4, 0x4 + .4byte 0x41F00000 .global $$255661 $$255661: - .incbin "baserom.dol", 0x49ACF8, 0x4 + .4byte 0x42340000 .global $$255662 $$255662: - .incbin "baserom.dol", 0x49ACFC, 0x4 + .4byte 0xC2C80000 .global $$255663 $$255663: - .incbin "baserom.dol", 0x49AD00, 0x4 + .4byte 0xC0400000 .global $$255664 $$255664: - .incbin "baserom.dol", 0x49AD04, 0x4 + .4byte 0x42480000 .global $$255929 $$255929: - .incbin "baserom.dol", 0x49AD08, 0x4 + .4byte 0x40A00000 .global $$255930 $$255930: - .incbin "baserom.dol", 0x49AD0C, 0x4 + .4byte 0x3C8EFA35 .global $$255931 $$255931: - .incbin "baserom.dol", 0x49AD10, 0x4 + .4byte 0x3E800000 .global $$255966 $$255966: - .incbin "baserom.dol", 0x49AD14, 0x4 + .4byte 0xBF800000 .global $$255967 $$255967: - .incbin "baserom.dol", 0x49AD18, 0x4 + .4byte 0x3727C5AC .global $$256003 $$256003: - .incbin "baserom.dol", 0x49AD1C, 0x4 + .4byte 0x3FC00000 .global $$256004 $$256004: - .incbin "baserom.dol", 0x49AD20, 0x8 + .4byte 0xBF000000 + .4byte 0 .global $$256048 $$256048: - .incbin "baserom.dol", 0x49AD28, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global INIT_DIR__Q43scn7history6detail27$$2unnamed$$2PackageWindow_cpp$$2 diff --git a/asm/src/PageAbility.s b/asm/src/PageAbility.s index 3496d5d2..2bb4ca42 100644 --- a/asm/src/PageAbility.s +++ b/asm/src/PageAbility.s @@ -211,27 +211,45 @@ lbl_801DC718: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252590 $$252590: - .incbin "baserom.dol", 0x459868, 0x10 + .asciz "AbilityWindow" + .balign 4 .global $$252591 $$252591: - .incbin "baserom.dol", 0x459878, 0x14 + .asciz "lyt/%s.arc.cmpbin" + .balign 4 .global $$252592 $$252592: - .incbin "baserom.dol", 0x45988C, 0x14 + .asciz "lyt/%s.arc.cmp" + .balign 4 + .4byte 0 .global __vt__Q25pause11PageAbility __vt__Q25pause11PageAbility: - .incbin "baserom.dol", 0x4598A0, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x801DC6BC ;# ptr + .4byte 0x801DC64C ;# ptr + .4byte 0x801DC6A8 ;# ptr + .4byte 0x801DC6AC ;# ptr + .4byte 0x801DC6B4 ;# ptr + .4byte 0x801DC6B8 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252593 $$252593: - .incbin "baserom.dol", 0x493C78, 0x8 + .asciz "AbImage" .global $$252594 $$252594: - .incbin "baserom.dol", 0x493C80, 0x8 + .asciz "ImageN" + .balign 4 .global $$252595 $$252595: - .incbin "baserom.dol", 0x493C88, 0x8 + .asciz "AbText" + .balign 4 .global $$252654 $$252654: - .incbin "baserom.dol", 0x493C90, 0x8 + .4byte 0x25733000 + .4byte 0 diff --git a/asm/src/PageCommand.s b/asm/src/PageCommand.s index 3e97a42a..8a6cb32c 100644 --- a/asm/src/PageCommand.s +++ b/asm/src/PageCommand.s @@ -509,54 +509,75 @@ lbl_801DCE4C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252946 $$252946: - .incbin "baserom.dol", 0x4598F0, 0x10 + .asciz "CommandWindow" + .balign 4 .global $$252947 $$252947: - .incbin "baserom.dol", 0x459900, 0xC + .asciz "FrameUpN" + .balign 4 .global $$252948 $$252948: - .incbin "baserom.dol", 0x45990C, 0xC + .asciz "FrameDownN" + .balign 4 .global $$252949 $$252949: - .incbin "baserom.dol", 0x459918, 0xC + .asciz "CommandText" .global $$252950 $$252950: - .incbin "baserom.dol", 0x459924, 0x14 + .asciz "Command%lu%luN" + .balign 4 + .4byte 0 .global $$252952 $$252952: - .incbin "baserom.dol", 0x459938, 0x10 + .asciz "SkillNameTextL4" .global $$252953 $$252953: - .incbin "baserom.dol", 0x459948, 0x10 + .asciz "CommandTextL4" + .balign 4 .global $$252956 $$252956: - .incbin "baserom.dol", 0x459958, 0x10 + .asciz "CommentText" + .4byte 0 .global $$252958 $$252958: - .incbin "baserom.dol", 0x459968, 0x10 + .asciz "SkillNameTextL2" .global $$252959 $$252959: - .incbin "baserom.dol", 0x459978, 0x10 + .asciz "CommandTextL1" + .balign 4 .global $$252960 $$252960: - .incbin "baserom.dol", 0x459988, 0x10 + .asciz "CommandTextL2" + .balign 4 .global __vt__Q25pause11PageCommand __vt__Q25pause11PageCommand: - .incbin "baserom.dol", 0x459998, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x801DCDF0 ;# ptr + .4byte 0x801DCD28 ;# ptr + .4byte 0x801DCD80 ;# ptr + .4byte 0x801DCD88 ;# ptr + .4byte 0x801DCDE8 ;# ptr + .4byte 0x801DCDEC ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252951 $$252951: - .incbin "baserom.dol", 0x493C98, 0x4 + .4byte 0x4C324E00 .global $$252954 $$252954: - .incbin "baserom.dol", 0x493C9C, 0x4 + .4byte 0x4C344E00 .global $$252955 $$252955: - .incbin "baserom.dol", 0x493CA0, 0x8 + .asciz "Group1N" .global $$252957 $$252957: - .incbin "baserom.dol", 0x493CA8, 0x8 + .asciz "Group2N" .global $$253024 $$253024: - .incbin "baserom.dol", 0x493CB0, 0x8 + .asciz "%s%d" + .balign 4 diff --git a/asm/src/PageCounter.s b/asm/src/PageCounter.s index 5a544833..404f725d 100644 --- a/asm/src/PageCounter.s +++ b/asm/src/PageCounter.s @@ -118,15 +118,18 @@ lbl_8020030C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249044 $$249044: - .incbin "baserom.dol", 0x45C428, 0x10 + .asciz "lyt/%s.arc.cmp" + .balign 4 .global $$249046 $$249046: - .incbin "baserom.dol", 0x45C438, 0x10 + .asciz "Page%02d.brlyt" + .balign 4 .global $$249047 $$249047: - .incbin "baserom.dol", 0x45C448, 0x10 + .asciz "PageS%02d.brlyt" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249045 $$249045: - .incbin "baserom.dol", 0x4946F0, 0x8 + .asciz "root" + .balign 4 diff --git a/asm/src/PageDropout.s b/asm/src/PageDropout.s index 26983768..d86bd701 100644 --- a/asm/src/PageDropout.s +++ b/asm/src/PageDropout.s @@ -822,112 +822,168 @@ lbl_801DD99C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x411538, 0x10 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0 .global T_ENTRY_CONTEXTS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRY_CONTEXTS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x411548, 0x20 + .4byte 0x8055FCC0 + .4byte 0x00000002 + .4byte 0x8055FCC8 + .4byte 0x00000002 + .4byte 0x80415438 + .4byte 0x00000003 + .4byte 0x8055FCD0 + .4byte 0x00000002 .global T_LABELS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_LABELS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x411568, 0x28 + .4byte 0x8045D8E8 + .4byte 0x8045D8F4 + .4byte 0x8045D8F4 + .4byte 0x8045D900 + .4byte 0x8045D914 + .4byte 0x805578D8 + .4byte 0x805578D8 + .4byte 0x8045D8F4 + .4byte 0x8045D924 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252145 $$252145: - .incbin "baserom.dol", 0x4599E8, 0xC + .asciz "Continue" + .balign 4 .global $$252146 $$252146: - .incbin "baserom.dol", 0x4599F4, 0xC + .asciz "ExitStage" + .balign 4 .global $$252147 $$252147: - .incbin "baserom.dol", 0x459A00, 0x14 + .asciz "ReturnFileSelect" + .balign 4 .global $$252148 $$252148: - .incbin "baserom.dol", 0x459A14, 0x10 + .asciz "ReturnAreaMap" + .balign 4 .global $$252150 $$252150: - .incbin "baserom.dol", 0x459A24, 0xC + .asciz "BattleKing" + .balign 4 .global $$253327 $$253327: - .incbin "baserom.dol", 0x459A30, 0x10 + .asciz "DropoutWindow" + .balign 4 .global $$253329 $$253329: - .incbin "baserom.dol", 0x459A40, 0xC + .asciz "ConfirmN" + .balign 4 .global $$253331 $$253331: - .incbin "baserom.dol", 0x459A4C, 0xC + .asciz "common/Main" .global $$253332 $$253332: - .incbin "baserom.dol", 0x459A58, 0x10 + .asciz "ConfirmWindow" + .balign 4 .global $$253333 $$253333: - .incbin "baserom.dol", 0x459A68, 0xC + .asciz "ButtonA1N" + .balign 4 .global $$253334 $$253334: - .incbin "baserom.dol", 0x459A74, 0xC + .asciz "ButtonA2N" + .balign 4 .global $$253335 $$253335: - .incbin "baserom.dol", 0x459A80, 0xC + .asciz "ButtonB1N" + .balign 4 .global $$253336 $$253336: - .incbin "baserom.dol", 0x459A8C, 0xC + .asciz "ButtonB2N" + .balign 4 .global $$253337 $$253337: - .incbin "baserom.dol", 0x459A98, 0xC + .asciz "ButtonB3N" + .balign 4 .global $$253339 $$253339: - .incbin "baserom.dol", 0x459AA4, 0xC + .asciz "Dropout%s" + .balign 4 .global $$253415 $$253415: - .incbin "baserom.dol", 0x459AB0, 0x14 + .asciz "PageTitleDropout" + .balign 4 .global $$253488 $$253488: - .incbin "baserom.dol", 0x459AC4, 0x10 + .asciz "DropoutAgain2" + .balign 4 .global $$253489 $$253489: - .incbin "baserom.dol", 0x459AD4, 0x1C + .asciz "DropoutReturnFileSelect2" + .balign 4 .global $$253490 $$253490: - .incbin "baserom.dol", 0x459AF0, 0x14 + .asciz "DropoutBattleKing2" + .balign 4 .global $$253491 $$253491: - .incbin "baserom.dol", 0x459B04, 0x14 + .asciz "ConfirmNotSaved2" + .balign 4 .global $$253492 $$253492: - .incbin "baserom.dol", 0x459B18, 0x10 + .asciz "ConfirmNotSaved" .global __vt__Q25pause11PageDropout __vt__Q25pause11PageDropout: - .incbin "baserom.dol", 0x459B28, 0x50 + .4byte 0 + .4byte 0 + .4byte 0x801DD928 ;# ptr + .4byte 0x801DD44C ;# ptr + .4byte 0x801DD458 ;# ptr + .4byte 0x801DD45C ;# ptr + .4byte 0x801DD4C4 ;# ptr + .4byte 0x801DD4F4 ;# ptr + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252149 $$252149: - .incbin "baserom.dol", 0x493CB8, 0x8 + .asciz "Again" + .balign 4 .global $$253328 $$253328: - .incbin "baserom.dol", 0x493CC0, 0x8 + .asciz "WindowN" .global $$253330 $$253330: - .incbin "baserom.dol", 0x493CC8, 0x4 + .4byte 0 .global $$253338 $$253338: - .incbin "baserom.dol", 0x493CCC, 0x4 + .4byte 0 .global $$253340 $$253340: - .incbin "baserom.dol", 0x493CD0, 0x8 + .asciz "Button" + .balign 4 .global $$253493 $$253493: - .incbin "baserom.dol", 0x493CD8, 0x8 + .asciz "%s_Yes" + .balign 4 .global $$253494 $$253494: - .incbin "baserom.dol", 0x493CE0, 0x8 + .asciz "%s_No" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x49A800, 0x8 + .4byte 0 + .4byte 0x00000002 .global T_ENTRIES_LEVELMAP__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_LEVELMAP__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x49A808, 0x8 + .4byte 0 + .4byte 0x00000003 .global T_ENTRIES_ABILITYROOM__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_ABILITYROOM__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .incbin "baserom.dol", 0x49A810, 0x8 + .4byte 0 + .4byte 0x00000004 diff --git a/asm/src/PageManager.s b/asm/src/PageManager.s index c83bc508..663498ef 100644 --- a/asm/src/PageManager.s +++ b/asm/src/PageManager.s @@ -1091,67 +1091,89 @@ Create__Q35pause11PageManager10PageRecipeFQ35pause11PageManager8PageKindUl: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252644 $$252644: - .incbin "baserom.dol", 0x411590, 0x10 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252168 $$252168: - .incbin "baserom.dol", 0x459B78, 0xC + .asciz "WindowFixN" + .balign 4 .global $$253823 $$253823: - .incbin "baserom.dol", 0x459B84, 0xC + .asciz "PausePage" + .balign 4 .global $$253824 $$253824: - .incbin "baserom.dol", 0x459B90, 0x10 + .asciz "PauseCursorBase" .global $$253825 $$253825: - .incbin "baserom.dol", 0x459BA0, 0xC + .asciz "CursorLN" + .balign 4 .global $$253826 $$253826: - .incbin "baserom.dol", 0x459BAC, 0x10 + .asciz "PauseCursorL" + .balign 4 .global $$253827 $$253827: - .incbin "baserom.dol", 0x459BBC, 0xC + .asciz "CursorRN" + .balign 4 .global $$253828 $$253828: - .incbin "baserom.dol", 0x459BC8, 0x10 + .asciz "PauseCursorR" + .balign 4 .global $$253829 $$253829: - .incbin "baserom.dol", 0x459BD8, 0x10 + .asciz "PauseCursorN" + .balign 4 .global $$253970 $$253970: - .incbin "baserom.dol", 0x459BE8, 0xC + .asciz "NextPage2" + .balign 4 .global $$253971 $$253971: - .incbin "baserom.dol", 0x459BF4, 0xC + .asciz "PrevPage2" + .balign 4 .global $$254026 $$254026: - .incbin "baserom.dol", 0x459C00, 0xC + .asciz "lyt/%s.arc" + .balign 4 .global $$254027 $$254027: - .incbin "baserom.dol", 0x459C0C, 0xC + .asciz "%s.cmpbin" + .balign 4 .global $$254051 $$254051: - .incbin "baserom.dol", 0x459C18, 0xC + .asciz "NextPage1" + .balign 4 .global $$254052 $$254052: - .incbin "baserom.dol", 0x459C24, 0x3C + .asciz "PrevPage1" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252167 $$252167: - .incbin "baserom.dol", 0x493CE8, 0x8 + .asciz "WindowN" .global $$253830 $$253830: - .incbin "baserom.dol", 0x493CF0, 0x8 + .asciz "Wait" + .balign 4 .global $$254028 $$254028: - .incbin "baserom.dol", 0x493CF8, 0x8 + .asciz "%s.cmp" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: - .incbin "baserom.dol", 0x49A818, 0x4 + .4byte 0x80557908 .global T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: - .incbin "baserom.dol", 0x49A81C, 0x4 + .4byte 0x8045DA78 diff --git a/asm/src/PaneAccessor.s b/asm/src/PaneAccessor.s index 2208a616..c0f1a344 100644 --- a/asm/src/PaneAccessor.s +++ b/asm/src/PaneAccessor.s @@ -449,4 +449,5 @@ lbl_801AE53C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253421 $$253421: - .incbin "baserom.dol", 0x49A4D0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Param.s b/asm/src/Param.s index 721a9fe6..3150332a 100644 --- a/asm/src/Param.s +++ b/asm/src/Param.s @@ -4122,457 +4122,581 @@ challengeMasterShot__Q43scn4step6weapon5ParamCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249988 $$249988: - .incbin "baserom.dol", 0x4607D8, 0x14 + .asciz "step/boss/Bonkers" + .balign 4 .global $$249989 $$249989: - .incbin "baserom.dol", 0x4607EC, 0x1C + .asciz "step/boss/ChallengeMaster" + .balign 4 .global $$249990 $$249990: - .incbin "baserom.dol", 0x460808, 0x14 + .asciz "step/boss/Common" + .balign 4 .global $$249991 $$249991: - .incbin "baserom.dol", 0x46081C, 0x18 + .asciz "step/boss/CreditDedede" + .balign 4 .global $$249992 $$249992: - .incbin "baserom.dol", 0x460834, 0x14 + .asciz "step/boss/CreditDee" .global $$249993 $$249993: - .incbin "baserom.dol", 0x460848, 0x18 + .asciz "step/boss/CreditMeta" + .balign 4 .global $$249994 $$249994: - .incbin "baserom.dol", 0x460860, 0x18 + .asciz "step/boss/CreditRoah" + .balign 4 .global $$249995 $$249995: - .incbin "baserom.dol", 0x460878, 0x14 + .asciz "step/boss/Dubior" + .balign 4 .global $$249996 $$249996: - .incbin "baserom.dol", 0x46088C, 0x18 + .asciz "step/boss/GigantEdge" + .balign 4 .global $$249997 $$249997: - .incbin "baserom.dol", 0x4608A4, 0x14 + .asciz "step/boss/KingsDoo" + .balign 4 .global $$249998 $$249998: - .incbin "baserom.dol", 0x4608B8, 0x18 + .asciz "step/boss/Moundeath" + .4byte 0 .global $$249999 $$249999: - .incbin "baserom.dol", 0x4608D0, 0x18 + .asciz "step/boss/WaterGalboros" .global $$250000 $$250000: - .incbin "baserom.dol", 0x4608E8, 0x14 + .asciz "step/boss/Whispy" + .balign 4 .global $$250001 $$250001: - .incbin "baserom.dol", 0x4608FC, 0x14 + .asciz "step/boss/Zankibble" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254665 $$254665: - .incbin "baserom.dol", 0x46E7D8, 0x14 + .asciz "step/enemy/Common" + .balign 4 .global $$254666 $$254666: - .incbin "baserom.dol", 0x46E7EC, 0x18 + .asciz "step/enemy/Sirkibble" + .balign 4 .global $$254667 $$254667: - .incbin "baserom.dol", 0x46E804, 0x18 + .asciz "step/enemy/Brontoburt" + .balign 4 .global $$254668 $$254668: - .incbin "baserom.dol", 0x46E81C, 0x18 + .asciz "step/enemy/Waddledee" + .balign 4 .global $$254669 $$254669: - .incbin "baserom.dol", 0x46E834, 0x18 + .asciz "step/enemy/Bladeknight" + .balign 4 .global $$254670 $$254670: - .incbin "baserom.dol", 0x46E84C, 0x14 + .asciz "step/enemy/Cappy" + .balign 4 .global $$254671 $$254671: - .incbin "baserom.dol", 0x46E860, 0x14 + .asciz "step/enemy/Hothead" + .balign 4 .global $$254672 $$254672: - .incbin "baserom.dol", 0x46E874, 0x18 + .asciz "step/enemy/Knucklejoe" + .balign 4 .global $$254673 $$254673: - .incbin "baserom.dol", 0x46E88C, 0x18 + .asciz "step/enemy/Puppetdee" + .balign 4 .global $$254674 $$254674: - .incbin "baserom.dol", 0x46E8A4, 0x14 + .asciz "step/enemy/Armordee" .global $$254675 $$254675: - .incbin "baserom.dol", 0x46E8B8, 0x10 + .asciz "step/enemy/Como" .global $$254676 $$254676: - .incbin "baserom.dol", 0x46E8C8, 0x14 + .asciz "step/enemy/Gordo" + .balign 4 .global $$254677 $$254677: - .incbin "baserom.dol", 0x46E8DC, 0x14 + .asciz "step/enemy/Whippy" + .balign 4 .global $$254678 $$254678: - .incbin "baserom.dol", 0x46E8F0, 0x14 + .asciz "step/enemy/Shotzo" + .balign 4 .global $$254679 $$254679: - .incbin "baserom.dol", 0x46E904, 0x14 + .asciz "step/enemy/Leafan" + .balign 4 .global $$254680 $$254680: - .incbin "baserom.dol", 0x46E918, 0x18 + .asciz "step/enemy/Waddledoo" + .balign 4 .global $$254681 $$254681: - .incbin "baserom.dol", 0x46E930, 0x14 + .asciz "step/enemy/Bouncy" + .balign 4 .global $$254682 $$254682: - .incbin "baserom.dol", 0x46E944, 0x14 + .asciz "step/enemy/Sparky" + .balign 4 .global $$254683 $$254683: - .incbin "baserom.dol", 0x46E958, 0x14 + .asciz "step/enemy/Needlous" .global $$254684 $$254684: - .incbin "baserom.dol", 0x46E96C, 0x18 + .asciz "step/enemy/Broomhatter" + .balign 4 .global $$254685 $$254685: - .incbin "baserom.dol", 0x46E984, 0x14 + .asciz "step/enemy/Scarfy" + .balign 4 .global $$254686 $$254686: - .incbin "baserom.dol", 0x46E998, 0x14 + .asciz "step/enemy/Nruff" + .balign 4 .global $$254687 $$254687: - .incbin "baserom.dol", 0x46E9AC, 0x14 + .asciz "step/enemy/Flamer" + .balign 4 .global $$254688 $$254688: - .incbin "baserom.dol", 0x46E9C0, 0x18 + .asciz "step/enemy/Watergalbo" + .balign 4 .global $$254689 $$254689: - .incbin "baserom.dol", 0x46E9D8, 0x14 + .asciz "step/enemy/Rocky" + .balign 4 .global $$254690 $$254690: - .incbin "baserom.dol", 0x46E9EC, 0x18 + .asciz "step/enemy/Poppybrojr" + .balign 4 .global $$254691 $$254691: - .incbin "baserom.dol", 0x46EA04, 0x14 + .asciz "step/enemy/Noddy" + .balign 4 .global $$254692 $$254692: - .incbin "baserom.dol", 0x46EA18, 0x14 + .asciz "step/enemy/Cerulean" .global $$254693 $$254693: - .incbin "baserom.dol", 0x46EA2C, 0x14 + .asciz "step/enemy/Blipper" + .balign 4 .global $$254694 $$254694: - .incbin "baserom.dol", 0x46EA40, 0x14 + .asciz "step/enemy/Gigatzo" + .balign 4 .global $$254695 $$254695: - .incbin "baserom.dol", 0x46EA54, 0x18 + .asciz "step/enemy/Sisterbound" + .balign 4 .global $$254696 $$254696: - .incbin "baserom.dol", 0x46EA6C, 0x14 + .asciz "step/enemy/Rollball" .global $$254697 $$254697: - .incbin "baserom.dol", 0x46EA80, 0x14 + .asciz "step/enemy/Mumbies" + .balign 4 .global $$254698 $$254698: - .incbin "baserom.dol", 0x46EA94, 0x1C + .asciz "step/enemy/Parasoldee" + .balign 4 + .4byte 0 .global $$254699 $$254699: - .incbin "baserom.dol", 0x46EAB0, 0x10 + .asciz "step/enemy/Kabu" .global $$254700 $$254700: - .incbin "baserom.dol", 0x46EAC0, 0x18 + .asciz "step/enemy/Parasoldoo" + .balign 4 .global $$254701 $$254701: - .incbin "baserom.dol", 0x46EAD8, 0x14 + .asciz "step/enemy/Foley" + .balign 4 .global $$254702 $$254702: - .incbin "baserom.dol", 0x46EAEC, 0x14 + .asciz "step/enemy/Juckle" + .balign 4 .global $$254703 $$254703: - .incbin "baserom.dol", 0x46EB00, 0x14 + .asciz "step/enemy/Bowby" + .balign 4 .global $$254704 $$254704: - .incbin "baserom.dol", 0x46EB14, 0x14 + .asciz "step/enemy/Owgulf" + .balign 4 .global $$254705 $$254705: - .incbin "baserom.dol", 0x46EB28, 0x14 + .asciz "step/enemy/Degout" + .balign 4 .global $$254706 $$254706: - .incbin "baserom.dol", 0x46EB3C, 0x14 + .asciz "step/enemy/Sheld" + .balign 4 .global $$254707 $$254707: - .incbin "baserom.dol", 0x46EB50, 0x14 + .asciz "step/enemy/Lanzer" + .balign 4 .global $$254708 $$254708: - .incbin "baserom.dol", 0x46EB64, 0x14 + .asciz "step/enemy/Chilly" + .balign 4 .global $$254709 $$254709: - .incbin "baserom.dol", 0x46EB78, 0x18 + .asciz "step/enemy/Tsukikage" + .balign 4 .global $$254710 $$254710: - .incbin "baserom.dol", 0x46EB90, 0x14 + .asciz "step/enemy/Gemra" + .balign 4 .global $$254711 $$254711: - .incbin "baserom.dol", 0x46EBA4, 0x14 + .asciz "step/enemy/Sodory" + .balign 4 .global $$254712 $$254712: - .incbin "baserom.dol", 0x46EBB8, 0x14 + .asciz "step/enemy/Searches" .global $$254713 $$254713: - .incbin "baserom.dol", 0x46EBCC, 0x14 + .asciz "step/enemy/Pierce" + .balign 4 .global $$254714 $$254714: - .incbin "baserom.dol", 0x46EBE0, 0x10 + .asciz "step/enemy/Elec" .global $$254715 $$254715: - .incbin "baserom.dol", 0x46EBF0, 0x14 + .asciz "step/enemy/Snowl" + .balign 4 .global $$254716 $$254716: - .incbin "baserom.dol", 0x46EC04, 0x10 + .asciz "step/enemy/Sun" + .balign 4 .global $$254717 $$254717: - .incbin "baserom.dol", 0x46EC14, 0x14 + .asciz "step/enemy/Sandbag" + .balign 4 .global $$254718 $$254718: - .incbin "baserom.dol", 0x46EC28, 0x18 + .asciz "step/enemy/Stareffect" + .balign 4 .global $$254719 $$254719: - .incbin "baserom.dol", 0x46EC40, 0x14 + .asciz "step/enemy/Cappyhat" .global $$254720 $$254720: - .incbin "baserom.dol", 0x46EC54, 0x18 + .asciz "step/enemy/Whispyapple" + .balign 4 .global $$254721 $$254721: - .incbin "baserom.dol", 0x46EC6C, 0x14 + .asciz "step/enemy/Parasol" + .balign 4 .global $$254722 $$254722: - .incbin "baserom.dol", 0x46EC80, 0x14 + .asciz "step/enemy/Dubiorjr" .global $$254723 $$254723: - .incbin "baserom.dol", 0x46EC94, 0x1C + .asciz "step/enemy/Poppybrojrbomb" + .balign 4 .global $$254724 $$254724: - .incbin "baserom.dol", 0x46ECB0, 0x1C + .asciz "step/enemy/Zankibblecutter" + .balign 4 .global $$254725 $$254725: - .incbin "baserom.dol", 0x46ECCC, 0x18 + .asciz "step/enemy/Bonkersbomb" + .balign 4 .global $$254726 $$254726: - .incbin "baserom.dol", 0x46ECE4, 0x18 + .asciz "step/enemy/Dubiorspark" + .balign 4 .global $$254727 $$254727: - .incbin "baserom.dol", 0x46ECFC, 0x1C + .asciz "step/enemy/MBossDead" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250654 $$250654: - .incbin "baserom.dol", 0x4813B0, 0x14 + .asciz "step/hero/Common" + .balign 4 .global $$250655 $$250655: - .incbin "baserom.dol", 0x4813C4, 0x18 + .asciz "step/hero/IndiviKirby" + .balign 4 .global $$250656 $$250656: - .incbin "baserom.dol", 0x4813DC, 0x18 + .asciz "step/hero/IndiviMeta" + .balign 4 .global $$250657 $$250657: - .incbin "baserom.dol", 0x4813F4, 0x18 + .asciz "step/hero/IndiviDedede" + .balign 4 .global $$250658 $$250658: - .incbin "baserom.dol", 0x48140C, 0x14 + .asciz "step/hero/IndiviDee" .global $$250659 $$250659: - .incbin "baserom.dol", 0x481420, 0x18 + .asciz "step/hero/Interference" + .balign 4 .global $$250660 $$250660: - .incbin "baserom.dol", 0x481438, 0x10 + .asciz "step/hero/Sword" .global $$250661 $$250661: - .incbin "baserom.dol", 0x481448, 0x14 + .asciz "step/hero/Cutter" + .balign 4 .global $$250662 $$250662: - .incbin "baserom.dol", 0x48145C, 0x10 + .asciz "step/hero/Whip" + .balign 4 .global $$250663 $$250663: - .incbin "baserom.dol", 0x48146C, 0x14 + .asciz "step/hero/Fire" + .balign 4 + .4byte 0 .global $$250664 $$250664: - .incbin "baserom.dol", 0x481480, 0x10 + .asciz "step/hero/Spark" .global $$250665 $$250665: - .incbin "baserom.dol", 0x481490, 0x10 + .asciz "step/hero/Stone" .global $$250666 $$250666: - .incbin "baserom.dol", 0x4814A0, 0x14 + .asciz "step/hero/Parasol" + .balign 4 .global $$250667 $$250667: - .incbin "baserom.dol", 0x4814B4, 0x14 + .asciz "step/hero/Hammer" + .balign 4 .global $$250668 $$250668: - .incbin "baserom.dol", 0x4814C8, 0x10 + .asciz "step/hero/Wing" + .balign 4 .global $$250669 $$250669: - .incbin "baserom.dol", 0x4814D8, 0x18 + .asciz "step/hero/Fighter" + .balign 4 + .4byte 0 .global $$250670 $$250670: - .incbin "baserom.dol", 0x4814F0, 0x10 + .asciz "step/hero/Smash" .global $$250671 $$250671: - .incbin "baserom.dol", 0x481500, 0x10 + .asciz "step/hero/Meta" + .balign 4 .global $$250672 $$250672: - .incbin "baserom.dol", 0x481510, 0x14 + .asciz "step/hero/Dedede" + .balign 4 .global $$250673 $$250673: - .incbin "baserom.dol", 0x481524, 0x10 + .asciz "step/hero/Dee" + .balign 4 .global $$250674 $$250674: - .incbin "baserom.dol", 0x481534, 0x14 + .asciz "step/hero/BossDemo" + .balign 4 .global $$250675 $$250675: - .incbin "baserom.dol", 0x481548, 0x18 + .asciz "step/hero/StaffCredit" + .balign 4 .global $$250676 $$250676: - .incbin "baserom.dol", 0x481560, 0x20 + .asciz "step/hero/CapturedWhispy" + .balign 4 + .4byte 0 .global $$250677 $$250677: - .incbin "baserom.dol", 0x481580, 0x20 + .asciz "step/hero/CapturedWaterGalboros" .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253509 $$253509: - .incbin "baserom.dol", 0x48F908, 0x18 + .asciz "step/weapon/StarShotLv1" .global $$253510 $$253510: - .incbin "baserom.dol", 0x48F920, 0x18 + .asciz "step/weapon/StarShotLv2" .global $$253511 $$253511: - .incbin "baserom.dol", 0x48F938, 0x18 + .asciz "step/weapon/StarShotLv3" .global $$253512 $$253512: - .incbin "baserom.dol", 0x48F950, 0x18 + .asciz "step/weapon/AirBall" + .4byte 0 .global $$253513 $$253513: - .incbin "baserom.dol", 0x48F968, 0x18 + .asciz "step/weapon/WaterPistol" .global $$253514 $$253514: - .incbin "baserom.dol", 0x48F980, 0x18 + .asciz "step/weapon/SwordBeam" + .balign 4 .global $$253515 $$253515: - .incbin "baserom.dol", 0x48F998, 0x1C + .asciz "step/weapon/CutterFinalWave" .global $$253516 $$253516: - .incbin "baserom.dol", 0x48F9B4, 0x24 + .asciz "step/weapon/FireBurningBullet" + .balign 4 + .4byte 0 .global $$253517 $$253517: - .incbin "baserom.dol", 0x48F9D8, 0x20 + .asciz "step/weapon/WhispyAirBallNormal" .global $$253518 $$253518: - .incbin "baserom.dol", 0x48F9F8, 0x20 + .asciz "step/weapon/WhispyAirBallBig" + .balign 4 .global $$253519 $$253519: - .incbin "baserom.dol", 0x48FA18, 0x24 + .asciz "step/weapon/WhispyAirBallSensitive" + .balign 4 .global $$253520 $$253520: - .incbin "baserom.dol", 0x48FA3C, 0x1C + .asciz "step/weapon/SirkibbleCutter" .global $$253521 $$253521: - .incbin "baserom.dol", 0x48FA58, 0x1C + .asciz "step/weapon/ShotzoBullet" + .balign 4 .global $$253522 $$253522: - .incbin "baserom.dol", 0x48FA74, 0x1C + .asciz "step/weapon/LeafanPollen" + .balign 4 .global $$253523 $$253523: - .incbin "baserom.dol", 0x48FA90, 0x1C + .asciz "step/weapon/SparkShotLv1" + .balign 4 .global $$253524 $$253524: - .incbin "baserom.dol", 0x48FAAC, 0x1C + .asciz "step/weapon/SparkShotLv2" + .balign 4 .global $$253525 $$253525: - .incbin "baserom.dol", 0x48FAC8, 0x1C + .asciz "step/weapon/SparkShotLv3" + .balign 4 .global $$253526 $$253526: - .incbin "baserom.dol", 0x48FAE4, 0x20 + .asciz "step/weapon/WaterGalborosWater" + .balign 4 .global $$253527 $$253527: - .incbin "baserom.dol", 0x48FB04, 0x18 + .asciz "step/weapon/SpearSpear" + .balign 4 .global $$253528 $$253528: - .incbin "baserom.dol", 0x48FB1C, 0x1C + .asciz "step/weapon/HammerHammer" + .balign 4 .global $$253529 $$253529: - .incbin "baserom.dol", 0x48FB38, 0x18 + .asciz "step/weapon/WingShot" + .balign 4 .global $$253530 $$253530: - .incbin "baserom.dol", 0x48FB50, 0x1C + .asciz "step/weapon/WingShockWave" + .balign 4 .global $$253531 $$253531: - .incbin "baserom.dol", 0x48FB6C, 0x20 + .asciz "step/weapon/FighterSmashShot" + .balign 4 .global $$253532 $$253532: - .incbin "baserom.dol", 0x48FB8C, 0x1C + .asciz "step/weapon/FighterKickShot" .global $$253533 $$253533: - .incbin "baserom.dol", 0x48FBA8, 0x20 + .asciz "step/weapon/FighterHadouShot" + .balign 4 .global $$253534 $$253534: - .incbin "baserom.dol", 0x48FBC8, 0x1C + .asciz "step/weapon/GigantEdgeShot" + .balign 4 .global $$253535 $$253535: - .incbin "baserom.dol", 0x48FBE4, 0x20 + .asciz "step/weapon/EnemyWaterBullet" + .balign 4 .global $$253536 $$253536: - .incbin "baserom.dol", 0x48FC04, 0x14 + .asciz "step/weapon/RollExp" .global $$253537 $$253537: - .incbin "baserom.dol", 0x48FC18, 0x1C + .asciz "step/weapon/GigatzoBullet" + .balign 4 .global $$253538 $$253538: - .incbin "baserom.dol", 0x48FC34, 0x20 + .asciz "step/weapon/KingsDooWaveShot" + .balign 4 .global $$253539 $$253539: - .incbin "baserom.dol", 0x48FC54, 0x18 + .asciz "step/weapon/FoleyLeaf" + .balign 4 .global $$253540 $$253540: - .incbin "baserom.dol", 0x48FC6C, 0x18 + .asciz "step/weapon/BowbyArrow" + .balign 4 .global $$253541 $$253541: - .incbin "baserom.dol", 0x48FC84, 0x1C + .asciz "step/weapon/JuckleCutter" + .balign 4 .global $$253542 $$253542: - .incbin "baserom.dol", 0x48FCA0, 0x20 + .asciz "step/weapon/TsukikageShuriken" + .balign 4 .global $$253543 $$253543: - .incbin "baserom.dol", 0x48FCC0, 0x1C + .asciz "step/weapon/KnucklejoeHadou" .global $$253544 $$253544: - .incbin "baserom.dol", 0x48FCDC, 0x18 + .asciz "step/weapon/FlowEffect" + .balign 4 .global $$253545 $$253545: - .incbin "baserom.dol", 0x48FCF4, 0x1C + .asciz "step/weapon/WhispyTornado" + .balign 4 .global $$253546 $$253546: - .incbin "baserom.dol", 0x48FD10, 0x18 + .asciz "step/weapon/WhispyRoot" + .balign 4 .global $$253547 $$253547: - .incbin "baserom.dol", 0x48FD28, 0x20 + .asciz "step/weapon/CombinationAirBall" + .balign 4 .global $$253548 $$253548: - .incbin "baserom.dol", 0x48FD48, 0x20 + .asciz "step/weapon/CombinationMetaBeam" .global $$253549 $$253549: - .incbin "baserom.dol", 0x48FD68, 0x24 + .asciz "step/weapon/CombinationDededeBomber" .global $$253550 $$253550: - .incbin "baserom.dol", 0x48FD8C, 0x20 + .asciz "step/weapon/CombinationDeeShot" + .balign 4 .global $$253551 $$253551: - .incbin "baserom.dol", 0x48FDAC, 0x18 + .asciz "step/weapon/MetaBeam" + .balign 4 .global $$253552 $$253552: - .incbin "baserom.dol", 0x48FDC4, 0x1C + .asciz "step/weapon/MetaShockWave" + .balign 4 .global $$253553 $$253553: - .incbin "baserom.dol", 0x48FDE0, 0x1C + .asciz "step/weapon/DededeHammer" + .balign 4 .global $$253554 $$253554: - .incbin "baserom.dol", 0x48FDFC, 0x18 + .asciz "step/weapon/DeeSpear" + .balign 4 .global $$253555 $$253555: - .incbin "baserom.dol", 0x48FE14, 0x1C + .asciz "step/weapon/VacuumedBlock" + .balign 4 .global $$253556 $$253556: - .incbin "baserom.dol", 0x48FE30, 0x28 + .asciz "step/weapon/ChallengeMasterSummonLight" + .balign 4 .global $$253557 $$253557: - .incbin "baserom.dol", 0x48FE58, 0x20 + .asciz "step/weapon/ChallengeMasterShot" diff --git a/asm/src/ParamAccessor.s b/asm/src/ParamAccessor.s index 4dc9c588..3e251231 100644 --- a/asm/src/ParamAccessor.s +++ b/asm/src/ParamAccessor.s @@ -114,9 +114,11 @@ str__Q25param13ParamAccessorCFUi: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249124 $$249124: - .incbin "baserom.dol", 0x459508, 0x18 + .asciz "param/Archive.bin.cmp" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249125 $$249125: - .incbin "baserom.dol", 0x493A38, 0x8 + .asciz "%s.bin" + .balign 4 diff --git a/asm/src/ParamBase.s b/asm/src/ParamBase.s index c81ce6e9..4cf3cbba 100644 --- a/asm/src/ParamBase.s +++ b/asm/src/ParamBase.s @@ -70,16 +70,17 @@ lbl_80291824: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248731 $$248731: - .incbin "baserom.dol", 0x49BAD8, 0x4 + .4byte 0 .global lbl_80560F9C lbl_80560F9C: - .incbin "baserom.dol", 0x49BADC, 0x4 + .4byte 0x3F000000 .global $$248784 $$248784: - .incbin "baserom.dol", 0x49BAE0, 0x4 + .4byte 0x3F800000 .global $$248785 $$248785: - .incbin "baserom.dol", 0x49BAE4, 0x4 + .4byte 0x42480000 .global $$248786 $$248786: - .incbin "baserom.dol", 0x49BAE8, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/Parasol.s b/asm/src/Parasol.s index 848e8513..5bf45859 100644 --- a/asm/src/Parasol.s +++ b/asm/src/Parasol.s @@ -325,82 +325,157 @@ lbl_803928E0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21 $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21: - .incbin "baserom.dol", 0x41BA40, 0x80 + .4byte 0x8055B240 + .4byte 0 + .4byte 0x8055B248 + .4byte 0 + .4byte 0x8048B390 + .4byte 0 + .4byte 0x8048B39C + .4byte 0 + .4byte 0x8048B3A8 + .4byte 0 + .4byte 0x8055B250 + .4byte 0 + .4byte 0x8055B258 + .4byte 0 + .4byte 0x8055B260 + .4byte 0 + .4byte 0x8048B3B4 + .4byte 0 + .4byte 0x8055B268 + .4byte 0 + .4byte 0x8048B3C0 + .4byte 0 + .4byte 0x8048B3CC + .4byte 0 + .4byte 0x8048B3DC + .4byte 0 + .4byte 0x8048B3F0 + .4byte 0 + .4byte 0x8048B400 + .4byte 0 + .4byte 0x8055B270 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248808 $$248808: - .incbin "baserom.dol", 0x487468, 0x28 + .asciz "step/chara/hero/kirby/parasol/Parasol" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x487490, 0xC + .asciz "SwingEnd" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x48749C, 0xC + .asciz "Parachute" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x4874A8, 0xC + .asciz "DiveStart" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x4874B4, 0xC + .asciz "DrillStart" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x4874C0, 0xC + .asciz "DrillEnd" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x4874CC, 0x10 + .asciz "ParasolCatch" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x4874DC, 0x14 + .asciz "ParasolPerformance" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x4874F0, 0x10 + .asciz "ParasolThrow" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x487500, 0x10 + .asciz "CloseStart" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257636 $$257636: - .incbin "baserom.dol", 0x489C58, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$257637 $$257637: - .incbin "baserom.dol", 0x489C78, 0x28 + .asciz "step/chara/hero/kirby/parasol/Motion" + .balign 4 .global __vt__Q53scn4step4hero7parasol7Parasol __vt__Q53scn4step4hero7parasol7Parasol: - .incbin "baserom.dol", 0x489CA0, 0x60 + .4byte 0 + .4byte 0 + .4byte 0x803925A4 + .4byte 0x80392630 + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x80392738 + .4byte 0x80392870 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x80392850 + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: - .incbin "baserom.dol", 0x497608, 0x8 + .asciz "TopL" + .balign 4 .global $$248733 $$248733: - .incbin "baserom.dol", 0x497610, 0x8 + .asciz "AllL" + .balign 4 .global $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21 $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21: - .incbin "baserom.dol", 0x497618, 0x8 + .4byte 0x8055B228 + .4byte 0x8055B230 .global $$248740 $$248740: - .incbin "baserom.dol", 0x497620, 0x8 + .asciz "Carry" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x497628, 0x8 + .asciz "Swing" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x497630, 0x8 + .asciz "Dive" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x497638, 0x8 + .asciz "DiveEnd" .global $$248747 $$248747: - .incbin "baserom.dol", 0x497640, 0x8 + .asciz "Shield" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x497648, 0x8 + .asciz "Drill" + .balign 4 .global $$248755 $$248755: - .incbin "baserom.dol", 0x497650, 0x8 + .asciz "Close" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2desc diff --git a/asm/src/PassageTime.s b/asm/src/PassageTime.s index 3a5850ef..4eed866d 100644 --- a/asm/src/PassageTime.s +++ b/asm/src/PassageTime.s @@ -264,36 +264,46 @@ lbl_803B4E3C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253861 $$253861: - .incbin "baserom.dol", 0x48C7B0, 0x14 + .asciz "step/challenge/Main" .global $$253862 $$253862: - .incbin "baserom.dol", 0x48C7C4, 0xC + .asciz "PassageTime" .global $$253867 $$253867: - .incbin "baserom.dol", 0x48C7D0, 0x40 + .asciz "FrameText" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253863 $$253863: - .incbin "baserom.dol", 0x497C28, 0x8 + .asciz "MinText" .global $$253864 $$253864: - .incbin "baserom.dol", 0x497C30, 0x8 + .4byte 0x30000000 + .4byte 0 .global $$253865 $$253865: - .incbin "baserom.dol", 0x497C38, 0x8 + .asciz "SecText" .global $$253866 $$253866: - .incbin "baserom.dol", 0x497C40, 0x4 + .4byte 0x30300000 .global $$253906 $$253906: - .incbin "baserom.dol", 0x497C44, 0x8 + .asciz "Wait" + .balign 4 .global $$253909 $$253909: - .incbin "baserom.dol", 0x497C4C, 0x8 + .asciz "Goal" + .balign 4 .global $$253945 $$253945: - .incbin "baserom.dol", 0x497C54, 0x4 + .4byte 0x25750000 .global $$253946 $$253946: - .incbin "baserom.dol", 0x497C58, 0x8 + .asciz "%02u" + .balign 4 diff --git a/asm/src/Pause.s b/asm/src/Pause.s index 5ebec978..a2fe9bf4 100644 --- a/asm/src/Pause.s +++ b/asm/src/Pause.s @@ -666,9 +666,12 @@ lbl_801DF1F0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253172 $$253172: - .incbin "baserom.dol", 0x459C60, 0x10 + .asciz "Disappear" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253126 $$253126: - .incbin "baserom.dol", 0x493D00, 0x8 + .asciz "Appear" + .balign 4 diff --git a/asm/src/PauseManager.s b/asm/src/PauseManager.s index 8a36712f..e96b3c55 100644 --- a/asm/src/PauseManager.s +++ b/asm/src/PauseManager.s @@ -144,4 +144,7 @@ lbl_80277988: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4core12PauseManager __vt__Q43scn4step4core12PauseManager: - .incbin "baserom.dol", 0x468948, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8021F370 ;# ptr + .4byte 0x8027790C ;# ptr diff --git a/asm/src/PerformanceController.s b/asm/src/PerformanceController.s index 5fcffa65..37c7bd98 100644 --- a/asm/src/PerformanceController.s +++ b/asm/src/PerformanceController.s @@ -341,12 +341,17 @@ __sinit_$$3PerformanceController_cpp: /* 8017A9D8 00176818 4B F6 2A 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4023DC, 0x4 + .4byte 0x8017A9D4 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DRAW_FRAME_INTERVAL_TABLE__35$$2unnamed$$2PerformanceController_cpp$$2 T_DRAW_FRAME_INTERVAL_TABLE__35$$2unnamed$$2PerformanceController_cpp$$2: - .incbin "baserom.dol", 0x410600, 0x18 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_instance__35$$2unnamed$$2PerformanceController_cpp$$2 diff --git a/asm/src/PermEffect.s b/asm/src/PermEffect.s index 6d27908d..e4412ced 100644 --- a/asm/src/PermEffect.s +++ b/asm/src/PermEffect.s @@ -346,4 +346,11 @@ onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4core10PermEffect __vt__Q43scn4step4core10PermEffect: - .incbin "baserom.dol", 0x468958, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8027814C ;# ptr + .4byte 0x80278270 ;# ptr + .4byte 0x80278280 ;# ptr + .4byte 0x80278290 ;# ptr + .4byte 0x802782D0 ;# ptr + .4byte 0 diff --git a/asm/src/Piggyback.s b/asm/src/Piggyback.s index 844fcb2d..fff8f292 100644 --- a/asm/src/Piggyback.s +++ b/asm/src/Piggyback.s @@ -1861,56 +1861,77 @@ lbl_80353788: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$261676 $$261676: - .incbin "baserom.dol", 0x4815A0, 0x50 + .4byte 0x80352B68 + .4byte 0x80352AE4 + .4byte 0x80352B3C + .4byte 0x80352B68 + .4byte 0x80352AE4 + .4byte 0x80352B10 + .4byte 0x80352B68 + .4byte 0x80352B68 + .4byte 0x80352AE4 + .4byte 0x80352AE4 + .4byte 0x80352B68 + .4byte 0x80352B3C + .4byte 0x80352B68 + .4byte 0x80352B68 + .4byte 0x80352B68 + .4byte 0x80352B68 + .4byte 0x80352B68 + .4byte 0x80352B10 + .4byte 0x80352B68 + .4byte 0x80352B10 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258605 $$258605: - .incbin "baserom.dol", 0x496E08, 0x4 + .4byte 0xBF800000 .global $$258606 $$258606: - .incbin "baserom.dol", 0x496E0C, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261280 $$261280: - .incbin "baserom.dol", 0x49D910, 0x4 + .4byte 0 .global $$261281 $$261281: - .incbin "baserom.dol", 0x49D914, 0x4 + .4byte 0x3F800000 .global $$261379 $$261379: - .incbin "baserom.dol", 0x49D918, 0x4 + .4byte 0xB727C5AC .global $$261380 $$261380: - .incbin "baserom.dol", 0x49D91C, 0x4 + .4byte 0x3727C5AC .global $$261455 $$261455: - .incbin "baserom.dol", 0x49D920, 0x4 + .4byte 0x42480000 .global $$261456 $$261456: - .incbin "baserom.dol", 0x49D924, 0x4 + .4byte 0x43020000 .global $$261457 $$261457: - .incbin "baserom.dol", 0x49D928, 0x4 + .4byte 0x3DCCCCCD .global $$261458 $$261458: - .incbin "baserom.dol", 0x49D92C, 0x4 + .4byte 0x3E800000 .global $$261459 $$261459: - .incbin "baserom.dol", 0x49D930, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 .global $$261462 $$261462: - .incbin "baserom.dol", 0x49D938, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$261573 $$261573: - .incbin "baserom.dol", 0x49D940, 0x4 + .4byte 0x3F000000 .global $$261672 $$261672: - .incbin "baserom.dol", 0x49D944, 0x4 + .4byte 0xBF800000 .global $$261673 $$261673: - .incbin "baserom.dol", 0x49D948, 0x4 + .4byte 0x43340000 .global $$261778 $$261778: - .incbin "baserom.dol", 0x49D94C, 0x4 + .4byte 0x3E99999A diff --git a/asm/src/Pinch.s b/asm/src/Pinch.s index 6e23093f..0e7fb7b2 100644 --- a/asm/src/Pinch.s +++ b/asm/src/Pinch.s @@ -203,15 +203,77 @@ lbl_80353A20: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE_1__19$$2unnamed$$2Pinch_cpp$$2 T_ALPHA_TABLE_1__19$$2unnamed$$2Pinch_cpp$$2: - .incbin "baserom.dol", 0x416328, 0x80 + .4byte 0x00000030 + .4byte 0x00000060 + .4byte 0x00000080 + .4byte 0x00000070 + .4byte 0x00000060 + .4byte 0x00000050 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global T_ALPHA_TABLE_2__19$$2unnamed$$2Pinch_cpp$$2 T_ALPHA_TABLE_2__19$$2unnamed$$2Pinch_cpp$$2: - .incbin "baserom.dol", 0x4163A8, 0x80 + .4byte 0x00000060 + .4byte 0x00000080 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000040 + .4byte 0x00000060 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000020 + .4byte 0x00000040 + .4byte 0x00000020 + .4byte 0x00000010 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252532 $$252532: - .incbin "baserom.dol", 0x49D950, 0x4 + .4byte 0x3F800000 .global $$252551 $$252551: - .incbin "baserom.dol", 0x49D954, 0x4 + .4byte 0x3F000000 diff --git a/asm/src/Player.s b/asm/src/Player.s index cb01ecf3..2bd9b98b 100644 --- a/asm/src/Player.s +++ b/asm/src/Player.s @@ -740,41 +740,53 @@ getTotalTime__Q33scn5anime6PlayerCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251631 $$251631: - .incbin "baserom.dol", 0x4115A0, 0xC + .4byte 0 + .4byte 0 + .4byte 0xC2C80000 .global $$251633 $$251633: - .incbin "baserom.dol", 0x4115AC, 0xC + .4byte 0 + .4byte 0 + .4byte 0x42C80000 .global $$251635 $$251635: - .incbin "baserom.dol", 0x4115B8, 0x10 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253021 $$253021: - .incbin "baserom.dol", 0x493DF0, 0x8 + .asciz "Player" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251642 $$251642: - .incbin "baserom.dol", 0x49A838, 0x8 + .4byte 0x64000080 + .4byte 0 .global $$253123 $$253123: - .incbin "baserom.dol", 0x49A840, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$253147 $$253147: - .incbin "baserom.dol", 0x49A848, 0x4 + .4byte 0x440A0000 .global $$253148 $$253148: - .incbin "baserom.dol", 0x49A84C, 0x4 + .4byte 0x43C20000 .global $$253149 $$253149: - .incbin "baserom.dol", 0x49A850, 0x4 + .4byte 0x3F800000 .global $$253162 $$253162: - .incbin "baserom.dol", 0x49A854, 0x4 + .4byte 0 .global $$253166 $$253166: - .incbin "baserom.dol", 0x49A858, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$253172 $$253172: - .incbin "baserom.dol", 0x49A860, 0x8 + .4byte 0x3FDD89D9 + .4byte 0 diff --git a/asm/src/PlayerIcon.s b/asm/src/PlayerIcon.s index d7467cde..79e0f227 100644 --- a/asm/src/PlayerIcon.s +++ b/asm/src/PlayerIcon.s @@ -288,42 +288,92 @@ hide__Q53scn4step4info5lvmap10PlayerIconFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252394 $$252394: - .incbin "baserom.dol", 0x48D920, 0xC + .asciz "common/Main" .global $$252395 $$252395: - .incbin "baserom.dol", 0x48D92C, 0xC + .asciz "PlayerIcon" + .balign 4 .global $$252444 $$252444: - .incbin "baserom.dol", 0x48D938, 0xC + .asciz "FighterN" + .balign 4 .global $$252445 $$252445: - .incbin "baserom.dol", 0x48D944, 0xC + .asciz "ParasolN" + .balign 4 .global $$252451 $$252451: - .incbin "baserom.dol", 0x48D950, 0xC + .asciz "MahoroaN" + .balign 4 .global $$252453 $$252453: - .incbin "baserom.dol", 0x48D95C, 0xC4 + .4byte 0x803BE6FC + .4byte 0x803BE79C + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE7EC + .4byte 0x803BE724 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE814 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE774 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE7C4 + .4byte 0x803BE864 + .4byte 0x803BE74C + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE83C + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE864 + .4byte 0x803BE888 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252442 $$252442: - .incbin "baserom.dol", 0x498010, 0x8 + .asciz "NormalN" .global $$252443 $$252443: - .incbin "baserom.dol", 0x498018, 0x8 + .asciz "FireN" + .balign 4 .global $$252446 $$252446: - .incbin "baserom.dol", 0x498020, 0x8 + .asciz "SwordN" + .balign 4 .global $$252447 $$252447: - .incbin "baserom.dol", 0x498028, 0x8 + .asciz "WingN" + .balign 4 .global $$252448 $$252448: - .incbin "baserom.dol", 0x498030, 0x8 + .asciz "WhipN" + .balign 4 .global $$252449 $$252449: - .incbin "baserom.dol", 0x498038, 0x8 + .asciz "SparkN" + .balign 4 .global $$252450 $$252450: - .incbin "baserom.dol", 0x498040, 0x8 + .asciz "SmashN" + .balign 4 diff --git a/asm/src/PlayerWindow.s b/asm/src/PlayerWindow.s index ef313e17..d5c4e6c8 100644 --- a/asm/src/PlayerWindow.s +++ b/asm/src/PlayerWindow.s @@ -299,45 +299,61 @@ lbl_803F7FC0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251655 $$251655: - .incbin "baserom.dol", 0x491C90, 0xC + .asciz "OnePersons" + .balign 4 .global $$251656 $$251656: - .incbin "baserom.dol", 0x491C9C, 0x14 + .asciz "One_TwoPersons" + .balign 4 + .4byte 0 .global $$251657 $$251657: - .incbin "baserom.dol", 0x491CB0, 0x10 + .asciz "One_FourPersons" .global t_getTextLabel__Q43scn9grandmenu4menu26$$2unnamed$$2PlayerWindow_cpp$$2 t_getTextLabel__Q43scn9grandmenu4menu26$$2unnamed$$2PlayerWindow_cpp$$2: - .incbin "baserom.dol", 0x491CC0, 0xC + .4byte 0x80495B90 + .4byte 0x80495B9C + .4byte 0x80495BB0 .global $$252109 $$252109: - .incbin "baserom.dol", 0x491CCC, 0x10 + .asciz "grandmenu/Main" + .balign 4 .global $$252110 $$252110: - .incbin "baserom.dol", 0x491CDC, 0xC + .asciz "ModeButton" + .balign 4 .global $$252111 $$252111: - .incbin "baserom.dol", 0x491CE8, 0x10 + .asciz "PlayerWindow" + .balign 4 .global $$252112 $$252112: - .incbin "baserom.dol", 0x491CF8, 0x40 + .asciz "ModeButtonN" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252113 $$252113: - .incbin "baserom.dol", 0x4989D8, 0x8 + .asciz "Wait" + .balign 4 .global $$252114 $$252114: - .incbin "baserom.dol", 0x4989E0, 0x8 + .asciz "PlayerT" .global $$252162 $$252162: - .incbin "baserom.dol", 0x4989E8, 0x8 + .asciz "Open" + .balign 4 .global $$252165 $$252165: - .incbin "baserom.dol", 0x4989F0, 0x4 + .4byte 0x496E0000 .global $$252168 $$252168: - .incbin "baserom.dol", 0x4989F4, 0x4 + .4byte 0x4F757400 .global $$252172 $$252172: - .incbin "baserom.dol", 0x4989F8, 0x8 + .asciz "Close" + .balign 4 diff --git a/asm/src/Point2.s b/asm/src/Point2.s index 0790203d..0b63e831 100644 --- a/asm/src/Point2.s +++ b/asm/src/Point2.s @@ -9,12 +9,13 @@ __sinit_$$3Point2_cpp: /* 8019EC78 0019AAB8 48 00 07 30 */ b set__Q33hel4math7Vector2Fff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40241C, 0x4 + .4byte 0x8019EC6C ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249826 $$249826: - .incbin "baserom.dol", 0x49A388, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global ORIGIN__Q33hel4math6Point2 diff --git a/asm/src/PolyEffect.s b/asm/src/PolyEffect.s index cafc0013..132eb487 100644 --- a/asm/src/PolyEffect.s +++ b/asm/src/PolyEffect.s @@ -1386,30 +1386,35 @@ lbl_80182ED8: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254764 $$254764: - .incbin "baserom.dol", 0x4930C0, 0x4 + .4byte 0x25730000 .global $$254997 $$254997: - .incbin "baserom.dol", 0x4930C4, 0x8 + .asciz "%sTopL" + .balign 4 .global $$255032 $$255032: - .incbin "baserom.dol", 0x4930CC, 0x4 + .4byte 0 .global $$255033 $$255033: - .incbin "baserom.dol", 0x4930D0, 0x8 + .asciz "Start" + .balign 4 .global $$255034 $$255034: - .incbin "baserom.dol", 0x4930D8, 0x8 + .asciz "Main" + .balign 4 .global $$255035 $$255035: - .incbin "baserom.dol", 0x4930E0, 0x4 + .4byte 0x456E6400 .global $$255036 $$255036: - .incbin "baserom.dol", 0x4930E4, 0xC + .asciz "%s%s" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254875 $$254875: - .incbin "baserom.dol", 0x49A180, 0x4 + .4byte 0 .global $$254881 $$254881: - .incbin "baserom.dol", 0x49A184, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/PolyEffectMemManager.s b/asm/src/PolyEffectMemManager.s index 5b452c74..d4e4002c 100644 --- a/asm/src/PolyEffectMemManager.s +++ b/asm/src/PolyEffectMemManager.s @@ -396,4 +396,6 @@ free__Q46effect6detail20PolyEffectMemManager8OneBlockFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249795 $$249795: - .incbin "baserom.dol", 0x44F508, 0x18 + .asciz "PolyEffectMemBlock" + .balign 4 + .4byte 0 diff --git a/asm/src/PosNotifier.s b/asm/src/PosNotifier.s index ac0c320d..3be81dae 100644 --- a/asm/src/PosNotifier.s +++ b/asm/src/PosNotifier.s @@ -138,15 +138,17 @@ lbl_80353C0C: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255814 $$255814: - .incbin "baserom.dol", 0x496E10, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 $$256314: - .incbin "baserom.dol", 0x49D958, 0x4 + .4byte 0 .global $$256336 $$256336: - .incbin "baserom.dol", 0x49D95C, 0x4 + .4byte 0x3E3851EC .global $$256337 $$256337: - .incbin "baserom.dol", 0x49D960, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/PowerCharge.s b/asm/src/PowerCharge.s index a1e86883..f91887cd 100644 --- a/asm/src/PowerCharge.s +++ b/asm/src/PowerCharge.s @@ -327,28 +327,29 @@ lbl_8035401C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254650 $$254650: - .incbin "baserom.dol", 0x49D968, 0x4 + .4byte 0 .global $$254688 $$254688: - .incbin "baserom.dol", 0x49D96C, 0x4 + .4byte 0x41F00000 .global $$254689 $$254689: - .incbin "baserom.dol", 0x49D970, 0x4 + .4byte 0x41400000 .global $$254690 $$254690: - .incbin "baserom.dol", 0x49D974, 0x4 + .4byte 0x43340000 .global $$254691 $$254691: - .incbin "baserom.dol", 0x49D978, 0x4 + .4byte 0x3F000000 .global $$254504 $$254504: - .incbin "baserom.dol", 0x49D97C, 0x4 + .4byte 0xFFFF0000 .global $$254721 $$254721: - .incbin "baserom.dol", 0x49D980, 0x4 + .4byte 0x4222F983 .global $$254722 $$254722: - .incbin "baserom.dol", 0x49D984, 0x4 + .4byte 0x3C8EFA35 .global $$254725 $$254725: - .incbin "baserom.dol", 0x49D988, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/PreLoadReq.s b/asm/src/PreLoadReq.s index 66e5bad1..f591d043 100644 --- a/asm/src/PreLoadReq.s +++ b/asm/src/PreLoadReq.s @@ -101,4 +101,6 @@ lbl_802784FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250582 $$250582: - .incbin "baserom.dol", 0x468978, 0x18 + .asciz "Challengeresult.dn" + .balign 4 + .4byte 0 diff --git a/asm/src/Product.s b/asm/src/Product.s index aaa85cdb..12992814 100644 --- a/asm/src/Product.s +++ b/asm/src/Product.s @@ -381,21 +381,29 @@ __sinit_$$3Product_cpp: /* 8021A3F0 00216230 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40246C, 0x4 + .4byte 0x8021A024 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249032 $$249032: - .incbin "baserom.dol", 0x412158, 0xC + .4byte 0x01010100 + .4byte 0 + .4byte 0 .global $$249039 $$249039: - .incbin "baserom.dol", 0x412164, 0xC + .4byte 0x01010000 + .4byte 0 + .4byte 0 .global $$248746 $$248746: - .incbin "baserom.dol", 0x412170, 0xC + .4byte 0x00000001 + .4byte 0 + .4byte 0 .global $$249050 $$249050: - .incbin "baserom.dol", 0x41217C, 0xC + .4byte 0 + .4byte 0 + .4byte 0x00000101 .section .bss, "wa" # 0x80496700 - 0x805643FC .global PRODUCT_INFO_TABLE__Q43scn7history6detail21$$2unnamed$$2Product_cpp$$2 diff --git a/asm/src/ProgressCtrl.s b/asm/src/ProgressCtrl.s index 680be5ff..428d1094 100644 --- a/asm/src/ProgressCtrl.s +++ b/asm/src/ProgressCtrl.s @@ -327,12 +327,19 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461E38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023F8A0 ;# ptr + .4byte 0x8023F864 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461E48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023F89C ;# ptr + .4byte 0x8023F880 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254746 $$254746: - .incbin "baserom.dol", 0x49B058, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Project.s b/asm/src/Project.s index 689dcf74..bb4fdc42 100644 --- a/asm/src/Project.s +++ b/asm/src/Project.s @@ -100,4 +100,5 @@ listItemName__Q23msg7ProjectCFUsUsUsUs: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249096 $$249096: - .incbin "baserom.dol", 0x4593A8, 0x10 + .asciz "msg/%s.msbp" + .4byte 0 diff --git a/asm/src/PtclEffectManager.s b/asm/src/PtclEffectManager.s index d8df8bbb..58f3764c 100644 --- a/asm/src/PtclEffectManager.s +++ b/asm/src/PtclEffectManager.s @@ -1039,22 +1039,27 @@ lbl_8018567C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$22 $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$22: - .incbin "baserom.dol", 0x44F520, 0x128 + .asciz "NW4R:Failed assertion pp->mParticleManager->GetLifeStatus() == ::nw4r::ef::ReferencedObject::NW4R_EF_LS_ACTIVE || pp->mParticleManager->GetLifeStatus() == ::nw4r::ef::ReferencedObject::NW4R_EF_LS_WAIT || pp->mParticleManager->GetLifeStatus() == ::nw4r::ef::ReferencedObject::NW4R_EF_LS_CLOSING" + .balign 4 .global $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$21 $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$21: - .incbin "baserom.dol", 0x44F648, 0x14 + .asciz "memorymanagertmp.h" + .balign 4 .global $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$20 $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$20: - .incbin "baserom.dol", 0x44F65C, 0x30 + .asciz "NW4R:Failed assertion pp->GetRefCount() == 0" + .balign 4 .global $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv: - .incbin "baserom.dol", 0x44F68C, 0x14 + .asciz "memorymanagertmp.h" + .balign 4 .global $$2STRING$$2ptr__Q34nw4r2ef10ResEmitterFv$$20 $$2STRING$$2ptr__Q34nw4r2ef10ResEmitterFv$$20: - .incbin "baserom.dol", 0x44F6A0, 0x34 + .asciz "NW4R:Pointer Error\nmData(=%p) is not valid pointer." .global $$2STRING$$2ptr__Q34nw4r2ef10ResEmitterFv $$2STRING$$2ptr__Q34nw4r2ef10ResEmitterFv: - .incbin "baserom.dol", 0x44F6D4, 0x14 + .asciz "res_emitter_ac.h" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common53PrivateSingleton$$0Q36effect6detail17PtclEffectManager$$1 diff --git a/asm/src/PtclEffectMemManager.s b/asm/src/PtclEffectMemManager.s index 37223a97..f816d001 100644 --- a/asm/src/PtclEffectMemManager.s +++ b/asm/src/PtclEffectMemManager.s @@ -1163,37 +1163,74 @@ AssignObjectID__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1FPv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef13MemoryManager __vt__Q34nw4r2ef13MemoryManager: - .incbin "baserom.dol", 0x44F6E8, 0x68 + .4byte 0 + .4byte 0 + .4byte 0x80185DD0 ;# ptr + .4byte 0x80184EBC ;# ptr + .4byte 0x80186588 ;# ptr + .4byte 0x80186538 ;# ptr + .4byte 0x801864E0 ;# ptr + .4byte 0x80185294 ;# ptr + .4byte 0x80185304 ;# ptr + .4byte 0x8018644C ;# ptr + .4byte 0x801863FC ;# ptr + .4byte 0x801863A4 ;# ptr + .4byte 0x801852B0 ;# ptr + .4byte 0x80185320 ;# ptr + .4byte 0x80186310 ;# ptr + .4byte 0x801862C0 ;# ptr + .4byte 0x80186268 ;# ptr + .4byte 0x801852CC ;# ptr + .4byte 0x8018533C ;# ptr + .4byte 0x801861C8 ;# ptr + .4byte 0x80186178 ;# ptr + .4byte 0x80186120 ;# ptr + .4byte 0x801852E8 ;# ptr + .4byte 0x80185358 ;# ptr + .4byte 0x80185C38 ;# ptr + .4byte 0x80185F48 ;# ptr .global __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1 __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1: - .incbin "baserom.dol", 0x44F750, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80186258 ;# ptr .global __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1 __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1: - .incbin "baserom.dol", 0x44F75C, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801863A0 ;# ptr .global __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1 __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1: - .incbin "baserom.dol", 0x44F768, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801864DC ;# ptr .global __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1 __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1: - .incbin "baserom.dol", 0x44F774, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80186618 ;# ptr .global $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$22 $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$22: - .incbin "baserom.dol", 0x44F780, 0x90 + .asciz "NW4R:Failed assertion mHeapStartAddr < mHeapEndAddr && reinterpret_cast(mHeapEndAddr) - reinterpret_cast(mHeapStartAddr) > headerSize" .global $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$21 $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$21: - .incbin "baserom.dol", 0x44F810, 0x14 + .asciz "memorymanagertmp.h" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$20 $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$20: - .incbin "baserom.dol", 0x44F824, 0x50 + .asciz "NW4R:Alignment Error(0x%x)\nstartAddress must be aligned to 32 bytes boundary." + .balign 4 .global $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii: - .incbin "baserom.dol", 0x44F874, 0x14 + .asciz "memorymanagertmp.h" + .balign 4 .global $$2STRING$$2AllocHeap__Q34nw4r2ef13MemoryManagerFUl$$20 $$2STRING$$2AllocHeap__Q34nw4r2ef13MemoryManagerFUl$$20: - .incbin "baserom.dol", 0x44F888, 0x1C + .asciz "NW4R:Failed assertion false" .global $$2STRING$$2AllocHeap__Q34nw4r2ef13MemoryManagerFUl $$2STRING$$2AllocHeap__Q34nw4r2ef13MemoryManagerFUl: - .incbin "baserom.dol", 0x44F8A4, 0x14 + .asciz "memorymanagertmp.h" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global isExist___Q33hel6common56PrivateSingleton$$0Q36effect6detail20PtclEffectMemManager$$1 diff --git a/asm/src/PtclEffectRes.s b/asm/src/PtclEffectRes.s index bd70a2f5..dd8a11d9 100644 --- a/asm/src/PtclEffectRes.s +++ b/asm/src/PtclEffectRes.s @@ -423,7 +423,7 @@ lbl_80186B60: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250371 $$250371: - .incbin "baserom.dol", 0x44F8B8, 0x14 + .asciz "effect/%s.breff.cmp" .global $$250372 $$250372: - .incbin "baserom.dol", 0x44F8CC, 0x14 + .asciz "effect/%s.breft.cmp" diff --git a/asm/src/Quake.s b/asm/src/Quake.s index 96225e93..df0e026a 100644 --- a/asm/src/Quake.s +++ b/asm/src/Quake.s @@ -133,4 +133,5 @@ lbl_80266418: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249899 $$249899: - .incbin "baserom.dol", 0x49B690, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/QuakeData.s b/asm/src/QuakeData.s index 490ce896..3ac7412b 100644 --- a/asm/src/QuakeData.s +++ b/asm/src/QuakeData.s @@ -854,82 +854,83 @@ offset__Q43scn4step6camera9QuakeDataCFQ43scn4step6camera9QuakeKindUl: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250464 $$250464: - .incbin "baserom.dol", 0x49B698, 0x4 + .4byte 0 .global $$250465 $$250465: - .incbin "baserom.dol", 0x49B69C, 0x4 + .4byte 0x3CF5C28F .global $$250466 $$250466: - .incbin "baserom.dol", 0x49B6A0, 0x4 + .4byte 0xBCF5C28F .global $$250467 $$250467: - .incbin "baserom.dol", 0x49B6A4, 0x4 + .4byte 0x3D4CCCCD .global $$250468 $$250468: - .incbin "baserom.dol", 0x49B6A8, 0x4 + .4byte 0xBD4CCCCD .global $$250469 $$250469: - .incbin "baserom.dol", 0x49B6AC, 0x4 + .4byte 0x3D8F5C29 .global $$250470 $$250470: - .incbin "baserom.dol", 0x49B6B0, 0x4 + .4byte 0xBD8F5C29 .global $$250471 $$250471: - .incbin "baserom.dol", 0x49B6B4, 0x4 + .4byte 0x3D75C28F .global $$250472 $$250472: - .incbin "baserom.dol", 0x49B6B8, 0x4 + .4byte 0xBD75C28F .global $$250473 $$250473: - .incbin "baserom.dol", 0x49B6BC, 0x4 + .4byte 0x3DF5C28F .global $$250474 $$250474: - .incbin "baserom.dol", 0x49B6C0, 0x4 + .4byte 0xBDF5C28F .global $$250475 $$250475: - .incbin "baserom.dol", 0x49B6C4, 0x4 + .4byte 0x3DCCCCCD .global $$250476 $$250476: - .incbin "baserom.dol", 0x49B6C8, 0x4 + .4byte 0xBDCCCCCD .global $$250477 $$250477: - .incbin "baserom.dol", 0x49B6CC, 0x4 + .4byte 0x3E4CCCCD .global $$250478 $$250478: - .incbin "baserom.dol", 0x49B6D0, 0x4 + .4byte 0xBE4CCCCD .global $$250479 $$250479: - .incbin "baserom.dol", 0x49B6D4, 0x4 + .4byte 0x3DA3D70A .global $$250480 $$250480: - .incbin "baserom.dol", 0x49B6D8, 0x4 + .4byte 0xBDA3D70A .global $$250481 $$250481: - .incbin "baserom.dol", 0x49B6DC, 0x4 + .4byte 0x3E23D70A .global $$250482 $$250482: - .incbin "baserom.dol", 0x49B6E0, 0x4 + .4byte 0xBE23D70A .global $$250483 $$250483: - .incbin "baserom.dol", 0x49B6E4, 0x4 + .4byte 0x3E75C28F .global $$250484 $$250484: - .incbin "baserom.dol", 0x49B6E8, 0x4 + .4byte 0xBE75C28F .global $$250485 $$250485: - .incbin "baserom.dol", 0x49B6EC, 0x4 + .4byte 0x3E99999A .global $$250486 $$250486: - .incbin "baserom.dol", 0x49B6F0, 0x4 + .4byte 0xBE99999A .global $$250487 $$250487: - .incbin "baserom.dol", 0x49B6F4, 0x4 + .4byte 0x3ECCCCCD .global $$250488 $$250488: - .incbin "baserom.dol", 0x49B6F8, 0x4 + .4byte 0xBECCCCCD .global $$250489 $$250489: - .incbin "baserom.dol", 0x49B6FC, 0x4 + .4byte 0xBF000000 .global $$250490 $$250490: - .incbin "baserom.dol", 0x49B700, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/Radar.s b/asm/src/Radar.s index 543b5e6b..31a44a01 100644 --- a/asm/src/Radar.s +++ b/asm/src/Radar.s @@ -375,47 +375,60 @@ lbl_803B537C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252323 $$252323: - .incbin "baserom.dol", 0x48C810, 0x14 + .asciz "step/challenge/Main" .global $$252324 $$252324: - .incbin "baserom.dol", 0x48C824, 0xC + .asciz "Interval" + .balign 4 .global $$252325 $$252325: - .incbin "baserom.dol", 0x48C830, 0xC + .asciz "KirbyIconN" + .balign 4 .global $$252326 $$252326: - .incbin "baserom.dol", 0x48C83C, 0x10 + .asciz "MahoroaIconN" + .balign 4 .global $$252329 $$252329: - .incbin "baserom.dol", 0x48C84C, 0xC + .asciz "Radar_Start" .global $$252331 $$252331: - .incbin "baserom.dol", 0x48C858, 0x40 + .asciz "Radar_Goal" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252328 $$252328: - .incbin "baserom.dol", 0x497C60, 0x8 + .asciz "Start" + .balign 4 .global $$252330 $$252330: - .incbin "baserom.dol", 0x497C68, 0x8 + .asciz "Goal" + .balign 4 .global $$252332 $$252332: - .incbin "baserom.dol", 0x497C70, 0x8 + .asciz "StartN" + .balign 4 .global $$252333 $$252333: - .incbin "baserom.dol", 0x497C78, 0x8 + .asciz "GoalN" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252327 $$252327: - .incbin "baserom.dol", 0x49E490, 0x4 + .4byte 0 .global $$252401 $$252401: - .incbin "baserom.dol", 0x49E494, 0x4 + .4byte 0x3F800000 .global $$252436 $$252436: - .incbin "baserom.dol", 0x49E498, 0x4 + .4byte 0x40000000 .global $$252437 $$252437: - .incbin "baserom.dol", 0x49E49C, 0x4 + .4byte 0x3E800000 diff --git a/asm/src/RadarIcon.s b/asm/src/RadarIcon.s index 59e53617..098093c4 100644 --- a/asm/src/RadarIcon.s +++ b/asm/src/RadarIcon.s @@ -60,10 +60,16 @@ appear__Q53scn4step4info9challenge9RadarIconFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251919 $$251919: - .incbin "baserom.dol", 0x48C898, 0x14 + .asciz "step/challenge/Main" .global $$251920 $$251920: - .incbin "baserom.dol", 0x48C8AC, 0xC + .asciz "MahoroaIcon" .global $$251921 $$251921: - .incbin "baserom.dol", 0x48C8B8, 0x40 + .asciz "KirbyIcon" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 diff --git a/asm/src/Random.s b/asm/src/Random.s index 3e7b5da4..5c531544 100644 --- a/asm/src/Random.s +++ b/asm/src/Random.s @@ -416,16 +416,17 @@ randCoreF32__Q33hel4math6RandomFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249032 $$249032: - .incbin "baserom.dol", 0x49A390, 0x4 + .4byte 0 .global $$249057 $$249057: - .incbin "baserom.dol", 0x49A394, 0x4 + .4byte 0xBF800000 .global $$249058 $$249058: - .incbin "baserom.dol", 0x49A398, 0x4 + .4byte 0x40000000 .global $$249069 $$249069: - .incbin "baserom.dol", 0x49A39C, 0x4 + .4byte 0x47800000 .global $$249072 $$249072: - .incbin "baserom.dol", 0x49A3A0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/Ranking.s b/asm/src/Ranking.s index ea869744..21426456 100644 --- a/asm/src/Ranking.s +++ b/asm/src/Ranking.s @@ -694,63 +694,83 @@ lbl_803BF41C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253816 $$253816: - .incbin "baserom.dol", 0x48DA20, 0x14 + .asciz "RankingWindowBase" + .balign 4 .global $$253818 $$253818: - .incbin "baserom.dol", 0x48DA34, 0x1C + .asciz "step/challenge/Challenge" + .balign 4 .global $$254052 $$254052: - .incbin "baserom.dol", 0x48DA50, 0x14 + .asciz "RankingWindowMaster" .global $$254053 $$254053: - .incbin "baserom.dol", 0x48DA64, 0x14 + .asciz "RankingWindowMusou" + .balign 4 .global $$254054 $$254054: - .incbin "baserom.dol", 0x48DA78, 0x18 + .asciz "RankingWindowChallenge" + .balign 4 .global $$254055 $$254055: - .incbin "baserom.dol", 0x48DA90, 0x10 + .asciz "WindowPictureN" + .balign 4 .global $$254058 $$254058: - .incbin "baserom.dol", 0x48DAA0, 0xC + .asciz "Plate%dN" + .balign 4 .global $$254061 $$254061: - .incbin "baserom.dol", 0x48DAAC, 0x10 + .asciz "ExplainRanking" + .balign 4 .global $$254062 $$254062: - .incbin "baserom.dol", 0x48DABC, 0x10 + .asciz "RankingShadow" + .balign 4 .global $$254064 $$254064: - .incbin "baserom.dol", 0x48DACC, 0x44 + .asciz "ExplainRankingMsg" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253815 $$253815: - .incbin "baserom.dol", 0x498048, 0x8 + .asciz "Base" + .balign 4 .global $$253817 $$253817: - .incbin "baserom.dol", 0x498050, 0x8 + .asciz "BackN" + .balign 4 .global $$253819 $$253819: - .incbin "baserom.dol", 0x498058, 0x8 + .asciz "TopN" + .balign 4 .global $$254051 $$254051: - .incbin "baserom.dol", 0x498060, 0x8 + .asciz "Open" + .balign 4 .global $$254056 $$254056: - .incbin "baserom.dol", 0x498068, 0x8 + .asciz "BGStarN" .global $$254057 $$254057: - .incbin "baserom.dol", 0x498070, 0x8 + .asciz "Wait" + .balign 4 .global $$254059 $$254059: - .incbin "baserom.dol", 0x498078, 0x8 + .asciz "MedalN" + .balign 4 .global $$254060 $$254060: - .incbin "baserom.dol", 0x498080, 0x8 + .asciz "Ranking" .global $$254063 $$254063: - .incbin "baserom.dol", 0x498088, 0x8 + .asciz "Explain" .global $$254118 $$254118: - .incbin "baserom.dol", 0x498090, 0x8 + .asciz "Close" + .balign 4 diff --git a/asm/src/RankingPanel.s b/asm/src/RankingPanel.s index aa699547..f985e5bb 100644 --- a/asm/src/RankingPanel.s +++ b/asm/src/RankingPanel.s @@ -297,66 +297,81 @@ updateFrame__Q53scn4step4info5lvmap12RankingPanelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252661 $$252661: - .incbin "baserom.dol", 0x48DB10, 0x18 + .asciz "step/challengeship/Main" .global $$252663 $$252663: - .incbin "baserom.dol", 0x48DB28, 0x10 + .asciz "PlayerIconN" + .4byte 0 .global $$252664 $$252664: - .incbin "baserom.dol", 0x48DB38, 0x10 + .asciz "TotalScoreBaseN" .global $$252665 $$252665: - .incbin "baserom.dol", 0x48DB48, 0xC + .asciz "RankingN" + .balign 4 .global $$252742 $$252742: - .incbin "baserom.dol", 0x48DB54, 0xC + .asciz "FileKirby1" + .balign 4 .global $$252744 $$252744: - .incbin "baserom.dol", 0x48DB60, 0xC + .asciz "FileKirby2" + .balign 4 .global $$252746 $$252746: - .incbin "baserom.dol", 0x48DB6C, 0xC + .asciz "FileKirby3" + .balign 4 .global $$252748 $$252748: - .incbin "baserom.dol", 0x48DB78, 0x40 + .asciz "FileMahoroa" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252660 $$252660: - .incbin "baserom.dol", 0x498098, 0x8 + .asciz "Plate" + .balign 4 .global $$252662 $$252662: - .incbin "baserom.dol", 0x4980A0, 0x8 + .asciz "Ranking" .global $$252734 $$252734: - .incbin "baserom.dol", 0x4980A8, 0x4 + .4byte 0x31737400 .global $$252735 $$252735: - .incbin "baserom.dol", 0x4980AC, 0x4 + .4byte 0x31000000 .global $$252736 $$252736: - .incbin "baserom.dol", 0x4980B0, 0x4 + .4byte 0x326E6400 .global $$252737 $$252737: - .incbin "baserom.dol", 0x4980B4, 0x4 + .4byte 0x32000000 .global $$252738 $$252738: - .incbin "baserom.dol", 0x4980B8, 0x4 + .4byte 0x33726400 .global $$252739 $$252739: - .incbin "baserom.dol", 0x4980BC, 0x4 + .4byte 0x33000000 .global $$252740 $$252740: - .incbin "baserom.dol", 0x4980C0, 0x8 + .asciz "Kirby1" + .balign 4 .global $$252741 $$252741: - .incbin "baserom.dol", 0x4980C8, 0x8 + .asciz "Name" + .balign 4 .global $$252743 $$252743: - .incbin "baserom.dol", 0x4980D0, 0x8 + .asciz "Kirby2" + .balign 4 .global $$252745 $$252745: - .incbin "baserom.dol", 0x4980D8, 0x8 + .asciz "Kirby3" + .balign 4 .global $$252747 $$252747: - .incbin "baserom.dol", 0x4980E0, 0x8 + .asciz "Mahoroa" diff --git a/asm/src/RayChecker.s b/asm/src/RayChecker.s index 5e989eac..e49c1344 100644 --- a/asm/src/RayChecker.s +++ b/asm/src/RayChecker.s @@ -544,10 +544,11 @@ lbl_801BCCCC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251870 $$251870: - .incbin "baserom.dol", 0x49A6E0, 0x4 + .4byte 0 .global $$251871 $$251871: - .incbin "baserom.dol", 0x49A6E4, 0x4 + .4byte 0xFF7FFFFF .global $$251872 $$251872: - .incbin "baserom.dol", 0x49A6E8, 0x8 + .4byte 0x7F7FFFFF + .4byte 0 diff --git a/asm/src/ReceiverBase.s b/asm/src/ReceiverBase.s index 762b1c8e..4545a314 100644 --- a/asm/src/ReceiverBase.s +++ b/asm/src/ReceiverBase.s @@ -259,22 +259,45 @@ handle__Q34util42ObjRefHandle$$0Q43scn4step6vacuum9IReceiver$$15OwnerFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6vacuum12ReceiverBase __vt__Q43scn4step6vacuum12ReceiverBase: - .incbin "baserom.dol", 0x48EF40, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x803D3328 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80236568 ;# ptr + .4byte 0x80236564 ;# ptr + .4byte 0x80236560 ;# ptr + .4byte 0x8023655C ;# ptr + .4byte 0x80236554 ;# ptr + .4byte 0x80236550 ;# ptr + .4byte 0x8023654C ;# ptr + .4byte 0x80236548 ;# ptr + .4byte 0x80236544 ;# ptr + .4byte 0x80236540 ;# ptr + .4byte 0x80236558 ;# ptr + .4byte 0x803D33A8 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x48EF88, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x48EFAC, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x48EFB8, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x48EFDC, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x48EFE8, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x48F00C, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/Rect.s b/asm/src/Rect.s index d81795c1..d309ccc5 100644 --- a/asm/src/Rect.s +++ b/asm/src/Rect.s @@ -359,10 +359,11 @@ lbl_801A01E4: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249898 $$249898: - .incbin "baserom.dol", 0x49A3E8, 0x4 + .4byte 0 .global $$249917 $$249917: - .incbin "baserom.dol", 0x49A3EC, 0x4 + .4byte 0x3F000000 .global $$249954 $$249954: - .incbin "baserom.dol", 0x49A3F0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Regset.s b/asm/src/Regset.s index 5895f30f..4a24d500 100644 --- a/asm/src/Regset.s +++ b/asm/src/Regset.s @@ -2241,95 +2241,202 @@ lbl_801C86FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251070 $$251070: - .incbin "baserom.dol", 0x457F98, 0xC + .asciz "Regset.cpp" + .balign 4 .global $$251071 $$251071: - .incbin "baserom.dol", 0x457FA4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$251100 $$251100: - .incbin "baserom.dol", 0x457FB8, 0x40 + .4byte 0x5B657272 + .4byte 0x6F725D20 + .4byte 0x73722564 + .4byte 0x203D2025 + .4byte 0x64202F20 + .4byte 0x2564203A + .4byte 0x20444956 + .4byte 0x49333296 + .4byte 0xBD97DF82 + .4byte 0xC982C481 + .4byte 0x41308F9C + .4byte 0x8E5A82AA + .4byte 0x8EC08D73 + .4byte 0x82B382EA + .4byte 0x82DC82B5 + .4byte 0x82BD0A00 .global $$251120 $$251120: - .incbin "baserom.dol", 0x457FF8, 0x40 + .4byte 0x5B657272 + .4byte 0x6F725D20 + .4byte 0x73722564 + .4byte 0x203D2025 + .4byte 0x66202F20 + .4byte 0x2566203A + .4byte 0x20444956 + .4byte 0x46333296 + .4byte 0xBD97DF82 + .4byte 0xC982C481 + .4byte 0x41308F9C + .4byte 0x8E5A82AA + .4byte 0x8EC08D73 + .4byte 0x82B382EA + .4byte 0x82DC82B5 + .4byte 0x82BD0A00 .global $$251201 $$251201: - .incbin "baserom.dol", 0x458038, 0x44 + .4byte 0x5B657272 + .4byte 0x6F725D20 + .4byte 0x7969656C + .4byte 0x64282564 + .4byte 0x29203A20 + .4byte 0x7969656C + .4byte 0x6496BD97 + .4byte 0xDF82C993 + .4byte 0x6E82B792 + .4byte 0x6C82CD30 + .4byte 0x88C88FE3 + .4byte 0x82C596B3 + .4byte 0x82AF82EA + .4byte 0x82CE82C8 + .4byte 0x82E882DC + .4byte 0x82B982F1 + .4byte 0x0A000000 .global $$251224 $$251224: - .incbin "baserom.dol", 0x45807C, 0x48 + .4byte 0x5B657272 + .4byte 0x6F725D20 + .4byte 0x41727261 + .4byte 0x792E6C65 + .4byte 0x6E677468 + .4byte 0x203D3D20 + .4byte 0x2564203A + .4byte 0x20947A97 + .4byte 0xF182C993 + .4byte 0x6E82B382 + .4byte 0xEA82BD83 + .4byte 0x54834383 + .4byte 0x5982AA90 + .4byte 0xB382B582 + .4byte 0xAD82A082 + .4byte 0xE882DC82 + .4byte 0xB982F10A + .4byte 0 .global $$251229 $$251229: - .incbin "baserom.dol", 0x4580C4, 0x54 + .4byte 0x5B657272 + .4byte 0x6F725D20 + .4byte 0x947A97F1 + .4byte 0x82CC8BAB + .4byte 0x8A458A4F + .4byte 0x82C582B7 + .asciz " -> a[%d] (a.length=%d)\n ^^^\n" + .balign 4 .global $$251251 $$251251: - .incbin "baserom.dol", 0x458118, 0x10 + .asciz "=== Regset ===\n" .global $$251252 $$251252: - .incbin "baserom.dol", 0x458128, 0xC + .asciz "-- main --\n" .global $$251253 $$251253: - .incbin "baserom.dol", 0x458134, 0x14 + .asciz "pc = %p\n" + .balign 4 .global $$251254 $$251254: - .incbin "baserom.dol", 0x458148, 0x14 + .asciz "lr = %p\n" + .balign 4 .global $$251255 $$251255: - .incbin "baserom.dol", 0x45815C, 0x18 + .asciz "stack_head = %p(%d)\n" + .balign 4 .global $$251256 $$251256: - .incbin "baserom.dol", 0x458174, 0x14 + .asciz "srp = %u\n" + .balign 4 .global $$251257 $$251257: - .incbin "baserom.dol", 0x458188, 0x14 + .asciz "sp = %u\n" + .balign 4 .global $$251258 $$251258: - .incbin "baserom.dol", 0x45819C, 0x10 + .asciz "-- stack --\n" + .balign 4 .global $$251263 $$251263: - .incbin "baserom.dol", 0x4581AC, 0xC + .asciz "-- fr --\n" + .balign 4 .global $$251264 $$251264: - .incbin "baserom.dol", 0x4581B8, 0xC + .asciz "%08x(%2d) " + .balign 4 .global __vt__Q26mintvm6Regset __vt__Q26mintvm6Regset: - .incbin "baserom.dol", 0x4581C4, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801C0838 ;# ptr .global __vt__Q26mintvm8RNObject __vt__Q26mintvm8RNObject: - .incbin "baserom.dol", 0x4581D0, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x801C0928 ;# ptr + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 .global $$2STRING$$2spInc__Q26mintvm6RegsetFUi$$20 $$2STRING$$2spInc__Q26mintvm6RegsetFUi$$20: - .incbin "baserom.dol", 0x45822C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2spInc__Q26mintvm6RegsetFUi $$2STRING$$2spInc__Q26mintvm6RegsetFUi: - .incbin "baserom.dol", 0x458240, 0xC + .asciz "Regset.hpp" + .balign 4 .global $$2STRING$$2spDec__Q26mintvm6RegsetFUi$$20 $$2STRING$$2spDec__Q26mintvm6RegsetFUi$$20: - .incbin "baserom.dol", 0x45824C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2spDec__Q26mintvm6RegsetFUi $$2STRING$$2spDec__Q26mintvm6RegsetFUi: - .incbin "baserom.dol", 0x458260, 0x38 + .asciz "Regset.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "ExplicitSingleton.hpp" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251259 $$251259: - .incbin "baserom.dol", 0x493938, 0x8 + .asciz "%3d : " + .balign 4 .global $$251260 $$251260: - .incbin "baserom.dol", 0x493940, 0x8 + .asciz "%08x" + .balign 4 .global $$251261 $$251261: - .incbin "baserom.dol", 0x493948, 0x8 + .asciz "(%2d) " + .balign 4 .global $$251262 $$251262: - .incbin "baserom.dol", 0x493950, 0x8 + .4byte 0x0A000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251099 $$251099: - .incbin "baserom.dol", 0x49A728, 0x8 + .4byte 0 + .4byte 0 .global $$251103 $$251103: - .incbin "baserom.dol", 0x49A730, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$251123 $$251123: - .incbin "baserom.dol", 0x49A738, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/RenderSetting.s b/asm/src/RenderSetting.s index 438129c2..6df03b31 100644 --- a/asm/src/RenderSetting.s +++ b/asm/src/RenderSetting.s @@ -819,16 +819,18 @@ endAABottomHalf__Q23gfx13RenderSettingFPv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248878 $$248878: - .incbin "baserom.dol", 0x49A260, 0x4 + .4byte 0x000000FF .global $$249375 $$249375: - .incbin "baserom.dol", 0x49A264, 0x4 + .4byte 0 .global $$249379 $$249379: - .incbin "baserom.dol", 0x49A268, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$249423 $$249423: - .incbin "baserom.dol", 0x49A270, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global garbage__27$$2unnamed$$2RenderSetting_cpp$$2 diff --git a/asm/src/RequestArgOption.s b/asm/src/RequestArgOption.s index 08ac2997..a7050c72 100644 --- a/asm/src/RequestArgOption.s +++ b/asm/src/RequestArgOption.s @@ -241,7 +241,7 @@ node__Q36effect6detail16RequestArgOptionCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global DEFAULT_SCALE__Q36effect6detail16RequestArgOption DEFAULT_SCALE__Q36effect6detail16RequestArgOption: - .incbin "baserom.dol", 0x49A188, 0x4 + .4byte 0x3F800000 .global $$252276 $$252276: - .incbin "baserom.dol", 0x49A18C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/Requestor.s b/asm/src/Requestor.s index 070ffc8c..f939ddd4 100644 --- a/asm/src/Requestor.s +++ b/asm/src/Requestor.s @@ -914,19 +914,25 @@ isActive__Q43scn4step5ostop9RequestorCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x44F360, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x44F384, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x44F390, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x44F3B4, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x44F3C0, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1Fv: - .incbin "baserom.dol", 0x44F3E4, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/ResFile.s b/asm/src/ResFile.s index 48f28d0f..ce61610b 100644 --- a/asm/src/ResFile.s +++ b/asm/src/ResFile.s @@ -148,10 +148,13 @@ lbl_8019341C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249003 $$249003: - .incbin "baserom.dol", 0x450918, 0x14 + .asciz "g3d/%s.brres.cmp" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r3g3d7ResFileFPv$$20 $$2STRING$$2__ct__Q34nw4r3g3d7ResFileFPv$$20: - .incbin "baserom.dol", 0x45092C, 0x28 + .asciz "NW4R:Failed assertion !((u32)p & 0x1f)" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r3g3d7ResFileFPv $$2STRING$$2__ct__Q34nw4r3g3d7ResFileFPv: - .incbin "baserom.dol", 0x450954, 0x14 + .asciz "g3d_resfile_ac.h" + .balign 4 diff --git a/asm/src/ResFileAccessor.s b/asm/src/ResFileAccessor.s index b36d93c4..6823da0e 100644 --- a/asm/src/ResFileAccessor.s +++ b/asm/src/ResFileAccessor.s @@ -266,10 +266,13 @@ lbl_80193744: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249610 $$249610: - .incbin "baserom.dol", 0x450968, 0xC + .asciz "%s.autoreq" + .balign 4 .global $$2STRING$$2__ct__Q34nw4r3g3d6ResMdlFPv$$20 $$2STRING$$2__ct__Q34nw4r3g3d6ResMdlFPv$$20: - .incbin "baserom.dol", 0x450974, 0x2C + .asciz "NW4R:Failed assertion !((u32)p & 0x1f)" + .balign 4 + .4byte 0 .global $$2STRING$$2__ct__Q34nw4r3g3d6ResMdlFPv $$2STRING$$2__ct__Q34nw4r3g3d6ResMdlFPv: - .incbin "baserom.dol", 0x4509A0, 0x10 + .asciz "g3d_resmdl_ac.h" diff --git a/asm/src/ResModelContext.s b/asm/src/ResModelContext.s index d5f7d6a4..4fe937fd 100644 --- a/asm/src/ResModelContext.s +++ b/asm/src/ResModelContext.s @@ -39,7 +39,9 @@ lbl_80193D0C: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249029 $$249029: - .incbin "baserom.dol", 0x4931C0, 0x8 + .asciz "Model" + .balign 4 .global $$249041 $$249041: - .incbin "baserom.dol", 0x4931C8, 0x8 + .4byte 0x25730000 + .4byte 0 diff --git a/asm/src/ResNode.s b/asm/src/ResNode.s index 8d0f2246..e29eeeb8 100644 --- a/asm/src/ResNode.s +++ b/asm/src/ResNode.s @@ -178,24 +178,31 @@ rotate__Q23g3d7ResNodeCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv$$20: - .incbin "baserom.dol", 0x4509B0, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv: - .incbin "baserom.dol", 0x4509CC, 0x14 + .asciz "g3d_resnode_ac.h" + .balign 4 .global $$2STRING$$2GetID__Q34nw4r3g3d7ResNodeCFv$$20 $$2STRING$$2GetID__Q34nw4r3g3d7ResNodeCFv$$20: - .incbin "baserom.dol", 0x4509E0, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2GetID__Q34nw4r3g3d7ResNodeCFv $$2STRING$$2GetID__Q34nw4r3g3d7ResNodeCFv: - .incbin "baserom.dol", 0x450A00, 0x18 + .asciz "g3d_resnode_ac.h" + .balign 4 + .4byte 0 .global $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv$$20 $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv$$20: - .incbin "baserom.dol", 0x450A18, 0x20 + .asciz "NW4R:Failed assertion IsValid()" .global $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv: - .incbin "baserom.dol", 0x450A38, 0x18 + .asciz "g3d_resnode_ac.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$30525 __FUNCTION__$30525: - .incbin "baserom.dol", 0x4931D0, 0x8 + .4byte 0x72656600 + .4byte 0 diff --git a/asm/src/Reset.s b/asm/src/Reset.s index e6f14cb9..5aee52df 100644 --- a/asm/src/Reset.s +++ b/asm/src/Reset.s @@ -469,18 +469,20 @@ dvdCheckDiskCallback__Q23app5ResetFlP15DVDCommandBlock: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250602 $$250602: - .incbin "baserom.dol", 0x493098, 0x4 + .4byte 0 .global $$250603 $$250603: - .incbin "baserom.dol", 0x49309C, 0x4 + .4byte 0x437F0000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251058 $$251058: - .incbin "baserom.dol", 0x49A118, 0x8 + .4byte 0x41A00000 + .4byte 0 .global $$251061 $$251061: - .incbin "baserom.dol", 0x49A120, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global tIsPushedReset__Q23app19$$2unnamed$$2Reset_cpp$$2 diff --git a/asm/src/ResidentFile.s b/asm/src/ResidentFile.s index 46d354e8..e348cc0d 100644 --- a/asm/src/ResidentFile.s +++ b/asm/src/ResidentFile.s @@ -245,15 +245,20 @@ lbl_8017B500: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251961 $$251961: - .incbin "baserom.dol", 0x44F120, 0x1C + .asciz "lyt/resident/Main.arc.cmp" + .balign 4 .global $$252401 $$252401: - .incbin "baserom.dol", 0x44F13C, 0x18 + .asciz "ResidentFileLoadThread" + .balign 4 .global $$252478 $$252478: - .incbin "baserom.dol", 0x44F154, 0x14 + .asciz "Resident.msbt" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2 T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2: - .incbin "baserom.dol", 0x49A128, 0x8 + .4byte 0x80453020 + .4byte 0 diff --git a/asm/src/ResourceFileName.s b/asm/src/ResourceFileName.s index fd5b21de..af081870 100644 --- a/asm/src/ResourceFileName.s +++ b/asm/src/ResourceFileName.s @@ -37,53 +37,60 @@ lbl_8019D884: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: - .incbin "baserom.dol", 0x452A30, 0x14 + .asciz "hbm/homeBtn_ENG.arc" .global $$248728 $$248728: - .incbin "baserom.dol", 0x452A44, 0x14 + .asciz "hbm/homeBtn_FRA.arc" .global $$248729 $$248729: - .incbin "baserom.dol", 0x452A58, 0x14 + .asciz "hbm/homeBtn_SPA.arc" .global $$248732 $$248732: - .incbin "baserom.dol", 0x452A6C, 0x14 + .asciz "hbm/home_nosave.csv" .global $$248733 $$248733: - .incbin "baserom.dol", 0x452A80, 0x10 + .asciz "hbm/home.csv" + .balign 4 .global $$248734 $$248734: - .incbin "baserom.dol", 0x452A90, 0x10 + .asciz "hbm/config.txt" + .balign 4 .global $$248735 $$248735: - .incbin "baserom.dol", 0x452AA0, 0x14 + .asciz "hbm/SpeakerSe.arc" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x452AB4, 0x1C + .asciz "hbm/HomeButtonSe.arc" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .incbin "baserom.dol", 0x493228, 0x4 + .4byte 0x80456930 .global LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .incbin "baserom.dol", 0x49322C, 0x4 + .4byte 0x80456944 .global LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .incbin "baserom.dol", 0x493230, 0x4 + .4byte 0x80456958 .global MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .incbin "baserom.dol", 0x493234, 0x4 + .4byte 0x8045696C .global MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .incbin "baserom.dol", 0x493238, 0x8 + .4byte 0x80456980 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global CONFIG_FILENAME__Q23hbm16ResourceFileName CONFIG_FILENAME__Q23hbm16ResourceFileName: - .incbin "baserom.dol", 0x49A358, 0x4 + .4byte 0x80456990 .global SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName: - .incbin "baserom.dol", 0x49A35C, 0x4 + .4byte 0x804569A0 .global SE_FILENAME__Q23hbm16ResourceFileName SE_FILENAME__Q23hbm16ResourceFileName: - .incbin "baserom.dol", 0x49A360, 0x8 + .4byte 0x804569B4 + .4byte 0 diff --git a/asm/src/Result.s b/asm/src/Result.s index b6ab8380..dcb4c310 100644 --- a/asm/src/Result.s +++ b/asm/src/Result.s @@ -2868,297 +2868,430 @@ hideIcons__Q63scn4step4info9challenge12masterresult6ResultFRQ23lyt6Layout: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253563 $$253563: - .incbin "baserom.dol", 0x48C9D0, 0x14 + .asciz "ResultBonusClear" + .balign 4 .global $$253564 $$253564: - .incbin "baserom.dol", 0x48C9E4, 0x18 + .asciz "ResultBonusMasterClear" + .balign 4 .global $$253565 $$253565: - .incbin "baserom.dol", 0x48C9FC, 0x18 + .asciz "ResultBonusMasterTime" + .balign 4 .global $$253566 $$253566: - .incbin "baserom.dol", 0x48CA14, 0x14 + .asciz "ResultBonusTime3" + .balign 4 .global $$253567 $$253567: - .incbin "baserom.dol", 0x48CA28, 0x14 + .asciz "ResultBonusTime4" + .balign 4 .global $$253568 $$253568: - .incbin "baserom.dol", 0x48CA3C, 0x14 + .asciz "ResultBonusDestroy" + .balign 4 .global $$253569 $$253569: - .incbin "baserom.dol", 0x48CA50, 0x14 + .asciz "ResultBonusNoDamage" .global $$253570 $$253570: - .incbin "baserom.dol", 0x48CA64, 0x14 + .asciz "ResultBonusDying" + .balign 4 .global $$253571 $$253571: - .incbin "baserom.dol", 0x48CA78, 0x18 + .asciz "ResultBonusCoinComplete" .global T_BONUS_MESSAGE_LABEL__Q63scn4step4info9challenge12masterresult20$$2unnamed$$2Result_cpp$$2 T_BONUS_MESSAGE_LABEL__Q63scn4step4info9challenge12masterresult20$$2unnamed$$2Result_cpp$$2: - .incbin "baserom.dol", 0x48CA90, 0x24 + .4byte 0x804908D0 + .4byte 0x804908E4 + .4byte 0x804908FC + .4byte 0x80490914 + .4byte 0x80490928 + .4byte 0x8049093C + .4byte 0x80490950 + .4byte 0x80490964 + .4byte 0x80490978 .global $$257484 $$257484: - .incbin "baserom.dol", 0x48CAB4, 0x14 + .asciz "masterresult/Main" + .balign 4 .global $$257485 $$257485: - .incbin "baserom.dol", 0x48CAC8, 0x10 + .asciz "Result02Master" + .balign 4 .global $$257486 $$257486: - .incbin "baserom.dol", 0x48CAD8, 0x14 + .asciz "step/challenge/Main" .global $$257488 $$257488: - .incbin "baserom.dol", 0x48CAEC, 0x10 + .asciz "RsultTotalScrN" + .balign 4 .global $$257490 $$257490: - .incbin "baserom.dol", 0x48CAFC, 0x10 + .asciz "LankingWindow" + .balign 4 .global $$257492 $$257492: - .incbin "baserom.dol", 0x48CB0C, 0xC + .asciz "GhostPlay" + .balign 4 .global $$257493 $$257493: - .incbin "baserom.dol", 0x48CB18, 0xC + .asciz "common/Main" .global $$257494 $$257494: - .incbin "baserom.dol", 0x48CB24, 0x10 + .asciz "CommonButton" + .balign 4 .global $$257495 $$257495: - .incbin "baserom.dol", 0x48CB34, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$257496 $$257496: - .incbin "baserom.dol", 0x48CB40, 0xC + .asciz "BreakDownN" + .balign 4 .global $$257497 $$257497: - .incbin "baserom.dol", 0x48CB4C, 0xC + .asciz "BreakDown" + .balign 4 .global $$257498 $$257498: - .incbin "baserom.dol", 0x48CB58, 0x10 + .asciz "BreakDownWinN" + .balign 4 .global $$257500 $$257500: - .incbin "baserom.dol", 0x48CB68, 0x10 + .asciz "ResultMenu_End" + .balign 4 .global $$257501 $$257501: - .incbin "baserom.dol", 0x48CB78, 0x18 + .asciz "ResultMenu_Retry" + .balign 4 + .4byte 0 .global $$257502 $$257502: - .incbin "baserom.dol", 0x48CB90, 0x10 + .asciz "ResultMenu_Hint" .global $$257503 $$257503: - .incbin "baserom.dol", 0x48CBA0, 0x10 + .asciz "ConfirmWindow" + .balign 4 .global $$257504 $$257504: - .incbin "baserom.dol", 0x48CBB0, 0x10 + .asciz "SelectGhost" + .4byte 0 .global $$257505 $$257505: - .incbin "baserom.dol", 0x48CBC0, 0x10 + .asciz "SelectGhost_Yes" .global $$257506 $$257506: - .incbin "baserom.dol", 0x48CBD0, 0x10 + .asciz "SelectGhost_No" + .balign 4 .global $$257508 $$257508: - .incbin "baserom.dol", 0x48CBE0, 0xC + .asciz "ResultParts" .global $$257509 $$257509: - .incbin "baserom.dol", 0x48CBEC, 0xC + .asciz "Score%02dN" + .balign 4 .global $$257510 $$257510: - .incbin "baserom.dol", 0x48CBF8, 0xC + .asciz "FilePlate" + .balign 4 .global $$257511 $$257511: - .incbin "baserom.dol", 0x48CC04, 0x10 + .asciz "FilePlate%02dN" + .balign 4 .global $$257512 $$257512: - .incbin "baserom.dol", 0x48CC14, 0xC + .asciz "PlayerIcon" + .balign 4 .global $$257513 $$257513: - .incbin "baserom.dol", 0x48CC20, 0xC + .asciz "PlayerIconN" .global $$257514 $$257514: - .incbin "baserom.dol", 0x48CC2C, 0xC + .asciz "CommonText" + .balign 4 .global $$257516 $$257516: - .incbin "baserom.dol", 0x48CC38, 0x10 + .asciz "ResultScoreList" .global $$257521 $$257521: - .incbin "baserom.dol", 0x48CC48, 0x10 + .asciz "TimeBonusText" + .balign 4 .global $$257523 $$257523: - .incbin "baserom.dol", 0x48CC58, 0xC + .asciz "BonusText" + .balign 4 .global $$257702 $$257702: - .incbin "baserom.dol", 0x48CC64, 0x54 + .4byte 0x803B6D30 + .4byte 0x803B6C20 + .4byte 0x803B6C2C + .4byte 0x803B6C38 + .4byte 0x803B6C44 + .4byte 0x803B6C50 + .4byte 0x803B6C5C + .4byte 0x803B6C68 + .4byte 0x803B6C74 + .4byte 0x803B6C80 + .4byte 0x803B6C8C + .4byte 0x803B6C98 + .4byte 0x803B6CA4 + .4byte 0x803B6CB0 + .4byte 0x803B6CBC + .4byte 0x803B6CC8 + .4byte 0x803B6CD4 + .4byte 0x803B6CE0 + .4byte 0x803B6CEC + .4byte 0x803B6D30 + .4byte 0x803B6CF8 .global $$257736 $$257736: - .incbin "baserom.dol", 0x48CCB8, 0x18 + .asciz "ResultBonusTimeSpare_00" .global $$257737 $$257737: - .incbin "baserom.dol", 0x48CCD0, 0x18 + .asciz "ResultBonusClearTime" + .balign 4 .global $$257738 $$257738: - .incbin "baserom.dol", 0x48CCE8, 0xC + .asciz "TimeText" + .balign 4 .global $$257739 $$257739: - .incbin "baserom.dol", 0x48CCF4, 0x10 + .asciz "BonusScoreText" + .balign 4 .global $$257792 $$257792: - .incbin "baserom.dol", 0x48CD04, 0xC + .asciz "Paturn01" + .balign 4 .global $$257799 $$257799: - .incbin "baserom.dol", 0x48CD10, 0xC + .asciz "GhostPlayIn" .global $$257800 $$257800: - .incbin "baserom.dol", 0x48CD1C, 0xC + .asciz "SelectIN" + .balign 4 .global $$258037 $$258037: - .incbin "baserom.dol", 0x48CD28, 0xC + .asciz "ScoreNow" + .balign 4 .global $$258038 $$258038: - .incbin "baserom.dol", 0x48CD34, 0xC + .asciz "ScoreKirby" + .balign 4 .global $$258039 $$258039: - .incbin "baserom.dol", 0x48CD40, 0xC + .asciz "ScoreRoa" + .balign 4 .global $$258042 $$258042: - .incbin "baserom.dol", 0x48CD4C, 0xC + .asciz "FileKirby%d" .global $$258044 $$258044: - .incbin "baserom.dol", 0x48CD58, 0xC + .asciz "FileMahoroa" .global $$258050 $$258050: - .incbin "baserom.dol", 0x48CD64, 0xC + .asciz "ParasolN" + .balign 4 .global $$258052 $$258052: - .incbin "baserom.dol", 0x48CD70, 0xC + .asciz "FighterN" + .balign 4 .global $$258054 $$258054: - .incbin "baserom.dol", 0x48CD7C, 0xC + .asciz "MahoroaN" + .balign 4 .global $$258055 $$258055: - .incbin "baserom.dol", 0x48CD88, 0x10 + .asciz "LankLight%02d" + .balign 4 .global $$258056 $$258056: - .incbin "baserom.dol", 0x48CD98, 0x10 + .asciz "GhostPlayN" + .balign 4 + .4byte 0 .global $$258057 $$258057: - .incbin "baserom.dol", 0x48CDA8, 0x10 + .asciz "ResultGhostPlay" .global $$258058 $$258058: - .incbin "baserom.dol", 0x48CDB8, 0x14 + .asciz "ResultGhostUpdate" + .balign 4 .global $$258060 $$258060: - .incbin "baserom.dol", 0x48CDCC, 0x64 + .4byte 0x803B7F2C + .4byte 0x803B7F34 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F3C + .4byte 0x803B7F44 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F4C + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F54 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F5C + .4byte 0x803B7F74 + .4byte 0x803B7F64 + .4byte 0x803B7F74 + .4byte 0x803B7F74 + .4byte 0x803B7F6C .global $$258062 $$258062: - .incbin "baserom.dol", 0x48CE30, 0x40 + .asciz "NewRecord" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257487 $$257487: - .incbin "baserom.dol", 0x497CD8, 0x8 + .asciz "Base" + .balign 4 .global $$257489 $$257489: - .incbin "baserom.dol", 0x497CE0, 0x8 + .asciz "MedalN" + .balign 4 .global $$257491 $$257491: - .incbin "baserom.dol", 0x497CE8, 0x8 + .asciz "Lank" + .balign 4 .global $$257499 $$257499: - .incbin "baserom.dol", 0x497CF0, 0x8 + .asciz "EndN" + .balign 4 .global $$257507 $$257507: - .incbin "baserom.dol", 0x497CF8, 0x8 + .asciz "LankN" + .balign 4 .global $$257515 $$257515: - .incbin "baserom.dol", 0x497D00, 0x8 + .asciz "Next" + .balign 4 .global $$257517 $$257517: - .incbin "baserom.dol", 0x497D08, 0x8 + .asciz "Back" + .balign 4 .global $$257518 $$257518: - .incbin "baserom.dol", 0x497D10, 0x8 + .asciz "Close" + .balign 4 .global $$257519 $$257519: - .incbin "baserom.dol", 0x497D18, 0x8 + .asciz "Open" + .balign 4 .global $$257520 $$257520: - .incbin "baserom.dol", 0x497D20, 0x8 + .asciz "BD%02d" + .balign 4 .global $$257522 $$257522: - .incbin "baserom.dol", 0x497D28, 0x8 + .asciz "BDTime" + .balign 4 .global $$257658 $$257658: - .incbin "baserom.dol", 0x497D30, 0x8 + .asciz "Appear" + .balign 4 .global $$257780 $$257780: - .incbin "baserom.dol", 0x497D38, 0x4 + .4byte 0x55500000 .global $$257791 $$257791: - .incbin "baserom.dol", 0x497D3C, 0x8 + .asciz "LankIN" + .balign 4 .global $$257793 $$257793: - .incbin "baserom.dol", 0x497D44, 0x4 + .4byte 0x494E0000 .global $$257816 $$257816: - .incbin "baserom.dol", 0x497D48, 0x8 + .asciz "Push" + .balign 4 .global $$257897 $$257897: - .incbin "baserom.dol", 0x497D50, 0x8 + .asciz "Medal" + .balign 4 .global $$258040 $$258040: - .incbin "baserom.dol", 0x497D58, 0x8 + .asciz "Kirby%d" .global $$258041 $$258041: - .incbin "baserom.dol", 0x497D60, 0x8 + .asciz "Name" + .balign 4 .global $$258043 $$258043: - .incbin "baserom.dol", 0x497D68, 0x8 + .asciz "Mahoroa" .global $$258045 $$258045: - .incbin "baserom.dol", 0x497D70, 0x8 + .asciz "NormalN" .global $$258046 $$258046: - .incbin "baserom.dol", 0x497D78, 0x8 + .asciz "SwordN" + .balign 4 .global $$258047 $$258047: - .incbin "baserom.dol", 0x497D80, 0x8 + .asciz "WhipN" + .balign 4 .global $$258048 $$258048: - .incbin "baserom.dol", 0x497D88, 0x8 + .asciz "FireN" + .balign 4 .global $$258049 $$258049: - .incbin "baserom.dol", 0x497D90, 0x8 + .asciz "SparkN" + .balign 4 .global $$258051 $$258051: - .incbin "baserom.dol", 0x497D98, 0x8 + .asciz "WingN" + .balign 4 .global $$258053 $$258053: - .incbin "baserom.dol", 0x497DA0, 0x8 + .asciz "SmashN" + .balign 4 .global $$258063 $$258063: - .incbin "baserom.dol", 0x497DA8, 0x8 + .asciz "ScoreS" + .balign 4 .global $$258064 $$258064: - .incbin "baserom.dol", 0x497DB0, 0x8 + .asciz "ScoreN" + .balign 4 .global $$258065 $$258065: - .incbin "baserom.dol", 0x497DB8, 0x8 + .asciz "Score" + .balign 4 .global $$258066 $$258066: - .incbin "baserom.dol", 0x497DC0, 0x8 + .asciz "ScoreP" + .balign 4 .global $$258067 $$258067: - .incbin "baserom.dol", 0x497DC8, 0x8 + .asciz "BonusN" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249649 $$249649: - .incbin "baserom.dol", 0x49D340, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249653 $$249653: - .incbin "baserom.dol", 0x49D3C8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257776 $$257776: - .incbin "baserom.dol", 0x49E4A0, 0x8 + .4byte 0x425C0000 + .4byte 0 diff --git a/asm/src/ResultLyt.s b/asm/src/ResultLyt.s index 3818b896..0ac10d41 100644 --- a/asm/src/ResultLyt.s +++ b/asm/src/ResultLyt.s @@ -2915,344 +2915,488 @@ preLoadStage__Q43scn15challengeresult4info9ResultLytFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253950 $$253950: - .incbin "baserom.dol", 0x45B1F8, 0x14 + .asciz "ResultBonusClear" + .balign 4 .global $$253951 $$253951: - .incbin "baserom.dol", 0x45B20C, 0x18 + .asciz "ResultBonusMasterClear" + .balign 4 .global $$253952 $$253952: - .incbin "baserom.dol", 0x45B224, 0x14 + .asciz "ResultBonusTime2" + .balign 4 .global $$253953 $$253953: - .incbin "baserom.dol", 0x45B238, 0x14 + .asciz "ResultBonusTime3" + .balign 4 .global $$253954 $$253954: - .incbin "baserom.dol", 0x45B24C, 0x14 + .asciz "ResultBonusTime4" + .balign 4 .global $$253955 $$253955: - .incbin "baserom.dol", 0x45B260, 0x14 + .asciz "ResultBonusDestroy" + .balign 4 .global $$253956 $$253956: - .incbin "baserom.dol", 0x45B274, 0x14 + .asciz "ResultBonusNoDamage" .global $$253957 $$253957: - .incbin "baserom.dol", 0x45B288, 0x18 + .asciz "ResultBonusDying" + .balign 4 + .4byte 0 .global $$253958 $$253958: - .incbin "baserom.dol", 0x45B2A0, 0x18 + .asciz "ResultBonusCoinComplete" .global T_BONUS_MESSAGE_LABEL__23$$2unnamed$$2ResultLyt_cpp$$2 T_BONUS_MESSAGE_LABEL__23$$2unnamed$$2ResultLyt_cpp$$2: - .incbin "baserom.dol", 0x45B2B8, 0x24 + .4byte 0x8045F0F8 + .4byte 0x8045F10C + .4byte 0x8045F124 + .4byte 0x8045F138 + .4byte 0x8045F14C + .4byte 0x8045F160 + .4byte 0x8045F174 + .4byte 0x8045F188 + .4byte 0x8045F1A0 .global $$258204 $$258204: - .incbin "baserom.dol", 0x45B2DC, 0x18 + .asciz "challengeresult/Main" + .balign 4 .global $$258205 $$258205: - .incbin "baserom.dol", 0x45B2F4, 0xC + .asciz "Result02" + .balign 4 .global $$258206 $$258206: - .incbin "baserom.dol", 0x45B300, 0x10 + .asciz "RsultTotalScrN" + .balign 4 .global $$258207 $$258207: - .incbin "baserom.dol", 0x45B310, 0x10 + .asciz "LankingWindow" + .balign 4 .global $$258210 $$258210: - .incbin "baserom.dol", 0x45B320, 0xC + .asciz "BreakDownN" + .balign 4 .global $$258211 $$258211: - .incbin "baserom.dol", 0x45B32C, 0xC + .asciz "BreakDown" + .balign 4 .global $$258212 $$258212: - .incbin "baserom.dol", 0x45B338, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$258213 $$258213: - .incbin "baserom.dol", 0x45B344, 0xC + .asciz "common/Main" .global $$258214 $$258214: - .incbin "baserom.dol", 0x45B350, 0x10 + .asciz "CommonButton" + .balign 4 .global $$258215 $$258215: - .incbin "baserom.dol", 0x45B360, 0x10 + .asciz "ResultMenu_End" + .balign 4 .global $$258216 $$258216: - .incbin "baserom.dol", 0x45B370, 0x18 + .asciz "ResultMenu_Retry" + .balign 4 + .4byte 0 .global $$258217 $$258217: - .incbin "baserom.dol", 0x45B388, 0x10 + .asciz "ResultMenu_Hint" .global $$258218 $$258218: - .incbin "baserom.dol", 0x45B398, 0x10 + .asciz "ConfirmWindow" + .balign 4 .global $$258219 $$258219: - .incbin "baserom.dol", 0x45B3A8, 0x10 + .asciz "SelectGhost" + .4byte 0 .global $$258220 $$258220: - .incbin "baserom.dol", 0x45B3B8, 0x10 + .asciz "SelectGhost_Yes" .global $$258221 $$258221: - .incbin "baserom.dol", 0x45B3C8, 0x10 + .asciz "SelectGhost_No" + .balign 4 .global $$258222 $$258222: - .incbin "baserom.dol", 0x45B3D8, 0x10 + .asciz "BreakDownWinN" + .balign 4 .global $$258501 $$258501: - .incbin "baserom.dol", 0x45B3E8, 0x1C + .asciz "common/abilitystaricon/%s" + .balign 4 .global $$258504 $$258504: - .incbin "baserom.dol", 0x45B404, 0xC + .asciz "%s4Result" + .balign 4 .global $$258506 $$258506: - .incbin "baserom.dol", 0x45B410, 0x10 + .asciz "%sStageSh" + .balign 4 + .4byte 0 .global $$258507 $$258507: - .incbin "baserom.dol", 0x45B420, 0x10 + .asciz "ResultScoreList" .global $$258509 $$258509: - .incbin "baserom.dol", 0x45B430, 0xC + .asciz "ResultParts" .global $$258510 $$258510: - .incbin "baserom.dol", 0x45B43C, 0xC + .asciz "Score%02dN" + .balign 4 .global $$258511 $$258511: - .incbin "baserom.dol", 0x45B448, 0xC + .asciz "FilePlate" + .balign 4 .global $$258512 $$258512: - .incbin "baserom.dol", 0x45B454, 0x10 + .asciz "FilePlate%02dN" + .balign 4 .global $$258513 $$258513: - .incbin "baserom.dol", 0x45B464, 0xC + .asciz "PlayerIcon" + .balign 4 .global $$258514 $$258514: - .incbin "baserom.dol", 0x45B470, 0xC + .asciz "PlayerIconN" .global $$258516 $$258516: - .incbin "baserom.dol", 0x45B47C, 0x10 + .asciz "TimeBonusText" + .balign 4 .global $$258518 $$258518: - .incbin "baserom.dol", 0x45B48C, 0xC + .asciz "BonusText" + .balign 4 .global $$258523 $$258523: - .incbin "baserom.dol", 0x45B498, 0xC + .asciz "CommonText" + .balign 4 .global $$258600 $$258600: - .incbin "baserom.dol", 0x45B4A4, 0x4C + .4byte 0x801F2B20 ;# ptr + .4byte 0x801F2A94 ;# ptr + .4byte 0x801F2A9C ;# ptr + .4byte 0x801F2AA4 ;# ptr + .4byte 0x801F2AAC ;# ptr + .4byte 0x801F2AB4 ;# ptr + .4byte 0x801F2ABC ;# ptr + .4byte 0x801F2AC4 ;# ptr + .4byte 0x801F2ACC ;# ptr + .4byte 0x801F2AD4 ;# ptr + .4byte 0x801F2ADC ;# ptr + .4byte 0x801F2AE4 ;# ptr + .4byte 0x801F2AEC ;# ptr + .4byte 0x801F2AF4 ;# ptr + .4byte 0x801F2AFC ;# ptr + .4byte 0x801F2B04 ;# ptr + .4byte 0x801F2B0C ;# ptr + .4byte 0x801F2B14 ;# ptr + .4byte 0x801F2B1C ;# ptr .global $$258636 $$258636: - .incbin "baserom.dol", 0x45B4F0, 0x18 + .asciz "ResultBonusTimeSpare_00" .global $$258637 $$258637: - .incbin "baserom.dol", 0x45B508, 0x14 + .asciz "ResultBonusRestTime" .global $$258638 $$258638: - .incbin "baserom.dol", 0x45B51C, 0xC + .asciz "TimeText" + .balign 4 .global $$258639 $$258639: - .incbin "baserom.dol", 0x45B528, 0x10 + .asciz "BonusScoreText" + .balign 4 .global $$258806 $$258806: - .incbin "baserom.dol", 0x45B538, 0xC + .asciz "Paturn01" + .balign 4 .global $$258929 $$258929: - .incbin "baserom.dol", 0x45B544, 0xC + .asciz "ScoreNow" + .balign 4 .global $$258930 $$258930: - .incbin "baserom.dol", 0x45B550, 0xC + .asciz "ScoreKirby" + .balign 4 .global $$258931 $$258931: - .incbin "baserom.dol", 0x45B55C, 0xC + .asciz "ScoreRoa" + .balign 4 .global $$258934 $$258934: - .incbin "baserom.dol", 0x45B568, 0xC + .asciz "FileKirby%d" .global $$258936 $$258936: - .incbin "baserom.dol", 0x45B574, 0xC + .asciz "FileMahoroa" .global $$258942 $$258942: - .incbin "baserom.dol", 0x45B580, 0xC + .asciz "ParasolN" + .balign 4 .global $$258944 $$258944: - .incbin "baserom.dol", 0x45B58C, 0xC + .asciz "FighterN" + .balign 4 .global $$258946 $$258946: - .incbin "baserom.dol", 0x45B598, 0xC + .asciz "MahoroaN" + .balign 4 .global $$258947 $$258947: - .incbin "baserom.dol", 0x45B5A4, 0x10 + .asciz "LankLight%02d" + .balign 4 .global $$258948 $$258948: - .incbin "baserom.dol", 0x45B5B4, 0xC + .asciz "GhostPlay" + .balign 4 .global $$258949 $$258949: - .incbin "baserom.dol", 0x45B5C0, 0x10 + .asciz "GhostPlayN" + .balign 4 + .4byte 0 .global $$258950 $$258950: - .incbin "baserom.dol", 0x45B5D0, 0x10 + .asciz "ResultGhostPlay" .global $$258951 $$258951: - .incbin "baserom.dol", 0x45B5E0, 0x14 + .asciz "ResultGhostUpdate" + .balign 4 .global $$258953 $$258953: - .incbin "baserom.dol", 0x45B5F4, 0x64 + .4byte 0x801F371C ;# ptr + .4byte 0x801F3724 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F372C ;# ptr + .4byte 0x801F3734 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F373C ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3744 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F374C ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3754 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F3764 ;# ptr + .4byte 0x801F375C ;# ptr .global $$258955 $$258955: - .incbin "baserom.dol", 0x45B658, 0xC + .asciz "NewRecord" + .balign 4 .global $$258968 $$258968: - .incbin "baserom.dol", 0x45B664, 0xC + .asciz "FgStageSh" + .balign 4 .global $$258970 $$258970: - .incbin "baserom.dol", 0x45B670, 0xC + .asciz "SmStageSh" + .balign 4 .global $$258971 $$258971: - .incbin "baserom.dol", 0x45B67C, 0xC + .asciz "SmEXStage" + .balign 4 .global $$258972 $$258972: - .incbin "baserom.dol", 0x45B688, 0xC + .asciz "SmEXStageSh" .global $$258980 $$258980: - .incbin "baserom.dol", 0x45B694, 0xC + .asciz "GhostPlayIn" .global $$258981 $$258981: - .incbin "baserom.dol", 0x45B6A0, 0x50 + .asciz "SelectIN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258208 $$258208: - .incbin "baserom.dol", 0x4941E8, 0x8 + .asciz "Lank" + .balign 4 .global $$258209 $$258209: - .incbin "baserom.dol", 0x4941F0, 0x8 + .asciz "MedalN" + .balign 4 .global $$258497 $$258497: - .incbin "baserom.dol", 0x4941F8, 0x8 + .asciz "Appear" + .balign 4 .global $$258498 $$258498: - .incbin "baserom.dol", 0x494200, 0x8 + .asciz "BG%s" + .balign 4 .global $$258499 $$258499: - .incbin "baserom.dol", 0x494208, 0x4 + .4byte 0x42470000 .global $$258500 $$258500: - .incbin "baserom.dol", 0x49420C, 0x8 + .asciz "Wait" + .balign 4 .global $$258502 $$258502: - .incbin "baserom.dol", 0x494214, 0xC + .asciz "AbStar" + .balign 4 + .4byte 0 .global $$258503 $$258503: - .incbin "baserom.dol", 0x494220, 0x8 + .asciz "AbStarN" .global $$258505 $$258505: - .incbin "baserom.dol", 0x494228, 0x8 + .asciz "%sStage" .global $$258508 $$258508: - .incbin "baserom.dol", 0x494230, 0x8 + .asciz "LankN" + .balign 4 .global $$258515 $$258515: - .incbin "baserom.dol", 0x494238, 0x8 + .asciz "BD%02d" + .balign 4 .global $$258517 $$258517: - .incbin "baserom.dol", 0x494240, 0x8 + .asciz "BDTime" + .balign 4 .global $$258519 $$258519: - .incbin "baserom.dol", 0x494248, 0x8 + .asciz "Back" + .balign 4 .global $$258520 $$258520: - .incbin "baserom.dol", 0x494250, 0x8 + .asciz "Close" + .balign 4 .global $$258521 $$258521: - .incbin "baserom.dol", 0x494258, 0x8 + .asciz "Open" + .balign 4 .global $$258522 $$258522: - .incbin "baserom.dol", 0x494260, 0x8 + .asciz "EndN" + .balign 4 .global $$258524 $$258524: - .incbin "baserom.dol", 0x494268, 0x8 + .asciz "Next" + .balign 4 .global $$258672 $$258672: - .incbin "baserom.dol", 0x494270, 0x8 + .asciz "Medal" + .balign 4 .global $$258776 $$258776: - .incbin "baserom.dol", 0x494278, 0x4 + .4byte 0x55500000 .global $$258805 $$258805: - .incbin "baserom.dol", 0x49427C, 0x8 + .asciz "LankIN" + .balign 4 .global $$258807 $$258807: - .incbin "baserom.dol", 0x494284, 0x4 + .4byte 0x494E0000 .global $$258932 $$258932: - .incbin "baserom.dol", 0x494288, 0x8 + .asciz "Kirby%d" .global $$258933 $$258933: - .incbin "baserom.dol", 0x494290, 0x8 + .asciz "Name" + .balign 4 .global $$258935 $$258935: - .incbin "baserom.dol", 0x494298, 0x8 + .asciz "Mahoroa" .global $$258937 $$258937: - .incbin "baserom.dol", 0x4942A0, 0x8 + .asciz "NormalN" .global $$258938 $$258938: - .incbin "baserom.dol", 0x4942A8, 0x8 + .asciz "SwordN" + .balign 4 .global $$258939 $$258939: - .incbin "baserom.dol", 0x4942B0, 0x8 + .asciz "WhipN" + .balign 4 .global $$258940 $$258940: - .incbin "baserom.dol", 0x4942B8, 0x8 + .asciz "FireN" + .balign 4 .global $$258941 $$258941: - .incbin "baserom.dol", 0x4942C0, 0x8 + .asciz "SparkN" + .balign 4 .global $$258943 $$258943: - .incbin "baserom.dol", 0x4942C8, 0x8 + .asciz "WingN" + .balign 4 .global $$258945 $$258945: - .incbin "baserom.dol", 0x4942D0, 0x8 + .asciz "SmashN" + .balign 4 .global $$258956 $$258956: - .incbin "baserom.dol", 0x4942D8, 0x8 + .asciz "ScoreS" + .balign 4 .global $$258957 $$258957: - .incbin "baserom.dol", 0x4942E0, 0x8 + .asciz "ScoreN" + .balign 4 .global $$258958 $$258958: - .incbin "baserom.dol", 0x4942E8, 0x8 + .asciz "Score" + .balign 4 .global $$258959 $$258959: - .incbin "baserom.dol", 0x4942F0, 0x8 + .asciz "ScoreP" + .balign 4 .global $$258960 $$258960: - .incbin "baserom.dol", 0x4942F8, 0x8 + .asciz "BonusN" + .balign 4 .global $$258965 $$258965: - .incbin "baserom.dol", 0x494300, 0x8 + .asciz "Stage" + .balign 4 .global $$258966 $$258966: - .incbin "baserom.dol", 0x494308, 0x8 + .asciz "StageSh" .global $$258967 $$258967: - .incbin "baserom.dol", 0x494310, 0x8 + .asciz "FgStage" .global $$258969 $$258969: - .incbin "baserom.dol", 0x494318, 0x8 + .asciz "SmStage" .global $$259013 $$259013: - .incbin "baserom.dol", 0x494320, 0x8 + .asciz "Push" + .balign 4 .global $$259087 $$259087: - .incbin "baserom.dol", 0x494328, 0x4 + .4byte 0x46670000 .global $$259088 $$259088: - .incbin "baserom.dol", 0x49432C, 0x4 + .4byte 0x536D0000 .global $$259089 $$259089: - .incbin "baserom.dol", 0x494330, 0x8 + .asciz "SmEX" + .balign 4 .global $$259090 $$259090: - .incbin "baserom.dol", 0x494338, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258808 $$258808: - .incbin "baserom.dol", 0x49A9A8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ReverseWorld.s b/asm/src/ReverseWorld.s index c33cd215..73d19343 100644 --- a/asm/src/ReverseWorld.s +++ b/asm/src/ReverseWorld.s @@ -491,46 +491,49 @@ lbl_803CECF8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254477 $$254477: - .incbin "baserom.dol", 0x49E758, 0x4 + .4byte 0x3F800000 .global $$254478 $$254478: - .incbin "baserom.dol", 0x49E75C, 0x4 + .4byte 0xBF800000 .global $$254502 $$254502: - .incbin "baserom.dol", 0x49E760, 0x4 + .4byte 0x4222F983 .global $$254503 $$254503: - .incbin "baserom.dol", 0x49E764, 0x4 + .4byte 0x3C8EFA35 .global $$254504 $$254504: - .incbin "baserom.dol", 0x49E768, 0x4 + .4byte 0x42B40000 .global $$254505 $$254505: - .incbin "baserom.dol", 0x49E76C, 0x4 + .4byte 0x43340000 .global $$254508 $$254508: - .incbin "baserom.dol", 0x49E770, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$254510 $$254510: - .incbin "baserom.dol", 0x49E778, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$254531 $$254531: - .incbin "baserom.dol", 0x49E780, 0x4 + .4byte 0x3D4CCCCD .global $$254532 $$254532: - .incbin "baserom.dol", 0x49E784, 0x4 + .4byte 0 .global $$254533 $$254533: - .incbin "baserom.dol", 0x49E788, 0x4 + .4byte 0x40000000 .global $$254534 $$254534: - .incbin "baserom.dol", 0x49E78C, 0x4 + .4byte 0xBF000000 .global $$254535 $$254535: - .incbin "baserom.dol", 0x49E790, 0x4 + .4byte 0x3F000000 .global $$254536 $$254536: - .incbin "baserom.dol", 0x49E794, 0x4 + .4byte 0x3F400000 .global $$254537 $$254537: - .incbin "baserom.dol", 0x49E798, 0x8 + .4byte 0x3E800000 + .4byte 0 diff --git a/asm/src/RoofChecker.s b/asm/src/RoofChecker.s index ce180ec4..ed0500d4 100644 --- a/asm/src/RoofChecker.s +++ b/asm/src/RoofChecker.s @@ -151,13 +151,13 @@ lbl_803542F0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252525 $$252525: - .incbin "baserom.dol", 0x49D990, 0x4 + .4byte 0 .global $$252271 $$252271: - .incbin "baserom.dol", 0x49D994, 0x4 + .4byte 0xFFFFFFFF .global $$252282 $$252282: - .incbin "baserom.dol", 0x49D998, 0x4 + .4byte 0xFF4040FF .global $$252564 $$252564: - .incbin "baserom.dol", 0x49D99C, 0x4 + .4byte 0x41400000 diff --git a/asm/src/RoomGuarder.s b/asm/src/RoomGuarder.s index f98b24bd..5eba8b76 100644 --- a/asm/src/RoomGuarder.s +++ b/asm/src/RoomGuarder.s @@ -3169,39 +3169,41 @@ lbl_8031E070: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$263446 $$263446: - .incbin "baserom.dol", 0x47DCA8, 0x20 + .asciz "step/gimmick/RoomGuarder" + .balign 4 + .4byte 0 .global $$263447 $$263447: - .incbin "baserom.dol", 0x47DCC8, 0x18 + .asciz "step/gimmick/CameraLock" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$263448 $$263448: - .incbin "baserom.dol", 0x49D538, 0x4 + .4byte 0 .global $$263691 $$263691: - .incbin "baserom.dol", 0x49D53C, 0x4 + .4byte 0xFF7FFFFF .global $$263894 $$263894: - .incbin "baserom.dol", 0x49D540, 0x4 + .4byte 0x3F000000 .global $$263895 $$263895: - .incbin "baserom.dol", 0x49D544, 0x4 + .4byte 0x3ECCCCCD .global $$263956 $$263956: - .incbin "baserom.dol", 0x49D548, 0x4 + .4byte 0x40000000 .global $$263957 $$263957: - .incbin "baserom.dol", 0x49D54C, 0x4 + .4byte 0x3F800000 .global $$260428 $$260428: - .incbin "baserom.dol", 0x49D550, 0x4 + .4byte 0xFFFFFFF0 .global $$264155 $$264155: - .incbin "baserom.dol", 0x49D554, 0x4 + .4byte 0xBF000000 .global $$264156 $$264156: - .incbin "baserom.dol", 0x49D558, 0x4 + .4byte 0x3DCCCCCD .global $$264195 $$264195: - .incbin "baserom.dol", 0x49D55C, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/Root.s b/asm/src/Root.s index c49ec4cb..0f709905 100644 --- a/asm/src/Root.s +++ b/asm/src/Root.s @@ -508,19 +508,20 @@ lbl_80194608: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252516 $$252516: - .incbin "baserom.dol", 0x49A1E0, 0x4 + .4byte 0x3FE38E39 .global $$252517 $$252517: - .incbin "baserom.dol", 0x49A1E4, 0x4 + .4byte 0xC0000000 .global $$252518 $$252518: - .incbin "baserom.dol", 0x49A1E8, 0x4 + .4byte 0xC0800000 .global $$252519 $$252519: - .incbin "baserom.dol", 0x49A1EC, 0x4 + .4byte 0xBF800000 .global $$252520 $$252520: - .incbin "baserom.dol", 0x49A1F0, 0x8 + .4byte 0x41800000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global object___Q33hel6common40ExplicitSingleton$$0Q23gfx13RenderSetting$$1 diff --git a/asm/src/RotAnim.s b/asm/src/RotAnim.s index 4329e157..7b73c75b 100644 --- a/asm/src/RotAnim.s +++ b/asm/src/RotAnim.s @@ -121,16 +121,17 @@ lbl_803C51E0: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254904 $$254904: - .incbin "baserom.dol", 0x49E578, 0x4 + .4byte 0x43B40000 .global $$254905 $$254905: - .incbin "baserom.dol", 0x49E57C, 0x4 + .4byte 0 .global $$254920 $$254920: - .incbin "baserom.dol", 0x49E580, 0x4 + .4byte 0xC0800000 .global $$254921 $$254921: - .incbin "baserom.dol", 0x49E584, 0x4 + .4byte 0xC0C00000 .global $$254922 $$254922: - .incbin "baserom.dol", 0x49E588, 0x8 + .4byte 0xC1900000 + .4byte 0 diff --git a/asm/src/RotController.s b/asm/src/RotController.s index 324c535e..9160964d 100644 --- a/asm/src/RotController.s +++ b/asm/src/RotController.s @@ -549,7 +549,7 @@ lbl_8026787C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250424 $$250424: - .incbin "baserom.dol", 0x49B708, 0x4 + .4byte 0x3F800000 .global $$250477 $$250477: - .incbin "baserom.dol", 0x49B70C, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/RotControllerData.s b/asm/src/RotControllerData.s index 19c08838..f3bf26dc 100644 --- a/asm/src/RotControllerData.s +++ b/asm/src/RotControllerData.s @@ -22,4 +22,5 @@ __ct__Q43scn4step6camera17RotControllerDataFUlffb: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249657 $$249657: - .incbin "baserom.dol", 0x49B710, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/RotCtrl.s b/asm/src/RotCtrl.s index 35bf85fd..4d272038 100644 --- a/asm/src/RotCtrl.s +++ b/asm/src/RotCtrl.s @@ -114,9 +114,11 @@ lbl_80354468: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256335 $$256335: - .incbin "baserom.dol", 0x496E18, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: - .incbin "baserom.dol", 0x49D9A0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Rumble.s b/asm/src/Rumble.s index 6ce6b38b..673b8a7e 100644 --- a/asm/src/Rumble.s +++ b/asm/src/Rumble.s @@ -96,27 +96,43 @@ __dt__Q33scn19challengefileselect6RumbleFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251963 $$251963: - .incbin "baserom.dol", 0x45A378, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$252003 $$252003: - .incbin "baserom.dol", 0x45A394, 0xC + .asciz "OpenSmall" + .balign 4 .global __vt__Q33scn19challengefileselect6Rumble __vt__Q33scn19challengefileselect6Rumble: - .incbin "baserom.dol", 0x45A3A0, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x801E43F0 ;# ptr + .4byte 0x801E43A0 ;# ptr + .4byte 0x801E43A4 ;# ptr + .4byte 0x801E43B4 ;# ptr + .4byte 0x801E43C0 ;# ptr + .4byte 0x801E43CC ;# ptr + .4byte 0x801E43D8 ;# ptr + .4byte 0x801E43DC ;# ptr + .4byte 0x801E43E4 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 $$251964: - .incbin "baserom.dol", 0x493F38, 0x8 + .asciz "Rumble" + .balign 4 .global $$252006 $$252006: - .incbin "baserom.dol", 0x493F40, 0x8 + .asciz "Focus" + .balign 4 .global $$252009 $$252009: - .incbin "baserom.dol", 0x493F48, 0x8 + .asciz "UnFocus" .global $$252012 $$252012: - .incbin "baserom.dol", 0x493F50, 0x8 + .asciz "Decide" + .balign 4 .global $$252018 $$252018: - .incbin "baserom.dol", 0x493F58, 0x8 + .asciz "CursorN" diff --git a/asm/src/RumbleResource.s b/asm/src/RumbleResource.s index 4f9ac3a5..fa56dd1c 100644 --- a/asm/src/RumbleResource.s +++ b/asm/src/RumbleResource.s @@ -76,12 +76,15 @@ lbl_801A4250: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248751 $$248751: - .incbin "baserom.dol", 0x453040, 0x1C + .asciz "hid/rumble/Rumble.dat.cmp" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x45305C, 0x24 + .asciz "hid/rumble/subgame/Rumble.dat.cmp" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2 T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2: - .incbin "baserom.dol", 0x493280, 0x8 + .4byte 0x80456F40 + .4byte 0x80456F5C diff --git a/asm/src/RumbleSetting.s b/asm/src/RumbleSetting.s index b4803a22..cd605bd8 100644 --- a/asm/src/RumbleSetting.s +++ b/asm/src/RumbleSetting.s @@ -408,33 +408,47 @@ lbl_801E4994: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252673 $$252673: - .incbin "baserom.dol", 0x45A3D0, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$252674 $$252674: - .incbin "baserom.dol", 0x45A3EC, 0x10 + .asciz "RumbleWindow" + .balign 4 .global $$252675 $$252675: - .incbin "baserom.dol", 0x45A3FC, 0xC + .asciz "Button01N" + .balign 4 .global $$252676 $$252676: - .incbin "baserom.dol", 0x45A408, 0xC + .asciz "Button02N" + .balign 4 .global $$252677 $$252677: - .incbin "baserom.dol", 0x45A414, 0x10 + .asciz "RumbleConfirm" + .balign 4 .global $$252678 $$252678: - .incbin "baserom.dol", 0x45A424, 0xC + .asciz "RumbleTxt" + .balign 4 .global $$252679 $$252679: - .incbin "baserom.dol", 0x45A430, 0xC + .asciz "RumbleTxtOn" .global $$252680 $$252680: - .incbin "baserom.dol", 0x45A43C, 0x44 + .asciz "RumbleTxtOff" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252745 $$252745: - .incbin "baserom.dol", 0x493F60, 0x8 + .asciz "Open" + .balign 4 .global $$252748 $$252748: - .incbin "baserom.dol", 0x493F68, 0x8 + .asciz "Close" + .balign 4 diff --git a/asm/src/Runner.s b/asm/src/Runner.s index 7ab11eeb..aab20635 100644 --- a/asm/src/Runner.s +++ b/asm/src/Runner.s @@ -1793,75 +1793,205 @@ lbl_801C9D44: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20: - .incbin "baserom.dol", 0x455EE0, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv: - .incbin "baserom.dol", 0x455EF4, 0x1C + .asciz "ExplicitSingleton.hpp" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252995 $$252995: - .incbin "baserom.dol", 0x458298, 0xC + .asciz "Runner.cpp" + .balign 4 .global $$252996 $$252996: - .incbin "baserom.dol", 0x4582A4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$253155 $$253155: - .incbin "baserom.dol", 0x4582B8, 0x10 + .asciz "[NOT IMPLEMENT]" .global $$253157 $$253157: - .incbin "baserom.dol", 0x4582C8, 0x108 + .4byte 0x801C974C ;# ptr + .4byte 0x801C8A70 ;# ptr + .4byte 0x801C8A94 ;# ptr + .4byte 0x801C8AB8 ;# ptr + .4byte 0x801C8AFC ;# ptr + .4byte 0x801C8B40 ;# ptr + .4byte 0x801C8B6C ;# ptr + .4byte 0x801C8B90 ;# ptr + .4byte 0x801C8BD4 ;# ptr + .4byte 0x801C8C04 ;# ptr + .4byte 0x801C8C50 ;# ptr + .4byte 0x801C8C7C ;# ptr + .4byte 0x801C8CC8 ;# ptr + .4byte 0x801C8CF4 ;# ptr + .4byte 0x801C8D40 ;# ptr + .4byte 0x801C8D74 ;# ptr + .4byte 0x801C8DA8 ;# ptr + .4byte 0x801C8DDC ;# ptr + .4byte 0x801C8E10 ;# ptr + .4byte 0x801C8E44 ;# ptr + .4byte 0x801C8E68 ;# ptr + .4byte 0x801C8E8C ;# ptr + .4byte 0x801C8EB8 ;# ptr + .4byte 0x801C8EEC ;# ptr + .4byte 0x801C8F20 ;# ptr + .4byte 0x801C8F54 ;# ptr + .4byte 0x801C8F88 ;# ptr + .4byte 0x801C8FAC ;# ptr + .4byte 0x801C8FD0 ;# ptr + .4byte 0x801C8FFC ;# ptr + .4byte 0x801C9030 ;# ptr + .4byte 0x801C9064 ;# ptr + .4byte 0x801C9098 ;# ptr + .4byte 0x801C90CC ;# ptr + .4byte 0x801C9100 ;# ptr + .4byte 0x801C9134 ;# ptr + .4byte 0x801C9168 ;# ptr + .4byte 0x801C919C ;# ptr + .4byte 0x801C91C8 ;# ptr + .4byte 0x801C91F4 ;# ptr + .4byte 0x801C9228 ;# ptr + .4byte 0x801C925C ;# ptr + .4byte 0x801C9290 ;# ptr + .4byte 0x801C92C4 ;# ptr + .4byte 0x801C92F8 ;# ptr + .4byte 0x801C9324 ;# ptr + .4byte 0x801C9350 ;# ptr + .4byte 0x801C9384 ;# ptr + .4byte 0x801C93B8 ;# ptr + .4byte 0x801C93CC ;# ptr + .4byte 0x801C93F0 ;# ptr + .4byte 0x801C9414 ;# ptr + .4byte 0x801C9458 ;# ptr + .4byte 0x801C946C ;# ptr + .4byte 0x801C9480 ;# ptr + .4byte 0x801C94D8 ;# ptr + .4byte 0x801C94FC ;# ptr + .4byte 0x801C9530 ;# ptr + .4byte 0x801C957C ;# ptr + .4byte 0x801C95C8 ;# ptr + .4byte 0x801C9614 ;# ptr + .4byte 0x801C9660 ;# ptr + .4byte 0x801C96AC ;# ptr + .4byte 0x801C96D0 ;# ptr + .4byte 0x801C96FC ;# ptr + .4byte 0x801C9728 ;# ptr .global __vt__Q26mintvm6Runner __vt__Q26mintvm6Runner: - .incbin "baserom.dol", 0x4583D0, 0x15C + .4byte 0 + .4byte 0 + .4byte 0x801C07C0 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "BCOpCode.hpp" + .balign 4 .global $$2STRING$$2instruction__Q26mintvm10VMFunctionCFv$$20 $$2STRING$$2instruction__Q26mintvm10VMFunctionCFv$$20: - .incbin "baserom.dol", 0x45852C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2instruction__Q26mintvm10VMFunctionCFv $$2STRING$$2instruction__Q26mintvm10VMFunctionCFv: - .incbin "baserom.dol", 0x458540, 0x10 + .asciz "VMFunction.hpp" + .balign 4 .global $$2STRING$$2nativeFunc__Q26mintvm10VMFunctionCFv$$20 $$2STRING$$2nativeFunc__Q26mintvm10VMFunctionCFv$$20: - .incbin "baserom.dol", 0x458550, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2nativeFunc__Q26mintvm10VMFunctionCFv $$2STRING$$2nativeFunc__Q26mintvm10VMFunctionCFv: - .incbin "baserom.dol", 0x458564, 0x14 + .asciz "VMFunction.hpp" + .balign 4 + .4byte 0 .global $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1CFUl$$20 $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1CFUl$$20: - .incbin "baserom.dol", 0x458578, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1CFUl $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1CFUl: - .incbin "baserom.dol", 0x458590, 0xC + .asciz "MArray.hpp" + .balign 4 .global $$2STRING$$2get__Q26mintvm15VMConstantTableCFUs$$20 $$2STRING$$2get__Q26mintvm15VMConstantTableCFUs$$20: - .incbin "baserom.dol", 0x45859C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2get__Q26mintvm15VMConstantTableCFUs $$2STRING$$2get__Q26mintvm15VMConstantTableCFUs: - .incbin "baserom.dol", 0x4585B0, 0x18 + .asciz "VMConstantTable.hpp" + .4byte 0 .global $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1CFUl$$20 $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1CFUl$$20: - .incbin "baserom.dol", 0x4585C8, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1CFUl $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1CFUl: - .incbin "baserom.dol", 0x4585E0, 0x10 + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .global $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1FUl$$20 $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1FUl$$20: - .incbin "baserom.dol", 0x4585F0, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1FUl $$2STRING$$2at__Q26mintvm28MArray$$0PCQ26mintvm8VMModule$$1FUl: - .incbin "baserom.dol", 0x458608, 0xC + .asciz "MArray.hpp" + .balign 4 .global $$2STRING$$2popModule__Q26mintvm6RunnerFv$$20 $$2STRING$$2popModule__Q26mintvm6RunnerFv$$20: - .incbin "baserom.dol", 0x458614, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2popModule__Q26mintvm6RunnerFv $$2STRING$$2popModule__Q26mintvm6RunnerFv: - .incbin "baserom.dol", 0x458628, 0xC + .asciz "Runner.hpp" + .balign 4 .global $$2STRING$$2decYieldCount__Q26mintvm6RegsetFv$$20 $$2STRING$$2decYieldCount__Q26mintvm6RegsetFv$$20: - .incbin "baserom.dol", 0x458634, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2decYieldCount__Q26mintvm6RegsetFv $$2STRING$$2decYieldCount__Q26mintvm6RegsetFv: - .incbin "baserom.dol", 0x458648, 0x38 + .asciz "Regset.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "ExplicitSingleton.hpp" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global object___Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1 diff --git a/asm/src/SCWaftCtrl.s b/asm/src/SCWaftCtrl.s index 2dec5904..ce9c4faf 100644 --- a/asm/src/SCWaftCtrl.s +++ b/asm/src/SCWaftCtrl.s @@ -157,7 +157,7 @@ lbl_8023F99C: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250562 $$250562: - .incbin "baserom.dol", 0x49B060, 0x4 + .4byte 0 .global $$250592 $$250592: - .incbin "baserom.dol", 0x49B064, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/SDKAllocator.s b/asm/src/SDKAllocator.s index 76971c20..e2f8cc57 100644 --- a/asm/src/SDKAllocator.s +++ b/asm/src/SDKAllocator.s @@ -32,4 +32,5 @@ Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global AllocatorFunc__Q23mem12SDKAllocator AllocatorFunc__Q23mem12SDKAllocator: - .incbin "baserom.dol", 0x49A6F8, 0x8 + .4byte 0x801BF778 ;# ptr + .4byte 0x801BF794 ;# ptr diff --git a/asm/src/SERequestor.s b/asm/src/SERequestor.s index 66151026..ede4c1cd 100644 --- a/asm/src/SERequestor.s +++ b/asm/src/SERequestor.s @@ -351,7 +351,9 @@ updateOutput__Q23snd11SERequestorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x4926D0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x4926F4, 0xC + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/SaveInfo.s b/asm/src/SaveInfo.s index da3652cb..db16fe01 100644 --- a/asm/src/SaveInfo.s +++ b/asm/src/SaveInfo.s @@ -426,36 +426,50 @@ requestSave__Q23app8SaveInfoFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252513 $$252513: - .incbin "baserom.dol", 0x44F168, 0x10 + .asciz "resident/Main" + .balign 4 .global $$252514 $$252514: - .incbin "baserom.dol", 0x44F178, 0x10 + .asciz "SaveInfoBase" + .balign 4 .global $$252515 $$252515: - .incbin "baserom.dol", 0x44F188, 0xC + .asciz "SaveInfo" + .balign 4 .global $$252517 $$252517: - .incbin "baserom.dol", 0x44F194, 0xC + .asciz "TextSave" + .balign 4 .global $$252518 $$252518: - .incbin "baserom.dol", 0x44F1A0, 0x14 + .asciz "SaveInfoNowSaving" + .balign 4 .global $$252582 $$252582: - .incbin "baserom.dol", 0x44F1B4, 0xC + .asciz "SaveBase1N" + .balign 4 .global $$252583 $$252583: - .incbin "baserom.dol", 0x44F1C0, 0x40 + .asciz "SaveBase2N" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252516 $$252516: - .incbin "baserom.dol", 0x4930A0, 0x8 + .asciz "Wait" + .balign 4 .global $$252584 $$252584: - .incbin "baserom.dol", 0x4930A8, 0x4 + .4byte 0 .global $$252585 $$252585: - .incbin "baserom.dol", 0x4930AC, 0x8 + .asciz "Start" + .balign 4 .global $$252621 $$252621: - .incbin "baserom.dol", 0x4930B4, 0x4 + .4byte 0x456E6400 diff --git a/asm/src/SceneAnim.s b/asm/src/SceneAnim.s index 8d7f4543..f5a59e60 100644 --- a/asm/src/SceneAnim.s +++ b/asm/src/SceneAnim.s @@ -289,23 +289,30 @@ lbl_801949D4: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmScnFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmScnFv: - .incbin "baserom.dol", 0x450A50, 0xC + .asciz "ResAnmScn" + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv$$20: - .incbin "baserom.dol", 0x450A5C, 0x1C + .asciz "%s::%s: Object not valid." + .balign 4 .global $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv: - .incbin "baserom.dol", 0x450A78, 0x18 + .asciz "g3d_resanmscn_ac.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$36033 __FUNCTION__$36033: - .incbin "baserom.dol", 0x4931D8, 0x8 + .4byte 0x72656600 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249337 $$249337: - .incbin "baserom.dol", 0x49A1F8, 0x8 + .4byte 0 + .4byte 0 .global $$249406 $$249406: - .incbin "baserom.dol", 0x49A200, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/SceneAnime.s b/asm/src/SceneAnime.s index 1b028121..a71ed7c7 100644 --- a/asm/src/SceneAnime.s +++ b/asm/src/SceneAnime.s @@ -456,28 +456,52 @@ GetRuntimeTypeInfo__Q23scn6ISceneCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252934 $$252934: - .incbin "baserom.dol", 0x459F60, 0x10 + .asciz "AnimeCommon.dn" + .balign 4 .global $$252935 $$252935: - .incbin "baserom.dol", 0x459F70, 0x18 + .asciz "HistoryLayoutDetail.dn" + .balign 4 .global $$252936 $$252936: - .incbin "baserom.dol", 0x459F88, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$252937 $$252937: - .incbin "baserom.dol", 0x459F9C, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$252938 $$252938: - .incbin "baserom.dol", 0x459FB0, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$252939 $$252939: - .incbin "baserom.dol", 0x459FC4, 0x14 + .asciz "HistoryCommon.dn" + .balign 4 .global __vt__Q33scn5anime10SceneAnime __vt__Q33scn5anime10SceneAnime: - .incbin "baserom.dol", 0x459FD8, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x801E2F7C ;# ptr + .4byte 0x801E2E08 ;# ptr + .4byte 0x801E2E9C ;# ptr + .4byte 0x801E2E74 ;# ptr + .4byte 0x801E2EC4 ;# ptr + .4byte 0x801E2EEC ;# ptr + .4byte 0x801E2F24 ;# ptr .global __vt__Q23scn6IScene __vt__Q23scn6IScene: - .incbin "baserom.dol", 0x459FFC, 0x34 + .4byte 0 + .4byte 0 + .4byte 0x801E2F80 ;# ptr + .4byte 0x80175B68 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn5anime10SceneAnime$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneChallengeFileSelect.s b/asm/src/SceneChallengeFileSelect.s index da743292..315943e7 100644 --- a/asm/src/SceneChallengeFileSelect.s +++ b/asm/src/SceneChallengeFileSelect.s @@ -5075,250 +5075,476 @@ __dt__Q43std3tr16detail348function_imp$$0PFv_b$$4Q43std3tr16detail304bound_func$ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$258868 $$258868: - .incbin "baserom.dol", 0x411608, 0xF0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0 + .4byte 0x00000005 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$265146 $$265146: - .incbin "baserom.dol", 0x45A480, 0x18 + .asciz "ChallengeFileSelect.dn" + .balign 4 .global $$265147 $$265147: - .incbin "baserom.dol", 0x45A498, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$265148 $$265148: - .incbin "baserom.dol", 0x45A4A8, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$265149 $$265149: - .incbin "baserom.dol", 0x45A4B8, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$265315 $$265315: - .incbin "baserom.dol", 0x45A4C8, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$265324 $$265324: - .incbin "baserom.dol", 0x45A4E4, 0x10 + .asciz "DeleteSelect" + .balign 4 .global $$265327 $$265327: - .incbin "baserom.dol", 0x45A4F4, 0x18 + .asciz "DeleteCompleteWindow" + .balign 4 .global $$265338 $$265338: - .incbin "baserom.dol", 0x45A50C, 0x14 + .asciz "DeleteSelectN" + .balign 4 + .4byte 0 .global $$265339 $$265339: - .incbin "baserom.dol", 0x45A520, 0x10 + .asciz "FileDeleteTitle" .global $$265341 $$265341: - .incbin "baserom.dol", 0x45A530, 0xC + .asciz "DeleteComp" + .balign 4 .global $$265583 $$265583: - .incbin "baserom.dol", 0x45A53C, 0xC + .4byte 0 + .4byte 0x00000020 + .4byte 0 .global $$265584 $$265584: - .incbin "baserom.dol", 0x45A548, 0xC + .4byte 0 + .4byte 0x00000020 + .4byte 0 .global $$265585 $$265585: - .incbin "baserom.dol", 0x45A554, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$265586 $$265586: - .incbin "baserom.dol", 0x45A560, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$265587 $$265587: - .incbin "baserom.dol", 0x45A56C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x804007C4 .global $$265588 $$265588: - .incbin "baserom.dol", 0x45A578, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global $$265589 $$265589: - .incbin "baserom.dol", 0x45A584, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801E42F4 ;# ptr .global $$265590 $$265590: - .incbin "baserom.dol", 0x45A590, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$265591 $$265591: - .incbin "baserom.dol", 0x45A59C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$265592 $$265592: - .incbin "baserom.dol", 0x45A5A8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x804007C4 .global $$265593 $$265593: - .incbin "baserom.dol", 0x45A5B4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global $$265594 $$265594: - .incbin "baserom.dol", 0x45A5C0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400920 .global $$265595 $$265595: - .incbin "baserom.dol", 0x45A5CC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80400908 .global $$265596 $$265596: - .incbin "baserom.dol", 0x45A5D8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x804007C4 .global $$265597 $$265597: - .incbin "baserom.dol", 0x45A5E4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8040096C .global $$265598 $$265598: - .incbin "baserom.dol", 0x45A5F0, 0xC + .4byte 0 + .4byte 0x00000020 + .4byte 0 .global $$265599 $$265599: - .incbin "baserom.dol", 0x45A5FC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801E3950 ;# ptr .global $$265600 $$265600: - .incbin "baserom.dol", 0x45A608, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801E398C ;# ptr .global $$265601 $$265601: - .incbin "baserom.dol", 0x45A614, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A7C10 ;# ptr .global $$265920 $$265920: - .incbin "baserom.dol", 0x45A620, 0x18 + .asciz "StepLevelMapCommon.dn" + .balign 4 .global $$265921 $$265921: - .incbin "baserom.dol", 0x45A638, 0x14 + .asciz "StepFirstDemo.dn" + .balign 4 .global $$265922 $$265922: - .incbin "baserom.dol", 0x45A64C, 0x18 + .asciz "StepShipMapCommon.dn" + .balign 4 .global $$265923 $$265923: - .incbin "baserom.dol", 0x45A664, 0x1C + .asciz "StepShipMapInCommon.dn" + .balign 4 + .4byte 0 .global $$265924 $$265924: - .incbin "baserom.dol", 0x45A680, 0x18 + .asciz "ChallengeTitleCommon.dn" .global $$265926 $$265926: - .incbin "baserom.dol", 0x45A698, 0xC + .asciz "OpenWait" + .balign 4 .global $$265930 $$265930: - .incbin "baserom.dol", 0x45A6A4, 0x44 + .4byte 0x801E5FA0 ;# ptr + .4byte 0x801E5FBC ;# ptr + .4byte 0x801E6A50 ;# ptr + .4byte 0x801E6B08 ;# ptr + .4byte 0x801E6D60 ;# ptr + .4byte 0x801E6D84 ;# ptr + .4byte 0x801E6DA8 ;# ptr + .4byte 0x801E6DCC ;# ptr + .4byte 0x801E6EF8 ;# ptr + .4byte 0x801E7120 ;# ptr + .4byte 0x801E715C ;# ptr + .4byte 0x801E71A4 ;# ptr + .4byte 0x801E71EC ;# ptr + .4byte 0x801E7224 ;# ptr + .4byte 0x801E7618 ;# ptr + .4byte 0x801E7670 ;# ptr + .4byte 0x801E76D4 ;# ptr .global __vt__Q43std3tr16detail348function_imp$$0PFv_b$$4Q43std3tr16detail304bound_func$$0b$$4Q43std3tr16detail49mem_fn_0_c$$0b$$4Q33scn19challengefileselect7IButton$$1$$4Q33std3tr1208tuple$$0Q33std3tr154reference_wrapper$$0Q33scn19challengefileselect7IButton$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail348function_imp$$0PFv_b$$4Q43std3tr16detail304bound_func$$0b$$4Q43std3tr16detail49mem_fn_0_c$$0b$$4Q33scn19challengefileselect7IButton$$1$$4Q33std3tr1208tuple$$0Q33std3tr154reference_wrapper$$0Q33scn19challengefileselect7IButton$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A6E8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91F0 ;# ptr + .4byte 0x801E8934 ;# ptr + .4byte 0x801E8974 ;# ptr + .4byte 0x801E8990 ;# ptr .global __vt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A700, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91EC ;# ptr + .4byte 0x801E89C8 ;# ptr + .4byte 0x801E8A08 ;# ptr + .4byte 0x801E8A24 ;# ptr .global __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A718, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91E8 ;# ptr + .4byte 0x801E8A58 ;# ptr + .4byte 0x801E8A98 ;# ptr + .4byte 0x801E8AB4 ;# ptr .global __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A730, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91E4 ;# ptr + .4byte 0x801E8AE8 ;# ptr + .4byte 0x801E8B28 ;# ptr + .4byte 0x801E8B44 ;# ptr .global __vt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A748, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91E0 ;# ptr + .4byte 0x801E8B84 ;# ptr + .4byte 0x801E8BC4 ;# ptr + .4byte 0x801E8BE0 ;# ptr .global __vt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A760, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E91DC ;# ptr + .4byte 0x801E8C28 ;# ptr + .4byte 0x801E8C68 ;# ptr + .4byte 0x801E8C84 ;# ptr .global __vt__Q43std3tr16detail360function_imp$$0PFv_v$$4Q43std3tr16detail316bound_func$$0v$$4Q43std3tr16detail54mem_fn_0$$0v$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail360function_imp$$0PFv_v$$4Q43std3tr16detail316bound_func$$0v$$4Q43std3tr16detail54mem_fn_0$$0v$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A778, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E9180 ;# ptr + .4byte 0x801E8C88 ;# ptr + .4byte 0x801E8CC8 ;# ptr + .4byte 0x801E8CE4 ;# ptr .global __vt__Q43std3tr16detail362function_imp$$0PFv_b$$4Q43std3tr16detail318bound_func$$0b$$4Q43std3tr16detail56mem_fn_0_c$$0b$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail362function_imp$$0PFv_b$$4Q43std3tr16detail318bound_func$$0b$$4Q43std3tr16detail56mem_fn_0_c$$0b$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A790, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E9124 ;# ptr + .4byte 0x801E8D24 ;# ptr + .4byte 0x801E8D64 ;# ptr + .4byte 0x801E8D80 ;# ptr .global __vt__Q43std3tr16detail20function_base$$0PFv_b$$1 __vt__Q43std3tr16detail20function_base$$0PFv_b$$1: - .incbin "baserom.dol", 0x45A7A8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801A6E88 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: - .incbin "baserom.dol", 0x45A7C0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801E90B8 ;# ptr + .4byte 0x801E8DC8 ;# ptr + .4byte 0x801E8E08 ;# ptr + .4byte 0x801E8E24 ;# ptr .global __vt__Q43std3tr16detail20function_base$$0PFv_v$$1 __vt__Q43std3tr16detail20function_base$$0PFv_v$$1: - .incbin "baserom.dol", 0x45A7D8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80015030 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q33scn19challengefileselect24SceneChallengeFileSelect __vt__Q33scn19challengefileselect24SceneChallengeFileSelect: - .incbin "baserom.dol", 0x45A7F0, 0xB8 + .4byte 0 + .4byte 0 + .4byte 0x801E8930 ;# ptr + .4byte 0x801E5C6C ;# ptr + .4byte 0x801E5E00 ;# ptr + .4byte 0x801E5DF8 ;# ptr + .4byte 0x801E8218 ;# ptr + .4byte 0x801E821C ;# ptr + .4byte 0x801E82D4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$265314 $$265314: - .incbin "baserom.dol", 0x493F70, 0x8 + .asciz "Effect" + .balign 4 .global $$265316 $$265316: - .incbin "baserom.dol", 0x493F78, 0x8 + .asciz "Base" + .balign 4 .global $$265317 $$265317: - .incbin "baserom.dol", 0x493F80, 0x4 + .4byte 0x42470000 .global $$265318 $$265318: - .incbin "baserom.dol", 0x493F84, 0xC + .asciz "FrameN" + .balign 4 + .4byte 0 .global $$265319 $$265319: - .incbin "baserom.dol", 0x493F90, 0x8 + .asciz "DeleteN" .global $$265320 $$265320: - .incbin "baserom.dol", 0x493F98, 0x8 + .asciz "RumbleN" .global $$265321 $$265321: - .incbin "baserom.dol", 0x493FA0, 0x8 + .asciz "EndingN" .global $$265322 $$265322: - .incbin "baserom.dol", 0x493FA8, 0x8 + .asciz "TopN" + .balign 4 .global $$265323 $$265323: - .incbin "baserom.dol", 0x493FB0, 0x8 + .asciz "Black" + .balign 4 .global $$265325 $$265325: - .incbin "baserom.dol", 0x493FB8, 0x8 + .asciz "BGBomb" + .balign 4 .global $$265326 $$265326: - .incbin "baserom.dol", 0x493FC0, 0x8 + .asciz "WindowN" .global $$265334 $$265334: - .incbin "baserom.dol", 0x493FC8, 0x4 + .4byte 0x496E0000 .global $$265335 $$265335: - .incbin "baserom.dol", 0x493FCC, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 .global $$265336 $$265336: - .incbin "baserom.dol", 0x493FD8, 0x8 + .asciz "FileN%u" .global $$265337 $$265337: - .incbin "baserom.dol", 0x493FE0, 0x8 + .asciz "BlackN" + .balign 4 .global $$265340 $$265340: - .incbin "baserom.dol", 0x493FE8, 0x8 + .asciz "BGBombN" .global $$265342 $$265342: - .incbin "baserom.dol", 0x493FF0, 0x8 + .asciz "Deleted" .global $$265919 $$265919: - .incbin "baserom.dol", 0x493FF8, 0x8 + .asciz "CursorN" .global $$265925 $$265925: - .incbin "baserom.dol", 0x494000, 0x4 + .4byte 0x4F757400 .global $$265927 $$265927: - .incbin "baserom.dol", 0x494004, 0x8 + .asciz "Open" + .balign 4 .global $$265928 $$265928: - .incbin "baserom.dol", 0x49400C, 0xC + .asciz "Close" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$265328 $$265328: - .incbin "baserom.dol", 0x49A868, 0x4 + .4byte 0x3F000000 .global $$265329 $$265329: - .incbin "baserom.dol", 0x49A86C, 0x4 + .4byte 0x3DCCCCCD .global $$265330 $$265330: - .incbin "baserom.dol", 0x49A870, 0x4 + .4byte 0x461C4000 .global $$265331 $$265331: - .incbin "baserom.dol", 0x49A874, 0x4 + .4byte 0 .global $$265332 $$265332: - .incbin "baserom.dol", 0x49A878, 0x4 + .4byte 0x42C80000 .global $$265333 $$265333: - .incbin "baserom.dol", 0x49A87C, 0x4 + .4byte 0x42200000 .global $$265345 $$265345: - .incbin "baserom.dol", 0x49A880, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$266262 $$266262: - .incbin "baserom.dol", 0x49A888, 0x4 + .4byte 0x3ECCCCCD .global $$266263 $$266263: - .incbin "baserom.dol", 0x49A88C, 0x4 + .4byte 0x3F800000 .global $$266264 $$266264: - .incbin "baserom.dol", 0x49A890, 0x8 + .4byte 0x3E99999A + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn19challengefileselect24SceneChallengeFileSelect$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneChallengeResult.s b/asm/src/SceneChallengeResult.s index a761429f..691e37c6 100644 --- a/asm/src/SceneChallengeResult.s +++ b/asm/src/SceneChallengeResult.s @@ -823,44 +823,55 @@ GetRuntimeTypeInfo__Q33scn15challengeresult20SceneChallengeResultCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254440 $$254440: - .incbin "baserom.dol", 0x45B0F0, 0x14 + .asciz "Challengeresult.dn" + .balign 4 .global __vt__Q33scn15challengeresult20SceneChallengeResult __vt__Q33scn15challengeresult20SceneChallengeResult: - .incbin "baserom.dol", 0x45B104, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x801F10BC ;# ptr + .4byte 0x801F0D5C ;# ptr + .4byte 0x801F0F24 ;# ptr + .4byte 0x801F0F20 ;# ptr + .4byte 0x801F1028 ;# ptr + .4byte 0x801F102C ;# ptr + .4byte 0x801F107C ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254439 $$254439: - .incbin "baserom.dol", 0x4941C8, 0x8 + .asciz "Effect" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253533 $$253533: - .incbin "baserom.dol", 0x49A968, 0x4 + .4byte 0x000000FF .global $$254497 $$254497: - .incbin "baserom.dol", 0x49A96C, 0x4 + .4byte 0xBF800000 .global $$254498 $$254498: - .incbin "baserom.dol", 0x49A970, 0x4 + .4byte 0 .global $$254499 $$254499: - .incbin "baserom.dol", 0x49A974, 0x4 + .4byte 0x42200000 .global $$254500 $$254500: - .incbin "baserom.dol", 0x49A978, 0x4 + .4byte 0x42700000 .global $$254501 $$254501: - .incbin "baserom.dol", 0x49A97C, 0x4 + .4byte 0x3FE38E39 .global $$254502 $$254502: - .incbin "baserom.dol", 0x49A980, 0x4 + .4byte 0x3DCCCCCD .global $$254503 $$254503: - .incbin "baserom.dol", 0x49A984, 0x4 + .4byte 0x447A0000 .global $$253899 $$253899: - .incbin "baserom.dol", 0x49A988, 0x8 + .4byte 0x000000FF + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn15challengeresult20SceneChallengeResult$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneChallengeTitle.s b/asm/src/SceneChallengeTitle.s index 517a5158..ca40d691 100644 --- a/asm/src/SceneChallengeTitle.s +++ b/asm/src/SceneChallengeTitle.s @@ -459,31 +459,57 @@ GetRuntimeTypeInfo__Q33scn14challengetitle19SceneChallengeTitleCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252713 $$252713: - .incbin "baserom.dol", 0x45AE78, 0x18 + .asciz "ChallengeTitleCommon.dn" .global $$252714 $$252714: - .incbin "baserom.dol", 0x45AE90, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$252715 $$252715: - .incbin "baserom.dol", 0x45AEA0, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$252716 $$252716: - .incbin "baserom.dol", 0x45AEB4, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$252717 $$252717: - .incbin "baserom.dol", 0x45AEC4, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$252718 $$252718: - .incbin "baserom.dol", 0x45AED8, 0x14 + .asciz "StepFirstDemo.dn" + .balign 4 .global $$252719 $$252719: - .incbin "baserom.dol", 0x45AEEC, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$252720 $$252720: - .incbin "baserom.dol", 0x45AF00, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global __vt__Q33scn14challengetitle19SceneChallengeTitle __vt__Q33scn14challengetitle19SceneChallengeTitle: - .incbin "baserom.dol", 0x45AF10, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x801EFBBC ;# ptr + .4byte 0x801EFA0C ;# ptr + .4byte 0x801EFAA0 ;# ptr + .4byte 0x801EFA78 ;# ptr + .4byte 0x801EFAF4 ;# ptr + .4byte 0x801EFB1C ;# ptr + .4byte 0x801EFB44 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn14challengetitle19SceneChallengeTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneChallengeTutorial.s b/asm/src/SceneChallengeTutorial.s index faf23f1b..c3eabc6f 100644 --- a/asm/src/SceneChallengeTutorial.s +++ b/asm/src/SceneChallengeTutorial.s @@ -636,54 +636,95 @@ GetRuntimeTypeInfo__Q33scn17challengetutorial22SceneChallengeTutorialCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253516 $$253516: - .incbin "baserom.dol", 0x45B988, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$253517 $$253517: - .incbin "baserom.dol", 0x45B998, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$253518 $$253518: - .incbin "baserom.dol", 0x45B9A8, 0x24 + .asciz "ChallengetutorialPreLoadNormal.dn" + .balign 4 .global $$253519 $$253519: - .incbin "baserom.dol", 0x45B9CC, 0x24 + .asciz "ChallengetutorialPreLoadMusou.dn" + .balign 4 .global $$253520 $$253520: - .incbin "baserom.dol", 0x45B9F0, 0x24 + .asciz "ChallengetutorialPreLoadMaster.dn" + .balign 4 .global $$253523 $$253523: - .incbin "baserom.dol", 0x45BA14, 0x40 + .4byte 0x801F6990 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F69E0 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F69B8 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F69E0 ;# ptr + .4byte 0x801F69B8 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F69E0 ;# ptr + .4byte 0x801F69E0 ;# ptr + .4byte 0x801F69B8 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F6990 ;# ptr + .4byte 0x801F6990 ;# ptr .global __vt__Q33scn17challengetutorial22SceneChallengeTutorial __vt__Q33scn17challengetutorial22SceneChallengeTutorial: - .incbin "baserom.dol", 0x45BA54, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x801F7044 ;# ptr + .4byte 0x801F6E00 ;# ptr + .4byte 0x801F6E98 ;# ptr + .4byte 0x801F6E94 ;# ptr + .4byte 0x801F6FF4 ;# ptr + .4byte 0x801F6FF8 ;# ptr + .4byte 0x801F7030 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252749 $$252749: - .incbin "baserom.dol", 0x49A9D8, 0x4 + .4byte 0x000000FF .global $$253588 $$253588: - .incbin "baserom.dol", 0x49A9DC, 0x4 + .4byte 0xBF800000 .global $$253589 $$253589: - .incbin "baserom.dol", 0x49A9E0, 0x4 + .4byte 0 .global $$253590 $$253590: - .incbin "baserom.dol", 0x49A9E4, 0x4 + .4byte 0x42200000 .global $$253591 $$253591: - .incbin "baserom.dol", 0x49A9E8, 0x4 + .4byte 0x42700000 .global $$253592 $$253592: - .incbin "baserom.dol", 0x49A9EC, 0x4 + .4byte 0x3FE38E39 .global $$253593 $$253593: - .incbin "baserom.dol", 0x49A9F0, 0x4 + .4byte 0x3DCCCCCD .global $$253594 $$253594: - .incbin "baserom.dol", 0x49A9F4, 0x4 + .4byte 0x447A0000 .global $$252934 $$252934: - .incbin "baserom.dol", 0x49A9F8, 0x8 + .4byte 0x000000FF + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn17challengetutorial22SceneChallengeTutorial$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneComic.s b/asm/src/SceneComic.s index c333c8e6..1e3f0dea 100644 --- a/asm/src/SceneComic.s +++ b/asm/src/SceneComic.s @@ -277,37 +277,67 @@ GetRuntimeTypeInfo__Q33scn5comic10SceneComicCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251709 $$251709: - .incbin "baserom.dol", 0x45C458, 0x10 + .asciz "ComicSakuma.dn" + .balign 4 .global $$251710 $$251710: - .incbin "baserom.dol", 0x45C468, 0x10 + .asciz "ComicHikawa.dn" + .balign 4 .global $$251711 $$251711: - .incbin "baserom.dol", 0x45C478, 0x14 + .asciz "ComicTaniguchi.dn" + .balign 4 .global T_COMIC_DN_TABLE__Q33scn5comic24$$2unnamed$$2SceneComic_cpp$$2 T_COMIC_DN_TABLE__Q33scn5comic24$$2unnamed$$2SceneComic_cpp$$2: - .incbin "baserom.dol", 0x45C48C, 0xC + .4byte 0x80460358 + .4byte 0x80460368 + .4byte 0x80460378 .global $$252094 $$252094: - .incbin "baserom.dol", 0x45C498, 0x10 + .asciz "ComicCommon.dn" + .balign 4 .global $$252095 $$252095: - .incbin "baserom.dol", 0x45C4A8, 0x18 + .asciz "HistoryLayoutDetail.dn" + .balign 4 .global $$252096 $$252096: - .incbin "baserom.dol", 0x45C4C0, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$252097 $$252097: - .incbin "baserom.dol", 0x45C4D4, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$252098 $$252098: - .incbin "baserom.dol", 0x45C4E8, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$252099 $$252099: - .incbin "baserom.dol", 0x45C4FC, 0x14 + .asciz "HistoryCommon.dn" + .balign 4 .global __vt__Q33scn5comic10SceneComic __vt__Q33scn5comic10SceneComic: - .incbin "baserom.dol", 0x45C510, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x802006DC ;# ptr + .4byte 0x80200598 ;# ptr + .4byte 0x8020062C ;# ptr + .4byte 0x80200604 ;# ptr + .4byte 0x80200654 ;# ptr + .4byte 0x8020067C ;# ptr + .4byte 0x802006B4 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn5comic10SceneComic$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneGrandMenu.s b/asm/src/SceneGrandMenu.s index c2757d85..6e5ea738 100644 --- a/asm/src/SceneGrandMenu.s +++ b/asm/src/SceneGrandMenu.s @@ -419,28 +419,54 @@ GetRuntimeTypeInfo__Q33scn9grandmenu14SceneGrandMenuCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249814 $$249814: - .incbin "baserom.dol", 0x491718, 0x14 + .asciz "GrandMenuCommon.dn" + .balign 4 .global $$249815 $$249815: - .incbin "baserom.dol", 0x49172C, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$249816 $$249816: - .incbin "baserom.dol", 0x491740, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$249817 $$249817: - .incbin "baserom.dol", 0x491754, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$249818 $$249818: - .incbin "baserom.dol", 0x491768, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$249819 $$249819: - .incbin "baserom.dol", 0x491778, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$249820 $$249820: - .incbin "baserom.dol", 0x491788, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global __vt__Q33scn9grandmenu14SceneGrandMenu __vt__Q33scn9grandmenu14SceneGrandMenu: - .incbin "baserom.dol", 0x491798, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x803F4548 + .4byte 0x803F43EC + .4byte 0x803F4480 + .4byte 0x803F4458 + .4byte 0x803F44A8 + .4byte 0x803F44D0 + .4byte 0x803F44F8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn9grandmenu14SceneGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneGrandTitle.s b/asm/src/SceneGrandTitle.s index f12c7767..c1a32447 100644 --- a/asm/src/SceneGrandTitle.s +++ b/asm/src/SceneGrandTitle.s @@ -423,28 +423,53 @@ GetRuntimeTypeInfo__Q33scn10grandtitle15SceneGrandTitleCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 $$252619: - .incbin "baserom.dol", 0x45CAA0, 0x14 + .asciz "GrandTitleCommon.dn" .global $$252620 $$252620: - .incbin "baserom.dol", 0x45CAB4, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$252621 $$252621: - .incbin "baserom.dol", 0x45CAC8, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$252622 $$252622: - .incbin "baserom.dol", 0x45CADC, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$252623 $$252623: - .incbin "baserom.dol", 0x45CAF0, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$252624 $$252624: - .incbin "baserom.dol", 0x45CB00, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$252625 $$252625: - .incbin "baserom.dol", 0x45CB10, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global __vt__Q33scn10grandtitle15SceneGrandTitle __vt__Q33scn10grandtitle15SceneGrandTitle: - .incbin "baserom.dol", 0x45CB20, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8020630C ;# ptr + .4byte 0x802061B0 ;# ptr + .4byte 0x80206244 ;# ptr + .4byte 0x8020621C ;# ptr + .4byte 0x8020626C ;# ptr + .4byte 0x80206294 ;# ptr + .4byte 0x802062BC ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn10grandtitle15SceneGrandTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneHistory.s b/asm/src/SceneHistory.s index 77e43cd9..ea76630c 100644 --- a/asm/src/SceneHistory.s +++ b/asm/src/SceneHistory.s @@ -312,13 +312,23 @@ GetRuntimeTypeInfo__Q33scn7history12SceneHistoryCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254220 $$254220: - .incbin "baserom.dol", 0x45D618, 0x14 + .asciz "HistoryCommon2.dn" + .balign 4 .global $$254221 $$254221: - .incbin "baserom.dol", 0x45D62C, 0x18 + .asciz "HistoryLayoutDetail.dn" + .balign 4 .global __vt__Q33scn7history12SceneHistory __vt__Q33scn7history12SceneHistory: - .incbin "baserom.dol", 0x45D644, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x8020EA80 ;# ptr + .4byte 0x8020E8A4 ;# ptr + .4byte 0x8020E938 ;# ptr + .4byte 0x8020E910 ;# ptr + .4byte 0x8020E960 ;# ptr + .4byte 0x8020E988 ;# ptr + .4byte 0x8020E9B0 ;# ptr .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn7history12SceneHistory$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneInit.s b/asm/src/SceneInit.s index 4c8cdc67..b02152bd 100644 --- a/asm/src/SceneInit.s +++ b/asm/src/SceneInit.s @@ -593,68 +593,120 @@ GetRuntimeTypeInfo__Q33scn4init9SceneInitCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253204 $$253204: - .incbin "baserom.dol", 0x45F7C8, 0x10 + .asciz "common/savedata" .global $$253205 $$253205: - .incbin "baserom.dol", 0x45F7D8, 0xC + .asciz "Savedata" + .balign 4 .global $$253206 $$253206: - .incbin "baserom.dol", 0x45F7E4, 0xC + .asciz "OKButton" + .balign 4 .global $$253208 $$253208: - .incbin "baserom.dol", 0x45F7F0, 0xC + .asciz "SaveFile" + .balign 4 .global $$253209 $$253209: - .incbin "baserom.dol", 0x45F7FC, 0xC + .asciz "OKButtonN" + .balign 4 .global $$253210 $$253210: - .incbin "baserom.dol", 0x45F808, 0xC + .asciz "ButtonText" + .balign 4 .global $$253211 $$253211: - .incbin "baserom.dol", 0x45F814, 0xC + .asciz "ConfirmOK" + .balign 4 .global $$253294 $$253294: - .incbin "baserom.dol", 0x45F820, 0xC + .asciz "SavingFile" + .balign 4 .global $$253295 $$253295: - .incbin "baserom.dol", 0x45F82C, 0xC + .asciz "SavedFile" + .balign 4 .global $$253298 $$253298: - .incbin "baserom.dol", 0x45F838, 0x3C + .4byte 0x8021BAE0 ;# ptr + .4byte 0x8021BB0C ;# ptr + .4byte 0x8021BBB0 ;# ptr + .4byte 0x8021BC20 ;# ptr + .4byte 0x8021BC8C ;# ptr + .4byte 0x8021BCD0 ;# ptr + .4byte 0x8021BD28 ;# ptr + .4byte 0x8021BDA0 ;# ptr + .4byte 0x8021BDC8 ;# ptr + .4byte 0x8021BDFC ;# ptr + .4byte 0x8021BE9C ;# ptr + .4byte 0x8021BEE0 ;# ptr + .4byte 0x8021BF38 ;# ptr + .4byte 0x8021BF7C ;# ptr + .4byte 0x8021BF98 ;# ptr .global __vt__Q33scn4init9SceneInit __vt__Q33scn4init9SceneInit: - .incbin "baserom.dol", 0x45F874, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x8021C058 ;# ptr + .4byte 0x8021B9E0 ;# ptr + .4byte 0x8021BA98 ;# ptr + .4byte 0x8021BA94 ;# ptr + .4byte 0x8021BFBC ;# ptr + .4byte 0x8021BFC0 ;# ptr + .4byte 0x8021C004 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253207 $$253207: - .incbin "baserom.dol", 0x495128, 0x8 + .asciz "Text01" + .balign 4 .global $$253289 $$253289: - .incbin "baserom.dol", 0x495130, 0x4 + .4byte 0x496E0000 .global $$253290 $$253290: - .incbin "baserom.dol", 0x495134, 0x8 + .asciz "TextIn" + .balign 4 .global $$253291 $$253291: - .incbin "baserom.dol", 0x49513C, 0xC + .asciz "Choice" + .balign 4 + .4byte 0 .global $$253292 $$253292: - .incbin "baserom.dol", 0x495148, 0x8 + .asciz "TextOut" .global $$253293 $$253293: - .incbin "baserom.dol", 0x495150, 0x8 + .asciz "Decide" + .balign 4 .global $$253296 $$253296: - .incbin "baserom.dol", 0x495158, 0x8 + .4byte 0x4F757400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252157 $$252157: - .incbin "baserom.dol", 0x49AD38, 0x4 + .4byte 0x000000FF .global $$252160 $$252160: - .incbin "baserom.dol", 0x49AD3C, 0x4 + .4byte 0xFFFFFFFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn4init9SceneInit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/ScenePackageList.s b/asm/src/ScenePackageList.s index cdab34a7..2b71917c 100644 --- a/asm/src/ScenePackageList.s +++ b/asm/src/ScenePackageList.s @@ -259,25 +259,50 @@ GetRuntimeTypeInfo__Q33scn11packagelist16ScenePackageListCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252048 $$252048: - .incbin "baserom.dol", 0x45FA20, 0x18 + .asciz "PackageListCommon.dn" + .balign 4 .global $$252049 $$252049: - .incbin "baserom.dol", 0x45FA38, 0x18 + .asciz "HistoryLayoutDetail.dn" + .balign 4 .global $$252050 $$252050: - .incbin "baserom.dol", 0x45FA50, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$252051 $$252051: - .incbin "baserom.dol", 0x45FA64, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$252052 $$252052: - .incbin "baserom.dol", 0x45FA78, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$252053 $$252053: - .incbin "baserom.dol", 0x45FA8C, 0x14 + .asciz "HistoryCommon.dn" + .balign 4 .global __vt__Q33scn11packagelist16ScenePackageList __vt__Q33scn11packagelist16ScenePackageList: - .incbin "baserom.dol", 0x45FAA0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x8021CCC4 ;# ptr + .4byte 0x8021CB90 ;# ptr + .4byte 0x8021CC24 ;# ptr + .4byte 0x8021CBFC ;# ptr + .4byte 0x8021CC4C ;# ptr + .4byte 0x8021CC74 ;# ptr + .4byte 0x8021CC9C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn11packagelist16ScenePackageList$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneStaffCredit.s b/asm/src/SceneStaffCredit.s index 7126b77f..6d616661 100644 --- a/asm/src/SceneStaffCredit.s +++ b/asm/src/SceneStaffCredit.s @@ -324,19 +324,41 @@ GetRuntimeTypeInfo__Q33scn11staffcredit16SceneStaffCreditCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252494 $$252494: - .incbin "baserom.dol", 0x4920A8, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$252495 $$252495: - .incbin "baserom.dol", 0x4920B8, 0x18 + .asciz "StaffCreditAfterLoad.dn" .global $$252496 $$252496: - .incbin "baserom.dol", 0x4920D0, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$252497 $$252497: - .incbin "baserom.dol", 0x4920E0, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global __vt__Q33scn11staffcredit16SceneStaffCredit __vt__Q33scn11staffcredit16SceneStaffCredit: - .incbin "baserom.dol", 0x4920F0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x803F9FD4 + .4byte 0x803F9D88 + .4byte 0x803F9E1C + .4byte 0x803F9DF4 + .4byte 0x803F9E44 + .4byte 0x803F9E6C + .4byte 0x803F9E94 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn11staffcredit16SceneStaffCredit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneStep.s b/asm/src/SceneStep.s index 6e3c6f2b..dbd6d4d8 100644 --- a/asm/src/SceneStep.s +++ b/asm/src/SceneStep.s @@ -502,37 +502,76 @@ GetRuntimeTypeInfo__Q33scn4step9SceneStepCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252721 $$252721: - .incbin "baserom.dol", 0x45FC10, 0x14 + .asciz "StepLevelMap1.dn" + .balign 4 .global $$252722 $$252722: - .incbin "baserom.dol", 0x45FC24, 0x14 + .asciz "StepLevelMap2.dn" + .balign 4 .global $$252723 $$252723: - .incbin "baserom.dol", 0x45FC38, 0x18 + .asciz "StepLevelMap3.dn" + .balign 4 + .4byte 0 .global $$252724 $$252724: - .incbin "baserom.dol", 0x45FC50, 0x18 + .asciz "StepExplainChallenge.dn" .global $$252725 $$252725: - .incbin "baserom.dol", 0x45FC68, 0x14 + .asciz "StepAbiliryRoom1.dn" .global $$252726 $$252726: - .incbin "baserom.dol", 0x45FC7C, 0x14 + .asciz "StepAbiliryRoom2.dn" .global $$252727 $$252727: - .incbin "baserom.dol", 0x45FC90, 0x14 + .asciz "StepAbiliryRoom3.dn" .global $$252728 $$252728: - .incbin "baserom.dol", 0x45FCA4, 0x14 + .asciz "StepExplainMusou.dn" .global $$252729 $$252729: - .incbin "baserom.dol", 0x45FCB8, 0x18 + .asciz "StepExplainMaster.dn" + .balign 4 .global $$252732 $$252732: - .incbin "baserom.dol", 0x45FCD0, 0x40 + .4byte 0x80221AFC ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221BA8 ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221B8C ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221BA8 ;# ptr + .4byte 0x80221B8C ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221BA8 ;# ptr + .4byte 0x80221BA8 ;# ptr + .4byte 0x80221B8C ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221AFC ;# ptr + .4byte 0x80221AFC ;# ptr .global __vt__Q33scn4step9SceneStep __vt__Q33scn4step9SceneStep: - .incbin "baserom.dol", 0x45FD10, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x80221E74 ;# ptr + .4byte 0x80221D04 ;# ptr + .4byte 0x80221D98 ;# ptr + .4byte 0x80221D70 ;# ptr + .4byte 0x80221DC0 ;# ptr + .4byte 0x80221DE8 ;# ptr + .4byte 0x80221E10 ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn4step9SceneStep$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneStrap.s b/asm/src/SceneStrap.s index 9ef59922..2ff28cb3 100644 --- a/asm/src/SceneStrap.s +++ b/asm/src/SceneStrap.s @@ -516,62 +516,101 @@ GetRuntimeTypeInfo__Q33scn5strap10SceneStrapCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252931 $$252931: - .incbin "baserom.dol", 0x491510, 0x14 + .asciz "strap/Main.US_FRA" + .balign 4 .global $$252933 $$252933: - .incbin "baserom.dol", 0x491524, 0x14 + .asciz "strap/Main.US_SPA" + .balign 4 .global $$252934 $$252934: - .incbin "baserom.dol", 0x491538, 0x14 + .asciz "strap/Main.US_ENG" + .balign 4 .global $$252935 $$252935: - .incbin "baserom.dol", 0x49154C, 0xC + .asciz "strap/Main" + .balign 4 .global $$252936 $$252936: - .incbin "baserom.dol", 0x491558, 0xC + .asciz "Sideways" + .balign 4 .global $$253019 $$253019: - .incbin "baserom.dol", 0x491564, 0x14 + .asciz "HistoryPackage1.dn" + .balign 4 .global $$253020 $$253020: - .incbin "baserom.dol", 0x491578, 0x14 + .asciz "HistoryPackage2.dn" + .balign 4 .global $$253021 $$253021: - .incbin "baserom.dol", 0x49158C, 0x14 + .asciz "HistoryPackage3.dn" + .balign 4 .global $$253022 $$253022: - .incbin "baserom.dol", 0x4915A0, 0x10 + .asciz "StaffCredit.dn" + .balign 4 .global $$253023 $$253023: - .incbin "baserom.dol", 0x4915B0, 0x10 + .asciz "StepCommon.dn" + .balign 4 .global $$253024 $$253024: - .incbin "baserom.dol", 0x4915C0, 0x10 + .asciz "StepHrKirby.dn" + .balign 4 .global $$253027 $$253027: - .incbin "baserom.dol", 0x4915D0, 0x20 + .4byte 0x803F256C + .4byte 0x803F25CC + .4byte 0x803F2608 + .4byte 0x803F2650 + .4byte 0x803F2690 + .4byte 0x803F2710 + .4byte 0x803F26D0 + .4byte 0x803F2744 .global __vt__Q33scn5strap10SceneStrap __vt__Q33scn5strap10SceneStrap: - .incbin "baserom.dol", 0x4915F0, 0x58 + .4byte 0 + .4byte 0 + .4byte 0x803F2830 + .4byte 0x803F2384 + .4byte 0x803F2418 + .4byte 0x803F2414 + .4byte 0x803F27A0 + .4byte 0x803F27A4 + .4byte 0x803F281C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "no name class" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252932 $$252932: - .incbin "baserom.dol", 0x498860, 0x8 + .asciz "Strap" + .balign 4 .global $$253025 $$253025: - .incbin "baserom.dol", 0x498868, 0x8 + .asciz "FadeOut" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252128 $$252128: - .incbin "baserom.dol", 0x49ED20, 0x4 + .4byte 0xFFFFFFFF .global $$253046 $$253046: - .incbin "baserom.dol", 0x49ED24, 0x4 + .4byte 0xC2C80000 .global $$253047 $$253047: - .incbin "baserom.dol", 0x49ED28, 0x8 + .4byte 0x42C80000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn5strap10SceneStrap$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneVC.s b/asm/src/SceneVC.s index fe5db214..aa086627 100644 --- a/asm/src/SceneVC.s +++ b/asm/src/SceneVC.s @@ -173,7 +173,16 @@ lbl_803F2B00: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q33scn2vc7SceneVC __vt__Q33scn2vc7SceneVC: - .incbin "baserom.dol", 0x4916F0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803F2AAC + .4byte 0x803F2AB0 + .4byte 0x803F29FC + .4byte 0x803F29D4 + .4byte 0x803F2A24 + .4byte 0x803F2A4C + .4byte 0x803F2A84 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn2vc7SceneVC$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/Scn__ChallengeTitle__Chara.s b/asm/src/Scn__ChallengeTitle__Chara.s index c418e56d..0104ca0f 100644 --- a/asm/src/Scn__ChallengeTitle__Chara.s +++ b/asm/src/Scn__ChallengeTitle__Chara.s @@ -644,83 +644,130 @@ setRandomFrame__Q28mintglue26Scn__ChallengeTitle__CharaFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256033 $$256033: - .incbin "baserom.dol", 0x456B88, 0x1C + .asciz "Scn.ChallengeTitle.Chara" + .balign 4 .global $$256034 $$256034: - .incbin "baserom.dol", 0x456BA4, 0x1C + .asciz "void changeAnim(string,int)" .global $$256035 $$256035: - .incbin "baserom.dol", 0x456BC0, 0x18 + .asciz "bool isAnimLooped()" + .4byte 0 .global $$256036 $$256036: - .incbin "baserom.dol", 0x456BD8, 0x20 + .asciz "void effectRequestN(int,string)" .global $$256037 $$256037: - .incbin "baserom.dol", 0x456BF8, 0x18 + .asciz "void releaseEffect()" + .balign 4 .global $$256038 $$256038: - .incbin "baserom.dol", 0x456C10, 0x14 + .asciz "void createEquip()" + .balign 4 .global $$256039 $$256039: - .incbin "baserom.dol", 0x456C24, 0x1C + .asciz "void setVisibility(bool)" + .balign 4 .global $$256040 $$256040: - .incbin "baserom.dol", 0x456C40, 0x14 + .asciz "void setSubAnim()" + .balign 4 .global $$256041 $$256041: - .incbin "baserom.dol", 0x456C54, 0x14 + .asciz "void clearSubAnim()" .global $$256042 $$256042: - .incbin "baserom.dol", 0x456C68, 0x1C + .asciz "void flashStart(int,bool)" + .balign 4 .global $$256043 $$256043: - .incbin "baserom.dol", 0x456C84, 0x14 + .asciz "void flashReset()" + .balign 4 .global $$256044 $$256044: - .incbin "baserom.dol", 0x456C98, 0x18 + .asciz "void setRandomFrame()" + .balign 4 .global $$256046 $$256046: - .incbin "baserom.dol", 0x456CB0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3D00 ;# ptr .global $$256077 $$256077: - .incbin "baserom.dol", 0x456CBC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3CDC ;# ptr .global $$256082 $$256082: - .incbin "baserom.dol", 0x456CC8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3C98 ;# ptr .global $$256098 $$256098: - .incbin "baserom.dol", 0x456CD4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3C74 ;# ptr .global $$256103 $$256103: - .incbin "baserom.dol", 0x456CE0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3C50 ;# ptr .global $$256108 $$256108: - .incbin "baserom.dol", 0x456CEC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3C1C ;# ptr .global $$256111 $$256111: - .incbin "baserom.dol", 0x456CF8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3BF8 ;# ptr .global $$256116 $$256116: - .incbin "baserom.dol", 0x456D04, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3BD4 ;# ptr .global $$256121 $$256121: - .incbin "baserom.dol", 0x456D10, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3B90 ;# ptr .global $$256127 $$256127: - .incbin "baserom.dol", 0x456D1C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3B6C ;# ptr .global $$256141 $$256141: - .incbin "baserom.dol", 0x456D28, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C3AC4 ;# ptr .global $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv: - .incbin "baserom.dol", 0x456D34, 0x8C + .asciz "MintPtr is 0." + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv$$20 $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv$$20: - .incbin "baserom.dol", 0x4936D8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256148 $$256148: - .incbin "baserom.dol", 0x49A708, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/Scn__ChallengeTitle__Commander.s b/asm/src/Scn__ChallengeTitle__Commander.s index 02c2f6f5..733e4627 100644 --- a/asm/src/Scn__ChallengeTitle__Commander.s +++ b/asm/src/Scn__ChallengeTitle__Commander.s @@ -290,64 +290,90 @@ lbl_801C4084: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255876 $$255876: - .incbin "baserom.dol", 0x456DC0, 0x20 + .asciz "Scn.ChallengeTitle.Commander" + .balign 4 .global $$255877 $$255877: - .incbin "baserom.dol", 0x456DE0, 0x14 + .asciz "int CurrentFrame()" + .balign 4 .global $$255878 $$255878: - .incbin "baserom.dol", 0x456DF4, 0x14 + .asciz "void SetFrame(int)" + .balign 4 .global $$255879 $$255879: - .incbin "baserom.dol", 0x456E08, 0x18 + .asciz "void SceneAnimStart()" + .balign 4 .global $$255880 $$255880: - .incbin "baserom.dol", 0x456E20, 0x18 + .asciz "void SceneAnimStop()" + .balign 4 .global $$255881 $$255881: - .incbin "baserom.dol", 0x456E38, 0x1C + .asciz "void LocatorAnim(string)" + .balign 4 .global $$255882 $$255882: - .incbin "baserom.dol", 0x456E54, 0x24 + .asciz "Scn.ChallengeTitle.Chara Chara(int)" .global $$255883 $$255883: - .incbin "baserom.dol", 0x456E78, 0x14 + .asciz "void RandomAnim()" + .balign 4 .global $$255884 $$255884: - .incbin "baserom.dol", 0x456E8C, 0x20 + .asciz "void SetWaitAnimFromRandom()" + .balign 4 .global $$255885 $$255885: - .incbin "baserom.dol", 0x456EAC, 0x1C + .asciz "bool IsRandomAnimLooped()" + .balign 4 .global $$255886 $$255886: - .incbin "baserom.dol", 0x456EC8, 0x18 + .asciz "void ResetRandomAnim()" + .balign 4 .global $$255887 $$255887: - .incbin "baserom.dol", 0x456EE0, 0x18 + .asciz "void SetRandomFrame()" + .balign 4 .global $$255888 $$255888: - .incbin "baserom.dol", 0x456EF8, 0x18 + .asciz "bool IsSetRandomFrame()" .global $$255889 $$255889: - .incbin "baserom.dol", 0x456F10, 0x18 + .asciz "void TitleInfoAppear()" + .balign 4 .global $$255890 $$255890: - .incbin "baserom.dol", 0x456F28, 0x1C + .asciz "void TitleInfoEffect(int)" + .balign 4 .global $$255891 $$255891: - .incbin "baserom.dol", 0x456F44, 0x1C + .asciz "void TitleInfoEffectBG(int)" .global $$255892 $$255892: - .incbin "baserom.dol", 0x456F60, 0x18 + .asciz "void CinemaScopeOut()" + .balign 4 .global $$255893 $$255893: - .incbin "baserom.dol", 0x456F78, 0x18 + .asciz "void CinemaScopeHide()" + .balign 4 .global $$255894 $$255894: - .incbin "baserom.dol", 0x456F90, 0x10 + .asciz "void BGMStart()" .global $$255895 $$255895: - .incbin "baserom.dol", 0x456FA0, 0x14 + .asciz "void SEStart(int)" + .balign 4 .global $$255896 $$255896: - .incbin "baserom.dol", 0x456FB4, 0x64 + .asciz "void SEStop()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/Scn__GrandTitle__Block.s b/asm/src/Scn__GrandTitle__Block.s index d7e4605e..e5503e9e 100644 --- a/asm/src/Scn__GrandTitle__Block.s +++ b/asm/src/Scn__GrandTitle__Block.s @@ -168,24 +168,40 @@ setVisibility__Q28mintglue22Scn__GrandTitle__BlockFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254950 $$254950: - .incbin "baserom.dol", 0x457018, 0x18 + .asciz "Scn.GrandTitle.Block" + .balign 4 .global $$254951 $$254951: - .incbin "baserom.dol", 0x457030, 0x1C + .asciz "void setVacuumed(float,int)" .global $$254952 $$254952: - .incbin "baserom.dol", 0x45704C, 0x1C + .asciz "void setVisibility(bool)" + .balign 4 .global $$254954 $$254954: - .incbin "baserom.dol", 0x457068, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C42A8 ;# ptr .global $$254989 $$254989: - .incbin "baserom.dol", 0x457074, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4218 ;# ptr .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv: - .incbin "baserom.dol", 0x457080, 0x60 + .asciz "MintPtr is 0." + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv$$20 $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv$$20: - .incbin "baserom.dol", 0x4936E0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Scn__GrandTitle__Chara.s b/asm/src/Scn__GrandTitle__Chara.s index 8a834343..e8de7a5f 100644 --- a/asm/src/Scn__GrandTitle__Chara.s +++ b/asm/src/Scn__GrandTitle__Chara.s @@ -891,101 +891,154 @@ isCelebrateAnimPlayed__Q28mintglue22Scn__GrandTitle__CharaFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256054 $$256054: - .incbin "baserom.dol", 0x4570E0, 0x18 + .asciz "Scn.GrandTitle.Chara" + .balign 4 .global $$256055 $$256055: - .incbin "baserom.dol", 0x4570F8, 0x1C + .asciz "void changeAnim(string,int)" .global $$256056 $$256056: - .incbin "baserom.dol", 0x457114, 0x14 + .asciz "bool isAnimLooped()" .global $$256057 $$256057: - .incbin "baserom.dol", 0x457128, 0x20 + .asciz "void effectRequestN(int,string)" .global $$256058 $$256058: - .incbin "baserom.dol", 0x457148, 0x24 + .asciz "void effectForeRequestN(int,string)" .global $$256059 $$256059: - .incbin "baserom.dol", 0x45716C, 0x24 + .asciz "void effectWarpRequestN(int,string)" .global $$256060 $$256060: - .incbin "baserom.dol", 0x457190, 0x14 + .asciz "void resetEffect()" + .balign 4 .global $$256061 $$256061: - .incbin "baserom.dol", 0x4571A4, 0x1C + .asciz "void setVisibility(bool)" + .balign 4 .global $$256062 $$256062: - .incbin "baserom.dol", 0x4571C0, 0x20 + .asciz "void setBlockVisibility(bool)" + .balign 4 .global $$256063 $$256063: - .incbin "baserom.dol", 0x4571E0, 0x18 + .asciz "void flashStart(int)" + .balign 4 .global $$256064 $$256064: - .incbin "baserom.dol", 0x4571F8, 0x18 + .asciz "void flashReset()" + .balign 4 + .4byte 0 .global $$256065 $$256065: - .incbin "baserom.dol", 0x457210, 0x20 + .asciz "void requestWalkSE(int,int,int)" .global $$256066 $$256066: - .incbin "baserom.dol", 0x457230, 0x18 + .asciz "void stopWalkSE()" + .balign 4 + .4byte 0 .global $$256067 $$256067: - .incbin "baserom.dol", 0x457248, 0x20 + .asciz "void setLoopAnim(string,string)" .global $$256068 $$256068: - .incbin "baserom.dol", 0x457268, 0x20 + .asciz "bool isCelebrateAnimPlayed()" + .balign 4 .global $$256070 $$256070: - .incbin "baserom.dol", 0x457288, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4EE8 ;# ptr .global $$256126 $$256126: - .incbin "baserom.dol", 0x457294, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4EA4 ;# ptr .global $$256131 $$256131: - .incbin "baserom.dol", 0x4572A0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4E80 ;# ptr .global $$256139 $$256139: - .incbin "baserom.dol", 0x4572AC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4E34 ;# ptr .global $$256142 $$256142: - .incbin "baserom.dol", 0x4572B8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4E10 ;# ptr .global $$256147 $$256147: - .incbin "baserom.dol", 0x4572C4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4DDC ;# ptr .global $$256150 $$256150: - .incbin "baserom.dol", 0x4572D0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4DA8 ;# ptr .global $$256158 $$256158: - .incbin "baserom.dol", 0x4572DC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4D74 ;# ptr .global $$256163 $$256163: - .incbin "baserom.dol", 0x4572E8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4D50 ;# ptr .global $$256168 $$256168: - .incbin "baserom.dol", 0x4572F4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4D0C ;# ptr .global $$256176 $$256176: - .incbin "baserom.dol", 0x457300, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4CC8 ;# ptr .global $$256181 $$256181: - .incbin "baserom.dol", 0x45730C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4C84 ;# ptr .global $$256186 $$256186: - .incbin "baserom.dol", 0x457318, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4C60 ;# ptr .global $$256191 $$256191: - .incbin "baserom.dol", 0x457324, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801C4BB8 ;# ptr .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv: - .incbin "baserom.dol", 0x457330, 0x88 + .asciz "MintPtr is 0." + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv$$20 $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv$$20: - .incbin "baserom.dol", 0x4936E8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256198 $$256198: - .incbin "baserom.dol", 0x49A710, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/Scn__GrandTitle__Commander.s b/asm/src/Scn__GrandTitle__Commander.s index 555cf674..3766235d 100644 --- a/asm/src/Scn__GrandTitle__Commander.s +++ b/asm/src/Scn__GrandTitle__Commander.s @@ -473,94 +473,130 @@ lbl_801C54BC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256032 $$256032: - .incbin "baserom.dol", 0x4573B8, 0x1C + .asciz "Scn.GrandTitle.Commander" + .balign 4 .global $$256033 $$256033: - .incbin "baserom.dol", 0x4573D4, 0x14 + .asciz "int CurrentFrame()" + .balign 4 .global $$256034 $$256034: - .incbin "baserom.dol", 0x4573E8, 0x14 + .asciz "void SetFrame(int)" + .balign 4 .global $$256035 $$256035: - .incbin "baserom.dol", 0x4573FC, 0x18 + .asciz "void SceneAnimStart()" + .balign 4 .global $$256036 $$256036: - .incbin "baserom.dol", 0x457414, 0x18 + .asciz "void SceneAnimStop()" + .balign 4 .global $$256037 $$256037: - .incbin "baserom.dol", 0x45742C, 0x1C + .asciz "void LocatorAnim(string)" + .balign 4 .global $$256038 $$256038: - .incbin "baserom.dol", 0x457448, 0x20 + .asciz "Scn.GrandTitle.Chara Chara(int)" .global $$256039 $$256039: - .incbin "baserom.dol", 0x457468, 0x20 + .asciz "Scn.GrandTitle.Block Block(int)" .global $$256040 $$256040: - .incbin "baserom.dol", 0x457488, 0x28 + .asciz "void RequestLocatorEffect(int,string)" + .balign 4 .global $$256041 $$256041: - .incbin "baserom.dol", 0x4574B0, 0x1C + .asciz "void ResetLocatorEffect()" + .balign 4 .global $$256042 $$256042: - .incbin "baserom.dol", 0x4574CC, 0x1C + .asciz "void RequestBGEffect(int)" + .balign 4 .global $$256043 $$256043: - .incbin "baserom.dol", 0x4574E8, 0x24 + .asciz "void RequestBGEffect(int,string)" + .balign 4 .global $$256044 $$256044: - .incbin "baserom.dol", 0x45750C, 0x18 + .asciz "void ResetBGEffect()" + .balign 4 .global $$256045 $$256045: - .incbin "baserom.dol", 0x457524, 0x18 + .asciz "void BGLayoutAppear()" + .balign 4 .global $$256046 $$256046: - .incbin "baserom.dol", 0x45753C, 0x18 + .asciz "void TitleLogoAppear()" + .balign 4 .global $$256047 $$256047: - .incbin "baserom.dol", 0x457554, 0x18 + .asciz "void TitlePushAppear()" + .balign 4 .global $$256048 $$256048: - .incbin "baserom.dol", 0x45756C, 0x18 + .asciz "void TitleInfoAppear()" + .balign 4 .global $$256049 $$256049: - .incbin "baserom.dol", 0x457584, 0x1C + .asciz "void TitleInfoEffect(int)" + .balign 4 .global $$256050 $$256050: - .incbin "baserom.dol", 0x4575A0, 0x1C + .asciz "void TitleInfoEffectBG(int)" .global $$256051 $$256051: - .incbin "baserom.dol", 0x4575BC, 0x18 + .asciz "void CinemaScopeIn()" + .balign 4 .global $$256052 $$256052: - .incbin "baserom.dol", 0x4575D4, 0x18 + .asciz "void CinemaScopeOut()" + .balign 4 .global $$256053 $$256053: - .incbin "baserom.dol", 0x4575EC, 0x1C + .asciz "void CinemaScopeHide()" + .balign 4 + .4byte 0 .global $$256054 $$256054: - .incbin "baserom.dol", 0x457608, 0x10 + .asciz "void BGMStart()" .global $$256055 $$256055: - .incbin "baserom.dol", 0x457618, 0x1C + .asciz "void SetInValidBGMChange()" + .balign 4 .global $$256056 $$256056: - .incbin "baserom.dol", 0x457634, 0x14 + .asciz "void SkipBGMStart()" .global $$256057 $$256057: - .incbin "baserom.dol", 0x457648, 0x14 + .asciz "void SEStart(int)" + .balign 4 .global $$256058 $$256058: - .incbin "baserom.dol", 0x45765C, 0x10 + .asciz "void SEStop()" + .balign 4 .global $$256059 $$256059: - .incbin "baserom.dol", 0x45766C, 0x14 + .asciz "void WalkSEStop()" + .balign 4 .global $$256060 $$256060: - .incbin "baserom.dol", 0x457680, 0x24 + .asciz "void AbilityGetFadeSetValid(bool)" + .balign 4 .global $$256061 $$256061: - .incbin "baserom.dol", 0x4576A4, 0x1C + .asciz "void AbilityGetFadeClear()" + .balign 4 .global $$256062 $$256062: - .incbin "baserom.dol", 0x4576C0, 0x68 + .asciz "bool IsSkipped()" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "MintFuncProxy.hpp" + .balign 4 + .4byte 0 + .asciz "index = %d, count = %d\n" + .asciz "MArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/Score.s b/asm/src/Score.s index 667047d8..4cd4ed94 100644 --- a/asm/src/Score.s +++ b/asm/src/Score.s @@ -592,14 +592,17 @@ set__Q53scn4step4info9challenge5ScoreFi: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252015 $$252015: - .incbin "baserom.dol", 0x48C8F8, 0x18 + .asciz "step/challenge/Main" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249451 $$249451: - .incbin "baserom.dol", 0x495818, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252016 $$252016: - .incbin "baserom.dol", 0x497C80, 0x8 + .asciz "Score" + .balign 4 diff --git a/asm/src/ScoreCoin.s b/asm/src/ScoreCoin.s index 1fa679d0..26095a01 100644 --- a/asm/src/ScoreCoin.s +++ b/asm/src/ScoreCoin.s @@ -128,30 +128,44 @@ lbl_803C7218: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250366 $$250366: - .incbin "baserom.dol", 0x48E5F8, 0xC + .asciz "ScoreCoinS" + .balign 4 .global $$250367 $$250367: - .incbin "baserom.dol", 0x48E604, 0x18 + .asciz "step/item/ScoreCoinS" + .balign 4 .global $$250369 $$250369: - .incbin "baserom.dol", 0x48E61C, 0x18 + .asciz "step/item/ScoreCoinB" + .balign 4 .global $$250370 $$250370: - .incbin "baserom.dol", 0x48E634, 0xC + .asciz "ScoreCoinB" + .balign 4 .global $$250371 $$250371: - .incbin "baserom.dol", 0x48E640, 0x20 + .4byte 0x803C7100 + .4byte 0x803C7114 + .4byte 0x803C7100 + .4byte 0x803C7114 + .4byte 0x803C7100 + .4byte 0x803C7114 + .4byte 0x803C7100 + .4byte 0x803C7114 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250368 $$250368: - .incbin "baserom.dol", 0x4982C8, 0x8 + .asciz "TopL" + .balign 4 .global $$2STRING$$2CreateGeneral$$09$$40$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$09$$40$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982D0, 0x8 + .asciz "Model" + .balign 4 .global $$2STRING$$2CreateGeneral$$09$$41$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc $$2STRING$$2CreateGeneral$$09$$41$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCc_RQ43scn4step5chara9ModelDesc: - .incbin "baserom.dol", 0x4982D8, 0x8 + .asciz "Model" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2CreateTmpl$$09$$41$$1__Q43scn4step4item13ModelDescUtilFPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry_RQ43scn4step5chara9ModelDesc$$2desc diff --git a/asm/src/ScoreInfo.s b/asm/src/ScoreInfo.s index d811633a..e2b6d5a0 100644 --- a/asm/src/ScoreInfo.s +++ b/asm/src/ScoreInfo.s @@ -79,7 +79,9 @@ isAlive__Q43scn4step9challenge9ScoreInfoCFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251676 $$251676: - .incbin "baserom.dol", 0x495820, 0x8 + .asciz "TopL" + .balign 4 .global $$251677 $$251677: - .incbin "baserom.dol", 0x495828, 0x8 + .asciz "Main" + .balign 4 diff --git a/asm/src/ScoreLine.s b/asm/src/ScoreLine.s index 68c8723f..4eff94c9 100644 --- a/asm/src/ScoreLine.s +++ b/asm/src/ScoreLine.s @@ -671,66 +671,88 @@ lbl_801F4F70: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253406 $$253406: - .incbin "baserom.dol", 0x45B6F0, 0x14 + .asciz "masterresult/Main" + .balign 4 .global $$253407 $$253407: - .incbin "baserom.dol", 0x45B704, 0xC + .asciz "ResultScore" .global $$253408 $$253408: - .incbin "baserom.dol", 0x45B710, 0x18 + .asciz "challengeresult/Main" + .balign 4 .global $$253411 $$253411: - .incbin "baserom.dol", 0x45B728, 0xC + .asciz "GoldCoinN" + .balign 4 .global $$253412 $$253412: - .incbin "baserom.dol", 0x45B734, 0xC + .asciz "SilverCoinN" .global $$253413 $$253413: - .incbin "baserom.dol", 0x45B740, 0xC + .asciz "EnemyiconN" + .balign 4 .global $$253414 $$253414: - .incbin "baserom.dol", 0x45B74C, 0x10 + .asciz "GoldEnemyiconN" + .balign 4 .global $$253415 $$253415: - .incbin "baserom.dol", 0x45B75C, 0xC + .asciz "TimeIconN" + .balign 4 .global $$253416 $$253416: - .incbin "baserom.dol", 0x45B768, 0xC + .asciz "DamageText" + .balign 4 .global $$253419 $$253419: - .incbin "baserom.dol", 0x45B774, 0xC + .asciz "ScoreText" + .balign 4 .global $$253420 $$253420: - .incbin "baserom.dol", 0x45B780, 0xC + .asciz "TotalText" + .balign 4 .global $$253421 $$253421: - .incbin "baserom.dol", 0x45B78C, 0x10 + .asciz "ToDamageText" + .balign 4 .global $$253422 $$253422: - .incbin "baserom.dol", 0x45B79C, 0x10 + .asciz "NoDamageText" + .balign 4 .global $$253504 $$253504: - .incbin "baserom.dol", 0x45B7AC, 0x14 + .asciz "ResultDamageScore" + .balign 4 .global $$253505 $$253505: - .incbin "baserom.dol", 0x45B7C0, 0x50 + .asciz "ResultDamageScore_Nothing" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253409 $$253409: - .incbin "baserom.dol", 0x494340, 0x8 + .asciz "ScoreN" + .balign 4 .global $$253410 $$253410: - .incbin "baserom.dol", 0x494348, 0x8 + .asciz "TimeN" + .balign 4 .global $$253417 $$253417: - .incbin "baserom.dol", 0x494350, 0x4 + .4byte 0x58000000 .global $$253418 $$253418: - .incbin "baserom.dol", 0x494354, 0x8 + .asciz "Equal" + .balign 4 .global $$253503 $$253503: - .incbin "baserom.dol", 0x49435C, 0x4 + .4byte 0x25750000 .global $$253506 $$253506: - .incbin "baserom.dol", 0x494360, 0x8 + .asciz "Start" + .balign 4 diff --git a/asm/src/ScreenRemap.s b/asm/src/ScreenRemap.s index 2bb47377..a91ffc1a 100644 --- a/asm/src/ScreenRemap.s +++ b/asm/src/ScreenRemap.s @@ -228,10 +228,11 @@ setupDrawOriginal__Q23sfx11ScreenRemapFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251565 $$251565: - .incbin "baserom.dol", 0x49EE48, 0x4 + .4byte 0xFFFFFFFF .global $$251592 $$251592: - .incbin "baserom.dol", 0x49EE4C, 0x4 + .4byte 0x000000FF .global $$251606 $$251606: - .incbin "baserom.dol", 0x49EE50, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Script.s b/asm/src/Script.s index db26a596..9968abad 100644 --- a/asm/src/Script.s +++ b/asm/src/Script.s @@ -260,9 +260,13 @@ prevScriptIndex__Q24gobj6ScriptCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251537 $$251537: - .incbin "baserom.dol", 0x451140, 0x20 + .asciz "GObj.Script.DoNothing" + .balign 4 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251536 $$251536: - .incbin "baserom.dol", 0x493208, 0x8 + .asciz "%s.%s" + .balign 4 diff --git a/asm/src/ScriptArchive.s b/asm/src/ScriptArchive.s index 6bbd7d7e..9a3e311c 100644 --- a/asm/src/ScriptArchive.s +++ b/asm/src/ScriptArchive.s @@ -107,9 +107,11 @@ lbl_801C0C48: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248751 $$248751: - .incbin "baserom.dol", 0x455F10, 0x18 + .asciz "mint/Archive.bin.cmp" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2 T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2: - .incbin "baserom.dol", 0x4936B8, 0x8 + .4byte 0x80459E10 + .4byte 0 diff --git a/asm/src/ScriptCallback.s b/asm/src/ScriptCallback.s index 53147f05..e33f0d89 100644 --- a/asm/src/ScriptCallback.s +++ b/asm/src/ScriptCallback.s @@ -248,14 +248,29 @@ onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss14ScriptCallback __vt__Q43scn4step4boss14ScriptCallback: - .incbin "baserom.dol", 0x460910, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80233FE4 ;# ptr + .4byte 0x80234060 ;# ptr + .4byte 0x802340B0 ;# ptr + .4byte 0x802340B8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy14ScriptCallback __vt__Q43scn4step5enemy14ScriptCallback: - .incbin "baserom.dol", 0x46ED18, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8028DA5C ;# ptr + .4byte 0x8028DAD8 ;# ptr + .4byte 0x8028DB04 ;# ptr + .4byte 0x8028DB10 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon14ScriptCallback __vt__Q43scn4step6weapon14ScriptCallback: - .incbin "baserom.dol", 0x48FE78, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803D88B8 + .4byte 0x803D8934 + .4byte 0x803D8938 + .4byte 0x803D893C diff --git a/asm/src/Scroll.s b/asm/src/Scroll.s index 6659ce0c..ddc6cc09 100644 --- a/asm/src/Scroll.s +++ b/asm/src/Scroll.s @@ -621,39 +621,41 @@ __sinit_$$3Scroll_cpp: /* 8020F2EC 0020B12C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402460, 0x4 + .4byte 0x8020F2A4 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253103 $$253103: - .incbin "baserom.dol", 0x49AC40, 0x4 + .4byte 0 .global $$253177 $$253177: - .incbin "baserom.dol", 0x49AC44, 0x4 + .4byte 0x41F00000 .global $$253178 $$253178: - .incbin "baserom.dol", 0x49AC48, 0x4 + .4byte 0x3FC00000 .global $$253179 $$253179: - .incbin "baserom.dol", 0x49AC4C, 0x4 + .4byte 0xBF000000 .global $$253183 $$253183: - .incbin "baserom.dol", 0x49AC50, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$253220 $$253220: - .incbin "baserom.dol", 0x49AC58, 0x4 + .4byte 0x41700000 .global $$253221 $$253221: - .incbin "baserom.dol", 0x49AC5C, 0x4 + .4byte 0x3E800000 .global $$253222 $$253222: - .incbin "baserom.dol", 0x49AC60, 0x4 + .4byte 0x41200000 .global $$253223 $$253223: - .incbin "baserom.dol", 0x49AC64, 0x4 + .4byte 0x41A00000 .global $$253224 $$253224: - .incbin "baserom.dol", 0x49AC68, 0x8 + .4byte 0x3FE00000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global STEP_WIDTH__Q33scn7history20$$2unnamed$$2Scroll_cpp$$2 diff --git a/asm/src/SearchAttack.s b/asm/src/SearchAttack.s index 4ae02d2b..317b9d54 100644 --- a/asm/src/SearchAttack.s +++ b/asm/src/SearchAttack.s @@ -515,4 +515,7 @@ getCollidedAttackTargetGimmick__Q25ocoll12SearchAttackCFUl: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll12SearchAttack __vt__Q25ocoll12SearchAttack: - .incbin "baserom.dol", 0x4594E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801D8548 ;# ptr + .4byte 0 diff --git a/asm/src/SearchAttackNode.s b/asm/src/SearchAttackNode.s index c462291d..2f601609 100644 --- a/asm/src/SearchAttackNode.s +++ b/asm/src/SearchAttackNode.s @@ -190,4 +190,5 @@ lbl_801D8C90: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251954 $$251954: - .incbin "baserom.dol", 0x49A7D8, 0x8 + .4byte 0x00FF0020 + .4byte 0 diff --git a/asm/src/SearchAttackResult.s b/asm/src/SearchAttackResult.s index 7afebce3..950b874c 100644 --- a/asm/src/SearchAttackResult.s +++ b/asm/src/SearchAttackResult.s @@ -92,4 +92,5 @@ getData__Q25ocoll18SearchAttackResultCFUl: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250028 $$250028: - .incbin "baserom.dol", 0x49A7E0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/SearchHit.s b/asm/src/SearchHit.s index 3edda982..3dd53a92 100644 --- a/asm/src/SearchHit.s +++ b/asm/src/SearchHit.s @@ -464,4 +464,7 @@ getCollidedHitOwnerUid__Q25ocoll9SearchHitCFUl: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll9SearchHit __vt__Q25ocoll9SearchHit: - .incbin "baserom.dol", 0x4594F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801D8FCC ;# ptr + .4byte 0 diff --git a/asm/src/SearchHitNode.s b/asm/src/SearchHitNode.s index be8ce788..41859eea 100644 --- a/asm/src/SearchHitNode.s +++ b/asm/src/SearchHitNode.s @@ -95,4 +95,5 @@ update__Q25ocoll13SearchHitNodeFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251952 $$251952: - .incbin "baserom.dol", 0x49A7E8, 0x8 + .4byte 0x00FF0020 + .4byte 0 diff --git a/asm/src/SelectButtonContent.s b/asm/src/SelectButtonContent.s index 28699ade..4bbf1b13 100644 --- a/asm/src/SelectButtonContent.s +++ b/asm/src/SelectButtonContent.s @@ -272,159 +272,280 @@ lbl_8021A7D0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251551 $$251551: - .incbin "baserom.dol", 0x45EEC8, 0xC + .asciz "KAvalancheN" .global $$251554 $$251554: - .incbin "baserom.dol", 0x45EED4, 0xC + .asciz "KPinballN" + .balign 4 .global $$251556 $$251556: - .incbin "baserom.dol", 0x45EEE0, 0xC + .asciz "KAirRideN" + .balign 4 .global $$251560 $$251560: - .incbin "baserom.dol", 0x45EEEC, 0xC + .asciz "KDreamDXN" + .balign 4 .global $$251561 $$251561: - .incbin "baserom.dol", 0x45EEF8, 0xC + .asciz "KMirrorN" + .balign 4 .global $$251566 $$251566: - .incbin "baserom.dol", 0x45EF04, 0xC + .asciz "KAtumeteN" + .balign 4 .global $$251572 $$251572: - .incbin "baserom.dol", 0x45EF10, 0xC + .asciz "Shadow2S" + .balign 4 .global PANES__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 PANES__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45EF1C, 0x74 + .4byte 0x80558AF0 + .4byte 0x80558AF8 + .4byte 0x80558AFC + .4byte 0x80558B00 + .4byte 0x80558B04 + .4byte 0x80462DC8 + .4byte 0x80558B10 + .4byte 0x80558B18 + .4byte 0x80462DD4 + .4byte 0x80558B20 + .4byte 0x80462DE0 + .4byte 0x80558B28 + .4byte 0x80558B30 + .4byte 0x80558B38 + .4byte 0x80462DEC + .4byte 0x80462DF8 + .4byte 0x80558B40 + .4byte 0x80558B48 + .4byte 0x80558B50 + .4byte 0x80558B58 + .4byte 0x80462E04 + .4byte 0x80558B60 + .4byte 0x80558B68 + .4byte 0x80558B70 + .4byte 0x80558B78 + .4byte 0x80558B80 + .4byte 0x80462E10 + .4byte 0x80558B88 + .4byte 0x80558B8C .global TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45EF90, 0x74 + .4byte 0x80558B90 + .4byte 0x80558AF8 + .4byte 0x80558B10 + .4byte 0x80462DD4 + .4byte 0x80558B90 + .4byte 0x80558B18 + .4byte 0x80462DC8 + .4byte 0x80558AFC + .4byte 0x80558B58 + .4byte 0x80558AF0 + .4byte 0x80558B20 + .4byte 0x80558B00 + .4byte 0x80558B90 + .4byte 0x80558B90 + .4byte 0x80558B04 + .4byte 0x80558B50 + .4byte 0x80462DEC + .4byte 0x80558B60 + .4byte 0x80462DE0 + .4byte 0x80462DF8 + .4byte 0x80558B38 + .4byte 0x80558B40 + .4byte 0x80558B90 + .4byte 0x80558B30 + .4byte 0x80558B90 + .4byte 0x80558B48 + .4byte 0x80462E04 + .4byte 0x80558B28 + .4byte 0x80558B68 .global ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .incbin "baserom.dol", 0x45F004, 0x74 + .4byte 0 + .4byte 0x80558B98 + .4byte 0x80558B98 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80558B98 + .4byte 0 + .4byte 0x80558B98 + .4byte 0 + .4byte 0x80558B98 + .4byte 0 + .4byte 0 + .4byte 0x80558B98 + .4byte 0 + .4byte 0 + .4byte 0x80558B9C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$252347 $$252347: - .incbin "baserom.dol", 0x45F078, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252348 $$252348: - .incbin "baserom.dol", 0x45F088, 0x14 + .asciz "TitleButtonPicture" + .balign 4 .global $$252349 $$252349: - .incbin "baserom.dol", 0x45F09C, 0x10 + .asciz "history/Main" + .balign 4 .global $$252402 $$252402: - .incbin "baserom.dol", 0x45F0AC, 0x3C + .asciz "Shadow2S" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251546 $$251546: - .incbin "baserom.dol", 0x494ED0, 0x8 + .asciz "KSDXN" + .balign 4 .global $$251547 $$251547: - .incbin "baserom.dol", 0x494ED8, 0x4 + .4byte 0x4B314E00 .global $$251548 $$251548: - .incbin "baserom.dol", 0x494EDC, 0x4 + .4byte 0x4B324E00 .global $$251549 $$251549: - .incbin "baserom.dol", 0x494EE0, 0x4 + .4byte 0x4B334E00 .global $$251550 $$251550: - .incbin "baserom.dol", 0x494EE4, 0xC + .asciz "K64N" + .balign 4 + .4byte 0 .global $$251552 $$251552: - .incbin "baserom.dol", 0x494EF0, 0x8 + .asciz "KDreamN" .global $$251553 $$251553: - .incbin "baserom.dol", 0x494EF8, 0x8 + .asciz "KBallN" + .balign 4 .global $$251555 $$251555: - .incbin "baserom.dol", 0x494F00, 0x8 + .asciz "KKiraN" + .balign 4 .global $$251557 $$251557: - .incbin "baserom.dol", 0x494F08, 0x8 + .asciz "KWiiN" + .balign 4 .global $$251558 $$251558: - .incbin "baserom.dol", 0x494F10, 0x8 + .asciz "KUSDXN" + .balign 4 .global $$251559 $$251559: - .incbin "baserom.dol", 0x494F18, 0x8 + .asciz "KTouchN" .global $$251562 $$251562: - .incbin "baserom.dol", 0x494F20, 0x8 + .asciz "KDoroN" + .balign 4 .global $$251563 $$251563: - .incbin "baserom.dol", 0x494F28, 0x8 + .asciz "KWoolN" + .balign 4 .global $$251564 $$251564: - .incbin "baserom.dol", 0x494F30, 0x8 + .asciz "KCoroN" + .balign 4 .global $$251565 $$251565: - .incbin "baserom.dol", 0x494F38, 0x8 + .asciz "KBBN" + .balign 4 .global $$251567 $$251567: - .incbin "baserom.dol", 0x494F40, 0x8 + .asciz "KanimeN" .global $$251568 $$251568: - .incbin "baserom.dol", 0x494F48, 0x8 + .asciz "KDonutN" .global $$251569 $$251569: - .incbin "baserom.dol", 0x494F50, 0x8 + .asciz "Shadow" + .balign 4 .global $$251570 $$251570: - .incbin "baserom.dol", 0x494F58, 0x8 + .asciz "ShadowS" .global $$251571 $$251571: - .incbin "baserom.dol", 0x494F60, 0x8 + .asciz "Shadow2" .global $$251573 $$251573: - .incbin "baserom.dol", 0x494F68, 0x4 + .4byte 0x42470000 .global $$251574 $$251574: - .incbin "baserom.dol", 0x494F6C, 0x4 + .4byte 0x42475300 .global $$251575 $$251575: - .incbin "baserom.dol", 0x494F70, 0x8 + .asciz "Dummy" + .balign 4 .global $$251577 $$251577: - .incbin "baserom.dol", 0x494F78, 0x4 + .4byte 0x56434E00 .global $$251578 $$251578: - .incbin "baserom.dol", 0x494F7C, 0x8 + .asciz "MovieN" + .balign 4 .global $$252350 $$252350: - .incbin "baserom.dol", 0x494F84, 0xC + .asciz "Icon" + .balign 4 + .4byte 0 .global $$252351 $$252351: - .incbin "baserom.dol", 0x494F90, 0x8 + .asciz "Unfocus" .global $$252401 $$252401: - .incbin "baserom.dol", 0x494F98, 0x8 + .asciz "ShadowS" .global $$252403 $$252403: - .incbin "baserom.dol", 0x494FA0, 0x4 + .4byte 0x42475300 .global $$252404 $$252404: - .incbin "baserom.dol", 0x494FA4, 0x8 + .asciz "IconSN" + .balign 4 .global $$252405 $$252405: - .incbin "baserom.dol", 0x494FAC, 0xC + .asciz "Shadow" + .balign 4 + .4byte 0 .global $$252406 $$252406: - .incbin "baserom.dol", 0x494FB8, 0x8 + .asciz "Shadow2" .global $$252407 $$252407: - .incbin "baserom.dol", 0x494FC0, 0x4 + .4byte 0x42470000 .global $$252408 $$252408: - .incbin "baserom.dol", 0x494FC4, 0x8 + .asciz "IconN" + .balign 4 .global $$252409 $$252409: - .incbin "baserom.dol", 0x494FCC, 0x8 + .asciz "Wait" + .balign 4 .global $$252410 $$252410: - .incbin "baserom.dol", 0x494FD4, 0x8 + .asciz "MovieN" + .balign 4 .global $$252411 $$252411: - .incbin "baserom.dol", 0x494FDC, 0x4 + .4byte 0x56434E00 .global $$252418 $$252418: - .incbin "baserom.dol", 0x494FE0, 0x8 + .asciz "Focus" + .balign 4 diff --git a/asm/src/Sequence.s b/asm/src/Sequence.s index 11f3c3a9..c1435eda 100644 --- a/asm/src/Sequence.s +++ b/asm/src/Sequence.s @@ -1581,31 +1581,66 @@ __dt__Q34info8sequence11CommandWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255949 $$255949: - .incbin "baserom.dol", 0x4532E8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x801A67CC ;# ptr .global __vt__Q34info8sequence11CommandWait __vt__Q34info8sequence11CommandWait: - .incbin "baserom.dol", 0x4532F4, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A7018 ;# ptr + .4byte 0x801A696C ;# ptr + .4byte 0x801A6924 ;# ptr .global __vt__Q34info8sequence11CommandProc __vt__Q34info8sequence11CommandProc: - .incbin "baserom.dol", 0x453308, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A6FAC ;# ptr + .4byte 0x801A6914 ;# ptr + .4byte 0x801A6974 ;# ptr .global __vt__Q34info8sequence15CommandInterval __vt__Q34info8sequence15CommandInterval: - .incbin "baserom.dol", 0x45331C, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A6F34 ;# ptr + .4byte 0x801A6ACC ;# ptr + .4byte 0x801A6A00 ;# ptr .global __vt__Q34info8sequence11CommandCall __vt__Q34info8sequence11CommandCall: - .incbin "baserom.dol", 0x453330, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A6EC8 ;# ptr + .4byte 0x801A6B24 ;# ptr + .4byte 0x801A5C68 ;# ptr .global __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap: - .incbin "baserom.dol", 0x453344, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A649C ;# ptr + .4byte 0x801A6C08 ;# ptr + .4byte 0x801A6C10 ;# ptr .global __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap: - .incbin "baserom.dol", 0x453358, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A6080 ;# ptr + .4byte 0x801A6C14 ;# ptr + .4byte 0x801A6C18 ;# ptr .global __vt__Q34info8sequence11CommandAnim __vt__Q34info8sequence11CommandAnim: - .incbin "baserom.dol", 0x45336C, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A6BAC ;# ptr + .4byte 0x801A6B9C ;# ptr + .4byte 0x801A6B5C ;# ptr .global __vt__Q34info8sequence7Command __vt__Q34info8sequence7Command: - .incbin "baserom.dol", 0x453380, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A5DAC ;# ptr + .4byte 0x801A6914 ;# ptr + .4byte 0x801A5C68 ;# ptr .global $$256161 $$256161: - .incbin "baserom.dol", 0x453394, 0x14 + .asciz "bad_function_call" + .balign 4 diff --git a/asm/src/SequenceChallengeRoot.s b/asm/src/SequenceChallengeRoot.s index 0724ec90..02c6fcdf 100644 --- a/asm/src/SequenceChallengeRoot.s +++ b/asm/src/SequenceChallengeRoot.s @@ -978,7 +978,16 @@ GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq21SequenceChallengeRoot __vt__Q23seq21SequenceChallengeRoot: - .incbin "baserom.dol", 0x4924B0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FD984 + .4byte 0x803FCECC + .4byte 0x803FCF38 + .4byte 0x803FCFD4 + .4byte 0x803FD180 + .4byte 0x803FD198 + .4byte 0x803FD510 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q23seq21SequenceChallengeRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SequenceChallengeTitleRoot.s b/asm/src/SequenceChallengeTitleRoot.s index dccfd0f6..55c6b0b1 100644 --- a/asm/src/SequenceChallengeTitleRoot.s +++ b/asm/src/SequenceChallengeTitleRoot.s @@ -506,7 +506,16 @@ __dt__Q23seq26SequenceChallengeTitleRootFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq26SequenceChallengeTitleRoot __vt__Q23seq26SequenceChallengeTitleRoot: - .incbin "baserom.dol", 0x4924D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FE020 + .4byte 0x803FE024 + .4byte 0x803FDB24 + .4byte 0x803FDB94 + .4byte 0x803FDD44 + .4byte 0x803FDE08 + .4byte 0x803FDF24 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q23seq26SequenceChallengeTitleRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SequenceFirstDemo.s b/asm/src/SequenceFirstDemo.s index 545d296a..5d68753d 100644 --- a/asm/src/SequenceFirstDemo.s +++ b/asm/src/SequenceFirstDemo.s @@ -206,4 +206,13 @@ GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceFirstDemo __vt__Q23seq17SequenceFirstDemo: - .incbin "baserom.dol", 0x492500, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FE2C0 + .4byte 0x803FE0F4 + .4byte 0x803FE0F8 + .4byte 0x803FE128 + .4byte 0x803FE270 + .4byte 0x803FE288 + .4byte 0x803FE2BC + .4byte 0 diff --git a/asm/src/SequenceGrandMenu.s b/asm/src/SequenceGrandMenu.s index d4874741..8b610d7e 100644 --- a/asm/src/SequenceGrandMenu.s +++ b/asm/src/SequenceGrandMenu.s @@ -356,7 +356,16 @@ GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceGrandMenu __vt__Q23seq17SequenceGrandMenu: - .incbin "baserom.dol", 0x492528, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FE74C + .4byte 0x803FE418 + .4byte 0x803FE41C + .4byte 0x803FE460 + .4byte 0x803FE538 + .4byte 0x803FE544 + .4byte 0x803FE614 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q23seq17SequenceGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SequenceHistory.s b/asm/src/SequenceHistory.s index 61c43e6f..36cd118b 100644 --- a/asm/src/SequenceHistory.s +++ b/asm/src/SequenceHistory.s @@ -366,4 +366,13 @@ __dt__Q23seq15SequenceHistoryFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq15SequenceHistory __vt__Q23seq15SequenceHistory: - .incbin "baserom.dol", 0x492550, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FEC18 + .4byte 0x803FEC1C + .4byte 0x803FE7C0 + .4byte 0x803FE808 + .4byte 0x803FE86C + .4byte 0x803FE870 + .4byte 0x803FEA34 + .4byte 0 diff --git a/asm/src/SequenceLvMapRoot.s b/asm/src/SequenceLvMapRoot.s index 1783fc5a..efd9e174 100644 --- a/asm/src/SequenceLvMapRoot.s +++ b/asm/src/SequenceLvMapRoot.s @@ -603,4 +603,13 @@ GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceLvMapRoot __vt__Q23seq17SequenceLvMapRoot: - .incbin "baserom.dol", 0x492578, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FF420 + .4byte 0x803FEF48 + .4byte 0x803FEF4C + .4byte 0x803FEF7C + .4byte 0x803FF184 + .4byte 0x803FF1A8 + .4byte 0x803FF1AC + .4byte 0 diff --git a/asm/src/SequenceProductRoot.s b/asm/src/SequenceProductRoot.s index 7eb20447..adf92d02 100644 --- a/asm/src/SequenceProductRoot.s +++ b/asm/src/SequenceProductRoot.s @@ -402,7 +402,16 @@ __dt__Q23seq19SequenceProductRootFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq19SequenceProductRoot __vt__Q23seq19SequenceProductRoot: - .incbin "baserom.dol", 0x4925A0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FF964 + .4byte 0x803FF968 + .4byte 0x803FF554 + .4byte 0x803FF584 + .4byte 0x803FF5E8 + .4byte 0x803FF604 + .4byte 0x803FF7D8 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q23seq19SequenceProductRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SequenceRoot.s b/asm/src/SequenceRoot.s index b5506719..09e4937e 100644 --- a/asm/src/SequenceRoot.s +++ b/asm/src/SequenceRoot.s @@ -90,4 +90,13 @@ lbl_803FFA40: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq12SequenceRoot __vt__Q23seq12SequenceRoot: - .incbin "baserom.dol", 0x4925C8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FF9FC + .4byte 0x803FFA00 + .4byte 0x803FF984 + .4byte 0x803FF988 + .4byte 0x803FF9F0 + .4byte 0x803FF9F4 + .4byte 0x803FF9F8 + .4byte 0 diff --git a/asm/src/SequenceStaffCredit.s b/asm/src/SequenceStaffCredit.s index 63b31221..c14538bb 100644 --- a/asm/src/SequenceStaffCredit.s +++ b/asm/src/SequenceStaffCredit.s @@ -131,4 +131,13 @@ GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq19SequenceStaffCredit __vt__Q23seq19SequenceStaffCredit: - .incbin "baserom.dol", 0x4925F0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803FFDA8 + .4byte 0x803FFCD4 + .4byte 0x803FFCD8 + .4byte 0x803FFD08 + .4byte 0x803FFD0C + .4byte 0x803FFD10 + .4byte 0x803FFD90 + .4byte 0 diff --git a/asm/src/SequenceStep.s b/asm/src/SequenceStep.s index bf0291ad..fb8ea76b 100644 --- a/asm/src/SequenceStep.s +++ b/asm/src/SequenceStep.s @@ -486,9 +486,19 @@ __dt__Q23seq12SequenceStepFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq12SequenceStep __vt__Q23seq12SequenceStep: - .incbin "baserom.dol", 0x492618, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80400438 + .4byte 0x8040043C + .4byte 0x8040021C + .4byte 0x80400234 + .4byte 0x80400268 + .4byte 0x8040026C + .4byte 0x804002E8 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251094 $$251094: - .incbin "baserom.dol", 0x49EDE0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/SequenceVC.s b/asm/src/SequenceVC.s index 9a6396c4..c558d60a 100644 --- a/asm/src/SequenceVC.s +++ b/asm/src/SequenceVC.s @@ -81,4 +81,13 @@ __dt__Q23seq10SequenceVCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq10SequenceVC __vt__Q23seq10SequenceVC: - .incbin "baserom.dol", 0x492640, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80400508 + .4byte 0x8040050C + .4byte 0x80400460 + .4byte 0x80400478 + .4byte 0x8040047C + .4byte 0x80400480 + .4byte 0x804004FC + .4byte 0 diff --git a/asm/src/Shadow.s b/asm/src/Shadow.s index bf12b681..db559ab9 100644 --- a/asm/src/Shadow.s +++ b/asm/src/Shadow.s @@ -1056,86 +1056,102 @@ lbl_8028DDAC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251778 $$251778: - .incbin "baserom.dol", 0x45AF68, 0x20 + .asciz "challengetitle/TitleScene" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252146 $$252146: - .incbin "baserom.dol", 0x45CB78, 0x20 + .asciz "challengetitle/TitleScene" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252296 $$252296: - .incbin "baserom.dol", 0x45D668, 0x10 + .asciz "common/Shadow" + .balign 4 .global $$252348 $$252348: - .incbin "baserom.dol", 0x45D678, 0xC + .asciz "LightEnd" + .balign 4 .global $$252351 $$252351: - .incbin "baserom.dol", 0x45D684, 0xC + .asciz "LightStart" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2: - .incbin "baserom.dol", 0x494170, 0x4 + .4byte 0x8045EE68 .global $$252224 $$252224: - .incbin "baserom.dol", 0x494174, 0x8 + .asciz "Shadow" + .balign 4 .global $$252232 $$252232: - .incbin "baserom.dol", 0x49417C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2: - .incbin "baserom.dol", 0x494810, 0x4 + .4byte 0x80460A78 .global $$252859 $$252859: - .incbin "baserom.dol", 0x494814, 0x8 + .asciz "Shadow" + .balign 4 .global $$252900 $$252900: - .incbin "baserom.dol", 0x49481C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252297 $$252297: - .incbin "baserom.dol", 0x494A58, 0x8 + .asciz "ShadowM" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252901 $$252901: - .incbin "baserom.dol", 0x49AB20, 0x4 + .4byte 0 .global $$252902 $$252902: - .incbin "baserom.dol", 0x49AB24, 0x4 + .4byte 0x3F800000 .global $$252903 $$252903: - .incbin "baserom.dol", 0x49AB28, 0x4 + .4byte 0x3F000000 .global $$252904 $$252904: - .incbin "baserom.dol", 0x49AB2C, 0x4 + .4byte 0x3F99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251517 $$251517: - .incbin "baserom.dol", 0x49B868, 0x4 + .4byte 0x00000078 .global $$251733 $$251733: - .incbin "baserom.dol", 0x49B86C, 0x4 + .4byte 0x40600000 .global $$251734 $$251734: - .incbin "baserom.dol", 0x49B870, 0x4 + .4byte 0 .global $$251769 $$251769: - .incbin "baserom.dol", 0x49B874, 0x4 + .4byte 0x3F800000 .global $$251770 $$251770: - .incbin "baserom.dol", 0x49B878, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$251773 $$251773: - .incbin "baserom.dol", 0x49B880, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252264 $$252264: - .incbin "baserom.dol", 0x49BA30, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/ShadowSphere.s b/asm/src/ShadowSphere.s index c60bd008..d3deb94f 100644 --- a/asm/src/ShadowSphere.s +++ b/asm/src/ShadowSphere.s @@ -143,20 +143,22 @@ updateMaterial__Q43scn4step3sfx12ShadowSphereFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252021 $$252021: - .incbin "baserom.dol", 0x48EDA0, 0x10 + .asciz "step/sfx/Shadow" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252022 $$252022: - .incbin "baserom.dol", 0x4983F0, 0x8 + .asciz "Sphere" + .balign 4 .global $$252072 $$252072: - .incbin "baserom.dol", 0x4983F8, 0x8 + .asciz "FrontAM" .global $$252073 $$252073: - .incbin "baserom.dol", 0x498400, 0x8 + .asciz "FrontCM" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251593 $$251593: - .incbin "baserom.dol", 0x49E7A0, 0x8 + .4byte 0x00000040 + .4byte 0 diff --git a/asm/src/Shake.s b/asm/src/Shake.s index a3e84546..679f7a1c 100644 --- a/asm/src/Shake.s +++ b/asm/src/Shake.s @@ -74,30 +74,65 @@ lbl_80272E54: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x413A88, 0x10 + .4byte 0xBD99999A + .4byte 0x3D99999A + .4byte 0xBCA3D70A + .4byte 0x3CA3D70A .global T_SHAKE_OFFS_TABLE_M__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_M__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x413A98, 0x10 + .4byte 0xBDF5C28F + .4byte 0x3DF5C28F + .4byte 0xBDCCCCCD + .4byte 0x3DCCCCCD .global T_SHAKE_OFFS_TABLE_L__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_L__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x413AA8, 0x18 + .4byte 0xBE051EB8 + .4byte 0x3E051EB8 + .4byte 0xBDF5C28F + .4byte 0x3DF5C28F + .4byte 0xBDCCCCCD + .4byte 0x3DCCCCCD .global T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x413AC0, 0x30 + .4byte 0xBE051EB8 + .4byte 0x3E051EB8 + .4byte 0xBE051EB8 + .4byte 0x3E051EB8 + .4byte 0xBE051EB8 + .4byte 0x3E051EB8 + .4byte 0xBE051EB8 + .4byte 0x3E051EB8 + .4byte 0xBDF5C28F + .4byte 0x3DF5C28F + .4byte 0xBDCCCCCD + .4byte 0x3DCCCCCD .global T_TABLE__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_TABLE__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x413AF0, 0x30 + .4byte 0x00000002 + .4byte 0x80560D48 + .4byte 0x00000002 + .4byte 0x80560D50 + .4byte 0x00000004 + .4byte 0x80417988 + .4byte 0x00000004 + .4byte 0x80417998 + .4byte 0x00000006 + .4byte 0x804179A8 + .4byte 0x0000000C + .4byte 0x804179C0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x49B888, 0x8 + .4byte 0xBCA3D70A + .4byte 0x3CA3D70A .global T_SHAKE_OFFS_TABLE_SS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_SS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: - .incbin "baserom.dol", 0x49B890, 0x8 + .4byte 0xBD4CCCCD + .4byte 0x3D4CCCCD .global $$249717 $$249717: - .incbin "baserom.dol", 0x49B898, 0x4 + .4byte 0 .global $$249718 $$249718: - .incbin "baserom.dol", 0x49B89C, 0x4 + .4byte 0x3F400000 diff --git a/asm/src/ShakeCharge.s b/asm/src/ShakeCharge.s index e770e5b1..0353b4f0 100644 --- a/asm/src/ShakeCharge.s +++ b/asm/src/ShakeCharge.s @@ -284,7 +284,7 @@ lbl_80354B40: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253367 $$253367: - .incbin "baserom.dol", 0x49D9A8, 0x4 + .4byte 0 .global $$253368 $$253368: - .incbin "baserom.dol", 0x49D9AC, 0x4 + .4byte 0x3ECCCCCD diff --git a/asm/src/Shape.s b/asm/src/Shape.s index d89793dd..3339ceb0 100644 --- a/asm/src/Shape.s +++ b/asm/src/Shape.s @@ -186,7 +186,7 @@ setDebugColor__Q25ocoll5ShapeFRC8_GXColor: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252228 $$252228: - .incbin "baserom.dol", 0x49A7F0, 0x4 + .4byte 0x3F000000 .global $$252229 $$252229: - .incbin "baserom.dol", 0x49A7F4, 0x4 + .4byte 0 diff --git a/asm/src/ShapeDiamondContext.s b/asm/src/ShapeDiamondContext.s index 819e916b..77e1b7e4 100644 --- a/asm/src/ShapeDiamondContext.s +++ b/asm/src/ShapeDiamondContext.s @@ -167,4 +167,5 @@ getToBottomDist__Q35mcoll6detail19ShapeDiamondContextCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249753 $$249753: - .incbin "baserom.dol", 0x49A6F0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Ship.s b/asm/src/Ship.s index 61aa56ad..7d3d30bc 100644 --- a/asm/src/Ship.s +++ b/asm/src/Ship.s @@ -90,12 +90,15 @@ procAnim__Q53scn4step4info4ship4ShipFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252067 $$252067: - .incbin "baserom.dol", 0x48DD88, 0x10 + .asciz "step/demo/Main" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252068 $$252068: - .incbin "baserom.dol", 0x498118, 0x8 + .asciz "Base" + .balign 4 .global $$252069 $$252069: - .incbin "baserom.dol", 0x498120, 0x8 + .asciz "SkipN" + .balign 4 diff --git a/asm/src/ShipEvent.s b/asm/src/ShipEvent.s index 6e5b9bb4..0db5c1bf 100644 --- a/asm/src/ShipEvent.s +++ b/asm/src/ShipEvent.s @@ -3843,163 +3843,312 @@ lbl_80322CB8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$260977 $$260977: - .incbin "baserom.dol", 0x415BB0, 0x20 + .4byte 0x8055A860 + .4byte 0x8055A868 + .4byte 0x8055A870 + .4byte 0x8055A878 + .4byte 0x8055A880 + .4byte 0x8055A888 + .4byte 0x8055A890 + .4byte 0 .global $$261005 $$261005: - .incbin "baserom.dol", 0x415BD0, 0x80 + .4byte 0x8055A860 + .4byte 0x8055A898 + .4byte 0x8055A8A0 + .4byte 0x80482244 + .4byte 0x8055A8A8 + .4byte 0x8055A8B0 + .4byte 0x80482250 + .4byte 0x8055A8B8 + .4byte 0x8055A8C0 + .4byte 0x80482260 + .4byte 0x80482270 + .4byte 0x8048227C + .4byte 0x80482288 + .4byte 0x80482270 + .4byte 0x80482294 + .4byte 0x8055A8A8 + .4byte 0x8055A898 + .4byte 0x804822A0 + .4byte 0x804822AC + .4byte 0x8055A878 + .4byte 0x8055A8A0 + .4byte 0x8055A8C8 + .4byte 0x804822B8 + .4byte 0x804822C8 + .4byte 0x804822D8 + .4byte 0x804822E8 + .4byte 0x804822F8 + .4byte 0x8055A8D0 + .4byte 0x8055A8D8 + .4byte 0x8055A860 + .4byte 0x8055A8E0 + .4byte 0x8055A8E8 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264598 $$264598: - .incbin "baserom.dol", 0x47E228, 0x18 + .asciz "step/gimmick/ShipEvent" + .balign 4 .global $$264599 $$264599: - .incbin "baserom.dol", 0x47E240, 0x30 + .asciz "Scn.Step.Gimmick.ShipEvent.FirstDemoEvent.Wait" + .balign 4 .global $$264706 $$264706: - .incbin "baserom.dol", 0x47E270, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80320420 .global $$264779 $$264779: - .incbin "baserom.dol", 0x47E27C, 0x30 + .asciz "Scn.Step.Gimmick.ShipEvent.FirstDemoEvent.Exec" + .balign 4 .global $$264825 $$264825: - .incbin "baserom.dol", 0x47E2AC, 0x38 + .4byte 0x8032059C + .4byte 0x8032061C + .4byte 0x8032069C + .4byte 0x80320704 + .4byte 0x8032076C + .4byte 0x803207D4 + .4byte 0x8032083C + .4byte 0x8032084C + .4byte 0x8032089C + .4byte 0x803208F8 + .4byte 0x80320904 + .4byte 0x80320910 + .4byte 0x8032091C + .4byte 0x80320988 .global $$264902 $$264902: - .incbin "baserom.dol", 0x47E2E4, 0x60 + .4byte 0x803211A0 + .4byte 0x803211AC + .4byte 0x803211B8 + .4byte 0x803211C4 + .4byte 0x803211D0 + .4byte 0x803211DC + .4byte 0x803211E8 + .4byte 0x803211F4 + .4byte 0x80321200 + .4byte 0x8032120C + .4byte 0x80321218 + .4byte 0x80321224 + .4byte 0x80321230 + .4byte 0x8032123C + .4byte 0x80321248 + .4byte 0x80321254 + .4byte 0x80321260 + .4byte 0x8032126C + .4byte 0x80321278 + .4byte 0x80321284 + .4byte 0x80321290 + .4byte 0x8032129C + .4byte 0x803212AC + .4byte 0x803212B8 .global $$260982 $$260982: - .incbin "baserom.dol", 0x47E344, 0xC + .asciz "VeryHappy" + .balign 4 .global $$260985 $$260985: - .incbin "baserom.dol", 0x47E350, 0x10 + .asciz "PointMonitor" + .balign 4 .global $$260988 $$260988: - .incbin "baserom.dol", 0x47E360, 0x10 + .asciz "TypeKeyBoard" + .balign 4 .global $$260989 $$260989: - .incbin "baserom.dol", 0x47E370, 0xC + .asciz "LookMonitor" .global $$260990 $$260990: - .incbin "baserom.dol", 0x47E37C, 0xC + .asciz "LookKirby" + .balign 4 .global $$260991 $$260991: - .incbin "baserom.dol", 0x47E388, 0xC + .asciz "CallKirby" + .balign 4 .global $$260992 $$260992: - .incbin "baserom.dol", 0x47E394, 0xC + .asciz "LookMahoroa" .global $$260993 $$260993: - .incbin "baserom.dol", 0x47E3A0, 0xC + .asciz "Listening" + .balign 4 .global $$260994 $$260994: - .incbin "baserom.dol", 0x47E3AC, 0xC + .asciz "PartsStatus" .global $$260996 $$260996: - .incbin "baserom.dol", 0x47E3B8, 0x10 + .asciz "UnlockChallenge" .global $$260997 $$260997: - .incbin "baserom.dol", 0x47E3C8, 0x10 + .asciz "UnlockAbility" + .balign 4 .global $$260998 $$260998: - .incbin "baserom.dol", 0x47E3D8, 0x10 + .asciz "MomentChallenge" .global $$260999 $$260999: - .incbin "baserom.dol", 0x47E3E8, 0x10 + .asciz "MomentAbility" + .balign 4 .global $$261000 $$261000: - .incbin "baserom.dol", 0x47E3F8, 0xC + .asciz "MomentTalk" + .balign 4 .global $$265156 $$265156: - .incbin "baserom.dol", 0x47E404, 0x84 + .4byte 0x803225FC + .4byte 0x803223F8 + .4byte 0x80322408 + .4byte 0x80322418 + .4byte 0x80322428 + .4byte 0x80322438 + .4byte 0x80322448 + .4byte 0x80322458 + .4byte 0x80322468 + .4byte 0x80322478 + .4byte 0x80322488 + .4byte 0x80322498 + .4byte 0x803224A8 + .4byte 0x803224B8 + .4byte 0x803224C8 + .4byte 0x803224D8 + .4byte 0x803224E8 + .4byte 0x803224F8 + .4byte 0x80322508 + .4byte 0x80322514 + .4byte 0x80322528 + .4byte 0x8032253C + .4byte 0x80322550 + .4byte 0x80322564 + .4byte 0x80322578 + .4byte 0x8032258C + .4byte 0x803225C8 + .4byte 0x803225A0 + .4byte 0x803225B4 + .4byte 0x803225DC + .4byte 0x803225E8 + .4byte 0x803225F4 + .4byte 0 .global __vt__Q43std3tr16detail383function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail334bound_func$$0v$$4Q43std3tr16detail59mem_fn_2$$0v$$4Q53scn4step7gimmick9shipevent9ShipEvent$$4PCc$$4PCc$$1$$4Q33std3tr1228tuple$$0PQ53scn4step7gimmick9shipevent9ShipEvent$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1 __vt__Q43std3tr16detail383function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail334bound_func$$0v$$4Q43std3tr16detail59mem_fn_2$$0v$$4Q53scn4step7gimmick9shipevent9ShipEvent$$4PCc$$4PCc$$1$$4Q33std3tr1228tuple$$0PQ53scn4step7gimmick9shipevent9ShipEvent$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1: - .incbin "baserom.dol", 0x47E488, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x80322C78 + .4byte 0x80322B04 + .4byte 0x80322B44 + .4byte 0x80322B60 .global __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1 __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1: - .incbin "baserom.dol", 0x47E4A0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803201B8 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeap __vt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeap: - .incbin "baserom.dol", 0x47E4B8, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x80320214 + .4byte 0x803227B8 + .4byte 0x803227BC .global $$265268 $$265268: - .incbin "baserom.dol", 0x47E4CC, 0x24 + .asciz "basic_string::reserve length_error" + .balign 4 .global $$2STRING$$2allocate__Q23std12allocator$$0c$$1FUlPCv $$2STRING$$2allocate__Q23std12allocator$$0c$$1FUlPCv: - .incbin "baserom.dol", 0x47E4F0, 0x20 + .asciz "Memory allocation failure" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260970 $$260970: - .incbin "baserom.dol", 0x496C40, 0x8 + .4byte 0 + .4byte 0 .global $$260971 $$260971: - .incbin "baserom.dol", 0x496C48, 0x8 + .asciz "Mahoroa" .global $$260972 $$260972: - .incbin "baserom.dol", 0x496C50, 0x8 + .asciz "Kirby" + .balign 4 .global $$260973 $$260973: - .incbin "baserom.dol", 0x496C58, 0x8 + .asciz "Monitor" .global $$260974 $$260974: - .incbin "baserom.dol", 0x496C60, 0x8 + .asciz "Camera" + .balign 4 .global $$260975 $$260975: - .incbin "baserom.dol", 0x496C68, 0x8 + .asciz "Suspend" .global $$260976 $$260976: - .incbin "baserom.dol", 0x496C70, 0x8 + .asciz "Message" .global $$260980 $$260980: - .incbin "baserom.dol", 0x496C78, 0x8 + .asciz "Wait" + .balign 4 .global $$260981 $$260981: - .incbin "baserom.dol", 0x496C80, 0x8 + .asciz "Talk" + .balign 4 .global $$260983 $$260983: - .incbin "baserom.dol", 0x496C88, 0x8 + .asciz "Happy" + .balign 4 .global $$260984 $$260984: - .incbin "baserom.dol", 0x496C90, 0x8 + .4byte 0x53616400 + .4byte 0 .global $$260986 $$260986: - .incbin "baserom.dol", 0x496C98, 0x8 + .asciz "Chuckle" .global $$260987 $$260987: - .incbin "baserom.dol", 0x496CA0, 0x8 + .asciz "LetsGo" + .balign 4 .global $$260995 $$260995: - .incbin "baserom.dol", 0x496CA8, 0x8 + .asciz "Show" + .balign 4 .global $$261001 $$261001: - .incbin "baserom.dol", 0x496CB0, 0x8 + .asciz "FadeOut" .global $$261002 $$261002: - .incbin "baserom.dol", 0x496CB8, 0x8 + .asciz "FadeIn" + .balign 4 .global $$261003 $$261003: - .incbin "baserom.dol", 0x496CC0, 0x8 + .asciz "Normal" + .balign 4 .global $$261004 $$261004: - .incbin "baserom.dol", 0x496CC8, 0x8 + .asciz "Auto" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$264823 $$264823: - .incbin "baserom.dol", 0x49D560, 0x4 + .4byte 0x3F800000 .global $$264827 $$264827: - .incbin "baserom.dol", 0x49D564, 0x4 + .4byte 0x3DCCCCCD .global $$264828 $$264828: - .incbin "baserom.dol", 0x49D568, 0x4 + .4byte 0x3C9374BC .global $$264833 $$264833: - .incbin "baserom.dol", 0x49D56C, 0x4 + .4byte 0x3BA3D70A .global $$264834 $$264834: - .incbin "baserom.dol", 0x49D570, 0x4 + .4byte 0 .global $$264835 $$264835: - .incbin "baserom.dol", 0x49D574, 0x4 + .4byte 0x3C23D70A diff --git a/asm/src/Shooting.s b/asm/src/Shooting.s index 658a2958..5210c9e3 100644 --- a/asm/src/Shooting.s +++ b/asm/src/Shooting.s @@ -42,4 +42,7 @@ __dt__Q53scn4step7gimmick8shooting8ShootingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8shooting8Shooting __vt__Q53scn4step7gimmick8shooting8Shooting: - .incbin "baserom.dol", 0x47E510, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8032303C + .4byte 0 diff --git a/asm/src/ShuffleManager.s b/asm/src/ShuffleManager.s index 81cae349..c1b25de8 100644 --- a/asm/src/ShuffleManager.s +++ b/asm/src/ShuffleManager.s @@ -608,140 +608,240 @@ lbl_80386268: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2 T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2: - .incbin "baserom.dol", 0x41BD18, 0x100 + .4byte 0x00000001 + .4byte 0x8055B358 + .4byte 0x8055B360 + .4byte 0x00000002 + .4byte 0x8055B368 + .4byte 0x8055B370 + .4byte 0x00000003 + .4byte 0x8055B378 + .4byte 0x8055B380 + .4byte 0x00000004 + .4byte 0x8055B388 + .4byte 0x8055B390 + .4byte 0x00000005 + .4byte 0x8055B398 + .4byte 0x8055B3A0 + .4byte 0x00000006 + .4byte 0x8055B3A8 + .4byte 0x8055B3B0 + .4byte 0x00000007 + .4byte 0x8055B3B8 + .4byte 0x8055B3C0 + .4byte 0x00000008 + .4byte 0x8055B3C8 + .4byte 0x8055B3D0 + .4byte 0x00000009 + .4byte 0x8055B3D8 + .4byte 0x8055B3E0 + .4byte 0x0000000A + .4byte 0x8055B3E8 + .4byte 0x8055B3F0 + .4byte 0x0000000B + .4byte 0x8055B3F8 + .4byte 0x8055B400 + .4byte 0x0000000C + .4byte 0x8055B408 + .4byte 0x8055B410 + .4byte 0x0000000D + .4byte 0x8048CE30 + .4byte 0x8048CE3C + .4byte 0x0000000E + .4byte 0x8055B418 + .4byte 0x8055B420 + .4byte 0x0000000F + .4byte 0x8055B428 + .4byte 0x8055B430 + .4byte 0x00000010 + .4byte 0x8055B438 + .4byte 0x8055B440 + .4byte 0x00000011 + .4byte 0x8055B448 + .4byte 0x8055B450 + .4byte 0x00000012 + .4byte 0x8055B458 + .4byte 0x8055B45C + .4byte 0x00000013 + .4byte 0x8055B460 + .4byte 0x8055B468 + .4byte 0x00000014 + .4byte 0x8055B470 + .4byte 0x8055B478 + .4byte 0x00000015 + .4byte 0x8055B480 + .4byte 0x8055B488 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252304 $$252304: - .incbin "baserom.dol", 0x488F30, 0xC + .asciz "highjump" + .balign 4 .global $$252305 $$252305: - .incbin "baserom.dol", 0x488F3C, 0xC + .asciz "Highjump" + .balign 4 .global $$253467 $$253467: - .incbin "baserom.dol", 0x488F48, 0x30 + .asciz "g3d/step/chara/hero/kirby/%s/Motion.brres.cmp" + .balign 4 .global $$253478 $$253478: - .incbin "baserom.dol", 0x488F78, 0x18 + .asciz "StepHrAbKirby%s.dn" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252280 $$252280: - .incbin "baserom.dol", 0x497738, 0x8 + .asciz "sword" + .balign 4 .global $$252281 $$252281: - .incbin "baserom.dol", 0x497740, 0x8 + .asciz "Sword" + .balign 4 .global $$252282 $$252282: - .incbin "baserom.dol", 0x497748, 0x8 + .asciz "cutter" + .balign 4 .global $$252283 $$252283: - .incbin "baserom.dol", 0x497750, 0x8 + .asciz "Cutter" + .balign 4 .global $$252284 $$252284: - .incbin "baserom.dol", 0x497758, 0x8 + .asciz "leaf" + .balign 4 .global $$252285 $$252285: - .incbin "baserom.dol", 0x497760, 0x8 + .asciz "Leaf" + .balign 4 .global $$252286 $$252286: - .incbin "baserom.dol", 0x497768, 0x8 + .asciz "whip" + .balign 4 .global $$252287 $$252287: - .incbin "baserom.dol", 0x497770, 0x8 + .asciz "Whip" + .balign 4 .global $$252288 $$252288: - .incbin "baserom.dol", 0x497778, 0x8 + .asciz "fire" + .balign 4 .global $$252289 $$252289: - .incbin "baserom.dol", 0x497780, 0x8 + .asciz "Fire" + .balign 4 .global $$252290 $$252290: - .incbin "baserom.dol", 0x497788, 0x8 + .asciz "needle" + .balign 4 .global $$252291 $$252291: - .incbin "baserom.dol", 0x497790, 0x8 + .asciz "Needle" + .balign 4 .global $$252292 $$252292: - .incbin "baserom.dol", 0x497798, 0x8 + .asciz "beam" + .balign 4 .global $$252293 $$252293: - .incbin "baserom.dol", 0x4977A0, 0x8 + .asciz "Beam" + .balign 4 .global $$252294 $$252294: - .incbin "baserom.dol", 0x4977A8, 0x8 + .asciz "spark" + .balign 4 .global $$252295 $$252295: - .incbin "baserom.dol", 0x4977B0, 0x8 + .asciz "Spark" + .balign 4 .global $$252296 $$252296: - .incbin "baserom.dol", 0x4977B8, 0x8 + .asciz "stone" + .balign 4 .global $$252297 $$252297: - .incbin "baserom.dol", 0x4977C0, 0x8 + .asciz "Stone" + .balign 4 .global $$252298 $$252298: - .incbin "baserom.dol", 0x4977C8, 0x8 + .asciz "sleep" + .balign 4 .global $$252299 $$252299: - .incbin "baserom.dol", 0x4977D0, 0x8 + .asciz "Sleep" + .balign 4 .global $$252300 $$252300: - .incbin "baserom.dol", 0x4977D8, 0x8 + .asciz "parasol" .global $$252301 $$252301: - .incbin "baserom.dol", 0x4977E0, 0x8 + .asciz "Parasol" .global $$252302 $$252302: - .incbin "baserom.dol", 0x4977E8, 0x8 + .asciz "water" + .balign 4 .global $$252303 $$252303: - .incbin "baserom.dol", 0x4977F0, 0x8 + .asciz "Water" + .balign 4 .global $$252306 $$252306: - .incbin "baserom.dol", 0x4977F8, 0x8 + .asciz "tornado" .global $$252307 $$252307: - .incbin "baserom.dol", 0x497800, 0x8 + .asciz "Tornado" .global $$252308 $$252308: - .incbin "baserom.dol", 0x497808, 0x8 + .asciz "bomb" + .balign 4 .global $$252309 $$252309: - .incbin "baserom.dol", 0x497810, 0x8 + .asciz "Bomb" + .balign 4 .global $$252310 $$252310: - .incbin "baserom.dol", 0x497818, 0x8 + .asciz "spear" + .balign 4 .global $$252311 $$252311: - .incbin "baserom.dol", 0x497820, 0x8 + .asciz "Spear" + .balign 4 .global $$252312 $$252312: - .incbin "baserom.dol", 0x497828, 0x8 + .asciz "hammer" + .balign 4 .global $$252313 $$252313: - .incbin "baserom.dol", 0x497830, 0x8 + .asciz "Hammer" + .balign 4 .global $$252314 $$252314: - .incbin "baserom.dol", 0x497838, 0x4 + .4byte 0x69636500 .global $$252315 $$252315: - .incbin "baserom.dol", 0x49783C, 0x4 + .4byte 0x49636500 .global $$252316 $$252316: - .incbin "baserom.dol", 0x497840, 0x8 + .asciz "wing" + .balign 4 .global $$252317 $$252317: - .incbin "baserom.dol", 0x497848, 0x8 + .asciz "Wing" + .balign 4 .global $$252318 $$252318: - .incbin "baserom.dol", 0x497850, 0x8 + .asciz "ninja" + .balign 4 .global $$252319 $$252319: - .incbin "baserom.dol", 0x497858, 0x8 + .asciz "Ninja" + .balign 4 .global $$252320 $$252320: - .incbin "baserom.dol", 0x497860, 0x8 + .asciz "fighter" .global $$252321 $$252321: - .incbin "baserom.dol", 0x497868, 0x8 + .asciz "Fighter" diff --git a/asm/src/Shutter.s b/asm/src/Shutter.s index cd621848..d4ebf289 100644 --- a/asm/src/Shutter.s +++ b/asm/src/Shutter.s @@ -2041,97 +2041,144 @@ mfReleaseWaitEffect__Q53scn4step7gimmick7shutter7ShutterFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$254624 $$254624: - .incbin "baserom.dol", 0x415C50, 0x14 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 .global $$254627 $$254627: - .incbin "baserom.dol", 0x415C64, 0x14 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 .global $$254630 $$254630: - .incbin "baserom.dol", 0x415C78, 0x14 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFB .global $$254633 $$254633: - .incbin "baserom.dol", 0x415C8C, 0x14 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFE + .4byte 0xFFFFFFFD + .4byte 0xFFFFFFFC + .4byte 0xFFFFFFFB .section .data, "wa" # 0x80421040 - 0x80496700 .global SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2 SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2: - .incbin "baserom.dol", 0x47E520, 0x10 + .4byte 0x8055A8F0 + .4byte 0x8055A8F4 + .4byte 0x8055A8FC + .4byte 0x8055A904 .global $$256118 $$256118: - .incbin "baserom.dol", 0x47E530, 0x18 + .asciz "step/gimmick/Shutter" + .balign 4 .global $$256218 $$256218: - .incbin "baserom.dol", 0x47E548, 0x20 + .4byte 0x80323B04 + .4byte 0x80323B24 + .4byte 0x80323B44 + .4byte 0x80323B64 + .4byte 0x80323B84 + .4byte 0x80323BA4 + .4byte 0x80323BC4 + .4byte 0x80323BE4 .global __vt__Q53scn4step7gimmick7shutter7Shutter __vt__Q53scn4step7gimmick7shutter7Shutter: - .incbin "baserom.dol", 0x47E568, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80323894 + .4byte 0x80323E08 + .4byte 0x80323E20 + .4byte 0x80323E38 + .4byte 0x80323E84 + .4byte 0x80323EC0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253500 $$253500: - .incbin "baserom.dol", 0x496CD0, 0x4 + .4byte 0x55700000 .global $$253501 $$253501: - .incbin "baserom.dol", 0x496CD4, 0x8 + .asciz "Right" + .balign 4 .global $$253502 $$253502: - .incbin "baserom.dol", 0x496CDC, 0x8 + .asciz "Left" + .balign 4 .global $$253503 $$253503: - .incbin "baserom.dol", 0x496CE4, 0x8 + .asciz "Under" + .balign 4 .global $$256074 $$256074: - .incbin "baserom.dol", 0x496CEC, 0x8 + .asciz "%s%s" + .balign 4 .global $$256119 $$256119: - .incbin "baserom.dol", 0x496CF4, 0x8 + .asciz "TopL" + .balign 4 .global $$256121 $$256121: - .incbin "baserom.dol", 0x496CFC, 0x8 + .asciz "Wait" + .balign 4 .global $$256287 $$256287: - .incbin "baserom.dol", 0x496D04, 0x8 + .asciz "Open" + .balign 4 .global $$256352 $$256352: - .incbin "baserom.dol", 0x496D0C, 0xC + .asciz "Close" + .balign 4 + .4byte 0 .global $$256570 $$256570: - .incbin "baserom.dol", 0x496D18, 0x8 + .asciz "EffectL" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256120 $$256120: - .incbin "baserom.dol", 0x49D578, 0x4 + .4byte 0 .global $$256191 $$256191: - .incbin "baserom.dol", 0x49D57C, 0x4 + .4byte 0x40A00000 .global $$256265 $$256265: - .incbin "baserom.dol", 0x49D580, 0x4 + .4byte 0x3FC00000 .global $$256266 $$256266: - .incbin "baserom.dol", 0x49D584, 0x4 + .4byte 0x40200000 .global $$256290 $$256290: - .incbin "baserom.dol", 0x49D588, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256312 $$256312: - .incbin "baserom.dol", 0x49D590, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$256318 $$256318: - .incbin "baserom.dol", 0x49D598, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256495 $$256495: - .incbin "baserom.dol", 0x49D5A0, 0x4 + .4byte 0x40400000 .global $$256496 $$256496: - .incbin "baserom.dol", 0x49D5A4, 0x4 + .4byte 0xBF000000 .global $$256497 $$256497: - .incbin "baserom.dol", 0x49D5A8, 0x4 + .4byte 0x3F000000 .global $$256498 $$256498: - .incbin "baserom.dol", 0x49D5AC, 0x4 + .4byte 0xC0400000 .global $$256499 $$256499: - .incbin "baserom.dol", 0x49D5B0, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/Skip.s b/asm/src/Skip.s index d6c1c1d2..e6bc833f 100644 --- a/asm/src/Skip.s +++ b/asm/src/Skip.s @@ -145,18 +145,24 @@ lbl_803C072C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252007 $$252007: - .incbin "baserom.dol", 0x48DD98, 0x10 + .asciz "step/demo/Main" + .balign 4 .global $$252009 $$252009: - .incbin "baserom.dol", 0x48DDA8, 0x10 + .asciz "DemoSkip" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252008 $$252008: - .incbin "baserom.dol", 0x498128, 0x8 + .asciz "Skip" + .balign 4 .global $$252047 $$252047: - .incbin "baserom.dol", 0x498130, 0x8 + .asciz "Wait" + .balign 4 .global $$252051 $$252051: - .incbin "baserom.dol", 0x498138, 0x8 + .4byte 0x496E0000 + .4byte 0 diff --git a/asm/src/SkipHelp.s b/asm/src/SkipHelp.s index 8447477e..8e5b5a1a 100644 --- a/asm/src/SkipHelp.s +++ b/asm/src/SkipHelp.s @@ -313,35 +313,46 @@ setTransTopRight__Q34info6common8SkipHelpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252391 $$252391: - .incbin "baserom.dol", 0x4536E8, 0x10 + .asciz "step/game/Main" + .balign 4 .global $$252393 $$252393: - .incbin "baserom.dol", 0x4536F8, 0xC + .asciz "SkipText" + .balign 4 .global $$252394 $$252394: - .incbin "baserom.dol", 0x453704, 0x3C + .asciz "SkipTextSdw" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252392 $$252392: - .incbin "baserom.dol", 0x493490, 0x8 + .asciz "Skip" + .balign 4 .global $$252438 $$252438: - .incbin "baserom.dol", 0x493498, 0x8 + .asciz "Start" + .balign 4 .global $$252439 $$252439: - .incbin "baserom.dol", 0x4934A0, 0x8 + .asciz "Wait" + .balign 4 .global $$252440 $$252440: - .incbin "baserom.dol", 0x4934A8, 0x8 + .4byte 0x456E6400 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252465 $$252465: - .incbin "baserom.dol", 0x49A498, 0x4 + .4byte 0x3F51EB85 .global $$252466 $$252466: - .incbin "baserom.dol", 0x49A49C, 0x4 + .4byte 0 .global $$252469 $$252469: - .incbin "baserom.dol", 0x49A4A0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/SlopeFit.s b/asm/src/SlopeFit.s index b000d94f..9d1b65c6 100644 --- a/asm/src/SlopeFit.s +++ b/asm/src/SlopeFit.s @@ -66,10 +66,11 @@ reset__Q43scn4step4hero8SlopeFitFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250930 $$250930: - .incbin "baserom.dol", 0x49D9B0, 0x4 + .4byte 0x3F000000 .global $$250931 $$250931: - .incbin "baserom.dol", 0x49D9B4, 0x4 + .4byte 0x3F800000 .global $$250932 $$250932: - .incbin "baserom.dol", 0x49D9B8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Smash.s b/asm/src/Smash.s index 38ed8f21..0e488267 100644 --- a/asm/src/Smash.s +++ b/asm/src/Smash.s @@ -558,87 +558,204 @@ lbl_803A0D04: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global STONEBODY_TABLE_0__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_TABLE_0__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: - .incbin "baserom.dol", 0x41BE18, 0x40 + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x00000019 + .4byte 0x00000019 + .4byte 0x00000019 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global STONEBODY_TABLE_1__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_TABLE_1__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: - .incbin "baserom.dol", 0x41BE58, 0x40 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000064 + .4byte 0x00000064 + .4byte 0x00000064 + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global STONEBODY_TABLE_2__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_TABLE_2__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: - .incbin "baserom.dol", 0x41BE98, 0x40 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000078 + .4byte 0x00000064 + .4byte 0x00000064 + .4byte 0x00000064 + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0x0000002D + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001E + .4byte 0x0000001E .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255926 $$255926: - .incbin "baserom.dol", 0x48A7E0, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Stone.brres.cmpbin" + .balign 4 .global $$255927 $$255927: - .incbin "baserom.dol", 0x48A820, 0x48 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/StarBlock.brres.cmpbin" + .balign 4 + .4byte 0 .global $$255928 $$255928: - .incbin "baserom.dol", 0x48A868, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/HachiTon.brres.cmpbin" .global $$255929 $$255929: - .incbin "baserom.dol", 0x48A8A8, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Kirby.brres.cmpbin" + .balign 4 .global $$255930 $$255930: - .incbin "baserom.dol", 0x48A8E8, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Glove.brres.cmpbin" + .balign 4 .global $$255931 $$255931: - .incbin "baserom.dol", 0x48A928, 0x3C + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/MMan.brres.cmpbin" .global $$255932 $$255932: - .incbin "baserom.dol", 0x48A964, 0x44 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/HoshiBlock.brres.cmpbin" + .balign 4 .global $$255933 $$255933: - .incbin "baserom.dol", 0x48A9A8, 0x44 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/RickKineCoo.brres.cmpbin" + .balign 4 .global $$255934 $$255934: - .incbin "baserom.dol", 0x48A9EC, 0x3C + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Marc.brres.cmpbin" .global $$255935 $$255935: - .incbin "baserom.dol", 0x48AA28, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Wambam.brres.cmpbin" + .balign 4 .global $$255936 $$255936: - .incbin "baserom.dol", 0x48AA68, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/FujiHAL.brres.cmpbin" + .balign 4 .global $$255937 $$255937: - .incbin "baserom.dol", 0x48AAA8, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Dragoon.brres.cmpbin" + .balign 4 .global $$255938 $$255938: - .incbin "baserom.dol", 0x48AAE8, 0x40 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/DogEgg.brres.cmpbin" + .balign 4 .global $$255939 $$255939: - .incbin "baserom.dol", 0x48AB28, 0x44 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/FirstDedede.brres.cmpbin" + .balign 4 .global $$255940 $$255940: - .incbin "baserom.dol", 0x48AB6C, 0x48 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/FirstKirby20th.brres.cmpbin" + .balign 4 .global $$255941 $$255941: - .incbin "baserom.dol", 0x48ABB4, 0x44 + .asciz "g3d/step/chara/hero/kirby/stone/stonebody/Mahoroa.brres.cmpbin" + .balign 4 + .4byte 0 .global STONEBODY_MODEL_TABLE__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_MODEL_TABLE__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: - .incbin "baserom.dol", 0x48ABF8, 0x40 + .4byte 0x8048E6E0 + .4byte 0x8048E720 + .4byte 0x8048E768 + .4byte 0x8048E7A8 + .4byte 0x8048E7E8 + .4byte 0x8048E828 + .4byte 0x8048E864 + .4byte 0x8048E8A8 + .4byte 0x8048E8EC + .4byte 0x8048E928 + .4byte 0x8048E968 + .4byte 0x8048E9A8 + .4byte 0x8048E9E8 + .4byte 0x8048EA28 + .4byte 0x8048EA6C + .4byte 0x8048EAB4 .global $$257442 $$257442: - .incbin "baserom.dol", 0x48AC38, 0x10 + .asciz "HrStoneBody" + .4byte 0 .global $$257566 $$257566: - .incbin "baserom.dol", 0x48AC48, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$257567 $$257567: - .incbin "baserom.dol", 0x48AC68, 0x24 + .asciz "step/chara/hero/kirby/hammer/Motion" .global $$257568 $$257568: - .incbin "baserom.dol", 0x48AC8C, 0x28 + .asciz "step/chara/hero/kirby/fighter/Motion" + .balign 4 .global $$257569 $$257569: - .incbin "baserom.dol", 0x48ACB4, 0x24 + .asciz "step/chara/hero/kirby/cutter/Motion" .global $$257570 $$257570: - .incbin "baserom.dol", 0x48ACD8, 0x24 + .asciz "step/chara/hero/kirby/fire/Motion" + .balign 4 .global $$257571 $$257571: - .incbin "baserom.dol", 0x48ACFC, 0x44 + .asciz "step/chara/hero/kirby/stone/Motion" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global __vt__Q53scn4step4hero5smash5Smash __vt__Q53scn4step4hero5smash5Smash: - .incbin "baserom.dol", 0x48AD40, 0xC8 + .4byte 0 + .4byte 0 + .4byte 0x803A05BC + .4byte 0x803A06CC + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x803A0864 + .4byte 0x803A09C8 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8032B7DC + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "NW4R:Failed assertion !((u32)p & 0x1f)" + .balign 4 + .asciz "g3d_resfile_ac.h" + .balign 4 diff --git a/asm/src/SoundManager.s b/asm/src/SoundManager.s index 5c7b79f8..815290f5 100644 --- a/asm/src/SoundManager.s +++ b/asm/src/SoundManager.s @@ -551,30 +551,78 @@ final__Q23snd12SoundManagerFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249464 $$249464: - .incbin "baserom.dol", 0x41D028, 0xA0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0x0000000C + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x00000013 + .4byte 0x00000015 + .4byte 0x00000016 + .4byte 0x00000017 + .4byte 0x00000018 + .4byte 0x0000001A + .4byte 0x0000001C + .4byte 0x00000019 + .4byte 0x0000001D + .4byte 0x00000010 + .4byte 0x00000011 + .4byte 0x00000012 + .4byte 0x00000014 + .4byte 0x0000001B + .4byte 0x00000020 + .4byte 0x00000021 + .4byte 0x00000022 + .4byte 0x00000023 + .4byte 0x00000024 + .4byte 0x00000025 + .4byte 0x00000026 + .4byte 0x00000027 + .4byte 0x0000001F + .4byte 0x00000028 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250548 $$250548: - .incbin "baserom.dol", 0x492700, 0x18 + .asciz "snd/iuk_sound/IUK.brsar" .global __vt__Q23snd12SoundManager __vt__Q23snd12SoundManager: - .incbin "baserom.dol", 0x492718, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80403150 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x492724, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x492748, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x492754, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x492778, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x492784, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x4927A8, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 diff --git a/asm/src/SoundSE.s b/asm/src/SoundSE.s index 29e2928c..9dafac37 100644 --- a/asm/src/SoundSE.s +++ b/asm/src/SoundSE.s @@ -372,15 +372,15 @@ onObjStopFinished__Q43scn4step4hero7SoundSEFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251502 $$251502: - .incbin "baserom.dol", 0x495840, 0x4 + .4byte 0x3F800000 .global $$251505 $$251505: - .incbin "baserom.dol", 0x495844, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251607 $$251607: - .incbin "baserom.dol", 0x49B8A0, 0x4 + .4byte 0x3F800000 .global $$251648 $$251648: - .incbin "baserom.dol", 0x49B8A4, 0x4 + .4byte 0x3C23D70A diff --git a/asm/src/Spark.s b/asm/src/Spark.s index 8aef5002..1188241c 100644 --- a/asm/src/Spark.s +++ b/asm/src/Spark.s @@ -1156,40 +1156,70 @@ lbl_8038DC18: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248824 $$248824: - .incbin "baserom.dol", 0x487510, 0x20 + .asciz "step/chara/hero/kirby/spark/Hat" .global $$248733 $$248733: - .incbin "baserom.dol", 0x487530, 0x10 + .asciz "PtcPointL" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$259457 $$259457: - .incbin "baserom.dol", 0x489860, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$259458 $$259458: - .incbin "baserom.dol", 0x489880, 0x24 + .asciz "step/chara/hero/kirby/spark/Motion" + .balign 4 .global __vt__Q53scn4step4hero5spark5Spark __vt__Q53scn4step4hero5spark5Spark: - .incbin "baserom.dol", 0x4898A4, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x8038CE2C + .4byte 0x8038CEDC + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x8038D02C + .4byte 0x8038D3B8 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8038D138 + .4byte 0x8038D13C + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8038D140 + .4byte 0x8032B7E0 + .4byte 0x8038D328 + .4byte 0x8032B7E8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: - .incbin "baserom.dol", 0x497658, 0x8 + .asciz "TopL" + .balign 4 .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SparkFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SparkFv$$2names$$21: - .incbin "baserom.dol", 0x497660, 0x8 + .4byte 0x8055B278 + .4byte 0x8048B430 .global $$248831 $$248831: - .incbin "baserom.dol", 0x497668, 0x8 + .asciz "TopL" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x497670, 0x8 + .asciz "Main" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22: - .incbin "baserom.dol", 0x49DAF8, 0x8 + .4byte 0x8055B290 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SparkFv$$2desc diff --git a/asm/src/SphereComplete.s b/asm/src/SphereComplete.s index 482c8024..7e0ea532 100644 --- a/asm/src/SphereComplete.s +++ b/asm/src/SphereComplete.s @@ -354,44 +354,56 @@ constraintPos__Q53scn4step4info5lvmap14SphereCompleteFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253706 $$253706: - .incbin "baserom.dol", 0x48DBB8, 0x10 + .asciz "step/lvmap/Main" .global $$253707 $$253707: - .incbin "baserom.dol", 0x48DBC8, 0x10 + .asciz "LevelComplete" + .balign 4 .global $$253756 $$253756: - .incbin "baserom.dol", 0x48DBD8, 0x10 + .asciz "BronzeTrophyN" + .balign 4 .global $$253757 $$253757: - .incbin "baserom.dol", 0x48DBE8, 0x10 + .asciz "SilverTrophyN" + .balign 4 .global $$253758 $$253758: - .incbin "baserom.dol", 0x48DBF8, 0x10 + .asciz "GoldTrophyN" + .4byte 0 .global $$253759 $$253759: - .incbin "baserom.dol", 0x48DC08, 0x10 + .asciz "PlatinumTrophyN" .global $$253760 $$253760: - .incbin "baserom.dol", 0x48DC18, 0xC + .asciz "KingTrophyN" .global $$253761 $$253761: - .incbin "baserom.dol", 0x48DC24, 0x10 + .asciz "StageCompleteN" + .balign 4 .global $$253767 $$253767: - .incbin "baserom.dol", 0x48DC34, 0x3C + .asciz "Disappear" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253755 $$253755: - .incbin "baserom.dol", 0x4980E8, 0x8 + .asciz "Appear" + .balign 4 .global $$253778 $$253778: - .incbin "baserom.dol", 0x4980F0, 0x8 + .asciz "Wait" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253708 $$253708: - .incbin "baserom.dol", 0x49E4E0, 0x4 + .4byte 0 .global $$253789 $$253789: - .incbin "baserom.dol", 0x49E4E4, 0x4 + .4byte 0x42A00000 diff --git a/asm/src/SpiralScreen.s b/asm/src/SpiralScreen.s index cdfb97ce..0bfc10f8 100644 --- a/asm/src/SpiralScreen.s +++ b/asm/src/SpiralScreen.s @@ -639,42 +639,45 @@ lbl_803CF8B8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251067 $$251067: - .incbin "baserom.dol", 0x48EDB0, 0x18 + .asciz "step/sfx/SpiralScreen" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251068 $$251068: - .incbin "baserom.dol", 0x49E7A8, 0x4 + .4byte 0x3D23D70A .global $$251069 $$251069: - .incbin "baserom.dol", 0x49E7AC, 0x4 + .4byte 0x3B83126F .global $$251070 $$251070: - .incbin "baserom.dol", 0x49E7B0, 0x4 + .4byte 0x3F000000 .global $$251099 $$251099: - .incbin "baserom.dol", 0x49E7B4, 0x4 + .4byte 0 .global $$251134 $$251134: - .incbin "baserom.dol", 0x49E7B8, 0x4 + .4byte 0x3727C5AC .global $$251135 $$251135: - .incbin "baserom.dol", 0x49E7BC, 0x4 + .4byte 0xB727C5AC .global $$251136 $$251136: - .incbin "baserom.dol", 0x49E7C0, 0x4 + .4byte 0x3C8EFA35 .global $$251137 $$251137: - .incbin "baserom.dol", 0x49E7C4, 0x4 + .4byte 0x41100000 .global $$251140 $$251140: - .incbin "baserom.dol", 0x49E7C8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251170 $$251170: - .incbin "baserom.dol", 0x49E7D0, 0x4 + .4byte 0x40000000 .global $$251171 $$251171: - .incbin "baserom.dol", 0x49E7D4, 0x4 + .4byte 0x3F800000 .global $$251172 $$251172: - .incbin "baserom.dol", 0x49E7D8, 0x8 + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/src/Spotlight.s b/asm/src/Spotlight.s index 84b5bb2a..abd22ec0 100644 --- a/asm/src/Spotlight.s +++ b/asm/src/Spotlight.s @@ -331,37 +331,51 @@ lbl_8020FB14: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global IS_LARGE__Q33scn7history23$$2unnamed$$2Spotlight_cpp$$2 IS_LARGE__Q33scn7history23$$2unnamed$$2Spotlight_cpp$$2: - .incbin "baserom.dol", 0x411CB8, 0x18 + .4byte 0x00010101 + .4byte 0x01000000 + .4byte 0x00010000 + .4byte 0x00000001 + .4byte 0 + .4byte 0x01000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253289 $$253289: - .incbin "baserom.dol", 0x45D690, 0x10 + .asciz "history/Light" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253290 $$253290: - .incbin "baserom.dol", 0x494A60, 0x8 + .asciz "LightM" + .balign 4 .global $$253291 $$253291: - .incbin "baserom.dol", 0x494A68, 0x8 + .asciz "Main" + .balign 4 .global $$253347 $$253347: - .incbin "baserom.dol", 0x494A70, 0x8 + .asciz "Start" + .balign 4 .global $$253351 $$253351: - .incbin "baserom.dol", 0x494A78, 0x4 + .4byte 0x456E6400 .global $$253362 $$253362: - .incbin "baserom.dol", 0x494A7C, 0xC + .asciz "TopL" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253352 $$253352: - .incbin "baserom.dol", 0x49AC70, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$253355 $$253355: - .incbin "baserom.dol", 0x49AC78, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$253361 $$253361: - .incbin "baserom.dol", 0x49AC80, 0x8 + .4byte 0x3FA66666 + .4byte 0 diff --git a/asm/src/Squash.s b/asm/src/Squash.s index b26a46be..2e4c823e 100644 --- a/asm/src/Squash.s +++ b/asm/src/Squash.s @@ -197,7 +197,7 @@ getCurrentScale__Q43scn4step4hero6SquashCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255361 $$255361: - .incbin "baserom.dol", 0x49D9C0, 0x4 + .4byte 0x3F800000 .global $$255385 $$255385: - .incbin "baserom.dol", 0x49D9C4, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StaffCredit.s b/asm/src/StaffCredit.s index 93fa660e..136b65e0 100644 --- a/asm/src/StaffCredit.s +++ b/asm/src/StaffCredit.s @@ -204,45 +204,80 @@ hideNew__Q33scn19challengefileselect11StaffCreditFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252079 $$252079: - .incbin "baserom.dol", 0x45A8A8, 0x1C + .asciz "challengefileselect/Main" + .balign 4 .global $$252082 $$252082: - .incbin "baserom.dol", 0x45A8C4, 0xC + .asciz "StaffCredit" .global $$252085 $$252085: - .incbin "baserom.dol", 0x45A8D0, 0x10 + .asciz "StaffCreditNew" + .balign 4 .global $$252124 $$252124: - .incbin "baserom.dol", 0x45A8E0, 0xC + .asciz "OpenSmall" + .balign 4 .global __vt__Q33scn19challengefileselect11StaffCredit __vt__Q33scn19challengefileselect11StaffCredit: - .incbin "baserom.dol", 0x45A8EC, 0x8C + .4byte 0 + .4byte 0 + .4byte 0x801E5938 ;# ptr + .4byte 0x801E9324 ;# ptr + .4byte 0x801E935C ;# ptr + .4byte 0x801E936C ;# ptr + .4byte 0x801E9378 ;# ptr + .4byte 0x801E9384 ;# ptr + .4byte 0x801E9390 ;# ptr + .4byte 0x801E9394 ;# ptr + .4byte 0x801E939C ;# ptr + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252080 $$252080: - .incbin "baserom.dol", 0x494018, 0x8 + .asciz "Ending" + .balign 4 .global $$252081 $$252081: - .incbin "baserom.dol", 0x494020, 0x4 + .4byte 0x4E657700 .global $$252083 $$252083: - .incbin "baserom.dol", 0x494024, 0x8 + .asciz "NewN" + .balign 4 .global $$252084 $$252084: - .incbin "baserom.dol", 0x49402C, 0x8 + .asciz "Wait" + .balign 4 .global $$252127 $$252127: - .incbin "baserom.dol", 0x494034, 0xC + .asciz "Focus" + .balign 4 + .4byte 0 .global $$252130 $$252130: - .incbin "baserom.dol", 0x494040, 0x8 + .asciz "UnFocus" .global $$252133 $$252133: - .incbin "baserom.dol", 0x494048, 0x8 + .asciz "Decide" + .balign 4 .global $$252139 $$252139: - .incbin "baserom.dol", 0x494050, 0x8 + .asciz "CursorN" .global $$252143 $$252143: - .incbin "baserom.dol", 0x494058, 0x8 + .asciz "OpenBig" diff --git a/asm/src/StaffRoll.s b/asm/src/StaffRoll.s index db65c2d6..d291e4a6 100644 --- a/asm/src/StaffRoll.s +++ b/asm/src/StaffRoll.s @@ -2245,217 +2245,402 @@ logoScrollOutTime__Q33scn11staffcredit9StaffRollCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2 POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: - .incbin "baserom.dol", 0x41CE08, 0x220 + .4byte 0x80496048 + .4byte 0 + .4byte 0x80496054 + .4byte 0 + .4byte 0x80496068 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80496080 + .4byte 0 + .4byte 0x80496090 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8049609C + .4byte 0 + .4byte 0x8055C628 + .4byte 0x00000001 + .4byte 0x804960AC + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x804960B8 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8055C630 + .4byte 0x00000001 + .4byte 0x804960CC + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804960D8 + .4byte 0x00000001 + .4byte 0x804960E8 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804960FC + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80496108 + .4byte 0x00000001 + .4byte 0x8055C638 + .4byte 0x00000001 + .4byte 0x80496118 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x8055C640 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80496128 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8049613C + .4byte 0 + .4byte 0x80496158 + .4byte 0x00000001 + .4byte 0x80496168 + .4byte 0 + .4byte 0x80496180 + .4byte 0x00000001 + .4byte 0x8049618C + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x8049619C + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804961B0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804961C4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804961D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x804961E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251814 $$251814: - .incbin "baserom.dol", 0x492148, 0xC + .asciz "Director" + .balign 4 .global $$251815 $$251815: - .incbin "baserom.dol", 0x492154, 0x14 + .asciz "AssistantDirector" + .balign 4 .global $$251816 $$251816: - .incbin "baserom.dol", 0x492168, 0x18 + .asciz "LevelDesignPlanner" + .balign 4 + .4byte 0 .global $$251817 $$251817: - .incbin "baserom.dol", 0x492180, 0x10 + .asciz "ProgramDirector" .global $$251818 $$251818: - .incbin "baserom.dol", 0x492190, 0xC + .asciz "Programming" .global $$251819 $$251819: - .incbin "baserom.dol", 0x49219C, 0x10 + .asciz "DesignDirector" + .balign 4 .global $$251821 $$251821: - .incbin "baserom.dol", 0x4921AC, 0xC + .asciz "MotifDesign" .global $$251822 $$251822: - .incbin "baserom.dol", 0x4921B8, 0x14 + .asciz "LevelDesignAdviser" + .balign 4 .global $$251824 $$251824: - .incbin "baserom.dol", 0x4921CC, 0xC + .asciz "VoiceActor" + .balign 4 .global $$251825 $$251825: - .incbin "baserom.dol", 0x4921D8, 0x10 + .asciz "HistoryMovie" + .balign 4 .global $$251826 $$251826: - .incbin "baserom.dol", 0x4921E8, 0x14 + .asciz "HistoryMoviePlay" + .balign 4 .global $$251827 $$251827: - .incbin "baserom.dol", 0x4921FC, 0xC + .asciz "TeamSupport" .global $$251828 $$251828: - .incbin "baserom.dol", 0x492208, 0x10 + .asciz "PublicRelations" .global $$251830 $$251830: - .incbin "baserom.dol", 0x492218, 0x10 + .asciz "ManualEditor" + .balign 4 .global $$251832 $$251832: - .incbin "baserom.dol", 0x492228, 0x14 + .asciz "TechnicalSupport" + .balign 4 .global $$251833 $$251833: - .incbin "baserom.dol", 0x49223C, 0x1C + .asciz "NOALocalizationManagement" + .balign 4 .global $$251834 $$251834: - .incbin "baserom.dol", 0x492258, 0x10 + .asciz "NOALocalization" .global $$251835 $$251835: - .incbin "baserom.dol", 0x492268, 0x18 + .asciz "NOATestingManagement" + .balign 4 .global $$251836 $$251836: - .incbin "baserom.dol", 0x492280, 0xC + .asciz "NOATesting" + .balign 4 .global $$251837 $$251837: - .incbin "baserom.dol", 0x49228C, 0x10 + .asciz "SpecialThanks" + .balign 4 .global $$251838 $$251838: - .incbin "baserom.dol", 0x49229C, 0x14 + .asciz "ManagingDirector" + .balign 4 .global $$251839 $$251839: - .incbin "baserom.dol", 0x4922B0, 0x14 + .asciz "ProjectManagement" + .balign 4 .global $$251840 $$251840: - .incbin "baserom.dol", 0x4922C4, 0xC + .asciz "Producer" + .balign 4 .global $$251841 $$251841: - .incbin "baserom.dol", 0x4922D0, 0x10 + .asciz "GeneralProducer" .global $$251842 $$251842: - .incbin "baserom.dol", 0x4922E0, 0x14 + .asciz "ExecutiveProducer" + .balign 4 .global $$255268 $$255268: - .incbin "baserom.dol", 0x4922F4, 0x14 + .asciz "staffcredits/Main" + .balign 4 .global $$255269 $$255269: - .incbin "baserom.dol", 0x492308, 0xC + .asciz "TextBase" + .balign 4 .global $$255270 $$255270: - .incbin "baserom.dol", 0x492314, 0xC + .asciz "Copyright" + .balign 4 .global $$255271 $$255271: - .incbin "baserom.dol", 0x492320, 0xC + .asciz "CompanyLogo" .global $$255275 $$255275: - .incbin "baserom.dol", 0x49232C, 0x14 + .asciz "FirstPositionText" + .balign 4 .global $$255276 $$255276: - .incbin "baserom.dol", 0x492340, 0x10 + .asciz "StaffCenterN" + .balign 4 .global $$255278 $$255278: - .incbin "baserom.dol", 0x492350, 0x10 + .asciz "PositionText1" + .balign 4 .global $$255279 $$255279: - .incbin "baserom.dol", 0x492360, 0xC + .asciz "UnderLine" + .balign 4 .global $$255280 $$255280: - .incbin "baserom.dol", 0x49236C, 0xC + .asciz "UnderLine1N" .global $$255285 $$255285: - .incbin "baserom.dol", 0x492378, 0x10 + .asciz "PositionText2" + .balign 4 .global $$255286 $$255286: - .incbin "baserom.dol", 0x492388, 0xC + .asciz "UnderLine2N" .global $$255287 $$255287: - .incbin "baserom.dol", 0x492394, 0x10 + .asciz "IntervalFirstN" + .balign 4 .global $$255288 $$255288: - .incbin "baserom.dol", 0x4923A4, 0x10 + .asciz "PositionText" + .balign 4 .global $$255289 $$255289: - .incbin "baserom.dol", 0x4923B4, 0xC + .asciz "PositonN" + .balign 4 .global $$255290 $$255290: - .incbin "baserom.dol", 0x4923C0, 0xC + .asciz "UnderLineN" + .balign 4 .global $$255291 $$255291: - .incbin "baserom.dol", 0x4923CC, 0xC + .asciz "IntervalN" + .balign 4 .global $$255292 $$255292: - .incbin "baserom.dol", 0x4923D8, 0x10 + .asciz "IntervalStaff2N" .global $$255293 $$255293: - .incbin "baserom.dol", 0x4923E8, 0x10 + .asciz "IntervalStaffN" + .balign 4 .global $$255296 $$255296: - .incbin "baserom.dol", 0x4923F8, 0xC + .asciz "StaffText" + .balign 4 .global $$255299 $$255299: - .incbin "baserom.dol", 0x492404, 0x10 + .asciz "IntervalPosiN" + .balign 4 .global $$255300 $$255300: - .incbin "baserom.dol", 0x492414, 0x10 + .asciz "IntervalPostN" + .balign 4 .global $$255301 $$255301: - .incbin "baserom.dol", 0x492424, 0x10 + .asciz "IntervalCopyN" + .balign 4 .global $$255302 $$255302: - .incbin "baserom.dol", 0x492434, 0x44 + .asciz "CopyrightText" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251820 $$251820: - .incbin "baserom.dol", 0x498A08, 0x8 + .asciz "Design" + .balign 4 .global $$251823 $$251823: - .incbin "baserom.dol", 0x498A10, 0x8 + .asciz "Sound" + .balign 4 .global $$251829 $$251829: - .incbin "baserom.dol", 0x498A18, 0x8 + .asciz "Artwork" .global $$251831 $$251831: - .incbin "baserom.dol", 0x498A20, 0x8 + .asciz "Testing" .global $$255277 $$255277: - .incbin "baserom.dol", 0x498A28, 0x8 + .asciz "Staff" + .balign 4 .global $$255281 $$255281: - .incbin "baserom.dol", 0x498A30, 0x8 + .asciz "CenterN" .global $$255283 $$255283: - .incbin "baserom.dol", 0x498A38, 0x4 + .4byte 0x524E0000 .global $$255284 $$255284: - .incbin "baserom.dol", 0x498A3C, 0xC + .asciz "Staff2" + .balign 4 + .4byte 0 .global $$255294 $$255294: - .incbin "baserom.dol", 0x498A48, 0x8 + .asciz "%s_%02u" .global $$255295 $$255295: - .incbin "baserom.dol", 0x498A50, 0x8 + .4byte 0 + .4byte 0 .global $$255297 $$255297: - .incbin "baserom.dol", 0x498A58, 0x8 + .asciz "Staff1N" .global $$255298 $$255298: - .incbin "baserom.dol", 0x498A60, 0x8 + .asciz "Staff2N" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255272 $$255272: - .incbin "baserom.dol", 0x49EDB8, 0x4 + .4byte 0x41F00000 .global $$255273 $$255273: - .incbin "baserom.dol", 0x49EDBC, 0x4 + .4byte 0x3F000000 .global $$255274 $$255274: - .incbin "baserom.dol", 0x49EDC0, 0x4 + .4byte 0 .global $$255282 $$255282: - .incbin "baserom.dol", 0x49EDC4, 0x4 + .4byte 0x3E800000 .global $$255307 $$255307: - .incbin "baserom.dol", 0x49EDC8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255444 $$255444: - .incbin "baserom.dol", 0x49EDD0, 0x4 + .4byte 0x41200000 .global $$255520 $$255520: - .incbin "baserom.dol", 0x49EDD4, 0x4 + .4byte 0x43C80000 .global $$255534 $$255534: - .incbin "baserom.dol", 0x49EDD8, 0x4 + .4byte 0x3F400000 .global $$255537 $$255537: - .incbin "baserom.dol", 0x49EDDC, 0x4 + .4byte 0x3F200000 diff --git a/asm/src/Stage.s b/asm/src/Stage.s index 6754d4a3..efd8dc31 100644 --- a/asm/src/Stage.s +++ b/asm/src/Stage.s @@ -1105,23 +1105,25 @@ __sinit_$$3Stage_cpp: /* 80210A70 0020C8B0 4B EA D6 50 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402464, 0x4 + .4byte 0x80210A5C ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254734 $$254734: - .incbin "baserom.dol", 0x45D6A0, 0x18 + .asciz "history/PackageOffset" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254735 $$254735: - .incbin "baserom.dol", 0x49AC88, 0x4 + .4byte 0 .global $$255028 $$255028: - .incbin "baserom.dol", 0x49AC8C, 0x4 + .4byte 0xC1F00000 .global $$255029 $$255029: - .incbin "baserom.dol", 0x49AC90, 0x8 + .4byte 0x3FC00000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global FUTURE_EFFECT_OFFSET__19$$2unnamed$$2Stage_cpp$$2 diff --git a/asm/src/StageParts.s b/asm/src/StageParts.s index bff930a0..a942dd32 100644 --- a/asm/src/StageParts.s +++ b/asm/src/StageParts.s @@ -553,56 +553,77 @@ decideEffect__Q33scn7history10StagePartsFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253814 $$253814: - .incbin "baserom.dol", 0x45D6B8, 0x10 + .asciz "history/WallUs" + .balign 4 .global $$253942 $$253942: - .incbin "baserom.dol", 0x45D6C8, 0x1C + .asciz "history/statue/Statuekirby" + .balign 4 .global $$253943 $$253943: - .incbin "baserom.dol", 0x45D6E4, 0x1C + .asciz "history/statue/Statuedee" + .balign 4 .global $$253944 $$253944: - .incbin "baserom.dol", 0x45D700, 0x1C + .asciz "history/statue/Statuerick" + .balign 4 .global $$253945 $$253945: - .incbin "baserom.dol", 0x45D71C, 0x1C + .asciz "history/statue/Statuekine" + .balign 4 .global $$253946 $$253946: - .incbin "baserom.dol", 0x45D738, 0x1C + .asciz "history/statue/Statuecoo" + .balign 4 .global $$253966 $$253966: - .incbin "baserom.dol", 0x45D754, 0xC + .asciz "SelectEnd" + .balign 4 .global $$253969 $$253969: - .incbin "baserom.dol", 0x45D760, 0x40 + .asciz "Package2LA" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253815 $$253815: - .incbin "baserom.dol", 0x494A88, 0x8 + .asciz "Model" + .balign 4 .global $$253816 $$253816: - .incbin "baserom.dol", 0x494A90, 0x8 + .asciz "PlateL" + .balign 4 .global $$253906 $$253906: - .incbin "baserom.dol", 0x494A98, 0x8 + .asciz "Wait" + .balign 4 .global $$253947 $$253947: - .incbin "baserom.dol", 0x494AA0, 0x8 + .asciz "TopL" + .balign 4 .global $$253948 $$253948: - .incbin "baserom.dol", 0x494AA8, 0x8 + .asciz "StatueL" .global $$253959 $$253959: - .incbin "baserom.dol", 0x494AB0, 0x8 + .asciz "Select" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global WIDTH__Q33scn7history10StageParts WIDTH__Q33scn7history10StageParts: - .incbin "baserom.dol", 0x49AC98, 0x8 + .4byte 0x40E00000 + .4byte 0 .global $$253821 $$253821: - .incbin "baserom.dol", 0x49ACA0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$253965 $$253965: - .incbin "baserom.dol", 0x49ACA8, 0x8 + .4byte 0x40A00000 + .4byte 0 diff --git a/asm/src/StagingCtrl.s b/asm/src/StagingCtrl.s index e204f579..71fdf42f 100644 --- a/asm/src/StagingCtrl.s +++ b/asm/src/StagingCtrl.s @@ -391,15 +391,17 @@ lbl_803554D8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253301 $$253301: - .incbin "baserom.dol", 0x49AEC8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253387 $$253387: - .incbin "baserom.dol", 0x49D9C8, 0x4 + .4byte 0 .global $$253388 $$253388: - .incbin "baserom.dol", 0x49D9CC, 0x4 + .4byte 0x3F400000 .global $$253396 $$253396: - .incbin "baserom.dol", 0x49D9D0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Stake.s b/asm/src/Stake.s index 7c162e6f..ed538650 100644 --- a/asm/src/Stake.s +++ b/asm/src/Stake.s @@ -446,29 +446,32 @@ mfStartStrike__Q53scn4step7gimmick5stake5StakeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258060 $$258060: - .incbin "baserom.dol", 0x47E588, 0x14 + .asciz "step/gimmick/Stake" + .balign 4 .global $$258062 $$258062: - .incbin "baserom.dol", 0x47E59C, 0x10 + .asciz "StandbyStake" + .balign 4 .global $$258184 $$258184: - .incbin "baserom.dol", 0x47E5AC, 0xC + .asciz "StrikeStake" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258061 $$258061: - .incbin "baserom.dol", 0x496D20, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258063 $$258063: - .incbin "baserom.dol", 0x49D5B8, 0x4 + .4byte 0x3E4CCCCD .global $$258064 $$258064: - .incbin "baserom.dol", 0x49D5BC, 0x4 + .4byte 0xBE99999A .global $$258065 $$258065: - .incbin "baserom.dol", 0x49D5C0, 0x4 + .4byte 0x3F4CCCCD .global $$258066 $$258066: - .incbin "baserom.dol", 0x49D5C4, 0x4 + .4byte 0x3E99999A diff --git a/asm/src/Start.s b/asm/src/Start.s index 712ee010..c4e87bc7 100644 --- a/asm/src/Start.s +++ b/asm/src/Start.s @@ -254,18 +254,27 @@ lbl_803B5874: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253747 $$253747: - .incbin "baserom.dol", 0x48C910, 0x18 + .asciz "step/challenge/Master" + .balign 4 .global $$253748 $$253748: - .incbin "baserom.dol", 0x48C928, 0xC + .asciz "StartMaster" .global $$253749 $$253749: - .incbin "baserom.dol", 0x48C934, 0x18 + .asciz "step/challenge/Musou" + .balign 4 .global $$253751 $$253751: - .incbin "baserom.dol", 0x48C94C, 0x4C + .asciz "step/challenge/Normal" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253750 $$253750: - .incbin "baserom.dol", 0x497C88, 0x8 + .asciz "Start" + .balign 4 diff --git a/asm/src/StateAbilityCrash.s b/asm/src/StateAbilityCrash.s index 475acd0f..5c718a8d 100644 --- a/asm/src/StateAbilityCrash.s +++ b/asm/src/StateAbilityCrash.s @@ -222,21 +222,33 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4886D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80375874 + .4byte 0x80375858 .global __vt__Q53scn4step4hero6damage17StateAbilityCrash __vt__Q53scn4step4hero6damage17StateAbilityCrash: - .incbin "baserom.dol", 0x4886E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037572C + .4byte 0x803757E8 + .4byte 0x803757EC + .4byte 0x8035550C + .4byte 0x80375854 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256035 $$256035: - .incbin "baserom.dol", 0x49DDE0, 0x4 + .4byte 0xBD99999A .global $$256036 $$256036: - .incbin "baserom.dol", 0x49DDE4, 0x4 + .4byte 0x3E000000 .global $$256037 $$256037: - .incbin "baserom.dol", 0x49DDE8, 0x4 + .4byte 0 .global $$256060 $$256060: - .incbin "baserom.dol", 0x49DDEC, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateAgony.s b/asm/src/StateAgony.s index 3589186d..59b6888e 100644 --- a/asm/src/StateAgony.s +++ b/asm/src/StateAgony.s @@ -328,42 +328,51 @@ __dt__Q53scn4step5enemy6flamer10StateAgonyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateAgony __vt__Q53scn4step5enemy6flamer10StateAgony: - .incbin "baserom.dol", 0x472D50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B2878 ;# ptr + .4byte 0x802B2484 ;# ptr + .4byte 0x802B27E8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 $$257328: - .incbin "baserom.dol", 0x49C3D0, 0x4 + .4byte 0 .global $$257329 $$257329: - .incbin "baserom.dol", 0x49C3D4, 0x4 + .4byte 0x4222F983 .global $$257330 $$257330: - .incbin "baserom.dol", 0x49C3D8, 0x4 + .4byte 0x42C80000 .global $$257331 $$257331: - .incbin "baserom.dol", 0x49C3DC, 0x4 + .4byte 0x3F000000 .global $$257332 $$257332: - .incbin "baserom.dol", 0x49C3E0, 0x4 + .4byte 0x3E19999A .global $$257333 $$257333: - .incbin "baserom.dol", 0x49C3E4, 0x4 + .4byte 0x42B40000 .global $$257334 $$257334: - .incbin "baserom.dol", 0x49C3E8, 0x4 + .4byte 0x3C8EFA35 .global $$257335 $$257335: - .incbin "baserom.dol", 0x49C3EC, 0x4 + .4byte 0x3F800000 .global $$257336 $$257336: - .incbin "baserom.dol", 0x49C3F0, 0x4 + .4byte 0x437F0000 .global $$257337 $$257337: - .incbin "baserom.dol", 0x49C3F4, 0x4 + .4byte 0x43340000 .global $$257341 $$257341: - .incbin "baserom.dol", 0x49C3F8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257342 $$257342: - .incbin "baserom.dol", 0x49C400, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateAim.s b/asm/src/StateAim.s index 97dfe281..a7fde849 100644 --- a/asm/src/StateAim.s +++ b/asm/src/StateAim.s @@ -513,40 +513,59 @@ __dt__Q53scn4step5enemy6shotzo8StateAimFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo8StateAim __vt__Q53scn4step5enemy7gigatzo8StateAim: - .incbin "baserom.dol", 0x473588, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B7A3C ;# ptr + .4byte 0x802B7AB8 ;# ptr + .4byte 0x802B7C44 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B7CDC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo8StateAim __vt__Q53scn4step5enemy6shotzo8StateAim: - .incbin "baserom.dol", 0x478270, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E0AAC ;# ptr + .4byte 0x802E08EC ;# ptr + .4byte 0x802E09CC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E0A6C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256000 $$256000: - .incbin "baserom.dol", 0x49C540, 0x4 + .4byte 0 .global $$256001 $$256001: - .incbin "baserom.dol", 0x49C544, 0x4 + .4byte 0x42340000 .global $$256002 $$256002: - .incbin "baserom.dol", 0x49C548, 0x8 + .4byte 0xC2340000 + .4byte 0 .global $$256036 $$256036: - .incbin "baserom.dol", 0x49C550, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256050 $$256050: - .incbin "baserom.dol", 0x49C558, 0x8 + .4byte 0x41B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255889 $$255889: - .incbin "baserom.dol", 0x49CDD0, 0x4 + .4byte 0x42340000 .global $$255890 $$255890: - .incbin "baserom.dol", 0x49CDD4, 0x4 + .4byte 0xC2340000 .global $$255914 $$255914: - .incbin "baserom.dol", 0x49CDD8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255929 $$255929: - .incbin "baserom.dol", 0x49CDE0, 0x8 + .4byte 0x41B40000 + .4byte 0 diff --git a/asm/src/StateAirJump.s b/asm/src/StateAirJump.s index b601ebea..d045bd3e 100644 --- a/asm/src/StateAirJump.s +++ b/asm/src/StateAirJump.s @@ -354,12 +354,25 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487A78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035E880 + .4byte 0x8035E864 .global __vt__Q53scn4step4hero6common12StateAirJump __vt__Q53scn4step4hero6common12StateAirJump: - .incbin "baserom.dol", 0x487A88, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035E6A4 + .4byte 0x8035E700 + .4byte 0x8035E7E0 + .4byte 0x8035550C + .4byte 0x8035E804 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256930 $$256930: - .incbin "baserom.dol", 0x49DB08, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateAirSpin.s b/asm/src/StateAirSpin.s index d8cf8beb..6d4c7234 100644 --- a/asm/src/StateAirSpin.s +++ b/asm/src/StateAirSpin.s @@ -196,12 +196,25 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AE08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A0F9C + .4byte 0x803A0F80 .global __vt__Q53scn4step4hero5smash12StateAirSpin __vt__Q53scn4step4hero5smash12StateAirSpin: - .incbin "baserom.dol", 0x48AE18, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A0E4C + .4byte 0x803A0ECC + .4byte 0x803A0F78 + .4byte 0x8035550C + .4byte 0x803A0F7C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258329 $$258329: - .incbin "baserom.dol", 0x49E350, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateAllStageClear.s b/asm/src/StateAllStageClear.s index 573148fd..a93f18c7 100644 --- a/asm/src/StateAllStageClear.s +++ b/asm/src/StateAllStageClear.s @@ -228,7 +228,19 @@ __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1: - .incbin "baserom.dol", 0x4888F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80378CAC + .4byte 0x80378C8C .global __vt__Q53scn4step4hero7gimmick18StateAllStageClear __vt__Q53scn4step4hero7gimmick18StateAllStageClear: - .incbin "baserom.dol", 0x488908, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80378A68 + .4byte 0x80378AF8 + .4byte 0x80378C84 + .4byte 0x8035550C + .4byte 0x80378C88 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateAngerChase.s b/asm/src/StateAngerChase.s index b48497f9..dae0280a 100644 --- a/asm/src/StateAngerChase.s +++ b/asm/src/StateAngerChase.s @@ -576,48 +576,57 @@ lbl_802DA688: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy15StateAngerChase __vt__Q53scn4step5enemy6scarfy15StateAngerChase: - .incbin "baserom.dol", 0x4776F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D9FDC ;# ptr + .4byte 0x802D9FE0 ;# ptr + .4byte 0x802DA278 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257207 $$257207: - .incbin "baserom.dol", 0x49CC20, 0x4 + .4byte 0 .global $$257208 $$257208: - .incbin "baserom.dol", 0x49CC24, 0x4 + .4byte 0x3F800000 .global $$257243 $$257243: - .incbin "baserom.dol", 0x49CC28, 0x4 + .4byte 0x43B40000 .global $$257244 $$257244: - .incbin "baserom.dol", 0x49CC2C, 0x4 + .4byte 0x3D19999A .global $$257245 $$257245: - .incbin "baserom.dol", 0x49CC30, 0x4 + .4byte 0x3F733333 .global $$257246 $$257246: - .incbin "baserom.dol", 0x49CC34, 0x4 + .4byte 0x4222F983 .global $$257247 $$257247: - .incbin "baserom.dol", 0x49CC38, 0x4 + .4byte 0x3C8EFA35 .global $$257248 $$257248: - .incbin "baserom.dol", 0x49CC3C, 0x4 + .4byte 0x3F000000 .global $$257249 $$257249: - .incbin "baserom.dol", 0x49CC40, 0x4 + .4byte 0x437F0000 .global $$257250 $$257250: - .incbin "baserom.dol", 0x49CC44, 0x4 + .4byte 0x43340000 .global $$257253 $$257253: - .incbin "baserom.dol", 0x49CC48, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257334 $$257334: - .incbin "baserom.dol", 0x49CC50, 0x4 + .4byte 0x3727C5AC .global $$257335 $$257335: - .incbin "baserom.dol", 0x49CC54, 0x4 + .4byte 0xBF800000 .global $$257336 $$257336: - .incbin "baserom.dol", 0x49CC58, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 diff --git a/asm/src/StateAnyWhereIn.s b/asm/src/StateAnyWhereIn.s index d3d99185..24666557 100644 --- a/asm/src/StateAnyWhereIn.s +++ b/asm/src/StateAnyWhereIn.s @@ -697,29 +697,41 @@ lbl_8035F2AC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateAnyWhereIn __vt__Q53scn4step4hero6common15StateAnyWhereIn: - .incbin "baserom.dol", 0x487AB0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035E9E8 + .4byte 0x8035EC44 + .4byte 0x8035ED38 + .4byte 0x8035550C + .4byte 0x8035EFB8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258805 $$258805: - .incbin "baserom.dol", 0x497710, 0x4 + .4byte 0x3F800000 .global $$258808 $$258808: - .incbin "baserom.dol", 0x497714, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259623 $$259623: - .incbin "baserom.dol", 0x49DB10, 0x4 + .4byte 0 .global $$259681 $$259681: - .incbin "baserom.dol", 0x49DB14, 0x4 + .4byte 0x3F000000 .global $$259682 $$259682: - .incbin "baserom.dol", 0x49DB18, 0x8 + .4byte 0x40490FDB + .4byte 0 .global $$259686 $$259686: - .incbin "baserom.dol", 0x49DB20, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259690 $$259690: - .incbin "baserom.dol", 0x49DB28, 0x8 + .4byte 0x4222F983 + .4byte 0 diff --git a/asm/src/StateAppear.s b/asm/src/StateAppear.s index de3948c5..8b208b71 100644 --- a/asm/src/StateAppear.s +++ b/asm/src/StateAppear.s @@ -1081,64 +1081,225 @@ procFixPos__Q53scn4step5enemy11whispyapple11StateAppearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257483 $$257483: - .incbin "baserom.dol", 0x4621A8, 0x1D8 + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244990 ;# ptr + .4byte 0x80244978 ;# ptr + .4byte 0 .global __vt__Q53scn4step4boss6common11StateAppear __vt__Q53scn4step4boss6common11StateAppear: - .incbin "baserom.dol", 0x462380, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80244738 ;# ptr + .4byte 0x80244814 ;# ptr + .4byte 0x80244AE0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80244AE4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463288, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024BA6C ;# ptr + .4byte 0x8024BA50 ;# ptr .global __vt__Q53scn4step4boss10creditroah11StateAppear __vt__Q53scn4step4boss10creditroah11StateAppear: - .incbin "baserom.dol", 0x463298, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024B9DC ;# ptr + .4byte 0x8024B9E0 ;# ptr + .4byte 0x8024BA08 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024BA4C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466608, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025CAF8 ;# ptr + .4byte 0x8025CADC ;# ptr .global __vt__Q53scn4step4boss6whispy11StateAppear __vt__Q53scn4step4boss6whispy11StateAppear: - .incbin "baserom.dol", 0x466618, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025C988 ;# ptr + .4byte 0x8025C98C ;# ptr + .4byte 0x8025CA80 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025CA84 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como11StateAppear __vt__Q53scn4step5enemy4como11StateAppear: - .incbin "baserom.dol", 0x471C60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A77B8 ;# ptr + .4byte 0x802A75BC ;# ptr + .4byte 0x802A7680 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A77B4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateAppear __vt__Q53scn4step5enemy11whispyapple11StateAppear: - .incbin "baserom.dol", 0x47AE38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F1210 ;# ptr + .4byte 0x802F128C ;# ptr + .4byte 0x802F1330 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F1334 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257435 $$257435: - .incbin "baserom.dol", 0x49B110, 0x8 + .4byte 0 + .4byte 0 .global $$257439 $$257439: - .incbin "baserom.dol", 0x49B118, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257480 $$257480: - .incbin "baserom.dol", 0x49B120, 0x4 + .4byte 0x40F00000 .global $$257481 $$257481: - .incbin "baserom.dol", 0x49B124, 0x4 + .4byte 0x3FA00000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255225 $$255225: - .incbin "baserom.dol", 0x49C0C0, 0x4 + .4byte 0x3F800000 .global $$255226 $$255226: - .incbin "baserom.dol", 0x49C0C4, 0x4 + .4byte 0x4222F983 .global $$255227 $$255227: - .incbin "baserom.dol", 0x49C0C8, 0x4 + .4byte 0x3C8EFA35 .global $$255228 $$255228: - .incbin "baserom.dol", 0x49C0CC, 0x4 + .4byte 0x42B40000 .global $$255231 $$255231: - .incbin "baserom.dol", 0x49C0D0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateApproach.s b/asm/src/StateApproach.s index 82f63c5e..2f2002b6 100644 --- a/asm/src/StateApproach.s +++ b/asm/src/StateApproach.s @@ -136,12 +136,17 @@ lbl_803C7448: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state13StateApproach __vt__Q53scn4step4item5state13StateApproach: - .incbin "baserom.dol", 0x48E660, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C7408 + .4byte 0x803C72E4 + .4byte 0x803C72E8 + .4byte 0x803C5204 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255066 $$255066: - .incbin "baserom.dol", 0x49E5B0, 0x4 + .4byte 0 .global $$255081 $$255081: - .incbin "baserom.dol", 0x49E5B4, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateAreaMapDemoFirstPlay.s b/asm/src/StateAreaMapDemoFirstPlay.s index 150d8834..51697a7f 100644 --- a/asm/src/StateAreaMapDemoFirstPlay.s +++ b/asm/src/StateAreaMapDemoFirstPlay.s @@ -160,4 +160,13 @@ procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay: - .incbin "baserom.dol", 0x488930, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80378D74 + .4byte 0x80378E04 + .4byte 0x80378ED0 + .4byte 0x8035550C + .4byte 0x80378ED4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateAttack.s b/asm/src/StateAttack.s index e640bbad..0e1c8137 100644 --- a/asm/src/StateAttack.s +++ b/asm/src/StateAttack.s @@ -7707,419 +7707,655 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common11StateAttack __vt__Q53scn4step4boss6common11StateAttack: - .incbin "baserom.dol", 0x4623A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80244C0C ;# ptr + .4byte 0x80244C10 ;# ptr + .4byte 0x80244E7C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80244EB4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros11StateAttack __vt__Q53scn4step4boss13watergalboros11StateAttack: - .incbin "baserom.dol", 0x465B20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80259F30 ;# ptr + .4byte 0x80259F34 ;# ptr + .4byte 0x8025A05C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025A0B0 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x467090, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8026164C ;# ptr + .4byte 0x80261630 ;# ptr .global __vt__Q53scn4step4boss9zankibble11StateAttack __vt__Q53scn4step4boss9zankibble11StateAttack: - .incbin "baserom.dol", 0x4670A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80260ED8 ;# ptr + .4byte 0x80260F98 ;# ptr + .4byte 0x80261210 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80261264 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight11StateAttack __vt__Q53scn4step5enemy11bladeknight11StateAttack: - .incbin "baserom.dol", 0x46FAD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029764C ;# ptr + .4byte 0x80297650 ;# ptr + .4byte 0x802976A8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80297818 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby11StateAttack __vt__Q53scn4step5enemy5bowby11StateAttack: - .incbin "baserom.dol", 0x470840, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029E98C ;# ptr + .4byte 0x8029EA0C ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1 __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: - .incbin "baserom.dol", 0x471328, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A3310 ;# ptr + .4byte 0x802A32E8 ;# ptr .global __vt__Q53scn4step5enemy5cappy11StateAttack __vt__Q53scn4step5enemy5cappy11StateAttack: - .incbin "baserom.dol", 0x471338, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A330C ;# ptr + .4byte 0x802A2F08 ;# ptr + .4byte 0x802A306C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A32C4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly11StateAttack __vt__Q53scn4step5enemy6chilly11StateAttack: - .incbin "baserom.dol", 0x4719F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A6450 ;# ptr + .4byte 0x802A64D8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A660C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec11StateAttack __vt__Q53scn4step5enemy4elec11StateAttack: - .incbin "baserom.dol", 0x472838, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AFD98 ;# ptr + .4byte 0x802AFE14 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11StateAttack __vt__Q53scn4step5enemy6flamer11StateAttack: - .incbin "baserom.dol", 0x472D70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B2934 ;# ptr + .4byte 0x802B2A1C ;# ptr + .4byte 0x802B2BB4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B2E0C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley11StateAttack __vt__Q53scn4step5enemy5foley11StateAttack: - .incbin "baserom.dol", 0x472F80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B4CC8 ;# ptr + .4byte 0x802B4CCC ;# ptr + .4byte 0x802B4EE8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B4F9C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra11StateAttack __vt__Q53scn4step5enemy5gemra11StateAttack: - .incbin "baserom.dol", 0x4731F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B632C ;# ptr + .4byte 0x802B63DC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo11StateAttack __vt__Q53scn4step5enemy7gigatzo11StateAttack: - .incbin "baserom.dol", 0x4735A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B7F6C ;# ptr + .4byte 0x802B7FE8 ;# ptr + .4byte 0x802B81A4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B8270 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateAttack __vt__Q53scn4step5enemy6juckle11StateAttack: - .incbin "baserom.dol", 0x473DE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BBC74 ;# ptr + .4byte 0x802BB8EC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4749F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C0178 ;# ptr + .4byte 0x802C00FC ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474A00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C0174 ;# ptr + .4byte 0x802C0118 ;# ptr .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474A10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C0170 ;# ptr + .4byte 0x802C0134 ;# ptr .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x474A20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C016C ;# ptr + .4byte 0x802C0150 ;# ptr .global __vt__Q53scn4step5enemy10knucklejoe11StateAttack __vt__Q53scn4step5enemy10knucklejoe11StateAttack: - .incbin "baserom.dol", 0x474A30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BFE8C ;# ptr + .4byte 0x802BFF08 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C00F8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer11StateAttack __vt__Q53scn4step5enemy6lanzer11StateAttack: - .incbin "baserom.dol", 0x474E30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C2398 ;# ptr + .4byte 0x802C2440 ;# ptr + .4byte 0x802C24AC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C25D0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475028, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C39A4 ;# ptr + .4byte 0x802C3984 ;# ptr .global __vt__Q53scn4step5enemy6leafan11StateAttack __vt__Q53scn4step5enemy6leafan11StateAttack: - .incbin "baserom.dol", 0x475038, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C39A0 ;# ptr + .4byte 0x802C36C8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C38E8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475570, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C6748 ;# ptr + .4byte 0x802C672C ;# ptr .global __vt__Q53scn4step5enemy8needlous11StateAttack __vt__Q53scn4step5enemy8needlous11StateAttack: - .incbin "baserom.dol", 0x475580, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C6350 ;# ptr + .4byte 0x802C63C8 ;# ptr + .4byte 0x802C6424 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C64DC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476EB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D3DE0 ;# ptr + .4byte 0x802D3DC4 ;# ptr .global __vt__Q53scn4step5enemy5rocky11StateAttack __vt__Q53scn4step5enemy5rocky11StateAttack: - .incbin "baserom.dol", 0x476EC8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D3C68 ;# ptr + .4byte 0x802D3C6C ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D3D28 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches11StateAttack __vt__Q53scn4step5enemy8searches11StateAttack: - .incbin "baserom.dol", 0x477960, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DC110 ;# ptr + .4byte 0x802DBF44 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble11StateAttack __vt__Q53scn4step5enemy9sirkibble11StateAttack: - .incbin "baserom.dol", 0x478670, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E1884 ;# ptr + .4byte 0x802E1888 ;# ptr + .4byte 0x802E1958 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E195C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory11StateAttack __vt__Q53scn4step5enemy6sodory11StateAttack: - .incbin "baserom.dol", 0x478FD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E56B4 ;# ptr + .4byte 0x802E577C ;# ptr + .4byte 0x802E5D48 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E5DEC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StateAttack __vt__Q53scn4step5enemy6sparky11StateAttack: - .incbin "baserom.dol", 0x479308, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E6FBC ;# ptr + .4byte 0x802E7038 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E7100 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11StateAttack __vt__Q53scn4step5enemy9tsukikage11StateAttack: - .incbin "baserom.dol", 0x479A50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EB36C ;# ptr + .4byte 0x802EB1C4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EB2C8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo11StateAttack __vt__Q53scn4step5enemy9waddledoo11StateAttack: - .incbin "baserom.dol", 0x47A8D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EFCB4 ;# ptr + .4byte 0x802EFCAC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EFCB0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11StateAttack __vt__Q53scn4step5enemy10watergalbo11StateAttack: - .incbin "baserom.dol", 0x47AAA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F0330 ;# ptr + .4byte 0x802F03B0 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F067C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11StateAttack __vt__Q53scn4step5enemy6whippy11StateAttack: - .incbin "baserom.dol", 0x47AC58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F0968 ;# ptr + .4byte 0x802F09DC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F0B6C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489900, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038E074 + .4byte 0x8038E038 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489910, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038E070 + .4byte 0x8038E054 .global __vt__Q53scn4step4hero5spark11StateAttack __vt__Q53scn4step4hero5spark11StateAttack: - .incbin "baserom.dol", 0x489920, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038DDE0 + .4byte 0x8038DEBC + .4byte 0x8038DFE8 + .4byte 0x8035550C + .4byte 0x8038DFEC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255924 $$255924: - .incbin "baserom.dol", 0x49B5A8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$255990 $$255990: - .incbin "baserom.dol", 0x49B5B0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256009 $$256009: - .incbin "baserom.dol", 0x49B5B8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256898 $$256898: - .incbin "baserom.dol", 0x49BEC0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257318 $$257318: - .incbin "baserom.dol", 0x49BFB8, 0x4 + .4byte 0 .global $$257319 $$257319: - .incbin "baserom.dol", 0x49BFBC, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256033 $$256033: - .incbin "baserom.dol", 0x49C358, 0x4 + .4byte 0 .global $$256047 $$256047: - .incbin "baserom.dol", 0x49C35C, 0x4 + .4byte 0x3F800000 .global $$256050 $$256050: - .incbin "baserom.dol", 0x49C360, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256901 $$256901: - .incbin "baserom.dol", 0x49C408, 0x4 + .4byte 0x3F800000 .global $$256902 $$256902: - .incbin "baserom.dol", 0x49C40C, 0x4 + .4byte 0xBF800000 .global $$256903 $$256903: - .incbin "baserom.dol", 0x49C410, 0x4 + .4byte 0 .global $$256936 $$256936: - .incbin "baserom.dol", 0x49C414, 0x4 + .4byte 0x4222F983 .global $$256937 $$256937: - .incbin "baserom.dol", 0x49C418, 0x4 + .4byte 0x42480000 .global $$256938 $$256938: - .incbin "baserom.dol", 0x49C41C, 0x4 + .4byte 0x3F000000 .global $$256939 $$256939: - .incbin "baserom.dol", 0x49C420, 0x8 + .4byte 0x3E19999A + .4byte 0 .global $$256943 $$256943: - .incbin "baserom.dol", 0x49C428, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256965 $$256965: - .incbin "baserom.dol", 0x49C430, 0x4 + .4byte 0x3E99999A .global $$256990 $$256990: - .incbin "baserom.dol", 0x49C434, 0x4 + .4byte 0x3DF5C28F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257636 $$257636: - .incbin "baserom.dol", 0x49C4B0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257706 $$257706: - .incbin "baserom.dol", 0x49C4B8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255969 $$255969: - .incbin "baserom.dol", 0x49C4F0, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258295 $$258295: - .incbin "baserom.dol", 0x49C560, 0x4 + .4byte 0x3F000000 .global $$258298 $$258298: - .incbin "baserom.dol", 0x49C564, 0x4 + .4byte 0 .global $$258408 $$258408: - .incbin "baserom.dol", 0x49C568, 0x4 + .4byte 0x3F800000 .global $$258409 $$258409: - .incbin "baserom.dol", 0x49C56C, 0x4 + .4byte 0xC2B40000 .global $$258410 $$258410: - .incbin "baserom.dol", 0x49C570, 0x4 + .4byte 0x43870000 .global $$258411 $$258411: - .incbin "baserom.dol", 0x49C574, 0x4 + .4byte 0xBF800000 .global $$258412 $$258412: - .incbin "baserom.dol", 0x49C578, 0x4 + .4byte 0x42B40000 .global $$258413 $$258413: - .incbin "baserom.dol", 0x49C57C, 0x4 + .4byte 0xC2340000 .global $$258414 $$258414: - .incbin "baserom.dol", 0x49C580, 0x4 + .4byte 0x439D8000 .global $$258415 $$258415: - .incbin "baserom.dol", 0x49C584, 0x4 + .4byte 0x42340000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257366 $$257366: - .incbin "baserom.dol", 0x49C608, 0x4 + .4byte 0x43870000 .global $$257367 $$257367: - .incbin "baserom.dol", 0x49C60C, 0x4 + .4byte 0x42B40000 .global $$257368 $$257368: - .incbin "baserom.dol", 0x49C610, 0x4 + .4byte 0 .global $$257369 $$257369: - .incbin "baserom.dol", 0x49C614, 0x4 + .4byte 0x3F800000 .global $$257370 $$257370: - .incbin "baserom.dol", 0x49C618, 0x4 + .4byte 0xBF800000 .global $$257371 $$257371: - .incbin "baserom.dol", 0x49C61C, 0x4 + .4byte 0x3E4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255588 $$255588: - .incbin "baserom.dol", 0x49C710, 0x4 + .4byte 0x3F800000 .global $$255589 $$255589: - .incbin "baserom.dol", 0x49C714, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256150 $$256150: - .incbin "baserom.dol", 0x49C7A0, 0x4 + .4byte 0x42B40000 .global $$256151 $$256151: - .incbin "baserom.dol", 0x49C7A4, 0x4 + .4byte 0x3E4CCCCD .global $$256160 $$256160: - .incbin "baserom.dol", 0x49C7A8, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257076 $$257076: - .incbin "baserom.dol", 0x49C7D8, 0x4 + .4byte 0 .global $$257086 $$257086: - .incbin "baserom.dol", 0x49C7DC, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256204 $$256204: - .incbin "baserom.dol", 0x49C880, 0x4 + .4byte 0 .global $$256205 $$256205: - .incbin "baserom.dol", 0x49C884, 0x4 + .4byte 0x3DCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255849 $$255849: - .incbin "baserom.dol", 0x49CB28, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256451 $$256451: - .incbin "baserom.dol", 0x49CCC8, 0x4 + .4byte 0 .global $$256452 $$256452: - .incbin "baserom.dol", 0x49CCCC, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257960 $$257960: - .incbin "baserom.dol", 0x49CE88, 0x4 + .4byte 0 .global $$257961 $$257961: - .incbin "baserom.dol", 0x49CE8C, 0x4 + .4byte 0x3F800000 .global $$257962 $$257962: - .incbin "baserom.dol", 0x49CE90, 0x4 + .4byte 0xBF800000 .global $$258042 $$258042: - .incbin "baserom.dol", 0x49CE94, 0x4 + .4byte 0x43340000 .global $$258043 $$258043: - .incbin "baserom.dol", 0x49CE98, 0x4 + .4byte 0x43B40000 .global $$258044 $$258044: - .incbin "baserom.dol", 0x49CE9C, 0x4 + .4byte 0xC3340000 .global $$258045 $$258045: - .incbin "baserom.dol", 0x49CEA0, 0x4 + .4byte 0x44340000 .global $$258046 $$258046: - .incbin "baserom.dol", 0x49CEA4, 0x4 + .4byte 0x3C23D70A .global $$258047 $$258047: - .incbin "baserom.dol", 0x49CEA8, 0x4 + .4byte 0x3ECCCCCD .global $$258048 $$258048: - .incbin "baserom.dol", 0x49CEAC, 0x4 + .4byte 0x3DCCCCCD .global $$258049 $$258049: - .incbin "baserom.dol", 0x49CEB0, 0x4 + .4byte 0x3E4CCCCD .global $$258050 $$258050: - .incbin "baserom.dol", 0x49CEB4, 0x4 + .4byte 0x3E99999A .global $$258051 $$258051: - .incbin "baserom.dol", 0x49CEB8, 0x4 + .4byte 0x3F400000 .global $$258052 $$258052: - .incbin "baserom.dol", 0x49CEBC, 0x4 + .4byte 0x40400000 .global $$258148 $$258148: - .incbin "baserom.dol", 0x49CEC0, 0x4 + .4byte 0x42B40000 .global $$258153 $$258153: - .incbin "baserom.dol", 0x49CEC4, 0x4 + .4byte 0x3FB40000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256622 $$256622: - .incbin "baserom.dol", 0x49D070, 0x4 + .4byte 0 .global $$256623 $$256623: - .incbin "baserom.dol", 0x49D074, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 $$256306: - .incbin "baserom.dol", 0x49D080, 0x4 + .4byte 0 .global $$256328 $$256328: - .incbin "baserom.dol", 0x49D084, 0x4 + .4byte 0x3FB40000 .global $$256329 $$256329: - .incbin "baserom.dol", 0x49D088, 0x4 + .4byte 0x3F4CCCCD .global $$256387 $$256387: - .incbin "baserom.dol", 0x49D08C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateAttack1Way.s b/asm/src/StateAttack1Way.s index 069ae3a5..e3802b3c 100644 --- a/asm/src/StateAttack1Way.s +++ b/asm/src/StateAttack1Way.s @@ -240,21 +240,29 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateAttack1Way __vt__Q53scn4step5enemy6owgulf15StateAttack1Way: - .incbin "baserom.dol", 0x475E18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CA368 ;# ptr + .4byte 0x802CA100 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255607 $$255607: - .incbin "baserom.dol", 0x49C920, 0x4 + .4byte 0x4222F983 .global $$255608 $$255608: - .incbin "baserom.dol", 0x49C924, 0x4 + .4byte 0x3C8EFA35 .global $$255609 $$255609: - .incbin "baserom.dol", 0x49C928, 0x4 + .4byte 0 .global $$255610 $$255610: - .incbin "baserom.dol", 0x49C92C, 0x4 + .4byte 0x3DCCCCCD .global $$255611 $$255611: - .incbin "baserom.dol", 0x49C930, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/StateAttack3Way.s b/asm/src/StateAttack3Way.s index d54640ff..dde30289 100644 --- a/asm/src/StateAttack3Way.s +++ b/asm/src/StateAttack3Way.s @@ -265,18 +265,25 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateAttack3Way __vt__Q53scn4step5enemy6owgulf15StateAttack3Way: - .incbin "baserom.dol", 0x475E38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CA728 ;# ptr + .4byte 0x802CA468 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255579 $$255579: - .incbin "baserom.dol", 0x49C938, 0x4 + .4byte 0x4222F983 .global $$255580 $$255580: - .incbin "baserom.dol", 0x49C93C, 0x4 + .4byte 0x3C8EFA35 .global $$255581 $$255581: - .incbin "baserom.dol", 0x49C940, 0x4 + .4byte 0 .global $$255582 $$255582: - .incbin "baserom.dol", 0x49C944, 0x4 + .4byte 0x3F000000 diff --git a/asm/src/StateAttackBreath.s b/asm/src/StateAttackBreath.s index 08dec059..3c8d8c02 100644 --- a/asm/src/StateAttackBreath.s +++ b/asm/src/StateAttackBreath.s @@ -157,4 +157,11 @@ lbl_802BA944: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead17StateAttackBreath __vt__Q53scn4step5enemy7hothead17StateAttackBreath: - .incbin "baserom.dol", 0x473B18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BA7B0 ;# ptr + .4byte 0x802BA7B4 ;# ptr + .4byte 0x802BA8BC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BA8C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateAttackEnd.s b/asm/src/StateAttackEnd.s index 4a760fd0..146fca24 100644 --- a/asm/src/StateAttackEnd.s +++ b/asm/src/StateAttackEnd.s @@ -138,4 +138,13 @@ procFixPos__Q53scn4step4hero5spark14StateAttackEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark14StateAttackEnd __vt__Q53scn4step4hero5spark14StateAttackEnd: - .incbin "baserom.dol", 0x489948, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038E110 + .4byte 0x8038E1A4 + .4byte 0x8038E204 + .4byte 0x8035550C + .4byte 0x8038E208 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateAttackJoint.s b/asm/src/StateAttackJoint.s index b6705b11..d064ec3b 100644 --- a/asm/src/StateAttackJoint.s +++ b/asm/src/StateAttackJoint.s @@ -50,4 +50,11 @@ procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros16StateAttackJoint __vt__Q53scn4step4boss13watergalboros16StateAttackJoint: - .incbin "baserom.dol", 0x465B40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025A120 ;# ptr + .4byte 0x8025A124 ;# ptr + .4byte 0x8025A128 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025A12C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateAttackOver.s b/asm/src/StateAttackOver.s index 0f6df443..273f569f 100644 --- a/asm/src/StateAttackOver.s +++ b/asm/src/StateAttackOver.s @@ -386,15 +386,31 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489970, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038E778 + .4byte 0x8038E73C .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489980, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038E774 + .4byte 0x8038E758 .global __vt__Q53scn4step4hero5spark15StateAttackOver __vt__Q53scn4step4hero5spark15StateAttackOver: - .incbin "baserom.dol", 0x489990, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038E3F4 + .4byte 0x8038E49C + .4byte 0x8038E5A8 + .4byte 0x8035550C + .4byte 0x8038E5AC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257144 $$257144: - .incbin "baserom.dol", 0x49E0D8, 0x8 + .4byte 0x40E00000 + .4byte 0 diff --git a/asm/src/StateAttackOverEnd.s b/asm/src/StateAttackOverEnd.s index a08c2cf3..e8bea52f 100644 --- a/asm/src/StateAttackOverEnd.s +++ b/asm/src/StateAttackOverEnd.s @@ -82,4 +82,13 @@ procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark18StateAttackOverEnd __vt__Q53scn4step4hero5spark18StateAttackOverEnd: - .incbin "baserom.dol", 0x4899B8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038E7E8 + .4byte 0x8038E868 + .4byte 0x8038E86C + .4byte 0x8035550C + .4byte 0x8038E870 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateAttackShot.s b/asm/src/StateAttackShot.s index 0eb259c7..8f98dc6f 100644 --- a/asm/src/StateAttackShot.s +++ b/asm/src/StateAttackShot.s @@ -352,18 +352,25 @@ reqWeapon__Q53scn4step5enemy7hothead15StateAttackShotFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead15StateAttackShot __vt__Q53scn4step5enemy7hothead15StateAttackShot: - .incbin "baserom.dol", 0x473B38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BA9E8 ;# ptr + .4byte 0x802BAA64 ;# ptr + .4byte 0x802BABA4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BABA8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 $$257616: - .incbin "baserom.dol", 0x49C5D8, 0x4 + .4byte 0 .global $$257617 $$257617: - .incbin "baserom.dol", 0x49C5DC, 0x4 + .4byte 0x42B40000 .global $$257677 $$257677: - .incbin "baserom.dol", 0x49C5E0, 0x4 + .4byte 0x42652EE1 .global $$257678 $$257678: - .incbin "baserom.dol", 0x49C5E4, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/src/StateAttackUnder.s b/asm/src/StateAttackUnder.s index fa049a11..019d8352 100644 --- a/asm/src/StateAttackUnder.s +++ b/asm/src/StateAttackUnder.s @@ -396,15 +396,31 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4899E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038EDCC + .4byte 0x8038ED90 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4899F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038EDC8 + .4byte 0x8038EDAC .global __vt__Q53scn4step4hero5spark16StateAttackUnder __vt__Q53scn4step4hero5spark16StateAttackUnder: - .incbin "baserom.dol", 0x489A00, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038EA34 + .4byte 0x8038EADC + .4byte 0x8038EBE8 + .4byte 0x8035550C + .4byte 0x8038EBEC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257172 $$257172: - .incbin "baserom.dol", 0x49E0E0, 0x8 + .4byte 0x41000000 + .4byte 0 diff --git a/asm/src/StateAttackUnderEnd.s b/asm/src/StateAttackUnderEnd.s index 595d2800..38c64796 100644 --- a/asm/src/StateAttackUnderEnd.s +++ b/asm/src/StateAttackUnderEnd.s @@ -82,4 +82,13 @@ procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark19StateAttackUnderEnd __vt__Q53scn4step4hero5spark19StateAttackUnderEnd: - .incbin "baserom.dol", 0x489A28, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038EE3C + .4byte 0x8038EEBC + .4byte 0x8038EEC0 + .4byte 0x8035550C + .4byte 0x8038EEC4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateBack.s b/asm/src/StateBack.s index fa550ff7..20f8de89 100644 --- a/asm/src/StateBack.s +++ b/asm/src/StateBack.s @@ -392,31 +392,47 @@ procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como9StateBack __vt__Q53scn4step5enemy4como9StateBack: - .incbin "baserom.dol", 0x471C80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A7A58 ;# ptr + .4byte 0x802A7830 ;# ptr + .4byte 0x802A7834 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A79BC ;# ptr + .4byte 0x802A79C0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateBack __vt__Q53scn4step5enemy8dubiorjr9StateBack: - .incbin "baserom.dol", 0x472408, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AE560 ;# ptr + .4byte 0x802AE564 ;# ptr + .4byte 0x802AE58C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AE5E0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255315 $$255315: - .incbin "baserom.dol", 0x49C0D8, 0x4 + .4byte 0x43340000 .global $$255316 $$255316: - .incbin "baserom.dol", 0x49C0DC, 0x4 + .4byte 0x4222F983 .global $$255317 $$255317: - .incbin "baserom.dol", 0x49C0E0, 0x4 + .4byte 0x3C8EFA35 .global $$255318 $$255318: - .incbin "baserom.dol", 0x49C0E4, 0x4 + .4byte 0 .global $$255322 $$255322: - .incbin "baserom.dol", 0x49C0E8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255062 $$255062: - .incbin "baserom.dol", 0x49C2F8, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 diff --git a/asm/src/StateBackCircle.s b/asm/src/StateBackCircle.s index 1914dd5c..d0ad8154 100644 --- a/asm/src/StateBackCircle.s +++ b/asm/src/StateBackCircle.s @@ -365,15 +365,23 @@ lbl_802F2B28: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle: - .incbin "baserom.dol", 0x47AFD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F26E0 ;# ptr + .4byte 0x802F26E4 ;# ptr + .4byte 0x802F26E8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F285C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256131 $$256131: - .incbin "baserom.dol", 0x49D0D8, 0x4 + .4byte 0 .global $$256132 $$256132: - .incbin "baserom.dol", 0x49D0DC, 0x4 + .4byte 0xBF800000 .global $$256133 $$256133: - .incbin "baserom.dol", 0x49D0E0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateBase.s b/asm/src/StateBase.s index 8a930320..c538fc97 100644 --- a/asm/src/StateBase.s +++ b/asm/src/StateBase.s @@ -279,24 +279,59 @@ lbl_803D89A8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss9StateBase __vt__Q43scn4step4boss9StateBase: - .incbin "baserom.dol", 0x460928, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80234508 ;# ptr + .4byte 0x802344F4 ;# ptr + .4byte 0x802344F8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80234500 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9StateBase __vt__Q43scn4step5enemy9StateBase: - .incbin "baserom.dol", 0x46ED30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8028DDEC ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero9StateBase __vt__Q43scn4step4hero9StateBase: - .incbin "baserom.dol", 0x4815F0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035551C + .4byte 0x80355504 + .4byte 0x80355508 + .4byte 0x8035550C + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item9StateBase __vt__Q43scn4step4item9StateBase: - .incbin "baserom.dol", 0x48E008, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C5208 + .4byte 0x803C51FC + .4byte 0x803C5200 + .4byte 0x803C5204 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9StateBase __vt__Q43scn4step6weapon9StateBase: - .incbin "baserom.dol", 0x48FE90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803D8968 + .4byte 0x803D8954 + .4byte 0x803D8958 + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803D8964 diff --git a/asm/src/StateBodyHit.s b/asm/src/StateBodyHit.s index 88c67fa6..0cc1a172 100644 --- a/asm/src/StateBodyHit.s +++ b/asm/src/StateBodyHit.s @@ -177,9 +177,19 @@ lbl_80375AC0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateBodyHit __vt__Q53scn4step4hero6damage12StateBodyHit: - .incbin "baserom.dol", 0x488708, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803758C0 + .4byte 0x80375938 + .4byte 0x80375998 + .4byte 0x8035550C + .4byte 0x80375A00 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256792 $$256792: - .incbin "baserom.dol", 0x49DDF0, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateBomb.s b/asm/src/StateBomb.s index dfe4f696..f8b75c04 100644 --- a/asm/src/StateBomb.s +++ b/asm/src/StateBomb.s @@ -268,4 +268,11 @@ lbl_80238104: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers9StateBomb __vt__Q53scn4step4boss7bonkers9StateBomb: - .incbin "baserom.dol", 0x461280, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80237E54 ;# ptr + .4byte 0x80237EB0 ;# ptr + .4byte 0x80237F6C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80237FC0 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateBombStart.s b/asm/src/StateBombStart.s index 8f186e6c..2a72222e 100644 --- a/asm/src/StateBombStart.s +++ b/asm/src/StateBombStart.s @@ -66,4 +66,11 @@ procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers14StateBombStart __vt__Q53scn4step4boss7bonkers14StateBombStart: - .incbin "baserom.dol", 0x4612A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802381AC ;# ptr + .4byte 0x802381B0 ;# ptr + .4byte 0x802381FC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80238200 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateBossDemoStart.s b/asm/src/StateBossDemoStart.s index 820245b7..cf67463d 100644 --- a/asm/src/StateBossDemoStart.s +++ b/asm/src/StateBossDemoStart.s @@ -18,4 +18,7 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48B070, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A2C20 + .4byte 0x803A2C04 diff --git a/asm/src/StateBossDemoWait.s b/asm/src/StateBossDemoWait.s index 54bdd87f..4f2d162a 100644 --- a/asm/src/StateBossDemoWait.s +++ b/asm/src/StateBossDemoWait.s @@ -1120,33 +1120,61 @@ lbl_803A3C44: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$260245 $$260245: - .incbin "baserom.dol", 0x48B080, 0x40 + .4byte 0x803A33E8 + .4byte 0x803A3158 + .4byte 0x803A31BC + .4byte 0x803A31D8 + .4byte 0x803A31F4 + .4byte 0x803A3210 + .4byte 0x803A322C + .4byte 0x803A3248 + .4byte 0x803A326C + .4byte 0x803A3290 + .4byte 0x803A32B4 + .4byte 0x803A32D8 + .4byte 0x803A32FC + .4byte 0x803A3398 + .4byte 0x803A33B4 + .4byte 0x803A33D0 .global __vt__Q53scn4step4hero8bossdemo17StateBossDemoWait __vt__Q53scn4step4hero8bossdemo17StateBossDemoWait: - .incbin "baserom.dol", 0x48B0C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2F6C + .4byte 0x803A3054 + .4byte 0x803A343C + .4byte 0x8035550C + .4byte 0x803A38C4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260133 $$260133: - .incbin "baserom.dol", 0x49E370, 0x4 + .4byte 0 .global $$260134 $$260134: - .incbin "baserom.dol", 0x49E374, 0x4 + .4byte 0x3DCCCCCD .global $$260138 $$260138: - .incbin "baserom.dol", 0x49E378, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$260299 $$260299: - .incbin "baserom.dol", 0x49E380, 0x4 + .4byte 0x3FE00000 .global $$260300 $$260300: - .incbin "baserom.dol", 0x49E384, 0x4 + .4byte 0x3FA00000 .global $$260301 $$260301: - .incbin "baserom.dol", 0x49E388, 0x8 + .4byte 0x40300000 + .4byte 0 .global $$260305 $$260305: - .incbin "baserom.dol", 0x49E390, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$260333 $$260333: - .incbin "baserom.dol", 0x49E398, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateBound.s b/asm/src/StateBound.s index d2fbb9a7..8293ded8 100644 --- a/asm/src/StateBound.s +++ b/asm/src/StateBound.s @@ -685,37 +685,51 @@ lbl_803C7884: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect10StateBound __vt__Q53scn4step5enemy10stareffect10StateBound: - .incbin "baserom.dol", 0x479438, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E7FF8 ;# ptr + .4byte 0x802E80BC ;# ptr + .4byte 0x802E8154 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E81D4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateBound __vt__Q53scn4step4item5state10StateBound: - .incbin "baserom.dol", 0x48E678, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C7578 + .4byte 0x803C760C + .4byte 0x803C7648 + .4byte 0x803C76BC .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257606 $$257606: - .incbin "baserom.dol", 0x49CF10, 0x4 + .4byte 0 .global $$257664 $$257664: - .incbin "baserom.dol", 0x49CF14, 0x4 + .4byte 0x3F800000 .global $$257665 $$257665: - .incbin "baserom.dol", 0x49CF18, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256096 $$256096: - .incbin "baserom.dol", 0x49E5B8, 0x4 + .4byte 0 .global $$256097 $$256097: - .incbin "baserom.dol", 0x49E5BC, 0x4 + .4byte 0x3F400000 .global $$256098 $$256098: - .incbin "baserom.dol", 0x49E5C0, 0x4 + .4byte 0xBF800000 .global $$256099 $$256099: - .incbin "baserom.dol", 0x49E5C4, 0x4 + .4byte 0xBF400000 .global $$256100 $$256100: - .incbin "baserom.dol", 0x49E5C8, 0x8 + .4byte 0x3727C5AC + .4byte 0 diff --git a/asm/src/StateBound1.s b/asm/src/StateBound1.s index 2c356fca..77cb91ba 100644 --- a/asm/src/StateBound1.s +++ b/asm/src/StateBound1.s @@ -339,18 +339,31 @@ __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1: - .incbin "baserom.dol", 0x47AE58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F17C8 ;# ptr + .4byte 0x802F17A4 ;# ptr .global __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1 __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1: - .incbin "baserom.dol", 0x47AE68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F17C4 ;# ptr + .4byte 0x802F1780 ;# ptr .global __vt__Q53scn4step5enemy11whispyapple11StateBound1 __vt__Q53scn4step5enemy11whispyapple11StateBound1: - .incbin "baserom.dol", 0x47AE78, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F13E4 ;# ptr + .4byte 0x802F13E8 ;# ptr + .4byte 0x802F1494 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F15C8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256704 $$256704: - .incbin "baserom.dol", 0x49D0B0, 0x4 + .4byte 0 .global $$256716 $$256716: - .incbin "baserom.dol", 0x49D0B4, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateBound2.s b/asm/src/StateBound2.s index 560ba85b..40cae8cb 100644 --- a/asm/src/StateBound2.s +++ b/asm/src/StateBound2.s @@ -222,12 +222,19 @@ lbl_802F1AC4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateBound2 __vt__Q53scn4step5enemy11whispyapple11StateBound2: - .incbin "baserom.dol", 0x47AE98, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F18B8 ;# ptr + .4byte 0x802F18BC ;# ptr + .4byte 0x802F1968 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F19C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 $$256621: - .incbin "baserom.dol", 0x49D0B8, 0x4 + .4byte 0 .global $$256633 $$256633: - .incbin "baserom.dol", 0x49D0BC, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateBoundNear.s b/asm/src/StateBoundNear.s index fd5553bf..48262d46 100644 --- a/asm/src/StateBoundNear.s +++ b/asm/src/StateBoundNear.s @@ -289,12 +289,19 @@ lbl_802F1EC8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple14StateBoundNear __vt__Q53scn4step5enemy11whispyapple14StateBoundNear: - .incbin "baserom.dol", 0x47AEB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F1C40 ;# ptr + .4byte 0x802F1C44 ;# ptr + .4byte 0x802F1D58 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F1DB0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 $$256802: - .incbin "baserom.dol", 0x49D0C0, 0x4 + .4byte 0 .global $$256828 $$256828: - .incbin "baserom.dol", 0x49D0C4, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateCall.s b/asm/src/StateCall.s index f687324d..c6e49edb 100644 --- a/asm/src/StateCall.s +++ b/asm/src/StateCall.s @@ -534,9 +534,17 @@ lbl_8024DFD4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateCall __vt__Q53scn4step4boss6dubior9StateCall: - .incbin "baserom.dol", 0x463860, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024D89C ;# ptr + .4byte 0x8024D8A0 ;# ptr + .4byte 0x8024D95C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024D9B0 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256053 $$256053: - .incbin "baserom.dol", 0x49B290, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateCallback.s b/asm/src/StateCallback.s index 48cd33d0..5d46049d 100644 --- a/asm/src/StateCallback.s +++ b/asm/src/StateCallback.s @@ -374,24 +374,39 @@ __dt__Q43scn4step6weapon13StateCallbackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss13StateCallback __vt__Q43scn4step4boss13StateCallback: - .incbin "baserom.dol", 0x460948, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8022BF84 ;# ptr + .4byte 0x80234580 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13StateCallback __vt__Q43scn4step5enemy13StateCallback: - .incbin "baserom.dol", 0x46ED50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80286D4C ;# ptr + .4byte 0x8028DE5C ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero13StateCallback __vt__Q43scn4step4hero13StateCallback: - .incbin "baserom.dol", 0x481618, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8033C720 + .4byte 0x8035558C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item13StateCallback __vt__Q43scn4step4item13StateCallback: - .incbin "baserom.dol", 0x48E020, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C1C90 + .4byte 0x803C5278 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon13StateCallback __vt__Q43scn4step6weapon13StateCallback: - .incbin "baserom.dol", 0x48FEB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803D8A00 + .4byte 0x803D89D8 diff --git a/asm/src/StateCapture.s b/asm/src/StateCapture.s index 553bb08a..5bd6d371 100644 --- a/asm/src/StateCapture.s +++ b/asm/src/StateCapture.s @@ -332,15 +332,35 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: - .incbin "baserom.dol", 0x465B60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025A434 ;# ptr + .4byte 0x8025A414 ;# ptr .global __vt__Q53scn4step4boss13watergalboros12StateCapture __vt__Q53scn4step4boss13watergalboros12StateCapture: - .incbin "baserom.dol", 0x465B70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025A244 ;# ptr + .4byte 0x8025A248 ;# ptr + .4byte 0x8025A40C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025A410 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466638, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025CC0C ;# ptr + .4byte 0x8025CBF0 ;# ptr .global __vt__Q53scn4step4boss6whispy12StateCapture __vt__Q53scn4step4boss6whispy12StateCapture: - .incbin "baserom.dol", 0x466648, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025CB4C ;# ptr + .4byte 0x8025CB50 ;# ptr + .4byte 0x8025CBE8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025CBEC ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateCaptureAttack.s b/asm/src/StateCaptureAttack.s index e7dcff12..0eceb585 100644 --- a/asm/src/StateCaptureAttack.s +++ b/asm/src/StateCaptureAttack.s @@ -288,7 +288,17 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalbo .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465B90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025A810 ;# ptr + .4byte 0x8025A7F4 ;# ptr .global __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack: - .incbin "baserom.dol", 0x465BA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025A4A4 ;# ptr + .4byte 0x8025A51C ;# ptr + .4byte 0x8025A740 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80234500 ;# ptr + .4byte 0x8025A744 ;# ptr diff --git a/asm/src/StateCapturedFighter.s b/asm/src/StateCapturedFighter.s index 2b28cb5d..9491a5f8 100644 --- a/asm/src/StateCapturedFighter.s +++ b/asm/src/StateCapturedFighter.s @@ -301,23 +301,39 @@ __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: - .incbin "baserom.dol", 0x4714D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A4634 ;# ptr + .4byte 0x802A45EC ;# ptr .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1: - .incbin "baserom.dol", 0x4714E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A4630 ;# ptr + .4byte 0x802A4610 ;# ptr .global __vt__Q53scn4step5enemy8captured20StateCapturedFighter __vt__Q53scn4step5enemy8captured20StateCapturedFighter: - .incbin "baserom.dol", 0x4714F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A42FC ;# ptr + .4byte 0x802A4370 ;# ptr + .4byte 0x802A4578 ;# ptr + .4byte 0x802A457C ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255917 $$255917: - .incbin "baserom.dol", 0x495C50, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 $$256237: - .incbin "baserom.dol", 0x49C010, 0x8 + .4byte 0x40A00000 + .4byte 0 .global $$256240 $$256240: - .incbin "baserom.dol", 0x49C018, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateCapturedParasol.s b/asm/src/StateCapturedParasol.s index 677fac5c..58508167 100644 --- a/asm/src/StateCapturedParasol.s +++ b/asm/src/StateCapturedParasol.s @@ -386,30 +386,41 @@ __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1 __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1: - .incbin "baserom.dol", 0x471518, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A4BB0 ;# ptr + .4byte 0x802A4B88 ;# ptr .global __vt__Q53scn4step5enemy8captured20StateCapturedParasol __vt__Q53scn4step5enemy8captured20StateCapturedParasol: - .incbin "baserom.dol", 0x471528, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A4730 ;# ptr + .4byte 0x802A47B8 ;# ptr + .4byte 0x802A4AE0 ;# ptr + .4byte 0x802A4AE4 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256967 $$256967: - .incbin "baserom.dol", 0x49C020, 0x4 + .4byte 0 .global $$257011 $$257011: - .incbin "baserom.dol", 0x49C024, 0x4 + .4byte 0x3E800000 .global $$257012 $$257012: - .incbin "baserom.dol", 0x49C028, 0x4 + .4byte 0x3E051EB8 .global $$257013 $$257013: - .incbin "baserom.dol", 0x49C02C, 0x4 + .4byte 0x3E4CCCCD .global $$257014 $$257014: - .incbin "baserom.dol", 0x49C030, 0x4 + .4byte 0xBE051EB8 .global $$257015 $$257015: - .incbin "baserom.dol", 0x49C034, 0x4 + .4byte 0x41A00000 .global $$257016 $$257016: - .incbin "baserom.dol", 0x49C038, 0x8 + .4byte 0x43B40000 + .4byte 0 diff --git a/asm/src/StateCapturedWaterGalborosEat.s b/asm/src/StateCapturedWaterGalborosEat.s index ee3f09f3..77061158 100644 --- a/asm/src/StateCapturedWaterGalborosEat.s +++ b/asm/src/StateCapturedWaterGalborosEat.s @@ -213,12 +213,21 @@ procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat: - .incbin "baserom.dol", 0x488DD0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80383F7C + .4byte 0x80384044 + .4byte 0x80384048 + .4byte 0x8035550C + .4byte 0x80384124 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257761 $$257761: - .incbin "baserom.dol", 0x49E038, 0x4 + .4byte 0x3DCCCCCD .global $$257762 $$257762: - .incbin "baserom.dol", 0x49E03C, 0x4 + .4byte 0x3F666666 diff --git a/asm/src/StateCapturedWaterGalborosVomit.s b/asm/src/StateCapturedWaterGalborosVomit.s index 42b2038a..f96c2950 100644 --- a/asm/src/StateCapturedWaterGalborosVomit.s +++ b/asm/src/StateCapturedWaterGalborosVomit.s @@ -315,12 +315,21 @@ lbl_803845A0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit: - .incbin "baserom.dol", 0x488DF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803842C0 + .4byte 0x803843A0 + .4byte 0x80384414 + .4byte 0x8035550C + .4byte 0x8038446C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257995 $$257995: - .incbin "baserom.dol", 0x49E040, 0x4 + .4byte 0 .global $$258014 $$258014: - .incbin "baserom.dol", 0x49E044, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateCapturedWhip.s b/asm/src/StateCapturedWhip.s index f8b54cda..1d95e79e 100644 --- a/asm/src/StateCapturedWhip.s +++ b/asm/src/StateCapturedWhip.s @@ -337,27 +337,37 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471548, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A5064 ;# ptr + .4byte 0x802A5048 ;# ptr .global __vt__Q53scn4step5enemy8captured17StateCapturedWhip __vt__Q53scn4step5enemy8captured17StateCapturedWhip: - .incbin "baserom.dol", 0x471558, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A4C9C ;# ptr + .4byte 0x802A4D10 ;# ptr + .4byte 0x802A501C ;# ptr + .4byte 0x802A5020 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256311 $$256311: - .incbin "baserom.dol", 0x49C040, 0x4 + .4byte 0 .global $$256312 $$256312: - .incbin "baserom.dol", 0x49C044, 0x4 + .4byte 0x3F800000 .global $$256313 $$256313: - .incbin "baserom.dol", 0x49C048, 0x4 + .4byte 0xBF800000 .global $$256351 $$256351: - .incbin "baserom.dol", 0x49C04C, 0x4 + .4byte 0x3727C5AC .global $$256352 $$256352: - .incbin "baserom.dol", 0x49C050, 0x4 + .4byte 0x3D4CCCCD .global $$256353 $$256353: - .incbin "baserom.dol", 0x49C054, 0x4 + .4byte 0x3E800000 diff --git a/asm/src/StateCapturedWhispyChewing.s b/asm/src/StateCapturedWhispyChewing.s index 812c4419..ddc468f5 100644 --- a/asm/src/StateCapturedWhispyChewing.s +++ b/asm/src/StateCapturedWhispyChewing.s @@ -114,4 +114,13 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing: - .incbin "baserom.dol", 0x488E20, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80384684 + .4byte 0x80384724 + .4byte 0x80384728 + .4byte 0x8035550C + .4byte 0x8038472C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateCapturedWhispyRelease.s b/asm/src/StateCapturedWhispyRelease.s index 7d3f0b09..30982eba 100644 --- a/asm/src/StateCapturedWhispyRelease.s +++ b/asm/src/StateCapturedWhispyRelease.s @@ -179,4 +179,13 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease: - .incbin "baserom.dol", 0x488E48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80384800 + .4byte 0x8038487C + .4byte 0x8038494C + .4byte 0x8035550C + .4byte 0x803849A0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateCapturedWhispyVacuum.s b/asm/src/StateCapturedWhispyVacuum.s index cccb2383..84747dc8 100644 --- a/asm/src/StateCapturedWhispyVacuum.s +++ b/asm/src/StateCapturedWhispyVacuum.s @@ -265,18 +265,31 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488E70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80384D50 + .4byte 0x80384D34 .global __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum: - .incbin "baserom.dol", 0x488E80, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80384B3C + .4byte 0x80384BB8 + .4byte 0x80384C70 + .4byte 0x8035550C + .4byte 0x80384D30 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257457 $$257457: - .incbin "baserom.dol", 0x49E048, 0x4 + .4byte 0 .global $$257458 $$257458: - .incbin "baserom.dol", 0x49E04C, 0x4 + .4byte 0x3F000000 .global $$257459 $$257459: - .incbin "baserom.dol", 0x49E050, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateCapturedWhispyVomit.s b/asm/src/StateCapturedWhispyVomit.s index 73194d18..2f0b8e22 100644 --- a/asm/src/StateCapturedWhispyVomit.s +++ b/asm/src/StateCapturedWhispyVomit.s @@ -249,7 +249,19 @@ __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488EA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803850C0 + .4byte 0x803850A4 .global __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit: - .incbin "baserom.dol", 0x488EB8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80384E20 + .4byte 0x80384E9C + .4byte 0x80384F00 + .4byte 0x8035550C + .4byte 0x80384F54 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateCapturedWhispyVomitBound.s b/asm/src/StateCapturedWhispyVomitBound.s index c90ed8a1..b01febbc 100644 --- a/asm/src/StateCapturedWhispyVomitBound.s +++ b/asm/src/StateCapturedWhispyVomitBound.s @@ -377,21 +377,31 @@ lbl_80385614: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound: - .incbin "baserom.dol", 0x488EE0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80385208 + .4byte 0x803852C8 + .4byte 0x80385434 + .4byte 0x8035550C + .4byte 0x8038548C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258072 $$258072: - .incbin "baserom.dol", 0x49E058, 0x4 + .4byte 0 .global $$258117 $$258117: - .incbin "baserom.dol", 0x49E05C, 0x4 + .4byte 0x43B40000 .global $$258118 $$258118: - .incbin "baserom.dol", 0x49E060, 0x4 + .4byte 0x3727C5AC .global $$258119 $$258119: - .incbin "baserom.dol", 0x49E064, 0x4 + .4byte 0x42652EE1 .global $$258120 $$258120: - .incbin "baserom.dol", 0x49E068, 0x8 + .4byte 0x42480000 + .4byte 0 diff --git a/asm/src/StateCapturedWhispyVomitSoft.s b/asm/src/StateCapturedWhispyVomitSoft.s index 5c4cf431..b21b2225 100644 --- a/asm/src/StateCapturedWhispyVomitSoft.s +++ b/asm/src/StateCapturedWhispyVomitSoft.s @@ -307,15 +307,25 @@ lbl_80385A8C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft: - .incbin "baserom.dol", 0x488F08, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80385720 + .4byte 0x803857F4 + .4byte 0x803858E0 + .4byte 0x8035550C + .4byte 0x80385938 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257620 $$257620: - .incbin "baserom.dol", 0x49E070, 0x4 + .4byte 0 .global $$257648 $$257648: - .incbin "baserom.dol", 0x49E074, 0x4 + .4byte 0x43B40000 .global $$257649 $$257649: - .incbin "baserom.dol", 0x49E078, 0x8 + .4byte 0x42480000 + .4byte 0 diff --git a/asm/src/StateCatch.s b/asm/src/StateCatch.s index 91166bab..c7e5fb88 100644 --- a/asm/src/StateCatch.s +++ b/asm/src/StateCatch.s @@ -783,40 +783,73 @@ __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9zankibble10StateCatch __vt__Q53scn4step4boss9zankibble10StateCatch: - .incbin "baserom.dol", 0x4670C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802616B8 ;# ptr + .4byte 0x80261738 ;# ptr + .4byte 0x80261854 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80261858 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble10StateCatch __vt__Q53scn4step5enemy9sirkibble10StateCatch: - .incbin "baserom.dol", 0x478690, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E19B0 ;# ptr + .4byte 0x802E19B4 ;# ptr + .4byte 0x802E1A4C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E1A50 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1 __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1: - .incbin "baserom.dol", 0x48A3A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039BF04 + .4byte 0x8039BEA0 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x48A3B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039BF00 + .4byte 0x8039BEC4 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A3C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039BEFC + .4byte 0x8039BEE0 .global __vt__Q53scn4step4hero7fighter10StateCatch __vt__Q53scn4step4hero7fighter10StateCatch: - .incbin "baserom.dol", 0x48A3D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039B920 + .4byte 0x8039B9BC + .4byte 0x8039BC0C + .4byte 0x8039BC10 + .4byte 0x8039BD68 + .4byte 0x8039BE9C + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258320 $$258320: - .incbin "baserom.dol", 0x49E2C0, 0x4 + .4byte 0 .global $$258376 $$258376: - .incbin "baserom.dol", 0x49E2C4, 0x4 + .4byte 0x3F000000 .global $$258377 $$258377: - .incbin "baserom.dol", 0x49E2C8, 0x4 + .4byte 0x3ECCCCCD .global $$258442 $$258442: - .incbin "baserom.dol", 0x49E2CC, 0x4 + .4byte 0x3F666666 .global $$258443 $$258443: - .incbin "baserom.dol", 0x49E2D0, 0x8 + .asciz "?333" + .balign 4 diff --git a/asm/src/StateChallengeBattleLose.s b/asm/src/StateChallengeBattleLose.s index b6e89884..406148e7 100644 --- a/asm/src/StateChallengeBattleLose.s +++ b/asm/src/StateChallengeBattleLose.s @@ -1073,33 +1073,43 @@ lbl_80379E84: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose: - .incbin "baserom.dol", 0x488958, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80378FFC + .4byte 0x803790EC + .4byte 0x80379808 + .4byte 0x8035550C + .4byte 0x8037999C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262138 $$262138: - .incbin "baserom.dol", 0x49DEE8, 0x4 + .4byte 0 .global $$260537 $$260537: - .incbin "baserom.dol", 0x49DEEC, 0x4 + .4byte 0x000000FF .global $$260547 $$260547: - .incbin "baserom.dol", 0x49DEF0, 0x4 + .4byte 0x000000FF .global $$262256 $$262256: - .incbin "baserom.dol", 0x49DEF4, 0x4 + .4byte 0x3F800000 .global $$262257 $$262257: - .incbin "baserom.dol", 0x49DEF8, 0x4 + .4byte 0x3F000000 .global $$262258 $$262258: - .incbin "baserom.dol", 0x49DEFC, 0x4 + .4byte 0x43340000 .global $$262261 $$262261: - .incbin "baserom.dol", 0x49DF00, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$262300 $$262300: - .incbin "baserom.dol", 0x49DF08, 0x4 + .4byte 0x42B40000 .global $$262340 $$262340: - .incbin "baserom.dol", 0x49DF0C, 0x4 + .4byte 0xC1400000 diff --git a/asm/src/StateChallengeBattleWin.s b/asm/src/StateChallengeBattleWin.s index 7ca35e23..a11a148e 100644 --- a/asm/src/StateChallengeBattleWin.s +++ b/asm/src/StateChallengeBattleWin.s @@ -617,9 +617,19 @@ sceneChange__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin: - .incbin "baserom.dol", 0x488980, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037A018 + .4byte 0x8037A0D4 + .4byte 0x8037A1C4 + .4byte 0x8035550C + .4byte 0x8037A1C8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259503 $$259503: - .incbin "baserom.dol", 0x497718, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateChallengeBattleWinPre.s b/asm/src/StateChallengeBattleWinPre.s index 418ad8eb..55e01fbc 100644 --- a/asm/src/StateChallengeBattleWinPre.s +++ b/asm/src/StateChallengeBattleWinPre.s @@ -935,38 +935,55 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x4889A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037B4C4 + .4byte 0x8037B480 .global __vt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1 __vt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1: - .incbin "baserom.dol", 0x4889B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037B4C0 + .4byte 0x8037B4A0 .global __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre: - .incbin "baserom.dol", 0x4889C8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037AD88 + .4byte 0x8037AE40 + .4byte 0x8037B004 + .4byte 0x8035550C + .4byte 0x8037B104 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248855 $$248855: - .incbin "baserom.dol", 0x497720, 0x4 + .4byte 0 .global $$248856 $$248856: - .incbin "baserom.dol", 0x497724, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260505 $$260505: - .incbin "baserom.dol", 0x49DF10, 0x4 + .4byte 0 .global $$260506 $$260506: - .incbin "baserom.dol", 0x49DF14, 0x4 + .4byte 0x3DCCCCCD .global $$260507 $$260507: - .incbin "baserom.dol", 0x49DF18, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$260511 $$260511: - .incbin "baserom.dol", 0x49DF20, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$260561 $$260561: - .incbin "baserom.dol", 0x49DF28, 0x4 + .4byte 0x3727C5AC .global $$260595 $$260595: - .incbin "baserom.dol", 0x49DF2C, 0x4 + .4byte 0x3D4CCCCD diff --git a/asm/src/StateChallengeConfirm.s b/asm/src/StateChallengeConfirm.s index 3a5b459a..2a8c2932 100644 --- a/asm/src/StateChallengeConfirm.s +++ b/asm/src/StateChallengeConfirm.s @@ -325,7 +325,19 @@ __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1 __vt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1: - .incbin "baserom.dol", 0x4889F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037B938 + .4byte 0x8037B914 .global __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm: - .incbin "baserom.dol", 0x488A00, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037B5FC + .4byte 0x8037B6A8 + .4byte 0x8037B858 + .4byte 0x8035550C + .4byte 0x8037B85C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateChallengeIn.s b/asm/src/StateChallengeIn.s index 176b0bf7..d252eaa4 100644 --- a/asm/src/StateChallengeIn.s +++ b/asm/src/StateChallengeIn.s @@ -595,12 +595,21 @@ lbl_8037C1C0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick16StateChallengeIn __vt__Q53scn4step4hero7gimmick16StateChallengeIn: - .incbin "baserom.dol", 0x488A28, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037BB84 + .4byte 0x8037BCB4 + .4byte 0x8037BE18 + .4byte 0x8035550C + .4byte 0x8037BEE4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260558 $$260558: - .incbin "baserom.dol", 0x49DF30, 0x4 + .4byte 0 .global $$260569 $$260569: - .incbin "baserom.dol", 0x49DF34, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateChange.s b/asm/src/StateChange.s index c9c4d8d2..77731d76 100644 --- a/asm/src/StateChange.s +++ b/asm/src/StateChange.s @@ -463,21 +463,43 @@ __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489A88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803900D0 + .4byte 0x80390044 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489A98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803900CC + .4byte 0x80390064 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489AA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803900C8 + .4byte 0x80390084 .global __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489AB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803900C4 + .4byte 0x803900A4 .global __vt__Q53scn4step4hero5stone11StateChange __vt__Q53scn4step4hero5stone11StateChange: - .incbin "baserom.dol", 0x489AC8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038FC84 + .4byte 0x8038FD1C + .4byte 0x8038FF10 + .4byte 0x8035550C + .4byte 0x8038FFD8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258219 $$258219: - .incbin "baserom.dol", 0x49E108, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateChangeGrade.s b/asm/src/StateChangeGrade.s index a4050f41..33f1fe95 100644 --- a/asm/src/StateChangeGrade.s +++ b/asm/src/StateChangeGrade.s @@ -125,4 +125,13 @@ procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick16StateChangeGrade __vt__Q53scn4step4hero7gimmick16StateChangeGrade: - .incbin "baserom.dol", 0x488A50, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037C2D4 + .4byte 0x8037C364 + .4byte 0x8037C368 + .4byte 0x8035550C + .4byte 0x8037C36C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateChanger.s b/asm/src/StateChanger.s index 58d0819e..62980458 100644 --- a/asm/src/StateChanger.s +++ b/asm/src/StateChanger.s @@ -179,4 +179,7 @@ onSetNextStateFactory__Q24util16StateChangerBaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util16StateChangerBase __vt__Q24util16StateChangerBase: - .incbin "baserom.dol", 0x4927F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80405D08 + .4byte 0 diff --git a/asm/src/StateCharge.s b/asm/src/StateCharge.s index b8f22410..6d4deeb4 100644 --- a/asm/src/StateCharge.s +++ b/asm/src/StateCharge.s @@ -558,27 +558,55 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A400, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C660 + .4byte 0x8039C5C0 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A410, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C65C + .4byte 0x8039C5DC .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A420, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C658 + .4byte 0x8039C5F8 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A430, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C654 + .4byte 0x8039C614 .global __vt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1 __vt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1: - .incbin "baserom.dol", 0x48A440, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C650 + .4byte 0x8039C5A0 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A450, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039C64C + .4byte 0x8039C630 .global __vt__Q53scn4step4hero7fighter11StateCharge __vt__Q53scn4step4hero7fighter11StateCharge: - .incbin "baserom.dol", 0x48A460, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039C054 + .4byte 0x8039C0F4 + .4byte 0x8039C278 + .4byte 0x8035550C + .4byte 0x8039C2B4 + .4byte 0x8039C2B8 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258418 $$258418: - .incbin "baserom.dol", 0x49E2D8, 0x8 + .4byte 0x40800000 + .4byte 0 diff --git a/asm/src/StateChargeAttack.s b/asm/src/StateChargeAttack.s index bad9c8ed..0a922da0 100644 --- a/asm/src/StateChargeAttack.s +++ b/asm/src/StateChargeAttack.s @@ -332,12 +332,19 @@ lbl_80253D54: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack: - .incbin "baserom.dol", 0x464838, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802539CC ;# ptr + .4byte 0x802539D0 ;# ptr + .4byte 0x80253A8C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80253AE0 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256691 $$256691: - .incbin "baserom.dol", 0x49B3B0, 0x4 + .4byte 0x3727C5AC .global $$256692 $$256692: - .incbin "baserom.dol", 0x49B3B4, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/src/StateChargeAttackStart.s b/asm/src/StateChargeAttackStart.s index e4a47497..bd2d6c44 100644 --- a/asm/src/StateChargeAttackStart.s +++ b/asm/src/StateChargeAttackStart.s @@ -54,4 +54,11 @@ procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart: - .incbin "baserom.dol", 0x464858, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80253E8C ;# ptr + .4byte 0x80253E90 ;# ptr + .4byte 0x80253E94 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80253E98 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateChase.s b/asm/src/StateChase.s index 354a4dec..a5851079 100644 --- a/asm/src/StateChase.s +++ b/asm/src/StateChase.s @@ -3212,210 +3212,273 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper10StateChase __vt__Q53scn4step5enemy7blipper10StateChase: - .incbin "baserom.dol", 0x46FF40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029A11C ;# ptr + .4byte 0x80299690 ;# ptr + .4byte 0x80299754 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80299D08 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10StateChase __vt__Q53scn4step5enemy6degout10StateChase: - .incbin "baserom.dol", 0x472160, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ADA54 ;# ptr + .4byte 0x802AD6C0 ;# ptr + .4byte 0x802AD784 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472858, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B0290 ;# ptr + .4byte 0x802B0270 ;# ptr .global __vt__Q53scn4step5enemy4elec10StateChase __vt__Q53scn4step5enemy4elec10StateChase: - .incbin "baserom.dol", 0x472868, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B028C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802AFF5C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateChase __vt__Q53scn4step5enemy6flamer10StateChase: - .incbin "baserom.dol", 0x472D90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B3478 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B3014 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B3248 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10StateChase __vt__Q53scn4step5enemy7mumbies10StateChase: - .incbin "baserom.dol", 0x475380, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C5270 ;# ptr + .4byte 0x802C5274 ;# ptr + .4byte 0x802C545C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C57B0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy10StateChase __vt__Q53scn4step5enemy6scarfy10StateChase: - .incbin "baserom.dol", 0x477718, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DA748 ;# ptr + .4byte 0x802DA74C ;# ptr + .4byte 0x802DA770 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477DF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DDED4 ;# ptr + .4byte 0x802DDE98 ;# ptr .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477E00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DDED0 ;# ptr + .4byte 0x802DDEB4 ;# ptr .global __vt__Q53scn4step5enemy5sheld10StateChase __vt__Q53scn4step5enemy5sheld10StateChase: - .incbin "baserom.dol", 0x477E10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DDBC8 ;# ptr + .4byte 0x802DDBCC ;# ptr + .4byte 0x802DDBD0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DDC40 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257807 $$257807: - .incbin "baserom.dol", 0x49BD80, 0x4 + .4byte 0 .global $$257808 $$257808: - .incbin "baserom.dol", 0x49BD84, 0x4 + .4byte 0x41A00000 .global $$257924 $$257924: - .incbin "baserom.dol", 0x49BD88, 0x4 + .4byte 0x3FC00000 .global $$257925 $$257925: - .incbin "baserom.dol", 0x49BD8C, 0x4 + .4byte 0x3F800000 .global $$257926 $$257926: - .incbin "baserom.dol", 0x49BD90, 0x4 + .4byte 0xBF800000 .global $$257927 $$257927: - .incbin "baserom.dol", 0x49BD94, 0x4 + .4byte 0x42652EE1 .global $$257928 $$257928: - .incbin "baserom.dol", 0x49BD98, 0x4 + .4byte 0x40000000 .global $$257929 $$257929: - .incbin "baserom.dol", 0x49BD9C, 0x4 + .4byte 0x43B40000 .global $$257930 $$257930: - .incbin "baserom.dol", 0x49BDA0, 0x4 + .4byte 0x43340000 .global $$257931 $$257931: - .incbin "baserom.dol", 0x49BDA4, 0x4 + .4byte 0xC3340000 .global $$257932 $$257932: - .incbin "baserom.dol", 0x49BDA8, 0x4 + .4byte 0x42B40000 .global $$257933 $$257933: - .incbin "baserom.dol", 0x49BDAC, 0x4 + .4byte 0x3DCCCCCD .global $$257934 $$257934: - .incbin "baserom.dol", 0x49BDB0, 0x4 + .4byte 0xBDCCCCCD .global $$257935 $$257935: - .incbin "baserom.dol", 0x49BDB4, 0x4 + .4byte 0xC2B40000 .global $$257936 $$257936: - .incbin "baserom.dol", 0x49BDB8, 0x4 + .4byte 0x41700000 .global $$257937 $$257937: - .incbin "baserom.dol", 0x49BDBC, 0x4 + .4byte 0xBF000000 .global $$257938 $$257938: - .incbin "baserom.dol", 0x49BDC0, 0x4 + .4byte 0x3F99999A .global $$257939 $$257939: - .incbin "baserom.dol", 0x49BDC4, 0x4 + .4byte 0x3F000000 .global $$257987 $$257987: - .incbin "baserom.dol", 0x49BDC8, 0x4 + .4byte 0x3A83126F .global $$257988 $$257988: - .incbin "baserom.dol", 0x49BDCC, 0x4 + .4byte 0x3E4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256387 $$256387: - .incbin "baserom.dol", 0x49C2D8, 0x4 + .4byte 0 .global $$256388 $$256388: - .incbin "baserom.dol", 0x49C2DC, 0x4 + .4byte 0x3727C5AC .global $$256464 $$256464: - .incbin "baserom.dol", 0x49C2E0, 0x8 + .asciz "?333" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255103 $$255103: - .incbin "baserom.dol", 0x49C368, 0x4 + .4byte 0x3F000000 .global $$255153 $$255153: - .incbin "baserom.dol", 0x49C36C, 0x4 + .4byte 0 .global $$255154 $$255154: - .incbin "baserom.dol", 0x49C370, 0x8 + .4byte 0x3727C5AC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255211 $$255211: - .incbin "baserom.dol", 0x49C438, 0x4 + .4byte 0 .global $$255239 $$255239: - .incbin "baserom.dol", 0x49C43C, 0x4 + .4byte 0x3727C5AC .global $$255240 $$255240: - .incbin "baserom.dol", 0x49C440, 0x4 + .4byte 0x42F00000 .global $$255241 $$255241: - .incbin "baserom.dol", 0x49C444, 0x4 + .4byte 0x3F800000 .global $$255242 $$255242: - .incbin "baserom.dol", 0x49C448, 0x4 + .4byte 0x42700000 .global $$255243 $$255243: - .incbin "baserom.dol", 0x49C44C, 0x4 + .4byte 0x3DA3D70A .global $$255291 $$255291: - .incbin "baserom.dol", 0x49C450, 0x4 + .4byte 0x3F000000 .global $$255299 $$255299: - .incbin "baserom.dol", 0x49C454, 0x4 + .4byte 0x4222F983 .global $$255300 $$255300: - .incbin "baserom.dol", 0x49C458, 0x4 + .4byte 0x3C8EFA35 .global $$255301 $$255301: - .incbin "baserom.dol", 0x49C45C, 0x4 + .4byte 0x43B40000 .global $$255305 $$255305: - .incbin "baserom.dol", 0x49C460, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256235 $$256235: - .incbin "baserom.dol", 0x49C828, 0x4 + .4byte 0 .global $$256326 $$256326: - .incbin "baserom.dol", 0x49C82C, 0x4 + .4byte 0x3A83126F .global $$256327 $$256327: - .incbin "baserom.dol", 0x49C830, 0x4 + .4byte 0x40000000 .global $$256328 $$256328: - .incbin "baserom.dol", 0x49C834, 0x4 + .4byte 0x3F000000 .global $$256331 $$256331: - .incbin "baserom.dol", 0x49C838, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255168 $$255168: - .incbin "baserom.dol", 0x49CC60, 0x4 + .4byte 0 .global $$255230 $$255230: - .incbin "baserom.dol", 0x49CC64, 0x4 + .4byte 0x3727C5AC .global $$255231 $$255231: - .incbin "baserom.dol", 0x49CC68, 0x4 + .4byte 0x3F000000 .global $$255232 $$255232: - .incbin "baserom.dol", 0x49CC6C, 0x4 + .4byte 0xBF800000 .global $$255233 $$255233: - .incbin "baserom.dol", 0x49CC70, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256351 $$256351: - .incbin "baserom.dol", 0x49CCF0, 0x4 + .4byte 0 .global $$256352 $$256352: - .incbin "baserom.dol", 0x49CCF4, 0x4 + .4byte 0x3F000000 .global $$256394 $$256394: - .incbin "baserom.dol", 0x49CCF8, 0x4 + .4byte 0x3A83126F .global $$256419 $$256419: - .incbin "baserom.dol", 0x49CCFC, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/StateChecker.s b/asm/src/StateChecker.s index 058d1da9..9b2a0968 100644 --- a/asm/src/StateChecker.s +++ b/asm/src/StateChecker.s @@ -168,4 +168,5 @@ setForbidWarpStar__Q43scn4step4hero12StateCheckerFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251026 $$251026: - .incbin "baserom.dol", 0x49D9D8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateChewing.s b/asm/src/StateChewing.s index 5c9f494d..fd54e14a 100644 --- a/asm/src/StateChewing.s +++ b/asm/src/StateChewing.s @@ -191,7 +191,17 @@ __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: - .incbin "baserom.dol", 0x466668, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025CE6C ;# ptr + .4byte 0x8025CE4C ;# ptr .global __vt__Q53scn4step4boss6whispy12StateChewing __vt__Q53scn4step4boss6whispy12StateChewing: - .incbin "baserom.dol", 0x466678, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025CC80 ;# ptr + .4byte 0x8025CC84 ;# ptr + .4byte 0x8025CE44 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025CE48 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateCircle.s b/asm/src/StateCircle.s index 4b6928da..90ce07e2 100644 --- a/asm/src/StateCircle.s +++ b/asm/src/StateCircle.s @@ -384,15 +384,23 @@ lbl_802F309C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter11StateCircle __vt__Q53scn4step5enemy15zankibblecutter11StateCircle: - .incbin "baserom.dol", 0x47AFF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F2CDC ;# ptr + .4byte 0x802F2CE0 ;# ptr + .4byte 0x802F2CE4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F2E0C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257063 $$257063: - .incbin "baserom.dol", 0x49D0E8, 0x4 + .4byte 0xBF800000 .global $$257064 $$257064: - .incbin "baserom.dol", 0x49D0EC, 0x4 + .4byte 0x3F800000 .global $$257094 $$257094: - .incbin "baserom.dol", 0x49D0F0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateClearDance.s b/asm/src/StateClearDance.s index 6767f123..f9c7f419 100644 --- a/asm/src/StateClearDance.s +++ b/asm/src/StateClearDance.s @@ -205,9 +205,19 @@ procFixPos__Q53scn4step4hero6common15StateClearDanceFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateClearDance __vt__Q53scn4step4hero6common15StateClearDance: - .incbin "baserom.dol", 0x487AD8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035F464 + .4byte 0x8035F468 + .4byte 0x8035F59C + .4byte 0x8035550C + .4byte 0x8035F5A0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259892 $$259892: - .incbin "baserom.dol", 0x49DB30, 0x8 + .4byte 0x3F400000 + .4byte 0 diff --git a/asm/src/StateClearDanceFall.s b/asm/src/StateClearDanceFall.s index cc000122..ab3da677 100644 --- a/asm/src/StateClearDanceFall.s +++ b/asm/src/StateClearDanceFall.s @@ -254,7 +254,19 @@ __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x487B00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035F924 + .4byte 0x8035F904 .global __vt__Q53scn4step4hero6common19StateClearDanceFall __vt__Q53scn4step4hero6common19StateClearDanceFall: - .incbin "baserom.dol", 0x487B10, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035F6D4 + .4byte 0x8035F770 + .4byte 0x8035F7A8 + .4byte 0x8035550C + .4byte 0x8035F7CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateClearDancePre.s b/asm/src/StateClearDancePre.s index cc4f292c..5e9b060c 100644 --- a/asm/src/StateClearDancePre.s +++ b/asm/src/StateClearDancePre.s @@ -191,7 +191,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487B38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035FBA8 + .4byte 0x8035FB8C .global __vt__Q53scn4step4hero6common18StateClearDancePre __vt__Q53scn4step4hero6common18StateClearDancePre: - .incbin "baserom.dol", 0x487B48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035FA84 + .4byte 0x8035FA88 + .4byte 0x8035FB84 + .4byte 0x8035550C + .4byte 0x8035FB88 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateClearDanceWalk.s b/asm/src/StateClearDanceWalk.s index c21167e5..0b9ea562 100644 --- a/asm/src/StateClearDanceWalk.s +++ b/asm/src/StateClearDanceWalk.s @@ -285,21 +285,33 @@ __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x487B70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035FFAC + .4byte 0x8035FF8C .global __vt__Q53scn4step4hero6common19StateClearDanceWalk __vt__Q53scn4step4hero6common19StateClearDanceWalk: - .incbin "baserom.dol", 0x487B80, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8035FD3C + .4byte 0x8035FD40 + .4byte 0x8035FD78 + .4byte 0x8035550C + .4byte 0x8035FE6C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258516 $$258516: - .incbin "baserom.dol", 0x49DB38, 0x4 + .4byte 0x3F666666 .global $$258517 $$258517: - .incbin "baserom.dol", 0x49DB3C, 0x4 + .4byte 0x3DCCCCCD .global $$258536 $$258536: - .incbin "baserom.dol", 0x49DB40, 0x4 + .4byte 0 .global $$258537 $$258537: - .incbin "baserom.dol", 0x49DB44, 0x4 + .4byte 0x3E4CCCCD diff --git a/asm/src/StateCliffAttack.s b/asm/src/StateCliffAttack.s index 67bfe9a5..22fb11d4 100644 --- a/asm/src/StateCliffAttack.s +++ b/asm/src/StateCliffAttack.s @@ -117,12 +117,23 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476EE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D3F54 ;# ptr + .4byte 0x802D3F38 ;# ptr .global __vt__Q53scn4step5enemy5rocky16StateCliffAttack __vt__Q53scn4step5enemy5rocky16StateCliffAttack: - .incbin "baserom.dol", 0x476EF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D3E74 ;# ptr + .4byte 0x802D3E78 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D3F34 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255825 $$255825: - .incbin "baserom.dol", 0x49CB30, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateCliffJump.s b/asm/src/StateCliffJump.s index 635083c0..f65e62e6 100644 --- a/asm/src/StateCliffJump.s +++ b/asm/src/StateCliffJump.s @@ -220,4 +220,11 @@ procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky14StateCliffJump __vt__Q53scn4step5enemy5rocky14StateCliffJump: - .incbin "baserom.dol", 0x476F18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D4050 ;# ptr + .4byte 0x802D4054 ;# ptr + .4byte 0x802D41D0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D4250 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateCombinationAttack.s b/asm/src/StateCombinationAttack.s index ce24d30b..ea05e407 100644 --- a/asm/src/StateCombinationAttack.s +++ b/asm/src/StateCombinationAttack.s @@ -1043,27 +1043,41 @@ __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interferen .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x488538, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80370E38 + .4byte 0x80370E18 .global __vt__Q53scn4step4hero12interference22StateCombinationAttack __vt__Q53scn4step4hero12interference22StateCombinationAttack: - .incbin "baserom.dol", 0x488548, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803700C8 + .4byte 0x80370144 + .4byte 0x803701B4 + .4byte 0x8035550C + .4byte 0x803701B8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258437 $$258437: - .incbin "baserom.dol", 0x49DCF0, 0x4 + .4byte 0x3F800000 .global $$258438 $$258438: - .incbin "baserom.dol", 0x49DCF4, 0x4 + .4byte 0 .global $$258458 $$258458: - .incbin "baserom.dol", 0x49DCF8, 0x4 + .4byte 0xBF800000 .global $$258529 $$258529: - .incbin "baserom.dol", 0x49DCFC, 0x4 + .4byte 0x3F490FDB .global $$258532 $$258532: - .incbin "baserom.dol", 0x49DD00, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$258548 $$258548: - .incbin "baserom.dol", 0x49DD08, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/StateCopy.s b/asm/src/StateCopy.s index 0fefa8c6..688d20ab 100644 --- a/asm/src/StateCopy.s +++ b/asm/src/StateCopy.s @@ -610,9 +610,19 @@ procFixPos__Q53scn4step4hero6common9StateCopyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateCopy __vt__Q53scn4step4hero6common9StateCopy: - .incbin "baserom.dol", 0x487BA8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80360498 + .4byte 0x80360778 + .4byte 0x8036087C + .4byte 0x8035550C + .4byte 0x80360880 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259744 $$259744: - .incbin "baserom.dol", 0x49DB48, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateCopyPre.s b/asm/src/StateCopyPre.s index b3cf71f4..132ab8e0 100644 --- a/asm/src/StateCopyPre.s +++ b/asm/src/StateCopyPre.s @@ -287,7 +287,19 @@ __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: - .incbin "baserom.dol", 0x487BD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80360C9C + .4byte 0x80360C7C .global __vt__Q53scn4step4hero6common12StateCopyPre __vt__Q53scn4step4hero6common12StateCopyPre: - .incbin "baserom.dol", 0x487BE0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036097C + .4byte 0x80360A8C + .4byte 0x80355508 + .4byte 0x8035550C + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateCreditMove.s b/asm/src/StateCreditMove.s index a7d9e078..33d2faf6 100644 --- a/asm/src/StateCreditMove.s +++ b/asm/src/StateCreditMove.s @@ -179,15 +179,25 @@ __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly15StateCreditMove __vt__Q53scn4step5enemy6chilly15StateCreditMove: - .incbin "baserom.dol", 0x471A10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A6880 ;# ptr + .4byte 0x802A66D4 ;# ptr + .4byte 0x802A6760 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A687C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256565 $$256565: - .incbin "baserom.dol", 0x49C070, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$256568 $$256568: - .incbin "baserom.dol", 0x49C078, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256570 $$256570: - .incbin "baserom.dol", 0x49C080, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateCreditWalk.s b/asm/src/StateCreditWalk.s index 10302a37..b98b0ee4 100644 --- a/asm/src/StateCreditWalk.s +++ b/asm/src/StateCreditWalk.s @@ -400,46 +400,61 @@ __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15StateCreditWalk __vt__Q53scn4step5enemy6common15StateCreditWalk: - .incbin "baserom.dol", 0x46F0E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802919B8 ;# ptr + .4byte 0x80291A14 ;# ptr + .4byte 0x80291A18 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80291A70 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk: - .incbin "baserom.dol", 0x470F98, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A131C ;# ptr + .4byte 0x802A1100 ;# ptr + .4byte 0x802A12D0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A1318 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256619 $$256619: - .incbin "baserom.dol", 0x49BAF0, 0x4 + .4byte 0x3CA3D70A .global $$256620 $$256620: - .incbin "baserom.dol", 0x49BAF4, 0x4 + .4byte 0x3A83126F .global $$256621 $$256621: - .incbin "baserom.dol", 0x49BAF8, 0x4 + .4byte 0x3CF5C28F .global $$256622 $$256622: - .incbin "baserom.dol", 0x49BAFC, 0x4 + .4byte 0x3B03126F .global $$256623 $$256623: - .incbin "baserom.dol", 0x49BB00, 0x4 + .4byte 0x3D23D70A .global $$256624 $$256624: - .incbin "baserom.dol", 0x49BB04, 0x4 + .4byte 0x3B449BA6 .global $$256625 $$256625: - .incbin "baserom.dol", 0x49BB08, 0x4 + .4byte 0x3D75C28F .global $$256626 $$256626: - .incbin "baserom.dol", 0x49BB0C, 0x4 + .4byte 0x3B83126F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 $$256990: - .incbin "baserom.dol", 0x49BF50, 0x4 + .4byte 0 .global $$256991 $$256991: - .incbin "baserom.dol", 0x49BF54, 0x4 + .4byte 0x40000000 .global $$256995 $$256995: - .incbin "baserom.dol", 0x49BF58, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateCutFall.s b/asm/src/StateCutFall.s index 3482600e..5c71815e 100644 --- a/asm/src/StateCutFall.s +++ b/asm/src/StateCutFall.s @@ -185,12 +185,23 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471CA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A7CCC ;# ptr + .4byte 0x802A7CB0 ;# ptr .global __vt__Q53scn4step5enemy4como12StateCutFall __vt__Q53scn4step5enemy4como12StateCutFall: - .incbin "baserom.dol", 0x471CB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A7B38 ;# ptr + .4byte 0x802A7BB0 ;# ptr + .4byte 0x802A7BB4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A7C0C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256668 $$256668: - .incbin "baserom.dol", 0x49C0F0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateCutLanding.s b/asm/src/StateCutLanding.s index 52f54cd5..b1e96797 100644 --- a/asm/src/StateCutLanding.s +++ b/asm/src/StateCutLanding.s @@ -123,9 +123,17 @@ procFixPos__Q53scn4step5enemy4como15StateCutLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como15StateCutLanding __vt__Q53scn4step5enemy4como15StateCutLanding: - .incbin "baserom.dol", 0x471CD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A7E04 ;# ptr + .4byte 0x802A7E08 ;# ptr + .4byte 0x802A7E64 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A7E68 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256544 $$256544: - .incbin "baserom.dol", 0x49C0F8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateDamage.s b/asm/src/StateDamage.s index bbf446e0..413701d6 100644 --- a/asm/src/StateDamage.s +++ b/asm/src/StateDamage.s @@ -166,4 +166,11 @@ __dt__Q53scn4step5enemy8rollball11StateDamageFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8rollball11StateDamage __vt__Q53scn4step5enemy8rollball11StateDamage: - .incbin "baserom.dol", 0x477200, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D69E8 ;# ptr + .4byte 0x802D69A0 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateDamageCapture.s b/asm/src/StateDamageCapture.s index f20b3bb3..8b4f1668 100644 --- a/asm/src/StateDamageCapture.s +++ b/asm/src/StateDamageCapture.s @@ -462,42 +462,49 @@ lbl_802A94A8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateDamageCapture __vt__Q53scn4step5enemy6damage18StateDamageCapture: - .incbin "baserom.dol", 0x471D60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A8F44 ;# ptr + .4byte 0x802A8FE8 ;# ptr + .4byte 0x802A9214 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A9294 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257027 $$257027: - .incbin "baserom.dol", 0x49C150, 0x4 + .4byte 0 .global $$257067 $$257067: - .incbin "baserom.dol", 0x49C154, 0x4 + .4byte 0x41A00000 .global $$257068 $$257068: - .incbin "baserom.dol", 0x49C158, 0x4 + .4byte 0x43B40000 .global $$257069 $$257069: - .incbin "baserom.dol", 0x49C15C, 0x4 + .4byte 0x3F800000 .global $$257070 $$257070: - .incbin "baserom.dol", 0x49C160, 0x4 + .4byte 0x42652EE1 .global $$257073 $$257073: - .incbin "baserom.dol", 0x49C164, 0x4 + .4byte 0x38D1B717 .global $$257074 $$257074: - .incbin "baserom.dol", 0x49C168, 0x4 + .4byte 0x3E4CCCCD .global $$257075 $$257075: - .incbin "baserom.dol", 0x49C16C, 0x4 + .4byte 0x3BC49BA6 .global $$257076 $$257076: - .incbin "baserom.dol", 0x49C170, 0x4 + .4byte 0x3BA3D70A .global $$257100 $$257100: - .incbin "baserom.dol", 0x49C174, 0x4 + .4byte 0x3F000000 .global $$257101 $$257101: - .incbin "baserom.dol", 0x49C178, 0x4 + .4byte 0xBF800000 .global $$257102 $$257102: - .incbin "baserom.dol", 0x49C17C, 0x4 + .4byte 0xBF733333 diff --git a/asm/src/StateDamageExtreme.s b/asm/src/StateDamageExtreme.s index 87ab21d8..69fc0b54 100644 --- a/asm/src/StateDamageExtreme.s +++ b/asm/src/StateDamageExtreme.s @@ -363,21 +363,29 @@ lbl_802A99C4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateDamageExtreme __vt__Q53scn4step5enemy6damage18StateDamageExtreme: - .incbin "baserom.dol", 0x471D80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A9600 ;# ptr + .4byte 0x802A96A4 ;# ptr + .4byte 0x802A9884 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A98C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 $$256978: - .incbin "baserom.dol", 0x49C180, 0x4 + .4byte 0 .global $$257016 $$257016: - .incbin "baserom.dol", 0x49C184, 0x4 + .4byte 0x41A00000 .global $$257017 $$257017: - .incbin "baserom.dol", 0x49C188, 0x4 + .4byte 0x43B40000 .global $$257018 $$257018: - .incbin "baserom.dol", 0x49C18C, 0x4 + .4byte 0x3F800000 .global $$257019 $$257019: - .incbin "baserom.dol", 0x49C190, 0x8 + .4byte 0x42652EE1 + .4byte 0 diff --git a/asm/src/StateDamageL.s b/asm/src/StateDamageL.s index f9c23ae3..b7ae666d 100644 --- a/asm/src/StateDamageL.s +++ b/asm/src/StateDamageL.s @@ -114,7 +114,17 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466698, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025CFC8 ;# ptr + .4byte 0x8025CFAC ;# ptr .global __vt__Q53scn4step4boss6whispy12StateDamageL __vt__Q53scn4step4boss6whispy12StateDamageL: - .incbin "baserom.dol", 0x4666A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025CF08 ;# ptr + .4byte 0x8025CF0C ;# ptr + .4byte 0x8025CFA4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025CFA8 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateDamageNormal.s b/asm/src/StateDamageNormal.s index 4ada57a3..b94aa168 100644 --- a/asm/src/StateDamageNormal.s +++ b/asm/src/StateDamageNormal.s @@ -287,12 +287,19 @@ procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage17StateDamageNormal __vt__Q53scn4step5enemy6damage17StateDamageNormal: - .incbin "baserom.dol", 0x471DA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A9C58 ;# ptr + .4byte 0x802A9CDC ;# ptr + .4byte 0x802A9D8C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A9DB0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256803 $$256803: - .incbin "baserom.dol", 0x49C198, 0x4 + .4byte 0 .global $$256804 $$256804: - .incbin "baserom.dol", 0x49C19C, 0x4 + .4byte 0x3F19999A diff --git a/asm/src/StateDamageWingToss.s b/asm/src/StateDamageWingToss.s index d5d9a6e6..dccf8a7a 100644 --- a/asm/src/StateDamageWingToss.s +++ b/asm/src/StateDamageWingToss.s @@ -315,12 +315,19 @@ lbl_802AA21C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage19StateDamageWingToss __vt__Q53scn4step5enemy6damage19StateDamageWingToss: - .incbin "baserom.dol", 0x471DC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A9EDC ;# ptr + .4byte 0x802A9F60 ;# ptr + .4byte 0x802AA068 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AA0D4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 $$256724: - .incbin "baserom.dol", 0x49C1A0, 0x4 + .4byte 0 .global $$256725 $$256725: - .incbin "baserom.dol", 0x49C1A4, 0x4 + .4byte 0xBF400000 diff --git a/asm/src/StateDash.s b/asm/src/StateDash.s index 69140a01..d5fe6bb5 100644 --- a/asm/src/StateDash.s +++ b/asm/src/StateDash.s @@ -1318,50 +1318,95 @@ lbl_802DE244: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461E58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023FE9C ;# ptr + .4byte 0x8023FE5C ;# ptr .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461E68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8023FE98 ;# ptr + .4byte 0x8023FE7C ;# ptr .global __vt__Q53scn4step4boss15challengemaster9StateDash __vt__Q53scn4step4boss15challengemaster9StateDash: - .incbin "baserom.dol", 0x461E78, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8023FC34 ;# ptr + .4byte 0x8023FCD8 ;# ptr + .4byte 0x8023FE28 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8023FE58 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1 __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1: - .incbin "baserom.dol", 0x4623C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024559C ;# ptr + .4byte 0x80245550 ;# ptr .global __vt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1 __vt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1: - .incbin "baserom.dol", 0x4623D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80245598 ;# ptr + .4byte 0x80245574 ;# ptr .global __vt__Q53scn4step4boss6common9StateDash __vt__Q53scn4step4boss6common9StateDash: - .incbin "baserom.dol", 0x4623E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80244FCC ;# ptr + .4byte 0x8024504C ;# ptr + .4byte 0x802452A4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024530C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463880, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024E3E0 ;# ptr + .4byte 0x8024E3C4 ;# ptr .global __vt__Q53scn4step4boss6dubior9StateDash __vt__Q53scn4step4boss6dubior9StateDash: - .incbin "baserom.dol", 0x463890, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024E15C ;# ptr + .4byte 0x8024E1D8 ;# ptr + .4byte 0x8024E244 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024E2FC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateDash __vt__Q53scn4step5enemy5sheld9StateDash: - .incbin "baserom.dol", 0x477E30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DE014 ;# ptr + .4byte 0x802DE018 ;# ptr + .4byte 0x802DE01C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DE08C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256936 $$256936: - .incbin "baserom.dol", 0x49B128, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49CD00, 0x4 + .4byte 0 .global $$256211 $$256211: - .incbin "baserom.dol", 0x49CD04, 0x4 + .4byte 0x3F000000 .global $$256222 $$256222: - .incbin "baserom.dol", 0x49CD08, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateDashAttack.s b/asm/src/StateDashAttack.s index 69d6bf96..ff918da0 100644 --- a/asm/src/StateDashAttack.s +++ b/asm/src/StateDashAttack.s @@ -830,30 +830,51 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A020, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80397DBC + .4byte 0x80397D40 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A030, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80397DB8 + .4byte 0x80397D5C .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A040, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80397DB4 + .4byte 0x80397D78 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A050, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80397DB0 + .4byte 0x80397D94 .global __vt__Q53scn4step4hero4wing15StateDashAttack __vt__Q53scn4step4hero4wing15StateDashAttack: - .incbin "baserom.dol", 0x48A060, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803973C8 + .4byte 0x803974C8 + .4byte 0x80397668 + .4byte 0x8035550C + .4byte 0x803976D8 + .4byte 0x803976DC + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259300 $$259300: - .incbin "baserom.dol", 0x49E218, 0x4 + .4byte 0 .global $$259350 $$259350: - .incbin "baserom.dol", 0x49E21C, 0x4 + .4byte 0xBF19999A .global $$259351 $$259351: - .incbin "baserom.dol", 0x49E220, 0x4 + .4byte 0xBF800000 .global $$259352 $$259352: - .incbin "baserom.dol", 0x49E224, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StateDashAttackWallHit.s b/asm/src/StateDashAttackWallHit.s index 74932973..b5c95971 100644 --- a/asm/src/StateDashAttackWallHit.s +++ b/asm/src/StateDashAttackWallHit.s @@ -194,21 +194,31 @@ procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing22StateDashAttackWallHit __vt__Q53scn4step4hero4wing22StateDashAttackWallHit: - .incbin "baserom.dol", 0x48A088, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80397ED4 + .4byte 0x80397F78 + .4byte 0x80397F7C + .4byte 0x8035550C + .4byte 0x80398068 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256276 $$256276: - .incbin "baserom.dol", 0x49E228, 0x4 + .4byte 0x3E4CCCCD .global $$256277 $$256277: - .incbin "baserom.dol", 0x49E22C, 0x4 + .4byte 0x3CA3D70A .global $$256278 $$256278: - .incbin "baserom.dol", 0x49E230, 0x4 + .4byte 0x3BA3D70A .global $$256279 $$256279: - .incbin "baserom.dol", 0x49E234, 0x4 + .4byte 0 .global $$256280 $$256280: - .incbin "baserom.dol", 0x49E238, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateDashEnd.s b/asm/src/StateDashEnd.s index 6d7d3378..3bda3b85 100644 --- a/asm/src/StateDashEnd.s +++ b/asm/src/StateDashEnd.s @@ -66,4 +66,11 @@ procFixPos__Q53scn4step4boss6common12StateDashEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common12StateDashEnd __vt__Q53scn4step4boss6common12StateDashEnd: - .incbin "baserom.dol", 0x462400, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80245700 ;# ptr + .4byte 0x80245704 ;# ptr + .4byte 0x80245708 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80245744 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateDashWallHit.s b/asm/src/StateDashWallHit.s index 2fd69479..79dbd1ff 100644 --- a/asm/src/StateDashWallHit.s +++ b/asm/src/StateDashWallHit.s @@ -406,17 +406,31 @@ procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common16StateDashWallHit __vt__Q53scn4step4boss6common16StateDashWallHit: - .incbin "baserom.dol", 0x462420, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024592C ;# ptr + .4byte 0x80245930 ;# ptr + .4byte 0x80245934 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80245970 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateDashWallHit __vt__Q53scn4step4boss6dubior16StateDashWallHit: - .incbin "baserom.dol", 0x4638B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024E5C0 ;# ptr + .4byte 0x8024E5C4 ;# ptr + .4byte 0x8024E5C8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024E5CC ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255953 $$255953: - .incbin "baserom.dol", 0x49B130, 0x4 + .4byte 0 .global $$255993 $$255993: - .incbin "baserom.dol", 0x49B134, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/StateDead.s b/asm/src/StateDead.s index 063fa182..0c7af63e 100644 --- a/asm/src/StateDead.s +++ b/asm/src/StateDead.s @@ -2220,88 +2220,119 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateDead __vt__Q53scn4step4boss6common9StateDead: - .incbin "baserom.dol", 0x462440, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80245EAC ;# ptr + .4byte 0x80245F34 ;# ptr + .4byte 0x80245FA4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802460DC ;# ptr + .4byte 0x802462F0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateDead __vt__Q53scn4step4boss6whispy9StateDead: - .incbin "baserom.dol", 0x4666C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025D05C ;# ptr + .4byte 0x8025D060 ;# ptr + .4byte 0x8025D3CC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025D3D0 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487C08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80361E28 + .4byte 0x80361E0C .global __vt__Q53scn4step4hero6common9StateDead __vt__Q53scn4step4hero6common9StateDead: - .incbin "baserom.dol", 0x487C18, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80360E48 + .4byte 0x80360EE8 + .4byte 0x803616A0 + .4byte 0x8035550C + .4byte 0x803616A4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257422 $$257422: - .incbin "baserom.dol", 0x4957B0, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257797 $$257797: - .incbin "baserom.dol", 0x49B138, 0x4 + .4byte 0xFFFFFFF0 .global $$259227 $$259227: - .incbin "baserom.dol", 0x49B13C, 0x4 + .4byte 0 .global $$259228 $$259228: - .incbin "baserom.dol", 0x49B140, 0x4 + .4byte 0x3F19999A .global $$259229 $$259229: - .incbin "baserom.dol", 0x49B144, 0x4 + .4byte 0x3F800000 .global $$259230 $$259230: - .incbin "baserom.dol", 0x49B148, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258046 $$258046: - .incbin "baserom.dol", 0x49B520, 0x4 + .4byte 0x3F800000 .global $$258047 $$258047: - .incbin "baserom.dol", 0x49B524, 0x4 + .4byte 0x4222F983 .global $$258048 $$258048: - .incbin "baserom.dol", 0x49B528, 0x4 + .4byte 0x3C8EFA35 .global $$258049 $$258049: - .incbin "baserom.dol", 0x49B52C, 0x4 + .4byte 0x43340000 .global $$258050 $$258050: - .incbin "baserom.dol", 0x49B530, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$258053 $$258053: - .incbin "baserom.dol", 0x49B538, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262125 $$262125: - .incbin "baserom.dol", 0x49DB50, 0x4 + .4byte 0 .global $$262214 $$262214: - .incbin "baserom.dol", 0x49DB54, 0x4 + .4byte 0x40000000 .global $$262215 $$262215: - .incbin "baserom.dol", 0x49DB58, 0x4 + .4byte 0x43B40000 .global $$262216 $$262216: - .incbin "baserom.dol", 0x49DB5C, 0x4 + .4byte 0x3F733333 .global $$262217 $$262217: - .incbin "baserom.dol", 0x49DB60, 0x4 + .4byte 0x3D4CCCCD .global $$262218 $$262218: - .incbin "baserom.dol", 0x49DB64, 0x4 + .4byte 0x3F800000 .global $$262254 $$262254: - .incbin "baserom.dol", 0x49DB68, 0x4 + .4byte 0x3F000000 .global $$262317 $$262317: - .incbin "baserom.dol", 0x49DB6C, 0x4 + .4byte 0x3E800000 .global $$262320 $$262320: - .incbin "baserom.dol", 0x49DB70, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateDeadCaptureRelease.s b/asm/src/StateDeadCaptureRelease.s index f15f9754..a5f7df1b 100644 --- a/asm/src/StateDeadCaptureRelease.s +++ b/asm/src/StateDeadCaptureRelease.s @@ -210,21 +210,29 @@ lbl_802AA50C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease: - .incbin "baserom.dol", 0x471DE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AA470 ;# ptr + .4byte 0x802AA474 ;# ptr + .4byte 0x802AA484 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AA4C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256713 $$256713: - .incbin "baserom.dol", 0x49C1A8, 0x4 + .4byte 0x42480000 .global $$256714 $$256714: - .incbin "baserom.dol", 0x49C1AC, 0x4 + .4byte 0x41200000 .global $$256715 $$256715: - .incbin "baserom.dol", 0x49C1B0, 0x4 + .4byte 0x3C8EFA35 .global $$256716 $$256716: - .incbin "baserom.dol", 0x49C1B4, 0x4 + .4byte 0x3DCCCCCD .global $$256717 $$256717: - .incbin "baserom.dol", 0x49C1B8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateDeadExtreme.s b/asm/src/StateDeadExtreme.s index 710efa7b..fe5a2c7d 100644 --- a/asm/src/StateDeadExtreme.s +++ b/asm/src/StateDeadExtreme.s @@ -331,24 +331,31 @@ lbl_802AA9A0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage16StateDeadExtreme __vt__Q53scn4step5enemy6damage16StateDeadExtreme: - .incbin "baserom.dol", 0x471E00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AA690 ;# ptr + .4byte 0x802AA734 ;# ptr + .4byte 0x802AA944 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AA948 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257029 $$257029: - .incbin "baserom.dol", 0x49C1C0, 0x4 + .4byte 0 .global $$257071 $$257071: - .incbin "baserom.dol", 0x49C1C4, 0x4 + .4byte 0x41800000 .global $$257072 $$257072: - .incbin "baserom.dol", 0x49C1C8, 0x4 + .4byte 0x41A00000 .global $$257073 $$257073: - .incbin "baserom.dol", 0x49C1CC, 0x4 + .4byte 0x43B40000 .global $$257074 $$257074: - .incbin "baserom.dol", 0x49C1D0, 0x4 + .4byte 0x3F800000 .global $$257075 $$257075: - .incbin "baserom.dol", 0x49C1D4, 0x4 + .4byte 0x42652EE1 diff --git a/asm/src/StateDeadInWater.s b/asm/src/StateDeadInWater.s index 3c19fdd0..3519bae1 100644 --- a/asm/src/StateDeadInWater.s +++ b/asm/src/StateDeadInWater.s @@ -404,74 +404,83 @@ lbl_802AAE7C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage16StateDeadInWater __vt__Q53scn4step5enemy6damage16StateDeadInWater: - .incbin "baserom.dol", 0x471E20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AABC8 ;# ptr + .4byte 0x802AABCC ;# ptr + .4byte 0x802AADCC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AAE14 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256983 $$256983: - .incbin "baserom.dol", 0x495D08, 0x8 + .4byte 0x42B40000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257302 $$257302: - .incbin "baserom.dol", 0x49C1D8, 0x4 + .4byte 0 .global $$257303 $$257303: - .incbin "baserom.dol", 0x49C1DC, 0x4 + .4byte 0x3F800000 .global $$257304 $$257304: - .incbin "baserom.dol", 0x49C1E0, 0x4 + .4byte 0x3CA3D70A .global $$257305 $$257305: - .incbin "baserom.dol", 0x49C1E4, 0x4 + .4byte 0xBCA3D70A .global $$257306 $$257306: - .incbin "baserom.dol", 0x49C1E8, 0x4 + .4byte 0x3F4CCCCD .global $$257307 $$257307: - .incbin "baserom.dol", 0x49C1EC, 0x4 + .4byte 0xBCF5C28F .global $$257345 $$257345: - .incbin "baserom.dol", 0x49C1F0, 0x4 + .4byte 0x3EE66666 .global $$257346 $$257346: - .incbin "baserom.dol", 0x49C1F4, 0x4 + .4byte 0x3C23D70A .global $$257347 $$257347: - .incbin "baserom.dol", 0x49C1F8, 0x4 + .4byte 0x3DCCCCCD .global $$257353 $$257353: - .incbin "baserom.dol", 0x49C1FC, 0x4 + .4byte 0x399D4952 .global $$257381 $$257381: - .incbin "baserom.dol", 0x49C200, 0x4 + .4byte 0x40600000 .global $$257382 $$257382: - .incbin "baserom.dol", 0x49C204, 0x4 + .4byte 0x43B40000 .global $$257383 $$257383: - .incbin "baserom.dol", 0x49C208, 0x4 + .4byte 0x3D19999A .global $$257384 $$257384: - .incbin "baserom.dol", 0x49C20C, 0x4 + .4byte 0x3F733333 .global $$257385 $$257385: - .incbin "baserom.dol", 0x49C210, 0x4 + .4byte 0x4222F983 .global $$257386 $$257386: - .incbin "baserom.dol", 0x49C214, 0x4 + .4byte 0x3C8EFA35 .global $$257387 $$257387: - .incbin "baserom.dol", 0x49C218, 0x4 + .4byte 0x3F000000 .global $$257388 $$257388: - .incbin "baserom.dol", 0x49C21C, 0x4 + .4byte 0x437F0000 .global $$257389 $$257389: - .incbin "baserom.dol", 0x49C220, 0x4 + .4byte 0x43400000 .global $$257390 $$257390: - .incbin "baserom.dol", 0x49C224, 0x4 + .4byte 0x43340000 .global $$257393 $$257393: - .incbin "baserom.dol", 0x49C228, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateDeadSuper.s b/asm/src/StateDeadSuper.s index e82160b3..6eeb7b47 100644 --- a/asm/src/StateDeadSuper.s +++ b/asm/src/StateDeadSuper.s @@ -473,27 +473,35 @@ lbl_802AB5FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage14StateDeadSuper __vt__Q53scn4step5enemy6damage14StateDeadSuper: - .incbin "baserom.dol", 0x471E40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AB0E8 ;# ptr + .4byte 0x802AB18C ;# ptr + .4byte 0x802AB39C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AB40C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257110 $$257110: - .incbin "baserom.dol", 0x49C230, 0x4 + .4byte 0 .global $$257152 $$257152: - .incbin "baserom.dol", 0x49C234, 0x4 + .4byte 0x41E00000 .global $$257153 $$257153: - .incbin "baserom.dol", 0x49C238, 0x4 + .4byte 0x420C0000 .global $$257154 $$257154: - .incbin "baserom.dol", 0x49C23C, 0x4 + .4byte 0x43B40000 .global $$257155 $$257155: - .incbin "baserom.dol", 0x49C240, 0x4 + .4byte 0x3F800000 .global $$257156 $$257156: - .incbin "baserom.dol", 0x49C244, 0x4 + .4byte 0x42652EE1 .global $$257181 $$257181: - .incbin "baserom.dol", 0x49C248, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateDemo.s b/asm/src/StateDemo.s index 84852a96..bb45df93 100644 --- a/asm/src/StateDemo.s +++ b/asm/src/StateDemo.s @@ -224,4 +224,13 @@ lbl_80362130: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateDemo __vt__Q53scn4step4hero6common9StateDemo: - .incbin "baserom.dol", 0x487C40, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80361F20 + .4byte 0x80361FF4 + .4byte 0x80362048 + .4byte 0x8035550C + .4byte 0x8036204C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateDive.s b/asm/src/StateDive.s index c1634098..4098c7dd 100644 --- a/asm/src/StateDive.s +++ b/asm/src/StateDive.s @@ -505,34 +505,51 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateDive __vt__Q53scn4step5enemy7blipper9StateDive: - .incbin "baserom.dol", 0x46FF60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029A56C ;# ptr + .4byte 0x8029A1F0 ;# ptr + .4byte 0x8029A240 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029A320 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x471CF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A8104 ;# ptr + .4byte 0x802A80E8 ;# ptr .global __vt__Q53scn4step5enemy4como9StateDive __vt__Q53scn4step5enemy4como9StateDive: - .incbin "baserom.dol", 0x471D00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A7ED8 ;# ptr + .4byte 0x802A7EDC ;# ptr + .4byte 0x802A7EE0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A8074 ;# ptr + .4byte 0x802A80E4 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255836 $$255836: - .incbin "baserom.dol", 0x49BDD0, 0x4 + .4byte 0xBD4CCCCD .global $$255837 $$255837: - .incbin "baserom.dol", 0x49BDD4, 0x4 + .4byte 0xBF800000 .global $$255838 $$255838: - .incbin "baserom.dol", 0x49BDD8, 0x4 + .4byte 0 .global $$255886 $$255886: - .incbin "baserom.dol", 0x49BDDC, 0x4 + .4byte 0x3A83126F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256046 $$256046: - .incbin "baserom.dol", 0x49C100, 0x4 + .4byte 0 .global $$256059 $$256059: - .incbin "baserom.dol", 0x49C104, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateDiveAttack.s b/asm/src/StateDiveAttack.s index a6416437..1ab3b33e 100644 --- a/asm/src/StateDiveAttack.s +++ b/asm/src/StateDiveAttack.s @@ -595,30 +595,43 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x48A0B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803988D8 + .4byte 0x803988B8 .global __vt__Q53scn4step4hero4wing15StateDiveAttack __vt__Q53scn4step4hero4wing15StateDiveAttack: - .incbin "baserom.dol", 0x48A0C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803981F4 + .4byte 0x803982F4 + .4byte 0x80398390 + .4byte 0x8035550C + .4byte 0x803984D8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257542 $$257542: - .incbin "baserom.dol", 0x49E240, 0x4 + .4byte 0x3F800000 .global $$257543 $$257543: - .incbin "baserom.dol", 0x49E244, 0x4 + .4byte 0xBF800000 .global $$257544 $$257544: - .incbin "baserom.dol", 0x49E248, 0x4 + .4byte 0x42B40000 .global $$257545 $$257545: - .incbin "baserom.dol", 0x49E24C, 0x4 + .4byte 0 .global $$257548 $$257548: - .incbin "baserom.dol", 0x49E250, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257602 $$257602: - .incbin "baserom.dol", 0x49E258, 0x4 + .4byte 0xBF19999A .global $$257603 $$257603: - .incbin "baserom.dol", 0x49E25C, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StateDiveWait.s b/asm/src/StateDiveWait.s index 925a24bd..e6352ef4 100644 --- a/asm/src/StateDiveWait.s +++ b/asm/src/StateDiveWait.s @@ -153,4 +153,11 @@ __dt__Q53scn4step5enemy4como13StateDiveWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como13StateDiveWait __vt__Q53scn4step5enemy4como13StateDiveWait: - .incbin "baserom.dol", 0x471D20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A82E8 ;# ptr + .4byte 0x802A814C ;# ptr + .4byte 0x802A81EC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A81F0 ;# ptr + .4byte 0x802A81F4 ;# ptr diff --git a/asm/src/StateDoubleAttack.s b/asm/src/StateDoubleAttack.s index b47cba27..a226b9ca 100644 --- a/asm/src/StateDoubleAttack.s +++ b/asm/src/StateDoubleAttack.s @@ -173,12 +173,19 @@ procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack: - .incbin "baserom.dol", 0x46FAF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80297950 ;# ptr + .4byte 0x80297954 ;# ptr + .4byte 0x80297A40 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80297B34 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255847 $$255847: - .incbin "baserom.dol", 0x49BD40, 0x4 + .4byte 0x3F800000 .global $$255848 $$255848: - .incbin "baserom.dol", 0x49BD44, 0x4 + .4byte 0 diff --git a/asm/src/StateDoubleKick.s b/asm/src/StateDoubleKick.s index 3eff6640..b9ab8549 100644 --- a/asm/src/StateDoubleKick.s +++ b/asm/src/StateDoubleKick.s @@ -309,12 +309,21 @@ createWeapon__Q53scn4step4hero7fighter15StateDoubleKickFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter15StateDoubleKick __vt__Q53scn4step4hero7fighter15StateDoubleKick: - .incbin "baserom.dol", 0x48A488, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039C710 + .4byte 0x8039C78C + .4byte 0x8039C824 + .4byte 0x8035550C + .4byte 0x8039C828 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257941 $$257941: - .incbin "baserom.dol", 0x49E2E0, 0x4 + .4byte 0x3F19999A .global $$257942 $$257942: - .incbin "baserom.dol", 0x49E2E4, 0x4 + .4byte 0 diff --git a/asm/src/StateDrink.s b/asm/src/StateDrink.s index 50bc10e8..fe7e1c9b 100644 --- a/asm/src/StateDrink.s +++ b/asm/src/StateDrink.s @@ -498,18 +498,37 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487C68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80362808 + .4byte 0x803627AC .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487C78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80362804 + .4byte 0x803627C8 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487C88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80362800 + .4byte 0x803627E4 .global __vt__Q53scn4step4hero6common10StateDrink __vt__Q53scn4step4hero6common10StateDrink: - .incbin "baserom.dol", 0x487C98, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803624EC + .4byte 0x803625C0 + .4byte 0x80362740 + .4byte 0x8035550C + .4byte 0x80362744 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258822 $$258822: - .incbin "baserom.dol", 0x49DB78, 0x8 + .4byte 0x41600000 + .4byte 0 diff --git a/asm/src/StateEat.s b/asm/src/StateEat.s index 45d38bbd..96baa9bc 100644 --- a/asm/src/StateEat.s +++ b/asm/src/StateEat.s @@ -121,4 +121,13 @@ procFixPos__Q53scn4step4hero6common8StateEatFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common8StateEat __vt__Q53scn4step4hero6common8StateEat: - .incbin "baserom.dol", 0x487CC0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803628C0 + .4byte 0x803628C4 + .4byte 0x8036298C + .4byte 0x8035550C + .4byte 0x80362990 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateEaten.s b/asm/src/StateEaten.s index d9dba48b..1bf045a4 100644 --- a/asm/src/StateEaten.s +++ b/asm/src/StateEaten.s @@ -563,9 +563,19 @@ endState__Q53scn4step4hero12interference10StateEatenFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference10StateEaten __vt__Q53scn4step4hero12interference10StateEaten: - .incbin "baserom.dol", 0x488570, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80371088 + .4byte 0x80371274 + .4byte 0x803713A8 + .4byte 0x803713AC + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259191 $$259191: - .incbin "baserom.dol", 0x49DD10, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateEnd.s b/asm/src/StateEnd.s index 4d002840..679e4f76 100644 --- a/asm/src/StateEnd.s +++ b/asm/src/StateEnd.s @@ -145,15 +145,25 @@ procFixPos__Q53scn4step4hero5stone8StateEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone8StateEnd __vt__Q53scn4step4hero5stone8StateEnd: - .incbin "baserom.dol", 0x489AF0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039021C + .4byte 0x803902A8 + .4byte 0x803902AC + .4byte 0x8035550C + .4byte 0x803902B0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256284 $$256284: - .incbin "baserom.dol", 0x49E110, 0x4 + .4byte 0x3727C5AC .global $$256285 $$256285: - .incbin "baserom.dol", 0x49E114, 0x4 + .4byte 0xB727C5AC .global $$256286 $$256286: - .incbin "baserom.dol", 0x49E118, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateEndure.s b/asm/src/StateEndure.s index c31362fb..b949a165 100644 --- a/asm/src/StateEndure.s +++ b/asm/src/StateEndure.s @@ -134,4 +134,11 @@ lbl_802C5A24: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies11StateEndure __vt__Q53scn4step5enemy7mumbies11StateEndure: - .incbin "baserom.dol", 0x4753A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C5980 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802C5984 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C5988 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateEnterChallengeDoor.s b/asm/src/StateEnterChallengeDoor.s index 198d9156..32f77d9d 100644 --- a/asm/src/StateEnterChallengeDoor.s +++ b/asm/src/StateEnterChallengeDoor.s @@ -277,12 +277,21 @@ lbl_8037C730: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor: - .incbin "baserom.dol", 0x488A78, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037C418 + .4byte 0x8037C484 + .4byte 0x8037C4F0 + .4byte 0x8035550C + .4byte 0x8037C5A0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260691 $$260691: - .incbin "baserom.dol", 0x49DF38, 0x4 + .4byte 0x3D4CCCCD .global $$260714 $$260714: - .incbin "baserom.dol", 0x49DF3C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateEnterChallengeDoorPre.s b/asm/src/StateEnterChallengeDoorPre.s index 5d48169d..d2485e1b 100644 --- a/asm/src/StateEnterChallengeDoorPre.s +++ b/asm/src/StateEnterChallengeDoorPre.s @@ -592,12 +592,25 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1: - .incbin "baserom.dol", 0x488AA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037CF78 + .4byte 0x8037CF58 .global __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre: - .incbin "baserom.dol", 0x488AB0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037CA5C + .4byte 0x8037CAE0 + .4byte 0x8037CB78 + .4byte 0x8035550C + .4byte 0x8037CB7C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261107 $$261107: - .incbin "baserom.dol", 0x49DF40, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateEnterDoor.s b/asm/src/StateEnterDoor.s index e4287366..47a0661b 100644 --- a/asm/src/StateEnterDoor.s +++ b/asm/src/StateEnterDoor.s @@ -820,21 +820,33 @@ __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1 __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1: - .incbin "baserom.dol", 0x488AD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037DB10 + .4byte 0x8037DAE8 .global __vt__Q53scn4step4hero7gimmick14StateEnterDoor __vt__Q53scn4step4hero7gimmick14StateEnterDoor: - .incbin "baserom.dol", 0x488AE8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037D2D0 + .4byte 0x8037D360 + .4byte 0x8037D5CC + .4byte 0x8035550C + .4byte 0x8037D684 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260742 $$260742: - .incbin "baserom.dol", 0x49DF48, 0x4 + .4byte 0 .global $$260792 $$260792: - .incbin "baserom.dol", 0x49DF4C, 0x4 + .4byte 0x3D800000 .global $$260793 $$260793: - .incbin "baserom.dol", 0x49DF50, 0x4 + .4byte 0x3F700000 .global $$260809 $$260809: - .incbin "baserom.dol", 0x49DF54, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateEnterMahoroa.s b/asm/src/StateEnterMahoroa.s index 99789d5b..46636a60 100644 --- a/asm/src/StateEnterMahoroa.s +++ b/asm/src/StateEnterMahoroa.s @@ -1830,53 +1830,85 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17Sta .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DEPTH_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_DEPTH_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: - .incbin "baserom.dol", 0x41BCF8, 0x10 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 .global T_DEPTH_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_DEPTH_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: - .incbin "baserom.dol", 0x41BD08, 0x10 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_OFS_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_OFS_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: - .incbin "baserom.dol", 0x488B10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x40000000 + .4byte 0 + .4byte 0x40600000 + .4byte 0 + .4byte 0xBFE66666 + .4byte 0 .global T_OFS_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_OFS_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: - .incbin "baserom.dol", 0x488B30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x40000000 + .4byte 0 + .4byte 0xBFE66666 + .4byte 0 + .4byte 0xBFE66666 + .4byte 0 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488B50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037F554 + .4byte 0x8037F538 .global __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa: - .incbin "baserom.dol", 0x488B60, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037DF6C + .4byte 0x8037E054 + .4byte 0x8037E248 + .4byte 0x8035550C + .4byte 0x8037E5B0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262848 $$262848: - .incbin "baserom.dol", 0x49DF58, 0x4 + .4byte 0x43B40000 .global $$262849 $$262849: - .incbin "baserom.dol", 0x49DF5C, 0x4 + .4byte 0 .global $$262850 $$262850: - .incbin "baserom.dol", 0x49DF60, 0x4 + .4byte 0x43340000 .global $$262985 $$262985: - .incbin "baserom.dol", 0x49DF64, 0x4 + .4byte 0x3DCCCCCD .global $$263019 $$263019: - .incbin "baserom.dol", 0x49DF68, 0x4 + .4byte 0x3D4CCCCD .global $$263020 $$263020: - .incbin "baserom.dol", 0x49DF6C, 0x4 + .4byte 0xBDCCCCCD .global $$263076 $$263076: - .incbin "baserom.dol", 0x49DF70, 0x4 + .4byte 0x3F666666 .global $$263077 $$263077: - .incbin "baserom.dol", 0x49DF74, 0x4 + .4byte 0x3F800000 .global $$263117 $$263117: - .incbin "baserom.dol", 0x49DF78, 0x4 + .4byte 0x3F000000 .global $$263173 $$263173: - .incbin "baserom.dol", 0x49DF7C, 0x4 + .4byte 0x3FC00000 diff --git a/asm/src/StateEscape.s b/asm/src/StateEscape.s index 9dc4df68..acc1f5f6 100644 --- a/asm/src/StateEscape.s +++ b/asm/src/StateEscape.s @@ -354,20 +354,35 @@ lbl_802DE524: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy11StateEscape __vt__Q53scn4step5enemy6scarfy11StateEscape: - .incbin "baserom.dol", 0x477738, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DAE04 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802DAC64 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11StateEscape __vt__Q53scn4step5enemy5sheld11StateEscape: - .incbin "baserom.dol", 0x477E50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DE394 ;# ptr + .4byte 0x802DE398 ;# ptr + .4byte 0x802DE39C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DE40C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257269 $$257269: - .incbin "baserom.dol", 0x49CD10, 0x4 + .4byte 0x3D4CCCCD .global $$257270 $$257270: - .incbin "baserom.dol", 0x49CD14, 0x4 + .4byte 0x3A83126F .global $$257284 $$257284: - .incbin "baserom.dol", 0x49CD18, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/StateExplosion.s b/asm/src/StateExplosion.s index fa45ed35..1a926dbf 100644 --- a/asm/src/StateExplosion.s +++ b/asm/src/StateExplosion.s @@ -1008,94 +1008,139 @@ __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12hammerhammer14StateExplosion __vt__Q53scn4step6weapon12hammerhammer14StateExplosion: - .incbin "baserom.dol", 0x4908B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E5784 + .4byte 0x803E5598 + .4byte 0x803E5778 + .4byte 0x803D895C + .4byte 0x803E577C + .4byte 0x803E5780 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion: - .incbin "baserom.dol", 0x490968, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6358 + .4byte 0x803E635C + .4byte 0x803E63B4 + .4byte 0x803D895C + .4byte 0x803E63B8 + .4byte 0x803E63BC .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion: - .incbin "baserom.dol", 0x4909B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6770 + .4byte 0x803E6774 + .4byte 0x803E67CC + .4byte 0x803D895C + .4byte 0x803E67D0 + .4byte 0x803E67D4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion: - .incbin "baserom.dol", 0x490A38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6D40 + .4byte 0x803E6D44 + .4byte 0x803E6E34 + .4byte 0x803D895C + .4byte 0x803E6E38 + .4byte 0x803E6E3C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion: - .incbin "baserom.dol", 0x490E58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EB974 + .4byte 0x803EB978 + .4byte 0x803EB9D0 + .4byte 0x803D895C + .4byte 0x803EB9D4 + .4byte 0x803EB9D8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12dededehammer14StateExplosion __vt__Q53scn4step6weapon12dededehammer14StateExplosion: - .incbin "baserom.dol", 0x490F88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803ECBD0 + .4byte 0x803EC9E4 + .4byte 0x803ECBC4 + .4byte 0x803D895C + .4byte 0x803ECBC8 + .4byte 0x803ECBCC .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256495 $$256495: - .incbin "baserom.dol", 0x4986E8, 0x4 + .4byte 0x00000019 .global $$256497 $$256497: - .incbin "baserom.dol", 0x4986EC, 0x4 + .4byte 0x0000001A .global $$256499 $$256499: - .incbin "baserom.dol", 0x4986F0, 0x4 + .4byte 0x0000001B .global $$256505 $$256505: - .incbin "baserom.dol", 0x4986F4, 0x4 + .4byte 0x00000019 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256953 $$256953: - .incbin "baserom.dol", 0x49EA90, 0x4 + .4byte 0x3FC00000 .global $$256954 $$256954: - .incbin "baserom.dol", 0x49EA94, 0x4 + .4byte 0x3F800000 .global $$256955 $$256955: - .incbin "baserom.dol", 0x49EA98, 0x4 + .4byte 0xBF000000 .global $$256956 $$256956: - .incbin "baserom.dol", 0x49EA9C, 0x4 + .4byte 0 .global $$256960 $$256960: - .incbin "baserom.dol", 0x49EAA0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256641 $$256641: - .incbin "baserom.dol", 0x49EAF0, 0x4 + .4byte 0x3F800000 .global $$256642 $$256642: - .incbin "baserom.dol", 0x49EAF4, 0x4 + .4byte 0x3FC00000 .global $$256643 $$256643: - .incbin "baserom.dol", 0x49EAF8, 0x4 + .4byte 0xBF000000 .global $$256644 $$256644: - .incbin "baserom.dol", 0x49EAFC, 0x4 + .4byte 0 .global $$256647 $$256647: - .incbin "baserom.dol", 0x49EB00, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256953 $$256953: - .incbin "baserom.dol", 0x49EC10, 0x4 + .4byte 0x3FC00000 .global $$256954 $$256954: - .incbin "baserom.dol", 0x49EC14, 0x4 + .4byte 0x3F800000 .global $$256955 $$256955: - .incbin "baserom.dol", 0x49EC18, 0x4 + .4byte 0xBF000000 .global $$256956 $$256956: - .incbin "baserom.dol", 0x49EC1C, 0x4 + .4byte 0 .global $$256960 $$256960: - .incbin "baserom.dol", 0x49EC20, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateExtreme.s b/asm/src/StateExtreme.s index 9f39992b..5d2cd037 100644 --- a/asm/src/StateExtreme.s +++ b/asm/src/StateExtreme.s @@ -378,24 +378,37 @@ __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x488730, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8037601C + .4byte 0x80375FF8 .global __vt__Q53scn4step4hero6damage12StateExtreme __vt__Q53scn4step4hero6damage12StateExtreme: - .incbin "baserom.dol", 0x488740, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80375BC4 + .4byte 0x80375C70 + .4byte 0x80375E00 + .4byte 0x8035550C + .4byte 0x80375E68 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256907 $$256907: - .incbin "baserom.dol", 0x49DDF8, 0x4 + .4byte 0 .global $$256954 $$256954: - .incbin "baserom.dol", 0x49DDFC, 0x4 + .4byte 0x41A00000 .global $$256955 $$256955: - .incbin "baserom.dol", 0x49DE00, 0x4 + .4byte 0x43B40000 .global $$256956 $$256956: - .incbin "baserom.dol", 0x49DE04, 0x4 + .4byte 0x42652EE1 .global $$256961 $$256961: - .incbin "baserom.dol", 0x49DE08, 0x8 + .4byte 0x38D1B717 + .4byte 0 diff --git a/asm/src/StateFaceChange.s b/asm/src/StateFaceChange.s index 97a4d598..848cb674 100644 --- a/asm/src/StateFaceChange.s +++ b/asm/src/StateFaceChange.s @@ -246,4 +246,11 @@ lbl_802DB160: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy15StateFaceChange __vt__Q53scn4step5enemy6scarfy15StateFaceChange: - .incbin "baserom.dol", 0x477758, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DAE88 ;# ptr + .4byte 0x802DAE8C ;# ptr + .4byte 0x802DB044 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateFaint.s b/asm/src/StateFaint.s index 9239c84e..c4973918 100644 --- a/asm/src/StateFaint.s +++ b/asm/src/StateFaint.s @@ -209,7 +209,19 @@ __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487CE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80362C50 + .4byte 0x80362C30 .global __vt__Q53scn4step4hero6common10StateFaint __vt__Q53scn4step4hero6common10StateFaint: - .incbin "baserom.dol", 0x487CF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80362A44 + .4byte 0x80362AE0 + .4byte 0x80362B90 + .4byte 0x8035550C + .4byte 0x80362B94 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFall.s b/asm/src/StateFall.s index c57daa6b..71279f30 100644 --- a/asm/src/StateFall.s +++ b/asm/src/StateFall.s @@ -3420,220 +3420,373 @@ lbl_803C7B58: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateFall __vt__Q53scn4step4boss6common9StateFall: - .incbin "baserom.dol", 0x462460, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802465E4 ;# ptr + .4byte 0x802465E8 ;# ptr + .4byte 0x802465EC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80246664 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F108, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80291C74 ;# ptr + .4byte 0x80291C58 ;# ptr .global __vt__Q53scn4step5enemy6common9StateFall __vt__Q53scn4step5enemy6common9StateFall: - .incbin "baserom.dol", 0x46F118, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291AD4 ;# ptr + .4byte 0x80291AD8 ;# ptr + .4byte 0x80291ADC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80291BA4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateFall __vt__Q53scn4step5enemy7blipper9StateFall: - .incbin "baserom.dol", 0x46FF80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029A73C ;# ptr + .4byte 0x8029A5E8 ;# ptr + .4byte 0x8029A638 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029A698 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateFall __vt__Q53scn4step5enemy4kabu9StateFall: - .incbin "baserom.dol", 0x474248, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BCF38 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802BCF3C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BCFC0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C3B38 ;# ptr + .4byte 0x802C3B18 ;# ptr .global __vt__Q53scn4step5enemy6leafan9StateFall __vt__Q53scn4step5enemy6leafan9StateFall: - .incbin "baserom.dol", 0x475068, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C3B34 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802C3A08 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C3A74 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475A48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C83A8 ;# ptr + .4byte 0x802C838C ;# ptr .global __vt__Q53scn4step5enemy5nruff9StateFall __vt__Q53scn4step5enemy5nruff9StateFall: - .incbin "baserom.dol", 0x475A58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C7FD4 ;# ptr + .4byte 0x802C8054 ;# ptr + .4byte 0x802C80BC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C8128 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476188, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CC89C ;# ptr + .4byte 0x802CC87C ;# ptr .global __vt__Q53scn4step5enemy10parasoldee9StateFall __vt__Q53scn4step5enemy10parasoldee9StateFall: - .incbin "baserom.dol", 0x476198, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CC898 ;# ptr + .4byte 0x802CC71C ;# ptr + .4byte 0x802CC720 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CC7B0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476338, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CE6A8 ;# ptr + .4byte 0x802CE688 ;# ptr .global __vt__Q53scn4step5enemy10parasoldoo9StateFall __vt__Q53scn4step5enemy10parasoldoo9StateFall: - .incbin "baserom.dol", 0x476348, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CE6A4 ;# ptr + .4byte 0x802CE564 ;# ptr + .4byte 0x802CE568 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CE5D4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476F38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D45F4 ;# ptr + .4byte 0x802D45D8 ;# ptr .global __vt__Q53scn4step5enemy5rocky9StateFall __vt__Q53scn4step5enemy5rocky9StateFall: - .incbin "baserom.dol", 0x476F48, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D4408 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802D4484 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D4534 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateFall __vt__Q53scn4step5enemy5sheld9StateFall: - .incbin "baserom.dol", 0x477E70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DE610 ;# ptr + .4byte 0x802DE614 ;# ptr + .4byte 0x802DE618 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DE684 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateFall __vt__Q53scn4step5enemy11sisterbound9StateFall: - .incbin "baserom.dol", 0x478A40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E2C68 ;# ptr + .4byte 0x802E2C6C ;# ptr + .4byte 0x802E2CFC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E2DA8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x479A70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EB510 ;# ptr + .4byte 0x802EB4F4 ;# ptr .global __vt__Q53scn4step5enemy9tsukikage9StateFall __vt__Q53scn4step5enemy9tsukikage9StateFall: - .incbin "baserom.dol", 0x479A80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EB3D0 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802EB3D4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EB440 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1 __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1: - .incbin "baserom.dol", 0x47AED8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802F2210 ;# ptr + .4byte 0x802F21EC ;# ptr .global __vt__Q53scn4step5enemy11whispyapple9StateFall __vt__Q53scn4step5enemy11whispyapple9StateFall: - .incbin "baserom.dol", 0x47AEE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F1F7C ;# ptr + .4byte 0x802F1F80 ;# ptr + .4byte 0x802F1F84 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F2014 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487D20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803631EC + .4byte 0x803631D0 .global __vt__Q53scn4step4hero6common9StateFall __vt__Q53scn4step4hero6common9StateFall: - .incbin "baserom.dol", 0x487D30, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80362D18 + .4byte 0x80362D94 + .4byte 0x80363068 + .4byte 0x8035550C + .4byte 0x8036306C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489B18, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803907AC + .4byte 0x8039076C .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489B28, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803907A8 + .4byte 0x8039078C .global __vt__Q53scn4step4hero5stone9StateFall __vt__Q53scn4step4hero5stone9StateFall: - .incbin "baserom.dol", 0x489B38, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80390354 + .4byte 0x803903C8 + .4byte 0x80390584 + .4byte 0x8035550C + .4byte 0x803906A4 + .4byte 0x803906A8 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state9StateFall __vt__Q53scn4step4item5state9StateFall: - .incbin "baserom.dol", 0x48E690, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C795C + .4byte 0x803C79E4 + .4byte 0x803C79EC + .4byte 0x803C7A60 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 $$255720: - .incbin "baserom.dol", 0x49B150, 0x4 + .4byte 0x3C23D70A .global $$255721 $$255721: - .incbin "baserom.dol", 0x49B154, 0x4 + .4byte 0x3E4CCCCD .global $$255722 $$255722: - .incbin "baserom.dol", 0x49B158, 0x4 + .4byte 0x3BA3D70A .global $$255723 $$255723: - .incbin "baserom.dol", 0x49B15C, 0x4 + .4byte 0x3D4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255749 $$255749: - .incbin "baserom.dol", 0x49BDE0, 0x4 + .4byte 0x38D1B717 .global $$255750 $$255750: - .incbin "baserom.dol", 0x49BDE4, 0x4 + .4byte 0x3E4CCCCD .global $$255751 $$255751: - .incbin "baserom.dol", 0x49BDE8, 0x4 + .4byte 0x3BC49BA6 .global $$255752 $$255752: - .incbin "baserom.dol", 0x49BDEC, 0x4 + .4byte 0x3BA3D70A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255807 $$255807: - .incbin "baserom.dol", 0x49C658, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256323 $$256323: - .incbin "baserom.dol", 0x49C8C8, 0x4 + .4byte 0x41200000 .global $$256331 $$256331: - .incbin "baserom.dol", 0x49C8CC, 0x4 + .4byte 0x3F800000 .global $$256361 $$256361: - .incbin "baserom.dol", 0x49C8D0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256052 $$256052: - .incbin "baserom.dol", 0x49C9B0, 0x4 + .4byte 0 .global $$256053 $$256053: - .incbin "baserom.dol", 0x49C9B4, 0x4 + .4byte 0xBF800000 .global $$256054 $$256054: - .incbin "baserom.dol", 0x49C9B8, 0x8 + .4byte 0x3C23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255891 $$255891: - .incbin "baserom.dol", 0x49CA00, 0x4 + .4byte 0 .global $$255892 $$255892: - .incbin "baserom.dol", 0x49CA04, 0x4 + .4byte 0xBF800000 .global $$255893 $$255893: - .incbin "baserom.dol", 0x49CA08, 0x8 + .4byte 0x3C23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256789 $$256789: - .incbin "baserom.dol", 0x49CB38, 0x4 + .4byte 0x3F800000 .global $$256790 $$256790: - .incbin "baserom.dol", 0x49CB3C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255784 $$255784: - .incbin "baserom.dol", 0x49CD20, 0x4 + .4byte 0x3F800000 .global $$255785 $$255785: - .incbin "baserom.dol", 0x49CD24, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255783 $$255783: - .incbin "baserom.dol", 0x49CE20, 0x4 + .4byte 0 .global $$255796 $$255796: - .incbin "baserom.dol", 0x49CE24, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256780 $$256780: - .incbin "baserom.dol", 0x49D0C8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257716 $$257716: - .incbin "baserom.dol", 0x49DB80, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255828 $$255828: - .incbin "baserom.dol", 0x49E5D0, 0x4 + .4byte 0x3F000000 .global $$255829 $$255829: - .incbin "baserom.dol", 0x49E5D4, 0x4 + .4byte 0 diff --git a/asm/src/StateFallEnemy.s b/asm/src/StateFallEnemy.s index e2cabcb8..68a42ee5 100644 --- a/asm/src/StateFallEnemy.s +++ b/asm/src/StateFallEnemy.s @@ -241,4 +241,11 @@ lbl_8025D7B0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy14StateFallEnemy __vt__Q53scn4step4boss6whispy14StateFallEnemy: - .incbin "baserom.dol", 0x4666E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025D5BC ;# ptr + .4byte 0x8025D63C ;# ptr + .4byte 0x8025D728 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025D72C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateFallFeathery.s b/asm/src/StateFallFeathery.s index 5273bbaf..24844e89 100644 --- a/asm/src/StateFallFeathery.s +++ b/asm/src/StateFallFeathery.s @@ -140,4 +140,9 @@ lbl_803C7D34: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state17StateFallFeathery __vt__Q53scn4step4item5state17StateFallFeathery: - .incbin "baserom.dol", 0x48E6A8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C7BE8 + .4byte 0x803C7C64 + .4byte 0x803C7C68 + .4byte 0x803C7CFC diff --git a/asm/src/StateFallNoDecel.s b/asm/src/StateFallNoDecel.s index d6ed098f..d1711e7b 100644 --- a/asm/src/StateFallNoDecel.s +++ b/asm/src/StateFallNoDecel.s @@ -69,15 +69,23 @@ procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateFallNoDecel __vt__Q53scn4step5enemy6common16StateFallNoDecel: - .incbin "baserom.dol", 0x46F138, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291CD8 ;# ptr + .4byte 0x80291CDC ;# ptr + .4byte 0x80291CE0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80291D3C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255747 $$255747: - .incbin "baserom.dol", 0x49BB10, 0x4 + .4byte 0x3E19999A .global $$255748 $$255748: - .incbin "baserom.dol", 0x49BB14, 0x4 + .4byte 0x3BC49BA6 .global $$255749 $$255749: - .incbin "baserom.dol", 0x49BB18, 0x8 + .4byte 0x3BA3D70A + .4byte 0 diff --git a/asm/src/StateFallScrewStart.s b/asm/src/StateFallScrewStart.s index 280b8275..36857d35 100644 --- a/asm/src/StateFallScrewStart.s +++ b/asm/src/StateFallScrewStart.s @@ -197,4 +197,13 @@ procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone19StateFallScrewStart __vt__Q53scn4step4hero5stone19StateFallScrewStart: - .incbin "baserom.dol", 0x489B60, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039088C + .4byte 0x80390900 + .4byte 0x803909D8 + .4byte 0x8035550C + .4byte 0x80390A58 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFattyBufferAppearFall.s b/asm/src/StateFattyBufferAppearFall.s index 3af2ef53..5e6144a6 100644 --- a/asm/src/StateFattyBufferAppearFall.s +++ b/asm/src/StateFattyBufferAppearFall.s @@ -186,9 +186,17 @@ procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall: - .incbin "baserom.dol", 0x46FFA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029A7E4 ;# ptr + .4byte 0x8029A8B8 ;# ptr + .4byte 0x8029A97C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029A9D4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256135 $$256135: - .incbin "baserom.dol", 0x49BDF0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateFattyBufferEscapeNear.s b/asm/src/StateFattyBufferEscapeNear.s index da682c99..300a19b6 100644 --- a/asm/src/StateFattyBufferEscapeNear.s +++ b/asm/src/StateFattyBufferEscapeNear.s @@ -119,9 +119,17 @@ __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear: - .incbin "baserom.dol", 0x46FFC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029AB60 ;# ptr + .4byte 0x8029AADC ;# ptr + .4byte 0x8029AAE0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029AAE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256586 $$256586: - .incbin "baserom.dol", 0x49BDF8, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/StateFinalCutterDrop.s b/asm/src/StateFinalCutterDrop.s index a3454490..4dfca7d9 100644 --- a/asm/src/StateFinalCutterDrop.s +++ b/asm/src/StateFinalCutterDrop.s @@ -271,7 +271,19 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AE40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A1364 + .4byte 0x803A1348 .global __vt__Q53scn4step4hero5smash20StateFinalCutterDrop __vt__Q53scn4step4hero5smash20StateFinalCutterDrop: - .incbin "baserom.dol", 0x48AE50, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A10AC + .4byte 0x803A1128 + .4byte 0x803A112C + .4byte 0x8035550C + .4byte 0x803A1208 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFinalCutterLanding.s b/asm/src/StateFinalCutterLanding.s index 4918c94b..c9a5dc5a 100644 --- a/asm/src/StateFinalCutterLanding.s +++ b/asm/src/StateFinalCutterLanding.s @@ -225,18 +225,27 @@ procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash23StateFinalCutterLanding __vt__Q53scn4step4hero5smash23StateFinalCutterLanding: - .incbin "baserom.dol", 0x48AE78, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A156C + .4byte 0x803A15E8 + .4byte 0x803A168C + .4byte 0x8035550C + .4byte 0x803A1690 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259013 $$259013: - .incbin "baserom.dol", 0x49E358, 0x4 + .4byte 0x3E19999A .global $$259014 $$259014: - .incbin "baserom.dol", 0x49E35C, 0x4 + .4byte 0x3E4CCCCD .global $$259015 $$259015: - .incbin "baserom.dol", 0x49E360, 0x4 + .4byte 0x3F066666 .global $$259016 $$259016: - .incbin "baserom.dol", 0x49E364, 0x4 + .4byte 0 diff --git a/asm/src/StateFinalCutterPre.s b/asm/src/StateFinalCutterPre.s index 8bded607..45abfa76 100644 --- a/asm/src/StateFinalCutterPre.s +++ b/asm/src/StateFinalCutterPre.s @@ -200,10 +200,25 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AEA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A1914 + .4byte 0x803A18D8 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AEB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A1910 + .4byte 0x803A18F4 .global __vt__Q53scn4step4hero5smash19StateFinalCutterPre __vt__Q53scn4step4hero5smash19StateFinalCutterPre: - .incbin "baserom.dol", 0x48AEC0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A17EC + .4byte 0x803A17F0 + .4byte 0x803A1880 + .4byte 0x8035550C + .4byte 0x803A18D4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFinalCutterRise.s b/asm/src/StateFinalCutterRise.s index 12b5eb4a..33da0421 100644 --- a/asm/src/StateFinalCutterRise.s +++ b/asm/src/StateFinalCutterRise.s @@ -262,12 +262,25 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AEE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A1CB0 + .4byte 0x803A1C94 .global __vt__Q53scn4step4hero5smash20StateFinalCutterRise __vt__Q53scn4step4hero5smash20StateFinalCutterRise: - .incbin "baserom.dol", 0x48AEF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A1A5C + .4byte 0x803A1AE8 + .4byte 0x803A1BF0 + .4byte 0x8035550C + .4byte 0x803A1C90 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257541 $$257541: - .incbin "baserom.dol", 0x49E368, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateFireBlock.s b/asm/src/StateFireBlock.s index c73d3df4..cd234cd7 100644 --- a/asm/src/StateFireBlock.s +++ b/asm/src/StateFireBlock.s @@ -424,42 +424,51 @@ lbl_8037662C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage14StateFireBlock __vt__Q53scn4step4hero6damage14StateFireBlock: - .incbin "baserom.dol", 0x488768, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80376258 + .4byte 0x80376314 + .4byte 0x803764A0 + .4byte 0x8035550C + .4byte 0x80376508 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257204 $$257204: - .incbin "baserom.dol", 0x49DE10, 0x4 + .4byte 0 .global $$257205 $$257205: - .incbin "baserom.dol", 0x49DE14, 0x4 + .4byte 0x3F000000 .global $$257206 $$257206: - .incbin "baserom.dol", 0x49DE18, 0x4 + .4byte 0x42700000 .global $$257207 $$257207: - .incbin "baserom.dol", 0x49DE1C, 0x4 + .4byte 0x41200000 .global $$257208 $$257208: - .incbin "baserom.dol", 0x49DE20, 0x4 + .4byte 0x3C8EFA35 .global $$257209 $$257209: - .incbin "baserom.dol", 0x49DE24, 0x4 + .4byte 0xBF800000 .global $$257210 $$257210: - .incbin "baserom.dol", 0x49DE28, 0x4 + .4byte 0x3E000000 .global $$257257 $$257257: - .incbin "baserom.dol", 0x49DE2C, 0x4 + .4byte 0x41A00000 .global $$257258 $$257258: - .incbin "baserom.dol", 0x49DE30, 0x4 + .4byte 0x43B40000 .global $$257259 $$257259: - .incbin "baserom.dol", 0x49DE34, 0x4 + .4byte 0x42652EE1 .global $$257260 $$257260: - .incbin "baserom.dol", 0x49DE38, 0x4 + .4byte 0x42480000 .global $$257265 $$257265: - .incbin "baserom.dol", 0x49DE3C, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateFireLv2.s b/asm/src/StateFireLv2.s index 32ed0bf6..0343ce27 100644 --- a/asm/src/StateFireLv2.s +++ b/asm/src/StateFireLv2.s @@ -334,24 +334,33 @@ lbl_80376AEC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateFireLv2 __vt__Q53scn4step4hero6damage12StateFireLv2: - .incbin "baserom.dol", 0x488790, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037671C + .4byte 0x803767D8 + .4byte 0x80376964 + .4byte 0x8035550C + .4byte 0x803769CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256845 $$256845: - .incbin "baserom.dol", 0x49DE40, 0x4 + .4byte 0 .global $$256892 $$256892: - .incbin "baserom.dol", 0x49DE44, 0x4 + .4byte 0x41A00000 .global $$256893 $$256893: - .incbin "baserom.dol", 0x49DE48, 0x4 + .4byte 0x43B40000 .global $$256894 $$256894: - .incbin "baserom.dol", 0x49DE4C, 0x4 + .4byte 0x42652EE1 .global $$256895 $$256895: - .incbin "baserom.dol", 0x49DE50, 0x4 + .4byte 0x42480000 .global $$256900 $$256900: - .incbin "baserom.dol", 0x49DE54, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateFireLv3.s b/asm/src/StateFireLv3.s index 16219250..e4397e04 100644 --- a/asm/src/StateFireLv3.s +++ b/asm/src/StateFireLv3.s @@ -339,24 +339,33 @@ lbl_80376FBC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateFireLv3 __vt__Q53scn4step4hero6damage12StateFireLv3: - .incbin "baserom.dol", 0x4887B8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80376BE8 + .4byte 0x80376CA4 + .4byte 0x80376E30 + .4byte 0x8035550C + .4byte 0x80376E98 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257010 $$257010: - .incbin "baserom.dol", 0x49DE58, 0x4 + .4byte 0 .global $$257057 $$257057: - .incbin "baserom.dol", 0x49DE5C, 0x4 + .4byte 0x41A00000 .global $$257058 $$257058: - .incbin "baserom.dol", 0x49DE60, 0x4 + .4byte 0x43B40000 .global $$257059 $$257059: - .incbin "baserom.dol", 0x49DE64, 0x4 + .4byte 0x42652EE1 .global $$257060 $$257060: - .incbin "baserom.dol", 0x49DE68, 0x4 + .4byte 0x42480000 .global $$257065 $$257065: - .incbin "baserom.dol", 0x49DE6C, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateFirst.s b/asm/src/StateFirst.s index ef92df05..6580beee 100644 --- a/asm/src/StateFirst.s +++ b/asm/src/StateFirst.s @@ -127,7 +127,17 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466708, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025D954 ;# ptr + .4byte 0x8025D938 ;# ptr .global __vt__Q53scn4step4boss6whispy10StateFirst __vt__Q53scn4step4boss6whispy10StateFirst: - .incbin "baserom.dol", 0x466718, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025D834 ;# ptr + .4byte 0x8025D838 ;# ptr + .4byte 0x8025D83C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025D840 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateFirstDemo.s b/asm/src/StateFirstDemo.s index 37aaca0a..d50d5530 100644 --- a/asm/src/StateFirstDemo.s +++ b/asm/src/StateFirstDemo.s @@ -354,9 +354,19 @@ lbl_8037FA2C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick14StateFirstDemo __vt__Q53scn4step4hero7gimmick14StateFirstDemo: - .incbin "baserom.dol", 0x488B88, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037F738 + .4byte 0x8037F844 + .4byte 0x8037F920 + .4byte 0x8035550C + .4byte 0x8037F924 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260642 $$260642: - .incbin "baserom.dol", 0x49DF80, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateFirstMotion.s b/asm/src/StateFirstMotion.s index bc1f6c42..a64473a4 100644 --- a/asm/src/StateFirstMotion.s +++ b/asm/src/StateFirstMotion.s @@ -489,13 +489,31 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A4B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D150 + .4byte 0x8039D0F4 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A4C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D14C + .4byte 0x8039D110 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A4D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D148 + .4byte 0x8039D12C .global __vt__Q53scn4step4hero7fighter16StateFirstMotion __vt__Q53scn4step4hero7fighter16StateFirstMotion: - .incbin "baserom.dol", 0x48A4E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039CC34 + .4byte 0x8039CCB0 + .4byte 0x8039D06C + .4byte 0x8035550C + .4byte 0x8039D070 + .4byte 0x8039D074 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFirstMotionDash.s b/asm/src/StateFirstMotionDash.s index 7758b6e5..65847095 100644 --- a/asm/src/StateFirstMotionDash.s +++ b/asm/src/StateFirstMotionDash.s @@ -279,13 +279,31 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A508, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D4D4 + .4byte 0x8039D478 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A518, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D4D0 + .4byte 0x8039D494 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A528, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D4CC + .4byte 0x8039D4B0 .global __vt__Q53scn4step4hero7fighter20StateFirstMotionDash __vt__Q53scn4step4hero7fighter20StateFirstMotionDash: - .incbin "baserom.dol", 0x48A538, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039D298 + .4byte 0x8039D29C + .4byte 0x8039D424 + .4byte 0x8035550C + .4byte 0x8039D428 + .4byte 0x8039D42C + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFixed.s b/asm/src/StateFixed.s index bbadbaec..29ff6967 100644 --- a/asm/src/StateFixed.s +++ b/asm/src/StateFixed.s @@ -63,4 +63,9 @@ __dt__Q53scn4step4item5state10StateFixedFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateFixed __vt__Q53scn4step4item5state10StateFixed: - .incbin "baserom.dol", 0x48E6C0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C7E08 + .4byte 0x803C51FC + .4byte 0x803C7D98 + .4byte 0x803C5204 diff --git a/asm/src/StateFlight.s b/asm/src/StateFlight.s index 3772ea2d..a65ae2f8 100644 --- a/asm/src/StateFlight.s +++ b/asm/src/StateFlight.s @@ -418,7 +418,19 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateF .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A0E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80398EB8 + .4byte 0x80398E9C .global __vt__Q53scn4step4hero4wing11StateFlight __vt__Q53scn4step4hero4wing11StateFlight: - .incbin "baserom.dol", 0x48A0F8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80398A60 + .4byte 0x80398B04 + .4byte 0x80398C64 + .4byte 0x8035550C + .4byte 0x80398CE4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateFlightFar.s b/asm/src/StateFlightFar.s index d5c54fc9..85f0e061 100644 --- a/asm/src/StateFlightFar.s +++ b/asm/src/StateFlightFar.s @@ -412,15 +412,25 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462C10, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80248EE4 ;# ptr + .4byte 0x80248EC8 ;# ptr .global __vt__Q53scn4step4boss9creditdee14StateFlightFar __vt__Q53scn4step4boss9creditdee14StateFlightFar: - .incbin "baserom.dol", 0x462C20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80248BBC ;# ptr + .4byte 0x80248C3C ;# ptr + .4byte 0x80248CF0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80248DD8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255678 $$255678: - .incbin "baserom.dol", 0x49B1B8, 0x4 + .4byte 0 .global $$255679 $$255679: - .incbin "baserom.dol", 0x49B1BC, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateFlush.s b/asm/src/StateFlush.s index a530432c..47f1339c 100644 --- a/asm/src/StateFlush.s +++ b/asm/src/StateFlush.s @@ -133,12 +133,21 @@ __dt__Q53scn4step5enemy6common10StateFlushFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common10StateFlush __vt__Q53scn4step5enemy6common10StateFlush: - .incbin "baserom.dol", 0x46F158, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80291F10 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x80291DB4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254965 $$254965: - .incbin "baserom.dol", 0x49BB20, 0x8 + .4byte 0x40C00000 + .4byte 0 .global $$254968 $$254968: - .incbin "baserom.dol", 0x49BB28, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateFlushWait.s b/asm/src/StateFlushWait.s index 388328ad..e91d9a68 100644 --- a/asm/src/StateFlushWait.s +++ b/asm/src/StateFlushWait.s @@ -111,21 +111,31 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46F178, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80292074 ;# ptr + .4byte 0x80292054 ;# ptr .global __vt__Q53scn4step5enemy6common14StateFlushWait __vt__Q53scn4step5enemy6common14StateFlushWait: - .incbin "baserom.dol", 0x46F188, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80292070 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80291F80 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 $$255730: - .incbin "baserom.dol", 0x49BB30, 0x4 + .4byte 0x41000000 .global $$255731 $$255731: - .incbin "baserom.dol", 0x49BB34, 0x4 + .4byte 0xC1000000 .global $$255732 $$255732: - .incbin "baserom.dol", 0x49BB38, 0x4 + .4byte 0xC0F00000 .global $$255733 $$255733: - .incbin "baserom.dol", 0x49BB3C, 0x4 + .4byte 0x40F00000 diff --git a/asm/src/StateFly.s b/asm/src/StateFly.s index 28a7a500..8244ba39 100644 --- a/asm/src/StateFly.s +++ b/asm/src/StateFly.s @@ -1625,84 +1625,153 @@ procFixPos__Q53scn4step5enemy6sodory8StateFlyFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster8StateFly __vt__Q53scn4step4boss15challengemaster8StateFly: - .incbin "baserom.dol", 0x461E98, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8023FF8C ;# ptr + .4byte 0x8023FF90 ;# ptr + .4byte 0x802400A0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802400A4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8StateFly __vt__Q53scn4step5enemy6common8StateFly: - .incbin "baserom.dol", 0x46F1A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802920F0 ;# ptr + .4byte 0x802920F4 ;# ptr + .4byte 0x802920F8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80292200 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt8StateFly __vt__Q53scn4step5enemy10brontoburt8StateFly: - .incbin "baserom.dol", 0x470B88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029F86C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8029F57C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029F69C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cerulean8StateFly __vt__Q53scn4step5enemy8cerulean8StateFly: - .incbin "baserom.dol", 0x4716B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A57B8 ;# ptr + .4byte 0x802A57BC ;# ptr + .4byte 0x802A586C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A5964 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout8StateFly __vt__Q53scn4step5enemy6degout8StateFly: - .incbin "baserom.dol", 0x472180, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ADB34 ;# ptr + .4byte 0x802ADAD0 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr8StateFly __vt__Q53scn4step5enemy8dubiorjr8StateFly: - .incbin "baserom.dol", 0x472428, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AE698 ;# ptr + .4byte 0x802AE69C ;# ptr + .4byte 0x802AE6A0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AE6F4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra8StateFly __vt__Q53scn4step5enemy5gemra8StateFly: - .incbin "baserom.dol", 0x473218, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B64DC ;# ptr + .4byte 0x802B64E0 ;# ptr + .4byte 0x802B65CC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B65F8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477980, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DC28C ;# ptr + .4byte 0x802DC26C ;# ptr .global __vt__Q53scn4step5enemy8searches8StateFly __vt__Q53scn4step5enemy8searches8StateFly: - .incbin "baserom.dol", 0x477990, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DC288 ;# ptr + .4byte 0x802DC174 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8StateFly __vt__Q53scn4step5enemy6sodory8StateFly: - .incbin "baserom.dol", 0x478FF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E61C0 ;# ptr + .4byte 0x802E61C4 ;# ptr + .4byte 0x802E6240 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E6284 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255233 $$255233: - .incbin "baserom.dol", 0x4953E8, 0x8 + .4byte 0x0000001E + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255684 $$255684: - .incbin "baserom.dol", 0x49BB40, 0x4 + .4byte 0x3CA3D70A .global $$255685 $$255685: - .incbin "baserom.dol", 0x49BB44, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255869 $$255869: - .incbin "baserom.dol", 0x49BED8, 0x4 + .4byte 0x3A83126F .global $$255884 $$255884: - .incbin "baserom.dol", 0x49BEDC, 0x4 + .4byte 0x3F000000 .global $$255885 $$255885: - .incbin "baserom.dol", 0x49BEE0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256042 $$256042: - .incbin "baserom.dol", 0x49C068, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255787 $$255787: - .incbin "baserom.dol", 0x49CEC8, 0x4 + .4byte 0 .global $$255788 $$255788: - .incbin "baserom.dol", 0x49CECC, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateFlyAround.s b/asm/src/StateFlyAround.s index 3c45ecb9..99401c51 100644 --- a/asm/src/StateFlyAround.s +++ b/asm/src/StateFlyAround.s @@ -957,43 +957,57 @@ lbl_802E3E80: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce14StateFlyAround __vt__Q53scn4step5enemy6pierce14StateFlyAround: - .incbin "baserom.dol", 0x476630, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CFD50 ;# ptr + .4byte 0x802CFD54 ;# ptr + .4byte 0x802CFFC4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D00C4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl14StateFlyAround __vt__Q53scn4step5enemy5snowl14StateFlyAround: - .incbin "baserom.dol", 0x478C20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E39F4 ;# ptr + .4byte 0x802E39F8 ;# ptr + .4byte 0x802E3C00 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E3D48 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 $$256372: - .incbin "baserom.dol", 0x49CA48, 0x4 + .4byte 0 .global $$256439 $$256439: - .incbin "baserom.dol", 0x49CA4C, 0x4 + .4byte 0x42B40000 .global $$256440 $$256440: - .incbin "baserom.dol", 0x49CA50, 0x4 + .4byte 0x43870000 .global $$256447 $$256447: - .incbin "baserom.dol", 0x49CA54, 0x4 + .4byte 0x43B40000 .global $$256460 $$256460: - .incbin "baserom.dol", 0x49CA58, 0x4 + .4byte 0x3F800000 .global $$256461 $$256461: - .incbin "baserom.dol", 0x49CA5C, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256260 $$256260: - .incbin "baserom.dol", 0x49CE40, 0x4 + .4byte 0x3F000000 .global $$256261 $$256261: - .incbin "baserom.dol", 0x49CE44, 0x4 + .4byte 0x3F800000 .global $$256287 $$256287: - .incbin "baserom.dol", 0x49CE48, 0x4 + .4byte 0 .global $$256288 $$256288: - .incbin "baserom.dol", 0x49CE4C, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/StateFlyAway.s b/asm/src/StateFlyAway.s index 2a3bc315..f91227b0 100644 --- a/asm/src/StateFlyAway.s +++ b/asm/src/StateFlyAway.s @@ -351,47 +351,59 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4632B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024BF58 ;# ptr + .4byte 0x8024BF3C ;# ptr .global __vt__Q53scn4step4boss10creditroah12StateFlyAway __vt__Q53scn4step4boss10creditroah12StateFlyAway: - .incbin "baserom.dol", 0x4632C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024BB60 ;# ptr + .4byte 0x8024BBD8 ;# ptr + .4byte 0x8024BC24 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024BD8C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255018 $$255018: - .incbin "baserom.dol", 0x495550, 0x4 + .4byte 0 .global $$255019 $$255019: - .incbin "baserom.dol", 0x495554, 0x4 + .4byte 0 .global $$255020 $$255020: - .incbin "baserom.dol", 0x495558, 0x4 + .4byte 0 .global $$255071 $$255071: - .incbin "baserom.dol", 0x49555C, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255489 $$255489: - .incbin "baserom.dol", 0x49B250, 0x4 + .4byte 0x3F800000 .global $$255490 $$255490: - .incbin "baserom.dol", 0x49B254, 0x4 + .4byte 0x42B40000 .global $$255491 $$255491: - .incbin "baserom.dol", 0x49B258, 0x4 + .4byte 0x4222F983 .global $$255492 $$255492: - .incbin "baserom.dol", 0x49B25C, 0x4 + .4byte 0x3C8EFA35 .global $$255493 $$255493: - .incbin "baserom.dol", 0x49B260, 0x4 + .4byte 0x43340000 .global $$255494 $$255494: - .incbin "baserom.dol", 0x49B264, 0x4 + .4byte 0xBD4CCCCD .global $$255495 $$255495: - .incbin "baserom.dol", 0x49B268, 0x8 + .4byte 0 + .4byte 0 .global $$255498 $$255498: - .incbin "baserom.dol", 0x49B270, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateFlyFarSinCurve.s b/asm/src/StateFlyFarSinCurve.s index db4943b1..5bc0b2b6 100644 --- a/asm/src/StateFlyFarSinCurve.s +++ b/asm/src/StateFlyFarSinCurve.s @@ -151,21 +151,29 @@ procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve: - .incbin "baserom.dol", 0x470BA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029F9B0 ;# ptr + .4byte 0x8029F9B4 ;# ptr + .4byte 0x8029F9B8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029FA78 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256604 $$256604: - .incbin "baserom.dol", 0x49BEE8, 0x4 + .4byte 0 .global $$256605 $$256605: - .incbin "baserom.dol", 0x49BEEC, 0x4 + .4byte 0x3C8EFA35 .global $$256606 $$256606: - .incbin "baserom.dol", 0x49BEF0, 0x4 + .4byte 0x41700000 .global $$256624 $$256624: - .incbin "baserom.dol", 0x49BEF4, 0x4 + .4byte 0x43B40000 .global $$256625 $$256625: - .incbin "baserom.dol", 0x49BEF8, 0x8 + .4byte 0x4222F983 + .4byte 0 diff --git a/asm/src/StateFlyPursuit.s b/asm/src/StateFlyPursuit.s index 755671c6..dfa336c3 100644 --- a/asm/src/StateFlyPursuit.s +++ b/asm/src/StateFlyPursuit.s @@ -491,18 +491,25 @@ lbl_802D0AEC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce15StateFlyPursuit __vt__Q53scn4step5enemy6pierce15StateFlyPursuit: - .incbin "baserom.dol", 0x476650, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D0554 ;# ptr + .4byte 0x802D0558 ;# ptr + .4byte 0x802D0708 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D0970 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 $$256306: - .incbin "baserom.dol", 0x49CA60, 0x4 + .4byte 0 .global $$256307 $$256307: - .incbin "baserom.dol", 0x49CA64, 0x4 + .4byte 0x40000000 .global $$256372 $$256372: - .incbin "baserom.dol", 0x49CA68, 0x4 + .4byte 0x3727C5AC .global $$256373 $$256373: - .incbin "baserom.dol", 0x49CA6C, 0x4 + .4byte 0x3F4CCCCD diff --git a/asm/src/StateFlySinCurve.s b/asm/src/StateFlySinCurve.s index 94f84eb3..efae3d6f 100644 --- a/asm/src/StateFlySinCurve.s +++ b/asm/src/StateFlySinCurve.s @@ -612,76 +612,91 @@ lbl_802D0F9C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateFlySinCurve __vt__Q53scn4step5enemy6common16StateFlySinCurve: - .incbin "baserom.dol", 0x46F1C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802922C4 ;# ptr + .4byte 0x802922C8 ;# ptr + .4byte 0x802922CC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802923D0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce16StateFlySinCurve __vt__Q53scn4step5enemy6pierce16StateFlySinCurve: - .incbin "baserom.dol", 0x476670, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D0BC8 ;# ptr + .4byte 0x802D0BCC ;# ptr + .4byte 0x802D0D98 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D0EB0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255895 $$255895: - .incbin "baserom.dol", 0x49BB48, 0x4 + .4byte 0 .global $$255896 $$255896: - .incbin "baserom.dol", 0x49BB4C, 0x4 + .4byte 0x3F800000 .global $$255897 $$255897: - .incbin "baserom.dol", 0x49BB50, 0x4 + .4byte 0xBF800000 .global $$255898 $$255898: - .incbin "baserom.dol", 0x49BB54, 0x4 + .4byte 0x3D23D70A .global $$255916 $$255916: - .incbin "baserom.dol", 0x49BB58, 0x4 + .4byte 0x3CA3D70A .global $$255917 $$255917: - .incbin "baserom.dol", 0x49BB5C, 0x4 + .4byte 0x40200000 .global $$255918 $$255918: - .incbin "baserom.dol", 0x49BB60, 0x4 + .4byte 0x43B40000 .global $$255919 $$255919: - .incbin "baserom.dol", 0x49BB64, 0x4 + .4byte 0x4222F983 .global $$255920 $$255920: - .incbin "baserom.dol", 0x49BB68, 0x4 + .4byte 0x3C8EFA35 .global $$255921 $$255921: - .incbin "baserom.dol", 0x49BB6C, 0x4 + .4byte 0x3FC00000 .global $$255940 $$255940: - .incbin "baserom.dol", 0x49BB70, 0x4 + .4byte 0x40000000 .global $$255941 $$255941: - .incbin "baserom.dol", 0x49BB74, 0x4 + .4byte 0x42B40000 .global $$255942 $$255942: - .incbin "baserom.dol", 0x49BB78, 0x8 + .4byte 0x43870000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256166 $$256166: - .incbin "baserom.dol", 0x49CA70, 0x4 + .4byte 0 .global $$256167 $$256167: - .incbin "baserom.dol", 0x49CA74, 0x4 + .4byte 0x3F800000 .global $$256168 $$256168: - .incbin "baserom.dol", 0x49CA78, 0x4 + .4byte 0xBF800000 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49CA7C, 0x4 + .4byte 0x43B40000 .global $$256211 $$256211: - .incbin "baserom.dol", 0x49CA80, 0x4 + .4byte 0x4222F983 .global $$256212 $$256212: - .incbin "baserom.dol", 0x49CA84, 0x4 + .4byte 0x3C8EFA35 .global $$256226 $$256226: - .incbin "baserom.dol", 0x49CA88, 0x4 + .4byte 0x42B40000 .global $$256227 $$256227: - .incbin "baserom.dol", 0x49CA8C, 0x4 + .4byte 0x43870000 diff --git a/asm/src/StateFlyStraight.s b/asm/src/StateFlyStraight.s index 6a9db767..ec9c61e0 100644 --- a/asm/src/StateFlyStraight.s +++ b/asm/src/StateFlyStraight.s @@ -459,34 +459,49 @@ lbl_802E42D4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf16StateFlyStraight __vt__Q53scn4step5enemy6owgulf16StateFlyStraight: - .incbin "baserom.dol", 0x475E58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CA93C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802CA7AC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CA830 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl16StateFlyStraight __vt__Q53scn4step5enemy5snowl16StateFlyStraight: - .incbin "baserom.dol", 0x478C40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E3F44 ;# ptr + .4byte 0x802E3F48 ;# ptr + .4byte 0x802E4154 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E41EC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255722 $$255722: - .incbin "baserom.dol", 0x49C948, 0x4 + .4byte 0x3DCCCCCD .global $$255723 $$255723: - .incbin "baserom.dol", 0x49C94C, 0x4 + .4byte 0x3A83126F .global $$255739 $$255739: - .incbin "baserom.dol", 0x49C950, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256178 $$256178: - .incbin "baserom.dol", 0x49CE50, 0x4 + .4byte 0x3F000000 .global $$256179 $$256179: - .incbin "baserom.dol", 0x49CE54, 0x4 + .4byte 0x3F800000 .global $$256200 $$256200: - .incbin "baserom.dol", 0x49CE58, 0x4 + .4byte 0 .global $$256201 $$256201: - .incbin "baserom.dol", 0x49CE5C, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/StateFlyUpDown.s b/asm/src/StateFlyUpDown.s index 6d474334..ad330fc3 100644 --- a/asm/src/StateFlyUpDown.s +++ b/asm/src/StateFlyUpDown.s @@ -340,43 +340,57 @@ lbl_802DB3CC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common14StateFlyUpDown __vt__Q53scn4step5enemy6common14StateFlyUpDown: - .incbin "baserom.dol", 0x46F1E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80292668 ;# ptr + .4byte 0x8029266C ;# ptr + .4byte 0x80292670 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029271C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown: - .incbin "baserom.dol", 0x477778, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DB218 ;# ptr + .4byte 0x802DB21C ;# ptr + .4byte 0x802DB220 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DB2E4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255699 $$255699: - .incbin "baserom.dol", 0x49BB80, 0x4 + .4byte 0 .global $$255711 $$255711: - .incbin "baserom.dol", 0x49BB84, 0x4 + .4byte 0x3FC00000 .global $$255712 $$255712: - .incbin "baserom.dol", 0x49BB88, 0x4 + .4byte 0x43B40000 .global $$255713 $$255713: - .incbin "baserom.dol", 0x49BB8C, 0x4 + .4byte 0x3FE00000 .global $$255727 $$255727: - .incbin "baserom.dol", 0x49BB90, 0x4 + .4byte 0x42B40000 .global $$255728 $$255728: - .incbin "baserom.dol", 0x49BB94, 0x4 + .4byte 0x43870000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 $$255730: - .incbin "baserom.dol", 0x49CC78, 0x4 + .4byte 0 .global $$255743 $$255743: - .incbin "baserom.dol", 0x49CC7C, 0x4 + .4byte 0x43B40000 .global $$255757 $$255757: - .incbin "baserom.dol", 0x49CC80, 0x4 + .4byte 0x42B40000 .global $$255758 $$255758: - .incbin "baserom.dol", 0x49CC84, 0x4 + .4byte 0x43870000 diff --git a/asm/src/StateFlyWait.s b/asm/src/StateFlyWait.s index d7ebbbd8..5163aeba 100644 --- a/asm/src/StateFlyWait.s +++ b/asm/src/StateFlyWait.s @@ -167,4 +167,11 @@ procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce12StateFlyWait __vt__Q53scn4step5enemy6pierce12StateFlyWait: - .incbin "baserom.dol", 0x476690, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D1028 ;# ptr + .4byte 0x802D102C ;# ptr + .4byte 0x802D1174 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateFlyWaitFix.s b/asm/src/StateFlyWaitFix.s index 7f2457f5..e4fd8aac 100644 --- a/asm/src/StateFlyWaitFix.s +++ b/asm/src/StateFlyWaitFix.s @@ -66,12 +66,19 @@ __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix: - .incbin "baserom.dol", 0x475E78, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CAA10 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802CA9B0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254812 $$254812: - .incbin "baserom.dol", 0x49C958, 0x4 + .4byte 0x3CA3D70A .global $$254813 $$254813: - .incbin "baserom.dol", 0x49C95C, 0x4 + .4byte 0 diff --git a/asm/src/StateFlyWall.s b/asm/src/StateFlyWall.s index 72211a89..a7a1ae23 100644 --- a/asm/src/StateFlyWall.s +++ b/asm/src/StateFlyWall.s @@ -533,30 +533,39 @@ lbl_8024096C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster12StateFlyWall __vt__Q53scn4step4boss15challengemaster12StateFlyWall: - .incbin "baserom.dol", 0x461EB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802402CC ;# ptr + .4byte 0x80240370 ;# ptr + .4byte 0x8024046C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80240668 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255893 $$255893: - .incbin "baserom.dol", 0x49B068, 0x4 + .4byte 0x3F800000 .global $$255897 $$255897: - .incbin "baserom.dol", 0x49B06C, 0x4 + .4byte 0 .global $$255958 $$255958: - .incbin "baserom.dol", 0x49B070, 0x4 + .4byte 0x3F000000 .global $$255959 $$255959: - .incbin "baserom.dol", 0x49B074, 0x4 + .4byte 0x43340000 .global $$255960 $$255960: - .incbin "baserom.dol", 0x49B078, 0x4 + .4byte 0x4222F983 .global $$255961 $$255961: - .incbin "baserom.dol", 0x49B07C, 0x4 + .4byte 0x3C8EFA35 .global $$255964 $$255964: - .incbin "baserom.dol", 0x49B080, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256023 $$256023: - .incbin "baserom.dol", 0x49B088, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/StateFlyWallStart.s b/asm/src/StateFlyWallStart.s index b31faa33..e0b488f7 100644 --- a/asm/src/StateFlyWallStart.s +++ b/asm/src/StateFlyWallStart.s @@ -258,10 +258,23 @@ __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1 __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1: - .incbin "baserom.dol", 0x461ED8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80240CD4 ;# ptr + .4byte 0x80240C90 ;# ptr .global __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1 __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1: - .incbin "baserom.dol", 0x461EE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80240CD0 ;# ptr + .4byte 0x80240CB0 ;# ptr .global __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart: - .incbin "baserom.dol", 0x461EF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80240B5C ;# ptr + .4byte 0x80240BF0 ;# ptr + .4byte 0x80240C88 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80240C8C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateFlyingOut.s b/asm/src/StateFlyingOut.s index f89ec48b..8c75192f 100644 --- a/asm/src/StateFlyingOut.s +++ b/asm/src/StateFlyingOut.s @@ -205,21 +205,29 @@ __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper14StateFlyingOut __vt__Q53scn4step5enemy7blipper14StateFlyingOut: - .incbin "baserom.dol", 0x46FFE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029AE30 ;# ptr + .4byte 0x8029AC9C ;# ptr + .4byte 0x8029AD60 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029ADC0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255853 $$255853: - .incbin "baserom.dol", 0x49BE00, 0x4 + .4byte 0 .global $$255877 $$255877: - .incbin "baserom.dol", 0x49BE04, 0x4 + .4byte 0x38D1B717 .global $$255878 $$255878: - .incbin "baserom.dol", 0x49BE08, 0x4 + .4byte 0x3E4CCCCD .global $$255879 $$255879: - .incbin "baserom.dol", 0x49BE0C, 0x4 + .4byte 0x3BC49BA6 .global $$255880 $$255880: - .incbin "baserom.dol", 0x49BE10, 0x8 + .4byte 0x3BA3D70A + .4byte 0 diff --git a/asm/src/StateFollow.s b/asm/src/StateFollow.s index 38fa9581..c62dff2c 100644 --- a/asm/src/StateFollow.s +++ b/asm/src/StateFollow.s @@ -359,33 +359,41 @@ __dt__Q53scn4step5enemy6juckle11StateFollowFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateFollow __vt__Q53scn4step5enemy6juckle11StateFollow: - .incbin "baserom.dol", 0x473E00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BC18C ;# ptr + .4byte 0x802BBE80 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255367 $$255367: - .incbin "baserom.dol", 0x49C620, 0x4 + .4byte 0 .global $$255368 $$255368: - .incbin "baserom.dol", 0x49C624, 0x4 + .4byte 0x43340000 .global $$255369 $$255369: - .incbin "baserom.dol", 0x49C628, 0x4 + .4byte 0x42340000 .global $$255370 $$255370: - .incbin "baserom.dol", 0x49C62C, 0x4 + .4byte 0xC2340000 .global $$255371 $$255371: - .incbin "baserom.dol", 0x49C630, 0x4 + .4byte 0xC3340000 .global $$255395 $$255395: - .incbin "baserom.dol", 0x49C634, 0x4 + .4byte 0x42B40000 .global $$255398 $$255398: - .incbin "baserom.dol", 0x49C638, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255413 $$255413: - .incbin "baserom.dol", 0x49C640, 0x4 + .4byte 0xBF800000 .global $$255430 $$255430: - .incbin "baserom.dol", 0x49C644, 0x4 + .4byte 0x41B40000 diff --git a/asm/src/StateFootSweep.s b/asm/src/StateFootSweep.s index a4a4336f..096bcfb1 100644 --- a/asm/src/StateFootSweep.s +++ b/asm/src/StateFootSweep.s @@ -365,21 +365,35 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A560, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039D9F0 + .4byte 0x8039D9D4 .global __vt__Q53scn4step4hero7fighter14StateFootSweep __vt__Q53scn4step4hero7fighter14StateFootSweep: - .incbin "baserom.dol", 0x48A570, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039D5DC + .4byte 0x8039D66C + .4byte 0x8039D778 + .4byte 0x8035550C + .4byte 0x8039D7CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257336 $$257336: - .incbin "baserom.dol", 0x49E2E8, 0x4 + .4byte 0xBE4CCCCD .global $$257337 $$257337: - .incbin "baserom.dol", 0x49E2EC, 0x4 + .4byte 0 .global $$257338 $$257338: - .incbin "baserom.dol", 0x49E2F0, 0x8 + .4byte 0x3E99999A + .4byte 0 .global $$257399 $$257399: - .incbin "baserom.dol", 0x49E2F8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateFootSweepEnd.s b/asm/src/StateFootSweepEnd.s index 39ce0da2..394910cc 100644 --- a/asm/src/StateFootSweepEnd.s +++ b/asm/src/StateFootSweepEnd.s @@ -84,4 +84,13 @@ procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter17StateFootSweepEnd __vt__Q53scn4step4hero7fighter17StateFootSweepEnd: - .incbin "baserom.dol", 0x48A598, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039DA6C + .4byte 0x8039DAE8 + .4byte 0x8039DAEC + .4byte 0x8035550C + .4byte 0x8039DAF0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateGather.s b/asm/src/StateGather.s index b224b86b..2ba82a51 100644 --- a/asm/src/StateGather.s +++ b/asm/src/StateGather.s @@ -196,30 +196,37 @@ __dt__Q53scn4step4item5state11StateGatherFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state11StateGather __vt__Q53scn4step4item5state11StateGather: - .incbin "baserom.dol", 0x48E6D8, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C80D4 + .4byte 0x803C7F10 + .4byte 0x803C7FD4 + .4byte 0x803C5204 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255059 $$255059: - .incbin "baserom.dol", 0x49E5D8, 0x4 + .4byte 0 .global $$255060 $$255060: - .incbin "baserom.dol", 0x49E5DC, 0x4 + .4byte 0x3F000000 .global $$255072 $$255072: - .incbin "baserom.dol", 0x49E5E0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$255075 $$255075: - .incbin "baserom.dol", 0x49E5E8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255079 $$255079: - .incbin "baserom.dol", 0x49E5F0, 0x4 + .4byte 0x41A00000 .global $$255080 $$255080: - .incbin "baserom.dol", 0x49E5F4, 0x4 + .4byte 0x4222F983 .global $$255081 $$255081: - .incbin "baserom.dol", 0x49E5F8, 0x4 + .4byte 0x3C8EFA35 .global $$255082 $$255082: - .incbin "baserom.dol", 0x49E5FC, 0x4 + .4byte 0x43340000 diff --git a/asm/src/StateGetShipParts.s b/asm/src/StateGetShipParts.s index 3fe34f0e..cc7f7197 100644 --- a/asm/src/StateGetShipParts.s +++ b/asm/src/StateGetShipParts.s @@ -332,21 +332,31 @@ lbl_8037FF00: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick17StateGetShipParts __vt__Q53scn4step4hero7gimmick17StateGetShipParts: - .incbin "baserom.dol", 0x488BB0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037FC1C + .4byte 0x8037FD2C + .4byte 0x8037FEC4 + .4byte 0x8035550C + .4byte 0x8037FEC8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259720 $$259720: - .incbin "baserom.dol", 0x49DF88, 0x4 + .4byte 0x3FA00000 .global $$259721 $$259721: - .incbin "baserom.dol", 0x49DF8C, 0x4 + .4byte 0x3F800000 .global $$259722 $$259722: - .incbin "baserom.dol", 0x49DF90, 0x4 + .4byte 0x43340000 .global $$259723 $$259723: - .incbin "baserom.dol", 0x49DF94, 0x4 + .4byte 0 .global $$259726 $$259726: - .incbin "baserom.dol", 0x49DF98, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateGlide.s b/asm/src/StateGlide.s index 3d15bcf4..4cf0cfe1 100644 --- a/asm/src/StateGlide.s +++ b/asm/src/StateGlide.s @@ -1070,69 +1070,91 @@ lbl_8024EEE4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1: - .incbin "baserom.dol", 0x462FD0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024A454 ;# ptr + .4byte 0x8024A434 ;# ptr .global __vt__Q53scn4step4boss10creditmeta10StateGlide __vt__Q53scn4step4boss10creditmeta10StateGlide: - .incbin "baserom.dol", 0x462FE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024A020 ;# ptr + .4byte 0x8024A024 ;# ptr + .4byte 0x8024A0A8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024A224 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior10StateGlide __vt__Q53scn4step4boss6dubior10StateGlide: - .incbin "baserom.dol", 0x4638D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024E7A4 ;# ptr + .4byte 0x8024E820 ;# ptr + .4byte 0x8024E978 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024ED44 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255202 $$255202: - .incbin "baserom.dol", 0x495508, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255695 $$255695: - .incbin "baserom.dol", 0x49B1D8, 0x4 + .4byte 0 .global $$255723 $$255723: - .incbin "baserom.dol", 0x49B1DC, 0x4 + .4byte 0x3C8EFA35 .global $$255738 $$255738: - .incbin "baserom.dol", 0x49B1E0, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256745 $$256745: - .incbin "baserom.dol", 0x49B298, 0x4 + .4byte 0x3F800000 .global $$256746 $$256746: - .incbin "baserom.dol", 0x49B29C, 0x4 + .4byte 0xBF800000 .global $$256747 $$256747: - .incbin "baserom.dol", 0x49B2A0, 0x4 + .4byte 0 .global $$256826 $$256826: - .incbin "baserom.dol", 0x49B2A4, 0x4 + .4byte 0x3FC00000 .global $$256827 $$256827: - .incbin "baserom.dol", 0x49B2A8, 0x4 + .4byte 0x3F000000 .global $$256828 $$256828: - .incbin "baserom.dol", 0x49B2AC, 0x4 + .4byte 0x40400000 .global $$256829 $$256829: - .incbin "baserom.dol", 0x49B2B0, 0x4 + .4byte 0x40000000 .global $$256830 $$256830: - .incbin "baserom.dol", 0x49B2B4, 0x4 + .4byte 0x43B40000 .global $$256831 $$256831: - .incbin "baserom.dol", 0x49B2B8, 0x4 + .4byte 0x42B40000 .global $$256832 $$256832: - .incbin "baserom.dol", 0x49B2BC, 0x4 + .4byte 0x43340000 .global $$256835 $$256835: - .incbin "baserom.dol", 0x49B2C0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256837 $$256837: - .incbin "baserom.dol", 0x49B2C8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256860 $$256860: - .incbin "baserom.dol", 0x49B2D0, 0x8 + .4byte 0x3E19999A + .4byte 0 diff --git a/asm/src/StateGlideAway.s b/asm/src/StateGlideAway.s index ba73c415..17fbbd2d 100644 --- a/asm/src/StateGlideAway.s +++ b/asm/src/StateGlideAway.s @@ -494,39 +494,47 @@ lbl_8024AB84: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta14StateGlideAway __vt__Q53scn4step4boss10creditmeta14StateGlideAway: - .incbin "baserom.dol", 0x463000, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024A5BC ;# ptr + .4byte 0x8024A668 ;# ptr + .4byte 0x8024A714 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024A924 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: - .incbin "baserom.dol", 0x49B1E8, 0x4 + .4byte 0 .global $$256126 $$256126: - .incbin "baserom.dol", 0x49B1EC, 0x4 + .4byte 0x3DCCCCCD .global $$256127 $$256127: - .incbin "baserom.dol", 0x49B1F0, 0x4 + .4byte 0x43340000 .global $$256128 $$256128: - .incbin "baserom.dol", 0x49B1F4, 0x4 + .4byte 0x3F800000 .global $$256129 $$256129: - .incbin "baserom.dol", 0x49B1F8, 0x4 + .4byte 0x42B40000 .global $$256130 $$256130: - .incbin "baserom.dol", 0x49B1FC, 0x4 + .4byte 0x43B40000 .global $$256133 $$256133: - .incbin "baserom.dol", 0x49B200, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256139 $$256139: - .incbin "baserom.dol", 0x49B208, 0x4 + .4byte 0x3C8EFA35 .global $$256160 $$256160: - .incbin "baserom.dol", 0x49B20C, 0x4 + .4byte 0x43610000 .global $$256161 $$256161: - .incbin "baserom.dol", 0x49B210, 0x4 + .4byte 0x3D99999A .global $$256162 $$256162: - .incbin "baserom.dol", 0x49B214, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StateGoodbye.s b/asm/src/StateGoodbye.s index 4b94b4d8..3a94642c 100644 --- a/asm/src/StateGoodbye.s +++ b/asm/src/StateGoodbye.s @@ -150,7 +150,65 @@ procFixPos__Q53scn4step5enemy6common12StateGoodbyeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256612 $$256612: - .incbin "baserom.dol", 0x46F208, 0xD0 + .4byte 0x80292928 ;# ptr + .4byte 0x802928F8 ;# ptr + .4byte 0x80292930 ;# ptr + .4byte 0x802928F0 ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x80292938 ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x80292900 ;# ptr + .4byte 0x80292920 ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x80292918 ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x80292910 ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x8029293C ;# ptr + .4byte 0x80292908 ;# ptr .global __vt__Q53scn4step5enemy6common12StateGoodbye __vt__Q53scn4step5enemy6common12StateGoodbye: - .incbin "baserom.dol", 0x46F2D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80292984 ;# ptr + .4byte 0x80292988 ;# ptr + .4byte 0x802929AC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80292A00 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateGrandLowperAppear.s b/asm/src/StateGrandLowperAppear.s index e7a3cc20..81380e3f 100644 --- a/asm/src/StateGrandLowperAppear.s +++ b/asm/src/StateGrandLowperAppear.s @@ -1437,206 +1437,273 @@ __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8armordee22StateGrandLowperAppear __vt__Q53scn4step5enemy8armordee22StateGrandLowperAppear: - .incbin "baserom.dol", 0x46F690, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802967A0 ;# ptr + .4byte 0x80296838 ;# ptr + .4byte 0x802968CC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802968D4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear: - .incbin "baserom.dol", 0x46FB18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80297BD0 ;# ptr + .4byte 0x80297C68 ;# ptr + .4byte 0x80297CFC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80297D00 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear: - .incbin "baserom.dol", 0x4704B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029D350 ;# ptr + .4byte 0x8029D3E8 ;# ptr + .4byte 0x8029D4B4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029D4B8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear: - .incbin "baserom.dol", 0x470FB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A13B8 ;# ptr + .4byte 0x802A1450 ;# ptr + .4byte 0x802A14E4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A14E8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear: - .incbin "baserom.dol", 0x474268, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BD180 ;# ptr + .4byte 0x802BD218 ;# ptr + .4byte 0x802BD344 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BD348 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear: - .incbin "baserom.dol", 0x475A78, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C8444 ;# ptr + .4byte 0x802C84DC ;# ptr + .4byte 0x802C859C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C85A0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear: - .incbin "baserom.dol", 0x477798, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DB488 ;# ptr + .4byte 0x802DB520 ;# ptr + .4byte 0x802DB614 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DB618 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear: - .incbin "baserom.dol", 0x477E90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DE7F4 ;# ptr + .4byte 0x802DE88C ;# ptr + .4byte 0x802DE920 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DE924 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A2C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EDC64 ;# ptr + .4byte 0x802EDC48 ;# ptr .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear: - .incbin "baserom.dol", 0x47A2D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EDA54 ;# ptr + .4byte 0x802EDAEC ;# ptr + .4byte 0x802EDBA0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EDBA4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: - .incbin "baserom.dol", 0x49BCE0, 0x4 + .4byte 0x4222F983 .global $$256598 $$256598: - .incbin "baserom.dol", 0x49BCE4, 0x4 + .4byte 0x3C8EFA35 .global $$256599 $$256599: - .incbin "baserom.dol", 0x49BCE8, 0x4 + .4byte 0x42B40000 .global $$256600 $$256600: - .incbin "baserom.dol", 0x49BCEC, 0x4 + .4byte 0x43B40000 .global $$256601 $$256601: - .incbin "baserom.dol", 0x49BCF0, 0x4 + .4byte 0x3F800000 .global $$256602 $$256602: - .incbin "baserom.dol", 0x49BCF4, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: - .incbin "baserom.dol", 0x49BD48, 0x4 + .4byte 0x4222F983 .global $$256598 $$256598: - .incbin "baserom.dol", 0x49BD4C, 0x4 + .4byte 0x3C8EFA35 .global $$256599 $$256599: - .incbin "baserom.dol", 0x49BD50, 0x4 + .4byte 0x42B40000 .global $$256600 $$256600: - .incbin "baserom.dol", 0x49BD54, 0x4 + .4byte 0x43B40000 .global $$256601 $$256601: - .incbin "baserom.dol", 0x49BD58, 0x4 + .4byte 0x3F800000 .global $$256602 $$256602: - .incbin "baserom.dol", 0x49BD5C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256493 $$256493: - .incbin "baserom.dol", 0x49BE70, 0x4 + .4byte 0x44340000 .global $$256494 $$256494: - .incbin "baserom.dol", 0x49BE74, 0x4 + .4byte 0x3F800000 .global $$256495 $$256495: - .incbin "baserom.dol", 0x49BE78, 0x4 + .4byte 0x42B40000 .global $$256496 $$256496: - .incbin "baserom.dol", 0x49BE7C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: - .incbin "baserom.dol", 0x49BF60, 0x4 + .4byte 0x4222F983 .global $$256598 $$256598: - .incbin "baserom.dol", 0x49BF64, 0x4 + .4byte 0x3C8EFA35 .global $$256599 $$256599: - .incbin "baserom.dol", 0x49BF68, 0x4 + .4byte 0x42B40000 .global $$256600 $$256600: - .incbin "baserom.dol", 0x49BF6C, 0x4 + .4byte 0xC4340000 .global $$256601 $$256601: - .incbin "baserom.dol", 0x49BF70, 0x4 + .4byte 0x3F800000 .global $$256602 $$256602: - .incbin "baserom.dol", 0x49BF74, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256576 $$256576: - .incbin "baserom.dol", 0x49C660, 0x4 + .4byte 0 .global $$256593 $$256593: - .incbin "baserom.dol", 0x49C664, 0x4 + .4byte 0x43B40000 .global $$256594 $$256594: - .incbin "baserom.dol", 0x49C668, 0x4 + .4byte 0x3F800000 .global $$256595 $$256595: - .incbin "baserom.dol", 0x49C66C, 0x4 + .4byte 0x42B40000 .global $$256596 $$256596: - .incbin "baserom.dol", 0x49C670, 0x8 + .4byte 0x44340000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256611 $$256611: - .incbin "baserom.dol", 0x49C8D8, 0x4 + .4byte 0x4222F983 .global $$256612 $$256612: - .incbin "baserom.dol", 0x49C8DC, 0x4 + .4byte 0x3C8EFA35 .global $$256613 $$256613: - .incbin "baserom.dol", 0x49C8E0, 0x4 + .4byte 0x42B40000 .global $$256614 $$256614: - .incbin "baserom.dol", 0x49C8E4, 0x4 + .4byte 0x44340000 .global $$256615 $$256615: - .incbin "baserom.dol", 0x49C8E8, 0x4 + .4byte 0x3F800000 .global $$256616 $$256616: - .incbin "baserom.dol", 0x49C8EC, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256585 $$256585: - .incbin "baserom.dol", 0x49CC88, 0x4 + .4byte 0x4222F983 .global $$256586 $$256586: - .incbin "baserom.dol", 0x49CC8C, 0x4 + .4byte 0x3C8EFA35 .global $$256587 $$256587: - .incbin "baserom.dol", 0x49CC90, 0x4 + .4byte 0x42B40000 .global $$256588 $$256588: - .incbin "baserom.dol", 0x49CC94, 0x4 + .4byte 0xC4340000 .global $$256589 $$256589: - .incbin "baserom.dol", 0x49CC98, 0x4 + .4byte 0x3F800000 .global $$256590 $$256590: - .incbin "baserom.dol", 0x49CC9C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256599 $$256599: - .incbin "baserom.dol", 0x49CD28, 0x4 + .4byte 0x4222F983 .global $$256600 $$256600: - .incbin "baserom.dol", 0x49CD2C, 0x4 + .4byte 0x3C8EFA35 .global $$256601 $$256601: - .incbin "baserom.dol", 0x49CD30, 0x4 + .4byte 0x42B40000 .global $$256602 $$256602: - .incbin "baserom.dol", 0x49CD34, 0x4 + .4byte 0x44340000 .global $$256603 $$256603: - .incbin "baserom.dol", 0x49CD38, 0x4 + .4byte 0x3F800000 .global $$256604 $$256604: - .incbin "baserom.dol", 0x49CD3C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256588 $$256588: - .incbin "baserom.dol", 0x49CFF8, 0x4 + .4byte 0 .global $$256602 $$256602: - .incbin "baserom.dol", 0x49CFFC, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateGrandLowperEscape.s b/asm/src/StateGrandLowperEscape.s index 245a3d18..85825669 100644 --- a/asm/src/StateGrandLowperEscape.s +++ b/asm/src/StateGrandLowperEscape.s @@ -1128,34 +1128,83 @@ lbl_802EDE88: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape: - .incbin "baserom.dol", 0x46FB38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80297DE8 ;# ptr + .4byte 0x80297E64 ;# ptr + .4byte 0x80297E68 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80297EC0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape: - .incbin "baserom.dol", 0x4704D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029D608 ;# ptr + .4byte 0x8029D684 ;# ptr + .4byte 0x8029D688 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029D6E0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape: - .incbin "baserom.dol", 0x470FD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A15D0 ;# ptr + .4byte 0x802A164C ;# ptr + .4byte 0x802A1650 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A16A8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape: - .incbin "baserom.dol", 0x474288, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BD430 ;# ptr + .4byte 0x802BD4AC ;# ptr + .4byte 0x802BD4B0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BD508 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape: - .incbin "baserom.dol", 0x475A98, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C8688 ;# ptr + .4byte 0x802C8704 ;# ptr + .4byte 0x802C8708 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C8760 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape: - .incbin "baserom.dol", 0x477EB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DEA0C ;# ptr + .4byte 0x802DEA88 ;# ptr + .4byte 0x802DEA8C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DEAE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape: - .incbin "baserom.dol", 0x47A2F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EDD4C ;# ptr + .4byte 0x802EDDC8 ;# ptr + .4byte 0x802EDDCC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EDE24 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateGrandLowperEscapeStart.s b/asm/src/StateGrandLowperEscapeStart.s index 172000c8..8218ad29 100644 --- a/asm/src/StateGrandLowperEscapeStart.s +++ b/asm/src/StateGrandLowperEscapeStart.s @@ -710,55 +710,125 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x46FB58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029806C ;# ptr + .4byte 0x80298050 ;# ptr .global __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x46FB68, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80297FAC ;# ptr + .4byte 0x80297FB0 ;# ptr + .4byte 0x80298048 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029804C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4704F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029D88C ;# ptr + .4byte 0x8029D870 ;# ptr .global __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x470508, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029D7CC ;# ptr + .4byte 0x8029D7D0 ;# ptr + .4byte 0x8029D868 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029D86C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470FF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A1854 ;# ptr + .4byte 0x802A1838 ;# ptr .global __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x471008, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A1794 ;# ptr + .4byte 0x802A1798 ;# ptr + .4byte 0x802A1830 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A1834 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4742A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802BD6B4 ;# ptr + .4byte 0x802BD698 ;# ptr .global __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x4742B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BD5F4 ;# ptr + .4byte 0x802BD5F8 ;# ptr + .4byte 0x802BD690 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BD694 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475AB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C890C ;# ptr + .4byte 0x802C88F0 ;# ptr .global __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x475AC8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C884C ;# ptr + .4byte 0x802C8850 ;# ptr + .4byte 0x802C88E8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C88EC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477ED0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DEC90 ;# ptr + .4byte 0x802DEC74 ;# ptr .global __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x477EE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DEBD0 ;# ptr + .4byte 0x802DEBD4 ;# ptr + .4byte 0x802DEC6C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DEC70 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A318, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EDFD0 ;# ptr + .4byte 0x802EDFB4 ;# ptr .global __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart: - .incbin "baserom.dol", 0x47A328, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EDF10 ;# ptr + .4byte 0x802EDF14 ;# ptr + .4byte 0x802EDFAC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EDFB0 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateGrandLowperLanding.s b/asm/src/StateGrandLowperLanding.s index 3ad1dfd7..b5189483 100644 --- a/asm/src/StateGrandLowperLanding.s +++ b/asm/src/StateGrandLowperLanding.s @@ -90,4 +90,11 @@ procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding: - .incbin "baserom.dol", 0x47A348, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EE044 ;# ptr + .4byte 0x802EE048 ;# ptr + .4byte 0x802EE0E0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EE0E4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateGroundAttack.s b/asm/src/StateGroundAttack.s index 954fd8e5..3e630732 100644 --- a/asm/src/StateGroundAttack.s +++ b/asm/src/StateGroundAttack.s @@ -111,4 +111,11 @@ procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory17StateGroundAttack __vt__Q53scn4step5enemy6sodory17StateGroundAttack: - .incbin "baserom.dol", 0x479018, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E635C ;# ptr + .4byte 0x802E6420 ;# ptr + .4byte 0x802E6424 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateGrow.s b/asm/src/StateGrow.s index 894feea4..33823d29 100644 --- a/asm/src/StateGrow.s +++ b/asm/src/StateGrow.s @@ -261,17 +261,27 @@ procFixPos__Q53scn4step4boss6whispy9StateGrowFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateGrow __vt__Q53scn4step4boss6whispy9StateGrow: - .incbin "baserom.dol", 0x466738, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025D9C0 ;# ptr + .4byte 0x8025D9C4 ;# ptr + .4byte 0x8025DCF0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025DCF4 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256186 $$256186: - .incbin "baserom.dol", 0x4957B8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256769 $$256769: - .incbin "baserom.dol", 0x49B540, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$256772 $$256772: - .incbin "baserom.dol", 0x49B548, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateGuard.s b/asm/src/StateGuard.s index 4263bcfb..960e9785 100644 --- a/asm/src/StateGuard.s +++ b/asm/src/StateGuard.s @@ -853,25 +853,57 @@ procFixPos__Q53scn4step4hero6damage10StateGuardFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge10StateGuard __vt__Q53scn4step4boss10gigantedge10StateGuard: - .incbin "baserom.dol", 0x464110, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80252424 ;# ptr + .4byte 0x802524C8 ;# ptr + .4byte 0x80252570 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802525C4 ;# ptr + .4byte 0x802525C8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: - .incbin "baserom.dol", 0x487D58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80363840 + .4byte 0x803637FC .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487D68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036383C + .4byte 0x8036381C .global __vt__Q53scn4step4hero6common10StateGuard __vt__Q53scn4step4hero6common10StateGuard: - .incbin "baserom.dol", 0x487D78, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803634A4 + .4byte 0x80363520 + .4byte 0x8036369C + .4byte 0x8035550C + .4byte 0x803636C0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateGuard __vt__Q53scn4step4hero6damage10StateGuard: - .incbin "baserom.dol", 0x4887E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037712C + .4byte 0x803771A8 + .4byte 0x8037721C + .4byte 0x8035550C + .4byte 0x80377240 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256790 $$256790: - .incbin "baserom.dol", 0x49DE70, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 diff --git a/asm/src/StateHadou.s b/asm/src/StateHadou.s index 3688e479..a8fe7e01 100644 --- a/asm/src/StateHadou.s +++ b/asm/src/StateHadou.s @@ -149,21 +149,29 @@ procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe10StateHadou __vt__Q53scn4step5enemy10knucklejoe10StateHadou: - .incbin "baserom.dol", 0x474A50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C024C ;# ptr + .4byte 0x802C02F4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C0380 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 $$255822: - .incbin "baserom.dol", 0x49C718, 0x4 + .4byte 0 .global $$255823 $$255823: - .incbin "baserom.dol", 0x49C71C, 0x4 + .4byte 0x42B40000 .global $$255824 $$255824: - .incbin "baserom.dol", 0x49C720, 0x4 + .4byte 0x3E800000 .global $$255832 $$255832: - .incbin "baserom.dol", 0x49C724, 0x4 + .4byte 0x3DCCCCCD .global $$255837 $$255837: - .incbin "baserom.dol", 0x49C728, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateHammerAirSpin.s b/asm/src/StateHammerAirSpin.s index ea69ddc1..7cd99d29 100644 --- a/asm/src/StateHammerAirSpin.s +++ b/asm/src/StateHammerAirSpin.s @@ -265,7 +265,19 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AF20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A2048 + .4byte 0x803A202C .global __vt__Q53scn4step4hero5smash18StateHammerAirSpin __vt__Q53scn4step4hero5smash18StateHammerAirSpin: - .incbin "baserom.dol", 0x48AF30, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A1E84 + .4byte 0x803A1F34 + .4byte 0x803A2024 + .4byte 0x8035550C + .4byte 0x803A2028 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateHammerStrongSwing.s b/asm/src/StateHammerStrongSwing.s index fc610605..cc03dcaa 100644 --- a/asm/src/StateHammerStrongSwing.s +++ b/asm/src/StateHammerStrongSwing.s @@ -192,7 +192,19 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AF58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A22C8 + .4byte 0x803A22AC .global __vt__Q53scn4step4hero5smash22StateHammerStrongSwing __vt__Q53scn4step4hero5smash22StateHammerStrongSwing: - .incbin "baserom.dol", 0x48AF68, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2200 + .4byte 0x803A2204 + .4byte 0x803A22A4 + .4byte 0x8035550C + .4byte 0x803A22A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateHang.s b/asm/src/StateHang.s index 4a9c15c3..d80f2dd1 100644 --- a/asm/src/StateHang.s +++ b/asm/src/StateHang.s @@ -874,55 +874,75 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interferenc .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como9StateHang __vt__Q53scn4step5enemy4como9StateHang: - .incbin "baserom.dol", 0x471D40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A85F4 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802A8420 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A8478 ;# ptr + .4byte 0x802A8554 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488598, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80371FF4 + .4byte 0x80371FD8 .global __vt__Q53scn4step4hero12interference9StateHang __vt__Q53scn4step4hero12interference9StateHang: - .incbin "baserom.dol", 0x4885A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80371954 + .4byte 0x80371A44 + .4byte 0x80371A9C + .4byte 0x80371AE0 + .4byte 0x80371DA4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256895 $$256895: - .incbin "baserom.dol", 0x49C108, 0x4 + .4byte 0x3DCCCCCD .global $$256896 $$256896: - .incbin "baserom.dol", 0x49C10C, 0x4 + .4byte 0 .global $$256897 $$256897: - .incbin "baserom.dol", 0x49C110, 0x4 + .4byte 0x3F99999A .global $$256898 $$256898: - .incbin "baserom.dol", 0x49C114, 0x4 + .4byte 0x3FA66666 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258465 $$258465: - .incbin "baserom.dol", 0x49DD18, 0x4 + .4byte 0 .global $$258466 $$258466: - .incbin "baserom.dol", 0x49DD1C, 0x4 + .4byte 0xBE99999A .global $$258467 $$258467: - .incbin "baserom.dol", 0x49DD20, 0x4 + .4byte 0x3E4CCCCD .global $$258468 $$258468: - .incbin "baserom.dol", 0x49DD24, 0x4 + .4byte 0x3F800000 .global $$258469 $$258469: - .incbin "baserom.dol", 0x49DD28, 0x4 + .4byte 0xBE4CCCCD .global $$258538 $$258538: - .incbin "baserom.dol", 0x49DD2C, 0x4 + .4byte 0x42480000 .global $$258541 $$258541: - .incbin "baserom.dol", 0x49DD30, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$258580 $$258580: - .incbin "baserom.dol", 0x49DD38, 0x4 + .4byte 0xB727C5AC .global $$258581 $$258581: - .incbin "baserom.dol", 0x49DD3C, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StateHeightAdjust.s b/asm/src/StateHeightAdjust.s index ad9d62c6..0f3864b1 100644 --- a/asm/src/StateHeightAdjust.s +++ b/asm/src/StateHeightAdjust.s @@ -262,21 +262,29 @@ procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior17StateHeightAdjust __vt__Q53scn4step4boss6dubior17StateHeightAdjust: - .incbin "baserom.dol", 0x4638F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024F0EC ;# ptr + .4byte 0x8024F0F0 ;# ptr + .4byte 0x8024F19C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024F2B8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255294 $$255294: - .incbin "baserom.dol", 0x49B2D8, 0x4 + .4byte 0 .global $$255295 $$255295: - .incbin "baserom.dol", 0x49B2DC, 0x4 + .4byte 0x3F800000 .global $$255296 $$255296: - .incbin "baserom.dol", 0x49B2E0, 0x4 + .4byte 0xBF800000 .global $$255297 $$255297: - .incbin "baserom.dol", 0x49B2E4, 0x4 + .4byte 0x3F000000 .global $$255333 $$255333: - .incbin "baserom.dol", 0x49B2E8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateHide.s b/asm/src/StateHide.s index 0515fcc4..3cedb58a 100644 --- a/asm/src/StateHide.s +++ b/asm/src/StateHide.s @@ -555,19 +555,47 @@ procFixPos__Q53scn4step4boss10creditroah9StateHideFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss12creditdedede9StateHide __vt__Q53scn4step4boss12creditdedede9StateHide: - .incbin "baserom.dol", 0x462840, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80247DC4 ;# ptr + .4byte 0x80247E54 ;# ptr + .4byte 0x80247E9C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80247EA0 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee9StateHide __vt__Q53scn4step4boss9creditdee9StateHide: - .incbin "baserom.dol", 0x462C40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80249008 ;# ptr + .4byte 0x80249098 ;# ptr + .4byte 0x80249124 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80249128 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta9StateHide __vt__Q53scn4step4boss10creditmeta9StateHide: - .incbin "baserom.dol", 0x463020, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024AC30 ;# ptr + .4byte 0x8024ACC0 ;# ptr + .4byte 0x8024AD08 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024AD0C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditroah9StateHide __vt__Q53scn4step4boss10creditroah9StateHide: - .incbin "baserom.dol", 0x4632E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024BFF8 ;# ptr + .4byte 0x8024C088 ;# ptr + .4byte 0x8024C0B0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024C0B4 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateHover.s b/asm/src/StateHover.s index 47605afe..096bdd09 100644 --- a/asm/src/StateHover.s +++ b/asm/src/StateHover.s @@ -965,28 +965,53 @@ procFixPos__Q53scn4step4hero6damage10StateHoverFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487DA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80364338 + .4byte 0x80364318 .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487DB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80364334 + .4byte 0x803642F8 .global __vt__Q53scn4step4hero6common10StateHover __vt__Q53scn4step4hero6common10StateHover: - .incbin "baserom.dol", 0x487DC0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80363BE0 + .4byte 0x80363C90 + .4byte 0x80363E70 + .4byte 0x8035550C + .4byte 0x80364128 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateHover __vt__Q53scn4step4hero6damage10StateHover: - .incbin "baserom.dol", 0x488808, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80377350 + .4byte 0x803773EC + .4byte 0x8037748C + .4byte 0x8035550C + .4byte 0x803774F4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258766 $$258766: - .incbin "baserom.dol", 0x49DB88, 0x4 + .4byte 0x3E4CCCCD .global $$258788 $$258788: - .incbin "baserom.dol", 0x49DB8C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257465 $$257465: - .incbin "baserom.dol", 0x49DE78, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateHoverFar.s b/asm/src/StateHoverFar.s index d64c199d..c579c04b 100644 --- a/asm/src/StateHoverFar.s +++ b/asm/src/StateHoverFar.s @@ -280,15 +280,25 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdede .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462860, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80248264 ;# ptr + .4byte 0x80248248 ;# ptr .global __vt__Q53scn4step4boss12creditdedede13StateHoverFar __vt__Q53scn4step4boss12creditdedede13StateHoverFar: - .incbin "baserom.dol", 0x462870, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024805C ;# ptr + .4byte 0x80248060 ;# ptr + .4byte 0x80248064 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802480F8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255585 $$255585: - .incbin "baserom.dol", 0x49B198, 0x4 + .4byte 0 .global $$255586 $$255586: - .incbin "baserom.dol", 0x49B19C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateHoverLanding.s b/asm/src/StateHoverLanding.s index bd67a942..cefb2fe1 100644 --- a/asm/src/StateHoverLanding.s +++ b/asm/src/StateHoverLanding.s @@ -164,7 +164,19 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487DE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80364540 + .4byte 0x80364524 .global __vt__Q53scn4step4hero6common17StateHoverLanding __vt__Q53scn4step4hero6common17StateHoverLanding: - .incbin "baserom.dol", 0x487DF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036443C + .4byte 0x80364440 + .4byte 0x803644C8 + .4byte 0x8035550C + .4byte 0x803644CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateIdling.s b/asm/src/StateIdling.s index 68b2bf9a..c9031d6c 100644 --- a/asm/src/StateIdling.s +++ b/asm/src/StateIdling.s @@ -371,18 +371,29 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4755A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C6C84 ;# ptr + .4byte 0x802C6C68 ;# ptr .global __vt__Q53scn4step5enemy8needlous11StateIdling __vt__Q53scn4step5enemy8needlous11StateIdling: - .incbin "baserom.dol", 0x4755B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C686C ;# ptr + .4byte 0x802C6914 ;# ptr + .4byte 0x802C698C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C6A0C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 $$256990: - .incbin "baserom.dol", 0x49C888, 0x4 + .4byte 0x3ECCCCCD .global $$257034 $$257034: - .incbin "baserom.dol", 0x49C88C, 0x4 + .4byte 0x3F800000 .global $$257035 $$257035: - .incbin "baserom.dol", 0x49C890, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateInit.s b/asm/src/StateInit.s index 7c78a752..184ea86e 100644 --- a/asm/src/StateInit.s +++ b/asm/src/StateInit.s @@ -383,14 +383,27 @@ procFixPos__Q53scn4step4hero11staffcredit9StateInitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8inactive9StateInit __vt__Q53scn4step4hero8inactive9StateInit: - .incbin "baserom.dol", 0x487A58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035D2E4 + .4byte 0x8035D340 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateInit __vt__Q53scn4step4hero11staffcredit9StateInit: - .incbin "baserom.dol", 0x48B0E8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A3DB0 + .4byte 0x803A3E2C + .4byte 0x803A3E78 + .4byte 0x8035550C + .4byte 0x803A3E7C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259466 $$259466: - .incbin "baserom.dol", 0x49E3A0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateItemGet.s b/asm/src/StateItemGet.s index 1e4d8206..74cc45c0 100644 --- a/asm/src/StateItemGet.s +++ b/asm/src/StateItemGet.s @@ -238,4 +238,13 @@ procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick12StateItemGet __vt__Q53scn4step4hero7gimmick12StateItemGet: - .incbin "baserom.dol", 0x488BD8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803800BC + .4byte 0x803801D4 + .4byte 0x80380250 + .4byte 0x8035550C + .4byte 0x80380254 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateJump.s b/asm/src/StateJump.s index 9e5c26b9..9248122d 100644 --- a/asm/src/StateJump.s +++ b/asm/src/StateJump.s @@ -4311,194 +4311,329 @@ __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredi .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateJump __vt__Q53scn4step4boss6common9StateJump: - .incbin "baserom.dol", 0x462480, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802467F0 ;# ptr + .4byte 0x80246870 ;# ptr + .4byte 0x802468A4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802468E0 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath9StateJump __vt__Q53scn4step4boss9moundeath9StateJump: - .incbin "baserom.dol", 0x465180, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80255C6C ;# ptr + .4byte 0x80255C70 ;# ptr + .4byte 0x80255C74 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80255CD4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateJump __vt__Q53scn4step5enemy7blipper9StateJump: - .incbin "baserom.dol", 0x470000, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029B084 ;# ptr + .4byte 0x8029AFB0 ;# ptr + .4byte 0x8029AFB4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029B014 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9StateJump __vt__Q53scn4step5enemy6bouncy9StateJump: - .incbin "baserom.dol", 0x470528, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029DBE0 ;# ptr + .4byte 0x8029D944 ;# ptr + .4byte 0x8029D9A0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029DAC4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateJump __vt__Q53scn4step5enemy4kabu9StateJump: - .incbin "baserom.dol", 0x4742D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BD72C ;# ptr + .4byte 0x802BD730 ;# ptr + .4byte 0x802BD868 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BD950 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateJump __vt__Q53scn4step5enemy6leafan9StateJump: - .incbin "baserom.dol", 0x475088, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C3DD4 ;# ptr + .4byte 0x802C3BEC ;# ptr + .4byte 0x802C3C90 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C3D14 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9StateJump __vt__Q53scn4step5enemy5rocky9StateJump: - .incbin "baserom.dol", 0x476F68, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D46F0 ;# ptr + .4byte 0x802D46F4 ;# ptr + .4byte 0x802D4870 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D48F0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477F00, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DF00C ;# ptr + .4byte 0x802DEFF0 ;# ptr .global __vt__Q53scn4step5enemy5sheld9StateJump __vt__Q53scn4step5enemy5sheld9StateJump: - .incbin "baserom.dol", 0x477F10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DEE20 ;# ptr + .4byte 0x802DEE9C ;# ptr + .4byte 0x802DEF2C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DEF30 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4786B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E1E08 ;# ptr + .4byte 0x802E1DEC ;# ptr .global __vt__Q53scn4step5enemy9sirkibble9StateJump __vt__Q53scn4step5enemy9sirkibble9StateJump: - .incbin "baserom.dol", 0x4786C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E1ABC ;# ptr + .4byte 0x802E1AC0 ;# ptr + .4byte 0x802E1C34 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E1CF4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateJump __vt__Q53scn4step5enemy11sisterbound9StateJump: - .incbin "baserom.dol", 0x478A60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E2F34 ;# ptr + .4byte 0x802E2F38 ;# ptr + .4byte 0x802E2FE4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E3068 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky9StateJump __vt__Q53scn4step5enemy6sparky9StateJump: - .incbin "baserom.dol", 0x479328, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E7164 ;# ptr + .4byte 0x802E7168 ;# ptr + .4byte 0x802E72C4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E7348 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateJump __vt__Q53scn4step5enemy9tsukikage9StateJump: - .incbin "baserom.dol", 0x479AA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EB588 ;# ptr + .4byte 0x802EB58C ;# ptr + .4byte 0x802EB65C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EB6F4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo9StateJump __vt__Q53scn4step5enemy9waddledoo9StateJump: - .incbin "baserom.dol", 0x47A8F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EFFA4 ;# ptr + .4byte 0x802EFD08 ;# ptr + .4byte 0x802EFDD8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EFE78 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487E20, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80364C58 + .4byte 0x80364C10 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487E30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80364C54 + .4byte 0x80364C30 .global __vt__Q53scn4step4hero6common9StateJump __vt__Q53scn4step4hero6common9StateJump: - .incbin "baserom.dol", 0x487E40, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803646B4 + .4byte 0x80364730 + .4byte 0x80364938 + .4byte 0x8035550C + .4byte 0x803649CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: - .incbin "baserom.dol", 0x48B110, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A4630 + .4byte 0x803A45F0 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48B120, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A462C + .4byte 0x803A4610 .global __vt__Q53scn4step4hero11staffcredit9StateJump __vt__Q53scn4step4hero11staffcredit9StateJump: - .incbin "baserom.dol", 0x48B130, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A4048 + .4byte 0x803A40C4 + .4byte 0x803A4234 + .4byte 0x8035550C + .4byte 0x803A448C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257111 $$257111: - .incbin "baserom.dol", 0x49B160, 0x4 + .4byte 0 .global $$257112 $$257112: - .incbin "baserom.dol", 0x49B164, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256117 $$256117: - .incbin "baserom.dol", 0x49B400, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255844 $$255844: - .incbin "baserom.dol", 0x49BE18, 0x4 + .4byte 0 .global $$255845 $$255845: - .incbin "baserom.dol", 0x49BE1C, 0x4 + .4byte 0x3F800000 .global $$255846 $$255846: - .incbin "baserom.dol", 0x49BE20, 0x4 + .4byte 0xBF800000 .global $$255867 $$255867: - .incbin "baserom.dol", 0x49BE24, 0x4 + .4byte 0x38D1B717 .global $$255868 $$255868: - .incbin "baserom.dol", 0x49BE28, 0x4 + .4byte 0x3E4CCCCD .global $$255869 $$255869: - .incbin "baserom.dol", 0x49BE2C, 0x4 + .4byte 0x3BC49BA6 .global $$255870 $$255870: - .incbin "baserom.dol", 0x49BE30, 0x8 + .4byte 0x3BA3D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255819 $$255819: - .incbin "baserom.dol", 0x49BE80, 0x4 + .4byte 0 .global $$255830 $$255830: - .incbin "baserom.dol", 0x49BE84, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256154 $$256154: - .incbin "baserom.dol", 0x49C678, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255874 $$255874: - .incbin "baserom.dol", 0x49C7E0, 0x8 + .4byte 0 + .4byte 0 .global $$255889 $$255889: - .incbin "baserom.dol", 0x49C7E8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256167 $$256167: - .incbin "baserom.dol", 0x49CD40, 0x4 + .4byte 0x3F800000 .global $$256168 $$256168: - .incbin "baserom.dol", 0x49CD44, 0x4 + .4byte 0x40000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256248 $$256248: - .incbin "baserom.dol", 0x49CE08, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255871 $$255871: - .incbin "baserom.dol", 0x49CE28, 0x4 + .4byte 0 .global $$255890 $$255890: - .incbin "baserom.dol", 0x49CE2C, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256307 $$256307: - .incbin "baserom.dol", 0x49CFA8, 0x4 + .4byte 0 .global $$256356 $$256356: - .incbin "baserom.dol", 0x49CFAC, 0x4 + .4byte 0x3F800000 .global $$256357 $$256357: - .incbin "baserom.dol", 0x49CFB0, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257601 $$257601: - .incbin "baserom.dol", 0x49DB90, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257888 $$257888: - .incbin "baserom.dol", 0x49E3A8, 0x4 + .4byte 0 .global $$257946 $$257946: - .incbin "baserom.dol", 0x49E3AC, 0x4 + .4byte 0x3FE00000 diff --git a/asm/src/StateJumpAttack.s b/asm/src/StateJumpAttack.s index d3127b64..6d081867 100644 --- a/asm/src/StateJumpAttack.s +++ b/asm/src/StateJumpAttack.s @@ -1167,44 +1167,81 @@ __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1 __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1: - .incbin "baserom.dol", 0x4624A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80246E98 ;# ptr + .4byte 0x80246E78 ;# ptr .global __vt__Q53scn4step4boss6common15StateJumpAttack __vt__Q53scn4step4boss6common15StateJumpAttack: - .incbin "baserom.dol", 0x4624B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80246C88 ;# ptr + .4byte 0x80246C8C ;# ptr + .4byte 0x80246CF8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80246D40 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1: - .incbin "baserom.dol", 0x4670E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80261E0C ;# ptr + .4byte 0x80261E08 ;# ptr .global __vt__Q53scn4step4boss9zankibble15StateJumpAttack __vt__Q53scn4step4boss9zankibble15StateJumpAttack: - .incbin "baserom.dol", 0x4670F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802619A4 ;# ptr + .4byte 0x802619A8 ;# ptr + .4byte 0x80261A14 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80261BDC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack: - .incbin "baserom.dol", 0x4786E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E1E84 ;# ptr + .4byte 0x802E1E88 ;# ptr + .4byte 0x802E1FC4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E2038 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack: - .incbin "baserom.dol", 0x479AC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EBF7C ;# ptr + .4byte 0x802EBAC4 ;# ptr + .4byte 0x802EBD38 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EBE24 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256369 $$256369: - .incbin "baserom.dol", 0x49B5C0, 0x4 + .4byte 0 .global $$256414 $$256414: - .incbin "baserom.dol", 0x49B5C4, 0x4 + .4byte 0x42B40000 .global $$256415 $$256415: - .incbin "baserom.dol", 0x49B5C8, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$256418 $$256418: - .incbin "baserom.dol", 0x49B5D0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256445 $$256445: - .incbin "baserom.dol", 0x49CFB8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateJumpAttackStart.s b/asm/src/StateJumpAttackStart.s index c35695cb..c7e87726 100644 --- a/asm/src/StateJumpAttackStart.s +++ b/asm/src/StateJumpAttackStart.s @@ -278,20 +278,41 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1 __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1: - .incbin "baserom.dol", 0x4624D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802470D0 ;# ptr + .4byte 0x802470AC ;# ptr .global __vt__Q53scn4step4boss6common20StateJumpAttackStart __vt__Q53scn4step4boss6common20StateJumpAttackStart: - .incbin "baserom.dol", 0x4624E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80246F5C ;# ptr + .4byte 0x80246F60 ;# ptr + .4byte 0x80247060 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802470A8 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1: - .incbin "baserom.dol", 0x467110, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80261F88 ;# ptr + .4byte 0x80261F3C ;# ptr .global __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart: - .incbin "baserom.dol", 0x467120, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80261E90 ;# ptr + .4byte 0x80261E94 ;# ptr + .4byte 0x80261F34 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80261F38 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254946 $$254946: - .incbin "baserom.dol", 0x49B168, 0x8 + .4byte 0x3C23D70A + .4byte 0 diff --git a/asm/src/StateJumpBig.s b/asm/src/StateJumpBig.s index a0068e84..c7acd5f3 100644 --- a/asm/src/StateJumpBig.s +++ b/asm/src/StateJumpBig.s @@ -338,30 +338,43 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4612C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802386C4 ;# ptr + .4byte 0x802386A8 ;# ptr .global __vt__Q53scn4step4boss7bonkers12StateJumpBig __vt__Q53scn4step4boss7bonkers12StateJumpBig: - .incbin "baserom.dol", 0x4612D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80238394 ;# ptr + .4byte 0x80238414 ;# ptr + .4byte 0x802385C8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802386A4 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256288 $$256288: - .incbin "baserom.dol", 0x49AF40, 0x8 + .4byte 0 + .4byte 0 .global $$256292 $$256292: - .incbin "baserom.dol", 0x49AF48, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256305 $$256305: - .incbin "baserom.dol", 0x49AF50, 0x4 + .4byte 0xBF800000 .global $$256328 $$256328: - .incbin "baserom.dol", 0x49AF54, 0x4 + .4byte 0x4222F983 .global $$256329 $$256329: - .incbin "baserom.dol", 0x49AF58, 0x4 + .4byte 0x3C8EFA35 .global $$256330 $$256330: - .incbin "baserom.dol", 0x49AF5C, 0x4 + .4byte 0x43340000 .global $$256333 $$256333: - .incbin "baserom.dol", 0x49AF60, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateJumpBigStart.s b/asm/src/StateJumpBigStart.s index 3f4a60a6..ad296835 100644 --- a/asm/src/StateJumpBigStart.s +++ b/asm/src/StateJumpBigStart.s @@ -100,7 +100,17 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4612F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802387E8 ;# ptr + .4byte 0x802387CC ;# ptr .global __vt__Q53scn4step4boss7bonkers17StateJumpBigStart __vt__Q53scn4step4boss7bonkers17StateJumpBigStart: - .incbin "baserom.dol", 0x461300, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80238728 ;# ptr + .4byte 0x8023872C ;# ptr + .4byte 0x802387C4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802387C8 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateJumpCenterAttack.s b/asm/src/StateJumpCenterAttack.s index 19150b98..d873633e 100644 --- a/asm/src/StateJumpCenterAttack.s +++ b/asm/src/StateJumpCenterAttack.s @@ -292,18 +292,27 @@ lbl_802542AC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack: - .incbin "baserom.dol", 0x464878, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80253FC8 ;# ptr + .4byte 0x80253FCC ;# ptr + .4byte 0x80254040 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80254220 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256165 $$256165: - .incbin "baserom.dol", 0x49B3B8, 0x4 + .4byte 0 .global $$256209 $$256209: - .incbin "baserom.dol", 0x49B3BC, 0x4 + .4byte 0x42B40000 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49B3C0, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$256213 $$256213: - .incbin "baserom.dol", 0x49B3C8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateJumpHold.s b/asm/src/StateJumpHold.s index a2d23059..03aca241 100644 --- a/asm/src/StateJumpHold.s +++ b/asm/src/StateJumpHold.s @@ -338,15 +338,27 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x487E68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80365110 + .4byte 0x803650F0 .global __vt__Q53scn4step4hero6common13StateJumpHold __vt__Q53scn4step4hero6common13StateJumpHold: - .incbin "baserom.dol", 0x487E78, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80364D8C + .4byte 0x80364E08 + .4byte 0x80364FB0 + .4byte 0x8035550C + .4byte 0x803650EC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256581 $$256581: - .incbin "baserom.dol", 0x49DB98, 0x4 + .4byte 0x3FE00000 .global $$256600 $$256600: - .incbin "baserom.dol", 0x49DB9C, 0x4 + .4byte 0 diff --git a/asm/src/StateJumpMachinegun.s b/asm/src/StateJumpMachinegun.s index 9c1140d7..22d1189f 100644 --- a/asm/src/StateJumpMachinegun.s +++ b/asm/src/StateJumpMachinegun.s @@ -405,24 +405,33 @@ reqMachinegun__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun: - .incbin "baserom.dol", 0x464898, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80254374 ;# ptr + .4byte 0x802543F4 ;# ptr + .4byte 0x802544F4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80254610 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256540 $$256540: - .incbin "baserom.dol", 0x49B3D0, 0x4 + .4byte 0 .global $$256569 $$256569: - .incbin "baserom.dol", 0x49B3D4, 0x4 + .4byte 0x3F800000 .global $$256570 $$256570: - .incbin "baserom.dol", 0x49B3D8, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$256573 $$256573: - .incbin "baserom.dol", 0x49B3E0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256579 $$256579: - .incbin "baserom.dol", 0x49B3E8, 0x4 + .4byte 0x3C8EFA35 .global $$256596 $$256596: - .incbin "baserom.dol", 0x49B3EC, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/StateJumpMachinegunStart.s b/asm/src/StateJumpMachinegunStart.s index 0d7806d7..4f2b9d3d 100644 --- a/asm/src/StateJumpMachinegunStart.s +++ b/asm/src/StateJumpMachinegunStart.s @@ -103,7 +103,17 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4648B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802549C4 ;# ptr + .4byte 0x802549A8 ;# ptr .global __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart: - .incbin "baserom.dol", 0x4648C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80254904 ;# ptr + .4byte 0x80254908 ;# ptr + .4byte 0x802549A0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802549A4 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateJumpStart.s b/asm/src/StateJumpStart.s index a55d36bc..12a8022e 100644 --- a/asm/src/StateJumpStart.s +++ b/asm/src/StateJumpStart.s @@ -915,55 +915,99 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1 __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1: - .incbin "baserom.dol", 0x462500, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802472E4 ;# ptr + .4byte 0x802472E0 ;# ptr .global __vt__Q53scn4step4boss6common14StateJumpStart __vt__Q53scn4step4boss6common14StateJumpStart: - .incbin "baserom.dol", 0x462510, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802471D8 ;# ptr + .4byte 0x802471DC ;# ptr + .4byte 0x802472A0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802472DC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477F30, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DF2D4 ;# ptr + .4byte 0x802DF2B8 ;# ptr .global __vt__Q53scn4step5enemy5sheld14StateJumpStart __vt__Q53scn4step5enemy5sheld14StateJumpStart: - .incbin "baserom.dol", 0x477F40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DF0F0 ;# ptr + .4byte 0x802DF0F4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DF1F4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound14StateJumpStart __vt__Q53scn4step5enemy11sisterbound14StateJumpStart: - .incbin "baserom.dol", 0x478A80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E3178 ;# ptr + .4byte 0x802E317C ;# ptr + .4byte 0x802E320C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E332C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487EA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80365620 + .4byte 0x803655DC .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487EB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036561C + .4byte 0x80365600 .global __vt__Q53scn4step4hero6common14StateJumpStart __vt__Q53scn4step4hero6common14StateJumpStart: - .incbin "baserom.dol", 0x487EC0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803653F0 + .4byte 0x80365480 + .4byte 0x803655D4 + .4byte 0x8035550C + .4byte 0x803655D8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256099 $$256099: - .incbin "baserom.dol", 0x49CD48, 0x4 + .4byte 0x3D4CCCCD .global $$256100 $$256100: - .incbin "baserom.dol", 0x49CD4C, 0x4 + .4byte 0x3A83126F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255920 $$255920: - .incbin "baserom.dol", 0x49CE30, 0x4 + .4byte 0 .global $$255942 $$255942: - .incbin "baserom.dol", 0x49CE34, 0x4 + .4byte 0x3F800000 .global $$255945 $$255945: - .incbin "baserom.dol", 0x49CE38, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258419 $$258419: - .incbin "baserom.dol", 0x49DBA0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateKiss.s b/asm/src/StateKiss.s index f89fef5f..c4cb2c58 100644 --- a/asm/src/StateKiss.s +++ b/asm/src/StateKiss.s @@ -680,30 +680,43 @@ __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interferen .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1 __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1: - .incbin "baserom.dol", 0x4885D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803729C8 + .4byte 0x80372944 .global __vt__Q53scn4step4hero12interference9StateKiss __vt__Q53scn4step4hero12interference9StateKiss: - .incbin "baserom.dol", 0x4885E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8037218C + .4byte 0x803722F4 + .4byte 0x803726A4 + .4byte 0x8035550C + .4byte 0x803726A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259088 $$259088: - .incbin "baserom.dol", 0x49DD40, 0x4 + .4byte 0 .global $$259197 $$259197: - .incbin "baserom.dol", 0x49DD44, 0x4 + .4byte 0x3F000000 .global $$259198 $$259198: - .incbin "baserom.dol", 0x49DD48, 0x4 + .4byte 0x4222F983 .global $$259199 $$259199: - .incbin "baserom.dol", 0x49DD4C, 0x4 + .4byte 0x3C8EFA35 .global $$259200 $$259200: - .incbin "baserom.dol", 0x49DD50, 0x4 + .4byte 0x43340000 .global $$259201 $$259201: - .incbin "baserom.dol", 0x49DD54, 0x4 + .4byte 0x3F800000 .global $$259205 $$259205: - .incbin "baserom.dol", 0x49DD58, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateKissReceive.s b/asm/src/StateKissReceive.s index 5803814e..2e8cfda7 100644 --- a/asm/src/StateKissReceive.s +++ b/asm/src/StateKissReceive.s @@ -444,24 +444,35 @@ procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference16StateKissReceive __vt__Q53scn4step4hero12interference16StateKissReceive: - .incbin "baserom.dol", 0x488608, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80372B6C + .4byte 0x80372CA8 + .4byte 0x80373034 + .4byte 0x8035550C + .4byte 0x80373038 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258092 $$258092: - .incbin "baserom.dol", 0x49DD60, 0x4 + .4byte 0x3F000000 .global $$258093 $$258093: - .incbin "baserom.dol", 0x49DD64, 0x4 + .4byte 0x4222F983 .global $$258094 $$258094: - .incbin "baserom.dol", 0x49DD68, 0x4 + .4byte 0x3C8EFA35 .global $$258095 $$258095: - .incbin "baserom.dol", 0x49DD6C, 0x4 + .4byte 0x43340000 .global $$258096 $$258096: - .incbin "baserom.dol", 0x49DD70, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$258100 $$258100: - .incbin "baserom.dol", 0x49DD78, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateLadder.s b/asm/src/StateLadder.s index 61b08231..a3d8cfc5 100644 --- a/asm/src/StateLadder.s +++ b/asm/src/StateLadder.s @@ -1105,27 +1105,39 @@ __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1 __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1: - .incbin "baserom.dol", 0x487EE8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803665D0 + .4byte 0x803665B0 .global __vt__Q53scn4step4hero6common11StateLadder __vt__Q53scn4step4hero6common11StateLadder: - .incbin "baserom.dol", 0x487EF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80365EE4 + .4byte 0x80365FC0 + .4byte 0x803660E8 + .4byte 0x8035550C + .4byte 0x80366328 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259367 $$259367: - .incbin "baserom.dol", 0x49DBA8, 0x4 + .4byte 0 .global $$259437 $$259437: - .incbin "baserom.dol", 0x49DBAC, 0x4 + .4byte 0x3F000000 .global $$259438 $$259438: - .incbin "baserom.dol", 0x49DBB0, 0x4 + .4byte 0xBF000000 .global $$259485 $$259485: - .incbin "baserom.dol", 0x49DBB4, 0x4 + .4byte 0x43340000 .global $$259524 $$259524: - .incbin "baserom.dol", 0x49DBB8, 0x4 + .4byte 0x3F800000 .global $$259563 $$259563: - .incbin "baserom.dol", 0x49DBBC, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateLanding.s b/asm/src/StateLanding.s index 71ed60bf..dfa84acb 100644 --- a/asm/src/StateLanding.s +++ b/asm/src/StateLanding.s @@ -2493,110 +2493,213 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common12StateLanding __vt__Q53scn4step4boss6common12StateLanding: - .incbin "baserom.dol", 0x462530, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802473A4 ;# ptr + .4byte 0x802473EC ;# ptr + .4byte 0x802473F0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80247438 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StateLanding __vt__Q53scn4step5enemy6common12StateLanding: - .incbin "baserom.dol", 0x46F2F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80292A64 ;# ptr + .4byte 0x80292A68 ;# ptr + .4byte 0x80292B98 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80292B9C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper12StateLanding __vt__Q53scn4step5enemy7blipper12StateLanding: - .incbin "baserom.dol", 0x470020, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029B298 ;# ptr + .4byte 0x8029B108 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029B1FC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bonkersbomb12StateLanding __vt__Q53scn4step5enemy11bonkersbomb12StateLanding: - .incbin "baserom.dol", 0x470108, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029C350 ;# ptr + .4byte 0x8029C354 ;# ptr + .4byte 0x8029C4E4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029C564 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy12StateLanding __vt__Q53scn4step5enemy6bouncy12StateLanding: - .incbin "baserom.dol", 0x470548, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029DC48 ;# ptr + .4byte 0x8029DC44 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan12StateLanding __vt__Q53scn4step5enemy6leafan12StateLanding: - .incbin "baserom.dol", 0x4750A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C3E38 ;# ptr + .4byte 0x802C3E3C ;# ptr + .4byte 0x802C3F6C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C3F70 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4761B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CCCF0 ;# ptr + .4byte 0x802CCCD4 ;# ptr .global __vt__Q53scn4step5enemy10parasoldee12StateLanding __vt__Q53scn4step5enemy10parasoldee12StateLanding: - .incbin "baserom.dol", 0x4761C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CCA94 ;# ptr + .4byte 0x802CCB2C ;# ptr + .4byte 0x802CCBD0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CCC24 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476368, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CEB3C ;# ptr + .4byte 0x802CEB20 ;# ptr .global __vt__Q53scn4step5enemy10parasoldoo12StateLanding __vt__Q53scn4step5enemy10parasoldoo12StateLanding: - .incbin "baserom.dol", 0x476378, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CE8F8 ;# ptr + .4byte 0x802CE978 ;# ptr + .4byte 0x802CEA1C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CEA70 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476F88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D4E3C ;# ptr + .4byte 0x802D4E20 ;# ptr .global __vt__Q53scn4step5enemy5rocky12StateLanding __vt__Q53scn4step5enemy5rocky12StateLanding: - .incbin "baserom.dol", 0x476F98, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D4A74 ;# ptr + .4byte 0x802D4A78 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D4B60 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound12StateLanding __vt__Q53scn4step5enemy11sisterbound12StateLanding: - .incbin "baserom.dol", 0x478AA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E3480 ;# ptr + .4byte 0x802E3484 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E3488 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage12StateLanding __vt__Q53scn4step5enemy9tsukikage12StateLanding: - .incbin "baserom.dol", 0x479AE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EBFF8 ;# ptr + .4byte 0x802EC078 ;# ptr + .4byte 0x802EC108 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EC10C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489B88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80390E68 + .4byte 0x80390E48 .global __vt__Q53scn4step4hero5stone12StateLanding __vt__Q53scn4step4hero5stone12StateLanding: - .incbin "baserom.dol", 0x489B98, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80390B14 + .4byte 0x80390B88 + .4byte 0x80390D50 + .4byte 0x8035550C + .4byte 0x80390D90 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254872 $$254872: - .incbin "baserom.dol", 0x495B10, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254882 $$254882: - .incbin "baserom.dol", 0x49B170, 0x8 + .4byte 0x3C23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255350 $$255350: - .incbin "baserom.dol", 0x49BE58, 0x4 + .4byte 0 .global $$255351 $$255351: - .incbin "baserom.dol", 0x49BE5C, 0x4 + .4byte 0xBE99999A .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257248 $$257248: - .incbin "baserom.dol", 0x49C9C0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257206 $$257206: - .incbin "baserom.dol", 0x49CA10, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256334 $$256334: - .incbin "baserom.dol", 0x49CB40, 0x4 + .4byte 0 .global $$256379 $$256379: - .incbin "baserom.dol", 0x49CB44, 0x4 + .4byte 0x3F800000 .global $$256380 $$256380: - .incbin "baserom.dol", 0x49CB48, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateLaugh.s b/asm/src/StateLaugh.s index beee4689..64e3c9cb 100644 --- a/asm/src/StateLaugh.s +++ b/asm/src/StateLaugh.s @@ -192,7 +192,17 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461F18, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80240F48 ;# ptr + .4byte 0x80240F2C ;# ptr .global __vt__Q53scn4step4boss15challengemaster10StateLaugh __vt__Q53scn4step4boss15challengemaster10StateLaugh: - .incbin "baserom.dol", 0x461F28, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80240DE0 ;# ptr + .4byte 0x80240E60 ;# ptr + .4byte 0x80240F24 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80240F28 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateLeaveChallengeDoor.s b/asm/src/StateLeaveChallengeDoor.s index b0c46efd..97ae1690 100644 --- a/asm/src/StateLeaveChallengeDoor.s +++ b/asm/src/StateLeaveChallengeDoor.s @@ -415,9 +415,19 @@ procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor: - .incbin "baserom.dol", 0x488C00, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80380418 + .4byte 0x80380578 + .4byte 0x803807E8 + .4byte 0x8035550C + .4byte 0x80380830 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260395 $$260395: - .incbin "baserom.dol", 0x49DFA0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateLeaveLvMapDoor.s b/asm/src/StateLeaveLvMapDoor.s index e67075a3..a0ae152c 100644 --- a/asm/src/StateLeaveLvMapDoor.s +++ b/asm/src/StateLeaveLvMapDoor.s @@ -439,15 +439,31 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1: - .incbin "baserom.dol", 0x488C28, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80380E54 + .4byte 0x80380E10 .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1: - .incbin "baserom.dol", 0x488C38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80380E50 + .4byte 0x80380E30 .global __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor: - .incbin "baserom.dol", 0x488C48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803809C8 + .4byte 0x80380A7C + .4byte 0x80380DD0 + .4byte 0x8035550C + .4byte 0x80380E0C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259504 $$259504: - .incbin "baserom.dol", 0x49DFA8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateLeaveMahoroa.s b/asm/src/StateLeaveMahoroa.s index 38721d23..f24407b5 100644 --- a/asm/src/StateLeaveMahoroa.s +++ b/asm/src/StateLeaveMahoroa.s @@ -354,12 +354,21 @@ distance__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa: - .incbin "baserom.dol", 0x488C70, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80380FB4 + .4byte 0x80381024 + .4byte 0x803812E0 + .4byte 0x8035550C + .4byte 0x803812E4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258967 $$258967: - .incbin "baserom.dol", 0x49DFB0, 0x4 + .4byte 0 .global $$258968 $$258968: - .incbin "baserom.dol", 0x49DFB4, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/StateLeaveSubgameDoor.s b/asm/src/StateLeaveSubgameDoor.s index f5aec778..566e27fa 100644 --- a/asm/src/StateLeaveSubgameDoor.s +++ b/asm/src/StateLeaveSubgameDoor.s @@ -272,9 +272,19 @@ mfCinemaScopeDisable__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor: - .incbin "baserom.dol", 0x488C98, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803814E8 + .4byte 0x803815B8 + .4byte 0x803816BC + .4byte 0x8035550C + .4byte 0x803816C0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260106 $$260106: - .incbin "baserom.dol", 0x49DFB8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateLink.s b/asm/src/StateLink.s index 7f729984..0060b2d5 100644 --- a/asm/src/StateLink.s +++ b/asm/src/StateLink.s @@ -146,12 +146,23 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802CB3CC ;# ptr + .4byte 0x802CB3AC ;# ptr .global __vt__Q53scn4step5enemy7parasol9StateLink __vt__Q53scn4step5enemy7parasol9StateLink: - .incbin "baserom.dol", 0x476058, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CB3C8 ;# ptr + .4byte 0x802CB2AC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 $$256687: - .incbin "baserom.dol", 0x49C978, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateLogout.s b/asm/src/StateLogout.s index e987fbb5..e082deb4 100644 --- a/asm/src/StateLogout.s +++ b/asm/src/StateLogout.s @@ -218,4 +218,13 @@ procFixPos__Q53scn4step4hero6common11StateLogoutFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common11StateLogout __vt__Q53scn4step4hero6common11StateLogout: - .incbin "baserom.dol", 0x487F20, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803668BC + .4byte 0x803668C0 + .4byte 0x803668C4 + .4byte 0x8035550C + .4byte 0x803668C8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateLookAround.s b/asm/src/StateLookAround.s index 3b180978..58f80b7c 100644 --- a/asm/src/StateLookAround.s +++ b/asm/src/StateLookAround.s @@ -43,4 +43,11 @@ __dt__Q53scn4step5enemy6chilly15StateLookAroundFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly15StateLookAround __vt__Q53scn4step5enemy6chilly15StateLookAround: - .incbin "baserom.dol", 0x471A30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A68EC ;# ptr + .4byte 0x802A68E4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A68E8 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateLookBoss.s b/asm/src/StateLookBoss.s index 2dc67432..8793d2d2 100644 --- a/asm/src/StateLookBoss.s +++ b/asm/src/StateLookBoss.s @@ -542,36 +542,51 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48B158, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A4D94 + .4byte 0x803A4D74 .global __vt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: - .incbin "baserom.dol", 0x48B168, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A4D90 + .4byte 0x803A4D54 .global __vt__Q53scn4step4hero11staffcredit13StateLookBoss __vt__Q53scn4step4hero11staffcredit13StateLookBoss: - .incbin "baserom.dol", 0x48B178, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A4760 + .4byte 0x803A47DC + .4byte 0x803A49E4 + .4byte 0x8035550C + .4byte 0x803A49E8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257405 $$257405: - .incbin "baserom.dol", 0x49E3B0, 0x4 + .4byte 0x3F000000 .global $$257406 $$257406: - .incbin "baserom.dol", 0x49E3B4, 0x4 + .4byte 0x3727C5AC .global $$257408 $$257408: - .incbin "baserom.dol", 0x49E3B8, 0x4 + .4byte 0x42652EE1 .global $$257409 $$257409: - .incbin "baserom.dol", 0x49E3BC, 0x4 + .4byte 0xC3B40000 .global $$257410 $$257410: - .incbin "baserom.dol", 0x49E3C0, 0x4 + .4byte 0x43340000 .global $$257411 $$257411: - .incbin "baserom.dol", 0x49E3C4, 0x4 + .4byte 0x43B40000 .global $$257412 $$257412: - .incbin "baserom.dol", 0x49E3C8, 0x4 + .4byte 0xC3340000 .global $$257413 $$257413: - .incbin "baserom.dol", 0x49E3CC, 0x4 + .4byte 0x3D4CCCCD diff --git a/asm/src/StateLose.s b/asm/src/StateLose.s index 8fb1a486..24fb0784 100644 --- a/asm/src/StateLose.s +++ b/asm/src/StateLose.s @@ -86,4 +86,11 @@ procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster9StateLose __vt__Q53scn4step4boss15challengemaster9StateLose: - .incbin "baserom.dol", 0x461F48, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80241030 ;# ptr + .4byte 0x80241034 ;# ptr + .4byte 0x80241038 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024103C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateLoseFly.s b/asm/src/StateLoseFly.s index 893d7b1a..ed9379fe 100644 --- a/asm/src/StateLoseFly.s +++ b/asm/src/StateLoseFly.s @@ -475,25 +475,37 @@ __sinit_$$3StateLoseFly_cpp: /* 802416E0 0023D520 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x40247C, 0x4 + .4byte 0x802416BC ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461F68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802416B8 ;# ptr + .4byte 0x8024169C ;# ptr .global __vt__Q53scn4step4boss15challengemaster12StateLoseFly __vt__Q53scn4step4boss15challengemaster12StateLoseFly: - .incbin "baserom.dol", 0x461F78, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80241178 ;# ptr + .4byte 0x8024117C ;# ptr + .4byte 0x80241340 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802415F8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256401 $$256401: - .incbin "baserom.dol", 0x4953F0, 0x8 + .4byte 0x3D4CCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257754 $$257754: - .incbin "baserom.dol", 0x49B090, 0x8 + .4byte 0x3727C5AC + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global SQ_LIMIT_DIST__Q53scn4step4boss15challengemaster26$$2unnamed$$2StateLoseFly_cpp$$2 diff --git a/asm/src/StateLostHat.s b/asm/src/StateLostHat.s index f95cfd09..55f347a3 100644 --- a/asm/src/StateLostHat.s +++ b/asm/src/StateLostHat.s @@ -121,4 +121,11 @@ procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5cappy12StateLostHat __vt__Q53scn4step5enemy5cappy12StateLostHat: - .incbin "baserom.dol", 0x471358, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A337C ;# ptr + .4byte 0x802A3380 ;# ptr + .4byte 0x802A3448 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A349C ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateMain.s b/asm/src/StateMain.s index be8bf185..a1b397b8 100644 --- a/asm/src/StateMain.s +++ b/asm/src/StateMain.s @@ -17275,865 +17275,1359 @@ __dt__Q53scn4step6weapon19challengemastershot9StateMainFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2 ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CB30, 0x10 + .4byte 0x0000015E + .4byte 0x0000016A + .4byte 0x00000177 + .4byte 0x0000017A .global ATTACK_SUB_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2 ATTACK_SUB_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CB40, 0x10 + .4byte 0x00000176 + .4byte 0x00000176 + .4byte 0x0000017D + .4byte 0x0000017D .global ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2 ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CB50, 0x10 + .4byte 0x0000015F + .4byte 0x0000016B + .4byte 0x00000178 + .4byte 0x0000017B .global ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2 ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CB60, 0x58 + .4byte 0x00000160 + .4byte 0x0000016C + .4byte 0x00000161 + .4byte 0x0000016D + .4byte 0x00000162 + .4byte 0x0000016E + .4byte 0x00000163 + .4byte 0x0000016F + .4byte 0x00000164 + .4byte 0x00000170 + .4byte 0x00000165 + .4byte 0x00000171 + .4byte 0x00000166 + .4byte 0x00000172 + .4byte 0x00000167 + .4byte 0x00000173 + .4byte 0x00000168 + .4byte 0x00000174 + .4byte 0x00000169 + .4byte 0x00000175 + .4byte 0x00000179 + .4byte 0x0000017C .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_WN_NODE_INTERVAL__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2 T_WN_NODE_INTERVAL__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CBC8, 0xC + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0x00000007 .global T_WN_GRAVITY__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2 T_WN_GRAVITY__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CBD4, 0xC + .4byte 0x3C23D70A + .4byte 0x3C23D70A + .4byte 0x3CA3D70A .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ROT_TABLE__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2 T_ROT_TABLE__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CC08, 0x10 + .4byte 0x41700000 + .4byte 0x41C80000 + .4byte 0x420C0000 + .4byte 0x42340000 .global T_HOLD_FRAME__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2 T_HOLD_FRAME__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: - .incbin "baserom.dol", 0x41CC18, 0x10 + .4byte 0x0000001E + .4byte 0x0000003C + .4byte 0x0000005A + .4byte 0x00000078 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9mbossdead9StateMain __vt__Q53scn4step5enemy9mbossdead9StateMain: - .incbin "baserom.dol", 0x475170, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C4904 ;# ptr + .4byte 0x802C4908 ;# ptr + .4byte 0x802C4960 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C49E8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7airball9StateMain __vt__Q53scn4step6weapon7airball9StateMain: - .incbin "baserom.dol", 0x48FFC8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DB650 + .4byte 0x803DB3D4 + .4byte 0x803DB444 + .4byte 0x803D895C + .4byte 0x803DB4C8 + .4byte 0x803DB53C .global __vt__Q53scn4step6weapon17fireburningbullet9StateMain __vt__Q53scn4step6weapon17fireburningbullet9StateMain: - .incbin "baserom.dol", 0x48FFE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DB768 + .4byte 0x803DB76C + .4byte 0x803DB8C8 + .4byte 0x803D895C + .4byte 0x803DB92C + .4byte 0x803DBAA8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv19StateMain __vt__Q53scn4step6weapon11starshotlv19StateMain: - .incbin "baserom.dol", 0x490098, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DC4A4 + .4byte 0x803DC51C + .4byte 0x803DC774 + .4byte 0x803D895C + .4byte 0x803DC7C4 + .4byte 0x803DC7C8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv29StateMain __vt__Q53scn4step6weapon11starshotlv29StateMain: - .incbin "baserom.dol", 0x490110, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DCDD0 + .4byte 0x803DCE48 + .4byte 0x803DD054 + .4byte 0x803D895C + .4byte 0x803DD058 + .4byte 0x803DD05C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv39StateMain __vt__Q53scn4step6weapon11starshotlv39StateMain: - .incbin "baserom.dol", 0x4901A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DD524 + .4byte 0x803DD528 + .4byte 0x803DD7A0 + .4byte 0x803D895C + .4byte 0x803DD7A4 + .4byte 0x803DD7A8 .global __vt__Q53scn4step6weapon11waterpistol9StateMain __vt__Q53scn4step6weapon11waterpistol9StateMain: - .incbin "baserom.dol", 0x4901C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DE040 + .4byte 0x803DDA38 + .4byte 0x803DDA9C + .4byte 0x803D895C + .4byte 0x803DDD90 + .4byte 0x803DDE04 .global __vt__Q53scn4step6weapon9swordbeam9StateMain __vt__Q53scn4step6weapon9swordbeam9StateMain: - .incbin "baserom.dol", 0x4901E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DE3FC + .4byte 0x803DE288 + .4byte 0x803DE2E0 + .4byte 0x803D895C + .4byte 0x803DE358 + .4byte 0x803DE35C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13whispyairball9StateMain __vt__Q53scn4step6weapon13whispyairball9StateMain: - .incbin "baserom.dol", 0x4902A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DEA3C + .4byte 0x803DE6E4 + .4byte 0x803DE6E8 + .4byte 0x803D895C + .4byte 0x803DE6EC + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7rollexp9StateMain __vt__Q53scn4step6weapon7rollexp9StateMain: - .incbin "baserom.dol", 0x4902F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DF074 + .4byte 0x803DEF88 + .4byte 0x803D8958 + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12leafanpollen9StateMain __vt__Q53scn4step6weapon12leafanpollen9StateMain: - .incbin "baserom.dol", 0x490348, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DF644 + .4byte 0x803DF2B0 + .4byte 0x803DF3B4 + .4byte 0x803D895C + .4byte 0x803DF490 + .4byte 0x803DF54C .global __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain: - .incbin "baserom.dol", 0x490368, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803DFC14 + .4byte 0x803DF850 + .4byte 0x803DF8A8 + .4byte 0x803D895C + .4byte 0x803DF8EC + .4byte 0x803D8964 .global __vt__Q53scn4step6weapon14gigantedgeshot9StateMain __vt__Q53scn4step6weapon14gigantedgeshot9StateMain: - .incbin "baserom.dol", 0x490388, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E0170 + .4byte 0x803DFEC8 + .4byte 0x803DFF20 + .4byte 0x803D895C + .4byte 0x803DFF24 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13gigatzobullet9StateMain __vt__Q53scn4step6weapon13gigatzobullet9StateMain: - .incbin "baserom.dol", 0x490480, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E1F48 + .4byte 0x803E0954 + .4byte 0x803E0A04 + .4byte 0x803D895C + .4byte 0x803E0B14 + .4byte 0x803E0CF8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10comothread9StateMain __vt__Q53scn4step6weapon10comothread9StateMain: - .incbin "baserom.dol", 0x490518, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E2738 + .4byte 0x803E23DC + .4byte 0x803E23E0 + .4byte 0x803D895C + .4byte 0x803E23E4 + .4byte 0x803D8964 .global __vt__Q53scn4step6weapon18watergalboroswater9StateMain __vt__Q53scn4step6weapon18watergalboroswater9StateMain: - .incbin "baserom.dol", 0x490538, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E2814 + .4byte 0x803E2818 + .4byte 0x803E287C + .4byte 0x803D895C + .4byte 0x803E28D4 + .4byte 0x803E2918 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16enemywaterbullet9StateMain __vt__Q53scn4step6weapon16enemywaterbullet9StateMain: - .incbin "baserom.dol", 0x4905D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E2E00 + .4byte 0x803E2E9C + .4byte 0x803E3088 + .4byte 0x803E3158 + .4byte 0x803E3254 + .4byte 0x803E337C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain: - .incbin "baserom.dol", 0x490670, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E37E8 + .4byte 0x803D8954 + .4byte 0x803D8958 + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803D8964 .global __vt__Q53scn4step6weapon15cutterfinalwave9StateMain __vt__Q53scn4step6weapon15cutterfinalwave9StateMain: - .incbin "baserom.dol", 0x490690, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E390C + .4byte 0x803E3910 + .4byte 0x803E396C + .4byte 0x803D895C + .4byte 0x803E39D0 + .4byte 0x803E3A24 .global __vt__Q53scn4step6weapon12sparkshotlv19StateMain __vt__Q53scn4step6weapon12sparkshotlv19StateMain: - .incbin "baserom.dol", 0x4906B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E3CA0 + .4byte 0x803E3BA8 + .4byte 0x803E3C00 + .4byte 0x803D895C + .4byte 0x803E3C04 + .4byte 0x803E3C08 .global __vt__Q53scn4step6weapon12sparkshotlv29StateMain __vt__Q53scn4step6weapon12sparkshotlv29StateMain: - .incbin "baserom.dol", 0x4906D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E3E30 + .4byte 0x803E3D74 + .4byte 0x803E3DCC + .4byte 0x803D895C + .4byte 0x803E3DD0 + .4byte 0x803E3DD4 .global __vt__Q53scn4step6weapon12sparkshotlv39StateMain __vt__Q53scn4step6weapon12sparkshotlv39StateMain: - .incbin "baserom.dol", 0x4906F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E3F60 + .4byte 0x803E3EFC + .4byte 0x803E3F54 + .4byte 0x803D895C + .4byte 0x803E3F58 + .4byte 0x803E3F5C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490780, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E463C + .4byte 0x803E4614 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x490790, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E4638 + .4byte 0x803E45B4 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x4907A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E4634 + .4byte 0x803E45D4 .global __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x4907B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E4630 + .4byte 0x803E45F4 .global __vt__Q53scn4step6weapon10spearspear9StateMain __vt__Q53scn4step6weapon10spearspear9StateMain: - .incbin "baserom.dol", 0x4907C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E41C4 + .4byte 0x803E4250 + .4byte 0x803E42BC + .4byte 0x803E4314 + .4byte 0x803E4470 + .4byte 0x803E45B0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4908D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E5AF0 + .4byte 0x803E5AD4 .global __vt__Q53scn4step6weapon12hammerhammer9StateMain __vt__Q53scn4step6weapon12hammerhammer9StateMain: - .incbin "baserom.dol", 0x4908E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E5880 + .4byte 0x803E58FC + .4byte 0x803E59C4 + .4byte 0x803D895C + .4byte 0x803E59C8 + .4byte 0x803E59CC .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8wingshot9StateMain __vt__Q53scn4step6weapon8wingshot9StateMain: - .incbin "baserom.dol", 0x490928, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E5DA8 + .4byte 0x803E5DAC + .4byte 0x803E5E8C + .4byte 0x803D895C + .4byte 0x803E5EE0 + .4byte 0x803E5EE4 .global __vt__Q53scn4step6weapon13wingshockwave9StateMain __vt__Q53scn4step6weapon13wingshockwave9StateMain: - .incbin "baserom.dol", 0x490948, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6080 + .4byte 0x803E6084 + .4byte 0x803E6164 + .4byte 0x803D895C + .4byte 0x803E61C8 + .4byte 0x803E61CC .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490988, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E6698 + .4byte 0x803E667C .global __vt__Q53scn4step6weapon16fightersmashshot9StateMain __vt__Q53scn4step6weapon16fightersmashshot9StateMain: - .incbin "baserom.dol", 0x490998, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E6490 + .4byte 0x803E650C + .4byte 0x803E6580 + .4byte 0x803D895C + .4byte 0x803E65E4 + .4byte 0x803E65E8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4909D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E6AB0 + .4byte 0x803E6A94 .global __vt__Q53scn4step6weapon15fighterkickshot9StateMain __vt__Q53scn4step6weapon15fighterkickshot9StateMain: - .incbin "baserom.dol", 0x4909E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E68A8 + .4byte 0x803E6924 + .4byte 0x803E6998 + .4byte 0x803D895C + .4byte 0x803E69FC + .4byte 0x803E6A00 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1 __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: - .incbin "baserom.dol", 0x490A58, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803E728C + .4byte 0x803E726C .global __vt__Q53scn4step6weapon16fighterhadoushot9StateMain __vt__Q53scn4step6weapon16fighterhadoushot9StateMain: - .incbin "baserom.dol", 0x490A68, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E7040 + .4byte 0x803E70CC + .4byte 0x803E7104 + .4byte 0x803D895C + .4byte 0x803E7108 + .4byte 0x803E710C .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12shotzobullet9StateMain __vt__Q53scn4step6weapon12shotzobullet9StateMain: - .incbin "baserom.dol", 0x490AC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E77F0 + .4byte 0x803E7564 + .4byte 0x803E768C + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803E7730 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15sirkibblecutter9StateMain __vt__Q53scn4step6weapon15sirkibblecutter9StateMain: - .incbin "baserom.dol", 0x490B10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E7B54 + .4byte 0x803E7BCC + .4byte 0x803E7C30 + .4byte 0x803D895C + .4byte 0x803E7CEC + .4byte 0x803E7EDC .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13owgulffeather9StateMain __vt__Q53scn4step6weapon13owgulffeather9StateMain: - .incbin "baserom.dol", 0x490B60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E8284 + .4byte 0x803E8300 + .4byte 0x803E837C + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803E8380 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon9foleyleaf9StateMain __vt__Q53scn4step6weapon9foleyleaf9StateMain: - .incbin "baserom.dol", 0x490BD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E87F0 + .4byte 0x803D8954 + .4byte 0x803E86FC + .4byte 0x803D895C + .4byte 0x803E8774 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10bowbyarrow9StateMain __vt__Q53scn4step6weapon10bowbyarrow9StateMain: - .incbin "baserom.dol", 0x490C48, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E9490 + .4byte 0x803E8EB8 + .4byte 0x803E9074 + .4byte 0x803D895C + .4byte 0x803E9208 + .4byte 0x803E93B0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12jucklecutter9StateMain __vt__Q53scn4step6weapon12jucklecutter9StateMain: - .incbin "baserom.dol", 0x490CA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E98C4 + .4byte 0x803E9694 + .4byte 0x803E9730 + .4byte 0x803D895C + .4byte 0x803E97A4 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain: - .incbin "baserom.dol", 0x490CF0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E9F68 + .4byte 0x803D8954 + .4byte 0x803E9CE4 + .4byte 0x803D895C + .4byte 0x803E9CE8 + .4byte 0x803E9E78 .global __vt__Q53scn4step6weapon15knucklejoehadou9StateMain __vt__Q53scn4step6weapon15knucklejoehadou9StateMain: - .incbin "baserom.dol", 0x490D10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EA078 + .4byte 0x803EA0F4 + .4byte 0x803EA164 + .4byte 0x803D895C + .4byte 0x803EA1E8 + .4byte 0x803EA22C .global __vt__Q53scn4step6weapon9snowlball9StateMain __vt__Q53scn4step6weapon9snowlball9StateMain: - .incbin "baserom.dol", 0x490D30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EA520 + .4byte 0x803D8954 + .4byte 0x803EA370 + .4byte 0x803D895C + .4byte 0x803EA374 + .4byte 0x803EA42C .global __vt__Q53scn4step6weapon10floweffect9StateMain __vt__Q53scn4step6weapon10floweffect9StateMain: - .incbin "baserom.dol", 0x490D50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EA5C0 + .4byte 0x803EA5B0 + .4byte 0x803EA5B4 + .4byte 0x803D895C + .4byte 0x803EA5B8 + .4byte 0x803EA5BC .global __vt__Q53scn4step6weapon13whispytornado9StateMain __vt__Q53scn4step6weapon13whispytornado9StateMain: - .incbin "baserom.dol", 0x490D70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EA764 + .4byte 0x803EA6B0 + .4byte 0x803EA6B4 + .4byte 0x803D895C + .4byte 0x803EA760 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10whispyroot9StateMain __vt__Q53scn4step6weapon10whispyroot9StateMain: - .incbin "baserom.dol", 0x490DB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EACA8 + .4byte 0x803EAA5C + .4byte 0x803EAB24 + .4byte 0x803D895C + .4byte 0x803EACA4 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationairball9StateMain __vt__Q53scn4step6weapon18combinationairball9StateMain: - .incbin "baserom.dol", 0x490E18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EAF9C + .4byte 0x803EB018 + .4byte 0x803EB090 + .4byte 0x803D895C + .4byte 0x803EB094 + .4byte 0x803D8964 .global __vt__Q53scn4step6weapon19combinationmetabeam9StateMain __vt__Q53scn4step6weapon19combinationmetabeam9StateMain: - .incbin "baserom.dol", 0x490E38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EB868 + .4byte 0x803EB668 + .4byte 0x803EB72C + .4byte 0x803D895C + .4byte 0x803EB780 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490E78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803EBE2C + .4byte 0x803EBE10 .global __vt__Q53scn4step6weapon23combinationdededebomber9StateMain __vt__Q53scn4step6weapon23combinationdededebomber9StateMain: - .incbin "baserom.dol", 0x490E88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EBC0C + .4byte 0x803EBC10 + .4byte 0x803EBC6C + .4byte 0x803D895C + .4byte 0x803EBCC0 + .4byte 0x803EBCC4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationdeeshot9StateMain __vt__Q53scn4step6weapon18combinationdeeshot9StateMain: - .incbin "baserom.dol", 0x490EF0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EC010 + .4byte 0x803EC014 + .4byte 0x803EC070 + .4byte 0x803D895C + .4byte 0x803EC074 + .4byte 0x803EC078 .global __vt__Q53scn4step6weapon8metabeam9StateMain __vt__Q53scn4step6weapon8metabeam9StateMain: - .incbin "baserom.dol", 0x490F10, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EC4D0 + .4byte 0x803EC3AC + .4byte 0x803EC404 + .4byte 0x803D895C + .4byte 0x803EC458 + .4byte 0x803EC45C .global __vt__Q53scn4step6weapon13metashockwave9StateMain __vt__Q53scn4step6weapon13metashockwave9StateMain: - .incbin "baserom.dol", 0x490F30, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EC620 + .4byte 0x803EC624 + .4byte 0x803EC67C + .4byte 0x803D895C + .4byte 0x803EC6E0 + .4byte 0x803EC6E4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x490FA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803ECF84 + .4byte 0x803ECF68 .global __vt__Q53scn4step6weapon12dededehammer9StateMain __vt__Q53scn4step6weapon12dededehammer9StateMain: - .incbin "baserom.dol", 0x490FB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803ECCF8 + .4byte 0x803ECD74 + .4byte 0x803ECE58 + .4byte 0x803D895C + .4byte 0x803ECE5C + .4byte 0x803ECE60 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x491048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803ED650 + .4byte 0x803ED628 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x491058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803ED64C + .4byte 0x803ED5C8 .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x491068, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803ED648 + .4byte 0x803ED5E8 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1: - .incbin "baserom.dol", 0x491078, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803ED644 + .4byte 0x803ED608 .global __vt__Q53scn4step6weapon8deespear9StateMain __vt__Q53scn4step6weapon8deespear9StateMain: - .incbin "baserom.dol", 0x491088, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803ED1E8 + .4byte 0x803ED264 + .4byte 0x803ED2D0 + .4byte 0x803ED328 + .4byte 0x803ED484 + .4byte 0x803ED5C4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock9StateMain __vt__Q53scn4step6weapon13vacuumedblock9StateMain: - .incbin "baserom.dol", 0x491308, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EEEA4 + .4byte 0x803EEEA8 + .4byte 0x803EEEAC + .4byte 0x803D895C + .4byte 0x803EEEB0 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11hotheadfire9StateMain __vt__Q53scn4step6weapon11hotheadfire9StateMain: - .incbin "baserom.dol", 0x4913D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EF988 + .4byte 0x803D8954 + .4byte 0x803EF81C + .4byte 0x803D895C + .4byte 0x803EF820 + .4byte 0x803EF8AC .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain: - .incbin "baserom.dol", 0x491420, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803F0210 + .4byte 0x803EFBE4 + .4byte 0x803EFCE4 + .4byte 0x803D895C + .4byte 0x803EFFFC + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateMain __vt__Q53scn4step6weapon19challengemastershot9StateMain: - .incbin "baserom.dol", 0x491480, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803F0784 + .4byte 0x803F0724 + .4byte 0x803F077C + .4byte 0x803D895C + .4byte 0x803F0780 + .4byte 0x803D8964 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256519 $$256519: - .incbin "baserom.dol", 0x498468, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256548 $$256548: - .incbin "baserom.dol", 0x498490, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256804 $$256804: - .incbin "baserom.dol", 0x4984B8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256562 $$256562: - .incbin "baserom.dol", 0x4986F8, 0x4 + .4byte 0x00000019 .global $$256564 $$256564: - .incbin "baserom.dol", 0x4986FC, 0x4 + .4byte 0x0000001A .global $$256566 $$256566: - .incbin "baserom.dol", 0x498700, 0x4 + .4byte 0x0000001B .global $$256572 $$256572: - .incbin "baserom.dol", 0x498704, 0x4 + .4byte 0x00000019 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256164 $$256164: - .incbin "baserom.dol", 0x498728, 0x4 + .4byte 0x0000001D .global $$256166 $$256166: - .incbin "baserom.dol", 0x49872C, 0x4 + .4byte 0x0000001E .global $$256168 $$256168: - .incbin "baserom.dol", 0x498730, 0x4 + .4byte 0x0000001F .global $$256174 $$256174: - .incbin "baserom.dol", 0x498734, 0x4 + .4byte 0x0000001D .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 $$256978: - .incbin "baserom.dol", 0x49C818, 0x4 + .4byte 0 .global $$256979 $$256979: - .incbin "baserom.dol", 0x49C81C, 0x4 + .4byte 0xBF19999A .global $$256980 $$256980: - .incbin "baserom.dol", 0x49C820, 0x8 + .4byte 0x3F19999A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257154 $$257154: - .incbin "baserom.dol", 0x49E898, 0x4 + .4byte 0x41700000 .global $$257155 $$257155: - .incbin "baserom.dol", 0x49E89C, 0x4 + .4byte 0x3FC00000 .global $$257156 $$257156: - .incbin "baserom.dol", 0x49E8A0, 0x4 + .4byte 0xBF000000 .global $$257157 $$257157: - .incbin "baserom.dol", 0x49E8A4, 0x4 + .4byte 0 .global $$257158 $$257158: - .incbin "baserom.dol", 0x49E8A8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$257161 $$257161: - .incbin "baserom.dol", 0x49E8B0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257181 $$257181: - .incbin "baserom.dol", 0x49E8B8, 0x8 + .4byte 0xB8D1B717 + .4byte 0 .global $$257613 $$257613: - .incbin "baserom.dol", 0x49E8C0, 0x4 + .4byte 0 .global $$257614 $$257614: - .incbin "baserom.dol", 0x49E8C4, 0x4 + .4byte 0x3A83126F .global $$257615 $$257615: - .incbin "baserom.dol", 0x49E8C8, 0x4 + .4byte 0x3F0CCCCD .global $$257663 $$257663: - .incbin "baserom.dol", 0x49E8CC, 0x4 + .4byte 0x43B40000 .global $$257664 $$257664: - .incbin "baserom.dol", 0x49E8D0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$257667 $$257667: - .incbin "baserom.dol", 0x49E8D8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257720 $$257720: - .incbin "baserom.dol", 0x49E8E0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257577 $$257577: - .incbin "baserom.dol", 0x49E8F0, 0x4 + .4byte 0 .global $$257578 $$257578: - .incbin "baserom.dol", 0x49E8F4, 0x4 + .4byte 0x3A83126F .global $$257579 $$257579: - .incbin "baserom.dol", 0x49E8F8, 0x4 + .4byte 0x3F0CCCCD .global $$257619 $$257619: - .incbin "baserom.dol", 0x49E8FC, 0x4 + .4byte 0x43B40000 .global $$257620 $$257620: - .incbin "baserom.dol", 0x49E900, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$257623 $$257623: - .incbin "baserom.dol", 0x49E908, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257870 $$257870: - .incbin "baserom.dol", 0x49E918, 0x4 + .4byte 0 .global $$257871 $$257871: - .incbin "baserom.dol", 0x49E91C, 0x4 + .4byte 0x3F800000 .global $$257872 $$257872: - .incbin "baserom.dol", 0x49E920, 0x4 + .4byte 0x3A83126F .global $$257873 $$257873: - .incbin "baserom.dol", 0x49E924, 0x4 + .4byte 0x41200000 .global $$257874 $$257874: - .incbin "baserom.dol", 0x49E928, 0x4 + .4byte 0x40000000 .global $$257875 $$257875: - .incbin "baserom.dol", 0x49E92C, 0x4 + .4byte 0x3F0CCCCD .global $$257879 $$257879: - .incbin "baserom.dol", 0x49E930, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257920 $$257920: - .incbin "baserom.dol", 0x49E938, 0x4 + .4byte 0x43B40000 .global $$257965 $$257965: - .incbin "baserom.dol", 0x49E93C, 0x4 + .4byte 0xBF800000 .global $$257966 $$257966: - .incbin "baserom.dol", 0x49E940, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 .global $$257269 $$257269: - .incbin "baserom.dol", 0x49E948, 0x4 + .4byte 0 .global $$257270 $$257270: - .incbin "baserom.dol", 0x49E94C, 0x4 + .4byte 0x43340000 .global $$257271 $$257271: - .incbin "baserom.dol", 0x49E950, 0x4 + .4byte 0x3ECCCCCD .global $$257318 $$257318: - .incbin "baserom.dol", 0x49E954, 0x4 + .4byte 0x43B40000 .global $$257319 $$257319: - .incbin "baserom.dol", 0x49E958, 0x4 + .4byte 0x4222F983 .global $$257320 $$257320: - .incbin "baserom.dol", 0x49E95C, 0x4 + .4byte 0x3C8EFA35 .global $$257321 $$257321: - .incbin "baserom.dol", 0x49E960, 0x8 + .4byte 0x3FC90FDB + .4byte 0 .global $$257324 $$257324: - .incbin "baserom.dol", 0x49E968, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256475 $$256475: - .incbin "baserom.dol", 0x49E970, 0x4 + .4byte 0 .global $$256513 $$256513: - .incbin "baserom.dol", 0x49E974, 0x4 + .4byte 0x40000000 .global $$256527 $$256527: - .incbin "baserom.dol", 0x49E978, 0x8 + .4byte 0x3C23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257213 $$257213: - .incbin "baserom.dol", 0x49E988, 0x8 + .4byte 0 + .4byte 0 .global $$256870 $$256870: - .incbin "baserom.dol", 0x49E990, 0x4 + .4byte 0 .global $$256882 $$256882: - .incbin "baserom.dol", 0x49E994, 0x4 + .4byte 0x40C00000 .global $$256855 $$256855: - .incbin "baserom.dol", 0x49E998, 0x4 + .4byte 0x42652EE1 .global $$256910 $$256910: - .incbin "baserom.dol", 0x49E99C, 0x4 + .4byte 0 .global $$256911 $$256911: - .incbin "baserom.dol", 0x49E9A0, 0x8 + .4byte 0xBF800000 + .4byte 0 .global $$256752 $$256752: - .incbin "baserom.dol", 0x49E9A8, 0x8 + .4byte 0x42652EE1 + .4byte 0 .global $$256756 $$256756: - .incbin "baserom.dol", 0x49E9B0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256766 $$256766: - .incbin "baserom.dol", 0x49E9B8, 0x4 + .4byte 0 .global $$256799 $$256799: - .incbin "baserom.dol", 0x49E9BC, 0x4 + .4byte 0xBF800000 .global $$260023 $$260023: - .incbin "baserom.dol", 0x49E9C0, 0x4 + .4byte 0x00000078 .global $$260041 $$260041: - .incbin "baserom.dol", 0x49E9C4, 0x4 + .4byte 0 .global $$260042 $$260042: - .incbin "baserom.dol", 0x49E9C8, 0x4 + .4byte 0xBF800000 .global $$260108 $$260108: - .incbin "baserom.dol", 0x49E9CC, 0x4 + .4byte 0x40400000 .global $$260109 $$260109: - .incbin "baserom.dol", 0x49E9D0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$260112 $$260112: - .incbin "baserom.dol", 0x49E9D8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$260222 $$260222: - .incbin "baserom.dol", 0x49E9E0, 0x4 + .4byte 0x3F000000 .global $$260297 $$260297: - .incbin "baserom.dol", 0x49E9E4, 0x4 + .4byte 0x40490FDB .global $$260298 $$260298: - .incbin "baserom.dol", 0x49E9E8, 0x4 + .4byte 0x4016CBE4 .global $$260299 $$260299: - .incbin "baserom.dol", 0x49E9EC, 0x4 + .4byte 0x3FC90FDB .global $$260300 $$260300: - .incbin "baserom.dol", 0x49E9F0, 0x4 + .4byte 0x407B53D2 .global $$260301 $$260301: - .incbin "baserom.dol", 0x49E9F4, 0x4 + .4byte 0x4096CBE4 .global $$260326 $$260326: - .incbin "baserom.dol", 0x49E9F8, 0x4 + .4byte 0x43B40000 .global $$260327 $$260327: - .incbin "baserom.dol", 0x49E9FC, 0x4 + .4byte 0x43340000 .global $$260328 $$260328: - .incbin "baserom.dol", 0x49EA00, 0x4 + .4byte 0x42340000 .global $$260329 $$260329: - .incbin "baserom.dol", 0x49EA04, 0x4 + .4byte 0x42B40000 .global $$257051 $$257051: - .incbin "baserom.dol", 0x49EA08, 0x4 + .4byte 0 .global $$257108 $$257108: - .incbin "baserom.dol", 0x49EA0C, 0x4 + .4byte 0xBEA1205C .global $$257109 $$257109: - .incbin "baserom.dol", 0x49EA10, 0x8 + .4byte 0x3E800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258554 $$258554: - .incbin "baserom.dol", 0x49EA20, 0x4 + .4byte 0x3DA3D70A .global $$258555 $$258555: - .incbin "baserom.dol", 0x49EA24, 0x4 + .4byte 0x3DCCCCCD .global $$258566 $$258566: - .incbin "baserom.dol", 0x49EA28, 0x8 + .4byte 0 + .4byte 0 .global $$257281 $$257281: - .incbin "baserom.dol", 0x49EA30, 0x4 + .4byte 0x00000002 .global lbl_80563EF4 lbl_80563EF4: - .incbin "baserom.dol", 0x49EA34, 0x4 + .4byte 0x00000003 .global $$258712 $$258712: - .incbin "baserom.dol", 0x49EA38, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256720 $$256720: - .incbin "baserom.dol", 0x49EA48, 0x4 + .4byte 0 .global $$256721 $$256721: - .incbin "baserom.dol", 0x49EA4C, 0x4 + .4byte 0x3F400000 .global $$257163 $$257163: - .incbin "baserom.dol", 0x49EA50, 0x4 + .4byte 0xC0000000 .global $$257164 $$257164: - .incbin "baserom.dol", 0x49EA54, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256753 $$256753: - .incbin "baserom.dol", 0x49EAA8, 0x4 + .4byte 0xC2340000 .global $$256754 $$256754: - .incbin "baserom.dol", 0x49EAAC, 0x4 + .4byte 0 .global $$256765 $$256765: - .incbin "baserom.dol", 0x49EAB0, 0x4 + .4byte 0x43B40000 .global $$256766 $$256766: - .incbin "baserom.dol", 0x49EAB4, 0x4 + .4byte 0x42B40000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256698 $$256698: - .incbin "baserom.dol", 0x49EAC0, 0x4 + .4byte 0 .global $$256699 $$256699: - .incbin "baserom.dol", 0x49EAC4, 0x4 + .4byte 0x3E4CCCCD .global $$256700 $$256700: - .incbin "baserom.dol", 0x49EAC8, 0x4 + .4byte 0xBF800000 .global $$256701 $$256701: - .incbin "baserom.dol", 0x49EACC, 0x4 + .4byte 0x3FB40000 .global $$256702 $$256702: - .incbin "baserom.dol", 0x49EAD0, 0x4 + .4byte 0x42B40000 .global $$256716 $$256716: - .incbin "baserom.dol", 0x49EAD4, 0x4 + .4byte 0x42AA0000 .global $$256724 $$256724: - .incbin "baserom.dol", 0x49EAD8, 0x4 + .4byte 0x3F800000 .global $$256725 $$256725: - .incbin "baserom.dol", 0x49EADC, 0x4 + .4byte 0 .global $$256726 $$256726: - .incbin "baserom.dol", 0x49EAE0, 0x4 + .4byte 0x3E99999A .global $$256744 $$256744: - .incbin "baserom.dol", 0x49EAE4, 0x4 + .4byte 0xBE4CCCCD .global $$256765 $$256765: - .incbin "baserom.dol", 0x49EAE8, 0x8 + .4byte 0x3F400000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256838 $$256838: - .incbin "baserom.dol", 0x49EB08, 0x8 + .4byte 0x40600000 + .4byte 0 .global $$257036 $$257036: - .incbin "baserom.dol", 0x49EB10, 0x4 + .4byte 0 .global $$257037 $$257037: - .incbin "baserom.dol", 0x49EB14, 0x4 + .4byte 0x3E4CCCCD .global $$257087 $$257087: - .incbin "baserom.dol", 0x49EB18, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257342 $$257342: - .incbin "baserom.dol", 0x49EB28, 0x4 + .4byte 0 .global $$257343 $$257343: - .incbin "baserom.dol", 0x49EB2C, 0x4 + .4byte 0x42B40000 .global $$257344 $$257344: - .incbin "baserom.dol", 0x49EB30, 0x4 + .4byte 0xBF000000 .global $$257345 $$257345: - .incbin "baserom.dol", 0x49EB34, 0x4 + .4byte 0x3F000000 .global $$257346 $$257346: - .incbin "baserom.dol", 0x49EB38, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$257350 $$257350: - .incbin "baserom.dol", 0x49EB40, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256724 $$256724: - .incbin "baserom.dol", 0x49EB48, 0x4 + .4byte 0x3FB40000 .global $$256725 $$256725: - .incbin "baserom.dol", 0x49EB4C, 0x4 + .4byte 0 .global $$256726 $$256726: - .incbin "baserom.dol", 0x49EB50, 0x4 + .4byte 0x42B40000 .global $$256758 $$256758: - .incbin "baserom.dol", 0x49EB54, 0x4 + .4byte 0x3DCCCCCD .global $$256525 $$256525: - .incbin "baserom.dol", 0x49EB58, 0x8 + .4byte 0 + .4byte 0 .global $$258285 $$258285: - .incbin "baserom.dol", 0x49EB60, 0x4 + .4byte 0 .global $$258286 $$258286: - .incbin "baserom.dol", 0x49EB64, 0x4 + .4byte 0x43340000 .global $$258287 $$258287: - .incbin "baserom.dol", 0x49EB68, 0x4 + .4byte 0xC2B40000 .global $$258288 $$258288: - .incbin "baserom.dol", 0x49EB6C, 0x4 + .4byte 0x3F800000 .global $$258289 $$258289: - .incbin "baserom.dol", 0x49EB70, 0x4 + .4byte 0xBF800000 .global $$258356 $$258356: - .incbin "baserom.dol", 0x49EB74, 0x4 + .4byte 0x42B40000 .global $$258389 $$258389: - .incbin "baserom.dol", 0x49EB78, 0x8 + .4byte 0x3F19999A + .4byte 0 .global $$256964 $$256964: - .incbin "baserom.dol", 0x49EB80, 0x4 + .4byte 0 .global $$257016 $$257016: - .incbin "baserom.dol", 0x49EB84, 0x4 + .4byte 0x3F000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257755 $$257755: - .incbin "baserom.dol", 0x49EB90, 0x4 + .4byte 0 .global $$257756 $$257756: - .incbin "baserom.dol", 0x49EB94, 0x4 + .4byte 0x3F800000 .global $$257757 $$257757: - .incbin "baserom.dol", 0x49EB98, 0x4 + .4byte 0xBF800000 .global $$257758 $$257758: - .incbin "baserom.dol", 0x49EB9C, 0x4 + .4byte 0xC2B40000 .global $$257759 $$257759: - .incbin "baserom.dol", 0x49EBA0, 0x4 + .4byte 0x42B40000 .global $$257805 $$257805: - .incbin "baserom.dol", 0x49EBA4, 0x4 + .4byte 0x3F19999A .global $$256364 $$256364: - .incbin "baserom.dol", 0x49EBA8, 0x8 + .4byte 0x3E800000 + .4byte 0 .global $$256231 $$256231: - .incbin "baserom.dol", 0x49EBB0, 0x8 + .4byte 0 + .4byte 0 .global $$256907 $$256907: - .incbin "baserom.dol", 0x49EBB8, 0x4 + .4byte 0 .global $$256908 $$256908: - .incbin "baserom.dol", 0x49EBBC, 0x4 + .4byte 0x3F800000 .global $$256909 $$256909: - .incbin "baserom.dol", 0x49EBC0, 0x4 + .4byte 0x3C8EFA35 .global $$256910 $$256910: - .incbin "baserom.dol", 0x49EBC4, 0x4 + .4byte 0x43340000 .global $$256911 $$256911: - .incbin "baserom.dol", 0x49EBC8, 0x4 + .4byte 0x3DCCCCCD .global $$256912 $$256912: - .incbin "baserom.dol", 0x49EBCC, 0x4 + .4byte 0x3ECCCCCD .global $$256913 $$256913: - .incbin "baserom.dol", 0x49EBD0, 0x4 + .4byte 0x40400000 .global $$256976 $$256976: - .incbin "baserom.dol", 0x49EBD4, 0x4 + .4byte 0x42B40000 .global $$256979 $$256979: - .incbin "baserom.dol", 0x49EBD8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 $$256687: - .incbin "baserom.dol", 0x49EBE8, 0x8 + .4byte 0x3F8CCCCD + .4byte 0 .global $$256676 $$256676: - .incbin "baserom.dol", 0x49EBF0, 0x4 + .4byte 0x3F800000 .global $$256677 $$256677: - .incbin "baserom.dol", 0x49EBF4, 0x4 + .4byte 0 .global $$256789 $$256789: - .incbin "baserom.dol", 0x49EBF8, 0x8 + .4byte 0 + .4byte 0 .global $$256664 $$256664: - .incbin "baserom.dol", 0x49EC00, 0x4 + .4byte 0 .global $$256665 $$256665: - .incbin "baserom.dol", 0x49EC04, 0x4 + .4byte 0x3E99999A .global $$256666 $$256666: - .incbin "baserom.dol", 0x49EC08, 0x4 + .4byte 0xBE4CCCCD .global $$256693 $$256693: - .incbin "baserom.dol", 0x49EC0C, 0x4 + .4byte 0x3F400000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256767 $$256767: - .incbin "baserom.dol", 0x49EC28, 0x4 + .4byte 0xC2340000 .global $$256768 $$256768: - .incbin "baserom.dol", 0x49EC2C, 0x4 + .4byte 0 .global $$256782 $$256782: - .incbin "baserom.dol", 0x49EC30, 0x4 + .4byte 0x43B40000 .global $$256783 $$256783: - .incbin "baserom.dol", 0x49EC34, 0x4 + .4byte 0x42B40000 .global $$257159 $$257159: - .incbin "baserom.dol", 0x49EC38, 0x4 + .4byte 0xC0000000 .global $$257160 $$257160: - .incbin "baserom.dol", 0x49EC3C, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256440 $$256440: - .incbin "baserom.dol", 0x49EC80, 0x4 + .4byte 0x42B40000 .global $$256441 $$256441: - .incbin "baserom.dol", 0x49EC84, 0x4 + .4byte 0xC2B40000 .global $$256442 $$256442: - .incbin "baserom.dol", 0x49EC88, 0x8 + .4byte 0x3EB33333 + .4byte 0 .global $$257151 $$257151: - .incbin "baserom.dol", 0x49EC90, 0x4 + .4byte 0xBF800000 .global $$257152 $$257152: - .incbin "baserom.dol", 0x49EC94, 0x4 + .4byte 0 .global $$257153 $$257153: - .incbin "baserom.dol", 0x49EC98, 0x4 + .4byte 0x3F800000 .global $$257219 $$257219: - .incbin "baserom.dol", 0x49EC9C, 0x4 + .4byte 0x3727C5AC .global $$257223 $$257223: - .incbin "baserom.dol", 0x49ECA0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257224 $$257224: - .incbin "baserom.dol", 0x49ECA8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257279 $$257279: - .incbin "baserom.dol", 0x49ECB0, 0x4 + .4byte 0x3F000000 .global $$257280 $$257280: - .incbin "baserom.dol", 0x49ECB4, 0x4 + .4byte 0x40400000 diff --git a/asm/src/StateMasterSummon.s b/asm/src/StateMasterSummon.s index 406e5d80..af7dd252 100644 --- a/asm/src/StateMasterSummon.s +++ b/asm/src/StateMasterSummon.s @@ -562,54 +562,63 @@ lbl_8029343C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17StateMasterSummon __vt__Q53scn4step5enemy6common17StateMasterSummon: - .incbin "baserom.dol", 0x46F318, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80292E20 ;# ptr + .4byte 0x80292ED4 ;# ptr + .4byte 0x80293104 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80293158 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257050 $$257050: - .incbin "baserom.dol", 0x49BB98, 0x4 + .4byte 0xFFFFFFFF .global $$259324 $$259324: - .incbin "baserom.dol", 0x49BB9C, 0x4 + .4byte 0x3DCCCCCD .global $$259325 $$259325: - .incbin "baserom.dol", 0x49BBA0, 0x4 + .4byte 0x3F666666 .global $$257172 $$257172: - .incbin "baserom.dol", 0x49BBA4, 0x4 + .4byte 0x000000FF .global $$259361 $$259361: - .incbin "baserom.dol", 0x49BBA8, 0x4 + .4byte 0x41F00000 .global $$259362 $$259362: - .incbin "baserom.dol", 0x49BBAC, 0x4 + .4byte 0x4222F983 .global $$259363 $$259363: - .incbin "baserom.dol", 0x49BBB0, 0x4 + .4byte 0x3C8EFA35 .global $$259364 $$259364: - .incbin "baserom.dol", 0x49BBB4, 0x4 + .4byte 0x42B40000 .global $$259365 $$259365: - .incbin "baserom.dol", 0x49BBB8, 0x4 + .4byte 0x437F0000 .global $$259366 $$259366: - .incbin "baserom.dol", 0x49BBBC, 0x4 + .4byte 0 .global $$259367 $$259367: - .incbin "baserom.dol", 0x49BBC0, 0x4 + .4byte 0x44070000 .global $$259368 $$259368: - .incbin "baserom.dol", 0x49BBC4, 0x4 + .4byte 0x3F800000 .global $$259371 $$259371: - .incbin "baserom.dol", 0x49BBC8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$259475 $$259475: - .incbin "baserom.dol", 0x49BBD0, 0x4 + .4byte 0x3F000000 .global T_INIT_SCALE__Q53scn4step5enemy6common31$$2unnamed$$2StateMasterSummon_cpp$$2 T_INIT_SCALE__Q53scn4step5enemy6common31$$2unnamed$$2StateMasterSummon_cpp$$2: - .incbin "baserom.dol", 0x49BBD4, 0x4 + .4byte 0x3DCCCCCD .global T_END_SCALE__Q53scn4step5enemy6common31$$2unnamed$$2StateMasterSummon_cpp$$2 T_END_SCALE__Q53scn4step5enemy6common31$$2unnamed$$2StateMasterSummon_cpp$$2: - .incbin "baserom.dol", 0x49BBD8, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateMasterSummonWait.s b/asm/src/StateMasterSummonWait.s index f2800f43..3ee181cc 100644 --- a/asm/src/StateMasterSummonWait.s +++ b/asm/src/StateMasterSummonWait.s @@ -321,4 +321,11 @@ lbl_8029389C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common21StateMasterSummonWait __vt__Q53scn4step5enemy6common21StateMasterSummonWait: - .incbin "baserom.dol", 0x46F338, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80293508 ;# ptr + .4byte 0x802935D4 ;# ptr + .4byte 0x802935F0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802935F4 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateMix.s b/asm/src/StateMix.s index 056f3516..d2ad4d89 100644 --- a/asm/src/StateMix.s +++ b/asm/src/StateMix.s @@ -570,4 +570,13 @@ lbl_803670E0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common8StateMix __vt__Q53scn4step4hero6common8StateMix: - .incbin "baserom.dol", 0x487F48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80366BC0 + .4byte 0x80366D8C + .4byte 0x80366E20 + .4byte 0x8035550C + .4byte 0x80366E24 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateMixPre.s b/asm/src/StateMixPre.s index c9c15cca..6c03865c 100644 --- a/asm/src/StateMixPre.s +++ b/asm/src/StateMixPre.s @@ -172,7 +172,19 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: - .incbin "baserom.dol", 0x487F70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80367348 + .4byte 0x80367328 .global __vt__Q53scn4step4hero6common11StateMixPre __vt__Q53scn4step4hero6common11StateMixPre: - .incbin "baserom.dol", 0x487F80, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80367194 + .4byte 0x80367234 + .4byte 0x80355508 + .4byte 0x8035550C + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateMoonSault.s b/asm/src/StateMoonSault.s index fe667c61..72e038c8 100644 --- a/asm/src/StateMoonSault.s +++ b/asm/src/StateMoonSault.s @@ -202,4 +202,13 @@ procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter14StateMoonSault __vt__Q53scn4step4hero7fighter14StateMoonSault: - .incbin "baserom.dol", 0x48A5C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039DB98 + .4byte 0x8039DC48 + .4byte 0x8039DD30 + .4byte 0x8035550C + .4byte 0x8039DDB4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateMove.s b/asm/src/StateMove.s index dd3700d8..e9323d9d 100644 --- a/asm/src/StateMove.s +++ b/asm/src/StateMove.s @@ -7538,422 +7538,525 @@ lbl_802E9CA4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateMove __vt__Q53scn4step5enemy7blipper9StateMove: - .incbin "baserom.dol", 0x470040, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029BB7C ;# ptr + .4byte 0x8029B4FC ;# ptr + .4byte 0x8029B6DC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029B7C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9StateMove __vt__Q53scn4step5enemy6chilly9StateMove: - .incbin "baserom.dol", 0x471A50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A6BCC ;# ptr + .4byte 0x802A69F4 ;# ptr + .4byte 0x802A6A88 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A6BC8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateMove __vt__Q53scn4step5enemy8dubiorjr9StateMove: - .incbin "baserom.dol", 0x472448, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AE980 ;# ptr + .4byte 0x802AEA2C ;# ptr + .4byte 0x802AEB48 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AEB9C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec9StateMove __vt__Q53scn4step5enemy4elec9StateMove: - .incbin "baserom.dol", 0x472888, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802B04EC ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B0568 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B0A30 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer9StateMove __vt__Q53scn4step5enemy6flamer9StateMove: - .incbin "baserom.dol", 0x472DB0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x802B1A98 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B36D4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B3B20 ;# ptr + .4byte 0x8028DDE8 ;# ptr + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x472FA0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B52D8 ;# ptr + .4byte 0x802B52BC ;# ptr .global __vt__Q53scn4step5enemy5foley9StateMove __vt__Q53scn4step5enemy5foley9StateMove: - .incbin "baserom.dol", 0x472FB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B50C8 ;# ptr + .4byte 0x802B50CC ;# ptr + .4byte 0x802B51BC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B5224 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateMove __vt__Q53scn4step5enemy4kabu9StateMove: - .incbin "baserom.dol", 0x4742F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BDDC0 ;# ptr + .4byte 0x802BDDC4 ;# ptr + .4byte 0x802BDE68 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BDF0C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr9StateMove __vt__Q53scn4step5enemy10poppybrojr9StateMove: - .incbin "baserom.dol", 0x476980, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D259C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802D2078 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D2598 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477220, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D87F4 ;# ptr + .4byte 0x802D87D8 ;# ptr .global __vt__Q53scn4step5enemy8rollball9StateMove __vt__Q53scn4step5enemy8rollball9StateMove: - .incbin "baserom.dol", 0x477230, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D6CD0 ;# ptr + .4byte 0x802D6CD4 ;# ptr + .4byte 0x802D6DF0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D6F18 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches9StateMove __vt__Q53scn4step5enemy8searches9StateMove: - .incbin "baserom.dol", 0x4779B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DC554 ;# ptr + .4byte 0x802DC354 ;# ptr + .4byte 0x802DC358 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DC39C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun9StateMove __vt__Q53scn4step5enemy3sun9StateMove: - .incbin "baserom.dol", 0x4795C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E9568 ;# ptr + .4byte 0x802E956C ;# ptr + .4byte 0x802E9570 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E96F4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255763 $$255763: - .incbin "baserom.dol", 0x495D80, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255521 $$255521: - .incbin "baserom.dol", 0x496308, 0x4 + .4byte 0x3E4CCCCD .global $$255522 $$255522: - .incbin "baserom.dol", 0x49630C, 0x4 + .4byte 0x3E4CCCCD .global $$255523 $$255523: - .incbin "baserom.dol", 0x496310, 0x4 + .4byte 0x3E4CCCCD .global $$255524 $$255524: - .incbin "baserom.dol", 0x496314, 0x4 + .4byte 0x3E4CCCCD .global $$255525 $$255525: - .incbin "baserom.dol", 0x496318, 0x4 + .4byte 0x3E4CCCCD .global $$255526 $$255526: - .incbin "baserom.dol", 0x49631C, 0x4 + .4byte 0x3E4CCCCD .global $$255528 $$255528: - .incbin "baserom.dol", 0x496320, 0x4 + .4byte 0x3ECCCCCD .global $$255529 $$255529: - .incbin "baserom.dol", 0x496324, 0x4 + .4byte 0x3ECCCCCD .global $$255530 $$255530: - .incbin "baserom.dol", 0x496328, 0x4 + .4byte 0x3E99999A .global $$255531 $$255531: - .incbin "baserom.dol", 0x49632C, 0x4 + .4byte 0x3E99999A .global $$255532 $$255532: - .incbin "baserom.dol", 0x496330, 0x4 + .4byte 0x3E99999A .global $$255533 $$255533: - .incbin "baserom.dol", 0x496334, 0x4 + .4byte 0x3E99999A .global $$255541 $$255541: - .incbin "baserom.dol", 0x496338, 0x4 + .4byte 0x3E4CCCCD .global $$255542 $$255542: - .incbin "baserom.dol", 0x49633C, 0x4 + .4byte 0x3E99999A .global $$255543 $$255543: - .incbin "baserom.dol", 0x496340, 0x4 + .4byte 0x3E4CCCCD .global $$255544 $$255544: - .incbin "baserom.dol", 0x496344, 0x4 + .4byte 0x3F000000 .global $$255545 $$255545: - .incbin "baserom.dol", 0x496348, 0x4 + .4byte 0x3E4CCCCD .global $$255546 $$255546: - .incbin "baserom.dol", 0x49634C, 0x4 + .4byte 0x3E4CCCCD .global $$255548 $$255548: - .incbin "baserom.dol", 0x496350, 0x4 + .4byte 0x3ECCCCCD .global $$255549 $$255549: - .incbin "baserom.dol", 0x496354, 0x4 + .4byte 0x3E99999A .global $$255550 $$255550: - .incbin "baserom.dol", 0x496358, 0x4 + .4byte 0x3E99999A .global $$255551 $$255551: - .incbin "baserom.dol", 0x49635C, 0x4 + .4byte 0x3F000000 .global $$255552 $$255552: - .incbin "baserom.dol", 0x496360, 0x4 + .4byte 0x3E99999A .global $$255553 $$255553: - .incbin "baserom.dol", 0x496364, 0x4 + .4byte 0x3E4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256356 $$256356: - .incbin "baserom.dol", 0x49BE38, 0x4 + .4byte 0 .global $$256357 $$256357: - .incbin "baserom.dol", 0x49BE3C, 0x4 + .4byte 0x3F800000 .global $$256358 $$256358: - .incbin "baserom.dol", 0x49BE40, 0x4 + .4byte 0x41200000 .global $$256359 $$256359: - .incbin "baserom.dol", 0x49BE44, 0x4 + .4byte 0xBF800000 .global $$256466 $$256466: - .incbin "baserom.dol", 0x49BE48, 0x4 + .4byte 0x3F000000 .global $$256467 $$256467: - .incbin "baserom.dol", 0x49BE4C, 0x4 + .4byte 0x3A83126F .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255848 $$255848: - .incbin "baserom.dol", 0x49C088, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$255851 $$255851: - .incbin "baserom.dol", 0x49C090, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255853 $$255853: - .incbin "baserom.dol", 0x49C098, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256340 $$256340: - .incbin "baserom.dol", 0x49C300, 0x4 + .4byte 0x3C8EFA35 .global $$256404 $$256404: - .incbin "baserom.dol", 0x49C304, 0x4 + .4byte 0x4222F983 .global $$256405 $$256405: - .incbin "baserom.dol", 0x49C308, 0x4 + .4byte 0x42B40000 .global $$256406 $$256406: - .incbin "baserom.dol", 0x49C30C, 0x4 + .4byte 0x43B40000 .global $$256407 $$256407: - .incbin "baserom.dol", 0x49C310, 0x8 + .4byte 0 + .4byte 0 .global $$256410 $$256410: - .incbin "baserom.dol", 0x49C318, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 $$257616: - .incbin "baserom.dol", 0x49C378, 0x4 + .4byte 0 .global $$257617 $$257617: - .incbin "baserom.dol", 0x49C37C, 0x4 + .4byte 0x3F800000 .global $$257624 $$257624: - .incbin "baserom.dol", 0x49C380, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257675 $$257675: - .incbin "baserom.dol", 0x49C388, 0x4 + .4byte 0x3E99999A .global $$257676 $$257676: - .incbin "baserom.dol", 0x49C38C, 0x4 + .4byte 0x3F4CCCCD .global $$257677 $$257677: - .incbin "baserom.dol", 0x49C390, 0x4 + .4byte 0x3D4CCCCD .global $$257678 $$257678: - .incbin "baserom.dol", 0x49C394, 0x4 + .4byte 0x3F333333 .global $$257679 $$257679: - .incbin "baserom.dol", 0x49C398, 0x4 + .4byte 0x3FC90FDB .global $$257738 $$257738: - .incbin "baserom.dol", 0x49C39C, 0x4 + .4byte 0x3F000000 .global $$257739 $$257739: - .incbin "baserom.dol", 0x49C3A0, 0x4 + .4byte 0x40490FDB .global $$257740 $$257740: - .incbin "baserom.dol", 0x49C3A4, 0x4 + .4byte 0x3CC90FDB .global $$257745 $$257745: - .incbin "baserom.dol", 0x49C3A8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257793 $$257793: - .incbin "baserom.dol", 0x49C3B0, 0x4 + .4byte 0x40800000 .global $$257800 $$257800: - .incbin "baserom.dol", 0x49C3B4, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257548 $$257548: - .incbin "baserom.dol", 0x49C468, 0x4 + .4byte 0 .global $$257549 $$257549: - .incbin "baserom.dol", 0x49C46C, 0x4 + .4byte 0x3F800000 .global $$257556 $$257556: - .incbin "baserom.dol", 0x49C470, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257603 $$257603: - .incbin "baserom.dol", 0x49C478, 0x4 + .4byte 0x3E99999A .global $$257604 $$257604: - .incbin "baserom.dol", 0x49C47C, 0x4 + .4byte 0x3F4CCCCD .global $$257605 $$257605: - .incbin "baserom.dol", 0x49C480, 0x4 + .4byte 0x3D4CCCCD .global $$257606 $$257606: - .incbin "baserom.dol", 0x49C484, 0x4 + .4byte 0x3F333333 .global $$257607 $$257607: - .incbin "baserom.dol", 0x49C488, 0x4 + .4byte 0x3FC90FDB .global $$257666 $$257666: - .incbin "baserom.dol", 0x49C48C, 0x4 + .4byte 0x3F000000 .global $$257667 $$257667: - .incbin "baserom.dol", 0x49C490, 0x4 + .4byte 0x40490FDB .global $$257668 $$257668: - .incbin "baserom.dol", 0x49C494, 0x4 + .4byte 0x3CC90FDB .global $$257673 $$257673: - .incbin "baserom.dol", 0x49C498, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257721 $$257721: - .incbin "baserom.dol", 0x49C4A0, 0x4 + .4byte 0x40800000 .global $$257728 $$257728: - .incbin "baserom.dol", 0x49C4A4, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255918 $$255918: - .incbin "baserom.dol", 0x49C4C0, 0x4 + .4byte 0x40000000 .global $$255919 $$255919: - .incbin "baserom.dol", 0x49C4C4, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256136 $$256136: - .incbin "baserom.dol", 0x49C680, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256352 $$256352: - .incbin "baserom.dol", 0x49CAD0, 0x4 + .4byte 0 .global $$256409 $$256409: - .incbin "baserom.dol", 0x49CAD4, 0x4 + .4byte 0x3E4CCCCD .global $$256410 $$256410: - .incbin "baserom.dol", 0x49CAD8, 0x4 + .4byte 0x3E99999A .global $$256411 $$256411: - .incbin "baserom.dol", 0x49CADC, 0x4 + .4byte 0x3F000000 .global $$256412 $$256412: - .incbin "baserom.dol", 0x49CAE0, 0x8 + .asciz "?333" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259518 $$259518: - .incbin "baserom.dol", 0x49CBA0, 0x4 + .4byte 0 .global $$259519 $$259519: - .incbin "baserom.dol", 0x49CBA4, 0x4 + .4byte 0x3DCCCCCD .global $$259520 $$259520: - .incbin "baserom.dol", 0x49CBA8, 0x4 + .4byte 0x3F000000 .global $$259560 $$259560: - .incbin "baserom.dol", 0x49CBAC, 0x4 + .4byte 0x43B40000 .global $$259581 $$259581: - .incbin "baserom.dol", 0x49CBB0, 0x4 + .4byte 0xBC23D70A .global $$259597 $$259597: - .incbin "baserom.dol", 0x49CBB4, 0x4 + .4byte 0x3C23D70A .global $$259653 $$259653: - .incbin "baserom.dol", 0x49CBB8, 0x4 + .4byte 0x40000000 .global $$259654 $$259654: - .incbin "baserom.dol", 0x49CBBC, 0x4 + .4byte 0x40400000 .global $$259655 $$259655: - .incbin "baserom.dol", 0x49CBC0, 0x4 + .4byte 0x40800000 .global $$259710 $$259710: - .incbin "baserom.dol", 0x49CBC4, 0x4 + .4byte 0xBF800000 .global $$259711 $$259711: - .incbin "baserom.dol", 0x49CBC8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$259731 $$259731: - .incbin "baserom.dol", 0x49CBD0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257493 $$257493: - .incbin "baserom.dol", 0x49CBD8, 0x4 + .4byte 0xFF0000FF .global $$257505 $$257505: - .incbin "baserom.dol", 0x49CBDC, 0x4 + .4byte 0xFF0000FF .global $$257512 $$257512: - .incbin "baserom.dol", 0x49CBE0, 0x4 + .4byte 0x00FFFFFF .global $$257519 $$257519: - .incbin "baserom.dol", 0x49CBE4, 0x4 + .4byte 0x00FFFFFF .global $$259765 $$259765: - .incbin "baserom.dol", 0x49CBE8, 0x4 + .4byte 0x42700000 .global $$259766 $$259766: - .incbin "baserom.dol", 0x49CBEC, 0x4 + .4byte 0x43340000 .global $$259767 $$259767: - .incbin "baserom.dol", 0x49CBF0, 0x4 + .4byte 0xBDCCCCCD .global $$259768 $$259768: - .incbin "baserom.dol", 0x49CBF4, 0x4 + .4byte 0xC2700000 .global $$259769 $$259769: - .incbin "baserom.dol", 0x49CBF8, 0x8 + .4byte 0x3727C5AC + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256202 $$256202: - .incbin "baserom.dol", 0x49CCD0, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258458 $$258458: - .incbin "baserom.dol", 0x49CF58, 0x4 + .4byte 0 .global $$258459 $$258459: - .incbin "baserom.dol", 0x49CF5C, 0x4 + .4byte 0x3DCCCCCD .global $$258460 $$258460: - .incbin "baserom.dol", 0x49CF60, 0x4 + .4byte 0x3F000000 .global $$258461 $$258461: - .incbin "baserom.dol", 0x49CF64, 0x4 + .4byte 0x40400000 .global $$258462 $$258462: - .incbin "baserom.dol", 0x49CF68, 0x4 + .4byte 0x3FB33333 .global $$258547 $$258547: - .incbin "baserom.dol", 0x49CF6C, 0x4 + .4byte 0x41F00000 .global $$258548 $$258548: - .incbin "baserom.dol", 0x49CF70, 0x4 + .4byte 0x43B40000 .global $$258549 $$258549: - .incbin "baserom.dol", 0x49CF74, 0x4 + .4byte 0xBF800000 .global $$258550 $$258550: - .incbin "baserom.dol", 0x49CF78, 0x4 + .4byte 0x4222F983 .global $$258551 $$258551: - .incbin "baserom.dol", 0x49CF7C, 0x4 + .4byte 0x3C8EFA35 .global $$258567 $$258567: - .incbin "baserom.dol", 0x49CF80, 0x4 + .4byte 0xC3B40000 .global $$258568 $$258568: - .incbin "baserom.dol", 0x49CF84, 0x4 + .4byte 0x3F800000 .global $$258578 $$258578: - .incbin "baserom.dol", 0x49CF88, 0x4 + .4byte 0x40000000 .global $$258613 $$258613: - .incbin "baserom.dol", 0x49CF8C, 0x4 + .4byte 0x40800000 diff --git a/asm/src/StateMoveAround.s b/asm/src/StateMoveAround.s index 7fb37668..d62a2464 100644 --- a/asm/src/StateMoveAround.s +++ b/asm/src/StateMoveAround.s @@ -299,9 +299,17 @@ turn__Q53scn4step5enemy4kabu15StateMoveAroundFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu15StateMoveAround __vt__Q53scn4step5enemy4kabu15StateMoveAround: - .incbin "baserom.dol", 0x474318, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BE17C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802BE180 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BE220 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256041 $$256041: - .incbin "baserom.dol", 0x49C688, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/StateMoveBack.s b/asm/src/StateMoveBack.s index 4eb8c950..ede1d040 100644 --- a/asm/src/StateMoveBack.s +++ b/asm/src/StateMoveBack.s @@ -83,4 +83,11 @@ procFixPos__Q53scn4step4boss6common13StateMoveBackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common13StateMoveBack __vt__Q53scn4step4boss6common13StateMoveBack: - .incbin "baserom.dol", 0x462550, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802474D4 ;# ptr + .4byte 0x802474D8 ;# ptr + .4byte 0x802474DC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80247538 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateMoveCircle.s b/asm/src/StateMoveCircle.s index 6c15054b..74638e5a 100644 --- a/asm/src/StateMoveCircle.s +++ b/asm/src/StateMoveCircle.s @@ -239,12 +239,19 @@ __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo15StateMoveCircle __vt__Q53scn4step5enemy5gordo15StateMoveCircle: - .incbin "baserom.dol", 0x473758, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B9490 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B9328 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255034 $$255034: - .incbin "baserom.dol", 0x49C598, 0x4 + .4byte 0 .global $$255066 $$255066: - .incbin "baserom.dol", 0x49C59C, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateMoveForward.s b/asm/src/StateMoveForward.s index f9c1556e..d203051b 100644 --- a/asm/src/StateMoveForward.s +++ b/asm/src/StateMoveForward.s @@ -239,32 +239,47 @@ procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common16StateMoveForward __vt__Q53scn4step4boss6common16StateMoveForward: - .incbin "baserom.dol", 0x462570, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802475D4 ;# ptr + .4byte 0x802475D8 ;# ptr + .4byte 0x802475DC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80247634 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath16StateMoveForward __vt__Q53scn4step4boss9moundeath16StateMoveForward: - .incbin "baserom.dol", 0x4651A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80255E64 ;# ptr + .4byte 0x80255E68 ;# ptr + .4byte 0x80255ECC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80256018 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254872 $$254872: - .incbin "baserom.dol", 0x49B408, 0x4 + .4byte 0x428C0000 .global $$254873 $$254873: - .incbin "baserom.dol", 0x49B40C, 0x4 + .4byte 0x44340000 .global $$254874 $$254874: - .incbin "baserom.dol", 0x49B410, 0x4 + .4byte 0x4222F983 .global $$254875 $$254875: - .incbin "baserom.dol", 0x49B414, 0x4 + .4byte 0x3C8EFA35 .global $$254876 $$254876: - .incbin "baserom.dol", 0x49B418, 0x4 + .4byte 0x3F000000 .global $$254877 $$254877: - .incbin "baserom.dol", 0x49B41C, 0x4 + .4byte 0x3F800000 .global $$254880 $$254880: - .incbin "baserom.dol", 0x49B420, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateMoveJoint.s b/asm/src/StateMoveJoint.s index 7db0db87..1078ba70 100644 --- a/asm/src/StateMoveJoint.s +++ b/asm/src/StateMoveJoint.s @@ -90,4 +90,11 @@ procFixPos__Q53scn4step4boss6common14StateMoveJointFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common14StateMoveJoint __vt__Q53scn4step4boss6common14StateMoveJoint: - .incbin "baserom.dol", 0x462590, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802476B0 ;# ptr + .4byte 0x802476B4 ;# ptr + .4byte 0x80247714 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024774C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateMoveSinCurve.s b/asm/src/StateMoveSinCurve.s index a20abdd7..69e7d83f 100644 --- a/asm/src/StateMoveSinCurve.s +++ b/asm/src/StateMoveSinCurve.s @@ -311,18 +311,25 @@ __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve: - .incbin "baserom.dol", 0x473778, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B98F8 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B9568 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B96D0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255872 $$255872: - .incbin "baserom.dol", 0x49C5A0, 0x4 + .4byte 0 .global $$255895 $$255895: - .incbin "baserom.dol", 0x49C5A4, 0x4 + .4byte 0x43B40000 .global $$255921 $$255921: - .incbin "baserom.dol", 0x49C5A8, 0x4 + .4byte 0x42B40000 .global $$255922 $$255922: - .incbin "baserom.dol", 0x49C5AC, 0x4 + .4byte 0x43870000 diff --git a/asm/src/StateMoveStraight.s b/asm/src/StateMoveStraight.s index 2af1c572..dbb4813f 100644 --- a/asm/src/StateMoveStraight.s +++ b/asm/src/StateMoveStraight.s @@ -169,9 +169,17 @@ __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo17StateMoveStraight __vt__Q53scn4step5enemy5gordo17StateMoveStraight: - .incbin "baserom.dol", 0x473798, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B9B44 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B99A0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B9A70 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255765 $$255765: - .incbin "baserom.dol", 0x49C5B0, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateMoveThunder.s b/asm/src/StateMoveThunder.s index 5bdb3402..a71c3178 100644 --- a/asm/src/StateMoveThunder.s +++ b/asm/src/StateMoveThunder.s @@ -474,36 +474,45 @@ procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateMoveThunder __vt__Q53scn4step4boss6dubior16StateMoveThunder: - .incbin "baserom.dol", 0x463910, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024F440 ;# ptr + .4byte 0x8024F4BC ;# ptr + .4byte 0x8024F834 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024F978 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257085 $$257085: - .incbin "baserom.dol", 0x49B2F0, 0x4 + .4byte 0x3F800000 .global $$257086 $$257086: - .incbin "baserom.dol", 0x49B2F4, 0x4 + .4byte 0xBF800000 .global $$257087 $$257087: - .incbin "baserom.dol", 0x49B2F8, 0x4 + .4byte 0 .global $$257159 $$257159: - .incbin "baserom.dol", 0x49B2FC, 0x4 + .4byte 0x3FC00000 .global $$257160 $$257160: - .incbin "baserom.dol", 0x49B300, 0x4 + .4byte 0x3F000000 .global $$257161 $$257161: - .incbin "baserom.dol", 0x49B304, 0x4 + .4byte 0x4222F983 .global $$257162 $$257162: - .incbin "baserom.dol", 0x49B308, 0x4 + .4byte 0x3C8EFA35 .global $$257163 $$257163: - .incbin "baserom.dol", 0x49B30C, 0x4 + .4byte 0x43B40000 .global $$257164 $$257164: - .incbin "baserom.dol", 0x49B310, 0x8 + .4byte 0x42B40000 + .4byte 0 .global $$257167 $$257167: - .incbin "baserom.dol", 0x49B318, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateMoveThunderStart.s b/asm/src/StateMoveThunderStart.s index d118786d..5da4bc67 100644 --- a/asm/src/StateMoveThunderStart.s +++ b/asm/src/StateMoveThunderStart.s @@ -270,21 +270,33 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463930, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024FD38 ;# ptr + .4byte 0x8024FD1C ;# ptr .global __vt__Q53scn4step4boss6dubior21StateMoveThunderStart __vt__Q53scn4step4boss6dubior21StateMoveThunderStart: - .incbin "baserom.dol", 0x463940, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024FB2C ;# ptr + .4byte 0x8024FB30 ;# ptr + .4byte 0x8024FBDC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024FD18 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256036 $$256036: - .incbin "baserom.dol", 0x49B320, 0x4 + .4byte 0x3F800000 .global $$256037 $$256037: - .incbin "baserom.dol", 0x49B324, 0x4 + .4byte 0xBF800000 .global $$256038 $$256038: - .incbin "baserom.dol", 0x49B328, 0x8 + .4byte 0 + .4byte 0 .global $$256083 $$256083: - .incbin "baserom.dol", 0x49B330, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateMoveToOtherSide.s b/asm/src/StateMoveToOtherSide.s index 38108542..73a34230 100644 --- a/asm/src/StateMoveToOtherSide.s +++ b/asm/src/StateMoveToOtherSide.s @@ -416,29 +416,41 @@ procFixPos__Q53scn4step4boss6dubior20StateMoveToOtherSideFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global WaitFrameTable__Q53scn4step4boss6dubior34$$2unnamed$$2StateMoveToOtherSide_cpp$$2 WaitFrameTable__Q53scn4step4boss6dubior34$$2unnamed$$2StateMoveToOtherSide_cpp$$2: - .incbin "baserom.dol", 0x412CC8, 0x10 + .4byte 0x0000000A + .4byte 0x0000001E + .4byte 0x0000000A + .4byte 0x0000000A .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior20StateMoveToOtherSide __vt__Q53scn4step4boss6dubior20StateMoveToOtherSide: - .incbin "baserom.dol", 0x463960, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802500E0 ;# ptr + .4byte 0x80250170 ;# ptr + .4byte 0x8025027C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80250330 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 $$256237: - .incbin "baserom.dol", 0x49B338, 0x4 + .4byte 0 .global $$256238 $$256238: - .incbin "baserom.dol", 0x49B33C, 0x4 + .4byte 0xBF800000 .global $$256239 $$256239: - .incbin "baserom.dol", 0x49B340, 0x4 + .4byte 0x3F800000 .global $$256240 $$256240: - .incbin "baserom.dol", 0x49B344, 0x4 + .4byte 0x3E800000 .global $$256244 $$256244: - .incbin "baserom.dol", 0x49B348, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256306 $$256306: - .incbin "baserom.dol", 0x49B350, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/StateNormal.s b/asm/src/StateNormal.s index b941052e..14437cb9 100644 --- a/asm/src/StateNormal.s +++ b/asm/src/StateNormal.s @@ -102,9 +102,17 @@ lbl_803D8B34: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon11StateNormal __vt__Q43scn4step6weapon11StateNormal: - .incbin "baserom.dol", 0x48FEC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803D8A40 + .4byte 0x803D8A9C + .4byte 0x803D8AA0 + .4byte 0x803D895C + .4byte 0x803D8B00 + .4byte 0x803D8964 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256141 $$256141: - .incbin "baserom.dol", 0x49E860, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateNoseDive.s b/asm/src/StateNoseDive.s index 566e954f..654dbc09 100644 --- a/asm/src/StateNoseDive.s +++ b/asm/src/StateNoseDive.s @@ -565,37 +565,51 @@ __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee13StateNoseDive __vt__Q53scn4step5enemy10parasoldee13StateNoseDive: - .incbin "baserom.dol", 0x4761E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CD100 ;# ptr + .4byte 0x802CCE28 ;# ptr + .4byte 0x802CCFBC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CD028 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive: - .incbin "baserom.dol", 0x476398, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CEF3C ;# ptr + .4byte 0x802CEC74 ;# ptr + .4byte 0x802CEE08 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CEE74 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257074 $$257074: - .incbin "baserom.dol", 0x49C9C8, 0x4 + .4byte 0x3D23D70A .global $$257075 $$257075: - .incbin "baserom.dol", 0x49C9CC, 0x4 + .4byte 0x3C23D70A .global $$257076 $$257076: - .incbin "baserom.dol", 0x49C9D0, 0x4 + .4byte 0x3F000000 .global $$257102 $$257102: - .incbin "baserom.dol", 0x49C9D4, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256945 $$256945: - .incbin "baserom.dol", 0x49CA18, 0x4 + .4byte 0x3D23D70A .global $$256946 $$256946: - .incbin "baserom.dol", 0x49CA1C, 0x4 + .4byte 0x3C23D70A .global $$256947 $$256947: - .incbin "baserom.dol", 0x49CA20, 0x4 + .4byte 0x3F000000 .global $$256973 $$256973: - .incbin "baserom.dol", 0x49CA24, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StatePanic.s b/asm/src/StatePanic.s index cb95fcb3..8a845330 100644 --- a/asm/src/StatePanic.s +++ b/asm/src/StatePanic.s @@ -253,7 +253,17 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461F98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80241A34 ;# ptr + .4byte 0x80241A18 ;# ptr .global __vt__Q53scn4step4boss15challengemaster10StatePanic __vt__Q53scn4step4boss15challengemaster10StatePanic: - .incbin "baserom.dol", 0x461FA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024186C ;# ptr + .4byte 0x80241870 ;# ptr + .4byte 0x8024198C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80241990 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateParasolCapture.s b/asm/src/StateParasolCapture.s index 522b5049..f6339f50 100644 --- a/asm/src/StateParasolCapture.s +++ b/asm/src/StateParasolCapture.s @@ -415,56 +415,65 @@ __sinit_$$3StateParasolCapture_cpp: /* 80392EFC 0038ED3C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025D0, 0x4 + .4byte 0x80392DD4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol19StateParasolCapture __vt__Q53scn4step4hero7parasol19StateParasolCapture: - .incbin "baserom.dol", 0x489D00, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803929BC + .4byte 0x80392AA0 + .4byte 0x80392B68 + .4byte 0x8035550C + .4byte 0x80392B6C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258789 $$258789: - .incbin "baserom.dol", 0x49E158, 0x4 + .4byte 0 .global $$258790 $$258790: - .incbin "baserom.dol", 0x49E15C, 0x4 + .4byte 0x3F000000 .global $$258791 $$258791: - .incbin "baserom.dol", 0x49E160, 0x4 + .4byte 0x3ECCCCCD .global $$258834 $$258834: - .incbin "baserom.dol", 0x49E164, 0x4 + .4byte 0x3FA66666 .global $$258835 $$258835: - .incbin "baserom.dol", 0x49E168, 0x4 + .4byte 0x3F19999A .global $$258836 $$258836: - .incbin "baserom.dol", 0x49E16C, 0x4 + .4byte 0x3F99999A .global $$258837 $$258837: - .incbin "baserom.dol", 0x49E170, 0x4 + .4byte 0x3F8CCCCD .global $$258838 $$258838: - .incbin "baserom.dol", 0x49E174, 0x4 + .4byte 0x3F333333 .global $$258839 $$258839: - .incbin "baserom.dol", 0x49E178, 0x4 + .4byte 0x3F800000 .global $$258840 $$258840: - .incbin "baserom.dol", 0x49E17C, 0x4 + .4byte 0x3F666666 .global $$258841 $$258841: - .incbin "baserom.dol", 0x49E180, 0x4 + .4byte 0x3F4CCCCD .global $$258842 $$258842: - .incbin "baserom.dol", 0x49E184, 0x4 + .4byte 0x3FB33333 .global $$258843 $$258843: - .incbin "baserom.dol", 0x49E188, 0x4 + .4byte 0x3FCCCCCD .global $$258844 $$258844: - .incbin "baserom.dol", 0x49E18C, 0x4 + .4byte 0x3FE66666 .section .bss, "wa" # 0x80496700 - 0x805643FC .global OFFSET_TABLE__Q53scn4step4hero7parasol33$$2unnamed$$2StateParasolCapture_cpp$$2 diff --git a/asm/src/StateParasolDive.s b/asm/src/StateParasolDive.s index 8102e044..8ac53440 100644 --- a/asm/src/StateParasolDive.s +++ b/asm/src/StateParasolDive.s @@ -415,15 +415,31 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489D28, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803934C0 + .4byte 0x80393484 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489D38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803934BC + .4byte 0x803934A0 .global __vt__Q53scn4step4hero7parasol16StateParasolDive __vt__Q53scn4step4hero7parasol16StateParasolDive: - .incbin "baserom.dol", 0x489D48, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80393128 + .4byte 0x80393224 + .4byte 0x80393360 + .4byte 0x8035550C + .4byte 0x8039340C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258601 $$258601: - .incbin "baserom.dol", 0x49E190, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateParasolDrill.s b/asm/src/StateParasolDrill.s index 08b7a6aa..49e4a785 100644 --- a/asm/src/StateParasolDrill.s +++ b/asm/src/StateParasolDrill.s @@ -414,21 +414,37 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489D70, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80393A68 + .4byte 0x80393A2C .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489D80, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80393A64 + .4byte 0x80393A48 .global __vt__Q53scn4step4hero7parasol17StateParasolDrill __vt__Q53scn4step4hero7parasol17StateParasolDrill: - .incbin "baserom.dol", 0x489D90, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803936F0 + .4byte 0x803937F4 + .4byte 0x803939A8 + .4byte 0x8035550C + .4byte 0x80393A28 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258531 $$258531: - .incbin "baserom.dol", 0x49E198, 0x4 + .4byte 0 .global $$258570 $$258570: - .incbin "baserom.dol", 0x49E19C, 0x4 + .4byte 0x3F19999A .global $$258571 $$258571: - .incbin "baserom.dol", 0x49E1A0, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/StateParasolDrillEnd.s b/asm/src/StateParasolDrillEnd.s index bbba6bfd..6639c7e0 100644 --- a/asm/src/StateParasolDrillEnd.s +++ b/asm/src/StateParasolDrillEnd.s @@ -107,4 +107,13 @@ procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd: - .incbin "baserom.dol", 0x489DB8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80393AFC + .4byte 0x80393BB8 + .4byte 0x80393BBC + .4byte 0x8035550C + .4byte 0x80393BC0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateParasolFall.s b/asm/src/StateParasolFall.s index 7ae49e97..00b8952b 100644 --- a/asm/src/StateParasolFall.s +++ b/asm/src/StateParasolFall.s @@ -474,43 +474,59 @@ __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee16StateParasolFall __vt__Q53scn4step5enemy10parasoldee16StateParasolFall: - .incbin "baserom.dol", 0x476208, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CD454 ;# ptr + .4byte 0x802CD230 ;# ptr + .4byte 0x802CD2F0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CD35C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall: - .incbin "baserom.dol", 0x4763B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CF284 ;# ptr + .4byte 0x802CF06C ;# ptr + .4byte 0x802CF12C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CF198 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256866 $$256866: - .incbin "baserom.dol", 0x49C9D8, 0x4 + .4byte 0 .global $$256867 $$256867: - .incbin "baserom.dol", 0x49C9DC, 0x4 + .4byte 0xBF800000 .global $$256868 $$256868: - .incbin "baserom.dol", 0x49C9E0, 0x4 + .4byte 0x3C23D70A .global $$256869 $$256869: - .incbin "baserom.dol", 0x49C9E4, 0x4 + .4byte 0x3F000000 .global $$256892 $$256892: - .incbin "baserom.dol", 0x49C9E8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256865 $$256865: - .incbin "baserom.dol", 0x49CA28, 0x4 + .4byte 0 .global $$256866 $$256866: - .incbin "baserom.dol", 0x49CA2C, 0x4 + .4byte 0xBF800000 .global $$256867 $$256867: - .incbin "baserom.dol", 0x49CA30, 0x4 + .4byte 0x3C23D70A .global $$256868 $$256868: - .incbin "baserom.dol", 0x49CA34, 0x4 + .4byte 0x3F000000 .global $$256891 $$256891: - .incbin "baserom.dol", 0x49CA38, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateParasolParachute.s b/asm/src/StateParasolParachute.s index 5e8b3e77..85b27053 100644 --- a/asm/src/StateParasolParachute.s +++ b/asm/src/StateParasolParachute.s @@ -491,21 +491,33 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489DE0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803942A8 + .4byte 0x8039428C .global __vt__Q53scn4step4hero7parasol21StateParasolParachute __vt__Q53scn4step4hero7parasol21StateParasolParachute: - .incbin "baserom.dol", 0x489DF0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80393D8C + .4byte 0x80393E24 + .4byte 0x80393FA4 + .4byte 0x8035550C + .4byte 0x80394238 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258821 $$258821: - .incbin "baserom.dol", 0x49E1A8, 0x4 + .4byte 0xBDB851EC .global $$258876 $$258876: - .incbin "baserom.dol", 0x49E1AC, 0x4 + .4byte 0x3F000000 .global $$258877 $$258877: - .incbin "baserom.dol", 0x49E1B0, 0x4 + .4byte 0x3F19999A .global $$258878 $$258878: - .incbin "baserom.dol", 0x49E1B4, 0x4 + .4byte 0 diff --git a/asm/src/StateParasolParachuteFall.s b/asm/src/StateParasolParachuteFall.s index 0c79c5c7..d8e5af3e 100644 --- a/asm/src/StateParasolParachuteFall.s +++ b/asm/src/StateParasolParachuteFall.s @@ -312,9 +312,19 @@ lbl_803946FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall: - .incbin "baserom.dol", 0x489E18, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80394374 + .4byte 0x80394418 + .4byte 0x803946C0 + .4byte 0x8035550C + .4byte 0x803946C4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258542 $$258542: - .incbin "baserom.dol", 0x49E1B8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateParasolRelease.s b/asm/src/StateParasolRelease.s index 48d11308..22569387 100644 --- a/asm/src/StateParasolRelease.s +++ b/asm/src/StateParasolRelease.s @@ -363,30 +363,37 @@ procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage19StateParasolRelease __vt__Q53scn4step5enemy6damage19StateParasolRelease: - .incbin "baserom.dol", 0x471E60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AB7E0 ;# ptr + .4byte 0x802AB898 ;# ptr + .4byte 0x802AB964 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AB9E4 ;# ptr + .4byte 0x802ABB34 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257646 $$257646: - .incbin "baserom.dol", 0x49C250, 0x4 + .4byte 0 .global $$257647 $$257647: - .incbin "baserom.dol", 0x49C254, 0x4 + .4byte 0x3F800000 .global $$257686 $$257686: - .incbin "baserom.dol", 0x49C258, 0x4 + .4byte 0x41A00000 .global $$257687 $$257687: - .incbin "baserom.dol", 0x49C25C, 0x4 + .4byte 0x43B40000 .global $$257690 $$257690: - .incbin "baserom.dol", 0x49C260, 0x4 + .4byte 0x38D1B717 .global $$257691 $$257691: - .incbin "baserom.dol", 0x49C264, 0x4 + .4byte 0x3E4CCCCD .global $$257692 $$257692: - .incbin "baserom.dol", 0x49C268, 0x4 + .4byte 0x3C23D70A .global $$257693 $$257693: - .incbin "baserom.dol", 0x49C26C, 0x4 + .4byte 0x3BA3D70A diff --git a/asm/src/StateParasolShield.s b/asm/src/StateParasolShield.s index ad4958ea..25576503 100644 --- a/asm/src/StateParasolShield.s +++ b/asm/src/StateParasolShield.s @@ -128,4 +128,13 @@ procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol18StateParasolShield __vt__Q53scn4step4hero7parasol18StateParasolShield: - .incbin "baserom.dol", 0x489E40, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803947A0 + .4byte 0x8039485C + .4byte 0x803948B0 + .4byte 0x8035550C + .4byte 0x803948B4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateParasolSwing.s b/asm/src/StateParasolSwing.s index 203b7dca..ad18c8e8 100644 --- a/asm/src/StateParasolSwing.s +++ b/asm/src/StateParasolSwing.s @@ -708,33 +708,55 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x489E68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80395288 + .4byte 0x8039520C .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489E78, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80395284 + .4byte 0x80395228 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489E88, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80395280 + .4byte 0x80395244 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489E98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039527C + .4byte 0x80395260 .global __vt__Q53scn4step4hero7parasol17StateParasolSwing __vt__Q53scn4step4hero7parasol17StateParasolSwing: - .incbin "baserom.dol", 0x489EA8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80394A84 + .4byte 0x80394B40 + .4byte 0x80394D94 + .4byte 0x8035550C + .4byte 0x80394D98 + .4byte 0x80394D9C + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259324 $$259324: - .incbin "baserom.dol", 0x49E1C0, 0x4 + .4byte 0 .global $$259396 $$259396: - .incbin "baserom.dol", 0x49E1C4, 0x4 + .4byte 0x3F000000 .global $$259397 $$259397: - .incbin "baserom.dol", 0x49E1C8, 0x4 + .4byte 0x40800000 .global $$259398 $$259398: - .incbin "baserom.dol", 0x49E1CC, 0x4 + .4byte 0xBF000000 .global $$259470 $$259470: - .incbin "baserom.dol", 0x49E1D0, 0x8 + .4byte 0x3FB33333 + .4byte 0 diff --git a/asm/src/StateParasolUnder.s b/asm/src/StateParasolUnder.s index c90983b0..cb2d2308 100644 --- a/asm/src/StateParasolUnder.s +++ b/asm/src/StateParasolUnder.s @@ -303,7 +303,19 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489ED0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803956AC + .4byte 0x80395690 .global __vt__Q53scn4step4hero7parasol17StateParasolUnder __vt__Q53scn4step4hero7parasol17StateParasolUnder: - .incbin "baserom.dol", 0x489EE0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039543C + .4byte 0x80395574 + .4byte 0x803955C8 + .4byte 0x8035550C + .4byte 0x8039568C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateParasolWaterDive.s b/asm/src/StateParasolWaterDive.s index 7b777c5c..df4ce09f 100644 --- a/asm/src/StateParasolWaterDive.s +++ b/asm/src/StateParasolWaterDive.s @@ -518,18 +518,31 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489F08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80395E0C + .4byte 0x80395DF0 .global __vt__Q53scn4step4hero7parasol21StateParasolWaterDive __vt__Q53scn4step4hero7parasol21StateParasolWaterDive: - .incbin "baserom.dol", 0x489F18, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803958E8 + .4byte 0x803959E4 + .4byte 0x80395C48 + .4byte 0x8035550C + .4byte 0x80395CF4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258175 $$258175: - .incbin "baserom.dol", 0x49E1D8, 0x4 + .4byte 0xFF00FFFF .global $$258859 $$258859: - .incbin "baserom.dol", 0x49E1DC, 0x4 + .4byte 0x3F000000 .global $$258860 $$258860: - .incbin "baserom.dol", 0x49E1E0, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateParasolWaterDrill.s b/asm/src/StateParasolWaterDrill.s index 644ddae9..c03322b7 100644 --- a/asm/src/StateParasolWaterDrill.s +++ b/asm/src/StateParasolWaterDrill.s @@ -558,30 +558,47 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489F40, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803965F0 + .4byte 0x803965B4 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489F50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803965EC + .4byte 0x803965D0 .global __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill: - .incbin "baserom.dol", 0x489F60, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80396010 + .4byte 0x80396114 + .4byte 0x8039630C + .4byte 0x8035550C + .4byte 0x803963C8 + .4byte 0x803963CC + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258172 $$258172: - .incbin "baserom.dol", 0x49E1E8, 0x4 + .4byte 0xFF00FFFF .global $$258959 $$258959: - .incbin "baserom.dol", 0x49E1EC, 0x4 + .4byte 0 .global $$258962 $$258962: - .incbin "baserom.dol", 0x49E1F0, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$258997 $$258997: - .incbin "baserom.dol", 0x49E1F8, 0x4 + .4byte 0x3F000000 .global $$258998 $$258998: - .incbin "baserom.dol", 0x49E1FC, 0x4 + .4byte 0x40800000 .global $$258999 $$258999: - .incbin "baserom.dol", 0x49E200, 0x8 + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/src/StateParasolWaterDrillEnd.s b/asm/src/StateParasolWaterDrillEnd.s index adfd78eb..d49cdd33 100644 --- a/asm/src/StateParasolWaterDrillEnd.s +++ b/asm/src/StateParasolWaterDrillEnd.s @@ -196,4 +196,13 @@ procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd: - .incbin "baserom.dol", 0x489F88, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803966B0 + .4byte 0x8039676C + .4byte 0x8039682C + .4byte 0x8035550C + .4byte 0x80396894 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StatePick.s b/asm/src/StatePick.s index 5afa906c..69398215 100644 --- a/asm/src/StatePick.s +++ b/asm/src/StatePick.s @@ -196,15 +196,25 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462C60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802494A0 ;# ptr + .4byte 0x80249484 ;# ptr .global __vt__Q53scn4step4boss9creditdee9StatePick __vt__Q53scn4step4boss9creditdee9StatePick: - .incbin "baserom.dol", 0x462C70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80249268 ;# ptr + .4byte 0x8024926C ;# ptr + .4byte 0x802493A0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80249480 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255433 $$255433: - .incbin "baserom.dol", 0x49B1C0, 0x4 + .4byte 0x3727C5AC .global $$255434 $$255434: - .incbin "baserom.dol", 0x49B1C4, 0x4 + .4byte 0xB727C5AC diff --git a/asm/src/StatePiggyback.s b/asm/src/StatePiggyback.s index 5cade1cf..2c5d78a6 100644 --- a/asm/src/StatePiggyback.s +++ b/asm/src/StatePiggyback.s @@ -374,18 +374,27 @@ procFixPos__Q53scn4step4hero12interference14StatePiggybackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference14StatePiggyback __vt__Q53scn4step4hero12interference14StatePiggyback: - .incbin "baserom.dol", 0x488630, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80373308 + .4byte 0x803733E0 + .4byte 0x80373588 + .4byte 0x8037358C + .4byte 0x80373590 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257204 $$257204: - .incbin "baserom.dol", 0x49DD80, 0x4 + .4byte 0 .global $$257205 $$257205: - .incbin "baserom.dol", 0x49DD84, 0x4 + .4byte 0x3E4CCCCD .global $$257206 $$257206: - .incbin "baserom.dol", 0x49DD88, 0x4 + .4byte 0x3F800000 .global $$257207 $$257207: - .incbin "baserom.dol", 0x49DD8C, 0x4 + .4byte 0xBE4CCCCD diff --git a/asm/src/StatePlancher.s b/asm/src/StatePlancher.s index 5eeb8ca9..aa119e17 100644 --- a/asm/src/StatePlancher.s +++ b/asm/src/StatePlancher.s @@ -394,12 +394,25 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x487FA8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803678A0 + .4byte 0x80367884 .global __vt__Q53scn4step4hero6common13StatePlancher __vt__Q53scn4step4hero6common13StatePlancher: - .incbin "baserom.dol", 0x487FB8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80367570 + .4byte 0x80367600 + .4byte 0x80367748 + .4byte 0x8035550C + .4byte 0x8036774C + .4byte 0x803677DC + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257709 $$257709: - .incbin "baserom.dol", 0x49DBC0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePlancherBound.s b/asm/src/StatePlancherBound.s index 8299dba5..5e02bc56 100644 --- a/asm/src/StatePlancherBound.s +++ b/asm/src/StatePlancherBound.s @@ -293,9 +293,19 @@ lbl_80367CB0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common18StatePlancherBound __vt__Q53scn4step4hero6common18StatePlancherBound: - .incbin "baserom.dol", 0x487FE0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80367994 + .4byte 0x80367A10 + .4byte 0x80367B14 + .4byte 0x8035550C + .4byte 0x80367C50 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256367 $$256367: - .incbin "baserom.dol", 0x49DBC8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePlancherHit.s b/asm/src/StatePlancherHit.s index a65df6aa..2c11b371 100644 --- a/asm/src/StatePlancherHit.s +++ b/asm/src/StatePlancherHit.s @@ -332,9 +332,19 @@ lbl_80368164: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common16StatePlancherHit __vt__Q53scn4step4hero6common16StatePlancherHit: - .incbin "baserom.dol", 0x488008, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80367DA4 + .4byte 0x80367E20 + .4byte 0x80367FF0 + .4byte 0x8035550C + .4byte 0x8036812C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256509 $$256509: - .incbin "baserom.dol", 0x49DBD0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePlancherLanding.s b/asm/src/StatePlancherLanding.s index d2604e96..5ffbb7ff 100644 --- a/asm/src/StatePlancherLanding.s +++ b/asm/src/StatePlancherLanding.s @@ -321,15 +321,31 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488030, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803685CC + .4byte 0x80368590 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488040, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803685C8 + .4byte 0x803685AC .global __vt__Q53scn4step4hero6common20StatePlancherLanding __vt__Q53scn4step4hero6common20StatePlancherLanding: - .incbin "baserom.dol", 0x488050, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803682E4 + .4byte 0x80368360 + .4byte 0x80368520 + .4byte 0x8035550C + .4byte 0x8036858C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257417 $$257417: - .incbin "baserom.dol", 0x49DBD8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePraise.s b/asm/src/StatePraise.s index 24558da4..f3e58370 100644 --- a/asm/src/StatePraise.s +++ b/asm/src/StatePraise.s @@ -1138,48 +1138,101 @@ procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462890, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80248558 ;# ptr + .4byte 0x8024853C ;# ptr .global __vt__Q53scn4step4boss12creditdedede11StatePraise __vt__Q53scn4step4boss12creditdedede11StatePraise: - .incbin "baserom.dol", 0x4628A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80248378 ;# ptr + .4byte 0x8024837C ;# ptr + .4byte 0x80248448 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024849C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462C90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80249690 ;# ptr + .4byte 0x80249674 ;# ptr .global __vt__Q53scn4step4boss9creditdee11StatePraise __vt__Q53scn4step4boss9creditdee11StatePraise: - .incbin "baserom.dol", 0x462CA0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802495A8 ;# ptr + .4byte 0x802495AC ;# ptr + .4byte 0x8024961C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80249670 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463040, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024AF10 ;# ptr + .4byte 0x8024AEF4 ;# ptr .global __vt__Q53scn4step4boss10creditmeta11StatePraise __vt__Q53scn4step4boss10creditmeta11StatePraise: - .incbin "baserom.dol", 0x463050, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024AE14 ;# ptr + .4byte 0x8024AE18 ;# ptr + .4byte 0x8024AE9C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024AEF0 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common11StatePraise __vt__Q53scn4step5enemy6common11StatePraise: - .incbin "baserom.dol", 0x46F358, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802939F8 ;# ptr + .4byte 0x802939FC ;# ptr + .4byte 0x80293A20 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80293A24 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy11StatePraise __vt__Q53scn4step5enemy6bouncy11StatePraise: - .incbin "baserom.dol", 0x470568, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029DD38 ;# ptr + .4byte 0x8029DD3C ;# ptr + .4byte 0x8029DE14 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029DF84 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StatePraise __vt__Q53scn4step5enemy6sparky11StatePraise: - .incbin "baserom.dol", 0x479348, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E7594 ;# ptr + .4byte 0x802E7598 ;# ptr + .4byte 0x802E76D0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E77DC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255711 $$255711: - .incbin "baserom.dol", 0x49B1A0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256661 $$256661: - .incbin "baserom.dol", 0x49BE88, 0x8 + .4byte 0x3E23D70A + .4byte 0 diff --git a/asm/src/StatePreciousAppear.s b/asm/src/StatePreciousAppear.s index 8520d6ac..24643c58 100644 --- a/asm/src/StatePreciousAppear.s +++ b/asm/src/StatePreciousAppear.s @@ -398,24 +398,33 @@ __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1: - .incbin "baserom.dol", 0x48E6F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C8654 + .4byte 0x803C8638 .global __vt__Q53scn4step4item5state19StatePreciousAppear __vt__Q53scn4step4item5state19StatePreciousAppear: - .incbin "baserom.dol", 0x48E700, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C81DC + .4byte 0x803C8258 + .4byte 0x803C82B0 + .4byte 0x803C5204 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 $$255473: - .incbin "baserom.dol", 0x49E600, 0x4 + .4byte 0 .global $$255524 $$255524: - .incbin "baserom.dol", 0x49E604, 0x4 + .4byte 0x42B40000 .global $$255525 $$255525: - .incbin "baserom.dol", 0x49E608, 0x4 + .4byte 0x40000000 .global $$255526 $$255526: - .incbin "baserom.dol", 0x49E60C, 0x4 + .4byte 0x43340000 .global $$255527 $$255527: - .incbin "baserom.dol", 0x49E610, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StatePressFall.s b/asm/src/StatePressFall.s index 56d74774..8825dde4 100644 --- a/asm/src/StatePressFall.s +++ b/asm/src/StatePressFall.s @@ -341,12 +341,19 @@ lbl_802564D4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath14StatePressFall __vt__Q53scn4step4boss9moundeath14StatePressFall: - .incbin "baserom.dol", 0x4651C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80256180 ;# ptr + .4byte 0x80256200 ;# ptr + .4byte 0x80256204 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025625C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256793 $$256793: - .incbin "baserom.dol", 0x49B428, 0x4 + .4byte 0 .global $$256815 $$256815: - .incbin "baserom.dol", 0x49B42C, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/StatePressFallStart.s b/asm/src/StatePressFallStart.s index 642dea08..30c9b0c9 100644 --- a/asm/src/StatePressFallStart.s +++ b/asm/src/StatePressFallStart.s @@ -203,12 +203,23 @@ __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: - .incbin "baserom.dol", 0x4651E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80256794 ;# ptr + .4byte 0x80256774 ;# ptr .global __vt__Q53scn4step4boss9moundeath19StatePressFallStart __vt__Q53scn4step4boss9moundeath19StatePressFallStart: - .incbin "baserom.dol", 0x4651F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80256648 ;# ptr + .4byte 0x802566C8 ;# ptr + .4byte 0x8025676C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80256770 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256005 $$256005: - .incbin "baserom.dol", 0x49B430, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePressJump.s b/asm/src/StatePressJump.s index f35cf089..f522934e 100644 --- a/asm/src/StatePressJump.s +++ b/asm/src/StatePressJump.s @@ -397,27 +397,39 @@ __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: - .incbin "baserom.dol", 0x465210, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80256D30 ;# ptr + .4byte 0x80256D10 ;# ptr .global __vt__Q53scn4step4boss9moundeath14StatePressJump __vt__Q53scn4step4boss9moundeath14StatePressJump: - .incbin "baserom.dol", 0x465220, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80256AF4 ;# ptr + .4byte 0x80256AF8 ;# ptr + .4byte 0x80256C28 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80256D0C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255442 $$255442: - .incbin "baserom.dol", 0x49B438, 0x4 + .4byte 0 .global $$255464 $$255464: - .incbin "baserom.dol", 0x49B43C, 0x4 + .4byte 0x43B40000 .global $$255467 $$255467: - .incbin "baserom.dol", 0x49B440, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255475 $$255475: - .incbin "baserom.dol", 0x49B448, 0x4 + .4byte 0x4222F983 .global $$255476 $$255476: - .incbin "baserom.dol", 0x49B44C, 0x4 + .4byte 0x3C8EFA35 .global $$255477 $$255477: - .incbin "baserom.dol", 0x49B450, 0x8 + .4byte 0x42B40000 + .4byte 0 diff --git a/asm/src/StatePressJumpStart.s b/asm/src/StatePressJumpStart.s index 2cb78bcb..920fe405 100644 --- a/asm/src/StatePressJumpStart.s +++ b/asm/src/StatePressJumpStart.s @@ -173,7 +173,17 @@ __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: - .incbin "baserom.dol", 0x465240, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80256F60 ;# ptr + .4byte 0x80256F40 ;# ptr .global __vt__Q53scn4step4boss9moundeath19StatePressJumpStart __vt__Q53scn4step4boss9moundeath19StatePressJumpStart: - .incbin "baserom.dol", 0x465250, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80256DE0 ;# ptr + .4byte 0x80256DE4 ;# ptr + .4byte 0x80256EE8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80256F3C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StatePuff.s b/asm/src/StatePuff.s index cd49809a..189d5b2a 100644 --- a/asm/src/StatePuff.s +++ b/asm/src/StatePuff.s @@ -150,9 +150,17 @@ procMove__Q53scn4step5enemy10stareffect9StatePuffFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect9StatePuff __vt__Q53scn4step5enemy10stareffect9StatePuff: - .incbin "baserom.dol", 0x479458, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E85B4 ;# ptr + .4byte 0x802E8678 ;# ptr + .4byte 0x802E867C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 $$256196: - .incbin "baserom.dol", 0x49CF20, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StatePursuit.s b/asm/src/StatePursuit.s index 95c2b0b7..0d9b205a 100644 --- a/asm/src/StatePursuit.s +++ b/asm/src/StatePursuit.s @@ -842,37 +842,51 @@ __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StatePursuit __vt__Q53scn4step5enemy6common12StatePursuit: - .incbin "baserom.dol", 0x46F378, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80294004 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x80293AAC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80293E68 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StatePursuit __vt__Q53scn4step5enemy10brontoburt12StatePursuit: - .incbin "baserom.dol", 0x470BC8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A00C8 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8029FB00 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029FEBC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: - .incbin "baserom.dol", 0x49BBE0, 0x4 + .4byte 0 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49BBE4, 0x4 + .4byte 0x3727C5AC .global $$256211 $$256211: - .incbin "baserom.dol", 0x49BBE8, 0x4 + .4byte 0x3F800000 .global $$256249 $$256249: - .incbin "baserom.dol", 0x49BBEC, 0x4 + .4byte 0x40000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256193 $$256193: - .incbin "baserom.dol", 0x49BF00, 0x4 + .4byte 0 .global $$256245 $$256245: - .incbin "baserom.dol", 0x49BF04, 0x4 + .4byte 0x3727C5AC .global $$256246 $$256246: - .incbin "baserom.dol", 0x49BF08, 0x4 + .4byte 0x3F800000 .global $$256288 $$256288: - .incbin "baserom.dol", 0x49BF0C, 0x4 + .4byte 0x40000000 diff --git a/asm/src/StateQuivery.s b/asm/src/StateQuivery.s index d1150505..c666faa6 100644 --- a/asm/src/StateQuivery.s +++ b/asm/src/StateQuivery.s @@ -223,18 +223,27 @@ reqQuivery__Q53scn4step4boss13watergalboros12StateQuiveryFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros12StateQuivery __vt__Q53scn4step4boss13watergalboros12StateQuivery: - .incbin "baserom.dol", 0x465BC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025A8AC ;# ptr + .4byte 0x8025A8B0 ;# ptr + .4byte 0x8025AA00 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025AA04 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 $$256461: - .incbin "baserom.dol", 0x49B4E0, 0x4 + .4byte 0 .global $$256462 $$256462: - .incbin "baserom.dol", 0x49B4E4, 0x4 + .4byte 0x42B40000 .global $$256480 $$256480: - .incbin "baserom.dol", 0x49B4E8, 0x8 + .4byte 0x43B40000 + .4byte 0 .global $$256483 $$256483: - .incbin "baserom.dol", 0x49B4F0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRainBomb.s b/asm/src/StateRainBomb.s index 990c2527..38cb67f2 100644 --- a/asm/src/StateRainBomb.s +++ b/asm/src/StateRainBomb.s @@ -326,18 +326,29 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461320, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80238C3C ;# ptr + .4byte 0x80238C20 ;# ptr .global __vt__Q53scn4step4boss7bonkers13StateRainBomb __vt__Q53scn4step4boss7bonkers13StateRainBomb: - .incbin "baserom.dol", 0x461330, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802388C8 ;# ptr + .4byte 0x80238948 ;# ptr + .4byte 0x80238A54 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80238A58 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256362 $$256362: - .incbin "baserom.dol", 0x49AF68, 0x4 + .4byte 0 .global $$256363 $$256363: - .incbin "baserom.dol", 0x49AF6C, 0x4 + .4byte 0x3F800000 .global $$256364 $$256364: - .incbin "baserom.dol", 0x49AF70, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateRainBombStart.s b/asm/src/StateRainBombStart.s index 0bd682a6..aaa93005 100644 --- a/asm/src/StateRainBombStart.s +++ b/asm/src/StateRainBombStart.s @@ -273,27 +273,39 @@ __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1 __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1: - .incbin "baserom.dol", 0x461350, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80238FF8 ;# ptr + .4byte 0x80238FAC ;# ptr .global __vt__Q53scn4step4boss7bonkers18StateRainBombStart __vt__Q53scn4step4boss7bonkers18StateRainBombStart: - .incbin "baserom.dol", 0x461360, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80238D90 ;# ptr + .4byte 0x80238D94 ;# ptr + .4byte 0x80238E7C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80238FA8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255597 $$255597: - .incbin "baserom.dol", 0x49AF78, 0x4 + .4byte 0 .global $$255631 $$255631: - .incbin "baserom.dol", 0x49AF7C, 0x4 + .4byte 0x42B40000 .global $$255632 $$255632: - .incbin "baserom.dol", 0x49AF80, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$255635 $$255635: - .incbin "baserom.dol", 0x49AF88, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$255640 $$255640: - .incbin "baserom.dol", 0x49AF90, 0x4 + .4byte 0x4222F983 .global $$255641 $$255641: - .incbin "baserom.dol", 0x49AF94, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/src/StateReady.s b/asm/src/StateReady.s index d2639b50..0c7a419f 100644 --- a/asm/src/StateReady.s +++ b/asm/src/StateReady.s @@ -617,45 +617,57 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x4914A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803F1070 + .4byte 0x803F1050 .global __vt__Q53scn4step6weapon19challengemastershot10StateReady __vt__Q53scn4step6weapon19challengemastershot10StateReady: - .incbin "baserom.dol", 0x4914B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803F106C + .4byte 0x803F08D8 + .4byte 0x803F0AC4 + .4byte 0x803D895C + .4byte 0x803F0DD8 + .4byte 0x803D8964 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257357 $$257357: - .incbin "baserom.dol", 0x49ECC0, 0x4 + .4byte 0 .global $$257431 $$257431: - .incbin "baserom.dol", 0x49ECC4, 0x4 + .4byte 0x3F800000 .global $$257432 $$257432: - .incbin "baserom.dol", 0x49ECC8, 0x4 + .4byte 0x3DCCCCCD .global $$257433 $$257433: - .incbin "baserom.dol", 0x49ECCC, 0x4 + .4byte 0x43340000 .global $$257434 $$257434: - .incbin "baserom.dol", 0x49ECD0, 0x4 + .4byte 0xBDCCCCCD .global $$257435 $$257435: - .incbin "baserom.dol", 0x49ECD4, 0x4 + .4byte 0x43B40000 .global $$257436 $$257436: - .incbin "baserom.dol", 0x49ECD8, 0x4 + .4byte 0x4222F983 .global $$257437 $$257437: - .incbin "baserom.dol", 0x49ECDC, 0x4 + .4byte 0x3C8EFA35 .global $$257438 $$257438: - .incbin "baserom.dol", 0x49ECE0, 0x4 + .4byte 0x42B40000 .global $$257439 $$257439: - .incbin "baserom.dol", 0x49ECE4, 0x4 + .4byte 0x3F000000 .global $$257442 $$257442: - .incbin "baserom.dol", 0x49ECE8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257479 $$257479: - .incbin "baserom.dol", 0x49ECF0, 0x8 + .4byte 0x40400000 + .4byte 0 diff --git a/asm/src/StateReflect.s b/asm/src/StateReflect.s index 25a30fc1..1352a289 100644 --- a/asm/src/StateReflect.s +++ b/asm/src/StateReflect.s @@ -667,37 +667,55 @@ procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear12StateReflect __vt__Q53scn4step6weapon10spearspear12StateReflect: - .incbin "baserom.dol", 0x4907E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E471C + .4byte 0x803E47C8 + .4byte 0x803E48C0 + .4byte 0x803D895C + .4byte 0x803E48C4 + .4byte 0x803E4AF4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear12StateReflect __vt__Q53scn4step6weapon8deespear12StateReflect: - .incbin "baserom.dol", 0x4910A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803ED730 + .4byte 0x803ED7DC + .4byte 0x803ED8D4 + .4byte 0x803D895C + .4byte 0x803ED8D8 + .4byte 0x803EDB08 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 $$257330: - .incbin "baserom.dol", 0x49EA58, 0x8 + .4byte 0 + .4byte 0 .global $$257334 $$257334: - .incbin "baserom.dol", 0x49EA60, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257379 $$257379: - .incbin "baserom.dol", 0x49EA68, 0x4 + .4byte 0x43B40000 .global $$257391 $$257391: - .incbin "baserom.dol", 0x49EA6C, 0x4 + .4byte 0xBDCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 $$257330: - .incbin "baserom.dol", 0x49EC40, 0x8 + .4byte 0 + .4byte 0 .global $$257334 $$257334: - .incbin "baserom.dol", 0x49EC48, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$257379 $$257379: - .incbin "baserom.dol", 0x49EC50, 0x4 + .4byte 0x43B40000 .global $$257391 $$257391: - .incbin "baserom.dol", 0x49EC54, 0x4 + .4byte 0xBDCCCCCD diff --git a/asm/src/StateReturnWarpLowper.s b/asm/src/StateReturnWarpLowper.s index d860bb24..4f9b75a4 100644 --- a/asm/src/StateReturnWarpLowper.s +++ b/asm/src/StateReturnWarpLowper.s @@ -484,36 +484,49 @@ __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1 __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1: - .incbin "baserom.dol", 0x488CC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80381E1C + .4byte 0x80381DF8 .global __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper: - .incbin "baserom.dol", 0x488CD0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80381954 + .4byte 0x80381A88 + .4byte 0x80381C0C + .4byte 0x8035550C + .4byte 0x80381DF4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259162 $$259162: - .incbin "baserom.dol", 0x49DFC0, 0x4 + .4byte 0 .global $$259191 $$259191: - .incbin "baserom.dol", 0x49DFC4, 0x4 + .4byte 0xBF000000 .global $$259230 $$259230: - .incbin "baserom.dol", 0x49DFC8, 0x4 + .4byte 0x42B40000 .global $$259231 $$259231: - .incbin "baserom.dol", 0x49DFCC, 0x4 + .4byte 0x3F800000 .global $$259232 $$259232: - .incbin "baserom.dol", 0x49DFD0, 0x4 + .4byte 0x4222F983 .global $$259233 $$259233: - .incbin "baserom.dol", 0x49DFD4, 0x4 + .4byte 0x3C8EFA35 .global $$259234 $$259234: - .incbin "baserom.dol", 0x49DFD8, 0x4 + .4byte 0x43340000 .global $$259235 $$259235: - .incbin "baserom.dol", 0x49DFDC, 0x4 + .4byte 0x40200000 .global $$259238 $$259238: - .incbin "baserom.dol", 0x49DFE0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRise.s b/asm/src/StateRise.s index f281c892..438768f0 100644 --- a/asm/src/StateRise.s +++ b/asm/src/StateRise.s @@ -220,33 +220,41 @@ __dt__Q53scn4step5enemy7parasol9StateRiseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7parasol9StateRise __vt__Q53scn4step5enemy7parasol9StateRise: - .incbin "baserom.dol", 0x476078, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CB6DC ;# ptr + .4byte 0x802CB4D0 ;# ptr + .4byte 0x802CB560 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CB5F8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255826 $$255826: - .incbin "baserom.dol", 0x49C980, 0x4 + .4byte 0 .global $$255827 $$255827: - .incbin "baserom.dol", 0x49C984, 0x4 + .4byte 0x3ECCCCCD .global $$255828 $$255828: - .incbin "baserom.dol", 0x49C988, 0x4 + .4byte 0x3F8B851F .global $$255829 $$255829: - .incbin "baserom.dol", 0x49C98C, 0x4 + .4byte 0x3F170A3D .global $$255830 $$255830: - .incbin "baserom.dol", 0x49C990, 0x4 + .4byte 0x42680000 .global $$255839 $$255839: - .incbin "baserom.dol", 0x49C994, 0x4 + .4byte 0x40A00000 .global $$255840 $$255840: - .incbin "baserom.dol", 0x49C998, 0x4 + .4byte 0x43B40000 .global $$255843 $$255843: - .incbin "baserom.dol", 0x49C99C, 0x4 + .4byte 0x3A378034 .global $$255864 $$255864: - .incbin "baserom.dol", 0x49C9A0, 0x8 + .4byte 0x3FC00000 + .4byte 0 diff --git a/asm/src/StateRising.s b/asm/src/StateRising.s index fad361a3..bd77c31c 100644 --- a/asm/src/StateRising.s +++ b/asm/src/StateRising.s @@ -555,31 +555,49 @@ lbl_8039E18C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe11StateRising __vt__Q53scn4step5enemy10knucklejoe11StateRising: - .incbin "baserom.dol", 0x474A70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C0454 ;# ptr + .4byte 0x802C04FC ;# ptr + .4byte 0x802C0638 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C06A8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter11StateRising __vt__Q53scn4step4hero7fighter11StateRising: - .incbin "baserom.dol", 0x48A5E8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039DECC + .4byte 0x8039DF84 + .4byte 0x8039E000 + .4byte 0x8035550C + .4byte 0x8039E110 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255924 $$255924: - .incbin "baserom.dol", 0x49C730, 0x4 + .4byte 0 .global $$255925 $$255925: - .incbin "baserom.dol", 0x49C734, 0x4 + .4byte 0x42B40000 .global $$255926 $$255926: - .incbin "baserom.dol", 0x49C738, 0x4 + .4byte 0x3E800000 .global $$255934 $$255934: - .incbin "baserom.dol", 0x49C73C, 0x4 + .4byte 0x3DCCCCCD .global $$255942 $$255942: - .incbin "baserom.dol", 0x49C740, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256087 $$256087: - .incbin "baserom.dol", 0x49E300, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateRoah.s b/asm/src/StateRoah.s index 89cc35b0..86805ee0 100644 --- a/asm/src/StateRoah.s +++ b/asm/src/StateRoah.s @@ -177,24 +177,31 @@ procFixPos__Q53scn4step4item5state9StateRoahFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state9StateRoah __vt__Q53scn4step4item5state9StateRoah: - .incbin "baserom.dol", 0x48E718, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C8748 + .4byte 0x803C874C + .4byte 0x803C8750 + .4byte 0x803C88C8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255795 $$255795: - .incbin "baserom.dol", 0x49E618, 0x4 + .4byte 0 .global $$255830 $$255830: - .incbin "baserom.dol", 0x49E61C, 0x4 + .4byte 0x4222F983 .global $$255831 $$255831: - .incbin "baserom.dol", 0x49E620, 0x4 + .4byte 0x3C8EFA35 .global $$255832 $$255832: - .incbin "baserom.dol", 0x49E624, 0x4 + .4byte 0x42B40000 .global $$255833 $$255833: - .incbin "baserom.dol", 0x49E628, 0x8 + .4byte 0xBF800000 + .4byte 0 .global $$255836 $$255836: - .incbin "baserom.dol", 0x49E630, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRollJump.s b/asm/src/StateRollJump.s index 3448bee6..617c45d7 100644 --- a/asm/src/StateRollJump.s +++ b/asm/src/StateRollJump.s @@ -362,24 +362,33 @@ procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath13StateRollJump __vt__Q53scn4step4boss9moundeath13StateRollJump: - .incbin "baserom.dol", 0x4652F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80257C18 ;# ptr + .4byte 0x80257C98 ;# ptr + .4byte 0x80257E50 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80257F8C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256524 $$256524: - .incbin "baserom.dol", 0x49B480, 0x4 + .4byte 0 .global $$256538 $$256538: - .incbin "baserom.dol", 0x49B484, 0x4 + .4byte 0xBF800000 .global $$256556 $$256556: - .incbin "baserom.dol", 0x49B488, 0x4 + .4byte 0x42B40000 .global $$256557 $$256557: - .incbin "baserom.dol", 0x49B48C, 0x4 + .4byte 0x3F800000 .global $$256558 $$256558: - .incbin "baserom.dol", 0x49B490, 0x8 + .4byte 0x43340000 + .4byte 0 .global $$256561 $$256561: - .incbin "baserom.dol", 0x49B498, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRolling.s b/asm/src/StateRolling.s index f5463c58..f022743c 100644 --- a/asm/src/StateRolling.s +++ b/asm/src/StateRolling.s @@ -478,24 +478,35 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465270, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80257620 ;# ptr + .4byte 0x80257604 ;# ptr .global __vt__Q53scn4step4boss9moundeath12StateRolling __vt__Q53scn4step4boss9moundeath12StateRolling: - .incbin "baserom.dol", 0x465280, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802570D0 ;# ptr + .4byte 0x8025714C ;# ptr + .4byte 0x80257288 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025742C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257155 $$257155: - .incbin "baserom.dol", 0x49B458, 0x4 + .4byte 0 .global $$257182 $$257182: - .incbin "baserom.dol", 0x49B45C, 0x4 + .4byte 0x43B40000 .global $$257185 $$257185: - .incbin "baserom.dol", 0x49B460, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257230 $$257230: - .incbin "baserom.dol", 0x49B468, 0x4 + .4byte 0x3F800000 .global $$257231 $$257231: - .incbin "baserom.dol", 0x49B46C, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/StateRollingEnd.s b/asm/src/StateRollingEnd.s index 18088b66..fa0554fc 100644 --- a/asm/src/StateRollingEnd.s +++ b/asm/src/StateRollingEnd.s @@ -67,4 +67,11 @@ procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath15StateRollingEnd __vt__Q53scn4step4boss9moundeath15StateRollingEnd: - .incbin "baserom.dol", 0x4652A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80257684 ;# ptr + .4byte 0x80257688 ;# ptr + .4byte 0x8025768C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802576E0 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateRollingStart.s b/asm/src/StateRollingStart.s index 06f9a7f8..aba26b4a 100644 --- a/asm/src/StateRollingStart.s +++ b/asm/src/StateRollingStart.s @@ -251,18 +251,29 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12S .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4652C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80257A5C ;# ptr + .4byte 0x80257A40 ;# ptr .global __vt__Q53scn4step4boss9moundeath17StateRollingStart __vt__Q53scn4step4boss9moundeath17StateRollingStart: - .incbin "baserom.dol", 0x4652D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80257810 ;# ptr + .4byte 0x8025788C ;# ptr + .4byte 0x802579CC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80257A3C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256231 $$256231: - .incbin "baserom.dol", 0x49B470, 0x4 + .4byte 0 .global $$256258 $$256258: - .incbin "baserom.dol", 0x49B474, 0x4 + .4byte 0x43B40000 .global $$256261 $$256261: - .incbin "baserom.dol", 0x49B478, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRoomGuarderAppear.s b/asm/src/StateRoomGuarderAppear.s index ccb82d9d..007b2ec0 100644 --- a/asm/src/StateRoomGuarderAppear.s +++ b/asm/src/StateRoomGuarderAppear.s @@ -224,18 +224,27 @@ procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear: - .incbin "baserom.dol", 0x46F398, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802940E4 ;# ptr + .4byte 0x80294194 ;# ptr + .4byte 0x80294334 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 $$256208: - .incbin "baserom.dol", 0x49BBF0, 0x4 + .4byte 0x43B40000 .global $$256209 $$256209: - .incbin "baserom.dol", 0x49BBF4, 0x4 + .4byte 0x42B40000 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49BBF8, 0x8 + .4byte 0 + .4byte 0 .global $$256213 $$256213: - .incbin "baserom.dol", 0x49BC00, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRootAttack.s b/asm/src/StateRootAttack.s index 37fb0298..bcb8c8c3 100644 --- a/asm/src/StateRootAttack.s +++ b/asm/src/StateRootAttack.s @@ -147,12 +147,21 @@ procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy15StateRootAttack __vt__Q53scn4step4boss6whispy15StateRootAttack: - .incbin "baserom.dol", 0x466758, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025DD48 ;# ptr + .4byte 0x8025DD4C ;# ptr + .4byte 0x8025DEE0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025DEE4 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256375 $$256375: - .incbin "baserom.dol", 0x49B550, 0x8 + .4byte 0x40000000 + .4byte 0 .global $$256378 $$256378: - .incbin "baserom.dol", 0x49B558, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateRun.s b/asm/src/StateRun.s index f2e60cf2..b075130f 100644 --- a/asm/src/StateRun.s +++ b/asm/src/StateRun.s @@ -563,20 +563,39 @@ __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee8StateRun __vt__Q53scn4step4boss9creditdee8StateRun: - .incbin "baserom.dol", 0x462CC0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024970C ;# ptr + .4byte 0x80249710 ;# ptr + .4byte 0x80249738 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802497A4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488078, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80368BB8 + .4byte 0x80368B9C .global __vt__Q53scn4step4hero6common8StateRun __vt__Q53scn4step4hero6common8StateRun: - .incbin "baserom.dol", 0x488088, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80368824 + .4byte 0x803688D4 + .4byte 0x80368AD4 + .4byte 0x8035550C + .4byte 0x80368AD8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259126 $$259126: - .incbin "baserom.dol", 0x49DBE0, 0x4 + .4byte 0x3C23D70A .global $$259127 $$259127: - .incbin "baserom.dol", 0x49DBE4, 0x4 + .4byte 0 diff --git a/asm/src/StateRunAppear.s b/asm/src/StateRunAppear.s index 50280d3e..b497e144 100644 --- a/asm/src/StateRunAppear.s +++ b/asm/src/StateRunAppear.s @@ -263,15 +263,29 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462CE0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80249BF4 ;# ptr + .4byte 0x80249BB8 ;# ptr .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462CF0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80249BF0 ;# ptr + .4byte 0x80249BD4 ;# ptr .global __vt__Q53scn4step4boss9creditdee14StateRunAppear __vt__Q53scn4step4boss9creditdee14StateRunAppear: - .incbin "baserom.dol", 0x462D00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80249A48 ;# ptr + .4byte 0x80249A4C ;# ptr + .4byte 0x80249A50 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80249ABC ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255551 $$255551: - .incbin "baserom.dol", 0x49B1C8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSCFlyAway.s b/asm/src/StateSCFlyAway.s index 118c0557..e71c78fb 100644 --- a/asm/src/StateSCFlyAway.s +++ b/asm/src/StateSCFlyAway.s @@ -600,47 +600,59 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461FC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802422DC ;# ptr + .4byte 0x802422C0 ;# ptr .global __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway: - .incbin "baserom.dol", 0x461FD8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80241B80 ;# ptr + .4byte 0x80241C2C ;# ptr + .4byte 0x80241D18 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80241F58 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255744 $$255744: - .incbin "baserom.dol", 0x4953F8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256779 $$256779: - .incbin "baserom.dol", 0x49B098, 0x4 + .4byte 0 .global $$256800 $$256800: - .incbin "baserom.dol", 0x49B09C, 0x4 + .4byte 0x42B40000 .global $$256801 $$256801: - .incbin "baserom.dol", 0x49B0A0, 0x4 + .4byte 0x3F11EB85 .global $$256802 $$256802: - .incbin "baserom.dol", 0x49B0A4, 0x4 + .4byte 0xBF800000 .global $$256803 $$256803: - .incbin "baserom.dol", 0x49B0A8, 0x4 + .4byte 0x43B40000 .global $$256804 $$256804: - .incbin "baserom.dol", 0x49B0AC, 0x4 + .4byte 0x43340000 .global $$256807 $$256807: - .incbin "baserom.dol", 0x49B0B0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256812 $$256812: - .incbin "baserom.dol", 0x49B0B8, 0x4 + .4byte 0x4222F983 .global $$256813 $$256813: - .incbin "baserom.dol", 0x49B0BC, 0x4 + .4byte 0x3C8EFA35 .global $$256878 $$256878: - .incbin "baserom.dol", 0x49B0C0, 0x4 + .4byte 0x3F800000 .global $$256879 $$256879: - .incbin "baserom.dol", 0x49B0C4, 0x4 + .4byte 0x3727C5AC diff --git a/asm/src/StateSCHide.s b/asm/src/StateSCHide.s index 0118b8d6..d94a572f 100644 --- a/asm/src/StateSCHide.s +++ b/asm/src/StateSCHide.s @@ -107,4 +107,11 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster11StateSCHide __vt__Q53scn4step4boss15challengemaster11StateSCHide: - .incbin "baserom.dol", 0x461FF8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024237C ;# ptr + .4byte 0x8024240C ;# ptr + .4byte 0x80242434 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80242438 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateSCLookFar.s b/asm/src/StateSCLookFar.s index 4a2f9c13..eb400a41 100644 --- a/asm/src/StateSCLookFar.s +++ b/asm/src/StateSCLookFar.s @@ -166,7 +166,17 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462018, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80242640 ;# ptr + .4byte 0x80242624 ;# ptr .global __vt__Q53scn4step4boss15challengemaster14StateSCLookFar __vt__Q53scn4step4boss15challengemaster14StateSCLookFar: - .incbin "baserom.dol", 0x462028, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80242554 ;# ptr + .4byte 0x80242558 ;# ptr + .4byte 0x802425BC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802425C0 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateSCLookKirby.s b/asm/src/StateSCLookKirby.s index 70dd75d9..2133a8f2 100644 --- a/asm/src/StateSCLookKirby.s +++ b/asm/src/StateSCLookKirby.s @@ -316,23 +316,37 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1: - .incbin "baserom.dol", 0x462048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80242A78 ;# ptr + .4byte 0x80242A38 ;# ptr .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462058, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80242A74 ;# ptr + .4byte 0x80242A58 ;# ptr .global __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby: - .incbin "baserom.dol", 0x462068, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80242794 ;# ptr + .4byte 0x80242798 ;# ptr + .4byte 0x8024283C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80242A34 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255360 $$255360: - .incbin "baserom.dol", 0x495400, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255993 $$255993: - .incbin "baserom.dol", 0x49B0C8, 0x4 + .4byte 0x3727C5AC .global $$255994 $$255994: - .incbin "baserom.dol", 0x49B0CC, 0x4 + .4byte 0 diff --git a/asm/src/StateSCPursuit.s b/asm/src/StateSCPursuit.s index 072f95fa..f443aad6 100644 --- a/asm/src/StateSCPursuit.s +++ b/asm/src/StateSCPursuit.s @@ -307,9 +307,17 @@ procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster14StateSCPursuit __vt__Q53scn4step4boss15challengemaster14StateSCPursuit: - .incbin "baserom.dol", 0x462088, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80242C60 ;# ptr + .4byte 0x80242C64 ;# ptr + .4byte 0x80242CAC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80242ECC ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256097 $$256097: - .incbin "baserom.dol", 0x49B0D0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSelect.s b/asm/src/StateSelect.s index 61fb4a8d..3888a377 100644 --- a/asm/src/StateSelect.s +++ b/asm/src/StateSelect.s @@ -951,4 +951,7 @@ lbl_8035E29C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8inactive11StateSelect __vt__Q53scn4step4hero8inactive11StateSelect: - .incbin "baserom.dol", 0x487A68, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035D6AC + .4byte 0x8035D72C diff --git a/asm/src/StateShipRepairDemo.s b/asm/src/StateShipRepairDemo.s index d136c202..8e6adf9d 100644 --- a/asm/src/StateShipRepairDemo.s +++ b/asm/src/StateShipRepairDemo.s @@ -393,12 +393,21 @@ procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common19StateShipRepairDemo __vt__Q53scn4step4hero6common19StateShipRepairDemo: - .incbin "baserom.dol", 0x4880B0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80368D04 + .4byte 0x80368DF4 + .4byte 0x8036907C + .4byte 0x8035550C + .4byte 0x80369120 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259942 $$259942: - .incbin "baserom.dol", 0x49DBE8, 0x4 + .4byte 0x42F00000 .global $$259943 $$259943: - .incbin "baserom.dol", 0x49DBEC, 0x4 + .4byte 0x42B40000 diff --git a/asm/src/StateShipRepairDemoAfter.s b/asm/src/StateShipRepairDemoAfter.s index ac9d74f2..230328c1 100644 --- a/asm/src/StateShipRepairDemoAfter.s +++ b/asm/src/StateShipRepairDemoAfter.s @@ -259,15 +259,25 @@ lbl_803694DC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter: - .incbin "baserom.dol", 0x4880D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80369294 + .4byte 0x80369344 + .4byte 0x80369410 + .4byte 0x8035550C + .4byte 0x803694A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260120 $$260120: - .incbin "baserom.dol", 0x49DBF0, 0x4 + .4byte 0 .global $$260147 $$260147: - .incbin "baserom.dol", 0x49DBF4, 0x4 + .4byte 0x3DCCCCCD .global $$260150 $$260150: - .incbin "baserom.dol", 0x49DBF8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateShipRepairDemoAfterFollow.s b/asm/src/StateShipRepairDemoAfterFollow.s index 0d0e7b13..9aa2eb4e 100644 --- a/asm/src/StateShipRepairDemoAfterFollow.s +++ b/asm/src/StateShipRepairDemoAfterFollow.s @@ -407,23 +407,39 @@ procFixPos__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DEPTH_LIST24__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2 T_DEPTH_LIST24__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: - .incbin "baserom.dol", 0x41BCC8, 0x10 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xC0000000 + .4byte 0 .global T_DEPTH_LIST3__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2 T_DEPTH_LIST3__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: - .incbin "baserom.dol", 0x41BCD8, 0x10 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollow __vt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollow: - .incbin "baserom.dol", 0x488100, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80369840 + .4byte 0x803698F0 + .4byte 0x803699E4 + .4byte 0x8035550C + .4byte 0x80369AB0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259551 $$259551: - .incbin "baserom.dol", 0x49DC00, 0x4 + .4byte 0 .global $$259580 $$259580: - .incbin "baserom.dol", 0x49DC04, 0x4 + .4byte 0x3DCCCCCD .global $$259583 $$259583: - .incbin "baserom.dol", 0x49DC08, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateShipRepairDemoFollow.s b/asm/src/StateShipRepairDemoFollow.s index be1d5410..e04e192b 100644 --- a/asm/src/StateShipRepairDemoFollow.s +++ b/asm/src/StateShipRepairDemoFollow.s @@ -429,20 +429,33 @@ procFixPos__Q53scn4step4hero6common25StateShipRepairDemoFollowFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ROT_LIST__39$$2unnamed$$2StateShipRepairDemoFollow_cpp$$2 ROT_LIST__39$$2unnamed$$2StateShipRepairDemoFollow_cpp$$2: - .incbin "baserom.dol", 0x41BCE8, 0x10 + .4byte 0 + .4byte 0x430C0000 + .4byte 0x42F00000 + .4byte 0x42F00000 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common25StateShipRepairDemoFollow __vt__Q53scn4step4hero6common25StateShipRepairDemoFollow: - .incbin "baserom.dol", 0x488128, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80369D4C + .4byte 0x80369E4C + .4byte 0x8036A028 + .4byte 0x8035550C + .4byte 0x8036A0CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259892 $$259892: - .incbin "baserom.dol", 0x49DC10, 0x4 + .4byte 0 .global $$259893 $$259893: - .incbin "baserom.dol", 0x49DC14, 0x4 + .4byte 0xC0400000 .global $$259963 $$259963: - .incbin "baserom.dol", 0x49DC18, 0x8 + .4byte 0x42B40000 + .4byte 0 diff --git a/asm/src/StateShot.s b/asm/src/StateShot.s index 85222353..ac00be58 100644 --- a/asm/src/StateShot.s +++ b/asm/src/StateShot.s @@ -3105,158 +3105,253 @@ lbl_8039E640: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4620A8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802432C4 ;# ptr + .4byte 0x802432A8 ;# ptr .global __vt__Q53scn4step4boss15challengemaster9StateShot __vt__Q53scn4step4boss15challengemaster9StateShot: - .incbin "baserom.dol", 0x4620B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80242FFC ;# ptr + .4byte 0x80243098 ;# ptr + .4byte 0x80243240 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80243244 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateShot __vt__Q53scn4step4boss6dubior9StateShot: - .incbin "baserom.dol", 0x463980, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802503A4 ;# ptr + .4byte 0x802503A8 ;# ptr + .4byte 0x80250464 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80250468 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge9StateShot __vt__Q53scn4step4boss10gigantedge9StateShot: - .incbin "baserom.dol", 0x464130, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802526CC ;# ptr + .4byte 0x802526D0 ;# ptr + .4byte 0x802527F8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802527FC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470128, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8029C844 ;# ptr + .4byte 0x8029C828 ;# ptr .global __vt__Q53scn4step5enemy11bonkersbomb9StateShot __vt__Q53scn4step5enemy11bonkersbomb9StateShot: - .incbin "baserom.dol", 0x470138, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029C638 ;# ptr + .4byte 0x8029C63C ;# ptr + .4byte 0x8029C6F8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029C784 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11dubiorspark9StateShot __vt__Q53scn4step5enemy11dubiorspark9StateShot: - .incbin "baserom.dol", 0x4724E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802AF05C ;# ptr + .4byte 0x802AF060 ;# ptr + .4byte 0x802AF064 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AF0B8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot: - .incbin "baserom.dol", 0x476A68, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D2E40 ;# ptr + .4byte 0x802D2E44 ;# ptr + .4byte 0x802D2FAC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D3010 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateShot __vt__Q53scn4step5enemy6shotzo9StateShot: - .incbin "baserom.dol", 0x478290, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E0E84 ;# ptr + .4byte 0x802E0B28 ;# ptr + .4byte 0x802E0B44 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E0C40 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x489A50, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038F548 + .4byte 0x8038F528 .global __vt__Q53scn4step4hero5spark9StateShot __vt__Q53scn4step4hero5spark9StateShot: - .incbin "baserom.dol", 0x489A60, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038F15C + .4byte 0x8038F1FC + .4byte 0x8038F410 + .4byte 0x8035550C + .4byte 0x8038F49C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A120, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039987C + .4byte 0x80399860 .global __vt__Q53scn4step4hero4wing9StateShot __vt__Q53scn4step4hero4wing9StateShot: - .incbin "baserom.dol", 0x48A130, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80399008 + .4byte 0x803990AC + .4byte 0x803992CC + .4byte 0x8035550C + .4byte 0x803992D0 + .4byte 0x803992D4 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter9StateShot __vt__Q53scn4step4hero7fighter9StateShot: - .incbin "baserom.dol", 0x48A610, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039E2B8 + .4byte 0x8039E334 + .4byte 0x8039E3C8 + .4byte 0x8035550C + .4byte 0x8039E460 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255729 $$255729: - .incbin "baserom.dol", 0x49B0D8, 0x4 + .4byte 0x3F800000 .global $$255730 $$255730: - .incbin "baserom.dol", 0x49B0DC, 0x4 + .4byte 0x40800000 .global $$255731 $$255731: - .incbin "baserom.dol", 0x49B0E0, 0x4 + .4byte 0x41A00000 .global $$255732 $$255732: - .incbin "baserom.dol", 0x49B0E4, 0x4 + .4byte 0x40000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256239 $$256239: - .incbin "baserom.dol", 0x49B358, 0x4 + .4byte 0xBF800000 .global $$256240 $$256240: - .incbin "baserom.dol", 0x49B35C, 0x4 + .4byte 0x3C8EFA35 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255827 $$255827: - .incbin "baserom.dol", 0x49BE60, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256882 $$256882: - .incbin "baserom.dol", 0x49CAF0, 0x4 + .4byte 0x3F000000 .global $$256898 $$256898: - .incbin "baserom.dol", 0x49CAF4, 0x4 + .4byte 0xBF800000 .global $$256899 $$256899: - .incbin "baserom.dol", 0x49CAF8, 0x4 + .4byte 0x3F800000 .global $$256900 $$256900: - .incbin "baserom.dol", 0x49CAFC, 0x4 + .4byte 0 .global $$256901 $$256901: - .incbin "baserom.dol", 0x49CB00, 0x8 + .4byte 0xBF000000 + .4byte 0 .global $$256904 $$256904: - .incbin "baserom.dol", 0x49CB08, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257656 $$257656: - .incbin "baserom.dol", 0x49CDE8, 0x4 + .4byte 0x3F800000 .global $$257657 $$257657: - .incbin "baserom.dol", 0x49CDEC, 0x4 + .4byte 0 .global $$257658 $$257658: - .incbin "baserom.dol", 0x49CDF0, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257930 $$257930: - .incbin "baserom.dol", 0x49E0E8, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258093 $$258093: - .incbin "baserom.dol", 0x49E260, 0x4 + .4byte 0 .global $$258098 $$258098: - .incbin "baserom.dol", 0x49E264, 0x4 + .4byte 0x3E99999A .global $$258099 $$258099: - .incbin "baserom.dol", 0x49E268, 0x4 + .4byte 0xBE4CCCCD .global $$258114 $$258114: - .incbin "baserom.dol", 0x49E26C, 0x4 + .4byte 0x3F000000 .global $$258115 $$258115: - .incbin "baserom.dol", 0x49E270, 0x4 + .4byte 0x40A00000 .global $$258116 $$258116: - .incbin "baserom.dol", 0x49E274, 0x4 + .4byte 0x4222F983 .global $$258117 $$258117: - .incbin "baserom.dol", 0x49E278, 0x8 + .4byte 0x3C8EFA35 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257331 $$257331: - .incbin "baserom.dol", 0x49E308, 0x4 + .4byte 0x3F19999A .global $$257332 $$257332: - .incbin "baserom.dol", 0x49E30C, 0x4 + .4byte 0x3F000000 .global $$257333 $$257333: - .incbin "baserom.dol", 0x49E310, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateShotAirBall.s b/asm/src/StateShotAirBall.s index b9febc2a..7f599587 100644 --- a/asm/src/StateShotAirBall.s +++ b/asm/src/StateShotAirBall.s @@ -356,14 +356,33 @@ procFixPos__Q53scn4step4hero6common16StateShotAirBallFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy16StateShotAirBall __vt__Q53scn4step4boss6whispy16StateShotAirBall: - .incbin "baserom.dol", 0x466778, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8025E12C ;# ptr + .4byte 0x8025E210 ;# ptr + .4byte 0x8025E37C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025E380 ;# ptr + .4byte 0x80234504 ;# ptr + .4byte 0x8025DF8C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common16StateShotAirBall __vt__Q53scn4step4hero6common16StateShotAirBall: - .incbin "baserom.dol", 0x488150, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036A19C + .4byte 0x8036A218 + .4byte 0x8036A2B4 + .4byte 0x8035550C + .4byte 0x8036A32C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253461 $$253461: - .incbin "baserom.dol", 0x49B560, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateShotAirBallBase.s b/asm/src/StateShotAirBallBase.s index df5bd998..de64bbe2 100644 --- a/asm/src/StateShotAirBallBase.s +++ b/asm/src/StateShotAirBallBase.s @@ -152,4 +152,13 @@ procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy20StateShotAirBallBase __vt__Q53scn4step4boss6whispy20StateShotAirBallBase: - .incbin "baserom.dol", 0x4667A0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8025DF88 ;# ptr + .4byte 0x8025E210 ;# ptr + .4byte 0x8025E37C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025E380 ;# ptr + .4byte 0x80234504 ;# ptr + .4byte 0 + .4byte 0 diff --git a/asm/src/StateShotAirBallBig.s b/asm/src/StateShotAirBallBig.s index 65c9942c..096e93ee 100644 --- a/asm/src/StateShotAirBallBig.s +++ b/asm/src/StateShotAirBallBig.s @@ -216,4 +216,13 @@ __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy19StateShotAirBallBig __vt__Q53scn4step4boss6whispy19StateShotAirBallBig: - .incbin "baserom.dol", 0x4667C8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8025E6A0 ;# ptr + .4byte 0x8025E210 ;# ptr + .4byte 0x8025E37C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025E380 ;# ptr + .4byte 0x80234504 ;# ptr + .4byte 0x8025E3C0 ;# ptr + .4byte 0 diff --git a/asm/src/StateShotAirBallTornado.s b/asm/src/StateShotAirBallTornado.s index 6be2b1b6..6972dfcb 100644 --- a/asm/src/StateShotAirBallTornado.s +++ b/asm/src/StateShotAirBallTornado.s @@ -154,9 +154,19 @@ __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado: - .incbin "baserom.dol", 0x4667F0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8025E8D4 ;# ptr + .4byte 0x8025E210 ;# ptr + .4byte 0x8025E37C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025E380 ;# ptr + .4byte 0x80234504 ;# ptr + .4byte 0x8025E6E8 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253395 $$253395: - .incbin "baserom.dol", 0x49B568, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateShuttleLoop.s b/asm/src/StateShuttleLoop.s index 515dbf10..e4236bb2 100644 --- a/asm/src/StateShuttleLoop.s +++ b/asm/src/StateShuttleLoop.s @@ -661,61 +661,93 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateS .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463070, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024B390 ;# ptr + .4byte 0x8024B354 ;# ptr .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463080, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024B38C ;# ptr + .4byte 0x8024B370 ;# ptr .global __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop: - .incbin "baserom.dol", 0x463090, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024B0E0 ;# ptr + .4byte 0x8024B0E4 ;# ptr + .4byte 0x8024B174 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024B350 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A158, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80399D14 + .4byte 0x80399CD8 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A168, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80399D10 + .4byte 0x80399CF4 .global __vt__Q53scn4step4hero4wing16StateShuttleLoop __vt__Q53scn4step4hero4wing16StateShuttleLoop: - .incbin "baserom.dol", 0x48A178, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803999C0 + .4byte 0x80399A78 + .4byte 0x80399B1C + .4byte 0x8035550C + .4byte 0x80399CD4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255753 $$255753: - .incbin "baserom.dol", 0x49B218, 0x4 + .4byte 0x3FC00000 .global $$255754 $$255754: - .incbin "baserom.dol", 0x49B21C, 0x4 + .4byte 0xBF000000 .global $$255755 $$255755: - .incbin "baserom.dol", 0x49B220, 0x4 + .4byte 0x4222F983 .global $$255756 $$255756: - .incbin "baserom.dol", 0x49B224, 0x4 + .4byte 0x3C8EFA35 .global $$255757 $$255757: - .incbin "baserom.dol", 0x49B228, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$255760 $$255760: - .incbin "baserom.dol", 0x49B230, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257169 $$257169: - .incbin "baserom.dol", 0x49E280, 0x4 + .4byte 0x3FC00000 .global $$257170 $$257170: - .incbin "baserom.dol", 0x49E284, 0x4 + .4byte 0xBF000000 .global $$257171 $$257171: - .incbin "baserom.dol", 0x49E288, 0x4 + .4byte 0x4222F983 .global $$257172 $$257172: - .incbin "baserom.dol", 0x49E28C, 0x4 + .4byte 0x3C8EFA35 .global $$257173 $$257173: - .incbin "baserom.dol", 0x49E290, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$257176 $$257176: - .incbin "baserom.dol", 0x49E298, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateShuttleLoopEnd.s b/asm/src/StateShuttleLoopEnd.s index 6060779e..41678702 100644 --- a/asm/src/StateShuttleLoopEnd.s +++ b/asm/src/StateShuttleLoopEnd.s @@ -189,4 +189,13 @@ procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd: - .incbin "baserom.dol", 0x48A1A0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80399DE0 + .4byte 0x80399E84 + .4byte 0x80399EE0 + .4byte 0x8035550C + .4byte 0x80399FA8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSkinned.s b/asm/src/StateSkinned.s index 261348a4..8a8392cb 100644 --- a/asm/src/StateSkinned.s +++ b/asm/src/StateSkinned.s @@ -317,4 +317,11 @@ lbl_802A3900: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5cappy12StateSkinned __vt__Q53scn4step5enemy5cappy12StateSkinned: - .incbin "baserom.dol", 0x471378, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A36A4 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802A371C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A3774 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateSkyKick.s b/asm/src/StateSkyKick.s index 389c5ab4..f2083570 100644 --- a/asm/src/StateSkyKick.s +++ b/asm/src/StateSkyKick.s @@ -312,10 +312,25 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A638, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039EA6C + .4byte 0x8039EA30 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A648, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039EA68 + .4byte 0x8039EA4C .global __vt__Q53scn4step4hero7fighter12StateSkyKick __vt__Q53scn4step4hero7fighter12StateSkyKick: - .incbin "baserom.dol", 0x48A658, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039E820 + .4byte 0x8039E824 + .4byte 0x8039E8E8 + .4byte 0x8035550C + .4byte 0x8039E944 + .4byte 0x8039E990 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSkyKickHit.s b/asm/src/StateSkyKickHit.s index a2726c20..db7756c1 100644 --- a/asm/src/StateSkyKickHit.s +++ b/asm/src/StateSkyKickHit.s @@ -270,15 +270,25 @@ procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter15StateSkyKickHit __vt__Q53scn4step4hero7fighter15StateSkyKickHit: - .incbin "baserom.dol", 0x48A680, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039EBA4 + .4byte 0x8039EBA8 + .4byte 0x8039ED50 + .4byte 0x8035550C + .4byte 0x8039EE38 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258356 $$258356: - .incbin "baserom.dol", 0x49E318, 0x4 + .4byte 0xBF800000 .global $$258389 $$258389: - .incbin "baserom.dol", 0x49E31C, 0x4 + .4byte 0 .global $$258390 $$258390: - .incbin "baserom.dol", 0x49E320, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateSlant.s b/asm/src/StateSlant.s index 8005d540..04447718 100644 --- a/asm/src/StateSlant.s +++ b/asm/src/StateSlant.s @@ -271,9 +271,17 @@ lbl_802F3468: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter10StateSlant __vt__Q53scn4step5enemy15zankibblecutter10StateSlant: - .incbin "baserom.dol", 0x47B018, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F31B8 ;# ptr + .4byte 0x802F31BC ;# ptr + .4byte 0x802F31C0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F31C4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256064 $$256064: - .incbin "baserom.dol", 0x49D0F8, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateSliding.s b/asm/src/StateSliding.s index 3864bf4b..41cdb903 100644 --- a/asm/src/StateSliding.s +++ b/asm/src/StateSliding.s @@ -484,18 +484,35 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488178, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036A9C4 + .4byte 0x8036A988 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488188, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036A9C0 + .4byte 0x8036A9A4 .global __vt__Q53scn4step4hero6common12StateSliding __vt__Q53scn4step4hero6common12StateSliding: - .incbin "baserom.dol", 0x488198, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036A4C8 + .4byte 0x8036A544 + .4byte 0x8036A698 + .4byte 0x8035550C + .4byte 0x8036A758 + .4byte 0x8036A8D4 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258502 $$258502: - .incbin "baserom.dol", 0x49DC20, 0x8 + .4byte 0 + .4byte 0 .global $$258540 $$258540: - .incbin "baserom.dol", 0x49DC28, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StateSlidingHit.s b/asm/src/StateSlidingHit.s index b41f443a..f34c8c5e 100644 --- a/asm/src/StateSlidingHit.s +++ b/asm/src/StateSlidingHit.s @@ -152,9 +152,19 @@ procFixPos__Q53scn4step4hero6common15StateSlidingHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateSlidingHit __vt__Q53scn4step4hero6common15StateSlidingHit: - .incbin "baserom.dol", 0x4881C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036AAB8 + .4byte 0x8036AABC + .4byte 0x8036AB64 + .4byte 0x8035550C + .4byte 0x8036ABD0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255746 $$255746: - .incbin "baserom.dol", 0x49DC30, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSlip.s b/asm/src/StateSlip.s index 14831003..36bec0d7 100644 --- a/asm/src/StateSlip.s +++ b/asm/src/StateSlip.s @@ -477,12 +477,21 @@ lbl_80391514: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone9StateSlip __vt__Q53scn4step4hero5stone9StateSlip: - .incbin "baserom.dol", 0x489BC0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80390F18 + .4byte 0x80391008 + .4byte 0x80391058 + .4byte 0x8035550C + .4byte 0x8039123C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257140 $$257140: - .incbin "baserom.dol", 0x49E120, 0x4 + .4byte 0x3F800000 .global $$257141 $$257141: - .incbin "baserom.dol", 0x49E124, 0x4 + .4byte 0 diff --git a/asm/src/StateSlope.s b/asm/src/StateSlope.s index ab8a5fe8..567be522 100644 --- a/asm/src/StateSlope.s +++ b/asm/src/StateSlope.s @@ -291,9 +291,17 @@ lbl_802D5228: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky10StateSlope __vt__Q53scn4step5enemy5rocky10StateSlope: - .incbin "baserom.dol", 0x476FB8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D4F54 ;# ptr + .4byte 0x802D4F58 ;# ptr + .4byte 0x802D4FA8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D5040 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256183 $$256183: - .incbin "baserom.dol", 0x49CB50, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSmash.s b/asm/src/StateSmash.s index fa2a8eac..5ccf45f4 100644 --- a/asm/src/StateSmash.s +++ b/asm/src/StateSmash.s @@ -155,12 +155,21 @@ createWeapon__Q53scn4step4hero7fighter10StateSmashFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter10StateSmash __vt__Q53scn4step4hero7fighter10StateSmash: - .incbin "baserom.dol", 0x48A6A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039EE90 + .4byte 0x8039EE94 + .4byte 0x8039EF04 + .4byte 0x8035550C + .4byte 0x8039EF08 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257075 $$257075: - .incbin "baserom.dol", 0x49E328, 0x4 + .4byte 0x3F19999A .global $$257076 $$257076: - .incbin "baserom.dol", 0x49E32C, 0x4 + .4byte 0 diff --git a/asm/src/StateSmashKick.s b/asm/src/StateSmashKick.s index 42d75dbe..b9fc7ff4 100644 --- a/asm/src/StateSmashKick.s +++ b/asm/src/StateSmashKick.s @@ -218,4 +218,13 @@ procFixPos__Q53scn4step4hero5smash14StateSmashKickFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash14StateSmashKick __vt__Q53scn4step4hero5smash14StateSmashKick: - .incbin "baserom.dol", 0x48AF90, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2410 + .4byte 0x803A24D0 + .4byte 0x803A2540 + .4byte 0x8035550C + .4byte 0x803A25C0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSmashKickCharge.s b/asm/src/StateSmashKickCharge.s index 2b4a390c..c4b5b111 100644 --- a/asm/src/StateSmashKickCharge.s +++ b/asm/src/StateSmashKickCharge.s @@ -249,10 +249,25 @@ __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1 __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1: - .incbin "baserom.dol", 0x48AFB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A28FC + .4byte 0x803A28BC .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48AFC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A28F8 + .4byte 0x803A28DC .global __vt__Q53scn4step4hero5smash20StateSmashKickCharge __vt__Q53scn4step4hero5smash20StateSmashKickCharge: - .incbin "baserom.dol", 0x48AFD8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2720 + .4byte 0x803A27B0 + .4byte 0x803A28B4 + .4byte 0x8035550C + .4byte 0x803A28B8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSmashed.s b/asm/src/StateSmashed.s index c664dabc..903384ca 100644 --- a/asm/src/StateSmashed.s +++ b/asm/src/StateSmashed.s @@ -792,61 +792,83 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477F60, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802DF7FC ;# ptr + .4byte 0x802DF7E0 ;# ptr .global __vt__Q53scn4step5enemy5sheld12StateSmashed __vt__Q53scn4step5enemy5sheld12StateSmashed: - .incbin "baserom.dol", 0x477F70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DF37C ;# ptr + .4byte 0x802DF414 ;# ptr + .4byte 0x802DF5C8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DF634 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A368, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EE6C4 ;# ptr + .4byte 0x802EE6A8 ;# ptr .global __vt__Q53scn4step5enemy9waddledee12StateSmashed __vt__Q53scn4step5enemy9waddledee12StateSmashed: - .incbin "baserom.dol", 0x47A378, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EE1A0 ;# ptr + .4byte 0x802EE24C ;# ptr + .4byte 0x802EE400 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EE46C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 $$256802: - .incbin "baserom.dol", 0x49CD50, 0x4 + .4byte 0 .global $$256839 $$256839: - .incbin "baserom.dol", 0x49CD54, 0x4 + .4byte 0x43B40000 .global $$256840 $$256840: - .incbin "baserom.dol", 0x49CD58, 0x4 + .4byte 0x3F800000 .global $$256841 $$256841: - .incbin "baserom.dol", 0x49CD5C, 0x4 + .4byte 0x42652EE1 .global $$256869 $$256869: - .incbin "baserom.dol", 0x49CD60, 0x4 + .4byte 0xBF000000 .global $$256870 $$256870: - .incbin "baserom.dol", 0x49CD64, 0x4 + .4byte 0xBF800000 .global $$256871 $$256871: - .incbin "baserom.dol", 0x49CD68, 0x8 + .4byte 0xBF733333 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256888 $$256888: - .incbin "baserom.dol", 0x49D000, 0x4 + .4byte 0 .global $$256925 $$256925: - .incbin "baserom.dol", 0x49D004, 0x4 + .4byte 0x43B40000 .global $$256926 $$256926: - .incbin "baserom.dol", 0x49D008, 0x4 + .4byte 0x3F800000 .global $$256927 $$256927: - .incbin "baserom.dol", 0x49D00C, 0x4 + .4byte 0x42652EE1 .global $$256963 $$256963: - .incbin "baserom.dol", 0x49D010, 0x4 + .4byte 0xBF800000 .global $$256964 $$256964: - .incbin "baserom.dol", 0x49D014, 0x4 + .4byte 0x3F733333 .global $$256965 $$256965: - .incbin "baserom.dol", 0x49D018, 0x8 + .4byte 0xBF733333 + .4byte 0 diff --git a/asm/src/StateSmashedEnd.s b/asm/src/StateSmashedEnd.s index bf91e3a5..6181b704 100644 --- a/asm/src/StateSmashedEnd.s +++ b/asm/src/StateSmashedEnd.s @@ -430,31 +430,47 @@ procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld15StateSmashedEnd __vt__Q53scn4step5enemy5sheld15StateSmashedEnd: - .incbin "baserom.dol", 0x477F90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DF964 ;# ptr + .4byte 0x802DF9F4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd: - .incbin "baserom.dol", 0x47A398, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EE82C ;# ptr + .4byte 0x802EE8BC ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EEA04 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 $$256208: - .incbin "baserom.dol", 0x49CD70, 0x4 + .4byte 0x3F800000 .global $$256209 $$256209: - .incbin "baserom.dol", 0x49CD74, 0x4 + .4byte 0 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49CD78, 0x8 + .4byte 0x3E99999A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256918 $$256918: - .incbin "baserom.dol", 0x49D020, 0x4 + .4byte 0x3F800000 .global $$256919 $$256919: - .incbin "baserom.dol", 0x49D024, 0x4 + .4byte 0 .global $$256920 $$256920: - .incbin "baserom.dol", 0x49D028, 0x8 + .4byte 0x3E99999A + .4byte 0 diff --git a/asm/src/StateSpaceJump.s b/asm/src/StateSpaceJump.s index c2cc0c2b..528a1739 100644 --- a/asm/src/StateSpaceJump.s +++ b/asm/src/StateSpaceJump.s @@ -1047,15 +1047,25 @@ init__Q53scn4step4hero12interference14StateSpaceJumpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference14StateSpaceJump __vt__Q53scn4step4hero12interference14StateSpaceJump: - .incbin "baserom.dol", 0x488658, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80373A80 + .4byte 0x80373C3C + .4byte 0x80373DB0 + .4byte 0x8035550C + .4byte 0x80374280 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260789 $$260789: - .incbin "baserom.dol", 0x49DD90, 0x4 + .4byte 0 .global $$260832 $$260832: - .incbin "baserom.dol", 0x49DD94, 0x4 + .4byte 0x3D75C28F .global $$260833 $$260833: - .incbin "baserom.dol", 0x49DD98, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/StateSparkLv1.s b/asm/src/StateSparkLv1.s index bcb99674..97ab9d08 100644 --- a/asm/src/StateSparkLv1.s +++ b/asm/src/StateSparkLv1.s @@ -142,12 +142,21 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv1 __vt__Q53scn4step4hero6damage13StateSparkLv1: - .incbin "baserom.dol", 0x488830, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803775B4 + .4byte 0x80377670 + .4byte 0x80377674 + .4byte 0x8035550C + .4byte 0x803776DC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256678 $$256678: - .incbin "baserom.dol", 0x49DE80, 0x4 + .4byte 0 .global $$256686 $$256686: - .incbin "baserom.dol", 0x49DE84, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateSparkLv2.s b/asm/src/StateSparkLv2.s index 801fa19a..87533183 100644 --- a/asm/src/StateSparkLv2.s +++ b/asm/src/StateSparkLv2.s @@ -337,24 +337,33 @@ lbl_80377B94: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv2 __vt__Q53scn4step4hero6damage13StateSparkLv2: - .incbin "baserom.dol", 0x488858, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803777B8 + .4byte 0x80377874 + .4byte 0x80377A00 + .4byte 0x8035550C + .4byte 0x80377A68 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256853 $$256853: - .incbin "baserom.dol", 0x49DE88, 0x4 + .4byte 0 .global $$256900 $$256900: - .incbin "baserom.dol", 0x49DE8C, 0x4 + .4byte 0x41A00000 .global $$256901 $$256901: - .incbin "baserom.dol", 0x49DE90, 0x4 + .4byte 0x43B40000 .global $$256902 $$256902: - .incbin "baserom.dol", 0x49DE94, 0x4 + .4byte 0x42652EE1 .global $$256903 $$256903: - .incbin "baserom.dol", 0x49DE98, 0x4 + .4byte 0x42480000 .global $$256908 $$256908: - .incbin "baserom.dol", 0x49DE9C, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateSparkLv3.s b/asm/src/StateSparkLv3.s index 7f9f1d6f..e1a60e98 100644 --- a/asm/src/StateSparkLv3.s +++ b/asm/src/StateSparkLv3.s @@ -257,24 +257,33 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv3 __vt__Q53scn4step4hero6damage13StateSparkLv3: - .incbin "baserom.dol", 0x488880, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80377C90 + .4byte 0x80377D4C + .4byte 0x80377ED8 + .4byte 0x8035550C + .4byte 0x80377F40 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257010 $$257010: - .incbin "baserom.dol", 0x49DEA0, 0x4 + .4byte 0 .global $$257057 $$257057: - .incbin "baserom.dol", 0x49DEA4, 0x4 + .4byte 0x41A00000 .global $$257058 $$257058: - .incbin "baserom.dol", 0x49DEA8, 0x4 + .4byte 0x43B40000 .global $$257059 $$257059: - .incbin "baserom.dol", 0x49DEAC, 0x4 + .4byte 0x42652EE1 .global $$257060 $$257060: - .incbin "baserom.dol", 0x49DEB0, 0x4 + .4byte 0x42480000 .global $$257065 $$257065: - .incbin "baserom.dol", 0x49DEB4, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateSpin.s b/asm/src/StateSpin.s index 9dcf3b04..fea2f4f8 100644 --- a/asm/src/StateSpin.s +++ b/asm/src/StateSpin.s @@ -713,37 +713,61 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateSpin __vt__Q53scn4step5enemy10knucklejoe9StateSpin: - .incbin "baserom.dol", 0x474A90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C0838 ;# ptr + .4byte 0x802C08E0 ;# ptr + .4byte 0x802C0A1C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C0AA0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489FB0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80396F28 + .4byte 0x80396F08 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x489FC0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80396F24 + .4byte 0x80396EE8 .global __vt__Q53scn4step4hero6hammer9StateSpin __vt__Q53scn4step4hero6hammer9StateSpin: - .incbin "baserom.dol", 0x489FD0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80396A7C + .4byte 0x80396B14 + .4byte 0x80396C64 + .4byte 0x8035550C + .4byte 0x80396D20 + .4byte 0x80396D24 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255929 $$255929: - .incbin "baserom.dol", 0x49C748, 0x4 + .4byte 0 .global $$255930 $$255930: - .incbin "baserom.dol", 0x49C74C, 0x4 + .4byte 0x42B40000 .global $$255931 $$255931: - .incbin "baserom.dol", 0x49C750, 0x4 + .4byte 0x3E800000 .global $$255939 $$255939: - .incbin "baserom.dol", 0x49C754, 0x4 + .4byte 0x3DCCCCCD .global $$255947 $$255947: - .incbin "baserom.dol", 0x49C758, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258565 $$258565: - .incbin "baserom.dol", 0x49E208, 0x8 + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/src/StateSpinKick.s b/asm/src/StateSpinKick.s index 71ff927e..40cee0bc 100644 --- a/asm/src/StateSpinKick.s +++ b/asm/src/StateSpinKick.s @@ -315,4 +315,13 @@ lbl_8039F494: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter13StateSpinKick __vt__Q53scn4step4hero7fighter13StateSpinKick: - .incbin "baserom.dol", 0x48A6D0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039F0F0 + .4byte 0x8039F16C + .4byte 0x8039F2CC + .4byte 0x8035550C + .4byte 0x8039F450 + .4byte 0x8039F454 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSpine.s b/asm/src/StateSpine.s index 2ba3582f..68b376ad 100644 --- a/asm/src/StateSpine.s +++ b/asm/src/StateSpine.s @@ -223,30 +223,39 @@ procFixPos__Q53scn4step4hero6damage10StateSpineFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateSpine __vt__Q53scn4step4hero6damage10StateSpine: - .incbin "baserom.dol", 0x4888A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80378144 + .4byte 0x80378200 + .4byte 0x80378204 + .4byte 0x8035550C + .4byte 0x8037826C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256844 $$256844: - .incbin "baserom.dol", 0x49DEB8, 0x4 + .4byte 0 .global $$256845 $$256845: - .incbin "baserom.dol", 0x49DEBC, 0x4 + .4byte 0x3F000000 .global $$256846 $$256846: - .incbin "baserom.dol", 0x49DEC0, 0x4 + .4byte 0x42700000 .global $$256847 $$256847: - .incbin "baserom.dol", 0x49DEC4, 0x4 + .4byte 0x41200000 .global $$256848 $$256848: - .incbin "baserom.dol", 0x49DEC8, 0x4 + .4byte 0x3C8EFA35 .global $$256849 $$256849: - .incbin "baserom.dol", 0x49DECC, 0x4 + .4byte 0xBF800000 .global $$256850 $$256850: - .incbin "baserom.dol", 0x49DED0, 0x4 + .4byte 0x3E000000 .global $$256873 $$256873: - .incbin "baserom.dol", 0x49DED4, 0x4 + .4byte 0x38D1B717 diff --git a/asm/src/StateSquashRoof.s b/asm/src/StateSquashRoof.s index 5112b9c8..d3fda9fa 100644 --- a/asm/src/StateSquashRoof.s +++ b/asm/src/StateSquashRoof.s @@ -286,12 +286,25 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4881E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036AFB4 + .4byte 0x8036AF98 .global __vt__Q53scn4step4hero6common15StateSquashRoof __vt__Q53scn4step4hero6common15StateSquashRoof: - .incbin "baserom.dol", 0x4881F8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036AD94 + .4byte 0x8036AD98 + .4byte 0x8036AE88 + .4byte 0x8035550C + .4byte 0x8036AF94 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257232 $$257232: - .incbin "baserom.dol", 0x49DC38, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSquashWall.s b/asm/src/StateSquashWall.s index eb545d57..476753a4 100644 --- a/asm/src/StateSquashWall.s +++ b/asm/src/StateSquashWall.s @@ -442,15 +442,27 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488220, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036B5DC + .4byte 0x8036B5C0 .global __vt__Q53scn4step4hero6common15StateSquashWall __vt__Q53scn4step4hero6common15StateSquashWall: - .incbin "baserom.dol", 0x488230, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036B410 + .4byte 0x8036B414 + .4byte 0x8036B560 + .4byte 0x8035550C + .4byte 0x8036B5BC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258293 $$258293: - .incbin "baserom.dol", 0x49DC40, 0x4 + .4byte 0 .global $$258313 $$258313: - .incbin "baserom.dol", 0x49DC44, 0x4 + .4byte 0x3B03126F diff --git a/asm/src/StateSquat.s b/asm/src/StateSquat.s index b4a90e46..500547b3 100644 --- a/asm/src/StateSquat.s +++ b/asm/src/StateSquat.s @@ -359,18 +359,31 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488258, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036BAD0 + .4byte 0x8036BAB4 .global __vt__Q53scn4step4hero6common10StateSquat __vt__Q53scn4step4hero6common10StateSquat: - .incbin "baserom.dol", 0x488268, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036B728 + .4byte 0x8036B7A4 + .4byte 0x8036BA2C + .4byte 0x8035550C + .4byte 0x8036BA30 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258194 $$258194: - .incbin "baserom.dol", 0x49DC48, 0x4 + .4byte 0 .global $$258195 $$258195: - .incbin "baserom.dol", 0x49DC4C, 0x4 + .4byte 0xBDCCCCCD .global $$258196 $$258196: - .incbin "baserom.dol", 0x49DC50, 0x8 + .4byte 0xBCCCCCCD + .4byte 0 diff --git a/asm/src/StateStamp.s b/asm/src/StateStamp.s index 38346daa..c723bf18 100644 --- a/asm/src/StateStamp.s +++ b/asm/src/StateStamp.s @@ -169,7 +169,19 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A6F8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039F6C8 + .4byte 0x8039F6AC .global __vt__Q53scn4step4hero7fighter10StateStamp __vt__Q53scn4step4hero7fighter10StateStamp: - .incbin "baserom.dol", 0x48A708, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039F538 + .4byte 0x8039F53C + .4byte 0x8039F604 + .4byte 0x8035550C + .4byte 0x8039F608 + .4byte 0x8039F60C + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateStampHit.s b/asm/src/StateStampHit.s index 0017158b..53f9d532 100644 --- a/asm/src/StateStampHit.s +++ b/asm/src/StateStampHit.s @@ -200,12 +200,21 @@ procFixPos__Q53scn4step4hero7fighter13StateStampHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter13StateStampHit __vt__Q53scn4step4hero7fighter13StateStampHit: - .incbin "baserom.dol", 0x48A730, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039F7C4 + .4byte 0x8039F7C8 + .4byte 0x8039F8A0 + .4byte 0x8035550C + .4byte 0x8039F988 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255748 $$255748: - .incbin "baserom.dol", 0x49E330, 0x4 + .4byte 0 .global $$255749 $$255749: - .incbin "baserom.dol", 0x49E334, 0x4 + .4byte 0x3A83126F diff --git a/asm/src/StateStartJump.s b/asm/src/StateStartJump.s index 9b0b2d0b..44cbd98c 100644 --- a/asm/src/StateStartJump.s +++ b/asm/src/StateStartJump.s @@ -235,4 +235,13 @@ lbl_8039185C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone14StateStartJump __vt__Q53scn4step4hero5stone14StateStartJump: - .incbin "baserom.dol", 0x489BE8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80391684 + .4byte 0x803916FC + .4byte 0x80391778 + .4byte 0x8035550C + .4byte 0x80391804 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateStartWait.s b/asm/src/StateStartWait.s index 19f721a0..282bb3f9 100644 --- a/asm/src/StateStartWait.s +++ b/asm/src/StateStartWait.s @@ -111,4 +111,11 @@ procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster14StateStartWait __vt__Q53scn4step4boss15challengemaster14StateStartWait: - .incbin "baserom.dol", 0x4620D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024333C ;# ptr + .4byte 0x80243340 ;# ptr + .4byte 0x80243424 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80243428 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateStay.s b/asm/src/StateStay.s index e907cb37..da92c77a 100644 --- a/asm/src/StateStay.s +++ b/asm/src/StateStay.s @@ -436,20 +436,37 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff9StateStay __vt__Q53scn4step5enemy5nruff9StateStay: - .incbin "baserom.dol", 0x475AE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C8998 ;# ptr + .4byte 0x802C899C ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C8A40 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x476FD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D5668 ;# ptr + .4byte 0x802D564C ;# ptr .global __vt__Q53scn4step5enemy5rocky9StateStay __vt__Q53scn4step5enemy5rocky9StateStay: - .incbin "baserom.dol", 0x476FE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D533C ;# ptr + .4byte 0x802D5340 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D5598 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 $$256196: - .incbin "baserom.dol", 0x49CB58, 0x4 + .4byte 0 .global $$256245 $$256245: - .incbin "baserom.dol", 0x49CB5C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateStepBack.s b/asm/src/StateStepBack.s index f0ffb4ee..08a19a57 100644 --- a/asm/src/StateStepBack.s +++ b/asm/src/StateStepBack.s @@ -242,4 +242,11 @@ lbl_80298394: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight13StateStepBack __vt__Q53scn4step5enemy11bladeknight13StateStepBack: - .incbin "baserom.dol", 0x46FB88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029813C ;# ptr + .4byte 0x80298140 ;# ptr + .4byte 0x8029818C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80298224 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateStickObj.s b/asm/src/StateStickObj.s index a059db6a..5958ef25 100644 --- a/asm/src/StateStickObj.s +++ b/asm/src/StateStickObj.s @@ -245,9 +245,23 @@ procMove__Q53scn4step6weapon8deespear13StateStickObjFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear13StateStickObj __vt__Q53scn4step6weapon10spearspear13StateStickObj: - .incbin "baserom.dol", 0x490800, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E4BC0 + .4byte 0x803E4C2C + .4byte 0x803E4CCC + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803D8964 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear13StateStickObj __vt__Q53scn4step6weapon8deespear13StateStickObj: - .incbin "baserom.dol", 0x4910C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EDBD4 + .4byte 0x803EDBD8 + .4byte 0x803EDC78 + .4byte 0x803D895C + .4byte 0x803D8960 + .4byte 0x803D8964 diff --git a/asm/src/StateStickWall.s b/asm/src/StateStickWall.s index 17bd5e99..b5cf10dc 100644 --- a/asm/src/StateStickWall.s +++ b/asm/src/StateStickWall.s @@ -397,37 +397,51 @@ procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear14StateStickWall __vt__Q53scn4step6weapon10spearspear14StateStickWall: - .incbin "baserom.dol", 0x490820, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E4D8C + .4byte 0x803E4DF8 + .4byte 0x803E4DFC + .4byte 0x803D895C + .4byte 0x803E4E04 + .4byte 0x803E4FA0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear14StateStickWall __vt__Q53scn4step6weapon8deespear14StateStickWall: - .incbin "baserom.dol", 0x4910E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EDD44 + .4byte 0x803EDD48 + .4byte 0x803EDD4C + .4byte 0x803D895C + .4byte 0x803EDD50 + .4byte 0x803EDEEC .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256411 $$256411: - .incbin "baserom.dol", 0x49EA70, 0x4 + .4byte 0x43340000 .global $$256412 $$256412: - .incbin "baserom.dol", 0x49EA74, 0x4 + .4byte 0x3DC28F5C .global $$256413 $$256413: - .incbin "baserom.dol", 0x49EA78, 0x4 + .4byte 0x41A00000 .global $$256414 $$256414: - .incbin "baserom.dol", 0x49EA7C, 0x4 + .4byte 0x43200000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256414 $$256414: - .incbin "baserom.dol", 0x49EC58, 0x4 + .4byte 0x43340000 .global $$256415 $$256415: - .incbin "baserom.dol", 0x49EC5C, 0x4 + .4byte 0x3DC28F5C .global $$256416 $$256416: - .incbin "baserom.dol", 0x49EC60, 0x4 + .4byte 0x41A00000 .global $$256417 $$256417: - .incbin "baserom.dol", 0x49EC64, 0x4 + .4byte 0x43200000 diff --git a/asm/src/StateStop.s b/asm/src/StateStop.s index 12a8adb8..9288fb14 100644 --- a/asm/src/StateStop.s +++ b/asm/src/StateStop.s @@ -229,9 +229,17 @@ lbl_802C8E1C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff9StateStop __vt__Q53scn4step5enemy5nruff9StateStop: - .incbin "baserom.dol", 0x475B08, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C8C9C ;# ptr + .4byte 0x802C8CA0 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C8D84 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 $$256172: - .incbin "baserom.dol", 0x49C8F0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateStopAir.s b/asm/src/StateStopAir.s index f6829814..5544cc4e 100644 --- a/asm/src/StateStopAir.s +++ b/asm/src/StateStopAir.s @@ -222,9 +222,17 @@ lbl_802C9134: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff12StateStopAir __vt__Q53scn4step5enemy5nruff12StateStopAir: - .incbin "baserom.dol", 0x475B28, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C9018 ;# ptr + .4byte 0x802C901C ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255952 $$255952: - .incbin "baserom.dol", 0x49C8F8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateStraight.s b/asm/src/StateStraight.s index f6c4f80e..d1949537 100644 --- a/asm/src/StateStraight.s +++ b/asm/src/StateStraight.s @@ -344,15 +344,23 @@ lbl_802F3944: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter13StateStraight __vt__Q53scn4step5enemy15zankibblecutter13StateStraight: - .incbin "baserom.dol", 0x47B038, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F359C ;# ptr + .4byte 0x802F3608 ;# ptr + .4byte 0x802F360C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802F373C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256486 $$256486: - .incbin "baserom.dol", 0x49D100, 0x4 + .4byte 0 .global $$256487 $$256487: - .incbin "baserom.dol", 0x49D104, 0x4 + .4byte 0xBF800000 .global $$256488 $$256488: - .incbin "baserom.dol", 0x49D108, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateSummon.s b/asm/src/StateSummon.s index 305cb3b3..d89ba2f7 100644 --- a/asm/src/StateSummon.s +++ b/asm/src/StateSummon.s @@ -148,4 +148,11 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster11StateSummon __vt__Q53scn4step4boss15challengemaster11StateSummon: - .incbin "baserom.dol", 0x4620F8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802434A0 ;# ptr + .4byte 0x802434A4 ;# ptr + .4byte 0x8024360C ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80243610 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateSuperAppear.s b/asm/src/StateSuperAppear.s index ec942b82..984e3e18 100644 --- a/asm/src/StateSuperAppear.s +++ b/asm/src/StateSuperAppear.s @@ -360,12 +360,19 @@ procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateSuperAppear __vt__Q53scn4step5enemy6common16StateSuperAppear: - .incbin "baserom.dol", 0x46F3B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029458C ;# ptr + .4byte 0x80294710 ;# ptr + .4byte 0x80294870 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80294874 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257491 $$257491: - .incbin "baserom.dol", 0x49BC08, 0x4 + .4byte 0x40F00000 .global $$257492 $$257492: - .incbin "baserom.dol", 0x49BC0C, 0x4 + .4byte 0x3D4CCCCD diff --git a/asm/src/StateSuperAppearPre.s b/asm/src/StateSuperAppearPre.s index 07bc11c0..f977061c 100644 --- a/asm/src/StateSuperAppearPre.s +++ b/asm/src/StateSuperAppearPre.s @@ -200,7 +200,17 @@ __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1 __vt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1: - .incbin "baserom.dol", 0x46F3D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80294B24 ;# ptr + .4byte 0x80294B00 ;# ptr .global __vt__Q53scn4step5enemy6common19StateSuperAppearPre __vt__Q53scn4step5enemy6common19StateSuperAppearPre: - .incbin "baserom.dol", 0x46F3E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029494C ;# ptr + .4byte 0x80294A24 ;# ptr + .4byte 0x80294AF8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80294AFC ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateSuperFirst.s b/asm/src/StateSuperFirst.s index 64795054..24eaba86 100644 --- a/asm/src/StateSuperFirst.s +++ b/asm/src/StateSuperFirst.s @@ -598,36 +598,49 @@ __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19St .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1: - .incbin "baserom.dol", 0x46F408, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80295364 ;# ptr + .4byte 0x80295320 ;# ptr .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1: - .incbin "baserom.dol", 0x46F418, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80295360 ;# ptr + .4byte 0x80295340 ;# ptr .global __vt__Q53scn4step5enemy6common15StateSuperFirst __vt__Q53scn4step5enemy6common15StateSuperFirst: - .incbin "baserom.dol", 0x46F428, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80294F7C ;# ptr + .4byte 0x80295054 ;# ptr + .4byte 0x802951C4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80295274 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258008 $$258008: - .incbin "baserom.dol", 0x49BC10, 0x4 + .4byte 0x41100000 .global $$258009 $$258009: - .incbin "baserom.dol", 0x49BC14, 0x4 + .4byte 0xC0C00000 .global $$258010 $$258010: - .incbin "baserom.dol", 0x49BC18, 0x4 + .4byte 0xC0A00000 .global $$258011 $$258011: - .incbin "baserom.dol", 0x49BC1C, 0x4 + .4byte 0x40A00000 .global $$258012 $$258012: - .incbin "baserom.dol", 0x49BC20, 0x4 + .4byte 0x40C00000 .global $$258013 $$258013: - .incbin "baserom.dol", 0x49BC24, 0x4 + .4byte 0xC0000000 .global $$258014 $$258014: - .incbin "baserom.dol", 0x49BC28, 0x4 + .4byte 0xC1000000 .global $$258015 $$258015: - .incbin "baserom.dol", 0x49BC2C, 0x4 + .4byte 0x41000000 diff --git a/asm/src/StateSuperJump.s b/asm/src/StateSuperJump.s index 95e4d4b7..caa4babf 100644 --- a/asm/src/StateSuperJump.s +++ b/asm/src/StateSuperJump.s @@ -248,9 +248,19 @@ procFixPos__Q53scn4step4hero6common14StateSuperJumpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateSuperJump __vt__Q53scn4step4hero6common14StateSuperJump: - .incbin "baserom.dol", 0x488290, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036BC14 + .4byte 0x8036BCA4 + .4byte 0x8036BD10 + .4byte 0x8035550C + .4byte 0x8036BE40 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256442 $$256442: - .incbin "baserom.dol", 0x49DC58, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSuperTeamAttack.s b/asm/src/StateSuperTeamAttack.s index 253456da..520dcfa5 100644 --- a/asm/src/StateSuperTeamAttack.s +++ b/asm/src/StateSuperTeamAttack.s @@ -185,9 +185,19 @@ procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage20StateSuperTeamAttack __vt__Q53scn4step4hero6damage20StateSuperTeamAttack: - .incbin "baserom.dol", 0x4888D0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80378368 + .4byte 0x80378404 + .4byte 0x8037848C + .4byte 0x8035550C + .4byte 0x803784F4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257021 $$257021: - .incbin "baserom.dol", 0x49DED8, 0x8 + .4byte 0x3A83126F + .4byte 0 diff --git a/asm/src/StateSwim.s b/asm/src/StateSwim.s index 7741d860..457bfdb7 100644 --- a/asm/src/StateSwim.s +++ b/asm/src/StateSwim.s @@ -743,21 +743,31 @@ lbl_8036C8B8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateSwim __vt__Q53scn4step4hero6common9StateSwim: - .incbin "baserom.dol", 0x4882B8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036C0A4 + .4byte 0x8036C11C + .4byte 0x8036C4D0 + .4byte 0x8035550C + .4byte 0x8036C6A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257929 $$257929: - .incbin "baserom.dol", 0x49DC60, 0x4 + .4byte 0 .global $$257985 $$257985: - .incbin "baserom.dol", 0x49DC64, 0x4 + .4byte 0xBF800000 .global $$257986 $$257986: - .incbin "baserom.dol", 0x49DC68, 0x4 + .4byte 0x42480000 .global $$257987 $$257987: - .incbin "baserom.dol", 0x49DC6C, 0x4 + .4byte 0x3F800000 .global $$257988 $$257988: - .incbin "baserom.dol", 0x49DC70, 0x8 + .4byte 0xC2480000 + .4byte 0 diff --git a/asm/src/StateSwing.s b/asm/src/StateSwing.s index 864d1c83..6f2b2590 100644 --- a/asm/src/StateSwing.s +++ b/asm/src/StateSwing.s @@ -313,7 +313,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x461380, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80239420 ;# ptr + .4byte 0x80239404 ;# ptr .global __vt__Q53scn4step4boss7bonkers10StateSwing __vt__Q53scn4step4boss7bonkers10StateSwing: - .incbin "baserom.dol", 0x461390, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80239068 ;# ptr + .4byte 0x80239170 ;# ptr + .4byte 0x802392CC ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8023935C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateSwingEnd.s b/asm/src/StateSwingEnd.s index 83d36ef2..20cacecd 100644 --- a/asm/src/StateSwingEnd.s +++ b/asm/src/StateSwingEnd.s @@ -106,4 +106,11 @@ procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers13StateSwingEnd __vt__Q53scn4step4boss7bonkers13StateSwingEnd: - .incbin "baserom.dol", 0x4613B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80239484 ;# ptr + .4byte 0x80239488 ;# ptr + .4byte 0x80239520 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80239574 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateSwingPursuit.s b/asm/src/StateSwingPursuit.s index 6bbd5ac2..28361f82 100644 --- a/asm/src/StateSwingPursuit.s +++ b/asm/src/StateSwingPursuit.s @@ -396,15 +396,23 @@ lbl_80239B08: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers17StateSwingPursuit __vt__Q53scn4step4boss7bonkers17StateSwingPursuit: - .incbin "baserom.dol", 0x4613D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80239608 ;# ptr + .4byte 0x80239684 ;# ptr + .4byte 0x802397B4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80239954 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256457 $$256457: - .incbin "baserom.dol", 0x49AF98, 0x4 + .4byte 0x3F800000 .global $$256458 $$256458: - .incbin "baserom.dol", 0x49AF9C, 0x4 + .4byte 0xBF800000 .global $$256459 $$256459: - .incbin "baserom.dol", 0x49AFA0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSwordAirSpin.s b/asm/src/StateSwordAirSpin.s index 91d5b0fd..ea9f048c 100644 --- a/asm/src/StateSwordAirSpin.s +++ b/asm/src/StateSwordAirSpin.s @@ -289,7 +289,19 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488F90, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80386698 + .4byte 0x8038667C .global __vt__Q53scn4step4hero5sword17StateSwordAirSpin __vt__Q53scn4step4hero5sword17StateSwordAirSpin: - .incbin "baserom.dol", 0x488FA0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80386444 + .4byte 0x803864F4 + .4byte 0x8038658C + .4byte 0x8035550C + .4byte 0x80386590 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordAttack.s b/asm/src/StateSwordAttack.s index a5f3db68..aca8915f 100644 --- a/asm/src/StateSwordAttack.s +++ b/asm/src/StateSwordAttack.s @@ -399,15 +399,31 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488FC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80386C04 + .4byte 0x80386BC8 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488FD8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80386C00 + .4byte 0x80386BE4 .global __vt__Q53scn4step4hero5sword16StateSwordAttack __vt__Q53scn4step4hero5sword16StateSwordAttack: - .incbin "baserom.dol", 0x488FE8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80386814 + .4byte 0x80386890 + .4byte 0x80386B54 + .4byte 0x8035550C + .4byte 0x80386B78 + .4byte 0x80386B7C + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259298 $$259298: - .incbin "baserom.dol", 0x49E080, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSwordAttackFinish.s b/asm/src/StateSwordAttackFinish.s index 9804d399..1f7ab49d 100644 --- a/asm/src/StateSwordAttackFinish.s +++ b/asm/src/StateSwordAttackFinish.s @@ -269,7 +269,19 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489010, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80386FA4 + .4byte 0x80386F88 .global __vt__Q53scn4step4hero5sword22StateSwordAttackFinish __vt__Q53scn4step4hero5sword22StateSwordAttackFinish: - .incbin "baserom.dol", 0x489020, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80386D28 + .4byte 0x80386D2C + .4byte 0x80386E28 + .4byte 0x8035550C + .4byte 0x80386E4C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordCharge.s b/asm/src/StateSwordCharge.s index 64b38a26..fb548a11 100644 --- a/asm/src/StateSwordCharge.s +++ b/asm/src/StateSwordCharge.s @@ -114,7 +114,19 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80387100 + .4byte 0x803870E4 .global __vt__Q53scn4step4hero5sword16StateSwordCharge __vt__Q53scn4step4hero5sword16StateSwordCharge: - .incbin "baserom.dol", 0x489058, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80387038 + .4byte 0x8038703C + .4byte 0x803870DC + .4byte 0x8035550C + .4byte 0x803870E0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordChargeStart.s b/asm/src/StateSwordChargeStart.s index 0ec8dbdd..2dfe2a82 100644 --- a/asm/src/StateSwordChargeStart.s +++ b/asm/src/StateSwordChargeStart.s @@ -179,7 +179,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489080, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80387340 + .4byte 0x80387324 .global __vt__Q53scn4step4hero5sword21StateSwordChargeStart __vt__Q53scn4step4hero5sword21StateSwordChargeStart: - .incbin "baserom.dol", 0x489090, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80387210 + .4byte 0x80387214 + .4byte 0x8038731C + .4byte 0x8035550C + .4byte 0x80387320 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordChopping.s b/asm/src/StateSwordChopping.s index c9bb7e55..39403ab0 100644 --- a/asm/src/StateSwordChopping.s +++ b/asm/src/StateSwordChopping.s @@ -334,10 +334,25 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4890B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80387798 + .4byte 0x80387778 .global __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x4890C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80387794 + .4byte 0x80387758 .global __vt__Q53scn4step4hero5sword18StateSwordChopping __vt__Q53scn4step4hero5sword18StateSwordChopping: - .incbin "baserom.dol", 0x4890D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803875A4 + .4byte 0x803875A8 + .4byte 0x80387688 + .4byte 0x8035550C + .4byte 0x8038768C + .4byte 0x803876B8 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordChoppingHit.s b/asm/src/StateSwordChoppingHit.s index 271450a9..d3a9c87d 100644 --- a/asm/src/StateSwordChoppingHit.s +++ b/asm/src/StateSwordChoppingHit.s @@ -198,24 +198,33 @@ procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword21StateSwordChoppingHit __vt__Q53scn4step4hero5sword21StateSwordChoppingHit: - .incbin "baserom.dol", 0x489100, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80387870 + .4byte 0x80387874 + .4byte 0x80387960 + .4byte 0x8035550C + .4byte 0x80387A48 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258007 $$258007: - .incbin "baserom.dol", 0x49E088, 0x4 + .4byte 0xBF800000 .global $$258008 $$258008: - .incbin "baserom.dol", 0x49E08C, 0x4 + .4byte 0x3F800000 .global $$258009 $$258009: - .incbin "baserom.dol", 0x49E090, 0x4 + .4byte 0x3D4CCCCD .global $$258010 $$258010: - .incbin "baserom.dol", 0x49E094, 0x4 + .4byte 0x3E8CCCCD .global $$258011 $$258011: - .incbin "baserom.dol", 0x49E098, 0x4 + .4byte 0 .global $$258039 $$258039: - .incbin "baserom.dol", 0x49E09C, 0x4 + .4byte 0x3A83126F diff --git a/asm/src/StateSwordFloatSpin.s b/asm/src/StateSwordFloatSpin.s index 7a302081..338adaca 100644 --- a/asm/src/StateSwordFloatSpin.s +++ b/asm/src/StateSwordFloatSpin.s @@ -385,12 +385,25 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489128, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80387F90 + .4byte 0x80387F74 .global __vt__Q53scn4step4hero5sword19StateSwordFloatSpin __vt__Q53scn4step4hero5sword19StateSwordFloatSpin: - .incbin "baserom.dol", 0x489138, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80387B9C + .4byte 0x80387C18 + .4byte 0x80387D68 + .4byte 0x8035550C + .4byte 0x80387DC8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258789 $$258789: - .incbin "baserom.dol", 0x49E0A0, 0x8 + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/src/StateSwordMeteor.s b/asm/src/StateSwordMeteor.s index 209b6e17..a9e8c2ed 100644 --- a/asm/src/StateSwordMeteor.s +++ b/asm/src/StateSwordMeteor.s @@ -299,10 +299,25 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489160, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80388398 + .4byte 0x8038835C .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489170, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80388394 + .4byte 0x80388378 .global __vt__Q53scn4step4hero5sword16StateSwordMeteor __vt__Q53scn4step4hero5sword16StateSwordMeteor: - .incbin "baserom.dol", 0x489180, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80388190 + .4byte 0x80388194 + .4byte 0x80388198 + .4byte 0x8035550C + .4byte 0x80388234 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordMeteorLanding.s b/asm/src/StateSwordMeteorLanding.s index 95738f88..8e124bd5 100644 --- a/asm/src/StateSwordMeteorLanding.s +++ b/asm/src/StateSwordMeteorLanding.s @@ -115,4 +115,13 @@ procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding: - .incbin "baserom.dol", 0x4891A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80388460 + .4byte 0x80388464 + .4byte 0x8038850C + .4byte 0x8035550C + .4byte 0x80388510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordMince.s b/asm/src/StateSwordMince.s index 5a6c5f9d..a6072acd 100644 --- a/asm/src/StateSwordMince.s +++ b/asm/src/StateSwordMince.s @@ -224,7 +224,19 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4891D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80388800 + .4byte 0x803887E4 .global __vt__Q53scn4step4hero5sword15StateSwordMince __vt__Q53scn4step4hero5sword15StateSwordMince: - .incbin "baserom.dol", 0x4891E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80388674 + .4byte 0x80388678 + .4byte 0x803887DC + .4byte 0x8035550C + .4byte 0x803887E0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordRaising.s b/asm/src/StateSwordRaising.s index aa70b9c7..983de8fb 100644 --- a/asm/src/StateSwordRaising.s +++ b/asm/src/StateSwordRaising.s @@ -299,15 +299,31 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489208, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80388BF8 + .4byte 0x80388BBC .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489218, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80388BF4 + .4byte 0x80388BD8 .global __vt__Q53scn4step4hero5sword17StateSwordRaising __vt__Q53scn4step4hero5sword17StateSwordRaising: - .incbin "baserom.dol", 0x489228, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803889E0 + .4byte 0x803889E4 + .4byte 0x80388AAC + .4byte 0x8035550C + .4byte 0x80388BB8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258972 $$258972: - .incbin "baserom.dol", 0x49E0A8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSwordRaisingEnd.s b/asm/src/StateSwordRaisingEnd.s index 513332af..630ecf09 100644 --- a/asm/src/StateSwordRaisingEnd.s +++ b/asm/src/StateSwordRaisingEnd.s @@ -85,4 +85,13 @@ procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd: - .incbin "baserom.dol", 0x489250, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80388C58 + .4byte 0x80388C5C + .4byte 0x80388CF4 + .4byte 0x8035550C + .4byte 0x80388CF8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordSpin.s b/asm/src/StateSwordSpin.s index c9a4c6b7..b7e7bebb 100644 --- a/asm/src/StateSwordSpin.s +++ b/asm/src/StateSwordSpin.s @@ -148,4 +148,13 @@ procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword14StateSwordSpin __vt__Q53scn4step4hero5sword14StateSwordSpin: - .incbin "baserom.dol", 0x489278, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80388DC4 + .4byte 0x80388E4C + .4byte 0x80388EA8 + .4byte 0x8035550C + .4byte 0x80388EE4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordThrust.s b/asm/src/StateSwordThrust.s index f65f5d53..3bc0287e 100644 --- a/asm/src/StateSwordThrust.s +++ b/asm/src/StateSwordThrust.s @@ -365,15 +365,31 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4892A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803893CC + .4byte 0x80389390 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4892B0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803893C8 + .4byte 0x803893AC .global __vt__Q53scn4step4hero5sword16StateSwordThrust __vt__Q53scn4step4hero5sword16StateSwordThrust: - .incbin "baserom.dol", 0x4892C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80389078 + .4byte 0x803890F4 + .4byte 0x80389298 + .4byte 0x8035550C + .4byte 0x8038938C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259340 $$259340: - .incbin "baserom.dol", 0x49E0B0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateSwordThrustEnd.s b/asm/src/StateSwordThrustEnd.s index 34ec9580..b7416cd0 100644 --- a/asm/src/StateSwordThrustEnd.s +++ b/asm/src/StateSwordThrustEnd.s @@ -44,4 +44,13 @@ procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword19StateSwordThrustEnd __vt__Q53scn4step4hero5sword19StateSwordThrustEnd: - .incbin "baserom.dol", 0x4892E8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80389424 + .4byte 0x80389428 + .4byte 0x8038942C + .4byte 0x8035550C + .4byte 0x80389430 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordUnderThrust.s b/asm/src/StateSwordUnderThrust.s index 991aa831..e7a774c7 100644 --- a/asm/src/StateSwordUnderThrust.s +++ b/asm/src/StateSwordUnderThrust.s @@ -195,12 +195,25 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489310, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803896CC + .4byte 0x803896B0 .global __vt__Q53scn4step4hero5sword21StateSwordUnderThrust __vt__Q53scn4step4hero5sword21StateSwordUnderThrust: - .incbin "baserom.dol", 0x489320, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803894EC + .4byte 0x803894F0 + .4byte 0x803894F4 + .4byte 0x8035550C + .4byte 0x80389570 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259034 $$259034: - .incbin "baserom.dol", 0x49E0B8, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/StateSwordUnderThrustLanding.s b/asm/src/StateSwordUnderThrustLanding.s index dc4ab724..d48c0035 100644 --- a/asm/src/StateSwordUnderThrustLanding.s +++ b/asm/src/StateSwordUnderThrustLanding.s @@ -103,4 +103,13 @@ procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding: - .incbin "baserom.dol", 0x489348, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038977C + .4byte 0x80389780 + .4byte 0x80389810 + .4byte 0x8035550C + .4byte 0x80389814 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordUnderThrustStart.s b/asm/src/StateSwordUnderThrustStart.s index 40342b4d..ecb18e39 100644 --- a/asm/src/StateSwordUnderThrustStart.s +++ b/asm/src/StateSwordUnderThrustStart.s @@ -206,10 +206,25 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489370, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80389AB0 + .4byte 0x80389A74 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489380, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80389AAC + .4byte 0x80389A90 .global __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart: - .incbin "baserom.dol", 0x489390, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038994C + .4byte 0x80389950 + .4byte 0x803899F0 + .4byte 0x8035550C + .4byte 0x80389A70 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateSwordWaterSpin.s b/asm/src/StateSwordWaterSpin.s index b67ab659..17efadac 100644 --- a/asm/src/StateSwordWaterSpin.s +++ b/asm/src/StateSwordWaterSpin.s @@ -164,7 +164,19 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4893B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80389CB8 + .4byte 0x80389C9C .global __vt__Q53scn4step4hero5sword19StateSwordWaterSpin __vt__Q53scn4step4hero5sword19StateSwordWaterSpin: - .incbin "baserom.dol", 0x4893C8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80389BF8 + .4byte 0x80389BFC + .4byte 0x80389C94 + .4byte 0x8035550C + .4byte 0x80389C98 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateTakeOff.s b/asm/src/StateTakeOff.s index a2dd17c8..482ae1d6 100644 --- a/asm/src/StateTakeOff.s +++ b/asm/src/StateTakeOff.s @@ -164,12 +164,21 @@ __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StateTakeOff __vt__Q53scn4step5enemy10brontoburt12StateTakeOff: - .incbin "baserom.dol", 0x470BE8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A030C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802A0140 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255068 $$255068: - .incbin "baserom.dol", 0x49BF10, 0x8 + .4byte 0x40C00000 + .4byte 0 .global $$255071 $$255071: - .incbin "baserom.dol", 0x49BF18, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateTeleport.s b/asm/src/StateTeleport.s index 819e0e5f..bfb498ea 100644 --- a/asm/src/StateTeleport.s +++ b/asm/src/StateTeleport.s @@ -561,27 +561,35 @@ lbl_802BEC48: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu13StateTeleport __vt__Q53scn4step5enemy4kabu13StateTeleport: - .incbin "baserom.dol", 0x474338, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802BE5C8 ;# ptr + .4byte 0x802BE5CC ;# ptr + .4byte 0x802BE974 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802BEB40 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257445 $$257445: - .incbin "baserom.dol", 0x49C690, 0x4 + .4byte 0 .global $$257446 $$257446: - .incbin "baserom.dol", 0x49C694, 0x4 + .4byte 0xBF800000 .global $$257450 $$257450: - .incbin "baserom.dol", 0x49C698, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257508 $$257508: - .incbin "baserom.dol", 0x49C6A0, 0x4 + .4byte 0x43B40000 .global $$257509 $$257509: - .incbin "baserom.dol", 0x49C6A4, 0x4 + .4byte 0x4222F983 .global $$257510 $$257510: - .incbin "baserom.dol", 0x49C6A8, 0x4 + .4byte 0x3C8EFA35 .global $$257534 $$257534: - .incbin "baserom.dol", 0x49C6AC, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateThrow.s b/asm/src/StateThrow.s index 5d0556d1..e994abdc 100644 --- a/asm/src/StateThrow.s +++ b/asm/src/StateThrow.s @@ -1151,64 +1151,99 @@ lbl_803A00F0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cappyhat10StateThrow __vt__Q53scn4step5enemy8cappyhat10StateThrow: - .incbin "baserom.dol", 0x4714B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A3E9C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802A3F58 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A3FB8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr10StateThrow __vt__Q53scn4step5enemy10poppybrojr10StateThrow: - .incbin "baserom.dol", 0x4769A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D2644 ;# ptr + .4byte 0x802D2648 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D2748 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6hammer10StateThrow __vt__Q53scn4step4hero6hammer10StateThrow: - .incbin "baserom.dol", 0x489FF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80397128 + .4byte 0x803971F8 + .4byte 0x80397248 + .4byte 0x8035550C + .4byte 0x8039724C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter10StateThrow __vt__Q53scn4step4hero7fighter10StateThrow: - .incbin "baserom.dol", 0x48A758, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039FADC + .4byte 0x8039FB54 + .4byte 0x8039FDD0 + .4byte 0x8039FE68 + .4byte 0x8039FFC0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 $$257328: - .incbin "baserom.dol", 0x49BFF0, 0x4 + .4byte 0x3E4CCCCD .global $$257386 $$257386: - .incbin "baserom.dol", 0x49BFF4, 0x4 + .4byte 0x3A83126F .global $$257387 $$257387: - .incbin "baserom.dol", 0x49BFF8, 0x4 + .4byte 0x3BC49BA6 .global $$257388 $$257388: - .incbin "baserom.dol", 0x49BFFC, 0x4 + .4byte 0x3BA3D70A .global $$257418 $$257418: - .incbin "baserom.dol", 0x49C000, 0x4 + .4byte 0 .global $$257419 $$257419: - .incbin "baserom.dol", 0x49C004, 0x4 + .4byte 0x3E99999A .global $$257420 $$257420: - .incbin "baserom.dol", 0x49C008, 0x8 + .4byte 0x3FC00000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258516 $$258516: - .incbin "baserom.dol", 0x49E210, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258019 $$258019: - .incbin "baserom.dol", 0x49E338, 0x4 + .4byte 0 .global $$258058 $$258058: - .incbin "baserom.dol", 0x49E33C, 0x4 + .4byte 0x42480000 .global $$258114 $$258114: - .incbin "baserom.dol", 0x49E340, 0x4 + .4byte 0x3F000000 .global $$258115 $$258115: - .incbin "baserom.dol", 0x49E344, 0x4 + .4byte 0x3ECCCCCD .global $$258183 $$258183: - .incbin "baserom.dol", 0x49E348, 0x8 + .asciz "?fff" + .balign 4 diff --git a/asm/src/StateThrownFighter.s b/asm/src/StateThrownFighter.s index 193d2234..a30a9fa5 100644 --- a/asm/src/StateThrownFighter.s +++ b/asm/src/StateThrownFighter.s @@ -500,36 +500,43 @@ lbl_802AC23C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateThrownFighter __vt__Q53scn4step5enemy6damage18StateThrownFighter: - .incbin "baserom.dol", 0x471E80, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802ABE18 ;# ptr + .4byte 0x802ABEE4 ;# ptr + .4byte 0x802AC0EC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802AC0F0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257792 $$257792: - .incbin "baserom.dol", 0x49C270, 0x4 + .4byte 0 .global $$257793 $$257793: - .incbin "baserom.dol", 0x49C274, 0x4 + .4byte 0x3E99999A .global $$257794 $$257794: - .incbin "baserom.dol", 0x49C278, 0x4 + .4byte 0x3F4CCCCD .global $$257795 $$257795: - .incbin "baserom.dol", 0x49C27C, 0x4 + .4byte 0x3727C5AC .global $$257796 $$257796: - .incbin "baserom.dol", 0x49C280, 0x4 + .4byte 0x3D4CCCCD .global $$257797 $$257797: - .incbin "baserom.dol", 0x49C284, 0x4 + .4byte 0x3DCCCCCD .global $$257871 $$257871: - .incbin "baserom.dol", 0x49C288, 0x4 + .4byte 0x41A00000 .global $$257872 $$257872: - .incbin "baserom.dol", 0x49C28C, 0x4 + .4byte 0x43B40000 .global $$257873 $$257873: - .incbin "baserom.dol", 0x49C290, 0x4 + .4byte 0x3F800000 .global $$257874 $$257874: - .incbin "baserom.dol", 0x49C294, 0x4 + .4byte 0x42652EE1 diff --git a/asm/src/StateThunder.s b/asm/src/StateThunder.s index 6f6c25b0..f7700af7 100644 --- a/asm/src/StateThunder.s +++ b/asm/src/StateThunder.s @@ -166,4 +166,11 @@ procFixPos__Q53scn4step4boss6dubior12StateThunderFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior12StateThunder __vt__Q53scn4step4boss6dubior12StateThunder: - .incbin "baserom.dol", 0x4639A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802506D0 ;# ptr + .4byte 0x80250750 ;# ptr + .4byte 0x80250874 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80250878 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateThunderStart.s b/asm/src/StateThunderStart.s index cd300c74..1e3cafc3 100644 --- a/asm/src/StateThunderStart.s +++ b/asm/src/StateThunderStart.s @@ -393,27 +393,39 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4639C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80250E0C ;# ptr + .4byte 0x80250DF0 ;# ptr .global __vt__Q53scn4step4boss6dubior17StateThunderStart __vt__Q53scn4step4boss6dubior17StateThunderStart: - .incbin "baserom.dol", 0x4639D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80250BA8 ;# ptr + .4byte 0x80250C30 ;# ptr + .4byte 0x80250D38 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80250DEC ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global WaitFrameTable__Q53scn4step4boss6dubior31$$2unnamed$$2StateThunderStart_cpp$$2 WaitFrameTable__Q53scn4step4boss6dubior31$$2unnamed$$2StateThunderStart_cpp$$2: - .incbin "baserom.dol", 0x49B360, 0x8 + .4byte 0x0000000A + .4byte 0x0000000A .global $$256087 $$256087: - .incbin "baserom.dol", 0x49B368, 0x4 + .4byte 0 .global $$256088 $$256088: - .incbin "baserom.dol", 0x49B36C, 0x4 + .4byte 0xBF800000 .global $$256089 $$256089: - .incbin "baserom.dol", 0x49B370, 0x4 + .4byte 0x3F000000 .global $$256090 $$256090: - .incbin "baserom.dol", 0x49B374, 0x4 + .4byte 0x3F800000 .global $$256094 $$256094: - .incbin "baserom.dol", 0x49B378, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateTornadoChase.s b/asm/src/StateTornadoChase.s index 0445148c..c60dd771 100644 --- a/asm/src/StateTornadoChase.s +++ b/asm/src/StateTornadoChase.s @@ -407,18 +407,25 @@ lbl_8025854C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath17StateTornadoChase __vt__Q53scn4step4boss9moundeath17StateTornadoChase: - .incbin "baserom.dol", 0x465310, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80258074 ;# ptr + .4byte 0x802580F4 ;# ptr + .4byte 0x802581F0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802583E8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257129 $$257129: - .incbin "baserom.dol", 0x49B4A0, 0x4 + .4byte 0 .global $$257190 $$257190: - .incbin "baserom.dol", 0x49B4A4, 0x4 + .4byte 0x3727C5AC .global $$257212 $$257212: - .incbin "baserom.dol", 0x49B4A8, 0x4 + .4byte 0x3F000000 .global $$257213 $$257213: - .incbin "baserom.dol", 0x49B4AC, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/StateTornadoRise.s b/asm/src/StateTornadoRise.s index b548542d..ccb43c19 100644 --- a/asm/src/StateTornadoRise.s +++ b/asm/src/StateTornadoRise.s @@ -282,24 +282,35 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x465330, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80258960 ;# ptr + .4byte 0x80258944 ;# ptr .global __vt__Q53scn4step4boss9moundeath16StateTornadoRise __vt__Q53scn4step4boss9moundeath16StateTornadoRise: - .incbin "baserom.dol", 0x465340, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802586B4 ;# ptr + .4byte 0x80258734 ;# ptr + .4byte 0x802587E0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80258940 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256270 $$256270: - .incbin "baserom.dol", 0x49B4B0, 0x4 + .4byte 0x4222F983 .global $$256271 $$256271: - .incbin "baserom.dol", 0x49B4B4, 0x4 + .4byte 0x3C8EFA35 .global $$256272 $$256272: - .incbin "baserom.dol", 0x49B4B8, 0x4 + .4byte 0x42B40000 .global $$256273 $$256273: - .incbin "baserom.dol", 0x49B4BC, 0x4 + .4byte 0x3F800000 .global $$256276 $$256276: - .incbin "baserom.dol", 0x49B4C0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateToss.s b/asm/src/StateToss.s index 66f23948..ef780e8d 100644 --- a/asm/src/StateToss.s +++ b/asm/src/StateToss.s @@ -400,15 +400,27 @@ __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateTo .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48A1C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8039A534 + .4byte 0x8039A518 .global __vt__Q53scn4step4hero4wing9StateToss __vt__Q53scn4step4hero4wing9StateToss: - .incbin "baserom.dol", 0x48A1D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039A12C + .4byte 0x8039A1D0 + .4byte 0x8039A31C + .4byte 0x8035550C + .4byte 0x8039A3FC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258321 $$258321: - .incbin "baserom.dol", 0x49E2A0, 0x4 + .4byte 0x3F800000 .global $$258374 $$258374: - .incbin "baserom.dol", 0x49E2A4, 0x4 + .4byte 0 diff --git a/asm/src/StateUnderAttack.s b/asm/src/StateUnderAttack.s index 7111a858..f046146a 100644 --- a/asm/src/StateUnderAttack.s +++ b/asm/src/StateUnderAttack.s @@ -410,18 +410,27 @@ lbl_8039AB00: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing16StateUnderAttack __vt__Q53scn4step4hero4wing16StateUnderAttack: - .incbin "baserom.dol", 0x48A200, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039A6AC + .4byte 0x8039A7AC + .4byte 0x8039A84C + .4byte 0x8035550C + .4byte 0x8039A9B8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257184 $$257184: - .incbin "baserom.dol", 0x49E2A8, 0x4 + .4byte 0 .global $$257220 $$257220: - .incbin "baserom.dol", 0x49E2AC, 0x4 + .4byte 0x43870000 .global $$257235 $$257235: - .incbin "baserom.dol", 0x49E2B0, 0x4 + .4byte 0x4222F983 .global $$257236 $$257236: - .incbin "baserom.dol", 0x49E2B4, 0x4 + .4byte 0x3C8EFA35 diff --git a/asm/src/StateUnderAttackLanding.s b/asm/src/StateUnderAttackLanding.s index 251b32fd..8cd8e066 100644 --- a/asm/src/StateUnderAttackLanding.s +++ b/asm/src/StateUnderAttackLanding.s @@ -334,20 +334,29 @@ lbl_8039AF24: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing23StateUnderAttackLanding __vt__Q53scn4step4hero4wing23StateUnderAttackLanding: - .incbin "baserom.dol", 0x48A228, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039AC64 + .4byte 0x8039AD08 + .4byte 0x8039ADC4 + .4byte 0x8035550C + .4byte 0x8039AE1C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256962 $$256962: - .incbin "baserom.dol", 0x497870, 0x4 + .4byte 0x3F800000 .global $$256963 $$256963: - .incbin "baserom.dol", 0x497874, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257777 $$257777: - .incbin "baserom.dol", 0x49E2B8, 0x4 + .4byte 0x3E19999A .global $$257778 $$257778: - .incbin "baserom.dol", 0x49E2BC, 0x4 + .4byte 0 diff --git a/asm/src/StateUnlockLvMapDoor.s b/asm/src/StateUnlockLvMapDoor.s index d755c5cd..1b722bb0 100644 --- a/asm/src/StateUnlockLvMapDoor.s +++ b/asm/src/StateUnlockLvMapDoor.s @@ -233,4 +233,13 @@ procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor: - .incbin "baserom.dol", 0x488CF8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80381EE4 + .4byte 0x80381F74 + .4byte 0x80382154 + .4byte 0x8035550C + .4byte 0x80382158 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateVacuum.s b/asm/src/StateVacuum.s index c9214a7c..46bc3673 100644 --- a/asm/src/StateVacuum.s +++ b/asm/src/StateVacuum.s @@ -1132,68 +1132,99 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466818, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025ECF0 ;# ptr + .4byte 0x8025ECB4 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466828, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025ECEC ;# ptr + .4byte 0x8025ECD0 ;# ptr .global __vt__Q53scn4step4boss6whispy11StateVacuum __vt__Q53scn4step4boss6whispy11StateVacuum: - .incbin "baserom.dol", 0x466838, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025EA18 ;# ptr + .4byte 0x8025EAB8 ;# ptr + .4byte 0x8025EC18 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80234500 ;# ptr + .4byte 0x8025EC1C ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4882E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036D4A8 + .4byte 0x8036D44C .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4882F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036D4A4 + .4byte 0x8036D468 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488300, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036D4A0 + .4byte 0x8036D484 .global __vt__Q53scn4step4hero6common11StateVacuum __vt__Q53scn4step4hero6common11StateVacuum: - .incbin "baserom.dol", 0x488310, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036CB24 + .4byte 0x8036CC94 + .4byte 0x8036CF74 + .4byte 0x8035550C + .4byte 0x8036CF78 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258572 $$258572: - .incbin "baserom.dol", 0x49DC78, 0x4 + .4byte 0x3F800000 .global $$258601 $$258601: - .incbin "baserom.dol", 0x49DC7C, 0x4 + .4byte 0x3F400000 .global $$258602 $$258602: - .incbin "baserom.dol", 0x49DC80, 0x4 + .4byte 0xBF400000 .global $$258603 $$258603: - .incbin "baserom.dol", 0x49DC84, 0x4 + .4byte 0xBF000000 .global $$258604 $$258604: - .incbin "baserom.dol", 0x49DC88, 0x4 + .4byte 0x3F000000 .global $$258605 $$258605: - .incbin "baserom.dol", 0x49DC8C, 0x4 + .4byte 0xBF800000 .global $$258606 $$258606: - .incbin "baserom.dol", 0x49DC90, 0x4 + .4byte 0xBFC00000 .global $$258607 $$258607: - .incbin "baserom.dol", 0x49DC94, 0x4 + .4byte 0x3FC00000 .global $$258608 $$258608: - .incbin "baserom.dol", 0x49DC98, 0x4 + .4byte 0x40000000 .global $$258609 $$258609: - .incbin "baserom.dol", 0x49DC9C, 0x4 + .4byte 0xC0300000 .global $$258610 $$258610: - .incbin "baserom.dol", 0x49DCA0, 0x4 + .4byte 0x40300000 .global $$258611 $$258611: - .incbin "baserom.dol", 0x49DCA4, 0x4 + .4byte 0xBFB33333 .global $$258612 $$258612: - .incbin "baserom.dol", 0x49DCA8, 0x4 + .4byte 0x3FB33333 .global $$258613 $$258613: - .incbin "baserom.dol", 0x49DCAC, 0x4 + .4byte 0x3FE66666 diff --git a/asm/src/StateVacuumEnd.s b/asm/src/StateVacuumEnd.s index 0f9dd8b0..97c9558c 100644 --- a/asm/src/StateVacuumEnd.s +++ b/asm/src/StateVacuumEnd.s @@ -193,9 +193,25 @@ procFixPos__Q53scn4step4hero6common14StateVacuumEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy14StateVacuumEnd __vt__Q53scn4step4boss6whispy14StateVacuumEnd: - .incbin "baserom.dol", 0x466858, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025ED7C ;# ptr + .4byte 0x8025ED80 ;# ptr + .4byte 0x8025EE18 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025EE1C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateVacuumEnd __vt__Q53scn4step4hero6common14StateVacuumEnd: - .incbin "baserom.dol", 0x488338, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036D500 + .4byte 0x8036D504 + .4byte 0x8036D5D8 + .4byte 0x8035550C + .4byte 0x8036D5DC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateVacuumReceive.s b/asm/src/StateVacuumReceive.s index 1f51effb..8dd639f4 100644 --- a/asm/src/StateVacuumReceive.s +++ b/asm/src/StateVacuumReceive.s @@ -1318,56 +1318,95 @@ procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common18StateVacuumReceive __vt__Q53scn4step4boss6common18StateVacuumReceive: - .incbin "baserom.dol", 0x4625B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80247880 ;# ptr + .4byte 0x80247884 ;# ptr + .4byte 0x802478F8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x802478FC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18StateVacuumReceive __vt__Q53scn4step5enemy6common18StateVacuumReceive: - .incbin "baserom.dol", 0x46F448, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80295564 ;# ptr + .4byte 0x80295600 ;# ptr + .4byte 0x80295670 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80295674 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference18StateVacuumReceive __vt__Q53scn4step4hero12interference18StateVacuumReceive: - .incbin "baserom.dol", 0x488680, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803746A8 + .4byte 0x80374814 + .4byte 0x803748CC + .4byte 0x8035550C + .4byte 0x80374A0C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state18StateVacuumReceive __vt__Q53scn4step4item5state18StateVacuumReceive: - .incbin "baserom.dol", 0x48E730, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C8A3C + .4byte 0x803C8AB8 + .4byte 0x803C5200 + .4byte 0x803C8B24 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive: - .incbin "baserom.dol", 0x491328, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EF04C + .4byte 0x803EF050 + .4byte 0x803EF0C4 + .4byte 0x803D895C + .4byte 0x803EF0C8 + .4byte 0x803D8964 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256631 $$256631: - .incbin "baserom.dol", 0x49B178, 0x4 + .4byte 0 .global $$256632 $$256632: - .incbin "baserom.dol", 0x49B17C, 0x4 + .4byte 0x3F800000 .global $$256633 $$256633: - .incbin "baserom.dol", 0x49B180, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256844 $$256844: - .incbin "baserom.dol", 0x49BC30, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258416 $$258416: - .incbin "baserom.dol", 0x49DDA0, 0x4 + .4byte 0 .global $$258417 $$258417: - .incbin "baserom.dol", 0x49DDA4, 0x4 + .4byte 0x3F000000 .global $$258418 $$258418: - .incbin "baserom.dol", 0x49DDA8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255920 $$255920: - .incbin "baserom.dol", 0x49E638, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateVacuumStart.s b/asm/src/StateVacuumStart.s index 6f589ab1..62376da9 100644 --- a/asm/src/StateVacuumStart.s +++ b/asm/src/StateVacuumStart.s @@ -111,7 +111,17 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x466878, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8025EF68 ;# ptr + .4byte 0x8025EF4C ;# ptr .global __vt__Q53scn4step4boss6whispy16StateVacuumStart __vt__Q53scn4step4boss6whispy16StateVacuumStart: - .incbin "baserom.dol", 0x466888, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025EEA8 ;# ptr + .4byte 0x8025EEAC ;# ptr + .4byte 0x8025EF44 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025EF48 ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateVanish.s b/asm/src/StateVanish.s index 5f96c16e..8a09bf74 100644 --- a/asm/src/StateVanish.s +++ b/asm/src/StateVanish.s @@ -389,25 +389,39 @@ procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear11StateVanish __vt__Q53scn4step6weapon10spearspear11StateVanish: - .incbin "baserom.dol", 0x490840, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803E50A0 + .4byte 0x803E514C + .4byte 0x803E5238 + .4byte 0x803D895C + .4byte 0x803E523C + .4byte 0x803E5240 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear11StateVanish __vt__Q53scn4step6weapon8deespear11StateVanish: - .incbin "baserom.dol", 0x491108, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803EDFEC + .4byte 0x803EE098 + .4byte 0x803EE184 + .4byte 0x803D895C + .4byte 0x803EE188 + .4byte 0x803EE18C .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: - .incbin "baserom.dol", 0x49EA80, 0x4 + .4byte 0 .global $$256904 $$256904: - .incbin "baserom.dol", 0x49EA84, 0x4 + .4byte 0x43B40000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: - .incbin "baserom.dol", 0x49EC68, 0x4 + .4byte 0 .global $$256904 $$256904: - .incbin "baserom.dol", 0x49EC6C, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateVomit.s b/asm/src/StateVomit.s index 97b8b258..354befa8 100644 --- a/asm/src/StateVomit.s +++ b/asm/src/StateVomit.s @@ -504,17 +504,43 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros10StateVomit __vt__Q53scn4step4boss13watergalboros10StateVomit: - .incbin "baserom.dol", 0x465BE0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025AB88 ;# ptr + .4byte 0x8025AB8C ;# ptr + .4byte 0x8025ACD0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025ACD4 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy10StateVomit __vt__Q53scn4step4boss6whispy10StateVomit: - .incbin "baserom.dol", 0x4668A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025EFF0 ;# ptr + .4byte 0x8025EFF4 ;# ptr + .4byte 0x8025F0D8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025F0DC ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488360, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036D944 + .4byte 0x8036D928 .global __vt__Q53scn4step4hero6common10StateVomit __vt__Q53scn4step4hero6common10StateVomit: - .incbin "baserom.dol", 0x488370, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036D7C8 + .4byte 0x8036D858 + .4byte 0x8036D920 + .4byte 0x8035550C + .4byte 0x8036D924 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateVomited.s b/asm/src/StateVomited.s index 66976c9c..11c06a6f 100644 --- a/asm/src/StateVomited.s +++ b/asm/src/StateVomited.s @@ -808,42 +808,52 @@ lbl_8037555C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference12StateVomited __vt__Q53scn4step4hero12interference12StateVomited: - .incbin "baserom.dol", 0x4886A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80374D70 + .4byte 0x80374F58 + .4byte 0x80375014 + .4byte 0x80375018 + .4byte 0x80375224 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260568 $$260568: - .incbin "baserom.dol", 0x49DDB0, 0x4 + .4byte 0xBD75C28F .global $$260569 $$260569: - .incbin "baserom.dol", 0x49DDB4, 0x4 + .4byte 0x3DCCCCCD .global $$260570 $$260570: - .incbin "baserom.dol", 0x49DDB8, 0x4 + .4byte 0 .global $$260609 $$260609: - .incbin "baserom.dol", 0x49DDBC, 0x4 + .4byte 0xBF000000 .global $$260610 $$260610: - .incbin "baserom.dol", 0x49DDC0, 0x4 + .4byte 0x3F800000 .global $$260611 $$260611: - .incbin "baserom.dol", 0x49DDC4, 0x4 + .4byte 0x3F4CCCCD .global $$260704 $$260704: - .incbin "baserom.dol", 0x49DDC8, 0x4 + .4byte 0x3D4CCCCD .global $$260705 $$260705: - .incbin "baserom.dol", 0x49DDCC, 0x4 + .4byte 0x3F19999A .global $$260706 $$260706: - .incbin "baserom.dol", 0x49DDD0, 0x4 + .4byte 0x3F000000 .global $$260707 $$260707: - .incbin "baserom.dol", 0x49DDD4, 0x4 + .4byte 0x3F8CCCCD .global $$260708 $$260708: - .incbin "baserom.dol", 0x49DDD8, 0x8 + .4byte 0x3ECCCCCD + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step6weapon11starshotlv16Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/StateVulcan.s b/asm/src/StateVulcan.s index 0e307b6a..ca69e4f5 100644 --- a/asm/src/StateVulcan.s +++ b/asm/src/StateVulcan.s @@ -579,40 +579,75 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe11StateVulcan __vt__Q53scn4step5enemy10knucklejoe11StateVulcan: - .incbin "baserom.dol", 0x474AB0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C0B74 ;# ptr + .4byte 0x802C0C1C ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C0CA8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1: - .incbin "baserom.dol", 0x48A780, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A03E0 + .4byte 0x803A03C0 .global __vt__Q53scn4step4hero7fighter11StateVulcan __vt__Q53scn4step4hero7fighter11StateVulcan: - .incbin "baserom.dol", 0x48A790, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A0160 + .4byte 0x803A0164 + .4byte 0x803A032C + .4byte 0x8035550C + .4byte 0x803A0330 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48B000, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A2B94 + .4byte 0x803A2B58 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x48B010, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A2B90 + .4byte 0x803A2B74 .global __vt__Q53scn4step4hero5smash11StateVulcan __vt__Q53scn4step4hero5smash11StateVulcan: - .incbin "baserom.dol", 0x48B020, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2A00 + .4byte 0x803A2A04 + .4byte 0x803A2B50 + .4byte 0x8035550C + .4byte 0x803A2B54 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 $$255822: - .incbin "baserom.dol", 0x49C760, 0x4 + .4byte 0 .global $$255823 $$255823: - .incbin "baserom.dol", 0x49C764, 0x4 + .4byte 0x42B40000 .global $$255824 $$255824: - .incbin "baserom.dol", 0x49C768, 0x4 + .4byte 0x3E800000 .global $$255832 $$255832: - .incbin "baserom.dol", 0x49C76C, 0x4 + .4byte 0x3DCCCCCD .global $$255837 $$255837: - .incbin "baserom.dol", 0x49C770, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateVulcanEnd.s b/asm/src/StateVulcanEnd.s index 53b636c3..b7cd6576 100644 --- a/asm/src/StateVulcanEnd.s +++ b/asm/src/StateVulcanEnd.s @@ -136,9 +136,27 @@ procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter14StateVulcanEnd __vt__Q53scn4step4hero7fighter14StateVulcanEnd: - .incbin "baserom.dol", 0x48A7B8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A0448 + .4byte 0x803A044C + .4byte 0x803A0500 + .4byte 0x8035550C + .4byte 0x803A0504 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash14StateVulcanEnd __vt__Q53scn4step4hero5smash14StateVulcanEnd: - .incbin "baserom.dol", 0x48B048, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A2BEC + .4byte 0x803A2BF0 + .4byte 0x803A2BF4 + .4byte 0x8035550C + .4byte 0x803A2BF8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWaft.s b/asm/src/StateWaft.s index 971b62a3..8c4729d0 100644 --- a/asm/src/StateWaft.s +++ b/asm/src/StateWaft.s @@ -171,33 +171,39 @@ __dt__Q53scn4step4item5state9StateWaftFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255349 $$255349: - .incbin "baserom.dol", 0x48E748, 0x10 + .asciz "RotControlL" + .4byte 0 .global __vt__Q53scn4step4item5state9StateWaft __vt__Q53scn4step4item5state9StateWaft: - .incbin "baserom.dol", 0x48E758, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C8E44 + .4byte 0x803C8D24 + .4byte 0x803C8D84 + .4byte 0x803C5204 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 $$255346: - .incbin "baserom.dol", 0x49E640, 0x4 + .4byte 0 .global $$255347 $$255347: - .incbin "baserom.dol", 0x49E644, 0x4 + .4byte 0x3DCCCCCD .global $$255348 $$255348: - .incbin "baserom.dol", 0x49E648, 0x4 + .4byte 0x43340000 .global $$255390 $$255390: - .incbin "baserom.dol", 0x49E64C, 0x4 + .4byte 0x40000000 .global $$255391 $$255391: - .incbin "baserom.dol", 0x49E650, 0x4 + .4byte 0x43B40000 .global $$255398 $$255398: - .incbin "baserom.dol", 0x49E654, 0x4 + .4byte 0x4222F983 .global $$255399 $$255399: - .incbin "baserom.dol", 0x49E658, 0x4 + .4byte 0x3C8EFA35 .global $$255400 $$255400: - .incbin "baserom.dol", 0x49E65C, 0x4 + .4byte 0x3E4CCCCD diff --git a/asm/src/StateWait.s b/asm/src/StateWait.s index ad6984bc..ce90ac12 100644 --- a/asm/src/StateWait.s +++ b/asm/src/StateWait.s @@ -2618,135 +2618,285 @@ __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateWait __vt__Q53scn4step4boss6common9StateWait: - .incbin "baserom.dol", 0x4625D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80247A98 ;# ptr + .4byte 0x80247A9C ;# ptr + .4byte 0x80247AC0 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80247B08 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateWait __vt__Q53scn4step4boss6dubior9StateWait: - .incbin "baserom.dol", 0x4639F0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80250E90 ;# ptr + .4byte 0x80250E94 ;# ptr + .4byte 0x80250E98 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80250E9C ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateWait __vt__Q53scn4step4boss6whispy9StateWait: - .incbin "baserom.dol", 0x4668C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8025F12C ;# ptr + .4byte 0x8025F130 ;# ptr + .4byte 0x8025F180 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8025F184 ;# ptr + .4byte 0x80234504 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common9StateWait __vt__Q53scn4step5enemy6common9StateWait: - .incbin "baserom.dol", 0x46F468, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80295820 ;# ptr + .4byte 0x80295824 ;# ptr + .4byte 0x80295828 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8029582C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x470C08, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802A0484 ;# ptr + .4byte 0x802A0464 ;# ptr .global __vt__Q53scn4step5enemy10brontoburt9StateWait __vt__Q53scn4step5enemy10brontoburt9StateWait: - .incbin "baserom.dol", 0x470C18, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A0480 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A037C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley9StateWait __vt__Q53scn4step5enemy5foley9StateWait: - .incbin "baserom.dol", 0x472FD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B5344 ;# ptr + .4byte 0x802B5348 ;# ptr + .4byte 0x802B54AC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo9StateWait __vt__Q53scn4step5enemy7gigatzo9StateWait: - .incbin "baserom.dol", 0x4735C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B891C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802B8998 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B899C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWait __vt__Q53scn4step5enemy6lanzer9StateWait: - .incbin "baserom.dol", 0x474E50, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C2740 ;# ptr + .4byte 0x802C2744 ;# ptr + .4byte 0x802C2748 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C274C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateWait __vt__Q53scn4step5enemy6leafan9StateWait: - .incbin "baserom.dol", 0x4750C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C4090 ;# ptr + .4byte 0x802C4094 ;# ptr + .4byte 0x802C4098 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C409C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait: - .incbin "baserom.dol", 0x476A88, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D3194 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateWait __vt__Q53scn4step5enemy6shotzo9StateWait: - .incbin "baserom.dol", 0x4782B0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E0EEC ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802E0EE4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E0EE8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x478700, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802E22C0 ;# ptr + .4byte 0x802E22A4 ;# ptr .global __vt__Q53scn4step5enemy9sirkibble9StateWait __vt__Q53scn4step5enemy9sirkibble9StateWait: - .incbin "baserom.dol", 0x478710, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E20CC ;# ptr + .4byte 0x802E20D0 ;# ptr + .4byte 0x802E229C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E22A0 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9StateWait __vt__Q53scn4step5enemy6sodory9StateWait: - .incbin "baserom.dol", 0x479038, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E6490 ;# ptr + .4byte 0x802E6494 ;# ptr + .4byte 0x802E6498 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E649C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWait __vt__Q53scn4step5enemy9tsukikage9StateWait: - .incbin "baserom.dol", 0x479B00, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EC258 ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802EC25C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EC260 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee9StateWait __vt__Q53scn4step5enemy9waddledee9StateWait: - .incbin "baserom.dol", 0x47A3B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EECDC ;# ptr + .4byte 0x802EEB80 ;# ptr + .4byte 0x802EEC68 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EEC6C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateWait __vt__Q53scn4step4hero6common9StateWait: - .incbin "baserom.dol", 0x488398, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036DB68 + .4byte 0x8036DBEC + .4byte 0x8036DED8 + .4byte 0x8035550C + .4byte 0x8036DEDC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone9StateWait __vt__Q53scn4step4hero5stone9StateWait: - .incbin "baserom.dol", 0x489C10, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8039194C + .4byte 0x803919D4 + .4byte 0x803919FC + .4byte 0x8035550C + .4byte 0x80391A00 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: - .incbin "baserom.dol", 0x48B1A0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803A5114 + .4byte 0x803A50F4 .global __vt__Q53scn4step4hero11staffcredit9StateWait __vt__Q53scn4step4hero11staffcredit9StateWait: - .incbin "baserom.dol", 0x48B1B0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A4F04 + .4byte 0x803A4FDC + .4byte 0x803A50EC + .4byte 0x8035550C + .4byte 0x803A50F0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateWait __vt__Q53scn4step6weapon19challengemastershot9StateWait: - .incbin "baserom.dol", 0x4914D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803F11DC + .4byte 0x803F11D0 + .4byte 0x803F11D4 + .4byte 0x803D895C + .4byte 0x803F11D8 + .4byte 0x803D8964 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254787 $$254787: - .incbin "baserom.dol", 0x49B188, 0x8 + .4byte 0x3C23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255734 $$255734: - .incbin "baserom.dol", 0x49BF20, 0x4 + .4byte 0x41000000 .global $$255735 $$255735: - .incbin "baserom.dol", 0x49BF24, 0x4 + .4byte 0xC1000000 .global $$255736 $$255736: - .incbin "baserom.dol", 0x49BF28, 0x4 + .4byte 0xC0F00000 .global $$255737 $$255737: - .incbin "baserom.dol", 0x49BF2C, 0x4 + .4byte 0x40F00000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255120 $$255120: - .incbin "baserom.dol", 0x49C4C8, 0x4 + .4byte 0x40000000 .global $$255121 $$255121: - .incbin "baserom.dol", 0x49C4CC, 0x4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255732 $$255732: - .incbin "baserom.dol", 0x49C7B0, 0x8 + .4byte 0x3E800000 + .4byte 0 diff --git a/asm/src/StateWaitFar.s b/asm/src/StateWaitFar.s index 084b7ce7..766877ec 100644 --- a/asm/src/StateWaitFar.s +++ b/asm/src/StateWaitFar.s @@ -223,7 +223,17 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x463308, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8024C38C ;# ptr + .4byte 0x8024C370 ;# ptr .global __vt__Q53scn4step4boss10creditroah12StateWaitFar __vt__Q53scn4step4boss10creditroah12StateWaitFar: - .incbin "baserom.dol", 0x463318, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8024C274 ;# ptr + .4byte 0x8024C2F0 ;# ptr + .4byte 0x8024C318 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024C36C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateWakeUp.s b/asm/src/StateWakeUp.s index cd9d6fcb..a4cf0d33 100644 --- a/asm/src/StateWakeUp.s +++ b/asm/src/StateWakeUp.s @@ -124,4 +124,13 @@ procFixPos__Q53scn4step4hero6common11StateWakeUpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common11StateWakeUp __vt__Q53scn4step4hero6common11StateWakeUp: - .incbin "baserom.dol", 0x4883C0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036E0F0 + .4byte 0x8036E18C + .4byte 0x8036E1D4 + .4byte 0x8035550C + .4byte 0x8036E1D8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWalk.s b/asm/src/StateWalk.s index 744c3f52..a2fb723c 100644 --- a/asm/src/StateWalk.s +++ b/asm/src/StateWalk.s @@ -2749,130 +2749,215 @@ procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight9StateWalk __vt__Q53scn4step5enemy11bladeknight9StateWalk: - .incbin "baserom.dol", 0x46FBA8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8029841C ;# ptr + .4byte 0x80298420 ;# ptr + .4byte 0x80298424 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80298494 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter9StateWalk __vt__Q53scn4step5enemy11broomhatter9StateWalk: - .incbin "baserom.dol", 0x471028, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A1BD0 ;# ptr + .4byte 0x802A1944 ;# ptr + .4byte 0x802A1B28 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A1B2C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateWalk __vt__Q53scn4step5enemy10knucklejoe9StateWalk: - .incbin "baserom.dol", 0x474AD0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C0D74 ;# ptr + .4byte 0x802C0DF0 ;# ptr + .4byte 0x802C0EC0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C0F3C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWalk __vt__Q53scn4step5enemy6lanzer9StateWalk: - .incbin "baserom.dol", 0x474E70, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C282C ;# ptr + .4byte 0x802C28A8 ;# ptr + .4byte 0x802C2A5C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C2AF4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9StateWalk __vt__Q53scn4step5enemy5noddy9StateWalk: - .incbin "baserom.dol", 0x475720, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C747C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x802C7480 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C74EC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x475B48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802C97EC ;# ptr + .4byte 0x802C97D0 ;# ptr .global __vt__Q53scn4step5enemy5nruff9StateWalk __vt__Q53scn4step5enemy5nruff9StateWalk: - .incbin "baserom.dol", 0x475B58, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C92AC ;# ptr + .4byte 0x802C932C ;# ptr + .4byte 0x802C94E0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C9564 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477008, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D5E44 ;# ptr + .4byte 0x802D5E08 ;# ptr .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477018, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D5E40 ;# ptr + .4byte 0x802D5E24 ;# ptr .global __vt__Q53scn4step5enemy5rocky9StateWalk __vt__Q53scn4step5enemy5rocky9StateWalk: - .incbin "baserom.dol", 0x477028, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D5758 ;# ptr + .4byte 0x802D575C ;# ptr + .4byte 0x802D5AB0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D5B64 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4883E8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036E6C0 + .4byte 0x8036E6A4 .global __vt__Q53scn4step4hero6common9StateWalk __vt__Q53scn4step4hero6common9StateWalk: - .incbin "baserom.dol", 0x4883F8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036E3F0 + .4byte 0x8036E3F4 + .4byte 0x8036E5C8 + .4byte 0x8035550C + .4byte 0x8036E5CC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateWalk __vt__Q53scn4step4hero11staffcredit9StateWalk: - .incbin "baserom.dol", 0x48B1D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803A52C8 + .4byte 0x803A5344 + .4byte 0x803A5494 + .4byte 0x8035550C + .4byte 0x803A5580 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255785 $$255785: - .incbin "baserom.dol", 0x49BD60, 0x4 + .4byte 0x3CF5C28F .global $$255786 $$255786: - .incbin "baserom.dol", 0x49BD64, 0x4 + .4byte 0x3B449BA6 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256240 $$256240: - .incbin "baserom.dol", 0x49BF78, 0x4 + .4byte 0 .global $$256241 $$256241: - .incbin "baserom.dol", 0x49BF7C, 0x4 + .4byte 0x40000000 .global $$256245 $$256245: - .incbin "baserom.dol", 0x49BF80, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 $$256172: - .incbin "baserom.dol", 0x49C778, 0x4 + .4byte 0x3F800000 .global $$256203 $$256203: - .incbin "baserom.dol", 0x49C77C, 0x4 + .4byte 0x40200000 .global $$256204 $$256204: - .incbin "baserom.dol", 0x49C780, 0x4 + .4byte 0 .global $$256205 $$256205: - .incbin "baserom.dol", 0x49C784, 0x4 + .4byte 0x40000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256206 $$256206: - .incbin "baserom.dol", 0x49C7B8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256452 $$256452: - .incbin "baserom.dol", 0x49C900, 0x4 + .4byte 0 .global $$256460 $$256460: - .incbin "baserom.dol", 0x49C904, 0x4 + .4byte 0x3F800000 .global $$256473 $$256473: - .incbin "baserom.dol", 0x49C908, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$256506 $$256506: - .incbin "baserom.dol", 0x49C910, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256748 $$256748: - .incbin "baserom.dol", 0x49CB60, 0x4 + .4byte 0x3F800000 .global $$256749 $$256749: - .incbin "baserom.dol", 0x49CB64, 0x4 + .4byte 0 .global $$256753 $$256753: - .incbin "baserom.dol", 0x49CB68, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257723 $$257723: - .incbin "baserom.dol", 0x49DCB0, 0x4 + .4byte 0x3C23D70A .global $$257724 $$257724: - .incbin "baserom.dol", 0x49DCB4, 0x4 + .4byte 0 .global $$257725 $$257725: - .incbin "baserom.dol", 0x49DCB8, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/StateWalkAround.s b/asm/src/StateWalkAround.s index 06e572c8..d2cbed39 100644 --- a/asm/src/StateWalkAround.s +++ b/asm/src/StateWalkAround.s @@ -1387,111 +1387,143 @@ lbl_802E6A34: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15StateWalkAround __vt__Q53scn4step5enemy6common15StateWalkAround: - .incbin "baserom.dol", 0x46F488, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80295A48 ;# ptr + .4byte 0x80295A4C ;# ptr + .4byte 0x80295A50 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80295AA8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateWalkAround __vt__Q53scn4step5enemy11broomhatter15StateWalkAround: - .incbin "baserom.dol", 0x471048, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A2100 ;# ptr + .4byte 0x802A1CB8 ;# ptr + .4byte 0x802A1F38 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A1F80 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15StateWalkAround __vt__Q53scn4step5enemy6lanzer15StateWalkAround: - .incbin "baserom.dol", 0x474E90, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C2D78 ;# ptr + .4byte 0x802C2DF4 ;# ptr + .4byte 0x802C2F7C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C2F80 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15StateWalkAround __vt__Q53scn4step5enemy6sodory15StateWalkAround: - .incbin "baserom.dol", 0x479058, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802E6658 ;# ptr + .4byte 0x802E665C ;# ptr + .4byte 0x802E6660 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802E66EC ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255928 $$255928: - .incbin "baserom.dol", 0x49BC38, 0x4 + .4byte 0x3CA3D70A .global $$255929 $$255929: - .incbin "baserom.dol", 0x49BC3C, 0x4 + .4byte 0x3A83126F .global $$255930 $$255930: - .incbin "baserom.dol", 0x49BC40, 0x4 + .4byte 0x3CF5C28F .global $$255931 $$255931: - .incbin "baserom.dol", 0x49BC44, 0x4 + .4byte 0x3B03126F .global $$255932 $$255932: - .incbin "baserom.dol", 0x49BC48, 0x4 + .4byte 0x3D23D70A .global $$255933 $$255933: - .incbin "baserom.dol", 0x49BC4C, 0x4 + .4byte 0x3B449BA6 .global $$255934 $$255934: - .incbin "baserom.dol", 0x49BC50, 0x4 + .4byte 0x3D75C28F .global $$255935 $$255935: - .incbin "baserom.dol", 0x49BC54, 0x4 + .4byte 0x3B83126F .global $$255969 $$255969: - .incbin "baserom.dol", 0x49BC58, 0x4 + .4byte 0x40200000 .global $$255970 $$255970: - .incbin "baserom.dol", 0x49BC5C, 0x4 + .4byte 0 .global $$255971 $$255971: - .incbin "baserom.dol", 0x49BC60, 0x8 + .4byte 0x40000000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256398 $$256398: - .incbin "baserom.dol", 0x49BF88, 0x4 + .4byte 0 .global $$256399 $$256399: - .incbin "baserom.dol", 0x49BF8C, 0x4 + .4byte 0x40000000 .global $$256403 $$256403: - .incbin "baserom.dol", 0x49BF90, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$256429 $$256429: - .incbin "baserom.dol", 0x49BF98, 0x8 + .4byte 0xBF800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256373 $$256373: - .incbin "baserom.dol", 0x49C7C0, 0x4 + .4byte 0x3F800000 .global $$256407 $$256407: - .incbin "baserom.dol", 0x49C7C4, 0x4 + .4byte 0x40200000 .global $$256408 $$256408: - .incbin "baserom.dol", 0x49C7C8, 0x4 + .4byte 0x40000000 .global $$256409 $$256409: - .incbin "baserom.dol", 0x49C7CC, 0x4 + .4byte 0xC0000000 .global $$256410 $$256410: - .incbin "baserom.dol", 0x49C7D0, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256319 $$256319: - .incbin "baserom.dol", 0x49CED0, 0x4 + .4byte 0x3F000000 .global $$256356 $$256356: - .incbin "baserom.dol", 0x49CED4, 0x4 + .4byte 0 .global $$256357 $$256357: - .incbin "baserom.dol", 0x49CED8, 0x4 + .4byte 0x3DCCCCCD .global $$256358 $$256358: - .incbin "baserom.dol", 0x49CEDC, 0x4 + .4byte 0x3F800000 .global $$256359 $$256359: - .incbin "baserom.dol", 0x49CEE0, 0x4 + .4byte 0xBF800000 .global $$256360 $$256360: - .incbin "baserom.dol", 0x49CEE4, 0x4 + .4byte 0x40200000 .global $$256361 $$256361: - .incbin "baserom.dol", 0x49CEE8, 0x4 + .4byte 0x40000000 .global $$256362 $$256362: - .incbin "baserom.dol", 0x49CEEC, 0x4 + .4byte 0xC0000000 diff --git a/asm/src/StateWalkEnd.s b/asm/src/StateWalkEnd.s index 3dba0868..0807b92c 100644 --- a/asm/src/StateWalkEnd.s +++ b/asm/src/StateWalkEnd.s @@ -91,9 +91,17 @@ lbl_802D5F54: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky12StateWalkEnd __vt__Q53scn4step5enemy5rocky12StateWalkEnd: - .incbin "baserom.dol", 0x477048, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D5EC0 ;# ptr + .4byte 0x802D5EC4 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D5EC8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 $$255720: - .incbin "baserom.dol", 0x49CB70, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateWalkStart.s b/asm/src/StateWalkStart.s index 89cc267a..14f6f0bb 100644 --- a/asm/src/StateWalkStart.s +++ b/asm/src/StateWalkStart.s @@ -96,12 +96,23 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x477068, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802D6088 ;# ptr + .4byte 0x802D606C ;# ptr .global __vt__Q53scn4step5enemy5rocky14StateWalkStart __vt__Q53scn4step5enemy5rocky14StateWalkStart: - .incbin "baserom.dol", 0x477078, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802D5FD4 ;# ptr + .4byte 0x802D5FD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802D6068 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255797 $$255797: - .incbin "baserom.dol", 0x49CB78, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateWalkStepBack.s b/asm/src/StateWalkStepBack.s index 2e3498e4..3c4970e4 100644 --- a/asm/src/StateWalkStepBack.s +++ b/asm/src/StateWalkStepBack.s @@ -424,12 +424,19 @@ lbl_802C1718: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack: - .incbin "baserom.dol", 0x474AF0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C1280 ;# ptr + .4byte 0x802C12FC ;# ptr + .4byte 0x802C1484 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C1570 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256282 $$256282: - .incbin "baserom.dol", 0x49C788, 0x4 + .4byte 0 .global $$256321 $$256321: - .incbin "baserom.dol", 0x49C78C, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/StateWalkStraight.s b/asm/src/StateWalkStraight.s index 665100e4..95094620 100644 --- a/asm/src/StateWalkStraight.s +++ b/asm/src/StateWalkStraight.s @@ -1055,81 +1055,111 @@ lbl_802CF618: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17StateWalkStraight __vt__Q53scn4step5enemy6common17StateWalkStraight: - .incbin "baserom.dol", 0x46F4A8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80295E24 ;# ptr + .4byte 0x80295E28 ;# ptr + .4byte 0x80295E2C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x80295E30 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous17StateWalkStraight __vt__Q53scn4step5enemy8needlous17StateWalkStraight: - .incbin "baserom.dol", 0x4755D0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802C6E14 ;# ptr + .4byte 0x802C6E18 ;# ptr + .4byte 0x802C6F78 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802C6F7C ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight: - .incbin "baserom.dol", 0x476228, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CD5CC ;# ptr + .4byte 0x802CD5D0 ;# ptr + .4byte 0x802CD5FC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CD600 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight: - .incbin "baserom.dol", 0x4763D8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802CF3FC ;# ptr + .4byte 0x802CF400 ;# ptr + .4byte 0x802CF42C ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802CF430 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255905 $$255905: - .incbin "baserom.dol", 0x49BC68, 0x4 + .4byte 0x3CA3D70A .global $$255906 $$255906: - .incbin "baserom.dol", 0x49BC6C, 0x4 + .4byte 0x3A83126F .global $$255907 $$255907: - .incbin "baserom.dol", 0x49BC70, 0x4 + .4byte 0x3CF5C28F .global $$255908 $$255908: - .incbin "baserom.dol", 0x49BC74, 0x4 + .4byte 0x3B03126F .global $$255909 $$255909: - .incbin "baserom.dol", 0x49BC78, 0x4 + .4byte 0x3D23D70A .global $$255910 $$255910: - .incbin "baserom.dol", 0x49BC7C, 0x4 + .4byte 0x3B449BA6 .global $$255911 $$255911: - .incbin "baserom.dol", 0x49BC80, 0x4 + .4byte 0x3D75C28F .global $$255912 $$255912: - .incbin "baserom.dol", 0x49BC84, 0x4 + .4byte 0x3B83126F .global $$255913 $$255913: - .incbin "baserom.dol", 0x49BC88, 0x4 + .4byte 0x3DB851EC .global $$255914 $$255914: - .incbin "baserom.dol", 0x49BC8C, 0x4 + .4byte 0x3BC49BA6 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256319 $$256319: - .incbin "baserom.dol", 0x49C898, 0x4 + .4byte 0x3CA3D70A .global $$256320 $$256320: - .incbin "baserom.dol", 0x49C89C, 0x4 + .4byte 0x3A83126F .global $$256321 $$256321: - .incbin "baserom.dol", 0x49C8A0, 0x4 + .4byte 0x3CF5C28F .global $$256322 $$256322: - .incbin "baserom.dol", 0x49C8A4, 0x4 + .4byte 0x3D23D70A .global $$256323 $$256323: - .incbin "baserom.dol", 0x49C8A8, 0x4 + .4byte 0x3D75C28F .global $$256373 $$256373: - .incbin "baserom.dol", 0x49C8AC, 0x4 + .4byte 0x3DCCCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256414 $$256414: - .incbin "baserom.dol", 0x49C9F0, 0x8 + .4byte 0x3CA3D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256413 $$256413: - .incbin "baserom.dol", 0x49CA40, 0x8 + .4byte 0x3CA3D70A + .4byte 0 diff --git a/asm/src/StateWall.s b/asm/src/StateWall.s index 4c6a8b4a..e04aaa03 100644 --- a/asm/src/StateWall.s +++ b/asm/src/StateWall.s @@ -141,9 +141,17 @@ lbl_802EC4E0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWall __vt__Q53scn4step5enemy9tsukikage9StateWall: - .incbin "baserom.dol", 0x479B20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EC47C ;# ptr + .4byte 0x8028DDD8 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255060 $$255060: - .incbin "baserom.dol", 0x49CFC0, 0x8 + .4byte 0x42B40000 + .4byte 0 diff --git a/asm/src/StateWallAttack.s b/asm/src/StateWallAttack.s index 004a90f0..3b817e09 100644 --- a/asm/src/StateWallAttack.s +++ b/asm/src/StateWallAttack.s @@ -174,9 +174,17 @@ lbl_802EC750: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateWallAttack __vt__Q53scn4step5enemy9tsukikage15StateWallAttack: - .incbin "baserom.dol", 0x479B40, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EC610 ;# ptr + .4byte 0x802EC690 ;# ptr + .4byte 0x8028DDDC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x8028DDE4 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255084 $$255084: - .incbin "baserom.dol", 0x49CFC8, 0x8 + .4byte 0x42B40000 + .4byte 0 diff --git a/asm/src/StateWarp.s b/asm/src/StateWarp.s index 233fa43a..840974e8 100644 --- a/asm/src/StateWarp.s +++ b/asm/src/StateWarp.s @@ -653,24 +653,33 @@ lbl_802ED08C: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWarp __vt__Q53scn4step5enemy9tsukikage9StateWarp: - .incbin "baserom.dol", 0x479B60, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EC94C ;# ptr + .4byte 0x802EC9D4 ;# ptr + .4byte 0x802ECD74 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802ECEA8 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257655 $$257655: - .incbin "baserom.dol", 0x49CFD0, 0x4 + .4byte 0xBF800000 .global $$257656 $$257656: - .incbin "baserom.dol", 0x49CFD4, 0x4 + .4byte 0 .global $$257660 $$257660: - .incbin "baserom.dol", 0x49CFD8, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$257716 $$257716: - .incbin "baserom.dol", 0x49CFE0, 0x4 + .4byte 0x41200000 .global $$257717 $$257717: - .incbin "baserom.dol", 0x49CFE4, 0x4 + .4byte 0x41000000 .global $$257742 $$257742: - .incbin "baserom.dol", 0x49CFE8, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/StateWarpStar.s b/asm/src/StateWarpStar.s index 17e44733..dcf57657 100644 --- a/asm/src/StateWarpStar.s +++ b/asm/src/StateWarpStar.s @@ -767,4 +767,13 @@ lbl_80382BAC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick13StateWarpStar __vt__Q53scn4step4hero7gimmick13StateWarpStar: - .incbin "baserom.dol", 0x488D20, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803827B8 + .4byte 0x803827BC + .4byte 0x80382B3C + .4byte 0x80382B40 + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWarpStarFall.s b/asm/src/StateWarpStarFall.s index aee4ce0a..81762b0c 100644 --- a/asm/src/StateWarpStarFall.s +++ b/asm/src/StateWarpStarFall.s @@ -477,23 +477,35 @@ __sinit_$$3StateWarpStarFall_cpp: /* 8038330C 0037F14C 4B D3 AD B4 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025C8, 0x4 + .4byte 0x803832F8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1: - .incbin "baserom.dol", 0x488D48, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803832F4 + .4byte 0x803832D4 .global __vt__Q53scn4step4hero7gimmick17StateWarpStarFall __vt__Q53scn4step4hero7gimmick17StateWarpStarFall: - .incbin "baserom.dol", 0x488D58, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80382D80 + .4byte 0x80382E9C + .4byte 0x803831BC + .4byte 0x8035550C + .4byte 0x803831C0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260208 $$260208: - .incbin "baserom.dol", 0x49DFE8, 0x4 + .4byte 0 .global $$260209 $$260209: - .incbin "baserom.dol", 0x49DFEC, 0x4 + .4byte 0x3F000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global TARGET_OFFSET__31$$2unnamed$$2StateWarpStarFall_cpp$$2 diff --git a/asm/src/StateWarpStarIn.s b/asm/src/StateWarpStarIn.s index 66738c85..58836b3a 100644 --- a/asm/src/StateWarpStarIn.s +++ b/asm/src/StateWarpStarIn.s @@ -670,52 +670,69 @@ __sinit_$$3StateWarpStarIn_cpp: /* 80383CD4 0037FB14 4B D3 A3 EC */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025CC, 0x4 + .4byte 0x80383CC0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$260738 $$260738: - .incbin "baserom.dol", 0x488D80, 0x18 + .asciz "step/gimmick/WarpStar" + .balign 4 .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x488D98, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80383CBC + .4byte 0x80383C9C .global __vt__Q53scn4step4hero7gimmick15StateWarpStarIn __vt__Q53scn4step4hero7gimmick15StateWarpStarIn: - .incbin "baserom.dol", 0x488DA8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803837C0 + .4byte 0x80383958 + .4byte 0x80383B6C + .4byte 0x80383C34 + .4byte 0x80355510 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260737 $$260737: - .incbin "baserom.dol", 0x497728, 0x8 + .asciz "TopL" + .balign 4 .global $$260739 $$260739: - .incbin "baserom.dol", 0x497730, 0x8 + .asciz "AnimL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260734 $$260734: - .incbin "baserom.dol", 0x49DFF0, 0x4 + .4byte 0xC0A00000 .global $$260735 $$260735: - .incbin "baserom.dol", 0x49DFF4, 0x4 + .4byte 0x41200000 .global $$260736 $$260736: - .incbin "baserom.dol", 0x49DFF8, 0x4 + .4byte 0 .global $$260740 $$260740: - .incbin "baserom.dol", 0x49DFFC, 0x4 + .4byte 0x3F800000 .global $$260835 $$260835: - .incbin "baserom.dol", 0x49E000, 0x4 + .4byte 0x3F000000 .global $$260836 $$260836: - .incbin "baserom.dol", 0x49E004, 0x4 + .4byte 0x3E000000 .global $$260848 $$260848: - .incbin "baserom.dol", 0x49E008, 0x8 + .4byte 0x42480000 + .4byte 0 .global $$260851 $$260851: - .incbin "baserom.dol", 0x49E010, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global TARGET_OFFSET__29$$2unnamed$$2StateWarpStarIn_cpp$$2 diff --git a/asm/src/StateWaterFloat.s b/asm/src/StateWaterFloat.s index d8ad9e92..10fcab2a 100644 --- a/asm/src/StateWaterFloat.s +++ b/asm/src/StateWaterFloat.s @@ -447,7 +447,19 @@ __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1 __vt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1: - .incbin "baserom.dol", 0x488420, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036ED08 + .4byte 0x8036ECE0 .global __vt__Q53scn4step4hero6common15StateWaterFloat __vt__Q53scn4step4hero6common15StateWaterFloat: - .incbin "baserom.dol", 0x488430, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036E7E8 + .4byte 0x8036E894 + .4byte 0x8036EBA0 + .4byte 0x8035550C + .4byte 0x8036EC18 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWaterPistol.s b/asm/src/StateWaterPistol.s index 9be65379..ea0c1ae7 100644 --- a/asm/src/StateWaterPistol.s +++ b/asm/src/StateWaterPistol.s @@ -356,33 +356,45 @@ __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1 __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1: - .incbin "baserom.dol", 0x488458, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036F1CC + .4byte 0x8036F1AC .global __vt__Q53scn4step4hero6common16StateWaterPistol __vt__Q53scn4step4hero6common16StateWaterPistol: - .incbin "baserom.dol", 0x488468, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036F098 + .4byte 0x8036F110 + .4byte 0x8036F1A4 + .4byte 0x8035550C + .4byte 0x8036F1A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257717 $$257717: - .incbin "baserom.dol", 0x49DCC0, 0x4 + .4byte 0 .global $$257718 $$257718: - .incbin "baserom.dol", 0x49DCC4, 0x4 + .4byte 0xBF800000 .global $$257719 $$257719: - .incbin "baserom.dol", 0x49DCC8, 0x4 + .4byte 0x3F800000 .global $$257763 $$257763: - .incbin "baserom.dol", 0x49DCCC, 0x4 + .4byte 0x3727C5AC .global $$257764 $$257764: - .incbin "baserom.dol", 0x49DCD0, 0x4 + .4byte 0xB727C5AC .global $$257765 $$257765: - .incbin "baserom.dol", 0x49DCD4, 0x4 + .4byte 0x3DCCCCCD .global $$257766 $$257766: - .incbin "baserom.dol", 0x49DCD8, 0x4 + .4byte 0xC2480000 .global $$257767 $$257767: - .incbin "baserom.dol", 0x49DCDC, 0x4 + .4byte 0x42480000 diff --git a/asm/src/StateWaterPistolFloat.s b/asm/src/StateWaterPistolFloat.s index e1f3047e..b497dbca 100644 --- a/asm/src/StateWaterPistolFloat.s +++ b/asm/src/StateWaterPistolFloat.s @@ -245,18 +245,31 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21Sta .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488490, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036F500 + .4byte 0x8036F4E4 .global __vt__Q53scn4step4hero6common21StateWaterPistolFloat __vt__Q53scn4step4hero6common21StateWaterPistolFloat: - .incbin "baserom.dol", 0x4884A0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036F310 + .4byte 0x8036F39C + .4byte 0x8036F4DC + .4byte 0x8035550C + .4byte 0x8036F4E0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257643 $$257643: - .incbin "baserom.dol", 0x49DCE0, 0x4 + .4byte 0x3F800000 .global $$257644 $$257644: - .incbin "baserom.dol", 0x49DCE4, 0x4 + .4byte 0xBF800000 .global $$257645 $$257645: - .incbin "baserom.dol", 0x49DCE8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StateWaterWait.s b/asm/src/StateWaterWait.s index d82b262e..28e2944b 100644 --- a/asm/src/StateWaterWait.s +++ b/asm/src/StateWaterWait.s @@ -433,7 +433,19 @@ __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x4884C8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036FAE4 + .4byte 0x8036FAC4 .global __vt__Q53scn4step4hero6common14StateWaterWait __vt__Q53scn4step4hero6common14StateWaterWait: - .incbin "baserom.dol", 0x4884D8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036F700 + .4byte 0x8036F778 + .4byte 0x8036F964 + .4byte 0x8035550C + .4byte 0x8036F9B8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWaterWalk.s b/asm/src/StateWaterWalk.s index 6ac7c3f9..26ceae49 100644 --- a/asm/src/StateWaterWalk.s +++ b/asm/src/StateWaterWalk.s @@ -340,7 +340,19 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x488500, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8036FF98 + .4byte 0x8036FF7C .global __vt__Q53scn4step4hero6common14StateWaterWalk __vt__Q53scn4step4hero6common14StateWaterWalk: - .incbin "baserom.dol", 0x488510, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8036FC08 + .4byte 0x8036FC80 + .4byte 0x8036FDEC + .4byte 0x8035550C + .4byte 0x8036FE6C + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipAttack.s b/asm/src/StateWhipAttack.s index 93c9236f..8f458279 100644 --- a/asm/src/StateWhipAttack.s +++ b/asm/src/StateWhipAttack.s @@ -57,4 +57,13 @@ procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip15StateWhipAttack __vt__Q53scn4step4hero4whip15StateWhipAttack: - .incbin "baserom.dol", 0x489490, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A0A4 + .4byte 0x8038A0A8 + .4byte 0x8038A0AC + .4byte 0x8035550C + .4byte 0x8038A0D0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipAttackAir.s b/asm/src/StateWhipAttackAir.s index 84119b44..6c7d54f6 100644 --- a/asm/src/StateWhipAttackAir.s +++ b/asm/src/StateWhipAttackAir.s @@ -159,7 +159,19 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4894B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038A2C8 + .4byte 0x8038A2AC .global __vt__Q53scn4step4hero4whip18StateWhipAttackAir __vt__Q53scn4step4hero4whip18StateWhipAttackAir: - .incbin "baserom.dol", 0x4894C8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A210 + .4byte 0x8038A214 + .4byte 0x8038A2A4 + .4byte 0x8035550C + .4byte 0x8038A2A8 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipAttackUp.s b/asm/src/StateWhipAttackUp.s index 9e5c5ea0..69f0a85a 100644 --- a/asm/src/StateWhipAttackUp.s +++ b/asm/src/StateWhipAttackUp.s @@ -112,7 +112,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4894F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038A40C + .4byte 0x8038A3F0 .global __vt__Q53scn4step4hero4whip17StateWhipAttackUp __vt__Q53scn4step4hero4whip17StateWhipAttackUp: - .incbin "baserom.dol", 0x489500, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A3E0 + .4byte 0x8038A3E4 + .4byte 0x8038A3E8 + .4byte 0x8035550C + .4byte 0x8038A3EC + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipCapture.s b/asm/src/StateWhipCapture.s index 2c154aa9..fb5757fb 100644 --- a/asm/src/StateWhipCapture.s +++ b/asm/src/StateWhipCapture.s @@ -261,10 +261,25 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x489528, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038A76C + .4byte 0x8038A730 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489538, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038A768 + .4byte 0x8038A74C .global __vt__Q53scn4step4hero4whip16StateWhipCapture __vt__Q53scn4step4hero4whip16StateWhipCapture: - .incbin "baserom.dol", 0x489548, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A484 + .4byte 0x8038A534 + .4byte 0x8038A5E8 + .4byte 0x8038A5EC + .4byte 0x8038A660 + .4byte 0x8038A664 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipCaptureUp.s b/asm/src/StateWhipCaptureUp.s index 1c79659a..7268d0de 100644 --- a/asm/src/StateWhipCaptureUp.s +++ b/asm/src/StateWhipCaptureUp.s @@ -105,4 +105,13 @@ procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip18StateWhipCaptureUp __vt__Q53scn4step4hero4whip18StateWhipCaptureUp: - .incbin "baserom.dol", 0x489570, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A7E4 + .4byte 0x8038A894 + .4byte 0x8038A898 + .4byte 0x8038A89C + .4byte 0x8038A8A0 + .4byte 0x8038A8A4 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipCatch.s b/asm/src/StateWhipCatch.s index 5643aced..d9f15b85 100644 --- a/asm/src/StateWhipCatch.s +++ b/asm/src/StateWhipCatch.s @@ -238,12 +238,21 @@ procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip14StateWhipCatch __vt__Q53scn4step4hero4whip14StateWhipCatch: - .incbin "baserom.dol", 0x489598, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038A958 + .4byte 0x8038A9F4 + .4byte 0x8038AA98 + .4byte 0x8038AA9C + .4byte 0x8038AAA0 + .4byte 0x8038ABC0 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258486 $$258486: - .incbin "baserom.dol", 0x49E0C0, 0x4 + .4byte 0 .global $$258563 $$258563: - .incbin "baserom.dol", 0x49E0C4, 0x4 + .4byte 0x3F666666 diff --git a/asm/src/StateWhipCharge.s b/asm/src/StateWhipCharge.s index 9f94a6d8..9805d292 100644 --- a/asm/src/StateWhipCharge.s +++ b/asm/src/StateWhipCharge.s @@ -405,16 +405,37 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4895C0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B130 + .4byte 0x8038B0B4 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4895D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B12C + .4byte 0x8038B0D0 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4895E0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B128 + .4byte 0x8038B0EC .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4895F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B124 + .4byte 0x8038B108 .global __vt__Q53scn4step4hero4whip15StateWhipCharge __vt__Q53scn4step4hero4whip15StateWhipCharge: - .incbin "baserom.dol", 0x489600, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038AD28 + .4byte 0x8038ADA4 + .4byte 0x8038B04C + .4byte 0x8035550C + .4byte 0x8038B0B0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipDrill.s b/asm/src/StateWhipDrill.s index b8114254..328144a6 100644 --- a/asm/src/StateWhipDrill.s +++ b/asm/src/StateWhipDrill.s @@ -288,7 +288,19 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489628, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B514 + .4byte 0x8038B4F8 .global __vt__Q53scn4step4hero4whip14StateWhipDrill __vt__Q53scn4step4hero4whip14StateWhipDrill: - .incbin "baserom.dol", 0x489638, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038B2A4 + .4byte 0x8038B320 + .4byte 0x8038B454 + .4byte 0x8035550C + .4byte 0x8038B4F4 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipGazerSpiral.s b/asm/src/StateWhipGazerSpiral.s index 2546cfd3..b041d72c 100644 --- a/asm/src/StateWhipGazerSpiral.s +++ b/asm/src/StateWhipGazerSpiral.s @@ -318,15 +318,29 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489660, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038B978 + .4byte 0x8038B95C .global __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral: - .incbin "baserom.dol", 0x489670, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038B6C4 + .4byte 0x8038B740 + .4byte 0x8038B7DC + .4byte 0x8035550C + .4byte 0x8038B958 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258346 $$258346: - .incbin "baserom.dol", 0x49E0C8, 0x8 + .asciz "?fff" + .balign 4 .global $$258349 $$258349: - .incbin "baserom.dol", 0x49E0D0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateWhipRush.s b/asm/src/StateWhipRush.s index cedabc47..0c9cbd14 100644 --- a/asm/src/StateWhipRush.s +++ b/asm/src/StateWhipRush.s @@ -239,7 +239,19 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489698, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038BC90 + .4byte 0x8038BC74 .global __vt__Q53scn4step4hero4whip13StateWhipRush __vt__Q53scn4step4hero4whip13StateWhipRush: - .incbin "baserom.dol", 0x4896A8, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038BAAC + .4byte 0x8038BAB0 + .4byte 0x8038BC6C + .4byte 0x8035550C + .4byte 0x8038BC70 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipSlamBack.s b/asm/src/StateWhipSlamBack.s index bac2f887..becf647d 100644 --- a/asm/src/StateWhipSlamBack.s +++ b/asm/src/StateWhipSlamBack.s @@ -211,7 +211,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x4896D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038BF40 + .4byte 0x8038BF24 .global __vt__Q53scn4step4hero4whip17StateWhipSlamBack __vt__Q53scn4step4hero4whip17StateWhipSlamBack: - .incbin "baserom.dol", 0x4896E0, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038BE04 + .4byte 0x8038BE7C + .4byte 0x8038BF18 + .4byte 0x8038BF1C + .4byte 0x8038BF20 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipSlamDown.s b/asm/src/StateWhipSlamDown.s index 077f040d..678b285e 100644 --- a/asm/src/StateWhipSlamDown.s +++ b/asm/src/StateWhipSlamDown.s @@ -218,7 +218,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489708, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038C210 + .4byte 0x8038C1F4 .global __vt__Q53scn4step4hero4whip17StateWhipSlamDown __vt__Q53scn4step4hero4whip17StateWhipSlamDown: - .incbin "baserom.dol", 0x489718, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038C074 + .4byte 0x8038C0EC + .4byte 0x8038C1E8 + .4byte 0x8038C1EC + .4byte 0x8038C1F0 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipSlamFront.s b/asm/src/StateWhipSlamFront.s index 04c238e2..cb35a716 100644 --- a/asm/src/StateWhipSlamFront.s +++ b/asm/src/StateWhipSlamFront.s @@ -241,7 +241,19 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489740, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038C528 + .4byte 0x8038C50C .global __vt__Q53scn4step4hero4whip18StateWhipSlamFront __vt__Q53scn4step4hero4whip18StateWhipSlamFront: - .incbin "baserom.dol", 0x489750, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038C3EC + .4byte 0x8038C464 + .4byte 0x8038C500 + .4byte 0x8038C504 + .4byte 0x8038C508 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhipSlamUp.s b/asm/src/StateWhipSlamUp.s index c3295065..600fce24 100644 --- a/asm/src/StateWhipSlamUp.s +++ b/asm/src/StateWhipSlamUp.s @@ -193,7 +193,19 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateW .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x489778, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8038C798 + .4byte 0x8038C77C .global __vt__Q53scn4step4hero4whip15StateWhipSlamUp __vt__Q53scn4step4hero4whip15StateWhipSlamUp: - .incbin "baserom.dol", 0x489788, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x8038C65C + .4byte 0x8038C6D4 + .4byte 0x8038C770 + .4byte 0x8038C774 + .4byte 0x8038C778 + .4byte 0x80355514 + .4byte 0x80355518 + .4byte 0 diff --git a/asm/src/StateWhispyAppear.s b/asm/src/StateWhispyAppear.s index 76076625..88402469 100644 --- a/asm/src/StateWhispyAppear.s +++ b/asm/src/StateWhispyAppear.s @@ -988,92 +988,133 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt17StateWhispyAppear __vt__Q53scn4step5enemy10brontoburt17StateWhispyAppear: - .incbin "baserom.dol", 0x470C38, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802A052C ;# ptr + .4byte 0x802A05A8 ;# ptr + .4byte 0x802A06C8 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802A0844 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x4737B8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802B9DB0 ;# ptr + .4byte 0x802B9D8C ;# ptr .global __vt__Q53scn4step5enemy5gordo17StateWhispyAppear __vt__Q53scn4step5enemy5gordo17StateWhispyAppear: - .incbin "baserom.dol", 0x4737C8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802B9BFC ;# ptr + .4byte 0x802B9C78 ;# ptr + .4byte 0x802B9D84 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802B9D88 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear: - .incbin "baserom.dol", 0x4777B8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802DB6C0 ;# ptr + .4byte 0x802DB73C ;# ptr + .4byte 0x802DB8B4 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802DBA14 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A3D8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EEFB0 ;# ptr + .4byte 0x802EEF94 ;# ptr .global __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear: - .incbin "baserom.dol", 0x47A3E8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EED78 ;# ptr + .4byte 0x802EEDF4 ;# ptr + .4byte 0x802EEEA0 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EEF90 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255825 $$255825: - .incbin "baserom.dol", 0x495F50, 0x4 + .4byte 0x3DCCCCCD .global $$255826 $$255826: - .incbin "baserom.dol", 0x495F54, 0x4 + .4byte 0x3F800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256674 $$256674: - .incbin "baserom.dol", 0x49BF30, 0x4 + .4byte 0 .global $$256690 $$256690: - .incbin "baserom.dol", 0x49BF34, 0x4 + .4byte 0x43B40000 .global $$256699 $$256699: - .incbin "baserom.dol", 0x49BF38, 0x8 + .4byte 0x42B40000 + .4byte 0 .global $$256703 $$256703: - .incbin "baserom.dol", 0x49BF40, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: - .incbin "baserom.dol", 0x49C5B8, 0x4 + .4byte 0x3DCCCCCD .global $$256087 $$256087: - .incbin "baserom.dol", 0x49C5BC, 0x4 + .4byte 0x42700000 .global $$256088 $$256088: - .incbin "baserom.dol", 0x49C5C0, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$256091 $$256091: - .incbin "baserom.dol", 0x49C5C8, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256654 $$256654: - .incbin "baserom.dol", 0x49CCA0, 0x4 + .4byte 0 .global $$256674 $$256674: - .incbin "baserom.dol", 0x49CCA4, 0x4 + .4byte 0x43B40000 .global $$256685 $$256685: - .incbin "baserom.dol", 0x49CCA8, 0x8 + .4byte 0x42B40000 + .4byte 0 .global $$256689 $$256689: - .incbin "baserom.dol", 0x49CCB0, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256065 $$256065: - .incbin "baserom.dol", 0x49D030, 0x4 + .4byte 0x3F800000 .global $$256066 $$256066: - .incbin "baserom.dol", 0x49D034, 0x4 + .4byte 0x4222F983 .global $$256067 $$256067: - .incbin "baserom.dol", 0x49D038, 0x4 + .4byte 0x3C8EFA35 .global $$256068 $$256068: - .incbin "baserom.dol", 0x49D03C, 0x4 + .4byte 0x42B40000 .global $$256071 $$256071: - .incbin "baserom.dol", 0x49D040, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateWhispyFall.s b/asm/src/StateWhispyFall.s index a9088deb..7a609a04 100644 --- a/asm/src/StateWhispyFall.s +++ b/asm/src/StateWhispyFall.s @@ -193,15 +193,25 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A408, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EF240 ;# ptr + .4byte 0x802EF224 ;# ptr .global __vt__Q53scn4step5enemy9waddledee15StateWhispyFall __vt__Q53scn4step5enemy9waddledee15StateWhispyFall: - .incbin "baserom.dol", 0x47A418, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EF01C ;# ptr + .4byte 0x802EF094 ;# ptr + .4byte 0x802EF114 ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EF180 ;# ptr + .4byte 0x8028DDE8 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256580 $$256580: - .incbin "baserom.dol", 0x49D048, 0x4 + .4byte 0 .global $$256593 $$256593: - .incbin "baserom.dol", 0x49D04C, 0x4 + .4byte 0x43B40000 diff --git a/asm/src/StateWhispyLanding.s b/asm/src/StateWhispyLanding.s index c2f923c2..76ef27e6 100644 --- a/asm/src/StateWhispyLanding.s +++ b/asm/src/StateWhispyLanding.s @@ -51,4 +51,11 @@ procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding: - .incbin "baserom.dol", 0x47A438, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802EF2B4 ;# ptr + .4byte 0x802EF2B8 ;# ptr + .4byte 0x802EF2BC ;# ptr + .4byte 0x8028DDE0 ;# ptr + .4byte 0x802EF2C0 ;# ptr + .4byte 0x8028DDE8 ;# ptr diff --git a/asm/src/StateWin.s b/asm/src/StateWin.s index 7699a1e2..9ef74037 100644 --- a/asm/src/StateWin.s +++ b/asm/src/StateWin.s @@ -113,4 +113,11 @@ procFixPos__Q53scn4step4boss15challengemaster8StateWinFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster8StateWin __vt__Q53scn4step4boss15challengemaster8StateWin: - .incbin "baserom.dol", 0x462118, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802436F4 ;# ptr + .4byte 0x802436F8 ;# ptr + .4byte 0x80243768 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x8024376C ;# ptr + .4byte 0x80234504 ;# ptr diff --git a/asm/src/StateWinFly.s b/asm/src/StateWinFly.s index 7b04ade5..53f4e4be 100644 --- a/asm/src/StateWinFly.s +++ b/asm/src/StateWinFly.s @@ -286,21 +286,33 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x462138, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80243B6C ;# ptr + .4byte 0x80243B50 ;# ptr .global __vt__Q53scn4step4boss15challengemaster11StateWinFly __vt__Q53scn4step4boss15challengemaster11StateWinFly: - .incbin "baserom.dol", 0x462148, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802438D8 ;# ptr + .4byte 0x802438DC ;# ptr + .4byte 0x802439D8 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80243B4C ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 $$256210: - .incbin "baserom.dol", 0x49B0E8, 0x4 + .4byte 0 .global $$256263 $$256263: - .incbin "baserom.dol", 0x49B0EC, 0x4 + .4byte 0x3FC00000 .global $$256264 $$256264: - .incbin "baserom.dol", 0x49B0F0, 0x8 + .4byte 0xBF000000 + .4byte 0 .global $$256267 $$256267: - .incbin "baserom.dol", 0x49B0F8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/StateWorrisome.s b/asm/src/StateWorrisome.s index 70399887..bef84cc8 100644 --- a/asm/src/StateWorrisome.s +++ b/asm/src/StateWorrisome.s @@ -539,18 +539,31 @@ __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1 __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1: - .incbin "baserom.dol", 0x462168, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802442F4 ;# ptr + .4byte 0x802442B0 ;# ptr .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1: - .incbin "baserom.dol", 0x462178, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802442F0 ;# ptr + .4byte 0x802442D0 ;# ptr .global __vt__Q53scn4step4boss15challengemaster14StateWorrisome __vt__Q53scn4step4boss15challengemaster14StateWorrisome: - .incbin "baserom.dol", 0x462188, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80243D68 ;# ptr + .4byte 0x80243E38 ;# ptr + .4byte 0x80243FB4 ;# ptr + .4byte 0x802344FC ;# ptr + .4byte 0x80243FB8 ;# ptr + .4byte 0x80234504 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256482 $$256482: - .incbin "baserom.dol", 0x49B100, 0x4 + .4byte 0 .global $$256612 $$256612: - .incbin "baserom.dol", 0x49B104, 0x4 + .4byte 0x42652EE1 diff --git a/asm/src/StdResponder.s b/asm/src/StdResponder.s index 55752bb3..3f4a1a02 100644 --- a/asm/src/StdResponder.s +++ b/asm/src/StdResponder.s @@ -221,4 +221,9 @@ lbl_801BD1F0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q35mcoll6detail12StdResponder __vt__Q35mcoll6detail12StdResponder: - .incbin "baserom.dol", 0x455D98, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801B1574 ;# ptr + .4byte 0x801BCFB4 ;# ptr + .4byte 0x801BD080 ;# ptr + .4byte 0x801BD0AC ;# ptr diff --git a/asm/src/StepMain.s b/asm/src/StepMain.s index 16f8dcf6..5f82eb8e 100644 --- a/asm/src/StepMain.s +++ b/asm/src/StepMain.s @@ -758,18 +758,30 @@ lbl_803FCB08: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$257488 $$257488: - .incbin "baserom.dol", 0x492478, 0x14 + .asciz "staffcredits/Main" + .balign 4 .global $$257586 $$257586: - .incbin "baserom.dol", 0x49248C, 0x24 + .4byte 0x803FC56C + .4byte 0x803FC578 + .4byte 0x803FC584 + .4byte 0x803FC590 + .4byte 0x803FC59C + .4byte 0x803FC5A8 + .4byte 0x803FC5B4 + .4byte 0x803FC5C0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257489 $$257489: - .incbin "baserom.dol", 0x498A68, 0x4 + .4byte 0x456E6400 .global $$257600 $$257600: - .incbin "baserom.dol", 0x498A6C, 0x8 + .asciz "Start" + .balign 4 .global $$257601 $$257601: - .incbin "baserom.dol", 0x498A74, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 diff --git a/asm/src/Stepping.s b/asm/src/Stepping.s index f191e96c..cda09669 100644 --- a/asm/src/Stepping.s +++ b/asm/src/Stepping.s @@ -169,15 +169,19 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481628, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80355C7C + .4byte 0x80355C60 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255899 $$255899: - .incbin "baserom.dol", 0x49D9E0, 0x4 + .4byte 0x3F800000 .global $$255900 $$255900: - .incbin "baserom.dol", 0x49D9E4, 0x4 + .4byte 0x3E333333 .global $$255901 $$255901: - .incbin "baserom.dol", 0x49D9E8, 0x8 + .asciz ">fff" + .balign 4 diff --git a/asm/src/Stick.s b/asm/src/Stick.s index a1ca86ea..1b56bbf6 100644 --- a/asm/src/Stick.s +++ b/asm/src/Stick.s @@ -51,4 +51,5 @@ normalized__Q23hid5StickCFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249704 $$249704: - .incbin "baserom.dol", 0x49A470, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/StickObjAlgorithm.s b/asm/src/StickObjAlgorithm.s index b1becb59..659df2d5 100644 --- a/asm/src/StickObjAlgorithm.s +++ b/asm/src/StickObjAlgorithm.s @@ -100,4 +100,5 @@ procMove__Q43scn4step6weapon17StickObjAlgorithmFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253717 $$253717: - .incbin "baserom.dol", 0x49E868, 0x8 + .4byte 0xC0000000 + .4byte 0 diff --git a/asm/src/StickWallAlgorithm.s b/asm/src/StickWallAlgorithm.s index 6fbaa795..d08e465f 100644 --- a/asm/src/StickWallAlgorithm.s +++ b/asm/src/StickWallAlgorithm.s @@ -110,4 +110,5 @@ lbl_803D8DFC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253191 $$253191: - .incbin "baserom.dol", 0x49E870, 0x8 + .4byte 0xBDCCCCCD + .4byte 0 diff --git a/asm/src/Stone.s b/asm/src/Stone.s index d33db1b4..475b1b6c 100644 --- a/asm/src/Stone.s +++ b/asm/src/Stone.s @@ -44,7 +44,10 @@ __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14Stat .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: - .incbin "baserom.dol", 0x489C38, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80391B58 + .4byte 0x80391B38 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2BodyModel__Q53scn4step4hero9modeldesc5StoneFv$$2desc diff --git a/asm/src/Stop.s b/asm/src/Stop.s index e9878da6..55fea336 100644 --- a/asm/src/Stop.s +++ b/asm/src/Stop.s @@ -855,9 +855,23 @@ lbl_803CFCE4: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick4Stop __vt__Q43scn4step7gimmick4Stop: - .incbin "baserom.dol", 0x47B058, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F7388 + .4byte 0x802F7708 + .4byte 0x802F77C0 + .4byte 0x802F7838 + .4byte 0x802F7930 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step3sfx4Stop __vt__Q43scn4step3sfx4Stop: - .incbin "baserom.dol", 0x48EDC8, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803CF958 + .4byte 0x803CFB20 + .4byte 0x803CFB8C + .4byte 0x803CFC04 + .4byte 0x803CFCAC + .4byte 0 diff --git a/asm/src/StorageManager.s b/asm/src/StorageManager.s index d71376ea..69a7971d 100644 --- a/asm/src/StorageManager.s +++ b/asm/src/StorageManager.s @@ -488,4 +488,5 @@ selectedBackupFileData2__Q27storage14StorageManagerFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250677 $$250677: - .incbin "baserom.dol", 0x49EEA8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/StorageUtil.s b/asm/src/StorageUtil.s index 6e85afd6..dcf3f330 100644 --- a/asm/src/StorageUtil.s +++ b/asm/src/StorageUtil.s @@ -161,4 +161,5 @@ hasAllPlatinumMedal__Q27storage11StorageUtilCFi: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249178 $$249178: - .incbin "baserom.dol", 0x4927D0, 0x10 + .asciz "storage/Param" + .balign 4 diff --git a/asm/src/SubAnimControl.s b/asm/src/SubAnimControl.s index 6111faa1..c34f12b6 100644 --- a/asm/src/SubAnimControl.s +++ b/asm/src/SubAnimControl.s @@ -368,12 +368,69 @@ lbl_80356188: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256381 $$256381: - .incbin "baserom.dol", 0x481638, 0xE8 + .4byte 0x80356090 + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x803560C4 + .4byte 0x80356098 + .4byte 0x803560AC + .4byte 0x803560B4 + .4byte 0x803560BC + .4byte 0x803560CC + .4byte 0x803560D4 + .4byte 0x803560DC + .4byte 0x803560E4 + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x803560EC + .4byte 0x803560EC + .4byte 0x803560EC + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x803560A0 + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x8035610C + .4byte 0x80356108 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256378 $$256378: - .incbin "baserom.dol", 0x49D9F0, 0x4 + .4byte 0x3F800000 .global $$256379 $$256379: - .incbin "baserom.dol", 0x49D9F4, 0x4 + .4byte 0 diff --git a/asm/src/SuperBackPicture.s b/asm/src/SuperBackPicture.s index cdf4ae03..a9d8401a 100644 --- a/asm/src/SuperBackPicture.s +++ b/asm/src/SuperBackPicture.s @@ -795,32 +795,43 @@ onStopPowerfulFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253740 $$253740: - .incbin "baserom.dol", 0x48EDE8, 0x14 + .asciz "SuperBackPicture" + .balign 4 .global $$253741 $$253741: - .incbin "baserom.dol", 0x48EDFC, 0x24 + .asciz "step/weapon/common/EffectLocator" + .balign 4 .global __vt__Q43scn4step3sfx16SuperBackPicture __vt__Q43scn4step3sfx16SuperBackPicture: - .incbin "baserom.dol", 0x48EE20, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803CFF94 + .4byte 0x803D0798 + .4byte 0x803D079C + .4byte 0x803D07A0 + .4byte 0x803D07D8 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253742 $$253742: - .incbin "baserom.dol", 0x498408, 0x8 + .asciz "Model" + .balign 4 .global $$253852 $$253852: - .incbin "baserom.dol", 0x498410, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253791 $$253791: - .incbin "baserom.dol", 0x49E7E0, 0x4 + .4byte 0x3727C5AC .global $$253792 $$253792: - .incbin "baserom.dol", 0x49E7E4, 0x4 + .4byte 0x3F800000 .global $$253793 $$253793: - .incbin "baserom.dol", 0x49E7E8, 0x4 + .4byte 0xBF800000 .global $$253794 $$253794: - .incbin "baserom.dol", 0x49E7EC, 0x4 + .4byte 0x41300000 diff --git a/asm/src/SuperFade.s b/asm/src/SuperFade.s index fabd7049..0165943b 100644 --- a/asm/src/SuperFade.s +++ b/asm/src/SuperFade.s @@ -79,16 +79,17 @@ lbl_803D08C8: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251381 $$251381: - .incbin "baserom.dol", 0x49E7F0, 0x4 + .4byte 0 .global $$251392 $$251392: - .incbin "baserom.dol", 0x49E7F4, 0x4 + .4byte 0x3F800000 .global $$251393 $$251393: - .incbin "baserom.dol", 0x49E7F8, 0x4 + .4byte 0x3E800000 .global $$251394 $$251394: - .incbin "baserom.dol", 0x49E7FC, 0x4 + .4byte 0x3F400000 .global $$251395 $$251395: - .incbin "baserom.dol", 0x49E800, 0x8 + .4byte 0x43B40000 + .4byte 0 diff --git a/asm/src/SuperStop.s b/asm/src/SuperStop.s index daf8590d..7f602082 100644 --- a/asm/src/SuperStop.s +++ b/asm/src/SuperStop.s @@ -671,24 +671,49 @@ lbl_803D8FF0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss9SuperStop __vt__Q43scn4step4boss9SuperStop: - .incbin "baserom.dol", 0x460958, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x802346A8 ;# ptr + .4byte 0x80234728 ;# ptr + .4byte 0x80234770 ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9SuperStop __vt__Q43scn4step5enemy9SuperStop: - .incbin "baserom.dol", 0x46ED60, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x8028DFAC ;# ptr + .4byte 0x8028E080 ;# ptr + .4byte 0x8028E08C ;# ptr + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick9SuperStop __vt__Q43scn4step7gimmick9SuperStop: - .incbin "baserom.dol", 0x47B078, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x802F7A24 + .4byte 0x802F7B68 + .4byte 0x802F7B74 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item9SuperStop __vt__Q43scn4step4item9SuperStop: - .incbin "baserom.dol", 0x48E030, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803C530C + .4byte 0x803C538C + .4byte 0x803C53E8 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9SuperStop __vt__Q43scn4step6weapon9SuperStop: - .incbin "baserom.dol", 0x48FEE0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x803D8E80 + .4byte 0x803D8F60 + .4byte 0x803D8FBC + .4byte 0 diff --git a/asm/src/Switch.s b/asm/src/Switch.s index 0759bc93..00756ee7 100644 --- a/asm/src/Switch.s +++ b/asm/src/Switch.s @@ -947,32 +947,47 @@ lbl_803281E0: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255943 $$255943: - .incbin "baserom.dol", 0x47E5F0, 0x14 + .asciz "step/gimmick/Switch" .global __vt__Q53scn4step7gimmick8switch_n6Switch __vt__Q53scn4step7gimmick8switch_n6Switch: - .incbin "baserom.dol", 0x47E604, 0x24 + .4byte 0 + .4byte 0 + .4byte 0x80327854 + .4byte 0x80327B50 + .4byte 0x80327B5C + .4byte 0x80327B54 + .4byte 0x80327B58 + .4byte 0x80327B60 + .4byte 0x80327B64 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255903 $$255903: - .incbin "baserom.dol", 0x496D28, 0x8 + .asciz "%s%s" + .balign 4 .global $$255919 $$255919: - .incbin "baserom.dol", 0x496D30, 0x8 + .asciz "%s%s%s" + .balign 4 .global $$255944 $$255944: - .incbin "baserom.dol", 0x496D38, 0x8 + .asciz "TopL" + .balign 4 .global $$255945 $$255945: - .incbin "baserom.dol", 0x496D40, 0x8 + .asciz "Wait" + .balign 4 .global $$256040 $$256040: - .incbin "baserom.dol", 0x496D48, 0x8 + .asciz "Push" + .balign 4 .global $$256041 $$256041: - .incbin "baserom.dol", 0x496D50, 0x8 + .4byte 0x55700000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256104 $$256104: - .incbin "baserom.dol", 0x49D5E0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/SwitchOnce.s b/asm/src/SwitchOnce.s index ca2e9fa7..633157ab 100644 --- a/asm/src/SwitchOnce.s +++ b/asm/src/SwitchOnce.s @@ -66,9 +66,19 @@ onChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n10SwitchOnce __vt__Q53scn4step7gimmick8switch_n10SwitchOnce: - .incbin "baserom.dol", 0x47E628, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x803282A0 + .4byte 0x803282FC + .4byte 0x80328300 + .4byte 0x80328304 + .4byte 0x80328308 + .4byte 0x80327B60 + .4byte 0x80327B64 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252477 $$252477: - .incbin "baserom.dol", 0x496D58, 0x8 + .asciz "Once" + .balign 4 diff --git a/asm/src/SwitchReceiver.s b/asm/src/SwitchReceiver.s index 9dddd5ac..38032c24 100644 --- a/asm/src/SwitchReceiver.s +++ b/asm/src/SwitchReceiver.s @@ -113,4 +113,11 @@ onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick14SwitchReceiver __vt__Q43scn4step7gimmick14SwitchReceiver: - .incbin "baserom.dol", 0x47B090, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x802F7C78 + .4byte 0x802F7D00 + .4byte 0x802F7CFC + .4byte 0x802F7CF8 + .4byte 0x802F7CF4 + .4byte 0x802F7CF0 diff --git a/asm/src/SwitchReturn.s b/asm/src/SwitchReturn.s index 86fd7c4f..37d148dd 100644 --- a/asm/src/SwitchReturn.s +++ b/asm/src/SwitchReturn.s @@ -164,9 +164,19 @@ onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n12SwitchReturn __vt__Q53scn4step7gimmick8switch_n12SwitchReturn: - .incbin "baserom.dol", 0x47E650, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80328368 + .4byte 0x8032836C + .4byte 0x80328370 + .4byte 0x80328468 + .4byte 0x8032849C + .4byte 0x803284D0 + .4byte 0x803284D4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252608 $$252608: - .incbin "baserom.dol", 0x496D60, 0x8 + .asciz "Return" + .balign 4 diff --git a/asm/src/SwitchToggle.s b/asm/src/SwitchToggle.s index 82fbed37..ec31ff94 100644 --- a/asm/src/SwitchToggle.s +++ b/asm/src/SwitchToggle.s @@ -115,9 +115,19 @@ onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n12SwitchToggle __vt__Q53scn4step7gimmick8switch_n12SwitchToggle: - .incbin "baserom.dol", 0x47E678, 0x28 + .4byte 0 + .4byte 0 + .4byte 0x80328548 + .4byte 0x8032854C + .4byte 0x80328550 + .4byte 0x80328640 + .4byte 0x80328644 + .4byte 0x80327B60 + .4byte 0x80328648 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252602 $$252602: - .incbin "baserom.dol", 0x496D68, 0x8 + .asciz "Toggle" + .balign 4 diff --git a/asm/src/Sword.s b/asm/src/Sword.s index a89e2b1d..dc9414f2 100644 --- a/asm/src/Sword.s +++ b/asm/src/Sword.s @@ -525,114 +525,206 @@ lbl_8038A028: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21 $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21: - .incbin "baserom.dol", 0x41BAC0, 0xB0 + .4byte 0x8055B2B0 + .4byte 0 + .4byte 0x8048B4B0 + .4byte 0 + .4byte 0x8048B4C4 + .4byte 0 + .4byte 0x8048B4D0 + .4byte 0 + .4byte 0x8048B4E0 + .4byte 0 + .4byte 0x8055B2B8 + .4byte 0 + .4byte 0x8048B4EC + .4byte 0 + .4byte 0x8048B4F8 + .4byte 0 + .4byte 0x8048B50C + .4byte 0 + .4byte 0x8048B518 + .4byte 0 + .4byte 0x8048B52C + .4byte 0 + .4byte 0x8055B2C0 + .4byte 0 + .4byte 0x8048B53C + .4byte 0 + .4byte 0x8048B548 + .4byte 0 + .4byte 0x8048B55C + .4byte 0 + .4byte 0x8048B574 + .4byte 0 + .4byte 0x8048B584 + .4byte 0 + .4byte 0x8048B59C + .4byte 0 + .4byte 0x8048B5A8 + .4byte 0 + .4byte 0x8048B5B8 + .4byte 0 + .4byte 0x8048B5C4 + .4byte 0 + .4byte 0x8055B2C8 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249844 $$249844: - .incbin "baserom.dol", 0x487540, 0x20 + .asciz "step/hero/modeldesc/Sword" + .balign 4 + .4byte 0 .global $$249861 $$249861: - .incbin "baserom.dol", 0x487560, 0x20 + .asciz "step/chara/hero/kirby/sword/Hat" .global $$249877 $$249877: - .incbin "baserom.dol", 0x487580, 0xC + .asciz "HatTail1DJ" + .balign 4 .global $$249888 $$249888: - .incbin "baserom.dol", 0x48758C, 0x24 + .asciz "step/chara/hero/kirby/sword/Sword" + .balign 4 .global $$249587 $$249587: - .incbin "baserom.dol", 0x4875B0, 0x14 + .asciz "SwordAttackStart" + .balign 4 .global $$249588 $$249588: - .incbin "baserom.dol", 0x4875C4, 0xC + .asciz "SwordAttack" .global $$249589 $$249589: - .incbin "baserom.dol", 0x4875D0, 0x10 + .asciz "SwordAttackEnd" + .balign 4 .global $$249590 $$249590: - .incbin "baserom.dol", 0x4875E0, 0xC + .asciz "ThrustStart" .global $$249592 $$249592: - .incbin "baserom.dol", 0x4875EC, 0xC + .asciz "ThrustEnd" + .balign 4 .global $$249593 $$249593: - .incbin "baserom.dol", 0x4875F8, 0x14 + .asciz "UnderThrustStart" + .balign 4 .global $$249594 $$249594: - .incbin "baserom.dol", 0x48760C, 0xC + .asciz "UnderThrust" .global $$249595 $$249595: - .incbin "baserom.dol", 0x487618, 0x14 + .asciz "UnderThrustLanding" + .balign 4 .global $$249596 $$249596: - .incbin "baserom.dol", 0x48762C, 0x10 + .asciz "RaisingStart" + .balign 4 .global $$249598 $$249598: - .incbin "baserom.dol", 0x48763C, 0xC + .asciz "RaisingEnd" + .balign 4 .global $$249599 $$249599: - .incbin "baserom.dol", 0x487648, 0x14 + .asciz "TornadoAttackCharge" .global $$249600 $$249600: - .incbin "baserom.dol", 0x48765C, 0x18 + .asciz "TornadoAttackChargeMax" + .balign 4 .global $$249601 $$249601: - .incbin "baserom.dol", 0x487674, 0x10 + .asciz "TornadoAttack" + .balign 4 .global $$249602 $$249602: - .incbin "baserom.dol", 0x487684, 0x18 + .asciz "TornadoAttackCharge2" + .balign 4 .global $$249603 $$249603: - .incbin "baserom.dol", 0x48769C, 0xC + .asciz "FinelyCut" + .balign 4 .global $$249604 $$249604: - .incbin "baserom.dol", 0x4876A8, 0x10 + .asciz "ChoppingStart" + .balign 4 .global $$249605 $$249605: - .incbin "baserom.dol", 0x4876B8, 0xC + .asciz "Chopping" + .balign 4 .global $$249606 $$249606: - .incbin "baserom.dol", 0x4876C4, 0x14 + .asciz "FinelyCutEnd" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256365 $$256365: - .incbin "baserom.dol", 0x4893F0, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$256366 $$256366: - .incbin "baserom.dol", 0x489410, 0x24 + .asciz "step/chara/hero/kirby/sword/Motion" + .balign 4 .global __vt__Q53scn4step4hero5sword5Sword __vt__Q53scn4step4hero5sword5Sword: - .incbin "baserom.dol", 0x489434, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x80389D00 + .4byte 0x80389D8C + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x80389EB8 + .4byte 0x80389FD4 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8032B7DC + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249578 $$249578: - .incbin "baserom.dol", 0x497678, 0x8 + .asciz "AllL" + .balign 4 .global $$249579 $$249579: - .incbin "baserom.dol", 0x497680, 0x8 + .asciz "EdgeL" + .balign 4 .global $$2LOCAL$$2SwordModel__Q53scn4step4hero9modeldesc5SwordFv$$2names$$21 $$2LOCAL$$2SwordModel__Q53scn4step4hero9modeldesc5SwordFv$$2names$$21: - .incbin "baserom.dol", 0x497688, 0x8 + .4byte 0x8055B298 + .4byte 0x8055B2A0 .global $$249586 $$249586: - .incbin "baserom.dol", 0x497690, 0x8 + .asciz "Carry" + .balign 4 .global $$249591 $$249591: - .incbin "baserom.dol", 0x497698, 0x8 + .asciz "Thrust" + .balign 4 .global $$249597 $$249597: - .incbin "baserom.dol", 0x4976A0, 0x8 + .asciz "Raising" .global $$249607 $$249607: - .incbin "baserom.dol", 0x4976A8, 0x8 + .asciz "Meteo" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249876 $$249876: - .incbin "baserom.dol", 0x49DB00, 0x8 + .4byte 0 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SwordFv$$2desc diff --git a/asm/src/SystemTagProcessor.s b/asm/src/SystemTagProcessor.s index 2ac7ad9f..c6040519 100644 --- a/asm/src/SystemTagProcessor.s +++ b/asm/src/SystemTagProcessor.s @@ -1647,111 +1647,143 @@ applyScale__Q23lyt18SystemTagProcessorCFPQ34nw4r2ut15PrintContext$$0w$$1Us: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23lyt18SystemTagProcessor __vt__Q23lyt18SystemTagProcessor: - .incbin "baserom.dol", 0x453B00, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801AC810 ;# ptr + .4byte 0x801AE550 ;# ptr + .4byte 0x801AFA44 ;# ptr .global $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20 $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20: - .incbin "baserom.dol", 0x453B14, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff: - .incbin "baserom.dol", 0x453B48, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1FUl$$20 $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1FUl$$20: - .incbin "baserom.dol", 0x453B5C, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1FUl $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1FUl: - .incbin "baserom.dol", 0x453B90, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2GetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20 $$2STRING$$2GetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20: - .incbin "baserom.dol", 0x453BA4, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1CFv $$2STRING$$2GetDrawFlag__Q34nw4r2ut17TextWriterBase$$0w$$1CFv: - .incbin "baserom.dol", 0x453BD8, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2GetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20 $$2STRING$$2GetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20: - .incbin "baserom.dol", 0x453BEC, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1CFv $$2STRING$$2GetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1CFv: - .incbin "baserom.dol", 0x453C20, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2GetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20 $$2STRING$$2GetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1CFv$$20: - .incbin "baserom.dol", 0x453C34, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1CFv $$2STRING$$2GetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1CFv: - .incbin "baserom.dol", 0x453C68, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2GetFont__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetFont__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453C7C, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetFont__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetFont__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453CB0, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetTextColor__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetTextColor__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453CC0, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetTextColor__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetTextColor__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453CF4, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2SetScale__Q34nw4r2ut10CharWriterFff$$20 $$2STRING$$2SetScale__Q34nw4r2ut10CharWriterFff$$20: - .incbin "baserom.dol", 0x453D04, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetScale__Q34nw4r2ut10CharWriterFff $$2STRING$$2SetScale__Q34nw4r2ut10CharWriterFff: - .incbin "baserom.dol", 0x453D38, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetScaleH__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetScaleH__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453D48, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetScaleH__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetScaleH__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453D7C, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetScaleV__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetScaleV__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453D8C, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetScaleV__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetScaleV__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453DC0, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2MoveCursorX__Q34nw4r2ut10CharWriterFf$$20 $$2STRING$$2MoveCursorX__Q34nw4r2ut10CharWriterFf$$20: - .incbin "baserom.dol", 0x453DD0, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2MoveCursorX__Q34nw4r2ut10CharWriterFf $$2STRING$$2MoveCursorX__Q34nw4r2ut10CharWriterFf: - .incbin "baserom.dol", 0x453E04, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetCursorX__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetCursorX__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453E14, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetCursorX__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetCursorX__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453E48, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x453E58, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x453E8C, 0x14 + .asciz "CharWriter.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250358 $$250358: - .incbin "baserom.dol", 0x49A4D8, 0x4 + .4byte 0x3F19999A .global $$250359 $$250359: - .incbin "baserom.dol", 0x49A4DC, 0x4 + .4byte 0xC0400000 .global $$250360 $$250360: - .incbin "baserom.dol", 0x49A4E0, 0x4 + .4byte 0 .global $$250361 $$250361: - .incbin "baserom.dol", 0x49A4E4, 0x4 + .4byte 0x3F000000 .global $$250362 $$250362: - .incbin "baserom.dol", 0x49A4E8, 0x4 + .4byte 0xC1300000 .global $$250363 $$250363: - .incbin "baserom.dol", 0x49A4EC, 0x4 + .4byte 0xC0E00000 .global $$250513 $$250513: - .incbin "baserom.dol", 0x49A4F0, 0x4 + .4byte 0x7F7FFFFF .global $$250652 $$250652: - .incbin "baserom.dol", 0x49A4F4, 0x4 + .4byte 0x42C80000 .global $$250656 $$250656: - .incbin "baserom.dol", 0x49A4F8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/TPLTexture.s b/asm/src/TPLTexture.s index b940f7cc..13e85dd5 100644 --- a/asm/src/TPLTexture.s +++ b/asm/src/TPLTexture.s @@ -77,7 +77,11 @@ lbl_80196FFC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23gfx10TPLTexture __vt__Q23gfx10TPLTexture: - .incbin "baserom.dol", 0x450A90, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80195854 ;# ptr .global __vt__Q23gfx10TextureObj __vt__Q23gfx10TextureObj: - .incbin "baserom.dol", 0x450A9C, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801958C0 ;# ptr diff --git a/asm/src/TPLTexturePlate.s b/asm/src/TPLTexturePlate.s index bee7e1cb..064cda97 100644 --- a/asm/src/TPLTexturePlate.s +++ b/asm/src/TPLTexturePlate.s @@ -323,16 +323,19 @@ setPos__Q23gfx15TPLTexturePlateFRCQ33hel4math7Vector2: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250129 $$250129: - .incbin "baserom.dol", 0x49A278, 0x4 + .4byte 0 .global $$250161 $$250161: - .incbin "baserom.dol", 0x49A27C, 0x4 + .4byte 0x3F800000 .global $$250183 $$250183: - .incbin "baserom.dol", 0x49A280, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$250188 $$250188: - .incbin "baserom.dol", 0x49A288, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$250192 $$250192: - .incbin "baserom.dol", 0x49A290, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/src/TSCtrl.s b/asm/src/TSCtrl.s index 041c982d..0341d93b 100644 --- a/asm/src/TSCtrl.s +++ b/asm/src/TSCtrl.s @@ -112,9 +112,15 @@ setBaseScale__Q53scn4step4boss6whispy6TSCtrlFRCQ33hel4math7Vector3: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TRUNKNODE_TABLE__Q53scn4step4boss6whispy20$$2unnamed$$2TSCtrl_cpp$$2 T_TRUNKNODE_TABLE__Q53scn4step4boss6whispy20$$2unnamed$$2TSCtrl_cpp$$2: - .incbin "baserom.dol", 0x4137C8, 0x18 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254977 $$254977: - .incbin "baserom.dol", 0x49B570, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Table.s b/asm/src/Table.s index 95ec0968..7e441cf3 100644 --- a/asm/src/Table.s +++ b/asm/src/Table.s @@ -3675,2398 +3675,3217 @@ PtclResPath__Q43scn9grandmenu6effect5TableFQ43scn9grandmenu6effect11PtclResSlot: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x4119C8, 0x18 + .4byte 0x8045EF38 + .4byte 0x8045EF48 + .4byte 0x80557DD8 + .4byte 0x8045EF68 + .4byte 0x80557DE0 + .4byte 0x8045EF7C .global T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x4119E0, 0x10 + .4byte 0x80557DF0 + .4byte 0x8045F028 + .4byte 0x80557DF0 + .4byte 0x8045F038 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x412270, 0x18 + .4byte 0x80558D28 + .4byte 0x804635A0 + .4byte 0x80558D30 + .4byte 0x804635B8 + .4byte 0x804635CC + .4byte 0x804635D8 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x413C00, 0x1D8 + .4byte 0x8046F564 + .4byte 0x8046F570 + .4byte 0x8046F584 + .4byte 0x8046F590 + .4byte 0x805594C8 + .4byte 0x8046F5A8 + .4byte 0x805594D0 + .4byte 0x8046F5B8 + .4byte 0x805594D8 + .4byte 0x8046F5C8 + .4byte 0x805594E0 + .4byte 0x8046F5DC + .4byte 0x8046F5F0 + .4byte 0x8046F600 + .4byte 0x805594E8 + .4byte 0x8046F61C + .4byte 0x8046F630 + .4byte 0x8046F63C + .4byte 0x805594F0 + .4byte 0x8046F654 + .4byte 0x805594F8 + .4byte 0x8046F668 + .4byte 0x80559500 + .4byte 0x8046F67C + .4byte 0x80559508 + .4byte 0x8046F690 + .4byte 0x80559510 + .4byte 0x8046F6A4 + .4byte 0x8046F6B4 + .4byte 0x8046F6C0 + .4byte 0x80559518 + .4byte 0x8046F6D8 + .4byte 0x80559520 + .4byte 0x8046F6F0 + .4byte 0x80559528 + .4byte 0x8046F700 + .4byte 0x80559530 + .4byte 0x8046F714 + .4byte 0x8046F728 + .4byte 0x8046F734 + .4byte 0x80559538 + .4byte 0x8046F74C + .4byte 0x8046F760 + .4byte 0x8046F774 + .4byte 0x8046F790 + .4byte 0x8046F79C + .4byte 0x8046F7B4 + .4byte 0x8046F7C0 + .4byte 0x8046F7D4 + .4byte 0x8046F7E0 + .4byte 0x8046F7F8 + .4byte 0x8046F804 + .4byte 0x80559540 + .4byte 0x8046F81C + .4byte 0x80559548 + .4byte 0x8046F830 + .4byte 0x8055954C + .4byte 0x8046F840 + .4byte 0x80559554 + .4byte 0x8046F850 + .4byte 0x8055955C + .4byte 0x8046F860 + .4byte 0x80559564 + .4byte 0x8046F870 + .4byte 0x8046F884 + .4byte 0x8046F890 + .4byte 0x8055956C + .4byte 0x8046F8A8 + .4byte 0x80559578 + .4byte 0x8046F8B8 + .4byte 0x8046F8CC + .4byte 0x8046F8D8 + .4byte 0x80559580 + .4byte 0x8046F8F0 + .4byte 0x80559588 + .4byte 0x8046F904 + .4byte 0x80559590 + .4byte 0x8046F918 + .4byte 0x80559598 + .4byte 0x8046F92C + .4byte 0x8046F940 + .4byte 0x8046F94C + .4byte 0x805595A0 + .4byte 0x8046F968 + .4byte 0x805595A8 + .4byte 0x8046F978 + .4byte 0x805595B0 + .4byte 0x8046F98C + .4byte 0x805595B8 + .4byte 0x8046F9A0 + .4byte 0x805595C0 + .4byte 0x8046F9B4 + .4byte 0x805595C8 + .4byte 0x8046F9C8 + .4byte 0x805595D0 + .4byte 0x8046F9DC + .4byte 0x805595D4 + .4byte 0x8046F9EC + .4byte 0x805595E0 + .4byte 0x8046FA00 + .4byte 0x805595E8 + .4byte 0x8046FA14 + .4byte 0x805595F0 + .4byte 0x8046FA28 + .4byte 0x805595F8 + .4byte 0x8046FA40 + .4byte 0x80559600 + .4byte 0x8046FA50 + .4byte 0x80559608 + .4byte 0x8046FA68 + .4byte 0x80559610 + .4byte 0x8046FA78 + .4byte 0x8046FA8C + .4byte 0x8046FA98 + .4byte 0x8046FAB0 + .4byte 0x8046FABC + .4byte 0x80559618 + .4byte 0x8046FAD0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: - .incbin "baserom.dol", 0x45AA68, 0xC + .asciz "FileDelete" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x45AA74, 0x18 + .asciz "step/obj/PtFileDelete" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x45AA8C, 0xC + .asciz "FileDelete" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: - .incbin "baserom.dol", 0x45B038, 0x10 + .asciz "ChallengeTitle" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x45B048, 0x20 + .asciz "challengetitle/PtChallengeTitle" .global $$248741 $$248741: - .incbin "baserom.dol", 0x45B068, 0x14 + .asciz "step/obj/PtCommon" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x45B07C, 0x14 + .asciz "step/obj/PtSpark" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x45B090, 0x1C + .asciz "ChallengeTitleGameTitleStar" .global $$248854 $$248854: - .incbin "baserom.dol", 0x45B0AC, 0x1C + .asciz "ChallengeTitleKirbyParticle" .global $$248855 $$248855: - .incbin "baserom.dol", 0x45B0C8, 0x14 + .asciz "CommonAbilityGet" + .balign 4 .global $$248856 $$248856: - .incbin "baserom.dol", 0x45B0DC, 0x14 + .asciz "SparkHatSpark" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248739 $$248739: - .incbin "baserom.dol", 0x45B128, 0x10 + .asciz "step/obj/PtInfo" .global $$248740 $$248740: - .incbin "baserom.dol", 0x45B138, 0x1C + .asciz "step/obj/PtChallengeInfo" + .balign 4 .global $$248848 $$248848: - .incbin "baserom.dol", 0x45B154, 0x10 + .asciz "InfoConfetti" + .balign 4 .global $$248849 $$248849: - .incbin "baserom.dol", 0x45B164, 0x1C + .asciz "ChallengeInfoResultMGold" + .balign 4 .global $$248850 $$248850: - .incbin "baserom.dol", 0x45B180, 0x1C + .asciz "ChallengeInfoResultMSilver" + .balign 4 .global $$248851 $$248851: - .incbin "baserom.dol", 0x45B19C, 0x20 + .asciz "ChallengeInfoResultMPlatinum" + .balign 4 .global $$248852 $$248852: - .incbin "baserom.dol", 0x45B1BC, 0x24 + .asciz "ChallengeInfoResultMPlatinumWait" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: - .incbin "baserom.dol", 0x45CC38, 0x10 + .asciz "GrandTitle" + .balign 4 + .4byte 0 .global $$248739 $$248739: - .incbin "baserom.dol", 0x45CC48, 0x18 + .asciz "grandtitle/PtGrandTitle" .global $$248741 $$248741: - .incbin "baserom.dol", 0x45CC60, 0x18 + .asciz "grandtitle/Vacuum" + .balign 4 + .4byte 0 .global $$248742 $$248742: - .incbin "baserom.dol", 0x45CC78, 0x18 + .asciz "grandtitle/VacuumHustle" .global $$248876 $$248876: - .incbin "baserom.dol", 0x45CC90, 0x18 + .asciz "GrandTitleAbilityGet" + .balign 4 .global $$248877 $$248877: - .incbin "baserom.dol", 0x45CCA8, 0x18 + .asciz "GrandTitleBlockEffect" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x45CCC0, 0x18 + .asciz "GrandTitleCompleteStar" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x45CCD8, 0x18 + .asciz "GrandTitleDededeHammer" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x45CCF0, 0x18 + .asciz "GrandTitleDotVacuumPtcl" .global $$248881 $$248881: - .incbin "baserom.dol", 0x45CD08, 0x10 + .asciz "GrandTitleEat" + .balign 4 .global $$248882 $$248882: - .incbin "baserom.dol", 0x45CD18, 0x10 + .asciz "GrandTitleRing" + .balign 4 .global $$248883 $$248883: - .incbin "baserom.dol", 0x45CD28, 0x14 + .asciz "GrandTitleRingFit" + .balign 4 .global $$248884 $$248884: - .incbin "baserom.dol", 0x45CD3C, 0x14 + .asciz "GrandTitleStarDot" + .balign 4 .global $$248885 $$248885: - .incbin "baserom.dol", 0x45CD50, 0x14 + .asciz "GrandTitleTitleStar" .global $$248886 $$248886: - .incbin "baserom.dol", 0x45CD64, 0x18 + .asciz "GrandTitleVacuumPtcl" + .balign 4 .global $$248887 $$248887: - .incbin "baserom.dol", 0x45CD7C, 0x1C + .asciz "GrandTitleVacuumHustlePtcl" + .balign 4 .global $$248888 $$248888: - .incbin "baserom.dol", 0x45CD98, 0x10 + .asciz "GrandTitleVomit" .global $$248889 $$248889: - .incbin "baserom.dol", 0x45CDA8, 0x18 + .asciz "GrandTitleWarpStar" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248739 $$248739: - .incbin "baserom.dol", 0x45F6A0, 0x18 + .asciz "step/history/PtHistory" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x45F6B8, 0x14 + .asciz "step/obj/PtNormal" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x45F6CC, 0xC + .asciz "Attribute" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x45F6D8, 0x18 + .asciz "step/obj/PtAttribute" + .balign 4 .global $$248745 $$248745: - .incbin "baserom.dol", 0x45F6F0, 0x1C + .asciz "step/effect/normal/Vacuum" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x45F70C, 0x20 + .asciz "step/effect/normal/VacuumWarp" + .balign 4 .global $$248868 $$248868: - .incbin "baserom.dol", 0x45F72C, 0x14 + .asciz "HistorySpotlight" + .balign 4 .global $$248869 $$248869: - .incbin "baserom.dol", 0x45F740, 0x14 + .asciz "HistorySpotlightTwo" .global $$248870 $$248870: - .incbin "baserom.dol", 0x45F754, 0x10 + .asciz "HistoryDecide" + .balign 4 .global $$248871 $$248871: - .incbin "baserom.dol", 0x45F764, 0xC + .asciz "HistorySky" + .balign 4 .global $$248872 $$248872: - .incbin "baserom.dol", 0x45F770, 0x10 + .asciz "HistoryFuture" + .balign 4 .global $$248873 $$248873: - .incbin "baserom.dol", 0x45F780, 0x18 + .asciz "NormalVacuumPtcl" + .balign 4 + .4byte 0 .global $$248874 $$248874: - .incbin "baserom.dol", 0x45F798, 0x18 + .asciz "AttributeNormalRunStart" .global $$248875 $$248875: - .incbin "baserom.dol", 0x45F7B0, 0x18 + .asciz "AttributeNormalRun" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250167 $$250167: - .incbin "baserom.dol", 0x468990, 0x10 + .asciz "ArmorDeeBreak" + .balign 4 .global $$250168 $$250168: - .incbin "baserom.dol", 0x4689A0, 0x18 + .asciz "AttributeCloudLanding" + .balign 4 .global $$250169 $$250169: - .incbin "baserom.dol", 0x4689B8, 0x14 + .asciz "AttributeCloudRun" + .balign 4 .global $$250170 $$250170: - .incbin "baserom.dol", 0x4689CC, 0x18 + .asciz "AttributeCloudRunStart" + .balign 4 .global $$250171 $$250171: - .incbin "baserom.dol", 0x4689E4, 0x18 + .asciz "AttributeFinalLanding" + .balign 4 .global $$250172 $$250172: - .incbin "baserom.dol", 0x4689FC, 0x14 + .asciz "AttributeFinalRun" + .balign 4 .global $$250173 $$250173: - .incbin "baserom.dol", 0x468A10, 0x18 + .asciz "AttributeFinalRunStart" + .balign 4 .global $$250174 $$250174: - .incbin "baserom.dol", 0x468A28, 0x18 + .asciz "AttributeGrassLanding" + .balign 4 .global $$250175 $$250175: - .incbin "baserom.dol", 0x468A40, 0x14 + .asciz "AttributeGrassRun" + .balign 4 .global $$250176 $$250176: - .incbin "baserom.dol", 0x468A54, 0x18 + .asciz "AttributeGrassRunStart" + .balign 4 .global $$250177 $$250177: - .incbin "baserom.dol", 0x468A6C, 0x14 + .asciz "AttributeIceLanding" .global $$250178 $$250178: - .incbin "baserom.dol", 0x468A80, 0x10 + .asciz "AttributeIceRun" .global $$250179 $$250179: - .incbin "baserom.dol", 0x468A90, 0x18 + .asciz "AttributeIceRunStart" + .balign 4 .global $$250180 $$250180: - .incbin "baserom.dol", 0x468AA8, 0x18 + .asciz "AttributeIronLanding" + .balign 4 .global $$250181 $$250181: - .incbin "baserom.dol", 0x468AC0, 0x14 + .asciz "AttributeIronRun" + .balign 4 .global $$250182 $$250182: - .incbin "baserom.dol", 0x468AD4, 0x18 + .asciz "AttributeIronRunStart" + .balign 4 .global $$250183 $$250183: - .incbin "baserom.dol", 0x468AEC, 0x18 + .asciz "AttributeLavaLanding" + .balign 4 .global $$250184 $$250184: - .incbin "baserom.dol", 0x468B04, 0x14 + .asciz "AttributeLavaRun" + .balign 4 .global $$250185 $$250185: - .incbin "baserom.dol", 0x468B18, 0x18 + .asciz "AttributeLavaRunStart" + .balign 4 .global $$250186 $$250186: - .incbin "baserom.dol", 0x468B30, 0x18 + .asciz "AttributeNormalLanding" + .balign 4 .global $$250187 $$250187: - .incbin "baserom.dol", 0x468B48, 0x18 + .asciz "AttributeNormalRun" + .balign 4 + .4byte 0 .global $$250188 $$250188: - .incbin "baserom.dol", 0x468B60, 0x18 + .asciz "AttributeNormalRunStart" .global $$250189 $$250189: - .incbin "baserom.dol", 0x468B78, 0x18 + .asciz "AttributeSandLanding" + .balign 4 .global $$250190 $$250190: - .incbin "baserom.dol", 0x468B90, 0x14 + .asciz "AttributeSandRun" + .balign 4 .global $$250191 $$250191: - .incbin "baserom.dol", 0x468BA4, 0x18 + .asciz "AttributeSandRunStart" + .balign 4 .global $$250192 $$250192: - .incbin "baserom.dol", 0x468BBC, 0x18 + .asciz "AttributeSnowLanding" + .balign 4 .global $$250193 $$250193: - .incbin "baserom.dol", 0x468BD4, 0x14 + .asciz "AttributeSnowRun" + .balign 4 .global $$250194 $$250194: - .incbin "baserom.dol", 0x468BE8, 0x18 + .asciz "AttributeSnowRunStart" + .balign 4 .global $$250195 $$250195: - .incbin "baserom.dol", 0x468C00, 0x18 + .asciz "AttributeStoneLanding" + .balign 4 .global $$250196 $$250196: - .incbin "baserom.dol", 0x468C18, 0x14 + .asciz "AttributeStoneRun" + .balign 4 .global $$250197 $$250197: - .incbin "baserom.dol", 0x468C2C, 0x18 + .asciz "AttributeStoneRunStart" + .balign 4 .global $$250198 $$250198: - .incbin "baserom.dol", 0x468C44, 0x18 + .asciz "AttributeWoodLanding" + .balign 4 .global $$250199 $$250199: - .incbin "baserom.dol", 0x468C5C, 0x14 + .asciz "AttributeWoodRun" + .balign 4 .global $$250200 $$250200: - .incbin "baserom.dol", 0x468C70, 0x18 + .asciz "AttributeWoodRunStart" + .balign 4 .global $$250201 $$250201: - .incbin "baserom.dol", 0x468C88, 0x14 + .asciz "BeamBeholdooAttack" + .balign 4 .global $$250202 $$250202: - .incbin "baserom.dol", 0x468C9C, 0x18 + .asciz "BeamBeholdooCanonShot" + .balign 4 .global $$250203 $$250203: - .incbin "baserom.dol", 0x468CB4, 0x18 + .asciz "BeamBeholdooChargeMax" + .balign 4 .global $$250204 $$250204: - .incbin "baserom.dol", 0x468CCC, 0x1C + .asciz "BeamBeholdooEyeFlash" + .balign 4 + .4byte 0 .global $$250205 $$250205: - .incbin "baserom.dol", 0x468CE8, 0x10 + .asciz "BeamGemraAttack" .global $$250206 $$250206: - .incbin "baserom.dol", 0x468CF8, 0x10 + .asciz "BeamGemraFlash" + .balign 4 .global $$250207 $$250207: - .incbin "baserom.dol", 0x468D08, 0x18 + .asciz "BeamWaveCanonShotBreak" + .balign 4 .global $$250208 $$250208: - .incbin "baserom.dol", 0x468D20, 0x10 + .asciz "BombFoleyFuse" + .balign 4 .global $$250209 $$250209: - .incbin "baserom.dol", 0x468D30, 0xC + .asciz "BombFuse" + .balign 4 .global $$250210 $$250210: - .incbin "baserom.dol", 0x468D3C, 0x10 + .asciz "BowbyArrowWind" + .balign 4 .global $$250211 $$250211: - .incbin "baserom.dol", 0x468D4C, 0xC + .asciz "BroomSmoke" + .balign 4 .global $$250212 $$250212: - .incbin "baserom.dol", 0x468D58, 0x1C + .asciz "ChallengeInfoResultMGold" + .balign 4 .global $$250213 $$250213: - .incbin "baserom.dol", 0x468D74, 0x1C + .asciz "ChallengeInfoResultMSilver" + .balign 4 .global $$250214 $$250214: - .incbin "baserom.dol", 0x468D90, 0x20 + .asciz "ChallengeInfoResultMPlatinum" + .balign 4 .global $$250215 $$250215: - .incbin "baserom.dol", 0x468DB0, 0x24 + .asciz "ChallengeInfoResultMPlatinumWait" + .balign 4 .global $$250216 $$250216: - .incbin "baserom.dol", 0x468DD4, 0x14 + .asciz "ColdtzoicesmorkA" + .balign 4 .global $$250217 $$250217: - .incbin "baserom.dol", 0x468DE8, 0x14 + .asciz "ColdtzoicesmorkB" + .balign 4 .global $$250218 $$250218: - .incbin "baserom.dol", 0x468DFC, 0x14 + .asciz "ColdtzoBombExplode" + .balign 4 .global $$250219 $$250219: - .incbin "baserom.dol", 0x468E10, 0x14 + .asciz "ColdtzoBombsmork" + .balign 4 .global $$250220 $$250220: - .incbin "baserom.dol", 0x468E24, 0x14 + .asciz "CommonAbilityGet" + .balign 4 .global $$250221 $$250221: - .incbin "baserom.dol", 0x468E38, 0x14 + .asciz "CommonAirBallBroken" .global $$250222 $$250222: - .incbin "baserom.dol", 0x468E4C, 0x10 + .asciz "CommonAirFlowL" + .balign 4 .global $$250223 $$250223: - .incbin "baserom.dol", 0x468E5C, 0x10 + .asciz "CommonAirFlowM" + .balign 4 .global $$250224 $$250224: - .incbin "baserom.dol", 0x468E6C, 0x10 + .asciz "CommonAirFlowS" + .balign 4 .global $$250225 $$250225: - .incbin "baserom.dol", 0x468E7C, 0x18 + .asciz "CommonAttackGroundHit" + .balign 4 .global $$250226 $$250226: - .incbin "baserom.dol", 0x468E94, 0x1C + .asciz "CommonBigEnemyBeforeDeath1" + .balign 4 .global $$250227 $$250227: - .incbin "baserom.dol", 0x468EB0, 0x20 + .asciz "CommonBigEnemyBeforeDeath2" + .balign 4 + .4byte 0 .global $$250228 $$250228: - .incbin "baserom.dol", 0x468ED0, 0x10 + .asciz "CommonBossDeath" .global $$250229 $$250229: - .incbin "baserom.dol", 0x468EE0, 0x14 + .asciz "CommonChargeFinish" + .balign 4 .global $$250230 $$250230: - .incbin "baserom.dol", 0x468EF4, 0x10 + .asciz "CommonCharge" + .balign 4 .global $$250231 $$250231: - .incbin "baserom.dol", 0x468F04, 0x20 + .asciz "CommonCombinationAirBallBroken" + .balign 4 .global $$250232 $$250232: - .incbin "baserom.dol", 0x468F24, 0x24 + .asciz "CommonCombinationAirBallTail" + .balign 4 + .4byte 0 .global $$250233 $$250233: - .incbin "baserom.dol", 0x468F48, 0x18 + .asciz "CommonCombinationAttack" .global $$250234 $$250234: - .incbin "baserom.dol", 0x468F60, 0x10 + .asciz "CommonDeadStar" + .balign 4 .global $$250235 $$250235: - .incbin "baserom.dol", 0x468F70, 0x18 + .asciz "CommonDeadLittleStar" + .balign 4 .global $$250236 $$250236: - .incbin "baserom.dol", 0x468F88, 0x18 + .asciz "CommonDiveWaterSplashS" + .balign 4 .global $$250237 $$250237: - .incbin "baserom.dol", 0x468FA0, 0x18 + .asciz "CommonDiveWaterSplashM" + .balign 4 .global $$250238 $$250238: - .incbin "baserom.dol", 0x468FB8, 0x14 + .asciz "CommonEneCameraHit" + .balign 4 .global $$250239 $$250239: - .incbin "baserom.dol", 0x468FCC, 0x14 + .asciz "CommonEneCollHit" + .balign 4 .global $$250240 $$250240: - .incbin "baserom.dol", 0x468FE0, 0x14 + .asciz "CommonEnemyDeath" + .balign 4 .global $$250241 $$250241: - .incbin "baserom.dol", 0x468FF4, 0x18 + .asciz "CommonKirbySwimBubble" + .balign 4 .global $$250242 $$250242: - .incbin "baserom.dol", 0x46900C, 0x10 + .asciz "CommonLanding" + .balign 4 .global $$250243 $$250243: - .incbin "baserom.dol", 0x46901C, 0x14 + .asciz "CommonLandingStar" + .balign 4 .global $$250244 $$250244: - .incbin "baserom.dol", 0x469030, 0x18 + .asciz "CommonMatchlessShine" + .balign 4 .global $$250245 $$250245: - .incbin "baserom.dol", 0x469048, 0x18 + .asciz "CommonOneUpGetBackLight" .global $$250246 $$250246: - .incbin "baserom.dol", 0x469060, 0x18 + .asciz "CommonOutWaterSplashS" + .balign 4 .global $$250247 $$250247: - .incbin "baserom.dol", 0x469078, 0x20 + .asciz "CommonPBVillagerCallShineBall" + .balign 4 .global $$250248 $$250248: - .incbin "baserom.dol", 0x469098, 0x10 + .asciz "CommonRecovery" + .balign 4 .global $$250249 $$250249: - .incbin "baserom.dol", 0x4690A8, 0x14 + .asciz "CommonRecoveryMax" + .balign 4 .global $$250250 $$250250: - .incbin "baserom.dol", 0x4690BC, 0x10 + .asciz "CommonRevive" + .balign 4 .global $$250251 $$250251: - .incbin "baserom.dol", 0x4690CC, 0x14 + .asciz "CommonRunStart" + .balign 4 + .4byte 0 .global $$250252 $$250252: - .incbin "baserom.dol", 0x4690E0, 0x10 + .asciz "CommonSpaceJump" .global $$250253 $$250253: - .incbin "baserom.dol", 0x4690F0, 0x20 + .asciz "CommonSuikomiBlockBroken" + .balign 4 + .4byte 0 .global $$250254 $$250254: - .incbin "baserom.dol", 0x469110, 0x18 + .asciz "CommonSuperHatDisappear" .global $$250255 $$250255: - .incbin "baserom.dol", 0x469128, 0xC + .asciz "CommonSweat" .global $$250256 $$250256: - .incbin "baserom.dol", 0x469134, 0x14 + .asciz "CommonSwimWaterWarp" .global $$250257 $$250257: - .incbin "baserom.dol", 0x469148, 0x14 + .asciz "CommonWallHitStar" + .balign 4 .global $$250258 $$250258: - .incbin "baserom.dol", 0x46915C, 0x18 + .asciz "CommonWaterFloatKick" + .balign 4 .global $$250259 $$250259: - .incbin "baserom.dol", 0x469174, 0x14 + .asciz "CommonWaterFlowL" + .balign 4 .global $$250260 $$250260: - .incbin "baserom.dol", 0x469188, 0x14 + .asciz "CommonWaterFlowM" + .balign 4 .global $$250261 $$250261: - .incbin "baserom.dol", 0x46919C, 0x14 + .asciz "CommonWaterFlowS" + .balign 4 .global $$250262 $$250262: - .incbin "baserom.dol", 0x4691B0, 0x18 + .asciz "CommonWaterPistolBroken" .global $$250263 $$250263: - .incbin "baserom.dol", 0x4691C8, 0x1C + .asciz "CommonWaterPistolBubbleL" + .balign 4 .global $$250264 $$250264: - .incbin "baserom.dol", 0x4691E4, 0x1C + .asciz "CommonWaterPistolBubbleS" + .balign 4 .global $$250265 $$250265: - .incbin "baserom.dol", 0x469200, 0x14 + .asciz "CutterCutterCatch" + .balign 4 .global $$250266 $$250266: - .incbin "baserom.dol", 0x469214, 0x14 + .asciz "CutterDashCutter" + .balign 4 .global $$250267 $$250267: - .incbin "baserom.dol", 0x469228, 0x18 + .asciz "CutterFinalCutterDrop" + .balign 4 .global $$250268 $$250268: - .incbin "baserom.dol", 0x469240, 0x1C + .asciz "CutterFinalCutterRiseTail" + .balign 4 .global $$250269 $$250269: - .incbin "baserom.dol", 0x46925C, 0x1C + .asciz "CutterFinalCutterRiseWind" + .balign 4 .global $$250270 $$250270: - .incbin "baserom.dol", 0x469278, 0x1C + .asciz "CutterFinalCutterShockWave" + .balign 4 .global $$250271 $$250271: - .incbin "baserom.dol", 0x469294, 0x20 + .asciz "CutterJuckleCutterAfterImage" + .balign 4 .global $$250272 $$250272: - .incbin "baserom.dol", 0x4692B4, 0x1C + .asciz "CutterJuckleCutterBroken" + .balign 4 .global $$250273 $$250273: - .incbin "baserom.dol", 0x4692D0, 0x18 + .asciz "CutterKabutowariTail" + .balign 4 .global $$250274 $$250274: - .incbin "baserom.dol", 0x4692E8, 0x1C + .asciz "CutterSirkCutterAfterImage" + .balign 4 .global $$250275 $$250275: - .incbin "baserom.dol", 0x469304, 0x18 + .asciz "CutterSirkCutterBroken" + .balign 4 .global $$250276 $$250276: - .incbin "baserom.dol", 0x46931C, 0x14 + .asciz "CutterSlashChain1" + .balign 4 .global $$250277 $$250277: - .incbin "baserom.dol", 0x469330, 0x18 + .asciz "CutterSlashChain2" + .balign 4 + .4byte 0 .global $$250278 $$250278: - .incbin "baserom.dol", 0x469348, 0x20 + .asciz "CutterZankibbleCutterAfterImage" .global $$250279 $$250279: - .incbin "baserom.dol", 0x469368, 0x20 + .asciz "CutterZankibbleCutterBroken" + .4byte 0 .global $$250280 $$250280: - .incbin "baserom.dol", 0x469388, 0x10 + .asciz "DamageCutterHit" .global $$250281 $$250281: - .incbin "baserom.dol", 0x469398, 0x10 + .asciz "DamageEneHit" + .balign 4 .global $$250282 $$250282: - .incbin "baserom.dol", 0x4693A8, 0x10 + .asciz "DamageFireHit" + .balign 4 .global $$250283 $$250283: - .incbin "baserom.dol", 0x4693B8, 0x18 + .asciz "DamageFireHitInfinity" + .balign 4 .global $$250284 $$250284: - .incbin "baserom.dol", 0x4693D0, 0x10 + .asciz "DamageFreezeHit" .global $$250285 $$250285: - .incbin "baserom.dol", 0x4693E0, 0x14 + .asciz "DamageHardEneHit" + .balign 4 .global $$250286 $$250286: - .incbin "baserom.dol", 0x4693F4, 0xC + .asciz "DamageHit" + .balign 4 .global $$250287 $$250287: - .incbin "baserom.dol", 0x469400, 0x10 + .asciz "DamageSparkHit" + .balign 4 .global $$250288 $$250288: - .incbin "baserom.dol", 0x469410, 0x10 + .asciz "DamageSparkHitL" .global $$250289 $$250289: - .incbin "baserom.dol", 0x469420, 0x18 + .asciz "DamageSparkHitInfinity" + .balign 4 .global $$250290 $$250290: - .incbin "baserom.dol", 0x469438, 0x10 + .asciz "DamageSpearHit" + .balign 4 .global $$250291 $$250291: - .incbin "baserom.dol", 0x469448, 0x18 + .asciz "DamageSuperCutterHit" + .balign 4 .global $$250292 $$250292: - .incbin "baserom.dol", 0x469460, 0x18 + .asciz "DededeHammerAttackStar" + .balign 4 .global $$250293 $$250293: - .incbin "baserom.dol", 0x469478, 0x10 + .asciz "DededeCharge" + .balign 4 .global $$250294 $$250294: - .incbin "baserom.dol", 0x469488, 0x10 + .asciz "DededeChargeMax" .global $$250295 $$250295: - .incbin "baserom.dol", 0x469498, 0x18 + .asciz "DededeCombinationAttack" .global $$250296 $$250296: - .incbin "baserom.dol", 0x4694B0, 0x20 + .asciz "DededeCombinationExplosion" + .balign 4 + .4byte 0 .global $$250297 $$250297: - .incbin "baserom.dol", 0x4694D0, 0x10 + .asciz "DededeShockWave" .global $$250298 $$250298: - .incbin "baserom.dol", 0x4694E0, 0x18 + .asciz "DededeGiantSwingTail" + .balign 4 .global $$250299 $$250299: - .incbin "baserom.dol", 0x4694F8, 0x18 + .asciz "DededeGuriguriHammer" + .balign 4 .global $$250300 $$250300: - .incbin "baserom.dol", 0x469510, 0x18 + .asciz "DededeHammerThrowTail" + .balign 4 .global $$250301 $$250301: - .incbin "baserom.dol", 0x469528, 0x14 + .asciz "DededeOnigorosiFire" .global $$250302 $$250302: - .incbin "baserom.dol", 0x46953C, 0x18 + .asciz "DededeHammerExplosion" + .balign 4 .global $$250303 $$250303: - .incbin "baserom.dol", 0x469554, 0x24 + .asciz "DededeTripleHammerAttackStar" + .balign 4 + .4byte 0 .global $$250304 $$250304: - .incbin "baserom.dol", 0x469578, 0x20 + .asciz "DededeTripleHammerAttackBigStar" .global $$250305 $$250305: - .incbin "baserom.dol", 0x469598, 0x18 + .asciz "DeeSpearAttackAfterGlow" .global $$250306 $$250306: - .incbin "baserom.dol", 0x4695B0, 0x14 + .asciz "DeeSpearAttackLine" + .balign 4 .global $$250307 $$250307: - .incbin "baserom.dol", 0x4695C4, 0x14 + .asciz "DeeSpearAttackShine" .global $$250308 $$250308: - .incbin "baserom.dol", 0x4695D8, 0x18 + .asciz "DeeCombinationAttack1" + .balign 4 .global $$250309 $$250309: - .incbin "baserom.dol", 0x4695F0, 0x18 + .asciz "DeeCombinationAttack2" + .balign 4 .global $$250310 $$250310: - .incbin "baserom.dol", 0x469608, 0x14 + .asciz "DeeAttackAfterImage" .global $$250311 $$250311: - .incbin "baserom.dol", 0x46961C, 0x1C + .asciz "DeeContinuousFinelyAttack" + .balign 4 .global $$250312 $$250312: - .incbin "baserom.dol", 0x469638, 0x18 + .asciz "DeeSpearShootingLine" + .balign 4 .global $$250313 $$250313: - .incbin "baserom.dol", 0x469650, 0x18 + .asciz "DeeTripleShotingCharge" + .balign 4 .global $$250314 $$250314: - .incbin "baserom.dol", 0x469668, 0x1C + .asciz "DeeTripleShotingChageMax" + .balign 4 .global $$250315 $$250315: - .incbin "baserom.dol", 0x469684, 0x18 + .asciz "EnemyCommonAppearance" + .balign 4 .global $$250316 $$250316: - .incbin "baserom.dol", 0x46969C, 0x1C + .asciz "EnemyCommonAppearance_Small" .global $$250317 $$250317: - .incbin "baserom.dol", 0x4696B8, 0x18 + .asciz "EnemyCommonDashSmoke" + .balign 4 .global $$250318 $$250318: - .incbin "baserom.dol", 0x4696D0, 0x18 + .asciz "EnemyCommonDeadSmoke" + .balign 4 .global $$250319 $$250319: - .incbin "baserom.dol", 0x4696E8, 0x14 + .asciz "EnemyCommonDeathS" + .balign 4 .global $$250320 $$250320: - .incbin "baserom.dol", 0x4696FC, 0x14 + .asciz "EnemyCommonDefeat" + .balign 4 .global $$250321 $$250321: - .incbin "baserom.dol", 0x469710, 0x14 + .asciz "EnemyCommonExplodeL" .global $$250322 $$250322: - .incbin "baserom.dol", 0x469724, 0x1C + .asciz "EnemyCommonExplodeLL" + .balign 4 + .4byte 0 .global $$250323 $$250323: - .incbin "baserom.dol", 0x469740, 0x18 + .asciz "EnemyCommonExplodeLWarp" .global $$250324 $$250324: - .incbin "baserom.dol", 0x469758, 0x18 + .asciz "EnemyCommonExplodeMWarp" .global $$250325 $$250325: - .incbin "baserom.dol", 0x469770, 0x1C + .asciz "EnemyCommonExplodeM_Short" + .balign 4 .global $$250326 $$250326: - .incbin "baserom.dol", 0x46978C, 0x14 + .asciz "EnemyCommonExplodeS" .global $$250327 $$250327: - .incbin "baserom.dol", 0x4697A0, 0x18 + .asciz "EnemyCommonExplodeSWarp" .global $$250328 $$250328: - .incbin "baserom.dol", 0x4697B8, 0x1C + .asciz "EnemyCommonHitMoveBubble" + .balign 4 .global $$250329 $$250329: - .incbin "baserom.dol", 0x4697D4, 0x1C + .asciz "EnemyCommonRoomGAppearance" + .balign 4 .global $$250330 $$250330: - .incbin "baserom.dol", 0x4697F0, 0x14 + .asciz "EnemyCommonSummon" + .balign 4 .global $$250331 $$250331: - .incbin "baserom.dol", 0x469804, 0x18 + .asciz "EnemyCommonSummonBig" + .balign 4 .global $$250332 $$250332: - .incbin "baserom.dol", 0x46981C, 0x18 + .asciz "EnemyCommonSuperEffect" + .balign 4 .global $$250333 $$250333: - .incbin "baserom.dol", 0x469834, 0x18 + .asciz "EnemyCommonSwimBubble" + .balign 4 .global $$250334 $$250334: - .incbin "baserom.dol", 0x46984C, 0x1C + .asciz "EnemyCommonWaterHitBroken" + .balign 4 .global $$250335 $$250335: - .incbin "baserom.dol", 0x469868, 0x10 + .asciz "FighterJoeHadou" .global $$250336 $$250336: - .incbin "baserom.dol", 0x469878, 0x14 + .asciz "FighterJoeHadouBall" .global $$250337 $$250337: - .incbin "baserom.dol", 0x46988C, 0x14 + .asciz "FighterJoeRising" + .balign 4 .global $$250338 $$250338: - .incbin "baserom.dol", 0x4698A0, 0x10 + .asciz "FighterJoeSpin" + .balign 4 .global $$250339 $$250339: - .incbin "baserom.dol", 0x4698B0, 0x14 + .asciz "FighterJoeVulcan" + .balign 4 .global $$250340 $$250340: - .incbin "baserom.dol", 0x4698C4, 0x10 + .asciz "FighterVulcan" + .balign 4 .global $$250341 $$250341: - .incbin "baserom.dol", 0x4698D4, 0x14 + .asciz "FighterHadouCharge" + .balign 4 .global $$250342 $$250342: - .incbin "baserom.dol", 0x4698E8, 0x14 + .asciz "FighterHadouLine" + .balign 4 .global $$250343 $$250343: - .incbin "baserom.dol", 0x4698FC, 0x14 + .asciz "FighterHadou" + .balign 4 + .4byte 0 .global $$250344 $$250344: - .incbin "baserom.dol", 0x469910, 0x18 + .asciz "FighterMegaHadouWallHit" .global $$250345 $$250345: - .incbin "baserom.dol", 0x469928, 0x18 + .asciz "FighterMegaHadouCharge" + .balign 4 .global $$250346 $$250346: - .incbin "baserom.dol", 0x469940, 0x18 + .asciz "FighterMegaHadouLine" + .balign 4 .global $$250347 $$250347: - .incbin "baserom.dol", 0x469958, 0x14 + .asciz "FighterMegaHadou" + .balign 4 .global $$250348 $$250348: - .incbin "baserom.dol", 0x46996C, 0x18 + .asciz "FighterGigaHadouCharge" + .balign 4 .global $$250349 $$250349: - .incbin "baserom.dol", 0x469984, 0x18 + .asciz "FighterGigaHadouBurst" + .balign 4 .global $$250350 $$250350: - .incbin "baserom.dol", 0x46999C, 0x18 + .asciz "FighterGigaHadouLine" + .balign 4 .global $$250351 $$250351: - .incbin "baserom.dol", 0x4699B4, 0x14 + .asciz "FighterGigaHadou" + .balign 4 .global $$250352 $$250352: - .incbin "baserom.dol", 0x4699C8, 0x18 + .asciz "FighterGigaHadouWallHit" .global $$250353 $$250353: - .incbin "baserom.dol", 0x4699E0, 0x14 + .asciz "FighterRisingStart" + .balign 4 .global $$250354 $$250354: - .incbin "baserom.dol", 0x4699F4, 0x18 + .asciz "FighterRisingAirStart" + .balign 4 .global $$250355 $$250355: - .incbin "baserom.dol", 0x469A0C, 0x10 + .asciz "FighterRising" + .balign 4 .global $$250356 $$250356: - .incbin "baserom.dol", 0x469A1C, 0x10 + .asciz "FighterSkyKick" + .balign 4 .global $$250357 $$250357: - .incbin "baserom.dol", 0x469A2C, 0x18 + .asciz "FighterSkyKickReverse" + .balign 4 .global $$250358 $$250358: - .incbin "baserom.dol", 0x469A44, 0x10 + .asciz "FighterSliding" + .balign 4 .global $$250359 $$250359: - .incbin "baserom.dol", 0x469A54, 0x10 + .asciz "FighterSmash" + .balign 4 .global $$250360 $$250360: - .incbin "baserom.dol", 0x469A64, 0x14 + .asciz "FighterSmashLine" + .balign 4 .global $$250361 $$250361: - .incbin "baserom.dol", 0x469A78, 0x18 + .asciz "FighterSmashWallHit" + .4byte 0 .global $$250362 $$250362: - .incbin "baserom.dol", 0x469A90, 0x10 + .asciz "FighterSmashEnd" .global $$250363 $$250363: - .incbin "baserom.dol", 0x469AA0, 0x14 + .asciz "FighterDoubleKick" + .balign 4 .global $$250364 $$250364: - .incbin "baserom.dol", 0x469AB4, 0x18 + .asciz "FighterDoubleKickLine" + .balign 4 .global $$250365 $$250365: - .incbin "baserom.dol", 0x469ACC, 0x1C + .asciz "FighterDoubleKickWallHit" + .balign 4 .global $$250366 $$250366: - .incbin "baserom.dol", 0x469AE8, 0x18 + .asciz "FighterDoubleKickEnd" + .balign 4 .global $$250367 $$250367: - .incbin "baserom.dol", 0x469B00, 0x18 + .asciz "FighterThrowFrontStart" + .balign 4 .global $$250368 $$250368: - .incbin "baserom.dol", 0x469B18, 0x18 + .asciz "FighterThrowBackLine" + .balign 4 .global $$250369 $$250369: - .incbin "baserom.dol", 0x469B30, 0xC + .asciz "FireBreath" + .balign 4 .global $$250370 $$250370: - .incbin "baserom.dol", 0x469B3C, 0x10 + .asciz "FireBreath4P" + .balign 4 .global $$250371 $$250371: - .incbin "baserom.dol", 0x469B4C, 0x10 + .asciz "FireBreathEnd" + .balign 4 .global $$250372 $$250372: - .incbin "baserom.dol", 0x469B5C, 0x10 + .asciz "FireBreathWarp" + .balign 4 .global $$250373 $$250373: - .incbin "baserom.dol", 0x469B6C, 0x14 + .asciz "FireBurningAttack" + .balign 4 .global $$250374 $$250374: - .incbin "baserom.dol", 0x469B80, 0x18 + .asciz "FireBurningAttackHit" + .balign 4 .global $$250375 $$250375: - .incbin "baserom.dol", 0x469B98, 0x18 + .asciz "FireBurningAttackSmoke" + .balign 4 .global $$250376 $$250376: - .incbin "baserom.dol", 0x469BB0, 0x1C + .asciz "FireBurningAttackTailWarp" + .balign 4 .global $$250377 $$250377: - .incbin "baserom.dol", 0x469BCC, 0x14 + .asciz "FireBurningBullet" + .balign 4 .global $$250378 $$250378: - .incbin "baserom.dol", 0x469BE0, 0x18 + .asciz "FireBurningBulletDrop" + .balign 4 .global $$250379 $$250379: - .incbin "baserom.dol", 0x469BF8, 0xC + .asciz "FireHatFire" .global $$250380 $$250380: - .incbin "baserom.dol", 0x469C04, 0x14 + .asciz "FireFireIgnition" + .balign 4 .global $$250381 $$250381: - .incbin "baserom.dol", 0x469C18, 0x14 + .asciz "FireFireIgnition4P" + .balign 4 .global $$250382 $$250382: - .incbin "baserom.dol", 0x469C2C, 0x18 + .asciz "FireFireIgnitionSmoke" + .balign 4 .global $$250383 $$250383: - .incbin "baserom.dol", 0x469C44, 0x18 + .asciz "FireFireIgnitionWarp" + .balign 4 .global $$250384 $$250384: - .incbin "baserom.dol", 0x469C5C, 0x10 + .asciz "FireSpiralFire" + .balign 4 .global $$250385 $$250385: - .incbin "baserom.dol", 0x469C6C, 0x14 + .asciz "FireSpiralFireEnd" + .balign 4 .global $$250386 $$250386: - .incbin "baserom.dol", 0x469C80, 0x18 + .asciz "FireSpiralFireReverse" + .balign 4 .global $$250387 $$250387: - .incbin "baserom.dol", 0x469C98, 0x1C + .asciz "FireSpiralFireReverseEnd" + .balign 4 .global $$250388 $$250388: - .incbin "baserom.dol", 0x469CB4, 0x1C + .asciz "FireSpiralFireReverseWarp" + .balign 4 .global $$250389 $$250389: - .incbin "baserom.dol", 0x469CD0, 0x14 + .asciz "FireSpiralFireWarp" + .balign 4 .global $$250390 $$250390: - .incbin "baserom.dol", 0x469CE4, 0x10 + .asciz "FireFireWheele" + .balign 4 .global $$250391 $$250391: - .incbin "baserom.dol", 0x469CF4, 0x18 + .asciz "FireFireWheeleReverse" + .balign 4 .global $$250392 $$250392: - .incbin "baserom.dol", 0x469D0C, 0x14 + .asciz "FireHotheadBreath" + .balign 4 .global $$250393 $$250393: - .incbin "baserom.dol", 0x469D20, 0x10 + .asciz "FireHotheadFire" .global $$250394 $$250394: - .incbin "baserom.dol", 0x469D30, 0x18 + .asciz "FireFlamerAttack" + .balign 4 + .4byte 0 .global $$250395 $$250395: - .incbin "baserom.dol", 0x469D48, 0x10 + .asciz "FireFlamerFireR" .global $$250396 $$250396: - .incbin "baserom.dol", 0x469D58, 0x18 + .asciz "FireFlamerFireVerticalL" .global $$250397 $$250397: - .incbin "baserom.dol", 0x469D70, 0x18 + .asciz "FireFlamerFireVerticalR" .global $$250398 $$250398: - .incbin "baserom.dol", 0x469D88, 0x10 + .asciz "GhostFollowUp" + .balign 4 .global $$250399 $$250399: - .incbin "baserom.dol", 0x469D98, 0xC + .asciz "GhostSmoke" + .balign 4 .global $$250400 $$250400: - .incbin "baserom.dol", 0x469DA4, 0x10 + .asciz "GigatzoAttack" + .balign 4 .global $$250401 $$250401: - .incbin "baserom.dol", 0x469DB4, 0x14 + .asciz "GigatzoBombCircle" + .balign 4 .global $$250402 $$250402: - .incbin "baserom.dol", 0x469DC8, 0x18 + .asciz "GigatzoBombCircleLaunch" .global $$250403 $$250403: - .incbin "baserom.dol", 0x469DE0, 0x18 + .asciz "GigatzoBombExplode" + .balign 4 + .4byte 0 .global $$250404 $$250404: - .incbin "baserom.dol", 0x469DF8, 0x10 + .asciz "GigatzoBombFire" .global $$250405 $$250405: - .incbin "baserom.dol", 0x469E08, 0x18 + .asciz "GigatzoBombFireLaunch" + .balign 4 .global $$250406 $$250406: - .incbin "baserom.dol", 0x469E20, 0x14 + .asciz "GigatzoBombSpark" + .balign 4 .global $$250407 $$250407: - .incbin "baserom.dol", 0x469E34, 0x18 + .asciz "GigatzoBombSparkLaunch" + .balign 4 .global $$250408 $$250408: - .incbin "baserom.dol", 0x469E4C, 0x14 + .asciz "GmkBallRockMaster" + .balign 4 .global $$250409 $$250409: - .incbin "baserom.dol", 0x469E60, 0x10 + .asciz "GmkBallRock" + .4byte 0 .global $$250410 $$250410: - .incbin "baserom.dol", 0x469E70, 0x18 + .asciz "GmkChallengeDoorRelease" .global $$250411 $$250411: - .incbin "baserom.dol", 0x469E88, 0x18 + .asciz "GmkChallengeDoorUnLock" + .balign 4 .global $$250412 $$250412: - .incbin "baserom.dol", 0x469EA0, 0x1C + .asciz "GmkChallengeDoorUnLockBreak" .global $$250413 $$250413: - .incbin "baserom.dol", 0x469EBC, 0x24 + .asciz "GmkChallengeDoorUnLockBreakSmall" + .balign 4 .global $$250414 $$250414: - .incbin "baserom.dol", 0x469EE0, 0x1C + .asciz "GmkChallengeDoorUnLockEnd" + .balign 4 .global $$250415 $$250415: - .incbin "baserom.dol", 0x469EFC, 0x10 + .asciz "GmkCommonAir" + .balign 4 .global $$250416 $$250416: - .incbin "baserom.dol", 0x469F0C, 0x1C + .asciz "GmkCommonBlockChainBreak" + .balign 4 .global $$250417 $$250417: - .incbin "baserom.dol", 0x469F28, 0x14 + .asciz "GmkCommonBlockChip" + .balign 4 .global $$250418 $$250418: - .incbin "baserom.dol", 0x469F3C, 0x18 + .asciz "GmkCommonBlockCrumble" + .balign 4 .global $$250419 $$250419: - .incbin "baserom.dol", 0x469F54, 0x20 + .asciz "GmkCommonBlockCrumbleFactory" + .balign 4 .global $$250420 $$250420: - .incbin "baserom.dol", 0x469F74, 0x1C + .asciz "GmkCommonBlockCrumbleShake" + .balign 4 .global $$250421 $$250421: - .incbin "baserom.dol", 0x469F90, 0x14 + .asciz "GmkCommonBlockFire" + .balign 4 .global $$250422 $$250422: - .incbin "baserom.dol", 0x469FA4, 0x1C + .asciz "GmkCommonBlockHardBrokenB" + .balign 4 .global $$250423 $$250423: - .incbin "baserom.dol", 0x469FC0, 0x10 + .asciz "GmkCommonBubble" .global $$250424 $$250424: - .incbin "baserom.dol", 0x469FD0, 0x10 + .asciz "GmkCommonCannon" .global $$250425 $$250425: - .incbin "baserom.dol", 0x469FE0, 0x18 + .asciz "GmkCommonCutropeLand" + .balign 4 .global $$250426 $$250426: - .incbin "baserom.dol", 0x469FF8, 0x10 + .asciz "GmkCommonDoor" + .balign 4 .global $$250427 $$250427: - .incbin "baserom.dol", 0x46A008, 0x14 + .asciz "GmkCommonDoorGoal" + .balign 4 .global $$250428 $$250428: - .incbin "baserom.dol", 0x46A01C, 0x14 + .asciz "GmkCommonGuideBoard" .global $$250429 $$250429: - .incbin "baserom.dol", 0x46A030, 0x18 + .asciz "GmkCommonShutterLaser" + .balign 4 .global $$250430 $$250430: - .incbin "baserom.dol", 0x46A048, 0x10 + .asciz "GmkCommonStar" + .balign 4 .global $$250431 $$250431: - .incbin "baserom.dol", 0x46A058, 0x18 + .asciz "GmkCommonSwimBubble2" + .balign 4 .global $$250432 $$250432: - .incbin "baserom.dol", 0x46A070, 0x10 + .asciz "GmkLvMapStar" + .balign 4 .global $$250433 $$250433: - .incbin "baserom.dol", 0x46A080, 0x10 + .asciz "GmkLvMapStar2" + .balign 4 .global $$250434 $$250434: - .incbin "baserom.dol", 0x46A090, 0x14 + .asciz "GmkWarpStarFlash" + .balign 4 .global $$250435 $$250435: - .incbin "baserom.dol", 0x46A0A4, 0x18 + .asciz "GmkWarpStarLittleStar" + .balign 4 .global $$250436 $$250436: - .incbin "baserom.dol", 0x46A0BC, 0x14 + .asciz "GmkWarpStarStart" + .balign 4 .global $$250437 $$250437: - .incbin "baserom.dol", 0x46A0D0, 0x14 + .asciz "GmkWarpStarStartLv" + .balign 4 .global $$250438 $$250438: - .incbin "baserom.dol", 0x46A0E4, 0x18 + .asciz "HalcanBowbyArrowWind" + .balign 4 .global $$250439 $$250439: - .incbin "baserom.dol", 0x46A0FC, 0x18 + .asciz "HammerHammerAttackStar" + .balign 4 .global $$250440 $$250440: - .incbin "baserom.dol", 0x46A114, 0x14 + .asciz "HammerBonkersBomb" + .balign 4 .global $$250441 $$250441: - .incbin "baserom.dol", 0x46A128, 0x18 + .asciz "HammerBonkersHammerDash" .global $$250442 $$250442: - .incbin "baserom.dol", 0x46A140, 0x1C + .asciz "HammerBonkersHammerDashLine" .global $$250443 $$250443: - .incbin "baserom.dol", 0x46A15C, 0x1C + .asciz "HammerBonkersLandingSmoke" + .balign 4 .global $$250444 $$250444: - .incbin "baserom.dol", 0x46A178, 0x18 + .asciz "HammerBonkersOnigorosi" + .balign 4 .global $$250445 $$250445: - .incbin "baserom.dol", 0x46A190, 0x14 + .asciz "HammerBonkersRun" + .balign 4 .global $$250446 $$250446: - .incbin "baserom.dol", 0x46A1A4, 0x18 + .asciz "HammerGiantSwingTail" + .balign 4 .global $$250447 $$250447: - .incbin "baserom.dol", 0x46A1BC, 0x18 + .asciz "HammerGuriguriHammer" + .balign 4 .global $$250448 $$250448: - .incbin "baserom.dol", 0x46A1D4, 0x18 + .asciz "HammerHammerThrowTail" + .balign 4 .global $$250449 $$250449: - .incbin "baserom.dol", 0x46A1EC, 0x14 + .asciz "HammerOnigorosiFire" .global $$250450 $$250450: - .incbin "baserom.dol", 0x46A200, 0x18 + .asciz "HammerWheelHammerTail" + .balign 4 .global $$250451 $$250451: - .incbin "baserom.dol", 0x46A218, 0x1C + .asciz "HammerStrongWheelHammerTail" .global $$250452 $$250452: - .incbin "baserom.dol", 0x46A234, 0x18 + .asciz "HammerHammerExplosion" + .balign 4 .global $$250453 $$250453: - .incbin "baserom.dol", 0x46A24C, 0x24 + .asciz "HammerTripleHammerAttackStar" + .balign 4 + .4byte 0 .global $$250454 $$250454: - .incbin "baserom.dol", 0x46A270, 0x20 + .asciz "HammerTripleHammerAttackBigStar" .global $$250455 $$250455: - .incbin "baserom.dol", 0x46A290, 0x18 + .asciz "HammerSpBonkersStar" + .4byte 0 .global $$250456 $$250456: - .incbin "baserom.dol", 0x46A2A8, 0x10 + .asciz "IceChillyAttack" .global $$250457 $$250457: - .incbin "baserom.dol", 0x46A2B8, 0x14 + .asciz "IceIceCubeBroken" + .balign 4 .global $$250458 $$250458: - .incbin "baserom.dol", 0x46A2CC, 0x10 + .asciz "IceSnowlMove" + .balign 4 .global $$250459 $$250459: - .incbin "baserom.dol", 0x46A2DC, 0x10 + .asciz "IceSnowlWeapon" + .balign 4 .global $$250460 $$250460: - .incbin "baserom.dol", 0x46A2EC, 0x14 + .asciz "IceSnowlWeaponBreak" .global $$250461 $$250461: - .incbin "baserom.dol", 0x46A300, 0xC + .asciz "Info50Score" .global $$250462 $$250462: - .incbin "baserom.dol", 0x46A30C, 0x10 + .asciz "Info100Score" + .balign 4 .global $$250463 $$250463: - .incbin "baserom.dol", 0x46A31C, 0x10 + .asciz "Info1000Score" + .balign 4 .global $$250464 $$250464: - .incbin "baserom.dol", 0x46A32C, 0x18 + .asciz "InfoBossPanelGuardLost" + .balign 4 .global $$250465 $$250465: - .incbin "baserom.dol", 0x46A344, 0x1C + .asciz "InfoBossPanelGuardLostMa" + .balign 4 .global $$250466 $$250466: - .incbin "baserom.dol", 0x46A360, 0x1C + .asciz "InfoBossPanelGuardLostEx" + .balign 4 .global $$250467 $$250467: - .incbin "baserom.dol", 0x46A37C, 0x10 + .asciz "InfoConfetti" + .balign 4 .global $$250468 $$250468: - .incbin "baserom.dol", 0x46A38C, 0x14 + .asciz "InfoConfettiSmall" + .balign 4 .global $$250469 $$250469: - .incbin "baserom.dol", 0x46A3A0, 0x10 + .asciz "InfoTrophy" + .balign 4 + .4byte 0 .global $$250470 $$250470: - .incbin "baserom.dol", 0x46A3B0, 0x18 + .asciz "InfoInvincibleCandyStar" .global $$250471 $$250471: - .incbin "baserom.dol", 0x46A3C8, 0xC + .asciz "ItemAppear" + .balign 4 .global $$250472 $$250472: - .incbin "baserom.dol", 0x46A3D4, 0x1C + .asciz "ItemEnergySphereGetLight" + .balign 4 .global $$250473 $$250473: - .incbin "baserom.dol", 0x46A3F0, 0x20 + .asciz "ItemEnergySphereGetLightSmall" + .balign 4 .global $$250474 $$250474: - .incbin "baserom.dol", 0x46A410, 0x1C + .asciz "ItemEnergySphereLightRing" + .balign 4 .global $$250475 $$250475: - .incbin "baserom.dol", 0x46A42C, 0x18 + .asciz "ItemEnergySphereShine" + .balign 4 .global $$250476 $$250476: - .incbin "baserom.dol", 0x46A444, 0x1C + .asciz "ItemEnergySphereShineGray" + .balign 4 .global $$250477 $$250477: - .incbin "baserom.dol", 0x46A460, 0x14 + .asciz "ItemFlyShipShine" + .balign 4 .global $$250478 $$250478: - .incbin "baserom.dol", 0x46A474, 0x18 + .asciz "ItemFlyShipShineGray" + .balign 4 .global $$250479 $$250479: - .incbin "baserom.dol", 0x46A48C, 0x1C + .asciz "ItemInvincibleCandyStarGet" + .balign 4 .global $$250480 $$250480: - .incbin "baserom.dol", 0x46A4A8, 0x18 + .asciz "ItemStepShoeJumpFall" + .balign 4 .global $$250481 $$250481: - .incbin "baserom.dol", 0x46A4C0, 0xC + .asciz "MasterBall" + .balign 4 .global $$250482 $$250482: - .incbin "baserom.dol", 0x46A4CC, 0x10 + .asciz "MasterBallBig" + .balign 4 .global $$250483 $$250483: - .incbin "baserom.dol", 0x46A4DC, 0x14 + .asciz "MasterBallBigWait" + .balign 4 .global $$250484 $$250484: - .incbin "baserom.dol", 0x46A4F0, 0x18 + .asciz "MasterBallBigVanish" + .4byte 0 .global $$250485 $$250485: - .incbin "baserom.dol", 0x46A508, 0x10 + .asciz "MasterBallSigns" .global $$250486 $$250486: - .incbin "baserom.dol", 0x46A518, 0x10 + .asciz "MasterBallWait" + .balign 4 .global $$250487 $$250487: - .incbin "baserom.dol", 0x46A528, 0x14 + .asciz "MasterBallVanish" + .balign 4 .global $$250488 $$250488: - .incbin "baserom.dol", 0x46A53C, 0xC + .asciz "MasterDash" + .balign 4 .global $$250489 $$250489: - .incbin "baserom.dol", 0x46A548, 0xC + .asciz "MasterEx" + .balign 4 .global $$250490 $$250490: - .incbin "baserom.dol", 0x46A554, 0xC + .asciz "MasterExEnd" .global $$250491 $$250491: - .incbin "baserom.dol", 0x46A560, 0x10 + .asciz "MasterMargin" + .balign 4 .global $$250492 $$250492: - .incbin "baserom.dol", 0x46A570, 0x10 + .asciz "MasterSummon" + .balign 4 .global $$250493 $$250493: - .incbin "baserom.dol", 0x46A580, 0x14 + .asciz "MasterSummonBeam" + .balign 4 .global $$250494 $$250494: - .incbin "baserom.dol", 0x46A594, 0x14 + .asciz "MasterSummonBeamBig" .global $$250495 $$250495: - .incbin "baserom.dol", 0x46A5A8, 0x10 + .asciz "MasterSurprised" .global $$250496 $$250496: - .incbin "baserom.dol", 0x46A5B8, 0xC + .asciz "MasterSweat" .global $$250497 $$250497: - .incbin "baserom.dol", 0x46A5C4, 0x14 + .asciz "MasterSweatRight" + .balign 4 .global $$250498 $$250498: - .incbin "baserom.dol", 0x46A5D8, 0x18 + .asciz "MasterWallthrough" + .balign 4 + .4byte 0 .global $$250499 $$250499: - .incbin "baserom.dol", 0x46A5F0, 0x18 + .asciz "MasterWallthroughCharge" .global $$250500 $$250500: - .incbin "baserom.dol", 0x46A608, 0x18 + .asciz "MetaknightSwordAirSpin" + .balign 4 .global $$250501 $$250501: - .incbin "baserom.dol", 0x46A620, 0x14 + .asciz "MetaknightAttackHi" + .balign 4 .global $$250502 $$250502: - .incbin "baserom.dol", 0x46A634, 0x18 + .asciz "MetaknightAttackTail" + .balign 4 .global $$250503 $$250503: - .incbin "baserom.dol", 0x46A64C, 0x14 + .asciz "MetaknightSwordBeam" .global $$250504 $$250504: - .incbin "baserom.dol", 0x46A660, 0x18 + .asciz "MetaknightSwordChopping" .global $$250505 $$250505: - .incbin "baserom.dol", 0x46A678, 0x1C + .asciz "MetaknightCombinationAttack" .global $$250506 $$250506: - .incbin "baserom.dol", 0x46A694, 0x20 + .asciz "MetaknightCombinationExplosion" + .balign 4 .global $$250507 $$250507: - .incbin "baserom.dol", 0x46A6B4, 0x18 + .asciz "MetaknightCondorDive" + .balign 4 .global $$250508 $$250508: - .incbin "baserom.dol", 0x46A6CC, 0x1C + .asciz "MetaknightCondorDiveLine" + .balign 4 .global $$250509 $$250509: - .incbin "baserom.dol", 0x46A6E8, 0x20 + .asciz "MetaknightSwordFinelyCutEndWave" .global $$250510 $$250510: - .incbin "baserom.dol", 0x46A708, 0x20 + .asciz "MetaknightSwordFinelyCutWave" + .balign 4 .global $$250511 $$250511: - .incbin "baserom.dol", 0x46A728, 0x14 + .asciz "MetaknightShockWave" .global $$250512 $$250512: - .incbin "baserom.dol", 0x46A73C, 0x1C + .asciz "MetaknightSwordShuttleLoop" + .balign 4 .global $$250513 $$250513: - .incbin "baserom.dol", 0x46A758, 0x24 + .asciz "MetaknightSwordShuttleLoopStripe" + .balign 4 .global $$250514 $$250514: - .incbin "baserom.dol", 0x46A77C, 0x1C + .asciz "MetaknightSwordThrustEdge" + .balign 4 .global $$250515 $$250515: - .incbin "baserom.dol", 0x46A798, 0x24 + .asciz "MetaknightSwordTornadoAttackCharge" + .balign 4 .global $$250516 $$250516: - .incbin "baserom.dol", 0x46A7BC, 0x24 + .asciz "MetaknightTornadoAttackChargeMax" + .balign 4 .global $$250517 $$250517: - .incbin "baserom.dol", 0x46A7E0, 0x24 + .asciz "MetaknightSwordTornadoAttackWind" + .balign 4 .global $$250518 $$250518: - .incbin "baserom.dol", 0x46A804, 0x20 + .asciz "MetaknightSwordUnderThrustEdge" + .balign 4 .global $$250519 $$250519: - .incbin "baserom.dol", 0x46A824, 0x24 + .asciz "MetaknightSwordUnderThrustGroundHit" .global $$250520 $$250520: - .incbin "baserom.dol", 0x46A848, 0x14 + .asciz "MoundeathBigLanding" .global $$250521 $$250521: - .incbin "baserom.dol", 0x46A85C, 0x1C + .asciz "MoundeathBigLandingSmoke" + .balign 4 .global $$250522 $$250522: - .incbin "baserom.dol", 0x46A878, 0x14 + .asciz "MoundeathCurling" + .balign 4 .global $$250523 $$250523: - .incbin "baserom.dol", 0x46A88C, 0x18 + .asciz "MoundeathCurlingStop" + .balign 4 .global $$250524 $$250524: - .incbin "baserom.dol", 0x46A8A4, 0x10 + .asciz "MoundeathJump" + .balign 4 .global $$250525 $$250525: - .incbin "baserom.dol", 0x46A8B4, 0x10 + .asciz "MoundeathMove" + .balign 4 .global $$250526 $$250526: - .incbin "baserom.dol", 0x46A8C4, 0x10 + .asciz "MoundeathRun" + .balign 4 .global $$250527 $$250527: - .incbin "baserom.dol", 0x46A8D4, 0x18 + .asciz "MoundeathSmallLanding" + .balign 4 .global $$250528 $$250528: - .incbin "baserom.dol", 0x46A8EC, 0x1C + .asciz "MoundeathSmallLandingSmoke" + .balign 4 .global $$250529 $$250529: - .incbin "baserom.dol", 0x46A908, 0x18 + .asciz "NinjaTsukikageAppear" + .balign 4 .global $$250530 $$250530: - .incbin "baserom.dol", 0x46A920, 0x14 + .asciz "NinjaTsukikageBlur" + .balign 4 .global $$250531 $$250531: - .incbin "baserom.dol", 0x46A934, 0x18 + .asciz "NinjaTsukikageCutLeft" + .balign 4 .global $$250532 $$250532: - .incbin "baserom.dol", 0x46A94C, 0x18 + .asciz "NinjaTsukikageCutRight" + .balign 4 .global $$250533 $$250533: - .incbin "baserom.dol", 0x46A964, 0x1C + .asciz "NinjaTsukikageCutWallLeft" + .balign 4 .global $$250534 $$250534: - .incbin "baserom.dol", 0x46A980, 0x1C + .asciz "NinjaTsukikageCutWallRight" + .balign 4 .global $$250535 $$250535: - .incbin "baserom.dol", 0x46A99C, 0x14 + .asciz "NinjaTsukikageExit" + .balign 4 .global $$250536 $$250536: - .incbin "baserom.dol", 0x46A9B0, 0x14 + .asciz "NinjaTsukikageSpin" + .balign 4 .global $$250537 $$250537: - .incbin "baserom.dol", 0x46A9C4, 0x14 + .asciz "NinjaTsukikageTail" + .balign 4 .global $$250538 $$250538: - .incbin "baserom.dol", 0x46A9D8, 0xC + .asciz "NormalEat" + .balign 4 .global $$250539 $$250539: - .incbin "baserom.dol", 0x46A9E4, 0x14 + .asciz "NormalVacuumCancel" + .balign 4 .global $$250540 $$250540: - .incbin "baserom.dol", 0x46A9F8, 0x14 + .asciz "NormalVacuumCharge" + .balign 4 .global $$250541 $$250541: - .incbin "baserom.dol", 0x46AA0C, 0x18 + .asciz "NormalVacuumChargeEnd" + .balign 4 .global $$250542 $$250542: - .incbin "baserom.dol", 0x46AA24, 0x18 + .asciz "NormalVacuumHustlePtcl" + .balign 4 .global $$250543 $$250543: - .incbin "baserom.dol", 0x46AA3C, 0x14 + .asciz "NormalVacuumPtcl" + .balign 4 .global $$250544 $$250544: - .incbin "baserom.dol", 0x46AA50, 0x10 + .asciz "NormalVomit" + .4byte 0 .global $$250545 $$250545: - .incbin "baserom.dol", 0x46AA60, 0x10 + .asciz "NormalStarBreak" .global $$250546 $$250546: - .incbin "baserom.dol", 0x46AA70, 0x18 + .asciz "NormalStaHitRing" + .balign 4 + .4byte 0 .global $$250547 $$250547: - .incbin "baserom.dol", 0x46AA88, 0x18 + .asciz "NormalTailBigStrongStar" .global $$250548 $$250548: - .incbin "baserom.dol", 0x46AAA0, 0x10 + .asciz "NormalTailStar" + .balign 4 .global $$250549 $$250549: - .incbin "baserom.dol", 0x46AAB0, 0x1C + .asciz "NormalTailStripeLittleStar" + .balign 4 .global $$250550 $$250550: - .incbin "baserom.dol", 0x46AACC, 0x18 + .asciz "NormalTailStripeStar" + .balign 4 .global $$250551 $$250551: - .incbin "baserom.dol", 0x46AAE4, 0x1C + .asciz "NormalTailStrongStar" + .balign 4 + .4byte 0 .global $$250552 $$250552: - .incbin "baserom.dol", 0x46AB00, 0x10 + .asciz "ParasolDiveStar" .global $$250553 $$250553: - .incbin "baserom.dol", 0x46AB10, 0x14 + .asciz "ParasolDrillStar" + .balign 4 .global $$250554 $$250554: - .incbin "baserom.dol", 0x46AB24, 0x18 + .asciz "ParasolPerformanceStar" + .balign 4 .global $$250555 $$250555: - .incbin "baserom.dol", 0x46AB3C, 0x14 + .asciz "ParasolSwingSplash" + .balign 4 .global $$250556 $$250556: - .incbin "baserom.dol", 0x46AB50, 0x10 + .asciz "PuppetDeeBreak" + .balign 4 .global $$250557 $$250557: - .incbin "baserom.dol", 0x46AB60, 0x1C + .asciz "ShipChallengeDoorRelease" + .balign 4 .global $$250558 $$250558: - .incbin "baserom.dol", 0x46AB7C, 0x1C + .asciz "ShipChallengeDoorRing" + .balign 4 + .4byte 0 .global $$250559 $$250559: - .incbin "baserom.dol", 0x46AB98, 0x10 + .asciz "ShipDoorWelcome" .global $$250560 $$250560: - .incbin "baserom.dol", 0x46ABA8, 0x10 + .asciz "ShotzoShoot" + .4byte 0 .global $$250561 $$250561: - .incbin "baserom.dol", 0x46ABB8, 0x10 + .asciz "ShotzoShotBreak" .global $$250562 $$250562: - .incbin "baserom.dol", 0x46ABC8, 0x10 + .asciz "SparkAttackBall" .global $$250563 $$250563: - .incbin "baserom.dol", 0x46ABD8, 0x18 + .asciz "SparkAttackBallSmall" + .balign 4 .global $$250564 $$250564: - .incbin "baserom.dol", 0x46ABF0, 0x14 + .asciz "SparkAttackSpark" + .balign 4 .global $$250565 $$250565: - .incbin "baserom.dol", 0x46AC04, 0x18 + .asciz "SparkAttackSparkUnder" + .balign 4 .global $$250566 $$250566: - .incbin "baserom.dol", 0x46AC1C, 0xC + .asciz "SparkArrow" + .balign 4 .global $$250567 $$250567: - .incbin "baserom.dol", 0x46AC28, 0x10 + .asciz "SparkBarrier" + .balign 4 .global $$250568 $$250568: - .incbin "baserom.dol", 0x46AC38, 0x14 + .asciz "SparkChargeMiddle" + .balign 4 .global $$250569 $$250569: - .incbin "baserom.dol", 0x46AC4C, 0x14 + .asciz "SparkChargeSmall" + .balign 4 .global $$250570 $$250570: - .incbin "baserom.dol", 0x46AC60, 0x20 + .asciz "SparkDubiorAttackRushBarrier" + .balign 4 .global $$250571 $$250571: - .incbin "baserom.dol", 0x46AC80, 0x20 + .asciz "SparkDubiorAttackRushBarrier2" + .balign 4 .global $$250572 $$250572: - .incbin "baserom.dol", 0x46ACA0, 0x20 + .asciz "SparkDubiorAttackRushExpression" .global $$250573 $$250573: - .incbin "baserom.dol", 0x46ACC0, 0x1C + .asciz "SparkDubiorAttackSparkBall" + .balign 4 .global $$250574 $$250574: - .incbin "baserom.dol", 0x46ACDC, 0x24 + .asciz "SparkDubiorAttackSparkBallLandHit" + .balign 4 .global $$250575 $$250575: - .incbin "baserom.dol", 0x46AD00, 0x20 + .asciz "SparkDubiorAttackSparkCharge" + .balign 4 .global $$250576 $$250576: - .incbin "baserom.dol", 0x46AD20, 0x1C + .asciz "SparkDubiorAttackSparkUnder" .global $$250577 $$250577: - .incbin "baserom.dol", 0x46AD3C, 0x24 + .asciz "SparkDubiorAttackSparkUnderLandHit" + .balign 4 .global $$250578 $$250578: - .incbin "baserom.dol", 0x46AD60, 0x14 + .asciz "SparkDubiorJrAppear" .global $$250579 $$250579: - .incbin "baserom.dol", 0x46AD74, 0x18 + .asciz "SparkDubiorJrLandHit" + .balign 4 .global $$250580 $$250580: - .incbin "baserom.dol", 0x46AD8C, 0x14 + .asciz "SparkDubiorJrStart" + .balign 4 .global $$250581 $$250581: - .incbin "baserom.dol", 0x46ADA0, 0x20 + .asciz "SparkDubiorMoveSparkTrack" + .balign 4 + .4byte 0 .global $$250582 $$250582: - .incbin "baserom.dol", 0x46ADC0, 0x10 + .asciz "SparkElecAttack" .global $$250583 $$250583: - .incbin "baserom.dol", 0x46ADD0, 0x18 + .asciz "SparkElecAttackStart" + .balign 4 .global $$250584 $$250584: - .incbin "baserom.dol", 0x46ADE8, 0x10 + .asciz "SparkHatSpark" + .balign 4 .global $$250585 $$250585: - .incbin "baserom.dol", 0x46ADF8, 0xC + .asciz "SparkLaser" + .balign 4 .global $$250586 $$250586: - .incbin "baserom.dol", 0x46AE04, 0x10 + .asciz "SparkShotBack" + .balign 4 .global $$250587 $$250587: - .incbin "baserom.dol", 0x46AE14, 0x10 + .asciz "SparkShotBall" + .balign 4 .global $$250588 $$250588: - .incbin "baserom.dol", 0x46AE24, 0x10 + .asciz "SparkSparkHit" + .balign 4 .global $$250589 $$250589: - .incbin "baserom.dol", 0x46AE34, 0x18 + .asciz "SparkSparkUnderBigHit" + .balign 4 .global $$250590 $$250590: - .incbin "baserom.dol", 0x46AE4C, 0x14 + .asciz "SparkSparkyAttack" + .balign 4 .global $$250591 $$250591: - .incbin "baserom.dol", 0x46AE60, 0x18 + .asciz "SparkSparkyAttackStart" + .balign 4 .global $$250592 $$250592: - .incbin "baserom.dol", 0x46AE78, 0x14 + .asciz "SparkSparkyEarFrash" .global $$250593 $$250593: - .incbin "baserom.dol", 0x46AE8C, 0x14 + .asciz "SpearLanzerAttack" + .balign 4 .global $$250594 $$250594: - .incbin "baserom.dol", 0x46AEA0, 0x14 + .asciz "SpearPierceAttack" + .balign 4 .global $$250595 $$250595: - .incbin "baserom.dol", 0x46AEB4, 0x10 + .asciz "SpearShooting" + .balign 4 .global $$250596 $$250596: - .incbin "baserom.dol", 0x46AEC4, 0xC + .asciz "StoneCancel" .global $$250597 $$250597: - .incbin "baserom.dol", 0x46AED0, 0x14 + .asciz "StoneCancelWater" + .balign 4 .global $$250598 $$250598: - .incbin "baserom.dol", 0x46AEE4, 0xC + .asciz "StoneChange" .global $$250599 $$250599: - .incbin "baserom.dol", 0x46AEF0, 0x10 + .asciz "StoneLanding" + .balign 4 .global $$250600 $$250600: - .incbin "baserom.dol", 0x46AF00, 0x14 + .asciz "StoneLandingSmoke" + .balign 4 .global $$250601 $$250601: - .incbin "baserom.dol", 0x46AF14, 0x18 + .asciz "StoneLandingSmokeWater" + .balign 4 .global $$250602 $$250602: - .incbin "baserom.dol", 0x46AF2C, 0x14 + .asciz "StoneScrewDropWind" + .balign 4 .global $$250603 $$250603: - .incbin "baserom.dol", 0x46AF40, 0x14 + .asciz "StoneSuperLanding" + .balign 4 .global $$250604 $$250604: - .incbin "baserom.dol", 0x46AF54, 0x1C + .asciz "StoneSuperLandingSmoke" + .balign 4 + .4byte 0 .global $$250605 $$250605: - .incbin "baserom.dol", 0x46AF70, 0x10 + .asciz "StoneUpperShock" .global $$250607 $$250607: - .incbin "baserom.dol", 0x46AF80, 0x14 + .asciz "SunDiveWaterSplashM" .global $$250608 $$250608: - .incbin "baserom.dol", 0x46AF94, 0x10 + .asciz "SwordAirSpin" + .balign 4 .global $$250609 $$250609: - .incbin "baserom.dol", 0x46AFA4, 0xC + .asciz "SwordBeam" + .balign 4 .global $$250610 $$250610: - .incbin "baserom.dol", 0x46AFB0, 0x10 + .asciz "SwordChopping" + .balign 4 .global $$250611 $$250611: - .incbin "baserom.dol", 0x46AFC0, 0x14 + .asciz "SwordCommonEdgeTail" .global $$250612 $$250612: - .incbin "baserom.dol", 0x46AFD4, 0x20 + .asciz "SwordGigantEdgeBreakAwayShine" + .balign 4 .global $$250613 $$250613: - .incbin "baserom.dol", 0x46AFF4, 0x1C + .asciz "SwordGigantEdgeExShockWave" + .balign 4 .global $$250614 $$250614: - .incbin "baserom.dol", 0x46B010, 0x1C + .asciz "SwordGigantEdgeGuardShine" + .balign 4 .global $$250615 $$250615: - .incbin "baserom.dol", 0x46B02C, 0x14 + .asciz "SwordGigantEdgeRun" + .balign 4 .global $$250616 $$250616: - .incbin "baserom.dol", 0x46B040, 0x1C + .asciz "SwordGigantEdgeShockCharge" + .balign 4 .global $$250617 $$250617: - .incbin "baserom.dol", 0x46B05C, 0x1C + .asciz "SwordGigantEdgeShockImpact" + .balign 4 .global $$250618 $$250618: - .incbin "baserom.dol", 0x46B078, 0x1C + .asciz "SwordGigantEdgeShockWave" + .balign 4 .global $$250619 $$250619: - .incbin "baserom.dol", 0x46B094, 0x18 + .asciz "SwordFinelyCutEndWave" + .balign 4 .global $$250620 $$250620: - .incbin "baserom.dol", 0x46B0AC, 0x14 + .asciz "SwordFinelyCutWave" + .balign 4 .global $$250621 $$250621: - .incbin "baserom.dol", 0x46B0C0, 0x14 + .asciz "SwordRaisingSmoke" + .balign 4 .global $$250622 $$250622: - .incbin "baserom.dol", 0x46B0D4, 0x1C + .asciz "SwordSodoryAttackMain" + .balign 4 + .4byte 0 .global $$250623 $$250623: - .incbin "baserom.dol", 0x46B0F0, 0x10 + .asciz "SwordThrustEdge" .global $$250624 $$250624: - .incbin "baserom.dol", 0x46B100, 0x1C + .asciz "SwordTornadoAttackCharge" + .balign 4 .global $$250625 $$250625: - .incbin "baserom.dol", 0x46B11C, 0x1C + .asciz "SwordTornadoAttackChargeMax" .global $$250626 $$250626: - .incbin "baserom.dol", 0x46B138, 0x18 + .asciz "SwordTornadoAttackWind" + .balign 4 .global $$250627 $$250627: - .incbin "baserom.dol", 0x46B150, 0x18 + .asciz "SwordUnderThrustEdge" + .balign 4 .global $$250628 $$250628: - .incbin "baserom.dol", 0x46B168, 0x1C + .asciz "SwordUnderThrustGroundHit" + .balign 4 .global $$250629 $$250629: - .incbin "baserom.dol", 0x46B184, 0x14 + .asciz "TornadoAttackStripe" .global $$250630 $$250630: - .incbin "baserom.dol", 0x46B198, 0x18 + .asciz "VolttzoBodysparkA" + .balign 4 + .4byte 0 .global $$250631 $$250631: - .incbin "baserom.dol", 0x46B1B0, 0x18 + .asciz "VolttzoBodysparkALaunch" .global $$250632 $$250632: - .incbin "baserom.dol", 0x46B1C8, 0x18 + .asciz "VolttzoBodysparkB" + .balign 4 + .4byte 0 .global $$250633 $$250633: - .incbin "baserom.dol", 0x46B1E0, 0x18 + .asciz "VolttzoBodysparkBLaunch" .global $$250634 $$250634: - .incbin "baserom.dol", 0x46B1F8, 0x18 + .asciz "VolttzoBodysparkC" + .balign 4 + .4byte 0 .global $$250635 $$250635: - .incbin "baserom.dol", 0x46B210, 0x18 + .asciz "VolttzoBodysparkCLaunch" .global $$250636 $$250636: - .incbin "baserom.dol", 0x46B228, 0x20 + .asciz "VolttzoBombDivisionsparkball" + .balign 4 .global $$250637 $$250637: - .incbin "baserom.dol", 0x46B248, 0x24 + .asciz "VolttzoBombDivisionsparkballLaunch" + .balign 4 .global $$250638 $$250638: - .incbin "baserom.dol", 0x46B26C, 0x14 + .asciz "VolttzoBombExplode" + .balign 4 .global $$250639 $$250639: - .incbin "baserom.dol", 0x46B280, 0x18 + .asciz "WaterWaterPistolBubbleL" .global $$250640 $$250640: - .incbin "baserom.dol", 0x46B298, 0x18 + .asciz "WaterWaterPistolBubbleS" .global $$250641 $$250641: - .incbin "baserom.dol", 0x46B2B0, 0x1C + .asciz "WaterUnderAttackGraundHit" + .balign 4 .global $$250642 $$250642: - .incbin "baserom.dol", 0x46B2CC, 0x14 + .asciz "WaterUnderAttackEnd" .global $$250643 $$250643: - .incbin "baserom.dol", 0x46B2E0, 0x14 + .asciz "WaterWnWaterStart" + .balign 4 .global $$250644 $$250644: - .incbin "baserom.dol", 0x46B2F4, 0x18 + .asciz "WaterWnWGagalboBreak" + .balign 4 .global $$250645 $$250645: - .incbin "baserom.dol", 0x46B30C, 0x18 + .asciz "WaterWnWGagalboSplash" + .balign 4 .global $$250646 $$250646: - .incbin "baserom.dol", 0x46B324, 0x18 + .asciz "WaterWnWGagalboSplash2" + .balign 4 .global $$250647 $$250647: - .incbin "baserom.dol", 0x46B33C, 0x18 + .asciz "WaterWnWGagalboSplash3" + .balign 4 .global $$250648 $$250648: - .incbin "baserom.dol", 0x46B354, 0x18 + .asciz "WaterWnWGagalboStart" + .balign 4 .global $$250649 $$250649: - .incbin "baserom.dol", 0x46B36C, 0xC + .asciz "WhipAttack" + .balign 4 .global $$250650 $$250650: - .incbin "baserom.dol", 0x46B378, 0x10 + .asciz "WhipGazerSpiral" .global $$250651 $$250651: - .incbin "baserom.dol", 0x46B388, 0x18 + .asciz "WhipGazerSpiralStripe" + .balign 4 .global $$250652 $$250652: - .incbin "baserom.dol", 0x46B3A0, 0x10 + .asciz "WhipStripeEtc" + .balign 4 .global $$250653 $$250653: - .incbin "baserom.dol", 0x46B3B0, 0x14 + .asciz "WhipWhippyAttack" + .balign 4 .global $$250654 $$250654: - .incbin "baserom.dol", 0x46B3C4, 0x14 + .asciz "WhipWhippyStripe" + .balign 4 .global $$250655 $$250655: - .incbin "baserom.dol", 0x46B3D8, 0x14 + .asciz "WhispyAnemicBreath" + .balign 4 .global $$250656 $$250656: - .incbin "baserom.dol", 0x46B3EC, 0x14 + .asciz "WhispyAnemicSweat" + .balign 4 .global $$250657 $$250657: - .incbin "baserom.dol", 0x46B400, 0x14 + .asciz "WhispyAppleVomit" + .balign 4 .global $$250658 $$250658: - .incbin "baserom.dol", 0x46B414, 0x14 + .asciz "WhispyAttackSign" + .balign 4 .global $$250659 $$250659: - .incbin "baserom.dol", 0x46B428, 0x14 + .asciz "WhispyBigBreathTail" .global $$250660 $$250660: - .incbin "baserom.dol", 0x46B43C, 0x14 + .asciz "WhispyBigVacuumLeaf" .global $$250661 $$250661: - .incbin "baserom.dol", 0x46B450, 0x14 + .asciz "WhispyBreathTail" + .balign 4 .global $$250662 $$250662: - .incbin "baserom.dol", 0x46B464, 0x14 + .asciz "WhispyDeathLeafDrop" .global $$250663 $$250663: - .incbin "baserom.dol", 0x46B478, 0x14 + .asciz "WhispyExAttackSmoke" .global $$250664 $$250664: - .incbin "baserom.dol", 0x46B48C, 0x18 + .asciz "WhispyExBigBreathTail" + .balign 4 .global $$250665 $$250665: - .incbin "baserom.dol", 0x46B4A4, 0x18 + .asciz "WhispyExBigVacuumLeaf" + .balign 4 .global $$250666 $$250666: - .incbin "baserom.dol", 0x46B4BC, 0x14 + .asciz "WhispyExBreathTail" + .balign 4 .global $$250667 $$250667: - .incbin "baserom.dol", 0x46B4D0, 0x18 + .asciz "WhispyExDeathLeafDrop" + .balign 4 .global $$250668 $$250668: - .incbin "baserom.dol", 0x46B4E8, 0x18 + .asciz "WhispyExGrowLeafDrop" + .balign 4 .global $$250669 $$250669: - .incbin "baserom.dol", 0x46B500, 0x14 + .asciz "WhispyExLLeafDrop" + .balign 4 .global $$250670 $$250670: - .incbin "baserom.dol", 0x46B514, 0x14 + .asciz "WhispyExSLeafDrop" + .balign 4 .global $$250671 $$250671: - .incbin "baserom.dol", 0x46B528, 0x18 + .asciz "WhispyGrowLeafDrop" + .balign 4 + .4byte 0 .global $$250672 $$250672: - .incbin "baserom.dol", 0x46B540, 0x10 + .asciz "WhispyGrowSmoke" .global $$250673 $$250673: - .incbin "baserom.dol", 0x46B550, 0x10 + .asciz "WhispyLLeafDrop" .global $$250674 $$250674: - .incbin "baserom.dol", 0x46B560, 0x10 + .asciz "WhispySLeafDrop" .global $$250675 $$250675: - .incbin "baserom.dol", 0x46B570, 0x10 + .asciz "WhispyTearShine" .global $$250676 $$250676: - .incbin "baserom.dol", 0x46B580, 0x10 + .asciz "WingBigBang" + .4byte 0 .global $$250677 $$250677: - .incbin "baserom.dol", 0x46B590, 0x10 + .asciz "WingBigBangLine" .global $$250678 $$250678: - .incbin "baserom.dol", 0x46B5A0, 0x14 + .asciz "WingFlightFeather" + .balign 4 .global $$250679 $$250679: - .incbin "baserom.dol", 0x46B5B4, 0xC + .asciz "WingToss" + .balign 4 .global $$250680 $$250680: - .incbin "baserom.dol", 0x46B5C0, 0x10 + .asciz "WingShockWave" + .balign 4 .global $$250681 $$250681: - .incbin "baserom.dol", 0x46B5D0, 0x10 + .asciz "WingShuttleLoop" .global $$250682 $$250682: - .incbin "baserom.dol", 0x46B5E0, 0x18 + .asciz "WingOwgulfBigAttackL" + .balign 4 .global $$250683 $$250683: - .incbin "baserom.dol", 0x46B5F8, 0x18 + .asciz "WingOwgulfBigAttackR" + .balign 4 .global $$250684 $$250684: - .incbin "baserom.dol", 0x46B610, 0x18 + .asciz "WingOwgulfSmallAttackL" + .balign 4 .global $$250685 $$250685: - .incbin "baserom.dol", 0x46B628, 0x18 + .asciz "WingOwgulfSmallAttackR" + .balign 4 .global $$250686 $$250686: - .incbin "baserom.dol", 0x46B640, 0x14 + .asciz "WingOwgulfWingTail" + .balign 4 .global $$250696 $$250696: - .incbin "baserom.dol", 0x46B654, 0x10 + .asciz "GroundAttack" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x46B664, 0xC + .asciz "ArmorDee" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x46B670, 0x14 + .asciz "step/obj/PtArmorDee" .global $$248740 $$248740: - .incbin "baserom.dol", 0x46B684, 0xC + .asciz "Attribute" + .balign 4 .global $$248741 $$248741: - .incbin "baserom.dol", 0x46B690, 0x18 + .asciz "step/obj/PtAttribute" + .balign 4 .global $$248743 $$248743: - .incbin "baserom.dol", 0x46B6A8, 0x10 + .asciz "step/obj/PtBeam" .global $$248745 $$248745: - .incbin "baserom.dol", 0x46B6B8, 0x10 + .asciz "step/obj/PtBomb" .global $$248747 $$248747: - .incbin "baserom.dol", 0x46B6C8, 0x14 + .asciz "step/obj/PtBowby" + .balign 4 .global $$248749 $$248749: - .incbin "baserom.dol", 0x46B6DC, 0x14 + .asciz "step/obj/PtBroom" + .balign 4 .global $$248750 $$248750: - .incbin "baserom.dol", 0x46B6F0, 0x10 + .asciz "ChallengeInfo" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x46B700, 0x1C + .asciz "step/obj/PtChallengeInfo" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x46B71C, 0x14 + .asciz "step/obj/PtColdtzo" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x46B730, 0xC + .asciz "ColdtzoBomb" .global $$248755 $$248755: - .incbin "baserom.dol", 0x46B73C, 0x18 + .asciz "step/obj/PtColdtzoBomb" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x46B754, 0x14 + .asciz "step/obj/PtCommon" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x46B768, 0x14 + .asciz "step/obj/PtCutter" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x46B77C, 0x14 + .asciz "step/obj/PtDamage" + .balign 4 .global $$248763 $$248763: - .incbin "baserom.dol", 0x46B790, 0x14 + .asciz "step/obj/PtDedede" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x46B7A4, 0x10 + .asciz "step/obj/PtDee" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x46B7B4, 0xC + .asciz "EnemyCommon" .global $$248767 $$248767: - .incbin "baserom.dol", 0x46B7C0, 0x18 + .asciz "step/obj/PtEnemyCommon" + .balign 4 .global $$248769 $$248769: - .incbin "baserom.dol", 0x46B7D8, 0x18 + .asciz "step/obj/PtFighter" + .balign 4 + .4byte 0 .global $$248771 $$248771: - .incbin "baserom.dol", 0x46B7F0, 0x10 + .asciz "step/obj/PtFire" .global $$248773 $$248773: - .incbin "baserom.dol", 0x46B800, 0x14 + .asciz "step/obj/PtGhost" + .balign 4 .global $$248775 $$248775: - .incbin "baserom.dol", 0x46B814, 0x14 + .asciz "step/obj/PtGigatzo" + .balign 4 .global $$248776 $$248776: - .incbin "baserom.dol", 0x46B828, 0xC + .asciz "GigatzoBomb" .global $$248777 $$248777: - .incbin "baserom.dol", 0x46B834, 0x18 + .asciz "step/obj/PtGigatzoBomb" + .balign 4 .global $$248779 $$248779: - .incbin "baserom.dol", 0x46B84C, 0x14 + .asciz "step/obj/PtGmkBall" + .balign 4 .global $$248780 $$248780: - .incbin "baserom.dol", 0x46B860, 0x14 + .asciz "GmkChallengeDoor" + .balign 4 .global $$248781 $$248781: - .incbin "baserom.dol", 0x46B874, 0x1C + .asciz "step/obj/PtGmkChallengeDoor" .global $$248782 $$248782: - .incbin "baserom.dol", 0x46B890, 0xC + .asciz "GmkCommon" + .balign 4 .global $$248783 $$248783: - .incbin "baserom.dol", 0x46B89C, 0x18 + .asciz "step/obj/PtGmkCommon" + .balign 4 .global $$248784 $$248784: - .incbin "baserom.dol", 0x46B8B4, 0xC + .asciz "GmkLvMap" + .balign 4 .global $$248785 $$248785: - .incbin "baserom.dol", 0x46B8C0, 0x14 + .asciz "step/obj/PtGmkLvMap" .global $$248786 $$248786: - .incbin "baserom.dol", 0x46B8D4, 0xC + .asciz "GmkWarpStar" .global $$248787 $$248787: - .incbin "baserom.dol", 0x46B8E0, 0x18 + .asciz "step/obj/PtGmkWarpStar" + .balign 4 .global $$248788 $$248788: - .incbin "baserom.dol", 0x46B8F8, 0xC + .asciz "HalcanBowby" .global $$248789 $$248789: - .incbin "baserom.dol", 0x46B904, 0x18 + .asciz "step/obj/PtHalcanBowby" + .balign 4 .global $$248791 $$248791: - .incbin "baserom.dol", 0x46B91C, 0x14 + .asciz "step/obj/PtHammer" + .balign 4 .global $$248793 $$248793: - .incbin "baserom.dol", 0x46B930, 0x10 + .asciz "step/obj/PtIce" + .balign 4 .global $$248795 $$248795: - .incbin "baserom.dol", 0x46B940, 0x10 + .asciz "step/obj/PtInfo" .global $$248797 $$248797: - .incbin "baserom.dol", 0x46B950, 0x10 + .asciz "step/obj/PtItem" .global $$248799 $$248799: - .incbin "baserom.dol", 0x46B960, 0x10 + .asciz "step/obj/PtLeaf" .global $$248801 $$248801: - .incbin "baserom.dol", 0x46B970, 0x14 + .asciz "step/obj/PtMaster" + .balign 4 .global $$248802 $$248802: - .incbin "baserom.dol", 0x46B984, 0xC + .asciz "Metaknight" + .balign 4 .global $$248803 $$248803: - .incbin "baserom.dol", 0x46B990, 0x18 + .asciz "step/obj/PtMetaknight" + .balign 4 .global $$248805 $$248805: - .incbin "baserom.dol", 0x46B9A8, 0x10 + .asciz "step/obj/PtMike" .global $$248807 $$248807: - .incbin "baserom.dol", 0x46B9B8, 0x14 + .asciz "step/obj/PtMissile" + .balign 4 .global $$248808 $$248808: - .incbin "baserom.dol", 0x46B9CC, 0xC + .asciz "Moundeath" + .balign 4 .global $$248809 $$248809: - .incbin "baserom.dol", 0x46B9D8, 0x18 + .asciz "step/obj/PtMoundeath" + .balign 4 .global $$248811 $$248811: - .incbin "baserom.dol", 0x46B9F0, 0x14 + .asciz "step/obj/PtNeedle" + .balign 4 .global $$248813 $$248813: - .incbin "baserom.dol", 0x46BA04, 0x14 + .asciz "step/obj/PtNinja" + .balign 4 .global $$248815 $$248815: - .incbin "baserom.dol", 0x46BA18, 0x14 + .asciz "step/obj/PtNormal" + .balign 4 .global $$248817 $$248817: - .incbin "baserom.dol", 0x46BA2C, 0x14 + .asciz "step/obj/PtParasol" + .balign 4 .global $$248818 $$248818: - .incbin "baserom.dol", 0x46BA40, 0xC + .asciz "PuppetDee" + .balign 4 .global $$248819 $$248819: - .incbin "baserom.dol", 0x46BA4C, 0x1C + .asciz "step/obj/PtPuppetDee" + .balign 4 + .4byte 0 .global $$248821 $$248821: - .incbin "baserom.dol", 0x46BA68, 0x10 + .asciz "step/obj/PtShip" .global $$248823 $$248823: - .incbin "baserom.dol", 0x46BA78, 0x14 + .asciz "step/obj/PtShotzo" + .balign 4 .global $$248825 $$248825: - .incbin "baserom.dol", 0x46BA8C, 0x14 + .asciz "step/obj/PtSleep" + .balign 4 .global $$248827 $$248827: - .incbin "baserom.dol", 0x46BAA0, 0x14 + .asciz "step/obj/PtSpark" + .balign 4 .global $$248829 $$248829: - .incbin "baserom.dol", 0x46BAB4, 0x14 + .asciz "step/obj/PtSpear" + .balign 4 .global $$248831 $$248831: - .incbin "baserom.dol", 0x46BAC8, 0x14 + .asciz "step/obj/PtStone" + .balign 4 .global $$248833 $$248833: - .incbin "baserom.dol", 0x46BADC, 0x10 + .asciz "step/obj/PtSun" + .balign 4 .global $$248835 $$248835: - .incbin "baserom.dol", 0x46BAEC, 0x14 + .asciz "step/obj/PtSword" + .balign 4 .global $$248837 $$248837: - .incbin "baserom.dol", 0x46BB00, 0x14 + .asciz "step/obj/PtTornado" + .balign 4 .global $$248839 $$248839: - .incbin "baserom.dol", 0x46BB14, 0x14 + .asciz "step/obj/PtVolttzo" + .balign 4 .global $$248841 $$248841: - .incbin "baserom.dol", 0x46BB28, 0x18 + .asciz "step/obj/PtWater" + .balign 4 + .4byte 0 .global $$248843 $$248843: - .incbin "baserom.dol", 0x46BB40, 0x10 + .asciz "step/obj/PtWhip" .global $$248845 $$248845: - .incbin "baserom.dol", 0x46BB50, 0x18 + .asciz "step/obj/PtWhispy" + .balign 4 + .4byte 0 .global $$248847 $$248847: - .incbin "baserom.dol", 0x46BB68, 0x10 + .asciz "step/obj/PtWing" .global $$248849 $$248849: - .incbin "baserom.dol", 0x46BB78, 0x14 + .asciz "step/map/PtMapCave" + .balign 4 .global $$248850 $$248850: - .incbin "baserom.dol", 0x46BB8C, 0xC + .asciz "MapGCKCloud" .global $$248851 $$248851: - .incbin "baserom.dol", 0x46BB98, 0x18 + .asciz "step/map/PtMapGCKCloud" + .balign 4 .global $$248852 $$248852: - .incbin "baserom.dol", 0x46BBB0, 0xC + .asciz "MapGrass" + .balign 4 .global $$248853 $$248853: - .incbin "baserom.dol", 0x46BBBC, 0x14 + .asciz "step/map/PtMapGrass" .global $$248855 $$248855: - .incbin "baserom.dol", 0x46BBD0, 0x14 + .asciz "step/map/PtMapSnow" + .balign 4 .global $$248857 $$248857: - .incbin "baserom.dol", 0x46BBE4, 0x1C + .asciz "step/effect/common/OneUpGet" .global $$248858 $$248858: - .incbin "baserom.dol", 0x46BC00, 0x24 + .asciz "step/effect/common/ScoreCoinBGet" + .balign 4 .global $$248859 $$248859: - .incbin "baserom.dol", 0x46BC24, 0x24 + .asciz "step/effect/common/ScoreCoinSGet" + .balign 4 .global $$248860 $$248860: - .incbin "baserom.dol", 0x46BC48, 0x20 + .asciz "step/effect/dedede/AttackCrown" + .balign 4 .global $$248861 $$248861: - .incbin "baserom.dol", 0x46BC68, 0x20 + .asciz "step/effect/dedede/AttackTail" + .balign 4 .global $$248862 $$248862: - .incbin "baserom.dol", 0x46BC88, 0x28 + .asciz "step/effect/dedede/TripleAttackCrown" + .balign 4 .global $$248863 $$248863: - .incbin "baserom.dol", 0x46BCB0, 0x20 + .asciz "step/effect/dee/DeeSpearCopter" + .balign 4 .global $$248864 $$248864: - .incbin "baserom.dol", 0x46BCD0, 0x20 + .asciz "step/effect/dee/DeeSpearVanish" + .balign 4 .global $$248865 $$248865: - .incbin "baserom.dol", 0x46BCF0, 0x1C + .asciz "step/effect/fighter/Double" + .balign 4 .global $$248866 $$248866: - .incbin "baserom.dol", 0x46BD0C, 0x24 + .asciz "step/effect/fighter/GigaHadouShot" + .balign 4 .global $$248867 $$248867: - .incbin "baserom.dol", 0x46BD30, 0x20 + .asciz "step/effect/fighter/HadouShot" + .balign 4 .global $$248868 $$248868: - .incbin "baserom.dol", 0x46BD50, 0x24 + .asciz "step/effect/fighter/MegaHadouShot" + .balign 4 .global $$248869 $$248869: - .incbin "baserom.dol", 0x46BD74, 0x20 + .asciz "step/effect/fighter/Moonsault" + .balign 4 .global $$248870 $$248870: - .incbin "baserom.dol", 0x46BD94, 0x1C + .asciz "step/effect/fighter/Rising" + .balign 4 .global $$248871 $$248871: - .incbin "baserom.dol", 0x46BDB0, 0x1C + .asciz "step/effect/fighter/Smash" + .balign 4 .global $$248872 $$248872: - .incbin "baserom.dol", 0x46BDCC, 0x1C + .asciz "step/effect/fighter/Spin" + .balign 4 .global $$248873 $$248873: - .incbin "baserom.dol", 0x46BDE8, 0x1C + .asciz "step/effect/fighter/Stamp" + .balign 4 .global $$248874 $$248874: - .incbin "baserom.dol", 0x46BE04, 0x20 + .asciz "step/effect/fire/BurningAttack" + .balign 4 .global $$248875 $$248875: - .incbin "baserom.dol", 0x46BE24, 0x1C + .asciz "step/effect/fire/HatWarp" + .balign 4 .global $$248876 $$248876: - .incbin "baserom.dol", 0x46BE40, 0x1C + .asciz "step/effect/gmkcommon/Door" + .balign 4 .global $$248877 $$248877: - .incbin "baserom.dol", 0x46BE5C, 0x20 + .asciz "step/effect/hammer/AttackCrown" + .balign 4 .global $$248878 $$248878: - .incbin "baserom.dol", 0x46BE7C, 0x20 + .asciz "step/effect/hammer/AttackTail" + .balign 4 .global $$248879 $$248879: - .incbin "baserom.dol", 0x46BE9C, 0x28 + .asciz "step/effect/hammer/TripleAttackCrown" + .balign 4 .global $$248880 $$248880: - .incbin "baserom.dol", 0x46BEC4, 0x2C + .asciz "step/effect/metaknight/CombinationAttack" + .balign 4 .global $$248881 $$248881: - .incbin "baserom.dol", 0x46BEF0, 0x24 + .asciz "step/effect/metaknight/CondorDive" + .balign 4 .global $$248882 $$248882: - .incbin "baserom.dol", 0x46BF14, 0x20 + .asciz "step/effect/metaknight/Flight" + .balign 4 .global $$248883 $$248883: - .incbin "baserom.dol", 0x46BF34, 0x20 + .asciz "step/effect/metaknight/Attack1" + .balign 4 .global $$248884 $$248884: - .incbin "baserom.dol", 0x46BF54, 0x20 + .asciz "step/effect/metaknight/Attack2" + .balign 4 .global $$248885 $$248885: - .incbin "baserom.dol", 0x46BF74, 0x20 + .asciz "step/effect/metaknight/Attack3" + .balign 4 .global $$248886 $$248886: - .incbin "baserom.dol", 0x46BF94, 0x20 + .asciz "step/effect/metaknight/Thrust" + .balign 4 .global $$248887 $$248887: - .incbin "baserom.dol", 0x46BFB4, 0x1C + .asciz "step/effect/normal/Vacuum" + .balign 4 .global $$248888 $$248888: - .incbin "baserom.dol", 0x46BFD0, 0x20 + .asciz "step/effect/normal/VacuumHustle" .global $$248889 $$248889: - .incbin "baserom.dol", 0x46BFF0, 0x20 + .asciz "step/effect/normal/VacuumWarp" + .balign 4 .global $$248890 $$248890: - .incbin "baserom.dol", 0x46C010, 0x24 + .asciz "step/effect/normal/VacuumHustleWarp" .global $$248891 $$248891: - .incbin "baserom.dol", 0x46C034, 0x20 + .asciz "step/effect/spark/SparkLaser" + .balign 4 .global $$248892 $$248892: - .incbin "baserom.dol", 0x46C054, 0x20 + .asciz "step/effect/spear/SpearVanish" + .balign 4 .global $$248893 $$248893: - .incbin "baserom.dol", 0x46C074, 0x1C + .asciz "step/effect/sword/Attack" + .balign 4 .global $$248894 $$248894: - .incbin "baserom.dol", 0x46C090, 0x1C + .asciz "step/effect/sword/AttackAir" .global $$248895 $$248895: - .incbin "baserom.dol", 0x46C0AC, 0x20 + .asciz "step/effect/sword/BladeAttack" + .balign 4 .global $$248896 $$248896: - .incbin "baserom.dol", 0x46C0CC, 0x24 + .asciz "step/effect/sword/Bladedoubleattack" .global $$248897 $$248897: - .incbin "baserom.dol", 0x46C0F0, 0x24 + .asciz "step/effect/sword/GigantEdgeAttack" + .balign 4 .global $$248898 $$248898: - .incbin "baserom.dol", 0x46C114, 0x20 + .asciz "step/effect/sword/SodoryAttack" + .balign 4 .global $$248899 $$248899: - .incbin "baserom.dol", 0x46C134, 0x1C + .asciz "step/effect/sword/Thrust" + .balign 4 .global $$248900 $$248900: - .incbin "baserom.dol", 0x46C150, 0x1C + .asciz "step/effect/tornado/Attack" + .balign 4 .global $$248901 $$248901: - .incbin "baserom.dol", 0x46C16C, 0x18 + .asciz "step/effect/whip/Drill" + .balign 4 .global $$248902 $$248902: - .incbin "baserom.dol", 0x46C184, 0x20 + .asciz "step/effect/whip/GazerSpiral" + .balign 4 .global $$248903 $$248903: - .incbin "baserom.dol", 0x46C1A4, 0x18 + .asciz "step/effect/whip/Rush" + .balign 4 .global $$248904 $$248904: - .incbin "baserom.dol", 0x46C1BC, 0x24 + .asciz "step/effect/whispy/BigVacuum" + .balign 4 + .4byte 0 .global $$248905 $$248905: - .incbin "baserom.dol", 0x46C1E0, 0x18 + .asciz "step/effect/whispy/Tear" .global $$248906 $$248906: - .incbin "baserom.dol", 0x46C1F8, 0x20 + .asciz "step/effect/wing/BigBang" + .balign 4 + .4byte 0 .global $$248907 $$248907: - .incbin "baserom.dol", 0x46C218, 0x18 + .asciz "step/effect/wing/Flight" .global T_POLY_RESPATHS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x46C230, 0xD0 + .4byte 0x8046FAE4 + .4byte 0x8046FB00 + .4byte 0x8046FB24 + .4byte 0x8046FB48 + .4byte 0x8046FB68 + .4byte 0x8046FB88 + .4byte 0x8046FBB0 + .4byte 0x8046FBD0 + .4byte 0x8046FBF0 + .4byte 0x8046FC0C + .4byte 0x8046FC30 + .4byte 0x8046FC50 + .4byte 0x8046FC74 + .4byte 0x8046FC94 + .4byte 0x8046FCB0 + .4byte 0x8046FCCC + .4byte 0x8046FCE8 + .4byte 0x8046FD04 + .4byte 0x8046FD24 + .4byte 0x8046FD40 + .4byte 0x8046FD5C + .4byte 0x8046FD7C + .4byte 0x8046FD9C + .4byte 0x8046FDC4 + .4byte 0x8046FDF0 + .4byte 0x8046FE14 + .4byte 0x8046FE34 + .4byte 0x8046FE54 + .4byte 0x8046FE74 + .4byte 0x8046FE94 + .4byte 0x8046FEB4 + .4byte 0x8046FED0 + .4byte 0x8046FEF0 + .4byte 0x8046FF10 + .4byte 0x8046FF34 + .4byte 0x8046FF54 + .4byte 0x8046FF74 + .4byte 0x8046FF90 + .4byte 0x8046FFAC + .4byte 0x8046FFCC + .4byte 0x8046FFF0 + .4byte 0x80470014 + .4byte 0x80470034 + .4byte 0x80470050 + .4byte 0x8047006C + .4byte 0x80470084 + .4byte 0x804700A4 + .4byte 0x804700BC + .4byte 0x804700E0 + .4byte 0x804700F8 + .4byte 0x80470118 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: - .incbin "baserom.dol", 0x4917F0, 0xC + .asciz "GrandMenu" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x4917FC, 0x1C + .asciz "step/grandmenu/PtGrandMenu" + .balign 4 .global $$248845 $$248845: - .incbin "baserom.dol", 0x491818, 0x10 + .asciz "GrandMenuLight" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x491828, 0x10 + .asciz "GrandMenuDecide" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248740 $$248740: - .incbin "baserom.dol", 0x4941B8, 0x8 + .asciz "Common" + .balign 4 .global $$248742 $$248742: - .incbin "baserom.dol", 0x4941C0, 0x8 + .asciz "Spark" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248738 $$248738: - .incbin "baserom.dol", 0x4941D0, 0x8 + .asciz "Info" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x494858, 0x8 + .4byte 0x80460B60 + .4byte 0x80460B78 .global $$248890 $$248890: - .incbin "baserom.dol", 0x494860, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248738 $$248738: - .incbin "baserom.dol", 0x495108, 0x8 + .asciz "History" .global $$248740 $$248740: - .incbin "baserom.dol", 0x495110, 0x8 + .asciz "Normal" + .balign 4 .global T_POLY_RESPATHS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x495118, 0x8 + .4byte 0x804635F0 + .4byte 0x8046360C .global $$248876 $$248876: - .incbin "baserom.dol", 0x495120, 0x8 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250606 $$250606: - .incbin "baserom.dol", 0x495878, 0x4 + .4byte 0x53756E00 .global $$250687 $$250687: - .incbin "baserom.dol", 0x49587C, 0x4 + .4byte 0 .global $$250688 $$250688: - .incbin "baserom.dol", 0x495880, 0x4 + .4byte 0x424F0000 .global $$250689 $$250689: - .incbin "baserom.dol", 0x495884, 0x4 + .4byte 0x42580000 .global $$250690 $$250690: - .incbin "baserom.dol", 0x495888, 0x4 + .4byte 0x474F0000 .global $$250691 $$250691: - .incbin "baserom.dol", 0x49588C, 0x4 + .4byte 0x47580000 .global $$250692 $$250692: - .incbin "baserom.dol", 0x495890, 0x4 + .4byte 0x4E4F0000 .global $$250693 $$250693: - .incbin "baserom.dol", 0x495894, 0x4 + .4byte 0x4E580000 .global $$250694 $$250694: - .incbin "baserom.dol", 0x495898, 0x8 + .asciz "Attack" + .balign 4 .global $$250695 $$250695: - .incbin "baserom.dol", 0x4958A0, 0x8 + .asciz "Attack2" .global $$248742 $$248742: - .incbin "baserom.dol", 0x4958A8, 0x8 + .asciz "Beam" + .balign 4 .global $$248744 $$248744: - .incbin "baserom.dol", 0x4958B0, 0x8 + .asciz "Bomb" + .balign 4 .global $$248746 $$248746: - .incbin "baserom.dol", 0x4958B8, 0x8 + .asciz "Bowby" + .balign 4 .global $$248748 $$248748: - .incbin "baserom.dol", 0x4958C0, 0x8 + .asciz "Broom" + .balign 4 .global $$248752 $$248752: - .incbin "baserom.dol", 0x4958C8, 0x8 + .asciz "Coldtzo" .global $$248756 $$248756: - .incbin "baserom.dol", 0x4958D0, 0x8 + .asciz "Common" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x4958D8, 0x8 + .asciz "Cutter" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x4958E0, 0x8 + .asciz "Damage" + .balign 4 .global $$248762 $$248762: - .incbin "baserom.dol", 0x4958E8, 0x8 + .asciz "Dedede" + .balign 4 .global $$248764 $$248764: - .incbin "baserom.dol", 0x4958F0, 0x8 + .4byte 0x44656500 + .4byte 0 .global $$248768 $$248768: - .incbin "baserom.dol", 0x4958F8, 0x8 + .asciz "Fighter" .global $$248770 $$248770: - .incbin "baserom.dol", 0x495900, 0x8 + .asciz "Fire" + .balign 4 .global $$248772 $$248772: - .incbin "baserom.dol", 0x495908, 0x8 + .asciz "Ghost" + .balign 4 .global $$248774 $$248774: - .incbin "baserom.dol", 0x495910, 0x8 + .asciz "Gigatzo" .global $$248778 $$248778: - .incbin "baserom.dol", 0x495918, 0x8 + .asciz "GmkBall" .global $$248790 $$248790: - .incbin "baserom.dol", 0x495920, 0x8 + .asciz "Hammer" + .balign 4 .global $$248792 $$248792: - .incbin "baserom.dol", 0x495928, 0x4 + .4byte 0x49636500 .global $$248794 $$248794: - .incbin "baserom.dol", 0x49592C, 0x8 + .asciz "Info" + .balign 4 .global $$248796 $$248796: - .incbin "baserom.dol", 0x495934, 0x8 + .asciz "Item" + .balign 4 .global $$248798 $$248798: - .incbin "baserom.dol", 0x49593C, 0x8 + .asciz "Leaf" + .balign 4 .global $$248800 $$248800: - .incbin "baserom.dol", 0x495944, 0x8 + .asciz "Master" + .balign 4 .global $$248804 $$248804: - .incbin "baserom.dol", 0x49594C, 0xC + .asciz "Mike" + .balign 4 + .4byte 0 .global $$248806 $$248806: - .incbin "baserom.dol", 0x495958, 0x8 + .asciz "Missile" .global $$248810 $$248810: - .incbin "baserom.dol", 0x495960, 0x8 + .asciz "Needle" + .balign 4 .global $$248812 $$248812: - .incbin "baserom.dol", 0x495968, 0x8 + .asciz "Ninja" + .balign 4 .global $$248814 $$248814: - .incbin "baserom.dol", 0x495970, 0x8 + .asciz "Normal" + .balign 4 .global $$248816 $$248816: - .incbin "baserom.dol", 0x495978, 0x8 + .asciz "Parasol" .global $$248820 $$248820: - .incbin "baserom.dol", 0x495980, 0x8 + .asciz "Ship" + .balign 4 .global $$248822 $$248822: - .incbin "baserom.dol", 0x495988, 0x8 + .asciz "Shotzo" + .balign 4 .global $$248824 $$248824: - .incbin "baserom.dol", 0x495990, 0x8 + .asciz "Sleep" + .balign 4 .global $$248826 $$248826: - .incbin "baserom.dol", 0x495998, 0x8 + .asciz "Spark" + .balign 4 .global $$248828 $$248828: - .incbin "baserom.dol", 0x4959A0, 0x8 + .asciz "Spear" + .balign 4 .global $$248830 $$248830: - .incbin "baserom.dol", 0x4959A8, 0x8 + .asciz "Stone" + .balign 4 .global $$248832 $$248832: - .incbin "baserom.dol", 0x4959B0, 0x4 + .4byte 0x53756E00 .global $$248834 $$248834: - .incbin "baserom.dol", 0x4959B4, 0xC + .asciz "Sword" + .balign 4 + .4byte 0 .global $$248836 $$248836: - .incbin "baserom.dol", 0x4959C0, 0x8 + .asciz "Tornado" .global $$248838 $$248838: - .incbin "baserom.dol", 0x4959C8, 0x8 + .asciz "Volttzo" .global $$248840 $$248840: - .incbin "baserom.dol", 0x4959D0, 0x8 + .asciz "Water" + .balign 4 .global $$248842 $$248842: - .incbin "baserom.dol", 0x4959D8, 0x8 + .asciz "Whip" + .balign 4 .global $$248844 $$248844: - .incbin "baserom.dol", 0x4959E0, 0x8 + .asciz "Whispy" + .balign 4 .global $$248846 $$248846: - .incbin "baserom.dol", 0x4959E8, 0x8 + .asciz "Wing" + .balign 4 .global $$248848 $$248848: - .incbin "baserom.dol", 0x4959F0, 0x8 + .asciz "MapCave" .global $$248854 $$248854: - .incbin "baserom.dol", 0x4959F8, 0x8 + .asciz "MapSnow" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x49A8D0, 0x8 + .4byte 0x8045E968 + .4byte 0x8045E974 .global $$248833 $$248833: - .incbin "baserom.dol", 0x49A8D8, 0x4 + .4byte 0x00000001 .global lbl_8055FD9C lbl_8055FD9C: - .incbin "baserom.dol", 0x49A8DC, 0x4 + .4byte 0x80545EE0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248847 $$248847: - .incbin "baserom.dol", 0x49A960, 0x4 + .4byte 0x00000004 .global lbl_8055FE24 lbl_8055FE24: - .incbin "baserom.dol", 0x49A964, 0x4 + .4byte 0x805461D0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248842 $$248842: - .incbin "baserom.dol", 0x49A9A0, 0x4 + .4byte 0x00000005 .global lbl_8055FE64 lbl_8055FE64: - .incbin "baserom.dol", 0x49A9A4, 0x4 + .4byte 0x805462B8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x49AB38, 0x8 + .4byte 0x80460B38 + .4byte 0x80460B48 .global $$248870 $$248870: - .incbin "baserom.dol", 0x49AB40, 0x4 + .4byte 0x00000010 .global lbl_80560004 lbl_80560004: - .incbin "baserom.dol", 0x49AB44, 0x4 + .4byte 0x805463E0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248862 $$248862: - .incbin "baserom.dol", 0x49AD30, 0x4 + .4byte 0x0000000A .global lbl_805601F4 lbl_805601F4: - .incbin "baserom.dol", 0x49AD34, 0x4 + .4byte 0x80546978 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250163 $$250163: - .incbin "baserom.dol", 0x49B928, 0x4 + .4byte 0x00000244 .global lbl_80560DEC lbl_80560DEC: - .incbin "baserom.dol", 0x49B92C, 0x4 + .4byte 0x80547610 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2: - .incbin "baserom.dol", 0x49ED70, 0x8 + .4byte 0x804956F0 + .4byte 0x804956FC .global $$248839 $$248839: - .incbin "baserom.dol", 0x49ED78, 0x4 + .4byte 0x00000002 .global lbl_8056423C lbl_8056423C: - .incbin "baserom.dol", 0x49ED7C, 0x4 + .4byte 0x80556398 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2t_genContextHeader__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS diff --git a/asm/src/TagProcessor.s b/asm/src/TagProcessor.s index 40ad9d99..e73fa410 100644 --- a/asm/src/TagProcessor.s +++ b/asm/src/TagProcessor.s @@ -123,4 +123,9 @@ setUseButtonPushedChar__Q23lyt12TagProcessorFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23lyt12TagProcessor __vt__Q23lyt12TagProcessor: - .incbin "baserom.dol", 0x453EA0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801AC73C ;# ptr + .4byte 0x801AFC70 ;# ptr + .4byte 0x801AFD08 ;# ptr + .4byte 0 diff --git a/asm/src/TagUtil.s b/asm/src/TagUtil.s index fac98025..cbd2e11f 100644 --- a/asm/src/TagUtil.s +++ b/asm/src/TagUtil.s @@ -270,7 +270,15 @@ onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q33lyt7TagUtil25Iterator$48859TagUtil_cpp __vt__Q33lyt7TagUtil25Iterator$48859TagUtil_cpp: - .incbin "baserom.dol", 0x453EB8, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801B0104 ;# ptr + .4byte 0x801B00F4 ;# ptr + .4byte 0x801B00C0 ;# ptr .global __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp: - .incbin "baserom.dol", 0x453ECC, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801B0128 ;# ptr + .4byte 0x801B0118 ;# ptr + .4byte 0x801B0108 ;# ptr diff --git a/asm/src/TalkManager.s b/asm/src/TalkManager.s index e93a05b2..d0b38a1e 100644 --- a/asm/src/TalkManager.s +++ b/asm/src/TalkManager.s @@ -192,15 +192,16 @@ lbl_802F82FC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252113 $$252113: - .incbin "baserom.dol", 0x47B0B0, 0x1C + .asciz "step/message/MahoroaName" + .balign 4 .global $$252114 $$252114: - .incbin "baserom.dol", 0x47B0CC, 0x24 + .asciz "step/message/MahoroaSpeak_FirstDemo" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252115 $$252115: - .incbin "baserom.dol", 0x49D118, 0x4 + .4byte 0x8047EFB0 .global lbl_805625DC lbl_805625DC: - .incbin "baserom.dol", 0x49D11C, 0x4 + .4byte 0x8047EFCC diff --git a/asm/src/Target.s b/asm/src/Target.s index 86c0dc69..4ed25912 100644 --- a/asm/src/Target.s +++ b/asm/src/Target.s @@ -64,7 +64,7 @@ invert__Q24gobj6TargetFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250757 $$250757: - .incbin "baserom.dol", 0x49A2F0, 0x4 + .4byte 0x3F800000 .global $$250758 $$250758: - .incbin "baserom.dol", 0x49A2F4, 0x4 + .4byte 0xBF800000 diff --git a/asm/src/TargetScorePanel.s b/asm/src/TargetScorePanel.s index 446c774b..5caa5ab1 100644 --- a/asm/src/TargetScorePanel.s +++ b/asm/src/TargetScorePanel.s @@ -478,68 +478,89 @@ lbl_803C03F0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251706 $$251706: - .incbin "baserom.dol", 0x41C200, 0x18 + .4byte 0x80491B70 + .4byte 0x80491B80 + .4byte 0x80491B90 + .4byte 0x80491BA0 + .4byte 0x80491BB0 + .4byte 0 .global $$252072 $$252072: - .incbin "baserom.dol", 0x41C218, 0x10 + .4byte 0x80491BE0 + .4byte 0x80491BF4 + .4byte 0x80491C08 + .4byte 0x80491C18 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251701 $$251701: - .incbin "baserom.dol", 0x48DC70, 0x10 + .asciz "TargetBronzeN" + .balign 4 .global $$251702 $$251702: - .incbin "baserom.dol", 0x48DC80, 0x10 + .asciz "TargetSilverN" + .balign 4 .global $$251703 $$251703: - .incbin "baserom.dol", 0x48DC90, 0x10 + .asciz "TargetGoldN" + .4byte 0 .global $$251704 $$251704: - .incbin "baserom.dol", 0x48DCA0, 0x10 + .asciz "TargetPlatinumN" .global $$251705 $$251705: - .incbin "baserom.dol", 0x48DCB0, 0x10 + .asciz "TargetKingN" + .4byte 0 .global $$252644 $$252644: - .incbin "baserom.dol", 0x48DCC0, 0x10 + .asciz "step/lvmap/Main" .global $$252645 $$252645: - .incbin "baserom.dol", 0x48DCD0, 0x10 + .asciz "TargetScoreBase" .global $$252068 $$252068: - .incbin "baserom.dol", 0x48DCE0, 0x14 + .asciz "TargetScoreBronze" + .balign 4 .global $$252069 $$252069: - .incbin "baserom.dol", 0x48DCF4, 0x14 + .asciz "TargetScoreSilver" + .balign 4 .global $$252070 $$252070: - .incbin "baserom.dol", 0x48DD08, 0x10 + .asciz "TargetScoreGold" .global $$252071 $$252071: - .incbin "baserom.dol", 0x48DD18, 0x14 + .asciz "TargetScorePlatinum" .global $$252771 $$252771: - .incbin "baserom.dol", 0x48DD2C, 0xC + .asciz "TargetScore" .global $$252772 $$252772: - .incbin "baserom.dol", 0x48DD38, 0x10 + .asciz "KingScoreSecret" .global $$252773 $$252773: - .incbin "baserom.dol", 0x48DD48, 0x40 + .asciz "TargetScoreSh" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252734 $$252734: - .incbin "baserom.dol", 0x4980F8, 0x8 + .asciz "Wait" + .balign 4 .global $$252737 $$252737: - .incbin "baserom.dol", 0x498100, 0x4 + .4byte 0x496E0000 .global $$252745 $$252745: - .incbin "baserom.dol", 0x498104, 0x4 + .4byte 0x4F757400 .global $$252774 $$252774: - .incbin "baserom.dol", 0x498108, 0x8 + .asciz "Focus" + .balign 4 .global $$252775 $$252775: - .incbin "baserom.dol", 0x498110, 0x8 + .asciz "UnFocus" diff --git a/asm/src/Text.s b/asm/src/Text.s index ecd03d8b..4c5b7803 100644 --- a/asm/src/Text.s +++ b/asm/src/Text.s @@ -782,275 +782,480 @@ hideAllText__Q43scn7history6detail4TextFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .incbin "baserom.dol", 0x412188, 0xE8 + .4byte 0 + .4byte 0x80558D10 + .4byte 0x00000001 + .4byte 0x804631B0 + .4byte 0x00000001 + .4byte 0x804631C0 + .4byte 0x00000001 + .4byte 0x804631D8 + .4byte 0 + .4byte 0x80558D10 + .4byte 0x00000001 + .4byte 0x804631F0 + .4byte 0x00000001 + .4byte 0x80463204 + .4byte 0x00000001 + .4byte 0x80463218 + .4byte 0x00000001 + .4byte 0x80463228 + .4byte 0x00000001 + .4byte 0x80463240 + .4byte 0x00000001 + .4byte 0x80463254 + .4byte 0x00000001 + .4byte 0x80463270 + .4byte 0 + .4byte 0x80558D10 + .4byte 0 + .4byte 0x80558D10 + .4byte 0x00000001 + .4byte 0x80463280 + .4byte 0x00000001 + .4byte 0x80463294 + .4byte 0x00000001 + .4byte 0x804632AC + .4byte 0x00000001 + .4byte 0x804632C8 + .4byte 0x00000001 + .4byte 0x804632E0 + .4byte 0x00000001 + .4byte 0x804632F8 + .4byte 0x00000001 + .4byte 0x80463310 + .4byte 0x00000001 + .4byte 0x80463324 + .4byte 0 + .4byte 0x80558D10 + .4byte 0x00000001 + .4byte 0x8046333C + .4byte 0 + .4byte 0x80558D10 + .4byte 0x00000001 + .4byte 0x80463350 + .4byte 0x00000001 + .4byte 0x80463368 + .4byte 0x00000001 + .4byte 0x80463384 + .4byte 0x00000001 + .4byte 0x80463398 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251808 $$251808: - .incbin "baserom.dol", 0x45F0E8, 0xC + .asciz "KAvalancheN" .global $$251809 $$251809: - .incbin "baserom.dol", 0x45F0F4, 0xC + .asciz "KPinballN" + .balign 4 .global $$251812 $$251812: - .incbin "baserom.dol", 0x45F100, 0xC + .asciz "KAirRideN" + .balign 4 .global $$251816 $$251816: - .incbin "baserom.dol", 0x45F10C, 0xC + .asciz "KDreamDXN" + .balign 4 .global $$251817 $$251817: - .incbin "baserom.dol", 0x45F118, 0xC + .asciz "KMirrorN" + .balign 4 .global $$251820 $$251820: - .incbin "baserom.dol", 0x45F124, 0xC + .asciz "KAtsumeteN" + .balign 4 .global PANES__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 PANES__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .incbin "baserom.dol", 0x45F130, 0x5C + .4byte 0x80558C08 + .4byte 0x80558C10 + .4byte 0x80558C18 + .4byte 0x80558C1C + .4byte 0x80558C20 + .4byte 0x80558C24 + .4byte 0x80558C30 + .4byte 0x80558C38 + .4byte 0x80462FE8 + .4byte 0x80462FF4 + .4byte 0x80558C40 + .4byte 0x80558C48 + .4byte 0x80463000 + .4byte 0x80558C50 + .4byte 0x80558C58 + .4byte 0x80558C60 + .4byte 0x8046300C + .4byte 0x80463018 + .4byte 0x80558C68 + .4byte 0x80558C70 + .4byte 0x80463024 + .4byte 0x80558C78 + .4byte 0x80558C80 .global TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .incbin "baserom.dol", 0x45F18C, 0x74 + .4byte 0x80558C88 + .4byte 0x80558C18 + .4byte 0x80558C30 + .4byte 0x80462FF4 + .4byte 0x80558C88 + .4byte 0x80558C38 + .4byte 0x80462FE8 + .4byte 0x80558C1C + .4byte 0x80558C10 + .4byte 0x80558C08 + .4byte 0x80558C40 + .4byte 0x80558C20 + .4byte 0x80558C88 + .4byte 0x80558C88 + .4byte 0x80558C24 + .4byte 0x80558C48 + .4byte 0x8046300C + .4byte 0x80558C78 + .4byte 0x80463000 + .4byte 0x80463018 + .4byte 0x80558C60 + .4byte 0x80558C68 + .4byte 0x80558C88 + .4byte 0x80558C58 + .4byte 0x80558C88 + .4byte 0x80558C70 + .4byte 0x80463024 + .4byte 0x80558C50 + .4byte 0x80558C80 .global $$251827 $$251827: - .incbin "baserom.dol", 0x45F200, 0xC + .asciz "KPinball" + .balign 4 .global $$251829 $$251829: - .incbin "baserom.dol", 0x45F20C, 0xC + .asciz "KAvalanche" + .balign 4 .global $$251837 $$251837: - .incbin "baserom.dol", 0x45F218, 0xC + .asciz "KDreamDX" + .balign 4 .global $$251839 $$251839: - .incbin "baserom.dol", 0x45F224, 0xC + .asciz "KAirRide" + .balign 4 .global $$251845 $$251845: - .incbin "baserom.dol", 0x45F230, 0xC + .asciz "KAtumete" + .balign 4 .global PICTUREPANE_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 PICTUREPANE_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .incbin "baserom.dol", 0x45F23C, 0x74 + .4byte 0x80558C88 + .4byte 0x80558C90 + .4byte 0x80558C94 + .4byte 0x80463100 + .4byte 0x80558C88 + .4byte 0x80558C9C + .4byte 0x8046310C + .4byte 0x80558CA4 + .4byte 0x80558CA8 + .4byte 0x80558CAC + .4byte 0x80558CB4 + .4byte 0x80558CBC + .4byte 0x80558C88 + .4byte 0x80558C88 + .4byte 0x80558CC0 + .4byte 0x80558CC4 + .4byte 0x80463118 + .4byte 0x80558CCC + .4byte 0x80463124 + .4byte 0x80558CD8 + .4byte 0x80558CE0 + .4byte 0x80558CE8 + .4byte 0x80558C88 + .4byte 0x80558CF0 + .4byte 0x80558C88 + .4byte 0x80558CF8 + .4byte 0x80463130 + .4byte 0x80558D00 + .4byte 0x80558D08 .global $$251850 $$251850: - .incbin "baserom.dol", 0x45F2B0, 0x10 + .asciz "CopyrightKirby1" .global $$251851 $$251851: - .incbin "baserom.dol", 0x45F2C0, 0x18 + .asciz "CopyrightKirbyDreamLand" .global $$251852 $$251852: - .incbin "baserom.dol", 0x45F2D8, 0x18 + .asciz "CopyrightKirbyPinBall" + .balign 4 .global $$251853 $$251853: - .incbin "baserom.dol", 0x45F2F0, 0x14 + .asciz "CopyrightKirbyBall" + .balign 4 .global $$251854 $$251854: - .incbin "baserom.dol", 0x45F304, 0x14 + .asciz "CopyrightAvalanche" + .balign 4 .global $$251855 $$251855: - .incbin "baserom.dol", 0x45F318, 0x10 + .asciz "CopyrightKirby2" .global $$251856 $$251856: - .incbin "baserom.dol", 0x45F328, 0x18 + .asciz "CopyrightKirbyBlockBall" .global $$251857 $$251857: - .incbin "baserom.dol", 0x45F340, 0x14 + .asciz "CopyrightKirbySDX" + .balign 4 .global $$251858 $$251858: - .incbin "baserom.dol", 0x45F354, 0x1C + .asciz "CopyrightKirbyKidsGB" + .balign 4 + .4byte 0 .global $$251859 $$251859: - .incbin "baserom.dol", 0x45F370, 0x10 + .asciz "CopyrightKirby3" .global $$251860 $$251860: - .incbin "baserom.dol", 0x45F380, 0x14 + .asciz "CopyrightKirby64" + .balign 4 .global $$251861 $$251861: - .incbin "baserom.dol", 0x45F394, 0x18 + .asciz "CopyrightKirbyKoroKoro" + .balign 4 .global $$251862 $$251862: - .incbin "baserom.dol", 0x45F3AC, 0x1C + .asciz "CopyrightKirbyDreamLandDX" + .balign 4 .global $$251863 $$251863: - .incbin "baserom.dol", 0x45F3C8, 0x18 + .asciz "CopyrightKirbyAnime1" + .balign 4 .global $$251864 $$251864: - .incbin "baserom.dol", 0x45F3E0, 0x18 + .asciz "CopyrightKirbyAirRide" + .balign 4 .global $$251865 $$251865: - .incbin "baserom.dol", 0x45F3F8, 0x18 + .asciz "CopyrightKirbyMirror" + .balign 4 .global $$251866 $$251866: - .incbin "baserom.dol", 0x45F410, 0x14 + .asciz "CopyrightKirbyTouch" .global $$251867 $$251867: - .incbin "baserom.dol", 0x45F424, 0x18 + .asciz "CopyrightKirbyDoroche" + .balign 4 .global $$251868 $$251868: - .incbin "baserom.dol", 0x45F43C, 0x14 + .asciz "CopyrightKirbyDDX" + .balign 4 .global $$251869 $$251869: - .incbin "baserom.dol", 0x45F450, 0x18 + .asciz "CopyrightKirbyEpicYarn" + .balign 4 .global $$251870 $$251870: - .incbin "baserom.dol", 0x45F468, 0x1C + .asciz "CopyrightKirbyMassAttack" + .balign 4 .global $$251871 $$251871: - .incbin "baserom.dol", 0x45F484, 0x14 + .asciz "CopyrightKirbyWii" + .balign 4 .global $$251872 $$251872: - .incbin "baserom.dol", 0x45F498, 0x14 + .asciz "CopyrightKirby20" + .balign 4 .global $$253072 $$253072: - .incbin "baserom.dol", 0x45F4AC, 0x10 + .asciz "history/Detail" + .balign 4 .global $$253073 $$253073: - .incbin "baserom.dol", 0x45F4BC, 0xC + .asciz "ProductText" .global $$253155 $$253155: - .incbin "baserom.dol", 0x45F4C8, 0x10 + .asciz "CopyrightOtherT" .global $$253156 $$253156: - .incbin "baserom.dol", 0x45F4D8, 0x3C + .asciz "CopyrightT" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetTexture__Q34nw4r3lyt8MaterialCFUc$$20 $$2STRING$$2GetTexture__Q34nw4r3lyt8MaterialCFUc$$20: - .incbin "baserom.dol", 0x45F514, 0x34 + .asciz "NW4R:Failed assertion texMapIdx < mGXMemNum.texMap" + .balign 4 .global $$2STRING$$2GetTexture__Q34nw4r3lyt8MaterialCFUc $$2STRING$$2GetTexture__Q34nw4r3lyt8MaterialCFUc: - .incbin "baserom.dol", 0x45F548, 0xC + .asciz "material.h" + .balign 4 .global $$2STRING$$2SetTexture__Q34nw4r3lyt8MaterialFUcRCQ34nw4r3lyt6TexMap$$20 $$2STRING$$2SetTexture__Q34nw4r3lyt8MaterialFUcRCQ34nw4r3lyt6TexMap$$20: - .incbin "baserom.dol", 0x45F554, 0x34 + .asciz "NW4R:Failed assertion texMapIdx < mGXMemNum.texMap" + .balign 4 .global $$2STRING$$2SetTexture__Q34nw4r3lyt8MaterialFUcRCQ34nw4r3lyt6TexMap $$2STRING$$2SetTexture__Q34nw4r3lyt8MaterialFUcRCQ34nw4r3lyt6TexMap: - .incbin "baserom.dol", 0x45F588, 0xC + .asciz "material.h" + .balign 4 .global $$2STRING$$2GetTexSRT__Q34nw4r3lyt8MaterialCFUl$$20 $$2STRING$$2GetTexSRT__Q34nw4r3lyt8MaterialCFUl$$20: - .incbin "baserom.dol", 0x45F594, 0x34 + .asciz "NW4R:Failed assertion texSRTIdx < mGXMemNum.texSRT" + .balign 4 .global $$2STRING$$2GetTexSRT__Q34nw4r3lyt8MaterialCFUl $$2STRING$$2GetTexSRT__Q34nw4r3lyt8MaterialCFUl: - .incbin "baserom.dol", 0x45F5C8, 0xC + .asciz "material.h" + .balign 4 .global $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT$$20 $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT$$20: - .incbin "baserom.dol", 0x45F5D4, 0x34 + .asciz "NW4R:Failed assertion texSRTIdx < mGXMemNum.texSRT" + .balign 4 .global $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT: - .incbin "baserom.dol", 0x45F608, 0x10 + .asciz "material.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251800 $$251800: - .incbin "baserom.dol", 0x494FE8, 0x8 + .asciz "KSDXN" + .balign 4 .global $$251801 $$251801: - .incbin "baserom.dol", 0x494FF0, 0x8 + .asciz "KBBN" + .balign 4 .global $$251802 $$251802: - .incbin "baserom.dol", 0x494FF8, 0x4 + .4byte 0x4B314E00 .global $$251803 $$251803: - .incbin "baserom.dol", 0x494FFC, 0x4 + .4byte 0x4B324E00 .global $$251804 $$251804: - .incbin "baserom.dol", 0x495000, 0x4 + .4byte 0x4B334E00 .global $$251805 $$251805: - .incbin "baserom.dol", 0x495004, 0xC + .asciz "K64N" + .balign 4 + .4byte 0 .global $$251806 $$251806: - .incbin "baserom.dol", 0x495010, 0x8 + .asciz "KDreamN" .global $$251807 $$251807: - .incbin "baserom.dol", 0x495018, 0x8 + .asciz "KBallN" + .balign 4 .global $$251810 $$251810: - .incbin "baserom.dol", 0x495020, 0x8 + .asciz "KKiraN" + .balign 4 .global $$251811 $$251811: - .incbin "baserom.dol", 0x495028, 0x8 + .asciz "KCoroN" + .balign 4 .global $$251813 $$251813: - .incbin "baserom.dol", 0x495030, 0x8 + .asciz "KWiiN" + .balign 4 .global $$251814 $$251814: - .incbin "baserom.dol", 0x495038, 0x8 + .asciz "KUSDXN" + .balign 4 .global $$251815 $$251815: - .incbin "baserom.dol", 0x495040, 0x8 + .asciz "KTouchN" .global $$251818 $$251818: - .incbin "baserom.dol", 0x495048, 0x8 + .asciz "KDoroN" + .balign 4 .global $$251819 $$251819: - .incbin "baserom.dol", 0x495050, 0x8 + .asciz "KWoolN" + .balign 4 .global $$251821 $$251821: - .incbin "baserom.dol", 0x495058, 0x8 + .asciz "KanimeN" .global $$251822 $$251822: - .incbin "baserom.dol", 0x495060, 0x8 + .asciz "KDonutN" .global $$251823 $$251823: - .incbin "baserom.dol", 0x495068, 0x8 + .asciz "Dummy" + .balign 4 .global $$251825 $$251825: - .incbin "baserom.dol", 0x495070, 0x4 + .4byte 0x4B310000 .global $$251826 $$251826: - .incbin "baserom.dol", 0x495074, 0x8 + .asciz "KDream" + .balign 4 .global $$251828 $$251828: - .incbin "baserom.dol", 0x49507C, 0x8 + .asciz "KBall" + .balign 4 .global $$251830 $$251830: - .incbin "baserom.dol", 0x495084, 0x4 + .4byte 0x4B320000 .global $$251831 $$251831: - .incbin "baserom.dol", 0x495088, 0x4 + .4byte 0x4B424200 .global $$251832 $$251832: - .incbin "baserom.dol", 0x49508C, 0x8 + .asciz "KSDX" + .balign 4 .global $$251833 $$251833: - .incbin "baserom.dol", 0x495094, 0x8 + .asciz "KKira" + .balign 4 .global $$251834 $$251834: - .incbin "baserom.dol", 0x49509C, 0x4 + .4byte 0x4B330000 .global $$251835 $$251835: - .incbin "baserom.dol", 0x4950A0, 0x4 + .4byte 0x4B363400 .global $$251836 $$251836: - .incbin "baserom.dol", 0x4950A4, 0x8 + .asciz "KCoro" + .balign 4 .global $$251838 $$251838: - .incbin "baserom.dol", 0x4950AC, 0xC + .asciz "Kanime" + .balign 4 + .4byte 0 .global $$251840 $$251840: - .incbin "baserom.dol", 0x4950B8, 0x8 + .asciz "KMirror" .global $$251841 $$251841: - .incbin "baserom.dol", 0x4950C0, 0x8 + .asciz "Touch" + .balign 4 .global $$251842 $$251842: - .incbin "baserom.dol", 0x4950C8, 0x8 + .asciz "KDoro" + .balign 4 .global $$251843 $$251843: - .incbin "baserom.dol", 0x4950D0, 0x8 + .asciz "KUSDX" + .balign 4 .global $$251844 $$251844: - .incbin "baserom.dol", 0x4950D8, 0x8 + .asciz "KWool" + .balign 4 .global $$251846 $$251846: - .incbin "baserom.dol", 0x4950E0, 0x8 + .asciz "KWii" + .balign 4 .global $$251847 $$251847: - .incbin "baserom.dol", 0x4950E8, 0x8 + .asciz "KDonut" + .balign 4 .global $$251849 $$251849: - .incbin "baserom.dol", 0x4950F0, 0x4 + .4byte 0 .global $$253152 $$253152: - .incbin "baserom.dol", 0x4950F4, 0x8 + .asciz "Text" + .balign 4 .global $$253153 $$253153: - .incbin "baserom.dol", 0x4950FC, 0x8 + .asciz "TextN" + .balign 4 .global $$253154 $$253154: - .incbin "baserom.dol", 0x495104, 0x4 + .4byte 0 diff --git a/asm/src/ThreadCtrl.s b/asm/src/ThreadCtrl.s index 679e60f4..5322a443 100644 --- a/asm/src/ThreadCtrl.s +++ b/asm/src/ThreadCtrl.s @@ -584,43 +584,44 @@ lbl_802A8E30: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258039 $$258039: - .incbin "baserom.dol", 0x49C118, 0x4 + .4byte 0 .global $$258040 $$258040: - .incbin "baserom.dol", 0x49C11C, 0x4 + .4byte 0x41200000 .global $$258041 $$258041: - .incbin "baserom.dol", 0x49C120, 0x4 + .4byte 0x3C23D70A .global $$258042 $$258042: - .incbin "baserom.dol", 0x49C124, 0x4 + .4byte 0xBE99999A .global $$258043 $$258043: - .incbin "baserom.dol", 0x49C128, 0x4 + .4byte 0x3FA66666 .global $$258044 $$258044: - .incbin "baserom.dol", 0x49C12C, 0x4 + .4byte 0x3F800000 .global $$258048 $$258048: - .incbin "baserom.dol", 0x49C130, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258168 $$258168: - .incbin "baserom.dol", 0x49C138, 0x4 + .4byte 0x3E800000 .global $$258172 $$258172: - .incbin "baserom.dol", 0x49C13C, 0x4 + .4byte 0x3DCCCCCD .global $$258173 $$258173: - .incbin "baserom.dol", 0x49C140, 0x4 + .4byte 0x3F8CCCCD .global $$258174 $$258174: - .incbin "baserom.dol", 0x49C144, 0x4 + .4byte 0x3F733333 .global $$258175 $$258175: - .incbin "baserom.dol", 0x49C148, 0x4 + .4byte 0x3F99999A .global $$258216 $$258216: - .incbin "baserom.dol", 0x49C14C, 0x4 + .4byte 0x400CCCCD .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step6weapon10comothread6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/Ticker.s b/asm/src/Ticker.s index b18fe48b..6f6fad8c 100644 --- a/asm/src/Ticker.s +++ b/asm/src/Ticker.s @@ -446,10 +446,11 @@ scrollWindowWidth__Q34info6ticker6TickerFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252326 $$252326: - .incbin "baserom.dol", 0x49A4A8, 0x4 + .4byte 0 .global $$252327 $$252327: - .incbin "baserom.dol", 0x49A4AC, 0x4 + .4byte 0x461C3C00 .global $$252423 $$252423: - .incbin "baserom.dol", 0x49A4B0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/TickerContext.s b/asm/src/TickerContext.s index dcb18ac1..36ddce0c 100644 --- a/asm/src/TickerContext.s +++ b/asm/src/TickerContext.s @@ -45,4 +45,5 @@ __ct__Q34info6ticker13TickerContextFQ23lyt12PaneAccessorQ23lyt12PaneAccessorfUlU .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252069 $$252069: - .incbin "baserom.dol", 0x49A4B8, 0x8 + .4byte 0x3FC00000 + .4byte 0 diff --git a/asm/src/Time.s b/asm/src/Time.s index 0fb5a237..1c7a3436 100644 --- a/asm/src/Time.s +++ b/asm/src/Time.s @@ -136,24 +136,28 @@ set__Q53scn4step4info9challenge4TimeFUl: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252024 $$252024: - .incbin "baserom.dol", 0x48C998, 0x14 + .asciz "step/challenge/Main" .global $$252084 $$252084: - .incbin "baserom.dol", 0x48C9AC, 0xC + .asciz "FrameText" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252025 $$252025: - .incbin "baserom.dol", 0x497C90, 0x8 + .asciz "Time" + .balign 4 .global $$252080 $$252080: - .incbin "baserom.dol", 0x497C98, 0x8 + .asciz "MinText" .global $$252081 $$252081: - .incbin "baserom.dol", 0x497CA0, 0x8 + .4byte 0x25750000 + .4byte 0 .global $$252082 $$252082: - .incbin "baserom.dol", 0x497CA8, 0x8 + .asciz "SecText" .global $$252083 $$252083: - .incbin "baserom.dol", 0x497CB0, 0x8 + .asciz "%02u" + .balign 4 diff --git a/asm/src/TimeString.s b/asm/src/TimeString.s index c7815a90..8c75567f 100644 --- a/asm/src/TimeString.s +++ b/asm/src/TimeString.s @@ -217,24 +217,34 @@ onNormalChar__Q43scn15challengeresult4info10TimeStringFw: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249497 $$249497: - .incbin "baserom.dol", 0x45B810, 0xC + .4byte 0x00250030 + .4byte 0x00310064 + .4byte 0 .global $$249499 $$249499: - .incbin "baserom.dol", 0x45B81C, 0xC + .4byte 0x00250030 + .4byte 0x00320064 + .4byte 0 .global __vt__Q43scn15challengeresult4info10TimeString __vt__Q43scn15challengeresult4info10TimeString: - .incbin "baserom.dol", 0x45B828, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x801F5050 ;# ptr + .4byte 0x801F52A4 ;# ptr + .4byte 0x801F52A8 ;# ptr + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249495 $$249495: - .incbin "baserom.dol", 0x494368, 0x8 + .asciz "Replace" .global $$249496 $$249496: - .incbin "baserom.dol", 0x494370, 0x8 + .asciz "Minutes" .global $$249498 $$249498: - .incbin "baserom.dol", 0x494378, 0x8 + .asciz "Seconds" .global $$249500 $$249500: - .incbin "baserom.dol", 0x494380, 0x8 + .asciz "Frames" + .balign 4 diff --git a/asm/src/TimeUp.s b/asm/src/TimeUp.s index 273926ac..0fead9d4 100644 --- a/asm/src/TimeUp.s +++ b/asm/src/TimeUp.s @@ -119,18 +119,23 @@ lbl_803B5BEC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251948 $$251948: - .incbin "baserom.dol", 0x48C9B8, 0x18 + .asciz "step/challenge/Main" + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251949 $$251949: - .incbin "baserom.dol", 0x497CB8, 0x8 + .asciz "TimeUp" + .balign 4 .global $$251983 $$251983: - .incbin "baserom.dol", 0x497CC0, 0x8 + .asciz "Start" + .balign 4 .global $$251984 $$251984: - .incbin "baserom.dol", 0x497CC8, 0x8 + .asciz "Wait" + .balign 4 .global $$251994 $$251994: - .incbin "baserom.dol", 0x497CD0, 0x8 + .4byte 0x456E6400 + .4byte 0 diff --git a/asm/src/TitleInfo.s b/asm/src/TitleInfo.s index 63b63c0c..9b2f0237 100644 --- a/asm/src/TitleInfo.s +++ b/asm/src/TitleInfo.s @@ -955,110 +955,142 @@ lbl_80206D3C: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252920 $$252920: - .incbin "baserom.dol", 0x45AF88, 0x14 + .asciz "challengetitle/Main" .global $$253701 $$253701: - .incbin "baserom.dol", 0x45AF9C, 0xC + .asciz "TitleLogo" + .balign 4 .global $$253703 $$253703: - .incbin "baserom.dol", 0x45AFA8, 0xC + .asciz "BackButtonN" .global $$253704 $$253704: - .incbin "baserom.dol", 0x45AFB4, 0xC + .asciz "TitleLogoN" + .balign 4 .global $$253790 $$253790: - .incbin "baserom.dol", 0x45AFC0, 0x10 + .asciz "DisconnectTitle" .global $$253791 $$253791: - .incbin "baserom.dol", 0x45AFD0, 0x14 + .asciz "DisconnectExtTitle" + .balign 4 .global $$253792 $$253792: - .incbin "baserom.dol", 0x45AFE4, 0xC + .asciz "PushTextSh" + .balign 4 .global $$253793 $$253793: - .incbin "baserom.dol", 0x45AFF0, 0xC + .asciz "PushText" + .balign 4 .global $$253794 $$253794: - .incbin "baserom.dol", 0x45AFFC, 0x3C + .asciz "PushButton" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252919 $$252919: - .incbin "baserom.dol", 0x45CB98, 0x10 + .asciz "grandtitle/Main" .global $$253747 $$253747: - .incbin "baserom.dol", 0x45CBA8, 0xC + .asciz "TitleLogo" + .balign 4 .global $$253749 $$253749: - .incbin "baserom.dol", 0x45CBB4, 0xC + .asciz "TitleLogoN" + .balign 4 .global $$253841 $$253841: - .incbin "baserom.dol", 0x45CBC0, 0x10 + .asciz "DisconnectTitle" .global $$253842 $$253842: - .incbin "baserom.dol", 0x45CBD0, 0x14 + .asciz "DisconnectExtTitle" + .balign 4 .global $$253843 $$253843: - .incbin "baserom.dol", 0x45CBE4, 0xC + .asciz "PushTextSh" + .balign 4 .global $$253844 $$253844: - .incbin "baserom.dol", 0x45CBF0, 0xC + .asciz "PushText" + .balign 4 .global $$253845 $$253845: - .incbin "baserom.dol", 0x45CBFC, 0x3C + .asciz "PushButton" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253700 $$253700: - .incbin "baserom.dol", 0x494188, 0x8 + .asciz "Base" + .balign 4 .global $$253702 $$253702: - .incbin "baserom.dol", 0x494190, 0x8 + .asciz "Push" + .balign 4 .global $$253705 $$253705: - .incbin "baserom.dol", 0x494198, 0x8 + .asciz "PushN" + .balign 4 .global $$253760 $$253760: - .incbin "baserom.dol", 0x4941A0, 0x8 + .asciz "Start" + .balign 4 .global $$253765 $$253765: - .incbin "baserom.dol", 0x4941A8, 0x8 + .asciz "Wait" + .balign 4 .global $$253795 $$253795: - .incbin "baserom.dol", 0x4941B0, 0x8 + .asciz "Frame" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253746 $$253746: - .incbin "baserom.dol", 0x494828, 0x8 + .asciz "Base" + .balign 4 .global $$253748 $$253748: - .incbin "baserom.dol", 0x494830, 0x8 + .asciz "Push" + .balign 4 .global $$253750 $$253750: - .incbin "baserom.dol", 0x494838, 0x8 + .asciz "PushN" + .balign 4 .global $$253803 $$253803: - .incbin "baserom.dol", 0x494840, 0x8 + .asciz "Start" + .balign 4 .global $$253812 $$253812: - .incbin "baserom.dol", 0x494848, 0x8 + .asciz "Wait" + .balign 4 .global $$253846 $$253846: - .incbin "baserom.dol", 0x494850, 0x8 + .asciz "Frame" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2: - .incbin "baserom.dol", 0x49A958, 0x4 + .4byte 0x8045EE88 .global $$253755 $$253755: - .incbin "baserom.dol", 0x49A95C, 0x4 + .4byte 0x3F333333 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2: - .incbin "baserom.dol", 0x49AB30, 0x4 + .4byte 0x80460A98 .global $$253798 $$253798: - .incbin "baserom.dol", 0x49AB34, 0x4 + .4byte 0x3F333333 diff --git a/asm/src/TotalScore.s b/asm/src/TotalScore.s index 7d4251b4..4af3ad82 100644 --- a/asm/src/TotalScore.s +++ b/asm/src/TotalScore.s @@ -3293,303 +3293,382 @@ lbl_803B991C: .section .data, "wa" # 0x80421040 - 0x80496700 .global NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2 NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2: - .incbin "baserom.dol", 0x453740, 0x18 + .4byte 0x805570D0 + .4byte 0x805570D0 + .4byte 0x805570D8 + .4byte 0x805570E0 + .4byte 0x805570E8 + .4byte 0x805570E8 .global $$252626 $$252626: - .incbin "baserom.dol", 0x453758, 0xC + .asciz "common/Main" .global $$252627 $$252627: - .incbin "baserom.dol", 0x453764, 0x10 + .asciz "TotalScoreBase" + .balign 4 .global $$252628 $$252628: - .incbin "baserom.dol", 0x453774, 0x14 + .asciz "TotalScoreNumber" + .balign 4 .global $$252629 $$252629: - .incbin "baserom.dol", 0x453788, 0xC + .asciz "Number%dN" + .balign 4 .global $$252630 $$252630: - .incbin "baserom.dol", 0x453794, 0x3C + .asciz "ScoreCommaN" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256054 $$256054: - .incbin "baserom.dol", 0x45B840, 0x18 + .asciz "challengeresult/Main" + .balign 4 .global $$256055 $$256055: - .incbin "baserom.dol", 0x45B858, 0xC + .asciz "BonusMove" + .balign 4 .global $$256056 $$256056: - .incbin "baserom.dol", 0x45B864, 0xC + .asciz "ResultParts" .global $$256063 $$256063: - .incbin "baserom.dol", 0x45B870, 0xC + .asciz "BonusMoveN" + .balign 4 .global $$256109 $$256109: - .incbin "baserom.dol", 0x45B87C, 0xC + .asciz "BonusText" + .balign 4 .global $$256110 $$256110: - .incbin "baserom.dol", 0x45B888, 0xC + .asciz "TimeText" + .balign 4 .global $$256111 $$256111: - .incbin "baserom.dol", 0x45B894, 0x10 + .asciz "BonusScoreText" + .balign 4 .global $$256112 $$256112: - .incbin "baserom.dol", 0x45B8A4, 0xC + .4byte 0x002B0025 + .4byte 0x006C0073 + .4byte 0 .global $$256158 $$256158: - .incbin "baserom.dol", 0x45B8B0, 0xC + .asciz "Score%02dN" + .balign 4 .global $$256159 $$256159: - .incbin "baserom.dol", 0x45B8BC, 0xC + .asciz "ScoreCommaN" .global $$256160 $$256160: - .incbin "baserom.dol", 0x45B8C8, 0xC + .asciz "ScoreNow" + .balign 4 .global $$256161 $$256161: - .incbin "baserom.dol", 0x45B8D4, 0xC + .asciz "ScoreRoa" + .balign 4 .global $$256162 $$256162: - .incbin "baserom.dol", 0x45B8E0, 0xC + .asciz "ScoreKirby" + .balign 4 .global $$256163 $$256163: - .incbin "baserom.dol", 0x45B8EC, 0xC + .asciz "NewRecord" + .balign 4 .global $$256164 $$256164: - .incbin "baserom.dol", 0x45B8F8, 0xC + .asciz "NewRecordN" + .balign 4 .global $$256524 $$256524: - .incbin "baserom.dol", 0x45B904, 0xC + .asciz "Score%s%d" + .balign 4 .global $$256525 $$256525: - .incbin "baserom.dol", 0x45B910, 0x10 + .asciz "Score%sminus" + .balign 4 .global $$256526 $$256526: - .incbin "baserom.dol", 0x45B920, 0x10 + .asciz "Score%sComma" + .balign 4 .global $$256527 $$256527: - .incbin "baserom.dol", 0x45B930, 0xC + .asciz "ScoreScaleN" .global $$256530 $$256530: - .incbin "baserom.dol", 0x45B93C, 0x4C + .asciz "ScoreNminus" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256014 $$256014: - .incbin "baserom.dol", 0x48CE70, 0x14 + .asciz "masterresult/Main" + .balign 4 .global $$256015 $$256015: - .incbin "baserom.dol", 0x48CE84, 0xC + .asciz "BonusMove" + .balign 4 .global $$256016 $$256016: - .incbin "baserom.dol", 0x48CE90, 0xC + .asciz "ResultParts" .global $$256023 $$256023: - .incbin "baserom.dol", 0x48CE9C, 0xC + .asciz "BonusMoveN" + .balign 4 .global $$256069 $$256069: - .incbin "baserom.dol", 0x48CEA8, 0xC + .asciz "BonusText" + .balign 4 .global $$256070 $$256070: - .incbin "baserom.dol", 0x48CEB4, 0xC + .asciz "TimeText" + .balign 4 .global $$256071 $$256071: - .incbin "baserom.dol", 0x48CEC0, 0x10 + .asciz "BonusScoreText" + .balign 4 .global $$256072 $$256072: - .incbin "baserom.dol", 0x48CED0, 0xC + .4byte 0x002B0025 + .4byte 0x006C0073 + .4byte 0 .global $$256118 $$256118: - .incbin "baserom.dol", 0x48CEDC, 0xC + .asciz "Score%02dN" + .balign 4 .global $$256119 $$256119: - .incbin "baserom.dol", 0x48CEE8, 0xC + .asciz "ScoreCommaN" .global $$256120 $$256120: - .incbin "baserom.dol", 0x48CEF4, 0xC + .asciz "ScoreNow" + .balign 4 .global $$256121 $$256121: - .incbin "baserom.dol", 0x48CF00, 0xC + .asciz "ScoreRoa" + .balign 4 .global $$256122 $$256122: - .incbin "baserom.dol", 0x48CF0C, 0xC + .asciz "ScoreKirby" + .balign 4 .global $$256123 $$256123: - .incbin "baserom.dol", 0x48CF18, 0xC + .asciz "NewRecord" + .balign 4 .global $$256124 $$256124: - .incbin "baserom.dol", 0x48CF24, 0xC + .asciz "NewRecordN" + .balign 4 .global $$256437 $$256437: - .incbin "baserom.dol", 0x48CF30, 0xC + .asciz "Score%s%d" + .balign 4 .global $$256438 $$256438: - .incbin "baserom.dol", 0x48CF3C, 0x10 + .asciz "Score%sminus" + .balign 4 .global $$256439 $$256439: - .incbin "baserom.dol", 0x48CF4C, 0x10 + .asciz "Score%sComma" + .balign 4 .global $$256440 $$256440: - .incbin "baserom.dol", 0x48CF5C, 0xC + .asciz "ScoreScaleN" .global $$256443 $$256443: - .incbin "baserom.dol", 0x48CF68, 0x40 + .asciz "ScoreNminus" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: - .incbin "baserom.dol", 0x4934B0, 0x8 + .asciz "Bronze" + .balign 4 .global $$251546 $$251546: - .incbin "baserom.dol", 0x4934B8, 0x8 + .asciz "Silver" + .balign 4 .global $$251547 $$251547: - .incbin "baserom.dol", 0x4934C0, 0x8 + .asciz "Gold" + .balign 4 .global $$251548 $$251548: - .incbin "baserom.dol", 0x4934C8, 0x8 + .asciz "Platina" .global $$252572 $$252572: - .incbin "baserom.dol", 0x4934D0, 0x8 + .asciz "%s%d" + .balign 4 .global $$252573 $$252573: - .incbin "baserom.dol", 0x4934D8, 0x8 + .asciz "%sComma" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256057 $$256057: - .incbin "baserom.dol", 0x494388, 0x8 + .asciz "TopN" + .balign 4 .global $$256058 $$256058: - .incbin "baserom.dol", 0x494390, 0x8 + .asciz "ScoreS" + .balign 4 .global $$256059 $$256059: - .incbin "baserom.dol", 0x494398, 0x8 + .asciz "ScoreN" + .balign 4 .global $$256060 $$256060: - .incbin "baserom.dol", 0x4943A0, 0x8 + .asciz "Score" + .balign 4 .global $$256061 $$256061: - .incbin "baserom.dol", 0x4943A8, 0x8 + .asciz "ScoreP" + .balign 4 .global $$256062 $$256062: - .incbin "baserom.dol", 0x4943B0, 0x8 + .asciz "BonusN" + .balign 4 .global $$256113 $$256113: - .incbin "baserom.dol", 0x4943B8, 0x8 + .asciz "Start" + .balign 4 .global $$256511 $$256511: - .incbin "baserom.dol", 0x4943C0, 0x4 + .4byte 0x50000000 .global $$256513 $$256513: - .incbin "baserom.dol", 0x4943C4, 0x4 + .4byte 0 .global $$256515 $$256515: - .incbin "baserom.dol", 0x4943C8, 0x4 + .4byte 0x53000000 .global $$256517 $$256517: - .incbin "baserom.dol", 0x4943CC, 0x4 + .4byte 0x4E000000 .global $$256522 $$256522: - .incbin "baserom.dol", 0x4943D0, 0x8 + .4byte 0x25356400 + .4byte 0 .global $$256523 $$256523: - .incbin "baserom.dol", 0x4943D8, 0x8 + .asciz "Score%s" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256017 $$256017: - .incbin "baserom.dol", 0x497DD0, 0x8 + .asciz "TopN" + .balign 4 .global $$256018 $$256018: - .incbin "baserom.dol", 0x497DD8, 0x8 + .asciz "ScoreS" + .balign 4 .global $$256019 $$256019: - .incbin "baserom.dol", 0x497DE0, 0x8 + .asciz "ScoreN" + .balign 4 .global $$256020 $$256020: - .incbin "baserom.dol", 0x497DE8, 0x8 + .asciz "Score" + .balign 4 .global $$256021 $$256021: - .incbin "baserom.dol", 0x497DF0, 0x8 + .asciz "ScoreP" + .balign 4 .global $$256022 $$256022: - .incbin "baserom.dol", 0x497DF8, 0x8 + .asciz "BonusN" + .balign 4 .global $$256073 $$256073: - .incbin "baserom.dol", 0x497E00, 0x8 + .asciz "Start" + .balign 4 .global $$256424 $$256424: - .incbin "baserom.dol", 0x497E08, 0x4 + .4byte 0x50000000 .global $$256426 $$256426: - .incbin "baserom.dol", 0x497E0C, 0x4 + .4byte 0 .global $$256428 $$256428: - .incbin "baserom.dol", 0x497E10, 0x4 + .4byte 0x53000000 .global $$256430 $$256430: - .incbin "baserom.dol", 0x497E14, 0x4 + .4byte 0x4E000000 .global $$256435 $$256435: - .incbin "baserom.dol", 0x497E18, 0x8 + .4byte 0x25356400 + .4byte 0 .global $$256436 $$256436: - .incbin "baserom.dol", 0x497E20, 0x8 + .asciz "Score%s" .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: - .incbin "baserom.dol", 0x49A9B0, 0x4 + .4byte 0x3F19999A .global $$256510 $$256510: - .incbin "baserom.dol", 0x49A9B4, 0x4 + .4byte 0x3F99999A .global $$256512 $$256512: - .incbin "baserom.dol", 0x49A9B8, 0x4 + .4byte 0x3F8CCCCD .global $$256514 $$256514: - .incbin "baserom.dol", 0x49A9BC, 0x4 + .4byte 0x3F800000 .global $$256516 $$256516: - .incbin "baserom.dol", 0x49A9C0, 0x4 + .4byte 0x3F666666 .global $$256518 $$256518: - .incbin "baserom.dol", 0x49A9C4, 0x4 + .4byte 0x3F4CCCCD .global $$256519 $$256519: - .incbin "baserom.dol", 0x49A9C8, 0x4 + .4byte 0x3F333333 .global $$256520 $$256520: - .incbin "baserom.dol", 0x49A9CC, 0x4 + .4byte 0x3D4CCCCD .global $$256521 $$256521: - .incbin "baserom.dol", 0x49A9D0, 0x8 + .4byte 0x3CCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256117 $$256117: - .incbin "baserom.dol", 0x49E4A8, 0x4 + .4byte 0x3F19999A .global $$256423 $$256423: - .incbin "baserom.dol", 0x49E4AC, 0x4 + .4byte 0x3F99999A .global $$256425 $$256425: - .incbin "baserom.dol", 0x49E4B0, 0x4 + .4byte 0x3F8CCCCD .global $$256427 $$256427: - .incbin "baserom.dol", 0x49E4B4, 0x4 + .4byte 0x3F800000 .global $$256429 $$256429: - .incbin "baserom.dol", 0x49E4B8, 0x4 + .4byte 0x3F666666 .global $$256431 $$256431: - .incbin "baserom.dol", 0x49E4BC, 0x4 + .4byte 0x3F4CCCCD .global $$256432 $$256432: - .incbin "baserom.dol", 0x49E4C0, 0x4 + .4byte 0x3F333333 .global $$256433 $$256433: - .incbin "baserom.dol", 0x49E4C4, 0x4 + .4byte 0x3D4CCCCD .global $$256434 $$256434: - .incbin "baserom.dol", 0x49E4C8, 0x8 + .4byte 0x3CCCCCCD + .4byte 0 diff --git a/asm/src/TotalScorePanel.s b/asm/src/TotalScorePanel.s index 243c992c..5ef49e93 100644 --- a/asm/src/TotalScorePanel.s +++ b/asm/src/TotalScorePanel.s @@ -442,71 +442,105 @@ lbl_803B00E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252167 $$252167: - .incbin "baserom.dol", 0x41BEF8, 0x18 + .4byte 0x8055B6F8 + .4byte 0x8055B6FC + .4byte 0x8055B704 + .4byte 0x8055B70C + .4byte 0x80490058 + .4byte 0x8055B714 .global $$252187 $$252187: - .incbin "baserom.dol", 0x41BF10, 0x18 + .4byte 0x8055B6F8 + .4byte 0x80490064 + .4byte 0x80490070 + .4byte 0x8049007C + .4byte 0x80490088 + .4byte 0x80490098 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 $$252619: - .incbin "baserom.dol", 0x48C0F8, 0x20 + .asciz "step/info/TotalScorePanel" + .balign 4 + .4byte 0 .global $$252620 $$252620: - .incbin "baserom.dol", 0x48C118, 0x10 + .asciz "step/lvmap/Main" .global $$252621 $$252621: - .incbin "baserom.dol", 0x48C128, 0x10 + .asciz "TotalScore" + .balign 4 + .4byte 0 .global $$252622 $$252622: - .incbin "baserom.dol", 0x48C138, 0x10 + .asciz "TotalScoreMedal" .global $$252623 $$252623: - .incbin "baserom.dol", 0x48C148, 0x10 + .asciz "TotalScoreBaseN" .global $$252165 $$252165: - .incbin "baserom.dol", 0x48C158, 0xC + .asciz "Platinum" + .balign 4 .global $$252182 $$252182: - .incbin "baserom.dol", 0x48C164, 0xC + .asciz "BronzeWait" + .balign 4 .global $$252183 $$252183: - .incbin "baserom.dol", 0x48C170, 0xC + .asciz "SilverWait" + .balign 4 .global $$252184 $$252184: - .incbin "baserom.dol", 0x48C17C, 0xC + .asciz "GoldWait" + .balign 4 .global $$252185 $$252185: - .incbin "baserom.dol", 0x48C188, 0x10 + .asciz "PlatinumWait" + .balign 4 .global $$252186 $$252186: - .incbin "baserom.dol", 0x48C198, 0x40 + .asciz "KingWait" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252624 $$252624: - .incbin "baserom.dol", 0x497AB8, 0x8 + .asciz "Title" + .balign 4 .global $$252625 $$252625: - .incbin "baserom.dol", 0x497AC0, 0x8 + .asciz "Wait" + .balign 4 .global $$252626 $$252626: - .incbin "baserom.dol", 0x497AC8, 0x8 + .asciz "MedalN" + .balign 4 .global $$252695 $$252695: - .incbin "baserom.dol", 0x497AD0, 0x8 + .asciz "RankUp" + .balign 4 .global $$252161 $$252161: - .incbin "baserom.dol", 0x497AD8, 0x4 + .4byte 0 .global $$252162 $$252162: - .incbin "baserom.dol", 0x497ADC, 0x8 + .asciz "Bronze" + .balign 4 .global $$252163 $$252163: - .incbin "baserom.dol", 0x497AE4, 0x8 + .asciz "Silver" + .balign 4 .global $$252164 $$252164: - .incbin "baserom.dol", 0x497AEC, 0x8 + .asciz "Gold" + .balign 4 .global $$252166 $$252166: - .incbin "baserom.dol", 0x497AF4, 0xC + .asciz "King" + .balign 4 + .4byte 0 diff --git a/asm/src/Trophy.s b/asm/src/Trophy.s index 777a1090..98c89aaa 100644 --- a/asm/src/Trophy.s +++ b/asm/src/Trophy.s @@ -862,87 +862,119 @@ __sinit_$$3Trophy_cpp: /* 801EA0CC 001E5F0C 4B ED 3F F4 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402448, 0x4 + .4byte 0x801EA0B8 ;# ptr .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252758 $$252758: - .incbin "baserom.dol", 0x4116F8, 0x28 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252317 $$252317: - .incbin "baserom.dol", 0x45A978, 0x10 + .asciz "Coppertrophy" + .balign 4 .global $$252318 $$252318: - .incbin "baserom.dol", 0x45A988, 0x10 + .asciz "Silvertrophy" + .balign 4 .global $$252319 $$252319: - .incbin "baserom.dol", 0x45A998, 0xC + .asciz "Goldtrophy" + .balign 4 .global $$252320 $$252320: - .incbin "baserom.dol", 0x45A9A4, 0x10 + .asciz "Platinumtrophy" + .balign 4 .global $$252321 $$252321: - .incbin "baserom.dol", 0x45A9B4, 0xC + .asciz "Kingtrophy" + .balign 4 .global MODEL_NAMES__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 MODEL_NAMES__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: - .incbin "baserom.dol", 0x45A9C0, 0x18 + .4byte 0x8045E878 + .4byte 0x8045E878 + .4byte 0x8045E888 + .4byte 0x8045E898 + .4byte 0x8045E8A4 + .4byte 0x8045E8B4 .global $$253902 $$253902: - .incbin "baserom.dol", 0x45A9D8, 0x20 + .asciz "challengefileselect/Trophyanime" .global $$253903 $$253903: - .incbin "baserom.dol", 0x45A9F8, 0x24 + .asciz "challengefileselect/Trophyswitch" + .balign 4 .global $$253908 $$253908: - .incbin "baserom.dol", 0x45AA1C, 0x4C + .asciz "challengefileselect/%s" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253905 $$253905: - .incbin "baserom.dol", 0x494060, 0x4 + .4byte 0x496E0000 .global $$253906 $$253906: - .incbin "baserom.dol", 0x494064, 0x8 + .asciz "Base01" + .balign 4 .global $$253909 $$253909: - .incbin "baserom.dol", 0x49406C, 0xC + .asciz "Wait" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global LAYER_DEPTH__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 LAYER_DEPTH__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: - .incbin "baserom.dol", 0x49A898, 0x4 + .4byte 0x447A0000 .global MODEL_SCALE__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 MODEL_SCALE__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: - .incbin "baserom.dol", 0x49A89C, 0x4 + .4byte 0x42C80000 .global WAIT_ANIM_START_FRAME__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 WAIT_ANIM_START_FRAME__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: - .incbin "baserom.dol", 0x49A8A0, 0x4 + .4byte 0x437F0000 .global $$253904 $$253904: - .incbin "baserom.dol", 0x49A8A4, 0x4 + .4byte 0 .global $$253907 $$253907: - .incbin "baserom.dol", 0x49A8A8, 0x8 + .4byte 0x3F800000 + .4byte 0 .global $$253915 $$253915: - .incbin "baserom.dol", 0x49A8B0, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$253993 $$253993: - .incbin "baserom.dol", 0x49A8B8, 0x4 + .4byte 0x40000000 .global $$253994 $$253994: - .incbin "baserom.dol", 0x49A8BC, 0x4 + .4byte 0xC0000000 .global $$254069 $$254069: - .incbin "baserom.dol", 0x49A8C0, 0x4 + .4byte 0xC39B0000 .global $$254070 $$254070: - .incbin "baserom.dol", 0x49A8C4, 0x4 + .4byte 0xC1C80000 .global $$254071 $$254071: - .incbin "baserom.dol", 0x49A8C8, 0x8 + .4byte 0xC3FA0000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global MODEL_TRANS__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 diff --git a/asm/src/Tutorial.s b/asm/src/Tutorial.s index 98a928cc..52d2ce98 100644 --- a/asm/src/Tutorial.s +++ b/asm/src/Tutorial.s @@ -3573,293 +3573,456 @@ lbl_801FD0B0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PageDataNormal__Q33scn17challengetutorial4info T_PageDataNormal__Q33scn17challengetutorial4info: - .incbin "baserom.dol", 0x411B18, 0xC0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258272 $$258272: - .incbin "baserom.dol", 0x45BDF8, 0x18 + .asciz "challengetutorial/Main" + .balign 4 .global $$258273 $$258273: - .incbin "baserom.dol", 0x45BE10, 0xC + .asciz "Tutorial" + .balign 4 .global $$258274 $$258274: - .incbin "baserom.dol", 0x45BE1C, 0xC + .asciz "TutorialBG" + .balign 4 .global $$258275 $$258275: - .incbin "baserom.dol", 0x45BE28, 0x10 + .asciz "TutorialFrame" + .balign 4 .global $$258276 $$258276: - .incbin "baserom.dol", 0x45BE38, 0x14 + .asciz "TutorialIllustBase" + .balign 4 .global $$258277 $$258277: - .incbin "baserom.dol", 0x45BE4C, 0xC + .asciz "common/Main" .global $$258278 $$258278: - .incbin "baserom.dol", 0x45BE58, 0x10 + .asciz "CommonButton" + .balign 4 .global $$258279 $$258279: - .incbin "baserom.dol", 0x45BE68, 0xC + .asciz "WiiButtonN" + .balign 4 .global $$258280 $$258280: - .incbin "baserom.dol", 0x45BE74, 0x1C + .asciz "step/challenge/Challenge" + .balign 4 .global $$258283 $$258283: - .incbin "baserom.dol", 0x45BE90, 0x10 + .asciz "BackButton01N" + .balign 4 .global $$258284 $$258284: - .incbin "baserom.dol", 0x45BEA0, 0x10 + .asciz "BackButton02N" + .balign 4 .global $$258285 $$258285: - .incbin "baserom.dol", 0x45BEB0, 0x10 + .asciz "IllustFrameN" + .balign 4 .global $$258618 $$258618: - .incbin "baserom.dol", 0x45BEC0, 0x10 + .asciz "FrameChallengeN" .global $$258619 $$258619: - .incbin "baserom.dol", 0x45BED0, 0xC + .asciz "FrameMusouN" .global $$258620 $$258620: - .incbin "baserom.dol", 0x45BEDC, 0x10 + .asciz "FrameMasterN" + .balign 4 .global $$258621 $$258621: - .incbin "baserom.dol", 0x45BEEC, 0x10 + .asciz "HintChallengeN" + .balign 4 .global $$258622 $$258622: - .incbin "baserom.dol", 0x45BEFC, 0xC + .asciz "HintMusouN" + .balign 4 .global $$258623 $$258623: - .incbin "baserom.dol", 0x45BF08, 0xC + .asciz "HintMasterN" .global $$258624 $$258624: - .incbin "baserom.dol", 0x45BF14, 0x18 + .asciz "step/challenge/Master" + .balign 4 .global $$258625 $$258625: - .incbin "baserom.dol", 0x45BF2C, 0xC + .asciz "BoardMaster" .global $$258626 $$258626: - .incbin "baserom.dol", 0x45BF38, 0x18 + .asciz "step/challenge/Musou" + .balign 4 .global $$258627 $$258627: - .incbin "baserom.dol", 0x45BF50, 0xC + .asciz "BoardMusou" + .balign 4 .global $$258628 $$258628: - .incbin "baserom.dol", 0x45BF5C, 0x18 + .asciz "step/challenge/Normal" + .balign 4 .global $$258629 $$258629: - .incbin "baserom.dol", 0x45BF74, 0x10 + .asciz "BoardChallenge" + .balign 4 .global $$258632 $$258632: - .incbin "baserom.dol", 0x45BF84, 0x14 + .asciz "step/challenge/Main" .global $$258633 $$258633: - .incbin "baserom.dol", 0x45BF98, 0x10 + .asciz "TitleExplain" + .balign 4 .global $$258634 $$258634: - .incbin "baserom.dol", 0x45BFA8, 0x10 + .asciz "TitleExplainN" + .balign 4 .global $$258636 $$258636: - .incbin "baserom.dol", 0x45BFB8, 0xC + .asciz "LimitTimeN" + .balign 4 .global $$258637 $$258637: - .incbin "baserom.dol", 0x45BFC4, 0xC + .asciz "AButtonN" + .balign 4 .global $$258640 $$258640: - .incbin "baserom.dol", 0x45BFD0, 0xC + .asciz "TutorialN" + .balign 4 .global $$258642 $$258642: - .incbin "baserom.dol", 0x45BFDC, 0xC + .asciz "PageButtonN" .global $$258645 $$258645: - .incbin "baserom.dol", 0x45BFE8, 0x10 + .asciz "TutorialSkip" + .balign 4 .global $$258647 $$258647: - .incbin "baserom.dol", 0x45BFF8, 0x10 + .asciz "TutorialKOTSU" + .balign 4 .global $$258648 $$258648: - .incbin "baserom.dol", 0x45C008, 0xC + .asciz "HintSkip" + .balign 4 .global $$258649 $$258649: - .incbin "baserom.dol", 0x45C014, 0x24 + .asciz "challengetutorial/tutorialillust/%s" .global $$258655 $$258655: - .incbin "baserom.dol", 0x45C038, 0x14 + .asciz "ChallengeTitleTime" + .balign 4 .global $$258658 $$258658: - .incbin "baserom.dol", 0x45C04C, 0xC + .asciz "LimitShadow" .global $$258659 $$258659: - .incbin "baserom.dol", 0x45C058, 0xC + .asciz "TimeShadow" + .balign 4 .global $$258661 $$258661: - .incbin "baserom.dol", 0x45C064, 0x14 + .asciz "ConfirmWindow" + .balign 4 + .4byte 0 .global $$258662 $$258662: - .incbin "baserom.dol", 0x45C078, 0x10 + .asciz "ResultMenu_Hint" .global $$258663 $$258663: - .incbin "baserom.dol", 0x45C088, 0xC + .asciz "GameOver_No" .global $$258664 $$258664: - .incbin "baserom.dol", 0x45C094, 0x10 + .asciz "GameOver_Yes" + .balign 4 .global $$258665 $$258665: - .incbin "baserom.dol", 0x45C0A4, 0xC + .asciz "GameOver" + .balign 4 .global $$258666 $$258666: - .incbin "baserom.dol", 0x45C0B0, 0x10 + .asciz "SelectGhost_No" + .balign 4 .global $$258667 $$258667: - .incbin "baserom.dol", 0x45C0C0, 0x10 + .asciz "SelectGhost_Yes" .global $$258668 $$258668: - .incbin "baserom.dol", 0x45C0D0, 0xC + .asciz "SelectGhost" .global $$258671 $$258671: - .incbin "baserom.dol", 0x45C0DC, 0x34 + .4byte 0x801FA2F8 ;# ptr + .4byte 0x801FA490 ;# ptr + .4byte 0x801FA398 ;# ptr + .4byte 0x801FA490 ;# ptr + .4byte 0x801FA2F8 ;# ptr + .4byte 0x801FA398 ;# ptr + .4byte 0x801FA490 ;# ptr + .4byte 0x801FA2F8 ;# ptr + .4byte 0x801FA2F8 ;# ptr + .4byte 0x801FA398 ;# ptr + .4byte 0x801FA438 ;# ptr + .4byte 0x801FA438 ;# ptr + .4byte 0x801FA438 ;# ptr .global $$258825 $$258825: - .incbin "baserom.dol", 0x45C110, 0x6C + .4byte 0x801FB1E0 ;# ptr + .4byte 0x801FB0AC ;# ptr + .4byte 0x801FB0B8 ;# ptr + .4byte 0x801FB0C4 ;# ptr + .4byte 0x801FB0D0 ;# ptr + .4byte 0x801FB0DC ;# ptr + .4byte 0x801FB0E8 ;# ptr + .4byte 0x801FB0F4 ;# ptr + .4byte 0x801FB100 ;# ptr + .4byte 0x801FB10C ;# ptr + .4byte 0x801FB118 ;# ptr + .4byte 0x801FB124 ;# ptr + .4byte 0x801FB130 ;# ptr + .4byte 0x801FB13C ;# ptr + .4byte 0x801FB148 ;# ptr + .4byte 0x801FB154 ;# ptr + .4byte 0x801FB160 ;# ptr + .4byte 0x801FB16C ;# ptr + .4byte 0x801FB178 ;# ptr + .4byte 0x801FB184 ;# ptr + .4byte 0x801FB190 ;# ptr + .4byte 0x801FB19C ;# ptr + .4byte 0x801FB1A8 ;# ptr + .4byte 0x801FB1B4 ;# ptr + .4byte 0x801FB1C0 ;# ptr + .4byte 0x801FB1CC ;# ptr + .4byte 0x801FB1D8 ;# ptr .global $$258842 $$258842: - .incbin "baserom.dol", 0x45C17C, 0x18 + .asciz "%sChallengeTutorial%d" + .balign 4 .global $$258843 $$258843: - .incbin "baserom.dol", 0x45C194, 0x14 + .asciz "%sChallengeHint0_%d" .global $$258864 $$258864: - .incbin "baserom.dol", 0x45C1A8, 0x10 + .asciz "%sIllust%02d" + .balign 4 .global $$258865 $$258865: - .incbin "baserom.dol", 0x45C1B8, 0x10 + .asciz "%sIllust0_%d" + .balign 4 .global $$258885 $$258885: - .incbin "baserom.dol", 0x45C1C8, 0xC + .asciz "ExplainTex" + .balign 4 .global $$258886 $$258886: - .incbin "baserom.dol", 0x45C1D4, 0x10 + .asciz "ExplainTexSh" + .balign 4 .global $$258887 $$258887: - .incbin "baserom.dol", 0x45C1E4, 0x1C + .asciz "%sChallengeTutorialBtn%d" + .balign 4 .global $$258888 $$258888: - .incbin "baserom.dol", 0x45C200, 0xC + .asciz "CommandTex" + .balign 4 .global $$258889 $$258889: - .incbin "baserom.dol", 0x45C20C, 0xC + .asciz "CommandN" + .balign 4 .global $$258904 $$258904: - .incbin "baserom.dol", 0x45C218, 0x18 + .asciz "%sChallengeHintBtn0_%d" + .balign 4 .global $$258947 $$258947: - .incbin "baserom.dol", 0x45C230, 0xC + .asciz "Denominator" .global $$258949 $$258949: - .incbin "baserom.dol", 0x45C23C, 0xC + .asciz "Molecular" + .balign 4 .global $$258950 $$258950: - .incbin "baserom.dol", 0x45C248, 0xC + .asciz "CommonText" + .balign 4 .global $$258953 $$258953: - .incbin "baserom.dol", 0x45C254, 0x10 + .asciz "TutorialStart" + .balign 4 .global $$259084 $$259084: - .incbin "baserom.dol", 0x45C264, 0xC + .asciz "EXdisappear" .global $$259086 $$259086: - .incbin "baserom.dol", 0x45C270, 0xC + .asciz "EXbackdis" + .balign 4 .global $$259093 $$259093: - .incbin "baserom.dol", 0x45C27C, 0xC + .asciz "EXappear" + .balign 4 .global $$259100 $$259100: - .incbin "baserom.dol", 0x45C288, 0x10 + .asciz "EXbackapp" + .balign 4 + .4byte 0 .global $$259119 $$259119: - .incbin "baserom.dol", 0x45C298, 0x50 + .asciz "TutorialSETUMEI" + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "no name class" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258281 $$258281: - .incbin "baserom.dol", 0x494550, 0x8 + .asciz "ShadowN" .global $$258282 $$258282: - .incbin "baserom.dol", 0x494558, 0x8 + .asciz "FrameN" + .balign 4 .global $$258286 $$258286: - .incbin "baserom.dol", 0x494560, 0x8 + .asciz "BaseN" + .balign 4 .global $$258630 $$258630: - .incbin "baserom.dol", 0x494568, 0x8 + .asciz "BoardN" + .balign 4 .global $$258631 $$258631: - .incbin "baserom.dol", 0x494570, 0x8 + .asciz "TitleN" + .balign 4 .global $$258635 $$258635: - .incbin "baserom.dol", 0x494578, 0x8 + .asciz "GhostN" + .balign 4 .global $$258638 $$258638: - .incbin "baserom.dol", 0x494580, 0x8 + .asciz "Wait" + .balign 4 .global $$258639 $$258639: - .incbin "baserom.dol", 0x494588, 0x8 + .asciz "close" + .balign 4 .global $$258641 $$258641: - .incbin "baserom.dol", 0x494590, 0x8 + .asciz "HintN" + .balign 4 .global $$258643 $$258643: - .incbin "baserom.dol", 0x494598, 0x8 + .asciz "Shadow" + .balign 4 .global $$258644 $$258644: - .incbin "baserom.dol", 0x4945A0, 0x8 + .asciz "Skip" + .balign 4 .global $$258646 $$258646: - .incbin "baserom.dol", 0x4945A8, 0x8 + .asciz "AButton" .global $$258650 $$258650: - .incbin "baserom.dol", 0x4945B0, 0x8 + .asciz "Illust" + .balign 4 .global $$258651 $$258651: - .incbin "baserom.dol", 0x4945B8, 0x8 + .asciz "IllustN" .global $$258652 $$258652: - .incbin "baserom.dol", 0x4945C0, 0x8 + .asciz "appear" + .balign 4 .global $$258653 $$258653: - .incbin "baserom.dol", 0x4945C8, 0x8 + .asciz "Start" + .balign 4 .global $$258654 $$258654: - .incbin "baserom.dol", 0x4945D0, 0x8 + .asciz "Limit" + .balign 4 .global $$258656 $$258656: - .incbin "baserom.dol", 0x4945D8, 0x8 + .asciz "Time" + .balign 4 .global $$258657 $$258657: - .incbin "baserom.dol", 0x4945E0, 0x8 + .asciz "%d:%02d" .global $$258660 $$258660: - .incbin "baserom.dol", 0x4945E8, 0x8 + .asciz "Open" + .balign 4 .global $$258948 $$258948: - .incbin "baserom.dol", 0x4945F0, 0x4 + .4byte 0x25640000 .global $$258951 $$258951: - .incbin "baserom.dol", 0x4945F4, 0x8 + .asciz "Close" + .balign 4 .global $$258952 $$258952: - .incbin "baserom.dol", 0x4945FC, 0x8 + .asciz "Back" + .balign 4 .global $$258954 $$258954: - .incbin "baserom.dol", 0x494604, 0x8 + .asciz "Next" + .balign 4 .global $$259085 $$259085: - .incbin "baserom.dol", 0x49460C, 0x4 + .4byte 0x456E6400 .global $$259087 $$259087: - .incbin "baserom.dol", 0x494610, 0x8 + .asciz "Close2" + .balign 4 .global $$259088 $$259088: - .incbin "baserom.dol", 0x494618, 0x8 + .asciz "Push" + .balign 4 .global $$259089 $$259089: - .incbin "baserom.dol", 0x494620, 0x8 + .asciz "Page" + .balign 4 diff --git a/asm/src/UIntAABBox.s b/asm/src/UIntAABBox.s index 62ec82db..2f885c4c 100644 --- a/asm/src/UIntAABBox.s +++ b/asm/src/UIntAABBox.s @@ -158,7 +158,11 @@ getContract__Q24util10UIntAABBoxCFRCQ24util10UIntAABBox: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250237 $$250237: - .incbin "baserom.dol", 0x49EEE8, 0x4 + .4byte 0 .global $$250238 $$250238: - .incbin "baserom.dol", 0x49EEEC, 0x14 + .4byte 0x4F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/src/UnitHeapMapUser.s b/asm/src/UnitHeapMapUser.s index 35526ffc..9d32c534 100644 --- a/asm/src/UnitHeapMapUser.s +++ b/asm/src/UnitHeapMapUser.s @@ -195,9 +195,21 @@ drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem15UnitHeapMapUser __vt__Q23mem15UnitHeapMapUser: - .incbin "baserom.dol", 0x455E80, 0x30 + .4byte 0 + .4byte 0 + .4byte 0x801BEFB8 ;# ptr + .4byte 0x801BF7C0 ;# ptr + .4byte 0x801BF7D4 ;# ptr + .4byte 0x801BF7D8 ;# ptr + .4byte 0x801BF7EC ;# ptr + .4byte 0x801BF84C ;# ptr + .4byte 0x801BF8A0 ;# ptr + .4byte 0x801BF8DC ;# ptr + .4byte 0x801BF94C ;# ptr + .4byte 0x801BFA2C ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249027 $$249027: - .incbin "baserom.dol", 0x49A700, 0x8 + .4byte 0x00FFFF40 + .4byte 0 diff --git a/asm/src/UserTagProcessor.s b/asm/src/UserTagProcessor.s index 50cd847b..6db62907 100644 --- a/asm/src/UserTagProcessor.s +++ b/asm/src/UserTagProcessor.s @@ -1177,197 +1177,275 @@ setUsePrivateCharButtonPushed__Q23lyt16UserTagProcessorFb: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2 RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2: - .incbin "baserom.dol", 0x410C70, 0x20 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000003 .global privateCharMap__30$$2unnamed$$2UserTagProcessor_cpp$$2 privateCharMap__30$$2unnamed$$2UserTagProcessor_cpp$$2: - .incbin "baserom.dol", 0x410C90, 0xA0 + .4byte 0x80457DE0 + .4byte 0x80557170 + .4byte 0x80457DEC + .4byte 0x80557174 + .4byte 0x80457DF8 + .4byte 0x80557178 + .4byte 0x80457E04 + .4byte 0x8055717C + .4byte 0x80457E10 + .4byte 0x80557180 + .4byte 0x80457E1C + .4byte 0x80557184 + .4byte 0x80457E2C + .4byte 0x80557188 + .4byte 0x80457E38 + .4byte 0x8055718C + .4byte 0x80457E48 + .4byte 0x80557190 + .4byte 0x80457E58 + .4byte 0x80557194 + .4byte 0x80557198 + .4byte 0x805571A0 + .4byte 0x805571A4 + .4byte 0x805571AC + .4byte 0x80457E68 + .4byte 0x805571B0 + .4byte 0x80457E7C + .4byte 0x805571B4 + .4byte 0x80457E90 + .4byte 0x805571B8 + .4byte 0x80457EA0 + .4byte 0x805571BC + .4byte 0x80457EB0 + .4byte 0x805571C0 + .4byte 0x80457EBC + .4byte 0x805571C4 + .4byte 0x80457EC8 + .4byte 0x805571C8 + .4byte 0x80457EDC + .4byte 0x80557178 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249204 $$249204: - .incbin "baserom.dol", 0x453EE0, 0xC + .asciz "Button_1" + .balign 4 .global $$249206 $$249206: - .incbin "baserom.dol", 0x453EEC, 0xC + .asciz "Button_2" + .balign 4 .global $$249208 $$249208: - .incbin "baserom.dol", 0x453EF8, 0xC + .asciz "Button_Up" + .balign 4 .global $$249210 $$249210: - .incbin "baserom.dol", 0x453F04, 0xC + .asciz "Button_Down" .global $$249212 $$249212: - .incbin "baserom.dol", 0x453F10, 0xC + .asciz "Button_Left" .global $$249214 $$249214: - .incbin "baserom.dol", 0x453F1C, 0x10 + .asciz "Button_Right" + .balign 4 .global $$249216 $$249216: - .incbin "baserom.dol", 0x453F2C, 0xC + .asciz "Button_A" + .balign 4 .global $$249218 $$249218: - .incbin "baserom.dol", 0x453F38, 0x10 + .asciz "Shake_LeftHalf" + .balign 4 .global $$249220 $$249220: - .incbin "baserom.dol", 0x453F48, 0x10 + .asciz "Shake_RightHalf" .global $$249222 $$249222: - .incbin "baserom.dol", 0x453F58, 0x10 + .asciz "Button_Minus" + .balign 4 .global $$249228 $$249228: - .incbin "baserom.dol", 0x453F68, 0x14 + .asciz "Button_UpRightDown" + .balign 4 .global $$249230 $$249230: - .incbin "baserom.dol", 0x453F7C, 0x14 + .asciz "Button_UpRight" + .balign 4 + .4byte 0 .global $$249232 $$249232: - .incbin "baserom.dol", 0x453F90, 0x10 + .asciz "Button_DownLeft" .global $$249234 $$249234: - .incbin "baserom.dol", 0x453FA0, 0x10 + .asciz "Button_UpDown" + .balign 4 .global $$249236 $$249236: - .incbin "baserom.dol", 0x453FB0, 0xC + .asciz "Button_Plus" .global $$249238 $$249238: - .incbin "baserom.dol", 0x453FBC, 0xC + .asciz "Button_2_3D" .global $$249240 $$249240: - .incbin "baserom.dol", 0x453FC8, 0x14 + .asciz "Button_2_3D_Push" + .balign 4 .global $$249242 $$249242: - .incbin "baserom.dol", 0x453FDC, 0x10 + .asciz "Button_Random" + .balign 4 .global $$250658 $$250658: - .incbin "baserom.dol", 0x453FEC, 0x10 + .asciz "Button_Random" + .balign 4 .global $$250943 $$250943: - .incbin "baserom.dol", 0x453FFC, 0xC + .asciz "PrivateChar" .global __vt__Q23lyt16UserTagProcessor __vt__Q23lyt16UserTagProcessor: - .incbin "baserom.dol", 0x454008, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801AC7B4 ;# ptr + .4byte 0x801B02C8 ;# ptr + .4byte 0x801B0CAC ;# ptr .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$22 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$22: - .incbin "baserom.dol", 0x45401C, 0x34 + .asciz "NW4R:Pointer Error\nstr(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$21 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$21: - .incbin "baserom.dol", 0x454050, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$20 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$20: - .incbin "baserom.dol", 0x454064, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw: - .incbin "baserom.dol", 0x454098, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5ColorQ34nw4r2ut5Color$$20 $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5ColorQ34nw4r2ut5Color$$20: - .incbin "baserom.dol", 0x4540AC, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5ColorQ34nw4r2ut5Color $$2STRING$$2SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5ColorQ34nw4r2ut5Color: - .incbin "baserom.dol", 0x4540E0, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetGradationStartColor__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetGradationStartColor__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x4540F0, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetGradationStartColor__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetGradationStartColor__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x454124, 0x10 + .asciz "CharWriter.h" + .balign 4 .global $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv$$20 $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv$$20: - .incbin "baserom.dol", 0x454134, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv: - .incbin "baserom.dol", 0x454168, 0x10 + .asciz "CharWriter.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249205 $$249205: - .incbin "baserom.dol", 0x493550, 0x4 + .4byte 0xF0000000 .global $$249207 $$249207: - .incbin "baserom.dol", 0x493554, 0x4 + .4byte 0xF0010000 .global $$249209 $$249209: - .incbin "baserom.dol", 0x493558, 0x4 + .4byte 0xF0020000 .global $$249211 $$249211: - .incbin "baserom.dol", 0x49355C, 0x4 + .4byte 0xF0030000 .global $$249213 $$249213: - .incbin "baserom.dol", 0x493560, 0x4 + .4byte 0xF0040000 .global $$249215 $$249215: - .incbin "baserom.dol", 0x493564, 0x4 + .4byte 0xF0050000 .global $$249217 $$249217: - .incbin "baserom.dol", 0x493568, 0x4 + .4byte 0xF0060000 .global $$249219 $$249219: - .incbin "baserom.dol", 0x49356C, 0x4 + .4byte 0xF0070000 .global $$249221 $$249221: - .incbin "baserom.dol", 0x493570, 0x4 + .4byte 0xF0080000 .global $$249223 $$249223: - .incbin "baserom.dol", 0x493574, 0x4 + .4byte 0xF0090000 .global $$249224 $$249224: - .incbin "baserom.dol", 0x493578, 0x8 + .asciz "Cursor" + .balign 4 .global $$249225 $$249225: - .incbin "baserom.dol", 0x493580, 0x4 + .4byte 0xF00A0000 .global $$249226 $$249226: - .incbin "baserom.dol", 0x493584, 0x8 + .asciz "Star" + .balign 4 .global $$249227 $$249227: - .incbin "baserom.dol", 0x49358C, 0x4 + .4byte 0xF0100000 .global $$249229 $$249229: - .incbin "baserom.dol", 0x493590, 0x4 + .4byte 0xF0120000 .global $$249231 $$249231: - .incbin "baserom.dol", 0x493594, 0x4 + .4byte 0xF0130000 .global $$249233 $$249233: - .incbin "baserom.dol", 0x493598, 0x4 + .4byte 0xF0140000 .global $$249235 $$249235: - .incbin "baserom.dol", 0x49359C, 0x4 + .4byte 0xF0150000 .global $$249237 $$249237: - .incbin "baserom.dol", 0x4935A0, 0x4 + .4byte 0xF0190000 .global $$249239 $$249239: - .incbin "baserom.dol", 0x4935A4, 0x4 + .4byte 0xF00D0000 .global $$249241 $$249241: - .incbin "baserom.dol", 0x4935A8, 0x4 + .4byte 0xF01D0000 .global $$250655 $$250655: - .incbin "baserom.dol", 0x4935AC, 0x4 + .4byte 0xF00B0000 .global $$250656 $$250656: - .incbin "baserom.dol", 0x4935B0, 0x4 + .4byte 0xF00C0000 .global $$250657 $$250657: - .incbin "baserom.dol", 0x4935B4, 0x4 + .4byte 0xF01D0000 .global $$250659 $$250659: - .incbin "baserom.dol", 0x4935B8, 0x4 + .4byte 0xF0020000 .global $$250660 $$250660: - .incbin "baserom.dol", 0x4935BC, 0x4 + .4byte 0xF0030000 .global $$250661 $$250661: - .incbin "baserom.dol", 0x4935C0, 0x4 + .4byte 0xF0040000 .global $$250662 $$250662: - .incbin "baserom.dol", 0x4935C4, 0x4 + .4byte 0xF0050000 .global $$250663 $$250663: - .incbin "baserom.dol", 0x4935C8, 0x8 + .4byte 0 + .4byte 0 .global $$250941 $$250941: - .incbin "baserom.dol", 0x4935D0, 0x8 + .asciz "Replace" .global $$250942 $$250942: - .incbin "baserom.dol", 0x4935D8, 0x8 + .asciz "Action" + .balign 4 diff --git a/asm/src/Util.s b/asm/src/Util.s index f6e914fb..88e918ca 100644 --- a/asm/src/Util.s +++ b/asm/src/Util.s @@ -1836,164 +1836,222 @@ InScreen__Q43scn4step7gimmick4UtilFRQ33scn4step9ComponentRCQ33hel4math7Vector2f: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251998 $$251998: - .incbin "baserom.dol", 0x410C40, 0x20 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000001 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2AsinRad__Q24nw4r4mathFf$$20 $$2STRING$$2AsinRad__Q24nw4r4mathFf$$20: - .incbin "baserom.dol", 0x44F268, 0x28 + .asciz "AsinRad: Input is out of the domain." + .balign 4 .global $$2STRING$$2AsinRad__Q24nw4r4mathFf $$2STRING$$2AsinRad__Q24nw4r4mathFf: - .incbin "baserom.dol", 0x44F290, 0x10 + .asciz "triangular.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2 T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2: - .incbin "baserom.dol", 0x453080, 0x1C + .4byte 0x80556EA8 + .4byte 0x80556EB0 + .4byte 0x80556EB8 + .4byte 0x80556EC0 + .4byte 0x80556EC8 + .4byte 0x80556ED0 + .4byte 0x80556ED8 .global $$254066 $$254066: - .incbin "baserom.dol", 0x45309C, 0x18 + .4byte 0xFF10FF11 + .4byte 0xFF12FF13 + .4byte 0xFF14FF15 + .4byte 0xFF16FF17 + .4byte 0xFF18FF19 + .4byte 0 .global $$254067 $$254067: - .incbin "baserom.dol", 0x4530B4, 0xC + .asciz "SphereCount" .global $$254078 $$254078: - .incbin "baserom.dol", 0x4530C0, 0xC + .asciz "PlayerNum" + .balign 4 .global __vt__Q24info22Iterator$52761Util_cpp __vt__Q24info22Iterator$52761Util_cpp: - .incbin "baserom.dol", 0x4530CC, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A56E8 ;# ptr + .4byte 0x801A5680 ;# ptr + .4byte 0x801A5600 ;# ptr .global __vt__Q24info22Iterator$52705Util_cpp __vt__Q24info22Iterator$52705Util_cpp: - .incbin "baserom.dol", 0x4530E0, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A58A8 ;# ptr + .4byte 0x801A5850 ;# ptr + .4byte 0x801A5804 ;# ptr .global $$254197 $$254197: - .incbin "baserom.dol", 0x4530F4, 0x14 + .asciz "bad_function_call" + .balign 4 .global __vt__Q24info22Iterator$52503Util_cpp __vt__Q24info22Iterator$52503Util_cpp: - .incbin "baserom.dol", 0x453108, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A5918 ;# ptr + .4byte 0x801AFF00 ;# ptr + .4byte 0x801AFF04 ;# ptr .global __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp: - .incbin "baserom.dol", 0x45311C, 0x14 + .4byte 0 + .4byte 0 + .4byte 0x801A5A70 ;# ptr + .4byte 0x801A5A6C ;# ptr + .4byte 0x801A5A68 ;# ptr .global $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$22 $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$22: - .incbin "baserom.dol", 0x453130, 0x34 + .asciz "NW4R:Pointer Error\nstr(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$21 $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$21: - .incbin "baserom.dol", 0x453164, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$20 $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$20: - .incbin "baserom.dol", 0x453178, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw: - .incbin "baserom.dol", 0x4531AC, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$22 $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$22: - .incbin "baserom.dol", 0x4531C0, 0x3C + .asciz "NW4R:Pointer Error\ntagProcessor(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$21 $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$21: - .incbin "baserom.dol", 0x4531FC, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$20 $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1$$20: - .incbin "baserom.dol", 0x453210, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1 $$2STRING$$2SetTagProcessor__Q34nw4r2ut17TextWriterBase$$0w$$1FPQ34nw4r2ut19TagProcessorBase$$0w$$1: - .incbin "baserom.dol", 0x453244, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20 $$2STRING$$2SetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20: - .incbin "baserom.dol", 0x453258, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff $$2STRING$$2SetCharSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff: - .incbin "baserom.dol", 0x45328C, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .global $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20 $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20: - .incbin "baserom.dol", 0x4532A0, 0x34 + .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." + .balign 4 .global $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff: - .incbin "baserom.dol", 0x4532D4, 0x14 + .asciz "TextWriterBase.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251913 $$251913: - .incbin "baserom.dol", 0x493288, 0x8 + .asciz "KirbyN" + .balign 4 .global $$251914 $$251914: - .incbin "baserom.dol", 0x493290, 0x8 + .asciz "KirbyYN" .global $$251915 $$251915: - .incbin "baserom.dol", 0x493298, 0x8 + .asciz "KirbyRN" .global $$251916 $$251916: - .incbin "baserom.dol", 0x4932A0, 0x8 + .asciz "KirbyGN" .global $$251917 $$251917: - .incbin "baserom.dol", 0x4932A8, 0x8 + .asciz "MetaN" + .balign 4 .global $$251918 $$251918: - .incbin "baserom.dol", 0x4932B0, 0x8 + .asciz "DededeN" .global $$251919 $$251919: - .incbin "baserom.dol", 0x4932B8, 0x8 + .asciz "WadoN" + .balign 4 .global $$254065 $$254065: - .incbin "baserom.dol", 0x4932C0, 0x8 + .4byte 0x00250075 + .4byte 0 .global $$254094 $$254094: - .incbin "baserom.dol", 0x4932C8, 0x8 + .asciz "FileNum" .global $$254215 $$254215: - .incbin "baserom.dol", 0x4932D0, 0x8 + .asciz "Replace" .global $$2STRING$$2onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc$$20 $$2STRING$$2onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc$$20: - .incbin "baserom.dol", 0x4932D8, 0x8 + .asciz "Suspend" .global $$2STRING$$2onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc $$2STRING$$2onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc: - .incbin "baserom.dol", 0x4932E0, 0x8 + .asciz "Action" + .balign 4 .global $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$22 $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$22: - .incbin "baserom.dol", 0x4932E8, 0x8 + .4byte 0 + .4byte 0 .global $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$21 $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$21: - .incbin "baserom.dol", 0x4932F0, 0x8 + .asciz "Suspend" .global $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$20 $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$20: - .incbin "baserom.dol", 0x4932F8, 0x8 + .asciz "Suspend" .global $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc: - .incbin "baserom.dol", 0x493300, 0x8 + .asciz "Action" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251710 $$251710: - .incbin "baserom.dol", 0x49A148, 0x4 + .4byte 0x3727C5AC .global $$251731 $$251731: - .incbin "baserom.dol", 0x49A14C, 0x4 + .4byte 0 .global $$251760 $$251760: - .incbin "baserom.dol", 0x49A150, 0x4 + .4byte 0x3F800000 .global $$251761 $$251761: - .incbin "baserom.dol", 0x49A154, 0x4 + .4byte 0xBF800000 .global $$251762 $$251762: - .incbin "baserom.dol", 0x49A158, 0x4 + .4byte 0x40490FDB .global $$251842 $$251842: - .incbin "baserom.dol", 0x49A15C, 0x4 + .4byte 0x00800000 .global $$251843 $$251843: - .incbin "baserom.dol", 0x49A160, 0x4 + .4byte 0x3FC90FDB .global $$251844 $$251844: - .incbin "baserom.dol", 0x49A164, 0x4 + .4byte 0xBFC90FDB .global $$251845 $$251845: - .incbin "baserom.dol", 0x49A168, 0x4 + .4byte 0x4222F983 .global $$251853 $$251853: - .incbin "baserom.dol", 0x49A16C, 0x4 + .4byte 0x3CC90FDB .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253983 $$253983: - .incbin "baserom.dol", 0x49A478, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Utility.s b/asm/src/Utility.s index 4c24acaf..a50679f8 100644 --- a/asm/src/Utility.s +++ b/asm/src/Utility.s @@ -10829,496 +10829,603 @@ lbl_80401D7C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$259919 $$259919: - .incbin "baserom.dol", 0x412590, 0x6C + .4byte 0x0000000F + .4byte 0 + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000016 .global $$259947 $$259947: - .incbin "baserom.dol", 0x4125FC, 0x6C + .4byte 0x0000000F + .4byte 0 + .4byte 0x00000002 + .4byte 0x0000000F + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0x0000000C + .4byte 0x0000000F + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x0000000F + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000016 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x460970, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x460994, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x4609A0, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x4609C4, 0xC + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$261649 $$261649: - .incbin "baserom.dol", 0x46ED78, 0x28 + .4byte 0x8028E910 ;# ptr + .4byte 0x8028E910 ;# ptr + .4byte 0x8028E904 ;# ptr + .4byte 0x8028E8E4 ;# ptr + .4byte 0x8028E8D4 ;# ptr + .4byte 0x8028E8F4 ;# ptr + .4byte 0x8028E90C ;# ptr + .4byte 0x8028E8DC ;# ptr + .4byte 0x8028E8FC ;# ptr + .4byte 0x8028E8EC ;# ptr .global $$261690 $$261690: - .incbin "baserom.dol", 0x46EDA0, 0x28 + .4byte 0x8028EB08 ;# ptr + .4byte 0x8028E978 ;# ptr + .4byte 0x8028E9E0 ;# ptr + .4byte 0x8028EA04 ;# ptr + .4byte 0x8028EA28 ;# ptr + .4byte 0x8028EA4C ;# ptr + .4byte 0x8028EA70 ;# ptr + .4byte 0x8028EA98 ;# ptr + .4byte 0x8028EABC ;# ptr + .4byte 0x8028EAE0 ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: - .incbin "baserom.dol", 0x47A458, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x802EF7C8 ;# ptr + .4byte 0x802EF7AC ;# ptr .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264675 $$264675: - .incbin "baserom.dol", 0x481720, 0x28 + .4byte 0x803577EC + .4byte 0x803577F8 + .4byte 0x8035780C + .4byte 0x80357820 + .4byte 0x80357834 + .4byte 0x80357848 + .4byte 0x8035785C + .4byte 0x80357870 + .4byte 0x80357884 + .4byte 0x80357898 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481748, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80358900 + .4byte 0x803588E4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249660 $$249660: - .incbin "baserom.dol", 0x493100, 0x8 + .asciz "%s.%s%s" .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260100 $$260100: - .incbin "baserom.dol", 0x4952D0, 0x4 + .4byte 0x42480000 .global $$260101 $$260101: - .incbin "baserom.dol", 0x4952D4, 0x4 + .4byte 0 .global $$260103 $$260103: - .incbin "baserom.dol", 0x4952D8, 0x4 + .4byte 0x42480000 .global $$260104 $$260104: - .incbin "baserom.dol", 0x4952DC, 0x4 + .4byte 0x43340000 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259859 $$259859: - .incbin "baserom.dol", 0x495A18, 0x4 + .4byte 0x42480000 .global $$259860 $$259860: - .incbin "baserom.dol", 0x495A1C, 0x4 + .4byte 0 .global $$259862 $$259862: - .incbin "baserom.dol", 0x495A20, 0x4 + .4byte 0x42480000 .global $$259863 $$259863: - .incbin "baserom.dol", 0x495A24, 0x4 + .4byte 0x43340000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251743 $$251743: - .incbin "baserom.dol", 0x49A298, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251748 $$251748: - .incbin "baserom.dol", 0x49A2A0, 0x4 + .4byte 0x3F000000 .global $$251755 $$251755: - .incbin "baserom.dol", 0x49A2A4, 0x4 + .4byte 0 .global $$251796 $$251796: - .incbin "baserom.dol", 0x49A2A8, 0x4 + .4byte 0x3F800000 .global $$251797 $$251797: - .incbin "baserom.dol", 0x49A2AC, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251538 $$251538: - .incbin "baserom.dol", 0x49A500, 0x4 + .4byte 0x3DCCCCCD .global $$251540 $$251540: - .incbin "baserom.dol", 0x49A504, 0x4 + .4byte 0x43480000 .global $$251542 $$251542: - .incbin "baserom.dol", 0x49A508, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$251544 $$251544: - .incbin "baserom.dol", 0x49A510, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$251552 $$251552: - .incbin "baserom.dol", 0x49A518, 0x4 + .4byte 0 .global $$251553 $$251553: - .incbin "baserom.dol", 0x49A51C, 0x4 + .4byte 0x42C7E666 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259635 $$259635: - .incbin "baserom.dol", 0x49AED0, 0x4 + .4byte 0xFFFFFF8C .global $$259696 $$259696: - .incbin "baserom.dol", 0x49AED4, 0x4 + .4byte 0xFFFFFF60 .global $$261417 $$261417: - .incbin "baserom.dol", 0x49AED8, 0x4 + .4byte 0xBF000000 .global $$261476 $$261476: - .incbin "baserom.dol", 0x49AEDC, 0x4 + .4byte 0x41A00000 .global $$261507 $$261507: - .incbin "baserom.dol", 0x49AEE0, 0x4 + .4byte 0x3727C5AC .global $$261509 $$261509: - .incbin "baserom.dol", 0x49AEE4, 0x4 + .4byte 0x42652EE1 .global $$261510 $$261510: - .incbin "baserom.dol", 0x49AEE8, 0x4 + .4byte 0x42B40000 .global $$261511 $$261511: - .incbin "baserom.dol", 0x49AEEC, 0x4 + .4byte 0 .global $$261512 $$261512: - .incbin "baserom.dol", 0x49AEF0, 0x4 + .4byte 0xC3B40000 .global $$261513 $$261513: - .incbin "baserom.dol", 0x49AEF4, 0x4 + .4byte 0x43340000 .global $$261514 $$261514: - .incbin "baserom.dol", 0x49AEF8, 0x4 + .4byte 0x43B40000 .global $$261515 $$261515: - .incbin "baserom.dol", 0x49AEFC, 0x4 + .4byte 0xC3340000 .global $$261516 $$261516: - .incbin "baserom.dol", 0x49AF00, 0x8 + .4byte 0x3D23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261487 $$261487: - .incbin "baserom.dol", 0x49BA38, 0x4 + .4byte 0x3F800000 .global $$261488 $$261488: - .incbin "baserom.dol", 0x49BA3C, 0x4 + .4byte 0x3FC00000 .global $$261489 $$261489: - .incbin "baserom.dol", 0x49BA40, 0x4 + .4byte 0x40200000 .global $$261490 $$261490: - .incbin "baserom.dol", 0x49BA44, 0x4 + .4byte 0x3F4CCCCD .global $$261491 $$261491: - .incbin "baserom.dol", 0x49BA48, 0x4 + .4byte 0x3F266666 .global $$261492 $$261492: - .incbin "baserom.dol", 0x49BA4C, 0x4 + .4byte 0x3FA66666 .global $$261493 $$261493: - .incbin "baserom.dol", 0x49BA50, 0x4 + .4byte 0x3F933333 .global $$261504 $$261504: - .incbin "baserom.dol", 0x49BA54, 0x4 + .4byte 0x40400000 .global $$261505 $$261505: - .incbin "baserom.dol", 0x49BA58, 0x4 + .4byte 0x3F19999A .global $$261506 $$261506: - .incbin "baserom.dol", 0x49BA5C, 0x4 + .4byte 0x3F99999A .global $$261527 $$261527: - .incbin "baserom.dol", 0x49BA60, 0x4 + .4byte 0x41300000 .global $$261528 $$261528: - .incbin "baserom.dol", 0x49BA64, 0x4 + .4byte 0x40A00000 .global $$261600 $$261600: - .incbin "baserom.dol", 0x49BA68, 0x4 + .4byte 0xBF800000 .global $$261640 $$261640: - .incbin "baserom.dol", 0x49BA6C, 0x4 + .4byte 0 .global $$261641 $$261641: - .incbin "baserom.dol", 0x49BA70, 0x4 + .4byte 0x42340000 .global $$261642 $$261642: - .incbin "baserom.dol", 0x49BA74, 0x4 + .4byte 0x42B40000 .global $$261643 $$261643: - .incbin "baserom.dol", 0x49BA78, 0x4 + .4byte 0x43070000 .global $$261644 $$261644: - .incbin "baserom.dol", 0x49BA7C, 0x4 + .4byte 0x43340000 .global $$261645 $$261645: - .incbin "baserom.dol", 0x49BA80, 0x4 + .4byte 0x43610000 .global $$261646 $$261646: - .incbin "baserom.dol", 0x49BA84, 0x4 + .4byte 0x43870000 .global $$261647 $$261647: - .incbin "baserom.dol", 0x49BA88, 0x4 + .4byte 0x439D8000 .global $$261686 $$261686: - .incbin "baserom.dol", 0x49BA8C, 0x4 + .4byte 0xBF3504F3 .global $$261687 $$261687: - .incbin "baserom.dol", 0x49BA90, 0x4 + .4byte 0x3F3504F3 .global $$261717 $$261717: - .incbin "baserom.dol", 0x49BA94, 0x4 + .4byte 0x3F000000 .global $$261792 $$261792: - .incbin "baserom.dol", 0x49BA98, 0x4 + .4byte 0x3DCCCCCD .global $$261954 $$261954: - .incbin "baserom.dol", 0x49BA9C, 0x4 + .4byte 0x3727C5AC .global $$261977 $$261977: - .incbin "baserom.dol", 0x49BAA0, 0x4 + .4byte 0x41A00000 .global $$262002 $$262002: - .incbin "baserom.dol", 0x49BAA4, 0x4 + .4byte 0xBF000000 .global $$262004 $$262004: - .incbin "baserom.dol", 0x49BAA8, 0x4 + .4byte 0x42652EE1 .global $$262005 $$262005: - .incbin "baserom.dol", 0x49BAAC, 0x4 + .4byte 0xC3B40000 .global $$262006 $$262006: - .incbin "baserom.dol", 0x49BAB0, 0x4 + .4byte 0x43B40000 .global $$262007 $$262007: - .incbin "baserom.dol", 0x49BAB4, 0x4 + .4byte 0xC3340000 .global $$262008 $$262008: - .incbin "baserom.dol", 0x49BAB8, 0x8 + .4byte 0x3D23D70A + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 $$256724: - .incbin "baserom.dol", 0x49C058, 0x4 + .4byte 0 .global $$256725 $$256725: - .incbin "baserom.dol", 0x49C05C, 0x4 + .4byte 0xBF000000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258292 $$258292: - .incbin "baserom.dol", 0x49C298, 0x4 + .4byte 0x3C8EFA35 .global $$258293 $$258293: - .incbin "baserom.dol", 0x49C29C, 0x4 + .4byte 0xBF800000 .global $$258300 $$258300: - .incbin "baserom.dol", 0x49C2A0, 0x4 + .4byte 0x38D1B717 .global $$258301 $$258301: - .incbin "baserom.dol", 0x49C2A4, 0x4 + .4byte 0x3E4CCCCD .global $$258302 $$258302: - .incbin "baserom.dol", 0x49C2A8, 0x4 + .4byte 0x3BC49BA6 .global $$258303 $$258303: - .incbin "baserom.dol", 0x49C2AC, 0x4 + .4byte 0x3BA3D70A .global $$258304 $$258304: - .incbin "baserom.dol", 0x49C2B0, 0x4 + .4byte 0x3D23D70A .global $$258305 $$258305: - .incbin "baserom.dol", 0x49C2B4, 0x4 + .4byte 0x3B03126F .global $$258306 $$258306: - .incbin "baserom.dol", 0x49C2B8, 0x4 + .4byte 0x3A83126F .global $$258339 $$258339: - .incbin "baserom.dol", 0x49C2BC, 0x4 + .4byte 0 .global $$258340 $$258340: - .incbin "baserom.dol", 0x49C2C0, 0x4 + .4byte 0x3F000000 .global $$258341 $$258341: - .incbin "baserom.dol", 0x49C2C4, 0x4 + .4byte 0xBF000000 .global $$258370 $$258370: - .incbin "baserom.dol", 0x49C2C8, 0x4 + .4byte 0x3F800000 .global $$258394 $$258394: - .incbin "baserom.dol", 0x49C2CC, 0x4 + .4byte 0x3F400000 .global $$258395 $$258395: - .incbin "baserom.dol", 0x49C2D0, 0x4 + .4byte 0x3ECCCCCD .global $$258481 $$258481: - .incbin "baserom.dol", 0x49C2D4, 0x4 + .4byte 0x3F4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257104 $$257104: - .incbin "baserom.dol", 0x49D050, 0x4 + .4byte 0x3F800000 .global $$257105 $$257105: - .incbin "baserom.dol", 0x49D054, 0x4 + .4byte 0xBF800000 .global $$257106 $$257106: - .incbin "baserom.dol", 0x49D058, 0x4 + .4byte 0x3E800000 .global $$257107 $$257107: - .incbin "baserom.dol", 0x49D05C, 0x4 + .4byte 0 .global $$257110 $$257110: - .incbin "baserom.dol", 0x49D060, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_WATERPISTOL_VARIATION_TABLE_STRONG__Q43scn4step4hero21$$2unnamed$$2Utility_cpp$$2 T_WATERPISTOL_VARIATION_TABLE_STRONG__Q43scn4step4hero21$$2unnamed$$2Utility_cpp$$2: - .incbin "baserom.dol", 0x49D9F8, 0x8 + .4byte 0x00000002 + .4byte 0x00000003 .global $$264296 $$264296: - .incbin "baserom.dol", 0x49DA00, 0x4 + .4byte 0 .global $$264442 $$264442: - .incbin "baserom.dol", 0x49DA04, 0x4 + .4byte 0x3F000000 .global $$264465 $$264465: - .incbin "baserom.dol", 0x49DA08, 0x4 + .4byte 0x3E4CCCCD .global $$264466 $$264466: - .incbin "baserom.dol", 0x49DA0C, 0x4 + .4byte 0x3DCCCCCD .global $$264495 $$264495: - .incbin "baserom.dol", 0x49DA10, 0x4 + .4byte 0x3F800000 .global $$264496 $$264496: - .incbin "baserom.dol", 0x49DA14, 0x4 + .4byte 0xBF800000 .global $$264812 $$264812: - .incbin "baserom.dol", 0x49DA18, 0x4 + .4byte 0x3FC00000 .global $$264893 $$264893: - .incbin "baserom.dol", 0x49DA1C, 0x4 + .4byte 0x3727C5AC .global $$264894 $$264894: - .incbin "baserom.dol", 0x49DA20, 0x4 + .4byte 0xB727C5AC .global $$261260 $$261260: - .incbin "baserom.dol", 0x49DA24, 0x4 + .4byte 0xFF00FFFF .global $$264998 $$264998: - .incbin "baserom.dol", 0x49DA28, 0x4 + .4byte 0x3F490FDB .global $$264999 $$264999: - .incbin "baserom.dol", 0x49DA2C, 0x4 + .4byte 0x40490FDB .global $$265000 $$265000: - .incbin "baserom.dol", 0x49DA30, 0x8 + .4byte 0x4222F983 + .4byte 0 .global $$265003 $$265003: - .incbin "baserom.dol", 0x49DA38, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253894 $$253894: - .incbin "baserom.dol", 0x49DEE0, 0x4 + .4byte 0x3C8EFA35 .global $$253895 $$253895: - .incbin "baserom.dol", 0x49DEE4, 0x4 + .4byte 0xBF800000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250538 $$250538: - .incbin "baserom.dol", 0x49E018, 0x4 + .4byte 0x3FC00000 .global $$250539 $$250539: - .incbin "baserom.dol", 0x49E01C, 0x4 + .4byte 0x3F000000 .global $$250540 $$250540: - .incbin "baserom.dol", 0x49E020, 0x4 + .4byte 0x3F800000 .global $$250541 $$250541: - .incbin "baserom.dol", 0x49E024, 0x4 + .4byte 0x3DCCCCCD .global $$250542 $$250542: - .incbin "baserom.dol", 0x49E028, 0x8 + .4byte 0x3D4CCCCD + .4byte 0 .global $$250549 $$250549: - .incbin "baserom.dol", 0x49E030, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253722 $$253722: - .incbin "baserom.dol", 0x49E0F0, 0x4 + .4byte 0 .global $$253723 $$253723: - .incbin "baserom.dol", 0x49E0F4, 0x4 + .4byte 0x3E4CCCCD .global $$253724 $$253724: - .incbin "baserom.dol", 0x49E0F8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258122 $$258122: - .incbin "baserom.dol", 0x49E128, 0x4 + .4byte 0x3F000000 .global $$258162 $$258162: - .incbin "baserom.dol", 0x49E12C, 0x4 + .4byte 0x3FC00000 .global $$258163 $$258163: - .incbin "baserom.dol", 0x49E130, 0x4 + .4byte 0xBF000000 .global $$258164 $$258164: - .incbin "baserom.dol", 0x49E134, 0x4 + .4byte 0 .global $$258168 $$258168: - .incbin "baserom.dol", 0x49E138, 0x8 + .4byte 0x43300000 + .4byte 0 .global $$258173 $$258173: - .incbin "baserom.dol", 0x49E140, 0x4 + .4byte 0x3E800000 .global $$258180 $$258180: - .incbin "baserom.dol", 0x49E144, 0x4 + .4byte 0x3AEBEDFA .global $$258198 $$258198: - .incbin "baserom.dol", 0x49E148, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253795 $$253795: - .incbin "baserom.dol", 0x49E590, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251819 $$251819: - .incbin "baserom.dol", 0x49E828, 0x4 + .4byte 0x3727C5AC .global $$251820 $$251820: - .incbin "baserom.dol", 0x49E82C, 0x4 + .4byte 0x3F800000 .global $$251821 $$251821: - .incbin "baserom.dol", 0x49E830, 0x8 + .4byte 0x3E19999A + .4byte 0 .global $$251826 $$251826: - .incbin "baserom.dol", 0x49E838, 0x8 + .4byte 0x43300000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255686 $$255686: - .incbin "baserom.dol", 0x49EA88, 0x4 + .4byte 0x42652EE1 .global $$255687 $$255687: - .incbin "baserom.dol", 0x49EA8C, 0x4 + .4byte 0x43340000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255686 $$255686: - .incbin "baserom.dol", 0x49EC70, 0x4 + .4byte 0x42652EE1 .global $$255687 $$255687: - .incbin "baserom.dol", 0x49EC74, 0x4 + .4byte 0x43340000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251502 $$251502: - .incbin "baserom.dol", 0x49EE58, 0x4 + .4byte 0x3F800000 .global $$251503 $$251503: - .incbin "baserom.dol", 0x49EE5C, 0x4 + .4byte 0xBF800000 .global $$251504 $$251504: - .incbin "baserom.dol", 0x49EE60, 0x4 + .4byte 0 .global $$251519 $$251519: - .incbin "baserom.dol", 0x49EE64, 0x4 + .4byte 0xBF000000 .global $$251520 $$251520: - .incbin "baserom.dol", 0x49EE68, 0x8 + .4byte 0x3F000000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_isFileLoadWarningEnable__Q24file21$$2unnamed$$2Utility_cpp$$2 diff --git a/asm/src/VISetting.s b/asm/src/VISetting.s index 5b9cca63..4e8d2754 100644 --- a/asm/src/VISetting.s +++ b/asm/src/VISetting.s @@ -281,53 +281,291 @@ getDimming__Q23gfx9VISettingCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4106B8, 0x44 + .4byte 0 + .4byte 0x028001C8 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x026001C8 + .4byte 0 .global NtscInt4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscInt4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4106FC, 0x44 + .4byte 0 + .4byte 0x028000E6 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00010302 + .4byte 0x0906030A + .4byte 0x03020906 + .4byte 0x030A0902 + .4byte 0x0306090A + .4byte 0x09020306 + .4byte 0x090A0408 + .4byte 0x0C100C08 + .4byte 0x04000000 + .4byte 0x026001C8 + .4byte 0 .global NtscProg4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscProg4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410740, 0x44 + .4byte 0x00000002 + .4byte 0x028001C8 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060000 + .4byte 0x15161500 + .4byte 0 + .4byte 0x026001C8 + .4byte 0 .global NtscProg4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscProg4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410784, 0x44 + .4byte 0x00000002 + .4byte 0x028000E6 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00010302 + .4byte 0x0906030A + .4byte 0x03020906 + .4byte 0x030A0902 + .4byte 0x0306090A + .4byte 0x09020306 + .4byte 0x090A0408 + .4byte 0x0C100C08 + .4byte 0x04000000 + .4byte 0x026001C8 + .4byte 0 .global Pal50Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal50Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4107C8, 0x44 + .4byte 0x00000004 + .4byte 0x028001C8 + .4byte 0x021E001B + .4byte 0x0010029A + .4byte 0x021E0000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x026001C8 + .4byte 0 .global Pal60Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal60Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x41080C, 0x44 + .4byte 0x00000014 + .4byte 0x028001C8 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x026001C8 + .4byte 0 .global Pal60Prog4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal60Prog4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410850, 0x44 + .4byte 0x00000016 + .4byte 0x028001C8 + .4byte 0x01C80019 + .4byte 0x000C029E + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060000 + .4byte 0x15161500 + .4byte 0 + .4byte 0x026001C8 + .4byte 0 .global NtscInt16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscInt16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410894, 0x44 + .4byte 0 + .4byte 0x028001C8 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x034001C8 + .4byte 0x01000000 .global NtscInt16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscInt16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4108D8, 0x44 + .4byte 0 + .4byte 0x028000E6 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00010302 + .4byte 0x0906030A + .4byte 0x03020906 + .4byte 0x030A0902 + .4byte 0x0306090A + .4byte 0x09020306 + .4byte 0x090A0408 + .4byte 0x0C100C08 + .4byte 0x04000000 + .4byte 0x034001C8 + .4byte 0x01000000 .global NtscProg16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscProg16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x41091C, 0x44 + .4byte 0x00000002 + .4byte 0x028001C8 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060000 + .4byte 0x15161500 + .4byte 0 + .4byte 0x034001C8 + .4byte 0x01000000 .global NtscProg16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscProg16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410960, 0x44 + .4byte 0x00000002 + .4byte 0x028000E6 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00010302 + .4byte 0x0906030A + .4byte 0x03020906 + .4byte 0x030A0902 + .4byte 0x0306090A + .4byte 0x09020306 + .4byte 0x090A0408 + .4byte 0x0C100C08 + .4byte 0x04000000 + .4byte 0x034001C8 + .4byte 0x01000000 .global Pal50Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal50Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4109A4, 0x44 + .4byte 0x00000004 + .4byte 0x028001C8 + .4byte 0x021E0013 + .4byte 0x001002AA + .4byte 0x021E0000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x034001C8 + .4byte 0x01000000 .global Pal60Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal60Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x4109E8, 0x44 + .4byte 0x00000014 + .4byte 0x028001C8 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060707 + .4byte 0x0C0C0C07 + .4byte 0x07000000 + .4byte 0x034001C8 + .4byte 0x01000000 .global Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x410A2C, 0x44 + .4byte 0x00000016 + .4byte 0x028001C8 + .4byte 0x01C80011 + .4byte 0x000C02AE + .4byte 0x01C80000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060000 + .4byte 0x15161500 + .4byte 0 + .4byte 0x034001C8 + .4byte 0x01000000 .section .data, "wa" # 0x80421040 - 0x80496700 .global StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .incbin "baserom.dol", 0x450AA8, 0x38 + .4byte 0x804145B8 + .4byte 0x804145FC + .4byte 0x80414640 + .4byte 0x80414684 + .4byte 0x804146C8 + .4byte 0x8041470C + .4byte 0x80414750 + .4byte 0x80414794 + .4byte 0x804147D8 + .4byte 0x8041481C + .4byte 0x80414860 + .4byte 0x804148A4 + .4byte 0x804148E8 + .4byte 0x8041492C .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249284 $$249284: - .incbin "baserom.dol", 0x49A2B0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/VMCore.s b/asm/src/VMCore.s index 8c881442..14932c13 100644 --- a/asm/src/VMCore.s +++ b/asm/src/VMCore.s @@ -3571,261 +3571,368 @@ deallocate__Q26mintvm215STLAllocator$$0Q33std187__tree_deleter$$0Q23std25pair$$0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258575 $$258575: - .incbin "baserom.dol", 0x458680, 0x1C + .asciz "tree::insert length error" + .balign 4 .global $$258628 $$258628: - .incbin "baserom.dol", 0x45869C, 0xC + .asciz "__Init()" + .balign 4 .global $$258641 $$258641: - .incbin "baserom.dol", 0x4586A8, 0xC + .asciz "Mint.Debug" + .balign 4 .global $$258642 $$258642: - .incbin "baserom.dol", 0x4586B4, 0x14 + .asciz "void Assert(bool)" + .balign 4 .global $$258643 $$258643: - .incbin "baserom.dol", 0x4586C8, 0x18 + .asciz "void AssertEq(int,int)" + .balign 4 .global $$258644 $$258644: - .incbin "baserom.dol", 0x4586E0, 0x1C + .asciz "void AssertEq(float,float)" + .balign 4 .global $$258645 $$258645: - .incbin "baserom.dol", 0x4586FC, 0x24 + .asciz "void AssertEq(float,float,float)" + .balign 4 .global $$258646 $$258646: - .incbin "baserom.dol", 0x458720, 0x18 + .asciz "void TestEq(int,int)" + .balign 4 .global $$258647 $$258647: - .incbin "baserom.dol", 0x458738, 0x1C + .asciz "void TestEq(float,float)" + .balign 4 .global $$258648 $$258648: - .incbin "baserom.dol", 0x458754, 0x20 + .asciz "void TestEq(float,float,float)" + .balign 4 .global $$258649 $$258649: - .incbin "baserom.dol", 0x458774, 0x10 + .asciz "void Dump(int)" + .balign 4 .global $$258650 $$258650: - .incbin "baserom.dol", 0x458784, 0x14 + .asciz "void Dump(float)" + .balign 4 .global $$258651 $$258651: - .incbin "baserom.dol", 0x458798, 0x14 + .asciz "void print(string)" + .balign 4 .global $$258652 $$258652: - .incbin "baserom.dol", 0x4587AC, 0x14 + .asciz "void puts(string)" + .balign 4 .global $$258653 $$258653: - .incbin "baserom.dol", 0x4587C0, 0x14 + .asciz "void StackDump()" + .balign 4 .global $$258654 $$258654: - .incbin "baserom.dol", 0x4587D4, 0xC + .asciz "Mint.Cast" + .balign 4 .global $$258655 $$258655: - .incbin "baserom.dol", 0x4587E0, 0x10 + .asciz "void i2f(int)" + .balign 4 .global $$258656 $$258656: - .incbin "baserom.dol", 0x4587F0, 0x10 + .asciz "void f2i(float)" .global $$258679 $$258679: - .incbin "baserom.dol", 0x458800, 0x20 + .asciz "Not Found Variable Symbol" + .balign 4 + .4byte 0 .global $$2LOCAL$$2isBuiltInType__Q26mintvm6VMCoreFPCc$$2table $$2LOCAL$$2isBuiltInType__Q26mintvm6VMCoreFPCc$$2table: - .incbin "baserom.dol", 0x458820, 0x10 + .4byte 0x80557580 + .4byte 0x80557588 + .4byte 0x8055758C + .4byte 0x80557594 .global $$258793 $$258793: - .incbin "baserom.dol", 0x458830, 0x1C + .asciz "Not Found VMCore::sizeOf" + .balign 4 .global $$258849 $$258849: - .incbin "baserom.dol", 0x45884C, 0x1C + .asciz "Not Found VMCore::offsetOf" + .balign 4 .global $$258872 $$258872: - .incbin "baserom.dol", 0x458868, 0xC + .asciz "\n* name : " + .balign 4 .global $$258874 $$258874: - .incbin "baserom.dol", 0x458874, 0x1C + .asciz "Not Found Function Symbol" + .balign 4 .global $$258933 $$258933: - .incbin "baserom.dol", 0x458890, 0xC + .asciz "VMCore.cpp" + .balign 4 .global $$258934 $$258934: - .incbin "baserom.dol", 0x45889C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$258979 $$258979: - .incbin "baserom.dol", 0x4588B0, 0x28 + .4byte 0x93AF82B6 + .4byte 0x96BC914F + .4byte 0x82CC8AD6 + .4byte 0x909482AA + .4byte 0x93F189F1 + .4byte 0x936F985E + .4byte 0x82B382EA + .4byte 0x82DC82B5 + .4byte 0x82BD8142 + .4byte 0 .global $$258998 $$258998: - .incbin "baserom.dol", 0x4588D8, 0x28 + .4byte 0x83418358 + .4byte 0x835E838A + .4byte 0x8358834E + .4byte 0x28272A27 + .4byte 0x2982AA8D + .4byte 0xAC93FC82 + .4byte 0xB582C482 + .4byte 0xA282DC82 + .4byte 0xB70A2A20 + .4byte 0 .global $$258999 $$258999: - .incbin "baserom.dol", 0x458900, 0x1C + .asciz "VMCore::addNativeFunction" + .balign 4 .global $$259000 $$259000: - .incbin "baserom.dol", 0x45891C, 0x1C + .4byte 0x8DB68A87 + .4byte 0x8CCA2827 + .4byte 0x28272982 + .4byte 0xAA82A082 + .4byte 0xE882DC82 + .4byte 0xB982F10A + .4byte 0x2A200000 .global $$259001 $$259001: - .incbin "baserom.dol", 0x458938, 0x1C + .4byte 0x89458A87 + .4byte 0x8CCA2827 + .4byte 0x29272982 + .4byte 0xAA82A082 + .4byte 0xE882DC82 + .4byte 0xB982F10A + .4byte 0x2A200000 .global $$259008 $$259008: - .incbin "baserom.dol", 0x458954, 0x10 + .asciz "Not found %s\n" + .balign 4 .global __vt__Q26mintvm6VMCore __vt__Q26mintvm6VMCore: - .incbin "baserom.dol", 0x458964, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CAE1C ;# ptr .global __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1 __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1: - .incbin "baserom.dol", 0x458970, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CADB0 ;# ptr .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1: - .incbin "baserom.dol", 0x45897C, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CACE8 ;# ptr .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1: - .incbin "baserom.dol", 0x458988, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CAC20 ;# ptr .global __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1 __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1: - .incbin "baserom.dol", 0x458994, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CAB58 ;# ptr .global __vt__Q26mintvm8VMObject __vt__Q26mintvm8VMObject: - .incbin "baserom.dol", 0x4589A0, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801C9F3C ;# ptr .global $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule$$20 $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule$$20: - .incbin "baserom.dol", 0x4589AC, 0xC + .asciz "mMax = %d\n" + .balign 4 .global $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule: - .incbin "baserom.dol", 0x4589B8, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$22 $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$22: - .incbin "baserom.dol", 0x4589C8, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$21 $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$21: - .incbin "baserom.dol", 0x4589DC, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$20 $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl$$20: - .incbin "baserom.dol", 0x4589EC, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl $$2STRING$$2deletePtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FUl: - .incbin "baserom.dol", 0x458A00, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$22 $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$22: - .incbin "baserom.dol", 0x458A10, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$21 $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$21: - .incbin "baserom.dol", 0x458A24, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$20 $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$20: - .incbin "baserom.dol", 0x458A34, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl $$2STRING$$2deletePtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl: - .incbin "baserom.dol", 0x458A48, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$20 $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl$$20: - .incbin "baserom.dol", 0x458A58, 0xC + .asciz "count = %d\n" .global $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FUl: - .incbin "baserom.dol", 0x458A64, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1CFUl$$20 $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1CFUl$$20: - .incbin "baserom.dol", 0x458A74, 0xC + .asciz "count = %d\n" .global $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1CFUl $$2STRING$$2at__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1CFUl: - .incbin "baserom.dol", 0x458A80, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$22 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$22: - .incbin "baserom.dol", 0x458A90, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$21 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$21: - .incbin "baserom.dol", 0x458AA4, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$20 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$20: - .incbin "baserom.dol", 0x458AB4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl: - .incbin "baserom.dol", 0x458AC8, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$20 $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl$$20: - .incbin "baserom.dol", 0x458AD8, 0xC + .asciz "count = %d\n" .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FUl: - .incbin "baserom.dol", 0x458AE4, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$22 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$22: - .incbin "baserom.dol", 0x458AF4, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$21 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$21: - .incbin "baserom.dol", 0x458B08, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$20 $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$20: - .incbin "baserom.dol", 0x458B18, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl $$2STRING$$2deletePtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl: - .incbin "baserom.dol", 0x458B2C, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$20 $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl$$20: - .incbin "baserom.dol", 0x458B3C, 0xC + .asciz "count = %d\n" .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FUl: - .incbin "baserom.dol", 0x458B48, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2add__Q26mintvm9TmpSymbolFPCc$$20 $$2STRING$$2add__Q26mintvm9TmpSymbolFPCc$$20: - .incbin "baserom.dol", 0x458B58, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2add__Q26mintvm9TmpSymbolFPCc $$2STRING$$2add__Q26mintvm9TmpSymbolFPCc: - .incbin "baserom.dol", 0x458B6C, 0x10 + .asciz "TmpSymbol.hpp" + .balign 4 .global $$2STRING$$2divide__Q26mintvm9TmpSymbolFi$$20 $$2STRING$$2divide__Q26mintvm9TmpSymbolFi$$20: - .incbin "baserom.dol", 0x458B7C, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global $$2STRING$$2divide__Q26mintvm9TmpSymbolFi $$2STRING$$2divide__Q26mintvm9TmpSymbolFi: - .incbin "baserom.dol", 0x458B90, 0x40 + .asciz "TmpSymbol.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "ExplicitSingleton.hpp" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258399 $$258399: - .incbin "baserom.dol", 0x493958, 0x4 + .4byte 0 .global $$258627 $$258627: - .incbin "baserom.dol", 0x49395C, 0x4 + .4byte 0x2E000000 .global $$252608 $$252608: - .incbin "baserom.dol", 0x493960, 0x8 + .asciz "bool" + .balign 4 .global $$252609 $$252609: - .incbin "baserom.dol", 0x493968, 0x4 + .4byte 0x696E7400 .global $$252610 $$252610: - .incbin "baserom.dol", 0x49396C, 0x8 + .asciz "float" + .balign 4 .global $$252611 $$252611: - .incbin "baserom.dol", 0x493974, 0x8 + .asciz "string" + .balign 4 .global $$258871 $$258871: - .incbin "baserom.dol", 0x49397C, 0x4 + .4byte 0x28290000 .global $$258873 $$258873: - .incbin "baserom.dol", 0x493980, 0x8 + .asciz "ns : " .global $$253270 $$253270: - .incbin "baserom.dol", 0x493988, 0x1 + .byte 0x01 .global $$253271 $$253271: - .incbin "baserom.dol", 0x493989, 0x3 + .balign 4 .global $$2STRING$$2__ct__Q26mintvm8VMTmpKeyFPCc$$20 $$2STRING$$2__ct__Q26mintvm8VMTmpKeyFPCc$$20: - .incbin "baserom.dol", 0x49398C, 0x4 + .4byte 0 .global $$2STRING$$2__ct__Q26mintvm8VMTmpKeyFPCc $$2STRING$$2__ct__Q26mintvm8VMTmpKeyFPCc: - .incbin "baserom.dol", 0x493990, 0x4 + .4byte 0 .global $$2STRING$$2moduleKey__Q26mintvm5VMKeyCFv $$2STRING$$2moduleKey__Q26mintvm5VMKeyCFv: - .incbin "baserom.dol", 0x493994, 0x4 + .4byte 0 .global $$2STRING$$2tmpSymbol__Q26mintvm5VMKeyCFv $$2STRING$$2tmpSymbol__Q26mintvm5VMKeyCFv: - .incbin "baserom.dol", 0x493998, 0x4 + .4byte 0x2E000000 .global $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCc $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCc: - .incbin "baserom.dol", 0x49399C, 0x4 + .4byte 0 .global $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCc $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCc: - .incbin "baserom.dol", 0x4939A0, 0x4 + .4byte 0 .global $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCcPCc $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCcPCc: - .incbin "baserom.dol", 0x4939A4, 0x4 + .4byte 0 .global $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCcPCcPCc $$2STRING$$2__ct__Q26mintvm9TmpSymbolFPCcPCcPCcPCc: - .incbin "baserom.dol", 0x4939A8, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/VMFunction.s b/asm/src/VMFunction.s index 717a2c73..6f8343af 100644 --- a/asm/src/VMFunction.s +++ b/asm/src/VMFunction.s @@ -108,10 +108,21 @@ lbl_801CCF78: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250536 $$250536: - .incbin "baserom.dol", 0x458BD0, 0x1C + .asciz "' (ex. 'void Assert(int)')" + .balign 4 .global $$250537 $$250537: - .incbin "baserom.dol", 0x458BEC, 0x18 + .asciz "Not Found ReturnType '" + .balign 4 .global $$250538 $$250538: - .incbin "baserom.dol", 0x458C04, 0x64 + .asciz "VMFunction::parseName fail" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "TmpSymbol.hpp" + .balign 4 + .asciz "Assertion failed.\n" + .balign 4 + .asciz "TmpSymbol.hpp" + .balign 4 diff --git a/asm/src/VMFunctionList.s b/asm/src/VMFunctionList.s index cb348626..6c7b66fc 100644 --- a/asm/src/VMFunctionList.s +++ b/asm/src/VMFunctionList.s @@ -168,13 +168,20 @@ lbl_801CD1B8: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm14VMFunctionList __vt__Q26mintvm14VMFunctionList: - .incbin "baserom.dol", 0x458C68, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA37C ;# ptr .global __vt__Q26mintvm10VMFunction __vt__Q26mintvm10VMFunction: - .incbin "baserom.dol", 0x458C74, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA504 ;# ptr .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction$$20 $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction$$20: - .incbin "baserom.dol", 0x458C80, 0xC + .asciz "mMax = %d\n" + .balign 4 .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction: - .incbin "baserom.dol", 0x458C8C, 0x14 + .asciz "MPtrArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/VMModule.s b/asm/src/VMModule.s index b9f05e3b..509b24a8 100644 --- a/asm/src/VMModule.s +++ b/asm/src/VMModule.s @@ -141,10 +141,17 @@ lbl_801CD3AC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm8VMModule __vt__Q26mintvm8VMModule: - .incbin "baserom.dol", 0x458CA0, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA0F8 ;# ptr .global __vt__Q26mintvm13VMSymbolTable __vt__Q26mintvm13VMSymbolTable: - .incbin "baserom.dol", 0x458CAC, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA6EC ;# ptr .global __vt__Q26mintvm15VMConstantTable __vt__Q26mintvm15VMConstantTable: - .incbin "baserom.dol", 0x458CB8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x801CA758 ;# ptr + .4byte 0 diff --git a/asm/src/VMObjectType.s b/asm/src/VMObjectType.s index 74e5ab28..05498be7 100644 --- a/asm/src/VMObjectType.s +++ b/asm/src/VMObjectType.s @@ -262,22 +262,32 @@ lbl_801CD758: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm12VMObjectType __vt__Q26mintvm12VMObjectType: - .incbin "baserom.dol", 0x458CC8, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA304 ;# ptr .global __vt__Q26mintvm14VMVariableList __vt__Q26mintvm14VMVariableList: - .incbin "baserom.dol", 0x458CD4, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA560 ;# ptr .global __vt__Q26mintvm10VMVariable __vt__Q26mintvm10VMVariable: - .incbin "baserom.dol", 0x458CE0, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA6E8 ;# ptr .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable$$20 $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable$$20: - .incbin "baserom.dol", 0x458CEC, 0xC + .asciz "mMax = %d\n" + .balign 4 .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable: - .incbin "baserom.dol", 0x458CF8, 0x10 + .asciz "MPtrArray.hpp" + .balign 4 .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1CFUl$$20 $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1CFUl$$20: - .incbin "baserom.dol", 0x458D08, 0xC + .asciz "count = %d\n" .global $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1CFUl $$2STRING$$2at__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1CFUl: - .incbin "baserom.dol", 0x458D14, 0x14 + .asciz "MPtrArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/VMObjectTypeList.s b/asm/src/VMObjectTypeList.s index 303da81c..3108f4bc 100644 --- a/asm/src/VMObjectTypeList.s +++ b/asm/src/VMObjectTypeList.s @@ -322,16 +322,23 @@ lbl_801CDBBC: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$250880 $$250880: - .incbin "baserom.dol", 0x458D28, 0x18 + .asciz "VMObjectTypeList.cpp" + .balign 4 .global $$250881 $$250881: - .incbin "baserom.dol", 0x458D40, 0x14 + .asciz "Assertion failed.\n" + .balign 4 .global __vt__Q26mintvm16VMObjectTypeList __vt__Q26mintvm16VMObjectTypeList: - .incbin "baserom.dol", 0x458D54, 0xC + .4byte 0 + .4byte 0 + .4byte 0x801CA17C ;# ptr .global $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType$$20 $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType$$20: - .incbin "baserom.dol", 0x458D60, 0xC + .asciz "mMax = %d\n" + .balign 4 .global $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType: - .incbin "baserom.dol", 0x458D6C, 0x14 + .asciz "MPtrArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/VMSymbolTable.s b/asm/src/VMSymbolTable.s index 4ac49e57..ef741e6b 100644 --- a/asm/src/VMSymbolTable.s +++ b/asm/src/VMSymbolTable.s @@ -140,7 +140,9 @@ lbl_801CDD80: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl$$20 $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl$$20: - .incbin "baserom.dol", 0x458D80, 0x18 + .asciz "index = %d, count = %d\n" .global $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl: - .incbin "baserom.dol", 0x458D98, 0x10 + .asciz "MArray.hpp" + .balign 4 + .4byte 0 diff --git a/asm/src/VacuumAttackerCallback.s b/asm/src/VacuumAttackerCallback.s index 4a49dd74..5dce3580 100644 --- a/asm/src/VacuumAttackerCallback.s +++ b/asm/src/VacuumAttackerCallback.s @@ -196,14 +196,35 @@ onReceivedCure__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8At .section .rodata, "wa" # 0x80406560 - 0x80421040 .global SOUND_TABLE__36$$2unnamed$$2VacuumAttackerCallback_cpp$$2 SOUND_TABLE__36$$2unnamed$$2VacuumAttackerCallback_cpp$$2: - .incbin "baserom.dol", 0x416428, 0x38 + .4byte 0x0000011F + .4byte 0x0000011F + .4byte 0x00000120 + .4byte 0x00000121 + .4byte 0x00000122 + .4byte 0x00000123 + .4byte 0x00000124 + .4byte 0x00000125 + .4byte 0x00000126 + .4byte 0x00000127 + .4byte 0x00000128 + .4byte 0x00000129 + .4byte 0x0000012A + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero22VacuumAttackerCallback __vt__Q43scn4step4hero22VacuumAttackerCallback: - .incbin "baserom.dol", 0x481758, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80358918 + .4byte 0x80358974 + .4byte 0x80358A80 + .4byte 0x80358AE0 + .4byte 0x80358B2C + .4byte 0x80358B64 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256925 $$256925: - .incbin "baserom.dol", 0x49DA40, 0x8 + .4byte 0x41500000 + .4byte 0 diff --git a/asm/src/VacuumReceiver.s b/asm/src/VacuumReceiver.s index 8cedfe6f..93e1fc4b 100644 --- a/asm/src/VacuumReceiver.s +++ b/asm/src/VacuumReceiver.s @@ -3689,140 +3689,251 @@ __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumed .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1: - .incbin "baserom.dol", 0x4609D0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80236588 ;# ptr + .4byte 0x8023656C ;# ptr .global __vt__Q43scn4step4boss14VacuumReceiver __vt__Q43scn4step4boss14VacuumReceiver: - .incbin "baserom.dol", 0x4609E0, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80235E24 ;# ptr + .4byte 0x80235F10 ;# ptr + .4byte 0x80235FCC ;# ptr + .4byte 0x802360F8 ;# ptr + .4byte 0x80236568 ;# ptr + .4byte 0x80236564 ;# ptr + .4byte 0x80236560 ;# ptr + .4byte 0x8023655C ;# ptr + .4byte 0x80236554 ;# ptr + .4byte 0x80236550 ;# ptr + .4byte 0x8023654C ;# ptr + .4byte 0x80236548 ;# ptr + .4byte 0x80236544 ;# ptr + .4byte 0x80236540 ;# ptr + .4byte 0x80236558 ;# ptr + .4byte 0x803D33A8 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x460A28, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x460A4C, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$20: - .incbin "baserom.dol", 0x460A58, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1: - .incbin "baserom.dol", 0x460A7C, 0xC + .asciz "LinkList.h" + .balign 4 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: - .incbin "baserom.dol", 0x46EDC8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80290A58 ;# ptr + .4byte 0x80290A38 ;# ptr .global __vt__Q43scn4step5enemy14VacuumReceiver __vt__Q43scn4step5enemy14VacuumReceiver: - .incbin "baserom.dol", 0x46EDD8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x8028FEE4 ;# ptr + .4byte 0x802900C0 ;# ptr + .4byte 0x80290238 ;# ptr + .4byte 0x80290348 ;# ptr + .4byte 0x80236568 ;# ptr + .4byte 0x80236564 ;# ptr + .4byte 0x80236560 ;# ptr + .4byte 0x8023655C ;# ptr + .4byte 0x80236554 ;# ptr + .4byte 0x80236550 ;# ptr + .4byte 0x8023654C ;# ptr + .4byte 0x80236548 ;# ptr + .4byte 0x80236544 ;# ptr + .4byte 0x80236540 ;# ptr + .4byte 0x80290418 ;# ptr + .4byte 0x803D33A8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x481778, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80359E34 + .4byte 0x80359D88 .global __vt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1 __vt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1: - .incbin "baserom.dol", 0x481788, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80359DC8 + .4byte 0x80359D04 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481798, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x80359DC4 + .4byte 0x80359DA8 .global __vt__Q43scn4step4hero14VacuumReceiver __vt__Q43scn4step4hero14VacuumReceiver: - .incbin "baserom.dol", 0x4817A8, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x80358C04 + .4byte 0x80358D3C + .4byte 0x80358DF4 + .4byte 0x80358F24 + .4byte 0x80358FAC + .4byte 0x80358FF4 + .4byte 0x8035929C + .4byte 0x8023655C ;# ptr + .4byte 0x8035943C + .4byte 0x80359464 + .4byte 0x8035948C + .4byte 0x803594E8 + .4byte 0x8035956C + .4byte 0x80359750 + .4byte 0x803592E8 + .4byte 0x803D33A8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1: - .incbin "baserom.dol", 0x48E048, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803C5BE4 + .4byte 0x803C5BC4 .global __vt__Q43scn4step4item14VacuumReceiver __vt__Q43scn4step4item14VacuumReceiver: - .incbin "baserom.dol", 0x48E058, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x803C55E0 + .4byte 0x803C5830 + .4byte 0x803C5894 + .4byte 0x803C59C4 + .4byte 0x80236568 ;# ptr + .4byte 0x80236564 ;# ptr + .4byte 0x80236560 ;# ptr + .4byte 0x8023655C ;# ptr + .4byte 0x80236554 ;# ptr + .4byte 0x80236550 ;# ptr + .4byte 0x8023654C ;# ptr + .4byte 0x80236548 ;# ptr + .4byte 0x80236544 ;# ptr + .4byte 0x80236540 ;# ptr + .4byte 0x803C5A24 + .4byte 0x803D33A8 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1 __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1: - .incbin "baserom.dol", 0x491348, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803EF5E8 + .4byte 0x803EF5C8 .global __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver: - .incbin "baserom.dol", 0x491358, 0x48 + .4byte 0 + .4byte 0 + .4byte 0x803EF274 + .4byte 0x803EF2E0 + .4byte 0x803EF2E4 + .4byte 0x803EF2E8 + .4byte 0x80236568 ;# ptr + .4byte 0x80236564 ;# ptr + .4byte 0x80236560 ;# ptr + .4byte 0x8023655C ;# ptr + .4byte 0x80236554 ;# ptr + .4byte 0x80236550 ;# ptr + .4byte 0x8023654C ;# ptr + .4byte 0x80236548 ;# ptr + .4byte 0x80236544 ;# ptr + .4byte 0x80236540 ;# ptr + .4byte 0x80236558 ;# ptr + .4byte 0x803D33A8 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 $$256314: - .incbin "baserom.dol", 0x49AF08, 0x4 + .4byte 0x3F99999A .global $$256315 $$256315: - .incbin "baserom.dol", 0x49AF0C, 0x4 + .4byte 0 .global $$256316 $$256316: - .incbin "baserom.dol", 0x49AF10, 0x4 + .4byte 0xBFC00000 .global $$256317 $$256317: - .incbin "baserom.dol", 0x49AF14, 0x4 + .4byte 0x3FC00000 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255809 $$255809: - .incbin "baserom.dol", 0x49BAC0, 0x4 + .4byte 0xFFFF00FF .global $$255817 $$255817: - .incbin "baserom.dol", 0x49BAC4, 0x4 + .4byte 0x00000080 .global $$255820 $$255820: - .incbin "baserom.dol", 0x49BAC8, 0x4 + .4byte 0x000000FF .global $$258166 $$258166: - .incbin "baserom.dol", 0x49BACC, 0x4 + .4byte 0 .global $$258167 $$258167: - .incbin "baserom.dol", 0x49BAD0, 0x4 + .4byte 0x3F800000 .global $$258375 $$258375: - .incbin "baserom.dol", 0x49BAD4, 0x4 + .4byte 0x3F4CCCCD .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257113 $$257113: - .incbin "baserom.dol", 0x49DA48, 0x4 + .4byte 0xFFFF00FF .global $$257121 $$257121: - .incbin "baserom.dol", 0x49DA4C, 0x4 + .4byte 0x00000080 .global $$257124 $$257124: - .incbin "baserom.dol", 0x49DA50, 0x4 + .4byte 0x000000FF .global $$259388 $$259388: - .incbin "baserom.dol", 0x49DA54, 0x4 + .4byte 0 .global $$259389 $$259389: - .incbin "baserom.dol", 0x49DA58, 0x4 + .4byte 0x3F800000 .global $$259476 $$259476: - .incbin "baserom.dol", 0x49DA5C, 0x4 + .4byte 0x40400000 .global $$259531 $$259531: - .incbin "baserom.dol", 0x49DA60, 0x4 + .4byte 0x3F000000 .global $$259532 $$259532: - .incbin "baserom.dol", 0x49DA64, 0x4 + .4byte 0x3ECCCCCD .global $$259533 $$259533: - .incbin "baserom.dol", 0x49DA68, 0x8 + .4byte 0xBECCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255562 $$255562: - .incbin "baserom.dol", 0x49E598, 0x4 + .4byte 0xFFFF00FF .global $$256404 $$256404: - .incbin "baserom.dol", 0x49E59C, 0x4 + .4byte 0 .global $$256405 $$256405: - .incbin "baserom.dol", 0x49E5A0, 0x4 + .4byte 0x3F800000 .global $$256412 $$256412: - .incbin "baserom.dol", 0x49E5A4, 0x4 + .4byte 0x3ECCCCCD .global $$256413 $$256413: - .incbin "baserom.dol", 0x49E5A8, 0x4 + .4byte 0xBECCCCCD .global $$256414 $$256414: - .incbin "baserom.dol", 0x49E5AC, 0x4 + .4byte 0x3F000000 diff --git a/asm/src/VacuumSoundCtrl.s b/asm/src/VacuumSoundCtrl.s index 26a4b77e..96f5bfad 100644 --- a/asm/src/VacuumSoundCtrl.s +++ b/asm/src/VacuumSoundCtrl.s @@ -410,15 +410,17 @@ lbl_8035A388: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250536 $$250536: - .incbin "baserom.dol", 0x496E20, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251157 $$251157: - .incbin "baserom.dol", 0x49DA70, 0x4 + .4byte 0x3F800000 .global $$251254 $$251254: - .incbin "baserom.dol", 0x49DA74, 0x4 + .4byte 0x3E000000 .global $$251255 $$251255: - .incbin "baserom.dol", 0x49DA78, 0x8 + .4byte 0x3E4CCCCD + .4byte 0 diff --git a/asm/src/VariationDemo.s b/asm/src/VariationDemo.s index f14739da..5eed9dae 100644 --- a/asm/src/VariationDemo.s +++ b/asm/src/VariationDemo.s @@ -754,85 +754,155 @@ __sinit_$$3VariationDemo_cpp: /* 8030422C 0030006C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x4025A4, 0x4 + .4byte 0x803040A4 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$254361 $$254361: - .incbin "baserom.dol", 0x4159F8, 0xC + .4byte 0x00020000 + .4byte 0 + .4byte 0 .global $$254373 $$254373: - .incbin "baserom.dol", 0x415A04, 0xC + .4byte 0x00030000 + .4byte 0 + .4byte 0 .global $$254385 $$254385: - .incbin "baserom.dol", 0x415A10, 0xC + .4byte 0x00040000 + .4byte 0 + .4byte 0 .global $$254397 $$254397: - .incbin "baserom.dol", 0x415A1C, 0xC + .4byte 0x00050000 + .4byte 0 + .4byte 0 .global $$254469 $$254469: - .incbin "baserom.dol", 0x415A28, 0xC + .4byte 0x000B0000 + .4byte 0 + .4byte 0 .global $$254508 $$254508: - .incbin "baserom.dol", 0x415A34, 0xC + .4byte 0x000E0000 + .4byte 0 + .4byte 0 .global $$254552 $$254552: - .incbin "baserom.dol", 0x415A40, 0xC + .4byte 0x00120000 + .4byte 0 + .4byte 0 .global $$254563 $$254563: - .incbin "baserom.dol", 0x415A4C, 0xC + .4byte 0x00130000 + .4byte 0 + .4byte 0 .global $$254574 $$254574: - .incbin "baserom.dol", 0x415A58, 0x10 + .4byte 0x00140000 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global datTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 datTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2: - .incbin "baserom.dol", 0x47C3E8, 0x30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80552588 .global datSizeTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 datSizeTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2: - .incbin "baserom.dol", 0x47C418, 0x30 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 .global $$255233 $$255233: - .incbin "baserom.dol", 0x47C448, 0x58 + .4byte 0x80303D60 + .4byte 0x80303D60 + .4byte 0x80303BD4 + .4byte 0x80303BE4 + .4byte 0x80303BF4 + .4byte 0x80303C04 + .4byte 0x80303C14 + .4byte 0x80303C24 + .4byte 0x80303C34 + .4byte 0x80303C44 + .4byte 0x80303C54 + .4byte 0x80303C60 + .4byte 0x80303C6C + .4byte 0x80303C84 + .4byte 0x80303C9C + .4byte 0x80303CB4 + .4byte 0x80303CC4 + .4byte 0x80303CDC + .4byte 0x80303D08 + .4byte 0x80303D10 + .4byte 0x80303D18 + .4byte 0x80303D20 .global __vt__Q53scn4step7gimmick10cameralock13VariationDemo __vt__Q53scn4step7gimmick10cameralock13VariationDemo: - .incbin "baserom.dol", 0x47C4A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80303B1C + .4byte 0x80303DCC + .4byte 0x80303DD8 + .4byte 0x80303DDC + .4byte 0x803040A0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255183 $$255183: - .incbin "baserom.dol", 0x49D240, 0x4 + .4byte 0 .global $$255184 $$255184: - .incbin "baserom.dol", 0x49D244, 0x4 + .4byte 0x3F800000 .global $$255250 $$255250: - .incbin "baserom.dol", 0x49D248, 0x4 + .4byte 0x3F000000 .global $$255251 $$255251: - .incbin "baserom.dol", 0x49D24C, 0x4 + .4byte 0xBF000000 .global $$255291 $$255291: - .incbin "baserom.dol", 0x49D250, 0x4 + .4byte 0x41500000 .global $$255292 $$255292: - .incbin "baserom.dol", 0x49D254, 0x4 + .4byte 0x41400000 .global $$255293 $$255293: - .incbin "baserom.dol", 0x49D258, 0x4 + .4byte 0x41B00000 .global $$255294 $$255294: - .incbin "baserom.dol", 0x49D25C, 0x4 + .4byte 0x40A00000 .global $$255295 $$255295: - .incbin "baserom.dol", 0x49D260, 0x4 + .4byte 0xC20C0000 .global $$255296 $$255296: - .incbin "baserom.dol", 0x49D264, 0x4 + .4byte 0x41300000 .global $$255297 $$255297: - .incbin "baserom.dol", 0x49D268, 0x8 + .4byte 0xBD1374BC + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global datDemoLock_Hakobune__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 diff --git a/asm/src/VariationDownside.s b/asm/src/VariationDownside.s index 4024469a..5c22052e 100644 --- a/asm/src/VariationDownside.s +++ b/asm/src/VariationDownside.s @@ -75,12 +75,19 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock17VariationDownside __vt__Q53scn4step7gimmick10cameralock17VariationDownside: - .incbin "baserom.dol", 0x47C4C0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80304240 + .4byte 0x8030424C + .4byte 0x80304250 + .4byte 0x80304254 + .4byte 0x80304300 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253413 $$253413: - .incbin "baserom.dol", 0x49D270, 0x4 + .4byte 0 .global $$253414 $$253414: - .incbin "baserom.dol", 0x49D274, 0x4 + .4byte 0xC2200000 diff --git a/asm/src/VariationLoose.s b/asm/src/VariationLoose.s index b8699a04..bbb081c7 100644 --- a/asm/src/VariationLoose.s +++ b/asm/src/VariationLoose.s @@ -648,23 +648,45 @@ lbl_80304BF4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SPACEJUMP_FRAME__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2 T_SPACEJUMP_FRAME__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2: - .incbin "baserom.dol", 0x415A68, 0x40 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001E + .4byte 0 + .4byte 0x0000001E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock14VariationLoose __vt__Q53scn4step7gimmick10cameralock14VariationLoose: - .incbin "baserom.dol", 0x47C4E0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x8030444C + .4byte 0x8030462C + .4byte 0x80304960 + .4byte 0x80304964 + .4byte 0x80304968 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255250 $$255250: - .incbin "baserom.dol", 0x49D278, 0x4 + .4byte 0x3F000000 .global $$255258 $$255258: - .incbin "baserom.dol", 0x49D27C, 0x4 + .4byte 0 .global $$255274 $$255274: - .incbin "baserom.dol", 0x49D280, 0x4 + .4byte 0x3CCCCCCD .global $$255326 $$255326: - .incbin "baserom.dol", 0x49D284, 0x4 + .4byte 0x3DCCCCCD diff --git a/asm/src/VariationMove.s b/asm/src/VariationMove.s index ebced014..3d0714e7 100644 --- a/asm/src/VariationMove.s +++ b/asm/src/VariationMove.s @@ -57,4 +57,11 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock13VariationMove __vt__Q53scn4step7gimmick10cameralock13VariationMove: - .incbin "baserom.dol", 0x47C500, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80304C20 + .4byte 0x80304C88 + .4byte 0x80304C8C + .4byte 0x80304C90 + .4byte 0x80304C94 + .4byte 0 diff --git a/asm/src/VariationNpc.s b/asm/src/VariationNpc.s index 75d7835a..c907f1b2 100644 --- a/asm/src/VariationNpc.s +++ b/asm/src/VariationNpc.s @@ -1480,120 +1480,200 @@ objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7maho .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258009 $$258009: - .incbin "baserom.dol", 0x47D9B8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314BBC .global $$258010 $$258010: - .incbin "baserom.dol", 0x47D9C4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314C00 .global $$258011 $$258011: - .incbin "baserom.dol", 0x47D9D0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314C44 .global $$258012 $$258012: - .incbin "baserom.dol", 0x47D9DC, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314C88 .global $$258013 $$258013: - .incbin "baserom.dol", 0x47D9E8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314CCC .global $$258014 $$258014: - .incbin "baserom.dol", 0x47D9F4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314D10 .global $$258015 $$258015: - .incbin "baserom.dol", 0x47DA00, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314D54 .global $$258016 $$258016: - .incbin "baserom.dol", 0x47DA0C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314D98 .global $$258017 $$258017: - .incbin "baserom.dol", 0x47DA18, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314DDC .global $$258018 $$258018: - .incbin "baserom.dol", 0x47DA24, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314E20 .global $$258019 $$258019: - .incbin "baserom.dol", 0x47DA30, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314E64 .global $$258020 $$258020: - .incbin "baserom.dol", 0x47DA3C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80314F64 .global $$258021 $$258021: - .incbin "baserom.dol", 0x47DA48, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803150B4 .global $$258022 $$258022: - .incbin "baserom.dol", 0x47DA54, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803150F8 .global $$258023 $$258023: - .incbin "baserom.dol", 0x47DA60, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8031513C .global $$258024 $$258024: - .incbin "baserom.dol", 0x47DA6C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80315180 .global $$258025 $$258025: - .incbin "baserom.dol", 0x47DA78, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803151C4 .global $$258026 $$258026: - .incbin "baserom.dol", 0x47DA84, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80315208 .global $$258027 $$258027: - .incbin "baserom.dol", 0x47DA90, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x8031524C .global $$258028 $$258028: - .incbin "baserom.dol", 0x47DA9C, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x80315290 .global $$258029 $$258029: - .incbin "baserom.dol", 0x47DAA8, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803153DC .global $$258030 $$258030: - .incbin "baserom.dol", 0x47DAB4, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803154E8 .global $$258031 $$258031: - .incbin "baserom.dol", 0x47DAC0, 0xC + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0x803155E8 .global $$258043 $$258043: - .incbin "baserom.dol", 0x47DACC, 0x5C + .4byte 0x8031488C + .4byte 0x803148AC + .4byte 0x803148CC + .4byte 0x803148EC + .4byte 0x8031490C + .4byte 0x8031492C + .4byte 0x8031494C + .4byte 0x8031496C + .4byte 0x8031498C + .4byte 0x803149AC + .4byte 0x803149CC + .4byte 0x803149EC + .4byte 0x80314A0C + .4byte 0x80314A2C + .4byte 0x80314A4C + .4byte 0x80314A6C + .4byte 0x80314A8C + .4byte 0x80314AAC + .4byte 0x80314ACC + .4byte 0x80314AEC + .4byte 0x80314B0C + .4byte 0x80314B2C + .4byte 0x80314B4C .global __vt__Q53scn4step7gimmick7mahoroa12VariationNpc __vt__Q53scn4step7gimmick7mahoroa12VariationNpc: - .incbin "baserom.dol", 0x47DB28, 0x1C + .4byte 0 + .4byte 0 + .4byte 0x80314600 + .4byte 0x80314640 + .4byte 0x8031479C + .4byte 0x80315740 + .4byte 0x803147C4 .global __vt__Q53scn4step7gimmick7mahoroa10IVariation __vt__Q53scn4step7gimmick7mahoroa10IVariation: - .incbin "baserom.dol", 0x47DB44, 0x1C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257896 $$257896: - .incbin "baserom.dol", 0x49D458, 0x4 + .4byte 0x3F800000 .global $$257902 $$257902: - .incbin "baserom.dol", 0x49D45C, 0x4 + .4byte 0 .global TURN_MAINPLAYER_X__Q53scn4step7gimmick7mahoroa12VariationNpc TURN_MAINPLAYER_X__Q53scn4step7gimmick7mahoroa12VariationNpc: - .incbin "baserom.dol", 0x49D460, 0x4 + .4byte 0x41A00000 .global TURN_BACK_X__Q53scn4step7gimmick7mahoroa12VariationNpc TURN_BACK_X__Q53scn4step7gimmick7mahoroa12VariationNpc: - .incbin "baserom.dol", 0x49D464, 0x4 + .4byte 0x43340000 .global TURN_FULL_X__Q53scn4step7gimmick7mahoroa12VariationNpc TURN_FULL_X__Q53scn4step7gimmick7mahoroa12VariationNpc: - .incbin "baserom.dol", 0x49D468, 0x4 + .4byte 0x43B40000 .global $$256702 $$256702: - .incbin "baserom.dol", 0x49D46C, 0x4 + .4byte 0x00000032 .global $$257914 $$257914: - .incbin "baserom.dol", 0x49D470, 0x4 + .4byte 0x3E99999A .global $$257915 $$257915: - .incbin "baserom.dol", 0x49D474, 0x4 + .4byte 0xBE4CCCCD .global $$257916 $$257916: - .incbin "baserom.dol", 0x49D478, 0x4 + .4byte 0xC0000000 .global $$258103 $$258103: - .incbin "baserom.dol", 0x49D47C, 0x4 + .4byte 0x3D4CCCCD .global $$258115 $$258115: - .incbin "baserom.dol", 0x49D480, 0x4 + .4byte 0x3DCCCCCD .global $$258165 $$258165: - .incbin "baserom.dol", 0x49D484, 0x4 + .4byte 0x42652EE1 .section .bss, "wa" # 0x80496700 - 0x805643FC .global TURN_FRONT_X__Q53scn4step7gimmick7mahoroa12VariationNpc diff --git a/asm/src/VariationPerm.s b/asm/src/VariationPerm.s index 49c0e09e..4b7dcd21 100644 --- a/asm/src/VariationPerm.s +++ b/asm/src/VariationPerm.s @@ -101,15 +101,23 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock13VariationPerm __vt__Q53scn4step7gimmick10cameralock13VariationPerm: - .incbin "baserom.dol", 0x47C520, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80304CB4 + .4byte 0x80304DC4 + .4byte 0x80304DC8 + .4byte 0x80304DCC + .4byte 0x80304DD0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254287 $$254287: - .incbin "baserom.dol", 0x49D288, 0x4 + .4byte 0x3F000000 .global $$254288 $$254288: - .incbin "baserom.dol", 0x49D28C, 0x4 + .4byte 0xBF000000 .global $$254289 $$254289: - .incbin "baserom.dol", 0x49D290, 0x8 + .4byte 0x3DCCCCCD + .4byte 0 diff --git a/asm/src/VariationShooting.s b/asm/src/VariationShooting.s index 4bed14d4..923d2bfd 100644 --- a/asm/src/VariationShooting.s +++ b/asm/src/VariationShooting.s @@ -168,18 +168,27 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock17VariationShooting __vt__Q53scn4step7gimmick10cameralock17VariationShooting: - .incbin "baserom.dol", 0x47C540, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80304DF0 + .4byte 0x80305004 + .4byte 0x80305008 + .4byte 0x8030500C + .4byte 0x80305010 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255517 $$255517: - .incbin "baserom.dol", 0x49D298, 0x4 + .4byte 0x3F800000 .global $$255518 $$255518: - .incbin "baserom.dol", 0x49D29C, 0x4 + .4byte 0xBF000000 .global $$255519 $$255519: - .incbin "baserom.dol", 0x49D2A0, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$255523 $$255523: - .incbin "baserom.dol", 0x49D2A8, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/VariationSphere.s b/asm/src/VariationSphere.s index 2b8d00cd..ac707488 100644 --- a/asm/src/VariationSphere.s +++ b/asm/src/VariationSphere.s @@ -306,12 +306,19 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock15VariationSphere __vt__Q53scn4step7gimmick10cameralock15VariationSphere: - .incbin "baserom.dol", 0x47C560, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80305034 + .4byte 0x8030528C + .4byte 0x8030545C + .4byte 0x80305460 + .4byte 0x80305464 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255509 $$255509: - .incbin "baserom.dol", 0x49D2B0, 0x4 + .4byte 0x3F000000 .global $$255575 $$255575: - .incbin "baserom.dol", 0x49D2B4, 0x4 + .4byte 0 diff --git a/asm/src/VariationStill.s b/asm/src/VariationStill.s index b370cd46..94ba8c3c 100644 --- a/asm/src/VariationStill.s +++ b/asm/src/VariationStill.s @@ -172,18 +172,25 @@ setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock14VariationStill __vt__Q53scn4step7gimmick10cameralock14VariationStill: - .incbin "baserom.dol", 0x47C580, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x80305498 + .4byte 0x80305628 + .4byte 0x803056A8 + .4byte 0x803056AC + .4byte 0x803056B0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254589 $$254589: - .incbin "baserom.dol", 0x49D2B8, 0x4 + .4byte 0x3F000000 .global $$254590 $$254590: - .incbin "baserom.dol", 0x49D2BC, 0x4 + .4byte 0xBF000000 .global $$254591 $$254591: - .incbin "baserom.dol", 0x49D2C0, 0x4 + .4byte 0 .global $$254592 $$254592: - .incbin "baserom.dol", 0x49D2C4, 0x4 + .4byte 0x3F800000 diff --git a/asm/src/VariationUpside.s b/asm/src/VariationUpside.s index 263a0acb..4424995a 100644 --- a/asm/src/VariationUpside.s +++ b/asm/src/VariationUpside.s @@ -73,12 +73,19 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock15VariationUpside __vt__Q53scn4step7gimmick10cameralock15VariationUpside: - .incbin "baserom.dol", 0x47C5A0, 0x20 + .4byte 0 + .4byte 0 + .4byte 0x803056C4 + .4byte 0x803056C8 + .4byte 0x803056CC + .4byte 0x803056D0 + .4byte 0x8030577C + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253413 $$253413: - .incbin "baserom.dol", 0x49D2C8, 0x4 + .4byte 0 .global $$253414 $$253414: - .incbin "baserom.dol", 0x49D2CC, 0x4 + .4byte 0x42200000 diff --git a/asm/src/Vector2.s b/asm/src/Vector2.s index b1644c5c..421b4053 100644 --- a/asm/src/Vector2.s +++ b/asm/src/Vector2.s @@ -444,24 +444,25 @@ __sinit_$$3Vector2_cpp: /* 8019F508 0019B348 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402420, 0x4 + .4byte 0x8019F4B0 ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250690 $$250690: - .incbin "baserom.dol", 0x49A3A8, 0x4 + .4byte 0 .global $$250708 $$250708: - .incbin "baserom.dol", 0x49A3AC, 0x4 + .4byte 0x3F800000 .global $$250709 $$250709: - .incbin "baserom.dol", 0x49A3B0, 0x4 + .4byte 0xBF800000 .global $$250737 $$250737: - .incbin "baserom.dol", 0x49A3B4, 0x4 + .4byte 0x3727C5AC .global $$250738 $$250738: - .incbin "baserom.dol", 0x49A3B8, 0x8 + .4byte 0x40490FDB + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global ZERO__Q33hel4math7Vector2 diff --git a/asm/src/Vector3.s b/asm/src/Vector3.s index 78409a2e..b235a048 100644 --- a/asm/src/Vector3.s +++ b/asm/src/Vector3.s @@ -611,33 +611,33 @@ __sinit_$$3Vector3_cpp: /* 8019FD48 0019BB88 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .incbin "baserom.dol", 0x402424, 0x4 + .4byte 0x8019FCBC ;# ptr .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251176 $$251176: - .incbin "baserom.dol", 0x49A3C0, 0x4 + .4byte 0 .global $$251220 $$251220: - .incbin "baserom.dol", 0x49A3C4, 0x4 + .4byte 0x3F800000 .global $$251221 $$251221: - .incbin "baserom.dol", 0x49A3C8, 0x4 + .4byte 0xBF800000 .global $$251266 $$251266: - .incbin "baserom.dol", 0x49A3CC, 0x4 + .4byte 0x4222F983 .global $$251306 $$251306: - .incbin "baserom.dol", 0x49A3D0, 0x4 + .4byte 0x3727C5AC .global $$251307 $$251307: - .incbin "baserom.dol", 0x49A3D4, 0x4 + .4byte 0x3F000000 .global $$251308 $$251308: - .incbin "baserom.dol", 0x49A3D8, 0x4 + .4byte 0x3FC90FDB .global $$251309 $$251309: - .incbin "baserom.dol", 0x49A3DC, 0x4 + .4byte 0x40000000 .section .bss, "wa" # 0x80496700 - 0x805643FC .global ZERO__Q33hel4math7Vector3 diff --git a/asm/src/VolatileData2.s b/asm/src/VolatileData2.s index 750381f6..91edc080 100644 --- a/asm/src/VolatileData2.s +++ b/asm/src/VolatileData2.s @@ -275,4 +275,5 @@ setLevelKind__Q27storage13VolatileData2FQ33scn4step9LevelKind: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249921 $$249921: - .incbin "baserom.dol", 0x49EEB0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/Warp.s b/asm/src/Warp.s index b4a0d044..e357c3cb 100644 --- a/asm/src/Warp.s +++ b/asm/src/Warp.s @@ -328,16 +328,17 @@ setupDrawOriginal__Q23sfx4WarpFv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251724 $$251724: - .incbin "baserom.dol", 0x49EE70, 0x4 + .4byte 0x8080FFFF .global $$251733 $$251733: - .incbin "baserom.dol", 0x49EE74, 0x4 + .4byte 0x000000FF .global $$251745 $$251745: - .incbin "baserom.dol", 0x49EE78, 0x4 + .4byte 0 .global $$251759 $$251759: - .incbin "baserom.dol", 0x49EE7C, 0x4 + .4byte 0x3D800000 .global $$251760 $$251760: - .incbin "baserom.dol", 0x49EE80, 0x8 + .4byte 0xBA816F00 + .4byte 0 diff --git a/asm/src/WarpStar.s b/asm/src/WarpStar.s index 48fe0f08..a3fe74bc 100644 --- a/asm/src/WarpStar.s +++ b/asm/src/WarpStar.s @@ -1017,80 +1017,123 @@ lbl_80329AB8: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253974 $$253974: - .incbin "baserom.dol", 0x47E6A0, 0xC + .asciz "ArenaWait1" + .balign 4 .global $$253975 $$253975: - .incbin "baserom.dol", 0x47E6AC, 0xC + .asciz "ArenaWait2" + .balign 4 .global $$253976 $$253976: - .incbin "baserom.dol", 0x47E6B8, 0xC + .asciz "ArenaWait3" + .balign 4 .global $$253998 $$253998: - .incbin "baserom.dol", 0x47E6C4, 0x18 + .asciz "step/gimmick/WarpStar" + .balign 4 .global $$253999 $$253999: - .incbin "baserom.dol", 0x47E6DC, 0x1C + .asciz "step/gimmick/WarpStarDemo" + .balign 4 .global $$254004 $$254004: - .incbin "baserom.dol", 0x47E6F8, 0xC + .asciz "Main%02d" + .balign 4 .global $$254005 $$254005: - .incbin "baserom.dol", 0x47E704, 0xC + .asciz "StarConstL" + .balign 4 .global $$254118 $$254118: - .incbin "baserom.dol", 0x47E710, 0x34 + .4byte 0x803293E8 + .4byte 0x80329390 + .4byte 0x80329398 + .4byte 0x803293A0 + .4byte 0x803293A8 + .4byte 0x803293B0 + .4byte 0x803293B8 + .4byte 0x803293C0 + .4byte 0x803293E8 + .4byte 0x803293C8 + .4byte 0x803293D0 + .4byte 0x803293D8 + .4byte 0x803293E0 .global $$254130 $$254130: - .incbin "baserom.dol", 0x47E744, 0xC + .asciz "FlashIn1" + .balign 4 .global $$254131 $$254131: - .incbin "baserom.dol", 0x47E750, 0xC + .asciz "FlashIn2" + .balign 4 .global $$254132 $$254132: - .incbin "baserom.dol", 0x47E75C, 0x74 + .asciz "FlashIn3" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .asciz "FSqrt: Input is out of the domain." + .balign 4 + .asciz "arithmetic.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253966 $$253966: - .incbin "baserom.dol", 0x496D70, 0x8 + .asciz "Start1" + .balign 4 .global $$253967 $$253967: - .incbin "baserom.dol", 0x496D78, 0x8 + .asciz "Start2" + .balign 4 .global $$253968 $$253968: - .incbin "baserom.dol", 0x496D80, 0x8 + .asciz "Start3" + .balign 4 .global $$254000 $$254000: - .incbin "baserom.dol", 0x496D88, 0x8 + .asciz "TopL" + .balign 4 .global $$254001 $$254001: - .incbin "baserom.dol", 0x496D90, 0x8 + .asciz "TopL1" + .balign 4 .global $$254002 $$254002: - .incbin "baserom.dol", 0x496D98, 0x8 + .asciz "TopL2" + .balign 4 .global $$254003 $$254003: - .incbin "baserom.dol", 0x496DA0, 0x8 + .asciz "TopL3" + .balign 4 .global $$254006 $$254006: - .incbin "baserom.dol", 0x496DA8, 0x8 + .asciz "AnimL" + .balign 4 .global $$254112 $$254112: - .incbin "baserom.dol", 0x496DB0, 0x8 + .asciz "Move1" + .balign 4 .global $$254113 $$254113: - .incbin "baserom.dol", 0x496DB8, 0x8 + .asciz "Move2" + .balign 4 .global $$254114 $$254114: - .incbin "baserom.dol", 0x496DC0, 0x8 + .asciz "Move3" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254115 $$254115: - .incbin "baserom.dol", 0x49D5E8, 0x4 + .4byte 0x41400000 .global $$254116 $$254116: - .incbin "baserom.dol", 0x49D5EC, 0x4 + .4byte 0x43520000 .global $$254163 $$254163: - .incbin "baserom.dol", 0x49D5F0, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/WarpStarPanel.s b/asm/src/WarpStarPanel.s index d8ca6e39..c5b65728 100644 --- a/asm/src/WarpStarPanel.s +++ b/asm/src/WarpStarPanel.s @@ -1047,44 +1047,57 @@ isOpenAreaDemoEnd__Q53scn4step4info13WarpStarPanel19WarpStarPanelIndiviCFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258551 $$258551: - .incbin "baserom.dol", 0x48C1D8, 0x10 + .asciz "step/lvmap/Main" .global $$258552 $$258552: - .incbin "baserom.dol", 0x48C1E8, 0x10 + .asciz "WarpStarBase" + .balign 4 .global $$258554 $$258554: - .incbin "baserom.dol", 0x48C1F8, 0x10 + .asciz "WarpStarName" + .balign 4 .global $$258600 $$258600: - .incbin "baserom.dol", 0x48C208, 0xC + .asciz "WarpStar_1" + .balign 4 .global $$258601 $$258601: - .incbin "baserom.dol", 0x48C214, 0xC + .asciz "WarpStar_2" + .balign 4 .global $$258602 $$258602: - .incbin "baserom.dol", 0x48C220, 0x40 + .asciz "WarpStar_3" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258555 $$258555: - .incbin "baserom.dol", 0x497B00, 0x4 + .4byte 0 .global $$258645 $$258645: - .incbin "baserom.dol", 0x497B04, 0x8 + .asciz "Start" + .balign 4 .global $$258646 $$258646: - .incbin "baserom.dol", 0x497B0C, 0x8 + .asciz "Wait" + .balign 4 .global $$258649 $$258649: - .incbin "baserom.dol", 0x497B14, 0x4 + .4byte 0x456E6400 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258553 $$258553: - .incbin "baserom.dol", 0x49E448, 0x4 + .4byte 0 .global $$258641 $$258641: - .incbin "baserom.dol", 0x49E44C, 0x4 + .4byte 0x40E00000 .global $$258642 $$258642: - .incbin "baserom.dol", 0x49E450, 0x8 + .4byte 0x40C00000 + .4byte 0 diff --git a/asm/src/Water.s b/asm/src/Water.s index c29ac4b5..cad5e7d8 100644 --- a/asm/src/Water.s +++ b/asm/src/Water.s @@ -1596,58 +1596,91 @@ __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State .section .rodata, "wa" # 0x80406560 - 0x80421040 .global CHECK_DEEP_OFFS_ARRAY__19$$2unnamed$$2Water_cpp$$2 CHECK_DEEP_OFFS_ARRAY__19$$2unnamed$$2Water_cpp$$2: - .incbin "baserom.dol", 0x416460, 0x60 + .4byte 0xBF7AE148 + .4byte 0x3F7AE148 + .4byte 0 + .4byte 0x3F9CCCCD + .4byte 0 + .4byte 0x3F1CCCCD + .4byte 0x3F7AE148 + .4byte 0x3F7AE148 + .4byte 0x3F9CCCCD + .4byte 0 + .4byte 0x3F1CCCCD + .4byte 0 + .4byte 0x3F7AE148 + .4byte 0xBF7AE148 + .4byte 0 + .4byte 0xBF9CCCCD + .4byte 0 + .4byte 0xBF1CCCCD + .4byte 0xBF7AE148 + .4byte 0xBF7AE148 + .4byte 0xBF9CCCCD + .4byte 0 + .4byte 0xBF1CCCCD + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1: - .incbin "baserom.dol", 0x4817F0, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035B524 + .4byte 0x8035B4DC .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1: - .incbin "baserom.dol", 0x481800, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x8035B520 + .4byte 0x8035B504 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253564 $$253564: - .incbin "baserom.dol", 0x49B8A8, 0x8 + .4byte 0x3F800000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259702 $$259702: - .incbin "baserom.dol", 0x49DA80, 0x4 + .4byte 0x3F19999A .global $$259703 $$259703: - .incbin "baserom.dol", 0x49DA84, 0x4 + .4byte 0 .global $$259807 $$259807: - .incbin "baserom.dol", 0x49DA88, 0x8 + .4byte 0x3F000000 + .4byte 0 .global $$259810 $$259810: - .incbin "baserom.dol", 0x49DA90, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$259867 $$259867: - .incbin "baserom.dol", 0x49DA98, 0x4 + .4byte 0x3DCCCCCD .global $$259908 $$259908: - .incbin "baserom.dol", 0x49DA9C, 0x4 + .4byte 0x3F800000 .global $$259909 $$259909: - .incbin "baserom.dol", 0x49DAA0, 0x4 + .4byte 0xBF800000 .global $$258297 $$258297: - .incbin "baserom.dol", 0x49DAA4, 0x4 + .4byte 0xFF0000FF .global $$258300 $$258300: - .incbin "baserom.dol", 0x49DAA8, 0x4 + .4byte 0xFF0000FF .global $$258303 $$258303: - .incbin "baserom.dol", 0x49DAAC, 0x4 + .4byte 0xFF0000FF .global $$258306 $$258306: - .incbin "baserom.dol", 0x49DAB0, 0x4 + .4byte 0xFF0000FF .global $$259962 $$259962: - .incbin "baserom.dol", 0x49DAB4, 0x4 + .4byte 0x3F4CCCCD .global $$259963 $$259963: - .incbin "baserom.dol", 0x49DAB8, 0x8 + .4byte 0xBF4CCCCD + .4byte 0 diff --git a/asm/src/WaterCallback.s b/asm/src/WaterCallback.s index a1c1a4b7..02d2b2c9 100644 --- a/asm/src/WaterCallback.s +++ b/asm/src/WaterCallback.s @@ -62,4 +62,9 @@ lbl_80290B04: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13WaterCallback __vt__Q43scn4step5enemy13WaterCallback: - .incbin "baserom.dol", 0x46EE20, 0x18 + .4byte 0 + .4byte 0 + .4byte 0x802863B4 ;# ptr + .4byte 0x80290A70 ;# ptr + .4byte 0x80290AC4 ;# ptr + .4byte 0 diff --git a/asm/src/WaterFlow.s b/asm/src/WaterFlow.s index 30d2df96..760ab7f1 100644 --- a/asm/src/WaterFlow.s +++ b/asm/src/WaterFlow.s @@ -893,31 +893,41 @@ lbl_8032B1A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global DIR_ROTATION__Q53scn4step7gimmick9waterflow23$$2unnamed$$2WaterFlow_cpp$$2 DIR_ROTATION__Q53scn4step7gimmick9waterflow23$$2unnamed$$2WaterFlow_cpp$$2: - .incbin "baserom.dol", 0x415CA0, 0x20 + .4byte 0 + .4byte 0x439D8000 + .4byte 0x43870000 + .4byte 0x43610000 + .4byte 0x43340000 + .4byte 0x43070000 + .4byte 0x42B40000 + .4byte 0x42340000 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253562 $$253562: - .incbin "baserom.dol", 0x47E7F8, 0x18 + .asciz "step/gimmick/WaterFlow" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253723 $$253723: - .incbin "baserom.dol", 0x496DD0, 0x8 + .asciz "TopL" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253563 $$253563: - .incbin "baserom.dol", 0x49D5F8, 0x4 + .4byte 0 .global $$253722 $$253722: - .incbin "baserom.dol", 0x49D5FC, 0x4 + .4byte 0x3E99999A .global $$253805 $$253805: - .incbin "baserom.dol", 0x49D600, 0x4 + .4byte 0x3C8EFA35 .global $$253821 $$253821: - .incbin "baserom.dol", 0x49D604, 0x4 + .4byte 0x41C00000 .global $$253822 $$253822: - .incbin "baserom.dol", 0x49D608, 0x8 + .4byte 0x43100000 + .4byte 0 diff --git a/asm/src/WaveHandle.s b/asm/src/WaveHandle.s index 85c67c49..808891f6 100644 --- a/asm/src/WaveHandle.s +++ b/asm/src/WaveHandle.s @@ -406,12 +406,17 @@ setParam__Q23snd10WaveHandleFUlUlQ34nw4r3snd12SampleFormat: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23snd10WaveHandle __vt__Q23snd10WaveHandle: - .incbin "baserom.dol", 0x4927B8, 0xC + .4byte 0 + .4byte 0 + .4byte 0x804040A4 .global __vt__Q33snd10WaveHandle10WavePacket __vt__Q33snd10WaveHandle10WavePacket: - .incbin "baserom.dol", 0x4927C4, 0xC + .4byte 0 + .4byte 0 + .4byte 0x80404048 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249104 $$249104: - .incbin "baserom.dol", 0x49EEA0, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/WeakPointCtrl.s b/asm/src/WeakPointCtrl.s index ab9c3cbb..c3a5d466 100644 --- a/asm/src/WeakPointCtrl.s +++ b/asm/src/WeakPointCtrl.s @@ -94,4 +94,5 @@ __vc__Q33hel6common62MutableArray$$0Q53scn4step4boss13WeakPointCtrl13WeakPointDa .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249046 $$249046: - .incbin "baserom.dol", 0x49AF18, 0x8 + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/src/Weapon.s b/asm/src/Weapon.s index 5cb467d4..8f951aa5 100644 --- a/asm/src/Weapon.s +++ b/asm/src/Weapon.s @@ -2202,42 +2202,55 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNorm .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1: - .incbin "baserom.dol", 0x48FEF8, 0x10 + .4byte 0 + .4byte 0 + .4byte 0x803DB1B4 + .4byte 0x803DB198 .global __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1 __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1: - .incbin "baserom.dol", 0x48FF08, 0xC + .4byte 0 + .4byte 0 + .4byte 0x803DA544 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: - .incbin "baserom.dol", 0x48FF14, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode: - .incbin "baserom.dol", 0x48FF38, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20 $$2STRING$$2__ml__Q44nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv$$20: - .incbin "baserom.dol", 0x48FF44, 0x24 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 .global $$2STRING$$2__ml__Q44nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv $$2STRING$$2__ml__Q44nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$18IteratorCFv: - .incbin "baserom.dol", 0x48FF68, 0xC + .asciz "LinkList.h" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20 $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1Fv$$20: - .incbin "baserom.dol", 0x48FF74, 0x24 + .asciz "NW4R:Failed assertion !IsEmpty()" + .balign 4 .global $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1Fv $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1Fv: - .incbin "baserom.dol", 0x48FF98, 0x10 + .asciz "LinkList.h" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$266105 $$266105: - .incbin "baserom.dol", 0x49E878, 0x4 + .4byte 0x41200000 .global $$266106 $$266106: - .incbin "baserom.dol", 0x49E87C, 0x4 + .4byte 0x40000000 .global $$266107 $$266107: - .incbin "baserom.dol", 0x49E880, 0x4 + .4byte 0 .global $$266108 $$266108: - .incbin "baserom.dol", 0x49E884, 0x4 + .4byte 0x3F800000 .global $$266109 $$266109: - .incbin "baserom.dol", 0x49E888, 0x8 + .4byte 0x42B40000 + .4byte 0 diff --git a/asm/src/WearBack.s b/asm/src/WearBack.s index c84f06b9..f05986c1 100644 --- a/asm/src/WearBack.s +++ b/asm/src/WearBack.s @@ -229,4 +229,39 @@ lbl_8035B840: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255703 $$255703: - .incbin "baserom.dol", 0x481810, 0x90 + .4byte 0x8035B71C + .4byte 0x8035B6C4 + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B6C4 + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B6C4 + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B6E0 + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B6C4 + .4byte 0x8035B6E0 + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B71C + .4byte 0x8035B710 + .4byte 0x8035B710 + .4byte 0x8035B710 diff --git a/asm/src/Whip.s b/asm/src/Whip.s index 4462c60f..2d461368 100644 --- a/asm/src/Whip.s +++ b/asm/src/Whip.s @@ -442,115 +442,204 @@ lbl_8038CCC0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21 $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21: - .incbin "baserom.dol", 0x41BB70, 0x90 + .4byte 0x8055B2E8 + .4byte 0 + .4byte 0x8048B698 + .4byte 0 + .4byte 0x8048B6A8 + .4byte 0 + .4byte 0x8055B2F0 + .4byte 0 + .4byte 0x8048B6B8 + .4byte 0 + .4byte 0x8048B6C8 + .4byte 0 + .4byte 0x8055B2F8 + .4byte 0 + .4byte 0x8055B300 + .4byte 0 + .4byte 0x8048B6D8 + .4byte 0 + .4byte 0x8048B6E8 + .4byte 0 + .4byte 0x8048B6F4 + .4byte 0 + .4byte 0x8048B700 + .4byte 0 + .4byte 0x8055B308 + .4byte 0 + .4byte 0x8048B70C + .4byte 0 + .4byte 0x8048B71C + .4byte 0 + .4byte 0x8048B72C + .4byte 0 + .4byte 0x8048B738 + .4byte 0 + .4byte 0x8048B748 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248821 $$248821: - .incbin "baserom.dol", 0x4876D8, 0x20 + .asciz "step/chara/hero/kirby/whip/Hat" + .balign 4 .global $$248823 $$248823: - .incbin "baserom.dol", 0x4876F8, 0x20 + .asciz "step/chara/hero/kirby/whip/Whip" .global $$248737 $$248737: - .incbin "baserom.dol", 0x487718, 0xC + .asciz "WhipHandM" + .balign 4 .global $$248738 $$248738: - .incbin "baserom.dol", 0x487724, 0xC + .asciz "WhipWhipM" + .balign 4 .global $$248740 $$248740: - .incbin "baserom.dol", 0x487730, 0xC + .asciz "WhipWhip7DJ" .global $$248741 $$248741: - .incbin "baserom.dol", 0x48773C, 0xC + .asciz "WhipWhip5DJ" .global $$248742 $$248742: - .incbin "baserom.dol", 0x487748, 0xC + .asciz "WhipWhip3DJ" .global $$248743 $$248743: - .incbin "baserom.dol", 0x487754, 0xC + .asciz "WhipWhip1DJ" .global $$248744 $$248744: - .incbin "baserom.dol", 0x487760, 0x10 + .asciz "WhipWhip9DJ" + .4byte 0 .global $$2LOCAL$$2WhipModel__Q53scn4step4hero9modeldesc4WhipFv$$2names$$21 $$2LOCAL$$2WhipModel__Q53scn4step4hero9modeldesc4WhipFv$$2names$$21: - .incbin "baserom.dol", 0x487770, 0x28 + .4byte 0x8055B2D0 + .4byte 0x8055B2D8 + .4byte 0x8048B618 + .4byte 0x8048B624 + .4byte 0x8055B2E0 + .4byte 0x8048B630 + .4byte 0x8048B63C + .4byte 0x8048B648 + .4byte 0x8048B654 + .4byte 0x8048B660 .global $$248752 $$248752: - .incbin "baserom.dol", 0x487798, 0x10 + .asciz "WhipCatchStart" + .balign 4 .global $$248753 $$248753: - .incbin "baserom.dol", 0x4877A8, 0x10 + .asciz "WhipCatchCharge" .global $$248755 $$248755: - .incbin "baserom.dol", 0x4877B8, 0x10 + .asciz "WhipCatchWait" + .balign 4 .global $$248756 $$248756: - .incbin "baserom.dol", 0x4877C8, 0x10 + .asciz "WhipCatchEnd" + .balign 4 .global $$248759 $$248759: - .incbin "baserom.dol", 0x4877D8, 0x10 + .asciz "WhipRushStart" + .balign 4 .global $$248760 $$248760: - .incbin "baserom.dol", 0x4877E8, 0xC + .asciz "WhipRush" + .balign 4 .global $$248761 $$248761: - .incbin "baserom.dol", 0x4877F4, 0xC + .asciz "WhipRushEnd" .global $$248762 $$248762: - .incbin "baserom.dol", 0x487800, 0xC + .asciz "GazerSpiral" .global $$248764 $$248764: - .incbin "baserom.dol", 0x48780C, 0x10 + .asciz "WhipSlamFront" + .balign 4 .global $$248765 $$248765: - .incbin "baserom.dol", 0x48781C, 0x10 + .asciz "WhipSlamBack" + .balign 4 .global $$248766 $$248766: - .incbin "baserom.dol", 0x48782C, 0xC + .asciz "WhipSlamUp" + .balign 4 .global $$248767 $$248767: - .incbin "baserom.dol", 0x487838, 0x10 + .asciz "WhipSlamDown" + .balign 4 .global $$248768 $$248768: - .incbin "baserom.dol", 0x487848, 0x10 + .asciz "WhipReset" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256579 $$256579: - .incbin "baserom.dol", 0x4897B0, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$256580 $$256580: - .incbin "baserom.dol", 0x4897D0, 0x24 + .asciz "step/chara/hero/kirby/whip/Motion" + .balign 4 .global __vt__Q53scn4step4hero4whip4Whip __vt__Q53scn4step4hero4whip4Whip: - .incbin "baserom.dol", 0x4897F4, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x8038C804 + .4byte 0x8038C8A4 + .4byte 0x8032B7A0 + .4byte 0x8032B7A4 + .4byte 0x8032B7A8 + .4byte 0x8038C9C4 + .4byte 0x8038CC64 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8038CB28 + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 $$248735: - .incbin "baserom.dol", 0x4976B0, 0x8 + .asciz "TopL" + .balign 4 .global $$248736 $$248736: - .incbin "baserom.dol", 0x4976B8, 0x8 + .asciz "AllL" + .balign 4 .global $$248739 $$248739: - .incbin "baserom.dol", 0x4976C0, 0x8 + .asciz "ConstL" + .balign 4 .global $$248751 $$248751: - .incbin "baserom.dol", 0x4976C8, 0x8 + .asciz "Carry" + .balign 4 .global $$248754 $$248754: - .incbin "baserom.dol", 0x4976D0, 0x8 + .asciz "Whip" + .balign 4 .global $$248757 $$248757: - .incbin "baserom.dol", 0x4976D8, 0x8 + .asciz "WhipUp" + .balign 4 .global $$248758 $$248758: - .incbin "baserom.dol", 0x4976E0, 0x8 + .asciz "WhipAir" .global $$248763 $$248763: - .incbin "baserom.dol", 0x4976E8, 0x8 + .asciz "Drill" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2WhipModel__Q53scn4step4hero9modeldesc4WhipFv$$2desc diff --git a/asm/src/WiiButton.s b/asm/src/WiiButton.s index 7eafc912..35758830 100644 --- a/asm/src/WiiButton.s +++ b/asm/src/WiiButton.s @@ -413,48 +413,65 @@ lbl_801AB108: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252511 $$252511: - .incbin "baserom.dol", 0x4537D0, 0xC + .asciz "common/Main" .global $$252512 $$252512: - .incbin "baserom.dol", 0x4537DC, 0xC + .asciz "WiiButton" + .balign 4 .global $$252513 $$252513: - .incbin "baserom.dol", 0x4537E8, 0xC + .asciz "Button1N" + .balign 4 .global $$252514 $$252514: - .incbin "baserom.dol", 0x4537F4, 0xC + .asciz "Button2N" + .balign 4 .global $$252515 $$252515: - .incbin "baserom.dol", 0x453800, 0xC + .asciz "ButtonPlusN" .global $$252516 $$252516: - .incbin "baserom.dol", 0x45380C, 0x10 + .asciz "ButtonMinusN" + .balign 4 .global $$252517 $$252517: - .incbin "baserom.dol", 0x45381C, 0xC + .asciz "ButtonAN" + .balign 4 .global $$252518 $$252518: - .incbin "baserom.dol", 0x453828, 0x40 + .asciz "ButtonCrossN" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252558 $$252558: - .incbin "baserom.dol", 0x4934E0, 0x8 + .asciz "Start" + .balign 4 .global $$252559 $$252559: - .incbin "baserom.dol", 0x4934E8, 0x8 + .asciz "Wait" + .balign 4 .global $$252562 $$252562: - .incbin "baserom.dol", 0x4934F0, 0x8 + .asciz "Wait2" + .balign 4 .global $$252565 $$252565: - .incbin "baserom.dol", 0x4934F8, 0x8 + .asciz "Blink" + .balign 4 .global $$252568 $$252568: - .incbin "baserom.dol", 0x493500, 0x4 + .4byte 0x456E6400 .global $$252582 $$252582: - .incbin "baserom.dol", 0x493504, 0x8 + .asciz "Push" + .balign 4 .global $$252587 $$252587: - .incbin "baserom.dol", 0x49350C, 0xC + .asciz "Hold" + .balign 4 + .4byte 0 diff --git a/asm/src/WindCtrl.s b/asm/src/WindCtrl.s index 7dc58876..cb197dc1 100644 --- a/asm/src/WindCtrl.s +++ b/asm/src/WindCtrl.s @@ -164,21 +164,29 @@ clear__Q53scn4step4boss6whispy8WindCtrlFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_AREA_RATE__Q53scn4step4boss6whispy22$$2unnamed$$2WindCtrl_cpp$$2 T_AREA_RATE__Q53scn4step4boss6whispy22$$2unnamed$$2WindCtrl_cpp$$2: - .incbin "baserom.dol", 0x4137E0, 0x20 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F8CCCCD + .4byte 0x3FA00000 + .4byte 0x3FB33333 + .4byte 0x3FC00000 + .4byte 0x3FCCCCCD + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250595 $$250595: - .incbin "baserom.dol", 0x49B578, 0x4 + .4byte 0 .global $$250596 $$250596: - .incbin "baserom.dol", 0x49B57C, 0x4 + .4byte 0x41100000 .global $$250597 $$250597: - .incbin "baserom.dol", 0x49B580, 0x4 + .4byte 0xC0000000 .global $$250598 $$250598: - .incbin "baserom.dol", 0x49B584, 0x4 + .4byte 0xC0400000 .global $$250599 $$250599: - .incbin "baserom.dol", 0x49B588, 0x8 + .4byte 0x40000000 + .4byte 0 diff --git a/asm/src/WindowPanel.s b/asm/src/WindowPanel.s index 0d5ecf81..25473627 100644 --- a/asm/src/WindowPanel.s +++ b/asm/src/WindowPanel.s @@ -62,12 +62,15 @@ __ct__Q25pause11WindowPanelFRQ25pause9ComponentRCQ23lyt12PaneAccessorb: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252028 $$252028: - .incbin "baserom.dol", 0x459C70, 0xC + .asciz "Pattern01N" + .balign 4 .global $$252029 $$252029: - .incbin "baserom.dol", 0x459C7C, 0xC + .asciz "Pattern02N" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252027 $$252027: - .incbin "baserom.dol", 0x493D08, 0x8 + .asciz "Window" + .balign 4 diff --git a/asm/src/Wing.s b/asm/src/Wing.s index cdf3a3da..02d7b895 100644 --- a/asm/src/Wing.s +++ b/asm/src/Wing.s @@ -444,115 +444,215 @@ lbl_8039B290: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21: - .incbin "baserom.dol", 0x41BC00, 0xC8 + .4byte 0x8048B794 + .4byte 0 + .4byte 0x8048B7A8 + .4byte 0 + .4byte 0x8048B7BC + .4byte 0 + .4byte 0x8048B7D0 + .4byte 0 + .4byte 0x8048B7E0 + .4byte 0 + .4byte 0x8048B7F8 + .4byte 0 + .4byte 0x8048B810 + .4byte 0 + .4byte 0x8048B828 + .4byte 0 + .4byte 0x8048B83C + .4byte 0 + .4byte 0x8048B848 + .4byte 0 + .4byte 0x8048B858 + .4byte 0 + .4byte 0x8048B86C + .4byte 0 + .4byte 0x8048B87C + .4byte 0 + .4byte 0x8048B890 + .4byte 0 + .4byte 0x8048B8A4 + .4byte 0 + .4byte 0x8048B8B4 + .4byte 0 + .4byte 0x8048B8C8 + .4byte 0 + .4byte 0x8048B8D8 + .4byte 0 + .4byte 0x8048B8E8 + .4byte 0 + .4byte 0x8048B8F8 + .4byte 0 + .4byte 0x8048B908 + .4byte 0 + .4byte 0x8048B91C + .4byte 0 + .4byte 0x8048B928 + .4byte 0 + .4byte 0x8048B938 + .4byte 0 + .4byte 0x8048B948 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249847 $$249847: - .incbin "baserom.dol", 0x487858, 0x1C + .asciz "step/hero/modeldesc/Wing" + .balign 4 .global $$249864 $$249864: - .incbin "baserom.dol", 0x487874, 0x20 + .asciz "step/chara/hero/kirby/wing/Hat" + .balign 4 .global $$249539 $$249539: - .incbin "baserom.dol", 0x487894, 0x14 + .asciz "WingFeatheGunStart" + .balign 4 .global $$249540 $$249540: - .incbin "baserom.dol", 0x4878A8, 0x14 + .asciz "WingFeatheGunLoop" + .balign 4 .global $$249541 $$249541: - .incbin "baserom.dol", 0x4878BC, 0x14 + .asciz "WingFeatheGunWait" + .balign 4 .global $$249542 $$249542: - .incbin "baserom.dol", 0x4878D0, 0x10 + .asciz "WingFeatheGun" + .balign 4 .global $$249543 $$249543: - .incbin "baserom.dol", 0x4878E0, 0x18 + .asciz "WingFeatheGunAirStart" + .balign 4 .global $$249544 $$249544: - .incbin "baserom.dol", 0x4878F8, 0x18 + .asciz "WingFeatheGunAirLoop" + .balign 4 .global $$249545 $$249545: - .incbin "baserom.dol", 0x487910, 0x18 + .asciz "WingFeatheGunAirWait" + .balign 4 .global $$249546 $$249546: - .incbin "baserom.dol", 0x487928, 0x14 + .asciz "WingFeatheGunAir" + .balign 4 .global $$249547 $$249547: - .incbin "baserom.dol", 0x48793C, 0xC + .asciz "WingFlight" + .balign 4 .global $$249548 $$249548: - .incbin "baserom.dol", 0x487948, 0x10 + .asciz "WingFlightFall" + .balign 4 .global $$249549 $$249549: - .incbin "baserom.dol", 0x487958, 0x14 + .asciz "WingBigBangAirStart" .global $$249550 $$249550: - .incbin "baserom.dol", 0x48796C, 0x10 + .asciz "WingBigBangAir" + .balign 4 .global $$249551 $$249551: - .incbin "baserom.dol", 0x48797C, 0x14 + .asciz "WingBigBangAirEnd" + .balign 4 .global $$249552 $$249552: - .incbin "baserom.dol", 0x487990, 0x14 + .asciz "WingCondorDiveStart" .global $$249553 $$249553: - .incbin "baserom.dol", 0x4879A4, 0x10 + .asciz "WingCondorDive" + .balign 4 .global $$249554 $$249554: - .incbin "baserom.dol", 0x4879B4, 0x14 + .asciz "WingCondorDiveEnd" + .balign 4 .global $$249555 $$249555: - .incbin "baserom.dol", 0x4879C8, 0x10 + .asciz "WingTossStart" + .balign 4 .global $$249556 $$249556: - .incbin "baserom.dol", 0x4879D8, 0x10 + .asciz "WingTossJump" + .balign 4 .global $$249557 $$249557: - .incbin "baserom.dol", 0x4879E8, 0x10 + .asciz "WingTossEnd" + .4byte 0 .global $$249558 $$249558: - .incbin "baserom.dol", 0x4879F8, 0x10 + .asciz "WingShuttleLoop" .global $$249559 $$249559: - .incbin "baserom.dol", 0x487A08, 0x14 + .asciz "WingShuttleLoopEnd" + .balign 4 .global $$249560 $$249560: - .incbin "baserom.dol", 0x487A1C, 0xC + .asciz "WingDash" + .balign 4 .global $$249561 $$249561: - .incbin "baserom.dol", 0x487A28, 0x10 + .asciz "WingAirDash" + .4byte 0 .global $$249562 $$249562: - .incbin "baserom.dol", 0x487A38, 0x10 + .asciz "WingDashEndWall" .global $$249563 $$249563: - .incbin "baserom.dol", 0x487A48, 0x10 + .asciz "WingReset" + .balign 4 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256289 $$256289: - .incbin "baserom.dol", 0x48A250, 0x20 + .asciz "step/chara/hero/kirby/base/Pink" .global $$256290 $$256290: - .incbin "baserom.dol", 0x48A270, 0x24 + .asciz "step/chara/hero/kirby/wing/Motion" + .balign 4 .global __vt__Q53scn4step4hero4wing4Wing __vt__Q53scn4step4hero4wing4Wing: - .incbin "baserom.dol", 0x48A294, 0x5C + .4byte 0 + .4byte 0 + .4byte 0x8039B018 + .4byte 0x8039B0A4 + .4byte 0x8032B7A0 + .4byte 0x8039B1E0 + .4byte 0x8032B7A8 + .4byte 0x8039B1E8 + .4byte 0x8032B7B0 + .4byte 0x8032B7B4 + .4byte 0x8032B7B8 + .4byte 0x8032B7BC + .4byte 0x8032B7C0 + .4byte 0x8032B7C4 + .4byte 0x8032B7C8 + .4byte 0x8032B7CC + .4byte 0x8032B7D0 + .4byte 0x8032B7D4 + .4byte 0x8032B7D8 + .4byte 0x8032B7DC + .4byte 0x8032B7E0 + .4byte 0x8032B7E4 + .4byte 0x8032B7E8 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249532 $$249532: - .incbin "baserom.dol", 0x4976F0, 0x8 + .asciz "AllJ" + .balign 4 .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc4WingFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc4WingFv$$2names$$21: - .incbin "baserom.dol", 0x4976F8, 0x4 + .4byte 0x8055B310 .global $$249870 $$249870: - .incbin "baserom.dol", 0x4976FC, 0x8 + .asciz "LBDJ" + .balign 4 .global $$249901 $$249901: - .incbin "baserom.dol", 0x497704, 0xC + .asciz "RBDJ" + .balign 4 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc4WingFv$$2desc diff --git a/asm/src/Wipe.s b/asm/src/Wipe.s index 28af22d4..58daf19a 100644 --- a/asm/src/Wipe.s +++ b/asm/src/Wipe.s @@ -450,34 +450,48 @@ lbl_80402564: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251702 $$251702: - .incbin "baserom.dol", 0x48EE40, 0x14 + .asciz "step/sfx/WipeCircle" .global $$251703 $$251703: - .incbin "baserom.dol", 0x48EE54, 0x14 + .asciz "step/sfx/WipeStar" + .balign 4 .global $$251704 $$251704: - .incbin "baserom.dol", 0x48EE68, 0x18 + .asciz "step/sfx/WipeChallenge" + .balign 4 .global T_WIPE_FILE_PATH_TABLE__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2 T_WIPE_FILE_PATH_TABLE__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2: - .incbin "baserom.dol", 0x48EE80, 0x10 + .4byte 0x80492D40 + .4byte 0x80492D54 + .4byte 0x80492D68 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251793 $$251793: - .incbin "baserom.dol", 0x498AA0, 0x8 + .asciz "Wipe" + .balign 4 .global $$251832 $$251832: - .incbin "baserom.dol", 0x498AA8, 0x18 + .asciz "TopL" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251871 $$251871: - .incbin "baserom.dol", 0x49E808, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251799 $$251799: - .incbin "baserom.dol", 0x49EE88, 0x8 + .4byte 0xBF800000 + .4byte 0 .global $$251836 $$251836: - .incbin "baserom.dol", 0x49EE90, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/src/WorldCage.s b/asm/src/WorldCage.s index a8c0d048..cae2933f 100644 --- a/asm/src/WorldCage.s +++ b/asm/src/WorldCage.s @@ -355,10 +355,11 @@ changePadding__Q43scn4step5chara9WorldCageFff: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254475 $$254475: - .incbin "baserom.dol", 0x49B8B0, 0x4 + .4byte 0 .global $$254508 $$254508: - .incbin "baserom.dol", 0x49B8B4, 0x4 + .4byte 0x3F000000 .global $$254509 $$254509: - .incbin "baserom.dol", 0x49B8B8, 0x8 + .4byte 0x3727C5AC + .4byte 0 diff --git a/asm/src/Year.s b/asm/src/Year.s index 2e6cb506..cb32c6dd 100644 --- a/asm/src/Year.s +++ b/asm/src/Year.s @@ -238,22 +238,33 @@ lbl_8021B600: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252314 $$252314: - .incbin "baserom.dol", 0x45F618, 0x10 + .asciz "history/Detail" + .balign 4 .global $$252315 $$252315: - .incbin "baserom.dol", 0x45F628, 0xC + .asciz "NumberBase" + .balign 4 .global $$252316 $$252316: - .incbin "baserom.dol", 0x45F634, 0xC + .asciz "Number%dN1" + .balign 4 .global $$252317 $$252317: - .incbin "baserom.dol", 0x45F640, 0xC + .asciz "Number%dN2" + .balign 4 .global $$252318 $$252318: - .incbin "baserom.dol", 0x45F64C, 0xC + .asciz "Number%dN3" + .balign 4 .global $$252319 $$252319: - .incbin "baserom.dol", 0x45F658, 0xC + .asciz "Number%dN4" + .balign 4 .global $$252392 $$252392: - .incbin "baserom.dol", 0x45F664, 0x3C + .asciz "Number%d" + .balign 4 + .asciz "NW4R:Pointer must not be NULL (p)" + .balign 4 + .asciz "LinkList.h" + .balign 4 diff --git a/asm/src/ZNururi.s b/asm/src/ZNururi.s index ae0b56e4..57649bcd 100644 --- a/asm/src/ZNururi.s +++ b/asm/src/ZNururi.s @@ -243,30 +243,31 @@ lbl_8035BB94: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251249 $$251249: - .incbin "baserom.dol", 0x496E28, 0x8 + .4byte 0 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251504 $$251504: - .incbin "baserom.dol", 0x49DAC0, 0x4 + .4byte 0 .global $$251536 $$251536: - .incbin "baserom.dol", 0x49DAC4, 0x4 + .4byte 0x3F4CCCCD .global $$251537 $$251537: - .incbin "baserom.dol", 0x49DAC8, 0x4 + .4byte 0x3E99999A .global $$251538 $$251538: - .incbin "baserom.dol", 0x49DACC, 0x4 + .4byte 0x3F800000 .global $$251539 $$251539: - .incbin "baserom.dol", 0x49DAD0, 0x4 + .4byte 0xBF800000 .global $$251540 $$251540: - .incbin "baserom.dol", 0x49DAD4, 0x4 + .4byte 0x40000000 .global $$251541 $$251541: - .incbin "baserom.dol", 0x49DAD8, 0x4 + .4byte 0x3E4CCCCD .global $$251571 $$251571: - .incbin "baserom.dol", 0x49DADC, 0x4 + .4byte 0x3F333333 diff --git a/asm/src/ZoomController.s b/asm/src/ZoomController.s index 79b24cb1..cc603d12 100644 --- a/asm/src/ZoomController.s +++ b/asm/src/ZoomController.s @@ -558,7 +558,7 @@ lbl_80267FDC: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250412 $$250412: - .incbin "baserom.dol", 0x49B718, 0x4 + .4byte 0x3DCCCCCD .global $$250470 $$250470: - .incbin "baserom.dol", 0x49B71C, 0x4 + .4byte 0x41100000 diff --git a/asm/src/ZoomControllerData.s b/asm/src/ZoomControllerData.s index fb56f653..60d3ca55 100644 --- a/asm/src/ZoomControllerData.s +++ b/asm/src/ZoomControllerData.s @@ -59,4 +59,5 @@ __ct__Q43scn4step6camera18ZoomControllerDataFRQ43scn4step6camera14ZoomController .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249761 $$249761: - .incbin "baserom.dol", 0x49B720, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/src/ZoomQuake.s b/asm/src/ZoomQuake.s index caee20d8..3480afb0 100644 --- a/asm/src/ZoomQuake.s +++ b/asm/src/ZoomQuake.s @@ -111,33 +111,47 @@ execute__Q43scn4step6camera9ZoomQuakeFv: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251535 $$251535: - .incbin "baserom.dol", 0x467240, 0x10 + .asciz "Invalid.Exec()" + .balign 4 .global $$251536 $$251536: - .incbin "baserom.dol", 0x467250, 0x18 + .asciz "SuperCopyKime.Exec()" + .balign 4 .global $$251537 $$251537: - .incbin "baserom.dol", 0x467268, 0x1C + .asciz "SuperSwordCameraOut.Exec()" + .balign 4 .global $$251538 $$251538: - .incbin "baserom.dol", 0x467284, 0x1C + .asciz "SuperHammerCameraOut.Exec()" .global $$251539 $$251539: - .incbin "baserom.dol", 0x4672A0, 0x20 + .asciz "BossPowerfulAttack.ExecLong()" + .balign 4 .global $$251540 $$251540: - .incbin "baserom.dol", 0x4672C0, 0x20 + .asciz "BossPowerfulAttack.ExecShort()" + .balign 4 .global $$251541 $$251541: - .incbin "baserom.dol", 0x4672E0, 0x20 + .asciz "BossPowerfulAttackCharge.Exec()" .global T_QUAKE_NAME_TABLE__Q43scn4step6camera23$$2unnamed$$2ZoomQuake_cpp$$2 T_QUAKE_NAME_TABLE__Q43scn4step6camera23$$2unnamed$$2ZoomQuake_cpp$$2: - .incbin "baserom.dol", 0x467300, 0x1C + .4byte 0x8046B140 + .4byte 0x8046B150 + .4byte 0x8046B168 + .4byte 0x8046B184 + .4byte 0x8046B1A0 + .4byte 0x8046B1C0 + .4byte 0x8046B1E0 .global $$251699 $$251699: - .incbin "baserom.dol", 0x46731C, 0x24 + .asciz "Scn.Step.Camera.ZoomQuake.%s" + .balign 4 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251687 $$251687: - .incbin "baserom.dol", 0x49B728, 0x8 + .4byte 0 + .4byte 0 diff --git a/asm/tpl/TPL.s b/asm/tpl/TPL.s index 6bdb0531..75acddc8 100644 --- a/asm/tpl/TPL.s +++ b/asm/tpl/TPL.s @@ -154,14 +154,18 @@ TPLGetGXTexObjFromPalette: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2773 $$2773: - .incbin "baserom.dol", 0x43C130, 0x30 + .asciz "invalid version number for texture palette" + .balign 4 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2772 $$2772: - .incbin "baserom.dol", 0x492D20, 0x8 + .asciz "TPL.c" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2795 $$2795: - .incbin "baserom.dol", 0x4994A0, 0x8 + .4byte 0x43300000 + .4byte 0 diff --git a/asm/usb/usb.s b/asm/usb/usb.s index 518068d2..fb3d7a51 100644 --- a/asm/usb/usb.s +++ b/asm/usb/usb.s @@ -1480,213 +1480,265 @@ IUSB_WriteCtrlMsgAsync: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$22524 $$22524: - .incbin "baserom.dol", 0x436138, 0xC + .asciz "USB ERR: " + .balign 4 .global $$22540 $$22540: - .incbin "baserom.dol", 0x436144, 0x30 + .asciz "Library is already initialized. Heap Id = %d\n" + .balign 4 .global $$22541 $$22541: - .incbin "baserom.dol", 0x436174, 0x20 + .asciz "iusb size: %d lo: %x hi: %x\n" + .balign 4 .global $$22542 $$22542: - .incbin "baserom.dol", 0x436194, 0x18 + .asciz "Not enough IPC arena\n" + .balign 4 .global $$22543 $$22543: - .incbin "baserom.dol", 0x4361AC, 0x14 + .asciz "Not enough heaps\n" + .balign 4 .global $$22563 $$22563: - .incbin "baserom.dol", 0x4361C0, 0x20 + .asciz "_intrBlkCtrlIsoCb returned: %d\n" .global $$22564 $$22564: - .incbin "baserom.dol", 0x4361E0, 0x20 + .asciz "_intrBlkCtrlIsoCb: nclean = %d\n" .global $$22565 $$22565: - .incbin "baserom.dol", 0x436200, 0x28 + .asciz "__intrBlkCtrlIsoCb: got invalid nclean\n" .global $$22566 $$22566: - .incbin "baserom.dol", 0x436228, 0x18 + .asciz "Freeing clean[%d] = %x\n" .global $$22567 $$22567: - .incbin "baserom.dol", 0x436240, 0x20 + .asciz "iosFree(%d, 0x%x) failed: %d\n" + .balign 4 .global $$22568 $$22568: - .incbin "baserom.dol", 0x436260, 0x14 + .asciz "cb = %x cbArg = %x\n" .global $$22569 $$22569: - .incbin "baserom.dol", 0x436274, 0x18 + .asciz "calling iso callback\n" + .balign 4 .global $$22577 $$22577: - .incbin "baserom.dol", 0x43628C, 0x24 + .asciz "iosAllocAligned(%d, %u) failed: %d\n" .global $$22578 $$22578: - .incbin "baserom.dol", 0x4362B0, 0x24 + .asciz "OpenDeviceIds: Not enough memory\n" + .balign 4 .global $$22579 $$22579: - .incbin "baserom.dol", 0x4362D4, 0x14 + .asciz "/dev/usb/%s/%x/%x" + .balign 4 .global $$22580 $$22580: - .incbin "baserom.dol", 0x4362E8, 0x14 + .asciz "OpenDevice - %s\n" + .balign 4 .global $$22581 $$22581: - .incbin "baserom.dol", 0x4362FC, 0x1C + .asciz "OpenDevice returned: %d\n" + .balign 4 .global $$22590 $$22590: - .incbin "baserom.dol", 0x436318, 0xC + .asciz "OpenDevice\n" .global $$22591 $$22591: - .incbin "baserom.dol", 0x436324, 0x28 + .asciz "OpenDeviceIdsAsync: Not enough memory\n" + .balign 4 .global $$22596 $$22596: - .incbin "baserom.dol", 0x43634C, 0x10 + .asciz "CloseDevice\n" + .balign 4 .global $$22597 $$22597: - .incbin "baserom.dol", 0x43635C, 0x1C + .asciz "CloseDevice returned: %d\n" + .balign 4 .global $$22604 $$22604: - .incbin "baserom.dol", 0x436378, 0x28 + .asciz "CloseDeviceAsync: Not enough memory\n" + .balign 4 .global $$22627 $$22627: - .incbin "baserom.dol", 0x4363A0, 0x20 + .asciz "openDevice: Not enough memory\n" + .balign 4 .global $$22628 $$22628: - .incbin "baserom.dol", 0x4363C0, 0x28 + .asciz "getDeviceList: Not enough memory\n" + .balign 4 + .4byte 0 .global __FUNCTION__$914 __FUNCTION__$914: - .incbin "baserom.dol", 0x4363E8, 0x10 + .asciz "__LongBlkMsgInt" .global $$22647 $$22647: - .incbin "baserom.dol", 0x4363F8, 0x24 + .asciz "__LongBlkMsgInt: Not enough memory\n" .global $$22648 $$22648: - .incbin "baserom.dol", 0x43641C, 0x20 + .asciz "Long bulk ioctl returned: %d\n" + .balign 4 .global $$22649 $$22649: - .incbin "baserom.dol", 0x43643C, 0x2C + .asciz "LongBlkMsgInt (async): Not enough memory\n" + .balign 4 .global $$22650 $$22650: - .incbin "baserom.dol", 0x436468, 0x24 + .asciz "longblkmsg: cb = 0x%x cbArg = 0x%x\n" .global $$22651 $$22651: - .incbin "baserom.dol", 0x43648C, 0x24 + .asciz "%s: IoctlvAsync returned error %d\n" + .balign 4 .global __FUNCTION__$945 __FUNCTION__$945: - .incbin "baserom.dol", 0x4364B0, 0x10 + .asciz "__IntrBlkMsgInt" .global $$22670 $$22670: - .incbin "baserom.dol", 0x4364C0, 0x24 + .asciz "__IntrBlkMsgInt: Not enough memory\n" .global $$22671 $$22671: - .incbin "baserom.dol", 0x4364E4, 0x20 + .asciz "intr/blk ioctl returned: %d\n" + .balign 4 .global $$22672 $$22672: - .incbin "baserom.dol", 0x436504, 0x2C + .asciz "IntBlkMsgInt (async): Not enough memory\n" + .balign 4 .global $$22673 $$22673: - .incbin "baserom.dol", 0x436530, 0x24 + .asciz "intrblkmsg: cb = 0x%x cbArg = 0x%x\n" .global $$22692 $$22692: - .incbin "baserom.dol", 0x436554, 0x38 + .asciz "calling short blk transfer fn: buflen = %u limit = %u\n" + .balign 4 .global $$22693 $$22693: - .incbin "baserom.dol", 0x43658C, 0x38 + .asciz "calling long blk transfer fn: buflen = %u limit = %u\n" + .balign 4 .global $$22736 $$22736: - .incbin "baserom.dol", 0x4365C4, 0x1C + .asciz "ctrlmsg: bad data buffer\n" + .balign 4 .global $$22737 $$22737: - .incbin "baserom.dol", 0x4365E0, 0x20 + .asciz "Ctrl Msg: Not enough memory\n" + .balign 4 .global $$22738 $$22738: - .incbin "baserom.dol", 0x436600, 0x28 + .asciz "CtrlMsgInt (async): Not enough memory\n" + .balign 4 .global $$22739 $$22739: - .incbin "baserom.dol", 0x436628, 0x24 + .asciz "ctrlmsgint: cb = 0x%x cbArg = 0x%x\n" .global $$22740 $$22740: - .incbin "baserom.dol", 0x43664C, 0x20 + .asciz "Ctrl Msg async returned: %d\n" + .balign 4 .global $$22775 $$22775: - .incbin "baserom.dol", 0x43666C, 0x18 + .asciz "GetStrCb returned: %d\n" + .balign 4 .global $$22776 $$22776: - .incbin "baserom.dol", 0x436684, 0x24 + .asciz "GetStrCb: buf = 0x%x buflen = %u\n" + .balign 4 .global $$22777 $$22777: - .incbin "baserom.dol", 0x4366A8, 0x30 + .asciz "Failed to convert buffer from unicode 2 ascii\n" + .balign 4 .global $$22778 $$22778: - .incbin "baserom.dol", 0x4366D8, 0x20 + .asciz "calling cb 0x%x with arg 0x%x\n" + .balign 4 .global $$22786 $$22786: - .incbin "baserom.dol", 0x4366F8, 0x18 + .asciz "Failed __CtrlMsg: %d" + .balign 4 .global $$22787 $$22787: - .incbin "baserom.dol", 0x436710, 0x24 + .asciz "Failed to convert unicode 2 ascii\n" + .balign 4 .global $$22795 $$22795: - .incbin "baserom.dol", 0x436734, 0x14 + .asciz "GetStr - _GetStrCb\n" .global $$22796 $$22796: - .incbin "baserom.dol", 0x436748, 0x28 + .asciz " GetAsciiStrAsync: Not enough memory\n" + .balign 4 .global $$22797 $$22797: - .incbin "baserom.dol", 0x436770, 0x18 + .asciz "__CtrlMsgInt failed %d\n" .global $$22807 $$22807: - .incbin "baserom.dol", 0x436788, 0x1C + .asciz "GetDescrCb returned: %d\n" + .balign 4 .global $$22815 $$22815: - .incbin "baserom.dol", 0x4367A4, 0x14 + .asciz "GetDevDescr\n" + .balign 4 + .4byte 0 .global $$22816 $$22816: - .incbin "baserom.dol", 0x4367B8, 0x20 + .asciz "GetDevDescr: Not enough memory\n" .global $$22817 $$22817: - .incbin "baserom.dol", 0x4367D8, 0x14 + .asciz "GetDevDescr: %d\n" + .balign 4 .global $$22829 $$22829: - .incbin "baserom.dol", 0x4367EC, 0x1C + .asciz "GetDevDescr - _GetDescrCb\n" + .balign 4 .global $$22830 $$22830: - .incbin "baserom.dol", 0x436808, 0x28 + .asciz "GetDevDescrAsync: Not enough memory\n" + .balign 4 .global $$22874 $$22874: - .incbin "baserom.dol", 0x436830, 0x1C + .asciz "DeviceRemovalNotifyAsync\n" + .balign 4 .global $$22892 $$22892: - .incbin "baserom.dol", 0x43684C, 0x18 + .asciz "packet %u too big: %u\n" + .balign 4 .global $$22912 $$22912: - .incbin "baserom.dol", 0x436864, 0x30 + .asciz "Invalid parameters for ISO transfer request\n" + .balign 4 .global $$22913 $$22913: - .incbin "baserom.dol", 0x436894, 0x28 + .asciz "IUSB_IsoMsgAsync: Not enough memory\n" + .balign 4 .global $$22933 $$22933: - .incbin "baserom.dol", 0x4368BC, 0x14 + .asciz "Open(%s) failed\n" + .balign 4 .global $$22964 $$22964: - .incbin "baserom.dol", 0x4368D0, 0x40 + .asciz "Invalid path or devClass in insertion notification call\n" + .balign 4 + .4byte 0 .global __FUNCTION__$1488 __FUNCTION__$1488: - .incbin "baserom.dol", 0x436910, 0x28 + .asciz "IUSB_RegisterInsertionNotifyWithIdAsync" .global $$23004 $$23004: - .incbin "baserom.dol", 0x436938, 0x18 + .asciz "%s: Not enough memory\n" + .balign 4 .global $$23016 $$23016: - .incbin "baserom.dol", 0x436950, 0x18 + .asciz "Failed to open %s: %d\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global hId hId: - .incbin "baserom.dol", 0x492C70, 0x4 + .4byte 0xFFFFFFFF .global s_usb_err s_usb_err: - .incbin "baserom.dol", 0x492C74, 0x4 + .4byte 0x01000000 .global $$22519 $$22519: - .incbin "baserom.dol", 0x492C78, 0x8 + .asciz "USB: " + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global lo diff --git a/asm/vi/i2c.s b/asm/vi/i2c.s index 3b6a5ea1..8306fae0 100644 --- a/asm/vi/i2c.s +++ b/asm/vi/i2c.s @@ -641,7 +641,8 @@ lbl_8002ED8C: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __i2c_ident_flag __i2c_ident_flag: - .incbin "baserom.dol", 0x492928, 0x8 + .4byte 0x00000001 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __i2c_ident_first diff --git a/asm/vi/vi.s b/asm/vi/vi.s index 001835fa..68caac5d 100644 --- a/asm/vi/vi.s +++ b/asm/vi/vi.s @@ -2948,84 +2948,321 @@ __VIResetSIIdle: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: - .incbin "baserom.dol", 0x42BD90, 0x48 + .asciz "<< RVL_SDK - VI \trelease build: Aug 23 2010 17:33:19 (0x4302_145) >>" + .balign 4 .global timing timing: - .incbin "baserom.dol", 0x42BDD8, 0x1A4 + .4byte 0x060000F0 + .4byte 0x00180019 + .4byte 0x00030002 + .4byte 0x0C0D0C0D + .4byte 0x02080207 + .4byte 0x02080207 + .4byte 0x020D01AD + .4byte 0x404769A2 + .4byte 0x01757A00 + .4byte 0x019C0600 + .4byte 0x00F00018 + .4byte 0x00180004 + .4byte 0x00040C0C + .4byte 0x0C0C0208 + .4byte 0x02080208 + .4byte 0x0208020E + .4byte 0x01AD4047 + .4byte 0x69A20175 + .4byte 0x7A00019C + .4byte 0x0500011F + .4byte 0x00230024 + .4byte 0x00010000 + .4byte 0x0D0C0B0A + .4byte 0x026B026A + .4byte 0x0269026C + .4byte 0x027101B0 + .4byte 0x404B6AAC + .4byte 0x017C8500 + .4byte 0x01A40500 + .4byte 0x011F0021 + .4byte 0x00210002 + .4byte 0x00020D0B + .4byte 0x0D0B026B + .4byte 0x026D026B + .4byte 0x026D0270 + .4byte 0x01B0404B + .4byte 0x6AAC017C + .4byte 0x850001A4 + .4byte 0x060000F0 + .4byte 0x00180019 + .4byte 0x00030002 + .4byte 0x100F0E0D + .4byte 0x02060205 + .4byte 0x02040207 + .4byte 0x020D01AD + .4byte 0x404E70A2 + .4byte 0x01757A00 + .4byte 0x019C0600 + .4byte 0x00F00018 + .4byte 0x00180004 + .4byte 0x0004100E + .4byte 0x100E0206 + .4byte 0x02080206 + .4byte 0x0208020E + .4byte 0x01AD404E + .4byte 0x70A20175 + .4byte 0x7A00019C + .4byte 0x0C0001E0 + .4byte 0x00300030 + .4byte 0x00060006 + .4byte 0x18181818 + .4byte 0x040E040E + .4byte 0x040E040E + .4byte 0x041A01AD + .4byte 0x404769A2 + .4byte 0x01757A00 + .4byte 0x019C0C00 + .4byte 0x01E0002C + .4byte 0x002C000A + .4byte 0x000A1818 + .4byte 0x1818040E + .4byte 0x040E040E + .4byte 0x040E041A + .4byte 0x01AD4047 + .4byte 0x69A8017B + .4byte 0x7A00019C + .4byte 0x060000F1 + .4byte 0x00180019 + .4byte 0x00010000 + .4byte 0x0C0D0C0D + .4byte 0x02080207 + .4byte 0x02080207 + .4byte 0x020D01AD + .4byte 0x4047699F + .4byte 0x01727A00 + .4byte 0x019C0C00 + .4byte 0x01E00030 + .4byte 0x00300006 + .4byte 0x00061818 + .4byte 0x1818040E + .4byte 0x040E040E + .4byte 0x040E041A + .4byte 0x01AD4047 + .4byte 0x69B40187 + .4byte 0x7A00019C + .4byte 0x0A000240 + .4byte 0x003E003E + .4byte 0x00060006 + .4byte 0x14141414 + .4byte 0x04D804D8 + .4byte 0x04D804D8 + .4byte 0x04E201B0 + .4byte 0x404B6AAC + .4byte 0x017C7A00 + .4byte 0x019C0000 .global taps taps: - .incbin "baserom.dol", 0x42BF7C, 0x34 + .4byte 0x01F001DC + .4byte 0x01AE0174 + .4byte 0x012900DB + .4byte 0x008E0046 + .4byte 0x000C00E2 + .4byte 0x00CB00C0 + .4byte 0x00C400CF + .4byte 0x00DE00EC + .4byte 0x00FC0008 + .4byte 0x000F0013 + .4byte 0x0013000F + .4byte 0x000C0008 + .4byte 0x00010000 .global GXPal528Prog GXPal528Prog: - .incbin "baserom.dol", 0x42BFB0, 0x3C + .4byte 0x00000006 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060000 + .4byte 0x15161500 + .4byte 0 .global GXPal528ProgSoft GXPal528ProgSoft: - .incbin "baserom.dol", 0x42BFEC, 0x3C + .4byte 0x00000006 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 .global GXPal524ProgAa GXPal524ProgAa: - .incbin "baserom.dol", 0x42C028, 0x40 + .4byte 0x00000006 + .4byte 0x02800108 + .4byte 0x020C0028 + .4byte 0x00170280 + .4byte 0x020C0000 + .4byte 0 + .4byte 0x00010302 + .4byte 0x0906030A + .4byte 0x03020906 + .4byte 0x030A0902 + .4byte 0x0306090A + .4byte 0x09020306 + .4byte 0x090A0408 + .4byte 0x0C100C08 + .4byte 0x04000000 + .4byte 0 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .incbin "baserom.dol", 0x42C068, 0x10 + .4byte 0x8002BAD0 ;# ptr + .4byte 0x0000007F + .4byte 0 + .4byte 0 .global $$23436 $$23436: - .incbin "baserom.dol", 0x42C078, 0x24 + .4byte 0x8002BFC0 ;# ptr + .4byte 0x8002BFC8 ;# ptr + .4byte 0x8002BFD0 ;# ptr + .4byte 0x8002BFC0 ;# ptr + .4byte 0x8002BFC8 ;# ptr + .4byte 0x8002BFD0 ;# ptr + .4byte 0x8002BFC0 ;# ptr + .4byte 0x8002BFC0 ;# ptr + .4byte 0x8002BFC0 ;# ptr .global $$23466 $$23466: - .incbin "baserom.dol", 0x42C09C, 0x8C + .4byte 0x8002C540 ;# ptr + .4byte 0x8002C54C ;# ptr + .4byte 0x8002C5B8 ;# ptr + .4byte 0x8002C5C8 ;# ptr + .4byte 0x8002C55C ;# ptr + .4byte 0x8002C56C ;# ptr + .4byte 0x8002C618 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C598 ;# ptr + .4byte 0x8002C5A8 ;# ptr + .4byte 0x8002C5B8 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C5D8 ;# ptr + .4byte 0x8002C5E8 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C57C ;# ptr + .4byte 0x8002C588 ;# ptr + .4byte 0x8002C5B8 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C5F8 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C608 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C628 ;# ptr + .4byte 0x8002C628 ;# ptr + .4byte 0x8002C628 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C630 ;# ptr + .4byte 0x8002C628 ;# ptr .global $$23633 $$23633: - .incbin "baserom.dol", 0x42C128, 0x24 + .4byte 0x8002CCD4 ;# ptr + .4byte 0x8002CCDC ;# ptr + .4byte 0x8002CCE4 ;# ptr + .4byte 0x8002CCD4 ;# ptr + .4byte 0x8002CCDC ;# ptr + .4byte 0x8002CCE4 ;# ptr + .4byte 0x8002CCD4 ;# ptr + .4byte 0x8002CCD4 ;# ptr + .4byte 0x8002CCD4 ;# ptr .global $$23931 $$23931: - .incbin "baserom.dol", 0x42C14C, 0x2C + .asciz "***************************************\n" + .balign 4 .global $$23932 $$23932: - .incbin "baserom.dol", 0x42C178, 0x2C + .asciz " ! ! ! C A U T I O N ! ! ! \n" + .balign 4 .global $$23933 $$23933: - .incbin "baserom.dol", 0x42C1A4, 0x2C + .asciz "This TV format \"DEBUG_PAL\" is only for \n" + .balign 4 .global $$23934 $$23934: - .incbin "baserom.dol", 0x42C1D0, 0x2C + .asciz "temporary solution until PAL DAC board \n" + .balign 4 .global $$23935 $$23935: - .incbin "baserom.dol", 0x42C1FC, 0x2C + .asciz "is available. Please do NOT use this \n" + .balign 4 .global $$23936 $$23936: - .incbin "baserom.dol", 0x42C228, 0x2C + .asciz "mode in real games!!! \n" + .balign 4 .global $$23938 $$23938: - .incbin "baserom.dol", 0x42C254, 0x4C + .asciz "VIConfigure(): Tried to change mode from (%d) to (%d), which is forbidden\n" + .balign 4 .global $$24121 $$24121: - .incbin "baserom.dol", 0x42C2A0, 0x24 + .4byte 0x8002E048 ;# ptr + .4byte 0x8002E050 ;# ptr + .4byte 0x8002E054 ;# ptr + .4byte 0x8002E048 ;# ptr + .4byte 0x8002E050 ;# ptr + .4byte 0x8002E054 ;# ptr + .4byte 0x8002E048 ;# ptr + .4byte 0x8002E048 ;# ptr + .4byte 0x8002E048 ;# ptr .global $$24441 $$24441: - .incbin "baserom.dol", 0x42C2C4, 0x24 + .4byte 0x8002E394 ;# ptr + .4byte 0x8002E39C ;# ptr + .4byte 0x8002E3A0 ;# ptr + .4byte 0x8002E394 ;# ptr + .4byte 0x8002E39C ;# ptr + .4byte 0x8002E3A0 ;# ptr + .4byte 0x8002E394 ;# ptr + .4byte 0x8002E394 ;# ptr + .4byte 0x8002E394 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __VIVersion __VIVersion: - .incbin "baserom.dol", 0x492908, 0x4 + .4byte 0x8042FC90 .global $$2LOCAL$$2OnShutdown__FiUl$$2first $$2LOCAL$$2OnShutdown__FiUl$$2first: - .incbin "baserom.dol", 0x49290C, 0x4 + .4byte 0x00000001 .global $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2old_dtvStatus $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2old_dtvStatus: - .incbin "baserom.dol", 0x492910, 0x4 + .4byte 0x000003E7 .global $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2old_tvtype$$20 $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2old_tvtype$$20: - .incbin "baserom.dol", 0x492914, 0x4 + .4byte 0x000003E7 .global $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2__VIDimmingFlag_Enable_old$$21 $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2__VIDimmingFlag_Enable_old$$21: - .incbin "baserom.dol", 0x492918, 0x4 + .4byte 0x00000001 .global $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2__VIDVDStopFlag_Enable_old$$22 $$2LOCAL$$2__VIRetraceHandler__FsP9OSContext$$2__VIDVDStopFlag_Enable_old$$22: - .incbin "baserom.dol", 0x49291C, 0x4 + .4byte 0x00000001 .global $$23937 $$23937: - .incbin "baserom.dol", 0x492920, 0x8 + .asciz "vi.c" + .balign 4 .section .bss, "wa" # 0x80496700 - 0x805643FC .global shdwRegs diff --git a/asm/vi/vi3in1.s b/asm/vi/vi3in1.s index d7a69e83..41ea7bfa 100644 --- a/asm/vi/vi3in1.s +++ b/asm/vi/vi3in1.s @@ -1568,93 +1568,438 @@ lbl_8003047C: .section .data, "wa" # 0x80421040 - 0x80496700 .global gammaSet gammaSet: - .incbin "baserom.dol", 0x42C2E8, 0x420 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00300397 + .4byte 0x3B49101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x10001000 + .4byte 0x10001080 + .4byte 0x1B80EB00 + .4byte 0x00000028 + .4byte 0x005A02DB + .4byte 0x0D8D3049 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10001000 + .4byte 0x10401100 + .4byte 0x18804200 + .4byte 0xEB000000 + .4byte 0x007A023C + .4byte 0x076D129C + .4byte 0x2724101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x100010C0 + .4byte 0x15802900 + .4byte 0x6200EB00 + .4byte 0x004E0199 + .4byte 0x052D0B24 + .4byte 0x142920A4 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10001040 + .4byte 0x12C01DC0 + .4byte 0x3B0078C0 + .4byte 0xEB0000EC + .4byte 0x03D70800 + .4byte 0x0D9E143E + .4byte 0x1BDB101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x10C016C0 + .4byte 0x27C04B80 + .4byte 0x8980EB00 + .4byte 0x02760666 + .4byte 0x0A960EF3 + .4byte 0x13AC1849 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10001200 + .4byte 0x1C003280 + .4byte 0x59C09600 + .4byte 0xEB0004EC + .4byte 0x08F50C96 + .4byte 0x0FCF12C6 + .4byte 0x1580101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x14002200 + .4byte 0x3CC06640 + .4byte 0x9FC0EB00 + .4byte 0x08000BAE + .4byte 0x0E001030 + .4byte 0x11CB1349 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10001680 + .4byte 0x28C04680 + .4byte 0x7100A780 + .4byte 0xEB000BB1 + .4byte 0x0E140F2D + .4byte 0x101810E5 + .4byte 0x1180101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x19802F80 + .4byte 0x4FC07A00 + .4byte 0xADC0EB00 + .4byte 0x10001000 + .4byte 0x10001000 + .4byte 0x10001000 + .4byte 0x10204060 + .4byte 0x80A0EB00 + .4byte 0x10002000 + .4byte 0x40006000 + .4byte 0x8000A000 ;# ptr + .4byte 0xEB0014EC + .4byte 0x11C21078 + .4byte 0x0FB60F2F + .4byte 0x0EB6101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x21003CC0 + .4byte 0x5FC08900 + .4byte 0xB780EB00 + .4byte 0x19D81333 + .4byte 0x10D20F6D + .4byte 0x0E5E0DA4 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10002500 + .4byte 0x430066C0 + .4byte 0x8F40BB40 + .4byte 0xEB001EC4 + .4byte 0x147A110F + .4byte 0x0F0C0DA1 + .4byte 0x0CB6101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x29004900 + .4byte 0x6D4094C0 + .4byte 0xBE80EB00 + .4byte 0x24001570 + .4byte 0x110F0EAA + .4byte 0x0D0F0BDB + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10002D40 + .4byte 0x4EC07300 + .4byte 0x9980C180 + .4byte 0xEB00293B + .4byte 0x163D110F + .4byte 0x0E300C7D + .4byte 0x0B24101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x31805440 + .4byte 0x78809DC0 + .4byte 0xC400EB00 + .4byte 0x2E27170A + .4byte 0x10D20DE7 + .4byte 0x0BEB0A80 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10003580 + .4byte 0x59807D40 + .4byte 0xA1C0C640 + .4byte 0xEB003362 + .4byte 0x175C10D2 + .4byte 0x0D6D0B6D + .4byte 0x09ED101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x39C05E40 + .4byte 0x8200A540 + .4byte 0xC840EB00 + .4byte 0x384E17AE + .4byte 0x10B40D0C + .4byte 0x0AF0096D + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10003DC0 + .4byte 0x62C08640 + .4byte 0xA880CA00 + .4byte 0xEB003D3B + .4byte 0x1800105A + .4byte 0x0CC30A72 + .4byte 0x0900101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x41C06740 + .4byte 0x8A00AB80 + .4byte 0xCB80EB00 + .4byte 0x41D81828 + .4byte 0x103C0C49 + .4byte 0x0A1F0892 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10004580 + .4byte 0x6B408DC0 + .4byte 0xAE00CD00 + .4byte 0xEB004676 + .4byte 0x18510FE1 + .4byte 0x0C0009B6 + .4byte 0x0836101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x49406F40 + .4byte 0x9100B080 + .4byte 0xCE40EB00 + .4byte 0x4AC4187A + .4byte 0x0FA50B9E + .4byte 0x096307DB + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10004CC0 + .4byte 0x73009440 + .4byte 0xB2C0CF80 + .4byte 0xEB004F13 + .4byte 0x18510F69 + .4byte 0x0B6D090F + .4byte 0x0780101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x50407640 + .4byte 0x9700B500 + .4byte 0xD0C0EB00 + .4byte 0x5313187A + .4byte 0x0F0F0B24 + .4byte 0x08BC0736 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10005380 + .4byte 0x79C099C0 + .4byte 0xB700D1C0 + .4byte 0xEB005713 + .4byte 0x18510EF0 + .4byte 0x0AC3087D + .4byte 0x06ED101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x56C07CC0 + .4byte 0x9C80B8C0 + .4byte 0xD2C0EB00 + .4byte 0x5B131828 + .4byte 0x0E960A92 + .4byte 0x082906B6 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10005A00 + .4byte 0x7FC09EC0 + .4byte 0xBA80D380 + .4byte 0xEB005EC4 + .4byte 0x18000E78 + .4byte 0x0A300800 + .4byte 0x066D101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x5D008280 + .4byte 0xA140BC00 + .4byte 0xD480EB00 + .4byte 0x627617D7 + .4byte 0x0E1E0A00 + .4byte 0x07C10636 + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10006000 + .4byte 0x8540A340 + .4byte 0xBD80D540 + .4byte 0xEB0065D8 + .4byte 0x17AE0DE1 + .4byte 0x09CF0782 + .4byte 0x0600101D + .4byte 0x365882B3 + .4byte 0xEB001000 + .4byte 0x62C087C0 + .4byte 0xA540BF00 + .4byte 0xD600EB00 + .4byte 0x693B1785 + .4byte 0x0DA50986 + .4byte 0x074305DB + .4byte 0x101D3658 + .4byte 0x82B3EB00 + .4byte 0x10006580 + .4byte 0x8A40A740 + .4byte 0xC040D680 + .4byte 0xEB000000 .global VINtscACPType1 VINtscACPType1: - .incbin "baserom.dol", 0x42C708, 0x1C + .4byte 0x36000000 + .4byte 0 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F600000 + .4byte 0 + .4byte 0 .global VINtscACPType2 VINtscACPType2: - .incbin "baserom.dol", 0x42C724, 0x1C + .4byte 0x3E1D1125 + .4byte 0x11010700 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F60010A + .4byte 0x00050403 + .4byte 0xFF000000 .global VINtscACPType3 VINtscACPType3: - .incbin "baserom.dol", 0x42C740, 0x1C + .4byte 0x3E171521 + .4byte 0x15050502 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F60010A + .4byte 0x00050403 + .4byte 0xFF000000 .global VIPalACPType1 VIPalACPType1: - .incbin "baserom.dol", 0x42C75C, 0x1C + .4byte 0x361A222A + .4byte 0x22050200 + .4byte 0x1C3D1403 + .4byte 0xFE0154FE + .4byte 0x7E600008 + .4byte 0x00040701 + .4byte 0x55010000 .global VIPalACPType2 VIPalACPType2: - .incbin "baserom.dol", 0x42C778, 0x1C + .4byte 0x361A222A + .4byte 0x22050200 + .4byte 0x1C3D1403 + .4byte 0xFE0154FE + .4byte 0x7E600008 + .4byte 0x00040701 + .4byte 0x55010000 .global VIPalACPType3 VIPalACPType3: - .incbin "baserom.dol", 0x42C794, 0x1C + .4byte 0x361A222A + .4byte 0x22050200 + .4byte 0x1C3D1403 + .4byte 0xFE0154FE + .4byte 0x7E600008 + .4byte 0x00040701 + .4byte 0x55010000 .global VIEurgb60ACPType1 VIEurgb60ACPType1: - .incbin "baserom.dol", 0x42C7B0, 0x1C + .4byte 0x36000000 + .4byte 0 + .4byte 0x1B1B2407 + .4byte 0xF800001E + .4byte 0x1E600000 + .4byte 0 + .4byte 0x00010000 .global VIEurgb60ACPType2 VIEurgb60ACPType2: - .incbin "baserom.dol", 0x42C7CC, 0x1C + .4byte 0x361D1125 + .4byte 0x11010700 + .4byte 0x1B1B2407 + .4byte 0xF800001E + .4byte 0x1E60010A + .4byte 0x00050403 + .4byte 0xFF010000 .global VIEurgb60ACPType3 VIEurgb60ACPType3: - .incbin "baserom.dol", 0x42C7E8, 0x1C + .4byte 0x36171521 + .4byte 0x15050502 + .4byte 0x1B1B2407 + .4byte 0xF800001E + .4byte 0x1E60010A + .4byte 0x00050403 + .4byte 0xFF010000 .global VIMpalACPType1 VIMpalACPType1: - .incbin "baserom.dol", 0x42C804, 0x1C + .4byte 0x36000000 + .4byte 0 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F600000 + .4byte 0 + .4byte 0 .global VIMpalACPType2 VIMpalACPType2: - .incbin "baserom.dol", 0x42C820, 0x1C + .4byte 0x361D1125 + .4byte 0x11010700 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F60010A + .4byte 0x00050403 + .4byte 0xFF000000 .global VIMpalACPType3 VIMpalACPType3: - .incbin "baserom.dol", 0x42C83C, 0x1C + .4byte 0x36171521 + .4byte 0x15050502 + .4byte 0x1B1B2407 + .4byte 0xF800000F + .4byte 0x0F60010A + .4byte 0x00050403 + .4byte 0xFF000000 .global VIProgressiveACPType VIProgressiveACPType: - .incbin "baserom.dol", 0x42C858, 0x1C + .4byte 0x01000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$23404 $$23404: - .incbin "baserom.dol", 0x42C874, 0xC + .asciz "vi3in1.c" + .balign 4 .global $$23405 $$23405: - .incbin "baserom.dol", 0x42C880, 0x80 + .asciz "VISetCGMS(): Tried to set APS Trigger bit(WORD2[3:2]) \nwhen the scan is progressive in DTV mode, which is forbidden\n" + .balign 4 + .4byte 0 + .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __tvType __tvType: - .incbin "baserom.dol", 0x492930, 0x4 + .4byte 0x000000FF .global __wd0 __wd0: - .incbin "baserom.dol", 0x492934, 0x1 + .byte 0xFF .global __wd1 __wd1: - .incbin "baserom.dol", 0x492935, 0x1 + .byte 0xFF .global __wd2 __wd2: - .incbin "baserom.dol", 0x492936, 0x1 + .byte 0xFF .global __gp1 __gp1: - .incbin "baserom.dol", 0x492937, 0x1 + .byte 0xFF .global __gp2 __gp2: - .incbin "baserom.dol", 0x492938, 0x1 + .byte 0xFF .global __gp3 __gp3: - .incbin "baserom.dol", 0x492939, 0x1 + .byte 0xFF .global __gp4 __gp4: - .incbin "baserom.dol", 0x49293A, 0x1 + .byte 0xFF .global __cc1 __cc1: - .incbin "baserom.dol", 0x49293B, 0x1 + .byte 0xFF .global __cc2 __cc2: - .incbin "baserom.dol", 0x49293C, 0x1 + .byte 0xFF .global __cc3 __cc3: - .incbin "baserom.dol", 0x49293D, 0x1 + .byte 0xFF .global __cc4 __cc4: - .incbin "baserom.dol", 0x49293E, 0x1 + .byte 0xFF .global __filter __filter: - .incbin "baserom.dol", 0x49293F, 0x1 + .byte 0xFF .section .bss, "wa" # 0x80496700 - 0x805643FC .global VIZeroACPType diff --git a/asm/wenc/wenc.s b/asm/wenc/wenc.s index 7ba2812a..ef6aae6e 100644 --- a/asm/wenc/wenc.s +++ b/asm/wenc/wenc.s @@ -204,9 +204,25 @@ lbl_8004D718: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21993 $$21993: - .incbin "baserom.dol", 0x403DA8, 0x40 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FF33000 + .4byte 0 + .4byte 0x3FF99000 + .4byte 0 + .4byte 0x40000000 + .4byte 0 + .4byte 0x40033000 + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22084 $$22084: - .incbin "baserom.dol", 0x499280, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/wpad/WPAD.s b/asm/wpad/WPAD.s index f9b20edb..eff51f4e 100644 --- a/asm/wpad/WPAD.s +++ b/asm/wpad/WPAD.s @@ -12052,79 +12052,210 @@ lbl_8005EC6C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global certn certn: - .incbin "baserom.dol", 0x403DE8, 0x48 + .4byte 0x00000010 + .4byte 0xA3DC5F11 + .4byte 0x1B2EC797 + .4byte 0xAC9657B8 + .4byte 0xCBEB788D + .4byte 0x991EF8B8 + .4byte 0x70CAA54E + .4byte 0x071CE896 + .4byte 0x63252CD0 + .4byte 0xFD8B6316 + .4byte 0x9E835020 + .4byte 0xBF9ED1EF + .4byte 0x0F870932 + .4byte 0xBC88B819 + .4byte 0xAF2C02E5 + .4byte 0x657BBFB9 + .4byte 0x81194F1C + .4byte 0 .global certv certv: - .incbin "baserom.dol", 0x403E30, 0x48 + .4byte 0x00000010 + .4byte 0x99D2071A + .4byte 0x8D823A01 + .4byte 0x4C50A978 + .4byte 0xD8A5BFFF + .4byte 0x4CAF5CE8 + .4byte 0x13A71CBA + .4byte 0x6FCFF21B + .4byte 0x8C5399BF + .4byte 0x8896982D + .4byte 0xCB6EC891 + .4byte 0x6BA136DA + .4byte 0x25B8F224 + .4byte 0x8F0F42C0 + .4byte 0x15EA9941 + .4byte 0xFDD1903E + .4byte 0x1AF308B6 + .4byte 0 .global $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg1 $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg1: - .incbin "baserom.dol", 0x403E78, 0x30 + .4byte 0x02000071 + .4byte 0x01006400 + .4byte 0xFE020000 + .4byte 0x71010096 + .4byte 0x00B40200 + .4byte 0x00710100 + .4byte 0xAA006402 + .4byte 0x00007101 + .4byte 0x00C80036 + .4byte 0x07000071 + .4byte 0x01007200 + .4byte 0x20000000 .global $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg2$$20 $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg2$$20: - .incbin "baserom.dol", 0x403EA8, 0x10 + .4byte 0xFD05B304 + .4byte 0x63033503 + .4byte 0x1F030000 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21504 $$21504: - .incbin "baserom.dol", 0x434688, 0x48 + .asciz "<< RVL_SDK - WPAD \trelease build: Aug 23 2010 19:49:06 (0x4302_145) >>" + .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .incbin "baserom.dol", 0x4346D0, 0x10 + .4byte 0x80053EA0 ;# ptr + .4byte 0x0000007F + .4byte 0 + .4byte 0 .global $$26806 $$26806: - .incbin "baserom.dol", 0x4346E0, 0x48 + .4byte 0x80054354 ;# ptr + .4byte 0x80054354 ;# ptr + .4byte 0x80054354 ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x8005438C ;# ptr + .4byte 0x8005436C ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x8005437C ;# ptr + .4byte 0x80054384 ;# ptr + .4byte 0x8005439C ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x80054394 ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x8005435C ;# ptr + .4byte 0x80054364 ;# ptr + .4byte 0x80054374 ;# ptr .global $$27538 $$27538: - .incbin "baserom.dol", 0x434728, 0x48 + .4byte 0x80054734 ;# ptr + .4byte 0x80054734 ;# ptr + .4byte 0x80054734 ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x800550CC ;# ptr + .4byte 0x80054A48 ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x80054B48 ;# ptr + .4byte 0x80054C84 ;# ptr + .4byte 0x800550CC ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x80054CA8 ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x800548AC ;# ptr + .4byte 0x800550CC ;# ptr + .4byte 0x80054AC0 ;# ptr .global $$28163 $$28163: - .incbin "baserom.dol", 0x434770, 0x14 + .asciz "Nintendo RVL-WBC" + .balign 4 .global $$28218 $$28218: - .incbin "baserom.dol", 0x434784, 0x14 + .asciz "Nintendo RVL-CNT" + .balign 4 .global $$28277 $$28277: - .incbin "baserom.dol", 0x434798, 0x34 + .asciz "WARNING: Overwritten the callback needed by KPAD.\n" + .balign 4 .global $$28278 $$28278: - .incbin "baserom.dol", 0x4347CC, 0x54 + .asciz " Please call KPADSetSamplingCallback instead of WPADSetSamplingCallback.\n" + .balign 4 .global $$28284 $$28284: - .incbin "baserom.dol", 0x434820, 0x50 + .asciz " Please call KPADSetConnectCallback instead of WPADSetConnectCallback.\n" .global $$29104 $$29104: - .incbin "baserom.dol", 0x434870, 0x24 + .4byte 0x8005C91C ;# ptr + .4byte 0x8005B864 ;# ptr + .4byte 0x8005C1B0 ;# ptr + .4byte 0x8005C394 ;# ptr + .4byte 0x8005C554 ;# ptr + .4byte 0x8005C570 ;# ptr + .4byte 0x8005C754 ;# ptr + .4byte 0x8005C910 ;# ptr + .4byte 0x8005C914 ;# ptr .global $$29220 $$29220: - .incbin "baserom.dol", 0x434894, 0x54 + .4byte 0x8005CE38 ;# ptr + .4byte 0x8005CE44 ;# ptr + .4byte 0x8005CE50 ;# ptr + .4byte 0x8005CE5C ;# ptr + .4byte 0x8005CE68 ;# ptr + .4byte 0x8005CE74 ;# ptr + .4byte 0x8005CE80 ;# ptr + .4byte 0x8005CE8C ;# ptr + .4byte 0x8005CE98 ;# ptr + .4byte 0x8005CEA4 ;# ptr + .4byte 0x8005CEB0 ;# ptr + .4byte 0x8005CEBC ;# ptr + .4byte 0x8005CEF8 ;# ptr + .4byte 0x8005CF04 ;# ptr + .4byte 0x8005CF24 ;# ptr + .4byte 0x8005CEC8 ;# ptr + .4byte 0x8005CF1C ;# ptr + .4byte 0x8005CF10 ;# ptr + .4byte 0x8005CED4 ;# ptr + .4byte 0x8005CEE0 ;# ptr + .4byte 0x8005CEEC ;# ptr .global $$29559 $$29559: - .incbin "baserom.dol", 0x4348E8, 0x30 + .4byte 0x8005E01C ;# ptr + .4byte 0x8005E1A0 ;# ptr + .4byte 0x8005E3AC ;# ptr + .4byte 0x8005E5F0 ;# ptr + .4byte 0x8005E77C ;# ptr + .4byte 0x8005E900 ;# ptr + .4byte 0x8005EB74 ;# ptr + .4byte 0x8005EB7C ;# ptr + .4byte 0x8005EBCC ;# ptr + .4byte 0x8005EBD4 ;# ptr + .4byte 0x8005EC00 ;# ptr + .4byte 0x8005EC08 ;# ptr .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __WPADVersion __WPADVersion: - .incbin "baserom.dol", 0x492BC0, 0x4 + .4byte 0x80438588 .global _wpadOnReconnect _wpadOnReconnect: - .incbin "baserom.dol", 0x492BC4, 0x4 + .4byte 0xFFFFFFFF .global _wpad_diff_count_threshold _wpad_diff_count_threshold: - .incbin "baserom.dol", 0x492BC8, 0x8 + .4byte 0x00060004 + .4byte 0x0006000C .global _wpad_hyst_count_threshold _wpad_hyst_count_threshold: - .incbin "baserom.dol", 0x492BD0, 0x8 + .4byte 0x001E001E + .4byte 0x001E001E .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22723 $$22723: - .incbin "baserom.dol", 0x499288, 0x4 + .4byte 0x0000D007 .global lbl_8055E74C lbl_8055E74C: - .incbin "baserom.dol", 0x49928C, 0x2 + .byte 0x40, 0x0C .global lbl_8055E74E lbl_8055E74E: - .incbin "baserom.dol", 0x49928E, 0x2 + .byte 0x0E, 0x00 .section .bss, "wa" # 0x80496700 - 0x805643FC .global _wpadManageAlarm diff --git a/asm/wpad/WPADEncrypt.s b/asm/wpad/WPADEncrypt.s index c6cbb2fa..1605767d 100644 --- a/asm/wpad/WPADEncrypt.s +++ b/asm/wpad/WPADEncrypt.s @@ -963,16 +963,1188 @@ lbl_80064D9C: .section .data, "wa" # 0x80421040 - 0x80496700 .global base base: - .incbin "baserom.dol", 0x434A18, 0x30 + .4byte 0xA877A6E0 + .4byte 0xF7435A35 + .4byte 0x85E27297 + .4byte 0x8FB71A62 + .4byte 0x87380D67 + .4byte 0xC7BE4F3E + .4byte 0x2076378F + .4byte 0x68B7A926 + .4byte 0x3F2B10E3 + .4byte 0x307E900E + .4byte 0x850A0000 + .4byte 0 .global tb tb: - .incbin "baserom.dol", 0x434A48, 0x900 + .4byte 0x70510386 + .4byte 0x400D4FEB + .4byte 0x3ECCD187 + .4byte 0x35BDF50B + .4byte 0x5ED0F8F2 + .4byte 0xD5E26C31 + .4byte 0x0CADFC21 + .4byte 0xC378C106 + .4byte 0xC24C55E6 + .4byte 0x4A344811 + .4byte 0x1EDAE71A + .4byte 0x84A096A7 + .4byte 0xE37FAF63 + .4byte 0x9CFA235B + .4byte 0x79C89EBA + .4byte 0xB2C92212 + .4byte 0x4BB3A1B6 + .4byte 0x3249A2E1 + .4byte 0x89391066 + .4byte 0xC5078F54 + .4byte 0xEA91CA3F + .4byte 0xF919F0D7 + .4byte 0x46BC281B + .4byte 0x61E82F6A + .4byte 0xAE9DF64E + .4byte 0x0914774D + .4byte 0xDB1F2E7B + .4byte 0x7CF143A3 + .4byte 0x00B8138C + .4byte 0x85B92975 + .4byte 0x88FDD256 + .4byte 0x1C509741 + .4byte 0xE53B60B5 + .4byte 0xC064EE98 + .4byte 0xD62D25A4 + .4byte 0xAACD7DA8 + .4byte 0x83C6ABBE + .4byte 0x4499263C + .4byte 0xCE9FBFD3 + .4byte 0xCB767A7E + .4byte 0x82018A9A + .4byte 0x801D0EB0 ;# ptr + .4byte 0x5CD43862 + .4byte 0xF430E08E + .4byte 0x53B70257 + .4byte 0xACA6520A + .4byte 0x6D926517 + .4byte 0x24334572 + .4byte 0x74B1B4F7 + .4byte 0x5DED2CFF + .4byte 0x47375A90 + .4byte 0xBBDF2A16 + .4byte 0x5995D9C4 + .4byte 0x276773C7 + .4byte 0x68FEA5DD + .4byte 0x6B5F93D8 + .4byte 0xEC053A8D + .4byte 0x6EFB3DA9 + .4byte 0x6936F394 + .4byte 0xDEEF156F + .4byte 0x8B9B080F + .4byte 0xDC811820 + .4byte 0x04E471CF + .4byte 0xE92B4258 + .4byte 0x01A0A962 + .4byte 0xD63F85A7 + .4byte 0xB6D4FA15 + .4byte 0x661709BD + .4byte 0x5D143426 + .4byte 0x59729154 + .4byte 0x064FF8B0 + .4byte 0x5B749399 + .4byte 0x8CF245CD + .4byte 0xEA4EAD10 + .4byte 0x4AE5CAEE + .4byte 0xDFC66F9F + .4byte 0x888E02CC + .4byte 0x08A87794 + .4byte 0x6D21B128 + .4byte 0xE4397996 + .4byte 0x60718116 + .4byte 0x2EE678B9 + .4byte 0xC4469A42 + .4byte 0xAEB77C43 + .4byte 0xB3221A86 + .4byte 0xC2323D2D + .4byte 0x9CD229E9 + .4byte 0x639BD131 + .4byte 0x385E1E36 + .4byte 0x41BB0318 + .4byte 0x2B3EBF68 + .4byte 0x61FC52C0 + .4byte 0xDEE00A58 + .4byte 0x135A00BE + .4byte 0x1C900E53 + .4byte 0x12FDE26E + .4byte 0xBACE2427 + .4byte 0x447F87A3 + .4byte 0xA1D55040 + .4byte 0xE3F983F7 + .4byte 0xC7A235C8 + .4byte 0xDB19AB2F + .4byte 0x1125ED33 + .4byte 0x9E55E148 + .4byte 0xAF7384DA + .4byte 0x2AAA51EB + .4byte 0x9D95B2CB + .4byte 0xE77080FE + .4byte 0x4C6504EF + .4byte 0xC5F1C33A + .4byte 0xB4F55F23 + .4byte 0x89DD30A5 + .4byte 0x8BD3F6DC + .4byte 0x4D64D7F0 + .4byte 0x8FEC5637 + .4byte 0x5CA40D07 + .4byte 0x768A2C0B + .4byte 0xB5D8C11F + .4byte 0xE83BF44B + .4byte 0x1B476C49 + .4byte 0x677B92CF + .4byte 0x757E20D9 + .4byte 0x7D3C977A + .4byte 0xD0056B0F + .4byte 0x1DFB8298 + .4byte 0x578DF36A + .4byte 0xBCACC9A6 + .4byte 0xFFB8690C + .4byte 0x4C4D7207 + .4byte 0x5A49338D + .4byte 0xA2AB463D + .4byte 0x630DA097 + .4byte 0xFFF0F5FA + .4byte 0xC0E9DB62 + .4byte 0xE4E17443 + .4byte 0xDC861829 + .4byte 0x37F406E2 + .4byte 0xED6F9048 + .4byte 0x1E2D1DEA + .4byte 0x739454DF + .4byte 0x25F64727 + .4byte 0xD91177C9 + .4byte 0x841C5B5C + .4byte 0x5181A622 + .4byte 0x3E2496C8 + .4byte 0x8AEC827C + .4byte 0x09B8454A + .4byte 0x57BB2F50 + .4byte 0x758E6170 + .4byte 0x8C6CAFD0 + .4byte 0xFDB41BAE + .4byte 0xDEFE3BB5 + .4byte 0x36BD5501 + .4byte 0x0E9C4156 + .4byte 0x5FB32603 + .4byte 0x83BA134B + .4byte 0xCAC50AF8 + .4byte 0x60A5B9C7 + .4byte 0xC39832FB + .4byte 0x12F9A792 + .4byte 0xAA68F378 + .4byte 0x7E052021 + .4byte 0x02E8BFF2 + .4byte 0xB0598FD2 + .4byte 0xCB876515 + .4byte 0xF11AB230 + .4byte 0xADEE58A3 + .4byte 0x8B661F2C + .4byte 0xD75D1985 + .4byte 0xA8E6D36B + .4byte 0xA10C9193 + .4byte 0x6A5E0B79 + .4byte 0xE3DD004F + .4byte 0x3C896E71 + .4byte 0x69A9AC40 + .4byte 0xE59928C6 + .4byte 0x314E7ACD + .4byte 0x089E7DEF + .4byte 0x17FC88D8 + .4byte 0xA46D4495 + .4byte 0xD1B7D49B + .4byte 0xBE2A3464 + .4byte 0x2BCF2EEB + .4byte 0x38CE23E0 + .4byte 0x3A3FF77B + .4byte 0x9F1053BC + .4byte 0x526716E7 + .4byte 0x807604C4 + .4byte 0xB6C1C27F + .4byte 0x9ADAD539 + .4byte 0x42149DB1 + .4byte 0x0F35D6CC + .4byte 0xB9DA380C + .4byte 0xA29C091F + .4byte 0x06B1B6FD + .4byte 0x1A692330 + .4byte 0xC4DE01D1 + .4byte 0xF4582937 + .4byte 0x1C7DD5BF + .4byte 0xFFBDC8C9 + .4byte 0xCF65BE7B + .4byte 0x78979867 + .4byte 0x08B32657 + .4byte 0xF7FA40AD + .4byte 0x8E75A67C + .4byte 0xDB918B51 + .4byte 0x99D4177A + .4byte 0x908DCE63 + .4byte 0xCB4EA0AB + .4byte 0x183A5B50 + .4byte 0x7F2174C1 + .4byte 0xBBB8B7BA + .4byte 0x0B359531 + .4byte 0x599A4D04 + .4byte 0x071E5A76 + .4byte 0x13F37183 + .4byte 0xF08603A8 + .4byte 0x3942AA28 + .4byte 0xE6E4D85D + .4byte 0xD3D06E6F + .4byte 0x96FB5EBC + .4byte 0x56C25F85 + .4byte 0x9BE7AFD2 + .4byte 0x3B846AA7 + .4byte 0x53C54449 + .4byte 0xA5F93672 + .4byte 0x3D2CD91B + .4byte 0xA1F54F93 + .4byte 0x9D684741 + .4byte 0x16CA2A4C + .4byte 0xA387D6E5 + .4byte 0x192E7715 + .4byte 0x6D70C0DF + .4byte 0xB20046ED + .4byte 0xC66C4360 + .4byte 0x922DA922 + .4byte 0x458F3455 + .4byte 0xAEA40A66 + .4byte 0x32E0DC02 + .4byte 0xACE8208C + .4byte 0x89624AFE + .4byte 0xEEC3E33C + .4byte 0xF17905E9 + .4byte 0xF62733CC + .4byte 0xF29E1181 + .4byte 0x7E80108A + .4byte 0x829F480D + .4byte 0xD7B4FC2F + .4byte 0xB5C7DD88 + .4byte 0x146B2B54 + .4byte 0xEA1D945C + .4byte 0xB0EF1224 + .4byte 0xCDEBE1E2 + .4byte 0x64733F0E + .4byte 0x5261253E + .4byte 0xF80F4BEC + .4byte 0xC00030F6 + .4byte 0x02493D10 + .4byte 0x6E20C9A6 + .4byte 0x2FFE2C2B + .4byte 0x752E4526 + .4byte 0xAB48A980 + .4byte 0xFC04CCD3 + .4byte 0xB5BAA338 + .4byte 0x317D01D9 + .4byte 0xA77B96B6 + .4byte 0x63694EF7 + .4byte 0xDEE078CA + .4byte 0x50AA4191 + .4byte 0x6588E421 + .4byte 0x85DA3A27 + .4byte 0xBE1C3E42 + .4byte 0x5E17527F + .4byte 0x1F89246F + .4byte 0x8F5C6774 + .4byte 0x0E12878D + .4byte 0xE934ED73 + .4byte 0xC4F8615B + .4byte 0x05DF594C + .4byte 0x97798318 + .4byte 0xA45595EB + .4byte 0xBD53F5F1 + .4byte 0x5766469F + .4byte 0xB2810951 + .4byte 0x862216DD + .4byte 0x23937629 + .4byte 0xC2D71DD4 + .4byte 0xBF363FEA + .4byte 0x4B1132B9 + .4byte 0x625460D6 + .4byte 0x6D439A0D + .4byte 0x929CB0EF + .4byte 0x586C9D77 + .4byte 0x2D70FAF3 + .4byte 0xB30BE240 + .4byte 0x7EF48AE5 + .4byte 0x8C3C5671 + .4byte 0xD164E182 + .4byte 0x0ACB1315 + .4byte 0x90EC0399 + .4byte 0xAF145D0F + .4byte 0x334A94A5 + .4byte 0xA8351BE3 + .4byte 0x6AC628FF + .4byte 0x4DE72584 + .4byte 0xAC08AEC5 + .4byte 0xA22AB837 + .4byte 0x0C7AA0C3 + .4byte 0xCEAD061A + .4byte 0x9E8BFBD5 + .4byte 0xF0C11ED0 + .4byte 0xB49BB144 + .4byte 0xF247C768 + .4byte 0xCF72BB4F + .4byte 0x5AF9DC6B + .4byte 0xDBD2E87C + .4byte 0xC8EE98A1 + .4byte 0xE6D83907 + .4byte 0x5FFD8E19 + .4byte 0xB73BBCCD + .4byte 0x7CE38173 + .4byte 0xB211BF6F + .4byte 0x2098FE75 + .4byte 0x96EF6CDA + .4byte 0x50E10972 + .4byte 0x5445BA34 + .4byte 0x805BED3E + .4byte 0x532C87A4 + .4byte 0x57F3333F + .4byte 0x3CB767B4 + .4byte 0xA325604F + .4byte 0x076B1B47 + .4byte 0x150FE40A + .4byte 0xEAD13278 + .4byte 0x36498D4B + .4byte 0xD2BCA5DC + .4byte 0x1D0D4DCD + .4byte 0x9A825FFC + .4byte 0x9465BEE2 + .4byte 0xF4C91E44 + .4byte 0xCB9E0C64 + .4byte 0x712663B3 + .4byte 0x14E84070 + .4byte 0x8A0E1942 + .4byte 0x6DAC8810 + .4byte 0x5CDF41A9 + .4byte 0xADE5FB74 + .4byte 0xCCD5068E + .4byte 0x5986CE1F + .4byte 0x3D76E08F + .4byte 0xB977277B + .4byte 0xA6D829D3 + .4byte 0xECB813F7 + .4byte 0xFAC3516A + .4byte 0xDE4A5AEB + .4byte 0xC28B2348 + .4byte 0x92CF62A8 + .4byte 0x99F8D02E + .4byte 0x856143C8 + .4byte 0xBDF00593 + .4byte 0xCA4EF17D + .4byte 0x30FDC469 + .4byte 0x662F08B1 + .4byte 0x52F921E6 + .4byte 0x7A2BDD39 + .4byte 0x84FFC091 + .4byte 0xD637D47F + .4byte 0x2D9B5DA1 + .4byte 0x3B6EB5C5 + .4byte 0x4604F590 + .4byte 0xEE7E831C + .4byte 0x0356B6AA + .4byte 0x00170135 + .4byte 0x55790B12 + .4byte 0xBB1A31E7 + .4byte 0x022816C1 + .4byte 0xF6A2DB18 + .4byte 0x9C896838 + .4byte 0x97ABC72A + .4byte 0xD73AF2C6 + .4byte 0x244CB058 + .4byte 0xA0225E9D + .4byte 0xD9A7E9AE + .4byte 0xAF8C959F + .4byte 0x28B720D7 + .4byte 0xB030C309 + .4byte 0x19C067D6 + .4byte 0x003C7EE7 + .4byte 0xE9F4085A + .4byte 0xF8B82E05 + .4byte 0xA6259E5C + .4byte 0xD8150DE1 + .4byte 0xF611546B + .4byte 0xCD214666 + .4byte 0x5E84AD06 + .4byte 0x382944C5 + .4byte 0xA2CEF1AA + .4byte 0xC1407186 + .4byte 0xB5EFFC36 + .4byte 0xA8CB0A48 + .4byte 0x274564A3 + .4byte 0xAF8CB2C6 + .4byte 0x9F0789DC + .4byte 0x17D34979 + .4byte 0xFBFE1DD0 + .4byte 0xB9884352 + .4byte 0xBC01782B + .4byte 0x7D94C70E + .4byte 0xDEA5D59B + .4byte 0xCCF7617A + .4byte 0xC2748139 + .4byte 0x03AB96A0 + .4byte 0x37BD2D72 + .4byte 0x753FC9D4 + .4byte 0x8E6FF98D + .4byte 0xED62DB1C + .4byte 0xDF04AC1B + .4byte 0x6C144B63 + .4byte 0xF0BFB482 + .4byte 0xEC7B1A59 + .4byte 0x92D21060 + .4byte 0xB63D5FE6 + .4byte 0x806E70C4 + .4byte 0xF235D97C + .4byte 0xEEE541A4 + .4byte 0x5B50DDBB + .4byte 0x4CF31F9D + .4byte 0x5D575551 + .4byte 0x97E35842 + .4byte 0x4D9C73BA + .4byte 0xC8773169 + .4byte 0x26AEEA8A + .4byte 0xDA22B387 + .4byte 0x56FA930B + .4byte 0x341633E8 + .4byte 0xE453BEA9 + .4byte 0xB13A3EF5 + .4byte 0x906ACF3B + .4byte 0x12FD8F9A + .4byte 0xA7479199 + .4byte 0xEB0F24FF + .4byte 0x2318854E + .4byte 0x7F0CE0A1 + .4byte 0xE2D12C2A + .4byte 0x4A024F1E + .4byte 0x95688B98 + .4byte 0x836D76CA + .4byte 0x6532132F + .4byte 0xC3829AA4 + .4byte 0xBA816037 + .4byte 0x3435FC80 + .4byte 0xA8516567 + .4byte 0xED305F10 + .4byte 0xD34A272F + .4byte 0x13B92AD2 + .4byte 0xCCE1EFAE + .4byte 0xEBBEF4BD + .4byte 0xCF43B3C5 + .4byte 0x8884B7DD + .4byte 0x3940CE48 + .4byte 0x6D9B7261 + .4byte 0x7EE7A14E + .4byte 0x532E773B + .4byte 0xE2C93622 + .4byte 0x1B6E73B1 + .4byte 0x03B24C87 + .4byte 0xA9D44D0F + .4byte 0xD8156CAA + .4byte 0x18F64957 + .4byte 0x5DFB7A14 + .4byte 0x9463A011 + .4byte 0xB09EDE05 + .4byte 0x46C8EE47 + .4byte 0xDBDC2489 + .4byte 0x9C919729 + .4byte 0xE97BC107 + .4byte 0x1EB8FDFE + .4byte 0xACC66298 + .4byte 0x4FF179E0 + .4byte 0xE86B7856 + .4byte 0xB68D0450 + .4byte 0x86CA6F20 + .4byte 0xE6EAE576 + .4byte 0x171C747F + .4byte 0xBC0D2C85 + .4byte 0xF76696E4 + .4byte 0x8B753F4B + .4byte 0xD938AF7C + .4byte 0xDA0B832D + .4byte 0x3132A2F5 + .4byte 0x1D594145 + .4byte 0xBF3C1FF8 + .4byte 0xF98AD016 + .4byte 0x25691299 + .4byte 0x9D2195AB + .4byte 0x01A6D7B5 + .4byte 0xC07DFF58 + .4byte 0x0E3A92D1 + .4byte 0x55E3089F + .4byte 0xD63E528E + .4byte 0xFAA3C702 + .4byte 0xCDDF8F64 + .4byte 0x198CF3A7 + .4byte 0x0C5E0A6A + .4byte 0x09F0935B + .4byte 0x42C20623 + .4byte 0xEC71ADB4 + .4byte 0xCBBB7028 + .4byte 0xD51A5C33 + .4byte 0x685A0044 + .4byte 0x90A5C426 + .4byte 0x3D2BF254 + .4byte 0x96ADDA1F + .4byte 0xED33E181 + .4byte 0x69080D0A + .4byte 0xDB35779A + .4byte 0x64D1FC78 + .4byte 0xAA1BD067 + .4byte 0xA0DDFA6C + .4byte 0x63710584 + .4byte 0x176A894F + .4byte 0x667FC650 + .4byte 0x55926FBD + .4byte 0xE7D24072 + .4byte 0x8DBBEC06 + .4byte 0x428AE488 + .4byte 0x9D7E7A82 + .4byte 0x2713411A + .4byte 0xAFC8A476 + .4byte 0xB4C2FE6D + .4byte 0x1CD96130 + .4byte 0xB37CEAF7 + .4byte 0x290FF23B + .4byte 0x51C1DE5F + .4byte 0xE52A2F99 + .4byte 0x0B5DA32B + .4byte 0x4AAB95A5 + .4byte 0xD35856EE + .4byte 0x283100CC + .4byte 0x1546CAE6 + .4byte 0x86383C65 + .4byte 0xF5E39FD6 + .4byte 0x5B094983 + .4byte 0x702D53A9 + .4byte 0x7DE2C4AC + .4byte 0x8E5EB825 + .4byte 0xF4B957F3 + .4byte 0xF16847B2 + .4byte 0xA25920CE + .4byte 0x34795C90 + .4byte 0x0E1EBED5 + .4byte 0x2223B1C9 + .4byte 0x1862162E + .4byte 0x913E078F + .4byte 0xD83F933D + .4byte 0xD49BDF85 + .4byte 0x21FB1174 + .4byte 0x97C7D7DC + .4byte 0x4C194598 + .4byte 0xE943024B + .4byte 0xBCC3049C + .4byte 0x6BF07552 + .4byte 0xA726F6C5 + .4byte 0xBACFB0B7 + .4byte 0xAE5AA1BF + .4byte 0x038B8012 + .4byte 0x6E0CEBF9 + .4byte 0xC04424EF + .4byte 0x10F8A88C + .4byte 0xE87BFF9E + .4byte 0x2CCD6036 + .4byte 0x87B594A6 + .4byte 0x54733A14 + .4byte 0x4E011DB6 + .4byte 0xFD37484D + .4byte 0x39CBE032 .global base3 base3: - .incbin "baserom.dol", 0x435348, 0x30 + .4byte 0x5429284E + .4byte 0x0FFCA46C + .4byte 0x8750493C + .4byte 0xF2B4B1F9 + .4byte 0xC3582E83 + .4byte 0x5F718A9B + .4byte 0x82CAC2BE + .4byte 0xBA759160 + .4byte 0x78A82A4C + .4byte 0x255B8BB0 + .4byte 0xDAAF0000 + .4byte 0 .global tb3 tb3: - .incbin "baserom.dol", 0x435378, 0x900 + .4byte 0xA4383369 + .4byte 0xD4F56AA8 + .4byte 0xD7EC74A6 + .4byte 0x7BC73C41 + .4byte 0xB721984A + .4byte 0x8DC828F3 + .4byte 0xF83291AB + .4byte 0xAD348630 + .4byte 0x4CBCFFCE + .4byte 0x141E2EF9 + .4byte 0x31598587 + .4byte 0xFCC2FD3E + .4byte 0xBB56888B + .4byte 0xBF476192 + .4byte 0xB1947A51 + .4byte 0x9C8FB049 + .4byte 0x9BB90536 + .4byte 0x103BD5D3 + .4byte 0x0C96CB79 + .4byte 0x604EA2B5 + .4byte 0xD1EE17BA + .4byte 0x1F097893 + .4byte 0xB4353A9D + .4byte 0x1D39C93F + .4byte 0x7C2FCA0B + .4byte 0x37E61BD0 + .4byte 0x67D91884 + .4byte 0xE1425A7E + .4byte 0xB897DF54 + .4byte 0x70036EDB + .4byte 0x63AE555D + .4byte 0xC44B89CC + .4byte 0x13B390F6 + .4byte 0xE9B2A3BE + .4byte 0x2D197323 + .4byte 0x207F4002 + .4byte 0x9EC36B1A + .4byte 0x52DA2980 + .4byte 0x0D5FD68E + .4byte 0x0E22E36D + .4byte 0xDC5875E0 + .4byte 0x010A2650 + .4byte 0x08A9FE4D + .4byte 0x15F76CCF + .4byte 0x4FF0645E + .4byte 0xC6688AAC + .4byte 0xDEB64866 + .4byte 0xED6F7145 + .4byte 0x3DEB9F04 + .4byte 0x255CBD65 + .4byte 0xDD53CD24 + .4byte 0xEF72E89A + .4byte 0xE716C100 + .4byte 0x772C7DA5 + .4byte 0x2A446227 + .4byte 0xF4C0071C + .4byte 0x5B998257 + .4byte 0x06FAFB12 + .4byte 0xAFA7D2AA + .4byte 0x2B8CF2D8 + .4byte 0x83A07611 + .4byte 0xC5438146 + .4byte 0xE5F1EA95 + .4byte 0xE2E40FA1 + .4byte 0x2BD2A58E + .4byte 0x26090FF7 + .4byte 0x455B3CFD + .4byte 0x8C7222BF + .4byte 0xCADAE7AF + .4byte 0x16B25E8A + .4byte 0x6F94B7D6 + .4byte 0x1CB1294C + .4byte 0xB543189C + .4byte 0x31CEB684 + .4byte 0x71607F2A + .4byte 0x6E35F8A6 + .4byte 0x54EA7488 + .4byte 0xAC03191B + .4byte 0x3D79FCEE + .4byte 0x429F93DB + .4byte 0x80AD8B15 + .4byte 0x415D48CD + .4byte 0x7CA32C32 + .4byte 0x1F63D1ED + .4byte 0x4F04661E + .4byte 0x469BBB38 + .4byte 0x067E95C8 + .4byte 0x5F4A516B + .4byte 0x97BE2E98 + .4byte 0xBDEC0E05 + .4byte 0x0AA00152 + .4byte 0x85C0D83B + .4byte 0xFE1264E1 + .4byte 0xF3244BF5 + .4byte 0x497AE44E + .4byte 0x34250853 + .4byte 0x1AE3EF86 + .4byte 0xDFF191EB + .4byte 0xC6D9D383 + .4byte 0x141DB0A7 + .4byte 0x0B104089 + .4byte 0xB4D43A02 + .4byte 0x0CDD2F5A + .4byte 0x5628AE2D + .4byte 0x55F6C1D5 + .4byte 0xA844CF58 + .4byte 0x9DB323C5 + .4byte 0xA43E7D30 + .4byte 0x136A61D0 + .4byte 0xF03F67CB + .4byte 0x0DFF9268 + .4byte 0xE0816962 + .4byte 0xAB755911 + .4byte 0xF2C907E9 + .4byte 0xC7A1C278 + .4byte 0x33176CF9 + .4byte 0xC4B8B9DC + .4byte 0x2790BCFB + .4byte 0x70AAE896 + .4byte 0x7339F4C3 + .4byte 0x7787DE00 + .4byte 0xA29AE27B + .4byte 0xFA36656D + .4byte 0x20D7575C + .4byte 0x378F4D9E + .4byte 0x47A9E5CC + .4byte 0x998D7650 + .4byte 0xBAE68221 + .4byte 0xB00DEB75 + .4byte 0x6D22CEE7 + .4byte 0x632CDEE2 + .4byte 0xF545BA44 + .4byte 0x951FE539 + .4byte 0xD7A5B58D + .4byte 0x0793FDBC + .4byte 0x627E89B3 + .4byte 0x48597FD3 + .4byte 0xBED0F236 + .4byte 0x539FE6B1 + .4byte 0x82C094B8 + .4byte 0x2F03243C + .4byte 0x000A4265 + .4byte 0xE85C96D5 + .4byte 0xA990B985 + .4byte 0xE9EA0E16 + .4byte 0x7B84294E + .4byte 0x5E879D35 + .4byte 0x0686E1E0 + .4byte 0xE3ECEFC8 + .4byte 0x525F64E4 + .4byte 0x46305ACD + .4byte 0xEDD15181 + .4byte 0x0C3A66FE + .4byte 0x04671ED6 + .4byte 0xF78CBD33 + .4byte 0xB291D4A8 + .4byte 0x4A140B79 + .4byte 0x5888B6C1 + .4byte 0x1956F827 + .4byte 0xAC2399B4 + .4byte 0xC312F320 + .4byte 0x783449DC + .4byte 0xD805BB55 + .4byte 0x8A711121 + .4byte 0xC7DBF19B + .4byte 0xF69E17F9 + .4byte 0xFAFBA760 + .4byte 0x8E6E8BCA + .4byte 0x15ABDD3D + .4byte 0xA6C680C2 + .4byte 0xDA4C1D4F + .4byte 0x5D926998 + .4byte 0xA2329C2B + .4byte 0x6A411A6C + .4byte 0xA3C572AA + .4byte 0xCC6B105B + .4byte 0x4D572868 + .4byte 0xEE0940F0 + .4byte 0xAD262E2D + .4byte 0x9AA07ACB + .4byte 0x743E1B70 + .4byte 0xFC43C477 + .4byte 0x08B7CF1C + .4byte 0x7D180F13 + .4byte 0x25BF6101 + .4byte 0x37AED22A + .4byte 0x7C97AF3F + .4byte 0x50DF6FA1 + .4byte 0xA4FF38C9 + .4byte 0x838F5473 + .4byte 0x0247D931 + .4byte 0x763B4BF4 + .4byte 0x9C49C7B6 + .4byte 0x14215F52 + .4byte 0xF3B7D5F2 + .4byte 0x95A02554 + .4byte 0xD9E7B0BF + .4byte 0x691378F0 + .4byte 0x33E08C94 + .4byte 0xDBE6A7B5 + .4byte 0xECC263E3 + .4byte 0x18B94B74 + .4byte 0xE5018EB1 + .4byte 0x2735B43D + .4byte 0x26481FFA + .4byte 0xBB90D398 + .4byte 0xDFA43767 + .4byte 0x5D80D262 + .4byte 0xE16F962D + .4byte 0xA86A9730 + .4byte 0x89EA3ABE + .4byte 0x221941AC + .4byte 0x79F185EE + .4byte 0x70C00A1B + .4byte 0x7FC1D0A6 + .4byte 0xF416FCBA + .4byte 0x4E4AC912 + .4byte 0x8A1A9DC5 + .4byte 0x38D4DEAD + .4byte 0xC44303B3 + .4byte 0xF7A9596D + .4byte 0xA320364D + .4byte 0x865BAE61 + .4byte 0x17A593DC + .4byte 0x502CEF2A + .4byte 0x68757A8B + .4byte 0xD6FB009E + .4byte 0x2E02CDED + .4byte 0x47AB82BD + .4byte 0x7111B266 + .4byte 0x5E3C7C08 + .4byte 0x6EF60945 + .4byte 0x3F5A0F84 + .4byte 0xCCDD730D + .4byte 0xF892E80B + .4byte 0xE9CF4F1C + .4byte 0xDA100E9F + .4byte 0xA258FF40 + .4byte 0x87772F60 + .4byte 0x4CC32888 + .4byte 0x15810656 + .4byte 0xD1558D9B + .4byte 0x57836591 + .4byte 0x34CE5342 + .4byte 0x040C467D + .4byte 0x0729FE24 + .4byte 0x2B6C0532 + .4byte 0xCB721E7E + .4byte 0xAAE4996B + .4byte 0xE2A1D81D + .4byte 0x3EC6C85C + .4byte 0x8FD76439 + .4byte 0xB8442331 + .4byte 0x7B51CA3B + .4byte 0xF5F9FD76 + .4byte 0xEB9AAFBC + .4byte 0x94C5263F + .4byte 0xF6F8936E + .4byte 0x738482E7 + .4byte 0x542C57AA + .4byte 0x466D7A7E + .4byte 0xF7E69A9F + .4byte 0xD6EDE1F0 + .4byte 0xF567DEF4 + .4byte 0xD141FC4A + .4byte 0x53C84D30 + .4byte 0x4E364031 + .4byte 0x8D980CA2 + .4byte 0xC0EA6C0A + .4byte 0x18588FEE + .4byte 0x006283E2 + .4byte 0x0D5B8BC7 + .4byte 0xD70490A1 + .4byte 0xE9CD1615 + .4byte 0x56789277 + .4byte 0xD512E3CE + .4byte 0x19BE3450 + .4byte 0x514B32C1 + .4byte 0x06073735 + .4byte 0x60ACAD2B + .4byte 0x27EB089B + .4byte 0xDB7B4F03 + .4byte 0x791117D3 + .4byte 0xF1D9A666 + .4byte 0xF3CF7299 + .4byte 0x3ACA3D0B + .4byte 0x894724DF + .4byte 0x65143861 + .4byte 0xC26F13AF + .4byte 0x913E2A33 + .4byte 0xDAE0A53B + .4byte 0x1B1DA022 + .4byte 0x6AC495FA + .4byte 0xB6B2699C + .4byte 0xF2804421 + .4byte 0xEF9DA7CB + .4byte 0xA9961E43 + .4byte 0x768A7F3C + .4byte 0xD0A85920 + .4byte 0xDC81C9CC + .4byte 0x97A4BCBD + .4byte 0x7DABA3B4 + .4byte 0x52E4B08C + .4byte 0xB92F9EB7 + .4byte 0x4CE84563 + .4byte 0x09645D88 + .4byte 0xD21C7487 + .4byte 0x485E556B + .4byte 0xB3EC3905 + .4byte 0x2D2810B1 + .4byte 0xC6FE7029 + .4byte 0x5AFB4923 + .4byte 0xDD8601E5 + .4byte 0xD42542AE + .4byte 0x8575FF68 + .4byte 0x2E5C1F02 + .4byte 0xBAB5BF7C + .4byte 0xFD71F98E + .4byte 0x5FB80E0F + .4byte 0xC31ABBD8 + .4byte 0xAAF3C7A9 + .4byte 0x4320C6D0 + .4byte 0xF407009F + .4byte 0x898EBAE0 + .4byte 0x5A241F2A + .4byte 0xDDD4E30D + .4byte 0xB0EDBEB2 + .4byte 0x2B752E66 + .4byte 0x176E7C52 + .4byte 0x76910159 + .4byte 0x613C862C + .4byte 0xFD2DF60B + .4byte 0xABE52241 + .4byte 0x6772C2AD + .4byte 0xBDFE96FA + .4byte 0x7B9E405F + .4byte 0x71984C88 + .4byte 0xFBEB6BC9 + .4byte 0xCEBBC003 + .4byte 0x5B3AAE15 + .4byte 0x3E564DD8 + .4byte 0x3B503584 + .4byte 0x9734C454 + .4byte 0xCC4E5ECD + .4byte 0xE6684FB3 + .4byte 0xB49D5DA5 + .4byte 0xA378E938 + .4byte 0x7E08606C + .4byte 0xDB7FBF82 + .4byte 0x30E24819 + .4byte 0x6D1AA2DF + .4byte 0x58956951 + .4byte 0x31DA0C4B + .4byte 0xA40A4527 + .4byte 0xD71E6587 + .4byte 0x1BB7B542 + .4byte 0x8C266F25 + .4byte 0xEAFCEF8A + .4byte 0xA710BCF5 + .4byte 0xA0214457 + .4byte 0x02D22F63 + .4byte 0x3DD5799C + .4byte 0x05F2E4CF + .4byte 0x29F1530E + .4byte 0x7AB11412 + .4byte 0xF9F7118B + .4byte 0x36A6B6D6 + .4byte 0xA11839EC + .4byte 0x04C1E88D + .4byte 0x28997390 + .4byte 0x70D31D8F + .4byte 0xCBF8F0B9 + .4byte 0xDE779232 + .4byte 0xE7EE8533 + .4byte 0x13A89A3F + .4byte 0xC8E1809B + .4byte 0x06233709 + .4byte 0xD1FFAC81 + .4byte 0x9464AF4A + .4byte 0x467D16C3 + .4byte 0x5547CAD9 + .4byte 0x0F1C6A74 + .4byte 0xDC4983C5 + .4byte 0xB85C9362 + .4byte 0xDC2FD4F0 + .4byte 0x8618B18C + .4byte 0x4FB9D597 + .4byte 0x1B434C1D + .4byte 0xEA5BC311 + .4byte 0x82FCA24A + .4byte 0xA07F47AF + .4byte 0xA30A59AD + .4byte 0xE5062A4E + .4byte 0x6EE340DB + .4byte 0x538349B4 + .4byte 0xBA71959B + .4byte 0x51B3ACD1 + .4byte 0xAEC4CF4B + .4byte 0x4D6916EC + .4byte 0x0BA59173 + .4byte 0x073B1984 + .4byte 0xC26D8DB2 + .4byte 0xBD254896 + .4byte 0xC5201AA1 + .4byte 0x8BC6E13F + .4byte 0x28A7E712 + .4byte 0x76B01C8E + .4byte 0xD04590CA + .4byte 0x98D6A636 + .4byte 0x32728AA8 + .4byte 0x0D3A9F37 + .4byte 0x3C89DD67 + .4byte 0x2281E915 + .4byte 0x4142F52E + .4byte 0x66D26180 + .4byte 0x0F5493AA + .4byte 0xED5DE47D + .4byte 0x30C93DE0 + .4byte 0xE226F208 + .4byte 0xA963242D + .4byte 0x8F799CDA + .4byte 0xBF55625C + .4byte 0x00B6276A + .4byte 0x0E9201D7 + .4byte 0xFFEB1F74 + .4byte 0x1499F744 + .4byte 0x87336C94 + .4byte 0x13507568 + .4byte 0x1017BB2C + .4byte 0x6B04DFBC + .4byte 0x356FB7F1 + .4byte 0x57C1E67C + .4byte 0xB877653E + .4byte 0x5FD364CB + .4byte 0x021E38AB + .4byte 0x88605E9D + .4byte 0xBEC8A4D8 + .4byte 0x527B29F4 + .4byte 0x0570CE78 + .4byte 0x853923F3 + .4byte 0x34589EFB + .4byte 0x31CC46EF + .4byte 0x9A5AFE7A + .4byte 0x56FDEEDE + .4byte 0x0CF9CDC0 + .4byte 0x2BD9B509 + .4byte 0xF6C721FA + .4byte 0xF803E87E + .4byte 0x9FBD7991 + .4byte 0xCC787FD5 + .4byte 0x1BEEBBB7 + .4byte 0xDCED6D9B + .4byte 0xEF58FB5D + .4byte 0x67691F4E + .4byte 0xAF624BB8 + .4byte 0xA8AE0860 + .4byte 0x8CAD24A1 + .4byte 0x482F8A00 + .4byte 0x90B15307 + .4byte 0x2612729D + .4byte 0x561C5134 + .4byte 0x462E81CF + .4byte 0xB3F337F1 + .4byte 0xFA3CBA06 + .4byte 0x54851459 + .4byte 0x365EA555 + .4byte 0x0C5289CB + .4byte 0x97E23B11 + .4byte 0xBED91DFC + .4byte 0x137DA005 + .4byte 0x41C3C5FD + .4byte 0x763382CD + .4byte 0x88161A29 + .4byte 0x871E406F + .4byte 0xE8033A50 + .4byte 0xA6E4F44F + .4byte 0xD6983971 + .4byte 0xD0F2F03E + .4byte 0xEA8D2CA2 + .4byte 0xA9570B8B + .4byte 0x0DAAE931 + .4byte 0xC2355CD1 + .4byte 0x38FF01A7 + .4byte 0xEC80F923 + .4byte 0xDF30EB2A + .4byte 0xB017D219 + .4byte 0x6EDA259E + .4byte 0xB64CC693 + .4byte 0xDB756B3F + .4byte 0x1573FE3D + .4byte 0x6566B57A + .4byte 0x9A32CA68 + .4byte 0x8E22C044 + .4byte 0x43A30E21 + .4byte 0xB9024DC8 + .4byte 0xB40AF6D3 + .4byte 0x45965A84 + .4byte 0x7018D4BF + .4byte 0xC4A49CC1 + .4byte 0xE047C7E5 + .4byte 0xE67E63DD + .4byte 0x6ACE2894 + .4byte 0xE710BC5F + .4byte 0x04642D8F + .4byte 0x6CF72B92 + .4byte 0x83D899E3 + .4byte 0xDED75BAB + .4byte 0x4A7477C9 + .4byte 0xF57B0F20 + .4byte 0xF8614286 + .4byte 0x7C4995AC + .4byte 0x27E109B2 + .4byte 0x0BD36F0A + .4byte 0x39772117 + .4byte 0x8FC7D5E5 + .4byte 0xB5B911A4 + .4byte 0xDCA3CDBB + .4byte 0x1A818AB7 + .4byte 0xD95B4761 + .4byte 0x8E88B80C + .4byte 0x3B3A9A54 + .4byte 0xFD2D53B4 + .4byte 0xC35F6960 + .4byte 0xB1AB2656 + .4byte 0x837EB33D + .4byte 0x4A0D5A1D + .4byte 0x1E59D635 + .4byte 0x8CF39B18 + .4byte 0x66BFE262 + .4byte 0x927BFF2E + .4byte 0x5CCF25C4 + .4byte 0xAFD22963 + .4byte 0xA5B2F96A + .4byte 0xC1FB1487 + .4byte 0x55732C44 + .4byte 0x3179F42A + .4byte 0x41012480 + .4byte 0x19654D9D + .4byte 0x9CE813A2 + .4byte 0xC0C5FE6B + .4byte 0xCE50F804 + .4byte 0x48A80616 + .4byte 0xBE67BAEA + .4byte 0xC60FD774 + .4byte 0x85B6D80E + .4byte 0x4C9315BD + .4byte 0xE6780305 + .4byte 0x32F734E4 + .4byte 0xAD3098A1 + .4byte 0x279EF643 + .4byte 0x643C49BC + .4byte 0xF099DD12 + .4byte 0xD1C95D7C + .4byte 0x22751F28 + .4byte 0x2F09C284 + .4byte 0x6DFA233F + .4byte 0x7D918982 + .4byte 0x8658DF76 + .4byte 0xE9AADBAC + .4byte 0x2BF59042 + .4byte 0x20E1A0ED + .4byte 0xD45210EF + .4byte 0x3EE31CDA + .4byte 0x96B07238 + .4byte 0x9F7A1BDE + .4byte 0x02A64E97 + .4byte 0x33366EE0 + .4byte 0xC84FFC37 + .4byte 0x71EC9400 + .4byte 0x95D0A7CB + .4byte 0xF170A98B + .4byte 0x40F24B46 + .4byte 0x45EE518D + .4byte 0xCC6CCAEB + .4byte 0x7F6807AE + .4byte 0x5E5708E7 .section .bss, "wa" # 0x80496700 - 0x805643FC .global NUM_C diff --git a/asm/wpad/WPADHIDParser.s b/asm/wpad/WPADHIDParser.s index e313dc51..e278407d 100644 --- a/asm/wpad/WPADHIDParser.s +++ b/asm/wpad/WPADHIDParser.s @@ -5697,95 +5697,172 @@ __a1_unused_report: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global _cExtInvalidData _cExtInvalidData: - .incbin "baserom.dol", 0x403EB8, 0x18 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFF000000 .global _cExtInvalidData2 _cExtInvalidData2: - .incbin "baserom.dol", 0x403ED0, 0x18 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global __a1_input_reports_array __a1_input_reports_array: - .incbin "baserom.dol", 0x434918, 0x80 + .4byte 0x80060FF0 ;# ptr + .4byte 0x80061430 ;# ptr + .4byte 0x800617A0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063650 ;# ptr + .4byte 0x80063690 ;# ptr + .4byte 0x80063760 ;# ptr + .4byte 0x800637B0 ;# ptr + .4byte 0x800638C0 ;# ptr + .4byte 0x80063910 ;# ptr + .4byte 0x800639F0 ;# ptr + .4byte 0x80063AA0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063EF0 ;# ptr + .4byte 0x80063BF0 ;# ptr + .4byte 0x80063C20 ;# ptr + .4byte 0x80063D90 ;# ptr .global $$25371 $$25371: - .incbin "baserom.dol", 0x434998, 0x30 + .4byte 0x80060704 ;# ptr + .4byte 0x80060728 ;# ptr + .4byte 0x80060890 ;# ptr + .4byte 0x8006074C ;# ptr + .4byte 0x80060770 ;# ptr + .4byte 0x80060794 ;# ptr + .4byte 0x800607B8 ;# ptr + .4byte 0x800607DC ;# ptr + .4byte 0x80060800 ;# ptr + .4byte 0x80060824 ;# ptr + .4byte 0x80060848 ;# ptr + .4byte 0x8006086C ;# ptr .global $$25370 $$25370: - .incbin "baserom.dol", 0x4349C8, 0x50 + .4byte 0x800605FC ;# ptr + .4byte 0x80060610 ;# ptr + .4byte 0x80060624 ;# ptr + .4byte 0x800606B4 ;# ptr + .4byte 0x800608A4 ;# ptr + .4byte 0x800608DC ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x8006094C ;# ptr + .4byte 0x80060648 ;# ptr + .4byte 0x8006066C ;# ptr + .4byte 0x80060690 ;# ptr + .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23033 $$23033: - .incbin "baserom.dol", 0x499290, 0x4 + .4byte 0x007F0380 .global lbl_8055E754 lbl_8055E754: - .incbin "baserom.dol", 0x499294, 0x4 + .4byte 0x0380007F .global $$23035 $$23035: - .incbin "baserom.dol", 0x499298, 0x4 + .4byte 0x005D005D .global lbl_8055E75C lbl_8055E75C: - .incbin "baserom.dol", 0x49929C, 0x4 + .4byte 0x02A202A2 .global $$25025 $$25025: - .incbin "baserom.dol", 0x4992A0, 0x4 + .4byte 0 .global $$25026 $$25026: - .incbin "baserom.dol", 0x4992A4, 0x4 + .4byte 0x3E800000 .global $$25027 $$25027: - .incbin "baserom.dol", 0x4992A8, 0x4 + .4byte 0x42FD0000 .global $$25028 $$25028: - .incbin "baserom.dol", 0x4992AC, 0x4 + .4byte 0x44A69000 .global $$25029 $$25029: - .incbin "baserom.dol", 0x4992B0, 0x8 + .4byte 0x3FB84D9D + .4byte 0xE0000000 .global $$25030 $$25030: - .incbin "baserom.dol", 0x4992B8, 0x4 + .4byte 0x42BA0000 .global $$25031 $$25031: - .incbin "baserom.dol", 0x4992BC, 0x4 + .4byte 0x44A72CCD .global $$25032 $$25032: - .incbin "baserom.dol", 0x4992C0, 0x8 + .4byte 0x3FB1CD3C + .4byte 0x80000000 .global $$25033 $$25033: - .incbin "baserom.dol", 0x4992C8, 0x4 + .4byte 0xBF800000 .global $$25034 $$25034: - .incbin "baserom.dol", 0x4992CC, 0x4 + .4byte 0x43BFC000 .global $$25035 $$25035: - .incbin "baserom.dol", 0x4992D0, 0x8 + .4byte 0x43FFC000 + .4byte 0 .global $$25038 $$25038: - .incbin "baserom.dol", 0x4992D8, 0x8 + .4byte 0x43300000 + .4byte 0x80000000 .global $$25149 $$25149: - .incbin "baserom.dol", 0x4992E0, 0x4 + .4byte 0x46000000 .global $$25150 $$25150: - .incbin "baserom.dol", 0x4992E4, 0x4 + .4byte 0x45A6A800 .global $$25151 $$25151: - .incbin "baserom.dol", 0x4992E8, 0x4 + .4byte 0x45A8C000 .global $$25152 $$25152: - .incbin "baserom.dol", 0x4992EC, 0x4 + .4byte 0x459C4000 .global $$25153 $$25153: - .incbin "baserom.dol", 0x4992F0, 0x4 + .4byte 0x41200000 .global $$25154 $$25154: - .incbin "baserom.dol", 0x4992F4, 0x4 + .4byte 0x457A0000 .global $$25731 $$25731: - .incbin "baserom.dol", 0x4992F8, 0x8 + .4byte 0x40490FD8 + .4byte 0 .global $$25736 $$25736: - .incbin "baserom.dol", 0x499300, 0x8 + .4byte 0x43300000 + .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC .global _wpadCalibrationX diff --git a/asm/wpad/WUD.s b/asm/wpad/WUD.s index 698d73a4..72ff2089 100644 --- a/asm/wpad/WUD.s +++ b/asm/wpad/WUD.s @@ -6337,65 +6337,204 @@ WUDiSetNotAckNumForHandle: .section .data, "wa" # 0x80421040 - 0x80496700 .global _wudWiiRemoteDescriptor _wudWiiRemoteDescriptor: - .incbin "baserom.dol", 0x435C78, 0xDC + .4byte 0x05010905 + .4byte 0xA1018510 + .4byte 0x150026FF + .4byte 0x00750895 + .4byte 0x010600FF + .4byte 0x09019100 + .4byte 0x85119501 + .4byte 0x09019100 + .4byte 0x85129502 + .4byte 0x09019100 + .4byte 0x85139501 + .4byte 0x09019100 + .4byte 0x85149501 + .4byte 0x09019100 + .4byte 0x85159501 + .4byte 0x09019100 + .4byte 0x85169515 + .4byte 0x09019100 + .4byte 0x85179506 + .4byte 0x09019100 + .4byte 0x85189515 + .4byte 0x09019100 + .4byte 0x85199501 + .4byte 0x09019100 + .4byte 0x851A9501 + .4byte 0x09019100 + .4byte 0x85209506 + .4byte 0x09018100 + .4byte 0x85219515 + .4byte 0x09018100 + .4byte 0x85229504 + .4byte 0x09018100 + .4byte 0x85309502 + .4byte 0x09018100 + .4byte 0x85319505 + .4byte 0x09018100 + .4byte 0x8532950A + .4byte 0x09018100 + .4byte 0x85339511 + .4byte 0x09018100 + .4byte 0x85349515 + .4byte 0x09018100 + .4byte 0x85359515 + .4byte 0x09018100 + .4byte 0x85369515 + .4byte 0x09018100 + .4byte 0x85379515 + .4byte 0x09018100 + .4byte 0x853D9515 + .4byte 0x09018100 + .4byte 0x853E9515 + .4byte 0x09018100 + .4byte 0x853F9515 + .4byte 0x09018100 + .4byte 0xC0000000 .global _wudSuperPeekPokeCmd _wudSuperPeekPokeCmd: - .incbin "baserom.dol", 0x435D54, 0xC + .4byte 0x05009A0E + .4byte 0x00010000 + .4byte 0 .global _wudPatchData _wudPatchData: - .incbin "baserom.dol", 0x435D60, 0xBC + .4byte 0x70990800 + .4byte 0xB4000000 + .4byte 0x8843D107 + .4byte 0x090C0843 + .4byte 0xA0621923 + .4byte 0xDB013380 + .4byte 0x7CF788F8 + .4byte 0x287680F7 + .4byte 0x17FF4378 + .4byte 0xEB701923 + .4byte 0xDB013387 + .4byte 0x7CF7BCFB + .4byte 0x0B60A37B + .4byte 0x01490B60 + .4byte 0x90F796FB + .4byte 0xD81D0800 + .4byte 0x00F004F8 + .4byte 0x002379F7 + .4byte 0xE3FA0000 + .4byte 0x00B50023 + .4byte 0x11490B60 + .4byte 0x1D21C903 + .4byte 0x0B607D20 + .4byte 0x80010138 ;# ptr + .4byte 0xFDD10E4B + .4byte 0x0E4A1360 + .4byte 0x47200021 + .4byte 0x96F796FF + .4byte 0x46200021 + .4byte 0x96F792FF + .4byte 0x0A4A1368 + .4byte 0x0A480340 + .4byte 0x13600A4A + .4byte 0x13680A48 + .4byte 0x03401360 + .4byte 0x094A1368 + .4byte 0x09480340 + .4byte 0x136000BD + .4byte 0x24800E00 + .4byte 0x81030FFE + .4byte 0x5C000F00 + .4byte 0x60FC0E00 + .4byte 0xFEFF0000 + .4byte 0xFCFC0E00 + .4byte 0xFF9F0000 + .4byte 0x30FC0E00 + .4byte 0x7FFF0000 .global _wudPatchInstallCmd _wudPatchInstallCmd: - .incbin "baserom.dol", 0x435E1C, 0x5C + .4byte 0x0720BC65 + .4byte 0x01008442 + .4byte 0x09D28442 + .4byte 0x09D12184 + .4byte 0x5A000083 + .4byte 0xF074FF09 + .4byte 0x0C084322 + .4byte 0x00610000 + .4byte 0x83F040FC + .4byte 0 + .4byte 0x23CC9F01 + .4byte 0x006FF0E4 + .4byte 0xFC03287D + .4byte 0xD1243C62 + .4byte 0x01002820 + .4byte 0x00E0608D + .4byte 0x23682504 + .4byte 0x12010020 + .4byte 0x1C201C24 + .4byte 0xE0B02126 + .4byte 0x742F0000 + .4byte 0x86F018FD + .4byte 0x214F3B60 .global _wudResetAuthCountCmd _wudResetAuthCountCmd: - .incbin "baserom.dol", 0x435E78, 0x1C + .4byte 0x30360800 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 .global $$26246 $$26246: - .incbin "baserom.dol", 0x435E94, 0x14 + .asciz "Nintendo RVL-CNT" + .balign 4 .global $$26247 $$26247: - .incbin "baserom.dol", 0x435EA8, 0x14 + .asciz "Nintendo RVL-WBC" + .balign 4 .global $$26546 $$26546: - .incbin "baserom.dol", 0x435EBC, 0x2C + .asciz "/title/00010004/52464e4a/data/RPHealth.dat" + .balign 4 .global $$26740 $$26740: - .incbin "baserom.dol", 0x435EE8, 0x14 + .asciz "Nintendo RVL-CNT-01" .global $$26792 $$26792: - .incbin "baserom.dol", 0x435EFC, 0x54 + .asciz "Error: the workarea for synchronizing WBC pairing information is not allocated.\n" + .balign 4 .global $$27511 $$27511: - .incbin "baserom.dol", 0x435F50, 0x24 + .asciz "WARNING: link num count is reset.\n" + .balign 4 .global $$27554 $$27554: - .incbin "baserom.dol", 0x435F74, 0x14 + .asciz "MODULE FATAL ERROR\n" .global $$27558 $$27558: - .incbin "baserom.dol", 0x435F88, 0x28 + .asciz "---- WARNING: USB FATAL ERROR! ----\n" + .balign 4 .global $$27592 $$27592: - .incbin "baserom.dol", 0x435FB0, 0x10 + .asciz "Unknown event\n" + .balign 4 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$26790 $$26790: - .incbin "baserom.dol", 0x492BD8, 0x8 + .asciz "RFNJ" + .balign 4 .global $$26791 $$26791: - .incbin "baserom.dol", 0x492BE0, 0x8 + .asciz "WUD.c" + .balign 4 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23808 $$23808: - .incbin "baserom.dol", 0x499308, 0x4 + .4byte 0x57696900 .global $$23810 $$23810: - .incbin "baserom.dol", 0x49930C, 0x2 + .byte 0x00, 0x04 .global lbl_8055E7CE lbl_8055E7CE: - .incbin "baserom.dol", 0x49930E, 0x2 + .byte 0x48, 0x00 .section .bss, "wa" # 0x80496700 - 0x805643FC .global __rvl_wudcb diff --git a/asm/wpad/WUDHidHost.s b/asm/wpad/WUDHidHost.s index d8416c73..9fcc91cb 100644 --- a/asm/wpad/WUDHidHost.s +++ b/asm/wpad/WUDHidHost.s @@ -311,7 +311,10 @@ bta_hh_co_data: .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21502 $$21502: - .incbin "baserom.dol", 0x435FC0, 0x14 + .asciz "Nintendo RVL-CNT" + .balign 4 .global $$21503 $$21503: - .incbin "baserom.dol", 0x435FD4, 0x2C + .asciz "WARNING: link num count is modified.\n" + .balign 4 + .4byte 0 diff --git a/deincbin.py b/deincbin.py index 36201c35..67287674 100755 --- a/deincbin.py +++ b/deincbin.py @@ -121,7 +121,7 @@ with open(sys.argv[1], 'rt') as f: m = re.match(r'\s*\.section\s+([\._A-Za-z0-9]+)', line) if m: currSection = m.groups()[0] - elif currSection in ['.rodata', '.data', '.sdata', '..ctors', '.ctors', '.dtors', 'extab_', 'extabindex_']: + elif currSection in ['.rodata', '.data', '.sdata', '..ctors', '.ctors', '.dtors', 'extab', 'extabindex', '.sdata2']: # Incbin directive m = re.match(r'\s*\.incbin\s+"baserom.dol"\s*,\s*([^,]+),\s*([^,]+)', line) if m: @@ -131,4 +131,4 @@ with open(sys.argv[1], 'rt') as f: data = read_baserom(start, size) print(convert_data(data, start).rstrip()) continue -# print(line) + print(line)