encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 02:12:44 -04:00
committed by GitHub
co-authored by Pheenoh
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_a/d_a_alink.cpp
+3305 -3288
View File
File diff suppressed because it is too large Load Diff
src/d/d_attention.cpp
+114 -114
View File
File diff suppressed because it is too large Load Diff
src/d/d_camera.cpp
+475 -474
View File
File diff suppressed because it is too large Load Diff
src/d/d_com/d_com_inf_game.cpp
+431 -423
View File
File diff suppressed because it is too large Load Diff
src/d/d_file/d_file_sel_info.cpp
+19 -17
View File
@@ -7,18 +7,18 @@ char* strcpy(char*, const char*);
void __ct__9J2DScreenFv(void);
void __dl__FPv(void);
void __nw__FUl(void);
void CPaneMgrAlpha_X1_(void);
void dDlst_list_c_NS_set(void);
void dMeter2Info_c_NS_getString(void);
void func_80362324(void);
void func_80362540(void);
void func_803664DC(void);
void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
void J2DTextBox_NS_getStringPtr(void);
void J2DTextBox_NS_setString_X1_(void);
void mDoExt_getMesgFont(void);
void mDoExt_removeMesgFont(void);
void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(void);
void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(void);
void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void);
void __div2i(void);
void __mod2i(void);
void sprintf(void);
void draw__9J2DScreenFffPC14J2DGrafContext(void);
void setPriority__9J2DScreenFPCcUlP10JKRArchive(void);
void getStringPtr__10J2DTextBoxCFv(void);
void setString__10J2DTextBoxFsPCce(void);
void mDoExt_getMesgFont__Fv(void);
void mDoExt_removeMesgFont__Fv(void);
void screenSet__12dFile_info_cFv(void);
void setHeartCnt__12dFile_info_cFP10dSv_save_c(void);
void setPlayTime__12dFile_info_cFP10dSv_save_c(void);
@@ -55,7 +55,7 @@ asm void dFile_info_c::screenSet(void) {
#if NONMATCHING
class JMSMesgEntry_c {};
extern void dMeter2Info_c_NS_getString(u32, char*, JMSMesgEntry_c*);
extern void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(u32, char*, JMSMesgEntry_c*);
extern u8 DAT_804070D8;
extern u16 DAT_804061C2;
extern char DAT_80406374[16];
@@ -63,7 +63,7 @@ extern char DAT_803948D8;
s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) {
if (param_2 == 0) {
dMeter2Info_c_NS_getString(0x51, this->unk56, 0);
getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x51, this->unk56, 0);
return -1;
} else {
if (!save_file->getPlayer().getPlayerInfo().getLinkName()) {
@@ -74,10 +74,10 @@ s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) {
strcpy(this->unk44, DAT_80406374);
strcpy(this->save_date, (char*)DAT_803948D8);
strcpy(this->play_time, (char*)DAT_803948D8);
dMeter2Info_c_NS_getString(0x4d, this->unk56, 0);
getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x4d, this->unk56, 0);
return 2;
} else {
dMeter2Info_c_NS_getString(0x4d, this->unk56, 0);
getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x4d, this->unk56, 0);
return 1;
}
} else {
@@ -131,10 +131,12 @@ asm void dDlst_FileInfo_c::draw(void) {
#include "d/d_file/d_file_sel_info/asm/func_80192D9C.s"
}
asm void _sinit_d_file_sel_info_cpp(void) {
extern "C" {
asm void __sinit_d_file_sel_info_cpp(void) {
nofralloc
#include "d/d_file/d_file_sel_info/asm/func_80192E88.s"
}
}
asm dDlst_FileInfo_c::~dDlst_FileInfo_c() {
nofralloc
src/d/d_item/d_item.cpp
+35 -35
View File
@@ -5,18 +5,18 @@
extern "C" {
int checkItemGet__FUci(u8, int);
int item_getcheck_func_FISHING_ROD_1(void);
u16 dComIfGs_getMaxLifeGauge(void);
int item_getcheck_func_FISHING_ROD_1__Fv(void);
u16 dComIfGs_getMaxLifeGauge__Fv(void);
u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8);
u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
void addBombCount(u8, u8);
void dComIfG_play_c_NS_getLayerNo(int);
void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
void dComIfGs_setSelectEquipClothes(u8);
void dComIfGs_setSelectEquipShield(u8);
void dComIfGs_setSelectEquipSword(u8);
void dMeter2Info_setSword(u8, bool);
void addBombCount__FUcUc(u8, u8);
void getLayerNo__14dComIfG_play_cFi(int);
void setItemBombNumCount__14dComIfG_play_cFUcs(u8, s16);
void dComIfGs_setSelectEquipClothes__FUc(u8);
void dComIfGs_setSelectEquipShield__FUc(u8);
void dComIfGs_setSelectEquipSword__FUc(u8);
void dMeter2Info_setSword__FUcb(u8, bool);
void getItem__17dSv_player_item_cCFib(void);
void isFirstBit__21dSv_player_get_item_cCFUc(void);
void onDungeonItem__12dSv_memBit_cFi(int);
@@ -104,19 +104,19 @@ void item_func_L_MAGIC(void) {
}
void item_func_BOMB_5(void) {
addBombCount(NORMAL_BOMB, 5);
addBombCount__FUcUc(NORMAL_BOMB, 5);
}
void item_func_BOMB_10(void) {
addBombCount(NORMAL_BOMB, 10);
addBombCount__FUcUc(NORMAL_BOMB, 10);
}
void item_func_BOMB_20(void) {
addBombCount(NORMAL_BOMB, 20);
addBombCount__FUcUc(NORMAL_BOMB, 20);
}
void item_func_BOMB_30(void) {
addBombCount(NORMAL_BOMB, 30);
addBombCount__FUcUc(NORMAL_BOMB, 30);
}
void item_func_ARROW_10(void) {
@@ -140,31 +140,31 @@ void item_func_PACHINKO_SHOT(void) {
}
void item_func_WATER_BOMB_5(void) {
addBombCount(WATER_BOMB, 5);
addBombCount__FUcUc(WATER_BOMB, 5);
}
void item_func_WATER_BOMB_10(void) {
addBombCount(WATER_BOMB, 10);
addBombCount__FUcUc(WATER_BOMB, 10);
}
void item_func_WATER_BOMB_20(void) {
addBombCount(WATER_BOMB, 15);
addBombCount__FUcUc(WATER_BOMB, 15);
}
void item_func_WATER_BOMB_30(void) {
addBombCount(WATER_BOMB, 3);
addBombCount__FUcUc(WATER_BOMB, 3);
}
void item_func_BOMB_INSECT_5(void) {
addBombCount(POKE_BOMB, 5);
addBombCount__FUcUc(POKE_BOMB, 5);
}
void item_func_BOMB_INSECT_10(void) {
addBombCount(POKE_BOMB, 10);
addBombCount__FUcUc(POKE_BOMB, 10);
}
void item_func_BOMB_INSECT_20(void) {
addBombCount(POKE_BOMB, 3);
addBombCount__FUcUc(POKE_BOMB, 3);
}
void item_func_BOMB_INSECT_30(void) {
@@ -215,17 +215,17 @@ void item_func_DUNGEON_BACK(void) {
void item_func_SWORD(void) {
dComIfGs_setCollectSword(ORDON_SWORD_FLAG);
dComIfGs_setSelectEquipSword(SWORD);
dComIfGs_setSelectEquipSword__FUc(SWORD);
}
void item_func_MASTER_SWORD(void) {
dComIfGs_setCollectSword(MASTER_SWORD_FLAG);
dComIfGs_setSelectEquipSword(MASTER_SWORD);
dComIfGs_setSelectEquipSword__FUc(MASTER_SWORD);
}
void item_func_WOOD_SHIELD(void) {
dComIfGs_setCollectShield(ORDON_SHIELD_FLAG);
dComIfGs_setSelectEquipShield(WOOD_SHIELD);
dComIfGs_setSelectEquipShield__FUc(WOOD_SHIELD);
}
void item_func_SHIELD(void) {
@@ -241,12 +241,12 @@ void item_func_TKS_LETTER(void) {
}
void item_func_WEAR_CASUAL(void) {
dComIfGs_setSelectEquipClothes(WEARS_CASUAL);
dComIfGs_setSelectEquipClothes__FUc(WEARS_CASUAL);
}
void item_func_WEAR_KOKIRI(void) {
dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG);
dComIfGs_setSelectEquipClothes(WEAR_KOKIRI);
dComIfGs_setSelectEquipClothes__FUc(WEAR_KOKIRI);
}
void item_func_ARMOR(void) {
@@ -281,7 +281,7 @@ void item_func_WALLET_LV3(void) {
void item_func_ZORAS_JEWEL(void) {
int checkFishingRod;
checkFishingRod = item_getcheck_func_FISHING_ROD_1();
checkFishingRod = item_getcheck_func_FISHING_ROD_1__Fv();
if (checkFishingRod != 0) {
dComIfGs_setRodTypeLevelUp();
} else {
@@ -296,7 +296,7 @@ void item_func_HAWK_EYE(void) {
#ifdef NONMATCHING
void item_func_WOOD_STICK(void) {
dComIfGs_setCollectSword(WOODEN_SWORD_FLAG);
dComIfGs_setSelectEquipSword(WOOD_STICK);
dComIfGs_setSelectEquipSword__FUc(WOOD_STICK);
dComIfGs_onSwitch(28, lbl_80450D64); // wrong order
}
#else
@@ -349,7 +349,7 @@ void item_func_KANTERA(void) {
void item_func_LIGHT_SWORD(void) {
dComIfGs_setCollectSword(LIGHT_SWORD_FLAG);
dMeter2Info_setSword(LIGHT_SWORD, 0);
dMeter2Info_setSword__FUcb(LIGHT_SWORD, 0);
}
void item_func_FISHING_ROD_1(void) {
@@ -1117,7 +1117,7 @@ BOOL item_getcheck_func_LIGHT_SWORD(void) {
return dComIfGs_isCollectSword(LIGHT_SWORD_FLAG);
}
asm int item_getcheck_func_FISHING_ROD_1(void) {
asm int item_getcheck_func_FISHING_ROD_1__Fv(void) {
nofralloc
#include "d/d_item/d_item/asm/func_8009A0C8.s"
}
@@ -1171,23 +1171,23 @@ int item_getcheck_func_HAWK_ARROW(void) {
}
BOOL item_getcheck_func_BEE_ROD(void) {
return item_getcheck_func_FISHING_ROD_1();
return item_getcheck_func_FISHING_ROD_1__Fv();
}
BOOL item_getcheck_func_JEWEL_ROD(void) {
return item_getcheck_func_FISHING_ROD_1();
return item_getcheck_func_FISHING_ROD_1__Fv();
}
BOOL item_getcheck_func_WORM_ROD(void) {
return item_getcheck_func_FISHING_ROD_1();
return item_getcheck_func_FISHING_ROD_1__Fv();
}
BOOL item_getcheck_func_JEWEL_BEE_ROD(void) {
return item_getcheck_func_FISHING_ROD_1();
return item_getcheck_func_FISHING_ROD_1__Fv();
}
BOOL item_getcheck_func_JEWEL_WORM_ROD(void) {
return item_getcheck_func_FISHING_ROD_1();
return item_getcheck_func_FISHING_ROD_1__Fv();
}
int item_getcheck_func_EMPTY_BOTTLE(void) {
@@ -1698,7 +1698,7 @@ asm u32 check_itemno(int param1) {
}
#endif
asm void addBombCount(u8 param1, u8 param2) {
asm void addBombCount__FUcUc(u8 param1, u8 param2) {
nofralloc
#include "d/d_item/d_item/asm/func_8009B940.s"
}
src/d/d_kankyo.cpp
+439 -426
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo/d_kankyo_data.cpp
+24 -24
View File
@@ -18,85 +18,85 @@ extern u8 lbl_803A8E98;
extern "C" {
// dKyd_dmpalet_getp__Fv
// dKyd_dmpalet_getp(void)
asm void dKyd_dmpalet_getp(void) {
// dKyd_dmpalet_getp__Fv(void)
asm void dKyd_dmpalet_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_800569DC.s"
}
// dKyd_dmpselect_getp__Fv
// dKyd_dmpselect_getp(void)
asm void dKyd_dmpselect_getp(void) {
// dKyd_dmpselect_getp__Fv(void)
asm void dKyd_dmpselect_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_800569E8.s"
}
// dKyd_dmenvr_getp__Fv
// dKyd_dmenvr_getp(void)
asm void dKyd_dmenvr_getp(void) {
// dKyd_dmenvr_getp__Fv(void)
asm void dKyd_dmenvr_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_800569F4.s"
}
// dKyd_dmvrbox_getp__Fv
// dKyd_dmvrbox_getp(void)
asm void dKyd_dmvrbox_getp(void) {
// dKyd_dmvrbox_getp__Fv(void)
asm void dKyd_dmvrbox_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A00.s"
}
// dKyd_schejule_getp__Fv
// dKyd_schejule_getp(void)
asm void dKyd_schejule_getp(void) {
// dKyd_schejule_getp__Fv(void)
asm void dKyd_schejule_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A0C.s"
}
// dKyd_schejule_boss_getp__Fv
// dKyd_schejule_boss_getp(void)
asm void dKyd_schejule_boss_getp(void) {
// dKyd_schejule_boss_getp__Fv(void)
asm void dKyd_schejule_boss_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A18.s"
}
// dKyd_xfog_table_set__FUc
// dKyd_xfog_table_set(unsigned char)
asm void dKyd_xfog_table_set(void) {
// dKyd_xfog_table_set__FUc(unsigned char)
asm void dKyd_xfog_table_set__FUc(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A24.s"
}
// dKyd_maple_col_getp__Fv
// dKyd_maple_col_getp(void)
asm void dKyd_maple_col_getp(void) {
// dKyd_maple_col_getp__Fv(void)
asm void dKyd_maple_col_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A64.s"
}
// dKyd_darkworld_tbl_getp__Fv
// dKyd_darkworld_tbl_getp(void)
asm void dKyd_darkworld_tbl_getp(void) {
// dKyd_darkworld_tbl_getp__Fv(void)
asm void dKyd_darkworld_tbl_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A70.s"
}
// dKyd_light_size_tbl_getp__Fv
// dKyd_light_size_tbl_getp(void)
asm void dKyd_light_size_tbl_getp(void) {
// dKyd_light_size_tbl_getp__Fv(void)
asm void dKyd_light_size_tbl_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A7C.s"
}
// dKyd_light_tw_size_tbl_getp__Fv
// dKyd_light_tw_size_tbl_getp(void)
asm void dKyd_light_tw_size_tbl_getp(void) {
// dKyd_light_tw_size_tbl_getp__Fv(void)
asm void dKyd_light_tw_size_tbl_getp__Fv(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A88.s"
}
// dKyd_BloomInf_tbl_getp__Fi
// dKyd_BloomInf_tbl_getp(int)
asm void dKyd_BloomInf_tbl_getp(void) {
// dKyd_BloomInf_tbl_getp__Fi(int)
asm void dKyd_BloomInf_tbl_getp__Fi(void) {
nofralloc
#include "d/d_kankyo/d_kankyo_data/asm/func_80056A94.s"
}
src/d/d_kankyo/d_kankyo_rain.cpp
+143 -141
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo/d_kankyo_wether.cpp
+218 -217
View File
File diff suppressed because it is too large Load Diff
src/d/d_kantera_icon_meter.cpp
+15 -15
View File
@@ -7,12 +7,12 @@ extern "C" {
void __ct__9J2DScreenFv(void);
void __dl__FPv(void);
void __nw__FUl(void);
void CPaneMgr_X1_(void);
void CPaneMgrAlpha_NS_setAlphaRate(void);
void dKantera_icon_c_NS_initiate(void);
void dPaneClass_showNullPane(void);
void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void);
void setAlphaRate__13CPaneMgrAlphaFf(void);
void initiate__15dKantera_icon_cFv(void);
void dPaneClass_showNullPane__FP9J2DScreen(void);
void draw__9J2DScreenFffPC14J2DGrafContext(void);
void setPriority__9J2DScreenFPCcUlP10JKRArchive(void);
}
// additional symbols needed for d_kantera_icon_meter.cpp
@@ -29,63 +29,63 @@ extern u8 lbl_8042EBC8;
extern "C" {
// __ct__15dKantera_icon_cFv
// dKantera_icon_c::dKantera_icon_c(void)
asm void dKantera_icon_c(void) {
asm void __ct__15dKantera_icon_cFv(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AE938.s"
}
// __dt__15dKantera_icon_cFv
// dKantera_icon_c::~dKantera_icon_c(void)
asm void func_801AE974(void) {
asm void __dt__15dKantera_icon_cFv(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AE974.s"
}
// initiate__15dKantera_icon_cFv
// dKantera_icon_c::initiate(void)
asm void dKantera_icon_c_NS_initiate(void) {
asm void initiate__15dKantera_icon_cFv(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AEA68.s"
}
// setAlphaRate__15dKantera_icon_cFf
// dKantera_icon_c::setAlphaRate(float)
asm void dKantera_icon_c_NS_setAlphaRate(void) {
asm void setAlphaRate__15dKantera_icon_cFf(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AEB7C.s"
}
// setPos__15dKantera_icon_cFff
// dKantera_icon_c::setPos(float, float)
asm void dKantera_icon_c_NS_setPos(void) {
asm void setPos__15dKantera_icon_cFff(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AEBA0.s"
}
// setScale__15dKantera_icon_cFff
// dKantera_icon_c::setScale(float, float)
asm void dKantera_icon_c_NS_setScale(void) {
asm void setScale__15dKantera_icon_cFff(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AEBF4.s"
}
// setNowGauge__15dKantera_icon_cFUsUs
// dKantera_icon_c::setNowGauge(unsigned short, unsigned short)
asm void dKantera_icon_c_NS_setNowGauge(void) {
asm void setNowGauge__15dKantera_icon_cFUsUs(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AEC44.s"
}
// draw__19dDlst_KanteraIcon_cFv
// dDlst_KanteraIcon_c::draw(void)
asm void func_801AECB8(void) {
asm void draw__19dDlst_KanteraIcon_cFv(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AECB8.s"
}
// __dt__19dDlst_KanteraIcon_cFv
// dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c(void)
asm void func_801AED1C(void) {
asm void __dt__19dDlst_KanteraIcon_cFv(void) {
nofralloc
#include "d/d_kantera_icon_meter/asm/func_801AED1C.s"
}
src/d/d_lib.cpp
+1 -1
View File
@@ -10,7 +10,7 @@ void __mi__4cXyzCFRC3Vec(void);
void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
void findFsResource__10JKRArchiveCFPCcUl(void);
void getAramAddress__14JKRAramArchiveFPCc(void);
void mDoMtx_YrotS(void);
void mDoMtx_YrotS__FPA4_fs(void);
void searchMapEventData__14dEvt_control_cFUc(void);
void Xinit__9STControlFv(void);
void Yinit__9STControlFv(void);
src/d/d_meter.cpp
+49 -49
View File
@@ -5,343 +5,343 @@
extern "C" {
// _create__9dMeter2_cFv
// dMeter2_c::_create(void)
asm void dMeter2_c_NS__create(void) {
asm void _create__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021EA14.s"
}
// _execute__9dMeter2_cFv
// dMeter2_c::_execute(void)
asm void dMeter2_c_NS__execute(void) {
asm void _execute__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F128.s"
}
// _draw__9dMeter2_cFv
// dMeter2_c::_draw(void)
asm void dMeter2_c_NS__draw(void) {
asm void _draw__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F370.s"
}
// _delete__9dMeter2_cFv
// dMeter2_c::_delete(void)
asm void dMeter2_c_NS__delete(void) {
asm void _delete__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F49C.s"
}
// emphasisButtonDelete__9dMeter2_cFv
// dMeter2_c::emphasisButtonDelete(void)
asm void dMeter2_c_NS_emphasisButtonDelete(void) {
asm void emphasisButtonDelete__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F6EC.s"
}
// setLifeZero__9dMeter2_cFv
// dMeter2_c::setLifeZero(void)
asm void func_8021F780(void) {
asm void setLifeZero__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F780.s"
}
// checkStatus__9dMeter2_cFv
// dMeter2_c::checkStatus(void)
asm void dMeter2_c_NS_checkStatus(void) {
asm void checkStatus__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021F7B0.s"
}
// moveLife__9dMeter2_cFv
// dMeter2_c::moveLife(void)
asm void dMeter2_c_NS_moveLife(void) {
asm void moveLife__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8021FD60.s"
}
// moveKantera__9dMeter2_cFv
// dMeter2_c::moveKantera(void)
asm void dMeter2_c_NS_moveKantera(void) {
asm void moveKantera__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80220180.s"
}
// moveOxygen__9dMeter2_cFv
// dMeter2_c::moveOxygen(void)
asm void dMeter2_c_NS_moveOxygen(void) {
asm void moveOxygen__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_8022051C.s"
}
// moveLightDrop__9dMeter2_cFv
// dMeter2_c::moveLightDrop(void)
asm void dMeter2_c_NS_moveLightDrop(void) {
asm void moveLightDrop__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80220888.s"
}
// moveRupee__9dMeter2_cFv
// dMeter2_c::moveRupee(void)
asm void dMeter2_c_NS_moveRupee(void) {
asm void moveRupee__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80220C30.s"
}
// moveKey__9dMeter2_cFv
// dMeter2_c::moveKey(void)
asm void dMeter2_c_NS_moveKey(void) {
asm void moveKey__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802210AC.s"
}
// moveButtonA__9dMeter2_cFv
// dMeter2_c::moveButtonA(void)
asm void dMeter2_c_NS_moveButtonA(void) {
asm void moveButtonA__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80221244.s"
}
// moveButtonB__9dMeter2_cFv
// dMeter2_c::moveButtonB(void)
asm void dMeter2_c_NS_moveButtonB(void) {
asm void moveButtonB__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802217F4.s"
}
// moveButtonR__9dMeter2_cFv
// dMeter2_c::moveButtonR(void)
asm void dMeter2_c_NS_moveButtonR(void) {
asm void moveButtonR__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80221EC8.s"
}
// moveButtonZ__9dMeter2_cFv
// dMeter2_c::moveButtonZ(void)
asm void dMeter2_c_NS_moveButtonZ(void) {
asm void moveButtonZ__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80222000.s"
}
// moveButton3D__9dMeter2_cFv
// dMeter2_c::moveButton3D(void)
asm void dMeter2_c_NS_moveButton3D(void) {
asm void moveButton3D__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802222A0.s"
}
// moveButtonC__9dMeter2_cFv
// dMeter2_c::moveButtonC(void)
asm void dMeter2_c_NS_moveButtonC(void) {
asm void moveButtonC__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80222364.s"
}
// moveButtonS__9dMeter2_cFv
// dMeter2_c::moveButtonS(void)
asm void dMeter2_c_NS_moveButtonS(void) {
asm void moveButtonS__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80222494.s"
}
// moveButtonXY__9dMeter2_cFv
// dMeter2_c::moveButtonXY(void)
asm void dMeter2_c_NS_moveButtonXY(void) {
asm void moveButtonXY__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80222518.s"
}
// moveButtonCross__9dMeter2_cFv
// dMeter2_c::moveButtonCross(void)
asm void dMeter2_c_NS_moveButtonCross(void) {
asm void moveButtonCross__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80222E88.s"
}
// moveTouchSubMenu__9dMeter2_cFv
// dMeter2_c::moveTouchSubMenu(void)
asm void dMeter2_c_NS_moveTouchSubMenu(void) {
asm void moveTouchSubMenu__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802230F8.s"
}
// moveSubContents__9dMeter2_cFv
// dMeter2_c::moveSubContents(void)
asm void dMeter2_c_NS_moveSubContents(void) {
asm void moveSubContents__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802230FC.s"
}
// move2DContents__9dMeter2_cFv
// dMeter2_c::move2DContents(void)
asm void dMeter2_c_NS_move2DContents(void) {
asm void move2DContents__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802231C8.s"
}
// checkSubContents__9dMeter2_cFv
// dMeter2_c::checkSubContents(void)
asm void dMeter2_c_NS_checkSubContents(void) {
asm void checkSubContents__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802237D4.s"
}
// check2DContents__9dMeter2_cFv
// dMeter2_c::check2DContents(void)
asm void dMeter2_c_NS_check2DContents(void) {
asm void check2DContents__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80223BC4.s"
}
// moveBombNum__9dMeter2_cFv
// dMeter2_c::moveBombNum(void)
asm void dMeter2_c_NS_moveBombNum(void) {
asm void moveBombNum__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80223E00.s"
}
// moveBottleNum__9dMeter2_cFv
// dMeter2_c::moveBottleNum(void)
asm void dMeter2_c_NS_moveBottleNum(void) {
asm void moveBottleNum__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224258.s"
}
// moveArrowNum__9dMeter2_cFv
// dMeter2_c::moveArrowNum(void)
asm void dMeter2_c_NS_moveArrowNum(void) {
asm void moveArrowNum__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224354.s"
}
// movePachinkoNum__9dMeter2_cFv
// dMeter2_c::movePachinkoNum(void)
asm void dMeter2_c_NS_movePachinkoNum(void) {
asm void movePachinkoNum__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224680.s"
}
// alphaAnimeLife__9dMeter2_cFv
// dMeter2_c::alphaAnimeLife(void)
asm void dMeter2_c_NS_alphaAnimeLife(void) {
asm void alphaAnimeLife__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802248E4.s"
}
// alphaAnimeKantera__9dMeter2_cFv
// dMeter2_c::alphaAnimeKantera(void)
asm void dMeter2_c_NS_alphaAnimeKantera(void) {
asm void alphaAnimeKantera__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224A04.s"
}
// alphaAnimeOxygen__9dMeter2_cFv
// dMeter2_c::alphaAnimeOxygen(void)
asm void dMeter2_c_NS_alphaAnimeOxygen(void) {
asm void alphaAnimeOxygen__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224BAC.s"
}
// alphaAnimeLightDrop__9dMeter2_cFv
// dMeter2_c::alphaAnimeLightDrop(void)
asm void dMeter2_c_NS_alphaAnimeLightDrop(void) {
asm void alphaAnimeLightDrop__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224D6C.s"
}
// alphaAnimeRupee__9dMeter2_cFv
// dMeter2_c::alphaAnimeRupee(void)
asm void dMeter2_c_NS_alphaAnimeRupee(void) {
asm void alphaAnimeRupee__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224DC0.s"
}
// alphaAnimeKey__9dMeter2_cFv
// dMeter2_c::alphaAnimeKey(void)
asm void dMeter2_c_NS_alphaAnimeKey(void) {
asm void alphaAnimeKey__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80224F70.s"
}
// alphaAnimeButton__9dMeter2_cFv
// dMeter2_c::alphaAnimeButton(void)
asm void dMeter2_c_NS_alphaAnimeButton(void) {
asm void alphaAnimeButton__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802250F4.s"
}
// alphaAnimeButtonCross__9dMeter2_cFv
// dMeter2_c::alphaAnimeButtonCross(void)
asm void dMeter2_c_NS_alphaAnimeButtonCross(void) {
asm void alphaAnimeButtonCross__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802254C0.s"
}
// isShowLightDrop__9dMeter2_cFv
// dMeter2_c::isShowLightDrop(void)
asm void dMeter2_c_NS_isShowLightDrop(void) {
asm void isShowLightDrop__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802256DC.s"
}
// killSubContents__9dMeter2_cFUc
// dMeter2_c::killSubContents(unsigned char)
asm void dMeter2_c_NS_killSubContents(void) {
asm void killSubContents__9dMeter2_cFUc(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802258A0.s"
}
// isKeyVisible__9dMeter2_cFv
// dMeter2_c::isKeyVisible(void)
asm void dMeter2_c_NS_isKeyVisible(void) {
asm void isKeyVisible__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225960.s"
}
// isArrowEquip__9dMeter2_cFv
// dMeter2_c::isArrowEquip(void)
asm void dMeter2_c_NS_isArrowEquip(void) {
asm void isArrowEquip__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_802259F8.s"
}
// isPachinkoEquip__9dMeter2_cFv
// dMeter2_c::isPachinkoEquip(void)
asm void dMeter2_c_NS_isPachinkoEquip(void) {
asm void isPachinkoEquip__9dMeter2_cFv(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225A64.s"
}
// dMeter2_Draw__FP9dMeter2_c
// dMeter2_Draw(dMeter2_c*)
asm void func_80225AA0(void) {
asm void dMeter2_Draw__FP9dMeter2_c(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225AA0.s"
}
// dMeter2_Execute__FP9dMeter2_c
// dMeter2_Execute(dMeter2_c*)
asm void func_80225AC0(void) {
asm void dMeter2_Execute__FP9dMeter2_c(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225AC0.s"
}
// dMeter2_IsDelete__FP9dMeter2_c
// dMeter2_IsDelete(dMeter2_c*)
asm void func_80225AE0(void) {
asm void dMeter2_IsDelete__FP9dMeter2_c(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225AE0.s"
}
// dMeter2_Delete__FP9dMeter2_c
// dMeter2_Delete(dMeter2_c*)
asm void func_80225AE8(void) {
asm void dMeter2_Delete__FP9dMeter2_c(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225AE8.s"
}
// dMeter2_Create__FP9msg_class
// dMeter2_Create(msg_class*)
asm void func_80225B08(void) {
asm void dMeter2_Create__FP9msg_class(void) {
nofralloc
#include "d/d_meter2/d_meter2/asm/func_80225B08.s"
}
src/d/d_meter/d_meter_HIO.cpp
+40 -40
View File
@@ -5,14 +5,14 @@
extern "C" {
void __dl__FPv(void);
void cXyz_NS_ctor(void);
void cXyz_NS_dtor(void);
void dMeter_fmapHIO_c_NS_MapBlinkAnime(void);
void __ct__4cXyzFv(void);
void __dt__4cXyzFv(void);
void __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv(void);
void free__7JKRHeapFPv(void);
void func_80361C24(void);
void func_80361CE8(void);
void func_80361D60(void);
void JUtility_NS_TColor(void);
void __destroy_arr(void);
void __construct_array(void);
void __ct__Q28JUtility6TColorFv(void);
}
// additional symbols needed for d_meter_HIO.cpp
@@ -192,238 +192,238 @@ extern u8 lbl_80454668;
extern "C" {
// __ct__16dMeter_menuHIO_cFv
// dMeter_menuHIO_c::dMeter_menuHIO_c(void)
asm void dMeter_menuHIO_c(void) {
asm void __ct__16dMeter_menuHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE330.s"
}
// __ct__23dMeter_drawCollectHIO_cFv
// dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c(void)
asm void dMeter_drawCollectHIO_c(void) {
asm void __ct__23dMeter_drawCollectHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE348.s"
}
// __ct__22dMeter_drawOptionHIO_cFv
// dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c(void)
asm void dMeter_drawOptionHIO_c(void) {
asm void __ct__22dMeter_drawOptionHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE4EC.s"
}
// __ct__22dMeter_drawLetterHIO_cFv
// dMeter_drawLetterHIO_c::dMeter_drawLetterHIO_c(void)
asm void dMeter_drawLetterHIO_c(void) {
asm void __ct__22dMeter_drawLetterHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE5CC.s"
}
// __ct__23dMeter_drawFishingHIO_cFv
// dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c(void)
asm void dMeter_drawFishingHIO_c(void) {
asm void __ct__23dMeter_drawFishingHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE730.s"
}
// __ct__22dMeter_drawInsectHIO_cFv
// dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c(void)
asm void dMeter_drawInsectHIO_c(void) {
asm void __ct__22dMeter_drawInsectHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE8DC.s"
}
// __ct__27dMeter_drawCalibrationHIO_cFv
// dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c(void)
asm void dMeter_drawCalibrationHIO_c(void) {
asm void __ct__27dMeter_drawCalibrationHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE954.s"
}
// __ct__21dMeter_drawSkillHIO_cFv
// dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c(void)
asm void dMeter_drawSkillHIO_c(void) {
asm void __ct__21dMeter_drawSkillHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FE990.s"
}
// __ct__25dMeter_drawEmpButtonHIO_cFv
// dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c(void)
asm void dMeter_drawEmpButtonHIO_c(void) {
asm void __ct__25dMeter_drawEmpButtonHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FEAF0.s"
}
// __ct__24dMeter_drawMiniGameHIO_cFv
// dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c(void)
asm void dMeter_drawMiniGameHIO_c(void) {
asm void __ct__24dMeter_drawMiniGameHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FEFF0.s"
}
// __ct__25dMeter_drawLightDropHIO_cFv
// dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c(void)
asm void dMeter_drawLightDropHIO_c(void) {
asm void __ct__25dMeter_drawLightDropHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FF31C.s"
}
// __ct__16dMeter_drawHIO_cFv
// dMeter_drawHIO_c::dMeter_drawHIO_c(void)
asm void dMeter_drawHIO_c(void) {
asm void __ct__16dMeter_drawHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_801FF5B8.s"
}
// __ct__16dMeter_ringHIO_cFv
// dMeter_ringHIO_c::dMeter_ringHIO_c(void)
asm void dMeter_ringHIO_c(void) {
asm void __ct__16dMeter_ringHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_802001AC.s"
}
// __ct__19dMeter_mapIconHIO_cFv
// dMeter_mapIconHIO_c::dMeter_mapIconHIO_c(void)
asm void dMeter_mapIconHIO_c(void) {
asm void __ct__19dMeter_mapIconHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_802004B4.s"
}
// __ct__16dMeter_fmapHIO_cFv
// dMeter_fmapHIO_c::dMeter_fmapHIO_c(void)
asm void dMeter_fmapHIO_c(void) {
asm void __ct__16dMeter_fmapHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_802006C8.s"
}
// __dt__16dMeter_fmapHIO_cFv
// dMeter_fmapHIO_c::~dMeter_fmapHIO_c(void)
asm void dMeter_fmapHIO_c_NS_dtor(void) {
asm void __dt__16dMeter_fmapHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200BCC.s"
}
// __ct__18dMeter_cursorHIO_cFv
// dMeter_cursorHIO_c::dMeter_cursorHIO_c(void)
asm void dMeter_cursorHIO_c(void) {
asm void __ct__18dMeter_cursorHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200CD4.s"
}
// __dt__25dMeter_drawLightDropHIO_cFv
// dMeter_drawLightDropHIO_c::~dMeter_drawLightDropHIO_c(void)
asm void func_80200D58(void) {
asm void __dt__25dMeter_drawLightDropHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200D58.s"
}
// __dt__25dMeter_drawEmpButtonHIO_cFv
// dMeter_drawEmpButtonHIO_c::~dMeter_drawEmpButtonHIO_c(void)
asm void func_80200DA0(void) {
asm void __dt__25dMeter_drawEmpButtonHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200DA0.s"
}
// __dt__24dMeter_drawMiniGameHIO_cFv
// dMeter_drawMiniGameHIO_c::~dMeter_drawMiniGameHIO_c(void)
asm void func_80200DE8(void) {
asm void __dt__24dMeter_drawMiniGameHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200DE8.s"
}
// __dt__21dMeter_drawSkillHIO_cFv
// dMeter_drawSkillHIO_c::~dMeter_drawSkillHIO_c(void)
asm void func_80200E30(void) {
asm void __dt__21dMeter_drawSkillHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200E30.s"
}
// __dt__27dMeter_drawCalibrationHIO_cFv
// dMeter_drawCalibrationHIO_c::~dMeter_drawCalibrationHIO_c(void)
asm void func_80200E78(void) {
asm void __dt__27dMeter_drawCalibrationHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200E78.s"
}
// __dt__22dMeter_drawInsectHIO_cFv
// dMeter_drawInsectHIO_c::~dMeter_drawInsectHIO_c(void)
asm void func_80200EC0(void) {
asm void __dt__22dMeter_drawInsectHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200EC0.s"
}
// __dt__23dMeter_drawFishingHIO_cFv
// dMeter_drawFishingHIO_c::~dMeter_drawFishingHIO_c(void)
asm void func_80200F08(void) {
asm void __dt__23dMeter_drawFishingHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200F08.s"
}
// __dt__22dMeter_drawLetterHIO_cFv
// dMeter_drawLetterHIO_c::~dMeter_drawLetterHIO_c(void)
asm void func_80200F50(void) {
asm void __dt__22dMeter_drawLetterHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200F50.s"
}
// __dt__22dMeter_drawOptionHIO_cFv
// dMeter_drawOptionHIO_c::~dMeter_drawOptionHIO_c(void)
asm void func_80200F98(void) {
asm void __dt__22dMeter_drawOptionHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200F98.s"
}
// __dt__23dMeter_drawCollectHIO_cFv
// dMeter_drawCollectHIO_c::~dMeter_drawCollectHIO_c(void)
asm void func_80200FE0(void) {
asm void __dt__23dMeter_drawCollectHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80200FE0.s"
}
// __dt__19dMeter_mapIconHIO_cFv
// dMeter_mapIconHIO_c::~dMeter_mapIconHIO_c(void)
asm void func_80201028(void) {
asm void __dt__19dMeter_mapIconHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80201028.s"
}
// __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv
// dMeter_fmapHIO_c::MapBlinkAnime::dMeter_fmapHIO_c::MapBlinkAnime(void)
asm void dMeter_fmapHIO_c_NS_MapBlinkAnime(void) {
asm void __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80201070.s"
}
// __dt__18dMeter_cursorHIO_cFv
// dMeter_cursorHIO_c::~dMeter_cursorHIO_c(void)
asm void dMeter_cursorHIO_c_NS_dtor(void) {
asm void __dt__18dMeter_cursorHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80201098.s"
}
// __dt__16dMeter_ringHIO_cFv
// dMeter_ringHIO_c::~dMeter_ringHIO_c(void)
asm void dMeter_ringHIO_c_NS_dtor(void) {
asm void __dt__16dMeter_ringHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_802010E0.s"
}
// __dt__16dMeter_drawHIO_cFv
// dMeter_drawHIO_c::~dMeter_drawHIO_c(void)
asm void dMeter_drawHIO_c_NS_dtor(void) {
asm void __dt__16dMeter_drawHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80201128.s"
}
// __dt__16dMeter_menuHIO_cFv
// dMeter_menuHIO_c::~dMeter_menuHIO_c(void)
asm void dMeter_menuHIO_c_NS_dtor(void) {
asm void __dt__16dMeter_menuHIO_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_8020123C.s"
}
// __sinit_d_meter_HIO_cpp
//
asm void func_80201284(void) {
asm void __sinit_d_meter_HIO_cpp(void) {
nofralloc
#include "d/d_meter/d_meter_HIO/asm/func_80201284.s"
}
src/d/d_meter/d_meter_button.cpp
+217 -215
View File
File diff suppressed because it is too large Load Diff
src/d/d_meter/d_meter_haihai.cpp
+33 -33
View File
@@ -8,22 +8,22 @@ void __ct__9J2DScreenFv(void);
void __dl__FPv(void);
void __nw__FUl(void);
void animationTransform__7J2DPaneFv(void);
void CPaneMgr_X1_(void);
void dMeterHaihai_c_NS_alphaAnimeHaihai(void);
void dMeterHaihai_c_NS_drawHaihaiBottom(void);
void dMeterHaihai_c_NS_drawHaihaiLeft(void);
void dMeterHaihai_c_NS_drawHaihaiRight(void);
void dMeterHaihai_c_NS_drawHaihaiTop(void);
void dMeterHaihai_c_NS_playBckAnime(void);
void dMeterHaihai_c_NS_playBpkAnime(void);
void dMeterHaihai_c_NS_playBtkAnime(void);
void dMeterHaihai_c_NS_updateHaihai(void);
void dPaneClass_showNullPane(void);
void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void);
void alphaAnimeHaihai__14dMeterHaihai_cFUl(void);
void drawHaihaiBottom__14dMeterHaihai_cFff(void);
void drawHaihaiLeft__14dMeterHaihai_cFff(void);
void drawHaihaiRight__14dMeterHaihai_cFff(void);
void drawHaihaiTop__14dMeterHaihai_cFff(void);
void playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey(void);
void playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor(void);
void playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey(void);
void updateHaihai__14dMeterHaihai_cFv(void);
void dPaneClass_showNullPane__FP9J2DScreen(void);
void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
void J2DAnmLoaderDataBase_NS_load(void);
void J2DScreen_NS_animation(void);
void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
void load__20J2DAnmLoaderDataBaseFPCv(void);
void animation__9J2DScreenFv(void);
void draw__9J2DScreenFffPC14J2DGrafContext(void);
void setPriority__9J2DScreenFPCcUlP10JKRArchive(void);
void rotate__7J2DPaneFff13J2DRotateAxisf(void);
}
@@ -56,126 +56,126 @@ extern u8 lbl_8042EBC8;
extern "C" {
// __ct__14dMeterHaihai_cFUc
// dMeterHaihai_c::dMeterHaihai_c(unsigned char)
asm void dMeterHaihai_c(void) {
asm void __ct__14dMeterHaihai_cFUc(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020AE8C.s"
}
// __dt__14dMeterHaihai_cFv
// dMeterHaihai_c::~dMeterHaihai_c(void)
asm void func_8020AEF0(void) {
asm void __dt__14dMeterHaihai_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020AEF0.s"
}
// _create__14dMeterHaihai_cFv
// dMeterHaihai_c::_create(void)
asm void func_8020AF6C(void) {
asm void _create__14dMeterHaihai_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020AF6C.s"
}
// _execute__14dMeterHaihai_cFUl
// dMeterHaihai_c::_execute(unsigned long)
asm void func_8020B0F4(void) {
asm void _execute__14dMeterHaihai_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020B0F4.s"
}
// draw__14dMeterHaihai_cFv
// dMeterHaihai_c::draw(void)
asm void func_8020B140(void) {
asm void draw__14dMeterHaihai_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020B140.s"
}
// drawHaihai__14dMeterHaihai_cFUc
// dMeterHaihai_c::drawHaihai(unsigned char)
asm void dMeterHaihai_c_NS_drawHaihai(void) {
asm void drawHaihai__14dMeterHaihai_cFUc(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020B518.s"
}
// drawHaihai__14dMeterHaihai_cFUcffff
// dMeterHaihai_c::drawHaihai(unsigned char, float, float, float, float)
asm void dMeterHaihai_c_NS_drawHaihai_X1_(void) {
asm void drawHaihai__14dMeterHaihai_cFUcffff(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020B814.s"
}
// drawHaihaiLeft__14dMeterHaihai_cFff
// dMeterHaihai_c::drawHaihaiLeft(float, float)
asm void dMeterHaihai_c_NS_drawHaihaiLeft(void) {
asm void drawHaihaiLeft__14dMeterHaihai_cFff(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020B9B0.s"
}
// drawHaihaiRight__14dMeterHaihai_cFff
// dMeterHaihai_c::drawHaihaiRight(float, float)
asm void dMeterHaihai_c_NS_drawHaihaiRight(void) {
asm void drawHaihaiRight__14dMeterHaihai_cFff(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BA4C.s"
}
// drawHaihaiTop__14dMeterHaihai_cFff
// dMeterHaihai_c::drawHaihaiTop(float, float)
asm void dMeterHaihai_c_NS_drawHaihaiTop(void) {
asm void drawHaihaiTop__14dMeterHaihai_cFff(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BAE8.s"
}
// drawHaihaiBottom__14dMeterHaihai_cFff
// dMeterHaihai_c::drawHaihaiBottom(float, float)
asm void dMeterHaihai_c_NS_drawHaihaiBottom(void) {
asm void drawHaihaiBottom__14dMeterHaihai_cFff(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BB84.s"
}
// setScale__14dMeterHaihai_cFf
// dMeterHaihai_c::setScale(float)
asm void dMeterHaihai_c_NS_setScale(void) {
asm void setScale__14dMeterHaihai_cFf(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BC20.s"
}
// _delete__14dMeterHaihai_cFv
// dMeterHaihai_c::_delete(void)
asm void func_8020BDAC(void) {
asm void _delete__14dMeterHaihai_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BDAC.s"
}
// alphaAnimeHaihai__14dMeterHaihai_cFUl
// dMeterHaihai_c::alphaAnimeHaihai(unsigned long)
asm void dMeterHaihai_c_NS_alphaAnimeHaihai(void) {
asm void alphaAnimeHaihai__14dMeterHaihai_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BEA0.s"
}
// updateHaihai__14dMeterHaihai_cFv
// dMeterHaihai_c::updateHaihai(void)
asm void dMeterHaihai_c_NS_updateHaihai(void) {
asm void updateHaihai__14dMeterHaihai_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BEA4.s"
}
// playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey
// dMeterHaihai_c::playBckAnime(J2DAnmTransformKey*)
asm void dMeterHaihai_c_NS_playBckAnime(void) {
asm void playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020BF00.s"
}
// playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey
// dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey*)
asm void dMeterHaihai_c_NS_playBtkAnime(void) {
asm void playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020C078.s"
}
// playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor
// dMeterHaihai_c::playBpkAnime(J2DAnmColor*)
asm void dMeterHaihai_c_NS_playBpkAnime(void) {
asm void playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor(void) {
nofralloc
#include "d/d_meter/d_meter_haihai/asm/func_8020C1CC.s"
}
src/d/d_meter/d_meter_hakusha.cpp
+35 -34
View File
@@ -8,27 +8,28 @@ int strcmp(const char*, const char*);
void __ct__9J2DScreenFv(void);
void __dl__FPv(void);
void __nw__FUl(void);
void CPaneMgr_NS_getGlobalVtxCenter(void);
void CPaneMgr_NS_paneTrans(void);
void CPaneMgr_X1_(void);
void CPaneMgrAlpha_NS_getAlphaRate(void);
void CPaneMgrAlpha_NS_hide(void);
void CPaneMgrAlpha_NS_setAlphaRate(void);
void CPaneMgrAlpha_NS_show(void);
void dComIfG_play_c_NS_getLayerNo(int);
void dMeter2Draw_c_NS_drawPikariHakusha(void);
void dMeter2Draw_c_NS_setAlphaAnimeMax(void);
void dMeter2Draw_c_NS_setAlphaAnimeMin(void);
void dMeterHakusha_c_NS_alphaAnimeHakusha(void);
void dMeterHakusha_c_NS_getHakushaNum(void);
void dMeterHakusha_c_NS_setAlphaButtonAnimeMax(void);
void dMeterHakusha_c_NS_setAlphaButtonAnimeMin(void);
void dMeterHakusha_c_NS_setAlphaHakushaAnimeMax(void);
void dMeterHakusha_c_NS_setAlphaHakushaAnimeMin(void);
void dMeterHakusha_c_NS_updateHakusha(void);
void dPaneClass_showNullPane(void);
void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void);
void paneTrans__8CPaneMgrFff(void);
void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void);
void getAlphaRate__13CPaneMgrAlphaFv(void);
void hide__13CPaneMgrAlphaFv(void);
void setAlphaRate__13CPaneMgrAlphaFf(void);
void show__13CPaneMgrAlphaFv(void);
void getLayerNo__14dComIfG_play_cFi(int);
void drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(
void);
void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(void);
void setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas(void);
void alphaAnimeHakusha__15dMeterHakusha_cFUl(void);
void getHakushaNum__15dMeterHakusha_cFv(void);
void setAlphaButtonAnimeMax__15dMeterHakusha_cFv(void);
void setAlphaButtonAnimeMin__15dMeterHakusha_cFv(void);
void setAlphaHakushaAnimeMax__15dMeterHakusha_cFv(void);
void setAlphaHakushaAnimeMin__15dMeterHakusha_cFv(void);
void updateHakusha__15dMeterHakusha_cFv(void);
void dPaneClass_showNullPane__FP9J2DScreen(void);
void draw__9J2DScreenFffPC14J2DGrafContext(void);
void setPriority__9J2DScreenFPCcUlP10JKRArchive(void);
}
// additional symbols needed for d_meter_hakusha.cpp
@@ -51,91 +52,91 @@ extern u8 lbl_8042EBC8;
extern "C" {
// __ct__15dMeterHakusha_cFPv
// dMeterHakusha_c::dMeterHakusha_c(void*)
asm void dMeterHakusha_c(void) {
asm void __ct__15dMeterHakusha_cFPv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020C320.s"
}
// __dt__15dMeterHakusha_cFv
// dMeterHakusha_c::~dMeterHakusha_c(void)
asm void func_8020C384(void) {
asm void __dt__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020C384.s"
}
// _create__15dMeterHakusha_cFv
// dMeterHakusha_c::_create(void)
asm void func_8020C400(void) {
asm void _create__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020C400.s"
}
// _execute__15dMeterHakusha_cFUl
// dMeterHakusha_c::_execute(unsigned long)
asm void func_8020C808(void) {
asm void _execute__15dMeterHakusha_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020C808.s"
}
// draw__15dMeterHakusha_cFv
// dMeterHakusha_c::draw(void)
asm void func_8020C850(void) {
asm void draw__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020C850.s"
}
// _delete__15dMeterHakusha_cFv
// dMeterHakusha_c::_delete(void)
asm void func_8020CABC(void) {
asm void _delete__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020CABC.s"
}
// alphaAnimeHakusha__15dMeterHakusha_cFUl
// dMeterHakusha_c::alphaAnimeHakusha(unsigned long)
asm void dMeterHakusha_c_NS_alphaAnimeHakusha(void) {
asm void alphaAnimeHakusha__15dMeterHakusha_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020CC58.s"
}
// updateHakusha__15dMeterHakusha_cFv
// dMeterHakusha_c::updateHakusha(void)
asm void dMeterHakusha_c_NS_updateHakusha(void) {
asm void updateHakusha__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s"
}
// setAlphaHakushaAnimeMin__15dMeterHakusha_cFv
// dMeterHakusha_c::setAlphaHakushaAnimeMin(void)
asm void dMeterHakusha_c_NS_setAlphaHakushaAnimeMin(void) {
asm void setAlphaHakushaAnimeMin__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020D258.s"
}
// setAlphaHakushaAnimeMax__15dMeterHakusha_cFv
// dMeterHakusha_c::setAlphaHakushaAnimeMax(void)
asm void dMeterHakusha_c_NS_setAlphaHakushaAnimeMax(void) {
asm void setAlphaHakushaAnimeMax__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020D308.s"
}
// setAlphaButtonAnimeMin__15dMeterHakusha_cFv
// dMeterHakusha_c::setAlphaButtonAnimeMin(void)
asm void dMeterHakusha_c_NS_setAlphaButtonAnimeMin(void) {
asm void setAlphaButtonAnimeMin__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s"
}
// setAlphaButtonAnimeMax__15dMeterHakusha_cFv
// dMeterHakusha_c::setAlphaButtonAnimeMax(void)
asm void dMeterHakusha_c_NS_setAlphaButtonAnimeMax(void) {
asm void setAlphaButtonAnimeMax__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020D41C.s"
}
// getHakushaNum__15dMeterHakusha_cFv
// dMeterHakusha_c::getHakushaNum(void)
asm void dMeterHakusha_c_NS_getHakushaNum(void) {
asm void getHakushaNum__15dMeterHakusha_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_hakusha/asm/func_8020D480.s"
}
src/d/d_meter/d_meter_map.cpp
+51 -51
View File
@@ -8,36 +8,36 @@
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
extern "C" {
void fopOvlpM_IsDoingReq__Fv(void);
bool dComIfGp_checkMapShow(void);
bool dComIfGp_checkMapShow__Fv(void);
int strcmp(const char*, const char*);
void __dl__FPv(void);
void __nw__FUl(void);
void cLib_addCalcAngleS__FPsssss(void);
void dComIfGp_mapHide(void);
void dComIfGp_mapShow(void);
void dDlst_list_c_NS_set(void);
void dMap_c_NS__draw(void);
void dMap_c_NS__move(void);
void dMap_c(void);
void dMapInfo_n_NS_getMapPlayerPos(void);
void dMeter2Info_set2DVibration(void);
void dMeterMap_c_NS__create(void);
void dMeterMap_c_NS__delete(void);
void dMeterMap_c_NS_checkMoveStatus(void);
void dMeterMap_c_NS_ctrlShowMap(void);
void dMeterMap_c_NS_getMapDispSizeTypeNo(void);
void dMeterMap_c_NS_isDmapScreen(void);
void dMeterMap_c_NS_isFmapScreen(void);
void dMeterMap_c_NS_isShow(void);
void dMeterMap_c_NS_keyCheck(void);
void dMpath_c_NS_isExistMapPathData(void);
void dMsgObject_c_NS_getStatus(void);
void dMw_LEFT_TRIGGER(void);
void dMw_RIGHT_TRIGGER(void);
void dStage_roomControl_c_NS_getStatusRoomDt(void);
void dComIfGp_mapHide__Fv(void);
void dComIfGp_mapShow__Fv(void);
void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(void);
void _draw__6dMap_cFv(void);
void _move__6dMap_cFffif(void);
void __ct__6dMap_cFiiii(void);
void getMapPlayerPos__10dMapInfo_nFv(void);
void dMeter2Info_set2DVibration__Fv(void);
void _create__11dMeterMap_cFP9J2DScreen(void);
void _delete__11dMeterMap_cFv(void);
void checkMoveStatus__11dMeterMap_cFv(void);
void ctrlShowMap__11dMeterMap_cFv(void);
void getMapDispSizeTypeNo__11dMeterMap_cFv(void);
void isDmapScreen__11dMeterMap_cFv(void);
void isFmapScreen__11dMeterMap_cFv(void);
void isShow__11dMeterMap_cFUl(void);
void keyCheck__11dMeterMap_cFv(void);
void isExistMapPathData__8dMpath_cFv(void);
void getStatus__12dMsgObject_cFv(void);
void dMw_LEFT_TRIGGER__Fv(void);
void dMw_RIGHT_TRIGGER__Fv(void);
void getStatusRoomDt__20dStage_roomControl_cFi(void);
void isDungeonItem__12dSv_memBit_cCFi(void);
void isEventBit__11dSv_event_cCFUs(void);
void J2DPicture_X3_(void);
void __ct__10J2DPictureFPC7ResTIMG(void);
void onEventBit__11dSv_event_cFUs(void);
}
@@ -61,189 +61,189 @@ extern u8 lbl_803A7288;
extern "C" {
// isEnableDispMap__11dMeterMap_cFv
// dMeterMap_c::isEnableDispMap(void)
asm void dMeterMap_c_NS_isEnableDispMap(void) {
asm void isEnableDispMap__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D49C.s"
}
// getMapDispSizeTypeNo__11dMeterMap_cFv
// dMeterMap_c::getMapDispSizeTypeNo(void)
asm void dMeterMap_c_NS_getMapDispSizeTypeNo(void) {
asm void getMapDispSizeTypeNo__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D528.s"
}
// isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv
// dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo(void)
asm void dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo(void) {
asm void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D650.s"
}
// getMapDispEdgeBottomY_Layout__11dMeterMap_cFv
// dMeterMap_c::getMapDispEdgeBottomY_Layout(void)
asm void dMeterMap_c_NS_getMapDispEdgeBottomY_Layout(void) {
asm void getMapDispEdgeBottomY_Layout__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D690.s"
}
// isEventRunCheck__11dMeterMap_cFv
// dMeterMap_c::isEventRunCheck(void)
asm void dMeterMap_c_NS_isEventRunCheck(void) {
asm void isEventRunCheck__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D698.s"
}
// getMapDispEdgeLeftX_Layout__11dMeterMap_cFv
// dMeterMap_c::getMapDispEdgeLeftX_Layout(void)
asm void dMeterMap_c_NS_getMapDispEdgeLeftX_Layout(void) {
asm void getMapDispEdgeLeftX_Layout__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D72C.s"
}
// getMapDispEdgeTop__11dMeterMap_cFv
// dMeterMap_c::getMapDispEdgeTop(void)
asm void dMeterMap_c_NS_getMapDispEdgeTop(void) {
asm void getMapDispEdgeTop__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D75C.s"
}
// getDispPosInside_OffsetX__11dMeterMap_cFv
// dMeterMap_c::getDispPosInside_OffsetX(void)
asm void dMeterMap_c_NS_getDispPosInside_OffsetX(void) {
asm void getDispPosInside_OffsetX__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D7E4.s"
}
// getDispPosOutSide_OffsetX__11dMeterMap_cFv
// dMeterMap_c::getDispPosOutSide_OffsetX(void)
asm void dMeterMap_c_NS_getDispPosOutSide_OffsetX(void) {
asm void getDispPosOutSide_OffsetX__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D7EC.s"
}
// setDispPosInsideFlg_SE_On__11dMeterMap_cFv
// dMeterMap_c::setDispPosInsideFlg_SE_On(void)
asm void dMeterMap_c_NS_setDispPosInsideFlg_SE_On(void) {
asm void setDispPosInsideFlg_SE_On__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D874.s"
}
// setDispPosOutsideFlg_SE_On__11dMeterMap_cFv
// dMeterMap_c::setDispPosOutsideFlg_SE_On(void)
asm void dMeterMap_c_NS_setDispPosOutsideFlg_SE_On(void) {
asm void setDispPosOutsideFlg_SE_On__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D8BC.s"
}
// setMapAlpha__11dMeterMap_cFUc
// dMeterMap_c::setMapAlpha(unsigned char)
asm void dMeterMap_c_NS_setMapAlpha(void) {
asm void setMapAlpha__11dMeterMap_cFUc(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D8F8.s"
}
// isMapOpenCheck__11dMeterMap_cFv
// dMeterMap_c::isMapOpenCheck(void)
asm void dMeterMap_c_NS_isMapOpenCheck(void) {
asm void isMapOpenCheck__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D900.s"
}
// __ct__11dMeterMap_cFP9J2DScreen
// dMeterMap_c::dMeterMap_c(J2DScreen*)
asm void dMeterMap_c(void) {
asm void __ct__11dMeterMap_cFP9J2DScreen(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D948.s"
}
// __dt__11dMeterMap_cFv
// dMeterMap_c::~dMeterMap_c(void)
asm void func_8020D990(void) {
asm void __dt__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D990.s"
}
// _create__11dMeterMap_cFP9J2DScreen
// dMeterMap_c::_create(J2DScreen*)
asm void dMeterMap_c_NS__create(void) {
asm void _create__11dMeterMap_cFP9J2DScreen(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020D9EC.s"
}
// _delete__11dMeterMap_cFv
// dMeterMap_c::_delete(void)
asm void dMeterMap_c_NS__delete(void) {
asm void _delete__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020DC50.s"
}
// _move__11dMeterMap_cFUl
// dMeterMap_c::_move(unsigned long)
asm void dMeterMap_c_NS__move(void) {
asm void _move__11dMeterMap_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020DCE4.s"
}
// _draw__11dMeterMap_cFv
// dMeterMap_c::_draw(void)
asm void dMeterMap_c_NS__draw(void) {
asm void _draw__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020DF1C.s"
}
// draw__11dMeterMap_cFv
// dMeterMap_c::draw(void)
asm void func_8020DF68(void) {
asm void draw__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020DF68.s"
}
// ctrlShowMap__11dMeterMap_cFv
// dMeterMap_c::ctrlShowMap(void)
asm void dMeterMap_c_NS_ctrlShowMap(void) {
asm void ctrlShowMap__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E070.s"
}
// checkMoveStatus__11dMeterMap_cFv
// dMeterMap_c::checkMoveStatus(void)
asm void dMeterMap_c_NS_checkMoveStatus(void) {
asm void checkMoveStatus__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E45C.s"
}
// isShow__11dMeterMap_cFUl
// dMeterMap_c::isShow(unsigned long)
asm void dMeterMap_c_NS_isShow(void) {
asm void isShow__11dMeterMap_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E4C8.s"
}
// isFmapScreen__11dMeterMap_cFv
// dMeterMap_c::isFmapScreen(void)
asm void dMeterMap_c_NS_isFmapScreen(void) {
asm void isFmapScreen__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E620.s"
}
// isDmapScreen__11dMeterMap_cFv
// dMeterMap_c::isDmapScreen(void)
asm void dMeterMap_c_NS_isDmapScreen(void) {
asm void isDmapScreen__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E70C.s"
}
// meter_map_move__11dMeterMap_cFUl
// dMeterMap_c::meter_map_move(unsigned long)
asm void dMeterMap_c_NS_meter_map_move(void) {
asm void meter_map_move__11dMeterMap_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E754.s"
}
// keyCheck__11dMeterMap_cFv
// dMeterMap_c::keyCheck(void)
asm void dMeterMap_c_NS_keyCheck(void) {
asm void keyCheck__11dMeterMap_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_map/asm/func_8020E9CC.s"
}
src/d/d_meter/d_meter_string.cpp
+31 -30
View File
@@ -9,28 +9,29 @@ void __ct__9J2DScreenFv(void);
void __dl__FPv(void);
void __nw__FUl(void);
void animationTransform__7J2DPaneFv(void);
void CPaneMgr_NS_getGlobalVtxCenter(void);
void CPaneMgr_NS_paneTrans(void);
void CPaneMgr_X1_(void);
void CPaneMgrAlpha_NS_setAlphaRate(void);
void dComIfG_TimerDeleteRequest(void);
void dMeter2Draw_c_NS_drawPikari_X1_(void);
void dMeter2Info_c_NS_getString(void);
void dMeter2Info_c_NS_resetMeterString(void);
void dMeterString_c_NS_createString(void);
void dMeterString_c_NS_drawPikari(void);
void dMeterString_c_NS_isLeadByte(void);
void dMeterString_c_NS_playBckAnimation(void);
void dPaneClass_showNullPane(void);
void dTimer_createTimer(void);
void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void);
void paneTrans__8CPaneMgrFff(void);
void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void);
void setAlphaRate__13CPaneMgrAlphaFf(void);
void dComIfG_TimerDeleteRequest__Fi(void);
void drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc(
void);
void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void);
void resetMeterString__13dMeter2Info_cFv(void);
void createString__14dMeterString_cFi(void);
void drawPikari__14dMeterString_cFv(void);
void isLeadByte__14dMeterString_cFi(void);
void playBckAnimation__14dMeterString_cFf(void);
void dPaneClass_showNullPane__FP9J2DScreen(void);
void dTimer_createTimer__FlUlUcUcffff(void);
void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
void getParentPane__7J2DPaneFv(void);
void J2DAnmLoaderDataBase_NS_load(void);
void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
void J2DTextBox_NS_getStringPtr(void);
void J2DTextBox_NS_setString_X1_(void);
void mDoExt_getMesgFont(void);
void load__20J2DAnmLoaderDataBaseFPCv(void);
void draw__9J2DScreenFffPC14J2DGrafContext(void);
void setPriority__9J2DScreenFPCcUlP10JKRArchive(void);
void getStringPtr__10J2DTextBoxCFv(void);
void setString__10J2DTextBoxFsPCce(void);
void mDoExt_getMesgFont__Fv(void);
}
// additional symbols needed for d_meter_string.cpp
@@ -57,70 +58,70 @@ extern u8 lbl_80430188;
extern "C" {
// __ct__14dMeterString_cFi
// dMeterString_c::dMeterString_c(int)
asm void dMeterString_c(void) {
asm void __ct__14dMeterString_cFi(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020ED60.s"
}
// __dt__14dMeterString_cFv
// dMeterString_c::~dMeterString_c(void)
asm void func_8020EDF4(void) {
asm void __dt__14dMeterString_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020EDF4.s"
}
// _create__14dMeterString_cFv
// dMeterString_c::_create(void)
asm void func_8020EE70(void) {
asm void _create__14dMeterString_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020EE70.s"
}
// _execute__14dMeterString_cFUl
// dMeterString_c::_execute(unsigned long)
asm void func_8020F150(void) {
asm void _execute__14dMeterString_cFUl(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F150.s"
}
// draw__14dMeterString_cFv
// dMeterString_c::draw(void)
asm void func_8020F1B0(void) {
asm void draw__14dMeterString_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F1B0.s"
}
// _delete__14dMeterString_cFv
// dMeterString_c::_delete(void)
asm void func_8020F49C(void) {
asm void _delete__14dMeterString_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F49C.s"
}
// createString__14dMeterString_cFi
// dMeterString_c::createString(int)
asm void dMeterString_c_NS_createString(void) {
asm void createString__14dMeterString_cFi(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F5A4.s"
}
// playBckAnimation__14dMeterString_cFf
// dMeterString_c::playBckAnimation(float)
asm void dMeterString_c_NS_playBckAnimation(void) {
asm void playBckAnimation__14dMeterString_cFf(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F66C.s"
}
// drawPikari__14dMeterString_cFv
// dMeterString_c::drawPikari(void)
asm void dMeterString_c_NS_drawPikari(void) {
asm void drawPikari__14dMeterString_cFv(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020F6EC.s"
}
// isLeadByte__14dMeterString_cFi
// dMeterString_c::isLeadByte(int)
asm void dMeterString_c_NS_isLeadByte(void) {
asm void isLeadByte__14dMeterString_cFi(void) {
nofralloc
#include "d/d_meter/d_meter_string/asm/func_8020FA88.s"
}
src/d/d_meter2.cpp
+200 -200
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More