Overlay 58 hardcoded pointers

This commit is contained in:
PikalaxALT 2021-12-04 09:28:27 -05:00
parent 2c4b2fa54d
commit fb6fa47c8e
6 changed files with 141 additions and 134 deletions

View File

@ -1,3 +1,4 @@
#pragma once #pragma once
.include "asm/macros/function.inc" .include "asm/macros/function.inc"
.include "asm/macros/cw.inc"

12
asm/macros/cw.inc Normal file
View File

@ -0,0 +1,12 @@
.macro exception what, size, data
.section .exceptix,4,1,2
.balign 4, 0
.type ?exc$\what, @object
.global ?exc$\what
.size ?exc$\what, 12
?exc$\what:
.word \what
.short \size
.word \data
.previous
.endm

View File

@ -589,10 +589,8 @@ _02237D18: .word 0x04001000
.rodata .rodata
_02237D1C: _02237D1C:
.byte 0x41, 0x7D, 0x23, 0x02 .word ov59_02237D40, ov59_02237DA8, ov59_02237E68, SDK_OVERLAY_OVY_59_ID
.byte 0xA9, 0x7D, 0x23, 0x02, 0x69, 0x7E, 0x23, 0x02, 0x3B, 0x00, 0x00, 0x00
ov58_02237D2C: ; 0x02237D2C ov58_02237D2C: ; 0x02237D2C
.byte 0xE1, 0xA8, 0x23, 0x02 .word ov59_0223A8E0, ov59_0223A948, ov59_0223A9B8, SDK_OVERLAY_OVY_59_ID
.byte 0x49, 0xA9, 0x23, 0x02, 0xB9, 0xA9, 0x23, 0x02, 0x3B, 0x00, 0x00, 0x00
; 0x02237D3C ; 0x02237D3C

View File

@ -3,8 +3,6 @@
.public _020FC824 .public _020FC824
.bss
.text .text
thumb_func_start sub_0205AC88 thumb_func_start sub_0205AC88

View File

@ -57339,7 +57339,7 @@ ov00_02219D54:
.asciz "natneg2.gs.nintendowifi.net" .asciz "natneg2.gs.nintendowifi.net"
.balign 4, 0 .balign 4, 0
ov00_02219D70: ov00_02219D70:
.byte 0x74, 0x9D, 0x21, 0x02 .word ov00_02219D74
ov00_02219D74: ov00_02219D74:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

View File

