rel: Add support for NPCs

Author: PistonMiner

ttyd-tools/rel/include/commonfunctions.h

@@ -2,6 +2,7 @@
 
 #include <gc/OSModule.h>
 #include <ttyd/seqdrv.h>
+#include <ttyd/npcdrv.h>
 #include <ttyd/party.h>
 
 #include <cstdint>
@@ -20,7 +21,7 @@ void *getBattleWorkPointer();
 void *getMarioBattlePointer();
 void *getPartnerBattlePointer();
 void *getActorPointer(uint32_t slot);
-void *getNPCFieldWorkPointer(uint32_t npcSlot);
+ttyd::npcdrv::NpcEntry *getNpcEntryData(uint32_t slot);
 uint32_t secondsToFrames(uint32_t seconds);
 uint32_t getSequencePosition();
 void setSequencePosition(uint32_t value);

ttyd-tools/rel/include/mod.h

@@ -3,6 +3,7 @@
 #include <gc/OSModule.h>
 #include <gc/OSContext.h>
 #include <ttyd/evtmgr.h>
+#include <ttyd/npcdrv.h>
 #include <ttyd/dispdrv.h>
 #include <ttyd/battle_unit.h>
 
@@ -28,7 +29,7 @@ class Mod
 	uint32_t setIndexWarpEntrance(ttyd::evtmgr::EvtEntry *, uint32_t);
 	int32_t fixMarioKeyOn();
 	bool performRelPatches(gc::OSModule::OSModuleInfo *, void *);
-	void *disableBattles(uint32_t, void *);
+	ttyd::npcdrv::NpcEntry *disableBattles(uint32_t, void *);
 	void drawArtAttackHitboxes(ttyd::dispdrv::CameraId);
 	int32_t displayActionCommandsTimingHook(void *, ttyd::battle_unit::AttackParams *);
 	void errorHandler(uint16_t, gc::OSContext::OSContext *, uint32_t, uint32_t);
@@ -48,7 +49,7 @@ class Mod
 	uint32_t (*mPFN_evt_bero_get_info_trampoline)(ttyd::evtmgr::EvtEntry *, uint32_t) = nullptr;
 	int32_t (*mPFN_marioKeyOn_trampoline)() = nullptr;
 	bool (*mPFN_OSLink_trampoline)(gc::OSModule::OSModuleInfo *, void *) = nullptr;
