mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-30 16:50:37 +00:00
more ctors sorting
ebisawa & kono
This commit is contained in:
parent
0a43c605c7
commit
dacc80c9f2
21
asm/ctors.s
21
asm/ctors.s
@ -184,24 +184,3 @@ __init_cpp_exceptions_reference:
|
|||||||
.4byte __sinit_blackManState_cpp
|
.4byte __sinit_blackManState_cpp
|
||||||
.4byte __sinit_blackMan_cpp
|
.4byte __sinit_blackMan_cpp
|
||||||
.4byte __sinit_tyre_cpp
|
.4byte __sinit_tyre_cpp
|
||||||
.4byte __sinit_efxBase_cpp
|
|
||||||
.4byte __sinit_particle2dMgr_cpp
|
|
||||||
.4byte __sinit_particleMgr_cpp
|
|
||||||
.4byte __sinit_ebiP2Title_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleUnit_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleCamera_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleLight_cpp
|
|
||||||
.4byte __sinit_ebiP2TitlePikmin_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleKogane_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleChappy_cpp
|
|
||||||
.4byte __sinit_ebiMainTitleMgr_cpp
|
|
||||||
.4byte __sinit_ebiP2TitleFog_cpp
|
|
||||||
.4byte __sinit_khWorldMap_cpp
|
|
||||||
.4byte __sinit_khCaveResult_cpp
|
|
||||||
.4byte __sinit_khReadyGo_cpp
|
|
||||||
.4byte __sinit_khFinalFloor_cpp
|
|
||||||
.4byte __sinit_khDayEndResult_cpp
|
|
||||||
.4byte __sinit_khFinalResult_cpp
|
|
||||||
.4byte __sinit_khPayDept_cpp
|
|
||||||
.4byte __sinit_khWinLose_cpp
|
|
||||||
.4byte __sinit_khWinLoseReason_cpp
|
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiMainTitleMgr_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80497880
|
.global lbl_80497880
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2Title_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80495C58
|
.global lbl_80495C58
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleCamera_cpp
|
||||||
|
|
||||||
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804E79C8
|
.global lbl_804E79C8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleChappy_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80497628
|
.global lbl_80497628
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleFog_cpp
|
||||||
|
|
||||||
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804E9FA8
|
.global lbl_804E9FA8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleKogane_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804974A0
|
.global lbl_804974A0
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleLight_cpp
|
||||||
|
|
||||||
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804E79D8
|
.global lbl_804E79D8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitlePikmin_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80497158
|
.global lbl_80497158
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_ebiP2TitleUnit_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804961D8
|
.global lbl_804961D8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_efxBase_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80495880
|
.global lbl_80495880
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_particle2dMgr_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80495A70
|
.global lbl_80495A70
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_particleMgr_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80495BC8
|
.global lbl_80495BC8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khCaveResult_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80498360
|
.global lbl_80498360
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khDayEndResult_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80498830
|
.global lbl_80498830
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khFinalFloor_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80498758
|
.global lbl_80498758
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khFinalResult_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80498CD8
|
.global lbl_80498CD8
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khPayDept_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80499160
|
.global lbl_80499160
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khReadyGo_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80498670
|
.global lbl_80498670
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khWinLose_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80499358
|
.global lbl_80499358
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khWinLoseReason_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_804994F0
|
.global lbl_804994F0
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
.include "macros.inc"
|
.include "macros.inc"
|
||||||
|
.section .ctors, "wa" # 0x80472F00 - 0x804732C0
|
||||||
|
.4byte __sinit_khWorldMap_cpp
|
||||||
|
|
||||||
.section .rodata # 0x804732E0 - 0x8049E220
|
.section .rodata # 0x804732E0 - 0x8049E220
|
||||||
.balign 0x8
|
.balign 0x8
|
||||||
.global lbl_80497C70
|
.global lbl_80497C70
|
||||||
|
@ -180,7 +180,8 @@ void ID32::sprint(char* str)
|
|||||||
str[3] = static_cast<u8>(m_id.raw);
|
str[3] = static_cast<u8>(m_id.raw);
|
||||||
str[4] = '\0';
|
str[4] = '\0';
|
||||||
}
|
}
|
||||||
|
#pragma ipa file
|
||||||
|
ID32 ID32::eof('_eof');
|
||||||
// TODO: Figure out how to do sinit in this style
|
// TODO: Figure out how to do sinit in this style
|
||||||
|
|
||||||
// extern "C" void __sinit_id32_cpp(){
|
// extern "C" void __sinit_id32_cpp(){
|
||||||
|
Loading…
Reference in New Issue
Block a user