mirror of
https://github.com/pmret/papermario.git
synced 2024-11-09 20:42:41 +01:00
code_838b0_len_5900 -> world/partners
This commit is contained in:
Alex Bates
parent
62e04bccc4
commit
6a62ea9a7b
@ -248,14 +248,14 @@ WorldPartner wPartners[12] = {
|
||||
|
||||
NpcId create_basic_npc(NpcBlueprint* blueprint);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", use_consumable);
|
||||
INCLUDE_ASM(s32, "world/partners", use_consumable);
|
||||
|
||||
void remove_consumable(void) {
|
||||
gPlayerData.invItems[D_8010CD20] = 0;
|
||||
sort_items();
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA4B0);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EA4B0);
|
||||
|
||||
s32 world_partner_can_use_ability_default(Npc* partner) {
|
||||
return D_8010EBB0[0] == 0;
|
||||
@ -265,11 +265,11 @@ s32 world_partner_can_player_pause_default(Npc* partner) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA52C);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EA52C);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", is_current_partner_flying, void);
|
||||
INCLUDE_ASM(s32, "world/partners", is_current_partner_flying, void);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5B8);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EA5B8);
|
||||
|
||||
void load_partner_npc(void) {
|
||||
WorldPartner* partnerEntry = &wPartners[D_8010CFD8];
|
||||
@ -311,92 +311,92 @@ void load_partner_npc(void) {
|
||||
D_8010C954 = 0;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EA6A8);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", _use_partner_ability);
|
||||
INCLUDE_ASM(s32, "world/partners", _use_partner_ability);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s32 arg0);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EB168, s32 arg0);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EB200);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB2A4);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EB2A4);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_use_ability);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_use_ability);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_player_can_pause);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_player_can_pause);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_can_use_ability);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_can_use_ability);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_reset_data);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_reset_data);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_initialize_data);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_initialize_data);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_test_enemy_collision);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_test_enemy_collision);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_get_ride_script);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_get_ride_script);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_handle_before_battle);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_handle_before_battle);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_handle_after_battle);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_handle_after_battle);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_kill_ability_script);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_kill_ability_script);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_suspend_ability_script);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_suspend_ability_script);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_resume_ability_script);
|
||||
INCLUDE_ASM(s32, "world/partners", partner_resume_ability_script);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_walking, Npc* partner, s32 val);
|
||||
INCLUDE_ASM(void, "world/partners", enable_partner_walking, Npc* partner, s32 val);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", func_800EBA3C, Npc* partner);
|
||||
INCLUDE_ASM(void, "world/partners", func_800EBA3C, Npc* partner);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", func_800EBB40, Npc* partner);
|
||||
INCLUDE_ASM(void, "world/partners", func_800EBB40, Npc* partner);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBC74);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EBC74);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_flying, Npc* partner, s32 val);
|
||||
INCLUDE_ASM(void, "world/partners", enable_partner_flying, Npc* partner, s32 val);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", update_player_move_history, Npc* partner);
|
||||
INCLUDE_ASM(void, "world/partners", update_player_move_history, Npc* partner);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", func_800ED5D0, Npc* partner);
|
||||
INCLUDE_ASM(void, "world/partners", func_800ED5D0, Npc* partner);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800ED9F8);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800ED9F8);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EE994);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EE994);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EE9B8);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EE9B8);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EECC4);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EECC4);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EECE8);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EECE8);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF300);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF300);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF314);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF314);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_ai, void);
|
||||
INCLUDE_ASM(void, "world/partners", enable_partner_ai, void);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", set_parter_tether_distance, f32 arg0);
|
||||
INCLUDE_ASM(s32, "world/partners", set_parter_tether_distance, f32 arg0);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", reset_parter_tether_distance);
|
||||
INCLUDE_ASM(s32, "world/partners", reset_parter_tether_distance);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3C0);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF3C0);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3D4);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF3D4);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3E4);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF3E4);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF414);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF414);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF43C);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF43C);
|
||||
|
||||
INCLUDE_ASM(void, "code_838b0_len_5900", clear_partner_move_history, Npc* partner);
|
||||
INCLUDE_ASM(void, "world/partners", clear_partner_move_history, Npc* partner);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF4E0);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF4E0);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF600);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF600);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF628);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF628);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF640);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF640);
|
||||
|
||||
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF82C);
|
||||
INCLUDE_ASM(s32, "world/partners", func_800EF82C);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user