-	void *(*mPFN_fbatHitCheck_trampoline)(uint32_t, void *) = nullptr;
+	ttyd::npcdrv::NpcEntry *(*mPFN_fbatHitCheck_trampoline)(uint32_t, void *) = nullptr;
 	void (*mPFN_scissor_disp_control_trampoline)(ttyd::dispdrv::CameraId) = nullptr;
 
 	int32_t (*mPFN_BattleActionCommandCheckDefence_trampoline)(

ttyd-tools/rel/include/ttyd.eu.lst

@@ -418,80 +418,192 @@
 80311524:worldData
 
 // npcdrv.o
-// 80043020:fbatPreventMarioEventChk
-// 80043054:npcCheckBlow
-// 80043194:npcCalcScore
-// 8004329C:fbatSandersBombTriggerOn
-// 800432B0:npcKoopaModeMobjBoundDeadCheck
-// 80043378:npcKoopaModeEncountCheck
-// 800434F4:npcClearDeadInfo
-// 80043528:npcGetBackItemEntry
+80043020:fbatPreventMarioEventChk
+80043054:npcCheckBlow
+80043194:npcCalcScore
+8004329C:fbatSandersBombTriggerOn
+800432B0:npcKoopaModeMobjBoundDeadCheck
+80043378:npcKoopaModeEncountCheck
+800434F4:npcClearDeadInfo
+80043528:npcGetBackItemEntry
 // 800435C4:_majinai_effect
 // 8004367C:_check
-// 800436EC:npcExecAllReglEvt
-// 800437AC:npcWaitAllInitEvtEnd
-// 80043880:npcExecAllInitEvt
-// 8004394C:dbGetDefData
-// 800439BC:npcSetLink
-// 800439C8:npcSetSlave
-// 800439DC:npcSetBtlSetupWork
-// 800439EC:npcGetBtlSetupWork
-// 800439FC:npcBlurOff
-// 80043AA0:npcBlurOn
-// 80043BBC:npcSetColor
-// 80043C48:npcStartForOneEvent
-// 80043CB0:npcStartForEvent
-// 80043D60:npcStopForOneEvent
-// 80043DC0:npcStopForEvent
-// 80043E68:npcSetBattleInfo
-// 80043F60:npcSetupBattleInfo
-// 800441E0:npcCheckInterrupt
+800436EC:npcExecAllReglEvt
+800437AC:npcWaitAllInitEvtEnd
+80043880:npcExecAllInitEvt
+8004394C:dbGetDefData
+800439BC:npcSetLink
+800439C8:npcSetSlave
+800439DC:npcSetBtlSetupWork
+800439EC:npcGetBtlSetupWork
+800439FC:npcBlurOff
+80043AA0:npcBlurOn
+80043BBC:npcSetColor
+80043C48:npcStartForOneEvent
+80043CB0:npcStartForEvent
+80043D60:npcStopForOneEvent
+80043DC0:npcStopForEvent
+80043E68:npcSetBattleInfo
+80043F60:npcSetupBattleInfo
+800441E0:npcCheckInterrupt
 // 80044414:_npcHitCheckHammerAllMotion
 // 8004479C:_npcHitCheckSphere
 80044914:fbatHitCheck
-// 800466EC:fbatHitCheckAll
-// 80046714:fbatNpcTalkCheck
-// 80046774:npcGroupDead
+800466EC:fbatHitCheckAll
+80046714:fbatNpcTalkCheck
+80046774:npcGroupDead
 // 800467B8:_npcGroupDead
 // 80046B14:_npcDead
-// 80046B60:fbatBattleMode
-// 800471C4:fbatTalkMode
-// 80047364:fbatEncountCheck
+80046B60:fbatBattleMode
+800471C4:fbatTalkMode
+80047364:fbatEncountCheck
 // 80047EE4:_fbatFirstAttackAnnouceDisp
-// 80048268:fbatSetAttackAnnounceEnable
-// 8004827C:fbatSetAttackAnnounce
-// 80048374:fbatChangeMode
+80048268:fbatSetAttackAnnounceEnable
+8004827C:fbatSetAttackAnnounce
+80048374:fbatChangeMode
 80048384:fbatGetPointer
-// 80048390:npcNearDistCheck
-// 80048500:npcHitCheckSide
-// 80048E18:npcTransRytoFaceDir
-// 80048E54:npcTuningRy
+80048390:npcNearDistCheck
+80048500:npcHitCheckSide
+80048E18:npcTransRytoFaceDir
+80048E54:npcTuningRy
 // 80048E84:npcMoveG
 // 800491B4:npcCheckHitMarioSide
-// 8004972C:npcSetStayPose
-// 80049884:npcSetTalkPose
-// 800499DC:npcSetMarioAutoTalkPose
-// 80049A1C:npcNameToPtr_NoAssert
-// 80049AC8:npcNameToPtr
-// 80049B64:npcMain
-// 8004B508:npcDeleteGroup
+8004972C:npcSetStayPose
+80049884:npcSetTalkPose
+800499DC:npcSetMarioAutoTalkPose
+80049A1C:npcNameToPtr_NoAssert
+80049AC8:npcNameToPtr
+80049B64:npcMain
+8004B508:npcDeleteGroup
 // 8004B54C:_npcDeleteGroup
-// 8004B7F0:npcDelete
-// 8004B910:npcGetTribe
-// 8004B97C:npcEntry
-// 8004BBCC:npcGetReactionOfLivingBody
-// 8004BBE4:npcReset
-// 8004BC58:npcInit
+8004B7F0:npcDelete
+8004B910:npcGetTribe
+8004B97C:npcEntry
+8004BBCC:npcGetReactionOfLivingBody
+8004BBE4:npcReset
+8004BC58:npcInit
 // 8004BD24:npcDisp_blur
 // 8004C010:npcDisp_offscreen
 // 8004C31C:npcDisp_offscreen_xlu
 // 8004C5F4:npcDisp
 // 8004C8C8:npcDisp_xlu
 // 8004CB68:mtx_setup
-// 8004CE20:npcRecoveryFiledNpc
-// 8004CF40:npcReleaseFiledNpc
+8004CE20:npcRecoveryFiledNpc
+8004CF40:npcReleaseFiledNpc
 8004D054:npcGetWorkPtr
 
+// evt_npc.o
+8004D070:evt_npc_release_filednpc
+8004D0D0:evt_npc_sound_data_set
+8004D1DC:evt_npc_sound_data_reset
+// 8004D268:unk_US_PAL_01_8004d268
+8004D4B4:evt_fbat_trans_floor_position
+8004D5FC:evt_npc_kamek_kemuri2
+8004D6FC:evt_npc_kamek_kemuri1
+8004D790:evt_npc_kamek_move_position
+// 8004DEB0:_kamek_houki_kemuri
+8004DFB4:evt_npc_calc_score
+8004E000:evt_npc_get_kpencount_type
+8004E05C:evt_npc_majo_disp_off
+8004E294:evt_npc_majo_disp_on
+8004E5D4:evt_npc_set_autotalkpose
+8004E68C:evt_npc_set_tribe
+8004E790:evt_npc_set_balloontype
+8004E7EC:evt_npc_wait_msec
+8004E8C0:evt_npc_set_unitwork
+8004E934:evt_npc_get_unitwork
+8004E9A4:evt_npc_getback_item_entry
+8004E9F0:evt_npc_get_drop_coin
+// 8004EA80:_npc_check_coin_group
+// 8004EAF8:_npc_check_coin
+8004EB0C:evt_npc_get_drop_flower
+8004EBCC:evt_npc_get_drop_heart
+8004EC8C:evt_npc_get_drop_item
+8004ED00:evt_npc_get_drop_fixitem
+8004ED58:evt_npc_set_link
+8004EDD8:evt_npc_set_btlsetup_work
+8004EE54:evt_npc_get_btlsetup_work
+8004EECC:evt_npc_get_battle_rule_keep_result
+8004EF18:evt_npc_check_escape_battle
+8004EF54:evt_npc_get_battle_result
+8004EFA4:evt_npc_wait_battle_end
+8004F020:evt_npc_battle_start
+8004F0D8:evt_npc_set_battle_rule
+8004F15C:evt_npc_set_battle_info
+8004F1C0:evt_npc_set_attack_mode
+8004F21C:evt_npc_check
+8004F284:evt_npc_blur_onoff
+8004F2F4:evt_npc_set_color
+8004F3A8:evt_npc_set_offscreen
+8004F428:evt_npc_change_fbat_mode
+8004F45C:evt_npc_start_for_one_event
+8004F4A8:evt_npc_stop_for_one_event
+8004F4F4:evt_npc_start_for_event
+8004F518:evt_npc_stop_for_event
+8004F53C:evtNpcNameToPtr_NoAssert
+8004F6A4:evtNpcNameToPtr
+8004F80C:evt_npc_facedirection_add
+8004F908:evt_npc_restart_regular_event
+8004F960:evt_npc_get_reglid
+8004F9B8:evt_npc_change_interrupt
+8004FA68:evt_npc_get_loiter_dir
+8004FB54:evt_npc_add_dirdist
+8004FC64:evt_set_dir_to_home
+8004FCD4:evt_set_dir_to_target
+8004FD4C:evt_get_target_dir
+// 8004FDC8:_get_target_dir
+8004FE8C:evt_npc_set_camid
+8004FEE8:evt_npc_pera_onoff
+8004FF6C:evt_npc_status_check
+8004FFD8:evt_npc_status_onoff
+80050074:evt_npc_reaction_flag_onoff
+80050110:evt_npc_flag_check
+8005017C:evt_npc_flag_onoff
+80050218:evt_npc_wait_anim
+80050294:evt_npc_wait_pera
+800502F0:evt_npc_set_force_regl_anim
+8005036C:evt_npc_clear_paper
+800503C4:evt_npc_set_paper_anim
+80050430:evt_npc_set_paper
+800504A8:evt_npc_set_run_anim
+80050524:evt_npc_set_walk_anim
+800505A0:evt_npc_set_talk_anim
+8005061C:evt_npc_set_stay_anim
+80050698:evt_npc_set_stop_anim
+80050714:evt_npc_set_confuse_anim
+80050790:evt_npc_set_damage_anim
+8005080C:evt_npc_set_anim
+80050894:evt_npc_get_dir
+800508F8:evt_npc_reverse_ry
+80050958:evt_npc_set_ry_lr
+80050A54:evt_npc_set_ry
+80050AB8:_intplGetFloat
+80050C98:evt_npc_homing_target
+80051334:evt_npc_return_interrupt
+80051388:evt_npc_glide_position
+80051934:evt_npc_jump_position_nohit
+80051C98:evt_npc_jump_position
+80052320:evt_npc_move_position
+800529B0:evt_npc_set_rotate_offset
+80052AFC:evt_npc_add_rotate
+80052C28:evt_npc_set_rotate
+80052D74:evt_npc_get_rotate
+80052DF8:evt_npc_set_home_position
+80052EE0:evt_npc_get_home_position
+80052F64:evt_npc_get_position
+80052FE8:evt_npc_get_scale
+8005306C:evt_npc_set_scale
+80053100:evt_npc_get_height
+8005315C:evt_npc_set_height
+800531C0:evt_npc_set_width
+80053224:evt_npc_set_position
+80053308:evt_npc_setup
+80053590:evt_npc_get_ReactionOfLivingBody
+800535E4:evt_npc_check_delete
+80053638:evt_npc_delete
+80053684:evt_npc_slave_entry
+800537B0:evt_npc_entry
+
 // evt_sub.o
 // 80053830:mail_evt_gor_04_keyoff_check
 // 80053890:irai_mail_check