@ -20202,7 +20202,7 @@ _02111848:
.word _ZSt9dthandlerv .word _ZSt9dthandlerv
.word _ZSt9duhandlerv .word _ZSt9duhandlerv
.section .exception,4,1 .section .exception,4,1,2
; MSL symbols have exceptions for C++ mode, even when compiling C. ; MSL symbols have exceptions for C++ mode, even when compiling C.
_020F4F84: _020F4F84:
@ -20255,129 +20255,127 @@ _020F5088:
.byte 0x40, 0x80, 0x40, 0x00, 0x20, 0x00, 0x16, 0x20 .byte 0x40, 0x80, 0x40, 0x00, 0x20, 0x00, 0x16, 0x20
.byte 0x00, 0x1E, 0x00, 0x8F, 0x00, 0x30, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x1E, 0x00, 0x8F, 0x00, 0x30, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x00
.section .exceptix,4,1 exception abort, 0x0025, 0x00100000
exception exit, 0x004D, 0x00100100
.word abort, 0x00000025, 0x00100000 exception __exit, 0x0129, 0x00200300
.word exit, 0x0000004D, 0x00100100 exception nan, 0x0019, 0x00000000
.word __exit, 0x00000129, 0x00200300 exception malloc, 0x0019, 0x00100000
.word nan, 0x00000019, 0x00000000 exception free, 0x0015, 0x00100000
.word malloc, 0x00000019, 0x00100000 exception __flush_line_buffered_output_files, 0x008D, 0x00403F00
.word free, 0x00000015, 0x00100000 exception __flush_all, 0x0069, 0x00403F00
.word __flush_line_buffered_output_files, 0x0000008D, 0x00403F00 exception __msl_assertion_failed, 0x003D, 0x00200100
.word __flush_all, 0x00000069, 0x00403F00 exception __load_buffer, 0x008D, 0x00200700
.word __msl_assertion_failed, 0x0000003D, 0x00200100 exception __flush_buffer, 0x0089, 0x00200300
.word __load_buffer, 0x0000008D, 0x00200700 exception fread, 0x010D, 0x00407F00
.word __flush_buffer, 0x00000089, 0x00200300 exception __fread, 0x0349, 0x00507F00
.word fread, 0x0000010D, 0x00407F00 exception __fwrite, 0x02B1, 0x0060FF00
.word __fread, 0x00000349, 0x00507F00 exception fclose, 0x0075, 0x00200300
.word __fwrite, 0x000002B1, 0x0060FF00 exception fflush, 0x00E9, 0x00100100
.word fclose, 0x00000075, 0x00200300 exception ftell, 0x011D, 0x00300F00
.word fflush, 0x000000E9, 0x00100100 exception _fseek, 0x01E9, 0x00400320
.word ftell, 0x0000011D, 0x00300F00 exception fseek, 0x012D, 0x00403F00
.word _fseek, 0x000001E9, 0x00400320 exception rewind, 0x0025, 0x00100100
.word fseek, 0x0000012D, 0x00403F00 exception mbtowc, 0x001D, 0x00100000
.word rewind, 0x00000025, 0x00100100 exception wctomb, 0x001D, 0x00100000
.word mbtowc, 0x0000001D, 0x00100000 exception mbstowcs, 0x0089, 0x00301F00
.word wctomb, 0x0000001D, 0x00100000 exception wcstombs, 0x0079, 0x00403F00
.word mbstowcs, 0x00000089, 0x00301F00 exception memset, 0x0015, 0x00100100
.word wcstombs, 0x00000079, 0x00403F00 exception long2str__printf, 0x024D, 0x0090FF20
.word memset, 0x00000015, 0x00100100 exception longlong2str__printf, 0x02FD, 0x00A0FF20
.word long2str__printf, 0x0000024D, 0x0090FF20 exception double2hex__printf, 0x04DD, 0x00F07F20
.word longlong2str__printf, 0x000002FD, 0x00A0FF20 exception float2str__printf, 0x0765, 0x00C0FF20
.word double2hex__printf, 0x000004DD, 0x00F07F20 exception __pformatter, 0x0824, _020F4F84
.word float2str__printf, 0x00000765, 0x00C0FF20 exception __FileWrite, 0x002D, 0x00200300
.word __pformatter, 0x00000824, _020F4F84 exception __StringWrite, 0x0045, 0x00200300
.word __FileWrite, 0x0000002D, 0x00200300 exception printf, 0x0119, 0x00300120
.word __StringWrite, 0x00000045, 0x00200300 exception vsnprintf, 0x0069, 0x00300300
.word printf, 0x00000119, 0x00300120 exception vsprintf, 0x0019, 0x00000000
.word vsnprintf, 0x00000069, 0x00300300 exception snprintf, 0x0029, 0x00300020
.word vsprintf, 0x00000019, 0x00000000 exception sprintf, 0x002D, 0x00300020
.word snprintf, 0x00000029, 0x00300020 exception qsort, 0x0165, 0x0070FF00
.word sprintf, 0x0000002D, 0x00300020 exception __sformatter, 0x0D54, _020F4F8C
.word qsort, 0x00000165, 0x0070FF00 exception vsscanf, 0x0055, 0x00200000
.word __sformatter, 0x00000D54, _020F4F8C exception sscanf, 0x0029, 0x00300020
.word vsscanf, 0x00000055, 0x00200000 exception signal, 0x0131, 0x00200300
.word sscanf, 0x00000029, 0x00300020 exception __strtold, 0x124C, _020F4F94
.word signal, 0x00000131, 0x00200300 exception strtold, 0x00E1, 0x00500F00
.word __strtold, 0x0000124C, _020F4F94 exception atof, 0x0011, 0x00000000
.word strtold, 0x000000E1, 0x00500F00 exception __strtoul, 0x03E9, 0x0060FF00
.word atof, 0x00000011, 0x00000000 exception __strtoull, 0x046D, 0x00807F00
.word __strtoul, 0x000003E9, 0x0060FF00 exception strtoul, 0x0099, 0x00600300
.word __strtoull, 0x0000046D, 0x00807F00 exception strtol, 0x00C9, 0x00600300
.word strtoul, 0x00000099, 0x00600300 exception atoi, 0x0015, 0x00000000
.word strtol, 0x000000C9, 0x00600300 exception wmemcpy, 0x0011, 0x00000000
.word atoi, 0x00000015, 0x00000000 exception long2str__wprintf, 0x0251, 0x0090FF20
.word wmemcpy, 0x00000011, 0x00000000 exception longlong2str__wprintf, 0x0301, 0x00A0FF20
.word long2str__wprintf, 0x00000251, 0x0090FF20 exception double2hex__wprintf, 0x0399, 0x00F07F20
.word longlong2str__wprintf, 0x00000301, 0x00A0FF20 exception float2str__wprintf, 0x064C, _020F4F9C
.word double2hex__wprintf, 0x00000399, 0x00F07F20 exception __wpformatter, 0x08F0, _020F4FA4
.word float2str__wprintf, 0x0000064C, _020F4F9C exception __wStringWrite, 0x0041, 0x00200300
.word __wpformatter, 0x000008F0, _020F4FA4 exception swprintf, 0x0029, 0x00300020
.word __wStringWrite, 0x00000041, 0x00200300 exception vswprintf, 0x0071, 0x00300300
.word swprintf, 0x00000029, 0x00300020 exception __ieee754_pow, 0x1188, _020F4FAC
.word vswprintf, 0x00000071, 0x00300300 exception frexp, 0x00BD, 0x00300120
.word __ieee754_pow, 0x00001188, _020F4FAC exception ldexp, 0x024D, 0x00300120
.word frexp, 0x000000BD, 0x00300120 exception pow, 0x000D, 0x00000000
.word ldexp, 0x0000024D, 0x00300120 exception __rounddec, 0x0041, 0x00200300
.word pow, 0x0000000D, 0x00000000 exception __ull2dec, 0x00CD, 0x0050FF00
.word __rounddec, 0x00000041, 0x00200300 exception __timesdec, 0x0185, 0x00D0FF00
.word __ull2dec, 0x000000CD, 0x0050FF00 exception __str2dec, 0x009D, 0x00100000
.word __timesdec, 0x00000185, 0x00D0FF00 exception __two_exp, 0x0385, 0x00B00300
.word __str2dec, 0x0000009D, 0x00100000 exception __num2dec_internal, 0x0181, 0x00E01F00
.word __two_exp, 0x00000385, 0x00B00300 exception __num2dec, 0x00A9, 0x00200300
.word __num2dec_internal, 0x00000181, 0x00E01F00 exception __dec2num, 0x0624, _020F4FB4
.word __num2dec, 0x000000A9, 0x00200300 exception scalbn, 0x002D, 0x00200100
.word __dec2num, 0x00000624, _020F4FB4 exception __sys_alloc, 0x0019, 0x00000000
.word scalbn, 0x0000002D, 0x00200100 exception __sys_free, 0x0019, 0x00000000
.word __sys_alloc, 0x00000019, 0x00000000 exception _ZNSt3tr110shared_ptrIcEC1IcNSt6detail14default_deleteIA0_cEEEEPT_T0_, 0x0080, _020F4FBC
.word __sys_free, 0x00000019, 0x00000000 exception _ZNSt9exceptionD0Ev, 0x0015, 0x00100100
.word _ZNSt3tr110shared_ptrIcEC1IcNSt6detail14default_deleteIA0_cEEEEPT_T0_, 0x00000080, _020F4FBC exception _ZNKSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEE11get_deleterERKSt9type_info, 0x0029, 0x00100100
.word _ZNSt9exceptionD0Ev, 0x00000015, 0x00100100 exception _ZNSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEE7disposeEv, 0x0011, 0x00000000
.word _ZNKSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEE11get_deleterERKSt9type_info, 0x00000029, 0x00100100 exception _ZNSt3tr110shared_ptrIcED1Ev, 0x0040, _020F4FCC
.word _ZNSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEE7disposeEv, 0x00000011, 0x00000000 exception _ZN10Metrowerks8move_ptrIcRNSt6detail14default_deleteIA0_cEEED1Ev, 0x0021, 0x00100100
.word _ZNSt3tr110shared_ptrIcED1Ev, 0x00000040, _020F4FCC exception _ZNSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEED0Ev, 0x0015, 0x00100100
.word _ZN10Metrowerks8move_ptrIcRNSt6detail14default_deleteIA0_cEEED1Ev, 0x00000021, 0x00100100 exception _ZNSt11logic_errorD1Ev, 0x0019, 0x00100100
.word _ZNSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEED0Ev, 0x00000015, 0x00100100 exception _ZNSt11logic_errorD0Ev, 0x0021, 0x00100100
.word _ZNSt11logic_errorD1Ev, 0x00000019, 0x00100100 exception _ZNSt12length_errorD1Ev, 0x0019, 0x00100100
.word _ZNSt11logic_errorD0Ev, 0x00000021, 0x00100100 exception _ZNSt12length_errorD0Ev, 0x0021, 0x00100100
.word _ZNSt12length_errorD1Ev, 0x00000019, 0x00100100 exception _ZNSt3tr16detail25shared_ptr_deleter_common7releaseEv, 0x0031, 0x00100100
.word _ZNSt12length_errorD0Ev, 0x00000021, 0x00100100 exception _ZNSt3tr16detail25shared_ptr_deleter_common12release_weakEv, 0x002D, 0x00100000
.word _ZNSt3tr16detail25shared_ptr_deleter_common7releaseEv, 0x00000031, 0x00100100 exception _ZNSt15__vector_commonILb1EE18throw_length_errorEv, 0x0090, _020F4FE0
.word _ZNSt3tr16detail25shared_ptr_deleter_common12release_weakEv, 0x0000002D, 0x00100000 exception __read_console, 0x0051, 0x00300F00
.word _ZNSt15__vector_commonILb1EE18throw_length_errorEv, 0x00000090, _020F4FE0 exception __write_console, 0x0035, 0x00200700
.word __read_console, 0x00000051, 0x00300F00 exception _Z19FindExceptionRecordPcP13ExceptionInfo, 0x0109, 0x00503F00
.word __write_console, 0x00000035, 0x00200700 exception _Z10NextActionP14ActionIterator, 0x0388, _020F4FF8
.word _Z19FindExceptionRecordPcP13ExceptionInfo, 0x00000109, 0x00503F00 exception _Z11UnwindStackP12ThrowContextP13ExceptionInfoPc, 0x08B0, _020F5000
.word _Z10NextActionP14ActionIterator, 0x00000388, _020F4FF8 exception _Z23FindMostRecentExceptionP12ThrowContextP13ExceptionInfo, 0x0154, _020F5010
.word _Z11UnwindStackP12ThrowContextP13ExceptionInfoPc, 0x000008B0, _020F5000 exception _Z17IsInSpecificationPcP16ex_specification, 0x0085, 0x00401F00
.word _Z23FindMostRecentExceptionP12ThrowContextP13ExceptionInfo, 0x00000154, _020F5010 exception __unexpected, 0x00A8, _020F5018
.word _Z17IsInSpecificationPcP16ex_specification, 0x00000085, 0x00401F00 exception _Z16HandleUnexpectedP12ThrowContextP13ExceptionInfoP16ex_specificationPc, 0x0060, _020F502C
.word __unexpected, 0x000000A8, _020F5018 exception _Z20FindExceptionHandlerP12ThrowContextP13ExceptionInfoPl, 0x01DC, _020F5034
.word _Z16HandleUnexpectedP12ThrowContextP13ExceptionInfoP16ex_specificationPc, 0x00000060, _020F502C exception _Z14__ThrowHandlerP12ThrowContext, 0x00ED, 0x00700300
.word _Z20FindExceptionHandlerP12ThrowContextP13ExceptionInfoPl, 0x000001DC, _020F5034 exception __end__catch, 0x0029, 0x00100000
.word _Z14__ThrowHandlerP12ThrowContext, 0x000000ED, 0x00700300 exception _ZNSt13bad_exceptionD0Ev, 0x0015, 0x00100100
.word __end__catch, 0x00000029, 0x00100000 exception _ZSt17__throw_bad_allocv, 0x0041, 0x00100000
.word _ZNSt13bad_exceptionD0Ev, 0x00000015, 0x00100100 exception _Znwm, 0x0064, _020F503C
.word _ZSt17__throw_bad_allocv, 0x00000041, 0x00100000 exception _ZnwmRKSt9nothrow_t, 0x0044, _020F5054
.word _Znwm, 0x00000064, _020F503C exception _ZdlPv, 0x0015, 0x00100000
.word _ZnwmRKSt9nothrow_t, 0x00000044, _020F5054 exception _Znam, 0x002C, _020F5070
.word _ZdlPv, 0x00000015, 0x00100000 exception _ZnamRKSt9nothrow_t, 0x002C, _020F5088
.word _Znam, 0x0000002C, _020F5070 exception _ZdaPv, 0x000D, 0x00000000
.word _ZnamRKSt9nothrow_t, 0x0000002C, _020F5088 exception _ZNSt9bad_allocD0Ev, 0x0015, 0x00100100
.word _ZdaPv, 0x0000000D, 0x00000000 exception __call_static_initializers, 0x002D, 0x00100100
.word _ZNSt9bad_allocD0Ev, 0x00000015, 0x00100100 exception __destroy_global_chain, 0x0045, 0x00200300
.word __call_static_initializers, 0x0000002D, 0x00100100 exception _ZNKSt9type_infoeqERKS_, 0x0031, 0x00100000
.word __destroy_global_chain, 0x00000045, 0x00200300 exception _ZN10__cxxabiv117__class_type_infoD1Ev, 0x0015, 0x00100100
.word _ZNKSt9type_infoeqERKS_, 0x00000031, 0x00100000 exception _ZN10__cxxabiv117__class_type_infoD0Ev, 0x001D, 0x00100100
.word _ZN10__cxxabiv117__class_type_infoD1Ev, 0x00000015, 0x00100100 exception _ZN10__cxxabiv117__class_type_infoD2Ev, 0x0015, 0x00100100
.word _ZN10__cxxabiv117__class_type_infoD0Ev, 0x0000001D, 0x00100100 exception _ZN10__cxxabiv120__si_class_type_infoD1Ev, 0x0015, 0x00100100
.word _ZN10__cxxabiv117__class_type_infoD2Ev, 0x00000015, 0x00100100 exception _ZN10__cxxabiv120__si_class_type_infoD0Ev, 0x001D, 0x00100100
.word _ZN10__cxxabiv120__si_class_type_infoD1Ev, 0x00000015, 0x00100100 exception _ZSt9dthandlerv, 0x000D, 0x00000000
.word _ZN10__cxxabiv120__si_class_type_infoD0Ev, 0x0000001D, 0x00100100 exception _ZSt9duhandlerv, 0x000D, 0x00000000
.word _ZSt9dthandlerv, 0x0000000D, 0x00000000 exception _ZSt9terminatev, 0x0019, 0x00100000
.word _ZSt9duhandlerv, 0x0000000D, 0x00000000 exception _ZSt10unexpectedv, 0x0019, 0x00100000
.word _ZSt9terminatev, 0x00000019, 0x00100000 exception _Z16__SetupFrameInfoP12ThrowContextP13ExceptionInfo, 0x00A1, 0x00200700
.word _ZSt10unexpectedv, 0x00000019, 0x00100000 exception _Z16__SkipUnwindInfoPc, 0x0031, 0x00200100
.word _Z16__SetupFrameInfoP12ThrowContextP13ExceptionInfo, 0x000000A1, 0x00200700 exception _ExitProcess, 0x000D, 0x00000000
.word _Z16__SkipUnwindInfoPc, 0x00000031, 0x00200100
.word _ExitProcess, 0x0000000D, 0x00000000